From 40342b208c6ac4677ab9239f3c867cee5d07f724 Mon Sep 17 00:00:00 2001
From: fxy060608 <fxy060608@gmail.com>
Date: Tue, 7 Apr 2020 19:12:44 +0800
Subject: [PATCH] refactor: quickapp=>quickapp-vue

---
 packages/uni-quickapp-vue/lib/uni.config.js            | 10 +---------
 packages/uni-quickapp-vue/lib/vue.config.js            |  9 +++++++++
 packages/uni-quickapp-vue/package.json                 |  2 +-
 packages/uni-template-compiler/lib/index.js            |  6 +++---
 packages/vue-cli-plugin-uni/index.js                   |  4 ++--
 packages/vue-cli-plugin-uni/lib/env.js                 |  2 +-
 packages/vue-cli-plugin-uni/packages/postcss/index.js  |  2 +-
 .../lib/platforms/{quickapp.js => quickapp-vue.js}     |  0
 8 files changed, 18 insertions(+), 17 deletions(-)
 create mode 100644 packages/uni-quickapp-vue/lib/vue.config.js
 rename packages/webpack-uni-pages-loader/lib/platforms/{quickapp.js => quickapp-vue.js} (100%)

diff --git a/packages/uni-quickapp-vue/lib/uni.config.js b/packages/uni-quickapp-vue/lib/uni.config.js
index d4bab4ef8..4ba52ba2c 100644
--- a/packages/uni-quickapp-vue/lib/uni.config.js
+++ b/packages/uni-quickapp-vue/lib/uni.config.js
@@ -1,9 +1 @@
-global.framework = {}
-
-const chainWebpack = require('./chain-webpack')
-const configureWebpack = require('./configure-webpack')
-
-module.exports = {
-  chainWebpack,
-  configureWebpack
-}
+module.exports = {}
diff --git a/packages/uni-quickapp-vue/lib/vue.config.js b/packages/uni-quickapp-vue/lib/vue.config.js
new file mode 100644
index 000000000..d4bab4ef8
--- /dev/null
+++ b/packages/uni-quickapp-vue/lib/vue.config.js
@@ -0,0 +1,9 @@
+global.framework = {}
+
+const chainWebpack = require('./chain-webpack')
+const configureWebpack = require('./configure-webpack')
+
+module.exports = {
+  chainWebpack,
+  configureWebpack
+}
diff --git a/packages/uni-quickapp-vue/package.json b/packages/uni-quickapp-vue/package.json
index 97bc6f63c..e65f614fb 100644
--- a/packages/uni-quickapp-vue/package.json
+++ b/packages/uni-quickapp-vue/package.json
@@ -21,7 +21,7 @@
   "license": "Apache-2.0",
   "gitHead": "110501ffb0313e417858dec92acf07522d4ded00",
   "uni-app": {
-    "name": "quickapp",
+    "name": "quickapp-vue",
     "title": "快应用(Vue)版"
   },
   "dependencies": {
diff --git a/packages/uni-template-compiler/lib/index.js b/packages/uni-template-compiler/lib/index.js
index 8cf7037ff..f6205148a 100644
--- a/packages/uni-template-compiler/lib/index.js
+++ b/packages/uni-template-compiler/lib/index.js
@@ -80,12 +80,12 @@ module.exports = {
         console.error(source)
         throw e
       }
-    } else if (options.quickapp) {
+    } else if (options['quickapp-vue']) {
       // 后续改版，应统一由具体包实现
-      (options.modules || (options.modules = [])).push(require('@dcloudio/uni-quickapp/lib/compiler-module'))
+      (options.modules || (options.modules = [])).push(require('@dcloudio/uni-quickapp-vue/lib/compiler-module'))
     }
 
-    if (!options.mp) { // h5,quickapp
+    if (!options.mp) { // h5,quickapp-vue
       return compileTemplate(source, options, compile)
     }
 
diff --git a/packages/vue-cli-plugin-uni/index.js b/packages/vue-cli-plugin-uni/index.js
index f05111a48..20bd60e1c 100644
--- a/packages/vue-cli-plugin-uni/index.js
+++ b/packages/vue-cli-plugin-uni/index.js
@@ -19,7 +19,7 @@ module.exports = (api, options) => {
 
   initBuildCommand(api, options)
 
-  if (process.env.UNI_PLATFORM === 'quickapp') {
+  if (process.env.UNI_PLATFORM === 'quickapp-vue') {
     process.env.UNI_OUTPUT_DIR = path.resolve(process.env.UNI_OUTPUT_DIR, 'build')
     Object.assign(options, {
       assetsDir,
@@ -35,7 +35,7 @@ module.exports = (api, options) => {
     api.configureWebpack(require('./lib/configure-webpack')(platformOptions, manifestPlatformOptions, options, api))
     api.chainWebpack(require('./lib/chain-webpack')(platformOptions, options, api))
 
-    const vueConfig = require('@dcloudio/uni-quickapp/lib/vue.config.js')
+    const vueConfig = require('@dcloudio/uni-quickapp-vue/lib/vue.config.js')
     api.configureWebpack(vueConfig.configureWebpack)
     api.chainWebpack(vueConfig.chainWebpack)
     return
diff --git a/packages/vue-cli-plugin-uni/lib/env.js b/packages/vue-cli-plugin-uni/lib/env.js
index 9b58185bb..3c3564360 100644
--- a/packages/vue-cli-plugin-uni/lib/env.js
+++ b/packages/vue-cli-plugin-uni/lib/env.js
@@ -287,7 +287,7 @@ if (process.env.UNI_USING_NATIVE || process.env.UNI_USING_V3_NATIVE) {
   console.log('当前nvue编译模式' + (process.env.UNI_USING_V3_NATIVE ? '（v3）' : '') + '：' + (isNVueCompiler ? 'uni-app'
     : 'weex') +
     ' 。编译模式差异见：https://ask.dcloud.net.cn/article/36074')
-} else if (process.env.UNI_PLATFORM !== 'h5' && process.env.UNI_PLATFORM !== 'quickapp') {
+} else if (process.env.UNI_PLATFORM !== 'h5' && process.env.UNI_PLATFORM !== 'quickapp-vue') {
   try {
     let info = ''
     if (process.env.UNI_PLATFORM === 'app-plus') {
diff --git a/packages/vue-cli-plugin-uni/packages/postcss/index.js b/packages/vue-cli-plugin-uni/packages/postcss/index.js
index c36ff7fd4..0eaae1063 100644
--- a/packages/vue-cli-plugin-uni/packages/postcss/index.js
+++ b/packages/vue-cli-plugin-uni/packages/postcss/index.js
@@ -241,7 +241,7 @@ if (process.env.UNI_USING_V3) {
             // Transform each property declaration here
             decl.value = tranformValue(decl, opts)
           })
-          if (process.env.UNI_PLATFORM !== 'quickapp') {
+          if (process.env.UNI_PLATFORM !== 'quickapp-vue') {
             rule.selectors = rule.selectors.map(complexSelector => {
               return transformSelector(complexSelector, simpleSelectors => {
                 return simpleSelectors.walkTags(tag => {
diff --git a/packages/webpack-uni-pages-loader/lib/platforms/quickapp.js b/packages/webpack-uni-pages-loader/lib/platforms/quickapp-vue.js
similarity index 100%
rename from packages/webpack-uni-pages-loader/lib/platforms/quickapp.js
rename to packages/webpack-uni-pages-loader/lib/platforms/quickapp-vue.js
-- 
GitLab