Skip to content
This repository was archived by the owner on Dec 24, 2019. It is now read-only.

Commit 74b29db

Browse files
author
Patrick Burtchaell
authored
Merge pull request #130 from pburtchaell/pburtchaell-upgrade-webpack
Upgrade to webpack 2
2 parents 1fa4129 + 08c781d commit 74b29db

File tree

3 files changed

+780
-283
lines changed

3 files changed

+780
-283
lines changed

examples/webpack.config.js

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,18 +31,23 @@ module.exports = {
3131
},
3232

3333
plugins: [
34-
new webpack.optimize.CommonsChunkPlugin('shared.js'),
34+
new webpack.optimize.CommonsChunkPlugin({
35+
name: 'shared',
36+
filename: 'shared.js',
37+
}),
3538
new webpack.DefinePlugin({
3639
'process.env.NODE_ENV': JSON.stringify(process.env.NODE_ENV || 'development')
3740
})
3841
],
3942

4043
module: {
41-
loaders: [
44+
rules: [
4245
{
4346
test: /\.js$/,
4447
exclude: /node_modules/,
45-
loader: 'babel',
48+
use: {
49+
loader: 'babel-loader'
50+
}
4651
}
4752
]
4853
},

package.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
},
4343
"devDependencies": {
4444
"babel-cli": "^6.24.1",
45-
"babel-core": "^6.24.1",
45+
"babel-core": "^6.25.0",
4646
"babel-eslint": "^7.2.2",
4747
"babel-loader": "^6.4.1",
4848
"babel-plugin-transform-object-assign": "^6.22.0",
@@ -63,16 +63,16 @@
6363
"html-webpack-plugin": "^2.28.0",
6464
"immutable": "^3.8.1",
6565
"jsdom": "^11.0.0",
66-
"mocha": "^3.4.1",
66+
"mocha": "^3.4.2",
6767
"pre-commit": "^1.2.2",
68-
"react": "^15.5.4",
69-
"react-addons-test-utils": "^15.5.1",
70-
"react-dom": "^15.5.4",
71-
"react-test-renderer": "^15.5.4",
68+
"react": "^15.6.1",
69+
"react-addons-test-utils": "^15.6.0",
70+
"react-dom": "^15.6.1",
71+
"react-test-renderer": "^15.6.1",
7272
"sinon": "^2.2.0",
73-
"webpack": "^1.12.14",
74-
"webpack-dev-middleware": "^1.10.1",
75-
"webpack-dev-server": "^1.14.1"
73+
"webpack": "^2.6.1",
74+
"webpack-dev-middleware": "^1.10.2",
75+
"webpack-dev-server": "^2.4.5"
7676
},
7777
"dependencies": {
7878
"prop-types": "^15.5.10"

0 commit comments

Comments
 (0)