From 3734881a7ab8d93f48ff4a38945eed5ab871bba1 Mon Sep 17 00:00:00 2001
From: fxy060608 <fxy060608@gmail.com>
Date: Tue, 7 Jun 2022 13:16:20 +0800
Subject: [PATCH] feat(mp-alipay): merge manifest.json into app.json (#3578)

---
 .../lib/platforms/mp-alipay.js                | 24 ++++++++++++-------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/packages/webpack-uni-pages-loader/lib/platforms/mp-alipay.js b/packages/webpack-uni-pages-loader/lib/platforms/mp-alipay.js
index ab3f68c3a..24dc3e42b 100644
--- a/packages/webpack-uni-pages-loader/lib/platforms/mp-alipay.js
+++ b/packages/webpack-uni-pages-loader/lib/platforms/mp-alipay.js
@@ -70,13 +70,15 @@ module.exports = function (pagesJson, manifestJson) {
   copyToJson(app, pagesJson, pagesJson2AppJson)
 
   const platformJson = manifestJson['mp-alipay'] || {}
-  if (hasOwn(platformJson, 'plugins')) {
-    app.plugins = platformJson.plugins
-  }
 
-  if (platformJson.useDynamicPlugins) {
-    app.useDynamicPlugins = true
-  }
+  Object.keys(platformJson).forEach(key => {
+    if (
+      ['usingComponents', 'optimization', 'uniStatistics', 'appid'].indexOf(key) === -1
+    ) {
+      // usingComponents 是编译模式开关，需要过滤，不能拷贝到 app
+      app[key] = platformJson[key]
+    }
+  })
 
   if (app.usingComponents) {
     updateAppJsonUsingComponents(app.usingComponents)
@@ -86,8 +88,12 @@ module.exports = function (pagesJson, manifestJson) {
   delete project.usingComponents
   delete project.plugins
   delete project.useDynamicPlugins
-  !('component2' in project) && (project.component2 = true)
-  !('enableAppxNg' in project) && (project.enableAppxNg = true)
+  if (!hasOwn(project, 'component2')) {
+    project.component2 = true
+  }
+  if (!hasOwn(project, 'enableAppxNg')) {
+    project.enableAppxNg = true
+  }
 
   return [{
     name: 'app',
@@ -96,4 +102,4 @@ module.exports = function (pagesJson, manifestJson) {
     name: 'mini.project',
     content: project
   }]
-}
+}
-- 
GitLab