chore: adapt code for Webpack 2

This commit is contained in:
Christopher Willis-Ford
2017-02-02 10:28:11 -08:00
parent 187a783e74
commit 805ec54f57
2 changed files with 8 additions and 14 deletions

View File

@@ -2,11 +2,11 @@
// First, have Webpack load their data as Base 64 strings. // First, have Webpack load their data as Base 64 strings.
/* eslint-disable global-require */ /* eslint-disable global-require */
const FONTS = { const FONTS = {
Donegal: require('base64!scratch-render-fonts/DonegalOne-Regular.ttf'), Donegal: require('base64-loader!scratch-render-fonts/DonegalOne-Regular.ttf'),
Gloria: require('base64!scratch-render-fonts/GloriaHallelujah.ttf'), Gloria: require('base64-loader!scratch-render-fonts/GloriaHallelujah.ttf'),
Mystery: require('base64!scratch-render-fonts/MysteryQuest-Regular.ttf'), Mystery: require('base64-loader!scratch-render-fonts/MysteryQuest-Regular.ttf'),
Marker: require('base64!scratch-render-fonts/PermanentMarker.ttf'), Marker: require('base64-loader!scratch-render-fonts/PermanentMarker.ttf'),
Scratch: require('base64!scratch-render-fonts/Scratch.ttf') Scratch: require('base64-loader!scratch-render-fonts/Scratch.ttf')
}; };
/* eslint-enable global-require */ /* eslint-enable global-require */

View File

@@ -15,21 +15,17 @@ const base = {
}, },
devtool: 'source-map', devtool: 'source-map',
module: { module: {
loaders: [ rules: [
{ {
include: [ include: [
path.resolve(__dirname, 'src') path.resolve(__dirname, 'src')
], ],
test: /\.js$/, test: /\.js$/,
loader: 'babel-loader', loader: 'babel-loader',
query: { options: {
presets: ['es2015'] presets: ['es2015']
} }
}, },
{
test: /\.json$/,
loader: 'json-loader'
},
{ {
test: /\.(glsl|vs|fs|frag|vert)$/, test: /\.(glsl|vs|fs|frag|vert)$/,
loader: 'raw-loader' loader: 'raw-loader'
@@ -40,9 +36,7 @@ const base = {
new webpack.optimize.UglifyJsPlugin({ new webpack.optimize.UglifyJsPlugin({
include: /\.min\.js$/, include: /\.min\.js$/,
minimize: true, minimize: true,
compress: { sourceMap: true
warnings: false
}
}) })
] ]
}; };