Merge branch 'next' into feat/json

webpack · Sep 29, 2020 · 8b5d295 · 8b5d295
2 parents b4a2406 + 0f13ab5
commit 8b5d295
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/packages/generators/package.json b/packages/generators/package.json
@@ -19,6 +19,7 @@
     "yeoman-generator": "4.7.2"
   },
   "peerDependencies": {
+    "webpack": "4.x.x || 5.x.x",
     "webpack-cli": "3.x.x || 4.x.x"
   },
   "devDependencies": {

diff --git a/packages/init/package.json b/packages/init/package.json
@@ -15,5 +15,9 @@
     "jscodeshift": "0.7.0",
     "p-each-series": "2.1.0"
   },
+  "peerDependencies": {
+    "webpack": "4.x.x || 5.x.x",
+    "webpack-cli": "4.x.x"
+  },
   "gitHead": "fb50f766851f500ca12867a2aa9de81fa6e368f9"
 }
diff --git a/packages/utils/package.json b/packages/utils/package.json
@@ -26,7 +26,7 @@
   },
   "peerDependencies": {
     "webpack": "4.x.x || 5.x.x",
-    "webpack-cli": "4.x.x || 5.x.x"
+    "webpack-cli": "4.x.x"
   },
   "devDependencies": {
     "@types/got": "9.6.9",

diff --git a/yarn.lock b/yarn.lock
@@ -5445,9 +5445,9 @@ escodegen@^1.11.1:
     source-map "~0.6.1"
 
 eslint-config-prettier@^6.11.0:
-  version "6.11.0"
-  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-6.11.0.tgz#f6d2238c1290d01c859a8b5c1f7d352a0b0da8b1"
-  integrity sha512-oB8cpLWSAjOVFEJhhyMZh6NOEOtBVziaqdDQ86+qhDHFbZXoRTM7pNSvFRfW/W/L/LrQ38C99J5CGuRBBzBsdA==
+  version "6.12.0"
+  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-6.12.0.tgz#9eb2bccff727db1c52104f0b49e87ea46605a0d2"
+  integrity sha512-9jWPlFlgNwRUYVoujvWTQ1aMO8o6648r+K7qU7K5Jmkbyqav1fuEZC0COYpGBxyiAJb65Ra9hrmFx19xRGwXWw==
   dependencies:
     get-stdin "^6.0.0"