diff --git a/README.en-US.md b/README.en-US.md index 59c952b8..3fd540a3 100644 --- a/README.en-US.md +++ b/README.en-US.md @@ -3,7 +3,7 @@ English | [简体中文](./README.md)

- fes.js + fes.js

diff --git a/README.md b/README.md index 45b95971..a13b63ce 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@

- fes.js + fes.js

diff --git a/docs/.vuepress/public/logo.png b/docs/.vuepress/public/logo.png index 4958e971..ad480536 100644 Binary files a/docs/.vuepress/public/logo.png and b/docs/.vuepress/public/logo.png differ diff --git a/images/fes-logo-name.png b/images/fes-logo-name.png new file mode 100644 index 00000000..b592a513 Binary files /dev/null and b/images/fes-logo-name.png differ diff --git a/images/fes-logo.png b/images/fes-logo.png new file mode 100644 index 00000000..ad480536 Binary files /dev/null and b/images/fes-logo.png differ diff --git a/images/hexo.png b/images/hexo.png deleted file mode 100644 index 4958e971..00000000 Binary files a/images/hexo.png and /dev/null differ diff --git a/images/单独图形-反白.png b/images/单独图形-反白.png deleted file mode 100644 index a5f11e62..00000000 Binary files a/images/单独图形-反白.png and /dev/null differ diff --git a/packages/create-fes-app/templates/app/h5/public/logo.png b/packages/create-fes-app/templates/app/h5/public/logo.png index 4958e971..ad480536 100644 Binary files a/packages/create-fes-app/templates/app/h5/public/logo.png and b/packages/create-fes-app/templates/app/h5/public/logo.png differ diff --git a/packages/create-fes-app/templates/app/pc/public/logo.png b/packages/create-fes-app/templates/app/pc/public/logo.png index 4958e971..ad480536 100644 Binary files a/packages/create-fes-app/templates/app/pc/public/logo.png and b/packages/create-fes-app/templates/app/pc/public/logo.png differ diff --git a/packages/fes-preset-built-in/src/plugins/generateFiles/core/plugin/index.js b/packages/fes-preset-built-in/src/plugins/generateFiles/core/plugin/index.js index 19ae586e..9439d434 100644 --- a/packages/fes-preset-built-in/src/plugins/generateFiles/core/plugin/index.js +++ b/packages/fes-preset-built-in/src/plugins/generateFiles/core/plugin/index.js @@ -3,6 +3,16 @@ import { join } from 'path'; import { winPath } from '@fesjs/utils'; import { runtimePath } from '../../../../utils/constants'; +function getAppPath(absSrcPath) { + for (const suffix of ['.js', '.ts', '.jsm']) { + const p = winPath(join(absSrcPath, `app${suffix}`)); + if (existsSync(p)) { + return p; + } + } + return null; +} + export default function (api) { const { paths, @@ -33,12 +43,11 @@ export default function (api) { 'onRouterCreated' ] }); - const appPath = winPath(join(paths.absSrcPath, 'app.js')); const plugins = await api.applyPlugins({ key: 'addRuntimePlugin', type: api.ApplyPluginsType.add, initialValue: [ - existsSync(appPath) && appPath + getAppPath(paths.absSrcPath) ].filter(Boolean) }); api.writeTmpFile({ diff --git a/packages/fes-preset-built-in/src/utils/generateFiles.js b/packages/fes-preset-built-in/src/utils/generateFiles.js index ddc0534f..c450a3ae 100644 --- a/packages/fes-preset-built-in/src/utils/generateFiles.js +++ b/packages/fes-preset-built-in/src/utils/generateFiles.js @@ -44,9 +44,8 @@ export default async ({ api, watch }) => { type: api.ApplyPluginsType.add, initialValue: [ paths.absPagesPath, - // 貌似没用到 - // join(paths.absSrcPath, api.config?.singular ? 'layout' : 'layouts'), - join(paths.absSrcPath, 'app.js') + join(paths.absSrcPath, 'app.js'), + join(paths.absSrcPath, 'app.ts') ] }); lodash