From 8cf0c29dabfe4612127ac9747ad89b44037d9161 Mon Sep 17 00:00:00 2001
From: fxy060608 <fxy060608@gmail.com>
Date: Fri, 22 Nov 2019 12:10:11 +0800
Subject: [PATCH] chore(cli): v3 tips

---
 packages/vue-cli-plugin-uni/lib/env.js | 49 ++++++++++++++------------
 1 file changed, 26 insertions(+), 23 deletions(-)

diff --git a/packages/vue-cli-plugin-uni/lib/env.js b/packages/vue-cli-plugin-uni/lib/env.js
index 30670dff8..e47f283c0 100644
--- a/packages/vue-cli-plugin-uni/lib/env.js
+++ b/packages/vue-cli-plugin-uni/lib/env.js
@@ -125,7 +125,7 @@ if (process.env.UNI_PLATFORM === 'app-plus') {
       platformOptions.compilerVersion === '3' ||
       platformOptions.compilerVersion === 3
     )
-  ) {
+  ) {
     delete process.env.UNI_USING_CACHE
     process.env.UNI_USING_V3 = true
     platformOptions.usingComponents = true
@@ -213,24 +213,27 @@ if (process.env.UNI_USING_NATIVE) {
     if (process.env.UNI_PLATFORM === 'app-plus') {
       const pagesPkg = require('@dcloudio/webpack-uni-pages-loader/package.json')
       if (pagesPkg) {
-        info = '编译器版本：' + pagesPkg['uni-app']['compilerVersion'] + (process.env.UNI_USING_V3 ? '（v3）' : '')
+        const v3Tips = `（v3）详见：https://ask.dcloud.net.cn/article/36599。`
+        info = '编译器版本：' + pagesPkg['uni-app']['compilerVersion'] + (process.env.UNI_USING_V3 ? v3Tips : '')
       }
-      const glob = require('glob')
-      hasNVue = !!glob.sync('pages/**/*.nvue', {
-        cwd: process.env.UNI_INPUT_DIR
-      }).length
-      if (hasNVue) {
-        console.log(info)
-        console.log(modeText)
-        if (needWarning) {
-          console.log(warningMsg)
-        }
-        console.log('当前nvue编译模式：' + (isNVueCompiler ? 'uni-app' : 'weex') +
-          ' 。编译模式差异见：https://ask.dcloud.net.cn/article/36074')
-      } else {
-        console.log(info + '，' + modeText)
-        if (needWarning) {
-          console.log(warningMsg)
+      if (!process.env.UNI_USING_V3) {
+        const glob = require('glob')
+        hasNVue = !!glob.sync('pages/**/*.nvue', {
+          cwd: process.env.UNI_INPUT_DIR
+        }).length
+        if (hasNVue) {
+          console.log(info)
+          console.log(modeText)
+          if (needWarning) {
+            console.log(warningMsg)
+          }
+          console.log('当前nvue编译模式：' + (isNVueCompiler ? 'uni-app' : 'weex') +
+            ' 。编译模式差异见：https://ask.dcloud.net.cn/article/36074')
+        } else {
+          console.log(info + '，' + modeText)
+          if (needWarning) {
+            console.log(warningMsg)
+          }
         }
       }
     } else {
@@ -257,22 +260,22 @@ const moduleAlias = require('module-alias')
 moduleAlias.addAlias('vue-template-compiler', '@dcloudio/vue-cli-plugin-uni/packages/vue-template-compiler')
 moduleAlias.addAlias('@megalo/template-compiler', '@dcloudio/vue-cli-plugin-uni/packages/@megalo/template-compiler')
 moduleAlias.addAlias('mpvue-template-compiler', '@dcloudio/vue-cli-plugin-uni/packages/mpvue-template-compiler')
-
+
 // vue cache
 if ( // 非 h5 ,非 v3,非 native
   process.env.UNI_PLATFORM !== 'h5' &&
   !process.env.UNI_USING_V3 &&
   !process.env.UNI_USING_NATIVE
-) {
+) {
   moduleAlias.addAlias('./loaders/pitcher', (fromPath, request, alias) => {
     if (fromPath.indexOf('vue-loader') !== -1) {
       return require.resolve('@dcloudio/vue-cli-plugin-hbuilderx/packages/vue-loader/lib/loaders/pitcher')
     }
     return request
   })
-}
+}
 
-if (process.env.UNI_PLATFORM === 'mp-toutiao') {
+if (process.env.UNI_PLATFORM === 'mp-toutiao') {
   // !important 始终带有一个空格
   moduleAlias.addAlias(
     'postcss-normalize-whitespace',
@@ -298,7 +301,7 @@ if (runByHBuilderX) {
 
 if (
   process.env.UNI_USING_CACHE &&
-  process.env.UNI_PLATFORM !== 'h5' &&
+  process.env.UNI_PLATFORM !== 'h5' &&
   !process.env.UNI_USING_V3 &&
   !process.env.UNI_USING_NATIVE
 ) { // 使用 cache, 拷贝 cache 的 json
-- 
GitLab