diff --git a/package.json b/package.json index 8d6fe3d384..7c7aa1e7c4 100644 --- a/package.json +++ b/package.json @@ -78,7 +78,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 00e0db9c76..d1449f1a0d 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-beta.3", "@vue/cli-shared-utils": "^4.0.0-beta.3", "babel-loader": "^8.0.6", - "webpack": ">=4 < 4.29" + "webpack": "^4.0.0" }, "peerDependencies": { "@vue/cli-service": "^3.0.0 || ^4.0.0-0" diff --git a/packages/@vue/cli-plugin-eslint/package.json b/packages/@vue/cli-plugin-eslint/package.json index ccf887e458..38dc746efa 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-beta.3", "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 2c21b11aa4..22c5a6afbf 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-beta.3", - "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 395b0a8796..955d8150e3 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/__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(/