From f7a637f0edfbb3c9c79d7ebb8370572e5a45dabc Mon Sep 17 00:00:00 2001
From: fxy060608 <fxy060608@gmail.com>
Date: Tue, 14 Dec 2021 20:18:17 +0800
Subject: [PATCH] fix(mp): merge usingComponents into app.json (#3071)

---
 packages/uni-cli-shared/src/json/mp/jsonFile.ts |  2 +-
 packages/uni-cli-shared/src/json/mp/pages.ts    | 12 ++++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/packages/uni-cli-shared/src/json/mp/jsonFile.ts b/packages/uni-cli-shared/src/json/mp/jsonFile.ts
index 26279cb85e..f2dc2e5e9a 100644
--- a/packages/uni-cli-shared/src/json/mp/jsonFile.ts
+++ b/packages/uni-cli-shared/src/json/mp/jsonFile.ts
@@ -37,7 +37,7 @@ export function normalizeJsonFilename(filename: string) {
 export function findChangedJsonFiles() {
   const changedJsonFiles = new Map<string, string>()
   function findChangedFile(filename: string, json: Record<string, any>) {
-    const newJson = extend({}, json)
+    const newJson = JSON.parse(JSON.stringify(json))
     if (!newJson.usingComponents) {
       newJson.usingComponents = {}
     }
diff --git a/packages/uni-cli-shared/src/json/mp/pages.ts b/packages/uni-cli-shared/src/json/mp/pages.ts
index 23dac94cef..a91f2a9d57 100644
--- a/packages/uni-cli-shared/src/json/mp/pages.ts
+++ b/packages/uni-cli-shared/src/json/mp/pages.ts
@@ -119,11 +119,19 @@ function parsePagesJson(
 
   // window
   if (pagesJson.globalStyle) {
-    appJson.window = parseWindowOptions(
+    const windowOptions = parseWindowOptions(
       pagesJson.globalStyle,
       platform,
       windowOptionsMap
     )
+    const { usingComponents } = windowOptions as PageWindowOptions
+    if (usingComponents) {
+      delete (windowOptions as PageWindowOptions).usingComponents
+      appJson.usingComponents = usingComponents
+    } else {
+      delete appJson.usingComponents
+    }
+    appJson.window = windowOptions
   }
 
   // tabBar
@@ -138,7 +146,7 @@ function parsePagesJson(
       appJson.tabBar = tabBar
     }
   }
-  ;['preloadRule', 'workers', 'usingComponents'].forEach((name) => {
+  ;['preloadRule', 'workers'].forEach((name) => {
     if (hasOwn(pagesJson, name)) {
       appJson[name] = pagesJson[name]
     }
-- 
GitLab