From 355e0efabdb49765e20045cb6b5d6b2337aea4a9 Mon Sep 17 00:00:00 2001 From: fxy060608 Date: Mon, 30 Dec 2019 17:25:40 +0800 Subject: [PATCH] feat(mp-alipay): add mini.project.json #1164 --- .../lib/plugin/generate-json.js | 2 +- .../lib/platforms/mp-alipay.js | 14 ++++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) 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 46e18fda5..ff6d04db2 100644 --- a/packages/webpack-uni-mp-loader/lib/plugin/generate-json.js +++ b/packages/webpack-uni-mp-loader/lib/plugin/generate-json.js @@ -155,7 +155,7 @@ module.exports = function generateJson (compilation) { const jsFile = name.replace('.json', '.js') if ( - !['app.js', 'manifest.js', 'project.config.js', 'project.swan.js'].includes(jsFile) && + !['app.js', 'manifest.js', 'mini.project.js', 'project.config.js', 'project.swan.js'].includes(jsFile) && !compilation.assets[jsFile] ) { const jsFileAsset = { 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 a2d4c2836..51627ad00 100644 --- a/packages/webpack-uni-pages-loader/lib/platforms/mp-alipay.js +++ b/packages/webpack-uni-pages-loader/lib/platforms/mp-alipay.js @@ -1,10 +1,10 @@ const { parsePages -} = require('@dcloudio/uni-cli-shared') +} = require('@dcloudio/uni-cli-shared') const { updateAppJsonUsingComponents -} = require('@dcloudio/uni-cli-shared/lib/cache') +} = require('@dcloudio/uni-cli-shared/lib/cache') const { hasOwn, @@ -63,13 +63,19 @@ module.exports = function (pagesJson, manifestJson) { }) copyToJson(app, pagesJson, pagesJson2AppJson) - + if (app.usingComponents) { updateAppJsonUsingComponents(app.usingComponents) - } + } + + const project = Object.assign({}, manifestJson['mp-alipay'] || {}) + delete project.usingComponents return [{ name: 'app', content: app + }, { + name: 'mini.project', + content: project }] } -- GitLab