Skip to content

Commit

Permalink
chore(package): update webpack to version 2.3.2 & extract-text-webpac…
Browse files Browse the repository at this point in the history
…k-plugin to 2.1.0 (FineUploader#85)

* chore(package): update webpack to version 2.3.2

Closes FineUploader#81

https://greenkeeper.io/

* update webpack + extract-text-plugin
  • Loading branch information
rnicholus authored Mar 25, 2017
1 parent 2049fc5 commit 9522197
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion config/karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
8 changes: 4 additions & 4 deletions config/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -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' })
}
]
},
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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": {
Expand Down

0 comments on commit 9522197

Please sign in to comment.