diff --git a/config/karma.conf.js b/config/karma.conf.js index ad4434a..8307709 100644 --- a/config/karma.conf.js +++ b/config/karma.conf.js @@ -42,7 +42,7 @@ var path = require('path'), } } -webpackConfig.module.loaders[0].query = { plugins: ['rewire'] } +webpackConfig.module.rules[0].query = { plugins: ['rewire'] } webpackConfig.devtool = 'inline-source-map' module.exports = function (config) { diff --git a/config/webpack.config.js b/config/webpack.config.js index 8a95a93..639d576 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -13,18 +13,18 @@ module.exports = { src: path.resolve('src'), test: path.resolve('src/test/unit') }, - extensions: ['', '.js', '.jsx'] + extensions: ['.js', '.jsx'] }, module: { - loaders: [ + rules: [ { test: /\.js/, - loader: 'babel', + loader: 'babel-loader', exclude: /node_modules/ }, { test: /\.css$/, - loader: ExtractTextPlugin.extract('style-loader', 'css-loader') + loader: ExtractTextPlugin.extract({ fallback: 'style-loader', use: 'css-loader' }) } ] }, diff --git a/package.json b/package.json index 648bccc..791700f 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,7 @@ "es6-promise": "4.1.0", "eslint": "3.18.0", "eslint-plugin-react": "6.10.3", - "extract-text-webpack-plugin": "1.0.1", + "extract-text-webpack-plugin": "2.1.0", "jasmine": "2.5.3", "jasmine-core": "2.5.2", "karma": "1.5.0", @@ -59,7 +59,7 @@ "react-addons-test-utils": "15.4.2", "react-dom": "15.4.2", "style-loader": "0.16.0", - "webpack": "1.14.0", + "webpack": "2.3.2", "webpack-node-externals": "1.5.4" }, "engines": {