From 28c7c1e7a4df6f9fb79a203c0d93f1763be83ddc Mon Sep 17 00:00:00 2001
From: Elijah Hamovitz <elijahhamovitz@gmail.com>
Date: Tue, 8 May 2018 17:23:46 -0700
Subject: [PATCH 1/4] upgrade to webpack 4 (and remove some unused
 dependencies)

---
 package.json | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index cf3a955..a9db03e 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,7 @@
     "babel-core": "^6.26.0",
     "babel-eslint": "^8.0.3",
     "babel-jest": "^22.1.0",
-    "babel-loader": "^7.1.2",
+    "babel-loader": "^7.1.4",
     "babel-plugin-add-module-exports": "^0.2.1",
     "babel-plugin-transform-class-properties": "^6.23.0",
     "babel-plugin-transform-es2015-classes": "^6.9.0",
@@ -38,12 +38,9 @@
     "codecov": "^3.0.0",
     "eslint": "^3.19.0",
     "eslint-plugin-babel": "^4.1.2",
-    "file-loader": "^1.1.6",
-    "html-webpack-plugin": "^2.30.1",
     "jest": "^22.1.3",
-    "prop-types": "^15.6.0",
-    "webpack": "^3.8.1",
-    "webpack-dev-server": "^2.9.5"
+    "webpack": "^4.8.1",
+    "webpack-cli": "^2.1.3"
   },
   "jest": {
     "coverageDirectory": "./coverage/",

From 7322c3fc33eaefcdfe7cc6240a39c6fc254838fc Mon Sep 17 00:00:00 2001
From: Elijah Hamovitz <elijahhamovitz@gmail.com>
Date: Tue, 8 May 2018 17:24:18 -0700
Subject: [PATCH 2/4] slim down webpack.config, since webpack 4 provides so
 many defaults

---
 package.json      |  7 ++-----
 webpack.config.js | 17 -----------------
 2 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/package.json b/package.json
index a9db03e..59578fc 100644
--- a/package.json
+++ b/package.json
@@ -2,13 +2,10 @@
   "name": "@code-dot-org/maze",
   "version": "1.1.0",
   "description": "standalone project for the Maze app type",
-  "files": [
-    "lib/maze.js"
-  ],
-  "main": "lib/maze.js",
+  "main": "dist/main.js",
   "scripts": {
     "build": "webpack -p",
-    "build:dev": "webpack --progress --colors",
+    "build:dev": "webpack --progress --colors --mode=development",
     "build:demo": "webpack --config demo/webpack.config.js",
     "lint": "eslint --ext .js src/ test",
     "postversion": "git push && git push --tags && npm publish",
diff --git a/webpack.config.js b/webpack.config.js
index d6f4957..6475edd 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -1,28 +1,11 @@
-const path = require("path");
-const name = "maze";
-
 module.exports = {
-  entry: './src/index.js',
   output: {
-    path: path.resolve(__dirname, "lib"),
-    filename: name + ".js",
-    library: name,
     libraryTarget: 'umd',
-    umdNamedDefine: true
   },
-  target: 'node',
   module: {
     rules: [{
       test: /\.js$/,
       loader: "babel-loader",
     }]
   },
-  resolve: {
-    extensions: [".js"],
-  },
-  stats: {
-    colors: true
-  },
-  devtool: 'source-map',
-  devServer: { inline: true }
 };

From bd363e06275317fe744bfb14194dc01337f77c46 Mon Sep 17 00:00:00 2001
From: Elijah Hamovitz <elijahhamovitz@gmail.com>
Date: Tue, 8 May 2018 17:24:31 -0700
Subject: [PATCH 3/4] update gitignore to reflect new build path

---
 .gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 9970f3f..5fcd227 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,7 +39,7 @@ Icon?
 /.cake_task_cache
 
 # Build files
-/lib
+/dist
 /demo/dist
 
 # VScode settings

From a9fedabef051fcec388a8ea55e64de9645850fa1 Mon Sep 17 00:00:00 2001
From: Elijah Hamovitz <elijahhamovitz@gmail.com>
Date: Fri, 1 Jun 2018 16:25:23 -0700
Subject: [PATCH 4/4] restore demo dependencies

---
 package.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 59578fc..1480468 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,7 @@
   "scripts": {
     "build": "webpack -p",
     "build:dev": "webpack --progress --colors --mode=development",
-    "build:demo": "webpack --config demo/webpack.config.js",
+    "build:demo": "webpack --config demo/webpack.config.js -p",
     "lint": "eslint --ext .js src/ test",
     "postversion": "git push && git push --tags && npm publish",
     "preversion": "npm run test",
@@ -35,6 +35,8 @@
     "codecov": "^3.0.0",
     "eslint": "^3.19.0",
     "eslint-plugin-babel": "^4.1.2",
+    "file-loader": "^1.1.11",
+    "html-webpack-plugin": "^3.2.0",
     "jest": "^22.1.3",
     "webpack": "^4.8.1",
     "webpack-cli": "^2.1.3"