Skip to content

[12.0.x] build: update Webpack to version 5.38.1 #20982

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
filipesilva merged 2 commits into from
May 31, 2021
Merged

[12.0.x] build: update Webpack to version 5.38.1 #20982

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
61cc225
build: update Webpack to version 5.38.1
alan-agius4 May 28, 2021
4f4508a
build: fix typings to works with webpack 5.37.0
alan-agius4 May 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
]
},
"resolutions": {
"**/@types/copy-webpack-plugin/webpack": "5.36.2"
"**/@types/copy-webpack-plugin/webpack": "5.38.1"
},
"devDependencies": {
"@angular/animations": "12.0.0",
Expand Down Expand Up @@ -229,7 +229,7 @@
"typescript": "4.2.4",
"verdaccio": "5.0.4",
"verdaccio-auth-memory": "^10.0.0",
"webpack": "5.36.2",
"webpack": "5.38.1",
"webpack-dev-middleware": "4.1.0",
"webpack-dev-server": "3.11.2",
"webpack-merge": "5.7.3",
Expand Down
2 changes: 1 addition & 1 deletion packages/angular_devkit/build_angular/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
"terser-webpack-plugin": "5.1.2",
"text-table": "0.2.0",
"tree-kill": "1.2.2",
"webpack": "5.36.2",
"webpack": "5.38.1",
"webpack-dev-middleware": "4.1.0",
"webpack-dev-server": "3.11.2",
"webpack-merge": "5.7.3",
Expand Down
10 changes: 6 additions & 4 deletions packages/angular_devkit/build_angular/src/browser/specs/differential_loading_spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ describe('Browser Builder with differential loading', () => {
it(
'emits all the neccessary files for default configuration',
async () => {
const { files } = await browserBuild(architect, host, target);
const { files } = await browserBuild(architect, host, target, { sourceMap: true });

const expectedOutputs = [
'favicon.ico',
Expand Down Expand Up @@ -71,8 +71,7 @@ describe('Browser Builder with differential loading', () => {
async () => {
host.replaceInFile('tsconfig.json', '"target": "es2017",', `"target": "esnext",`);

const { files } = await browserBuild(architect, host, target);

const { files } = await browserBuild(architect, host, target, { sourceMap: true });
const expectedOutputs = [
'favicon.ico',
'index.html',
Expand Down Expand Up @@ -109,7 +108,10 @@ describe('Browser Builder with differential loading', () => {
it(
'deactivates differential loading for watch mode',
async () => {
const { files } = await browserBuild(architect, host, target, { watch: true });
const { files } = await browserBuild(architect, host, target, {
watch: true,
sourceMap: true,
});

const expectedOutputs = [
'favicon.ico',
Expand Down
6 changes: 3 additions & 3 deletions packages/angular_devkit/build_angular/src/browser/specs/scripts-array_spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,9 +174,9 @@ describe('Browser Builder scripts array', () => {
);

const joinedLogs = logs.join('\n');
expect(joinedLogs).toMatch(/lazy-script.+69 bytes/);
expect(joinedLogs).toMatch(/renamed-script.+78 bytes/);
expect(joinedLogs).toMatch(/renamed-lazy-script.+88 bytes/);
expect(joinedLogs).toMatch(/lazy-script.+\d+ bytes/);
expect(joinedLogs).toMatch(/renamed-script.+\d+ bytes/);
expect(joinedLogs).toMatch(/renamed-lazy-script.+\d+ bytes/);
expect(joinedLogs).not.toContain('Lazy Chunks');
});

Expand Down
19 changes: 11 additions & 8 deletions packages/angular_devkit/build_angular/src/webpack/plugins/index-html-webpack-plugin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,16 +106,19 @@ export class IndexHtmlWebpackPlugin extends IndexHtmlGenerator {

protected async readIndex(path: string): Promise<string> {
return new Promise<string>((resolve, reject) => {
this.compilation.inputFileSystem.readFile(path, (err?: Error, data?: string | Buffer) => {
if (err) {
reject(err);
this.compilation.inputFileSystem.readFile(
path,
(err?: Error | null, data?: string | Buffer) => {
if (err) {
reject(err);

return;
}
return;
}

this.compilation.fileDependencies.add(path);
resolve(data?.toString() ?? '');
});
this.compilation.fileDependencies.add(path);
resolve(data?.toString() ?? '');
},
);
});
}
}
2 changes: 1 addition & 1 deletion packages/angular_devkit/build_angular/src/webpack/plugins/scripts-webpack-plugin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ export class ScriptsWebpackPlugin {
return new Promise<webpackSources.Source>((resolve, reject) => {
compilation.inputFileSystem.readFile(
fullPath,
(err?: Error, data?: string | Buffer) => {
(err?: Error | null, data?: string | Buffer) => {
if (err) {
reject(err);

Expand Down
2 changes: 1 addition & 1 deletion packages/angular_devkit/build_angular/test/hello-world-app/angular.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"polyfills": "src/polyfills.ts",
"tsConfig": "src/tsconfig.app.json",
"progress": false,
"sourceMap": true,
"sourceMap": false,
"aot": false,
"vendorChunk": true,
"buildOptimizer": false,
Expand Down
2 changes: 1 addition & 1 deletion packages/angular_devkit/build_optimizer/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@
}
},
"devDependencies": {
"webpack": "5.36.2"
"webpack": "5.38.1"
}
}
2 changes: 1 addition & 1 deletion packages/angular_devkit/build_webpack/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"devDependencies": {
"@angular-devkit/core": "0.0.0",
"node-fetch": "2.6.1",
"webpack": "5.36.2"
"webpack": "5.38.1"
},
"peerDependencies": {
"webpack": "^5.30.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/ngtools/webpack/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,6 @@
"@angular/compiler": "12.0.0",
"@angular/compiler-cli": "12.0.0",
"typescript": "4.2.4",
"webpack": "5.36.2"
"webpack": "5.38.1"
}
}
34 changes: 17 additions & 17 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@

"@angular/dev-infra-private@https://github.com/angular/dev-infra-private-builds.git#0d0c8c43a08fa6d52540283a607c7289e8165c9e":
version "0.0.0"
resolved "https://github.com/angular/dev-infra-private-builds.git#47233b68d11ff433e924afe2e20b5379f0f53eef"
resolved "https://github.com/angular/dev-infra-private-builds.git#bab06572744a776c0fe52114b2eb8470dcd9e30b"
dependencies:
"@angular/benchpress" "0.2.1"
"@bazel/buildifier" "^4.0.1"
Expand Down Expand Up @@ -4945,7 +4945,7 @@ eslint-plugin-import@2.22.1:
resolve "^1.17.0"
tsconfig-paths "^3.9.0"

eslint-scope@^5.0.0, eslint-scope@^5.1.1:
eslint-scope@5.1.1, eslint-scope@^5.0.0, eslint-scope@^5.1.1:
version "5.1.1"
resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c"
integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==
Expand Down Expand Up @@ -12123,10 +12123,10 @@ w3c-xmlserializer@^1.1.2:
webidl-conversions "^4.0.2"
xml-name-validator "^3.0.0"

watchpack@^2.0.0:
version "2.1.1"
resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.1.1.tgz#e99630550fca07df9f90a06056987baa40a689c7"
integrity sha512-Oo7LXCmc1eE1AjyuSBmtC3+Wy4HcV8PxWh2kP6fOl8yTlNS7r0K9l1ao2lrrUza7V39Y3D/BbJgY8VeSlc5JKw==
watchpack@^2.2.0:
version "2.2.0"
resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.2.0.tgz#47d78f5415fe550ecd740f99fe2882323a58b1ce"
integrity sha512-up4YAn/XHgZHIxFBVCdlMiWDj6WaLKpwVeGQk2I5thdYxF/KmF0aaz6TfJZ/hfl1h/XlcDr7k1KH7ThDagpFaA==
dependencies:
glob-to-regexp "^0.4.1"
graceful-fs "^4.1.2"
Expand Down Expand Up @@ -12261,10 +12261,10 @@ webpack-sources@^1.1.0, webpack-sources@^1.2.0, webpack-sources@^1.3.0:
source-list-map "^2.0.0"
source-map "~0.6.1"

webpack-sources@^2.1.1:
version "2.2.0"
resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-2.2.0.tgz#058926f39e3d443193b6c31547229806ffd02bac"
integrity sha512-bQsA24JLwcnWGArOKUxYKhX3Mz/nK1Xf6hxullKERyktjNMC4x8koOeaDNTA2fEJ09BdWLbM/iTW0ithREUP0w==
webpack-sources@^2.3.0:
version "2.3.0"
resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-2.3.0.tgz#9ed2de69b25143a4c18847586ad9eccb19278cfa"
integrity sha512-WyOdtwSvOML1kbgtXbTDnEW0jkJ7hZr/bDByIwszhWd/4XX1A3XMkrbFMsuH4+/MfLlZCUzlAdg4r7jaGKEIgQ==
dependencies:
source-list-map "^2.0.1"
source-map "^0.6.1"
Expand All @@ -12276,10 +12276,10 @@ webpack-subresource-integrity@1.5.2:
dependencies:
webpack-sources "^1.3.0"

webpack@5.36.2, webpack@^5.1.0:
version "5.36.2"
resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.36.2.tgz#6ef1fb2453ad52faa61e78d486d353d07cca8a0f"
integrity sha512-XJumVnnGoH2dV+Pk1VwgY4YT6AiMKpVoudUFCNOXMIVrEKPUgEwdIfWPjIuGLESAiS8EdIHX5+TiJz/5JccmRg==
webpack@5.38.1, webpack@^5.1.0:
version "5.38.1"
resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.38.1.tgz#5224c7f24c18e729268d3e3bc97240d6e880258e"
integrity sha512-OqRmYD1OJbHZph6RUMD93GcCZy4Z4wC0ele4FXyYF0J6AxO1vOSuIlU1hkS/lDlR9CDYBz64MZRmdbdnFFoT2g==
dependencies:
"@types/eslint-scope" "^3.7.0"
"@types/estree" "^0.0.47"
Expand All @@ -12291,7 +12291,7 @@ webpack@5.36.2, webpack@^5.1.0:
chrome-trace-event "^1.0.2"
enhanced-resolve "^5.8.0"
es-module-lexer "^0.4.0"
eslint-scope "^5.1.1"
eslint-scope "5.1.1"
events "^3.2.0"
glob-to-regexp "^0.4.1"
graceful-fs "^4.2.4"
Expand All @@ -12302,8 +12302,8 @@ webpack@5.36.2, webpack@^5.1.0:
schema-utils "^3.0.0"
tapable "^2.1.1"
terser-webpack-plugin "^5.1.1"
watchpack "^2.0.0"
webpack-sources "^2.1.1"
watchpack "^2.2.0"
webpack-sources "^2.3.0"

websocket-driver@>=0.5.1, websocket-driver@^0.7.4:
version "0.7.4"
Expand Down