From c1dd4b4da88b67b1da295a699ad77bc668256076 Mon Sep 17 00:00:00 2001 From: yylgit <394720943@qq.com> Date: Wed, 27 Mar 2019 11:08:21 +0800 Subject: [PATCH] fix domain config --- packages/chameleon-tool/configs/getCommonConfig.js | 8 +++++++- packages/chameleon-tool/lib/config.js | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/packages/chameleon-tool/configs/getCommonConfig.js b/packages/chameleon-tool/configs/getCommonConfig.js index 9c5eed53..ffc3c98d 100644 --- a/packages/chameleon-tool/configs/getCommonConfig.js +++ b/packages/chameleon-tool/configs/getCommonConfig.js @@ -161,7 +161,13 @@ module.exports = function (options) { // 兼容旧版api let apiPrefix = options.apiPrefix || devApiPrefix; // 新版api 优先读取domainMap - let domain = options.domain || {}; + // 浅拷贝不影响config中的domain + let domain = {}; + if (options.domain) { + domain = { + ...options.domain + } + } if (options.media === 'dev') { diff --git a/packages/chameleon-tool/lib/config.js b/packages/chameleon-tool/lib/config.js index 00c4678a..c64b9c0e 100644 --- a/packages/chameleon-tool/lib/config.js +++ b/packages/chameleon-tool/lib/config.js @@ -161,7 +161,7 @@ _.get = function() { if (baseConfig) { platforms.forEach(platform => { if (chameleonConfig[platform]) { - utils.merge(chameleonConfig[platform], baseConfig); + utils.merge(chameleonConfig[platform], JSON.parse(JSON.stringify(baseConfig))); } }) delete chameleonConfig.base; -- GitLab