diff --git a/packages/vue-cli-plugin-hbuilderx/build/webpack.nvue.conf.js b/packages/vue-cli-plugin-hbuilderx/build/webpack.nvue.conf.js index f5e070a2cde716308a9bc553d79fcfd5840a1f69..cee4155af172da70d587b8077d5329aa76d62044 100644 --- a/packages/vue-cli-plugin-hbuilderx/build/webpack.nvue.conf.js +++ b/packages/vue-cli-plugin-hbuilderx/build/webpack.nvue.conf.js @@ -37,13 +37,15 @@ const uniPath = process.env.UNI_USING_V8 : '../packages/uni-app-plus-nvue/dist/index.js' const provide = {} - -if (!process.env.UNI_USING_NATIVE) { - provide['uni'] = [path.resolve(__dirname, uniPath), 'default'] -} - -if (process.env.UNI_USING_V8) { - provide['plus'] = [path.resolve(__dirname, uniPath), 'weexPlus'] + +if (!process.env.UNI_USING_V3) { + if (!process.env.UNI_USING_NATIVE) { + provide['uni'] = [path.resolve(__dirname, uniPath), 'default'] + } + + if (process.env.UNI_USING_V8) { + provide['plus'] = [path.resolve(__dirname, uniPath), 'weexPlus'] + } } if ( diff --git a/packages/vue-cli-plugin-uni/lib/configure-webpack.js b/packages/vue-cli-plugin-uni/lib/configure-webpack.js index 2873411eaadfbe3adff60cd6bd9a81ee3356cf17..a061bd775ff5513f88414235de2d07b3079a330b 100644 --- a/packages/vue-cli-plugin-uni/lib/configure-webpack.js +++ b/packages/vue-cli-plugin-uni/lib/configure-webpack.js @@ -178,7 +178,7 @@ module.exports = function configureWebpack (platformOptions, manifestPlatformOpt let platformWebpackConfig = platformOptions.webpackConfig if (typeof platformWebpackConfig === 'function') { - platformWebpackConfig = platformWebpackConfig(webpackConfig, api) + platformWebpackConfig = platformWebpackConfig(webpackConfig, vueOptions, api) } // 移除 node_modules 目录,避免受路径上的 node_modules 影响 webpackConfig.resolve.modules = webpackConfig.resolve.modules.filter(module => module !== diff --git a/packages/vue-cli-plugin-uni/lib/mp.js b/packages/vue-cli-plugin-uni/lib/mp.js index 02495711ce77f0cd5751137134e08c192acf16bc..4d37822c4780af22a5d4a8e0a6aa2bc630d9056c 100644 --- a/packages/vue-cli-plugin-uni/lib/mp.js +++ b/packages/vue-cli-plugin-uni/lib/mp.js @@ -62,7 +62,7 @@ module.exports = { vueConfig: { parallel: false }, - webpackConfig (webpackConfig, api) { + webpackConfig (webpackConfig, vueOptions, api) { if (!webpackConfig.optimization) { webpackConfig.optimization = {} }