Fix code that broke due to webpack 2 upgrade

hackebrot · May 20, 2017 · 14c5315 · 14c5315
1 parent de21a28
commit 14c5315
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 16 deletions.
diff --git a/webpack/js/main.js b/webpack/js/main.js
@@ -2,6 +2,6 @@ var $ = require('jquery');
 window.$ = $;
 window.jQuery = $;
 require("bootstrap");
-require("!style!css!bootswatch/yeti/bootstrap.min.css");
+require("!style-loader!css-loader!bootswatch/yeti/bootstrap.min.css");
 
 
diff --git a/webpack/webpack.config.js b/webpack/webpack.config.js
@@ -13,27 +13,19 @@ module.exports = {
   },
   devtool: '#cheap-module-source-map',
   resolve: {
-    modulesDirectories: ['node_modules'],
-    extensions: ['', '.js', '.css']
+    modules: ['node_modules'],
+    extensions: ['.js']
   },
   module: {
     loaders: [
-      { test: /\.js$/, exclude: /node_modules/,
-        loader: 'babel-loader' },
-      { test: /\.scss$/,
-        loader: ExtractTextPlugin.extract(
-          'style-loader', 'css-loader!sass-loader') },
-      { test: /\.css$/,
-        loader: ExtractTextPlugin.extract(
-          'style-loader', 'css-loader') },
-      { test: /\.(woff2?|ttf|eot|svg|png|jpe?g|gif)$/,
-        loader: 'file' }
+      { test: /\.js$/, exclude: /node_modules/, loader: 'babel-loader' },
+      { test: /\.scss$/, loader: ExtractTextPlugin.extract( { fallback: 'style-loader', use: 'css-loader!sass-loader' } ) },
+      { test: /\.css$/, loader: ExtractTextPlugin.extract( { fallback: 'style-loader', use: 'css-loader' } ) },
+      { test: /\.(woff2?|ttf|eot|svg|png|jpe?g|gif)$/, loader: 'file-loader' }
     ]
   },
   plugins: [
-    new ExtractTextPlugin('styles.css', {
-      allChunks: true
-    }),
+    new ExtractTextPlugin({filename: 'styles.css',  allChunks: true }),
     new webpack.optimize.UglifyJsPlugin()
   ]
 };