ff-stream-web

git clone git://archive.git.mtrnord.blog/MTRNord/ff-stream-web.git
Log | Files | Refs | README | LICENSE

commit c67db1d9b275e875edd48e8cb9db55db4d03fb5a
parent f5baaca6c68cf1405ffa68d85af17a67b5cc8b3a
Author: Konstantin Tarkus <koistya@gmail.com>
Date:   Wed, 18 Nov 2015 20:04:25 +0300

Merge pull request #311 from chentaixu/patch-5

Removed redundant spread vars
Diffstat:
Mtools/webpack.config.js | 4----
1 file changed, 0 insertions(+), 4 deletions(-)

diff --git a/tools/webpack.config.js b/tools/webpack.config.js @@ -116,7 +116,6 @@ const appConfig = merge({}, config, { // http://webpack.github.io/docs/configuration.html#devtool devtool: DEBUG ? 'cheap-module-eval-source-map' : false, plugins: [ - ...config.plugins, new webpack.DefinePlugin(GLOBALS), ...(!DEBUG ? [ new webpack.optimize.DedupePlugin(), @@ -156,7 +155,6 @@ const appConfig = merge({}, config, { }, }, } : JS_LOADER, - ...config.module.loaders, { test: /\.css$/, loader: 'style-loader/useable!css-loader!postcss-loader', @@ -196,7 +194,6 @@ const serverConfig = merge({}, config, { }, devtool: 'source-map', plugins: [ - ...config.plugins, new webpack.DefinePlugin(GLOBALS), new webpack.BannerPlugin('require("source-map-support").install();', { raw: true, entryOnly: false }), @@ -204,7 +201,6 @@ const serverConfig = merge({}, config, { module: { loaders: [ JS_LOADER, - ...config.module.loaders, { test: /\.css$/, loader: 'css-loader!postcss-loader',