From db74a9a1d4ccec7d365b3016d78b6990ddfd9f54 Mon Sep 17 00:00:00 2001 From: plondon Date: Wed, 9 May 2018 14:07:24 -0400 Subject: [PATCH] fix(Webpack): remove ci check so config gets set --- .../webpack.config.js | 28 +++++++++---------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/packages/blockchain-wallet-v4-frontend/webpack.config.js b/packages/blockchain-wallet-v4-frontend/webpack.config.js index 0336cf24d9a..fe4b0473ea7 100644 --- a/packages/blockchain-wallet-v4-frontend/webpack.config.js +++ b/packages/blockchain-wallet-v4-frontend/webpack.config.js @@ -20,21 +20,19 @@ let mockWalletOptions let iSignThisDomain // load, parse and log application configuration if not a CI build -if (!isCiBuild) { - mockWalletOptions = require('./../../config/wallet-options-v4.json') - iSignThisDomain = mockWalletOptions.platforms.web.coinify.config.iSignThisDomain - try { - envConfig = require(PATHS.envConfig + process.env.NODE_ENV + '.js') - } catch (e) { - console.log(chalk.red('\u{1F6A8} WARNING \u{1F6A8} ') + chalk.yellow(`Failed to load ${process.env.NODE_ENV}.js config file! Using the production config instead.\n`)) - envConfig = require(PATHS.envConfig + 'production.js') - } finally { - console.log(chalk.blue('\u{1F6A7} CONFIGURATION \u{1F6A7}')) - console.log(chalk.cyan('Root URL') + `: ${envConfig.ROOT_URL}`) - console.log(chalk.cyan('API Domain') + `: ${envConfig.API_DOMAIN}`) - console.log(chalk.cyan('Wallet Helper Domain') + ': ' + chalk.blue(envConfig.WALLET_HELPER_DOMAIN)) - console.log(chalk.cyan('Web Socket URL') + ': ' + chalk.blue(envConfig.WEB_SOCKET_URL)) - } +mockWalletOptions = require('./../../config/wallet-options-v4.json') +iSignThisDomain = mockWalletOptions.platforms.web.coinify.config.iSignThisDomain +try { + envConfig = require(PATHS.envConfig + process.env.NODE_ENV + '.js') +} catch (e) { + console.log(chalk.red('\u{1F6A8} WARNING \u{1F6A8} ') + chalk.yellow(`Failed to load ${process.env.NODE_ENV}.js config file! Using the production config instead.\n`)) + envConfig = require(PATHS.envConfig + 'production.js') +} finally { + console.log(chalk.blue('\u{1F6A7} CONFIGURATION \u{1F6A7}')) + console.log(chalk.cyan('Root URL') + `: ${envConfig.ROOT_URL}`) + console.log(chalk.cyan('API Domain') + `: ${envConfig.API_DOMAIN}`) + console.log(chalk.cyan('Wallet Helper Domain') + ': ' + chalk.blue(envConfig.WALLET_HELPER_DOMAIN)) + console.log(chalk.cyan('Web Socket URL') + ': ' + chalk.blue(envConfig.WEB_SOCKET_URL)) } module.exports = {