From 7693553c061fa03535698e4c92f9308fdcb49f3a Mon Sep 17 00:00:00 2001
From: fxy060608 <fxy060608@gmail.com>
Date: Thu, 26 Sep 2019 19:20:22 +0800
Subject: [PATCH] fix(mp-alipay): merge usingGlobalComponents #827

---
 packages/uni-cli-shared/lib/cache.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/uni-cli-shared/lib/cache.js b/packages/uni-cli-shared/lib/cache.js
index 531e13239..69e101650 100644
--- a/packages/uni-cli-shared/lib/cache.js
+++ b/packages/uni-cli-shared/lib/cache.js
@@ -71,7 +71,11 @@ function updateComponentJson (name, jsonObj, usingComponents = true) {
   const oldJsonStr = getJsonFile(name)
   if (oldJsonStr) { // update
     if (usingComponents) { // merge usingComponents
-      jsonObj.usingComponents = JSON.parse(oldJsonStr).usingComponents || {}
+      const oldJsonObj = JSON.parse(oldJsonStr)
+      jsonObj.usingComponents = oldJsonObj.usingComponents || {}
+      if (oldJsonObj.usingGlobalComponents) { // 复制 global components(针对不支持全局 usingComponents 的平台)
+        jsonObj.usingGlobalComponents = oldJsonObj.usingGlobalComponents
+      }
     }
     const newJsonStr = JSON.stringify(jsonObj, null, 2)
     if (newJsonStr !== oldJsonStr) {
-- 
GitLab