From 4345497a6df6b3acbd4dd43329ad7c053d1f48e2 Mon Sep 17 00:00:00 2001 From: crptm Date: Thu, 25 May 2017 02:43:41 +0400 Subject: [PATCH] remove config boilerplate --- common/config/base.js | 2 -- common/config/dev.js | 9 --------- common/config/dist.js | 9 --------- common/config/test.js | 9 --------- webpack_config/webpack.base.js | 3 +-- webpack_config/webpack.dev.js | 1 - webpack_config/webpack.prod.js | 1 - 7 files changed, 1 insertion(+), 33 deletions(-) delete mode 100644 common/config/base.js delete mode 100644 common/config/dev.js delete mode 100644 common/config/dist.js delete mode 100644 common/config/test.js diff --git a/common/config/base.js b/common/config/base.js deleted file mode 100644 index 1ef3b252..00000000 --- a/common/config/base.js +++ /dev/null @@ -1,2 +0,0 @@ -// Settings configured here will be merged into the final config object. -export default {} diff --git a/common/config/dev.js b/common/config/dev.js deleted file mode 100644 index abc03cf3..00000000 --- a/common/config/dev.js +++ /dev/null @@ -1,9 +0,0 @@ -'use strict'; - -import baseConfig from './base'; - -let config = { - BASE_API: 'http://localhost:3333/api/v1' -}; - -export default Object.freeze(Object.assign({}, baseConfig, config)); diff --git a/common/config/dist.js b/common/config/dist.js deleted file mode 100644 index 789561c5..00000000 --- a/common/config/dist.js +++ /dev/null @@ -1,9 +0,0 @@ -'use strict'; - -import baseConfig from './base'; - -let config = { - BASE_API: 'http://localhost:3333/api/v1' /// your base api for XHR -}; - -export default Object.freeze(Object.assign({}, baseConfig, config)); diff --git a/common/config/test.js b/common/config/test.js deleted file mode 100644 index 805d7665..00000000 --- a/common/config/test.js +++ /dev/null @@ -1,9 +0,0 @@ -'use strict'; - -import baseConfig from './base'; - -let config = { - appEnv: 'test' // don't remove the appEnv property here -}; - -export default Object.freeze(Object.assign(baseConfig, config)); diff --git a/webpack_config/webpack.base.js b/webpack_config/webpack.base.js index 9b5f26e4..9c9d693f 100644 --- a/webpack_config/webpack.base.js +++ b/webpack_config/webpack.base.js @@ -31,8 +31,7 @@ module.exports = { components: `${config.srcPath}/components/`, containers: `${config.srcPath}/containers/`, styles: `${config.srcPath}/styles/`, - less_vars: `${config.srcPath}/styles/etherwallet-variables.less`, - config: `${config.srcPath}/config/` + process.env.REACT_WEBPACK_ENV + less_vars: `${config.srcPath}/styles/etherwallet-variables.less` }, modules: [ // places where to search for required modules diff --git a/webpack_config/webpack.dev.js b/webpack_config/webpack.dev.js index 176b5b74..4db9b88a 100644 --- a/webpack_config/webpack.dev.js +++ b/webpack_config/webpack.dev.js @@ -1,6 +1,5 @@ 'use strict' process.env.NODE_ENV = 'development' -process.env.REACT_WEBPACK_ENV = 'dev' const webpack = require('webpack') const base = require('./webpack.base') diff --git a/webpack_config/webpack.prod.js b/webpack_config/webpack.prod.js index b1a3942c..d25a4db0 100644 --- a/webpack_config/webpack.prod.js +++ b/webpack_config/webpack.prod.js @@ -1,6 +1,5 @@ 'use strict' process.env.NODE_ENV = 'production' -process.env.REACT_WEBPACK_ENV = 'dist' const exec = require('child_process').execSync const webpack = require('webpack')