From 99911b9c6aafd8e8a67a8005384f122fe44525b5 Mon Sep 17 00:00:00 2001 From: fxy060608 Date: Wed, 20 Nov 2019 17:04:03 +0800 Subject: [PATCH] fix(cli): add vueOptions --- packages/vue-cli-plugin-uni/index.js | 2 +- packages/vue-cli-plugin-uni/lib/chain-webpack.js | 4 ++-- packages/vue-cli-plugin-uni/lib/h5/index.js | 2 +- packages/vue-cli-plugin-uni/lib/mp.js | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/vue-cli-plugin-uni/index.js b/packages/vue-cli-plugin-uni/index.js index 3e1a8cea..e5e3565b 100644 --- a/packages/vue-cli-plugin-uni/index.js +++ b/packages/vue-cli-plugin-uni/index.js @@ -26,7 +26,7 @@ module.exports = (api, options) => { require('./lib/options')(options) api.configureWebpack(require('./lib/configure-webpack')(platformOptions, manifestPlatformOptions, options, api)) - api.chainWebpack(require('./lib/chain-webpack')(platformOptions, api)) + api.chainWebpack(require('./lib/chain-webpack')(platformOptions, options, api)) } module.exports.defaultModes = { diff --git a/packages/vue-cli-plugin-uni/lib/chain-webpack.js b/packages/vue-cli-plugin-uni/lib/chain-webpack.js index 45dc249d..c4190e9b 100644 --- a/packages/vue-cli-plugin-uni/lib/chain-webpack.js +++ b/packages/vue-cli-plugin-uni/lib/chain-webpack.js @@ -12,7 +12,7 @@ function resolve (dir) { return path.resolve(__dirname, '..', dir) } -module.exports = function chainWebpack (platformOptions, api) { +module.exports = function chainWebpack (platformOptions, vueOptions, api) { const { runByHBuilderX, // 使用 HBuilderX 运行 cssPreprocessOptions @@ -94,7 +94,7 @@ module.exports = function chainWebpack (platformOptions, api) { }) } - platformOptions.chainWebpack(webpackConfig, api) + platformOptions.chainWebpack(webpackConfig, vueOptions, api) // define webpackConfig .plugin('uni-define') diff --git a/packages/vue-cli-plugin-uni/lib/h5/index.js b/packages/vue-cli-plugin-uni/lib/h5/index.js index db9ebde2..2de8359e 100644 --- a/packages/vue-cli-plugin-uni/lib/h5/index.js +++ b/packages/vue-cli-plugin-uni/lib/h5/index.js @@ -101,7 +101,7 @@ module.exports = { plugins } }, - chainWebpack (webpackConfig, api) { + chainWebpack (webpackConfig, vueOptions, api) { webpackConfig.plugins.delete('copy') if (!process.env.UNI_OPT_PREFETCH) { diff --git a/packages/vue-cli-plugin-uni/lib/mp.js b/packages/vue-cli-plugin-uni/lib/mp.js index 66251959..02495711 100644 --- a/packages/vue-cli-plugin-uni/lib/mp.js +++ b/packages/vue-cli-plugin-uni/lib/mp.js @@ -154,7 +154,7 @@ module.exports = { ] } }, - chainWebpack (webpackConfig, api) { + chainWebpack (webpackConfig, vueOptions, api) { if (process.env.UNI_PLATFORM === 'mp-baidu') { webpackConfig.module .rule('js') -- GitLab