From d8032a95149e31c5659e10af5e4529dcf1c0681a Mon Sep 17 00:00:00 2001 From: yangyiliang Date: Mon, 11 Feb 2019 17:38:25 +0800 Subject: [PATCH] =?UTF-8?q?cli=E5=85=BC=E5=AE=B9=E8=80=81=E7=89=88?= =?UTF-8?q?=E6=9C=ACapi=E9=A1=B9=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../chameleon-tool/configs/getCommonConfig.js | 34 ++++++++----------- 1 file changed, 14 insertions(+), 20 deletions(-) diff --git a/packages/chameleon-tool/configs/getCommonConfig.js b/packages/chameleon-tool/configs/getCommonConfig.js index 9b0c9fd0..ea500430 100644 --- a/packages/chameleon-tool/configs/getCommonConfig.js +++ b/packages/chameleon-tool/configs/getCommonConfig.js @@ -155,32 +155,26 @@ module.exports = function (options) { // 兼容原来的处理 apiPrefix let domainMap = cml.config.get().domainMap || {apiPrefix}; let defaultDomainKey = cml.config.get().defaultDomainKey || 'apiPrefix'; - if (options.media === 'build') { - commonConfig.plugins.push(new webpack.DefinePlugin({ - 'process.env.domainMap': JSON.stringify(domainMap) - })) - commonConfig.plugins.push(new webpack.DefinePlugin({ - 'process.env.defaultDomainKey': JSON.stringify(defaultDomainKey) - })) - commonConfig.plugins.push(new webpack.DefinePlugin({ - 'process.env.media': JSON.stringify(options.media) - })) - } else if (options.media === 'dev') { + if (options.media === 'dev') { // 默认去web端 dev模式的port let devApiPrefix = `http://${config.ip}:${webServerPort}` Object.keys(domainMap).forEach((key) => { domainMap[key] = devApiPrefix; }) - commonConfig.plugins.push(new webpack.DefinePlugin({ - 'process.env.domainMap': JSON.stringify(domainMap) - })) - commonConfig.plugins.push(new webpack.DefinePlugin({ - 'process.env.defaultDomainKey': JSON.stringify(defaultDomainKey) - })) - commonConfig.plugins.push(new webpack.DefinePlugin({ - 'process.env.media': JSON.stringify(options.media) - })) } + // 新cli 兼容旧api的cmlApiPrefix + commonConfig.plugins.push(new webpack.DefinePlugin({ + 'process.env.cmlApiPrefix': JSON.stringify(domainMap[defaultDomainKey]) + })) + commonConfig.plugins.push(new webpack.DefinePlugin({ + 'process.env.domainMap': JSON.stringify(domainMap) + })) + commonConfig.plugins.push(new webpack.DefinePlugin({ + 'process.env.defaultDomainKey': JSON.stringify(defaultDomainKey) + })) + commonConfig.plugins.push(new webpack.DefinePlugin({ + 'process.env.media': JSON.stringify(options.media) + })) if (options.minimize) { commonConfig.plugins = commonConfig.plugins.concat([ -- GitLab