Merge branch 'dev' into alpha

packages/vue-cli-plugin-uni/packages/app-vue-style-loader/lib/addStylesClient.js

@@ -242,7 +242,7 @@ function processCss(css) {
 			.replace(VAR_WINDOW_TOP, offset.top + 'px')
 			.replace(VAR_WINDOW_BOTTOM, offset.bottom + 'px')
 	}
-  return css.replace(/\{.+?\}/gs, function (css) {
+  return css.replace(/\{[\s\S]+?\}/g, function (css) {
     return css.replace(UPX_RE, function (a, b) {
       return uni.upx2px(b) + 'px'
     })

packages/vue-cli-plugin-uni/packages/h5-vue-style-loader/lib/addStylesClient.js

@@ -250,7 +250,7 @@ function processCss(css) {
 		.replace(BODY_SCOPED_RE, page)
 		.replace(BODY_RE, '')
 		.replace(PAGE_SCOPED_RE, 'body.' + page + ' uni-page-body')
-		.replace(/\{.+?\}/gs, function (css) {
+		.replace(/\{[\s\S]+?\}/g, function (css) {
 			return css.replace(UPX_RE, function (a, b) {
 				return uni.upx2px(b) + 'px'
 			})

packages/vue-cli-plugin-uni/packages/webpack-uni-app-loader/service/style.js

-module.exports = function (source, map) {
+module.exports = function (source, map) {
   /* eslint-disable no-mixed-operators */
   console.warn(
-    `App平台 v3 模式暂不支持在 js 文件中引用"${this._module && this._module.rawRequest || this.resourcePath}"`
+    `App平台 v3 模式暂不支持在 js 文件中引用"${this._module && this._module.rawRequest || this.resourcePath}" 请改在 style 内引用`
   )
   this.callback(null, '', map)
-}
+}

src/platforms/app-plus/service/framework/app.js

@@ -124,7 +124,7 @@ function initAppLaunch (appVm) {
 }
 
 function initTabBar () {
-  if (!__uniConfig.tabBar || !__uniConfig.tabBar.list.length) {
+  if (!__uniConfig.tabBar || !__uniConfig.tabBar.list || !__uniConfig.tabBar.list.length) {
     return
   }
 
@@ -230,4 +230,4 @@ export function registerApp (appVm) {
   __uniConfig.ready = true
 
   process.env.NODE_ENV !== 'production' && perf('registerApp')
-}
+}