diff --git a/packages/uni-template-compiler/lib/index.js b/packages/uni-template-compiler/lib/index.js index 15ae48f4047830de465cdbdefb002cc4a9fb6a10..6ab8e2629aed2d6af3210366fa6e043dfdf31890 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 f0d330ded6c12d76aa1ec0512597ebce477eb0e9..2ec810b484e3f6dda471fc30778d545aa05f7df9 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