diff --git a/package.json b/package.json index b33851f36f..0007c08eb4 100644 --- a/package.json +++ b/package.json @@ -71,7 +71,7 @@ "typescript": "^3.4.3", "vuepress": "1.0.0-alpha.44", "vuepress-theme-vue": "^1.1.0", - "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 bc44e0bc16..766840d58e 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": "^3.10.0", "@vue/cli-shared-utils": "^3.10.0", "babel-loader": "^8.0.5", - "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 d22f1ab2ff..b6e861507a 100644 --- a/packages/@vue/cli-plugin-eslint/package.json +++ b/packages/@vue/cli-plugin-eslint/package.json @@ -27,7 +27,7 @@ "babel-eslint": "^10.0.1", "eslint-loader": "^2.1.2", "globby": "^9.2.0", - "webpack": ">=4 < 4.29", + "webpack": "^4.0.0", "yorkie": "^2.0.0" }, "optionalDependencies": { diff --git a/packages/@vue/cli-plugin-pwa/package.json b/packages/@vue/cli-plugin-pwa/package.json index 3076b828f2..023e174564 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": "^3.10.0", - "webpack": ">=4 < 4.29", + "webpack": "^4.0.0", "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 539a0c4c3f..18b62991b0 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": "^5.3.3", "tslint": "^5.15.0", - "webpack": ">=4 < 4.29", + "webpack": "^4.0.0", "yorkie": "^2.0.0" }, "peerDependencies": { 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(/]*js\/chunk-vendors[^>]*\.js rel=preload as=script>/) - // should split and preload common js and css - expect(file).toMatch(/]*js\/chunk-common[^>]*\.js rel=preload as=script>/) - expect(file).toMatch(/]*chunk-common[^>]*\.css rel=preload as=style>/) - // should load common css - expect(file).toMatch(//) - // should load common js expect(file).toMatch(/