From 3e5d84c897198f4ca1910d5725fc5a058c17ec99 Mon Sep 17 00:00:00 2001
From: xf00000000 <qFM9H0VX@protonmail.com>
Date: Tue, 4 Jan 2022 14:32:06 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=AD=A3package.json=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E8=87=AA=E5=AE=9A=E4=B9=89=E7=BC=96=E8=AF=91=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=E8=A6=86=E7=9B=96=E4=B8=BAfalse?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

如果有package.json下的uni-app->scripts配置有两个平台以上且有相同的自定义编译条件变量时会导致变量覆盖为false
---
 packages/uni-cli-shared/lib/package.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/uni-cli-shared/lib/package.js b/packages/uni-cli-shared/lib/package.js
index b050a2ea3..a98886e4f 100644
--- a/packages/uni-cli-shared/lib/package.js
+++ b/packages/uni-cli-shared/lib/package.js
@@ -35,7 +35,9 @@ module.exports = {
         if (scriptName !== name) {
           const define = uniAppOptions.scripts[scriptName].define
           Object.keys(define).forEach(name => {
-            define[name] = false
+            if (typeof scriptOptions.define[name] === "undefined") {
+              define[name] = false
+            }
           })
           Object.assign(scriptOptions.define, define)
         }
@@ -50,4 +52,4 @@ module.exports = {
 
     return scriptOptions
   }
-}
+}
-- 
GitLab