From 6e5e1170bffd573b59b16b7f86696014cbdfc651 Mon Sep 17 00:00:00 2001
From: Haoqun Jiang <haoqunjiang@gmail.com>
Date: Fri, 1 Feb 2019 02:25:57 +0800
Subject: [PATCH] fix: add webpack to plugins' dependencies, fix yarn peer dep
 warnings

---
 packages/@vue/cli-plugin-babel/package.json   |  3 ++-
 packages/@vue/cli-plugin-eslint/package.json  |  3 ++-
 packages/@vue/cli-plugin-pwa/package.json     |  1 +
 .../@vue/cli-plugin-typescript/package.json   |  3 ++-
 yarn.lock                                     | 19 +++++++++++++++++--
 5 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/packages/@vue/cli-plugin-babel/package.json b/packages/@vue/cli-plugin-babel/package.json
index 8d7b7a475..2315a6303 100644
--- a/packages/@vue/cli-plugin-babel/package.json
+++ b/packages/@vue/cli-plugin-babel/package.json
@@ -22,7 +22,8 @@
     "@babel/core": "^7.0.0",
     "@vue/babel-preset-app": "^3.3.0",
     "@vue/cli-shared-utils": "^3.3.0",
-    "babel-loader": "^8.0.5"
+    "babel-loader": "^8.0.5",
+    "webpack": ">=4 < 4.29"
   },
   "publishConfig": {
     "access": "public"
diff --git a/packages/@vue/cli-plugin-eslint/package.json b/packages/@vue/cli-plugin-eslint/package.json
index c466c8b18..cf6c9e0c7 100644
--- a/packages/@vue/cli-plugin-eslint/package.json
+++ b/packages/@vue/cli-plugin-eslint/package.json
@@ -27,6 +27,7 @@
     "eslint": "^4.19.1",
     "eslint-loader": "^2.1.1",
     "eslint-plugin-vue": "^4.7.1",
-    "globby": "^9.0.0"
+    "globby": "^9.0.0",
+    "webpack": ">=4 < 4.29"
   }
 }
diff --git a/packages/@vue/cli-plugin-pwa/package.json b/packages/@vue/cli-plugin-pwa/package.json
index 34e737087..d19bac8bf 100644
--- a/packages/@vue/cli-plugin-pwa/package.json
+++ b/packages/@vue/cli-plugin-pwa/package.json
@@ -23,6 +23,7 @@
   },
   "dependencies": {
     "@vue/cli-shared-utils": "^3.3.0",
+    "webpack": ">=4 < 4.29",
     "workbox-webpack-plugin": "^3.6.3"
   },
   "devDependencies": {
diff --git a/packages/@vue/cli-plugin-typescript/package.json b/packages/@vue/cli-plugin-typescript/package.json
index db4c2d330..3e22581c6 100644
--- a/packages/@vue/cli-plugin-typescript/package.json
+++ b/packages/@vue/cli-plugin-typescript/package.json
@@ -27,7 +27,8 @@
     "fork-ts-checker-webpack-plugin": "^0.5.2",
     "globby": "^9.0.0",
     "ts-loader": "^5.3.3",
-    "tslint": "^5.12.1"
+    "tslint": "^5.12.1",
+    "webpack": ">=4 < 4.29"
   },
   "peerDependencies": {
     "typescript": ">=2"
diff --git a/yarn.lock b/yarn.lock
index 6971289e2..35941623d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2207,6 +2207,21 @@
     source-map "^0.7.3"
     vue-template-es2015-compiler "^1.6.0"
 
+"@vue/component-compiler-utils@^2.5.2":
+  version "2.5.2"
+  resolved "https://registry.yarnpkg.com/@vue/component-compiler-utils/-/component-compiler-utils-2.5.2.tgz#a8d57e773354ab10e4742c7d6a8dd86184d4d7be"
+  integrity sha512-3exq9O89GXo9E+CGKzgURCbasG15FtFMs8QRrCUVWGaKue4Egpw41MHb3Avtikv1VykKfBq3FvAnf9Nx3sdVJg==
+  dependencies:
+    consolidate "^0.15.1"
+    hash-sum "^1.0.2"
+    lru-cache "^4.1.2"
+    merge-source-map "^1.1.0"
+    postcss "^7.0.14"
+    postcss-selector-parser "^5.0.0"
+    prettier "1.16.3"
+    source-map "~0.6.1"
+    vue-template-es2015-compiler "^1.8.2"
+
 "@vue/conventional-changelog@^0.1.1":
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/@vue/conventional-changelog/-/conventional-changelog-0.1.1.tgz#48d2227ca65c354cba4be60754ea531afd0c3718"
@@ -13512,7 +13527,7 @@ prettier@1.16.0:
   resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.16.0.tgz#104dd25f5ee3d0c9d0a6ce4bb40ced8481d51219"
   integrity sha512-MCBCYeAuZfejUPdEpkleLWvpRBwLii/Sp5jQs0eb8Ul/drGIDjkL6tAU24tk6yCGf0KPV5rhPPPlczfBmN2pWQ==
 
-prettier@^1.16.3:
+prettier@1.16.3, prettier@^1.16.3:
   version "1.16.3"
   resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.16.3.tgz#8c62168453badef702f34b45b6ee899574a6a65d"
   integrity sha512-kn/GU6SMRYPxUakNXhpP0EedT/KmaPzr0H5lIsDogrykbaxOpOfAFfk5XA7DZrJyMAv1wlMV3CPcZruGXVVUZw==
@@ -16801,7 +16816,7 @@ vue-template-compiler@^2.5.16, vue-template-compiler@^2.5.21, vue-template-compi
     de-indent "^1.0.2"
     he "^1.1.0"
 
-vue-template-es2015-compiler@^1.6.0:
+vue-template-es2015-compiler@^1.6.0, vue-template-es2015-compiler@^1.8.2:
   version "1.8.2"
   resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.8.2.tgz#dd73e80ba58bb65dd7a8aa2aeef6089cf6116f2a"
   integrity sha512-cliV19VHLJqFUYbz/XeWXe5CO6guzwd0yrrqqp0bmjlMP3ZZULY7fu8RTC4+3lmHwo6ESVDHFDsvjB15hcR5IA==