From 805ec54f57d02eed3d9da24a3715dcc47c643829 Mon Sep 17 00:00:00 2001
From: Christopher Willis-Ford <cwillisf@media.mit.edu>
Date: Thu, 2 Feb 2017 10:28:11 -0800
Subject: [PATCH] chore: adapt code for Webpack 2

---
 src/svg-quirks-mode/svg-renderer.js | 10 +++++-----
 webpack.config.js                   | 12 +++---------
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/src/svg-quirks-mode/svg-renderer.js b/src/svg-quirks-mode/svg-renderer.js
index 9198af8..6648467 100644
--- a/src/svg-quirks-mode/svg-renderer.js
+++ b/src/svg-quirks-mode/svg-renderer.js
@@ -2,11 +2,11 @@
 // First, have Webpack load their data as Base 64 strings.
 /* eslint-disable global-require */
 const FONTS = {
-    Donegal: require('base64!scratch-render-fonts/DonegalOne-Regular.ttf'),
-    Gloria: require('base64!scratch-render-fonts/GloriaHallelujah.ttf'),
-    Mystery: require('base64!scratch-render-fonts/MysteryQuest-Regular.ttf'),
-    Marker: require('base64!scratch-render-fonts/PermanentMarker.ttf'),
-    Scratch: require('base64!scratch-render-fonts/Scratch.ttf')
+    Donegal: require('base64-loader!scratch-render-fonts/DonegalOne-Regular.ttf'),
+    Gloria: require('base64-loader!scratch-render-fonts/GloriaHallelujah.ttf'),
+    Mystery: require('base64-loader!scratch-render-fonts/MysteryQuest-Regular.ttf'),
+    Marker: require('base64-loader!scratch-render-fonts/PermanentMarker.ttf'),
+    Scratch: require('base64-loader!scratch-render-fonts/Scratch.ttf')
 };
 /* eslint-enable global-require */
 
diff --git a/webpack.config.js b/webpack.config.js
index 31bbb26..87c0a9a 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -15,21 +15,17 @@ const base = {
     },
     devtool: 'source-map',
     module: {
-        loaders: [
+        rules: [
             {
                 include: [
                     path.resolve(__dirname, 'src')
                 ],
                 test: /\.js$/,
                 loader: 'babel-loader',
-                query: {
+                options: {
                     presets: ['es2015']
                 }
             },
-            {
-                test: /\.json$/,
-                loader: 'json-loader'
-            },
             {
                 test: /\.(glsl|vs|fs|frag|vert)$/,
                 loader: 'raw-loader'
@@ -40,9 +36,7 @@ const base = {
         new webpack.optimize.UglifyJsPlugin({
             include: /\.min\.js$/,
             minimize: true,
-            compress: {
-                warnings: false
-            }
+            sourceMap: true
         })
     ]
 };