From 98dd17da8699e28eafbfdbbab7b24839019d79fd Mon Sep 17 00:00:00 2001
From: Even Stensberg <evenstensberg@gmail.com>
Date: Wed, 13 Dec 2017 07:45:11 +0100
Subject: [PATCH 1/2] use webpack as optional dependency

---
 package-lock.json | 28 ++++++++++++++--------------
 package.json      |  4 +++-
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 07232c09f65..6734c638546 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5813,6 +5813,16 @@
       "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
       "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M="
     },
+    "os-locale": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz",
+      "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==",
+      "requires": {
+        "execa": "0.7.0",
+        "lcid": "1.0.0",
+        "mem": "1.1.0"
+      }
+    },
     "os-shim": {
       "version": "0.1.3",
       "resolved": "https://registry.npmjs.org/os-shim/-/os-shim-0.1.3.tgz",
@@ -7796,13 +7806,13 @@
           "requires": {
             "graceful-fs": "4.1.11",
             "memory-fs": "0.4.1",
-            "tapable": "1.0.0-beta.4"
+            "tapable": "1.0.0-beta.5"
           },
           "dependencies": {
             "tapable": {
-              "version": "1.0.0-beta.4",
-              "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.0.0-beta.4.tgz",
-              "integrity": "sha512-3yD1lGFQgLeLgp2Hjue7afrviSiXDMBNw495ME25is+RJywZzG0Fl/IbIyD+RER+QUSfhrjZdhnpkRLmSLOYVw=="
+              "version": "1.0.0-beta.5",
+              "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.0.0-beta.5.tgz",
+              "integrity": "sha512-TRKt8j59hRVoYaoSB5IFCbfNEcLzDaVdKrOIPlC1AJAIZTmZZTbHDXGsqiUb9IjeRAYGeQtc617oEzlsnpUi3w=="
             }
           }
         },
@@ -7814,16 +7824,6 @@
             "number-is-nan": "1.0.1"
           }
         },
-        "os-locale": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz",
-          "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==",
-          "requires": {
-            "execa": "0.7.0",
-            "lcid": "1.0.0",
-            "mem": "1.1.0"
-          }
-        },
         "tapable": {
           "version": "1.0.0-beta.3",
           "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.0.0-beta.3.tgz",
diff --git a/package.json b/package.json
index 8ba7c7757e4..1e23266fcfb 100644
--- a/package.json
+++ b/package.json
@@ -62,7 +62,6 @@
     "resolve-cwd": "^2.0.0",
     "rx": "^4.1.0",
     "supports-color": "^4.4.0",
-    "webpack": "^4.0.0-alpha.0",
     "webpack-addons": "^1.1.4",
     "yargs": "^9.0.1",
     "yeoman-environment": "^2.0.0",
@@ -87,5 +86,8 @@
     "lint-staged": "^4.1.3",
     "prettier-eslint-cli": "^4.3.2",
     "should": "^13.1.0"
+  },
+  "optionalDependencies": {
+    "webpack": "^4.0.0-alpha.0"
   }
 }

From 956a920eaf0efe71062f71991ca11411d031b065 Mon Sep 17 00:00:00 2001
From: Even Stensberg <evenstensberg@gmail.com>
Date: Wed, 13 Dec 2017 14:14:33 +0100
Subject: [PATCH 2/2] Update package.json

---
 package.json | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index f45f9eeb1f1..32791952a18 100644
--- a/package.json
+++ b/package.json
@@ -62,6 +62,7 @@
     "recast": "git://github.com/kalcifer/recast.git#bug/allowbreak",
     "resolve-cwd": "^2.0.0",
     "supports-color": "^4.4.0",
+    "webpack": "next",
     "webpack-addons": "^1.1.4",
     "yargs": "^9.0.1",
     "yeoman-environment": "^2.0.0",
@@ -84,9 +85,10 @@
     "jest": "^21.2.1",
     "jest-cli": "^21.2.1",
     "lint-staged": "^4.1.3",
-  }
+    "prettier-eslint-cli": "^4.3.2"
+  },
   "optionalDependencies": {
     "schema-utils": "^0.4.2",
-    "webpack": "^4.0.0-alpha.0
+    "webpack": "^4.0.0-alpha.0"
   }
 }