Skip to content

Commit e0e2d91

Browse files
authored
Merge pull request #1004 from Soundnode/upgrade-webpack
Upgrade webpack to latest version
2 parents 43a7327 + 30ad859 commit e0e2d91

4 files changed

Lines changed: 17 additions & 19 deletions

File tree

npm-debug.log.2198688145

Whitespace-only changes.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,14 @@
3131
"babel-preset-react": "^6.23.0",
3232
"babel-preset-stage-0": "^6.22.0",
3333
"babel-register": "^6.23.0",
34-
"electron-packager": "^8.5.1",
3534
"electron": "^1.6.11",
35+
"electron-packager": "^8.5.1",
3636
"eslint": "^4.0.0",
3737
"eslint-plugin-react": "^7.1.0",
3838
"install": "^0.10.1",
3939
"node-sass": "^4.5.0",
4040
"rimraf": "^2.5.4",
41-
"webpack": "^1.12.2"
41+
"webpack": "^3.3.0"
4242
},
4343
"dependencies": {
4444
"angular": "^1.6.2",

webpack.dev.js

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,24 +13,23 @@ module.exports = {
1313
publicPath: '/'
1414
},
1515
module: {
16-
loaders: [
16+
rules: [
1717
{
1818
test: /\.(js|jsx)$/,
19-
exclude: /node_modules/,
20-
loader: 'babel-loader'
19+
use: [
20+
'babel-loader'
21+
]
2122
}
2223
]
2324
},
2425
resolve: {
25-
extensions: ['', '.js', '.jsx']
26+
extensions: ['.js', '.jsx']
2627
},
2728
plugins: [
28-
new webpack.optimize.DedupePlugin(),
29-
new webpack.optimize.OccurenceOrderPlugin(),
30-
new webpack.NoErrorsPlugin(),
3129
new webpack.DefinePlugin({
3230
'process.env.NODE_ENV': '"development"'
33-
})
31+
}),
32+
new webpack.NoEmitOnErrorsPlugin()
3433
],
3534
externals: [
3635
(function () {

webpack.prod.js

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,25 +13,24 @@ module.exports = {
1313
publicPath: '/'
1414
},
1515
module: {
16-
loaders: [
16+
rules: [
1717
{
1818
test: /\.(js|jsx)$/,
19-
exclude: /node_modules/,
20-
loader: 'babel-loader'
19+
use: [
20+
'babel-loader'
21+
]
2122
}
2223
]
2324
},
2425
resolve: {
25-
extensions: ['', '.js', '.jsx']
26+
extensions: ['.js', '.jsx']
2627
},
2728
plugins: [
28-
new webpack.optimize.DedupePlugin(),
29-
new webpack.optimize.OccurenceOrderPlugin(),
30-
new webpack.optimize.UglifyJsPlugin({ compress: { warnings: false } }),
31-
new webpack.NoErrorsPlugin(),
3229
new webpack.DefinePlugin({
3330
'process.env.NODE_ENV': '"production"'
34-
})
31+
}),
32+
new webpack.optimize.AggressiveMergingPlugin(),
33+
new webpack.NoEmitOnErrorsPlugin()
3534
],
3635
externals: [
3736
(function () {

0 commit comments

Comments
 (0)