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

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

@@ -29,7 +29,7 @@ process.UNI_LIBRARIES = process.UNI_LIBRARIES || ['@dcloudio/uni-ui']
 const {
   isSupportSubPackages,
   runByHBuilderX,
-  isInHBuilderXAlpha,
+  // isInHBuilderXAlpha,
   getPagesJson,
   getManifestJson
 } = require('@dcloudio/uni-cli-shared')
@@ -65,12 +65,12 @@ process.UNI_STAT_CONFIG = {
   appid: manifestJsonObj.appid
 }
 
-// fixed by hxy alpha 版默认启用新的框架
-if (isInHBuilderXAlpha) {
-  if (!platformOptions.hasOwnProperty('usingComponents')) {
-    platformOptions.usingComponents = true
-  }
+// 默认启用 自定义组件模式
+// if (isInHBuilderXAlpha) {
+if (!platformOptions.hasOwnProperty('usingComponents')) {
+  platformOptions.usingComponents = true
 }
+// }
 
 if (process.env.UNI_PLATFORM === 'h5') {
   const optimization = platformOptions.optimization
@@ -169,7 +169,7 @@ if (process.env.UNI_USING_COMPONENTS) { // 是否启用分包优化
     }
   }
 }
-
+
 const warningMsg = `uni-app将于2019年11月1日起停止支持非自定义组件模式 [详情](https://ask.dcloud.net.cn/article/36385)`
 // 输出编译器版本等信息
 if (process.env.UNI_PLATFORM !== 'h5') {
@@ -197,14 +197,14 @@ if (process.env.UNI_PLATFORM !== 'h5') {
           ' 。编译模式差异见：https://ask.dcloud.net.cn/article/36074')
       } else {
         console.log(info + '，' + modeText)
-        if (!platformOptions.usingComponents) {
-          console.log(warningMsg)
+        if (!platformOptions.usingComponents) {
+          console.log(warningMsg)
         }
       }
     } else {
-      console.log(modeText)
-      if (!platformOptions.usingComponents) {
-        console.log(warningMsg)
+      console.log(modeText)
+      if (!platformOptions.usingComponents) {
+        console.log(warningMsg)
       }
     }
   } catch (e) {}