From ceab747b7d05de8d7236c4841a52eb44f5b7841c Mon Sep 17 00:00:00 2001
From: qiang <guoshengqiang@live.com>
Date: Sat, 8 May 2021 16:24:13 +0800
Subject: [PATCH] fix:  patch for 29dd7b43 (fix 3f47718b)

---
 .../packages/app-vue-style-loader/lib/addStylesClient.js        | 2 +-
 .../packages/h5-vue-style-loader/lib/addStylesClient.js         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/vue-cli-plugin-uni/packages/app-vue-style-loader/lib/addStylesClient.js b/packages/vue-cli-plugin-uni/packages/app-vue-style-loader/lib/addStylesClient.js
index 5c304b26a..fe58c0cd0 100644
--- a/packages/vue-cli-plugin-uni/packages/app-vue-style-loader/lib/addStylesClient.js
+++ b/packages/vue-cli-plugin-uni/packages/app-vue-style-loader/lib/addStylesClient.js
@@ -246,7 +246,7 @@ function processCss(css) {
             .replace(VAR_WINDOW_LEFT, '0px')
             .replace(VAR_WINDOW_RIGHT, '0px')
 	}
-  return css.replace(/\{[\s\S]+?\}|@media[^{]+/g, function (css) {
+  return css.replace(/\{[\s\S]+?\}|@media.+?\{/g, function (css) {
     return css.replace(UPX_RE, function (a, b) {
       return uni.upx2px(b) + 'px'
     })
diff --git a/packages/vue-cli-plugin-uni/packages/h5-vue-style-loader/lib/addStylesClient.js b/packages/vue-cli-plugin-uni/packages/h5-vue-style-loader/lib/addStylesClient.js
index 44f65c541..c594c32b4 100644
--- a/packages/vue-cli-plugin-uni/packages/h5-vue-style-loader/lib/addStylesClient.js
+++ b/packages/vue-cli-plugin-uni/packages/h5-vue-style-loader/lib/addStylesClient.js
@@ -253,7 +253,7 @@ function processCss(css) {
 		.replace(BODY_SCOPED_RE, page)
 		.replace(BODY_RE, '')
 		.replace(PAGE_SCOPED_RE, 'body.' + page + ' uni-page-body')
-		.replace(/\{[\s\S]+?\}|@media[^{]+/g, function (css) {
+		.replace(/\{[\s\S]+?\}|@media.+?\{/g, function (css) {
       if(typeof uni === 'undefined'){
         return css
       }
-- 
GitLab