diff --git a/packages/uni-mp-alipay/lib/uni.config.js b/packages/uni-mp-alipay/lib/uni.config.js index a96c4b53af466a455175256b625f8f4b954a25f3..6ead0cb57f398c9b05367abd2d15cd8d865dbc75 100644 --- a/packages/uni-mp-alipay/lib/uni.config.js +++ b/packages/uni-mp-alipay/lib/uni.config.js @@ -1,5 +1,7 @@ const path = require('path') -const { parseJson } = require('@dcloudio/uni-cli-shared/lib/json') +const { + parseJson +} = require('@dcloudio/uni-cli-shared/lib/json') module.exports = { options: { @@ -17,7 +19,8 @@ module.exports = { filter: '.sjs' }, filterTag: 'sjs', - subPackages: true + subPackages: true, + project: 'mini.project.json' }, copyWebpackOptions (platformOptions, vueOptions) { const copyOptions = ['mycomponents', 'customize-tab-bar', 'ext.json'] @@ -35,4 +38,4 @@ module.exports = { return copyOptions } -} +} 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 c33cb05e1b4c1cffa3a7ecdbd4ab1f73ebc6f964..56ab395b9e72905b06fc03eadef52f05ed67e828 100644 --- a/packages/webpack-uni-pages-loader/lib/platforms/mp-alipay.js +++ b/packages/webpack-uni-pages-loader/lib/platforms/mp-alipay.js @@ -1,5 +1,9 @@ +const fs = require('fs') +const path = require('path') + const { - parsePages + parsePages, + getPlatformProject } = require('@dcloudio/uni-cli-shared') const { @@ -84,13 +88,21 @@ module.exports = function (pagesJson, manifestJson) { if (app.usingComponents) { updateAppJsonUsingComponents(app.usingComponents) } + const projectName = getPlatformProject() - const project = Object.assign({ - appid: platformJson.appid - }) + let project = {} - project.component2 = hasOwn(platformJson, 'component2') ? platformJson.component2 : true - project.enableAppxNg = hasOwn(platformJson, 'enableAppxNg') ? platformJson.enableAppxNg : true + const projectPath = path.resolve(process.env.UNI_INPUT_DIR, projectName) + if (fs.existsSync(projectPath)) { + project = require(projectPath) + } else { + if (platformJson.appid) { + project.appid = platformJson.appid + } + + project.component2 = hasOwn(platformJson, 'component2') ? platformJson.component2 : true + project.enableAppxNg = hasOwn(platformJson, 'enableAppxNg') ? platformJson.enableAppxNg : true + } return [{ name: 'app',