scratchfoundation/scratch-vm
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-vm.git synced 2025-07-05 10:41:03 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions1

Update webpack config for webpack 2

Browse source 
* `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

1
package.json
View file

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

35
webpack.config.js
View file

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