From c76624b3fd2271dc385addd85b8f89eaa9caa01a Mon Sep 17 00:00:00 2001
From: qiang <guoshengqiang@live.com>
Date: Tue, 30 Aug 2022 16:57:20 +0800
Subject: [PATCH] =?UTF-8?q?fix(mp-alipay):=20=E4=BF=AE=E5=A4=8D=E6=94=AF?=
 =?UTF-8?q?=E4=BB=98=E5=AE=9D=E5=B0=8F=E7=A8=8B=E5=BA=8F=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E5=85=A8=E5=B1=80=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E5=90=8E=E7=BC=96=E8=AF=91=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=20#3619?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../webpack-uni-mp-loader/lib/plugin/generate-component.js    | 4 ++--
 packages/webpack-uni-mp-loader/lib/plugin/generate-json.js    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/webpack-uni-mp-loader/lib/plugin/generate-component.js b/packages/webpack-uni-mp-loader/lib/plugin/generate-component.js
index f49deac62..e6b0edb76 100644
--- a/packages/webpack-uni-mp-loader/lib/plugin/generate-component.js
+++ b/packages/webpack-uni-mp-loader/lib/plugin/generate-component.js
@@ -294,8 +294,8 @@ module.exports = function generateComponent (compilation, jsonpFunction = 'webpa
   // fix mp-alipay plugin
   if (process.env.UNI_PLATFORM === 'mp-alipay' && appJsonFile) {
     const obj = JSON.parse(appJsonFile.source())
-    if (obj && obj.usingComponents && !Object.keys(obj.usingComponents).length) {
-      const componentName = 'plugin-wrapper'
+    const componentName = 'plugin-wrapper'
+    if (obj && obj.usingComponents && !(componentName in obj.usingComponents)) {
       obj.usingComponents[componentName] = `/${componentName}`
       const source = JSON.stringify(obj, null, 2)
       if (webpack.version[0] > 4) {
diff --git a/packages/webpack-uni-mp-loader/lib/plugin/generate-json.js b/packages/webpack-uni-mp-loader/lib/plugin/generate-json.js
index 2ec810b48..f15a9efb3 100644
--- a/packages/webpack-uni-mp-loader/lib/plugin/generate-json.js
+++ b/packages/webpack-uni-mp-loader/lib/plugin/generate-json.js
@@ -159,7 +159,7 @@ module.exports = function generateJson (compilation) {
       })
     }
     // fix mp-alipay plugin
-    if (process.env.UNI_PLATFORM === 'mp-alipay') {
+    if (process.env.UNI_PLATFORM === 'mp-alipay' && name !== 'app.json') {
       const usingComponents = jsonObj.usingComponents || {}
       if (Object.values(usingComponents).find(value => value.startsWith('plugin://'))) {
         const componentName = 'plugin-wrapper'
-- 
GitLab