From 848248b77e1e3aada8799a1cf5ba2963c7b29c5c Mon Sep 17 00:00:00 2001
From: qiang <guoshengqiang@live.com>
Date: Fri, 14 Oct 2022 14:58:46 +0800
Subject: [PATCH] fix(mp-baidu): usingSwanComponents merge to wxComponents
 (question/155281)

---
 packages/webpack-uni-pages-loader/lib/index-new.js    | 6 ++++--
 packages/webpack-uni-pages-loader/lib/platforms/mp.js | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/packages/webpack-uni-pages-loader/lib/index-new.js b/packages/webpack-uni-pages-loader/lib/index-new.js
index d59f81e04..752f4b206 100644
--- a/packages/webpack-uni-pages-loader/lib/index-new.js
+++ b/packages/webpack-uni-pages-loader/lib/index-new.js
@@ -39,9 +39,11 @@ const {
 
 // 将开发者手动设置的 usingComponents 调整名称，方便与自动解析到的 usingComponents 做最后合并
 function renameUsingComponents (jsonObj) {
-  if (jsonObj.usingComponents) {
-    jsonObj.customUsingComponents = jsonObj.usingComponents
+  if (jsonObj.usingComponents || jsonObj.usingSwanComponents) {
+    // 暂定 usingComponents 优先级高于 usingSwanComponents
+    jsonObj.customUsingComponents = Object.assign({}, jsonObj.usingSwanComponents, jsonObj.usingComponents)
     delete jsonObj.usingComponents
+    delete jsonObj.usingSwanComponents
   }
   return jsonObj
 }
diff --git a/packages/webpack-uni-pages-loader/lib/platforms/mp.js b/packages/webpack-uni-pages-loader/lib/platforms/mp.js
index 6a2250d11..f948fe017 100644
--- a/packages/webpack-uni-pages-loader/lib/platforms/mp.js
+++ b/packages/webpack-uni-pages-loader/lib/platforms/mp.js
@@ -49,9 +49,11 @@ function deepCopy (name, value, json) {
 const pagesJson2AppJson = {
   globalStyle: function (name, value, json) {
     json.window = parseStyle(value)
-    if (json.window.usingComponents) {
-      json.usingComponents = json.window.usingComponents
+    if (json.window.usingComponents || json.window.usingSwanComponents) {
+      // 暂定 usingComponents 优先级高于 usingSwanComponents
+      json.usingComponents = Object.assign({}, json.window.usingSwanComponents, json.window.usingComponents)
       delete json.window.usingComponents
+      delete json.window.usingSwanComponents
     } else {
       json.usingComponents = {}
     }
-- 
GitLab