Merge branch 'dev' into alpha

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

@@ -242,7 +242,9 @@ function processCss(css) {
 			.replace(VAR_WINDOW_TOP, offset.top + 'px')
 			.replace(VAR_WINDOW_BOTTOM, offset.bottom + 'px')
 	}
-  return css.replace(/\{.+?\}/gs, css => css.replace(UPX_RE, function (a, b) {
-    return uni.upx2px(b) + 'px'
-  }))
+  return css.replace(/\{.+?\}/gs, 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,9 +250,11 @@ function processCss(css) {
 		.replace(BODY_SCOPED_RE, page)
 		.replace(BODY_RE, '')
 		.replace(PAGE_SCOPED_RE, 'body.' + page + ' uni-page-body')
-		.replace(/\{.+?\}/gs, css => css.replace(UPX_RE, function (a, b) {
-			return uni.upx2px(b) + 'px'
-		}))
+		.replace(/\{.+?\}/gs, function (css) {
+			return css.replace(UPX_RE, function (a, b) {
+				return uni.upx2px(b) + 'px'
+			})
+		})
 }
 
 function getPage() {