From 66a6308ffa9864c652533171f49accb8b596884f Mon Sep 17 00:00:00 2001
From: fxy060608 <fxy060608@gmail.com>
Date: Wed, 20 Nov 2019 17:39:53 +0800
Subject: [PATCH] feat(v3): remove provide(uni,plus)

---
 .../build/webpack.nvue.conf.js                   | 16 +++++++++-------
 .../vue-cli-plugin-uni/lib/configure-webpack.js  |  2 +-
 packages/vue-cli-plugin-uni/lib/mp.js            |  2 +-
 3 files changed, 11 insertions(+), 9 deletions(-)

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 f5e070a2c..cee4155af 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 2873411ea..a061bd775 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 02495711c..4d37822c4 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 = {}
     }
-- 
GitLab