From 276ea1487a232895356e950ea49ba9234dca0a8d Mon Sep 17 00:00:00 2001
From: Daan Roet <daanroet@gmail.com>
Date: Tue, 9 Jul 2019 14:47:22 +0200
Subject: [PATCH 1/2] feat: remove webpack version restriction

---
 package.json                                     | 2 +-
 packages/@vue/cli-plugin-babel/package.json      | 2 +-
 packages/@vue/cli-plugin-eslint/package.json     | 2 +-
 packages/@vue/cli-plugin-pwa/package.json        | 2 +-
 packages/@vue/cli-plugin-typescript/package.json | 2 +-
 packages/@vue/cli-service/package.json           | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 5a31854580..c0770ed30d 100644
--- a/package.json
+++ b/package.json
@@ -77,7 +77,7 @@
     "semver": "^6.1.0",
     "typescript": "^3.4.5",
     "vuepress": "^1.0.1",
-    "webpack": ">=4 < 4.29",
+    "webpack": "^4.0.0",
     "yorkie": "^2.0.0"
   },
   "resolutions": {
diff --git a/packages/@vue/cli-plugin-babel/package.json b/packages/@vue/cli-plugin-babel/package.json
index dbae130d47..c8e2d05bfd 100644
--- a/packages/@vue/cli-plugin-babel/package.json
+++ b/packages/@vue/cli-plugin-babel/package.json
@@ -24,7 +24,7 @@
     "@vue/babel-preset-app": "^4.0.0-alpha.4",
     "@vue/cli-shared-utils": "^4.0.0-alpha.4",
     "babel-loader": "^8.0.6",
-    "webpack": ">=4 < 4.29"
+    "webpack": "^4.0.0"
   },
   "publishConfig": {
     "access": "public"
diff --git a/packages/@vue/cli-plugin-eslint/package.json b/packages/@vue/cli-plugin-eslint/package.json
index fbe33d02c6..728cd8ddee 100644
--- a/packages/@vue/cli-plugin-eslint/package.json
+++ b/packages/@vue/cli-plugin-eslint/package.json
@@ -26,7 +26,7 @@
     "@vue/cli-shared-utils": "^4.0.0-alpha.4",
     "eslint-loader": "^2.1.2",
     "globby": "^9.2.0",
-    "webpack": ">=4 < 4.29",
+    "webpack": "^4.0.0",
     "yorkie": "^2.0.0"
   },
   "peerDependencies": {
diff --git a/packages/@vue/cli-plugin-pwa/package.json b/packages/@vue/cli-plugin-pwa/package.json
index a22474019f..9f11acb628 100644
--- a/packages/@vue/cli-plugin-pwa/package.json
+++ b/packages/@vue/cli-plugin-pwa/package.json
@@ -24,7 +24,7 @@
   },
   "dependencies": {
     "@vue/cli-shared-utils": "^4.0.0-alpha.4",
-    "webpack": ">=4 < 4.29",
+    "webpack": "^4.0.0",
     "workbox-webpack-plugin": "^4.3.1"
   },
   "devDependencies": {
diff --git a/packages/@vue/cli-plugin-typescript/package.json b/packages/@vue/cli-plugin-typescript/package.json
index 0b445ef324..d235155eb0 100644
--- a/packages/@vue/cli-plugin-typescript/package.json
+++ b/packages/@vue/cli-plugin-typescript/package.json
@@ -29,7 +29,7 @@
     "globby": "^9.2.0",
     "ts-loader": "^6.0.1",
     "tslint": "^5.16.0",
-    "webpack": ">=4 < 4.29",
+    "webpack": "^4.0.0",
     "yorkie": "^2.0.0"
   },
   "peerDependencies": {
diff --git a/packages/@vue/cli-service/package.json b/packages/@vue/cli-service/package.json
index 4a5041c0a7..3127f812d3 100644
--- a/packages/@vue/cli-service/package.json
+++ b/packages/@vue/cli-service/package.json
@@ -73,7 +73,7 @@
     "thread-loader": "^2.1.2",
     "url-loader": "^1.1.2",
     "vue-loader": "^15.7.0",
-    "webpack": ">=4 < 4.29",
+    "webpack": "^4.0.0",
     "webpack-bundle-analyzer": "^3.3.2",
     "webpack-chain": "^6.0.0",
     "webpack-dev-server": "^3.4.1",

From 0ef46df7a75d62bea894ce583e10c7839d8a1a4f Mon Sep 17 00:00:00 2001
From: Haoqun Jiang <haoqunjiang@gmail.com>
Date: Thu, 8 Aug 2019 17:09:15 +0800
Subject: [PATCH 2/2] test: fix common chunk test

only test pages that do share a common chunk
---
 .../cli-service/__tests__/multiPage.spec.js     | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/packages/@vue/cli-service/__tests__/multiPage.spec.js b/packages/@vue/cli-service/__tests__/multiPage.spec.js
index 54dccf3916..b7da0de805 100644
--- a/packages/@vue/cli-service/__tests__/multiPage.spec.js
+++ b/packages/@vue/cli-service/__tests__/multiPage.spec.js
@@ -99,18 +99,16 @@ test('build w/ multi page', async () => {
   const assertSharedAssets = file => {
     // should split and preload vendor chunk
     expect(file).toMatch(/<link [^>]*js\/chunk-vendors[^>]*\.js rel=preload as=script>/)
-    // should split and preload common js and css
-    expect(file).toMatch(/<link [^>]*js\/chunk-common[^>]*\.js rel=preload as=script>/)
-    expect(file).toMatch(/<link [^>]*chunk-common[^>]*\.css rel=preload as=style>/)
-    // should load common css
-    expect(file).toMatch(/<link href=\/css\/chunk-common\.\w+\.css rel=stylesheet>/)
-    // should load common js
     expect(file).toMatch(/<script [^>]*src=\/js\/chunk-vendors\.\w+\.js>/)
-    expect(file).toMatch(/<script [^>]*src=\/js\/chunk-common\.\w+\.js>/)
   }
 
   const index = await project.read('dist/index.html')
   assertSharedAssets(index)
+  // should split and preload common js and css
+  expect(index).toMatch(/<link [^>]*js\/chunk-common[^>]*\.js rel=preload as=script>/)
+  expect(index).toMatch(/<script [^>]*src=\/js\/chunk-common\.\w+\.js>/)
+  expect(index).toMatch(/<link href=\/css\/chunk-common\.\w+\.css rel=stylesheet>/)
+  expect(index).toMatch(/<link [^>]*chunk-common[^>]*\.css rel=preload as=style>/)
   // should preload correct page file
   expect(index).toMatch(/<link [^>]*js\/index[^>]*\.js rel=preload as=script>/)
   expect(index).not.toMatch(/<link [^>]*js\/foo[^>]*\.js rel=preload as=script>/)
@@ -140,6 +138,11 @@ test('build w/ multi page', async () => {
 
   const bar = await project.read('dist/bar.html')
   assertSharedAssets(bar)
+  // bar & index have a shared common chunk (App.vue)
+  expect(bar).toMatch(/<link [^>]*js\/chunk-common[^>]*\.js rel=preload as=script>/)
+  expect(bar).toMatch(/<script [^>]*src=\/js\/chunk-common\.\w+\.js>/)
+  expect(bar).toMatch(/<link href=\/css\/chunk-common\.\w+\.css rel=stylesheet>/)
+  expect(bar).toMatch(/<link [^>]*chunk-common[^>]*\.css rel=preload as=style>/)
   // should preload correct page file
   expect(bar).not.toMatch(/<link [^>]*js\/index[^>]*\.js rel=preload as=script>/)
   expect(bar).not.toMatch(/<link [^>]*js\/foo[^>]*\.js rel=preload as=script>/)