Update webpack config for webpack 2

* `module.loaders` -> `module.rules`
* loaders need `-loader` suffix
* `json-loader` is enabled by default
* `UglifyJsPlugin`'s `compress.warning` setting is false by default
This commit is contained in:
Ray Schamp 2017-02-01 15:30:27 -05:00
parent 0d38d1d245
commit a6568c4bf2
2 changed files with 12 additions and 24 deletions

View file

@ -34,7 +34,6 @@
"highlightjs": "9.8.0",
"htmlparser2": "3.9.2",
"json": "9.0.4",
"json-loader": "0.5.4",
"lodash.defaultsdeep": "4.6.0",
"minilog": "3.1.0",
"promise": "7.1.1",

View file

@ -10,21 +10,10 @@ var base = {
port: process.env.PORT || 8073
},
devtool: 'source-map',
module: {
loaders: [
{
test: /\.json$/,
loader: 'json-loader'
}
]
},
plugins: [
new webpack.optimize.UglifyJsPlugin({
include: /\.min\.js$/,
minimize: true,
compress: {
warnings: false
}
minimize: true
})
]
};
@ -42,12 +31,12 @@ module.exports = [
filename: '[name].js'
},
module: {
loaders: base.module.loaders.concat([
rules: [
{
test: require.resolve('./src/index.js'),
loader: 'expose?VirtualMachine'
loader: 'expose-loader?VirtualMachine'
}
])
]
}
}),
// Node-compatible
@ -86,32 +75,32 @@ module.exports = [
filename: '[name].js'
},
module: {
loaders: base.module.loaders.concat([
loaders: [
{
test: require.resolve('./src/index.js'),
loader: 'expose?VirtualMachine'
loader: 'expose-loader?VirtualMachine'
},
{
test: require.resolve('stats.js/build/stats.min.js'),
loader: 'script'
loader: 'script-loader'
},
{
test: require.resolve('highlightjs/highlight.pack.min.js'),
loader: 'script'
loader: 'script-loader'
},
{
test: require.resolve('scratch-blocks/dist/vertical.js'),
loader: 'expose?Blockly'
loader: 'expose-loader?Blockly'
},
{
test: require.resolve('scratch-render'),
loader: 'expose?RenderWebGL'
loader: 'expose-loader?RenderWebGL'
},
{
test: require.resolve('scratch-audio'),
loader: 'expose?AudioEngine'
loader: 'expose-loader?AudioEngine'
}
])
]
},
plugins: base.plugins.concat([
new CopyWebpackPlugin([{