diff options
author | Idan Amit <ia096e@intl.att.com> | 2018-03-13 19:59:46 +0200 |
---|---|---|
committer | Idan Amit <ia096e@intl.att.com> | 2018-03-13 20:02:12 +0200 |
commit | fad1d735d7ac3896e28277c733920d15e105db6e (patch) | |
tree | 22dabd78b1383707776fc06ccd1c8b5814461131 /catalog-ui/webpack.server.js | |
parent | 0f3a80869bf57fc909ec5908601ba04271d92d97 (diff) |
Fixed merge issues
Fixed merge issues that broke the behavior of the plugins development
Change-Id: I6333944939628f745eb36c4619be33780881d27d
Issue-ID: SDC-1126
Signed-off-by: Idan Amit <ia096e@intl.att.com>
Diffstat (limited to 'catalog-ui/webpack.server.js')
-rw-r--r-- | catalog-ui/webpack.server.js | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/catalog-ui/webpack.server.js b/catalog-ui/webpack.server.js index 608063aa02..f55be99715 100644 --- a/catalog-ui/webpack.server.js +++ b/catalog-ui/webpack.server.js @@ -40,15 +40,23 @@ module.exports = function(env) { // Redirect all '/sdc1/feProxy/rest' to feHost middlewares.push( proxy(['/sdc1/feProxy/rest'],{ - target: 'http://' + loclahost + ':' + fePort, + target: 'http://localhost:' + fePort, changeOrigin: true, secure: false })); + // Redirect all '/sdc1/rest' to feHost + middlewares.push( + proxy(['/sdc1/rest'],{ + target: 'http://localhost:' + fePort, + changeOrigin: true, + secure: false + })); + // Redirect dcae urls to feHost middlewares.push( proxy(['/dcae','/sdc1/feProxy/dcae-api'],{ - target: 'http://' + loclahost + ':' + fePort, + target: 'http://localhost:' + fePort, changeOrigin: true, secure: false, onProxyRes: (proxyRes, req, res) => { @@ -62,7 +70,7 @@ module.exports = function(env) { // Redirect onboarding urls to feHost middlewares.push( proxy(['/onboarding','/sdc1/feProxy/onboarding-api'],{ - target: 'http://' + loclahost + ':' + fePort, + target: 'http://localhost:' + fePort, changeOrigin: true, secure: false, onProxyRes: (proxyRes, req, res) => { @@ -78,4 +86,4 @@ module.exports = function(env) { }; return ServerConfig; -}
\ No newline at end of file +} |