Merge branch 'alpha'

lerna.json

@@ -12,5 +12,5 @@
       "message": "chore(release): publish %s"
     }
   },
-  "version": "2.0.0-alpha-31120210204001"
+  "version": "2.0.0-31220210205002"
 }

packages/uni-app-plus-nvue/package.json

 {
   "name": "@dcloudio/uni-app-plus-nvue",
-  "version": "2.0.0-alpha-31120210204001",
+  "version": "2.0.0-31220210205002",
   "description": "uni-app app-plus-nvue",
   "main": "dist/index.js",
   "repository": {

packages/uni-app-plus/package.json

 {
   "name": "@dcloudio/uni-app-plus",
-  "version": "2.0.0-alpha-31120210204001",
+  "version": "2.0.0-31220210205002",
   "description": "uni-app app-plus",
   "main": "dist/index.js",
   "repository": {

packages/uni-automator/package.json

 {
   "name": "@dcloudio/uni-automator",
-  "version": "2.0.0-alpha-31120210204001",
+  "version": "2.0.0-31220210205002",
   "description": "uni-app automator",
   "main": "dist/index.js",
   "repository": {

packages/uni-cli-shared/package.json

 {
   "name": "@dcloudio/uni-cli-shared",
-  "version": "2.0.0-alpha-31120210204001",
+  "version": "2.0.0-31220210205002",
   "description": "uni-cli-shared",
   "main": "lib/index.js",
   "repository": {

packages/uni-h5-ui/package.json

 {
   "name": "@dcloudio/uni-h5-ui",
-  "version": "2.0.0-alpha-31120210204001",
+  "version": "2.0.0-31220210205002",
   "description": "uni-app h5 ui",
   "main": "dist/index.umd.min.js",
   "repository": {

packages/uni-h5/package.json

 {
   "name": "@dcloudio/uni-h5",
-  "version": "2.0.0-alpha-31120210204001",
+  "version": "2.0.0-31220210205002",
   "description": "uni-app h5",
   "main": "dist/index.umd.min.js",
   "repository": {

packages/uni-migration/package.json

 {
   "name": "@dcloudio/uni-migration",
-  "version": "2.0.0-alpha-31120210204001",
+  "version": "2.0.0-31220210205002",
   "description": "uni-app migration",
   "main": "lib/index.js",
   "repository": {

packages/uni-mp-alipay/package.json

 {
   "name": "@dcloudio/uni-mp-alipay",
-  "version": "2.0.0-alpha-31120210204001",
+  "version": "2.0.0-31220210205002",
   "description": "uni-app mp-alipay",
   "main": "dist/index.js",
   "repository": {

packages/uni-mp-baidu/package.json

 {
   "name": "@dcloudio/uni-mp-baidu",
-  "version": "2.0.0-alpha-31120210204001",
+  "version": "2.0.0-31220210205002",
   "description": "uni-app mp-baidu",
   "main": "dist/index.js",
   "repository": {

packages/uni-mp-kuaishou/package.json

 {
   "name": "@dcloudio/uni-mp-kuaishou",
-  "version": "2.0.0-alpha-31120210204001",
+  "version": "2.0.0-31220210205002",
   "description": "uni-app mp-kuaishou",
   "main": "dist/index.js",
   "repository": {

packages/uni-mp-qq/package.json

 {
   "name": "@dcloudio/uni-mp-qq",
-  "version": "2.0.0-alpha-31120210204001",
+  "version": "2.0.0-31220210205002",
   "description": "uni-app mp-qq",
   "main": "dist/index.js",
   "repository": {

packages/uni-mp-toutiao/package.json

 {
   "name": "@dcloudio/uni-mp-toutiao",
-  "version": "2.0.0-alpha-31120210204001",
+  "version": "2.0.0-31220210205002",
   "description": "uni-app mp-toutiao",
   "main": "dist/index.js",
   "repository": {

packages/uni-mp-vue/package.json

 {
   "name": "@dcloudio/uni-mp-vue",
-  "version": "2.0.0-alpha-31120210204001",
+  "version": "2.0.0-31220210205002",
   "description": "@dcloudio/uni-mp-vue",
   "main": "dist/vue.runtime.esm.js",
   "module": "dist/vue.runtime.esm.js",

packages/uni-mp-weixin/package.json

 {
   "name": "@dcloudio/uni-mp-weixin",
-  "version": "2.0.0-alpha-31120210204001",
+  "version": "2.0.0-31220210205002",
   "description": "uni-app mp-weixin",
   "main": "dist/index.js",
   "repository": {

packages/uni-quickapp-native/package.json

 {
   "name": "@dcloudio/uni-quickapp-native",
-  "version": "2.0.0-alpha-31120210204001",
+  "version": "2.0.0-31220210205002",
   "description": "uni-app quickapp-native",
   "main": "dist/vue.prod.js",
   "repository": {

packages/uni-quickapp-webview/package.json

 {
   "name": "@dcloudio/uni-quickapp-webview",
-  "version": "2.0.0-alpha-31120210204001",
+  "version": "2.0.0-31220210205002",
   "description": "uni-app quickapp-webview",
   "main": "dist/index.js",
   "repository": {

packages/uni-stat/package.json

 {
   "name": "@dcloudio/uni-stat",
-  "version": "2.0.0-alpha-31120210204001",
+  "version": "2.0.0-31220210205002",
   "description": "",
   "main": "dist/index.js",
   "repository": {

packages/uni-template-compiler/package.json

 {
   "name": "@dcloudio/uni-template-compiler",
-  "version": "2.0.0-alpha-31120210204001",
+  "version": "2.0.0-31220210205002",
   "description": "uni-template-compiler",
   "main": "lib/index.js",
   "repository": {

packages/vue-cli-plugin-hbuilderx/package.json

 {
   "name": "@dcloudio/vue-cli-plugin-hbuilderx",
-  "version": "2.0.0-alpha-31120210204001",
+  "version": "2.0.0-31220210205002",
   "description": "HBuilderX plugin for vue-cli 3",
   "main": "index.js",
   "repository": {

packages/vue-cli-plugin-uni-optimize/package.json

 {
   "name": "@dcloudio/vue-cli-plugin-uni-optimize",
-  "version": "2.0.0-alpha-31120210204001",
+  "version": "2.0.0-31220210205002",
   "description": "uni-app optimize plugin for vue-cli 3",
   "main": "index.js",
   "repository": {

packages/vue-cli-plugin-uni/package.json

 {
   "name": "@dcloudio/vue-cli-plugin-uni",
-  "version": "2.0.0-alpha-31120210204001",
+  "version": "2.0.0-31220210205002",
   "description": "uni-app plugin for vue-cli 3",
   "main": "index.js",
   "repository": {
@@ -17,7 +17,7 @@
   "author": "fxy060608",
   "license": "Apache-2.0",
   "dependencies": {
-    "@dcloudio/uni-stat": "^2.0.0-alpha-31120210204001",
+    "@dcloudio/uni-stat": "^2.0.0-31220210205002",
     "buffer-json": "^2.0.0",
     "copy-webpack-plugin": "^5.1.1",
     "cross-env": "^5.2.0",

packages/webpack-uni-mp-loader/package.json

 {
   "name": "@dcloudio/webpack-uni-mp-loader",
-  "version": "2.0.0-alpha-31120210204001",
+  "version": "2.0.0-31220210205002",
   "description": "webpack-uni-mp-loader",
   "main": "index.js",
   "repository": {

packages/webpack-uni-pages-loader/lib/platforms/mp.js

@@ -19,7 +19,7 @@ const {
 
 const {
   hasOwn,
-  parseStyle,
+  parseStyle,
   trimMPJson
 } = require('../util')
 
@@ -113,7 +113,8 @@ const platformJson2ProjectJson = {
   projectname: defaultCopy,
   packOptions: defaultCopy,
   debugOptions: defaultCopy,
-  scripts: defaultCopy
+  scripts: defaultCopy,
+  cloudbaseRoot: defaultCopy
 }
 
 function copyToJson (json, fromJson, options) {
@@ -320,4 +321,4 @@ module.exports = function (pagesJson, manifestJson, project = {}) {
       }
     }
   }
-}
+}

packages/webpack-uni-pages-loader/package.json

 {
   "name": "@dcloudio/webpack-uni-pages-loader",
-  "version": "2.0.0-alpha-31120210204001",
+  "version": "2.0.0-31220210205002",
   "description": "uni-app pages.json loader",
   "main": "lib/index.js",
   "repository": {
@@ -21,7 +21,7 @@
     "strip-json-comments": "^2.0.1"
   },
   "uni-app": {
-    "compilerVersion": "3.1.1"
+    "compilerVersion": "3.1.2"
   },
   "gitHead": "b366367ac0b63f41ef205dc93eee55d8e9f8f3ed"
 }

src/core/service/plugins/app/create-app.js

@@ -18,14 +18,15 @@ export function getCurrentPages (isAll = false, ignoreError = false) {
   let childrenVm = app.$children[0]
   if (childrenVm && childrenVm.$children.length) {
     const tabBarVm = childrenVm.$children.find(vm => vm.$options.name === 'TabBar')
-    const layoutVm = childrenVm.$children.find(vm => vm.$options.name === 'Layout')
-    if (layoutVm) {
-      childrenVm = layoutVm
+    const layoutVm = childrenVm.$children.find(vm => vm.$options.name === 'Layout')
+    if (layoutVm) {
+      childrenVm = layoutVm
     }
     childrenVm.$children.forEach(vm => {
       if (tabBarVm !== vm && vm.$children.length && vm.$children[0].$options.name === 'Page' && vm.$children[0].$slots.page) {
         // vm.$children[0]=Page->PageBody->RealPage
-        const pageVm = vm.$children[0].$children.find(vm => vm.$options.name === 'PageBody').$children.find(vm => !!vm.$page)
+        const pageBody = vm.$children[0].$children.find(vm => vm.$options.name === 'PageBody')
+        const pageVm = pageBody && pageBody.$children.find(vm => !!vm.$page)
         if (pageVm) {
           let isActive = true
           if (!isAll && tabBarVm && pageVm.$page && pageVm.$page.meta.isTabBar) { // 选项卡仅列出活动的