Merge branch 'dev' of https://github.com/dcloudio/uni-app into v3

# Conflicts:
#	packages/vue-cli-plugin-uni/lib/env.js

packages/vue-cli-plugin-uni/lib/env.js

@@ -205,10 +205,6 @@ if (process.env.UNI_USING_NATIVE) {
     ' 。编译模式差异见：https://ask.dcloud.net.cn/article/36074')
 } else if (process.env.UNI_PLATFORM !== 'h5') {
   try {
-    const modeText = '当前项目编译模式：' +
-      (platformOptions.usingComponents ? '自定义组件模式' : '非自定义组件模式') +
-      '。编译模式差异见：https://ask.dcloud.net.cn/article/35843'
-
     let info = ''
     if (process.env.UNI_PLATFORM === 'app-plus') {
       const pagesPkg = require('@dcloudio/webpack-uni-pages-loader/package.json')
@@ -225,21 +221,19 @@ if (process.env.UNI_USING_NATIVE) {
         }).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)
+          console.log(info)
           if (needWarning) {
             console.log(warningMsg)
           }
         }
       }
     } else {
-      console.log(modeText)
       if (needWarning) {
         console.log(warningMsg)
       }