diff --git a/webpack_config/webpack.base.js b/webpack_config/webpack.base.js index 0e33b674..fa6abf37 100644 --- a/webpack_config/webpack.base.js +++ b/webpack_config/webpack.base.js @@ -32,7 +32,6 @@ module.exports = { containers: `${config.srcPath}/containers/`, styles: `${config.srcPath}/styles/`, less_vars: `${config.srcPath}/styles/etherwallet-variables.less`, - scss_vars: `${config.srcPath}/styles/vars.scss`, config: `${config.srcPath}/config/` + process.env.REACT_WEBPACK_ENV }, modules: [ diff --git a/webpack_config/webpack.dev.js b/webpack_config/webpack.dev.js index f9160ec2..176b5b74 100644 --- a/webpack_config/webpack.dev.js +++ b/webpack_config/webpack.dev.js @@ -10,7 +10,8 @@ base.devtool = 'eval-source-map' base.module.loaders.push({ test: /\.css$/, loaders: ['style-loader', 'css-loader', 'resolve-url-loader'] - }, { + }, + { test: /\.scss$/, loaders: ['style-loader', 'css-loader', 'resolve-url-loader', 'sass-loader'] }, @@ -18,6 +19,7 @@ base.module.loaders.push({ test: /\.less$/, loaders: ['style-loader', 'css-loader', 'resolve-url-loader', 'less-loader'] }) + base.plugins.push( new webpack.DefinePlugin({ 'process.env.NODE_ENV': JSON.stringify('development') diff --git a/webpack_config/webpack.prod.js b/webpack_config/webpack.prod.js index c4843b8a..b1a3942c 100644 --- a/webpack_config/webpack.prod.js +++ b/webpack_config/webpack.prod.js @@ -14,15 +14,6 @@ const config = require('./config') exec('rm -rf dist/') base.devtool = 'cheap-source-map' base.module.loaders.push( - { - test: /\.less$/, - use: ExtractTextPlugin.extract( - { - fallback: 'style-loader', - use: ['css-loader','less-loader'] - } - ) - }, { test: /\.css$/, use: ExtractTextPlugin.extract( @@ -31,14 +22,24 @@ base.module.loaders.push( use: 'css-loader' } ) - }, { + }, + { test: /\.scss$/, use: ExtractTextPlugin.extract( { fallback: 'style-loader', use: ['css-loader', 'sass-loader'] } - ), + ) + }, + { + test: /\.less$/, + use: ExtractTextPlugin.extract( + { + fallback: 'style-loader', + use: ['css-loader', 'less-loader'] + } + ) } ) // a white list to add dependencies to vendor chunk