From 3c7db84f4f2b17137eb8232482e12db287fefb9b Mon Sep 17 00:00:00 2001
From: handongxun <handongxun@dcloud.io>
Date: Tue, 26 Apr 2022 17:26:02 +0800
Subject: [PATCH] =?UTF-8?q?ad:=20=E6=9B=B4=E6=96=B0=E5=BE=AE=E4=BF=A1?=
 =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=20app.json?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/uni-template-compiler/lib/index.js                  | 4 ++--
 packages/webpack-uni-mp-loader/lib/plugin/generate-json.js   | 5 ++++-
 .../lib/plugin/mp-weixin-uniad-app.json.js}                  | 0
 3 files changed, 6 insertions(+), 3 deletions(-)
 rename packages/{webpack-uni-pages-loader/lib/platforms/mp-weixin/app.json.uniad.js => webpack-uni-mp-loader/lib/plugin/mp-weixin-uniad-app.json.js} (100%)

diff --git a/packages/uni-template-compiler/lib/index.js b/packages/uni-template-compiler/lib/index.js
index 15ae48f40..6ab8e2629 100644
--- a/packages/uni-template-compiler/lib/index.js
+++ b/packages/uni-template-compiler/lib/index.js
@@ -16,7 +16,7 @@ const traverseTemplate = require('./template/traverse')
 const generateTemplate = require('./template/generate')
 
 const compilerModule = require('./module')
-// const compilerModuleUniad = require('./module.uniad')
+const compilerModuleUniad = require('./module.uniad')
 
 const compilerAlipayModule = require('./module-alipay')
 const compilerToutiaoModule = require('./module-toutiao')
@@ -92,7 +92,7 @@ module.exports = {
     }
 
     options.modules.push(compilerModule)
-    // options.modules.push(compilerModuleUniad)
+    options.modules.push(compilerModuleUniad)
 
     if (options.mp.platform === 'mp-alipay') {
       options.modules.push(compilerAlipayModule)
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 f0d330ded..2ec810b48 100644
--- a/packages/webpack-uni-mp-loader/lib/plugin/generate-json.js
+++ b/packages/webpack-uni-mp-loader/lib/plugin/generate-json.js
@@ -225,7 +225,10 @@ module.exports = function generateJson (compilation) {
     if (name === 'app.json') { // 删除manifest.json携带的配置项
       delete jsonObj.insertAppCssToIndependent
       delete jsonObj.independent
-      delete jsonObj.copyWxComponentsOnDemand
+      delete jsonObj.copyWxComponentsOnDemand
+      if (process.env.UNI_PLATFORM === 'mp-weixin' && process.env.USE_UNI_AD) {
+        require('./mp-weixin-uniad-app.json')(jsonObj)
+      }
     } else { // 删除用于临时记录的属性
       delete jsonObj.usingGlobalComponents
     }
diff --git a/packages/webpack-uni-pages-loader/lib/platforms/mp-weixin/app.json.uniad.js b/packages/webpack-uni-mp-loader/lib/plugin/mp-weixin-uniad-app.json.js
similarity index 100%
rename from packages/webpack-uni-pages-loader/lib/platforms/mp-weixin/app.json.uniad.js
rename to packages/webpack-uni-mp-loader/lib/plugin/mp-weixin-uniad-app.json.js
-- 
GitLab