Skip to content

Commit 494cca6

Browse files
alan-agius4filipesilva
authored andcommitted
build: update Webpack to version 5.38.1
With this change we update to `webpack` to `5.38.1`, this also updates `webpack-sources` to `2.3.0`, The latter is causing OOM errors on our CI, but it in real projects the memory usage only increased by a small fraction. Also, the OOM errors don't manifest themselves when the entire test suit is run locally. Therefore with this change we also disable sourcemap genertation for most of the browser builds to speed up the tests and reduce memery usage.
1 parent afc9d10 commit 494cca6

File tree

9 files changed

+32
-32
lines changed

9 files changed

+32
-32
lines changed

package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
]
6363
},
6464
"resolutions": {
65-
"**/@types/copy-webpack-plugin/webpack": "5.37.0",
65+
"**/@types/copy-webpack-plugin/webpack": "5.38.1",
6666
"ajv-formats/ajv": "8.4.0"
6767
},
6868
"devDependencies": {
@@ -230,7 +230,7 @@
230230
"typescript": "4.2.4",
231231
"verdaccio": "5.0.4",
232232
"verdaccio-auth-memory": "^10.0.0",
233-
"webpack": "5.37.0",
233+
"webpack": "5.38.1",
234234
"webpack-dev-middleware": "4.2.0",
235235
"webpack-dev-server": "3.11.2",
236236
"webpack-merge": "5.7.3",

packages/angular_devkit/build_angular/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
"terser-webpack-plugin": "5.1.2",
6969
"text-table": "0.2.0",
7070
"tree-kill": "1.2.2",
71-
"webpack": "5.37.0",
71+
"webpack": "5.38.1",
7272
"webpack-dev-middleware": "4.2.0",
7373
"webpack-dev-server": "3.11.2",
7474
"webpack-merge": "5.7.3",

packages/angular_devkit/build_angular/src/browser/specs/differential_loading_spec.ts

+6-4
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ describe('Browser Builder with differential loading', () => {
3131
it(
3232
'emits all the neccessary files for default configuration',
3333
async () => {
34-
const { files } = await browserBuild(architect, host, target);
34+
const { files } = await browserBuild(architect, host, target, { sourceMap: true });
3535

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

74-
const { files } = await browserBuild(architect, host, target);
75-
74+
const { files } = await browserBuild(architect, host, target, { sourceMap: true });
7675
const expectedOutputs = [
7776
'favicon.ico',
7877
'index.html',
@@ -109,7 +108,10 @@ describe('Browser Builder with differential loading', () => {
109108
it(
110109
'deactivates differential loading for watch mode',
111110
async () => {
112-
const { files } = await browserBuild(architect, host, target, { watch: true });
111+
const { files } = await browserBuild(architect, host, target, {
112+
watch: true,
113+
sourceMap: true,
114+
});
113115

114116
const expectedOutputs = [
115117
'favicon.ico',

packages/angular_devkit/build_angular/src/browser/specs/scripts-array_spec.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -174,9 +174,9 @@ describe('Browser Builder scripts array', () => {
174174
);
175175

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

packages/angular_devkit/build_angular/test/hello-world-app/angular.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"polyfills": "src/polyfills.ts",
2323
"tsConfig": "src/tsconfig.app.json",
2424
"progress": false,
25-
"sourceMap": true,
25+
"sourceMap": false,
2626
"aot": false,
2727
"vendorChunk": true,
2828
"buildOptimizer": false,

packages/angular_devkit/build_optimizer/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@
2222
}
2323
},
2424
"devDependencies": {
25-
"webpack": "5.37.0"
25+
"webpack": "5.38.1"
2626
}
2727
}

packages/angular_devkit/build_webpack/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"devDependencies": {
1414
"@angular-devkit/core": "0.0.0",
1515
"node-fetch": "2.6.1",
16-
"webpack": "5.37.0"
16+
"webpack": "5.38.1"
1717
},
1818
"peerDependencies": {
1919
"webpack": "^5.30.0",

packages/ngtools/webpack/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,6 @@
3333
"@angular/compiler": "12.0.0",
3434
"@angular/compiler-cli": "12.0.0",
3535
"typescript": "4.2.4",
36-
"webpack": "5.37.0"
36+
"webpack": "5.38.1"
3737
}
3838
}

yarn.lock

+16-18
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@
8686

8787
"@angular/dev-infra-private@https://github.com/angular/dev-infra-private-builds.git#bab06572744a776c0fe52114b2eb8470dcd9e30b":
8888
version "0.0.0"
89-
uid bab06572744a776c0fe52114b2eb8470dcd9e30b
9089
resolved "https://github.com/angular/dev-infra-private-builds.git#bab06572744a776c0fe52114b2eb8470dcd9e30b"
9190
dependencies:
9291
"@angular/benchpress" "0.2.1"
@@ -4775,7 +4774,7 @@ eslint-plugin-import@2.22.1:
47754774
resolve "^1.17.0"
47764775
tsconfig-paths "^3.9.0"
47774776

4778-
eslint-scope@^5.0.0, eslint-scope@^5.1.1:
4777+
eslint-scope@5.1.1, eslint-scope@^5.0.0, eslint-scope@^5.1.1:
47794778
version "5.1.1"
47804779
resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c"
47814780
integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==
@@ -10210,7 +10209,6 @@ sass@1.32.13, sass@^1.32.8:
1021010209

1021110210
"sauce-connect-proxy@https://saucelabs.com/downloads/sc-4.6.4-linux.tar.gz":
1021210211
version "0.0.0"
10213-
uid "992e2cb0d91e54b27a4f5bbd2049f3b774718115"
1021410212
resolved "https://saucelabs.com/downloads/sc-4.6.4-linux.tar.gz#992e2cb0d91e54b27a4f5bbd2049f3b774718115"
1021510213

1021610214
saucelabs@^1.5.0:
@@ -11945,10 +11943,10 @@ w3c-xmlserializer@^1.1.2:
1194511943
webidl-conversions "^4.0.2"
1194611944
xml-name-validator "^3.0.0"
1194711945

11948-
watchpack@^2.0.0:
11949-
version "2.1.1"
11950-
resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.1.1.tgz#e99630550fca07df9f90a06056987baa40a689c7"
11951-
integrity sha512-Oo7LXCmc1eE1AjyuSBmtC3+Wy4HcV8PxWh2kP6fOl8yTlNS7r0K9l1ao2lrrUza7V39Y3D/BbJgY8VeSlc5JKw==
11946+
watchpack@^2.2.0:
11947+
version "2.2.0"
11948+
resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.2.0.tgz#47d78f5415fe550ecd740f99fe2882323a58b1ce"
11949+
integrity sha512-up4YAn/XHgZHIxFBVCdlMiWDj6WaLKpwVeGQk2I5thdYxF/KmF0aaz6TfJZ/hfl1h/XlcDr7k1KH7ThDagpFaA==
1195211950
dependencies:
1195311951
glob-to-regexp "^0.4.1"
1195411952
graceful-fs "^4.1.2"
@@ -12083,10 +12081,10 @@ webpack-sources@^1.1.0, webpack-sources@^1.2.0, webpack-sources@^1.3.0:
1208312081
source-list-map "^2.0.0"
1208412082
source-map "~0.6.1"
1208512083

12086-
webpack-sources@^2.1.1:
12087-
version "2.2.0"
12088-
resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-2.2.0.tgz#058926f39e3d443193b6c31547229806ffd02bac"
12089-
integrity sha512-bQsA24JLwcnWGArOKUxYKhX3Mz/nK1Xf6hxullKERyktjNMC4x8koOeaDNTA2fEJ09BdWLbM/iTW0ithREUP0w==
12084+
webpack-sources@^2.3.0:
12085+
version "2.3.0"
12086+
resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-2.3.0.tgz#9ed2de69b25143a4c18847586ad9eccb19278cfa"
12087+
integrity sha512-WyOdtwSvOML1kbgtXbTDnEW0jkJ7hZr/bDByIwszhWd/4XX1A3XMkrbFMsuH4+/MfLlZCUzlAdg4r7jaGKEIgQ==
1209012088
dependencies:
1209112089
source-list-map "^2.0.1"
1209212090
source-map "^0.6.1"
@@ -12098,10 +12096,10 @@ webpack-subresource-integrity@1.5.2:
1209812096
dependencies:
1209912097
webpack-sources "^1.3.0"
1210012098

12101-
webpack@5.37.0, webpack@^5.1.0:
12102-
version "5.37.0"
12103-
resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.37.0.tgz#2ab00f613faf494504eb2beef278dab7493cc39d"
12104-
integrity sha512-yvdhgcI6QkQkDe1hINBAJ1UNevqNGTVaCkD2SSJcB8rcrNNl922RI8i2DXUAuNfANoxwsiXXEA4ZPZI9q2oGLA==
12099+
webpack@5.38.1, webpack@^5.1.0:
12100+
version "5.38.1"
12101+
resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.38.1.tgz#5224c7f24c18e729268d3e3bc97240d6e880258e"
12102+
integrity sha512-OqRmYD1OJbHZph6RUMD93GcCZy4Z4wC0ele4FXyYF0J6AxO1vOSuIlU1hkS/lDlR9CDYBz64MZRmdbdnFFoT2g==
1210512103
dependencies:
1210612104
"@types/eslint-scope" "^3.7.0"
1210712105
"@types/estree" "^0.0.47"
@@ -12113,7 +12111,7 @@ webpack@5.37.0, webpack@^5.1.0:
1211312111
chrome-trace-event "^1.0.2"
1211412112
enhanced-resolve "^5.8.0"
1211512113
es-module-lexer "^0.4.0"
12116-
eslint-scope "^5.1.1"
12114+
eslint-scope "5.1.1"
1211712115
events "^3.2.0"
1211812116
glob-to-regexp "^0.4.1"
1211912117
graceful-fs "^4.2.4"
@@ -12124,8 +12122,8 @@ webpack@5.37.0, webpack@^5.1.0:
1212412122
schema-utils "^3.0.0"
1212512123
tapable "^2.1.1"
1212612124
terser-webpack-plugin "^5.1.1"
12127-
watchpack "^2.0.0"
12128-
webpack-sources "^2.1.1"
12125+
watchpack "^2.2.0"
12126+
webpack-sources "^2.3.0"
1212912127

1213012128
websocket-driver@>=0.5.1, websocket-driver@^0.7.4:
1213112129
version "0.7.4"

0 commit comments

Comments
 (0)