summaryrefslogtreecommitdiffstats
path: root/webapp/webpack.config.js
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2017-03-13 13:58:12 -0400
committerGitHub <noreply@github.com>2017-03-13 13:58:12 -0400
commitc84b761e751ae1c9fbd55bd0b01193cb3dc72b67 (patch)
tree9c39a22f095e10f12c1c67cc6142f59d728b05e7 /webapp/webpack.config.js
parentc281ee3b61e8ab53ff118866d72618ae8cce582b (diff)
downloadchat-c84b761e751ae1c9fbd55bd0b01193cb3dc72b67.tar.gz
chat-c84b761e751ae1c9fbd55bd0b01193cb3dc72b67.tar.bz2
chat-c84b761e751ae1c9fbd55bd0b01193cb3dc72b67.zip
Updating client dependancies except ESLint and react-router (#5750)
Diffstat (limited to 'webapp/webpack.config.js')
-rw-r--r--webapp/webpack.config.js18
1 files changed, 10 insertions, 8 deletions
diff --git a/webapp/webpack.config.js b/webapp/webpack.config.js
index f1742e3ae..32c5a322a 100644
--- a/webapp/webpack.config.js
+++ b/webapp/webpack.config.js
@@ -65,7 +65,16 @@ var config = {
},
{
test: /\.scss$/,
- loaders: ['style-loader', 'css-loader', 'sass-loader']
+ use: [{
+ loader: 'style-loader'
+ }, {
+ loader: 'css-loader'
+ }, {
+ loader: 'sass-loader',
+ options: {
+ includePaths: ['node_modules/compass-mixins/lib']
+ }
+ }]
},
{
test: /\.css$/,
@@ -92,13 +101,6 @@ var config = {
minimize: !DEV,
debug: false
}),
- new webpack.LoaderOptionsPlugin({
- options: {
- sassLoader: {
- includePaths: ['node_modules/compass-mixins/lib']
- }
- }
- }),
new webpack.optimize.CommonsChunkPlugin({
minChunks: 2,
children: true