Skip to content

Commit ea28e66

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 06e0a72 commit ea28e66

File tree

9 files changed

+33
-31
lines changed

9 files changed

+33
-31
lines changed

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
]
6363
},
6464
"resolutions": {
65-
"**/@types/copy-webpack-plugin/webpack": "5.36.2"
65+
"**/@types/copy-webpack-plugin/webpack": "5.38.1"
6666
},
6767
"devDependencies": {
6868
"@angular/animations": "12.0.0",
@@ -229,7 +229,7 @@
229229
"typescript": "4.2.4",
230230
"verdaccio": "5.0.4",
231231
"verdaccio-auth-memory": "^10.0.0",
232-
"webpack": "5.36.2",
232+
"webpack": "5.38.1",
233233
"webpack-dev-middleware": "4.1.0",
234234
"webpack-dev-server": "3.11.2",
235235
"webpack-merge": "5.7.3",

packages/angular_devkit/build_angular/package.json

Lines changed: 1 addition & 1 deletion
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.36.2",
71+
"webpack": "5.38.1",
7272
"webpack-dev-middleware": "4.1.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

Lines changed: 6 additions & 4 deletions
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

Lines changed: 3 additions & 3 deletions
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@
2222
}
2323
},
2424
"devDependencies": {
25-
"webpack": "5.36.2"
25+
"webpack": "5.38.1"
2626
}
2727
}

packages/angular_devkit/build_webpack/package.json

Lines changed: 1 addition & 1 deletion
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.36.2"
16+
"webpack": "5.38.1"
1717
},
1818
"peerDependencies": {
1919
"webpack": "^5.30.0",

packages/ngtools/webpack/package.json

Lines changed: 1 addition & 1 deletion
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.36.2"
36+
"webpack": "5.38.1"
3737
}
3838
}

yarn.lock

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686

8787
"@angular/dev-infra-private@https://github.com/angular/dev-infra-private-builds.git#0d0c8c43a08fa6d52540283a607c7289e8165c9e":
8888
version "0.0.0"
89-
resolved "https://github.com/angular/dev-infra-private-builds.git#47233b68d11ff433e924afe2e20b5379f0f53eef"
89+
resolved "https://github.com/angular/dev-infra-private-builds.git#bab06572744a776c0fe52114b2eb8470dcd9e30b"
9090
dependencies:
9191
"@angular/benchpress" "0.2.1"
9292
"@bazel/buildifier" "^4.0.1"
@@ -4945,7 +4945,7 @@ eslint-plugin-import@2.22.1:
49454945
resolve "^1.17.0"
49464946
tsconfig-paths "^3.9.0"
49474947

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

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

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

12279-
webpack@5.36.2, webpack@^5.1.0:
12280-
version "5.36.2"
12281-
resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.36.2.tgz#6ef1fb2453ad52faa61e78d486d353d07cca8a0f"
12282-
integrity sha512-XJumVnnGoH2dV+Pk1VwgY4YT6AiMKpVoudUFCNOXMIVrEKPUgEwdIfWPjIuGLESAiS8EdIHX5+TiJz/5JccmRg==
12279+
webpack@5.38.1, webpack@^5.1.0:
12280+
version "5.38.1"
12281+
resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.38.1.tgz#5224c7f24c18e729268d3e3bc97240d6e880258e"
12282+
integrity sha512-OqRmYD1OJbHZph6RUMD93GcCZy4Z4wC0ele4FXyYF0J6AxO1vOSuIlU1hkS/lDlR9CDYBz64MZRmdbdnFFoT2g==
1228312283
dependencies:
1228412284
"@types/eslint-scope" "^3.7.0"
1228512285
"@types/estree" "^0.0.47"
@@ -12291,7 +12291,7 @@ webpack@5.36.2, webpack@^5.1.0:
1229112291
chrome-trace-event "^1.0.2"
1229212292
enhanced-resolve "^5.8.0"
1229312293
es-module-lexer "^0.4.0"
12294-
eslint-scope "^5.1.1"
12294+
eslint-scope "5.1.1"
1229512295
events "^3.2.0"
1229612296
glob-to-regexp "^0.4.1"
1229712297
graceful-fs "^4.2.4"
@@ -12302,8 +12302,8 @@ webpack@5.36.2, webpack@^5.1.0:
1230212302
schema-utils "^3.0.0"
1230312303
tapable "^2.1.1"
1230412304
terser-webpack-plugin "^5.1.1"
12305-
watchpack "^2.0.0"
12306-
webpack-sources "^2.1.1"
12305+
watchpack "^2.2.0"
12306+
webpack-sources "^2.3.0"
1230712307

1230812308
websocket-driver@>=0.5.1, websocket-driver@^0.7.4:
1230912309
version "0.7.4"

0 commit comments

Comments
 (0)