From 8b696f60104e7de4a54523ae192d41f538b4c583 Mon Sep 17 00:00:00 2001 From: lucaszhu Date: Tue, 17 Aug 2021 17:40:21 +0800 Subject: [PATCH 1/3] Update locale.md --- docs/zh/reference/plugin/plugins/locale.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/zh/reference/plugin/plugins/locale.md b/docs/zh/reference/plugin/plugins/locale.md index c5253b9e..4eaab726 100644 --- a/docs/zh/reference/plugin/plugins/locale.md +++ b/docs/zh/reference/plugin/plugins/locale.md @@ -45,7 +45,7 @@ export default { }; ``` ```js -// src/locales/zh-CN.js +// src/locales/en-US.js export default { menu: { interface: 'interface' @@ -199,4 +199,4 @@ export default { ``` -`useI18n()`返回结果是 [Composer](https://vue-i18n.intlify.dev/api/composition.html#composer)，提供类似 `t`、`n`、`d` 等转换函数，在模板中使用。 \ No newline at end of file +`useI18n()`返回结果是 [Composer](https://vue-i18n.intlify.dev/api/composition.html#composer)，提供类似 `t`、`n`、`d` 等转换函数，在模板中使用。 From 04a33d2c6870f1c14321f7055758940dd4ba98e8 Mon Sep 17 00:00:00 2001 From: harrywan Date: Wed, 3 Nov 2021 14:45:44 +0800 Subject: [PATCH 2/3] =?UTF-8?q?feat:=20=E6=94=AF=E6=8C=81=E6=8C=89?= =?UTF-8?q?=E8=B7=AF=E7=94=B1=E7=BC=96=E8=AF=91=E5=87=BA.html=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/fes-preset-built-in/src/index.js | 1 + .../src/plugins/commands/buildDevUtils.js | 2 +- .../plugins/commands/webpackConfig/html.js | 42 ++++++++++++++++--- .../plugins/commands/webpackConfig/index.js | 2 + packages/fes-template/.fes.js | 2 + packages/fes-template/src/pages/a/b.vue | 8 ++++ packages/fes-template/src/pages/b/index.vue | 8 ++++ 7 files changed, 58 insertions(+), 7 deletions(-) create mode 100644 packages/fes-template/src/pages/a/b.vue create mode 100644 packages/fes-template/src/pages/b/index.vue diff --git a/packages/fes-preset-built-in/src/index.js b/packages/fes-preset-built-in/src/index.js index e491f6a2..fd8150af 100644 --- a/packages/fes-preset-built-in/src/index.js +++ b/packages/fes-preset-built-in/src/index.js @@ -45,6 +45,7 @@ export default function () { require.resolve('./plugins/features/mock'), require.resolve('./plugins/features/dynamicImport'), require.resolve('./plugins/features/runtimePublicPath'), + require.resolve('./plugins/features/exportStatic'), // misc require.resolve('./plugins/misc/route'), diff --git a/packages/fes-preset-built-in/src/plugins/commands/buildDevUtils.js b/packages/fes-preset-built-in/src/plugins/commands/buildDevUtils.js index b2b86505..eafc32b3 100644 --- a/packages/fes-preset-built-in/src/plugins/commands/buildDevUtils.js +++ b/packages/fes-preset-built-in/src/plugins/commands/buildDevUtils.js @@ -73,7 +73,7 @@ export async function getBundleAndConfigs({ const bundleConfig = await api.applyPlugins({ type: api.ApplyPluginsType.modify, key: 'modifyBundleConfig', - initialValue: await getConfig(getConfigOpts), + initialValue: await getConfig({ api, ...getConfigOpts }), args: { } }); diff --git a/packages/fes-preset-built-in/src/plugins/commands/webpackConfig/html.js b/packages/fes-preset-built-in/src/plugins/commands/webpackConfig/html.js index 5a5fd5b8..2a81af68 100644 --- a/packages/fes-preset-built-in/src/plugins/commands/webpackConfig/html.js +++ b/packages/fes-preset-built-in/src/plugins/commands/webpackConfig/html.js @@ -6,6 +6,7 @@ import { import resolveDefine from './resolveDefine'; export default async function createHtmlWebpackConfig({ + api, cwd, config, webpackConfig, @@ -38,13 +39,14 @@ export default async function createHtmlWebpackConfig({ const defaultHtmlPath = resolve(__dirname, 'index-default.html'); const publicCopyIgnore = []; - if (!multiPageConfig) { - // default, single page setup. - htmlOptions.template = existsSync(htmlPath) - ? htmlPath - : defaultHtmlPath; + // default, single page setup. + htmlOptions.template = existsSync(htmlPath) + ? htmlPath + : defaultHtmlPath; - publicCopyIgnore.push(winPath(htmlOptions.template)); + publicCopyIgnore.push(winPath(htmlOptions.template)); + + if (!multiPageConfig) { webpackConfig .plugin('html') .use(require.resolve('html-webpack-plugin'), [htmlOptions]); @@ -52,6 +54,34 @@ export default async function createHtmlWebpackConfig({ // TODO 支持多页 } + // 如果需要导出html，则根据路由生成对应的html文件 + if (config.exportStatic) { + const routes = await api.getRoutes(); + const addHtml = (_routes) => { + if (Array.isArray(_routes)) { + _routes.forEach((route) => { + const _fileName = `${route.path.slice(1) || 'index'}.html`; + if (_fileName !== 'index.html') { + const _htmlOptions = { + title: 'fes.js', + filename: _fileName, + ...config.html, + templateParameters: resolveDefine(config, true), + mountElementId: config.mountElementId + }; + webpackConfig + .plugin(_fileName) + .use(require.resolve('html-webpack-plugin'), [_htmlOptions]); + } + if (route.children && route.children.length) { + addHtml(route.children); + } + }); + } + }; + addHtml(routes); + } + if (headScripts) { const headScriptsMap = await headScripts(); webpackConfig diff --git a/packages/fes-preset-built-in/src/plugins/commands/webpackConfig/index.js b/packages/fes-preset-built-in/src/plugins/commands/webpackConfig/index.js index d821b0b4..903fbd00 100644 --- a/packages/fes-preset-built-in/src/plugins/commands/webpackConfig/index.js +++ b/packages/fes-preset-built-in/src/plugins/commands/webpackConfig/index.js @@ -59,6 +59,7 @@ function genTranspileDepRegex(exclude) { export default async function getConfig({ + api, cwd, config, env, @@ -219,6 +220,7 @@ export default async function getConfig({ // --------------- html ----------- const { publicCopyIgnore } = await createHtmlWebpackConfig({ + api, cwd, config, webpackConfig, diff --git a/packages/fes-template/.fes.js b/packages/fes-template/.fes.js index 2d02144c..4374b125 100644 --- a/packages/fes-template/.fes.js +++ b/packages/fes-template/.fes.js @@ -1,10 +1,12 @@ // .fes.js 只负责管理编译时配置，只能使用plain Object export default { + exportStatic: {}, base: "/base/", define: { __DEV__: false, }, + publicPath: "./", html: { title: "海贼王", }, diff --git a/packages/fes-template/src/pages/a/b.vue b/packages/fes-template/src/pages/a/b.vue new file mode 100644 index 00000000..183c640d --- /dev/null +++ b/packages/fes-template/src/pages/a/b.vue @@ -0,0 +1,8 @@ + + diff --git a/packages/fes-template/src/pages/b/index.vue b/packages/fes-template/src/pages/b/index.vue new file mode 100644 index 00000000..26f31da7 --- /dev/null +++ b/packages/fes-template/src/pages/b/index.vue @@ -0,0 +1,8 @@ + + From 0f0c646ceda2492fcc8aaf5b2abbc2c9f6224303 Mon Sep 17 00:00:00 2001 From: harrywan Date: Tue, 9 Nov 2021 20:00:25 +0800 Subject: [PATCH 3/3] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E6=8C=89?= =?UTF-8?q?=E8=B7=AF=E7=94=B1=E5=AF=BC=E5=87=BA=E5=A4=9Ahtml=E7=9A=84title?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/plugins/commands/webpackConfig/html.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/fes-preset-built-in/src/plugins/commands/webpackConfig/html.js b/packages/fes-preset-built-in/src/plugins/commands/webpackConfig/html.js index 2a81af68..0528e133 100644 --- a/packages/fes-preset-built-in/src/plugins/commands/webpackConfig/html.js +++ b/packages/fes-preset-built-in/src/plugins/commands/webpackConfig/html.js @@ -63,9 +63,9 @@ export default async function createHtmlWebpackConfig({ const _fileName = `${route.path.slice(1) || 'index'}.html`; if (_fileName !== 'index.html') { const _htmlOptions = { - title: 'fes.js', - filename: _fileName, ...config.html, + title: route?.meta?.title || config.html.title || 'fes.js', + filename: _fileName, templateParameters: resolveDefine(config, true), mountElementId: config.mountElementId };