From a90fa7be017df3f371aa9502ee3a737db59abf29 Mon Sep 17 00:00:00 2001 From: Luca Date: Tue, 21 Aug 2018 08:37:05 +0200 Subject: [PATCH 1/3] feat(cli-service): templateParameters per page Allow use custom template parameters defined in each htmlWebpackPlugin pages. --- packages/@vue/cli-service/lib/config/app.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/@vue/cli-service/lib/config/app.js b/packages/@vue/cli-service/lib/config/app.js index 6b14fcc7f1..208060c62e 100644 --- a/packages/@vue/cli-service/lib/config/app.js +++ b/packages/@vue/cli-service/lib/config/app.js @@ -189,7 +189,8 @@ module.exports = (api, options) => { entry, template = `public/${name}.html`, filename = `${name}.html`, - chunks + chunks, + templateParameters } = normalizePageConfig(multiPageConfig[name]) // inject entry webpackConfig.entry(name).add(api.resolve(entry)) @@ -210,7 +211,10 @@ module.exports = (api, options) => { chunks: chunks || ['chunk-vendors', 'chunk-common', name], template: templatePath, filename: ensureRelative(outputDir, filename), - title + title, + templateParameters: (compilation, assets, pluginOptions) => { + return Object.assign(htmlOptions.templateParameters(compilation, assets, pluginOptions), templateParameters) + } }) webpackConfig From 1696fd2b66f5a6bb75773e6ae590f09c511995d3 Mon Sep 17 00:00:00 2001 From: Luca Date: Wed, 14 Nov 2018 13:48:48 +0100 Subject: [PATCH 2/3] style(cli-service): rollback line separation --- packages/@vue/cli-service/lib/config/app.js | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/@vue/cli-service/lib/config/app.js b/packages/@vue/cli-service/lib/config/app.js index 2c62cb3c6d..7ae4a2913a 100644 --- a/packages/@vue/cli-service/lib/config/app.js +++ b/packages/@vue/cli-service/lib/config/app.js @@ -200,6 +200,7 @@ module.exports = (api, options) => { customHtmlOptions[key] = pageConfig[key] } } + // inject entry webpackConfig.entry(name).add(api.resolve(entry)) From bfea9d1be5a020ea66c431616cd8cee9f6b03fe7 Mon Sep 17 00:00:00 2001 From: Luca Date: Wed, 14 Nov 2018 13:54:46 +0100 Subject: [PATCH 3/3] fix(cli-service-app): const assignment --- packages/@vue/cli-service/lib/config/app.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/@vue/cli-service/lib/config/app.js b/packages/@vue/cli-service/lib/config/app.js index 7ae4a2913a..862784fc08 100644 --- a/packages/@vue/cli-service/lib/config/app.js +++ b/packages/@vue/cli-service/lib/config/app.js @@ -183,7 +183,7 @@ module.exports = (api, options) => { template = `public/${name}.html`, filename = `${name}.html`, chunks = ['chunk-vendors', 'chunk-common', name], - templateParameters: (compilation, assets, pluginOptions) => { + templateParameters = (compilation, assets, pluginOptions) => { return Object.assign(htmlOptions.templateParameters(compilation, assets, pluginOptions), templateParameters) } } = pageConfig