From 6351c44dfc903d25e5d1a14d03b90c23eeb31009 Mon Sep 17 00:00:00 2001 From: Charles Lyding <19598772+clydin@users.noreply.github.com> Date: Wed, 7 Aug 2024 17:32:45 -0400 Subject: [PATCH 01/87] release: cut the v18.2.0-rc.0 release --- CHANGELOG.md | 13 +++++++++++++ package.json | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 51cd3b032ff2..950db95d7094 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,16 @@ + + +# 18.2.0-rc.0 (2024-08-07) + +### @angular/build + +| Commit | Type | Description | +| --------------------------------------------------------------------------------------------------- | ---- | ------------------------------------------------------ | +| [182ecbd18](https://github.com/angular/angular-cli/commit/182ecbd18817679b27441ffef2431f92910b592f) | fix | allow explicitly disabling TypeScript incremental mode | +| [34908a3fc](https://github.com/angular/angular-cli/commit/34908a3fcba304da6916b2113863751500268a8c) | fix | lazy load Node.js inspector for dev server | + + + # 18.1.4 (2024-08-07) diff --git a/package.json b/package.json index 04736b300f82..695411de03cf 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@angular/devkit-repo", - "version": "18.2.0-next.3", + "version": "18.2.0-rc.0", "private": true, "description": "Software Development Kit for Angular", "keywords": [ From 62c040a6a3924496347b439c756f31394fae65e8 Mon Sep 17 00:00:00 2001 From: Angular Robot Date: Fri, 9 Aug 2024 16:11:05 +0000 Subject: [PATCH 02/87] build: update all non-major dependencies (cherry picked from commit 289ea4cad2a1064c5b5aca06db48599fef0f9ff1) --- package.json | 6 +- packages/angular/build/package.json | 2 +- .../angular_devkit/build_angular/package.json | 6 +- yarn.lock | 75 +++++++++++++++---- 4 files changed, 66 insertions(+), 23 deletions(-) diff --git a/package.json b/package.json index 695411de03cf..2dec4850959d 100644 --- a/package.json +++ b/package.json @@ -192,15 +192,15 @@ "source-map-support": "0.5.21", "symbol-observable": "4.0.0", "tar": "^6.1.6", - "terser": "5.31.4", + "terser": "5.31.5", "tree-kill": "1.2.2", "ts-node": "^10.9.1", "tslib": "2.6.3", "typescript": "5.5.4", - "undici": "6.19.5", + "undici": "6.19.7", "verdaccio": "5.32.1", "verdaccio-auth-memory": "^10.0.0", - "vite": "5.3.5", + "vite": "5.4.0", "watchpack": "2.4.1", "webpack": "5.93.0", "webpack-dev-middleware": "7.3.0", diff --git a/packages/angular/build/package.json b/packages/angular/build/package.json index d547ad1e227f..85c42a63b34c 100644 --- a/packages/angular/build/package.json +++ b/packages/angular/build/package.json @@ -41,7 +41,7 @@ "rollup": "4.20.0", "sass": "1.77.8", "semver": "7.6.3", - "vite": "5.3.5", + "vite": "5.4.0", "watchpack": "2.4.1" }, "peerDependencies": { diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json index af73d2e07a8c..a30e64ba144b 100644 --- a/packages/angular_devkit/build_angular/package.json +++ b/packages/angular_devkit/build_angular/package.json @@ -58,10 +58,10 @@ "semver": "7.6.3", "source-map-loader": "5.0.0", "source-map-support": "0.5.21", - "terser": "5.31.4", + "terser": "5.31.5", "tree-kill": "1.2.2", "tslib": "2.6.3", - "vite": "5.3.5", + "vite": "5.4.0", "watchpack": "2.4.1", "webpack": "5.93.0", "webpack-dev-middleware": "7.3.0", @@ -73,7 +73,7 @@ "esbuild": "0.23.0" }, "devDependencies": { - "undici": "6.19.5" + "undici": "6.19.7" }, "peerDependencies": { "@angular/compiler-cli": "^18.0.0 || ^18.2.0-next.0", diff --git a/yarn.lock b/yarn.lock index dcc50868fed6..a343e956b09a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -112,11 +112,11 @@ __metadata: semver: "npm:7.6.3" source-map-loader: "npm:5.0.0" source-map-support: "npm:0.5.21" - terser: "npm:5.31.4" + terser: "npm:5.31.5" tree-kill: "npm:1.2.2" tslib: "npm:2.6.3" - undici: "npm:6.19.5" - vite: "npm:5.3.5" + undici: "npm:6.19.7" + vite: "npm:5.4.0" watchpack: "npm:2.4.1" webpack: "npm:5.93.0" webpack-dev-middleware: "npm:7.3.0" @@ -401,7 +401,7 @@ __metadata: rollup: "npm:4.20.0" sass: "npm:1.77.8" semver: "npm:7.6.3" - vite: "npm:5.3.5" + vite: "npm:5.4.0" watchpack: "npm:2.4.1" peerDependencies: "@angular/compiler-cli": ^18.0.0 || ^18.2.0-next.0 @@ -759,15 +759,15 @@ __metadata: source-map-support: "npm:0.5.21" symbol-observable: "npm:4.0.0" tar: "npm:^6.1.6" - terser: "npm:5.31.4" + terser: "npm:5.31.5" tree-kill: "npm:1.2.2" ts-node: "npm:^10.9.1" tslib: "npm:2.6.3" typescript: "npm:5.5.4" - undici: "npm:6.19.5" + undici: "npm:6.19.7" verdaccio: "npm:5.32.1" verdaccio-auth-memory: "npm:^10.0.0" - vite: "npm:5.3.5" + vite: "npm:5.4.0" watchpack: "npm:2.4.1" webpack: "npm:5.93.0" webpack-dev-middleware: "npm:7.3.0" @@ -14372,7 +14372,7 @@ __metadata: languageName: node linkType: hard -"postcss@npm:8.4.41": +"postcss@npm:8.4.41, postcss@npm:^8.4.40": version: 8.4.41 resolution: "postcss@npm:8.4.41" dependencies: @@ -16596,9 +16596,9 @@ __metadata: languageName: node linkType: hard -"terser@npm:5.31.4": - version: 5.31.4 - resolution: "terser@npm:5.31.4" +"terser@npm:5.31.5": + version: 5.31.5 + resolution: "terser@npm:5.31.5" dependencies: "@jridgewell/source-map": "npm:^0.3.3" acorn: "npm:^8.8.2" @@ -16606,7 +16606,7 @@ __metadata: source-map-support: "npm:~0.5.20" bin: terser: bin/terser - checksum: 10c0/cb47731837623acf657f929a7b6e8a79bfc2b505b2dbe881523c8337c35628af7c37b1b60da1a9a6719be5a3ca06c69b4d9a93e850cdafbc5c91207378acd94b + checksum: 10c0/6e7c66c1f4062ee098bff3dc3c396819ebf5f1740f0615be9de39b675a78c732d199f4dcfdcd15bd65f354e37c45bb944360f532a36fe7f7d22f800ca53c2d02 languageName: node linkType: hard @@ -17191,10 +17191,10 @@ __metadata: languageName: node linkType: hard -"undici@npm:6.19.5": - version: 6.19.5 - resolution: "undici@npm:6.19.5" - checksum: 10c0/ee2c0a62f3e4333bad8b20e8218c8dea4a5b4f5c8589a92897a7aeb5b321f4118bd5eea2591a4add90b6c7d8049eabd8020725b44f9a1ba0fa1f92a71ed14b14 +"undici@npm:6.19.7": + version: 6.19.7 + resolution: "undici@npm:6.19.7" + checksum: 10c0/801d1e66d5bccdd3fcc9ecf1c95b83a593e4867b89e21ed725e35bd4d572b3d3ce1d7feab2a4f2046f65923de70bfafb69ac148c633d1ab30a948d6fec24475a languageName: node linkType: hard @@ -17601,6 +17601,49 @@ __metadata: languageName: node linkType: hard +"vite@npm:5.4.0": + version: 5.4.0 + resolution: "vite@npm:5.4.0" + dependencies: + esbuild: "npm:^0.21.3" + fsevents: "npm:~2.3.3" + postcss: "npm:^8.4.40" + rollup: "npm:^4.13.0" + peerDependencies: + "@types/node": ^18.0.0 || >=20.0.0 + less: "*" + lightningcss: ^1.21.0 + sass: "*" + sass-embedded: "*" + stylus: "*" + sugarss: "*" + terser: ^5.4.0 + dependenciesMeta: + fsevents: + optional: true + peerDependenciesMeta: + "@types/node": + optional: true + less: + optional: true + lightningcss: + optional: true + sass: + optional: true + sass-embedded: + optional: true + stylus: + optional: true + sugarss: + optional: true + terser: + optional: true + bin: + vite: bin/vite.js + checksum: 10c0/122de7795e1c3c08cd0acc7d77296f908398266b424492be7310400107f37a3cf4c9506f2b4b16619e57299ca2859b8ca187aac5e25f8e66d84f9204a1d72d18 + languageName: node + linkType: hard + "void-elements@npm:^2.0.0": version: 2.0.1 resolution: "void-elements@npm:2.0.1" From 5eef87c25cc5242a774ca523517ae092923b179a Mon Sep 17 00:00:00 2001 From: Angular Robot Date: Tue, 13 Aug 2024 09:14:26 +0000 Subject: [PATCH 03/87] build: update all non-major dependencies (cherry picked from commit 8d650d308e584f1d6b9cc6dce1f85f5f9d10924a) --- package.json | 6 +- .../angular_devkit/build_angular/package.json | 2 +- yarn.lock | 116 +++++++++--------- 3 files changed, 62 insertions(+), 62 deletions(-) diff --git a/package.json b/package.json index 2dec4850959d..e11e1e53da57 100644 --- a/package.json +++ b/package.json @@ -112,8 +112,8 @@ "@types/yargs": "^17.0.20", "@types/yargs-parser": "^21.0.0", "@types/yarnpkg__lockfile": "^1.1.5", - "@typescript-eslint/eslint-plugin": "8.0.1", - "@typescript-eslint/parser": "8.0.1", + "@typescript-eslint/eslint-plugin": "8.1.0", + "@typescript-eslint/parser": "8.1.0", "@vitejs/plugin-basic-ssl": "1.1.0", "@web/test-runner": "^0.18.0", "@yarnpkg/lockfile": "1.1.0", @@ -192,7 +192,7 @@ "source-map-support": "0.5.21", "symbol-observable": "4.0.0", "tar": "^6.1.6", - "terser": "5.31.5", + "terser": "5.31.6", "tree-kill": "1.2.2", "ts-node": "^10.9.1", "tslib": "2.6.3", diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json index a30e64ba144b..846d25f56f81 100644 --- a/packages/angular_devkit/build_angular/package.json +++ b/packages/angular_devkit/build_angular/package.json @@ -58,7 +58,7 @@ "semver": "7.6.3", "source-map-loader": "5.0.0", "source-map-support": "0.5.21", - "terser": "5.31.5", + "terser": "5.31.6", "tree-kill": "1.2.2", "tslib": "2.6.3", "vite": "5.4.0", diff --git a/yarn.lock b/yarn.lock index a343e956b09a..4c8a33aed457 100644 --- a/yarn.lock +++ b/yarn.lock @@ -112,7 +112,7 @@ __metadata: semver: "npm:7.6.3" source-map-loader: "npm:5.0.0" source-map-support: "npm:0.5.21" - terser: "npm:5.31.5" + terser: "npm:5.31.6" tree-kill: "npm:1.2.2" tslib: "npm:2.6.3" undici: "npm:6.19.7" @@ -679,8 +679,8 @@ __metadata: "@types/yargs": "npm:^17.0.20" "@types/yargs-parser": "npm:^21.0.0" "@types/yarnpkg__lockfile": "npm:^1.1.5" - "@typescript-eslint/eslint-plugin": "npm:8.0.1" - "@typescript-eslint/parser": "npm:8.0.1" + "@typescript-eslint/eslint-plugin": "npm:8.1.0" + "@typescript-eslint/parser": "npm:8.1.0" "@vitejs/plugin-basic-ssl": "npm:1.1.0" "@web/test-runner": "npm:^0.18.0" "@yarnpkg/lockfile": "npm:1.1.0" @@ -759,7 +759,7 @@ __metadata: source-map-support: "npm:0.5.21" symbol-observable: "npm:4.0.0" tar: "npm:^6.1.6" - terser: "npm:5.31.5" + terser: "npm:5.31.6" tree-kill: "npm:1.2.2" ts-node: "npm:^10.9.1" tslib: "npm:2.6.3" @@ -5309,15 +5309,15 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/eslint-plugin@npm:8.0.1": - version: 8.0.1 - resolution: "@typescript-eslint/eslint-plugin@npm:8.0.1" +"@typescript-eslint/eslint-plugin@npm:8.1.0": + version: 8.1.0 + resolution: "@typescript-eslint/eslint-plugin@npm:8.1.0" dependencies: "@eslint-community/regexpp": "npm:^4.10.0" - "@typescript-eslint/scope-manager": "npm:8.0.1" - "@typescript-eslint/type-utils": "npm:8.0.1" - "@typescript-eslint/utils": "npm:8.0.1" - "@typescript-eslint/visitor-keys": "npm:8.0.1" + "@typescript-eslint/scope-manager": "npm:8.1.0" + "@typescript-eslint/type-utils": "npm:8.1.0" + "@typescript-eslint/utils": "npm:8.1.0" + "@typescript-eslint/visitor-keys": "npm:8.1.0" graphemer: "npm:^1.4.0" ignore: "npm:^5.3.1" natural-compare: "npm:^1.4.0" @@ -5328,66 +5328,66 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 10c0/fd4e11599c4a85d0fbbd0be350f11acaa32d424bc5c2c0b672133266b4b56fc20a78edd0c7b803b4223a1a66736624561a60fee827738118550733d14afb775a + checksum: 10c0/7bbeae588f859b59c34d6a76cac06ef0fa605921b40c5d3b65b94829984280ea84c4dd3f5cb9ce2eb326f5563e9abb4c90ebff05c47f83f4def296c2ea1fa86c languageName: node linkType: hard -"@typescript-eslint/parser@npm:8.0.1": - version: 8.0.1 - resolution: "@typescript-eslint/parser@npm:8.0.1" +"@typescript-eslint/parser@npm:8.1.0": + version: 8.1.0 + resolution: "@typescript-eslint/parser@npm:8.1.0" dependencies: - "@typescript-eslint/scope-manager": "npm:8.0.1" - "@typescript-eslint/types": "npm:8.0.1" - "@typescript-eslint/typescript-estree": "npm:8.0.1" - "@typescript-eslint/visitor-keys": "npm:8.0.1" + "@typescript-eslint/scope-manager": "npm:8.1.0" + "@typescript-eslint/types": "npm:8.1.0" + "@typescript-eslint/typescript-estree": "npm:8.1.0" + "@typescript-eslint/visitor-keys": "npm:8.1.0" debug: "npm:^4.3.4" peerDependencies: eslint: ^8.57.0 || ^9.0.0 peerDependenciesMeta: typescript: optional: true - checksum: 10c0/bf93640f06c9d2e09a79d015d2c3303f58a8569a3f6928544feeeaad8825388133b5e44ca017b4480d38c037644cf6390c785129539fe256f55422ae608943b5 + checksum: 10c0/b94b2d3ab5ca505484d100701fad6a04a5dc8d595029bac1b9f5b8a4a91d80fd605b0f65d230b36a97ab7e5d55eeb0c28af2ab63929a3e4ab8fdefd2a548c36b languageName: node linkType: hard -"@typescript-eslint/scope-manager@npm:8.0.1": - version: 8.0.1 - resolution: "@typescript-eslint/scope-manager@npm:8.0.1" +"@typescript-eslint/scope-manager@npm:8.1.0": + version: 8.1.0 + resolution: "@typescript-eslint/scope-manager@npm:8.1.0" dependencies: - "@typescript-eslint/types": "npm:8.0.1" - "@typescript-eslint/visitor-keys": "npm:8.0.1" - checksum: 10c0/79c00bc726c0c14b800bbbc1c1b88978c2cbeb29d2b06b94a5773f959aafac5cfb37bdb8c3bb80b9fb07fd10440413fce9098f338dce100696a4d3dc1ea6b187 + "@typescript-eslint/types": "npm:8.1.0" + "@typescript-eslint/visitor-keys": "npm:8.1.0" + checksum: 10c0/2bcf8cd176a1819bddcae16c572e7da8fba821b995a91cd53d64d8d6b85a17f5a895522f281ba57e34929574bddd4d6684ee3e545ec4e8096be4c3198e253a9a languageName: node linkType: hard -"@typescript-eslint/type-utils@npm:8.0.1": - version: 8.0.1 - resolution: "@typescript-eslint/type-utils@npm:8.0.1" +"@typescript-eslint/type-utils@npm:8.1.0": + version: 8.1.0 + resolution: "@typescript-eslint/type-utils@npm:8.1.0" dependencies: - "@typescript-eslint/typescript-estree": "npm:8.0.1" - "@typescript-eslint/utils": "npm:8.0.1" + "@typescript-eslint/typescript-estree": "npm:8.1.0" + "@typescript-eslint/utils": "npm:8.1.0" debug: "npm:^4.3.4" ts-api-utils: "npm:^1.3.0" peerDependenciesMeta: typescript: optional: true - checksum: 10c0/5cbf604044d5cd9cc6e95a2eee5a62803a09f46ccf4aa7293e373a4be8b7b57b470cbc97c1121ef354f842e7fc1d17b30c81bf3540023382ad5e339c9ca3ce15 + checksum: 10c0/62753941c4136e8d2daa72fe0410dea48e5317a6f12ece6382ca85e29912bd1b3f739b61d1060fc0a1f8c488dfc905beab4c8b8497951a21c3138a659c7271ec languageName: node linkType: hard -"@typescript-eslint/types@npm:8.0.1": - version: 8.0.1 - resolution: "@typescript-eslint/types@npm:8.0.1" - checksum: 10c0/e7c02d4e153a935c04bfddc0c8fc1618b1c8e9767583cff05a0e063bbacb7f3c8fac2257879c41162fe19094a0de3a567b57969177b2a0c32f39accd4c5601d5 +"@typescript-eslint/types@npm:8.1.0": + version: 8.1.0 + resolution: "@typescript-eslint/types@npm:8.1.0" + checksum: 10c0/ceade44455f45974e68956016c4d1c6626580732f7f9675e14ffa63db80b551752b0df596b20473dae9f0dc6ed966e17417dc2cf36e1a82b6ab0edc97c5eaa50 languageName: node linkType: hard -"@typescript-eslint/typescript-estree@npm:8.0.1": - version: 8.0.1 - resolution: "@typescript-eslint/typescript-estree@npm:8.0.1" +"@typescript-eslint/typescript-estree@npm:8.1.0": + version: 8.1.0 + resolution: "@typescript-eslint/typescript-estree@npm:8.1.0" dependencies: - "@typescript-eslint/types": "npm:8.0.1" - "@typescript-eslint/visitor-keys": "npm:8.0.1" + "@typescript-eslint/types": "npm:8.1.0" + "@typescript-eslint/visitor-keys": "npm:8.1.0" debug: "npm:^4.3.4" globby: "npm:^11.1.0" is-glob: "npm:^4.0.3" @@ -5397,31 +5397,31 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 10c0/12507995dc634a1746b581635e0df9f986ad01e7f0b4482f1f240986e7277ebd301dfe3b59c07da6d1f3d465f9110dc2a61ce50b67a8f31188cad13f7cc3632e + checksum: 10c0/a7bc8275df1c79c4cb14ef086c56674316dd4907efec53eddca35d0b5220428b69c82178ce2d95138da2e398269c8bd0764cae8020a36417e411e35c3c47bc4b languageName: node linkType: hard -"@typescript-eslint/utils@npm:8.0.1": - version: 8.0.1 - resolution: "@typescript-eslint/utils@npm:8.0.1" +"@typescript-eslint/utils@npm:8.1.0": + version: 8.1.0 + resolution: "@typescript-eslint/utils@npm:8.1.0" dependencies: "@eslint-community/eslint-utils": "npm:^4.4.0" - "@typescript-eslint/scope-manager": "npm:8.0.1" - "@typescript-eslint/types": "npm:8.0.1" - "@typescript-eslint/typescript-estree": "npm:8.0.1" + "@typescript-eslint/scope-manager": "npm:8.1.0" + "@typescript-eslint/types": "npm:8.1.0" + "@typescript-eslint/typescript-estree": "npm:8.1.0" peerDependencies: eslint: ^8.57.0 || ^9.0.0 - checksum: 10c0/9ab4baee82ac74caee18fb687697698043385aea5d0ec4bb34d874a6969eaa3e48f9319ab023cbcb6114f86de17f7360a43460fb4159c61760a2d2984004dd21 + checksum: 10c0/c95503a6bdcd98b1ff04d1adbf46377b2036b1c510d90a4a056401f996f775f06c3108c95fb81cd6babc9c97b73b91b8e848f0337bc508de8a49c993582f0e75 languageName: node linkType: hard -"@typescript-eslint/visitor-keys@npm:8.0.1": - version: 8.0.1 - resolution: "@typescript-eslint/visitor-keys@npm:8.0.1" +"@typescript-eslint/visitor-keys@npm:8.1.0": + version: 8.1.0 + resolution: "@typescript-eslint/visitor-keys@npm:8.1.0" dependencies: - "@typescript-eslint/types": "npm:8.0.1" + "@typescript-eslint/types": "npm:8.1.0" eslint-visitor-keys: "npm:^3.4.3" - checksum: 10c0/64c12095a97808bb1e1f5709192b274cac58d6b8fbbf9ec8fafead30f7effef7f0232244ec759298d046e1cd43521b9f3ba37b80618d5184c8b22fae665a7068 + checksum: 10c0/b7544dbb0eec1ddbfcd95c04b51b9a739c2e768c16d1c88508f976a2b0d1bc02fefb7491930e06e48073a5c07c6f488cd8403bba3a8b918888b93a88d5ac3869 languageName: node linkType: hard @@ -16596,9 +16596,9 @@ __metadata: languageName: node linkType: hard -"terser@npm:5.31.5": - version: 5.31.5 - resolution: "terser@npm:5.31.5" +"terser@npm:5.31.6": + version: 5.31.6 + resolution: "terser@npm:5.31.6" dependencies: "@jridgewell/source-map": "npm:^0.3.3" acorn: "npm:^8.8.2" @@ -16606,7 +16606,7 @@ __metadata: source-map-support: "npm:~0.5.20" bin: terser: bin/terser - checksum: 10c0/6e7c66c1f4062ee098bff3dc3c396819ebf5f1740f0615be9de39b675a78c732d199f4dcfdcd15bd65f354e37c45bb944360f532a36fe7f7d22f800ca53c2d02 + checksum: 10c0/b17d02b65a52a5041430572b3c514475820f5e7590fa93773c0f5b4be601ccf3f6d745bf5a79f3ee58187cf85edf61c24ddf4345783839fccb44c9c8fa9b427e languageName: node linkType: hard From d14c9ab0d91411fd20c216d1e27b0233ae48e877 Mon Sep 17 00:00:00 2001 From: Charles Lyding <19598772+clydin@users.noreply.github.com> Date: Mon, 12 Aug 2024 11:39:20 -0400 Subject: [PATCH 04/87] refactor(@angular-devkit/build-angular): reduce custom code in browser-esbuild implementation The implementation of the `browser-esbuild` builder is now a small wrapper around the `application` builder. The custom file writing code is no longer required with the availability of the additional output path options for `application` builder. This also allows the internal `browser-esbuild` programmatic interface to retain its architect-based signature. (cherry picked from commit 7af63b4aba32e9a715a67b43f756d04cdc65d251) --- .../src/builders/browser-esbuild/index.ts | 79 +++---------------- .../tests/options/assets_spec.ts | 4 +- .../tests/options/delete-output-path_spec.ts | 4 +- .../tests/options/deploy-url_spec.ts | 4 +- .../tests/options/main_spec.ts | 4 +- .../src/builders/dev-server/builder.ts | 6 +- .../extract-i18n/application-extraction.ts | 46 ++++++----- 7 files changed, 46 insertions(+), 101 deletions(-) diff --git a/packages/angular_devkit/build_angular/src/builders/browser-esbuild/index.ts b/packages/angular_devkit/build_angular/src/builders/browser-esbuild/index.ts index 6a595e43aa1f..6fcc8feb1535 100644 --- a/packages/angular_devkit/build_angular/src/builders/browser-esbuild/index.ts +++ b/packages/angular_devkit/build_angular/src/builders/browser-esbuild/index.ts @@ -6,21 +6,14 @@ * found in the LICENSE file at https://angular.dev/license */ -import type { ApplicationBuilderOptions } from '@angular/build'; -import { - Result, - ResultKind, - buildApplicationInternal, - deleteOutputDir, - emitFilesToDisk, -} from '@angular/build/private'; -import { BuilderContext, createBuilder } from '@angular-devkit/architect'; +import { type ApplicationBuilderOptions, buildApplication } from '@angular/build'; +import { BuilderContext, BuilderOutput, createBuilder } from '@angular-devkit/architect'; import type { Plugin } from 'esbuild'; -import fs from 'node:fs/promises'; -import path from 'node:path'; import { logBuilderStatusWarnings } from './builder-status-warnings'; import type { Schema as BrowserBuilderOptions } from './schema'; +export type { BrowserBuilderOptions }; + type OutputPathClass = Exclude; /** @@ -37,57 +30,15 @@ export async function* buildEsbuildBrowser( write?: boolean; }, plugins?: Plugin[], -): AsyncIterable { +): AsyncIterable { // Inform user of status of builder and options logBuilderStatusWarnings(userOptions, context); - const normalizedOptions = normalizeOptions(userOptions); - const { deleteOutputPath, outputPath } = normalizedOptions; - const fullOutputPath = path.join(context.workspaceRoot, outputPath.base); - - if (deleteOutputPath && infrastructureSettings?.write !== false) { - await deleteOutputDir(context.workspaceRoot, outputPath.base); - } - - for await (const result of buildApplicationInternal( - normalizedOptions, - context, - plugins && { codePlugins: plugins }, - )) { - // Write the file directly from this builder to maintain webpack output compatibility - // and not output browser files into '/browser'. - if ( - infrastructureSettings?.write !== false && - (result.kind === ResultKind.Full || result.kind === ResultKind.Incremental) - ) { - const directoryExists = new Set(); - // Writes the output file to disk and ensures the containing directories are present - await emitFilesToDisk(Object.entries(result.files), async ([filePath, file]) => { - // Ensure output subdirectories exist - const basePath = path.dirname(filePath); - if (basePath && !directoryExists.has(basePath)) { - await fs.mkdir(path.join(fullOutputPath, basePath), { recursive: true }); - directoryExists.add(basePath); - } - - if (file.origin === 'memory') { - // Write file contents - await fs.writeFile(path.join(fullOutputPath, filePath), file.contents); - } else { - // Copy file contents - await fs.copyFile( - file.inputPath, - path.join(fullOutputPath, filePath), - fs.constants.COPYFILE_FICLONE, - ); - } - }); - } - yield result; - } + const normalizedOptions = convertBrowserOptions(userOptions); + yield* buildApplication(normalizedOptions, context, { codePlugins: plugins }); } -function normalizeOptions( +export function convertBrowserOptions( options: BrowserBuilderOptions, ): Omit & { outputPath: OutputPathClass } { const { @@ -96,6 +47,7 @@ function normalizeOptions( ngswConfigPath, serviceWorker, polyfills, + resourcesOutputPath, ...otherOptions } = options; @@ -106,18 +58,11 @@ function normalizeOptions( outputPath: { base: outputPath, browser: '', + server: '', + media: resourcesOutputPath ?? 'media', }, ...otherOptions, }; } -export async function* buildEsbuildBrowserArchitect( - options: BrowserBuilderOptions, - context: BuilderContext, -) { - for await (const result of buildEsbuildBrowser(options, context)) { - yield { success: result.kind !== ResultKind.Failure }; - } -} - -export default createBuilder(buildEsbuildBrowserArchitect); +export default createBuilder(buildEsbuildBrowser); diff --git a/packages/angular_devkit/build_angular/src/builders/browser-esbuild/tests/options/assets_spec.ts b/packages/angular_devkit/build_angular/src/builders/browser-esbuild/tests/options/assets_spec.ts index 62dec5a44fc6..740612d19478 100644 --- a/packages/angular_devkit/build_angular/src/builders/browser-esbuild/tests/options/assets_spec.ts +++ b/packages/angular_devkit/build_angular/src/builders/browser-esbuild/tests/options/assets_spec.ts @@ -6,10 +6,10 @@ * found in the LICENSE file at https://angular.dev/license */ -import { buildEsbuildBrowserArchitect } from '../../index'; +import { buildEsbuildBrowser } from '../../index'; import { BASE_OPTIONS, BROWSER_BUILDER_INFO, describeBuilder } from '../setup'; -describeBuilder(buildEsbuildBrowserArchitect, BROWSER_BUILDER_INFO, (harness) => { +describeBuilder(buildEsbuildBrowser, BROWSER_BUILDER_INFO, (harness) => { describe('Option: "assets"', () => { beforeEach(async () => { // Application code is not needed for asset tests diff --git a/packages/angular_devkit/build_angular/src/builders/browser-esbuild/tests/options/delete-output-path_spec.ts b/packages/angular_devkit/build_angular/src/builders/browser-esbuild/tests/options/delete-output-path_spec.ts index e4ceda3f4828..5a16d020555d 100644 --- a/packages/angular_devkit/build_angular/src/builders/browser-esbuild/tests/options/delete-output-path_spec.ts +++ b/packages/angular_devkit/build_angular/src/builders/browser-esbuild/tests/options/delete-output-path_spec.ts @@ -6,10 +6,10 @@ * found in the LICENSE file at https://angular.dev/license */ -import { buildEsbuildBrowserArchitect } from '../../index'; +import { buildEsbuildBrowser } from '../../index'; import { BASE_OPTIONS, BROWSER_BUILDER_INFO, describeBuilder } from '../setup'; -describeBuilder(buildEsbuildBrowserArchitect, BROWSER_BUILDER_INFO, (harness) => { +describeBuilder(buildEsbuildBrowser, BROWSER_BUILDER_INFO, (harness) => { describe('Option: "deleteOutputPath"', () => { beforeEach(async () => { // Application code is not needed for asset tests diff --git a/packages/angular_devkit/build_angular/src/builders/browser-esbuild/tests/options/deploy-url_spec.ts b/packages/angular_devkit/build_angular/src/builders/browser-esbuild/tests/options/deploy-url_spec.ts index 692d7e684636..4c3629a400e4 100644 --- a/packages/angular_devkit/build_angular/src/builders/browser-esbuild/tests/options/deploy-url_spec.ts +++ b/packages/angular_devkit/build_angular/src/builders/browser-esbuild/tests/options/deploy-url_spec.ts @@ -6,10 +6,10 @@ * found in the LICENSE file at https://angular.dev/license */ -import { buildEsbuildBrowserArchitect } from '../../index'; +import { buildEsbuildBrowser } from '../../index'; import { BASE_OPTIONS, BROWSER_BUILDER_INFO, describeBuilder } from '../setup'; -describeBuilder(buildEsbuildBrowserArchitect, BROWSER_BUILDER_INFO, (harness) => { +describeBuilder(buildEsbuildBrowser, BROWSER_BUILDER_INFO, (harness) => { describe('Option: "deployUrl"', () => { beforeEach(async () => { // Add a global stylesheet to test link elements diff --git a/packages/angular_devkit/build_angular/src/builders/browser-esbuild/tests/options/main_spec.ts b/packages/angular_devkit/build_angular/src/builders/browser-esbuild/tests/options/main_spec.ts index c3af469b7d75..1111ed01554a 100644 --- a/packages/angular_devkit/build_angular/src/builders/browser-esbuild/tests/options/main_spec.ts +++ b/packages/angular_devkit/build_angular/src/builders/browser-esbuild/tests/options/main_spec.ts @@ -6,10 +6,10 @@ * found in the LICENSE file at https://angular.dev/license */ -import { buildEsbuildBrowserArchitect } from '../../index'; +import { buildEsbuildBrowser } from '../../index'; import { BASE_OPTIONS, BROWSER_BUILDER_INFO, describeBuilder } from '../setup'; -describeBuilder(buildEsbuildBrowserArchitect, BROWSER_BUILDER_INFO, (harness) => { +describeBuilder(buildEsbuildBrowser, BROWSER_BUILDER_INFO, (harness) => { describe('Option: "main"', () => { it('uses a provided TypeScript file', async () => { harness.useTarget('build', { diff --git a/packages/angular_devkit/build_angular/src/builders/dev-server/builder.ts b/packages/angular_devkit/build_angular/src/builders/dev-server/builder.ts index 37a1502200a8..3b244a008c2c 100644 --- a/packages/angular_devkit/build_angular/src/builders/dev-server/builder.ts +++ b/packages/angular_devkit/build_angular/src/builders/dev-server/builder.ts @@ -88,14 +88,16 @@ export function execute( return defer(() => Promise.all([import('@angular/build/private'), import('../browser-esbuild')]), ).pipe( - switchMap(([{ serveWithVite, buildApplicationInternal }, { buildEsbuildBrowser }]) => + switchMap(([{ serveWithVite, buildApplicationInternal }, { convertBrowserOptions }]) => serveWithVite( normalizedOptions, builderName, (options, context, codePlugins) => { return builderName === '@angular-devkit/build-angular:browser-esbuild' ? // eslint-disable-next-line @typescript-eslint/no-explicit-any - buildEsbuildBrowser(options as any, context, { write: false }, codePlugins) + buildApplicationInternal(convertBrowserOptions(options as any), context, { + codePlugins, + }) : buildApplicationInternal(options, context, { codePlugins }); }, context, diff --git a/packages/angular_devkit/build_angular/src/builders/extract-i18n/application-extraction.ts b/packages/angular_devkit/build_angular/src/builders/extract-i18n/application-extraction.ts index 7a7daaa8af15..4e89fad52fd1 100644 --- a/packages/angular_devkit/build_angular/src/builders/extract-i18n/application-extraction.ts +++ b/packages/angular_devkit/build_angular/src/builders/extract-i18n/application-extraction.ts @@ -6,17 +6,13 @@ * found in the LICENSE file at https://angular.dev/license */ -import { - type ApplicationBuilderInternalOptions, - ResultFile, - ResultKind, - buildApplicationInternal, -} from '@angular/build/private'; +import type { ApplicationBuilderOptions } from '@angular/build'; +import { ResultFile, ResultKind, buildApplicationInternal } from '@angular/build/private'; import type { ɵParsedMessage as LocalizeMessage } from '@angular/localize'; import type { MessageExtractor } from '@angular/localize/tools'; import type { BuilderContext } from '@angular-devkit/architect'; import nodePath from 'node:path'; -import { buildEsbuildBrowser } from '../browser-esbuild'; +import { BrowserBuilderOptions, convertBrowserOptions } from '../browser-esbuild'; import type { NormalizedExtractI18nOptions } from './options'; export async function extractMessages( @@ -33,30 +29,32 @@ export async function extractMessages( const messages: LocalizeMessage[] = []; // Setup the build options for the application based on the buildTarget option - const buildOptions = (await context.validateOptions( - await context.getTargetOptions(options.buildTarget), - builderName, - )) as unknown as ApplicationBuilderInternalOptions; + let buildOptions; + if (builderName === '@angular-devkit/build-angular:application') { + buildOptions = (await context.validateOptions( + await context.getTargetOptions(options.buildTarget), + builderName, + )) as unknown as ApplicationBuilderOptions; + } else { + buildOptions = convertBrowserOptions( + (await context.validateOptions( + await context.getTargetOptions(options.buildTarget), + builderName, + )) as unknown as BrowserBuilderOptions, + ); + } + buildOptions.optimization = false; buildOptions.sourceMap = { scripts: true, vendor: true, styles: false }; buildOptions.localize = false; buildOptions.budgets = undefined; buildOptions.index = false; buildOptions.serviceWorker = false; + buildOptions.ssr = false; + buildOptions.appShell = false; + buildOptions.prerender = false; - let build; - if (builderName === '@angular-devkit/build-angular:application') { - build = buildApplicationInternal; - - buildOptions.ssr = false; - buildOptions.appShell = false; - buildOptions.prerender = false; - } else { - build = buildEsbuildBrowser; - } - - // eslint-disable-next-line @typescript-eslint/no-explicit-any - const builderResult = await first(build(buildOptions as any, context, { write: false })); + const builderResult = await first(buildApplicationInternal(buildOptions, context)); let success = false; if (!builderResult || builderResult.kind === ResultKind.Failure) { From 4528be1eaba299ec5dae978d6e25e29ef5db770d Mon Sep 17 00:00:00 2001 From: Alan Agius Date: Wed, 14 Aug 2024 14:21:07 +0000 Subject: [PATCH 05/87] build: add missing `pkg_deps` for `@angular/create` Included missing `@angular/cli` in `pkg_deps`. (cherry picked from commit 650aeec286bb991bcdad3bc63b2813bc4bc3aaee) --- packages/angular/create/BUILD.bazel | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/angular/create/BUILD.bazel b/packages/angular/create/BUILD.bazel index b4e42da1e4ed..e65dbcb98d1c 100644 --- a/packages/angular/create/BUILD.bazel +++ b/packages/angular/create/BUILD.bazel @@ -26,6 +26,9 @@ genrule( pkg_npm( name = "npm_package", + pkg_deps = [ + "//packages/angular/cli:package.json", + ], tags = ["release-package"], visibility = ["//visibility:public"], deps = [ From 0c2ca9a040c0ce69ad363b8cb323af87c6b6e4e5 Mon Sep 17 00:00:00 2001 From: Alan Agius Date: Wed, 14 Aug 2024 16:46:59 +0000 Subject: [PATCH 06/87] build: remove Bazel typings workaround The workaround is no longer necessary since the bug has been resolved upstream. (cherry picked from commit 474571f087d4f3c0e8c768da15683ee2316828cb) --- package.json | 1 + packages/angular/cli/BUILD.bazel | 1 + packages/angular/cli/src/typings-bazel.d.ts | 14 -------------- .../build_angular/src/babel-bazel.d.ts | 17 ----------------- tsconfig.json | 1 - yarn.lock | 1 + 6 files changed, 3 insertions(+), 32 deletions(-) delete mode 100644 packages/angular/cli/src/typings-bazel.d.ts delete mode 100644 packages/angular_devkit/build_angular/src/babel-bazel.d.ts diff --git a/package.json b/package.json index e11e1e53da57..a157861a8d94 100644 --- a/package.json +++ b/package.json @@ -167,6 +167,7 @@ "ng-packagr": "18.2.0-next.0", "npm": "^10.8.1", "npm-package-arg": "11.0.3", + "npm-pick-manifest": "9.1.0", "open": "10.1.0", "ora": "5.4.1", "pacote": "18.0.6", diff --git a/packages/angular/cli/BUILD.bazel b/packages/angular/cli/BUILD.bazel index 252cd6c77df3..bfdcaca10e98 100644 --- a/packages/angular/cli/BUILD.bazel +++ b/packages/angular/cli/BUILD.bazel @@ -69,6 +69,7 @@ ts_library( "@npm//jsonc-parser", "@npm//listr2", "@npm//npm-package-arg", + "@npm//npm-pick-manifest", "@npm//pacote", "@npm//semver", "@npm//yargs", diff --git a/packages/angular/cli/src/typings-bazel.d.ts b/packages/angular/cli/src/typings-bazel.d.ts deleted file mode 100644 index 80cc2d571570..000000000000 --- a/packages/angular/cli/src/typings-bazel.d.ts +++ /dev/null @@ -1,14 +0,0 @@ -/** - * @license - * Copyright Google LLC All Rights Reserved. - * - * Use of this source code is governed by an MIT-style license that can be - * found in the LICENSE file at https://angular.dev/license - */ - -/* eslint-disable import/no-extraneous-dependencies */ -// Workaround for https://github.com/bazelbuild/rules_nodejs/issues/1033 -// Alternative approach instead of https://github.com/angular/angular/pull/33226 -declare module '@yarnpkg/lockfile' { - export * from '@types/yarnpkg__lockfile'; -} diff --git a/packages/angular_devkit/build_angular/src/babel-bazel.d.ts b/packages/angular_devkit/build_angular/src/babel-bazel.d.ts deleted file mode 100644 index ba847b93d585..000000000000 --- a/packages/angular_devkit/build_angular/src/babel-bazel.d.ts +++ /dev/null @@ -1,17 +0,0 @@ -/** - * @license - * Copyright Google LLC All Rights Reserved. - * - * Use of this source code is governed by an MIT-style license that can be - * found in the LICENSE file at https://angular.dev/license - */ - -/* eslint-disable import/no-extraneous-dependencies */ -// Workaround for https://github.com/bazelbuild/rules_nodejs/issues/1033 -// Alternative approach instead of https://github.com/angular/angular/pull/33226 -declare module '@babel/core' { - export * from '@types/babel__core'; -} -declare module '@babel/generator' { - export { default } from '@types/babel__generator'; -} diff --git a/tsconfig.json b/tsconfig.json index fe9e0e782ebd..7ff8885fe17c 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -33,7 +33,6 @@ } }, "exclude": [ - "packages/angular_devkit/build_angular/src/babel-bazel.d.ts", "dist/**/*", "dist-schema/**", "goldens/**/*", diff --git a/yarn.lock b/yarn.lock index 4c8a33aed457..6df9b82679f4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -734,6 +734,7 @@ __metadata: ng-packagr: "npm:18.2.0-next.0" npm: "npm:^10.8.1" npm-package-arg: "npm:11.0.3" + npm-pick-manifest: "npm:9.1.0" open: "npm:10.1.0" ora: "npm:5.4.1" pacote: "npm:18.0.6" From eb9c7fee72a7164e354d1ace1bad6d54df7e4c62 Mon Sep 17 00:00:00 2001 From: Alan Agius Date: Wed, 14 Aug 2024 17:20:12 +0000 Subject: [PATCH 07/87] build: remove unnecessary excludes from tsconfig.json The excluded files are no longer relevant. (cherry picked from commit cb078c276861ce6fb6aaebc589b3c44fcb854c38) --- tsconfig.json | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/tsconfig.json b/tsconfig.json index 7ff8885fe17c..65db5fb17ac1 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -35,13 +35,10 @@ "exclude": [ "dist/**/*", "dist-schema/**", - "goldens/**/*", "**/node_modules/**/*", "**/third_party/**/*", - "packages/angular_devkit/schematics_cli/blank/*-files/**/*", "packages/angular_devkit/schematics_cli/schematic/files/**/*", "packages/angular_devkit/*/test/**/*", - "tests/**/*", - ".ng-dev/**/*" + "tests/**/*" ] } From 1a876a3153ca12e22c129b51bef5e88ec8c084ee Mon Sep 17 00:00:00 2001 From: Charles Lyding <19598772+clydin@users.noreply.github.com> Date: Wed, 14 Aug 2024 13:16:09 -0400 Subject: [PATCH 08/87] build: update Angular versions to 18.2 stable --- package.json | 24 +- packages/angular/build/package.json | 8 +- packages/angular/pwa/package.json | 2 +- packages/angular/ssr/package.json | 4 +- .../angular_devkit/build_angular/package.json | 10 +- packages/ngtools/webpack/package.json | 2 +- .../utility/latest-versions/package.json | 6 +- yarn.lock | 217 ++++++++++-------- 8 files changed, 155 insertions(+), 118 deletions(-) diff --git a/package.json b/package.json index a157861a8d94..77091750672f 100644 --- a/package.json +++ b/package.json @@ -52,23 +52,23 @@ }, "devDependencies": { "@ampproject/remapping": "2.3.0", - "@angular/animations": "18.2.0-rc.0", + "@angular/animations": "18.2.0", "@angular/bazel": "patch:@angular/bazel@https%3A//github.com/angular/bazel-builds.git%23commit=71bd2e043e076365effdb6076f33b2d8d6bd6d02#~/.yarn/patches/@angular-bazel-https-9848736cf4.patch", "@angular/build-tooling": "https://github.com/angular/dev-infra-private-build-tooling-builds.git#8128c8cc982b49ca12490da8d97692143aefd026", "@angular/cdk": "18.1.3", - "@angular/common": "18.2.0-rc.0", - "@angular/compiler": "18.2.0-rc.0", - "@angular/compiler-cli": "18.2.0-rc.0", - "@angular/core": "18.2.0-rc.0", - "@angular/forms": "18.2.0-rc.0", - "@angular/localize": "18.2.0-rc.0", + "@angular/common": "18.2.0", + "@angular/compiler": "18.2.0", + "@angular/compiler-cli": "18.2.0", + "@angular/core": "18.2.0", + "@angular/forms": "18.2.0", + "@angular/localize": "18.2.0", "@angular/material": "18.1.3", "@angular/ng-dev": "https://github.com/angular/dev-infra-private-ng-dev-builds.git#871fbcb75819dba4dfc6c8971c7aec1c57a8de0c", - "@angular/platform-browser": "18.2.0-rc.0", - "@angular/platform-browser-dynamic": "18.2.0-rc.0", - "@angular/platform-server": "18.2.0-rc.0", - "@angular/router": "18.2.0-rc.0", - "@angular/service-worker": "18.2.0-rc.0", + "@angular/platform-browser": "18.2.0", + "@angular/platform-browser-dynamic": "18.2.0", + "@angular/platform-server": "18.2.0", + "@angular/router": "18.2.0", + "@angular/service-worker": "18.2.0", "@babel/core": "7.25.2", "@babel/generator": "7.25.0", "@babel/helper-annotate-as-pure": "7.24.7", diff --git a/packages/angular/build/package.json b/packages/angular/build/package.json index 85c42a63b34c..283cf904451e 100644 --- a/packages/angular/build/package.json +++ b/packages/angular/build/package.json @@ -45,10 +45,10 @@ "watchpack": "2.4.1" }, "peerDependencies": { - "@angular/compiler-cli": "^18.0.0 || ^18.2.0-next.0", - "@angular/localize": "^18.0.0 || ^18.2.0-next.0", - "@angular/platform-server": "^18.0.0 || ^18.2.0-next.0", - "@angular/service-worker": "^18.0.0 || ^18.2.0-next.0", + "@angular/compiler-cli": "^18.0.0", + "@angular/localize": "^18.0.0", + "@angular/platform-server": "^18.0.0", + "@angular/service-worker": "^18.0.0", "less": "^4.2.0", "postcss": "^8.4.0", "tailwindcss": "^2.0.0 || ^3.0.0", diff --git a/packages/angular/pwa/package.json b/packages/angular/pwa/package.json index 071ae16f831c..778029e66822 100644 --- a/packages/angular/pwa/package.json +++ b/packages/angular/pwa/package.json @@ -17,7 +17,7 @@ "parse5-html-rewriting-stream": "7.0.0" }, "peerDependencies": { - "@angular/cli": "^18.0.0 || ^18.2.0-next.0" + "@angular/cli": "^18.0.0" }, "peerDependenciesMeta": { "@angular/cli": { diff --git a/packages/angular/ssr/package.json b/packages/angular/ssr/package.json index 7ca5ff5d1d5d..bfb9aa80a89b 100644 --- a/packages/angular/ssr/package.json +++ b/packages/angular/ssr/package.json @@ -17,8 +17,8 @@ "tslib": "^2.3.0" }, "peerDependencies": { - "@angular/common": "^18.0.0 || ^18.2.0-next.0", - "@angular/core": "^18.0.0 || ^18.2.0-next.0" + "@angular/common": "^18.0.0", + "@angular/core": "^18.0.0" }, "schematics": "./schematics/collection.json", "repository": { diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json index 846d25f56f81..28365bae6d58 100644 --- a/packages/angular_devkit/build_angular/package.json +++ b/packages/angular_devkit/build_angular/package.json @@ -76,16 +76,16 @@ "undici": "6.19.7" }, "peerDependencies": { - "@angular/compiler-cli": "^18.0.0 || ^18.2.0-next.0", - "@angular/localize": "^18.0.0 || ^18.2.0-next.0", - "@angular/platform-server": "^18.0.0 || ^18.2.0-next.0", - "@angular/service-worker": "^18.0.0 || ^18.2.0-next.0", + "@angular/compiler-cli": "^18.0.0", + "@angular/localize": "^18.0.0", + "@angular/platform-server": "^18.0.0", + "@angular/service-worker": "^18.0.0", "@web/test-runner": "^0.18.0", "browser-sync": "^3.0.2", "jest": "^29.5.0", "jest-environment-jsdom": "^29.5.0", "karma": "^6.3.0", - "ng-packagr": "^18.0.0 || ^18.2.0-next.0", + "ng-packagr": "^18.0.0", "protractor": "^7.0.0", "tailwindcss": "^2.0.0 || ^3.0.0", "typescript": ">=5.4 <5.6" diff --git a/packages/ngtools/webpack/package.json b/packages/ngtools/webpack/package.json index c77f6739c5ca..136f7c996a0a 100644 --- a/packages/ngtools/webpack/package.json +++ b/packages/ngtools/webpack/package.json @@ -21,7 +21,7 @@ }, "homepage": "https://github.com/angular/angular-cli/tree/main/packages/ngtools/webpack", "peerDependencies": { - "@angular/compiler-cli": "^18.0.0 || ^18.2.0-next.0", + "@angular/compiler-cli": "^18.0.0", "typescript": ">=5.4 <5.6", "webpack": "^5.54.0" }, diff --git a/packages/schematics/angular/utility/latest-versions/package.json b/packages/schematics/angular/utility/latest-versions/package.json index f6e60bec918b..29db9cce103e 100644 --- a/packages/schematics/angular/utility/latest-versions/package.json +++ b/packages/schematics/angular/utility/latest-versions/package.json @@ -3,7 +3,7 @@ "comment": "This file is needed so that dependencies are synced by Renovate.", "private": true, "dependencies": { - "@angular/core": "^18.2.0-next.0", + "@angular/core": "^18.2.0", "@types/express": "^4.17.17", "@types/jasmine": "~5.1.0", "@types/node": "^18.18.0", @@ -17,13 +17,13 @@ "karma-jasmine": "~5.1.0", "karma": "~6.4.0", "less": "^4.2.0", - "ng-packagr": "^18.2.0-next.0", + "ng-packagr": "^18.2.0", "postcss": "^8.4.38", "protractor": "~7.0.0", "rxjs": "~7.8.0", "tslib": "^2.3.0", "ts-node": "~10.9.0", "typescript": "~5.5.2", - "zone.js": "~0.14.3" + "zone.js": "~0.14.10" } } diff --git a/yarn.lock b/yarn.lock index 6df9b82679f4..94b7724d94e2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -124,16 +124,16 @@ __metadata: webpack-merge: "npm:6.0.1" webpack-subresource-integrity: "npm:5.1.0" peerDependencies: - "@angular/compiler-cli": ^18.0.0 || ^18.2.0-next.0 - "@angular/localize": ^18.0.0 || ^18.2.0-next.0 - "@angular/platform-server": ^18.0.0 || ^18.2.0-next.0 - "@angular/service-worker": ^18.0.0 || ^18.2.0-next.0 + "@angular/compiler-cli": ^18.0.0 + "@angular/localize": ^18.0.0 + "@angular/platform-server": ^18.0.0 + "@angular/service-worker": ^18.0.0 "@web/test-runner": ^0.18.0 browser-sync: ^3.0.2 jest: ^29.5.0 jest-environment-jsdom: ^29.5.0 karma: ^6.3.0 - ng-packagr: ^18.0.0 || ^18.2.0-next.0 + ng-packagr: ^18.0.0 protractor: ^7.0.0 tailwindcss: ^2.0.0 || ^3.0.0 typescript: ">=5.4 <5.6" @@ -249,14 +249,14 @@ __metadata: languageName: unknown linkType: soft -"@angular/animations@npm:18.2.0-rc.0": - version: 18.2.0-rc.0 - resolution: "@angular/animations@npm:18.2.0-rc.0" +"@angular/animations@npm:18.2.0": + version: 18.2.0 + resolution: "@angular/animations@npm:18.2.0" dependencies: tslib: "npm:^2.3.0" peerDependencies: - "@angular/core": 18.2.0-rc.0 - checksum: 10c0/ed4f6b841e2ff37a32d7c9d1bd90d1b1473771df645450067789b0e1337024bf24c2ac7d62a1505d5d08c0574c1be59c0d53f401e6f94276dcbb52d2aeca4c0a + "@angular/core": 18.2.0 + checksum: 10c0/8ad61102c4862a8e78a6d373f4f8c944a75268767f09050a086cd0e05f06a5e8adb99388b7fbc44923f4cc28bd13445ebb3098f60c3a3addfc53d4a70102c99a languageName: node linkType: hard @@ -404,10 +404,10 @@ __metadata: vite: "npm:5.4.0" watchpack: "npm:2.4.1" peerDependencies: - "@angular/compiler-cli": ^18.0.0 || ^18.2.0-next.0 - "@angular/localize": ^18.0.0 || ^18.2.0-next.0 - "@angular/platform-server": ^18.0.0 || ^18.2.0-next.0 - "@angular/service-worker": ^18.0.0 || ^18.2.0-next.0 + "@angular/compiler-cli": ^18.0.0 + "@angular/localize": ^18.0.0 + "@angular/platform-server": ^18.0.0 + "@angular/service-worker": ^18.0.0 less: ^4.2.0 postcss: ^8.4.0 tailwindcss: ^2.0.0 || ^3.0.0 @@ -531,15 +531,38 @@ __metadata: languageName: unknown linkType: soft -"@angular/common@npm:18.2.0-rc.0": - version: 18.2.0-rc.0 - resolution: "@angular/common@npm:18.2.0-rc.0" +"@angular/common@npm:18.2.0": + version: 18.2.0 + resolution: "@angular/common@npm:18.2.0" dependencies: tslib: "npm:^2.3.0" peerDependencies: - "@angular/core": 18.2.0-rc.0 + "@angular/core": 18.2.0 rxjs: ^6.5.3 || ^7.4.0 - checksum: 10c0/8b86394b5ad39c90c4c50ff28177cbb7ffa396747cbed3bc17e339e445b0b7dc2b89aec3cf7dd97773d7b6c9685411b3c4dd4442a7414ee098dae7bc61441591 + checksum: 10c0/c6ded4739979d5e62d45eaa504031c163bee1f2ef4f1c7d4382494e69379da0855c43ddbdd74450247239468d26f9306b61a585a9401b04ce97fd5e4933af4ea + languageName: node + linkType: hard + +"@angular/compiler-cli@npm:18.2.0": + version: 18.2.0 + resolution: "@angular/compiler-cli@npm:18.2.0" + dependencies: + "@babel/core": "npm:7.25.2" + "@jridgewell/sourcemap-codec": "npm:^1.4.14" + chokidar: "npm:^3.0.0" + convert-source-map: "npm:^1.5.1" + reflect-metadata: "npm:^0.2.0" + semver: "npm:^7.0.0" + tslib: "npm:^2.3.0" + yargs: "npm:^17.2.1" + peerDependencies: + "@angular/compiler": 18.2.0 + typescript: ">=5.4 <5.6" + bin: + ng-xi18n: bundles/src/bin/ng_xi18n.js + ngc: bundles/src/bin/ngc.js + ngcc: bundles/ngcc/index.js + checksum: 10c0/d9922a5a4b5ac5b8d82bac0bb766d6d1645f0a7f3ac2c4bb863efc4fcc0d36bf9442ba842a0f594cf3d32103c221db3340195646f8341df8dcbed7a08eaebaac languageName: node linkType: hard @@ -566,6 +589,20 @@ __metadata: languageName: node linkType: hard +"@angular/compiler@npm:18.2.0": + version: 18.2.0 + resolution: "@angular/compiler@npm:18.2.0" + dependencies: + tslib: "npm:^2.3.0" + peerDependencies: + "@angular/core": 18.2.0 + peerDependenciesMeta: + "@angular/core": + optional: true + checksum: 10c0/db1510d33a6caaef27aa7eb94423be9c6e652707cea37166a774f90d2ff1e36ef9d60b38076abaf829666c1256aa0c3c8daa8e662fd0dd112c7c8135b003ad0c + languageName: node + linkType: hard + "@angular/compiler@npm:18.2.0-rc.0": version: 18.2.0-rc.0 resolution: "@angular/compiler@npm:18.2.0-rc.0" @@ -580,15 +617,15 @@ __metadata: languageName: node linkType: hard -"@angular/core@npm:18.2.0-rc.0": - version: 18.2.0-rc.0 - resolution: "@angular/core@npm:18.2.0-rc.0" +"@angular/core@npm:18.2.0": + version: 18.2.0 + resolution: "@angular/core@npm:18.2.0" dependencies: tslib: "npm:^2.3.0" peerDependencies: rxjs: ^6.5.3 || ^7.4.0 zone.js: ~0.14.10 - checksum: 10c0/3d38231744b9de58bb83eadce3ee172e3bb56e7e5422936d29f76b243c47cf494dafa74e8fe0e0469f6f455b157adaf220cbedaad88795d56631ee151977b353 + checksum: 10c0/a66b9c474bf3b32dc3e678353bd79c2c9c0a8e9531500828d51e3c4a1998bcfaa9834ad5910646dfbd5d7fc9d8f37b55f024f6d5f08407a405c94f0c44f50683 languageName: node linkType: hard @@ -619,23 +656,23 @@ __metadata: resolution: "@angular/devkit-repo@workspace:." dependencies: "@ampproject/remapping": "npm:2.3.0" - "@angular/animations": "npm:18.2.0-rc.0" + "@angular/animations": "npm:18.2.0" "@angular/bazel": "patch:@angular/bazel@https%3A//github.com/angular/bazel-builds.git%23commit=71bd2e043e076365effdb6076f33b2d8d6bd6d02#~/.yarn/patches/@angular-bazel-https-9848736cf4.patch" "@angular/build-tooling": "https://github.com/angular/dev-infra-private-build-tooling-builds.git#8128c8cc982b49ca12490da8d97692143aefd026" "@angular/cdk": "npm:18.1.3" - "@angular/common": "npm:18.2.0-rc.0" - "@angular/compiler": "npm:18.2.0-rc.0" - "@angular/compiler-cli": "npm:18.2.0-rc.0" - "@angular/core": "npm:18.2.0-rc.0" - "@angular/forms": "npm:18.2.0-rc.0" - "@angular/localize": "npm:18.2.0-rc.0" + "@angular/common": "npm:18.2.0" + "@angular/compiler": "npm:18.2.0" + "@angular/compiler-cli": "npm:18.2.0" + "@angular/core": "npm:18.2.0" + "@angular/forms": "npm:18.2.0" + "@angular/localize": "npm:18.2.0" "@angular/material": "npm:18.1.3" "@angular/ng-dev": "https://github.com/angular/dev-infra-private-ng-dev-builds.git#871fbcb75819dba4dfc6c8971c7aec1c57a8de0c" - "@angular/platform-browser": "npm:18.2.0-rc.0" - "@angular/platform-browser-dynamic": "npm:18.2.0-rc.0" - "@angular/platform-server": "npm:18.2.0-rc.0" - "@angular/router": "npm:18.2.0-rc.0" - "@angular/service-worker": "npm:18.2.0-rc.0" + "@angular/platform-browser": "npm:18.2.0" + "@angular/platform-browser-dynamic": "npm:18.2.0" + "@angular/platform-server": "npm:18.2.0" + "@angular/router": "npm:18.2.0" + "@angular/service-worker": "npm:18.2.0" "@babel/core": "npm:7.25.2" "@babel/generator": "npm:7.25.0" "@babel/helper-annotate-as-pure": "npm:7.24.7" @@ -786,36 +823,36 @@ __metadata: languageName: unknown linkType: soft -"@angular/forms@npm:18.2.0-rc.0": - version: 18.2.0-rc.0 - resolution: "@angular/forms@npm:18.2.0-rc.0" +"@angular/forms@npm:18.2.0": + version: 18.2.0 + resolution: "@angular/forms@npm:18.2.0" dependencies: tslib: "npm:^2.3.0" peerDependencies: - "@angular/common": 18.2.0-rc.0 - "@angular/core": 18.2.0-rc.0 - "@angular/platform-browser": 18.2.0-rc.0 + "@angular/common": 18.2.0 + "@angular/core": 18.2.0 + "@angular/platform-browser": 18.2.0 rxjs: ^6.5.3 || ^7.4.0 - checksum: 10c0/8559dab88f50b72fd0d12a2a05bf31b7d376c923a9e7376dc32b72522ea3cfe9b27e1c5e2bb34c93155dc9f4a16d13a574f6065aee824b8764147fff30d0cac3 + checksum: 10c0/5a71b10a7d54b102cf69a79c60e2eb1dc515d11fa8c827c56e3738ee3fbe256f5ca63b46314bb0a3adba7675465919546142785a64dc9f931d7600f295e97e96 languageName: node linkType: hard -"@angular/localize@npm:18.2.0-rc.0": - version: 18.2.0-rc.0 - resolution: "@angular/localize@npm:18.2.0-rc.0" +"@angular/localize@npm:18.2.0": + version: 18.2.0 + resolution: "@angular/localize@npm:18.2.0" dependencies: - "@babel/core": "npm:7.24.9" + "@babel/core": "npm:7.25.2" "@types/babel__core": "npm:7.20.5" fast-glob: "npm:3.3.2" yargs: "npm:^17.2.1" peerDependencies: - "@angular/compiler": 18.2.0-rc.0 - "@angular/compiler-cli": 18.2.0-rc.0 + "@angular/compiler": 18.2.0 + "@angular/compiler-cli": 18.2.0 bin: localize-extract: tools/bundles/src/extract/cli.js localize-migrate: tools/bundles/src/migrate/cli.js localize-translate: tools/bundles/src/translate/cli.js - checksum: 10c0/12a0797598ea2e1cda7983a4e359a4660c167363ed080e0fa05cadbb6d4fec907ad034545ebacec1801fb2b4ea4ed7c483a79eb81299f51f89b69343bd2153be + checksum: 10c0/c278f43533656fd1de9fa78e4ad563048ee8814e4562f356f1ae39f6eb0f3186aa854592d44c570e02803a264e5ceca08cbaf1e49446c2448f1263f840e07775 languageName: node linkType: hard @@ -856,49 +893,49 @@ __metadata: languageName: node linkType: hard -"@angular/platform-browser-dynamic@npm:18.2.0-rc.0": - version: 18.2.0-rc.0 - resolution: "@angular/platform-browser-dynamic@npm:18.2.0-rc.0" +"@angular/platform-browser-dynamic@npm:18.2.0": + version: 18.2.0 + resolution: "@angular/platform-browser-dynamic@npm:18.2.0" dependencies: tslib: "npm:^2.3.0" peerDependencies: - "@angular/common": 18.2.0-rc.0 - "@angular/compiler": 18.2.0-rc.0 - "@angular/core": 18.2.0-rc.0 - "@angular/platform-browser": 18.2.0-rc.0 - checksum: 10c0/ae2c469993fa9a205c26c8a25af308886d92622f9cffde99b20c96a5e1bbabf31381bfe81fe9e18f4dc467db8b8ff5d8ec451a50741839486c77eab2e6219aac + "@angular/common": 18.2.0 + "@angular/compiler": 18.2.0 + "@angular/core": 18.2.0 + "@angular/platform-browser": 18.2.0 + checksum: 10c0/874f2c97e948f05b14c20b2da22e4633f277ca3b41c6cfb8b388b4428e6302d8c79bbbdb7262d539c177453824cff1a046f39d0fb754a0ae502d36595b39c44c languageName: node linkType: hard -"@angular/platform-browser@npm:18.2.0-rc.0": - version: 18.2.0-rc.0 - resolution: "@angular/platform-browser@npm:18.2.0-rc.0" +"@angular/platform-browser@npm:18.2.0": + version: 18.2.0 + resolution: "@angular/platform-browser@npm:18.2.0" dependencies: tslib: "npm:^2.3.0" peerDependencies: - "@angular/animations": 18.2.0-rc.0 - "@angular/common": 18.2.0-rc.0 - "@angular/core": 18.2.0-rc.0 + "@angular/animations": 18.2.0 + "@angular/common": 18.2.0 + "@angular/core": 18.2.0 peerDependenciesMeta: "@angular/animations": optional: true - checksum: 10c0/e7668a2d5fa5ea5298dd7a1ae762a4f3b8d3936a0fcae9198d1e82ffb51ccf52637c29efdde9a294aef4930fdd0ea707cc971aeb2b3ab6fc83a466a1c3acbc11 + checksum: 10c0/270bed2ec0fa1df62a4172762debee8f25e6de4eddb0610db82bfdb44a6c61b6cd33c479f740a43550a7eccbacebe961cd5ecdbed91afe119f3b5cfbfc455acf languageName: node linkType: hard -"@angular/platform-server@npm:18.2.0-rc.0": - version: 18.2.0-rc.0 - resolution: "@angular/platform-server@npm:18.2.0-rc.0" +"@angular/platform-server@npm:18.2.0": + version: 18.2.0 + resolution: "@angular/platform-server@npm:18.2.0" dependencies: tslib: "npm:^2.3.0" xhr2: "npm:^0.2.0" peerDependencies: - "@angular/animations": 18.2.0-rc.0 - "@angular/common": 18.2.0-rc.0 - "@angular/compiler": 18.2.0-rc.0 - "@angular/core": 18.2.0-rc.0 - "@angular/platform-browser": 18.2.0-rc.0 - checksum: 10c0/0ea91668439c2df01d20a2d0c9b8da0ac34baaa00f8b7cfe8b3533da3e0c1198bb33c13343431b53e2dde98e1a962c0e7edbab3b33a3bf97fba934e58954ccdc + "@angular/animations": 18.2.0 + "@angular/common": 18.2.0 + "@angular/compiler": 18.2.0 + "@angular/core": 18.2.0 + "@angular/platform-browser": 18.2.0 + checksum: 10c0/e03481b765bb429e75ed0e3305183647204519f5a01117460af25bc489880b90a60e438f76990a1de5cf1035f8de4f09331023168d6bb4c3eb38d254bd157398 languageName: node linkType: hard @@ -910,38 +947,38 @@ __metadata: "@schematics/angular": "npm:0.0.0-PLACEHOLDER" parse5-html-rewriting-stream: "npm:7.0.0" peerDependencies: - "@angular/cli": ^18.0.0 || ^18.2.0-next.0 + "@angular/cli": ^18.0.0 peerDependenciesMeta: "@angular/cli": optional: true languageName: unknown linkType: soft -"@angular/router@npm:18.2.0-rc.0": - version: 18.2.0-rc.0 - resolution: "@angular/router@npm:18.2.0-rc.0" +"@angular/router@npm:18.2.0": + version: 18.2.0 + resolution: "@angular/router@npm:18.2.0" dependencies: tslib: "npm:^2.3.0" peerDependencies: - "@angular/common": 18.2.0-rc.0 - "@angular/core": 18.2.0-rc.0 - "@angular/platform-browser": 18.2.0-rc.0 + "@angular/common": 18.2.0 + "@angular/core": 18.2.0 + "@angular/platform-browser": 18.2.0 rxjs: ^6.5.3 || ^7.4.0 - checksum: 10c0/861679f66dab0048383538035967e8a6d2dfad2620f7cc6fb91a6fb623e96cac878ebb089f2d6b0a55afc61601c6891c5e3ffa2bd83733649e0055c3539c42aa + checksum: 10c0/c15189eb083c1ee358b9715d269d33d6b160157d02c54c3eec3e8afade389e12f700af8a3103b6cb91d9a53f11fae73ed9a9620fc95239b2399a10b90b4494ba languageName: node linkType: hard -"@angular/service-worker@npm:18.2.0-rc.0": - version: 18.2.0-rc.0 - resolution: "@angular/service-worker@npm:18.2.0-rc.0" +"@angular/service-worker@npm:18.2.0": + version: 18.2.0 + resolution: "@angular/service-worker@npm:18.2.0" dependencies: tslib: "npm:^2.3.0" peerDependencies: - "@angular/common": 18.2.0-rc.0 - "@angular/core": 18.2.0-rc.0 + "@angular/common": 18.2.0 + "@angular/core": 18.2.0 bin: ngsw-config: ngsw-config.js - checksum: 10c0/ab290f0ad0c0c479564f20556c2fbb43209d7fb8b74104b79b8b830218b19fac19a9bb2f0f6f796b2f022f17e6fe0baaedb9186d40a9d3d40a2dfc72a2ff4825 + checksum: 10c0/561614d54bbfe24501113d628d4b212485e1205d8bc2f0525caaf9342d4e2725c7604f85cd4c4c990a738fb772715c6cc2b30c3160f89e4c32ed39cae1293ab2 languageName: node linkType: hard @@ -952,8 +989,8 @@ __metadata: critters: "npm:0.0.24" tslib: "npm:^2.3.0" peerDependencies: - "@angular/common": ^18.0.0 || ^18.2.0-next.0 - "@angular/core": ^18.0.0 || ^18.2.0-next.0 + "@angular/common": ^18.0.0 + "@angular/core": ^18.0.0 languageName: unknown linkType: soft @@ -3485,7 +3522,7 @@ __metadata: typescript: "npm:5.5.4" webpack: "npm:5.93.0" peerDependencies: - "@angular/compiler-cli": ^18.0.0 || ^18.2.0-next.0 + "@angular/compiler-cli": ^18.0.0 typescript: ">=5.4 <5.6" webpack: ^5.54.0 languageName: unknown From ff5a0fe2125f7e6b4aa789171d660f2f2d8d6d9f Mon Sep 17 00:00:00 2001 From: Charles Lyding <19598772+clydin@users.noreply.github.com> Date: Wed, 14 Aug 2024 14:13:49 -0400 Subject: [PATCH 09/87] release: cut the v18.2.0 release --- CHANGELOG.md | 78 ++++++++-------------------------------------------- package.json | 2 +- 2 files changed, 12 insertions(+), 68 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 950db95d7094..98f3f67b223c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,13 +1,18 @@ - + -# 18.2.0-rc.0 (2024-08-07) +# 18.2.0 (2024-08-14) + +### @schematics/angular + +| Commit | Type | Description | +| --------------------------------------------------------------------------------------------------- | ---- | ---------------------------------------- | +| [4da922e4f](https://github.com/angular/angular-cli/commit/4da922e4f4e905a1274e70adca1d875c025b8b46) | feat | use isolatedModules in generated project | ### @angular/build -| Commit | Type | Description | -| --------------------------------------------------------------------------------------------------- | ---- | ------------------------------------------------------ | -| [182ecbd18](https://github.com/angular/angular-cli/commit/182ecbd18817679b27441ffef2431f92910b592f) | fix | allow explicitly disabling TypeScript incremental mode | -| [34908a3fc](https://github.com/angular/angular-cli/commit/34908a3fcba304da6916b2113863751500268a8c) | fix | lazy load Node.js inspector for dev server | +| Commit | Type | Description | +| --------------------------------------------------------------------------------------------------- | ---- | --------------------------------------------------- | +| [24aaf1e37](https://github.com/angular/angular-cli/commit/24aaf1e37f49735ce97fe72fced3d53b51d6b631) | feat | support import attribute based loader configuration | @@ -24,20 +29,6 @@ - - -# 18.2.0-next.3 (2024-07-31) - -### @angular/build - -| Commit | Type | Description | -| --------------------------------------------------------------------------------------------------- | ---- | ----------------------------------------------------------------------------- | -| [636cb6932](https://github.com/angular/angular-cli/commit/636cb6932425b838ccd14ae6ce8b51663e6ded47) | fix | add CSP `nonce` attribute to script tags when inline critical CSS is disabled | -| [7d52941a2](https://github.com/angular/angular-cli/commit/7d52941a2e36b1e08001d7042c9d3e258d8e8b34) | fix | prevent build failures with remote CSS imports when Tailwind is configured | -| [0466fb74a](https://github.com/angular/angular-cli/commit/0466fb74a2559e2b3cbcf0828de5b5e10b729ddb) | fix | resolve error with `extract-i18n` builder for libraries | - - - # 18.1.3 (2024-07-31) @@ -52,21 +43,6 @@ - - -# 18.2.0-next.2 (2024-07-24) - -### @angular/build - -| Commit | Type | Description | -| --------------------------------------------------------------------------------------------------- | ---- | --------------------------------------------------- | -| [37a2138cb](https://github.com/angular/angular-cli/commit/37a2138cb474778ef398a8d4129e1c389dde0f44) | fix | account for HTML base HREF for dev-server externals | -| [8ff687d03](https://github.com/angular/angular-cli/commit/8ff687d036085508fa18397d7a039ab33cc027c7) | fix | correctly detect comma in Sass URL lexer | -| [6d6937587](https://github.com/angular/angular-cli/commit/6d6937587f8dfa95c951e775f97abde45710c8a6) | fix | prevent redirection loop | -| [11a140bab](https://github.com/angular/angular-cli/commit/11a140babb72519a030997b7986946adefd0b824) | fix | serve HTML files directly | - - - # 18.1.2 (2024-07-24) @@ -82,26 +58,6 @@ - - -# 18.2.0-next.1 (2024-07-17) - -### @angular-devkit/build-angular - -| Commit | Type | Description | -| --------------------------------------------------------------------------------------------------- | ---- | ------------------------------------------------- | -| [9baae6e22](https://github.com/angular/angular-cli/commit/9baae6e22c5ad89e2f05b55b46a91ef0fbbe79a2) | fix | skip undefined files when generating budget stats | - -### @angular/build - -| Commit | Type | Description | -| --------------------------------------------------------------------------------------------------- | ---- | ------------------------------------------------------------- | -| [24aaf1e37](https://github.com/angular/angular-cli/commit/24aaf1e37f49735ce97fe72fced3d53b51d6b631) | feat | support import attribute based loader configuration | -| [394f9ce35](https://github.com/angular/angular-cli/commit/394f9ce35f876e7f82c6817d9424b32ec1eaa4a2) | fix | remove Vite "/@id/" prefix for explicit external dependencies | -| [855a4b841](https://github.com/angular/angular-cli/commit/855a4b84121ab16594bcd1785d648eccefa4baa3) | fix | resolve only ".wasm" files | - - - # 18.1.1 (2024-07-17) @@ -121,18 +77,6 @@ - - -# 18.2.0-next.0 (2024-07-10) - -### @schematics/angular - -| Commit | Type | Description | -| --------------------------------------------------------------------------------------------------- | ---- | ---------------------------------------- | -| [4da922e4f](https://github.com/angular/angular-cli/commit/4da922e4f4e905a1274e70adca1d875c025b8b46) | feat | use isolatedModules in generated project | - - - # 18.1.0 (2024-07-10) diff --git a/package.json b/package.json index 77091750672f..6686804e72a0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@angular/devkit-repo", - "version": "18.2.0-rc.0", + "version": "18.2.0", "private": true, "description": "Software Development Kit for Angular", "keywords": [ From 05a274a01365c21f69c0412f3455acd14cc6ddc5 Mon Sep 17 00:00:00 2001 From: Alan Agius Date: Mon, 12 Aug 2024 08:28:30 +0000 Subject: [PATCH 10/87] fix(@angular/cli): prevent bypassing select/checkbox prompts on validation failure Previously, when a select or checkbox prompt failed validation, it was bypassed, preventing users from correcting their input. This commit ensures that when validation fails, the prompts are re-displayed, allowing users to make the necessary corrections. This improves the user experience and helps avoid unintended selections. Closes #28189 (cherry picked from commit fae9542652d1e7cab6e785d13f8a0ac2400bed34) --- .../cli/src/command-builder/schematics-command-module.ts | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/packages/angular/cli/src/command-builder/schematics-command-module.ts b/packages/angular/cli/src/command-builder/schematics-command-module.ts index b1c88c6d8f3e..139f7d89059f 100644 --- a/packages/angular/cli/src/command-builder/schematics-command-module.ts +++ b/packages/angular/cli/src/command-builder/schematics-command-module.ts @@ -197,6 +197,13 @@ export abstract class SchematicsCommandModule definition.multiselect ? prompts.checkbox : prompts.select )({ message: definition.message, + validate: (values) => { + if (!definition.validator) { + return true; + } + + return definition.validator(Object.values(values).map(({ value }) => value)); + }, default: definition.default, choices: definition.items?.map((item) => typeof item == 'string' From 94e27c88bb968589bc8b9b5d6536ce6c0ba0b24f Mon Sep 17 00:00:00 2001 From: Alan Agius Date: Mon, 12 Aug 2024 08:29:28 +0000 Subject: [PATCH 11/87] fix(@angular-devkit/schematics-cli): prevent bypassing select/checkbox prompts on validation failure Previously, when a select or checkbox prompt failed validation, it was bypassed, preventing users from correcting their input. This commit ensures that when validation fails, the prompts are re-displayed, allowing users to make the necessary corrections. This improves the user experience and helps avoid unintended selections. Closes #28189 (cherry picked from commit d4e95f2d153d4d604ea7555fcbb37710e56d86d7) --- packages/angular_devkit/schematics_cli/bin/schematics.ts | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/packages/angular_devkit/schematics_cli/bin/schematics.ts b/packages/angular_devkit/schematics_cli/bin/schematics.ts index d370edf98227..02272044c568 100644 --- a/packages/angular_devkit/schematics_cli/bin/schematics.ts +++ b/packages/angular_devkit/schematics_cli/bin/schematics.ts @@ -96,6 +96,13 @@ function _createPromptProvider(): schema.PromptProvider { )({ message: definition.message, default: definition.default, + validate: (values) => { + if (!definition.validator) { + return true; + } + + return definition.validator(Object.values(values).map(({ value }) => value)); + }, choices: definition.items.map((item) => typeof item == 'string' ? { From 83b2699abbf58a7c90d2339fa4a01d67aa2d2d33 Mon Sep 17 00:00:00 2001 From: Alan Agius Date: Thu, 15 Aug 2024 07:01:14 +0000 Subject: [PATCH 12/87] fix(@angular/build): improve error message when an unhandled exception occurs during prerendering MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This change enhances the error messaging when an unhandled exception occurs during the prerendering process. The updated error message provides more context and clarity. **Previous Behavior** ``` ng b An unhandled exception occurred: Some error!!! See "/tmp/ng-S2ABKF/angular-errors.log" for further details. ``` **Updated Behavior:** ``` ng b Browser bundles Initial chunk files | Names | Raw size | Estimated transfer size main-AFPIPGGK.js | main | 218.00 kB | 59.48 kB polyfills-Z2GOM3BN.js | polyfills | 35.82 kB | 11.80 kB styles-5INURTSO.css | styles | 0 bytes | 0 bytes | Initial total | 253.82 kB | 71.28 kB Server bundles Initial chunk files | Names | Raw size server.mjs | server | 1.11 MB | chunk-HZL5H5M5.mjs | - | 526.77 kB | polyfills.server.mjs | polyfills.server | 269.91 kB | chunk-GFWAPST7.mjs | - | 19.16 kB | chunk-5XUXGTUW.mjs | - | 2.55 kB | render-utils.server.mjs | render-utils.server | 1.46 kB | main.server.mjs | main.server | 149 bytes | Lazy chunk files | Names | Raw size chunk-7YC4RJ5P.mjs | xhr2 | 12.08 kB | Prerendered 1 static route. Application bundle generation failed. [4.923 seconds] ✘ [ERROR] An error occurred while prerendering route '/'. Error: Some error!!! at render (node_modules/@angular/build/src/utils/server-rendering/render-worker.js:20:20) at /angular-cli/abc/node_modules/piscina/dist/worker.js:146:32 ``` Closes #28212 (cherry picked from commit 71c06c69f6f472e5ea86f2e5adbd5062a8cc5f2a) --- .../src/utils/server-rendering/prerender.ts | 57 ++++++++++++------- .../tests/behavior/build-errors_spec.ts | 5 +- 2 files changed, 40 insertions(+), 22 deletions(-) diff --git a/packages/angular/build/src/utils/server-rendering/prerender.ts b/packages/angular/build/src/utils/server-rendering/prerender.ts index 5b42f8c739ef..f8796a7ac861 100644 --- a/packages/angular/build/src/utils/server-rendering/prerender.ts +++ b/packages/angular/build/src/utils/server-rendering/prerender.ts @@ -81,7 +81,11 @@ export async function prerenderPages( } // Get routes to prerender - const { routes: allRoutes, warnings: routesWarnings } = await getAllRoutes( + const { + routes: allRoutes, + warnings: routesWarnings, + errors: routesErrors, + } = await getAllRoutes( workspaceRoot, outputFilesForWorker, assetsReversed, @@ -92,11 +96,15 @@ export async function prerenderPages( verbose, ); + if (routesErrors?.length) { + errors.push(...routesErrors); + } + if (routesWarnings?.length) { warnings.push(...routesWarnings); } - if (allRoutes.size < 1) { + if (allRoutes.size < 1 || errors.length > 0) { return { errors, warnings, @@ -190,22 +198,27 @@ async function renderPages( const isAppShellRoute = appShellRoute === route; const serverContext: ServerContext = isAppShellRoute ? 'app-shell' : 'ssg'; const render: Promise = renderWorker.run({ route, serverContext }); - const renderResult: Promise = render.then(({ content, warnings, errors }) => { - if (content !== undefined) { - const outPath = isAppShellRoute - ? 'index.html' - : posix.join(removeLeadingSlash(route), 'index.html'); - output[outPath] = content; - } - - if (warnings) { - warnings.push(...warnings); - } - - if (errors) { - errors.push(...errors); - } - }); + const renderResult: Promise = render + .then(({ content, warnings, errors }) => { + if (content !== undefined) { + const outPath = isAppShellRoute + ? 'index.html' + : posix.join(removeLeadingSlash(route), 'index.html'); + output[outPath] = content; + } + + if (warnings) { + warnings.push(...warnings); + } + + if (errors) { + errors.push(...errors); + } + }) + .catch((err) => { + errors.push(`An error occurred while prerendering route '${route}'.\n\n${err.stack}`); + void renderWorker.destroy(); + }); renderingPromises.push(renderResult); } @@ -231,7 +244,7 @@ async function getAllRoutes( prerenderOptions: PrerenderOptions, sourcemap: boolean, verbose: boolean, -): Promise<{ routes: Set; warnings?: string[] }> { +): Promise<{ routes: Set; warnings?: string[]; errors?: string[] }> { const { routesFile, discoverRoutes } = prerenderOptions; const routes = new RoutesSet(); const { route: appShellRoute } = appShellOptions; @@ -275,8 +288,12 @@ async function getAllRoutes( recordTiming: false, }); + const errors: string[] = []; const { routes: extractedRoutes, warnings }: RoutersExtractorWorkerResult = await renderWorker .run({}) + .catch((err) => { + errors.push(`An error occurred while extracting routes.\n\n${err.stack}`); + }) .finally(() => { void renderWorker.destroy(); }); @@ -285,7 +302,7 @@ async function getAllRoutes( routes.add(route); } - return { routes, warnings }; + return { routes, warnings, errors }; } function addLeadingSlash(value: string): string { diff --git a/packages/angular_devkit/build_angular/src/builders/server/tests/behavior/build-errors_spec.ts b/packages/angular_devkit/build_angular/src/builders/server/tests/behavior/build-errors_spec.ts index 0fbb12794a62..11bd6b94b25e 100644 --- a/packages/angular_devkit/build_angular/src/builders/server/tests/behavior/build-errors_spec.ts +++ b/packages/angular_devkit/build_angular/src/builders/server/tests/behavior/build-errors_spec.ts @@ -15,13 +15,14 @@ describeBuilder(execute, SERVER_BUILDER_INFO, (harness) => { it('emits errors', async () => { harness.useTarget('server', { ...BASE_OPTIONS, - watch: true, }); // Generate an error await harness.appendToFile('src/main.server.ts', `const foo: = 'abc';`); - const { result, logs } = await harness.executeOnce(); + const { result, logs } = await harness.executeOnce({ + outputLogsOnFailure: false, + }); expect(result?.success).toBeFalse(); expect(logs).toContain( From a655b9255afef4914defaa07567059cf912a4c71 Mon Sep 17 00:00:00 2001 From: Kristiyan Kostadinov Date: Tue, 20 Aug 2024 09:12:48 +0200 Subject: [PATCH 13/87] build: downgrade sass version In 18.2 the Sass version was updated to 1.77.7 which causes a lot of deprecation warnings for Material users (see https://github.com/angular/components/issues/29591). Resolving these warnings can break some apps so we want to delay it until v19. These changes downgrade to a version that doesn't check for the deprecation. --- package.json | 2 +- packages/angular/build/package.json | 2 +- .../angular_devkit/build_angular/package.json | 2 +- yarn.lock | 19 ++++++++++++++++--- 4 files changed, 19 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 6686804e72a0..5bcfbcfe8daf 100644 --- a/package.json +++ b/package.json @@ -184,7 +184,7 @@ "rollup": "4.20.0", "rollup-plugin-sourcemaps": "^0.6.0", "rxjs": "7.8.1", - "sass": "1.77.8", + "sass": "1.77.6", "sass-loader": "16.0.0", "semver": "7.6.3", "shelljs": "^0.8.5", diff --git a/packages/angular/build/package.json b/packages/angular/build/package.json index 283cf904451e..91592c016183 100644 --- a/packages/angular/build/package.json +++ b/packages/angular/build/package.json @@ -39,7 +39,7 @@ "picomatch": "4.0.2", "piscina": "4.6.1", "rollup": "4.20.0", - "sass": "1.77.8", + "sass": "1.77.6", "semver": "7.6.3", "vite": "5.4.0", "watchpack": "2.4.1" diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json index 28365bae6d58..965594523f07 100644 --- a/packages/angular_devkit/build_angular/package.json +++ b/packages/angular_devkit/build_angular/package.json @@ -53,7 +53,7 @@ "postcss-loader": "8.1.1", "resolve-url-loader": "5.0.0", "rxjs": "7.8.1", - "sass": "1.77.8", + "sass": "1.77.6", "sass-loader": "16.0.0", "semver": "7.6.3", "source-map-loader": "5.0.0", diff --git a/yarn.lock b/yarn.lock index 94b7724d94e2..29699394cbf2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -107,7 +107,7 @@ __metadata: postcss-loader: "npm:8.1.1" resolve-url-loader: "npm:5.0.0" rxjs: "npm:7.8.1" - sass: "npm:1.77.8" + sass: "npm:1.77.6" sass-loader: "npm:16.0.0" semver: "npm:7.6.3" source-map-loader: "npm:5.0.0" @@ -399,7 +399,7 @@ __metadata: picomatch: "npm:4.0.2" piscina: "npm:4.6.1" rollup: "npm:4.20.0" - sass: "npm:1.77.8" + sass: "npm:1.77.6" semver: "npm:7.6.3" vite: "npm:5.4.0" watchpack: "npm:2.4.1" @@ -788,7 +788,7 @@ __metadata: rollup: "npm:4.20.0" rollup-plugin-sourcemaps: "npm:^0.6.0" rxjs: "npm:7.8.1" - sass: "npm:1.77.8" + sass: "npm:1.77.6" sass-loader: "npm:16.0.0" semver: "npm:7.6.3" shelljs: "npm:^0.8.5" @@ -15516,6 +15516,19 @@ __metadata: languageName: node linkType: hard +"sass@npm:1.77.6": + version: 1.77.6 + resolution: "sass@npm:1.77.6" + dependencies: + chokidar: "npm:>=3.0.0 <4.0.0" + immutable: "npm:^4.0.0" + source-map-js: "npm:>=0.6.2 <2.0.0" + bin: + sass: sass.js + checksum: 10c0/fe5a393c0aa29eda9f83c06be9b94788b61fe8bad0616ee6e3a25d21ab504f430d40c0064fdca89b02b8e426411ae6dcd906c91f2e48c263575c3d392b6daeb1 + languageName: node + linkType: hard + "sass@npm:1.77.8, sass@npm:^1.69.5": version: 1.77.8 resolution: "sass@npm:1.77.8" From 0be4038a503626e2e9f44d68fe5599cc6028dd8e Mon Sep 17 00:00:00 2001 From: Charles Lyding <19598772+clydin@users.noreply.github.com> Date: Tue, 20 Aug 2024 09:58:22 -0400 Subject: [PATCH 14/87] fix(@angular/build): support reading on-disk files during i18n extraction If an application has JavaScript files that are sourced directly from disk, the extraction would previously fail due to the i18n extractor only able to access the in-memory generated JavaScript files. The extractor can now access both memory and disk-based JavaScript files. (cherry picked from commit 6b544f70e706b9e13564d4ddbb0f0cb352942b2c) --- .../build/src/builders/extract-i18n/application-extraction.ts | 3 +++ .../src/builders/extract-i18n/application-extraction.ts | 3 +++ 2 files changed, 6 insertions(+) diff --git a/packages/angular/build/src/builders/extract-i18n/application-extraction.ts b/packages/angular/build/src/builders/extract-i18n/application-extraction.ts index 0a1bf83e91e2..7640cba88366 100644 --- a/packages/angular/build/src/builders/extract-i18n/application-extraction.ts +++ b/packages/angular/build/src/builders/extract-i18n/application-extraction.ts @@ -9,6 +9,7 @@ import type { ɵParsedMessage as LocalizeMessage } from '@angular/localize'; import type { MessageExtractor } from '@angular/localize/tools'; import type { BuilderContext } from '@angular-devkit/architect'; +import { readFileSync } from 'node:fs'; import nodePath from 'node:path'; import { buildApplicationInternal } from '../application'; import type { @@ -101,6 +102,8 @@ function setupLocalizeExtractor( let content; if (file?.origin === 'memory') { content = textDecoder.decode(file.contents); + } else if (file?.origin === 'disk') { + content = readFileSync(file.inputPath, 'utf-8'); } if (content === undefined) { throw new Error('Unknown file requested: ' + requestedPath); diff --git a/packages/angular_devkit/build_angular/src/builders/extract-i18n/application-extraction.ts b/packages/angular_devkit/build_angular/src/builders/extract-i18n/application-extraction.ts index 4e89fad52fd1..f62208738507 100644 --- a/packages/angular_devkit/build_angular/src/builders/extract-i18n/application-extraction.ts +++ b/packages/angular_devkit/build_angular/src/builders/extract-i18n/application-extraction.ts @@ -11,6 +11,7 @@ import { ResultFile, ResultKind, buildApplicationInternal } from '@angular/build import type { ɵParsedMessage as LocalizeMessage } from '@angular/localize'; import type { MessageExtractor } from '@angular/localize/tools'; import type { BuilderContext } from '@angular-devkit/architect'; +import { readFileSync } from 'node:fs'; import nodePath from 'node:path'; import { BrowserBuilderOptions, convertBrowserOptions } from '../browser-esbuild'; import type { NormalizedExtractI18nOptions } from './options'; @@ -106,6 +107,8 @@ function setupLocalizeExtractor( let content; if (file?.origin === 'memory') { content = textDecoder.decode(file.contents); + } else if (file?.origin === 'disk') { + content = readFileSync(file.inputPath, 'utf-8'); } if (content === undefined) { throw new Error('Unknown file requested: ' + requestedPath); From ddeb2b2b93eaa9d8b659d17357aa2b7a9dc509ce Mon Sep 17 00:00:00 2001 From: Charles Lyding <19598772+clydin@users.noreply.github.com> Date: Tue, 20 Aug 2024 10:21:23 -0400 Subject: [PATCH 15/87] fix(@angular-devkit/build-angular): remove outdated browser-esbuild option warning The `resourcesOutputPath` option from the browser builder is supported as of 18.2. The unsupported warning is now removed. The warning logic has also been consolidated now that there are only several warnings left. (cherry picked from commit 0b161bc7616bef9a8f1f9113a50b07291635159d) --- .../builder-status-warnings.ts | 51 ------------------- .../src/builders/browser-esbuild/index.ts | 20 ++++++-- 2 files changed, 17 insertions(+), 54 deletions(-) delete mode 100644 packages/angular_devkit/build_angular/src/builders/browser-esbuild/builder-status-warnings.ts diff --git a/packages/angular_devkit/build_angular/src/builders/browser-esbuild/builder-status-warnings.ts b/packages/angular_devkit/build_angular/src/builders/browser-esbuild/builder-status-warnings.ts deleted file mode 100644 index d5fc1342dd14..000000000000 --- a/packages/angular_devkit/build_angular/src/builders/browser-esbuild/builder-status-warnings.ts +++ /dev/null @@ -1,51 +0,0 @@ -/** - * @license - * Copyright Google LLC All Rights Reserved. - * - * Use of this source code is governed by an MIT-style license that can be - * found in the LICENSE file at https://angular.dev/license - */ - -import { BuilderContext } from '@angular-devkit/architect'; -import { Schema as BrowserBuilderOptions } from './schema'; - -const UNSUPPORTED_OPTIONS: Array = [ - // * Always enabled with esbuild - // 'commonChunk', - - // * Unused by builder and will be removed in a future release - 'vendorChunk', - 'resourcesOutputPath', - - // * Currently unsupported by esbuild - 'webWorkerTsConfig', -]; - -export function logBuilderStatusWarnings( - options: BrowserBuilderOptions, - { logger }: BuilderContext, -) { - // Validate supported options - for (const unsupportedOption of UNSUPPORTED_OPTIONS) { - const value = (options as unknown as BrowserBuilderOptions)[unsupportedOption]; - - if (value === undefined || value === false) { - continue; - } - if (Array.isArray(value) && value.length === 0) { - continue; - } - if (typeof value === 'object' && Object.keys(value).length === 0) { - continue; - } - - if (unsupportedOption === 'vendorChunk' || unsupportedOption === 'resourcesOutputPath') { - logger.warn( - `The '${unsupportedOption}' option is not used by this builder and will be ignored.`, - ); - continue; - } - - logger.warn(`The '${unsupportedOption}' option is not yet supported by this builder.`); - } -} diff --git a/packages/angular_devkit/build_angular/src/builders/browser-esbuild/index.ts b/packages/angular_devkit/build_angular/src/builders/browser-esbuild/index.ts index 6fcc8feb1535..dd91944b55b8 100644 --- a/packages/angular_devkit/build_angular/src/builders/browser-esbuild/index.ts +++ b/packages/angular_devkit/build_angular/src/builders/browser-esbuild/index.ts @@ -9,7 +9,6 @@ import { type ApplicationBuilderOptions, buildApplication } from '@angular/build'; import { BuilderContext, BuilderOutput, createBuilder } from '@angular-devkit/architect'; import type { Plugin } from 'esbuild'; -import { logBuilderStatusWarnings } from './builder-status-warnings'; import type { Schema as BrowserBuilderOptions } from './schema'; export type { BrowserBuilderOptions }; @@ -31,10 +30,25 @@ export async function* buildEsbuildBrowser( }, plugins?: Plugin[], ): AsyncIterable { - // Inform user of status of builder and options - logBuilderStatusWarnings(userOptions, context); + // Warn about any unsupported options + if (userOptions['vendorChunk']) { + context.logger.warn( + `The 'vendorChunk' option is not used by this builder and will be ignored.`, + ); + } + if (userOptions['commonChunk'] === false) { + context.logger.warn( + `The 'commonChunk' option is always enabled by this builder and will be ignored.`, + ); + } + if (userOptions['webWorkerTsConfig']) { + context.logger.warn(`The 'webWorkerTsConfig' option is not yet supported by this builder.`); + } + // Convert browser builder options to application builder options const normalizedOptions = convertBrowserOptions(userOptions); + + // Execute the application builder yield* buildApplication(normalizedOptions, context, { codePlugins: plugins }); } From 15f3d5a60e16d983fcfc779ac5a621ead5fa20eb Mon Sep 17 00:00:00 2001 From: Alan Agius Date: Wed, 21 Aug 2024 11:22:52 +0000 Subject: [PATCH 16/87] release: cut the v18.2.1 release --- CHANGELOG.md | 31 +++++++++++++++++++++++++++++++ package.json | 2 +- 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 98f3f67b223c..babbb31d20cc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,34 @@ + + +# 18.2.1 (2024-08-21) + +### @angular/cli + +| Commit | Type | Description | +| --------------------------------------------------------------------------------------------------- | ---- | --------------------------------------------------------------- | +| [05a274a01](https://github.com/angular/angular-cli/commit/05a274a01365c21f69c0412f3455acd14cc6ddc5) | fix | prevent bypassing select/checkbox prompts on validation failure | + +### @angular-devkit/schematics-cli + +| Commit | Type | Description | +| --------------------------------------------------------------------------------------------------- | ---- | --------------------------------------------------------------- | +| [94e27c88b](https://github.com/angular/angular-cli/commit/94e27c88bb968589bc8b9b5d6536ce6c0ba0b24f) | fix | prevent bypassing select/checkbox prompts on validation failure | + +### @angular-devkit/build-angular + +| Commit | Type | Description | +| --------------------------------------------------------------------------------------------------- | ---- | ---------------------------------------------- | +| [ddeb2b2b9](https://github.com/angular/angular-cli/commit/ddeb2b2b93eaa9d8b659d17357aa2b7a9dc509ce) | fix | remove outdated browser-esbuild option warning | + +### @angular/build + +| Commit | Type | Description | +| --------------------------------------------------------------------------------------------------- | ---- | ---------------------------------------------------------------------------- | +| [83b2699ab](https://github.com/angular/angular-cli/commit/83b2699abbf58a7c90d2339fa4a01d67aa2d2d33) | fix | improve error message when an unhandled exception occurs during prerendering | +| [0be4038a5](https://github.com/angular/angular-cli/commit/0be4038a503626e2e9f44d68fe5599cc6028dd8e) | fix | support reading on-disk files during i18n extraction | + + + # 18.2.0 (2024-08-14) diff --git a/package.json b/package.json index 5bcfbcfe8daf..ab64e4adb50f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@angular/devkit-repo", - "version": "18.2.0", + "version": "18.2.1", "private": true, "description": "Software Development Kit for Angular", "keywords": [ From b2d14777990f0c2b5e13d4187d3b2350e96113cd Mon Sep 17 00:00:00 2001 From: Alan Agius Date: Wed, 21 Aug 2024 13:05:55 +0000 Subject: [PATCH 17/87] build: mark server tests as flaky These server tests frequently fail due to timeouts. Despite efforts, the root cause has not yet been identified, so they are being marked as flaky to prevent blocking the pipeline while further investigation continues. (cherry picked from commit 60d24b24c5e5993bc93fd4646c76056ec0c15244) --- packages/angular_devkit/build_angular/BUILD.bazel | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/angular_devkit/build_angular/BUILD.bazel b/packages/angular_devkit/build_angular/BUILD.bazel index 4d2e1f7b294b..db87b696e12b 100644 --- a/packages/angular_devkit/build_angular/BUILD.bazel +++ b/packages/angular_devkit/build_angular/BUILD.bazel @@ -342,6 +342,7 @@ LARGE_SPECS = { "shards": 1, }, "server": { + "flaky": True, "extra_deps": [ "@npm//@angular/animations", ], From 3ee53c9a075d862a21e935d877dc9cf2855d2001 Mon Sep 17 00:00:00 2001 From: Alan Agius Date: Thu, 22 Aug 2024 18:37:44 +0000 Subject: [PATCH 18/87] build: clean up redundant `exclude` field from `tsconfig-build.json` The exclude field has been removed from `tsconfig-build.json` as it is redundant. This configuration is used by Bazel, which already specifies the input files explicitly, making the exclude field unnecessary. This change simplifies the configuration without impacting the build process. (cherry picked from commit 4aa95bda24216f4bab6389a199be61b3495d3d90) --- tsconfig-build.json | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/tsconfig-build.json b/tsconfig-build.json index 4b248abd099c..177f584d2deb 100644 --- a/tsconfig-build.json +++ b/tsconfig-build.json @@ -2,26 +2,5 @@ "extends": "./tsconfig.json", "compilerOptions": { "types": ["node"] - }, - "exclude": [ - "packages/angular_devkit/build_angular/src/bazel-babel.d.ts", - "bazel-out/**/*", - "dist/**/*", - "dist-schema/**", - "goldens/**/*", - "**/node_modules/**/*", - "**/third_party/**/*", - "packages/angular_devkit/schematics_cli/blank/*-files/**/*", - "packages/angular_devkit/schematics_cli/schematic/files/**/*", - "packages/angular_devkit/build_angular/src/*/tests/**/*", - "packages/angular_devkit/build_angular/src/builders/*/tests/**/*", - "packages/angular_devkit/build_angular/src/testing/**/*", - "packages/angular_devkit/*/test/**/*", - "packages/schematics/*/*/*files/**/*", - "tests/**/*", - "tools/**/*", - ".ng-dev/**/*", - "**/*_spec.ts", - "scripts/**/*.mts" - ] + } } From e5b4c5c3f531500b6652b1b89775452e9bd507ac Mon Sep 17 00:00:00 2001 From: Alan Agius Date: Fri, 23 Aug 2024 18:50:14 +0000 Subject: [PATCH 19/87] ci: run modules and packages tests using a single bazel invocation Optimize Bazel build with unified module and package tests (cherry picked from commit ac102aa9c6300a7612a272c49b77a7580475391d) --- .github/workflows/ci.yml | 6 ++---- .github/workflows/pr.yml | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 41d41bcbe062..6ae8b75e0b30 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -63,10 +63,8 @@ jobs: uses: angular/dev-infra/github-actions/bazel/configure-remote@d66f2009955fd4b3430d9cf7072d94f4b4da95e7 - name: Install node modules run: yarn install --immutable - - name: Run module tests - run: yarn bazel test //modules/... - - name: Run package tests - run: yarn bazel test //packages/... + - name: Run module and package tests + run: yarn bazel test //modules/... //packages/... e2e: strategy: diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 84082d99f915..d488d8802ce9 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -97,10 +97,8 @@ jobs: uses: angular/dev-infra/github-actions/bazel/configure-remote@d66f2009955fd4b3430d9cf7072d94f4b4da95e7 - name: Install node modules run: yarn install --immutable - - name: Run module tests - run: yarn bazel test //modules/... - - name: Run package tests - run: yarn bazel test //packages/... + - name: Run module and package tests + run: yarn bazel test //modules/... //packages/... e2e: strategy: From 672f6a277d63671ec18a966bf24ec76d24bdef76 Mon Sep 17 00:00:00 2001 From: Alan Agius Date: Sat, 24 Aug 2024 06:50:49 +0000 Subject: [PATCH 20/87] test: disable `buildOptimizer` for server tests Attempting to reduce flaky tests. (cherry picked from commit 3fd7b68c38584acb3f4fc1033d4412e4b055c8e2) --- .../build_angular/src/builders/server/tests/setup.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/angular_devkit/build_angular/src/builders/server/tests/setup.ts b/packages/angular_devkit/build_angular/src/builders/server/tests/setup.ts index 4621a9a7135f..8172b22e63d1 100644 --- a/packages/angular_devkit/build_angular/src/builders/server/tests/setup.ts +++ b/packages/angular_devkit/build_angular/src/builders/server/tests/setup.ts @@ -28,4 +28,5 @@ export const BASE_OPTIONS = Object.freeze({ // Disable optimizations optimization: false, + buildOptimizer: false, }); From 5e030b8edfb411c749e3b5ea13004f23e1199ed7 Mon Sep 17 00:00:00 2001 From: Alan Agius Date: Sat, 24 Aug 2024 06:56:47 +0000 Subject: [PATCH 21/87] Revert "build: mark server tests as flaky" This reverts commit 60d24b24c5e5993bc93fd4646c76056ec0c15244. (cherry picked from commit 1ac220d9bca49cedfc6834bf4b066b42764b2ce6) --- packages/angular_devkit/build_angular/BUILD.bazel | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/angular_devkit/build_angular/BUILD.bazel b/packages/angular_devkit/build_angular/BUILD.bazel index db87b696e12b..4d2e1f7b294b 100644 --- a/packages/angular_devkit/build_angular/BUILD.bazel +++ b/packages/angular_devkit/build_angular/BUILD.bazel @@ -342,7 +342,6 @@ LARGE_SPECS = { "shards": 1, }, "server": { - "flaky": True, "extra_deps": [ "@npm//@angular/animations", ], From 82b76086eb519c224981038dfa55b2ec3cfec0b4 Mon Sep 17 00:00:00 2001 From: Alan Agius Date: Wed, 28 Aug 2024 08:21:03 +0000 Subject: [PATCH 22/87] build: update webpack to `5.94.0` Closes #28292 --- package.json | 2 +- .../angular_devkit/build_angular/package.json | 2 +- packages/ngtools/webpack/src/ivy/plugin.ts | 6 ++- yarn.lock | 42 +++++++++++++++++-- 4 files changed, 46 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index ab64e4adb50f..385a380d2c7a 100644 --- a/package.json +++ b/package.json @@ -203,7 +203,7 @@ "verdaccio-auth-memory": "^10.0.0", "vite": "5.4.0", "watchpack": "2.4.1", - "webpack": "5.93.0", + "webpack": "5.94.0", "webpack-dev-middleware": "7.3.0", "webpack-dev-server": "5.0.4", "webpack-merge": "6.0.1", diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json index 965594523f07..3434773e2dde 100644 --- a/packages/angular_devkit/build_angular/package.json +++ b/packages/angular_devkit/build_angular/package.json @@ -63,7 +63,7 @@ "tslib": "2.6.3", "vite": "5.4.0", "watchpack": "2.4.1", - "webpack": "5.93.0", + "webpack": "5.94.0", "webpack-dev-middleware": "7.3.0", "webpack-dev-server": "5.0.4", "webpack-merge": "6.0.1", diff --git a/packages/ngtools/webpack/src/ivy/plugin.ts b/packages/ngtools/webpack/src/ivy/plugin.ts index 478cfe762806..4faee61bcfa1 100644 --- a/packages/ngtools/webpack/src/ivy/plugin.ts +++ b/packages/ngtools/webpack/src/ivy/plugin.ts @@ -311,7 +311,11 @@ export class AngularWebpackPlugin { compilationFileEmitters.set(compilation, fileEmitters); compilation.compiler.webpack.NormalModule.getCompilationHooks(compilation).loader.tap( PLUGIN_NAME, - (loaderContext: { [AngularPluginSymbol]?: FileEmitterCollection }) => { + (context) => { + const loaderContext = context as typeof context & { + [AngularPluginSymbol]?: FileEmitterCollection; + }; + loaderContext[AngularPluginSymbol] = fileEmitters; }, ); diff --git a/yarn.lock b/yarn.lock index 29699394cbf2..4c61e54ab69b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -118,7 +118,7 @@ __metadata: undici: "npm:6.19.7" vite: "npm:5.4.0" watchpack: "npm:2.4.1" - webpack: "npm:5.93.0" + webpack: "npm:5.94.0" webpack-dev-middleware: "npm:7.3.0" webpack-dev-server: "npm:5.0.4" webpack-merge: "npm:6.0.1" @@ -807,7 +807,7 @@ __metadata: verdaccio-auth-memory: "npm:^10.0.0" vite: "npm:5.4.0" watchpack: "npm:2.4.1" - webpack: "npm:5.93.0" + webpack: "npm:5.94.0" webpack-dev-middleware: "npm:7.3.0" webpack-dev-server: "npm:5.0.4" webpack-merge: "npm:6.0.1" @@ -8644,7 +8644,7 @@ __metadata: languageName: node linkType: hard -"enhanced-resolve@npm:^5.17.0": +"enhanced-resolve@npm:^5.17.0, enhanced-resolve@npm:^5.17.1": version: 5.17.1 resolution: "enhanced-resolve@npm:5.17.1" dependencies: @@ -17932,6 +17932,42 @@ __metadata: languageName: node linkType: hard +"webpack@npm:5.94.0": + version: 5.94.0 + resolution: "webpack@npm:5.94.0" + dependencies: + "@types/estree": "npm:^1.0.5" + "@webassemblyjs/ast": "npm:^1.12.1" + "@webassemblyjs/wasm-edit": "npm:^1.12.1" + "@webassemblyjs/wasm-parser": "npm:^1.12.1" + acorn: "npm:^8.7.1" + acorn-import-attributes: "npm:^1.9.5" + browserslist: "npm:^4.21.10" + chrome-trace-event: "npm:^1.0.2" + enhanced-resolve: "npm:^5.17.1" + es-module-lexer: "npm:^1.2.1" + eslint-scope: "npm:5.1.1" + events: "npm:^3.2.0" + glob-to-regexp: "npm:^0.4.1" + graceful-fs: "npm:^4.2.11" + json-parse-even-better-errors: "npm:^2.3.1" + loader-runner: "npm:^4.2.0" + mime-types: "npm:^2.1.27" + neo-async: "npm:^2.6.2" + schema-utils: "npm:^3.2.0" + tapable: "npm:^2.1.1" + terser-webpack-plugin: "npm:^5.3.10" + watchpack: "npm:^2.4.1" + webpack-sources: "npm:^3.2.3" + peerDependenciesMeta: + webpack-cli: + optional: true + bin: + webpack: bin/webpack.js + checksum: 10c0/b4d1b751f634079bd177a89eef84d80fa5bb8d6fc15d72ab40fc2b9ca5167a79b56585e1a849e9e27e259803ee5c4365cb719e54af70a43c06358ec268ff4ebf + languageName: node + linkType: hard + "websocket-driver@npm:>=0.5.1, websocket-driver@npm:^0.7.4": version: 0.7.4 resolution: "websocket-driver@npm:0.7.4" From 504b00b93b80eec4185838b426c0f6acaa3a148e Mon Sep 17 00:00:00 2001 From: Doug Parker Date: Thu, 29 Aug 2024 11:07:01 -0700 Subject: [PATCH 23/87] fix(@angular-devkit/build-angular): clear context in Karma by default for single run executions This works around https://github.com/angular/angular-cli/issues/28271. (cherry picked from commit 3ee21631f481b2e72be2390b5a2cac74824efbb5) --- .../build_angular/src/builders/karma/index.ts | 9 ++++++--- .../angular/config/files/karma.conf.js.template | 1 - 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/packages/angular_devkit/build_angular/src/builders/karma/index.ts b/packages/angular_devkit/build_angular/src/builders/karma/index.ts index dd545daf7f22..d46dea4923b9 100644 --- a/packages/angular_devkit/build_angular/src/builders/karma/index.ts +++ b/packages/angular_devkit/build_angular/src/builders/karma/index.ts @@ -98,6 +98,12 @@ export function execute( karmaOptions.singleRun = singleRun; + // Workaround https://github.com/angular/angular-cli/issues/28271, by clearing context by default + // for single run executions. Not clearing context for multi-run (watched) builds allows the + // Jasmine Spec Runner to be visible in the browser after test execution. + karmaOptions.client ??= {}; + karmaOptions.client.clearContext ??= singleRun ?? false; // `singleRun` defaults to `false` per Karma docs. + // Convert browsers from a string to an array if (typeof options.browsers === 'string' && options.browsers) { karmaOptions.browsers = options.browsers.split(','); @@ -208,9 +214,6 @@ function getBuiltInKarmaConfig( 'karma-coverage', '@angular-devkit/build-angular/plugins/karma', ].map((p) => workspaceRootRequire(p)), - client: { - clearContext: false, // leave Jasmine Spec Runner output visible in browser - }, jasmineHtmlReporter: { suppressAll: true, // removes the duplicated traces }, diff --git a/packages/schematics/angular/config/files/karma.conf.js.template b/packages/schematics/angular/config/files/karma.conf.js.template index bac55a495a5b..f8da22b16e55 100644 --- a/packages/schematics/angular/config/files/karma.conf.js.template +++ b/packages/schematics/angular/config/files/karma.conf.js.template @@ -19,7 +19,6 @@ module.exports = function (config) { // for example, you can disable the random execution with `random: false` // or set a specific seed with `seed: 4321` }, - clearContext: false // leave Jasmine Spec Runner output visible in browser }, jasmineHtmlReporter: { suppressAll: true // removes the duplicated traces From 72fb55cc1c2992c8dbc3952c09243873a9d8ea4e Mon Sep 17 00:00:00 2001 From: Doug Parker Date: Thu, 29 Aug 2024 12:15:18 -0700 Subject: [PATCH 24/87] release: cut the v18.2.2 release --- CHANGELOG.md | 13 +++++++++++++ package.json | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index babbb31d20cc..6f7689da5429 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,16 @@ + + +# 18.2.2 (2024-08-29) + +### @angular-devkit/build-angular + +| Commit | Type | Description | +| --------------------------------------------------------------------------------------------------- | ---- | ----------------------------------------------------------- | +| [504b00b93](https://github.com/angular/angular-cli/commit/504b00b93b80eec4185838b426c0f6acaa3a148e) | fix | clear context in Karma by default for single run executions | +| [82b76086e](https://github.com/angular/angular-cli/commit/82b76086eb519c224981038dfa55b2ec3cfec0b4) | fix | update webpack to `5.94.0` | + + + # 18.2.1 (2024-08-21) diff --git a/package.json b/package.json index 385a380d2c7a..22a4c49ec157 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@angular/devkit-repo", - "version": "18.2.1", + "version": "18.2.2", "private": true, "description": "Software Development Kit for Angular", "keywords": [ From 482076612cac4b6565fc1b5e89ff9ca207653f87 Mon Sep 17 00:00:00 2001 From: Alan Agius Date: Tue, 3 Sep 2024 13:54:05 +0000 Subject: [PATCH 25/87] fix(@angular-devkit/build-angular): update `webpack-dev-middleware` to `7.4.2` This update contains a fix for `Error: Cannot set headers after they are sent to the client`. See: https://github.com/webpack/webpack-dev-middleware/blob/master/CHANGELOG.md#742-2024-08-21 Closes #28331 --- package.json | 2 +- .../angular_devkit/build_angular/package.json | 2 +- yarn.lock | 25 ++++++++++++++++--- 3 files changed, 24 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 22a4c49ec157..fc8eb424ed74 100644 --- a/package.json +++ b/package.json @@ -204,7 +204,7 @@ "vite": "5.4.0", "watchpack": "2.4.1", "webpack": "5.94.0", - "webpack-dev-middleware": "7.3.0", + "webpack-dev-middleware": "7.4.2", "webpack-dev-server": "5.0.4", "webpack-merge": "6.0.1", "webpack-subresource-integrity": "5.1.0", diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json index 3434773e2dde..4d2c77c7a300 100644 --- a/packages/angular_devkit/build_angular/package.json +++ b/packages/angular_devkit/build_angular/package.json @@ -64,7 +64,7 @@ "vite": "5.4.0", "watchpack": "2.4.1", "webpack": "5.94.0", - "webpack-dev-middleware": "7.3.0", + "webpack-dev-middleware": "7.4.2", "webpack-dev-server": "5.0.4", "webpack-merge": "6.0.1", "webpack-subresource-integrity": "5.1.0" diff --git a/yarn.lock b/yarn.lock index 4c61e54ab69b..eecf69e4445e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -119,7 +119,7 @@ __metadata: vite: "npm:5.4.0" watchpack: "npm:2.4.1" webpack: "npm:5.94.0" - webpack-dev-middleware: "npm:7.3.0" + webpack-dev-middleware: "npm:7.4.2" webpack-dev-server: "npm:5.0.4" webpack-merge: "npm:6.0.1" webpack-subresource-integrity: "npm:5.1.0" @@ -808,7 +808,7 @@ __metadata: vite: "npm:5.4.0" watchpack: "npm:2.4.1" webpack: "npm:5.94.0" - webpack-dev-middleware: "npm:7.3.0" + webpack-dev-middleware: "npm:7.4.2" webpack-dev-server: "npm:5.0.4" webpack-merge: "npm:6.0.1" webpack-subresource-integrity: "npm:5.1.0" @@ -17796,7 +17796,26 @@ __metadata: languageName: node linkType: hard -"webpack-dev-middleware@npm:7.3.0, webpack-dev-middleware@npm:^7.1.0": +"webpack-dev-middleware@npm:7.4.2": + version: 7.4.2 + resolution: "webpack-dev-middleware@npm:7.4.2" + dependencies: + colorette: "npm:^2.0.10" + memfs: "npm:^4.6.0" + mime-types: "npm:^2.1.31" + on-finished: "npm:^2.4.1" + range-parser: "npm:^1.2.1" + schema-utils: "npm:^4.0.0" + peerDependencies: + webpack: ^5.0.0 + peerDependenciesMeta: + webpack: + optional: true + checksum: 10c0/2aa873ef57a7095d7fba09400737b6066adc3ded229fd6eba89a666f463c2614c68e01ae58f662c9cdd74f0c8da088523d972329bf4a054e470bc94feb8bcad0 + languageName: node + linkType: hard + +"webpack-dev-middleware@npm:^7.1.0": version: 7.3.0 resolution: "webpack-dev-middleware@npm:7.3.0" dependencies: From f4db482906e6fdcefb6748020539c6d2a3dff92b Mon Sep 17 00:00:00 2001 From: Charles Lyding <19598772+clydin@users.noreply.github.com> Date: Wed, 4 Sep 2024 13:39:57 -0400 Subject: [PATCH 26/87] release: cut the v18.2.3 release --- CHANGELOG.md | 12 ++++++++++++ package.json | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6f7689da5429..c4ec9b320ea2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,15 @@ + + +# 18.2.3 (2024-09-04) + +### @angular-devkit/build-angular + +| Commit | Type | Description | +| --------------------------------------------------------------------------------------------------- | ---- | ------------------------------------------ | +| [482076612](https://github.com/angular/angular-cli/commit/482076612cac4b6565fc1b5e89ff9ca207653f87) | fix | update `webpack-dev-middleware` to `7.4.2` | + + + # 18.2.2 (2024-08-29) diff --git a/package.json b/package.json index fc8eb424ed74..6de4d307deab 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@angular/devkit-repo", - "version": "18.2.2", + "version": "18.2.3", "private": true, "description": "Software Development Kit for Angular", "keywords": [ From 328ed650de8901a4f468bc682f88004b550380f1 Mon Sep 17 00:00:00 2001 From: Jan Martin Date: Fri, 6 Sep 2024 12:06:22 -0700 Subject: [PATCH 27/87] docs: elaborate on debugging jasmine node tests The existing instructions don't quite cover a full debugging setup and miss some flags that allow debugging without modification of BUILD files. (cherry picked from commit f8b220317fcc080626f69b0e718aaae89c649af9) --- docs/process/bazel.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/docs/process/bazel.md b/docs/process/bazel.md index fe136061fe25..4973278c30ba 100644 --- a/docs/process/bazel.md +++ b/docs/process/bazel.md @@ -46,6 +46,7 @@ things on Windows, at which point it breaks. On Linux, Bazel tests will run under a sandbox for isolation. You can turn off this sandbox by adding the [`local = True`](https://docs.bazel.build/versions/master/be/common-definitions.html#common-attributes-tests) attribute to the rule. +You can also force local execution by passing `--test_output=streamed`. Then you will find the intermediate test files in `bazel-out/k8-fastbuild/bin`, followed by the test target path. @@ -58,6 +59,16 @@ causes jasmine to exit with a non-zero exit code. While testing, you can remove the `shard_count` attribute to prevent sharding and the `flaky` attribute to prevent repetition. +Setting `--test_output=streamed` will disable sharding and `--flaky_test_attempts=1` will disable +the reruns of tests that have been marked as `flaky`. + +The `.bazelrc` includes a config for running tests with remote debugging enabled: + +```sh +yarn bazel test --config=debug //packages/angular/cli:angular-cli_test +# Also disable reruns of failing tests that were marked as flaky: +yarn bazel test --config=debug --config=no-sharding //packages/angular/cli:angular-cli_test +``` NB: For a few tests, sandbox is required as otherwise the rules_nodejs linker symlinks will conflict with the yarn workspace symlinks in node_modules. From e12a66ab14042c6444fe8d83311eccd13e0f7940 Mon Sep 17 00:00:00 2001 From: Simon Knott Date: Mon, 9 Sep 2024 13:57:00 +0200 Subject: [PATCH 28/87] docs(@angular/cli): add playwright to e2e targets (cherry picked from commit e4d598f5d13f8e55c9b3b30c7b8d65406e9ac0eb) --- packages/angular/cli/src/commands/e2e/cli.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/angular/cli/src/commands/e2e/cli.ts b/packages/angular/cli/src/commands/e2e/cli.ts index 7054d358d7fb..85d9aab173a0 100644 --- a/packages/angular/cli/src/commands/e2e/cli.ts +++ b/packages/angular/cli/src/commands/e2e/cli.ts @@ -16,6 +16,10 @@ export default class E2eCommandModule implements CommandModuleImplementation { override missingTargetChoices: MissingTargetChoice[] = [ + { + name: 'Playwright', + value: 'playwright-ng-schematics', + }, { name: 'Cypress', value: '@cypress/schematic', From 765309a2e1bcd3bb07ff87062fc2dc04e4bce16f Mon Sep 17 00:00:00 2001 From: Alan Agius Date: Wed, 11 Sep 2024 12:05:01 +0000 Subject: [PATCH 29/87] fix(@angular/build): prevent transformation of Node.js internal dependencies by Vite This commit excludes Node.js module imports from being processed by Vite when prebundling is enabled. Closes #28390 (cherry picked from commit 4153a6ecf6707729a4f0c6a620eeb8d6916588df) --- .../src/builders/dev-server/vite-server.ts | 33 ++++++++++++------- 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/packages/angular/build/src/builders/dev-server/vite-server.ts b/packages/angular/build/src/builders/dev-server/vite-server.ts index ec3ddbb84cd8..78a971f0e8d7 100644 --- a/packages/angular/build/src/builders/dev-server/vite-server.ts +++ b/packages/angular/build/src/builders/dev-server/vite-server.ts @@ -40,6 +40,11 @@ interface OutputFileRecord { servable: boolean; } +interface DevServerExternalResultMetadata extends Omit { + explicitBrowser: string[]; + explicitServer: string[]; +} + export type BuilderAction = ( options: ApplicationBuilderInternalOptions, context: BuilderContext, @@ -138,10 +143,11 @@ export async function* serveWithVite( let hadError = false; const generatedFiles = new Map(); const assetFiles = new Map(); - const externalMetadata: ExternalResultMetadata = { + const externalMetadata: DevServerExternalResultMetadata = { implicitBrowser: [], implicitServer: [], - explicit: [], + explicitBrowser: [], + explicitServer: [], }; // Add cleanup logic via a builder teardown. @@ -234,17 +240,20 @@ export async function* serveWithVite( } // Empty Arrays to avoid growing unlimited with every re-build. - externalMetadata.explicit.length = 0; + externalMetadata.explicitBrowser.length = 0; + externalMetadata.explicitServer.length = 0; externalMetadata.implicitServer.length = 0; externalMetadata.implicitBrowser.length = 0; - externalMetadata.explicit.push(...explicit); + externalMetadata.explicitBrowser.push(...explicit); + externalMetadata.explicitServer.push(...explicit, ...nodeJsBuiltinModules); externalMetadata.implicitServer.push(...implicitServerFiltered); externalMetadata.implicitBrowser.push(...implicitBrowserFiltered); // The below needs to be sorted as Vite uses these options are part of the hashing invalidation algorithm. // See: https://github.com/vitejs/vite/blob/0873bae0cfe0f0718ad2f5743dd34a17e4ab563d/packages/vite/src/node/optimizer/index.ts#L1203-L1239 - externalMetadata.explicit.sort(); + externalMetadata.explicitBrowser.sort(); + externalMetadata.explicitServer.sort(); externalMetadata.implicitServer.sort(); externalMetadata.implicitBrowser.sort(); } @@ -478,7 +487,7 @@ export async function setupServer( outputFiles: Map, assets: Map, preserveSymlinks: boolean | undefined, - externalMetadata: ExternalResultMetadata, + externalMetadata: DevServerExternalResultMetadata, ssr: boolean, prebundleTransformer: JavaScriptTransformer, target: string[], @@ -557,18 +566,18 @@ export async function setupServer( }, // This is needed when `externalDependencies` is used to prevent Vite load errors. // NOTE: If Vite adds direct support for externals, this can be removed. - preTransformRequests: externalMetadata.explicit.length === 0, + preTransformRequests: externalMetadata.explicitBrowser.length === 0, }, ssr: { // Note: `true` and `/.*/` have different sematics. When true, the `external` option is ignored. noExternal: /.*/, // Exclude any Node.js built in module and provided dependencies (currently build defined externals) - external: externalMetadata.explicit, + external: externalMetadata.explicitServer, optimizeDeps: getDepOptimizationConfig({ // Only enable with caching since it causes prebundle dependencies to be cached disabled: serverOptions.prebundle === false, // Exclude any explicitly defined dependencies (currently build defined externals and node.js built-ins) - exclude: externalMetadata.explicit, + exclude: externalMetadata.explicitServer, // Include all implict dependencies from the external packages internal option include: externalMetadata.implicitServer, ssr: true, @@ -587,19 +596,19 @@ export async function setupServer( outputFiles, assets, ssr, - external: externalMetadata.explicit, + external: externalMetadata.explicitBrowser, indexHtmlTransformer, extensionMiddleware, normalizePath, }), - createRemoveIdPrefixPlugin(externalMetadata.explicit), + createRemoveIdPrefixPlugin(externalMetadata.explicitBrowser), ], // Browser only optimizeDeps. (This does not run for SSR dependencies). optimizeDeps: getDepOptimizationConfig({ // Only enable with caching since it causes prebundle dependencies to be cached disabled: serverOptions.prebundle === false, // Exclude any explicitly defined dependencies (currently build defined externals) - exclude: externalMetadata.explicit, + exclude: externalMetadata.explicitBrowser, // Include all implict dependencies from the external packages internal option include: externalMetadata.implicitBrowser, ssr: false, From f29db1d4c57b55ad74410b9cee9e514b1698773e Mon Sep 17 00:00:00 2001 From: Alan Agius Date: Wed, 11 Sep 2024 13:56:16 +0000 Subject: [PATCH 30/87] release: cut the v18.2.4 release --- CHANGELOG.md | 12 ++++++++++++ package.json | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c4ec9b320ea2..40e58425727c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,15 @@ + + +# 18.2.4 (2024-09-11) + +### @angular/build + +| Commit | Type | Description | +| --------------------------------------------------------------------------------------------------- | ---- | --------------------------------------------------------------- | +| [765309a2e](https://github.com/angular/angular-cli/commit/765309a2e1bcd3bb07ff87062fc2dc04e4bce16f) | fix | prevent transformation of Node.js internal dependencies by Vite | + + + # 18.2.3 (2024-09-04) diff --git a/package.json b/package.json index 6de4d307deab..ad3be2ebad22 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@angular/devkit-repo", - "version": "18.2.3", + "version": "18.2.4", "private": true, "description": "Software Development Kit for Angular", "keywords": [ From 1032b3da1a0f3aaf63d2fd3cd8c6fd3b0d0b578c Mon Sep 17 00:00:00 2001 From: Alan Agius Date: Wed, 18 Sep 2024 10:08:00 +0000 Subject: [PATCH 31/87] fix(@angular/build): update vite to `5.4.6` Includes a fix for CVE-2024-45812 / CVE-2024-45811 Closes #28435 --- package.json | 2 +- packages/angular/build/package.json | 2 +- .../angular_devkit/build_angular/package.json | 2 +- yarn.lock | 220 +++++++++++++++++- 4 files changed, 213 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index ad3be2ebad22..e8c6a8252b48 100644 --- a/package.json +++ b/package.json @@ -201,7 +201,7 @@ "undici": "6.19.7", "verdaccio": "5.32.1", "verdaccio-auth-memory": "^10.0.0", - "vite": "5.4.0", + "vite": "5.4.6", "watchpack": "2.4.1", "webpack": "5.94.0", "webpack-dev-middleware": "7.4.2", diff --git a/packages/angular/build/package.json b/packages/angular/build/package.json index 91592c016183..2d7c8d1f59d1 100644 --- a/packages/angular/build/package.json +++ b/packages/angular/build/package.json @@ -41,7 +41,7 @@ "rollup": "4.20.0", "sass": "1.77.6", "semver": "7.6.3", - "vite": "5.4.0", + "vite": "5.4.6", "watchpack": "2.4.1" }, "peerDependencies": { diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json index 4d2c77c7a300..548bff700406 100644 --- a/packages/angular_devkit/build_angular/package.json +++ b/packages/angular_devkit/build_angular/package.json @@ -61,7 +61,7 @@ "terser": "5.31.6", "tree-kill": "1.2.2", "tslib": "2.6.3", - "vite": "5.4.0", + "vite": "5.4.6", "watchpack": "2.4.1", "webpack": "5.94.0", "webpack-dev-middleware": "7.4.2", diff --git a/yarn.lock b/yarn.lock index eecf69e4445e..99233eafaafb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -116,7 +116,7 @@ __metadata: tree-kill: "npm:1.2.2" tslib: "npm:2.6.3" undici: "npm:6.19.7" - vite: "npm:5.4.0" + vite: "npm:5.4.6" watchpack: "npm:2.4.1" webpack: "npm:5.94.0" webpack-dev-middleware: "npm:7.4.2" @@ -401,7 +401,7 @@ __metadata: rollup: "npm:4.20.0" sass: "npm:1.77.6" semver: "npm:7.6.3" - vite: "npm:5.4.0" + vite: "npm:5.4.6" watchpack: "npm:2.4.1" peerDependencies: "@angular/compiler-cli": ^18.0.0 @@ -805,7 +805,7 @@ __metadata: undici: "npm:6.19.7" verdaccio: "npm:5.32.1" verdaccio-auth-memory: "npm:^10.0.0" - vite: "npm:5.4.0" + vite: "npm:5.4.6" watchpack: "npm:2.4.1" webpack: "npm:5.94.0" webpack-dev-middleware: "npm:7.4.2" @@ -4092,6 +4092,13 @@ __metadata: languageName: node linkType: hard +"@rollup/rollup-android-arm-eabi@npm:4.21.3": + version: 4.21.3 + resolution: "@rollup/rollup-android-arm-eabi@npm:4.21.3" + conditions: os=android & cpu=arm + languageName: node + linkType: hard + "@rollup/rollup-android-arm64@npm:4.19.1": version: 4.19.1 resolution: "@rollup/rollup-android-arm64@npm:4.19.1" @@ -4106,6 +4113,13 @@ __metadata: languageName: node linkType: hard +"@rollup/rollup-android-arm64@npm:4.21.3": + version: 4.21.3 + resolution: "@rollup/rollup-android-arm64@npm:4.21.3" + conditions: os=android & cpu=arm64 + languageName: node + linkType: hard + "@rollup/rollup-darwin-arm64@npm:4.19.1": version: 4.19.1 resolution: "@rollup/rollup-darwin-arm64@npm:4.19.1" @@ -4120,6 +4134,13 @@ __metadata: languageName: node linkType: hard +"@rollup/rollup-darwin-arm64@npm:4.21.3": + version: 4.21.3 + resolution: "@rollup/rollup-darwin-arm64@npm:4.21.3" + conditions: os=darwin & cpu=arm64 + languageName: node + linkType: hard + "@rollup/rollup-darwin-x64@npm:4.19.1": version: 4.19.1 resolution: "@rollup/rollup-darwin-x64@npm:4.19.1" @@ -4134,6 +4155,13 @@ __metadata: languageName: node linkType: hard +"@rollup/rollup-darwin-x64@npm:4.21.3": + version: 4.21.3 + resolution: "@rollup/rollup-darwin-x64@npm:4.21.3" + conditions: os=darwin & cpu=x64 + languageName: node + linkType: hard + "@rollup/rollup-linux-arm-gnueabihf@npm:4.19.1": version: 4.19.1 resolution: "@rollup/rollup-linux-arm-gnueabihf@npm:4.19.1" @@ -4148,6 +4176,13 @@ __metadata: languageName: node linkType: hard +"@rollup/rollup-linux-arm-gnueabihf@npm:4.21.3": + version: 4.21.3 + resolution: "@rollup/rollup-linux-arm-gnueabihf@npm:4.21.3" + conditions: os=linux & cpu=arm & libc=glibc + languageName: node + linkType: hard + "@rollup/rollup-linux-arm-musleabihf@npm:4.19.1": version: 4.19.1 resolution: "@rollup/rollup-linux-arm-musleabihf@npm:4.19.1" @@ -4162,6 +4197,13 @@ __metadata: languageName: node linkType: hard +"@rollup/rollup-linux-arm-musleabihf@npm:4.21.3": + version: 4.21.3 + resolution: "@rollup/rollup-linux-arm-musleabihf@npm:4.21.3" + conditions: os=linux & cpu=arm & libc=musl + languageName: node + linkType: hard + "@rollup/rollup-linux-arm64-gnu@npm:4.19.1": version: 4.19.1 resolution: "@rollup/rollup-linux-arm64-gnu@npm:4.19.1" @@ -4176,6 +4218,13 @@ __metadata: languageName: node linkType: hard +"@rollup/rollup-linux-arm64-gnu@npm:4.21.3": + version: 4.21.3 + resolution: "@rollup/rollup-linux-arm64-gnu@npm:4.21.3" + conditions: os=linux & cpu=arm64 & libc=glibc + languageName: node + linkType: hard + "@rollup/rollup-linux-arm64-musl@npm:4.19.1": version: 4.19.1 resolution: "@rollup/rollup-linux-arm64-musl@npm:4.19.1" @@ -4190,6 +4239,13 @@ __metadata: languageName: node linkType: hard +"@rollup/rollup-linux-arm64-musl@npm:4.21.3": + version: 4.21.3 + resolution: "@rollup/rollup-linux-arm64-musl@npm:4.21.3" + conditions: os=linux & cpu=arm64 & libc=musl + languageName: node + linkType: hard + "@rollup/rollup-linux-powerpc64le-gnu@npm:4.19.1": version: 4.19.1 resolution: "@rollup/rollup-linux-powerpc64le-gnu@npm:4.19.1" @@ -4204,6 +4260,13 @@ __metadata: languageName: node linkType: hard +"@rollup/rollup-linux-powerpc64le-gnu@npm:4.21.3": + version: 4.21.3 + resolution: "@rollup/rollup-linux-powerpc64le-gnu@npm:4.21.3" + conditions: os=linux & cpu=ppc64 & libc=glibc + languageName: node + linkType: hard + "@rollup/rollup-linux-riscv64-gnu@npm:4.19.1": version: 4.19.1 resolution: "@rollup/rollup-linux-riscv64-gnu@npm:4.19.1" @@ -4218,6 +4281,13 @@ __metadata: languageName: node linkType: hard +"@rollup/rollup-linux-riscv64-gnu@npm:4.21.3": + version: 4.21.3 + resolution: "@rollup/rollup-linux-riscv64-gnu@npm:4.21.3" + conditions: os=linux & cpu=riscv64 & libc=glibc + languageName: node + linkType: hard + "@rollup/rollup-linux-s390x-gnu@npm:4.19.1": version: 4.19.1 resolution: "@rollup/rollup-linux-s390x-gnu@npm:4.19.1" @@ -4232,6 +4302,13 @@ __metadata: languageName: node linkType: hard +"@rollup/rollup-linux-s390x-gnu@npm:4.21.3": + version: 4.21.3 + resolution: "@rollup/rollup-linux-s390x-gnu@npm:4.21.3" + conditions: os=linux & cpu=s390x & libc=glibc + languageName: node + linkType: hard + "@rollup/rollup-linux-x64-gnu@npm:4.19.1": version: 4.19.1 resolution: "@rollup/rollup-linux-x64-gnu@npm:4.19.1" @@ -4246,6 +4323,13 @@ __metadata: languageName: node linkType: hard +"@rollup/rollup-linux-x64-gnu@npm:4.21.3": + version: 4.21.3 + resolution: "@rollup/rollup-linux-x64-gnu@npm:4.21.3" + conditions: os=linux & cpu=x64 & libc=glibc + languageName: node + linkType: hard + "@rollup/rollup-linux-x64-musl@npm:4.19.1": version: 4.19.1 resolution: "@rollup/rollup-linux-x64-musl@npm:4.19.1" @@ -4260,6 +4344,13 @@ __metadata: languageName: node linkType: hard +"@rollup/rollup-linux-x64-musl@npm:4.21.3": + version: 4.21.3 + resolution: "@rollup/rollup-linux-x64-musl@npm:4.21.3" + conditions: os=linux & cpu=x64 & libc=musl + languageName: node + linkType: hard + "@rollup/rollup-win32-arm64-msvc@npm:4.19.1": version: 4.19.1 resolution: "@rollup/rollup-win32-arm64-msvc@npm:4.19.1" @@ -4274,6 +4365,13 @@ __metadata: languageName: node linkType: hard +"@rollup/rollup-win32-arm64-msvc@npm:4.21.3": + version: 4.21.3 + resolution: "@rollup/rollup-win32-arm64-msvc@npm:4.21.3" + conditions: os=win32 & cpu=arm64 + languageName: node + linkType: hard + "@rollup/rollup-win32-ia32-msvc@npm:4.19.1": version: 4.19.1 resolution: "@rollup/rollup-win32-ia32-msvc@npm:4.19.1" @@ -4288,6 +4386,13 @@ __metadata: languageName: node linkType: hard +"@rollup/rollup-win32-ia32-msvc@npm:4.21.3": + version: 4.21.3 + resolution: "@rollup/rollup-win32-ia32-msvc@npm:4.21.3" + conditions: os=win32 & cpu=ia32 + languageName: node + linkType: hard + "@rollup/rollup-win32-x64-msvc@npm:4.19.1": version: 4.19.1 resolution: "@rollup/rollup-win32-x64-msvc@npm:4.19.1" @@ -4302,6 +4407,13 @@ __metadata: languageName: node linkType: hard +"@rollup/rollup-win32-x64-msvc@npm:4.21.3": + version: 4.21.3 + resolution: "@rollup/rollup-win32-x64-msvc@npm:4.21.3" + conditions: os=win32 & cpu=x64 + languageName: node + linkType: hard + "@rollup/wasm-node@npm:^4.18.0": version: 4.20.0 resolution: "@rollup/wasm-node@npm:4.20.0" @@ -14123,6 +14235,13 @@ __metadata: languageName: node linkType: hard +"picocolors@npm:^1.1.0": + version: 1.1.0 + resolution: "picocolors@npm:1.1.0" + checksum: 10c0/86946f6032148801ef09c051c6fb13b5cf942eaf147e30ea79edb91dd32d700934edebe782a1078ff859fb2b816792e97ef4dab03d7f0b804f6b01a0df35e023 + languageName: node + linkType: hard + "picomatch@npm:4.0.2": version: 4.0.2 resolution: "picomatch@npm:4.0.2" @@ -14410,7 +14529,7 @@ __metadata: languageName: node linkType: hard -"postcss@npm:8.4.41, postcss@npm:^8.4.40": +"postcss@npm:8.4.41": version: 8.4.41 resolution: "postcss@npm:8.4.41" dependencies: @@ -14432,6 +14551,17 @@ __metadata: languageName: node linkType: hard +"postcss@npm:^8.4.43": + version: 8.4.47 + resolution: "postcss@npm:8.4.47" + dependencies: + nanoid: "npm:^3.3.7" + picocolors: "npm:^1.1.0" + source-map-js: "npm:^1.2.1" + checksum: 10c0/929f68b5081b7202709456532cee2a145c1843d391508c5a09de2517e8c4791638f71dd63b1898dba6712f8839d7a6da046c72a5e44c162e908f5911f57b5f44 + languageName: node + linkType: hard + "prelude-ls@npm:^1.2.1": version: 1.2.1 resolution: "prelude-ls@npm:1.2.1" @@ -15407,6 +15537,69 @@ __metadata: languageName: node linkType: hard +"rollup@npm:^4.20.0": + version: 4.21.3 + resolution: "rollup@npm:4.21.3" + dependencies: + "@rollup/rollup-android-arm-eabi": "npm:4.21.3" + "@rollup/rollup-android-arm64": "npm:4.21.3" + "@rollup/rollup-darwin-arm64": "npm:4.21.3" + "@rollup/rollup-darwin-x64": "npm:4.21.3" + "@rollup/rollup-linux-arm-gnueabihf": "npm:4.21.3" + "@rollup/rollup-linux-arm-musleabihf": "npm:4.21.3" + "@rollup/rollup-linux-arm64-gnu": "npm:4.21.3" + "@rollup/rollup-linux-arm64-musl": "npm:4.21.3" + "@rollup/rollup-linux-powerpc64le-gnu": "npm:4.21.3" + "@rollup/rollup-linux-riscv64-gnu": "npm:4.21.3" + "@rollup/rollup-linux-s390x-gnu": "npm:4.21.3" + "@rollup/rollup-linux-x64-gnu": "npm:4.21.3" + "@rollup/rollup-linux-x64-musl": "npm:4.21.3" + "@rollup/rollup-win32-arm64-msvc": "npm:4.21.3" + "@rollup/rollup-win32-ia32-msvc": "npm:4.21.3" + "@rollup/rollup-win32-x64-msvc": "npm:4.21.3" + "@types/estree": "npm:1.0.5" + fsevents: "npm:~2.3.2" + dependenciesMeta: + "@rollup/rollup-android-arm-eabi": + optional: true + "@rollup/rollup-android-arm64": + optional: true + "@rollup/rollup-darwin-arm64": + optional: true + "@rollup/rollup-darwin-x64": + optional: true + "@rollup/rollup-linux-arm-gnueabihf": + optional: true + "@rollup/rollup-linux-arm-musleabihf": + optional: true + "@rollup/rollup-linux-arm64-gnu": + optional: true + "@rollup/rollup-linux-arm64-musl": + optional: true + "@rollup/rollup-linux-powerpc64le-gnu": + optional: true + "@rollup/rollup-linux-riscv64-gnu": + optional: true + "@rollup/rollup-linux-s390x-gnu": + optional: true + "@rollup/rollup-linux-x64-gnu": + optional: true + "@rollup/rollup-linux-x64-musl": + optional: true + "@rollup/rollup-win32-arm64-msvc": + optional: true + "@rollup/rollup-win32-ia32-msvc": + optional: true + "@rollup/rollup-win32-x64-msvc": + optional: true + fsevents: + optional: true + bin: + rollup: dist/bin/rollup + checksum: 10c0/a9f98366a451f1302276390de9c0c59b464d680946410f53c14e7057fa84642efbe05eca8d85076962657955d77bb4a2d2b6dd8b70baf58c3c4b56f565d804dd + languageName: node + linkType: hard + "run-applescript@npm:^7.0.0": version: 7.0.0 resolution: "run-applescript@npm:7.0.0" @@ -16070,6 +16263,13 @@ __metadata: languageName: node linkType: hard +"source-map-js@npm:^1.2.1": + version: 1.2.1 + resolution: "source-map-js@npm:1.2.1" + checksum: 10c0/7bda1fc4c197e3c6ff17de1b8b2c20e60af81b63a52cb32ec5a5d67a20a7d42651e2cb34ebe93833c5a2a084377e17455854fee3e21e7925c64a51b6a52b0faf + languageName: node + linkType: hard + "source-map-loader@npm:5.0.0": version: 5.0.0 resolution: "source-map-loader@npm:5.0.0" @@ -17652,14 +17852,14 @@ __metadata: languageName: node linkType: hard -"vite@npm:5.4.0": - version: 5.4.0 - resolution: "vite@npm:5.4.0" +"vite@npm:5.4.6": + version: 5.4.6 + resolution: "vite@npm:5.4.6" dependencies: esbuild: "npm:^0.21.3" fsevents: "npm:~2.3.3" - postcss: "npm:^8.4.40" - rollup: "npm:^4.13.0" + postcss: "npm:^8.4.43" + rollup: "npm:^4.20.0" peerDependencies: "@types/node": ^18.0.0 || >=20.0.0 less: "*" @@ -17691,7 +17891,7 @@ __metadata: optional: true bin: vite: bin/vite.js - checksum: 10c0/122de7795e1c3c08cd0acc7d77296f908398266b424492be7310400107f37a3cf4c9506f2b4b16619e57299ca2859b8ca187aac5e25f8e66d84f9204a1d72d18 + checksum: 10c0/5f87be3a10e970eaf9ac52dfab39cf9fff583036685252fb64570b6d7bfa749f6d221fb78058f5ef4b5664c180d45a8e7a7ff68d7f3770e69e24c7c68b958bde languageName: node linkType: hard From 11554f55c007b7f493ab4404e651ab9c4016fbdf Mon Sep 17 00:00:00 2001 From: Charles Lyding <19598772+clydin@users.noreply.github.com> Date: Tue, 17 Sep 2024 20:32:43 -0400 Subject: [PATCH 32/87] test: ensure localize package is not initially present in E2E test (cherry picked from commit 33e6cb0d6bc9f36f2f110d43bc77a927d14e1cb8) --- tests/legacy-cli/e2e/tests/i18n/extract-ivy.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/legacy-cli/e2e/tests/i18n/extract-ivy.ts b/tests/legacy-cli/e2e/tests/i18n/extract-ivy.ts index 7c6bf4c21f4c..0b2321c0321f 100644 --- a/tests/legacy-cli/e2e/tests/i18n/extract-ivy.ts +++ b/tests/legacy-cli/e2e/tests/i18n/extract-ivy.ts @@ -27,6 +27,9 @@ export default async function () { `, ); + // Ensure localize package is not present initially + await uninstallPackage('@angular/localize'); + // Should fail if `@angular/localize` is missing const { message: message1 } = await expectToFail(() => ng('extract-i18n')); if (!message1.includes(`i18n extraction requires the '@angular/localize' package.`)) { From 7074316257bd736e0d3393368fc93dec9604b49e Mon Sep 17 00:00:00 2001 From: Charles Lyding <19598772+clydin@users.noreply.github.com> Date: Tue, 17 Sep 2024 14:22:45 -0400 Subject: [PATCH 33/87] fix(@angular/build): support HTTP HEAD requests for virtual output files When using the development server, HTTP HEAD requests will now correctly respond for the virtual output files generated from the Angular build system. Previously Vite only handled GET requests for the files. While HEAD requests are not common in development workflows, it can be needed in more complex cases with additional servers/proxies/etc. during development. (cherry picked from commit f6b7cd925dacf0ae34cb8e49b4deaf2e5c52ccd4) --- .../vite/middlewares/assets-middleware.ts | 6 +++++ .../e2e/tests/commands/serve/head-request.ts | 25 +++++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 tests/legacy-cli/e2e/tests/commands/serve/head-request.ts diff --git a/packages/angular/build/src/tools/vite/middlewares/assets-middleware.ts b/packages/angular/build/src/tools/vite/middlewares/assets-middleware.ts index 9dd93e1df516..6cc74495af29 100644 --- a/packages/angular/build/src/tools/vite/middlewares/assets-middleware.ts +++ b/packages/angular/build/src/tools/vite/middlewares/assets-middleware.ts @@ -63,6 +63,12 @@ export function createAngularAssetsMiddleware( return; } + // Support HTTP HEAD requests for the virtual output files from the Angular build + if (req.method === 'HEAD' && outputFiles.get(pathname)?.servable) { + // While a GET will also generate content, the rest of the response is equivalent + req.method = 'GET'; + } + // Resource files are handled directly. // Global stylesheets (CSS files) are currently considered resources to workaround // dev server sourcemap issues with stylesheets. diff --git a/tests/legacy-cli/e2e/tests/commands/serve/head-request.ts b/tests/legacy-cli/e2e/tests/commands/serve/head-request.ts new file mode 100644 index 000000000000..82ba370a0743 --- /dev/null +++ b/tests/legacy-cli/e2e/tests/commands/serve/head-request.ts @@ -0,0 +1,25 @@ +import { ngServe } from '../../../utils/project'; + +export default async function () { + const port = await ngServe(); + // HTML + await checkHeadForUrl(`http://localhost:${port}/index.html`); + // Generated JS + await checkHeadForUrl(`http://localhost:${port}/main.js`); + // Generated CSS + await checkHeadForUrl(`http://localhost:${port}/styles.css`); + // Configured asset + await checkHeadForUrl(`http://localhost:${port}/favicon.ico`); +} + +async function checkHeadForUrl(url: string): Promise { + const result = await fetch(url, { method: 'HEAD' }); + const content = await result.blob(); + + if (content.size !== 0) { + throw new Error(`Expected "size" to be "0" but got "${content.size}".`); + } + if (result.status !== 200) { + throw new Error(`Expected "status" to be "200" but got "${result.status}".`); + } +} From d6384f1fce927c463a386ba76fbb85b967bc2c32 Mon Sep 17 00:00:00 2001 From: Jan Krems Date: Wed, 18 Sep 2024 16:15:56 -0700 Subject: [PATCH 34/87] release: cut the v18.2.5 release --- CHANGELOG.md | 13 +++++++++++++ package.json | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 40e58425727c..930bd9ebb355 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,16 @@ + + +# 18.2.5 (2024-09-18) + +### @angular/build + +| Commit | Type | Description | +| --------------------------------------------------------------------------------------------------- | ---- | --------------------------------------------------- | +| [707431625](https://github.com/angular/angular-cli/commit/7074316257bd736e0d3393368fc93dec9604b49e) | fix | support HTTP HEAD requests for virtual output files | +| [1032b3da1](https://github.com/angular/angular-cli/commit/1032b3da1a0f3aaf63d2fd3cd8c6fd3b0d0b578c) | fix | update vite to `5.4.6` | + + + # 18.2.4 (2024-09-11) diff --git a/package.json b/package.json index e8c6a8252b48..b5b30e534766 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@angular/devkit-repo", - "version": "18.2.4", + "version": "18.2.5", "private": true, "description": "Software Development Kit for Angular", "keywords": [ From 9d0b67124e4855c5c4a2101b64f8ed86f8624561 Mon Sep 17 00:00:00 2001 From: Charles Lyding <19598772+clydin@users.noreply.github.com> Date: Wed, 18 Sep 2024 21:24:30 -0400 Subject: [PATCH 35/87] fix(@angular/build): allow missing HTML file request to fallback to index If a HTTP request is made to the development server that explicitly requests an HTML file (i.e., `/abc.html`), the development server will now attempt to fallback to the root `index.html` file if the requested HTML file does not exist. Since this may indicate a defect or other application misconfiguration such as a missing asset, a warning will also be issued in the console during development to notify the developer that something may be wrong. (cherry picked from commit 13a3e430da894fee87e4279f51b166f657b29b3f) --- .../middlewares/html-fallback-middleware.ts | 34 +++++++++++++++---- 1 file changed, 28 insertions(+), 6 deletions(-) diff --git a/packages/angular/build/src/tools/vite/middlewares/html-fallback-middleware.ts b/packages/angular/build/src/tools/vite/middlewares/html-fallback-middleware.ts index 3378404f76d9..a9c4d434e507 100644 --- a/packages/angular/build/src/tools/vite/middlewares/html-fallback-middleware.ts +++ b/packages/angular/build/src/tools/vite/middlewares/html-fallback-middleware.ts @@ -10,6 +10,8 @@ import type { ServerResponse } from 'node:http'; import type { Connect } from 'vite'; import { lookupMimeTypeFromRequest } from '../utils'; +const ALLOWED_FALLBACK_METHODS = Object.freeze(['GET', 'HEAD']); + export function angularHtmlFallbackMiddleware( req: Connect.IncomingMessage, res: ServerResponse, @@ -17,13 +19,33 @@ export function angularHtmlFallbackMiddleware( ): void { // Similar to how it is handled in vite // https://github.com/vitejs/vite/blob/main/packages/vite/src/node/server/middlewares/htmlFallback.ts#L15C19-L15C45 + if (!req.method || !ALLOWED_FALLBACK_METHODS.includes(req.method)) { + // No fallback for unsupported request methods + next(); + + return; + } + + if (req.url) { + const mimeType = lookupMimeTypeFromRequest(req.url); + if (mimeType === 'text/html' || mimeType === 'application/xhtml+xml') { + // eslint-disable-next-line no-console + console.warn( + `Request for HTML file "${req.url}" was received but no asset found. Asset may be missing from build.`, + ); + } else if (mimeType) { + // No fallback for request of asset-like files + next(); + + return; + } + } + if ( - (req.method === 'GET' || req.method === 'HEAD') && - (!req.url || !lookupMimeTypeFromRequest(req.url)) && - (!req.headers.accept || - req.headers.accept.includes('text/html') || - req.headers.accept.includes('text/*') || - req.headers.accept.includes('*/*')) + !req.headers.accept || + req.headers.accept.includes('text/html') || + req.headers.accept.includes('text/*') || + req.headers.accept.includes('*/*') ) { req.url = '/index.html'; } From 6a52dcc963e30467af89ba5a8bdd067797201796 Mon Sep 17 00:00:00 2001 From: Charles Lyding <19598772+clydin@users.noreply.github.com> Date: Mon, 23 Sep 2024 11:52:06 -0400 Subject: [PATCH 36/87] test: unlink symlink in ng add base E2E test Instead of attempting to delete all files within the directory, the created symlink can instead be removed on its own. This should prevent odd Windows failures in CI. (cherry picked from commit f05b0537f555e6c5ccb2ea8397ae90ec3a2e4d83) --- tests/legacy-cli/e2e/tests/commands/add/base.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/legacy-cli/e2e/tests/commands/add/base.ts b/tests/legacy-cli/e2e/tests/commands/add/base.ts index ba5978633225..f4e7048df6ac 100644 --- a/tests/legacy-cli/e2e/tests/commands/add/base.ts +++ b/tests/legacy-cli/e2e/tests/commands/add/base.ts @@ -1,5 +1,5 @@ import { assetDir } from '../../../utils/assets'; -import { expectFileToExist, rimraf, symlinkFile } from '../../../utils/fs'; +import { deleteFile, expectFileToExist, symlinkFile } from '../../../utils/fs'; import { ng } from '../../../utils/process'; import { expectToFail } from '../../../utils/utils'; @@ -15,5 +15,5 @@ export default async function () { await expectToFail(() => ng('add', 'add-collection')); // File already exists. // Cleanup the package - await rimraf('node_modules/add-collection'); + await deleteFile('node_modules/add-collection'); } From c7105395fe2df06fd6c3c31d99a1cb0dc4f04238 Mon Sep 17 00:00:00 2001 From: Alan Agius Date: Tue, 24 Sep 2024 18:01:14 +0000 Subject: [PATCH 37/87] test: update test logic to fix windows CI Minor changes to the testing setup to fix failures on Windows CI. (cherry picked from commit 5da0e480c7d4f9bb34484746afe4a3e92af16eb8) --- tests/legacy-cli/e2e/tests/build/rebuild-dot-dirname.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/legacy-cli/e2e/tests/build/rebuild-dot-dirname.ts b/tests/legacy-cli/e2e/tests/build/rebuild-dot-dirname.ts index 3a24ca0bcab5..b3485ec495e8 100644 --- a/tests/legacy-cli/e2e/tests/build/rebuild-dot-dirname.ts +++ b/tests/legacy-cli/e2e/tests/build/rebuild-dot-dirname.ts @@ -2,7 +2,7 @@ import { setTimeout } from 'node:timers/promises'; import { getGlobalVariable } from '../../utils/env'; import { appendToFile, createDir, rimraf } from '../../utils/fs'; import { installWorkspacePackages } from '../../utils/packages'; -import { ng, waitForAnyProcessOutputToMatch } from '../../utils/process'; +import { killAllProcesses, ng, waitForAnyProcessOutputToMatch } from '../../utils/process'; import { ngServe, updateJsonFile, useSha } from '../../utils/project'; const goodRegEx = getGlobalVariable('argv')['esbuild'] @@ -52,5 +52,7 @@ export default async function () { await waitForAnyProcessOutputToMatch(goodRegEx); } finally { process.chdir(originalCwd); + await killAllProcesses(); + await setTimeout(100); } } From 5fea635b20b29429e355072c5adc5bf2a597a267 Mon Sep 17 00:00:00 2001 From: Jan Olaf Martin Date: Tue, 24 Sep 2024 18:45:32 +0000 Subject: [PATCH 38/87] fix(@angular/build): update rollup to 4.22.4 Contains fix for CVE-2024-47068. See: https://github.com/advisories/GHSA-gcx4-mw62-g8wm --- package.json | 2 +- packages/angular/build/package.json | 2 +- yarn.lock | 181 +++++++++++++++++++++++++++- 3 files changed, 180 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index b5b30e534766..b6cdff2f73f9 100644 --- a/package.json +++ b/package.json @@ -181,7 +181,7 @@ "puppeteer": "18.2.1", "quicktype-core": "23.0.170", "resolve-url-loader": "5.0.0", - "rollup": "4.20.0", + "rollup": "4.22.4", "rollup-plugin-sourcemaps": "^0.6.0", "rxjs": "7.8.1", "sass": "1.77.6", diff --git a/packages/angular/build/package.json b/packages/angular/build/package.json index 2d7c8d1f59d1..f8b94876401e 100644 --- a/packages/angular/build/package.json +++ b/packages/angular/build/package.json @@ -38,7 +38,7 @@ "parse5-html-rewriting-stream": "7.0.0", "picomatch": "4.0.2", "piscina": "4.6.1", - "rollup": "4.20.0", + "rollup": "4.22.4", "sass": "1.77.6", "semver": "7.6.3", "vite": "5.4.6", diff --git a/yarn.lock b/yarn.lock index 99233eafaafb..f732d86e4bf5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -398,7 +398,7 @@ __metadata: parse5-html-rewriting-stream: "npm:7.0.0" picomatch: "npm:4.0.2" piscina: "npm:4.6.1" - rollup: "npm:4.20.0" + rollup: "npm:4.22.4" sass: "npm:1.77.6" semver: "npm:7.6.3" vite: "npm:5.4.6" @@ -785,7 +785,7 @@ __metadata: puppeteer: "npm:18.2.1" quicktype-core: "npm:23.0.170" resolve-url-loader: "npm:5.0.0" - rollup: "npm:4.20.0" + rollup: "npm:4.22.4" rollup-plugin-sourcemaps: "npm:^0.6.0" rxjs: "npm:7.8.1" sass: "npm:1.77.6" @@ -4099,6 +4099,13 @@ __metadata: languageName: node linkType: hard +"@rollup/rollup-android-arm-eabi@npm:4.22.4": + version: 4.22.4 + resolution: "@rollup/rollup-android-arm-eabi@npm:4.22.4" + conditions: os=android & cpu=arm + languageName: node + linkType: hard + "@rollup/rollup-android-arm64@npm:4.19.1": version: 4.19.1 resolution: "@rollup/rollup-android-arm64@npm:4.19.1" @@ -4120,6 +4127,13 @@ __metadata: languageName: node linkType: hard +"@rollup/rollup-android-arm64@npm:4.22.4": + version: 4.22.4 + resolution: "@rollup/rollup-android-arm64@npm:4.22.4" + conditions: os=android & cpu=arm64 + languageName: node + linkType: hard + "@rollup/rollup-darwin-arm64@npm:4.19.1": version: 4.19.1 resolution: "@rollup/rollup-darwin-arm64@npm:4.19.1" @@ -4141,6 +4155,13 @@ __metadata: languageName: node linkType: hard +"@rollup/rollup-darwin-arm64@npm:4.22.4": + version: 4.22.4 + resolution: "@rollup/rollup-darwin-arm64@npm:4.22.4" + conditions: os=darwin & cpu=arm64 + languageName: node + linkType: hard + "@rollup/rollup-darwin-x64@npm:4.19.1": version: 4.19.1 resolution: "@rollup/rollup-darwin-x64@npm:4.19.1" @@ -4162,6 +4183,13 @@ __metadata: languageName: node linkType: hard +"@rollup/rollup-darwin-x64@npm:4.22.4": + version: 4.22.4 + resolution: "@rollup/rollup-darwin-x64@npm:4.22.4" + conditions: os=darwin & cpu=x64 + languageName: node + linkType: hard + "@rollup/rollup-linux-arm-gnueabihf@npm:4.19.1": version: 4.19.1 resolution: "@rollup/rollup-linux-arm-gnueabihf@npm:4.19.1" @@ -4183,6 +4211,13 @@ __metadata: languageName: node linkType: hard +"@rollup/rollup-linux-arm-gnueabihf@npm:4.22.4": + version: 4.22.4 + resolution: "@rollup/rollup-linux-arm-gnueabihf@npm:4.22.4" + conditions: os=linux & cpu=arm & libc=glibc + languageName: node + linkType: hard + "@rollup/rollup-linux-arm-musleabihf@npm:4.19.1": version: 4.19.1 resolution: "@rollup/rollup-linux-arm-musleabihf@npm:4.19.1" @@ -4204,6 +4239,13 @@ __metadata: languageName: node linkType: hard +"@rollup/rollup-linux-arm-musleabihf@npm:4.22.4": + version: 4.22.4 + resolution: "@rollup/rollup-linux-arm-musleabihf@npm:4.22.4" + conditions: os=linux & cpu=arm & libc=musl + languageName: node + linkType: hard + "@rollup/rollup-linux-arm64-gnu@npm:4.19.1": version: 4.19.1 resolution: "@rollup/rollup-linux-arm64-gnu@npm:4.19.1" @@ -4225,6 +4267,13 @@ __metadata: languageName: node linkType: hard +"@rollup/rollup-linux-arm64-gnu@npm:4.22.4": + version: 4.22.4 + resolution: "@rollup/rollup-linux-arm64-gnu@npm:4.22.4" + conditions: os=linux & cpu=arm64 & libc=glibc + languageName: node + linkType: hard + "@rollup/rollup-linux-arm64-musl@npm:4.19.1": version: 4.19.1 resolution: "@rollup/rollup-linux-arm64-musl@npm:4.19.1" @@ -4246,6 +4295,13 @@ __metadata: languageName: node linkType: hard +"@rollup/rollup-linux-arm64-musl@npm:4.22.4": + version: 4.22.4 + resolution: "@rollup/rollup-linux-arm64-musl@npm:4.22.4" + conditions: os=linux & cpu=arm64 & libc=musl + languageName: node + linkType: hard + "@rollup/rollup-linux-powerpc64le-gnu@npm:4.19.1": version: 4.19.1 resolution: "@rollup/rollup-linux-powerpc64le-gnu@npm:4.19.1" @@ -4267,6 +4323,13 @@ __metadata: languageName: node linkType: hard +"@rollup/rollup-linux-powerpc64le-gnu@npm:4.22.4": + version: 4.22.4 + resolution: "@rollup/rollup-linux-powerpc64le-gnu@npm:4.22.4" + conditions: os=linux & cpu=ppc64 & libc=glibc + languageName: node + linkType: hard + "@rollup/rollup-linux-riscv64-gnu@npm:4.19.1": version: 4.19.1 resolution: "@rollup/rollup-linux-riscv64-gnu@npm:4.19.1" @@ -4288,6 +4351,13 @@ __metadata: languageName: node linkType: hard +"@rollup/rollup-linux-riscv64-gnu@npm:4.22.4": + version: 4.22.4 + resolution: "@rollup/rollup-linux-riscv64-gnu@npm:4.22.4" + conditions: os=linux & cpu=riscv64 & libc=glibc + languageName: node + linkType: hard + "@rollup/rollup-linux-s390x-gnu@npm:4.19.1": version: 4.19.1 resolution: "@rollup/rollup-linux-s390x-gnu@npm:4.19.1" @@ -4309,6 +4379,13 @@ __metadata: languageName: node linkType: hard +"@rollup/rollup-linux-s390x-gnu@npm:4.22.4": + version: 4.22.4 + resolution: "@rollup/rollup-linux-s390x-gnu@npm:4.22.4" + conditions: os=linux & cpu=s390x & libc=glibc + languageName: node + linkType: hard + "@rollup/rollup-linux-x64-gnu@npm:4.19.1": version: 4.19.1 resolution: "@rollup/rollup-linux-x64-gnu@npm:4.19.1" @@ -4330,6 +4407,13 @@ __metadata: languageName: node linkType: hard +"@rollup/rollup-linux-x64-gnu@npm:4.22.4": + version: 4.22.4 + resolution: "@rollup/rollup-linux-x64-gnu@npm:4.22.4" + conditions: os=linux & cpu=x64 & libc=glibc + languageName: node + linkType: hard + "@rollup/rollup-linux-x64-musl@npm:4.19.1": version: 4.19.1 resolution: "@rollup/rollup-linux-x64-musl@npm:4.19.1" @@ -4351,6 +4435,13 @@ __metadata: languageName: node linkType: hard +"@rollup/rollup-linux-x64-musl@npm:4.22.4": + version: 4.22.4 + resolution: "@rollup/rollup-linux-x64-musl@npm:4.22.4" + conditions: os=linux & cpu=x64 & libc=musl + languageName: node + linkType: hard + "@rollup/rollup-win32-arm64-msvc@npm:4.19.1": version: 4.19.1 resolution: "@rollup/rollup-win32-arm64-msvc@npm:4.19.1" @@ -4372,6 +4463,13 @@ __metadata: languageName: node linkType: hard +"@rollup/rollup-win32-arm64-msvc@npm:4.22.4": + version: 4.22.4 + resolution: "@rollup/rollup-win32-arm64-msvc@npm:4.22.4" + conditions: os=win32 & cpu=arm64 + languageName: node + linkType: hard + "@rollup/rollup-win32-ia32-msvc@npm:4.19.1": version: 4.19.1 resolution: "@rollup/rollup-win32-ia32-msvc@npm:4.19.1" @@ -4393,6 +4491,13 @@ __metadata: languageName: node linkType: hard +"@rollup/rollup-win32-ia32-msvc@npm:4.22.4": + version: 4.22.4 + resolution: "@rollup/rollup-win32-ia32-msvc@npm:4.22.4" + conditions: os=win32 & cpu=ia32 + languageName: node + linkType: hard + "@rollup/rollup-win32-x64-msvc@npm:4.19.1": version: 4.19.1 resolution: "@rollup/rollup-win32-x64-msvc@npm:4.19.1" @@ -4414,6 +4519,13 @@ __metadata: languageName: node linkType: hard +"@rollup/rollup-win32-x64-msvc@npm:4.22.4": + version: 4.22.4 + resolution: "@rollup/rollup-win32-x64-msvc@npm:4.22.4" + conditions: os=win32 & cpu=x64 + languageName: node + linkType: hard + "@rollup/wasm-node@npm:^4.18.0": version: 4.20.0 resolution: "@rollup/wasm-node@npm:4.20.0" @@ -15474,7 +15586,70 @@ __metadata: languageName: node linkType: hard -"rollup@npm:4.20.0, rollup@npm:^4.13.0, rollup@npm:^4.18.0, rollup@npm:^4.4.0": +"rollup@npm:4.22.4": + version: 4.22.4 + resolution: "rollup@npm:4.22.4" + dependencies: + "@rollup/rollup-android-arm-eabi": "npm:4.22.4" + "@rollup/rollup-android-arm64": "npm:4.22.4" + "@rollup/rollup-darwin-arm64": "npm:4.22.4" + "@rollup/rollup-darwin-x64": "npm:4.22.4" + "@rollup/rollup-linux-arm-gnueabihf": "npm:4.22.4" + "@rollup/rollup-linux-arm-musleabihf": "npm:4.22.4" + "@rollup/rollup-linux-arm64-gnu": "npm:4.22.4" + "@rollup/rollup-linux-arm64-musl": "npm:4.22.4" + "@rollup/rollup-linux-powerpc64le-gnu": "npm:4.22.4" + "@rollup/rollup-linux-riscv64-gnu": "npm:4.22.4" + "@rollup/rollup-linux-s390x-gnu": "npm:4.22.4" + "@rollup/rollup-linux-x64-gnu": "npm:4.22.4" + "@rollup/rollup-linux-x64-musl": "npm:4.22.4" + "@rollup/rollup-win32-arm64-msvc": "npm:4.22.4" + "@rollup/rollup-win32-ia32-msvc": "npm:4.22.4" + "@rollup/rollup-win32-x64-msvc": "npm:4.22.4" + "@types/estree": "npm:1.0.5" + fsevents: "npm:~2.3.2" + dependenciesMeta: + "@rollup/rollup-android-arm-eabi": + optional: true + "@rollup/rollup-android-arm64": + optional: true + "@rollup/rollup-darwin-arm64": + optional: true + "@rollup/rollup-darwin-x64": + optional: true + "@rollup/rollup-linux-arm-gnueabihf": + optional: true + "@rollup/rollup-linux-arm-musleabihf": + optional: true + "@rollup/rollup-linux-arm64-gnu": + optional: true + "@rollup/rollup-linux-arm64-musl": + optional: true + "@rollup/rollup-linux-powerpc64le-gnu": + optional: true + "@rollup/rollup-linux-riscv64-gnu": + optional: true + "@rollup/rollup-linux-s390x-gnu": + optional: true + "@rollup/rollup-linux-x64-gnu": + optional: true + "@rollup/rollup-linux-x64-musl": + optional: true + "@rollup/rollup-win32-arm64-msvc": + optional: true + "@rollup/rollup-win32-ia32-msvc": + optional: true + "@rollup/rollup-win32-x64-msvc": + optional: true + fsevents: + optional: true + bin: + rollup: dist/bin/rollup + checksum: 10c0/4c96b6e2e0c5dbe73b4ba899cea894a05115ab8c65ccff631fbbb944e2b3a9f2eb3b99c2dce3dd91b179647df1892ffc44ecee29381ccf155ba8000b22712a32 + languageName: node + linkType: hard + +"rollup@npm:^4.13.0, rollup@npm:^4.18.0, rollup@npm:^4.4.0": version: 4.20.0 resolution: "rollup@npm:4.20.0" dependencies: From 9758a48b49d9e92abeca1427facbeaaa95022ea5 Mon Sep 17 00:00:00 2001 From: Charles Lyding <19598772+clydin@users.noreply.github.com> Date: Wed, 25 Sep 2024 10:58:08 -0400 Subject: [PATCH 39/87] release: cut the v18.2.6 release --- CHANGELOG.md | 13 +++++++++++++ package.json | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 930bd9ebb355..5b5ec9627ff8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,16 @@ + + +# 18.2.6 (2024-09-25) + +### @angular/build + +| Commit | Type | Description | +| --------------------------------------------------------------------------------------------------- | ---- | ---------------------------------------------------- | +| [9d0b67124](https://github.com/angular/angular-cli/commit/9d0b67124e4855c5c4a2101b64f8ed86f8624561) | fix | allow missing HTML file request to fallback to index | +| [5fea635b2](https://github.com/angular/angular-cli/commit/5fea635b20b29429e355072c5adc5bf2a597a267) | fix | update rollup to 4.22.4 | + + + # 18.2.5 (2024-09-18) diff --git a/package.json b/package.json index b6cdff2f73f9..25da8912d23e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@angular/devkit-repo", - "version": "18.2.5", + "version": "18.2.6", "private": true, "description": "Software Development Kit for Angular", "keywords": [ From ca28ec7971c818726166e69256dd4c84e17a9799 Mon Sep 17 00:00:00 2001 From: Jan Martin Date: Mon, 23 Sep 2024 15:49:58 -0700 Subject: [PATCH 40/87] test(@angular-devkit/build-angular): add application/browser test runs Runs all existing karma tests twice: Once in an environment that uses the application builder and once in one that uses the browser builder. The general approach is taken from the dev server tests. This is in preparation for supporting the application builder for karma tests. (cherry picked from commit 66c55df46812c2f8d95c1e6eadc75bdc5153c14f) --- .../angular_devkit/build_angular/BUILD.bazel | 2 +- .../tests/behavior/code-coverage_spec.ts | 8 +- .../karma/tests/behavior/errors_spec.ts | 8 +- .../karma/tests/behavior/module-cjs_spec.ts | 8 +- .../karma/tests/behavior/rebuilds_spec.ts | 8 +- .../karma/tests/options/assets_spec.ts | 8 +- .../options/code-coverage-exclude_spec.ts | 8 +- .../karma/tests/options/code-coverage_spec.ts | 8 +- .../karma/tests/options/exclude_spec.ts | 8 +- .../karma/tests/options/include_spec.ts | 8 +- .../karma/tests/options/styles_spec.ts | 8 +- .../tests/options/web-worker-tsconfig_spec.ts | 8 +- .../src/builders/karma/tests/setup.ts | 145 ++++++++++++++++++ 13 files changed, 212 insertions(+), 23 deletions(-) diff --git a/packages/angular_devkit/build_angular/BUILD.bazel b/packages/angular_devkit/build_angular/BUILD.bazel index 4d2e1f7b294b..3a19f71b208c 100644 --- a/packages/angular_devkit/build_angular/BUILD.bazel +++ b/packages/angular_devkit/build_angular/BUILD.bazel @@ -317,7 +317,7 @@ LARGE_SPECS = { }, "extract-i18n": {}, "karma": { - "shards": 3, + "shards": 6, "size": "large", "flaky": True, "extra_deps": [ diff --git a/packages/angular_devkit/build_angular/src/builders/karma/tests/behavior/code-coverage_spec.ts b/packages/angular_devkit/build_angular/src/builders/karma/tests/behavior/code-coverage_spec.ts index 0b94de99af31..38e93f6dd611 100644 --- a/packages/angular_devkit/build_angular/src/builders/karma/tests/behavior/code-coverage_spec.ts +++ b/packages/angular_devkit/build_angular/src/builders/karma/tests/behavior/code-coverage_spec.ts @@ -10,7 +10,7 @@ import { setTimeout } from 'node:timers/promises'; import { tags } from '@angular-devkit/core'; import { last, tap } from 'rxjs'; import { execute } from '../../index'; -import { BASE_OPTIONS, KARMA_BUILDER_INFO, describeBuilder } from '../setup'; +import { BASE_OPTIONS, KARMA_BUILDER_INFO, describeKarmaBuilder } from '../setup'; // In each of the test below we'll have to call setTimeout to wait for the coverage // analysis to be done. This is because karma-coverage performs the analysis @@ -21,8 +21,12 @@ import { BASE_OPTIONS, KARMA_BUILDER_INFO, describeBuilder } from '../setup'; const coveragePath = 'coverage/lcov.info'; -describeBuilder(execute, KARMA_BUILDER_INFO, (harness) => { +describeKarmaBuilder(execute, KARMA_BUILDER_INFO, (harness, setupTarget, isApplicationBuilder) => { describe('Behavior: "codeCoverage"', () => { + beforeEach(() => { + setupTarget(harness); + }); + it('should generate coverage report when file was previously processed by Babel', async () => { // Force Babel transformation. await harness.appendToFile('src/app/app.component.ts', '// async'); diff --git a/packages/angular_devkit/build_angular/src/builders/karma/tests/behavior/errors_spec.ts b/packages/angular_devkit/build_angular/src/builders/karma/tests/behavior/errors_spec.ts index 437aff26f791..c1ff1a15bd06 100644 --- a/packages/angular_devkit/build_angular/src/builders/karma/tests/behavior/errors_spec.ts +++ b/packages/angular_devkit/build_angular/src/builders/karma/tests/behavior/errors_spec.ts @@ -7,10 +7,14 @@ */ import { execute } from '../../index'; -import { BASE_OPTIONS, KARMA_BUILDER_INFO, describeBuilder } from '../setup'; +import { BASE_OPTIONS, KARMA_BUILDER_INFO, describeKarmaBuilder } from '../setup'; -describeBuilder(execute, KARMA_BUILDER_INFO, (harness) => { +describeKarmaBuilder(execute, KARMA_BUILDER_INFO, (harness, setupTarget) => { describe('Behavior: "Errors"', () => { + beforeEach(() => { + setupTarget(harness); + }); + it('should fail when there is a TypeScript error', async () => { harness.useTarget('test', { ...BASE_OPTIONS, diff --git a/packages/angular_devkit/build_angular/src/builders/karma/tests/behavior/module-cjs_spec.ts b/packages/angular_devkit/build_angular/src/builders/karma/tests/behavior/module-cjs_spec.ts index fc6937f09aa1..3737944c351d 100644 --- a/packages/angular_devkit/build_angular/src/builders/karma/tests/behavior/module-cjs_spec.ts +++ b/packages/angular_devkit/build_angular/src/builders/karma/tests/behavior/module-cjs_spec.ts @@ -7,10 +7,14 @@ */ import { execute } from '../../index'; -import { BASE_OPTIONS, KARMA_BUILDER_INFO, describeBuilder } from '../setup'; +import { BASE_OPTIONS, KARMA_BUILDER_INFO, describeKarmaBuilder } from '../setup'; -describeBuilder(execute, KARMA_BUILDER_INFO, (harness) => { +describeKarmaBuilder(execute, KARMA_BUILDER_INFO, (harness, setupTarget) => { describe('Behavior: "module commonjs"', () => { + beforeEach(() => { + setupTarget(harness); + }); + it('should work when module is commonjs', async () => { harness.useTarget('test', { ...BASE_OPTIONS, diff --git a/packages/angular_devkit/build_angular/src/builders/karma/tests/behavior/rebuilds_spec.ts b/packages/angular_devkit/build_angular/src/builders/karma/tests/behavior/rebuilds_spec.ts index 039a3fdbab3b..d58cf7a851fb 100644 --- a/packages/angular_devkit/build_angular/src/builders/karma/tests/behavior/rebuilds_spec.ts +++ b/packages/angular_devkit/build_angular/src/builders/karma/tests/behavior/rebuilds_spec.ts @@ -8,10 +8,14 @@ import { concatMap, count, debounceTime, take, timeout } from 'rxjs'; import { execute } from '../../index'; -import { BASE_OPTIONS, KARMA_BUILDER_INFO, describeBuilder } from '../setup'; +import { BASE_OPTIONS, KARMA_BUILDER_INFO, describeKarmaBuilder } from '../setup'; -describeBuilder(execute, KARMA_BUILDER_INFO, (harness) => { +describeKarmaBuilder(execute, KARMA_BUILDER_INFO, (harness, setupTarget) => { describe('Behavior: "Rebuilds"', () => { + beforeEach(() => { + setupTarget(harness); + }); + it('recovers from compilation failures in watch mode', async () => { harness.useTarget('test', { ...BASE_OPTIONS, diff --git a/packages/angular_devkit/build_angular/src/builders/karma/tests/options/assets_spec.ts b/packages/angular_devkit/build_angular/src/builders/karma/tests/options/assets_spec.ts index 76d417912180..b900dca8321d 100644 --- a/packages/angular_devkit/build_angular/src/builders/karma/tests/options/assets_spec.ts +++ b/packages/angular_devkit/build_angular/src/builders/karma/tests/options/assets_spec.ts @@ -7,10 +7,14 @@ */ import { execute } from '../../index'; -import { BASE_OPTIONS, KARMA_BUILDER_INFO, describeBuilder } from '../setup'; +import { BASE_OPTIONS, KARMA_BUILDER_INFO, describeKarmaBuilder } from '../setup'; -describeBuilder(execute, KARMA_BUILDER_INFO, (harness) => { +describeKarmaBuilder(execute, KARMA_BUILDER_INFO, (harness, setupTarget) => { describe('Option: "assets"', () => { + beforeEach(() => { + setupTarget(harness); + }); + it('includes assets', async () => { await harness.writeFiles({ './src/string-file-asset.txt': 'string-file-asset.txt', diff --git a/packages/angular_devkit/build_angular/src/builders/karma/tests/options/code-coverage-exclude_spec.ts b/packages/angular_devkit/build_angular/src/builders/karma/tests/options/code-coverage-exclude_spec.ts index de5b2ff8949d..d10c6a74b0fb 100644 --- a/packages/angular_devkit/build_angular/src/builders/karma/tests/options/code-coverage-exclude_spec.ts +++ b/packages/angular_devkit/build_angular/src/builders/karma/tests/options/code-coverage-exclude_spec.ts @@ -7,7 +7,7 @@ */ import { setTimeout } from 'node:timers/promises'; import { execute } from '../../index'; -import { BASE_OPTIONS, KARMA_BUILDER_INFO, describeBuilder } from '../setup'; +import { BASE_OPTIONS, KARMA_BUILDER_INFO, describeKarmaBuilder } from '../setup'; // In each of the test below we'll have to call setTimeout to wait for the coverage // analysis to be done. This is because karma-coverage performs the analysis @@ -18,8 +18,12 @@ import { BASE_OPTIONS, KARMA_BUILDER_INFO, describeBuilder } from '../setup'; const coveragePath = 'coverage/lcov.info'; -describeBuilder(execute, KARMA_BUILDER_INFO, (harness) => { +describeKarmaBuilder(execute, KARMA_BUILDER_INFO, (harness, setupTarget) => { describe('Option: "codeCoverageExclude"', () => { + beforeEach(() => { + setupTarget(harness); + }); + it('should exclude file from coverage when set', async () => { harness.useTarget('test', { ...BASE_OPTIONS, diff --git a/packages/angular_devkit/build_angular/src/builders/karma/tests/options/code-coverage_spec.ts b/packages/angular_devkit/build_angular/src/builders/karma/tests/options/code-coverage_spec.ts index 8346cb133012..5b8bd9d7217b 100644 --- a/packages/angular_devkit/build_angular/src/builders/karma/tests/options/code-coverage_spec.ts +++ b/packages/angular_devkit/build_angular/src/builders/karma/tests/options/code-coverage_spec.ts @@ -8,7 +8,7 @@ import { setTimeout } from 'node:timers/promises'; import { execute } from '../../index'; -import { BASE_OPTIONS, KARMA_BUILDER_INFO, describeBuilder } from '../setup'; +import { BASE_OPTIONS, KARMA_BUILDER_INFO, describeKarmaBuilder } from '../setup'; // In each of the test below we'll have to call setTimeout to wait for the coverage // analysis to be done. This is because karma-coverage performs the analysis @@ -19,8 +19,12 @@ import { BASE_OPTIONS, KARMA_BUILDER_INFO, describeBuilder } from '../setup'; const coveragePath = 'coverage/lcov.info'; -describeBuilder(execute, KARMA_BUILDER_INFO, (harness) => { +describeKarmaBuilder(execute, KARMA_BUILDER_INFO, (harness, setupTarget) => { describe('Option: "codeCoverage"', () => { + beforeEach(() => { + setupTarget(harness); + }); + it('should generate coverage report when option is set to true', async () => { harness.useTarget('test', { ...BASE_OPTIONS, diff --git a/packages/angular_devkit/build_angular/src/builders/karma/tests/options/exclude_spec.ts b/packages/angular_devkit/build_angular/src/builders/karma/tests/options/exclude_spec.ts index bcc7af77d296..e2cc3221a2e3 100644 --- a/packages/angular_devkit/build_angular/src/builders/karma/tests/options/exclude_spec.ts +++ b/packages/angular_devkit/build_angular/src/builders/karma/tests/options/exclude_spec.ts @@ -7,10 +7,14 @@ */ import { execute } from '../../index'; -import { BASE_OPTIONS, KARMA_BUILDER_INFO, describeBuilder } from '../setup'; +import { BASE_OPTIONS, KARMA_BUILDER_INFO, describeKarmaBuilder } from '../setup'; -describeBuilder(execute, KARMA_BUILDER_INFO, (harness) => { +describeKarmaBuilder(execute, KARMA_BUILDER_INFO, (harness, setupTarget) => { describe('Option: "exclude"', () => { + beforeEach(() => { + setupTarget(harness); + }); + beforeEach(async () => { await harness.writeFiles({ 'src/app/error.spec.ts': ` diff --git a/packages/angular_devkit/build_angular/src/builders/karma/tests/options/include_spec.ts b/packages/angular_devkit/build_angular/src/builders/karma/tests/options/include_spec.ts index b8402b187916..9dd61aa52516 100644 --- a/packages/angular_devkit/build_angular/src/builders/karma/tests/options/include_spec.ts +++ b/packages/angular_devkit/build_angular/src/builders/karma/tests/options/include_spec.ts @@ -7,10 +7,14 @@ */ import { execute } from '../../index'; -import { BASE_OPTIONS, KARMA_BUILDER_INFO, describeBuilder } from '../setup'; +import { BASE_OPTIONS, KARMA_BUILDER_INFO, describeKarmaBuilder } from '../setup'; -describeBuilder(execute, KARMA_BUILDER_INFO, (harness) => { +describeKarmaBuilder(execute, KARMA_BUILDER_INFO, (harness, setupTarget) => { describe('Option: "include"', () => { + beforeEach(() => { + setupTarget(harness); + }); + it(`should fail when includes doesn't match any files`, async () => { harness.useTarget('test', { ...BASE_OPTIONS, diff --git a/packages/angular_devkit/build_angular/src/builders/karma/tests/options/styles_spec.ts b/packages/angular_devkit/build_angular/src/builders/karma/tests/options/styles_spec.ts index 5d498462c9f1..37f213cb087c 100644 --- a/packages/angular_devkit/build_angular/src/builders/karma/tests/options/styles_spec.ts +++ b/packages/angular_devkit/build_angular/src/builders/karma/tests/options/styles_spec.ts @@ -7,10 +7,14 @@ */ import { execute } from '../../index'; -import { BASE_OPTIONS, KARMA_BUILDER_INFO, describeBuilder } from '../setup'; +import { BASE_OPTIONS, KARMA_BUILDER_INFO, describeKarmaBuilder } from '../setup'; -describeBuilder(execute, KARMA_BUILDER_INFO, (harness) => { +describeKarmaBuilder(execute, KARMA_BUILDER_INFO, (harness, setupTarget) => { describe('Option: "styles"', () => { + beforeEach(() => { + setupTarget(harness); + }); + it(`processes 'styles.css' styles`, async () => { await harness.writeFiles({ 'src/styles.css': 'p {display: none}', diff --git a/packages/angular_devkit/build_angular/src/builders/karma/tests/options/web-worker-tsconfig_spec.ts b/packages/angular_devkit/build_angular/src/builders/karma/tests/options/web-worker-tsconfig_spec.ts index 22423e2b8586..3bc06d86a10d 100644 --- a/packages/angular_devkit/build_angular/src/builders/karma/tests/options/web-worker-tsconfig_spec.ts +++ b/packages/angular_devkit/build_angular/src/builders/karma/tests/options/web-worker-tsconfig_spec.ts @@ -7,10 +7,14 @@ */ import { execute } from '../../index'; -import { BASE_OPTIONS, KARMA_BUILDER_INFO, describeBuilder } from '../setup'; +import { BASE_OPTIONS, KARMA_BUILDER_INFO, describeKarmaBuilder } from '../setup'; -describeBuilder(execute, KARMA_BUILDER_INFO, (harness) => { +describeKarmaBuilder(execute, KARMA_BUILDER_INFO, (harness, setupTarget) => { describe('Option: "webWorkerTsConfig"', () => { + beforeEach(() => { + setupTarget(harness); + }); + beforeEach(async () => { await harness.writeFiles({ 'src/tsconfig.worker.json': ` diff --git a/packages/angular_devkit/build_angular/src/builders/karma/tests/setup.ts b/packages/angular_devkit/build_angular/src/builders/karma/tests/setup.ts index eb10590b44c5..6f0cde5927d4 100644 --- a/packages/angular_devkit/build_angular/src/builders/karma/tests/setup.ts +++ b/packages/angular_devkit/build_angular/src/builders/karma/tests/setup.ts @@ -7,6 +7,21 @@ */ import { Schema } from '../schema'; +import { BuilderHandlerFn } from '@angular-devkit/architect'; +import { json } from '@angular-devkit/core'; +import { ApplicationBuilderOptions as ApplicationSchema, buildApplication } from '@angular/build'; +import * as path from 'node:path'; +import { readFileSync } from 'node:fs'; + +import { JasmineBuilderHarness } from '../../../testing'; +import { host } from '../../../testing/test-utils'; +import { BuilderHarness } from '../../../testing'; +import { buildWebpackBrowser } from '../../browser'; +import { Schema as BrowserSchema } from '../../browser/schema'; +import { + BASE_OPTIONS as BROWSER_BASE_OPTIONS, + BROWSER_BUILDER_INFO, +} from '../../browser/tests/setup'; export { describeBuilder } from '../../../testing'; @@ -27,3 +42,133 @@ export const BASE_OPTIONS = Object.freeze({ progress: false, watch: false, }); + +const optionSchemaCache = new Map(); + +function getCachedSchema(options: { schemaPath: string }): json.schema.JsonSchema { + let optionSchema = optionSchemaCache.get(options.schemaPath); + if (optionSchema === undefined) { + optionSchema = JSON.parse(readFileSync(options.schemaPath, 'utf8')) as json.schema.JsonSchema; + optionSchemaCache.set(options.schemaPath, optionSchema); + } + return optionSchema; +} + +/** + * Adds a `build` target to a builder test harness for the browser builder with the base options + * used by the browser builder tests. + * + * @param harness The builder harness to use when setting up the browser builder target + * @param extraOptions The additional options that should be used when executing the target. + */ +export function setupBrowserTarget( + harness: BuilderHarness, + extraOptions?: Partial, +): void { + const browserSchema = getCachedSchema(BROWSER_BUILDER_INFO); + + harness.withBuilderTarget( + 'build', + buildWebpackBrowser, + { + ...BROWSER_BASE_OPTIONS, + ...extraOptions, + }, + { + builderName: BROWSER_BUILDER_INFO.name, + optionSchema: browserSchema, + }, + ); +} + +/** + * Contains all required application builder fields. + * Also disables progress reporting to minimize logging output. + */ +export const APPLICATION_BASE_OPTIONS = Object.freeze({ + index: 'src/index.html', + browser: 'src/main.ts', + outputPath: 'dist', + tsConfig: 'src/tsconfig.app.json', + progress: false, + + // Disable optimizations + optimization: false, + + // Enable polling (if a test enables watch mode). + // This is a workaround for bazel isolation file watch not triggering in tests. + poll: 100, +}); + +// TODO: Remove and use import after Vite-based dev server is moved to new package +export const APPLICATION_BUILDER_INFO = Object.freeze({ + name: '@angular-devkit/build-angular:application', + schemaPath: path.join( + path.dirname(require.resolve('@angular/build/package.json')), + 'src/builders/application/schema.json', + ), +}); + +/** + * Adds a `build` target to a builder test harness for the application builder with the base options + * used by the application builder tests. + * + * @param harness The builder harness to use when setting up the application builder target + * @param extraOptions The additional options that should be used when executing the target. + */ +export function setupApplicationTarget( + harness: BuilderHarness, + extraOptions?: Partial, +): void { + const applicationSchema = getCachedSchema(APPLICATION_BUILDER_INFO); + + harness.withBuilderTarget( + 'build', + buildApplication, + { + ...APPLICATION_BASE_OPTIONS, + ...extraOptions, + }, + { + builderName: APPLICATION_BUILDER_INFO.name, + optionSchema: applicationSchema, + }, + ); +} + +/** Runs the test against both an application- and a browser-builder context. */ +export function describeKarmaBuilder( + builderHandler: BuilderHandlerFn, + options: { name?: string; schemaPath: string }, + specDefinitions: (( + harness: JasmineBuilderHarness, + setupTarget: typeof setupApplicationTarget, + isApplicationTarget: true, + ) => void) & + (( + harness: JasmineBuilderHarness, + setupTarget: typeof setupBrowserTarget, + isApplicationTarget: false, + ) => void), +) { + const optionSchema = getCachedSchema(options); + const harness = new JasmineBuilderHarness(builderHandler, host, { + builderName: options.name, + optionSchema, + }); + + describe(options.name || builderHandler.name, () => { + for (const isApplicationTarget of [true, false]) { + describe(isApplicationTarget ? 'with application builder' : 'with browser builder', () => { + beforeEach(() => host.initialize().toPromise()); + afterEach(() => host.restore().toPromise()); + + if (isApplicationTarget) { + specDefinitions(harness, setupApplicationTarget, true); + } else { + specDefinitions(harness, setupBrowserTarget, false); + } + }); + } + }); +} From 8274184e1c6fa43cc5101018b6fa86fd636a90ba Mon Sep 17 00:00:00 2001 From: Alan Agius Date: Thu, 26 Sep 2024 13:03:13 +0000 Subject: [PATCH 41/87] fix(@angular/build): add `animate` to valid self-closing elements The `` tag, used for SVG animations, was incorrectly treated as a non-self-closing tag by the Angular build process. This resulted in errors during the build, as the parser expected a closing `` tag even when unnecessary. Closes #28502 (cherry picked from commit dd499499c7e5aeb959cdb1a4442493091c07d667) --- .../build/src/utils/index-file/valid-self-closing-tags.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/angular/build/src/utils/index-file/valid-self-closing-tags.ts b/packages/angular/build/src/utils/index-file/valid-self-closing-tags.ts index bd85b6ee00dd..a67eedf21f30 100644 --- a/packages/angular/build/src/utils/index-file/valid-self-closing-tags.ts +++ b/packages/angular/build/src/utils/index-file/valid-self-closing-tags.ts @@ -23,6 +23,7 @@ export const VALID_SELF_CLOSING_TAGS = new Set([ 'track', 'wbr', /** SVG tags */ + 'animate', 'circle', 'ellipse', 'line', From 3f98193d6963464bd04b510c2d045938f1418ff3 Mon Sep 17 00:00:00 2001 From: "Jan-Niklas W." <6104311+niklas-wortmann@users.noreply.github.com> Date: Wed, 25 Sep 2024 15:00:36 -0500 Subject: [PATCH 42/87] fix(@schematics/angular): support single quote setting in JetBrains IDEs (cherry picked from commit 4179bf2e6b38eeddb53b4e9989a7c64238ab23ad) --- .../angular/workspace/files/__dot__editorconfig.template | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/schematics/angular/workspace/files/__dot__editorconfig.template b/packages/schematics/angular/workspace/files/__dot__editorconfig.template index 59d9a3a3e73f..f166060da1cb 100644 --- a/packages/schematics/angular/workspace/files/__dot__editorconfig.template +++ b/packages/schematics/angular/workspace/files/__dot__editorconfig.template @@ -10,6 +10,7 @@ trim_trailing_whitespace = true [*.ts] quote_type = single +ij_typescript_use_double_quotes = false [*.md] max_line_length = off From 2648e811e7c71e8a68d1eb418d7dcdae42ebf9ff Mon Sep 17 00:00:00 2001 From: nosaku Date: Thu, 26 Sep 2024 19:00:12 -0500 Subject: [PATCH 43/87] fix(@angular/build): add few more SVG elements animateMotion, animateTransform, and feBlend etc. to valid self-closing elements (cherry picked from commit ecfb2b261356946d5f4a653f90c0b78db4ef519c) --- .../index-file/valid-self-closing-tags.ts | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/packages/angular/build/src/utils/index-file/valid-self-closing-tags.ts b/packages/angular/build/src/utils/index-file/valid-self-closing-tags.ts index a67eedf21f30..84a534582ce4 100644 --- a/packages/angular/build/src/utils/index-file/valid-self-closing-tags.ts +++ b/packages/angular/build/src/utils/index-file/valid-self-closing-tags.ts @@ -24,8 +24,35 @@ export const VALID_SELF_CLOSING_TAGS = new Set([ 'wbr', /** SVG tags */ 'animate', + 'animateMotion', + 'animateTransform', 'circle', 'ellipse', + 'feBlend', + 'feColorMatrix', + 'feComponentTransfer', + 'feComposite', + 'feConvolveMatrix', + 'feDiffuseLighting', + 'feDisplacementMap', + 'feDistantLight', + 'feDropShadow', + 'feFlood', + 'feFuncA', + 'feFuncB', + 'feFuncG', + 'feFuncR', + 'feGaussianBlur', + 'feImage', + 'feMerge', + 'feMergeNode', + 'feMorphology', + 'feOffset', + 'fePointLight', + 'feSpecularLighting', + 'feSpotLight', + 'feTile', + 'feTurbulence', 'line', 'path', 'polygon', From 736e126e4836e1c3df32c0ab9ee40e58c16503c0 Mon Sep 17 00:00:00 2001 From: Alan Agius Date: Tue, 1 Oct 2024 13:10:05 +0000 Subject: [PATCH 44/87] fix(@angular/build): separate Vite cache by project Previously, Vite prebundled dependencies were stored in a shared directory across all projects, which caused the `_metadata.json` files to be overwritten. This resulted in undefined behavior, such as re-optimizing dependencies on each run when multiple projects were present in the workspace. Additionally, it introduced conflicts when running multiple `ng serve` processes simultaneously. Closes #28536 (cherry picked from commit c0b76e3377e7f9ded023e5350b9a9ae90a7d31ee) --- packages/angular/build/src/builders/dev-server/vite-server.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/angular/build/src/builders/dev-server/vite-server.ts b/packages/angular/build/src/builders/dev-server/vite-server.ts index 78a971f0e8d7..f1864fda1a21 100644 --- a/packages/angular/build/src/builders/dev-server/vite-server.ts +++ b/packages/angular/build/src/builders/dev-server/vite-server.ts @@ -510,7 +510,7 @@ export async function setupServer( join(serverOptions.workspaceRoot, `.angular/vite-root`, serverOptions.buildTarget.project), ); - const cacheDir = join(serverOptions.cacheOptions.path, 'vite'); + const cacheDir = join(serverOptions.cacheOptions.path, serverOptions.buildTarget.project, 'vite'); const configuration: InlineConfig = { configFile: false, envFile: false, From e45983a277eef12a207042d419068860817654e8 Mon Sep 17 00:00:00 2001 From: Alan Agius Date: Tue, 1 Oct 2024 16:25:51 +0000 Subject: [PATCH 45/87] docs: update license file match that of angular/angular (cherry picked from commit 728d7b0bcc9c8154c6b77b5b314d7b12246943a3) --- LICENSE | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/LICENSE b/LICENSE index 8876c32c1969..9017f114edfc 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ The MIT License -Copyright (c) 2017 Google, Inc. +Copyright (c) 2010-2024 Google LLC. https://angular.dev/license Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -9,13 +9,13 @@ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. From d21d1e6ef4fb33f31316d20657667d806ad7d331 Mon Sep 17 00:00:00 2001 From: Alan Agius Date: Wed, 2 Oct 2024 08:51:45 +0000 Subject: [PATCH 46/87] release: cut the v18.2.7 release --- CHANGELOG.md | 20 ++++++++++++++++++++ package.json | 2 +- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5b5ec9627ff8..fe323b21ca1d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,23 @@ + + +# 18.2.7 (2024-10-02) + +### @schematics/angular + +| Commit | Type | Description | +| --------------------------------------------------------------------------------------------------- | ---- | ---------------------------------------------- | +| [3f98193d6](https://github.com/angular/angular-cli/commit/3f98193d6963464bd04b510c2d045938f1418ff3) | fix | support single quote setting in JetBrains IDEs | + +### @angular/build + +| Commit | Type | Description | +| --------------------------------------------------------------------------------------------------- | ---- | ---------------------------------------------------------------------------------------------------------- | +| [8274184e1](https://github.com/angular/angular-cli/commit/8274184e1c6fa43cc5101018b6fa86fd636a90ba) | fix | add `animate` to valid self-closing elements | +| [2648e811e](https://github.com/angular/angular-cli/commit/2648e811e7c71e8a68d1eb418d7dcdae42ebf9ff) | fix | add few more SVG elements animateMotion, animateTransform, and feBlend etc. to valid self-closing elements | +| [736e126e4](https://github.com/angular/angular-cli/commit/736e126e4836e1c3df32c0ab9ee40e58c16503c0) | fix | separate Vite cache by project | + + + # 18.2.6 (2024-09-25) diff --git a/package.json b/package.json index 25da8912d23e..fe45af9c63b2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@angular/devkit-repo", - "version": "18.2.6", + "version": "18.2.7", "private": true, "description": "Software Development Kit for Angular", "keywords": [ From b522002fff763cda2ae1c746efcb2638d0099184 Mon Sep 17 00:00:00 2001 From: harshlakhara Date: Fri, 4 Oct 2024 07:35:49 +0530 Subject: [PATCH 47/87] fix(@schematics/angular): add validation for component and directive class name (cherry picked from commit 6dbfc770b2d2f72dbc73e39e763f0773435825c6) --- packages/schematics/angular/component/index.ts | 3 ++- packages/schematics/angular/component/index_spec.ts | 8 ++++++++ packages/schematics/angular/directive/index.ts | 3 ++- packages/schematics/angular/directive/index_spec.ts | 8 ++++++++ 4 files changed, 20 insertions(+), 2 deletions(-) diff --git a/packages/schematics/angular/component/index.ts b/packages/schematics/angular/component/index.ts index bb07a85cab1d..ef1fcd856a00 100644 --- a/packages/schematics/angular/component/index.ts +++ b/packages/schematics/angular/component/index.ts @@ -25,7 +25,7 @@ import { import { addDeclarationToNgModule } from '../utility/add-declaration-to-ng-module'; import { findModuleFromOptions } from '../utility/find-module'; import { parseName } from '../utility/parse-name'; -import { validateHtmlSelector } from '../utility/validation'; +import { validateClassName, validateHtmlSelector } from '../utility/validation'; import { buildDefaultPath, getWorkspace } from '../utility/workspace'; import { Schema as ComponentOptions, Style } from './schema'; @@ -62,6 +62,7 @@ export default function (options: ComponentOptions): Rule { options.selector || buildSelector(options, (project && project.prefix) || ''); validateHtmlSelector(options.selector); + validateClassName(strings.classify(options.name)); const skipStyleFile = options.inlineStyle || options.style === Style.None; const templateSource = apply(url('./files'), [ diff --git a/packages/schematics/angular/component/index_spec.ts b/packages/schematics/angular/component/index_spec.ts index ee1d51c3c1a0..d6f5af8dc6df 100644 --- a/packages/schematics/angular/component/index_spec.ts +++ b/packages/schematics/angular/component/index_spec.ts @@ -157,6 +157,14 @@ describe('Component Schematic', () => { ).toBeRejectedWithError('Selector "app-1-one" is invalid.'); }); + it('should error when class name contains invalid characters', async () => { + const options = { ...defaultOptions, name: '404' }; + + await expectAsync( + schematicRunner.runSchematic('component', options, appTree), + ).toBeRejectedWithError('Class name "404" is invalid.'); + }); + it('should allow dash in selector before a number', async () => { const options = { ...defaultOptions, name: 'one-1' }; diff --git a/packages/schematics/angular/directive/index.ts b/packages/schematics/angular/directive/index.ts index b6e89eacf0e1..97e6a9deaa18 100644 --- a/packages/schematics/angular/directive/index.ts +++ b/packages/schematics/angular/directive/index.ts @@ -23,7 +23,7 @@ import { import { addDeclarationToNgModule } from '../utility/add-declaration-to-ng-module'; import { findModuleFromOptions } from '../utility/find-module'; import { parseName } from '../utility/parse-name'; -import { validateHtmlSelector } from '../utility/validation'; +import { validateClassName, validateHtmlSelector } from '../utility/validation'; import { buildDefaultPath, getWorkspace } from '../utility/workspace'; import { Schema as DirectiveOptions } from './schema'; @@ -58,6 +58,7 @@ export default function (options: DirectiveOptions): Rule { options.selector = options.selector || buildSelector(options, project.prefix || ''); validateHtmlSelector(options.selector); + validateClassName(strings.classify(options.name)); const templateSource = apply(url('./files'), [ options.skipTests ? filter((path) => !path.endsWith('.spec.ts.template')) : noop(), diff --git a/packages/schematics/angular/directive/index_spec.ts b/packages/schematics/angular/directive/index_spec.ts index e636830bf93c..afa845d29f65 100644 --- a/packages/schematics/angular/directive/index_spec.ts +++ b/packages/schematics/angular/directive/index_spec.ts @@ -111,6 +111,14 @@ describe('Directive Schematic', () => { expect(directiveContent).toContain('class FooDirective'); }); + it('should error when class name contains invalid characters', async () => { + const options = { ...defaultOptions, name: '404' }; + + await expectAsync( + schematicRunner.runSchematic('component', options, appTree), + ).toBeRejectedWithError('Class name "404" is invalid.'); + }); + describe('standalone=false', () => { const defaultNonStandaloneOptions: DirectiveOptions = { ...defaultOptions, From af7e775c1f5526f7ad54f8308072bbe53ed1058f Mon Sep 17 00:00:00 2001 From: Alan Agius Date: Fri, 4 Oct 2024 09:41:23 +0000 Subject: [PATCH 48/87] test: fix typo in directory name (cherry picked from commit 54cb0058443ea29bdf1069ecdc842d5f69d391bd) --- .../e2e/tests/generate/{confg => config}/type-browserslist.ts | 0 .../legacy-cli/e2e/tests/generate/{confg => config}/type-karma.ts | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename tests/legacy-cli/e2e/tests/generate/{confg => config}/type-browserslist.ts (100%) rename tests/legacy-cli/e2e/tests/generate/{confg => config}/type-karma.ts (100%) diff --git a/tests/legacy-cli/e2e/tests/generate/confg/type-browserslist.ts b/tests/legacy-cli/e2e/tests/generate/config/type-browserslist.ts similarity index 100% rename from tests/legacy-cli/e2e/tests/generate/confg/type-browserslist.ts rename to tests/legacy-cli/e2e/tests/generate/config/type-browserslist.ts diff --git a/tests/legacy-cli/e2e/tests/generate/confg/type-karma.ts b/tests/legacy-cli/e2e/tests/generate/config/type-karma.ts similarity index 100% rename from tests/legacy-cli/e2e/tests/generate/confg/type-karma.ts rename to tests/legacy-cli/e2e/tests/generate/config/type-karma.ts From dfd2d5c0500777fa5aea91519f6657aed7f3b7d7 Mon Sep 17 00:00:00 2001 From: Alan Agius Date: Mon, 7 Oct 2024 07:58:28 +0000 Subject: [PATCH 49/87] fix(@schematics/angular): include `index.csr.html` in resources asset group Ensure `index.csr.html` is available for the service worker when using SSR/SSG. Closes #28574 (cherry picked from commit 7de93e593a9b6439b2f33d0c25c371e14a0e9e38) --- .../angular/service-worker/files/ngsw-config.json.template | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/schematics/angular/service-worker/files/ngsw-config.json.template b/packages/schematics/angular/service-worker/files/ngsw-config.json.template index 17954bd634f1..1be9a7e62f53 100644 --- a/packages/schematics/angular/service-worker/files/ngsw-config.json.template +++ b/packages/schematics/angular/service-worker/files/ngsw-config.json.template @@ -8,6 +8,7 @@ "resources": { "files": [ "/favicon.ico", + "/index.csr.html", "/index.html", "/manifest.webmanifest", "/*.css", From 9b5cfaa8ce9d12bf450e7527d479ce7a879ea1b8 Mon Sep 17 00:00:00 2001 From: Ihar Sazanavets Date: Fri, 4 Oct 2024 01:45:16 +0300 Subject: [PATCH 50/87] fix(@angular/build): always generate a new hash for optimized chunk (cherry picked from commit 1d9db138f34132f62fd008c9b8597489b08018e6) --- .../build/src/builders/application/chunk-optimizer.ts | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/packages/angular/build/src/builders/application/chunk-optimizer.ts b/packages/angular/build/src/builders/application/chunk-optimizer.ts index ab19f5757b6c..a0ffa657b5c3 100644 --- a/packages/angular/build/src/builders/application/chunk-optimizer.ts +++ b/packages/angular/build/src/builders/application/chunk-optimizer.ts @@ -103,10 +103,7 @@ export async function optimizeChunks( const result = await bundle.generate({ compact: true, sourcemap, - chunkFileNames(chunkInfo) { - // Do not add hash to file name if already present - return /-[a-zA-Z0-9]{8}$/.test(chunkInfo.name) ? '[name].js' : '[name]-[hash].js'; - }, + chunkFileNames: (chunkInfo) => `${chunkInfo.name.replace(/-[a-zA-Z0-9]{8}$/, '')}-[hash].js`, }); optimizedOutput = result.output; } catch (e) { From 9445916f9b5b9da69623bf86735264d8a5f26fb3 Mon Sep 17 00:00:00 2001 From: Alan Agius Date: Wed, 9 Oct 2024 11:43:38 +0000 Subject: [PATCH 51/87] fix(@angular/build): `Ctrl + C` not terminating dev-server with SSR This commit provides a workaround for https://github.com/angular/angular-cli/issues/28336, which occurs due to the interaction between `zone.js` and `listr2`. The issue prevents proper termination of the development server using Ctrl + C when dev-server. Closes: #28336 --- .../angular/build/src/builders/dev-server/vite-server.ts | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/packages/angular/build/src/builders/dev-server/vite-server.ts b/packages/angular/build/src/builders/dev-server/vite-server.ts index f1864fda1a21..f6a4f54accd2 100644 --- a/packages/angular/build/src/builders/dev-server/vite-server.ts +++ b/packages/angular/build/src/builders/dev-server/vite-server.ts @@ -101,6 +101,13 @@ export async function* serveWithVite( // https://nodejs.org/api/process.html#processsetsourcemapsenabledval process.setSourceMapsEnabled(true); + + if (browserOptions.progress !== false) { + // This is a workaround for https://github.com/angular/angular-cli/issues/28336, which is caused by the interaction between `zone.js` and `listr2`. + process.once('SIGINT', () => { + process.kill(process.pid); + }); + } } // Set all packages as external to support Vite's prebundle caching From 1e578dff750012c7411572afc1e91b7f4d050c64 Mon Sep 17 00:00:00 2001 From: Doug Parker Date: Wed, 9 Oct 2024 10:26:07 -0700 Subject: [PATCH 52/87] release: cut the v18.2.8 release --- CHANGELOG.md | 20 ++++++++++++++++++++ package.json | 2 +- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fe323b21ca1d..375e460861ee 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,23 @@ + + +# 18.2.8 (2024-10-09) + +### @schematics/angular + +| Commit | Type | Description | +| --------------------------------------------------------------------------------------------------- | ---- | ----------------------------------------------------- | +| [b522002ff](https://github.com/angular/angular-cli/commit/b522002fff763cda2ae1c746efcb2638d0099184) | fix | add validation for component and directive class name | +| [dfd2d5c05](https://github.com/angular/angular-cli/commit/dfd2d5c0500777fa5aea91519f6657aed7f3b7d7) | fix | include `index.csr.html` in resources asset group | + +### @angular/build + +| Commit | Type | Description | +| --------------------------------------------------------------------------------------------------- | ---- | ---------------------------------------------- | +| [9445916f9](https://github.com/angular/angular-cli/commit/9445916f9b5b9da69623bf86735264d8a5f26fb3) | fix | `Ctrl + C` not terminating dev-server with SSR | +| [9b5cfaa8c](https://github.com/angular/angular-cli/commit/9b5cfaa8ce9d12bf450e7527d479ce7a879ea1b8) | fix | always generate a new hash for optimized chunk | + + + # 18.2.7 (2024-10-02) diff --git a/package.json b/package.json index fe45af9c63b2..0b3938df6e9e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@angular/devkit-repo", - "version": "18.2.7", + "version": "18.2.8", "private": true, "description": "Software Development Kit for Angular", "keywords": [ From 237f7c5d0355e0a90b23156d3aa97f4328c869e7 Mon Sep 17 00:00:00 2001 From: Jithil P Ponnan Date: Sun, 13 Oct 2024 02:20:47 +1100 Subject: [PATCH 53/87] fix(@schematics/angular): update browserslist config to include last 2 Android major versions (cherry picked from commit a68e832aefa0767461e43e3b824f3ef773b02038) --- packages/angular/build/src/utils/supported-browsers.ts | 1 + .../schematics/angular/config/files/.browserslistrc.template | 1 + 2 files changed, 2 insertions(+) diff --git a/packages/angular/build/src/utils/supported-browsers.ts b/packages/angular/build/src/utils/supported-browsers.ts index 79674a62beae..30c3d502fcdd 100644 --- a/packages/angular/build/src/utils/supported-browsers.ts +++ b/packages/angular/build/src/utils/supported-browsers.ts @@ -18,6 +18,7 @@ export function getSupportedBrowsers( 'last 2 Edge major versions', 'last 2 Safari major versions', 'last 2 iOS major versions', + 'last 2 Android major versions', 'Firefox ESR', ]; diff --git a/packages/schematics/angular/config/files/.browserslistrc.template b/packages/schematics/angular/config/files/.browserslistrc.template index 08a5553150f9..4ec7f1adf73c 100644 --- a/packages/schematics/angular/config/files/.browserslistrc.template +++ b/packages/schematics/angular/config/files/.browserslistrc.template @@ -13,4 +13,5 @@ last 1 Firefox version last 2 Edge major versions last 2 Safari major versions last 2 iOS major versions +last 2 Android major versions Firefox ESR From b91c82d8997c0009ed4bbf5e9cd9c82cb1f7f755 Mon Sep 17 00:00:00 2001 From: hborchardt <66408901+hborchardt@users.noreply.github.com> Date: Mon, 14 Oct 2024 23:01:07 +0200 Subject: [PATCH 54/87] fix(@angular/build): avoid race condition in sass importer On slow systems, a race condition can lead to the sass worker thread being notified to wake up before a message is posted. This causes the build to be aborted because the searched file is not found. Waiting twice for a non-zero number in the signal handles this race correctly, and the second wait should be a noop in the usual case. Fixes #27167 (cherry picked from commit 5f473affcf001888082bf4adc51481c5afca81e0) --- .../angular/build/src/tools/sass/worker.ts | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/packages/angular/build/src/tools/sass/worker.ts b/packages/angular/build/src/tools/sass/worker.ts index f0d7d5cd8b06..b64aa3a34fe8 100644 --- a/packages/angular/build/src/tools/sass/worker.ts +++ b/packages/angular/build/src/tools/sass/worker.ts @@ -80,6 +80,25 @@ export default async function renderSassStylesheet(request: RenderRequestMessage containingUrl: containingUrl ? fileURLToPath(containingUrl) : null, }, }); + // Wait for the main thread to set the signal to 1 and notify, which tells + // us that a message can be received on the port. + // If the main thread is fast, the signal will already be set to 1, and no + // sleep/notify is necessary. + // However, there can be a race condition here: + // - the main thread sets the signal to 1, but does not get to the notify instruction yet + // - the worker does not pause because the signal is set to 1 + // - the worker very soon enters this method again + // - this method sets the signal to 0 and sends the message + // - the signal is 0 and so the `Atomics.wait` call blocks + // - only now the main thread runs the `notify` from the first invocation, so the + // worker continues. + // - but there is no message yet in the port, because the thread should not have been + // waken up yet. + // To combat this, wait for a non-0 value _twice_. + // Almost every time, this immediately continues with "not-equal", because + // the signal is still set to 1, except during the race condition, when the second + // wait will wait for the correct notify. + Atomics.wait(importerChannel.signal, 0, 0); Atomics.wait(importerChannel.signal, 0, 0); const result = receiveMessageOnPort(importerChannel.port)?.message as string | null; From d749ba6a3c3dd7a90317bd9b46e858a842f27696 Mon Sep 17 00:00:00 2001 From: Charles Lyding <19598772+clydin@users.noreply.github.com> Date: Tue, 15 Oct 2024 12:20:43 -0400 Subject: [PATCH 55/87] fix(@angular/build): allow direct bundling of TSX files with application builder When using the application builder with `isolatedModules`, the bundler will directly handle TypeScript transpilation and bundling. Previously, any input TSX files were loaded by the bundler as TS files. This difference caused errors when attempting to process the files since the syntax differs between TSX and TS. The appropriate loader will now be used if the input file is TSX in this situation. (cherry picked from commit 13b65dfe191ca18a577421019c9a9e285d5c95a3) --- .../typescript-isolated-modules_spec.ts | 28 +++++++++++++++++++ .../tools/esbuild/angular/compiler-plugin.ts | 15 +++++++++- 2 files changed, 42 insertions(+), 1 deletion(-) diff --git a/packages/angular/build/src/builders/application/tests/behavior/typescript-isolated-modules_spec.ts b/packages/angular/build/src/builders/application/tests/behavior/typescript-isolated-modules_spec.ts index 738e454adb01..06e66cbd6da9 100644 --- a/packages/angular/build/src/builders/application/tests/behavior/typescript-isolated-modules_spec.ts +++ b/packages/angular/build/src/builders/application/tests/behavior/typescript-isolated-modules_spec.ts @@ -47,5 +47,33 @@ describeBuilder(buildApplication, APPLICATION_BUILDER_INFO, (harness) => { expect(result?.success).toBe(true); }); + + it('supports TSX files with isolated modules enabled and enabled optimizations', async () => { + // Enable tsconfig isolatedModules option in tsconfig + await harness.modifyFile('tsconfig.json', (content) => { + const tsconfig = JSON.parse(content); + tsconfig.compilerOptions.isolatedModules = true; + tsconfig.compilerOptions.jsx = 'react-jsx'; + + return JSON.stringify(tsconfig); + }); + + await harness.writeFile('src/types.d.ts', `declare module 'react/jsx-runtime' { jsx: any }`); + await harness.writeFile('src/abc.tsx', `export function hello() { return

Hello

; }`); + await harness.modifyFile( + 'src/main.ts', + (content) => content + `import { hello } from './abc'; console.log(hello());`, + ); + + harness.useTarget('build', { + ...BASE_OPTIONS, + optimization: true, + externalDependencies: ['react'], + }); + + const { result } = await harness.executeOnce(); + + expect(result?.success).toBe(true); + }); }); }); diff --git a/packages/angular/build/src/tools/esbuild/angular/compiler-plugin.ts b/packages/angular/build/src/tools/esbuild/angular/compiler-plugin.ts index a992a199c1cb..eaeb7f324bf9 100644 --- a/packages/angular/build/src/tools/esbuild/angular/compiler-plugin.ts +++ b/packages/angular/build/src/tools/esbuild/angular/compiler-plugin.ts @@ -8,6 +8,7 @@ import type { BuildFailure, + Loader, Metafile, OnStartResult, OutputFile, @@ -409,9 +410,21 @@ export function createCompilerPlugin( typeScriptFileCache.set(request, contents); } + let loader: Loader; + if (useTypeScriptTranspilation || isJS) { + // TypeScript has transpiled to JS or is already JS + loader = 'js'; + } else if (request.at(-1) === 'x') { + // TSX and TS have different syntax rules. Only set if input is a TSX file. + loader = 'tsx'; + } else { + // Otherwise, directly bundle TS + loader = 'ts'; + } + return { contents, - loader: useTypeScriptTranspilation || isJS ? 'js' : 'ts', + loader, }; }); From 302c4d13fc497c28ebd90d3a8235846f4423bea6 Mon Sep 17 00:00:00 2001 From: Jan Martin Date: Wed, 16 Oct 2024 22:55:06 +0000 Subject: [PATCH 56/87] release: cut the v18.2.9 release --- CHANGELOG.md | 19 +++++++++++++++++++ package.json | 2 +- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 375e460861ee..a3d13f8cb63d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,22 @@ + + +# 18.2.9 (2024-10-16) + +### @schematics/angular + +| Commit | Type | Description | +| --------------------------------------------------------------------------------------------------- | ---- | ------------------------------------------------------------------- | +| [237f7c5d0](https://github.com/angular/angular-cli/commit/237f7c5d0355e0a90b23156d3aa97f4328c869e7) | fix | update browserslist config to include last 2 Android major versions | + +### @angular/build + +| Commit | Type | Description | +| --------------------------------------------------------------------------------------------------- | ---- | ----------------------------------------------------------- | +| [d749ba6a3](https://github.com/angular/angular-cli/commit/d749ba6a3c3dd7a90317bd9b46e858a842f27696) | fix | allow direct bundling of TSX files with application builder | +| [b91c82d89](https://github.com/angular/angular-cli/commit/b91c82d8997c0009ed4bbf5e9cd9c82cb1f7f755) | fix | avoid race condition in sass importer | + + + # 18.2.8 (2024-10-09) diff --git a/package.json b/package.json index 0b3938df6e9e..ec1a2bf5c62c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@angular/devkit-repo", - "version": "18.2.8", + "version": "18.2.9", "private": true, "description": "Software Development Kit for Angular", "keywords": [ From b1e5f51f9111d7da56ebe64cad51936ad659782d Mon Sep 17 00:00:00 2001 From: Alan Agius Date: Wed, 23 Oct 2024 07:54:27 +0000 Subject: [PATCH 57/87] fix(@angular/build): Address build issue in Node.js LTS versions with prerendering or SSR In Node.js 20, changes to ESM loader hooks result in the `--import` execArgv being passed from the parent to child workers. This commit resolves the issue by setting an empty `execArgv` in the JavaScript transformer, preventing unintended propagation. Closes #28683 (cherry picked from commit cc345b02d814a37bb23d6c3f1baca9595130d010) --- .../angular/build/src/tools/esbuild/javascript-transformer.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/angular/build/src/tools/esbuild/javascript-transformer.ts b/packages/angular/build/src/tools/esbuild/javascript-transformer.ts index ce4b0aa91356..08d8efd4e94a 100644 --- a/packages/angular/build/src/tools/esbuild/javascript-transformer.ts +++ b/packages/angular/build/src/tools/esbuild/javascript-transformer.ts @@ -62,6 +62,8 @@ export class JavaScriptTransformer { // Shutdown idle threads after 1 second of inactivity idleTimeout: 1000, recordTiming: false, + // Prevent passing `--import` (loader-hooks) from parent to child worker. + execArgv: [], }); return this.#workerPool; From 7b775f4e008652777bbe7b788dabed02bcc70cc7 Mon Sep 17 00:00:00 2001 From: Alan Agius Date: Wed, 23 Oct 2024 09:24:32 +0000 Subject: [PATCH 58/87] fix(@angular-devkit/build-angular): update `http-proxy-middleware` to `3.0.3` Address CVE-2024-21536 Closes #28680 --- package.json | 2 +- .../angular_devkit/build_angular/package.json | 2 +- yarn.lock | 52 ++++++++++++++----- 3 files changed, 41 insertions(+), 15 deletions(-) diff --git a/package.json b/package.json index ec1a2bf5c62c..b4e825965b3d 100644 --- a/package.json +++ b/package.json @@ -139,7 +139,7 @@ "express": "4.19.2", "fast-glob": "3.3.2", "http-proxy": "^1.18.1", - "http-proxy-middleware": "3.0.0", + "http-proxy-middleware": "3.0.3", "https-proxy-agent": "7.0.5", "husky": "9.1.4", "ini": "4.1.3", diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json index 548bff700406..72179d0daa05 100644 --- a/packages/angular_devkit/build_angular/package.json +++ b/packages/angular_devkit/build_angular/package.json @@ -32,7 +32,7 @@ "css-loader": "7.1.2", "esbuild-wasm": "0.23.0", "fast-glob": "3.3.2", - "http-proxy-middleware": "3.0.0", + "http-proxy-middleware": "3.0.3", "https-proxy-agent": "7.0.5", "istanbul-lib-instrument": "6.0.3", "jsonc-parser": "3.3.1", diff --git a/yarn.lock b/yarn.lock index f732d86e4bf5..9303c206eea5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -86,7 +86,7 @@ __metadata: esbuild: "npm:0.23.0" esbuild-wasm: "npm:0.23.0" fast-glob: "npm:3.3.2" - http-proxy-middleware: "npm:3.0.0" + http-proxy-middleware: "npm:3.0.3" https-proxy-agent: "npm:7.0.5" istanbul-lib-instrument: "npm:6.0.3" jsonc-parser: "npm:3.3.1" @@ -743,7 +743,7 @@ __metadata: express: "npm:4.19.2" fast-glob: "npm:3.3.2" http-proxy: "npm:^1.18.1" - http-proxy-middleware: "npm:3.0.0" + http-proxy-middleware: "npm:3.0.3" https-proxy-agent: "npm:7.0.5" husky: "npm:9.1.4" ini: "npm:4.1.3" @@ -5004,7 +5004,16 @@ __metadata: languageName: node linkType: hard -"@types/http-proxy@npm:^1.17.10, @types/http-proxy@npm:^1.17.4, @types/http-proxy@npm:^1.17.8": +"@types/http-proxy@npm:^1.17.15": + version: 1.17.15 + resolution: "@types/http-proxy@npm:1.17.15" + dependencies: + "@types/node": "npm:*" + checksum: 10c0/e2bf2fcdf23c88141b8d2c85ed5e5418b62ef78285884a2b5a717af55f4d9062136aa475489d10292093343df58fb81975f34bebd6b9df322288fd9821cbee07 + languageName: node + linkType: hard + +"@types/http-proxy@npm:^1.17.4, @types/http-proxy@npm:^1.17.8": version: 1.17.14 resolution: "@types/http-proxy@npm:1.17.14" dependencies: @@ -10659,17 +10668,17 @@ __metadata: languageName: node linkType: hard -"http-proxy-middleware@npm:3.0.0": - version: 3.0.0 - resolution: "http-proxy-middleware@npm:3.0.0" +"http-proxy-middleware@npm:3.0.3": + version: 3.0.3 + resolution: "http-proxy-middleware@npm:3.0.3" dependencies: - "@types/http-proxy": "npm:^1.17.10" - debug: "npm:^4.3.4" + "@types/http-proxy": "npm:^1.17.15" + debug: "npm:^4.3.6" http-proxy: "npm:^1.18.1" - is-glob: "npm:^4.0.1" - is-plain-obj: "npm:^3.0.0" - micromatch: "npm:^4.0.5" - checksum: 10c0/a3da2e9211483834384c27ad37dcff00dc8ea4990bb791f1383d3a5951f28f77fdc41dbaf2501a6607dcfca3dacac11e43bda22c4f68224abe532cbab8983ede + is-glob: "npm:^4.0.3" + is-plain-object: "npm:^5.0.0" + micromatch: "npm:^4.0.8" + checksum: 10c0/c4d68a10d8d42f02e59f7dc8249c98d1ac03aecee177b42c2d8b6a0cb6b71c6688e759e5387f4cdb570150070ca1c6808b38010cbdf67f4500a2e75671a36e05 languageName: node linkType: hard @@ -11344,6 +11353,13 @@ __metadata: languageName: node linkType: hard +"is-plain-object@npm:^5.0.0": + version: 5.0.0 + resolution: "is-plain-object@npm:5.0.0" + checksum: 10c0/893e42bad832aae3511c71fd61c0bf61aa3a6d853061c62a307261842727d0d25f761ce9379f7ba7226d6179db2a3157efa918e7fe26360f3bf0842d9f28942c + languageName: node + linkType: hard + "is-promise@npm:^2.1.0": version: 2.2.2 resolution: "is-promise@npm:2.2.2" @@ -12898,7 +12914,7 @@ __metadata: languageName: node linkType: hard -"micromatch@npm:^4.0.2, micromatch@npm:^4.0.4, micromatch@npm:^4.0.5": +"micromatch@npm:^4.0.2, micromatch@npm:^4.0.4": version: 4.0.7 resolution: "micromatch@npm:4.0.7" dependencies: @@ -12908,6 +12924,16 @@ __metadata: languageName: node linkType: hard +"micromatch@npm:^4.0.8": + version: 4.0.8 + resolution: "micromatch@npm:4.0.8" + dependencies: + braces: "npm:^3.0.3" + picomatch: "npm:^2.3.1" + checksum: 10c0/166fa6eb926b9553f32ef81f5f531d27b4ce7da60e5baf8c021d043b27a388fb95e46a8038d5045877881e673f8134122b59624d5cecbd16eb50a42e7a6b5ca8 + languageName: node + linkType: hard + "mime-db@npm:1.52.0": version: 1.52.0 resolution: "mime-db@npm:1.52.0" From fee914ec9dcba5ae75283fba00e8548757447908 Mon Sep 17 00:00:00 2001 From: Doug Parker Date: Wed, 23 Oct 2024 11:49:57 -0700 Subject: [PATCH 59/87] release: cut the v18.2.10 release --- CHANGELOG.md | 18 ++++++++++++++++++ package.json | 2 +- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a3d13f8cb63d..cc0ff5b11b02 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,21 @@ + + +# 18.2.10 (2024-10-23) + +### @angular-devkit/build-angular + +| Commit | Type | Description | +| --------------------------------------------------------------------------------------------------- | ---- | ----------------------------------------- | +| [7b775f4e0](https://github.com/angular/angular-cli/commit/7b775f4e008652777bbe7b788dabed02bcc70cc7) | fix | update `http-proxy-middleware` to `3.0.3` | + +### @angular/build + +| Commit | Type | Description | +| --------------------------------------------------------------------------------------------------- | ---- | -------------------------------------------------------------------- | +| [b1e5f51f9](https://github.com/angular/angular-cli/commit/b1e5f51f9111d7da56ebe64cad51936ad659782d) | fix | Address build issue in Node.js LTS versions with prerendering or SSR | + + + # 18.2.9 (2024-10-16) diff --git a/package.json b/package.json index b4e825965b3d..4e92eb36b445 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@angular/devkit-repo", - "version": "18.2.9", + "version": "18.2.10", "private": true, "description": "Software Development Kit for Angular", "keywords": [ From 87ec15ba266436b7b99b0629beaea3e487434115 Mon Sep 17 00:00:00 2001 From: Alan Agius Date: Wed, 30 Oct 2024 09:11:06 +0000 Subject: [PATCH 60/87] fix(@angular/build): show error message when error stack is undefined Handle cases where the error stack is missing by displaying a relevant message. Closes #28740 --- .../angular/build/src/utils/server-rendering/prerender.ts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/angular/build/src/utils/server-rendering/prerender.ts b/packages/angular/build/src/utils/server-rendering/prerender.ts index f8796a7ac861..46ec378b6765 100644 --- a/packages/angular/build/src/utils/server-rendering/prerender.ts +++ b/packages/angular/build/src/utils/server-rendering/prerender.ts @@ -216,7 +216,9 @@ async function renderPages( } }) .catch((err) => { - errors.push(`An error occurred while prerendering route '${route}'.\n\n${err.stack}`); + errors.push( + `An error occurred while prerendering route '${route}'.\n\n${err.stack ?? err.message ?? err.code ?? err}`, + ); void renderWorker.destroy(); }); @@ -292,7 +294,9 @@ async function getAllRoutes( const { routes: extractedRoutes, warnings }: RoutersExtractorWorkerResult = await renderWorker .run({}) .catch((err) => { - errors.push(`An error occurred while extracting routes.\n\n${err.stack}`); + errors.push( + `An error occurred while extracting routes.\n\n${err.stack ?? err.message ?? err.code ?? err}`, + ); }) .finally(() => { void renderWorker.destroy(); From de955450e3c6afc0c8b0e7d16008b9f76505df59 Mon Sep 17 00:00:00 2001 From: Charles Lyding <19598772+clydin@users.noreply.github.com> Date: Wed, 30 Oct 2024 19:16:12 -0400 Subject: [PATCH 61/87] release: cut the v18.2.11 release --- CHANGELOG.md | 12 ++++++++++++ package.json | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cc0ff5b11b02..666ed703dbc2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,15 @@ + + +# 18.2.11 (2024-10-30) + +### @angular/build + +| Commit | Type | Description | +| --------------------------------------------------------------------------------------------------- | ---- | ------------------------------------------------ | +| [87ec15ba2](https://github.com/angular/angular-cli/commit/87ec15ba266436b7b99b0629beaea3e487434115) | fix | show error message when error stack is undefined | + + + # 18.2.10 (2024-10-23) diff --git a/package.json b/package.json index 4e92eb36b445..5626df1bcc82 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@angular/devkit-repo", - "version": "18.2.10", + "version": "18.2.11", "private": true, "description": "Software Development Kit for Angular", "keywords": [ From f58e689fe7334226b1c7c55492ecb0b10696c57d Mon Sep 17 00:00:00 2001 From: Alan Agius Date: Mon, 4 Nov 2024 08:55:01 +0000 Subject: [PATCH 62/87] test: add `@parcel/watcher` to allowed postinstall checks Included `@parcel/watcher` in the list of packages allowed in the postinstall checks test. (cherry picked from commit 416c9aaf2ddfdf7372082490c3d7a6ece026f9a0) --- tests/legacy-cli/e2e/tests/misc/check-postinstalls.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/legacy-cli/e2e/tests/misc/check-postinstalls.ts b/tests/legacy-cli/e2e/tests/misc/check-postinstalls.ts index 76c98bb22b38..c21294362d59 100644 --- a/tests/legacy-cli/e2e/tests/misc/check-postinstalls.ts +++ b/tests/legacy-cli/e2e/tests/misc/check-postinstalls.ts @@ -2,6 +2,7 @@ import glob from 'fast-glob'; import { readFile } from '../../utils/fs'; const CURRENT_SCRIPT_PACKAGES: ReadonlySet = new Set([ + '@parcel/watcher (install)', 'esbuild (postinstall)', 'lmdb (install)', 'msgpackr-extract (install)', From c8bee8415099dfa03d5309183ebbbaab73b2a0eb Mon Sep 17 00:00:00 2001 From: Charles Lyding <19598772+clydin@users.noreply.github.com> Date: Fri, 8 Nov 2024 12:53:32 -0500 Subject: [PATCH 63/87] fix(@angular/build): allow .js file replacements in all configuration cases Previously the `fileReplacements` option within the `application` builder would only replace `.js` files if the TypeScript `allowJs` option was enabled. This differs from the `browser` builder which did not require the option. To minimize friction when migrating to the new build system, the `allowJs` option is no longer required for this file replacement case. (cherry picked from commit a325c9a969c1b2eaca093a6bc39ec0c1230452b9) --- .../src/tools/esbuild/angular/compiler-plugin.ts | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/packages/angular/build/src/tools/esbuild/angular/compiler-plugin.ts b/packages/angular/build/src/tools/esbuild/angular/compiler-plugin.ts index eaeb7f324bf9..c20f40d189dc 100644 --- a/packages/angular/build/src/tools/esbuild/angular/compiler-plugin.ts +++ b/packages/angular/build/src/tools/esbuild/angular/compiler-plugin.ts @@ -431,12 +431,20 @@ export function createCompilerPlugin( build.onLoad( { filter: /\.[cm]?js$/ }, createCachedLoad(pluginOptions.loadResultCache, async (args) => { + let request = args.path; + if (pluginOptions.fileReplacements) { + const replacement = pluginOptions.fileReplacements[path.normalize(args.path)]; + if (replacement) { + request = path.normalize(replacement); + } + } + return profileAsync( 'NG_EMIT_JS*', async () => { - const sideEffects = await hasSideEffects(args.path); + const sideEffects = await hasSideEffects(request); const contents = await javascriptTransformer.transformFile( - args.path, + request, pluginOptions.jit, sideEffects, ); @@ -444,6 +452,7 @@ export function createCompilerPlugin( return { contents, loader: 'js', + watchFiles: request !== args.path ? [request] : undefined, }; }, true, From c3925ed7f8e34fd9816cf5a4e8d63c2c45d31d53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Fra=C5=9B?= Date: Tue, 12 Nov 2024 11:38:51 +0100 Subject: [PATCH 64/87] fix(@angular/cli): support default options for multiselect list x-prompt (cherry picked from commit af147692459a47aeb9212e8b6e672568bc422cda) --- .../cli/src/command-builder/schematics-command-module.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/angular/cli/src/command-builder/schematics-command-module.ts b/packages/angular/cli/src/command-builder/schematics-command-module.ts index 139f7d89059f..cf9767baf0e7 100644 --- a/packages/angular/cli/src/command-builder/schematics-command-module.ts +++ b/packages/angular/cli/src/command-builder/schematics-command-module.ts @@ -204,7 +204,7 @@ export abstract class SchematicsCommandModule return definition.validator(Object.values(values).map(({ value }) => value)); }, - default: definition.default, + default: definition.multiselect ? undefined : definition.default, choices: definition.items?.map((item) => typeof item == 'string' ? { @@ -212,6 +212,7 @@ export abstract class SchematicsCommandModule value: item, } : { + ...item, name: item.label, value: item.value, }, From 93f552112c2bbd10bc0cee4afcae5b012242636c Mon Sep 17 00:00:00 2001 From: Charles Lyding <19598772+clydin@users.noreply.github.com> Date: Wed, 13 Nov 2024 09:38:27 -0800 Subject: [PATCH 65/87] fix(@angular/build): improve URL rebasing for hyphenated Sass namespaced variables Sass variable namespaces can contain either a hyphen or underscore in the namespace identifier. The URL rebasing support within the Angular CLI will now account for these type of namespaces and rebase the evaluated URL as expected. (cherry picked from commit f96bb86c4e7b4d9c3185230bba11eeb8ab625d81) --- .../stylesheet-url-resolution_spec.ts | 54 +++++++++++++++++++ .../build/src/tools/sass/rebasing-importer.ts | 3 +- 2 files changed, 56 insertions(+), 1 deletion(-) diff --git a/packages/angular/build/src/builders/application/tests/behavior/stylesheet-url-resolution_spec.ts b/packages/angular/build/src/builders/application/tests/behavior/stylesheet-url-resolution_spec.ts index 229636f0b8f8..0adc77b5311a 100644 --- a/packages/angular/build/src/builders/application/tests/behavior/stylesheet-url-resolution_spec.ts +++ b/packages/angular/build/src/builders/application/tests/behavior/stylesheet-url-resolution_spec.ts @@ -243,6 +243,60 @@ describeBuilder(buildApplication, APPLICATION_BUILDER_INFO, (harness) => { harness.expectFile('dist/browser/media/logo.svg').toExist(); }); + it('should rebase a URL with a hyphen-namespaced Sass variable referencing a local resource', async () => { + await harness.writeFiles({ + 'src/styles.scss': `@use 'theme/a';`, + 'src/theme/a.scss': ` + @use './b' as named-hyphen; + .a { + background-image: url(named-hyphen.$my-var) + } + `, + 'src/theme/b.scss': `@forward './c.scss' show $my-var;`, + 'src/theme/c.scss': `$my-var: "./images/logo.svg";`, + 'src/theme/images/logo.svg': ``, + }); + + harness.useTarget('build', { + ...BASE_OPTIONS, + outputHashing: OutputHashing.None, + styles: ['src/styles.scss'], + }); + + const { result } = await harness.executeOnce(); + expect(result?.success).toBeTrue(); + + harness.expectFile('dist/browser/styles.css').content.toContain(`url("./media/logo.svg")`); + harness.expectFile('dist/browser/media/logo.svg').toExist(); + }); + + it('should rebase a URL with a underscore-namespaced Sass variable referencing a local resource', async () => { + await harness.writeFiles({ + 'src/styles.scss': `@use 'theme/a';`, + 'src/theme/a.scss': ` + @use './b' as named_underscore; + .a { + background-image: url(named_underscore.$my-var) + } + `, + 'src/theme/b.scss': `@forward './c.scss' show $my-var;`, + 'src/theme/c.scss': `$my-var: "./images/logo.svg";`, + 'src/theme/images/logo.svg': ``, + }); + + harness.useTarget('build', { + ...BASE_OPTIONS, + outputHashing: OutputHashing.None, + styles: ['src/styles.scss'], + }); + + const { result } = await harness.executeOnce(); + expect(result?.success).toBeTrue(); + + harness.expectFile('dist/browser/styles.css').content.toContain(`url("./media/logo.svg")`); + harness.expectFile('dist/browser/media/logo.svg').toExist(); + }); + it('should rebase a URL with a Sass variable referencing a local resource', async () => { await harness.writeFiles({ 'src/styles.scss': `@use 'theme/a';`, diff --git a/packages/angular/build/src/tools/sass/rebasing-importer.ts b/packages/angular/build/src/tools/sass/rebasing-importer.ts index c51c352ca274..d5ade8b6cf54 100644 --- a/packages/angular/build/src/tools/sass/rebasing-importer.ts +++ b/packages/angular/build/src/tools/sass/rebasing-importer.ts @@ -77,7 +77,8 @@ abstract class UrlRebasingImporter implements Importer<'sync'> { } // Sass variable usage either starts with a `$` or contains a namespace and a `.$` - const valueNormalized = value[0] === '$' || /^\w+\.\$/.test(value) ? `#{${value}}` : value; + const valueNormalized = + value[0] === '$' || /^\w[\w_-]*\.\$/.test(value) ? `#{${value}}` : value; const rebasedPath = relative(this.entryDirectory, stylesheetDirectory); // Normalize path separators and escape characters From 53b9e355f2ecb4fe43489722f727dbb36153d9f1 Mon Sep 17 00:00:00 2001 From: Jan Krems Date: Thu, 14 Nov 2024 07:48:09 -0800 Subject: [PATCH 66/87] release: cut the v18.2.12 release --- CHANGELOG.md | 19 +++++++++++++++++++ package.json | 2 +- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 666ed703dbc2..055f6a2c1fd9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,22 @@ + + +# 18.2.12 (2024-11-14) + +### @angular/cli + +| Commit | Type | Description | +| --------------------------------------------------------------------------------------------------- | ---- | ----------------------------------------------------- | +| [c3925ed7f](https://github.com/angular/angular-cli/commit/c3925ed7f8e34fd9816cf5a4e8d63c2c45d31d53) | fix | support default options for multiselect list x-prompt | + +### @angular/build + +| Commit | Type | Description | +| --------------------------------------------------------------------------------------------------- | ---- | ------------------------------------------------------------- | +| [c8bee8415](https://github.com/angular/angular-cli/commit/c8bee8415099dfa03d5309183ebbbaab73b2a0eb) | fix | allow .js file replacements in all configuration cases | +| [93f552112](https://github.com/angular/angular-cli/commit/93f552112c2bbd10bc0cee4afcae5b012242636c) | fix | improve URL rebasing for hyphenated Sass namespaced variables | + + + # 18.2.11 (2024-10-30) diff --git a/package.json b/package.json index 5626df1bcc82..29acd802c7d0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@angular/devkit-repo", - "version": "18.2.11", + "version": "18.2.12", "private": true, "description": "Software Development Kit for Angular", "keywords": [ From 0434effb96d395421c3b45196c563201e1eac771 Mon Sep 17 00:00:00 2001 From: Alan Agius Date: Thu, 5 Dec 2024 15:05:53 +0000 Subject: [PATCH 67/87] ci: update dev-infra sha to use latest Bazel keys This commit consumes the latest version of dev-infra to fix CI. See: angular/dev-infra@40b2cbd --- .../assistant-to-the-branch-manager.yml | 2 +- .github/workflows/ci.yml | 42 +++++++++---------- .github/workflows/dev-infra.yml | 4 +- .github/workflows/feature-requests.yml | 2 +- .github/workflows/pr.yml | 34 +++++++-------- 5 files changed, 42 insertions(+), 42 deletions(-) diff --git a/.github/workflows/assistant-to-the-branch-manager.yml b/.github/workflows/assistant-to-the-branch-manager.yml index 560abdc2294f..3ba5ed41e1fd 100644 --- a/.github/workflows/assistant-to-the-branch-manager.yml +++ b/.github/workflows/assistant-to-the-branch-manager.yml @@ -16,6 +16,6 @@ jobs: - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 with: persist-credentials: false - - uses: angular/dev-infra/github-actions/branch-manager@d66f2009955fd4b3430d9cf7072d94f4b4da95e7 + - uses: angular/dev-infra/github-actions/branch-manager@40b2cbdbcc40f36f125d721c4e8decd3bb607ea4 with: angular-robot-key: ${{ secrets.ANGULAR_ROBOT_PRIVATE_KEY }} diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6ae8b75e0b30..ba787cf28c19 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,7 +21,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Initialize environment - uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@d66f2009955fd4b3430d9cf7072d94f4b4da95e7 + uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@40b2cbdbcc40f36f125d721c4e8decd3bb607ea4 - name: Install node modules run: yarn install --immutable - name: Generate JSON schema types @@ -42,11 +42,11 @@ jobs: runs-on: ubuntu-latest steps: - name: Initialize environment - uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@d66f2009955fd4b3430d9cf7072d94f4b4da95e7 + uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@40b2cbdbcc40f36f125d721c4e8decd3bb607ea4 - name: Setup Bazel - uses: angular/dev-infra/github-actions/bazel/setup@d66f2009955fd4b3430d9cf7072d94f4b4da95e7 + uses: angular/dev-infra/github-actions/bazel/setup@40b2cbdbcc40f36f125d721c4e8decd3bb607ea4 - name: Setup Bazel RBE - uses: angular/dev-infra/github-actions/bazel/configure-remote@d66f2009955fd4b3430d9cf7072d94f4b4da95e7 + uses: angular/dev-infra/github-actions/bazel/configure-remote@40b2cbdbcc40f36f125d721c4e8decd3bb607ea4 - name: Install node modules run: yarn install --immutable - name: Build release targets @@ -56,11 +56,11 @@ jobs: runs-on: ubuntu-latest steps: - name: Initialize environment - uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@d66f2009955fd4b3430d9cf7072d94f4b4da95e7 + uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@40b2cbdbcc40f36f125d721c4e8decd3bb607ea4 - name: Setup Bazel - uses: angular/dev-infra/github-actions/bazel/setup@d66f2009955fd4b3430d9cf7072d94f4b4da95e7 + uses: angular/dev-infra/github-actions/bazel/setup@40b2cbdbcc40f36f125d721c4e8decd3bb607ea4 - name: Setup Bazel RBE - uses: angular/dev-infra/github-actions/bazel/configure-remote@d66f2009955fd4b3430d9cf7072d94f4b4da95e7 + uses: angular/dev-infra/github-actions/bazel/configure-remote@40b2cbdbcc40f36f125d721c4e8decd3bb607ea4 - name: Install node modules run: yarn install --immutable - name: Run module and package tests @@ -90,13 +90,13 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Initialize environment - uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@d66f2009955fd4b3430d9cf7072d94f4b4da95e7 + uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@40b2cbdbcc40f36f125d721c4e8decd3bb607ea4 - name: Install node modules run: yarn install --immutable - name: Setup Bazel - uses: angular/dev-infra/github-actions/bazel/setup@d66f2009955fd4b3430d9cf7072d94f4b4da95e7 + uses: angular/dev-infra/github-actions/bazel/setup@40b2cbdbcc40f36f125d721c4e8decd3bb607ea4 - name: Setup Bazel RBE - uses: angular/dev-infra/github-actions/bazel/configure-remote@d66f2009955fd4b3430d9cf7072d94f4b4da95e7 + uses: angular/dev-infra/github-actions/bazel/configure-remote@40b2cbdbcc40f36f125d721c4e8decd3bb607ea4 - name: Run CLI E2E tests run: yarn bazel test --define=E2E_SHARD_TOTAL=6 --define=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.${{ matrix.subset }}_node${{ matrix.node }} @@ -111,13 +111,13 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Initialize environment - uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@d66f2009955fd4b3430d9cf7072d94f4b4da95e7 + uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@40b2cbdbcc40f36f125d721c4e8decd3bb607ea4 - name: Install node modules run: yarn install --immutable - name: Setup Bazel - uses: angular/dev-infra/github-actions/bazel/setup@d66f2009955fd4b3430d9cf7072d94f4b4da95e7 + uses: angular/dev-infra/github-actions/bazel/setup@40b2cbdbcc40f36f125d721c4e8decd3bb607ea4 - name: Setup Bazel RBE - uses: angular/dev-infra/github-actions/bazel/configure-remote@d66f2009955fd4b3430d9cf7072d94f4b4da95e7 + uses: angular/dev-infra/github-actions/bazel/configure-remote@40b2cbdbcc40f36f125d721c4e8decd3bb607ea4 - name: Run CLI E2E tests run: yarn bazel test --define=E2E_SHARD_TOTAL=3 --define=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.${{ matrix.subset }}_node${{ matrix.node }} @@ -132,13 +132,13 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Initialize environment - uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@d66f2009955fd4b3430d9cf7072d94f4b4da95e7 + uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@40b2cbdbcc40f36f125d721c4e8decd3bb607ea4 - name: Install node modules run: yarn install --immutable - name: Setup Bazel - uses: angular/dev-infra/github-actions/bazel/setup@d66f2009955fd4b3430d9cf7072d94f4b4da95e7 + uses: angular/dev-infra/github-actions/bazel/setup@40b2cbdbcc40f36f125d721c4e8decd3bb607ea4 - name: Setup Bazel RBE - uses: angular/dev-infra/github-actions/bazel/configure-remote@d66f2009955fd4b3430d9cf7072d94f4b4da95e7 + uses: angular/dev-infra/github-actions/bazel/configure-remote@40b2cbdbcc40f36f125d721c4e8decd3bb607ea4 - name: Run CLI E2E tests run: yarn bazel test --define=E2E_SHARD_TOTAL=6 --define=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.snapshots.${{ matrix.subset }}_node${{ matrix.node }} @@ -149,13 +149,13 @@ jobs: SAUCE_TUNNEL_IDENTIFIER: angular-cli-${{ github.workflow }}-${{ github.run_number }} steps: - name: Initialize environment - uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@d66f2009955fd4b3430d9cf7072d94f4b4da95e7 + uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@40b2cbdbcc40f36f125d721c4e8decd3bb607ea4 - name: Install node modules run: yarn install --immutable - name: Setup Bazel - uses: angular/dev-infra/github-actions/bazel/setup@d66f2009955fd4b3430d9cf7072d94f4b4da95e7 + uses: angular/dev-infra/github-actions/bazel/setup@40b2cbdbcc40f36f125d721c4e8decd3bb607ea4 - name: Setup Bazel RBE - uses: angular/dev-infra/github-actions/bazel/configure-remote@d66f2009955fd4b3430d9cf7072d94f4b4da95e7 + uses: angular/dev-infra/github-actions/bazel/configure-remote@40b2cbdbcc40f36f125d721c4e8decd3bb607ea4 - name: Run E2E Browser tests env: SAUCE_USERNAME: ${{ vars.SAUCE_USERNAME }} @@ -182,11 +182,11 @@ jobs: CIRCLE_BRANCH: ${{ github.ref_name }} steps: - name: Initialize environment - uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@d66f2009955fd4b3430d9cf7072d94f4b4da95e7 + uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@40b2cbdbcc40f36f125d721c4e8decd3bb607ea4 - name: Install node modules run: yarn install --immutable - name: Setup Bazel - uses: angular/dev-infra/github-actions/bazel/setup@d66f2009955fd4b3430d9cf7072d94f4b4da95e7 + uses: angular/dev-infra/github-actions/bazel/setup@40b2cbdbcc40f36f125d721c4e8decd3bb607ea4 - run: yarn admin snapshots --verbose env: SNAPSHOT_BUILDS_GITHUB_TOKEN: ${{ secrets.SNAPSHOT_BUILDS_GITHUB_TOKEN }} diff --git a/.github/workflows/dev-infra.yml b/.github/workflows/dev-infra.yml index f38e14c62c72..37c6198d71ff 100644 --- a/.github/workflows/dev-infra.yml +++ b/.github/workflows/dev-infra.yml @@ -13,13 +13,13 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - - uses: angular/dev-infra/github-actions/commit-message-based-labels@d66f2009955fd4b3430d9cf7072d94f4b4da95e7 + - uses: angular/dev-infra/github-actions/commit-message-based-labels@40b2cbdbcc40f36f125d721c4e8decd3bb607ea4 with: angular-robot-key: ${{ secrets.ANGULAR_ROBOT_PRIVATE_KEY }} post_approval_changes: runs-on: ubuntu-latest steps: - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - - uses: angular/dev-infra/github-actions/post-approval-changes@d66f2009955fd4b3430d9cf7072d94f4b4da95e7 + - uses: angular/dev-infra/github-actions/post-approval-changes@40b2cbdbcc40f36f125d721c4e8decd3bb607ea4 with: angular-robot-key: ${{ secrets.ANGULAR_ROBOT_PRIVATE_KEY }} diff --git a/.github/workflows/feature-requests.yml b/.github/workflows/feature-requests.yml index 7818868ad6f8..3852df5a0944 100644 --- a/.github/workflows/feature-requests.yml +++ b/.github/workflows/feature-requests.yml @@ -16,6 +16,6 @@ jobs: if: github.repository == 'angular/angular-cli' runs-on: ubuntu-latest steps: - - uses: angular/dev-infra/github-actions/feature-request@d66f2009955fd4b3430d9cf7072d94f4b4da95e7 + - uses: angular/dev-infra/github-actions/feature-request@40b2cbdbcc40f36f125d721c4e8decd3bb607ea4 with: angular-robot-key: ${{ secrets.ANGULAR_ROBOT_PRIVATE_KEY }} diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index d488d8802ce9..01764c70cc1a 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -34,7 +34,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Initialize environment - uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@d66f2009955fd4b3430d9cf7072d94f4b4da95e7 + uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@40b2cbdbcc40f36f125d721c4e8decd3bb607ea4 - name: Setup ESLint Caching uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2 with: @@ -54,7 +54,7 @@ jobs: - name: Run Validation run: yarn admin validate - name: Check Package Licenses - uses: angular/dev-infra/github-actions/linting/licenses@d66f2009955fd4b3430d9cf7072d94f4b4da95e7 + uses: angular/dev-infra/github-actions/linting/licenses@40b2cbdbcc40f36f125d721c4e8decd3bb607ea4 - name: Check tooling setup run: yarn check-tooling-setup - name: Check commit message @@ -70,11 +70,11 @@ jobs: runs-on: ubuntu-latest steps: - name: Initialize environment - uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@d66f2009955fd4b3430d9cf7072d94f4b4da95e7 + uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@40b2cbdbcc40f36f125d721c4e8decd3bb607ea4 - name: Setup Bazel - uses: angular/dev-infra/github-actions/bazel/setup@d66f2009955fd4b3430d9cf7072d94f4b4da95e7 + uses: angular/dev-infra/github-actions/bazel/setup@40b2cbdbcc40f36f125d721c4e8decd3bb607ea4 - name: Setup Bazel RBE - uses: angular/dev-infra/github-actions/bazel/configure-remote@d66f2009955fd4b3430d9cf7072d94f4b4da95e7 + uses: angular/dev-infra/github-actions/bazel/configure-remote@40b2cbdbcc40f36f125d721c4e8decd3bb607ea4 - name: Install node modules run: yarn install --immutable - name: Build release targets @@ -90,11 +90,11 @@ jobs: runs-on: ubuntu-latest steps: - name: Initialize environment - uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@d66f2009955fd4b3430d9cf7072d94f4b4da95e7 + uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@40b2cbdbcc40f36f125d721c4e8decd3bb607ea4 - name: Setup Bazel - uses: angular/dev-infra/github-actions/bazel/setup@d66f2009955fd4b3430d9cf7072d94f4b4da95e7 + uses: angular/dev-infra/github-actions/bazel/setup@40b2cbdbcc40f36f125d721c4e8decd3bb607ea4 - name: Setup Bazel RBE - uses: angular/dev-infra/github-actions/bazel/configure-remote@d66f2009955fd4b3430d9cf7072d94f4b4da95e7 + uses: angular/dev-infra/github-actions/bazel/configure-remote@40b2cbdbcc40f36f125d721c4e8decd3bb607ea4 - name: Install node modules run: yarn install --immutable - name: Run module and package tests @@ -111,13 +111,13 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Initialize environment - uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@d66f2009955fd4b3430d9cf7072d94f4b4da95e7 + uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@40b2cbdbcc40f36f125d721c4e8decd3bb607ea4 - name: Install node modules run: yarn install --immutable - name: Setup Bazel - uses: angular/dev-infra/github-actions/bazel/setup@d66f2009955fd4b3430d9cf7072d94f4b4da95e7 + uses: angular/dev-infra/github-actions/bazel/setup@40b2cbdbcc40f36f125d721c4e8decd3bb607ea4 - name: Setup Bazel RBE - uses: angular/dev-infra/github-actions/bazel/configure-remote@d66f2009955fd4b3430d9cf7072d94f4b4da95e7 + uses: angular/dev-infra/github-actions/bazel/configure-remote@40b2cbdbcc40f36f125d721c4e8decd3bb607ea4 - name: Run CLI E2E tests run: yarn bazel test --define=E2E_SHARD_TOTAL=6 --define=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.${{ matrix.subset }}_node${{ matrix.node }} @@ -132,13 +132,13 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Initialize environment - uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@d66f2009955fd4b3430d9cf7072d94f4b4da95e7 + uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@40b2cbdbcc40f36f125d721c4e8decd3bb607ea4 - name: Install node modules run: yarn install --immutable - name: Setup Bazel - uses: angular/dev-infra/github-actions/bazel/setup@d66f2009955fd4b3430d9cf7072d94f4b4da95e7 + uses: angular/dev-infra/github-actions/bazel/setup@40b2cbdbcc40f36f125d721c4e8decd3bb607ea4 - name: Setup Bazel RBE - uses: angular/dev-infra/github-actions/bazel/configure-remote@d66f2009955fd4b3430d9cf7072d94f4b4da95e7 + uses: angular/dev-infra/github-actions/bazel/configure-remote@40b2cbdbcc40f36f125d721c4e8decd3bb607ea4 - name: Run CLI E2E tests run: yarn bazel test --define=E2E_SHARD_TOTAL=3 --define=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.${{ matrix.subset }}_node${{ matrix.node }} @@ -155,12 +155,12 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Initialize environment - uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@d66f2009955fd4b3430d9cf7072d94f4b4da95e7 + uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@40b2cbdbcc40f36f125d721c4e8decd3bb607ea4 - name: Install node modules run: yarn install --immutable - name: Setup Bazel - uses: angular/dev-infra/github-actions/bazel/setup@d66f2009955fd4b3430d9cf7072d94f4b4da95e7 + uses: angular/dev-infra/github-actions/bazel/setup@40b2cbdbcc40f36f125d721c4e8decd3bb607ea4 - name: Setup Bazel RBE - uses: angular/dev-infra/github-actions/bazel/configure-remote@d66f2009955fd4b3430d9cf7072d94f4b4da95e7 + uses: angular/dev-infra/github-actions/bazel/configure-remote@40b2cbdbcc40f36f125d721c4e8decd3bb607ea4 - name: Run CLI E2E tests run: yarn bazel test --define=E2E_SHARD_TOTAL=6 --define=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.snapshots.${{ matrix.subset }}_node${{ matrix.node }} From fdddf2c0844081667a09f2ffe0b16f77384959b2 Mon Sep 17 00:00:00 2001 From: Charles Lyding <19598772+clydin@users.noreply.github.com> Date: Thu, 23 Jan 2025 19:30:23 -0500 Subject: [PATCH 68/87] fix(@angular/build): update vite to version 5.4.14 Version update from 5.4.6 to address advisory https://github.com/vitejs/vite/security/advisories/GHSA-vg6x-rcgg-rjx6 Vite version 5.4.12+, which is now used by the Angular CLI with the `application`/`browser-esbuild` builders, contains a potentially breaking change for some development setups. Examples of such setups include those that use reverse proxies or custom host names during development. The change within a patch release was made by Vite to address a security vulnerability. For projects that directly access the development server via `localhost`, no changes should be needed. However, some development setups may now need to adjust the `allowedHosts` development server option. This option can include an array of host names that are allowed to communicate with the development server. The option sets the corresponding Vite option within the Angular CLI. For more information on the option and its specific behavior, please see the Vite documentation located here: https://vite.dev/config/server-options.html#server-allowedhosts The following is an example of the configuration option allowing `example.com`: ``` "serve": { "builder": "@angular-devkit/build-angular:dev-server", "options": { "allowedHosts": ["example.com"] }, ``` --- goldens/public-api/angular/build/index.api.md | 1 + package.json | 2 +- packages/angular/build/package.json | 2 +- .../build/src/builders/dev-server/options.ts | 2 + .../build/src/builders/dev-server/schema.json | 17 ++++ .../dev-server/tests/execute-fetch.ts | 48 ++++++++++- .../tests/options/allowed-hosts_spec.ts | 80 +++++++++++++++++++ .../src/builders/dev-server/vite-server.ts | 1 + .../src/builders/dev-server/builder.ts | 11 ++- .../src/builders/dev-server/schema.json | 4 +- yarn.lock | 47 ++++++++++- 11 files changed, 207 insertions(+), 8 deletions(-) create mode 100644 packages/angular/build/src/builders/dev-server/tests/options/allowed-hosts_spec.ts diff --git a/goldens/public-api/angular/build/index.api.md b/goldens/public-api/angular/build/index.api.md index c3efe5dda318..443a55279ab2 100644 --- a/goldens/public-api/angular/build/index.api.md +++ b/goldens/public-api/angular/build/index.api.md @@ -110,6 +110,7 @@ export enum BuildOutputFileType { // @public export interface DevServerBuilderOptions { + allowedHosts?: AllowedHosts; buildTarget: string; headers?: { [key: string]: string; diff --git a/package.json b/package.json index 29acd802c7d0..a296832c7752 100644 --- a/package.json +++ b/package.json @@ -201,7 +201,7 @@ "undici": "6.19.7", "verdaccio": "5.32.1", "verdaccio-auth-memory": "^10.0.0", - "vite": "5.4.6", + "vite": "5.4.14", "watchpack": "2.4.1", "webpack": "5.94.0", "webpack-dev-middleware": "7.4.2", diff --git a/packages/angular/build/package.json b/packages/angular/build/package.json index f8b94876401e..0f420f8f4ca4 100644 --- a/packages/angular/build/package.json +++ b/packages/angular/build/package.json @@ -41,7 +41,7 @@ "rollup": "4.22.4", "sass": "1.77.6", "semver": "7.6.3", - "vite": "5.4.6", + "vite": "5.4.14", "watchpack": "2.4.1" }, "peerDependencies": { diff --git a/packages/angular/build/src/builders/dev-server/options.ts b/packages/angular/build/src/builders/dev-server/options.ts index 080e168699bc..cb6dd438ad6f 100644 --- a/packages/angular/build/src/builders/dev-server/options.ts +++ b/packages/angular/build/src/builders/dev-server/options.ts @@ -103,6 +103,7 @@ export async function normalizeOptions( sslCert, sslKey, prebundle, + allowedHosts, } = options; // Return all the normalized options @@ -128,5 +129,6 @@ export async function normalizeOptions( // Prebundling defaults to true but requires caching to function prebundle: cacheOptions.enabled && !optimization.scripts && prebundle, inspect, + allowedHosts: allowedHosts ? allowedHosts : [], }; } diff --git a/packages/angular/build/src/builders/dev-server/schema.json b/packages/angular/build/src/builders/dev-server/schema.json index 3adce45eb71a..775ce72ea4d4 100644 --- a/packages/angular/build/src/builders/dev-server/schema.json +++ b/packages/angular/build/src/builders/dev-server/schema.json @@ -36,6 +36,23 @@ "type": "string", "description": "SSL certificate to use for serving HTTPS." }, + "allowedHosts": { + "description": "The hosts that can access the development server. This option sets the Vite option of the same name. For further details: https://vite.dev/config/server-options.html#server-allowedhosts", + "default": [], + "oneOf": [ + { + "type": "array", + "description": "List of hosts that are allowed to access the development server.", + "items": { + "type": "string" + } + }, + { + "type": "boolean", + "description": "Indicates that all hosts are allowed. This is not recommended and a security risk." + } + ] + }, "headers": { "type": "object", "description": "Custom HTTP headers to be added to all responses.", diff --git a/packages/angular/build/src/builders/dev-server/tests/execute-fetch.ts b/packages/angular/build/src/builders/dev-server/tests/execute-fetch.ts index 3bb731a6c6b3..a36196da14be 100644 --- a/packages/angular/build/src/builders/dev-server/tests/execute-fetch.ts +++ b/packages/angular/build/src/builders/dev-server/tests/execute-fetch.ts @@ -7,7 +7,8 @@ */ import { lastValueFrom, mergeMap, take, timeout } from 'rxjs'; -import { URL } from 'url'; +import { get, IncomingMessage, RequestOptions } from 'node:http'; +import { text } from 'node:stream/consumers'; import { BuilderHarness, BuilderHarnessExecutionOptions, @@ -41,3 +42,48 @@ export async function executeOnceAndFetch( ), ); } + +/** + * Executes the builder and then immediately performs a GET request + * via the Node.js `http` builtin module. This is useful for cases + * where the `fetch` API is limited such as testing different `Host` + * header values with the development server. + * The `fetch` based alternative is preferred otherwise. + * + * @param harness A builder harness instance. + * @param url The URL string to get. + * @param options An options object. + */ +export async function executeOnceAndGet( + harness: BuilderHarness, + url: string, + options?: Partial & { request?: RequestOptions }, +): Promise { + return lastValueFrom( + harness.execute().pipe( + timeout(30_000), + mergeMap(async (executionResult) => { + let response = undefined; + let content = undefined; + if (executionResult.result?.success) { + let baseUrl = `${executionResult.result.baseUrl}`; + baseUrl = baseUrl[baseUrl.length - 1] === '/' ? baseUrl : `${baseUrl}/`; + const resolvedUrl = new URL(url, baseUrl); + + response = await new Promise((resolve) => + get(resolvedUrl, options?.request ?? {}, resolve), + ); + + if (response.statusCode === 200) { + content = await text(response); + } + + response.resume(); + } + + return { ...executionResult, response, content }; + }), + take(1), + ), + ); +} diff --git a/packages/angular/build/src/builders/dev-server/tests/options/allowed-hosts_spec.ts b/packages/angular/build/src/builders/dev-server/tests/options/allowed-hosts_spec.ts new file mode 100644 index 000000000000..8e96c7b4b4b0 --- /dev/null +++ b/packages/angular/build/src/builders/dev-server/tests/options/allowed-hosts_spec.ts @@ -0,0 +1,80 @@ +/** + * @license + * Copyright Google LLC All Rights Reserved. + * + * Use of this source code is governed by an MIT-style license that can be + * found in the LICENSE file at https://angular.dev/license + */ + +import { executeDevServer } from '../../index'; +import { executeOnceAndGet } from '../execute-fetch'; +import { describeServeBuilder } from '../jasmine-helpers'; +import { BASE_OPTIONS, DEV_SERVER_BUILDER_INFO } from '../setup'; + +const FETCH_HEADERS = Object.freeze({ Host: 'example.com' }); + +describeServeBuilder(executeDevServer, DEV_SERVER_BUILDER_INFO, (harness, setupTarget) => { + describe('option: "allowedHosts"', () => { + beforeEach(async () => { + setupTarget(harness); + + // Application code is not needed for these tests + await harness.writeFile('src/main.ts', ''); + }); + + it('does not allow an invalid host when option is not present', async () => { + harness.useTarget('serve', { + ...BASE_OPTIONS, + }); + + const { result, response } = await executeOnceAndGet(harness, '/', { + request: { headers: FETCH_HEADERS }, + }); + + expect(result?.success).toBeTrue(); + expect(response?.statusCode).toBe(403); + }); + + it('does not allow an invalid host when option is an empty array', async () => { + harness.useTarget('serve', { + ...BASE_OPTIONS, + allowedHosts: [], + }); + + const { result, response } = await executeOnceAndGet(harness, '/', { + request: { headers: FETCH_HEADERS }, + }); + + expect(result?.success).toBeTrue(); + expect(response?.statusCode).toBe(403); + }); + + it('allows a host when specified in the option', async () => { + harness.useTarget('serve', { + ...BASE_OPTIONS, + allowedHosts: ['example.com'], + }); + + const { result, content } = await executeOnceAndGet(harness, '/', { + request: { headers: FETCH_HEADERS }, + }); + + expect(result?.success).toBeTrue(); + expect(content).toContain(''); + }); + + it('allows a host when option is true', async () => { + harness.useTarget('serve', { + ...BASE_OPTIONS, + allowedHosts: true, + }); + + const { result, content } = await executeOnceAndGet(harness, '/', { + request: { headers: FETCH_HEADERS }, + }); + + expect(result?.success).toBeTrue(); + expect(content).toContain('<title>'); + }); + }); +}); diff --git a/packages/angular/build/src/builders/dev-server/vite-server.ts b/packages/angular/build/src/builders/dev-server/vite-server.ts index f6a4f54accd2..b005deee8dce 100644 --- a/packages/angular/build/src/builders/dev-server/vite-server.ts +++ b/packages/angular/build/src/builders/dev-server/vite-server.ts @@ -551,6 +551,7 @@ export async function setupServer( strictPort: true, host: serverOptions.host, open: serverOptions.open, + allowedHosts: serverOptions.allowedHosts, headers: serverOptions.headers, proxy, cors: { diff --git a/packages/angular_devkit/build_angular/src/builders/dev-server/builder.ts b/packages/angular_devkit/build_angular/src/builders/dev-server/builder.ts index 3b244a008c2c..f99bb5c3d6c8 100644 --- a/packages/angular_devkit/build_angular/src/builders/dev-server/builder.ts +++ b/packages/angular_devkit/build_angular/src/builders/dev-server/builder.ts @@ -85,12 +85,21 @@ export function execute( ); } + // New build system uses Vite's allowedHost option convention of true for disabling host checks + if (normalizedOptions.disableHostCheck) { + (normalizedOptions as unknown as { allowedHosts: true }).allowedHosts = true; + } else { + normalizedOptions.allowedHosts ??= []; + } + return defer(() => Promise.all([import('@angular/build/private'), import('../browser-esbuild')]), ).pipe( switchMap(([{ serveWithVite, buildApplicationInternal }, { convertBrowserOptions }]) => serveWithVite( - normalizedOptions, + normalizedOptions as typeof normalizedOptions & { + allowedHosts: true | string[]; + }, builderName, (options, context, codePlugins) => { return builderName === '@angular-devkit/build-angular:browser-esbuild' diff --git a/packages/angular_devkit/build_angular/src/builders/dev-server/schema.json b/packages/angular_devkit/build_angular/src/builders/dev-server/schema.json index 5796dd04e895..ce8242b234dc 100644 --- a/packages/angular_devkit/build_angular/src/builders/dev-server/schema.json +++ b/packages/angular_devkit/build_angular/src/builders/dev-server/schema.json @@ -73,7 +73,7 @@ }, "allowedHosts": { "type": "array", - "description": "List of hosts that are allowed to access the dev server. This option has no effect when using the 'application' or other esbuild-based builders.", + "description": "List of hosts that are allowed to access the dev server.", "default": [], "items": { "type": "string" @@ -85,7 +85,7 @@ }, "disableHostCheck": { "type": "boolean", - "description": "Don't verify connected clients are part of allowed hosts. This option has no effect when using the 'application' or other esbuild-based builders.", + "description": "Don't verify connected clients are part of allowed hosts.", "default": false }, "hmr": { diff --git a/yarn.lock b/yarn.lock index 9303c206eea5..d8a69a7091be 100644 --- a/yarn.lock +++ b/yarn.lock @@ -401,7 +401,7 @@ __metadata: rollup: "npm:4.22.4" sass: "npm:1.77.6" semver: "npm:7.6.3" - vite: "npm:5.4.6" + vite: "npm:5.4.14" watchpack: "npm:2.4.1" peerDependencies: "@angular/compiler-cli": ^18.0.0 @@ -805,7 +805,7 @@ __metadata: undici: "npm:6.19.7" verdaccio: "npm:5.32.1" verdaccio-auth-memory: "npm:^10.0.0" - vite: "npm:5.4.6" + vite: "npm:5.4.14" watchpack: "npm:2.4.1" webpack: "npm:5.94.0" webpack-dev-middleware: "npm:7.4.2" @@ -18053,6 +18053,49 @@ __metadata: languageName: node linkType: hard +"vite@npm:5.4.14": + version: 5.4.14 + resolution: "vite@npm:5.4.14" + dependencies: + esbuild: "npm:^0.21.3" + fsevents: "npm:~2.3.3" + postcss: "npm:^8.4.43" + rollup: "npm:^4.20.0" + peerDependencies: + "@types/node": ^18.0.0 || >=20.0.0 + less: "*" + lightningcss: ^1.21.0 + sass: "*" + sass-embedded: "*" + stylus: "*" + sugarss: "*" + terser: ^5.4.0 + dependenciesMeta: + fsevents: + optional: true + peerDependenciesMeta: + "@types/node": + optional: true + less: + optional: true + lightningcss: + optional: true + sass: + optional: true + sass-embedded: + optional: true + stylus: + optional: true + sugarss: + optional: true + terser: + optional: true + bin: + vite: bin/vite.js + checksum: 10c0/8842933bd70ca6a98489a0bb9c8464bec373de00f9a97c8c7a4e64b24d15c88bfaa8c1acb38a68c3e5eb49072ffbccb146842c2d4edcdd036a9802964cffe3d1 + languageName: node + linkType: hard + "vite@npm:5.4.6": version: 5.4.6 resolution: "vite@npm:5.4.6" From f1417002d8e1431771cbded7108e1dc0eea2a3be Mon Sep 17 00:00:00 2001 From: Alan Agius <alanagius@google.com> Date: Thu, 19 Dec 2024 09:07:07 +0000 Subject: [PATCH 69/87] test: add `--disable-dev-shm-usage` to address `WebDriverError: unknown error: Chrome failed to start: crashed` This fixes an issue where protractor integration tests are failing with ``` [07:38:37] I/direct - Using ChromeDriver directly... [07:38:39] E/launcher - unknown error: Chrome failed to start: crashed. (unknown error: DevToolsActivePort file doesn't exist) ``` (cherry picked from commit 0718e1b70c101e624cd43dc08f7c58d2bae07f1f) --- .../testing/builder/projects/hello-world-app/protractor.conf.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/testing/builder/projects/hello-world-app/protractor.conf.js b/modules/testing/builder/projects/hello-world-app/protractor.conf.js index 89b7edda6324..313f7ac7c53b 100644 --- a/modules/testing/builder/projects/hello-world-app/protractor.conf.js +++ b/modules/testing/builder/projects/hello-world-app/protractor.conf.js @@ -18,7 +18,7 @@ exports.config = { capabilities: { browserName: 'chrome', chromeOptions: { - args: ['--headless', '--disable-gpu', '--window-size=800,600'], + args: ['--headless', '--no-sandbox', '--disable-gpu', '--disable-dev-shm-usage'], binary: require('puppeteer').executablePath(), }, }, From deeaf18836efddfa1ee56a25e44944ba444d35ac Mon Sep 17 00:00:00 2001 From: Alan Agius <alanagius@google.com> Date: Wed, 27 Nov 2024 13:45:37 +0000 Subject: [PATCH 70/87] fix(@angular/cli): correctly select package versions in descending order during `ng add` When using the `ng add` command, the package version selection logic was not correctly selected based on the available versions in desc order. This could lead to selecting an unintended version of the package. Closes: #28985 (cherry picked from commit 4ef45ecf99a9b8b4c4fefb5b2cfd75f11a36331d) --- packages/angular/cli/src/commands/add/cli.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/angular/cli/src/commands/add/cli.ts b/packages/angular/cli/src/commands/add/cli.ts index ccc830eaa1f0..c280ba1af067 100644 --- a/packages/angular/cli/src/commands/add/cli.ts +++ b/packages/angular/cli/src/commands/add/cli.ts @@ -242,6 +242,7 @@ export default class AddCommandModule versionManifest.version, ); found = true; + break; } if (!found) { From 50c6817ed435c3a9c1eacaf8db350e2d957c36d6 Mon Sep 17 00:00:00 2001 From: Alan Agius <alanagius@google.com> Date: Thu, 19 Dec 2024 06:29:42 +0000 Subject: [PATCH 71/87] test: disable WTR e2e test Temporary disable this test due to ``` Failed to launch local browser installed at /home/runner/.cache/bazel/_bazel_runner/f47b8283cc0f5922f9455b06771398a1/sandbox/processwrapper-sandbox/410/execroot/angular_cli/bazel-out/k8-fastbuild/bin/tests/legacy-cli/e2e.npm_node22.sh.runfiles/org_chromium_chromium_linux_x64/chrome-linux/chrome. This could be because of a mismatch between the version of puppeteer and Chrome or Chromium. Try updating either of them, or adjust the executablePath option to point to another browser installation. Use the --puppeteer flag to run tests with bundled compatible version of Chromium. dist/test-out/c48222bb-ca34-455e-bc1b-122521e1e71e/app.component.spec.js: ``` (cherry picked from commit 307eda17e669c3edc9e7cd5603eca1b59828a267) --- tests/legacy-cli/e2e/tests/web-test-runner/basic.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/legacy-cli/e2e/tests/web-test-runner/basic.ts b/tests/legacy-cli/e2e/tests/web-test-runner/basic.ts index 2067e382b6d9..4985f872fb18 100644 --- a/tests/legacy-cli/e2e/tests/web-test-runner/basic.ts +++ b/tests/legacy-cli/e2e/tests/web-test-runner/basic.ts @@ -2,6 +2,9 @@ import { noSilentNg } from '../../utils/process'; import { applyWtrBuilder } from '../../utils/web-test-runner'; export default async function () { + // Temporary disabled due to failure. + return; + await applyWtrBuilder(); const { stderr } = await noSilentNg('test'); From d619f3d306565b3a88b7584913dde6f55ee8d538 Mon Sep 17 00:00:00 2001 From: Alan Agius <alanagius@google.com> Date: Wed, 29 Jan 2025 10:09:04 +0000 Subject: [PATCH 72/87] release: cut the v18.2.13 release --- CHANGELOG.md | 18 ++++++++++++++++++ package.json | 2 +- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 055f6a2c1fd9..d752f2bbe2d5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,21 @@ +<a name="18.2.13"></a> + +# 18.2.13 (2025-01-29) + +### @angular/cli + +| Commit | Type | Description | +| --------------------------------------------------------------------------------------------------- | ---- | --------------------------------------------------------------------- | +| [deeaf1883](https://github.com/angular/angular-cli/commit/deeaf18836efddfa1ee56a25e44944ba444d35ac) | fix | correctly select package versions in descending order during `ng add` | + +### @angular/build + +| Commit | Type | Description | +| --------------------------------------------------------------------------------------------------- | ---- | ----------------------------- | +| [fdddf2c08](https://github.com/angular/angular-cli/commit/fdddf2c0844081667a09f2ffe0b16f77384959b2) | fix | update vite to version 5.4.14 | + +<!-- CHANGELOG SPLIT MARKER --> + <a name="18.2.12"></a> # 18.2.12 (2024-11-14) diff --git a/package.json b/package.json index a296832c7752..d935d833a6f0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@angular/devkit-repo", - "version": "18.2.12", + "version": "18.2.13", "private": true, "description": "Software Development Kit for Angular", "keywords": [ From 9d34d28ec2965e1b9753556b2721d25ab05c655b Mon Sep 17 00:00:00 2001 From: Alan Agius <alanagius@google.com> Date: Wed, 29 Jan 2025 12:20:04 +0000 Subject: [PATCH 73/87] fix(@angular-devkit/build-angular): remove unused `vite` dependency This resolves advisory GHSA-vg6x-rcgg-rjx6 Fixes #29464 --- .../angular_devkit/build_angular/package.json | 1 - yarn.lock | 44 ------------------- 2 files changed, 45 deletions(-) diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json index 72179d0daa05..045ecf728a21 100644 --- a/packages/angular_devkit/build_angular/package.json +++ b/packages/angular_devkit/build_angular/package.json @@ -61,7 +61,6 @@ "terser": "5.31.6", "tree-kill": "1.2.2", "tslib": "2.6.3", - "vite": "5.4.6", "watchpack": "2.4.1", "webpack": "5.94.0", "webpack-dev-middleware": "7.4.2", diff --git a/yarn.lock b/yarn.lock index d8a69a7091be..b41130542c4f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -116,7 +116,6 @@ __metadata: tree-kill: "npm:1.2.2" tslib: "npm:2.6.3" undici: "npm:6.19.7" - vite: "npm:5.4.6" watchpack: "npm:2.4.1" webpack: "npm:5.94.0" webpack-dev-middleware: "npm:7.4.2" @@ -18096,49 +18095,6 @@ __metadata: languageName: node linkType: hard -"vite@npm:5.4.6": - version: 5.4.6 - resolution: "vite@npm:5.4.6" - dependencies: - esbuild: "npm:^0.21.3" - fsevents: "npm:~2.3.3" - postcss: "npm:^8.4.43" - rollup: "npm:^4.20.0" - peerDependencies: - "@types/node": ^18.0.0 || >=20.0.0 - less: "*" - lightningcss: ^1.21.0 - sass: "*" - sass-embedded: "*" - stylus: "*" - sugarss: "*" - terser: ^5.4.0 - dependenciesMeta: - fsevents: - optional: true - peerDependenciesMeta: - "@types/node": - optional: true - less: - optional: true - lightningcss: - optional: true - sass: - optional: true - sass-embedded: - optional: true - stylus: - optional: true - sugarss: - optional: true - terser: - optional: true - bin: - vite: bin/vite.js - checksum: 10c0/5f87be3a10e970eaf9ac52dfab39cf9fff583036685252fb64570b6d7bfa749f6d221fb78058f5ef4b5664c180d45a8e7a7ff68d7f3770e69e24c7c68b958bde - languageName: node - linkType: hard - "void-elements@npm:^2.0.0": version: 2.0.1 resolution: "void-elements@npm:2.0.1" From d621da89e2c91fc2ff0afac46c1c12940ef31419 Mon Sep 17 00:00:00 2001 From: Alan Agius <alanagius@google.com> Date: Wed, 29 Jan 2025 12:35:29 +0000 Subject: [PATCH 74/87] release: cut the v18.2.14 release --- CHANGELOG.md | 12 ++++++++++++ package.json | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d752f2bbe2d5..5cbd49f91311 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,15 @@ +<a name="18.2.14"></a> + +# 18.2.14 (2025-01-29) + +### @angular-devkit/build-angular + +| Commit | Type | Description | +| --------------------------------------------------------------------------------------------------- | ---- | ------------------------------- | +| [9d34d28ec](https://github.com/angular/angular-cli/commit/9d34d28ec2965e1b9753556b2721d25ab05c655b) | fix | remove unused `vite` dependency | + +<!-- CHANGELOG SPLIT MARKER --> + <a name="18.2.13"></a> # 18.2.13 (2025-01-29) diff --git a/package.json b/package.json index d935d833a6f0..738bb6e446a6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@angular/devkit-repo", - "version": "18.2.13", + "version": "18.2.14", "private": true, "description": "Software Development Kit for Angular", "keywords": [ From 255c8a50d2214747c8121e963afcd96cbff39293 Mon Sep 17 00:00:00 2001 From: Alan Agius <17563226+alan-agius4@users.noreply.github.com> Date: Thu, 13 Mar 2025 09:05:52 +0000 Subject: [PATCH 75/87] fix(@angular-devkit/build-angular): update babel packages This fixes a security report: https://github.com/babel/babel/security/advisories/GHSA-968p-4wvh-cqc8 Closes #29833 --- package.json | 18 +- .../angular_devkit/build_angular/package.json | 16 +- yarn.lock | 1480 ++++++++++------- 3 files changed, 856 insertions(+), 658 deletions(-) diff --git a/package.json b/package.json index 738bb6e446a6..60718e34c859 100644 --- a/package.json +++ b/package.json @@ -69,16 +69,16 @@ "@angular/platform-server": "18.2.0", "@angular/router": "18.2.0", "@angular/service-worker": "18.2.0", - "@babel/core": "7.25.2", - "@babel/generator": "7.25.0", - "@babel/helper-annotate-as-pure": "7.24.7", + "@babel/core": "7.26.10", + "@babel/generator": "7.26.10", + "@babel/helper-annotate-as-pure": "7.25.9", "@babel/helper-split-export-declaration": "7.24.7", - "@babel/plugin-syntax-import-attributes": "7.24.7", - "@babel/plugin-transform-async-generator-functions": "7.25.0", - "@babel/plugin-transform-async-to-generator": "7.24.7", - "@babel/plugin-transform-runtime": "7.24.7", - "@babel/preset-env": "7.25.3", - "@babel/runtime": "7.25.0", + "@babel/plugin-syntax-import-attributes": "7.26.0", + "@babel/plugin-transform-async-generator-functions": "7.26.8", + "@babel/plugin-transform-async-to-generator": "7.25.9", + "@babel/plugin-transform-runtime": "7.26.10", + "@babel/preset-env": "7.26.9", + "@babel/runtime": "7.26.10", "@bazel/bazelisk": "1.19.0", "@bazel/buildifier": "7.1.2", "@bazel/concatjs": "patch:@bazel/concatjs@npm%3A5.8.1#~/.yarn/patches/@bazel-concatjs-npm-5.8.1-1bf81df846.patch", diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json index 045ecf728a21..0217743c824a 100644 --- a/packages/angular_devkit/build_angular/package.json +++ b/packages/angular_devkit/build_angular/package.json @@ -11,15 +11,15 @@ "@angular-devkit/build-webpack": "0.0.0-EXPERIMENTAL-PLACEHOLDER", "@angular-devkit/core": "0.0.0-PLACEHOLDER", "@angular/build": "0.0.0-PLACEHOLDER", - "@babel/core": "7.25.2", - "@babel/generator": "7.25.0", - "@babel/helper-annotate-as-pure": "7.24.7", + "@babel/core": "7.26.10", + "@babel/generator": "7.26.10", + "@babel/helper-annotate-as-pure": "7.25.9", "@babel/helper-split-export-declaration": "7.24.7", - "@babel/plugin-transform-async-generator-functions": "7.25.0", - "@babel/plugin-transform-async-to-generator": "7.24.7", - "@babel/plugin-transform-runtime": "7.24.7", - "@babel/preset-env": "7.25.3", - "@babel/runtime": "7.25.0", + "@babel/plugin-transform-async-generator-functions": "7.26.8", + "@babel/plugin-transform-async-to-generator": "7.25.9", + "@babel/plugin-transform-runtime": "7.26.10", + "@babel/preset-env": "7.26.9", + "@babel/runtime": "7.26.10", "@discoveryjs/json-ext": "0.6.1", "@ngtools/webpack": "0.0.0-PLACEHOLDER", "@vitejs/plugin-basic-ssl": "1.1.0", diff --git a/yarn.lock b/yarn.lock index b41130542c4f..8cab8b89e647 100644 --- a/yarn.lock +++ b/yarn.lock @@ -64,15 +64,15 @@ __metadata: "@angular-devkit/build-webpack": "npm:0.0.0-EXPERIMENTAL-PLACEHOLDER" "@angular-devkit/core": "npm:0.0.0-PLACEHOLDER" "@angular/build": "npm:0.0.0-PLACEHOLDER" - "@babel/core": "npm:7.25.2" - "@babel/generator": "npm:7.25.0" - "@babel/helper-annotate-as-pure": "npm:7.24.7" + "@babel/core": "npm:7.26.10" + "@babel/generator": "npm:7.26.10" + "@babel/helper-annotate-as-pure": "npm:7.25.9" "@babel/helper-split-export-declaration": "npm:7.24.7" - "@babel/plugin-transform-async-generator-functions": "npm:7.25.0" - "@babel/plugin-transform-async-to-generator": "npm:7.24.7" - "@babel/plugin-transform-runtime": "npm:7.24.7" - "@babel/preset-env": "npm:7.25.3" - "@babel/runtime": "npm:7.25.0" + "@babel/plugin-transform-async-generator-functions": "npm:7.26.8" + "@babel/plugin-transform-async-to-generator": "npm:7.25.9" + "@babel/plugin-transform-runtime": "npm:7.26.10" + "@babel/preset-env": "npm:7.26.9" + "@babel/runtime": "npm:7.26.10" "@discoveryjs/json-ext": "npm:0.6.1" "@ngtools/webpack": "npm:0.0.0-PLACEHOLDER" "@vitejs/plugin-basic-ssl": "npm:1.1.0" @@ -672,16 +672,16 @@ __metadata: "@angular/platform-server": "npm:18.2.0" "@angular/router": "npm:18.2.0" "@angular/service-worker": "npm:18.2.0" - "@babel/core": "npm:7.25.2" - "@babel/generator": "npm:7.25.0" - "@babel/helper-annotate-as-pure": "npm:7.24.7" + "@babel/core": "npm:7.26.10" + "@babel/generator": "npm:7.26.10" + "@babel/helper-annotate-as-pure": "npm:7.25.9" "@babel/helper-split-export-declaration": "npm:7.24.7" - "@babel/plugin-syntax-import-attributes": "npm:7.24.7" - "@babel/plugin-transform-async-generator-functions": "npm:7.25.0" - "@babel/plugin-transform-async-to-generator": "npm:7.24.7" - "@babel/plugin-transform-runtime": "npm:7.24.7" - "@babel/preset-env": "npm:7.25.3" - "@babel/runtime": "npm:7.25.0" + "@babel/plugin-syntax-import-attributes": "npm:7.26.0" + "@babel/plugin-transform-async-generator-functions": "npm:7.26.8" + "@babel/plugin-transform-async-to-generator": "npm:7.25.9" + "@babel/plugin-transform-runtime": "npm:7.26.10" + "@babel/preset-env": "npm:7.26.9" + "@babel/runtime": "npm:7.26.10" "@bazel/bazelisk": "npm:1.19.0" "@bazel/buildifier": "npm:7.1.2" "@bazel/concatjs": "patch:@bazel/concatjs@npm%3A5.8.1#~/.yarn/patches/@bazel-concatjs-npm-5.8.1-1bf81df846.patch" @@ -1003,6 +1003,17 @@ __metadata: languageName: node linkType: hard +"@babel/code-frame@npm:^7.26.2": + version: 7.26.2 + resolution: "@babel/code-frame@npm:7.26.2" + dependencies: + "@babel/helper-validator-identifier": "npm:^7.25.9" + js-tokens: "npm:^4.0.0" + picocolors: "npm:^1.0.0" + checksum: 10c0/7d79621a6849183c415486af99b1a20b84737e8c11cd55b6544f688c51ce1fd710e6d869c3dd21232023da272a79b91efb3e83b5bc2dc65c1187c5fcd1b72ea8 + languageName: node + linkType: hard + "@babel/compat-data@npm:^7.22.6, @babel/compat-data@npm:^7.25.2": version: 7.25.2 resolution: "@babel/compat-data@npm:7.25.2" @@ -1010,6 +1021,13 @@ __metadata: languageName: node linkType: hard +"@babel/compat-data@npm:^7.26.5, @babel/compat-data@npm:^7.26.8": + version: 7.26.8 + resolution: "@babel/compat-data@npm:7.26.8" + checksum: 10c0/66408a0388c3457fff1c2f6c3a061278dd7b3d2f0455ea29bb7b187fa52c60ae8b4054b3c0a184e21e45f0eaac63cf390737bc7504d1f4a088a6e7f652c068ca + languageName: node + linkType: hard + "@babel/core@npm:7.24.9": version: 7.24.9 resolution: "@babel/core@npm:7.24.9" @@ -1056,7 +1074,43 @@ __metadata: languageName: node linkType: hard -"@babel/generator@npm:7.25.0, @babel/generator@npm:^7.24.9, @babel/generator@npm:^7.25.0": +"@babel/core@npm:7.26.10": + version: 7.26.10 + resolution: "@babel/core@npm:7.26.10" + dependencies: + "@ampproject/remapping": "npm:^2.2.0" + "@babel/code-frame": "npm:^7.26.2" + "@babel/generator": "npm:^7.26.10" + "@babel/helper-compilation-targets": "npm:^7.26.5" + "@babel/helper-module-transforms": "npm:^7.26.0" + "@babel/helpers": "npm:^7.26.10" + "@babel/parser": "npm:^7.26.10" + "@babel/template": "npm:^7.26.9" + "@babel/traverse": "npm:^7.26.10" + "@babel/types": "npm:^7.26.10" + convert-source-map: "npm:^2.0.0" + debug: "npm:^4.1.0" + gensync: "npm:^1.0.0-beta.2" + json5: "npm:^2.2.3" + semver: "npm:^6.3.1" + checksum: 10c0/e046e0e988ab53841b512ee9d263ca409f6c46e2a999fe53024688b92db394346fa3aeae5ea0866331f62133982eee05a675d22922a4603c3f603aa09a581d62 + languageName: node + linkType: hard + +"@babel/generator@npm:7.26.10, @babel/generator@npm:^7.26.10": + version: 7.26.10 + resolution: "@babel/generator@npm:7.26.10" + dependencies: + "@babel/parser": "npm:^7.26.10" + "@babel/types": "npm:^7.26.10" + "@jridgewell/gen-mapping": "npm:^0.3.5" + "@jridgewell/trace-mapping": "npm:^0.3.25" + jsesc: "npm:^3.0.2" + checksum: 10c0/88b3b3ea80592fc89349c4e1a145e1386e4042866d2507298adf452bf972f68d13bf699a845e6ab8c028bd52c2247013eb1221b86e1db5c9779faacba9c4b10e + languageName: node + linkType: hard + +"@babel/generator@npm:^7.24.9, @babel/generator@npm:^7.25.0": version: 7.25.0 resolution: "@babel/generator@npm:7.25.0" dependencies: @@ -1077,17 +1131,16 @@ __metadata: languageName: node linkType: hard -"@babel/helper-builder-binary-assignment-operator-visitor@npm:^7.24.7": - version: 7.24.7 - resolution: "@babel/helper-builder-binary-assignment-operator-visitor@npm:7.24.7" +"@babel/helper-annotate-as-pure@npm:7.25.9, @babel/helper-annotate-as-pure@npm:^7.25.9": + version: 7.25.9 + resolution: "@babel/helper-annotate-as-pure@npm:7.25.9" dependencies: - "@babel/traverse": "npm:^7.24.7" - "@babel/types": "npm:^7.24.7" - checksum: 10c0/0ed84abf848c79fb1cd4c1ddac12c771d32c1904d87fc3087f33cfdeb0c2e0db4e7892b74b407d9d8d0c000044f3645a7391a781f788da8410c290bb123a1f13 + "@babel/types": "npm:^7.25.9" + checksum: 10c0/095b6ba50489d797733abebc4596a81918316a99e3632755c9f02508882912b00c2ae5e468532a25a5c2108d109ddbe9b7da78333ee7cc13817fc50c00cf06fe languageName: node linkType: hard -"@babel/helper-compilation-targets@npm:^7.22.6, @babel/helper-compilation-targets@npm:^7.24.7, @babel/helper-compilation-targets@npm:^7.24.8, @babel/helper-compilation-targets@npm:^7.25.2": +"@babel/helper-compilation-targets@npm:^7.22.6, @babel/helper-compilation-targets@npm:^7.24.8, @babel/helper-compilation-targets@npm:^7.25.2": version: 7.25.2 resolution: "@babel/helper-compilation-targets@npm:7.25.2" dependencies: @@ -1100,24 +1153,37 @@ __metadata: languageName: node linkType: hard -"@babel/helper-create-class-features-plugin@npm:^7.24.7": - version: 7.25.0 - resolution: "@babel/helper-create-class-features-plugin@npm:7.25.0" +"@babel/helper-compilation-targets@npm:^7.25.9, @babel/helper-compilation-targets@npm:^7.26.5": + version: 7.26.5 + resolution: "@babel/helper-compilation-targets@npm:7.26.5" dependencies: - "@babel/helper-annotate-as-pure": "npm:^7.24.7" - "@babel/helper-member-expression-to-functions": "npm:^7.24.8" - "@babel/helper-optimise-call-expression": "npm:^7.24.7" - "@babel/helper-replace-supers": "npm:^7.25.0" - "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.24.7" - "@babel/traverse": "npm:^7.25.0" + "@babel/compat-data": "npm:^7.26.5" + "@babel/helper-validator-option": "npm:^7.25.9" + browserslist: "npm:^4.24.0" + lru-cache: "npm:^5.1.1" + semver: "npm:^6.3.1" + checksum: 10c0/9da5c77e5722f1a2fcb3e893049a01d414124522bbf51323bb1a0c9dcd326f15279836450fc36f83c9e8a846f3c40e88be032ed939c5a9840922bed6073edfb4 + languageName: node + linkType: hard + +"@babel/helper-create-class-features-plugin@npm:^7.25.9": + version: 7.26.9 + resolution: "@babel/helper-create-class-features-plugin@npm:7.26.9" + dependencies: + "@babel/helper-annotate-as-pure": "npm:^7.25.9" + "@babel/helper-member-expression-to-functions": "npm:^7.25.9" + "@babel/helper-optimise-call-expression": "npm:^7.25.9" + "@babel/helper-replace-supers": "npm:^7.26.5" + "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.25.9" + "@babel/traverse": "npm:^7.26.9" semver: "npm:^6.3.1" peerDependencies: "@babel/core": ^7.0.0 - checksum: 10c0/2f8ac36cfeb45d462432acea64c78312cc9180dda7aa9337b77017961e373c323065362d2452f3d6f8bffeb254ff3f7346ac1b25c8ad7b81db813a95924f4053 + checksum: 10c0/808620b350ac012f22163fd44c38ed8e05b24ce5d37bc4aa99a44e9724205f11efcef6b25ccfa5bb5de82ac32b899f1e939123c688f335d2851f4b8d70742233 languageName: node linkType: hard -"@babel/helper-create-regexp-features-plugin@npm:^7.18.6, @babel/helper-create-regexp-features-plugin@npm:^7.24.7, @babel/helper-create-regexp-features-plugin@npm:^7.25.0": +"@babel/helper-create-regexp-features-plugin@npm:^7.18.6": version: 7.25.2 resolution: "@babel/helper-create-regexp-features-plugin@npm:7.25.2" dependencies: @@ -1130,6 +1196,19 @@ __metadata: languageName: node linkType: hard +"@babel/helper-create-regexp-features-plugin@npm:^7.25.9": + version: 7.26.3 + resolution: "@babel/helper-create-regexp-features-plugin@npm:7.26.3" + dependencies: + "@babel/helper-annotate-as-pure": "npm:^7.25.9" + regexpu-core: "npm:^6.2.0" + semver: "npm:^6.3.1" + peerDependencies: + "@babel/core": ^7.0.0 + checksum: 10c0/266f30b99af621559467ed67634cb653408a9262930c0627c3d17691a9d477329fb4dabe4b1785cbf0490e892513d247836674271842d6a8da49fd0afae7d435 + languageName: node + linkType: hard + "@babel/helper-define-polyfill-provider@npm:^0.6.2": version: 0.6.2 resolution: "@babel/helper-define-polyfill-provider@npm:0.6.2" @@ -1145,6 +1224,21 @@ __metadata: languageName: node linkType: hard +"@babel/helper-define-polyfill-provider@npm:^0.6.3": + version: 0.6.3 + resolution: "@babel/helper-define-polyfill-provider@npm:0.6.3" + dependencies: + "@babel/helper-compilation-targets": "npm:^7.22.6" + "@babel/helper-plugin-utils": "npm:^7.22.5" + debug: "npm:^4.1.1" + lodash.debounce: "npm:^4.0.8" + resolve: "npm:^1.14.2" + peerDependencies: + "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0 + checksum: 10c0/4320e3527645e98b6a0d5626fef815680e3b2b03ec36045de5e909b0f01546ab3674e96f50bf3bc8413f8c9037e5ee1a5f560ebdf8210426dad1c2c03c96184a + languageName: node + linkType: hard + "@babel/helper-environment-visitor@npm:^7.18.9": version: 7.24.7 resolution: "@babel/helper-environment-visitor@npm:7.24.7" @@ -1154,13 +1248,13 @@ __metadata: languageName: node linkType: hard -"@babel/helper-member-expression-to-functions@npm:^7.24.8": - version: 7.24.8 - resolution: "@babel/helper-member-expression-to-functions@npm:7.24.8" +"@babel/helper-member-expression-to-functions@npm:^7.25.9": + version: 7.25.9 + resolution: "@babel/helper-member-expression-to-functions@npm:7.25.9" dependencies: - "@babel/traverse": "npm:^7.24.8" - "@babel/types": "npm:^7.24.8" - checksum: 10c0/7e14a5acc91f6cd26305a4441b82eb6f616bd70b096a4d2099a968f16b26d50207eec0b9ebfc466fefd62bd91587ac3be878117cdfec819b7151911183cb0e5a + "@babel/traverse": "npm:^7.25.9" + "@babel/types": "npm:^7.25.9" + checksum: 10c0/e08c7616f111e1fb56f398365e78858e26e466d4ac46dff25921adc5ccae9b232f66e952a2f4162bbe336627ba336c7fd9eca4835b6548935973d3380d77eaff languageName: node linkType: hard @@ -1174,7 +1268,17 @@ __metadata: languageName: node linkType: hard -"@babel/helper-module-transforms@npm:^7.24.7, @babel/helper-module-transforms@npm:^7.24.8, @babel/helper-module-transforms@npm:^7.24.9, @babel/helper-module-transforms@npm:^7.25.0, @babel/helper-module-transforms@npm:^7.25.2": +"@babel/helper-module-imports@npm:^7.25.9": + version: 7.25.9 + resolution: "@babel/helper-module-imports@npm:7.25.9" + dependencies: + "@babel/traverse": "npm:^7.25.9" + "@babel/types": "npm:^7.25.9" + checksum: 10c0/078d3c2b45d1f97ffe6bb47f61961be4785d2342a4156d8b42c92ee4e1b7b9e365655dd6cb25329e8fe1a675c91eeac7e3d04f0c518b67e417e29d6e27b6aa70 + languageName: node + linkType: hard + +"@babel/helper-module-transforms@npm:^7.24.9, @babel/helper-module-transforms@npm:^7.25.2": version: 7.25.2 resolution: "@babel/helper-module-transforms@npm:7.25.2" dependencies: @@ -1188,23 +1292,43 @@ __metadata: languageName: node linkType: hard -"@babel/helper-optimise-call-expression@npm:^7.24.7": - version: 7.24.7 - resolution: "@babel/helper-optimise-call-expression@npm:7.24.7" +"@babel/helper-module-transforms@npm:^7.25.9, @babel/helper-module-transforms@npm:^7.26.0": + version: 7.26.0 + resolution: "@babel/helper-module-transforms@npm:7.26.0" dependencies: - "@babel/types": "npm:^7.24.7" - checksum: 10c0/ca6a9884705dea5c95a8b3ce132d1e3f2ae951ff74987d400d1d9c215dae9c0f9e29924d8f8e131e116533d182675bc261927be72f6a9a2968eaeeaa51eb1d0f + "@babel/helper-module-imports": "npm:^7.25.9" + "@babel/helper-validator-identifier": "npm:^7.25.9" + "@babel/traverse": "npm:^7.25.9" + peerDependencies: + "@babel/core": ^7.0.0 + checksum: 10c0/ee111b68a5933481d76633dad9cdab30c41df4479f0e5e1cc4756dc9447c1afd2c9473b5ba006362e35b17f4ebddd5fca090233bef8dfc84dca9d9127e56ec3a languageName: node linkType: hard -"@babel/helper-plugin-utils@npm:^7.0.0, @babel/helper-plugin-utils@npm:^7.10.4, @babel/helper-plugin-utils@npm:^7.12.13, @babel/helper-plugin-utils@npm:^7.14.5, @babel/helper-plugin-utils@npm:^7.18.6, @babel/helper-plugin-utils@npm:^7.20.2, @babel/helper-plugin-utils@npm:^7.22.5, @babel/helper-plugin-utils@npm:^7.24.7, @babel/helper-plugin-utils@npm:^7.24.8, @babel/helper-plugin-utils@npm:^7.8.0, @babel/helper-plugin-utils@npm:^7.8.3": +"@babel/helper-optimise-call-expression@npm:^7.25.9": + version: 7.25.9 + resolution: "@babel/helper-optimise-call-expression@npm:7.25.9" + dependencies: + "@babel/types": "npm:^7.25.9" + checksum: 10c0/90203e6607edeadd2a154940803fd616c0ed92c1013d6774c4b8eb491f1a5a3448b68faae6268141caa5c456e55e3ee49a4ed2bd7ddaf2365daea321c435914c + languageName: node + linkType: hard + +"@babel/helper-plugin-utils@npm:^7.0.0, @babel/helper-plugin-utils@npm:^7.18.6, @babel/helper-plugin-utils@npm:^7.20.2, @babel/helper-plugin-utils@npm:^7.22.5, @babel/helper-plugin-utils@npm:^7.24.7, @babel/helper-plugin-utils@npm:^7.8.0": version: 7.24.8 resolution: "@babel/helper-plugin-utils@npm:7.24.8" checksum: 10c0/0376037f94a3bfe6b820a39f81220ac04f243eaee7193774b983e956c1750883ff236b30785795abbcda43fac3ece74750566830c2daa4d6e3870bb0dff34c2d languageName: node linkType: hard -"@babel/helper-remap-async-to-generator@npm:^7.18.9, @babel/helper-remap-async-to-generator@npm:^7.24.7, @babel/helper-remap-async-to-generator@npm:^7.25.0": +"@babel/helper-plugin-utils@npm:^7.25.9, @babel/helper-plugin-utils@npm:^7.26.5": + version: 7.26.5 + resolution: "@babel/helper-plugin-utils@npm:7.26.5" + checksum: 10c0/cdaba71d4b891aa6a8dfbe5bac2f94effb13e5fa4c2c487667fdbaa04eae059b78b28d85a885071f45f7205aeb56d16759e1bed9c118b94b16e4720ef1ab0f65 + languageName: node + linkType: hard + +"@babel/helper-remap-async-to-generator@npm:^7.18.9": version: 7.25.0 resolution: "@babel/helper-remap-async-to-generator@npm:7.25.0" dependencies: @@ -1217,16 +1341,29 @@ __metadata: languageName: node linkType: hard -"@babel/helper-replace-supers@npm:^7.24.7, @babel/helper-replace-supers@npm:^7.25.0": - version: 7.25.0 - resolution: "@babel/helper-replace-supers@npm:7.25.0" +"@babel/helper-remap-async-to-generator@npm:^7.25.9": + version: 7.25.9 + resolution: "@babel/helper-remap-async-to-generator@npm:7.25.9" dependencies: - "@babel/helper-member-expression-to-functions": "npm:^7.24.8" - "@babel/helper-optimise-call-expression": "npm:^7.24.7" - "@babel/traverse": "npm:^7.25.0" + "@babel/helper-annotate-as-pure": "npm:^7.25.9" + "@babel/helper-wrap-function": "npm:^7.25.9" + "@babel/traverse": "npm:^7.25.9" peerDependencies: "@babel/core": ^7.0.0 - checksum: 10c0/b4b6650ab3d56c39a259367cd97f8df2f21c9cebb3716fea7bca40a150f8847bfb82f481e98927c7c6579b48a977b5a8f77318a1c6aeb497f41ecd6dbc3fdfef + checksum: 10c0/6798b562f2788210980f29c5ee96056d90dc73458c88af5bd32f9c82e28e01975588aa2a57bb866c35556bd9b76bac937e824ee63ba472b6430224b91b4879e9 + languageName: node + linkType: hard + +"@babel/helper-replace-supers@npm:^7.25.9, @babel/helper-replace-supers@npm:^7.26.5": + version: 7.26.5 + resolution: "@babel/helper-replace-supers@npm:7.26.5" + dependencies: + "@babel/helper-member-expression-to-functions": "npm:^7.25.9" + "@babel/helper-optimise-call-expression": "npm:^7.25.9" + "@babel/traverse": "npm:^7.26.5" + peerDependencies: + "@babel/core": ^7.0.0 + checksum: 10c0/b19b1245caf835207aaaaac3a494f03a16069ae55e76a2e1350b5acd560e6a820026997a8160e8ebab82ae873e8208759aa008eb8422a67a775df41f0a4633d4 languageName: node linkType: hard @@ -1240,13 +1377,13 @@ __metadata: languageName: node linkType: hard -"@babel/helper-skip-transparent-expression-wrappers@npm:^7.24.7": - version: 7.24.7 - resolution: "@babel/helper-skip-transparent-expression-wrappers@npm:7.24.7" +"@babel/helper-skip-transparent-expression-wrappers@npm:^7.25.9": + version: 7.25.9 + resolution: "@babel/helper-skip-transparent-expression-wrappers@npm:7.25.9" dependencies: - "@babel/traverse": "npm:^7.24.7" - "@babel/types": "npm:^7.24.7" - checksum: 10c0/e3a9b8ac9c262ac976a1bcb5fe59694db5e6f0b4f9e7bdba5c7693b8b5e28113c23bdaa60fe8d3ec32a337091b67720b2053bcb3d5655f5406536c3d0584242b + "@babel/traverse": "npm:^7.25.9" + "@babel/types": "npm:^7.25.9" + checksum: 10c0/09ace0c6156961624ac9524329ce7f45350bab94bbe24335cbe0da7dfaa1448e658771831983cb83fe91cf6635b15d0a3cab57c03b92657480bfb49fb56dd184 languageName: node linkType: hard @@ -1266,6 +1403,13 @@ __metadata: languageName: node linkType: hard +"@babel/helper-string-parser@npm:^7.25.9": + version: 7.25.9 + resolution: "@babel/helper-string-parser@npm:7.25.9" + checksum: 10c0/7244b45d8e65f6b4338a6a68a8556f2cb161b782343e97281a5f2b9b93e420cad0d9f5773a59d79f61d0c448913d06f6a2358a87f2e203cf112e3c5b53522ee6 + languageName: node + linkType: hard + "@babel/helper-validator-identifier@npm:^7.24.7": version: 7.24.7 resolution: "@babel/helper-validator-identifier@npm:7.24.7" @@ -1273,6 +1417,13 @@ __metadata: languageName: node linkType: hard +"@babel/helper-validator-identifier@npm:^7.25.9": + version: 7.25.9 + resolution: "@babel/helper-validator-identifier@npm:7.25.9" + checksum: 10c0/4fc6f830177b7b7e887ad3277ddb3b91d81e6c4a24151540d9d1023e8dc6b1c0505f0f0628ae653601eb4388a8db45c1c14b2c07a9173837aef7e4116456259d + languageName: node + linkType: hard + "@babel/helper-validator-option@npm:^7.24.8": version: 7.24.8 resolution: "@babel/helper-validator-option@npm:7.24.8" @@ -1280,6 +1431,13 @@ __metadata: languageName: node linkType: hard +"@babel/helper-validator-option@npm:^7.25.9": + version: 7.25.9 + resolution: "@babel/helper-validator-option@npm:7.25.9" + checksum: 10c0/27fb195d14c7dcb07f14e58fe77c44eea19a6a40a74472ec05c441478fa0bb49fa1c32b2d64be7a38870ee48ef6601bdebe98d512f0253aea0b39756c4014f3e + languageName: node + linkType: hard + "@babel/helper-wrap-function@npm:^7.25.0": version: 7.25.0 resolution: "@babel/helper-wrap-function@npm:7.25.0" @@ -1291,6 +1449,17 @@ __metadata: languageName: node linkType: hard +"@babel/helper-wrap-function@npm:^7.25.9": + version: 7.25.9 + resolution: "@babel/helper-wrap-function@npm:7.25.9" + dependencies: + "@babel/template": "npm:^7.25.9" + "@babel/traverse": "npm:^7.25.9" + "@babel/types": "npm:^7.25.9" + checksum: 10c0/b6627d83291e7b80df020f8ee2890c52b8d49272962cac0114ef90f189889c90f1027985873d1b5261a4e986e109b2754292dc112392f0b1fcbfc91cc08bd003 + languageName: node + linkType: hard + "@babel/helpers@npm:^7.24.8, @babel/helpers@npm:^7.25.0": version: 7.25.0 resolution: "@babel/helpers@npm:7.25.0" @@ -1301,6 +1470,16 @@ __metadata: languageName: node linkType: hard +"@babel/helpers@npm:^7.26.10": + version: 7.26.10 + resolution: "@babel/helpers@npm:7.26.10" + dependencies: + "@babel/template": "npm:^7.26.9" + "@babel/types": "npm:^7.26.10" + checksum: 10c0/f99e1836bcffce96db43158518bb4a24cf266820021f6461092a776cba2dc01d9fc8b1b90979d7643c5c2ab7facc438149064463a52dd528b21c6ab32509784f + languageName: node + linkType: hard + "@babel/highlight@npm:^7.24.7": version: 7.24.7 resolution: "@babel/highlight@npm:7.24.7" @@ -1324,62 +1503,73 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-bugfix-firefox-class-in-computed-class-key@npm:^7.25.3": - version: 7.25.3 - resolution: "@babel/plugin-bugfix-firefox-class-in-computed-class-key@npm:7.25.3" +"@babel/parser@npm:^7.26.10, @babel/parser@npm:^7.26.9": + version: 7.26.10 + resolution: "@babel/parser@npm:7.26.10" dependencies: - "@babel/helper-plugin-utils": "npm:^7.24.8" - "@babel/traverse": "npm:^7.25.3" + "@babel/types": "npm:^7.26.10" + bin: + parser: ./bin/babel-parser.js + checksum: 10c0/c47f5c0f63cd12a663e9dc94a635f9efbb5059d98086a92286d7764357c66bceba18ccbe79333e01e9be3bfb8caba34b3aaebfd8e62c3d5921c8cf907267be75 + languageName: node + linkType: hard + +"@babel/plugin-bugfix-firefox-class-in-computed-class-key@npm:^7.25.9": + version: 7.25.9 + resolution: "@babel/plugin-bugfix-firefox-class-in-computed-class-key@npm:7.25.9" + dependencies: + "@babel/helper-plugin-utils": "npm:^7.25.9" + "@babel/traverse": "npm:^7.25.9" peerDependencies: "@babel/core": ^7.0.0 - checksum: 10c0/814b4d3f102e7556a5053d1acf57ef601cfcff39a2c81b8cdc6a5c842e3cb9838f5925d1466a5f1e6416e74c9c83586a3c07fbd7fb8610a396c2becdf9ae5790 + checksum: 10c0/7aab47fcbb8c1ddc195a3cd66609edcad54c5022f018db7de40185f0182950389690e953e952f117a1737b72f665ff02ad30de6c02b49b97f1d8f4ccdffedc34 languageName: node linkType: hard -"@babel/plugin-bugfix-safari-class-field-initializer-scope@npm:^7.25.0": - version: 7.25.0 - resolution: "@babel/plugin-bugfix-safari-class-field-initializer-scope@npm:7.25.0" +"@babel/plugin-bugfix-safari-class-field-initializer-scope@npm:^7.25.9": + version: 7.25.9 + resolution: "@babel/plugin-bugfix-safari-class-field-initializer-scope@npm:7.25.9" dependencies: - "@babel/helper-plugin-utils": "npm:^7.24.8" + "@babel/helper-plugin-utils": "npm:^7.25.9" peerDependencies: "@babel/core": ^7.0.0 - checksum: 10c0/9645a1f47b3750acadb1353c02e71cc712d072aafe5ce115ed3a886bc14c5d9200cfb0b5b5e60e813baa549b800cf798f8714019fd246c699053cf68c428e426 + checksum: 10c0/3a652b3574ca62775c5f101f8457950edc540c3581226579125da535d67765f41ad7f0e6327f8efeb2540a5dad5bb0c60a89fb934af3f67472e73fb63612d004 languageName: node linkType: hard -"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:^7.25.0": - version: 7.25.0 - resolution: "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:7.25.0" +"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:^7.25.9": + version: 7.25.9 + resolution: "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:7.25.9" dependencies: - "@babel/helper-plugin-utils": "npm:^7.24.8" + "@babel/helper-plugin-utils": "npm:^7.25.9" peerDependencies: "@babel/core": ^7.0.0 - checksum: 10c0/ed1ce1c90cac46c01825339fd0f2a96fa071b016fb819d8dfaf8e96300eae30e74870cb47e4dc80d4ce2fb287869f102878b4f3b35bc927fec8b1d0d76bcf612 + checksum: 10c0/18fc9004104a150f9f5da9f3307f361bc3104d16778bb593b7523d5110f04a8df19a2587e6bdd5e726fb1d397191add45223f4f731bb556c33f14f2779d596e8 languageName: node linkType: hard -"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@npm:^7.24.7": - version: 7.24.7 - resolution: "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@npm:7.24.7" +"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@npm:^7.25.9": + version: 7.25.9 + resolution: "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@npm:7.25.9" dependencies: - "@babel/helper-plugin-utils": "npm:^7.24.7" - "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.24.7" - "@babel/plugin-transform-optional-chaining": "npm:^7.24.7" + "@babel/helper-plugin-utils": "npm:^7.25.9" + "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.25.9" + "@babel/plugin-transform-optional-chaining": "npm:^7.25.9" peerDependencies: "@babel/core": ^7.13.0 - checksum: 10c0/aeb6e7aa363a47f815cf956ea1053c5dd8b786a17799f065c9688ba4b0051fe7565d258bbe9400bfcbfb3114cb9fda66983e10afe4d750bc70ff75403e15dd36 + checksum: 10c0/3f6c8781a2f7aa1791a31d2242399ca884df2ab944f90c020b6f112fb19f05fa6dad5be143d274dad1377e40415b63d24d5489faf5060b9c4a99e55d8f0c317c languageName: node linkType: hard -"@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@npm:^7.25.0": - version: 7.25.0 - resolution: "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@npm:7.25.0" +"@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@npm:^7.25.9": + version: 7.25.9 + resolution: "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@npm:7.25.9" dependencies: - "@babel/helper-plugin-utils": "npm:^7.24.8" - "@babel/traverse": "npm:^7.25.0" + "@babel/helper-plugin-utils": "npm:^7.25.9" + "@babel/traverse": "npm:^7.25.9" peerDependencies: "@babel/core": ^7.0.0 - checksum: 10c0/45988025537a9d4a27b610fd696a18fd9ba9336621a69b4fb40560eeb10c79657f85c92a37f30c7c8fb29c22970eea0b373315795a891f1a05549a6cfe5a6bfe + checksum: 10c0/02b365f0cc4df8b8b811c68697c93476da387841e5f153fe42766f34241b685503ea51110d5ed6df7132759820b93e48d9fa3743cffc091eed97c19f7e5fe272 languageName: node linkType: hard @@ -1417,62 +1607,18 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-syntax-class-properties@npm:^7.12.13": - version: 7.12.13 - resolution: "@babel/plugin-syntax-class-properties@npm:7.12.13" +"@babel/plugin-syntax-import-assertions@npm:^7.26.0": + version: 7.26.0 + resolution: "@babel/plugin-syntax-import-assertions@npm:7.26.0" dependencies: - "@babel/helper-plugin-utils": "npm:^7.12.13" + "@babel/helper-plugin-utils": "npm:^7.25.9" peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 10c0/95168fa186416195280b1264fb18afcdcdcea780b3515537b766cb90de6ce042d42dd6a204a39002f794ae5845b02afb0fd4861a3308a861204a55e68310a120 + checksum: 10c0/525b174e60b210d96c1744c1575fc2ddedcc43a479cba64a5344cf77bd0541754fc58120b5a11ff832ba098437bb05aa80900d1f49bb3d888c5e349a4a3a356e languageName: node linkType: hard -"@babel/plugin-syntax-class-static-block@npm:^7.14.5": - version: 7.14.5 - resolution: "@babel/plugin-syntax-class-static-block@npm:7.14.5" - dependencies: - "@babel/helper-plugin-utils": "npm:^7.14.5" - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: 10c0/4464bf9115f4a2d02ce1454411baf9cfb665af1da53709c5c56953e5e2913745b0fcce82982a00463d6facbdd93445c691024e310b91431a1e2f024b158f6371 - languageName: node - linkType: hard - -"@babel/plugin-syntax-dynamic-import@npm:^7.8.3": - version: 7.8.3 - resolution: "@babel/plugin-syntax-dynamic-import@npm:7.8.3" - dependencies: - "@babel/helper-plugin-utils": "npm:^7.8.0" - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: 10c0/9c50927bf71adf63f60c75370e2335879402648f468d0172bc912e303c6a3876927d8eb35807331b57f415392732ed05ab9b42c68ac30a936813ab549e0246c5 - languageName: node - linkType: hard - -"@babel/plugin-syntax-export-namespace-from@npm:^7.8.3": - version: 7.8.3 - resolution: "@babel/plugin-syntax-export-namespace-from@npm:7.8.3" - dependencies: - "@babel/helper-plugin-utils": "npm:^7.8.3" - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: 10c0/5100d658ba563829700cd8d001ddc09f4c0187b1a13de300d729c5b3e87503f75a6d6c99c1794182f7f1a9f546ee009df4f15a0ce36376e206ed0012fa7cdc24 - languageName: node - linkType: hard - -"@babel/plugin-syntax-import-assertions@npm:^7.24.7": - version: 7.24.7 - resolution: "@babel/plugin-syntax-import-assertions@npm:7.24.7" - dependencies: - "@babel/helper-plugin-utils": "npm:^7.24.7" - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: 10c0/b82c53e095274ee71c248551352d73441cf65b3b3fc0107258ba4e9aef7090772a425442b3ed1c396fa207d0efafde8929c87a17d3c885b3ca2021316e87e246 - languageName: node - linkType: hard - -"@babel/plugin-syntax-import-attributes@npm:7.24.7, @babel/plugin-syntax-import-attributes@npm:^7.24.7": +"@babel/plugin-syntax-import-attributes@npm:7.24.7": version: 7.24.7 resolution: "@babel/plugin-syntax-import-attributes@npm:7.24.7" dependencies: @@ -1483,113 +1629,14 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-syntax-import-meta@npm:^7.10.4": - version: 7.10.4 - resolution: "@babel/plugin-syntax-import-meta@npm:7.10.4" - dependencies: - "@babel/helper-plugin-utils": "npm:^7.10.4" - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: 10c0/0b08b5e4c3128523d8e346f8cfc86824f0da2697b1be12d71af50a31aff7a56ceb873ed28779121051475010c28d6146a6bfea8518b150b71eeb4e46190172ee - languageName: node - linkType: hard - -"@babel/plugin-syntax-json-strings@npm:^7.8.3": - version: 7.8.3 - resolution: "@babel/plugin-syntax-json-strings@npm:7.8.3" - dependencies: - "@babel/helper-plugin-utils": "npm:^7.8.0" - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: 10c0/e98f31b2ec406c57757d115aac81d0336e8434101c224edd9a5c93cefa53faf63eacc69f3138960c8b25401315af03df37f68d316c151c4b933136716ed6906e - languageName: node - linkType: hard - -"@babel/plugin-syntax-logical-assignment-operators@npm:^7.10.4": - version: 7.10.4 - resolution: "@babel/plugin-syntax-logical-assignment-operators@npm:7.10.4" - dependencies: - "@babel/helper-plugin-utils": "npm:^7.10.4" - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: 10c0/2594cfbe29411ad5bc2ad4058de7b2f6a8c5b86eda525a993959438615479e59c012c14aec979e538d60a584a1a799b60d1b8942c3b18468cb9d99b8fd34cd0b - languageName: node - linkType: hard - -"@babel/plugin-syntax-nullish-coalescing-operator@npm:^7.8.3": - version: 7.8.3 - resolution: "@babel/plugin-syntax-nullish-coalescing-operator@npm:7.8.3" - dependencies: - "@babel/helper-plugin-utils": "npm:^7.8.0" - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: 10c0/2024fbb1162899094cfc81152449b12bd0cc7053c6d4bda8ac2852545c87d0a851b1b72ed9560673cbf3ef6248257262c3c04aabf73117215c1b9cc7dd2542ce - languageName: node - linkType: hard - -"@babel/plugin-syntax-numeric-separator@npm:^7.10.4": - version: 7.10.4 - resolution: "@babel/plugin-syntax-numeric-separator@npm:7.10.4" +"@babel/plugin-syntax-import-attributes@npm:7.26.0, @babel/plugin-syntax-import-attributes@npm:^7.26.0": + version: 7.26.0 + resolution: "@babel/plugin-syntax-import-attributes@npm:7.26.0" dependencies: - "@babel/helper-plugin-utils": "npm:^7.10.4" - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: 10c0/c55a82b3113480942c6aa2fcbe976ff9caa74b7b1109ff4369641dfbc88d1da348aceb3c31b6ed311c84d1e7c479440b961906c735d0ab494f688bf2fd5b9bb9 - languageName: node - linkType: hard - -"@babel/plugin-syntax-object-rest-spread@npm:^7.8.3": - version: 7.8.3 - resolution: "@babel/plugin-syntax-object-rest-spread@npm:7.8.3" - dependencies: - "@babel/helper-plugin-utils": "npm:^7.8.0" + "@babel/helper-plugin-utils": "npm:^7.25.9" peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 10c0/ee1eab52ea6437e3101a0a7018b0da698545230015fc8ab129d292980ec6dff94d265e9e90070e8ae5fed42f08f1622c14c94552c77bcac784b37f503a82ff26 - languageName: node - linkType: hard - -"@babel/plugin-syntax-optional-catch-binding@npm:^7.8.3": - version: 7.8.3 - resolution: "@babel/plugin-syntax-optional-catch-binding@npm:7.8.3" - dependencies: - "@babel/helper-plugin-utils": "npm:^7.8.0" - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: 10c0/27e2493ab67a8ea6d693af1287f7e9acec206d1213ff107a928e85e173741e1d594196f99fec50e9dde404b09164f39dec5864c767212154ffe1caa6af0bc5af - languageName: node - linkType: hard - -"@babel/plugin-syntax-optional-chaining@npm:^7.8.3": - version: 7.8.3 - resolution: "@babel/plugin-syntax-optional-chaining@npm:7.8.3" - dependencies: - "@babel/helper-plugin-utils": "npm:^7.8.0" - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: 10c0/46edddf2faa6ebf94147b8e8540dfc60a5ab718e2de4d01b2c0bdf250a4d642c2bd47cbcbb739febcb2bf75514dbcefad3c52208787994b8d0f8822490f55e81 - languageName: node - linkType: hard - -"@babel/plugin-syntax-private-property-in-object@npm:^7.14.5": - version: 7.14.5 - resolution: "@babel/plugin-syntax-private-property-in-object@npm:7.14.5" - dependencies: - "@babel/helper-plugin-utils": "npm:^7.14.5" - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: 10c0/69822772561706c87f0a65bc92d0772cea74d6bc0911537904a676d5ff496a6d3ac4e05a166d8125fce4a16605bace141afc3611074e170a994e66e5397787f3 - languageName: node - linkType: hard - -"@babel/plugin-syntax-top-level-await@npm:^7.14.5": - version: 7.14.5 - resolution: "@babel/plugin-syntax-top-level-await@npm:7.14.5" - dependencies: - "@babel/helper-plugin-utils": "npm:^7.14.5" - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: 10c0/14bf6e65d5bc1231ffa9def5f0ef30b19b51c218fcecaa78cd1bdf7939dfdf23f90336080b7f5196916368e399934ce5d581492d8292b46a2fb569d8b2da106f + checksum: 10c0/e594c185b12bfe0bbe7ca78dfeebe870e6d569a12128cac86f3164a075fe0ff70e25ddbd97fd0782906b91f65560c9dc6957716b7b4a68aba2516c9b7455e352 languageName: node linkType: hard @@ -1605,701 +1652,685 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-transform-arrow-functions@npm:^7.24.7": - version: 7.24.7 - resolution: "@babel/plugin-transform-arrow-functions@npm:7.24.7" +"@babel/plugin-transform-arrow-functions@npm:^7.25.9": + version: 7.25.9 + resolution: "@babel/plugin-transform-arrow-functions@npm:7.25.9" dependencies: - "@babel/helper-plugin-utils": "npm:^7.24.7" + "@babel/helper-plugin-utils": "npm:^7.25.9" peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 10c0/6ac05a54e5582f34ac6d5dc26499e227227ec1c7fa6fc8de1f3d40c275f140d3907f79bbbd49304da2d7008a5ecafb219d0b71d78ee3290ca22020d878041245 + checksum: 10c0/851fef9f58be60a80f46cc0ce1e46a6f7346a6f9d50fa9e0fa79d46ec205320069d0cc157db213e2bea88ef5b7d9bd7618bb83f0b1996a836e2426c3a3a1f622 languageName: node linkType: hard -"@babel/plugin-transform-async-generator-functions@npm:7.25.0, @babel/plugin-transform-async-generator-functions@npm:^7.25.0": - version: 7.25.0 - resolution: "@babel/plugin-transform-async-generator-functions@npm:7.25.0" +"@babel/plugin-transform-async-generator-functions@npm:7.26.8, @babel/plugin-transform-async-generator-functions@npm:^7.26.8": + version: 7.26.8 + resolution: "@babel/plugin-transform-async-generator-functions@npm:7.26.8" dependencies: - "@babel/helper-plugin-utils": "npm:^7.24.8" - "@babel/helper-remap-async-to-generator": "npm:^7.25.0" - "@babel/plugin-syntax-async-generators": "npm:^7.8.4" - "@babel/traverse": "npm:^7.25.0" + "@babel/helper-plugin-utils": "npm:^7.26.5" + "@babel/helper-remap-async-to-generator": "npm:^7.25.9" + "@babel/traverse": "npm:^7.26.8" peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 10c0/5348c3a33d16e0d62f13482c6fa432185ba096d58880b08d42450f7db662d6b03e6149d495c8620897dcd3da35061068cbd6c09da7d0ec95743e55a788809e4e + checksum: 10c0/f6fefce963fe2e6268dde1958975d7adbce65fba94ca6f4bc554c90da03104ad1dd2e66d03bc0462da46868498428646e30b03a218ef0e5a84bfc87a7e375cec languageName: node linkType: hard -"@babel/plugin-transform-async-to-generator@npm:7.24.7, @babel/plugin-transform-async-to-generator@npm:^7.24.7": - version: 7.24.7 - resolution: "@babel/plugin-transform-async-to-generator@npm:7.24.7" +"@babel/plugin-transform-async-to-generator@npm:7.25.9, @babel/plugin-transform-async-to-generator@npm:^7.25.9": + version: 7.25.9 + resolution: "@babel/plugin-transform-async-to-generator@npm:7.25.9" dependencies: - "@babel/helper-module-imports": "npm:^7.24.7" - "@babel/helper-plugin-utils": "npm:^7.24.7" - "@babel/helper-remap-async-to-generator": "npm:^7.24.7" + "@babel/helper-module-imports": "npm:^7.25.9" + "@babel/helper-plugin-utils": "npm:^7.25.9" + "@babel/helper-remap-async-to-generator": "npm:^7.25.9" peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 10c0/83c82e243898875af8457972a26ab29baf8a2078768ee9f35141eb3edff0f84b165582a2ff73e90a9e08f5922bf813dbf15a85c1213654385198f4591c0dc45d + checksum: 10c0/c443d9e462ddef733ae56360064f32fc800105803d892e4ff32d7d6a6922b3765fa97b9ddc9f7f1d3f9d8c2d95721d85bef9dbf507804214c6cf6466b105c168 languageName: node linkType: hard -"@babel/plugin-transform-block-scoped-functions@npm:^7.24.7": - version: 7.24.7 - resolution: "@babel/plugin-transform-block-scoped-functions@npm:7.24.7" +"@babel/plugin-transform-block-scoped-functions@npm:^7.26.5": + version: 7.26.5 + resolution: "@babel/plugin-transform-block-scoped-functions@npm:7.26.5" dependencies: - "@babel/helper-plugin-utils": "npm:^7.24.7" + "@babel/helper-plugin-utils": "npm:^7.26.5" peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 10c0/113e86de4612ae91773ff5cb6b980f01e1da7e26ae6f6012127415d7ae144e74987bc23feb97f63ba4bc699331490ddea36eac004d76a20d5369e4cc6a7f61cd + checksum: 10c0/2f3060800ead46b09971dd7bf830d66383b7bc61ced9945633b4ef9bf87787956ea83fcf49b387cecb377812588c6b81681714c760f9cf89ecba45edcbab1192 languageName: node linkType: hard -"@babel/plugin-transform-block-scoping@npm:^7.25.0": - version: 7.25.0 - resolution: "@babel/plugin-transform-block-scoping@npm:7.25.0" +"@babel/plugin-transform-block-scoping@npm:^7.25.9": + version: 7.25.9 + resolution: "@babel/plugin-transform-block-scoping@npm:7.25.9" dependencies: - "@babel/helper-plugin-utils": "npm:^7.24.8" + "@babel/helper-plugin-utils": "npm:^7.25.9" peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 10c0/382931c75a5d0ea560387e76cb57b03461300527e4784efcb2fb62f36c1eb0ab331327b6034def256baa0cad9050925a61f9c0d56261b6afd6a29c3065fb0bd4 + checksum: 10c0/a76e30becb6c75b4d87a2cd53556fddb7c88ddd56bfadb965287fd944810ac159aa8eb5705366fc37336041f63154ed9fab3862fb10482a45bf5ede63fd55fda languageName: node linkType: hard -"@babel/plugin-transform-class-properties@npm:^7.24.7": - version: 7.24.7 - resolution: "@babel/plugin-transform-class-properties@npm:7.24.7" +"@babel/plugin-transform-class-properties@npm:^7.25.9": + version: 7.25.9 + resolution: "@babel/plugin-transform-class-properties@npm:7.25.9" dependencies: - "@babel/helper-create-class-features-plugin": "npm:^7.24.7" - "@babel/helper-plugin-utils": "npm:^7.24.7" + "@babel/helper-create-class-features-plugin": "npm:^7.25.9" + "@babel/helper-plugin-utils": "npm:^7.25.9" peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 10c0/75018a466c7ede3d2397e158891c224ba7fca72864506ce067ddbc02fc65191d44da4d6379c996d0c7f09019e26b5c3f5f1d3a639cd98366519723886f0689d0 + checksum: 10c0/f0603b6bd34d8ba62c03fc0572cb8bbc75874d097ac20cc7c5379e001081210a84dba1749e7123fca43b978382f605bb9973c99caf2c5b4c492d5c0a4a441150 languageName: node linkType: hard -"@babel/plugin-transform-class-static-block@npm:^7.24.7": - version: 7.24.7 - resolution: "@babel/plugin-transform-class-static-block@npm:7.24.7" +"@babel/plugin-transform-class-static-block@npm:^7.26.0": + version: 7.26.0 + resolution: "@babel/plugin-transform-class-static-block@npm:7.26.0" dependencies: - "@babel/helper-create-class-features-plugin": "npm:^7.24.7" - "@babel/helper-plugin-utils": "npm:^7.24.7" - "@babel/plugin-syntax-class-static-block": "npm:^7.14.5" + "@babel/helper-create-class-features-plugin": "npm:^7.25.9" + "@babel/helper-plugin-utils": "npm:^7.25.9" peerDependencies: "@babel/core": ^7.12.0 - checksum: 10c0/b0ade39a3d09dce886f79dbd5907c3d99b48167eddb6b9bbde24a0598129654d7017e611c20494cdbea48b07ac14397cd97ea34e3754bbb2abae4e698128eccb + checksum: 10c0/cdcf5545ae6514ed75fbd73cccfa209c6a5dfdf0c2bb7bb62c0fb4ec334a32281bcf1bc16ace494d9dbe93feb8bdc0bd3cf9d9ccb6316e634a67056fa13b741b languageName: node linkType: hard -"@babel/plugin-transform-classes@npm:^7.25.0": - version: 7.25.0 - resolution: "@babel/plugin-transform-classes@npm:7.25.0" +"@babel/plugin-transform-classes@npm:^7.25.9": + version: 7.25.9 + resolution: "@babel/plugin-transform-classes@npm:7.25.9" dependencies: - "@babel/helper-annotate-as-pure": "npm:^7.24.7" - "@babel/helper-compilation-targets": "npm:^7.24.8" - "@babel/helper-plugin-utils": "npm:^7.24.8" - "@babel/helper-replace-supers": "npm:^7.25.0" - "@babel/traverse": "npm:^7.25.0" + "@babel/helper-annotate-as-pure": "npm:^7.25.9" + "@babel/helper-compilation-targets": "npm:^7.25.9" + "@babel/helper-plugin-utils": "npm:^7.25.9" + "@babel/helper-replace-supers": "npm:^7.25.9" + "@babel/traverse": "npm:^7.25.9" globals: "npm:^11.1.0" peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 10c0/4451dccf8a7979427ae042afe381233f30764a8072faf0de1337a4fc297c6d7cb40df9e28931ac096e5b56392d0cd97d3ce10aee68288150a8701624d362a791 + checksum: 10c0/02742ea7cd25be286c982e672619effca528d7a931626a6f3d6cea11852951b7ee973276127eaf6418ac0e18c4d749a16b520709c707e86a67012bd23ff2927d languageName: node linkType: hard -"@babel/plugin-transform-computed-properties@npm:^7.24.7": - version: 7.24.7 - resolution: "@babel/plugin-transform-computed-properties@npm:7.24.7" +"@babel/plugin-transform-computed-properties@npm:^7.25.9": + version: 7.25.9 + resolution: "@babel/plugin-transform-computed-properties@npm:7.25.9" dependencies: - "@babel/helper-plugin-utils": "npm:^7.24.7" - "@babel/template": "npm:^7.24.7" + "@babel/helper-plugin-utils": "npm:^7.25.9" + "@babel/template": "npm:^7.25.9" peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 10c0/25636dbc1f605c0b8bc60aa58628a916b689473d11551c9864a855142e36742fe62d4a70400ba3b74902338e77fb3d940376c0a0ba154b6b7ec5367175233b49 + checksum: 10c0/948c0ae3ce0ba2375241d122a9bc7cda4a7ac8110bd8a62cd804bc46a5fdb7a7a42c7799c4cd972e14e0a579d2bd0999b92e53177b73f240bb0d4b09972c758b languageName: node linkType: hard -"@babel/plugin-transform-destructuring@npm:^7.24.8": - version: 7.24.8 - resolution: "@babel/plugin-transform-destructuring@npm:7.24.8" +"@babel/plugin-transform-destructuring@npm:^7.25.9": + version: 7.25.9 + resolution: "@babel/plugin-transform-destructuring@npm:7.25.9" dependencies: - "@babel/helper-plugin-utils": "npm:^7.24.8" + "@babel/helper-plugin-utils": "npm:^7.25.9" peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 10c0/804968c1d5f5072c717505296c1e5d5ec33e90550423de66de82bbcb78157156e8470bbe77a04ab8c710a88a06360a30103cf223ac7eff4829adedd6150de5ce + checksum: 10c0/7beec5fda665d108f69d5023aa7c298a1e566b973dd41290faa18aeea70f6f571295c1ece0a058f3ceb6c6c96de76de7cd34f5a227fbf09a1b8d8a735d28ca49 languageName: node linkType: hard -"@babel/plugin-transform-dotall-regex@npm:^7.24.7": - version: 7.24.7 - resolution: "@babel/plugin-transform-dotall-regex@npm:7.24.7" +"@babel/plugin-transform-dotall-regex@npm:^7.25.9": + version: 7.25.9 + resolution: "@babel/plugin-transform-dotall-regex@npm:7.25.9" dependencies: - "@babel/helper-create-regexp-features-plugin": "npm:^7.24.7" - "@babel/helper-plugin-utils": "npm:^7.24.7" + "@babel/helper-create-regexp-features-plugin": "npm:^7.25.9" + "@babel/helper-plugin-utils": "npm:^7.25.9" peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 10c0/793f14c9494972d294b7e7b97b747f47874b6d57d7804d3443c701becf5db192c9311be6a1835c07664486df1f5c60d33196c36fb7e11a53015e476b4c145b33 + checksum: 10c0/7c3471ae5cf7521fd8da5b03e137e8d3733fc5ee4524ce01fb0c812f0bb77cb2c9657bc8a6253186be3a15bb4caa8974993c7ddc067f554ecc6a026f0a3b5e12 languageName: node linkType: hard -"@babel/plugin-transform-duplicate-keys@npm:^7.24.7": - version: 7.24.7 - resolution: "@babel/plugin-transform-duplicate-keys@npm:7.24.7" +"@babel/plugin-transform-duplicate-keys@npm:^7.25.9": + version: 7.25.9 + resolution: "@babel/plugin-transform-duplicate-keys@npm:7.25.9" dependencies: - "@babel/helper-plugin-utils": "npm:^7.24.7" + "@babel/helper-plugin-utils": "npm:^7.25.9" peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 10c0/75ff7ec1117ac500e77bf20a144411d39c0fdd038f108eec061724123ce6d1bb8d5bd27968e466573ee70014f8be0043361cdb0ef388f8a182d1d97ad67e51b9 + checksum: 10c0/d0c74894b9bf6ff2a04189afffb9cd43d87ebd7b7943e51a827c92d2aaa40fa89ac81565a2fd6fbeabf9e38413a9264c45862eee2b017f1d49046cc3c8ff06b4 languageName: node linkType: hard -"@babel/plugin-transform-duplicate-named-capturing-groups-regex@npm:^7.25.0": - version: 7.25.0 - resolution: "@babel/plugin-transform-duplicate-named-capturing-groups-regex@npm:7.25.0" +"@babel/plugin-transform-duplicate-named-capturing-groups-regex@npm:^7.25.9": + version: 7.25.9 + resolution: "@babel/plugin-transform-duplicate-named-capturing-groups-regex@npm:7.25.9" dependencies: - "@babel/helper-create-regexp-features-plugin": "npm:^7.25.0" - "@babel/helper-plugin-utils": "npm:^7.24.8" + "@babel/helper-create-regexp-features-plugin": "npm:^7.25.9" + "@babel/helper-plugin-utils": "npm:^7.25.9" peerDependencies: "@babel/core": ^7.0.0 - checksum: 10c0/1c9b57ddd9b33696e88911d0e7975e1573ebc46219c4b30eb1dc746cbb71aedfac6f6dab7fdfdec54dd58f31468bf6ab56b157661ea4ffe58f906d71f89544c8 + checksum: 10c0/a8039a6d2b90e011c7b30975edee47b5b1097cf3c2f95ec1f5ddd029898d783a995f55f7d6eb8d6bb8873c060fb64f9f1ccba938dfe22d118d09cf68e0cd3bf6 languageName: node linkType: hard -"@babel/plugin-transform-dynamic-import@npm:^7.24.7": - version: 7.24.7 - resolution: "@babel/plugin-transform-dynamic-import@npm:7.24.7" +"@babel/plugin-transform-dynamic-import@npm:^7.25.9": + version: 7.25.9 + resolution: "@babel/plugin-transform-dynamic-import@npm:7.25.9" dependencies: - "@babel/helper-plugin-utils": "npm:^7.24.7" - "@babel/plugin-syntax-dynamic-import": "npm:^7.8.3" + "@babel/helper-plugin-utils": "npm:^7.25.9" peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 10c0/eeda48372efd0a5103cb22dadb13563c975bce18ae85daafbb47d57bb9665d187da9d4fe8d07ac0a6e1288afcfcb73e4e5618bf75ff63fddf9736bfbf225203b + checksum: 10c0/5e643a8209072b668350f5788f23c64e9124f81f958b595c80fecca6561086d8ef346c04391b9e5e4cad8b8cbe22c258f0cd5f4ea89b97e74438e7d1abfd98cf languageName: node linkType: hard -"@babel/plugin-transform-exponentiation-operator@npm:^7.24.7": - version: 7.24.7 - resolution: "@babel/plugin-transform-exponentiation-operator@npm:7.24.7" +"@babel/plugin-transform-exponentiation-operator@npm:^7.26.3": + version: 7.26.3 + resolution: "@babel/plugin-transform-exponentiation-operator@npm:7.26.3" dependencies: - "@babel/helper-builder-binary-assignment-operator-visitor": "npm:^7.24.7" - "@babel/helper-plugin-utils": "npm:^7.24.7" + "@babel/helper-plugin-utils": "npm:^7.25.9" peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 10c0/ace3e11c94041b88848552ba8feb39ae4d6cad3696d439ff51445bd2882d8b8775d85a26c2c0edb9b5e38c9e6013cc11b0dea89ec8f93c7d9d7ee95e3645078c + checksum: 10c0/cac922e851c6a0831fdd2e3663564966916015aeff7f4485825fc33879cbc3a313ceb859814c9200248e2875d65bb13802a723e5d7d7b40a2e90da82a5a1e15c languageName: node linkType: hard -"@babel/plugin-transform-export-namespace-from@npm:^7.24.7": - version: 7.24.7 - resolution: "@babel/plugin-transform-export-namespace-from@npm:7.24.7" +"@babel/plugin-transform-export-namespace-from@npm:^7.25.9": + version: 7.25.9 + resolution: "@babel/plugin-transform-export-namespace-from@npm:7.25.9" dependencies: - "@babel/helper-plugin-utils": "npm:^7.24.7" - "@babel/plugin-syntax-export-namespace-from": "npm:^7.8.3" + "@babel/helper-plugin-utils": "npm:^7.25.9" peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 10c0/4e144d7f1c57bc63b4899dbbbdfed0880f2daa75ea9c7251c7997f106e4b390dc362175ab7830f11358cb21f6b972ca10a43a2e56cd789065f7606b082674c0c + checksum: 10c0/f291ea2ec5f36de9028a00cbd5b32f08af281b8183bf047200ff001f4cb260be56f156b2449f42149448a4a033bd6e86a3a7f06d0c2825532eb0ae6b03058dfb languageName: node linkType: hard -"@babel/plugin-transform-for-of@npm:^7.24.7": - version: 7.24.7 - resolution: "@babel/plugin-transform-for-of@npm:7.24.7" +"@babel/plugin-transform-for-of@npm:^7.26.9": + version: 7.26.9 + resolution: "@babel/plugin-transform-for-of@npm:7.26.9" dependencies: - "@babel/helper-plugin-utils": "npm:^7.24.7" - "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.24.7" + "@babel/helper-plugin-utils": "npm:^7.26.5" + "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.25.9" peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 10c0/77629b1173e55d07416f05ba7353caa09d2c2149da2ca26721ab812209b63689d1be45116b68eadc011c49ced59daf5320835b15245eb7ae93ae0c5e8277cfc0 + checksum: 10c0/e28a521521cf9f84ddd69ca8da7c89fb9f7aa38e4dea35742fe973e4e1d7c23f9cee1a4861a2fdd9e9f18ff945886a44d7335cea1c603b96bfcb1c7c8791ef09 languageName: node linkType: hard -"@babel/plugin-transform-function-name@npm:^7.25.1": - version: 7.25.1 - resolution: "@babel/plugin-transform-function-name@npm:7.25.1" +"@babel/plugin-transform-function-name@npm:^7.25.9": + version: 7.25.9 + resolution: "@babel/plugin-transform-function-name@npm:7.25.9" dependencies: - "@babel/helper-compilation-targets": "npm:^7.24.8" - "@babel/helper-plugin-utils": "npm:^7.24.8" - "@babel/traverse": "npm:^7.25.1" + "@babel/helper-compilation-targets": "npm:^7.25.9" + "@babel/helper-plugin-utils": "npm:^7.25.9" + "@babel/traverse": "npm:^7.25.9" peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 10c0/e74912174d5e33d1418b840443c2e226a7b76cc017c1ed20ee30a566e4f1794d4a123be03180da046241576e8b692731807ba1f52608922acf1cb2cb6957593f + checksum: 10c0/8e67fbd1dd367927b8b6afdf0a6e7cb3a3fd70766c52f700ca77428b6d536f6c9d7ec643e7762d64b23093233765c66bffa40e31aabe6492682879bcb45423e1 languageName: node linkType: hard -"@babel/plugin-transform-json-strings@npm:^7.24.7": - version: 7.24.7 - resolution: "@babel/plugin-transform-json-strings@npm:7.24.7" +"@babel/plugin-transform-json-strings@npm:^7.25.9": + version: 7.25.9 + resolution: "@babel/plugin-transform-json-strings@npm:7.25.9" dependencies: - "@babel/helper-plugin-utils": "npm:^7.24.7" - "@babel/plugin-syntax-json-strings": "npm:^7.8.3" + "@babel/helper-plugin-utils": "npm:^7.25.9" peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 10c0/17c72cd5bf3e90e722aabd333559275f3309e3fa0b9cea8c2944ab83ae01502c71a2be05da5101edc02b3fc8df15a8dbb9b861cbfcc8a52bf5e797cf01d3a40a + checksum: 10c0/00bc2d4751dfc9d44ab725be16ee534de13cfd7e77dfb386e5dac9e48101ce8fcbc5971df919dc25b3f8a0fa85d6dc5f2a0c3cf7ec9d61c163d9823c091844f0 languageName: node linkType: hard -"@babel/plugin-transform-literals@npm:^7.25.2": - version: 7.25.2 - resolution: "@babel/plugin-transform-literals@npm:7.25.2" +"@babel/plugin-transform-literals@npm:^7.25.9": + version: 7.25.9 + resolution: "@babel/plugin-transform-literals@npm:7.25.9" dependencies: - "@babel/helper-plugin-utils": "npm:^7.24.8" + "@babel/helper-plugin-utils": "npm:^7.25.9" peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 10c0/0796883217b0885d37e7f6d350773be349e469a812b6bf11ccf862a6edf65103d3e7c849529d65381b441685c12e756751d8c2489a0fd3f8139bb5ef93185f58 + checksum: 10c0/00b14e9c14cf1e871c1f3781bf6334cac339c360404afd6aba63d2f6aca9270854d59a2b40abff1c4c90d4ffdca614440842d3043316c2f0ceb155fdf7726b3b languageName: node linkType: hard -"@babel/plugin-transform-logical-assignment-operators@npm:^7.24.7": - version: 7.24.7 - resolution: "@babel/plugin-transform-logical-assignment-operators@npm:7.24.7" +"@babel/plugin-transform-logical-assignment-operators@npm:^7.25.9": + version: 7.25.9 + resolution: "@babel/plugin-transform-logical-assignment-operators@npm:7.25.9" dependencies: - "@babel/helper-plugin-utils": "npm:^7.24.7" - "@babel/plugin-syntax-logical-assignment-operators": "npm:^7.10.4" + "@babel/helper-plugin-utils": "npm:^7.25.9" peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 10c0/dbe882eb9053931f2ab332c50fc7c2a10ef507d6421bd9831adbb4cb7c9f8e1e5fbac4fbd2e007f6a1bf1df1843547559434012f118084dc0bf42cda3b106272 + checksum: 10c0/6e2051e10b2d6452980fc4bdef9da17c0d6ca48f81b8529e8804b031950e4fff7c74a7eb3de4a2b6ad22ffb631d0b67005425d232cce6e2b29ce861c78ed04f5 languageName: node linkType: hard -"@babel/plugin-transform-member-expression-literals@npm:^7.24.7": - version: 7.24.7 - resolution: "@babel/plugin-transform-member-expression-literals@npm:7.24.7" +"@babel/plugin-transform-member-expression-literals@npm:^7.25.9": + version: 7.25.9 + resolution: "@babel/plugin-transform-member-expression-literals@npm:7.25.9" dependencies: - "@babel/helper-plugin-utils": "npm:^7.24.7" + "@babel/helper-plugin-utils": "npm:^7.25.9" peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 10c0/e789ae359bdf2d20e90bedef18dfdbd965c9ebae1cee398474a0c349590fda7c8b874e1a2ceee62e47e5e6ec1730e76b0f24e502164357571854271fc12cc684 + checksum: 10c0/91d17b451bcc5ea9f1c6f8264144057ade3338d4b92c0b248366e4db3a7790a28fd59cc56ac433a9627a9087a17a5684e53f4995dd6ae92831cb72f1bd540b54 languageName: node linkType: hard -"@babel/plugin-transform-modules-amd@npm:^7.24.7": - version: 7.24.7 - resolution: "@babel/plugin-transform-modules-amd@npm:7.24.7" +"@babel/plugin-transform-modules-amd@npm:^7.25.9": + version: 7.25.9 + resolution: "@babel/plugin-transform-modules-amd@npm:7.25.9" dependencies: - "@babel/helper-module-transforms": "npm:^7.24.7" - "@babel/helper-plugin-utils": "npm:^7.24.7" + "@babel/helper-module-transforms": "npm:^7.25.9" + "@babel/helper-plugin-utils": "npm:^7.25.9" peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 10c0/6df7de7fce34117ca4b2fa07949b12274c03668cbfe21481c4037b6300796d50ae40f4f170527b61b70a67f26db906747797e30dbd0d9809a441b6e220b5728f + checksum: 10c0/849957d9484d0a2d93331226ed6cf840cee7d57454549534c447c93f8b839ef8553eae9877f8f550e3c39f14d60992f91244b2e8e7502a46064b56c5d68ba855 languageName: node linkType: hard -"@babel/plugin-transform-modules-commonjs@npm:^7.24.8": - version: 7.24.8 - resolution: "@babel/plugin-transform-modules-commonjs@npm:7.24.8" +"@babel/plugin-transform-modules-commonjs@npm:^7.26.3": + version: 7.26.3 + resolution: "@babel/plugin-transform-modules-commonjs@npm:7.26.3" dependencies: - "@babel/helper-module-transforms": "npm:^7.24.8" - "@babel/helper-plugin-utils": "npm:^7.24.8" - "@babel/helper-simple-access": "npm:^7.24.7" + "@babel/helper-module-transforms": "npm:^7.26.0" + "@babel/helper-plugin-utils": "npm:^7.25.9" peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 10c0/f1cf552307ebfced20d3907c1dd8be941b277f0364aa655e2b5fee828c84c54065745183104dae86f1f93ea0406db970a463ef7ceaaed897623748e99640e5a7 + checksum: 10c0/82e59708f19f36da29531a64a7a94eabbf6ff46a615e0f5d9b49f3f59e8ef10e2bac607d749091508d3fa655146c9e5647c3ffeca781060cdabedb4c7a33c6f2 languageName: node linkType: hard -"@babel/plugin-transform-modules-systemjs@npm:^7.25.0": - version: 7.25.0 - resolution: "@babel/plugin-transform-modules-systemjs@npm:7.25.0" +"@babel/plugin-transform-modules-systemjs@npm:^7.25.9": + version: 7.25.9 + resolution: "@babel/plugin-transform-modules-systemjs@npm:7.25.9" dependencies: - "@babel/helper-module-transforms": "npm:^7.25.0" - "@babel/helper-plugin-utils": "npm:^7.24.8" - "@babel/helper-validator-identifier": "npm:^7.24.7" - "@babel/traverse": "npm:^7.25.0" + "@babel/helper-module-transforms": "npm:^7.25.9" + "@babel/helper-plugin-utils": "npm:^7.25.9" + "@babel/helper-validator-identifier": "npm:^7.25.9" + "@babel/traverse": "npm:^7.25.9" peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 10c0/fca6198da71237e4bb1274b3b67a0c81d56013c9535361242b6bfa87d70a9597854aadb45d4d8203369be4a655e158be2a5d20af0040b1f8d1bfc47db3ad7b68 + checksum: 10c0/8299e3437542129c2684b86f98408c690df27db4122a79edded4782cf04e755d6ecb05b1e812c81a34224a81e664303392d5f3c36f3d2d51fdc99bb91c881e9a languageName: node linkType: hard -"@babel/plugin-transform-modules-umd@npm:^7.24.7": - version: 7.24.7 - resolution: "@babel/plugin-transform-modules-umd@npm:7.24.7" +"@babel/plugin-transform-modules-umd@npm:^7.25.9": + version: 7.25.9 + resolution: "@babel/plugin-transform-modules-umd@npm:7.25.9" dependencies: - "@babel/helper-module-transforms": "npm:^7.24.7" - "@babel/helper-plugin-utils": "npm:^7.24.7" + "@babel/helper-module-transforms": "npm:^7.25.9" + "@babel/helper-plugin-utils": "npm:^7.25.9" peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 10c0/7791d290121db210e4338b94b4a069a1a79e4c7a8d7638d8159a97b281851bbed3048dac87a4ae718ad963005e6c14a5d28e6db2eeb2b04e031cee92fb312f85 + checksum: 10c0/fa11a621f023e2ac437b71d5582f819e667c94306f022583d77da9a8f772c4128861a32bbb63bef5cba581a70cd7dbe87a37238edaafcfacf889470c395e7076 languageName: node linkType: hard -"@babel/plugin-transform-named-capturing-groups-regex@npm:^7.24.7": - version: 7.24.7 - resolution: "@babel/plugin-transform-named-capturing-groups-regex@npm:7.24.7" +"@babel/plugin-transform-named-capturing-groups-regex@npm:^7.25.9": + version: 7.25.9 + resolution: "@babel/plugin-transform-named-capturing-groups-regex@npm:7.25.9" dependencies: - "@babel/helper-create-regexp-features-plugin": "npm:^7.24.7" - "@babel/helper-plugin-utils": "npm:^7.24.7" + "@babel/helper-create-regexp-features-plugin": "npm:^7.25.9" + "@babel/helper-plugin-utils": "npm:^7.25.9" peerDependencies: "@babel/core": ^7.0.0 - checksum: 10c0/41a0b0f2d0886318237440aa3b489f6d0305361d8671121777d9ff89f9f6de9d0c02ce93625049061426c8994064ef64deae8b819d1b14c00374a6a2336fb5d9 + checksum: 10c0/32b14fda5c885d1706863f8af2ee6c703d39264355b57482d3a24fce7f6afbd4c7a0896e501c0806ed2b0759beb621bf7f3f7de1fbbc82026039a98d961e78ef languageName: node linkType: hard -"@babel/plugin-transform-new-target@npm:^7.24.7": - version: 7.24.7 - resolution: "@babel/plugin-transform-new-target@npm:7.24.7" +"@babel/plugin-transform-new-target@npm:^7.25.9": + version: 7.25.9 + resolution: "@babel/plugin-transform-new-target@npm:7.25.9" dependencies: - "@babel/helper-plugin-utils": "npm:^7.24.7" + "@babel/helper-plugin-utils": "npm:^7.25.9" peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 10c0/2540808a35e1a978e537334c43dab439cf24c93e7beb213a2e71902f6710e60e0184316643790c0a6644e7a8021e52f7ab8165e6b3e2d6651be07bdf517b67df + checksum: 10c0/7b5f1b7998f1cf183a7fa646346e2f3742e5805b609f28ad5fee22d666a15010f3e398b7e1ab78cddb7901841a3d3f47135929af23d54e8bf4ce69b72051f71e languageName: node linkType: hard -"@babel/plugin-transform-nullish-coalescing-operator@npm:^7.24.7": - version: 7.24.7 - resolution: "@babel/plugin-transform-nullish-coalescing-operator@npm:7.24.7" +"@babel/plugin-transform-nullish-coalescing-operator@npm:^7.26.6": + version: 7.26.6 + resolution: "@babel/plugin-transform-nullish-coalescing-operator@npm:7.26.6" dependencies: - "@babel/helper-plugin-utils": "npm:^7.24.7" - "@babel/plugin-syntax-nullish-coalescing-operator": "npm:^7.8.3" + "@babel/helper-plugin-utils": "npm:^7.26.5" peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 10c0/7243c8ff734ed5ef759dd8768773c4b443c12e792727e759a1aec2c7fa2bfdd24f1ecb42e292a7b3d8bd3d7f7b861cf256a8eb4ba144fc9cc463892c303083d9 + checksum: 10c0/574d6db7cbc5c092db5d1dece8ce26195e642b9c40dbfeaf3082058a78ad7959c1c333471cdd45f38b784ec488850548075d527b178c5010ee9bff7aa527cc7a languageName: node linkType: hard -"@babel/plugin-transform-numeric-separator@npm:^7.24.7": - version: 7.24.7 - resolution: "@babel/plugin-transform-numeric-separator@npm:7.24.7" +"@babel/plugin-transform-numeric-separator@npm:^7.25.9": + version: 7.25.9 + resolution: "@babel/plugin-transform-numeric-separator@npm:7.25.9" dependencies: - "@babel/helper-plugin-utils": "npm:^7.24.7" - "@babel/plugin-syntax-numeric-separator": "npm:^7.10.4" + "@babel/helper-plugin-utils": "npm:^7.25.9" peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 10c0/e18e09ca5a6342645d00ede477731aa6e8714ff357efc9d7cda5934f1703b3b6fb7d3298dce3ce3ba53e9ff1158eab8f1aadc68874cc21a6099d33a1ca457789 + checksum: 10c0/ad63ad341977844b6f9535fcca15ca0d6d6ad112ed9cc509d4f6b75e9bf4b1b1a96a0bcb1986421a601505d34025373608b5f76d420d924b4e21f86b1a1f2749 languageName: node linkType: hard -"@babel/plugin-transform-object-rest-spread@npm:^7.24.7": - version: 7.24.7 - resolution: "@babel/plugin-transform-object-rest-spread@npm:7.24.7" +"@babel/plugin-transform-object-rest-spread@npm:^7.25.9": + version: 7.25.9 + resolution: "@babel/plugin-transform-object-rest-spread@npm:7.25.9" dependencies: - "@babel/helper-compilation-targets": "npm:^7.24.7" - "@babel/helper-plugin-utils": "npm:^7.24.7" - "@babel/plugin-syntax-object-rest-spread": "npm:^7.8.3" - "@babel/plugin-transform-parameters": "npm:^7.24.7" + "@babel/helper-compilation-targets": "npm:^7.25.9" + "@babel/helper-plugin-utils": "npm:^7.25.9" + "@babel/plugin-transform-parameters": "npm:^7.25.9" peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 10c0/9ad64bc003f583030f9da50614b485852f8edac93f8faf5d1cd855201a4852f37c5255ae4daf70dd4375bdd4874e16e39b91f680d4668ec219ba05441ce286eb + checksum: 10c0/02077d8abd83bf6a48ff0b59e98d7561407cf75b591cffd3fdc5dc5e9a13dec1c847a7a690983762a3afecddb244831e897e0515c293e7c653b262c30cd614af languageName: node linkType: hard -"@babel/plugin-transform-object-super@npm:^7.24.7": - version: 7.24.7 - resolution: "@babel/plugin-transform-object-super@npm:7.24.7" +"@babel/plugin-transform-object-super@npm:^7.25.9": + version: 7.25.9 + resolution: "@babel/plugin-transform-object-super@npm:7.25.9" dependencies: - "@babel/helper-plugin-utils": "npm:^7.24.7" - "@babel/helper-replace-supers": "npm:^7.24.7" + "@babel/helper-plugin-utils": "npm:^7.25.9" + "@babel/helper-replace-supers": "npm:^7.25.9" peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 10c0/770cebb4b4e1872c216b17069db9a13b87dfee747d359dc56d9fcdd66e7544f92dc6ab1861a4e7e0528196aaff2444e4f17dc84efd8eaf162d542b4ba0943869 + checksum: 10c0/0348d00e76f1f15ada44481a76e8c923d24cba91f6e49ee9b30d6861eb75344e7f84d62a18df8a6f9e9a7eacf992f388174b7f9cc4ce48287bcefca268c07600 languageName: node linkType: hard -"@babel/plugin-transform-optional-catch-binding@npm:^7.24.7": - version: 7.24.7 - resolution: "@babel/plugin-transform-optional-catch-binding@npm:7.24.7" +"@babel/plugin-transform-optional-catch-binding@npm:^7.25.9": + version: 7.25.9 + resolution: "@babel/plugin-transform-optional-catch-binding@npm:7.25.9" dependencies: - "@babel/helper-plugin-utils": "npm:^7.24.7" - "@babel/plugin-syntax-optional-catch-binding": "npm:^7.8.3" + "@babel/helper-plugin-utils": "npm:^7.25.9" peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 10c0/1e2f10a018f7d03b3bde6c0b70d063df8d5dd5209861d4467726cf834f5e3d354e2276079dc226aa8e6ece35f5c9b264d64b8229a8bb232829c01e561bcfb07a + checksum: 10c0/722fd5ee12ab905309d4e84421584fce4b6d9e6b639b06afb20b23fa809e6ab251e908a8d5e8b14d066a28186b8ef8f58d69fd6eca9ce1b9ef7af08333378f6c languageName: node linkType: hard -"@babel/plugin-transform-optional-chaining@npm:^7.24.7, @babel/plugin-transform-optional-chaining@npm:^7.24.8": - version: 7.24.8 - resolution: "@babel/plugin-transform-optional-chaining@npm:7.24.8" +"@babel/plugin-transform-optional-chaining@npm:^7.25.9": + version: 7.25.9 + resolution: "@babel/plugin-transform-optional-chaining@npm:7.25.9" dependencies: - "@babel/helper-plugin-utils": "npm:^7.24.8" - "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.24.7" - "@babel/plugin-syntax-optional-chaining": "npm:^7.8.3" + "@babel/helper-plugin-utils": "npm:^7.25.9" + "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.25.9" peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 10c0/4ffbe1aad7dec7c9aa2bf6ceb4b2f91f96815b2784f2879bde80e46934f59d64a12cb2c6262e40897c4754d77d2c35d8a5cfed63044fdebf94978b1ed3d14b17 + checksum: 10c0/041ad2beae5affb8e68a0bcb6882a2dadb758db3c629a0e012f57488ab43a822ac1ea17a29db8ef36560a28262a5dfa4dbbbf06ed6e431db55abe024b7cd3961 languageName: node linkType: hard -"@babel/plugin-transform-parameters@npm:^7.24.7": - version: 7.24.7 - resolution: "@babel/plugin-transform-parameters@npm:7.24.7" +"@babel/plugin-transform-parameters@npm:^7.25.9": + version: 7.25.9 + resolution: "@babel/plugin-transform-parameters@npm:7.25.9" dependencies: - "@babel/helper-plugin-utils": "npm:^7.24.7" + "@babel/helper-plugin-utils": "npm:^7.25.9" peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 10c0/53bf190d6926771545d5184f1f5f3f5144d0f04f170799ad46a43f683a01fab8d5fe4d2196cf246774530990c31fe1f2b9f0def39f0a5ddbb2340b924f5edf01 + checksum: 10c0/aecb446754b9e09d6b6fa95fd09e7cf682f8aaeed1d972874ba24c0a30a7e803ad5f014bb1fffc7bfeed22f93c0d200947407894ea59bf7687816f2f464f8df3 languageName: node linkType: hard -"@babel/plugin-transform-private-methods@npm:^7.24.7": - version: 7.24.7 - resolution: "@babel/plugin-transform-private-methods@npm:7.24.7" +"@babel/plugin-transform-private-methods@npm:^7.25.9": + version: 7.25.9 + resolution: "@babel/plugin-transform-private-methods@npm:7.25.9" dependencies: - "@babel/helper-create-class-features-plugin": "npm:^7.24.7" - "@babel/helper-plugin-utils": "npm:^7.24.7" + "@babel/helper-create-class-features-plugin": "npm:^7.25.9" + "@babel/helper-plugin-utils": "npm:^7.25.9" peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 10c0/5b7bf923b738fbe3ad6c33b260e0a7451be288edfe4ef516303fa787a1870cd87533bfbf61abb779c22ed003c2fc484dec2436fe75a48756f686c0241173d364 + checksum: 10c0/64bd71de93d39daefa3e6c878d6f2fd238ed7d4ecfb13b0e771ddbbc131487def3ceb405b62b534a5cbb5043046b504e1b189b0a45229cc75af979a9fbcaa7bd languageName: node linkType: hard -"@babel/plugin-transform-private-property-in-object@npm:^7.24.7": - version: 7.24.7 - resolution: "@babel/plugin-transform-private-property-in-object@npm:7.24.7" +"@babel/plugin-transform-private-property-in-object@npm:^7.25.9": + version: 7.25.9 + resolution: "@babel/plugin-transform-private-property-in-object@npm:7.25.9" dependencies: - "@babel/helper-annotate-as-pure": "npm:^7.24.7" - "@babel/helper-create-class-features-plugin": "npm:^7.24.7" - "@babel/helper-plugin-utils": "npm:^7.24.7" - "@babel/plugin-syntax-private-property-in-object": "npm:^7.14.5" + "@babel/helper-annotate-as-pure": "npm:^7.25.9" + "@babel/helper-create-class-features-plugin": "npm:^7.25.9" + "@babel/helper-plugin-utils": "npm:^7.25.9" peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 10c0/c6fa7defb90b1b0ed46f24ff94ff2e77f44c1f478d1090e81712f33cf992dda5ba347016f030082a2f770138bac6f4a9c2c1565e9f767a125901c77dd9c239ba + checksum: 10c0/d4965de19d9f204e692cc74dbc39f0bb469e5f29df96dd4457ea23c5e5596fba9d5af76eaa96f9d48a9fc20ec5f12a94c679285e36b8373406868ea228109e27 languageName: node linkType: hard -"@babel/plugin-transform-property-literals@npm:^7.24.7": - version: 7.24.7 - resolution: "@babel/plugin-transform-property-literals@npm:7.24.7" +"@babel/plugin-transform-property-literals@npm:^7.25.9": + version: 7.25.9 + resolution: "@babel/plugin-transform-property-literals@npm:7.25.9" dependencies: - "@babel/helper-plugin-utils": "npm:^7.24.7" + "@babel/helper-plugin-utils": "npm:^7.25.9" peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 10c0/52564b58f3d111dc02d241d5892a4b01512e98dfdf6ef11b0ed62f8b11b0acacccef0fc229b44114fe8d1a57a8b70780b11bdd18b807d3754a781a07d8f57433 + checksum: 10c0/1639e35b2438ccf3107af760d34e6a8e4f9acdd3ae6186ae771a6e3029bd59dfe778e502d67090f1185ecda5c16addfed77561e39c518a3f51ff10d41790e106 languageName: node linkType: hard -"@babel/plugin-transform-regenerator@npm:^7.24.7": - version: 7.24.7 - resolution: "@babel/plugin-transform-regenerator@npm:7.24.7" +"@babel/plugin-transform-regenerator@npm:^7.25.9": + version: 7.25.9 + resolution: "@babel/plugin-transform-regenerator@npm:7.25.9" dependencies: - "@babel/helper-plugin-utils": "npm:^7.24.7" + "@babel/helper-plugin-utils": "npm:^7.25.9" regenerator-transform: "npm:^0.15.2" peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 10c0/d2dc2c788fdae9d97217e70d46ba8ca9db0035c398dc3e161552b0c437113719a75c04f201f9c91ddc8d28a1da60d0b0853f616dead98a396abb9c845c44892b + checksum: 10c0/eef3ffc19f7d291b863635f32b896ad7f87806d9219a0d3404a470219abcfc5b43aabecd691026c48e875b965760d9c16abee25e6447272233f30cd07f453ec7 languageName: node linkType: hard -"@babel/plugin-transform-reserved-words@npm:^7.24.7": - version: 7.24.7 - resolution: "@babel/plugin-transform-reserved-words@npm:7.24.7" +"@babel/plugin-transform-regexp-modifiers@npm:^7.26.0": + version: 7.26.0 + resolution: "@babel/plugin-transform-regexp-modifiers@npm:7.26.0" dependencies: - "@babel/helper-plugin-utils": "npm:^7.24.7" + "@babel/helper-create-regexp-features-plugin": "npm:^7.25.9" + "@babel/helper-plugin-utils": "npm:^7.25.9" + peerDependencies: + "@babel/core": ^7.0.0 + checksum: 10c0/4abc1db6c964efafc7a927cda814c7275275afa4b530483e0936fd614de23cb5802f7ca43edaa402008a723d4e7eac282b6f5283aa2eeb3b27da6d6c1dd7f8ed + languageName: node + linkType: hard + +"@babel/plugin-transform-reserved-words@npm:^7.25.9": + version: 7.25.9 + resolution: "@babel/plugin-transform-reserved-words@npm:7.25.9" + dependencies: + "@babel/helper-plugin-utils": "npm:^7.25.9" peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 10c0/2229de2768615e7f5dc0bbc55bc121b5678fd6d2febd46c74a58e42bb894d74cd5955c805880f4e02d0e1cf94f6886270eda7fafc1be9305a1ec3b9fd1d063f5 + checksum: 10c0/8b028b80d1983e3e02f74e21924323cc66ba930e5c5758909a122aa7d80e341b8b0f42e1698e42b50d47a6ba911332f584200b28e1a4e2104b7514d9dc011e96 languageName: node linkType: hard -"@babel/plugin-transform-runtime@npm:7.24.7": - version: 7.24.7 - resolution: "@babel/plugin-transform-runtime@npm:7.24.7" +"@babel/plugin-transform-runtime@npm:7.26.10": + version: 7.26.10 + resolution: "@babel/plugin-transform-runtime@npm:7.26.10" dependencies: - "@babel/helper-module-imports": "npm:^7.24.7" - "@babel/helper-plugin-utils": "npm:^7.24.7" + "@babel/helper-module-imports": "npm:^7.25.9" + "@babel/helper-plugin-utils": "npm:^7.26.5" babel-plugin-polyfill-corejs2: "npm:^0.4.10" - babel-plugin-polyfill-corejs3: "npm:^0.10.1" + babel-plugin-polyfill-corejs3: "npm:^0.11.0" babel-plugin-polyfill-regenerator: "npm:^0.6.1" semver: "npm:^6.3.1" peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 10c0/a33f5095872bbba00b8ee553dfe6941477e69a017a2e65e9dd86e80dab5c627635093b796eb1eb22aaaf2f874704f63ad1d99b952b83b59ef6b368ae04e5bb41 + checksum: 10c0/4b70a63b904a3f7faa6ca95f9034d2f29330764820b06cf1814dda4ab0482b233a28241e98d8497bc1690dd31972e72861d8534ae0e37f26e04637e7d615e43d languageName: node linkType: hard -"@babel/plugin-transform-shorthand-properties@npm:^7.24.7": - version: 7.24.7 - resolution: "@babel/plugin-transform-shorthand-properties@npm:7.24.7" +"@babel/plugin-transform-shorthand-properties@npm:^7.25.9": + version: 7.25.9 + resolution: "@babel/plugin-transform-shorthand-properties@npm:7.25.9" dependencies: - "@babel/helper-plugin-utils": "npm:^7.24.7" + "@babel/helper-plugin-utils": "npm:^7.25.9" peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 10c0/41b155bdbb3be66618358488bf7731b3b2e8fff2de3dbfd541847720a9debfcec14db06a117abedd03c9cd786db20a79e2a86509a4f19513f6e1b610520905cf + checksum: 10c0/05a20d45f0fb62567644c507ccd4e379c1a74dacf887d2b2cac70247415e3f6d7d3bf4850c8b336053144715fedb6200fc38f7130c4b76c94eec9b9c0c2a8e9b languageName: node linkType: hard -"@babel/plugin-transform-spread@npm:^7.24.7": - version: 7.24.7 - resolution: "@babel/plugin-transform-spread@npm:7.24.7" +"@babel/plugin-transform-spread@npm:^7.25.9": + version: 7.25.9 + resolution: "@babel/plugin-transform-spread@npm:7.25.9" dependencies: - "@babel/helper-plugin-utils": "npm:^7.24.7" - "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.24.7" + "@babel/helper-plugin-utils": "npm:^7.25.9" + "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.25.9" peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 10c0/facba1553035f76b0d2930d4ada89a8cd0f45b79579afd35baefbfaf12e3b86096995f4b0c402cf9ee23b3f2ea0a4460c3b1ec0c192d340962c948bb223d4e66 + checksum: 10c0/996c8fed238efc30e0664f9f58bd7ec8c148f4659f84425f68923a094fe891245711d26eb10d1f815f50c124434e076e860dbe9662240844d1b77cd09907dcdf languageName: node linkType: hard -"@babel/plugin-transform-sticky-regex@npm:^7.24.7": - version: 7.24.7 - resolution: "@babel/plugin-transform-sticky-regex@npm:7.24.7" +"@babel/plugin-transform-sticky-regex@npm:^7.25.9": + version: 7.25.9 + resolution: "@babel/plugin-transform-sticky-regex@npm:7.25.9" dependencies: - "@babel/helper-plugin-utils": "npm:^7.24.7" + "@babel/helper-plugin-utils": "npm:^7.25.9" peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 10c0/5a74ed2ed0a3ab51c3d15fcaf09d9e2fe915823535c7a4d7b019813177d559b69677090e189ec3d5d08b619483eb5ad371fbcfbbff5ace2a76ba33ee566a1109 + checksum: 10c0/e9612b0615dab4c4fba1c560769616a9bd7b9226c73191ef84b6c3ee185c8b719b4f887cdd8336a0a13400ce606ab4a0d33bc8fa6b4fcdb53e2896d07f2568f6 languageName: node linkType: hard -"@babel/plugin-transform-template-literals@npm:^7.24.7": - version: 7.24.7 - resolution: "@babel/plugin-transform-template-literals@npm:7.24.7" +"@babel/plugin-transform-template-literals@npm:^7.26.8": + version: 7.26.8 + resolution: "@babel/plugin-transform-template-literals@npm:7.26.8" dependencies: - "@babel/helper-plugin-utils": "npm:^7.24.7" + "@babel/helper-plugin-utils": "npm:^7.26.5" peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 10c0/3630f966257bcace122f04d3157416a09d40768c44c3a800855da81146b009187daa21859d1c3b7d13f4e19e8888e60613964b175b2275d451200fb6d8d6cfe6 + checksum: 10c0/205a938ded9554857a604416d369023a961334b6c20943bd861b45f0e5dbbeca1cf6fda1c2049126e38a0d18865993433fdc78eae3028e94836b3b643c08ba0d languageName: node linkType: hard -"@babel/plugin-transform-typeof-symbol@npm:^7.24.8": - version: 7.24.8 - resolution: "@babel/plugin-transform-typeof-symbol@npm:7.24.8" +"@babel/plugin-transform-typeof-symbol@npm:^7.26.7": + version: 7.26.7 + resolution: "@babel/plugin-transform-typeof-symbol@npm:7.26.7" dependencies: - "@babel/helper-plugin-utils": "npm:^7.24.8" + "@babel/helper-plugin-utils": "npm:^7.26.5" peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 10c0/2f570a4fbbdc5fd85f48165a97452826560051e3b8efb48c3bb0a0a33ee8485633439e7b71bfe3ef705583a1df43f854f49125bd759abdedc195b2cf7e60012a + checksum: 10c0/d5640e3457637e6eee1d7205d255602ccca124ed30e4de10ec75ba179d167e0a826ceeab424e119921f5c995dfddf39ef1f2c91efd2dcbf3f0dc1e7931dfd1d1 languageName: node linkType: hard -"@babel/plugin-transform-unicode-escapes@npm:^7.24.7": - version: 7.24.7 - resolution: "@babel/plugin-transform-unicode-escapes@npm:7.24.7" +"@babel/plugin-transform-unicode-escapes@npm:^7.25.9": + version: 7.25.9 + resolution: "@babel/plugin-transform-unicode-escapes@npm:7.25.9" dependencies: - "@babel/helper-plugin-utils": "npm:^7.24.7" + "@babel/helper-plugin-utils": "npm:^7.25.9" peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 10c0/8b18e2e66af33471a6971289492beff5c240e56727331db1d34c4338a6a368a82a7ed6d57ec911001b6d65643aed76531e1e7cac93265fb3fb2717f54d845e69 + checksum: 10c0/615c84d7c53e1575d54ba9257e753e0b98c5de1e3225237d92f55226eaab8eb5bceb74df43f50f4aa162b0bbcc934ed11feafe2b60b8ec4934ce340fad4b8828 languageName: node linkType: hard -"@babel/plugin-transform-unicode-property-regex@npm:^7.24.7": - version: 7.24.7 - resolution: "@babel/plugin-transform-unicode-property-regex@npm:7.24.7" +"@babel/plugin-transform-unicode-property-regex@npm:^7.25.9": + version: 7.25.9 + resolution: "@babel/plugin-transform-unicode-property-regex@npm:7.25.9" dependencies: - "@babel/helper-create-regexp-features-plugin": "npm:^7.24.7" - "@babel/helper-plugin-utils": "npm:^7.24.7" + "@babel/helper-create-regexp-features-plugin": "npm:^7.25.9" + "@babel/helper-plugin-utils": "npm:^7.25.9" peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 10c0/bc57656eb94584d1b74a385d378818ac2b3fca642e3f649fead8da5fb3f9de22f8461185936915dfb33d5a9104e62e7a47828331248b09d28bb2d59e9276de3e + checksum: 10c0/1685836fc38af4344c3d2a9edbd46f7c7b28d369b63967d5b83f2f6849ec45b97223461cea3d14cc3f0be6ebb284938e637a5ca3955c0e79c873d62f593d615c languageName: node linkType: hard -"@babel/plugin-transform-unicode-regex@npm:^7.24.7": - version: 7.24.7 - resolution: "@babel/plugin-transform-unicode-regex@npm:7.24.7" +"@babel/plugin-transform-unicode-regex@npm:^7.25.9": + version: 7.25.9 + resolution: "@babel/plugin-transform-unicode-regex@npm:7.25.9" dependencies: - "@babel/helper-create-regexp-features-plugin": "npm:^7.24.7" - "@babel/helper-plugin-utils": "npm:^7.24.7" + "@babel/helper-create-regexp-features-plugin": "npm:^7.25.9" + "@babel/helper-plugin-utils": "npm:^7.25.9" peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 10c0/83f72a345b751566b601dc4d07e9f2c8f1bc0e0c6f7abb56ceb3095b3c9d304de73f85f2f477a09f8cc7edd5e65afd0ff9e376cdbcbea33bc0c28f3705b38fd9 + checksum: 10c0/448004f978279e726af26acd54f63f9002c9e2582ecd70d1c5c4436f6de490fcd817afb60016d11c52f5ef17dbaac2590e8cc7bfaf4e91b58c452cf188c7920f languageName: node linkType: hard -"@babel/plugin-transform-unicode-sets-regex@npm:^7.24.7": - version: 7.24.7 - resolution: "@babel/plugin-transform-unicode-sets-regex@npm:7.24.7" +"@babel/plugin-transform-unicode-sets-regex@npm:^7.25.9": + version: 7.25.9 + resolution: "@babel/plugin-transform-unicode-sets-regex@npm:7.25.9" dependencies: - "@babel/helper-create-regexp-features-plugin": "npm:^7.24.7" - "@babel/helper-plugin-utils": "npm:^7.24.7" + "@babel/helper-create-regexp-features-plugin": "npm:^7.25.9" + "@babel/helper-plugin-utils": "npm:^7.25.9" peerDependencies: "@babel/core": ^7.0.0 - checksum: 10c0/7457c0ee8e80a80cb6fdc1fe54ab115b52815627616ce9151be8ef292fc99d04a910ec24f11382b4f124b89374264396892b086886bd2a9c2317904d87c9b21b + checksum: 10c0/56ee04fbe236b77cbcd6035cbf0be7566d1386b8349154ac33244c25f61170c47153a9423cd1d92855f7d6447b53a4a653d9e8fd1eaeeee14feb4b2baf59bd9f languageName: node linkType: hard -"@babel/preset-env@npm:7.25.3": - version: 7.25.3 - resolution: "@babel/preset-env@npm:7.25.3" +"@babel/preset-env@npm:7.26.9": + version: 7.26.9 + resolution: "@babel/preset-env@npm:7.26.9" dependencies: - "@babel/compat-data": "npm:^7.25.2" - "@babel/helper-compilation-targets": "npm:^7.25.2" - "@babel/helper-plugin-utils": "npm:^7.24.8" - "@babel/helper-validator-option": "npm:^7.24.8" - "@babel/plugin-bugfix-firefox-class-in-computed-class-key": "npm:^7.25.3" - "@babel/plugin-bugfix-safari-class-field-initializer-scope": "npm:^7.25.0" - "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "npm:^7.25.0" - "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "npm:^7.24.7" - "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "npm:^7.25.0" + "@babel/compat-data": "npm:^7.26.8" + "@babel/helper-compilation-targets": "npm:^7.26.5" + "@babel/helper-plugin-utils": "npm:^7.26.5" + "@babel/helper-validator-option": "npm:^7.25.9" + "@babel/plugin-bugfix-firefox-class-in-computed-class-key": "npm:^7.25.9" + "@babel/plugin-bugfix-safari-class-field-initializer-scope": "npm:^7.25.9" + "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "npm:^7.25.9" + "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "npm:^7.25.9" + "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "npm:^7.25.9" "@babel/plugin-proposal-private-property-in-object": "npm:7.21.0-placeholder-for-preset-env.2" - "@babel/plugin-syntax-async-generators": "npm:^7.8.4" - "@babel/plugin-syntax-class-properties": "npm:^7.12.13" - "@babel/plugin-syntax-class-static-block": "npm:^7.14.5" - "@babel/plugin-syntax-dynamic-import": "npm:^7.8.3" - "@babel/plugin-syntax-export-namespace-from": "npm:^7.8.3" - "@babel/plugin-syntax-import-assertions": "npm:^7.24.7" - "@babel/plugin-syntax-import-attributes": "npm:^7.24.7" - "@babel/plugin-syntax-import-meta": "npm:^7.10.4" - "@babel/plugin-syntax-json-strings": "npm:^7.8.3" - "@babel/plugin-syntax-logical-assignment-operators": "npm:^7.10.4" - "@babel/plugin-syntax-nullish-coalescing-operator": "npm:^7.8.3" - "@babel/plugin-syntax-numeric-separator": "npm:^7.10.4" - "@babel/plugin-syntax-object-rest-spread": "npm:^7.8.3" - "@babel/plugin-syntax-optional-catch-binding": "npm:^7.8.3" - "@babel/plugin-syntax-optional-chaining": "npm:^7.8.3" - "@babel/plugin-syntax-private-property-in-object": "npm:^7.14.5" - "@babel/plugin-syntax-top-level-await": "npm:^7.14.5" + "@babel/plugin-syntax-import-assertions": "npm:^7.26.0" + "@babel/plugin-syntax-import-attributes": "npm:^7.26.0" "@babel/plugin-syntax-unicode-sets-regex": "npm:^7.18.6" - "@babel/plugin-transform-arrow-functions": "npm:^7.24.7" - "@babel/plugin-transform-async-generator-functions": "npm:^7.25.0" - "@babel/plugin-transform-async-to-generator": "npm:^7.24.7" - "@babel/plugin-transform-block-scoped-functions": "npm:^7.24.7" - "@babel/plugin-transform-block-scoping": "npm:^7.25.0" - "@babel/plugin-transform-class-properties": "npm:^7.24.7" - "@babel/plugin-transform-class-static-block": "npm:^7.24.7" - "@babel/plugin-transform-classes": "npm:^7.25.0" - "@babel/plugin-transform-computed-properties": "npm:^7.24.7" - "@babel/plugin-transform-destructuring": "npm:^7.24.8" - "@babel/plugin-transform-dotall-regex": "npm:^7.24.7" - "@babel/plugin-transform-duplicate-keys": "npm:^7.24.7" - "@babel/plugin-transform-duplicate-named-capturing-groups-regex": "npm:^7.25.0" - "@babel/plugin-transform-dynamic-import": "npm:^7.24.7" - "@babel/plugin-transform-exponentiation-operator": "npm:^7.24.7" - "@babel/plugin-transform-export-namespace-from": "npm:^7.24.7" - "@babel/plugin-transform-for-of": "npm:^7.24.7" - "@babel/plugin-transform-function-name": "npm:^7.25.1" - "@babel/plugin-transform-json-strings": "npm:^7.24.7" - "@babel/plugin-transform-literals": "npm:^7.25.2" - "@babel/plugin-transform-logical-assignment-operators": "npm:^7.24.7" - "@babel/plugin-transform-member-expression-literals": "npm:^7.24.7" - "@babel/plugin-transform-modules-amd": "npm:^7.24.7" - "@babel/plugin-transform-modules-commonjs": "npm:^7.24.8" - "@babel/plugin-transform-modules-systemjs": "npm:^7.25.0" - "@babel/plugin-transform-modules-umd": "npm:^7.24.7" - "@babel/plugin-transform-named-capturing-groups-regex": "npm:^7.24.7" - "@babel/plugin-transform-new-target": "npm:^7.24.7" - "@babel/plugin-transform-nullish-coalescing-operator": "npm:^7.24.7" - "@babel/plugin-transform-numeric-separator": "npm:^7.24.7" - "@babel/plugin-transform-object-rest-spread": "npm:^7.24.7" - "@babel/plugin-transform-object-super": "npm:^7.24.7" - "@babel/plugin-transform-optional-catch-binding": "npm:^7.24.7" - "@babel/plugin-transform-optional-chaining": "npm:^7.24.8" - "@babel/plugin-transform-parameters": "npm:^7.24.7" - "@babel/plugin-transform-private-methods": "npm:^7.24.7" - "@babel/plugin-transform-private-property-in-object": "npm:^7.24.7" - "@babel/plugin-transform-property-literals": "npm:^7.24.7" - "@babel/plugin-transform-regenerator": "npm:^7.24.7" - "@babel/plugin-transform-reserved-words": "npm:^7.24.7" - "@babel/plugin-transform-shorthand-properties": "npm:^7.24.7" - "@babel/plugin-transform-spread": "npm:^7.24.7" - "@babel/plugin-transform-sticky-regex": "npm:^7.24.7" - "@babel/plugin-transform-template-literals": "npm:^7.24.7" - "@babel/plugin-transform-typeof-symbol": "npm:^7.24.8" - "@babel/plugin-transform-unicode-escapes": "npm:^7.24.7" - "@babel/plugin-transform-unicode-property-regex": "npm:^7.24.7" - "@babel/plugin-transform-unicode-regex": "npm:^7.24.7" - "@babel/plugin-transform-unicode-sets-regex": "npm:^7.24.7" + "@babel/plugin-transform-arrow-functions": "npm:^7.25.9" + "@babel/plugin-transform-async-generator-functions": "npm:^7.26.8" + "@babel/plugin-transform-async-to-generator": "npm:^7.25.9" + "@babel/plugin-transform-block-scoped-functions": "npm:^7.26.5" + "@babel/plugin-transform-block-scoping": "npm:^7.25.9" + "@babel/plugin-transform-class-properties": "npm:^7.25.9" + "@babel/plugin-transform-class-static-block": "npm:^7.26.0" + "@babel/plugin-transform-classes": "npm:^7.25.9" + "@babel/plugin-transform-computed-properties": "npm:^7.25.9" + "@babel/plugin-transform-destructuring": "npm:^7.25.9" + "@babel/plugin-transform-dotall-regex": "npm:^7.25.9" + "@babel/plugin-transform-duplicate-keys": "npm:^7.25.9" + "@babel/plugin-transform-duplicate-named-capturing-groups-regex": "npm:^7.25.9" + "@babel/plugin-transform-dynamic-import": "npm:^7.25.9" + "@babel/plugin-transform-exponentiation-operator": "npm:^7.26.3" + "@babel/plugin-transform-export-namespace-from": "npm:^7.25.9" + "@babel/plugin-transform-for-of": "npm:^7.26.9" + "@babel/plugin-transform-function-name": "npm:^7.25.9" + "@babel/plugin-transform-json-strings": "npm:^7.25.9" + "@babel/plugin-transform-literals": "npm:^7.25.9" + "@babel/plugin-transform-logical-assignment-operators": "npm:^7.25.9" + "@babel/plugin-transform-member-expression-literals": "npm:^7.25.9" + "@babel/plugin-transform-modules-amd": "npm:^7.25.9" + "@babel/plugin-transform-modules-commonjs": "npm:^7.26.3" + "@babel/plugin-transform-modules-systemjs": "npm:^7.25.9" + "@babel/plugin-transform-modules-umd": "npm:^7.25.9" + "@babel/plugin-transform-named-capturing-groups-regex": "npm:^7.25.9" + "@babel/plugin-transform-new-target": "npm:^7.25.9" + "@babel/plugin-transform-nullish-coalescing-operator": "npm:^7.26.6" + "@babel/plugin-transform-numeric-separator": "npm:^7.25.9" + "@babel/plugin-transform-object-rest-spread": "npm:^7.25.9" + "@babel/plugin-transform-object-super": "npm:^7.25.9" + "@babel/plugin-transform-optional-catch-binding": "npm:^7.25.9" + "@babel/plugin-transform-optional-chaining": "npm:^7.25.9" + "@babel/plugin-transform-parameters": "npm:^7.25.9" + "@babel/plugin-transform-private-methods": "npm:^7.25.9" + "@babel/plugin-transform-private-property-in-object": "npm:^7.25.9" + "@babel/plugin-transform-property-literals": "npm:^7.25.9" + "@babel/plugin-transform-regenerator": "npm:^7.25.9" + "@babel/plugin-transform-regexp-modifiers": "npm:^7.26.0" + "@babel/plugin-transform-reserved-words": "npm:^7.25.9" + "@babel/plugin-transform-shorthand-properties": "npm:^7.25.9" + "@babel/plugin-transform-spread": "npm:^7.25.9" + "@babel/plugin-transform-sticky-regex": "npm:^7.25.9" + "@babel/plugin-transform-template-literals": "npm:^7.26.8" + "@babel/plugin-transform-typeof-symbol": "npm:^7.26.7" + "@babel/plugin-transform-unicode-escapes": "npm:^7.25.9" + "@babel/plugin-transform-unicode-property-regex": "npm:^7.25.9" + "@babel/plugin-transform-unicode-regex": "npm:^7.25.9" + "@babel/plugin-transform-unicode-sets-regex": "npm:^7.25.9" "@babel/preset-modules": "npm:0.1.6-no-external-plugins" babel-plugin-polyfill-corejs2: "npm:^0.4.10" - babel-plugin-polyfill-corejs3: "npm:^0.10.4" + babel-plugin-polyfill-corejs3: "npm:^0.11.0" babel-plugin-polyfill-regenerator: "npm:^0.6.1" - core-js-compat: "npm:^3.37.1" + core-js-compat: "npm:^3.40.0" semver: "npm:^6.3.1" peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 10c0/9287dc2e296fe2aa3367d84c2a799db17c9d1e48bba86525f47c6f51f5ba2e2cce454f45f4ae2ef928f9077c0640b04556b55b94835675ceeca94a0c5133205e + checksum: 10c0/6812ca76bd38165a58fe8354bab5e7204e1aa17d8b9270bd8f8babb08cc7fa94cd29525fe41b553f2ba0e84033d566f10da26012b8ee0f81897005c5225d0051 languageName: node linkType: hard @@ -2323,7 +2354,16 @@ __metadata: languageName: node linkType: hard -"@babel/runtime@npm:7.25.0, @babel/runtime@npm:^7.8.4": +"@babel/runtime@npm:7.26.10": + version: 7.26.10 + resolution: "@babel/runtime@npm:7.26.10" + dependencies: + regenerator-runtime: "npm:^0.14.0" + checksum: 10c0/6dc6d88c7908f505c4f7770fb4677dfa61f68f659b943c2be1f2a99cb6680343462867abf2d49822adc435932919b36c77ac60125793e719ea8745f2073d3745 + languageName: node + linkType: hard + +"@babel/runtime@npm:^7.8.4": version: 7.25.0 resolution: "@babel/runtime@npm:7.25.0" dependencies: @@ -2343,7 +2383,18 @@ __metadata: languageName: node linkType: hard -"@babel/traverse@npm:^7.24.7, @babel/traverse@npm:^7.24.8, @babel/traverse@npm:^7.25.0, @babel/traverse@npm:^7.25.1, @babel/traverse@npm:^7.25.2, @babel/traverse@npm:^7.25.3": +"@babel/template@npm:^7.25.9, @babel/template@npm:^7.26.9": + version: 7.26.9 + resolution: "@babel/template@npm:7.26.9" + dependencies: + "@babel/code-frame": "npm:^7.26.2" + "@babel/parser": "npm:^7.26.9" + "@babel/types": "npm:^7.26.9" + checksum: 10c0/019b1c4129cc01ad63e17529089c2c559c74709d225f595eee017af227fee11ae8a97a6ab19ae6768b8aa22d8d75dcb60a00b28f52e9fa78140672d928bc1ae9 + languageName: node + linkType: hard + +"@babel/traverse@npm:^7.24.7, @babel/traverse@npm:^7.24.8, @babel/traverse@npm:^7.25.0, @babel/traverse@npm:^7.25.2": version: 7.25.3 resolution: "@babel/traverse@npm:7.25.3" dependencies: @@ -2358,7 +2409,22 @@ __metadata: languageName: node linkType: hard -"@babel/types@npm:^7.0.0, @babel/types@npm:^7.20.7, @babel/types@npm:^7.24.7, @babel/types@npm:^7.24.8, @babel/types@npm:^7.24.9, @babel/types@npm:^7.25.0, @babel/types@npm:^7.25.2, @babel/types@npm:^7.4.4": +"@babel/traverse@npm:^7.25.9, @babel/traverse@npm:^7.26.10, @babel/traverse@npm:^7.26.5, @babel/traverse@npm:^7.26.8, @babel/traverse@npm:^7.26.9": + version: 7.26.10 + resolution: "@babel/traverse@npm:7.26.10" + dependencies: + "@babel/code-frame": "npm:^7.26.2" + "@babel/generator": "npm:^7.26.10" + "@babel/parser": "npm:^7.26.10" + "@babel/template": "npm:^7.26.9" + "@babel/types": "npm:^7.26.10" + debug: "npm:^4.3.1" + globals: "npm:^11.1.0" + checksum: 10c0/4e86bb4e3c30a6162bb91df86329df79d96566c3e2d9ccba04f108c30473a3a4fd360d9990531493d90f6a12004f10f616bf9b9229ca30c816b708615e9de2ac + languageName: node + linkType: hard + +"@babel/types@npm:^7.0.0, @babel/types@npm:^7.20.7, @babel/types@npm:^7.24.7, @babel/types@npm:^7.24.9, @babel/types@npm:^7.25.0, @babel/types@npm:^7.25.2, @babel/types@npm:^7.4.4": version: 7.25.2 resolution: "@babel/types@npm:7.25.2" dependencies: @@ -2369,6 +2435,16 @@ __metadata: languageName: node linkType: hard +"@babel/types@npm:^7.25.9, @babel/types@npm:^7.26.10, @babel/types@npm:^7.26.9": + version: 7.26.10 + resolution: "@babel/types@npm:7.26.10" + dependencies: + "@babel/helper-string-parser": "npm:^7.25.9" + "@babel/helper-validator-identifier": "npm:^7.25.9" + checksum: 10c0/7a7f83f568bfc3dfabfaf9ae3a97ab5c061726c0afa7dcd94226d4f84a81559da368ed79671e3a8039d16f12476cf110381a377ebdea07587925f69628200dac + languageName: node + linkType: hard + "@bazel/bazelisk@npm:1.19.0": version: 1.19.0 resolution: "@bazel/bazelisk@npm:1.19.0" @@ -6994,15 +7070,15 @@ __metadata: languageName: node linkType: hard -"babel-plugin-polyfill-corejs3@npm:^0.10.1, babel-plugin-polyfill-corejs3@npm:^0.10.4": - version: 0.10.6 - resolution: "babel-plugin-polyfill-corejs3@npm:0.10.6" +"babel-plugin-polyfill-corejs3@npm:^0.11.0": + version: 0.11.1 + resolution: "babel-plugin-polyfill-corejs3@npm:0.11.1" dependencies: - "@babel/helper-define-polyfill-provider": "npm:^0.6.2" - core-js-compat: "npm:^3.38.0" + "@babel/helper-define-polyfill-provider": "npm:^0.6.3" + core-js-compat: "npm:^3.40.0" peerDependencies: "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0 - checksum: 10c0/3a69220471b07722c2ae6537310bf26b772514e12b601398082965459c838be70a0ca70b0662f0737070654ff6207673391221d48599abb4a2b27765206d9f79 + checksum: 10c0/025f754b6296d84b20200aff63a3c1acdd85e8c621781f2bd27fe2512d0060526192d02329326947c6b29c27cf475fbcfaaff8c51eab1d2bfc7b79086bb64229 languageName: node linkType: hard @@ -7325,6 +7401,20 @@ __metadata: languageName: node linkType: hard +"browserslist@npm:^4.24.0, browserslist@npm:^4.24.4": + version: 4.24.4 + resolution: "browserslist@npm:4.24.4" + dependencies: + caniuse-lite: "npm:^1.0.30001688" + electron-to-chromium: "npm:^1.5.73" + node-releases: "npm:^2.0.19" + update-browserslist-db: "npm:^1.1.1" + bin: + browserslist: cli.js + checksum: 10c0/db7ebc1733cf471e0b490b4f47e3e2ea2947ce417192c9246644e92c667dd56a71406cc58f62ca7587caf828364892e9952904a02b7aead752bc65b62a37cfe9 + languageName: node + linkType: hard + "browserstack@npm:^1.5.1": version: 1.6.1 resolution: "browserstack@npm:1.6.1" @@ -7506,6 +7596,13 @@ __metadata: languageName: node linkType: hard +"caniuse-lite@npm:^1.0.30001688": + version: 1.0.30001704 + resolution: "caniuse-lite@npm:1.0.30001704" + checksum: 10c0/4efa0ece51ef58e7ce7e7c8cd7b50372bcb910581a47397be5c086c046c3cd436d123b734351fb20f638c322b339198edf89b5b632ff59bdd171c74ff7f4efcf + languageName: node + linkType: hard + "caseless@npm:~0.12.0": version: 0.12.0 resolution: "caseless@npm:0.12.0" @@ -8084,12 +8181,12 @@ __metadata: languageName: node linkType: hard -"core-js-compat@npm:^3.37.1, core-js-compat@npm:^3.38.0": - version: 3.38.0 - resolution: "core-js-compat@npm:3.38.0" +"core-js-compat@npm:^3.40.0": + version: 3.41.0 + resolution: "core-js-compat@npm:3.41.0" dependencies: - browserslist: "npm:^4.23.3" - checksum: 10c0/9d653a448b8a491034358d2f052e63dda86f75fb65646e2d313a938212470ba1c2f5a83bf31cc583d6c87a9e8d7b0d49458447cab2ff36c4caa097ae381de336 + browserslist: "npm:^4.24.4" + checksum: 10c0/92d2c748d3dd1c4e3b6cee6b6683b9212db9bc0a6574d933781210daf3baaeb76334ed4636eb8935b45802aa8d9235ab604c9a262694e02a2fa17ad0f6976829 languageName: node linkType: hard @@ -8785,6 +8882,13 @@ __metadata: languageName: node linkType: hard +"electron-to-chromium@npm:^1.5.73": + version: 1.5.116 + resolution: "electron-to-chromium@npm:1.5.116" + checksum: 10c0/27f117cd18b17b6a7c4ddf82db5f5093c0eaa37bab27798f544648bf6408ef7d7c938251b50210eb1fa98d1bcf0a65b4302f926a147896f8a3dea3c0fc9a45f6 + languageName: node + linkType: hard + "emoji-regex@npm:^10.3.0": version: 10.3.0 resolution: "emoji-regex@npm:10.3.0" @@ -9271,6 +9375,13 @@ __metadata: languageName: node linkType: hard +"escalade@npm:^3.2.0": + version: 3.2.0 + resolution: "escalade@npm:3.2.0" + checksum: 10c0/ced4dd3a78e15897ed3be74e635110bbf3b08877b0a41be50dcb325ee0e0b5f65fc2d50e9845194d7c4633f327e2e1c6cce00a71b617c5673df0374201d67f65 + languageName: node + linkType: hard + "escape-html@npm:^1.0.3, escape-html@npm:~1.0.3": version: 1.0.3 resolution: "escape-html@npm:1.0.3" @@ -11778,6 +11889,15 @@ __metadata: languageName: node linkType: hard +"jsesc@npm:^3.0.2": + version: 3.1.0 + resolution: "jsesc@npm:3.1.0" + bin: + jsesc: bin/jsesc + checksum: 10c0/531779df5ec94f47e462da26b4cbf05eb88a83d9f08aac2ba04206508fc598527a153d08bd462bae82fc78b3eaa1a908e1a4a79f886e9238641c4cdefaf118b1 + languageName: node + linkType: hard + "jsesc@npm:~0.5.0": version: 0.5.0 resolution: "jsesc@npm:0.5.0" @@ -11787,6 +11907,15 @@ __metadata: languageName: node linkType: hard +"jsesc@npm:~3.0.2": + version: 3.0.2 + resolution: "jsesc@npm:3.0.2" + bin: + jsesc: bin/jsesc + checksum: 10c0/ef22148f9e793180b14d8a145ee6f9f60f301abf443288117b4b6c53d0ecd58354898dc506ccbb553a5f7827965cd38bc5fb726575aae93c5e8915e2de8290e1 + languageName: node + linkType: hard + "json-buffer@npm:3.0.1": version: 3.0.1 resolution: "json-buffer@npm:3.0.1" @@ -13543,6 +13672,13 @@ __metadata: languageName: node linkType: hard +"node-releases@npm:^2.0.19": + version: 2.0.19 + resolution: "node-releases@npm:2.0.19" + checksum: 10c0/52a0dbd25ccf545892670d1551690fe0facb6a471e15f2cfa1b20142a5b255b3aa254af5f59d6ecb69c2bec7390bc643c43aa63b13bf5e64b6075952e716b1aa + languageName: node + linkType: hard + "nopt@npm:^7.0.0, nopt@npm:^7.2.1": version: 7.2.1 resolution: "nopt@npm:7.2.1" @@ -14379,6 +14515,13 @@ __metadata: languageName: node linkType: hard +"picocolors@npm:^1.1.1": + version: 1.1.1 + resolution: "picocolors@npm:1.1.1" + checksum: 10c0/e2e3e8170ab9d7c7421969adaa7e1b31434f789afb9b3f115f6b96d91945041ac3ceb02e9ec6fe6510ff036bcc0bf91e69a1772edc0b707e12b19c0f2d6bcf58 + languageName: node + linkType: hard + "picomatch@npm:4.0.2": version: 4.0.2 resolution: "picomatch@npm:4.0.2" @@ -15251,6 +15394,15 @@ __metadata: languageName: node linkType: hard +"regenerate-unicode-properties@npm:^10.2.0": + version: 10.2.0 + resolution: "regenerate-unicode-properties@npm:10.2.0" + dependencies: + regenerate: "npm:^1.4.2" + checksum: 10c0/5510785eeaf56bbfdf4e663d6753f125c08d2a372d4107bc1b756b7bf142e2ed80c2733a8b54e68fb309ba37690e66a0362699b0e21d5c1f0255dea1b00e6460 + languageName: node + linkType: hard + "regenerate@npm:^1.4.2": version: 1.4.2 resolution: "regenerate@npm:1.4.2" @@ -15307,6 +15459,38 @@ __metadata: languageName: node linkType: hard +"regexpu-core@npm:^6.2.0": + version: 6.2.0 + resolution: "regexpu-core@npm:6.2.0" + dependencies: + regenerate: "npm:^1.4.2" + regenerate-unicode-properties: "npm:^10.2.0" + regjsgen: "npm:^0.8.0" + regjsparser: "npm:^0.12.0" + unicode-match-property-ecmascript: "npm:^2.0.0" + unicode-match-property-value-ecmascript: "npm:^2.1.0" + checksum: 10c0/bbcb83a854bf96ce4005ee4e4618b71c889cda72674ce6092432f0039b47890c2d0dfeb9057d08d440999d9ea03879ebbb7f26ca005ccf94390e55c348859b98 + languageName: node + linkType: hard + +"regjsgen@npm:^0.8.0": + version: 0.8.0 + resolution: "regjsgen@npm:0.8.0" + checksum: 10c0/44f526c4fdbf0b29286101a282189e4dbb303f4013cf3fea058668d96d113b9180d3d03d1e13f6d4cbde38b7728bf951aecd9dc199938c080093a9a6f0d7a6bd + languageName: node + linkType: hard + +"regjsparser@npm:^0.12.0": + version: 0.12.0 + resolution: "regjsparser@npm:0.12.0" + dependencies: + jsesc: "npm:~3.0.2" + bin: + regjsparser: bin/parser + checksum: 10c0/99d3e4e10c8c7732eb7aa843b8da2fd8b647fe144d3711b480e4647dc3bff4b1e96691ccf17f3ace24aa866a50b064236177cb25e6e4fbbb18285d99edaed83b + languageName: node + linkType: hard + "regjsparser@npm:^0.9.1": version: 0.9.1 resolution: "regjsparser@npm:0.9.1" @@ -17781,6 +17965,20 @@ __metadata: languageName: node linkType: hard +"update-browserslist-db@npm:^1.1.1": + version: 1.1.3 + resolution: "update-browserslist-db@npm:1.1.3" + dependencies: + escalade: "npm:^3.2.0" + picocolors: "npm:^1.1.1" + peerDependencies: + browserslist: ">= 4.21.0" + bin: + update-browserslist-db: cli.js + checksum: 10c0/682e8ecbf9de474a626f6462aa85927936cdd256fe584c6df2508b0df9f7362c44c957e9970df55dfe44d3623807d26316ea2c7d26b80bb76a16c56c37233c32 + languageName: node + linkType: hard + "uri-js@npm:^4.2.2, uri-js@npm:^4.4.1": version: 4.4.1 resolution: "uri-js@npm:4.4.1" From c88727a49087aa01e47720d2b4781a084f5da926 Mon Sep 17 00:00:00 2001 From: Alan Agius <17563226+alan-agius4@users.noreply.github.com> Date: Thu, 13 Mar 2025 09:24:41 +0000 Subject: [PATCH 76/87] ci: update angular/dev-infra actions version --- .../assistant-to-the-branch-manager.yml | 2 +- .github/workflows/ci.yml | 42 +++++++++---------- .github/workflows/dev-infra.yml | 4 +- .github/workflows/feature-requests.yml | 2 +- .github/workflows/pr.yml | 36 ++++++++-------- 5 files changed, 43 insertions(+), 43 deletions(-) diff --git a/.github/workflows/assistant-to-the-branch-manager.yml b/.github/workflows/assistant-to-the-branch-manager.yml index 3ba5ed41e1fd..db83a4227fcc 100644 --- a/.github/workflows/assistant-to-the-branch-manager.yml +++ b/.github/workflows/assistant-to-the-branch-manager.yml @@ -16,6 +16,6 @@ jobs: - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 with: persist-credentials: false - - uses: angular/dev-infra/github-actions/branch-manager@40b2cbdbcc40f36f125d721c4e8decd3bb607ea4 + - uses: angular/dev-infra/github-actions/branch-manager@47572aba6019f368057c00966ac7ce354b1d65bc with: angular-robot-key: ${{ secrets.ANGULAR_ROBOT_PRIVATE_KEY }} diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ba787cf28c19..5b80b308ed0f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,7 +21,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Initialize environment - uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@40b2cbdbcc40f36f125d721c4e8decd3bb607ea4 + uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@47572aba6019f368057c00966ac7ce354b1d65bc - name: Install node modules run: yarn install --immutable - name: Generate JSON schema types @@ -42,11 +42,11 @@ jobs: runs-on: ubuntu-latest steps: - name: Initialize environment - uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@40b2cbdbcc40f36f125d721c4e8decd3bb607ea4 + uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@47572aba6019f368057c00966ac7ce354b1d65bc - name: Setup Bazel - uses: angular/dev-infra/github-actions/bazel/setup@40b2cbdbcc40f36f125d721c4e8decd3bb607ea4 + uses: angular/dev-infra/github-actions/bazel/setup@47572aba6019f368057c00966ac7ce354b1d65bc - name: Setup Bazel RBE - uses: angular/dev-infra/github-actions/bazel/configure-remote@40b2cbdbcc40f36f125d721c4e8decd3bb607ea4 + uses: angular/dev-infra/github-actions/bazel/configure-remote@47572aba6019f368057c00966ac7ce354b1d65bc - name: Install node modules run: yarn install --immutable - name: Build release targets @@ -56,11 +56,11 @@ jobs: runs-on: ubuntu-latest steps: - name: Initialize environment - uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@40b2cbdbcc40f36f125d721c4e8decd3bb607ea4 + uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@47572aba6019f368057c00966ac7ce354b1d65bc - name: Setup Bazel - uses: angular/dev-infra/github-actions/bazel/setup@40b2cbdbcc40f36f125d721c4e8decd3bb607ea4 + uses: angular/dev-infra/github-actions/bazel/setup@47572aba6019f368057c00966ac7ce354b1d65bc - name: Setup Bazel RBE - uses: angular/dev-infra/github-actions/bazel/configure-remote@40b2cbdbcc40f36f125d721c4e8decd3bb607ea4 + uses: angular/dev-infra/github-actions/bazel/configure-remote@47572aba6019f368057c00966ac7ce354b1d65bc - name: Install node modules run: yarn install --immutable - name: Run module and package tests @@ -90,13 +90,13 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Initialize environment - uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@40b2cbdbcc40f36f125d721c4e8decd3bb607ea4 + uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@47572aba6019f368057c00966ac7ce354b1d65bc - name: Install node modules run: yarn install --immutable - name: Setup Bazel - uses: angular/dev-infra/github-actions/bazel/setup@40b2cbdbcc40f36f125d721c4e8decd3bb607ea4 + uses: angular/dev-infra/github-actions/bazel/setup@47572aba6019f368057c00966ac7ce354b1d65bc - name: Setup Bazel RBE - uses: angular/dev-infra/github-actions/bazel/configure-remote@40b2cbdbcc40f36f125d721c4e8decd3bb607ea4 + uses: angular/dev-infra/github-actions/bazel/configure-remote@47572aba6019f368057c00966ac7ce354b1d65bc - name: Run CLI E2E tests run: yarn bazel test --define=E2E_SHARD_TOTAL=6 --define=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.${{ matrix.subset }}_node${{ matrix.node }} @@ -111,13 +111,13 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Initialize environment - uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@40b2cbdbcc40f36f125d721c4e8decd3bb607ea4 + uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@47572aba6019f368057c00966ac7ce354b1d65bc - name: Install node modules run: yarn install --immutable - name: Setup Bazel - uses: angular/dev-infra/github-actions/bazel/setup@40b2cbdbcc40f36f125d721c4e8decd3bb607ea4 + uses: angular/dev-infra/github-actions/bazel/setup@47572aba6019f368057c00966ac7ce354b1d65bc - name: Setup Bazel RBE - uses: angular/dev-infra/github-actions/bazel/configure-remote@40b2cbdbcc40f36f125d721c4e8decd3bb607ea4 + uses: angular/dev-infra/github-actions/bazel/configure-remote@47572aba6019f368057c00966ac7ce354b1d65bc - name: Run CLI E2E tests run: yarn bazel test --define=E2E_SHARD_TOTAL=3 --define=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.${{ matrix.subset }}_node${{ matrix.node }} @@ -132,13 +132,13 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Initialize environment - uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@40b2cbdbcc40f36f125d721c4e8decd3bb607ea4 + uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@47572aba6019f368057c00966ac7ce354b1d65bc - name: Install node modules run: yarn install --immutable - name: Setup Bazel - uses: angular/dev-infra/github-actions/bazel/setup@40b2cbdbcc40f36f125d721c4e8decd3bb607ea4 + uses: angular/dev-infra/github-actions/bazel/setup@47572aba6019f368057c00966ac7ce354b1d65bc - name: Setup Bazel RBE - uses: angular/dev-infra/github-actions/bazel/configure-remote@40b2cbdbcc40f36f125d721c4e8decd3bb607ea4 + uses: angular/dev-infra/github-actions/bazel/configure-remote@47572aba6019f368057c00966ac7ce354b1d65bc - name: Run CLI E2E tests run: yarn bazel test --define=E2E_SHARD_TOTAL=6 --define=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.snapshots.${{ matrix.subset }}_node${{ matrix.node }} @@ -149,13 +149,13 @@ jobs: SAUCE_TUNNEL_IDENTIFIER: angular-cli-${{ github.workflow }}-${{ github.run_number }} steps: - name: Initialize environment - uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@40b2cbdbcc40f36f125d721c4e8decd3bb607ea4 + uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@47572aba6019f368057c00966ac7ce354b1d65bc - name: Install node modules run: yarn install --immutable - name: Setup Bazel - uses: angular/dev-infra/github-actions/bazel/setup@40b2cbdbcc40f36f125d721c4e8decd3bb607ea4 + uses: angular/dev-infra/github-actions/bazel/setup@47572aba6019f368057c00966ac7ce354b1d65bc - name: Setup Bazel RBE - uses: angular/dev-infra/github-actions/bazel/configure-remote@40b2cbdbcc40f36f125d721c4e8decd3bb607ea4 + uses: angular/dev-infra/github-actions/bazel/configure-remote@47572aba6019f368057c00966ac7ce354b1d65bc - name: Run E2E Browser tests env: SAUCE_USERNAME: ${{ vars.SAUCE_USERNAME }} @@ -182,11 +182,11 @@ jobs: CIRCLE_BRANCH: ${{ github.ref_name }} steps: - name: Initialize environment - uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@40b2cbdbcc40f36f125d721c4e8decd3bb607ea4 + uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@47572aba6019f368057c00966ac7ce354b1d65bc - name: Install node modules run: yarn install --immutable - name: Setup Bazel - uses: angular/dev-infra/github-actions/bazel/setup@40b2cbdbcc40f36f125d721c4e8decd3bb607ea4 + uses: angular/dev-infra/github-actions/bazel/setup@47572aba6019f368057c00966ac7ce354b1d65bc - run: yarn admin snapshots --verbose env: SNAPSHOT_BUILDS_GITHUB_TOKEN: ${{ secrets.SNAPSHOT_BUILDS_GITHUB_TOKEN }} diff --git a/.github/workflows/dev-infra.yml b/.github/workflows/dev-infra.yml index 37c6198d71ff..44846786e854 100644 --- a/.github/workflows/dev-infra.yml +++ b/.github/workflows/dev-infra.yml @@ -13,13 +13,13 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - - uses: angular/dev-infra/github-actions/commit-message-based-labels@40b2cbdbcc40f36f125d721c4e8decd3bb607ea4 + - uses: angular/dev-infra/github-actions/commit-message-based-labels@47572aba6019f368057c00966ac7ce354b1d65bc with: angular-robot-key: ${{ secrets.ANGULAR_ROBOT_PRIVATE_KEY }} post_approval_changes: runs-on: ubuntu-latest steps: - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - - uses: angular/dev-infra/github-actions/post-approval-changes@40b2cbdbcc40f36f125d721c4e8decd3bb607ea4 + - uses: angular/dev-infra/github-actions/post-approval-changes@47572aba6019f368057c00966ac7ce354b1d65bc with: angular-robot-key: ${{ secrets.ANGULAR_ROBOT_PRIVATE_KEY }} diff --git a/.github/workflows/feature-requests.yml b/.github/workflows/feature-requests.yml index 3852df5a0944..5e922d9c70f0 100644 --- a/.github/workflows/feature-requests.yml +++ b/.github/workflows/feature-requests.yml @@ -16,6 +16,6 @@ jobs: if: github.repository == 'angular/angular-cli' runs-on: ubuntu-latest steps: - - uses: angular/dev-infra/github-actions/feature-request@40b2cbdbcc40f36f125d721c4e8decd3bb607ea4 + - uses: angular/dev-infra/github-actions/feature-request@47572aba6019f368057c00966ac7ce354b1d65bc with: angular-robot-key: ${{ secrets.ANGULAR_ROBOT_PRIVATE_KEY }} diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 01764c70cc1a..fcdb1b25d798 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -34,9 +34,9 @@ jobs: runs-on: ubuntu-latest steps: - name: Initialize environment - uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@40b2cbdbcc40f36f125d721c4e8decd3bb607ea4 + uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@47572aba6019f368057c00966ac7ce354b1d65bc - name: Setup ESLint Caching - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2 + uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4.2.2 with: path: .eslintcache key: ${{ runner.os }}-${{ hashFiles('.eslintrc.json') }} @@ -54,7 +54,7 @@ jobs: - name: Run Validation run: yarn admin validate - name: Check Package Licenses - uses: angular/dev-infra/github-actions/linting/licenses@40b2cbdbcc40f36f125d721c4e8decd3bb607ea4 + uses: angular/dev-infra/github-actions/linting/licenses@47572aba6019f368057c00966ac7ce354b1d65bc - name: Check tooling setup run: yarn check-tooling-setup - name: Check commit message @@ -70,11 +70,11 @@ jobs: runs-on: ubuntu-latest steps: - name: Initialize environment - uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@40b2cbdbcc40f36f125d721c4e8decd3bb607ea4 + uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@47572aba6019f368057c00966ac7ce354b1d65bc - name: Setup Bazel - uses: angular/dev-infra/github-actions/bazel/setup@40b2cbdbcc40f36f125d721c4e8decd3bb607ea4 + uses: angular/dev-infra/github-actions/bazel/setup@47572aba6019f368057c00966ac7ce354b1d65bc - name: Setup Bazel RBE - uses: angular/dev-infra/github-actions/bazel/configure-remote@40b2cbdbcc40f36f125d721c4e8decd3bb607ea4 + uses: angular/dev-infra/github-actions/bazel/configure-remote@47572aba6019f368057c00966ac7ce354b1d65bc - name: Install node modules run: yarn install --immutable - name: Build release targets @@ -90,11 +90,11 @@ jobs: runs-on: ubuntu-latest steps: - name: Initialize environment - uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@40b2cbdbcc40f36f125d721c4e8decd3bb607ea4 + uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@47572aba6019f368057c00966ac7ce354b1d65bc - name: Setup Bazel - uses: angular/dev-infra/github-actions/bazel/setup@40b2cbdbcc40f36f125d721c4e8decd3bb607ea4 + uses: angular/dev-infra/github-actions/bazel/setup@47572aba6019f368057c00966ac7ce354b1d65bc - name: Setup Bazel RBE - uses: angular/dev-infra/github-actions/bazel/configure-remote@40b2cbdbcc40f36f125d721c4e8decd3bb607ea4 + uses: angular/dev-infra/github-actions/bazel/configure-remote@47572aba6019f368057c00966ac7ce354b1d65bc - name: Install node modules run: yarn install --immutable - name: Run module and package tests @@ -111,13 +111,13 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Initialize environment - uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@40b2cbdbcc40f36f125d721c4e8decd3bb607ea4 + uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@47572aba6019f368057c00966ac7ce354b1d65bc - name: Install node modules run: yarn install --immutable - name: Setup Bazel - uses: angular/dev-infra/github-actions/bazel/setup@40b2cbdbcc40f36f125d721c4e8decd3bb607ea4 + uses: angular/dev-infra/github-actions/bazel/setup@47572aba6019f368057c00966ac7ce354b1d65bc - name: Setup Bazel RBE - uses: angular/dev-infra/github-actions/bazel/configure-remote@40b2cbdbcc40f36f125d721c4e8decd3bb607ea4 + uses: angular/dev-infra/github-actions/bazel/configure-remote@47572aba6019f368057c00966ac7ce354b1d65bc - name: Run CLI E2E tests run: yarn bazel test --define=E2E_SHARD_TOTAL=6 --define=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.${{ matrix.subset }}_node${{ matrix.node }} @@ -132,13 +132,13 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Initialize environment - uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@40b2cbdbcc40f36f125d721c4e8decd3bb607ea4 + uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@47572aba6019f368057c00966ac7ce354b1d65bc - name: Install node modules run: yarn install --immutable - name: Setup Bazel - uses: angular/dev-infra/github-actions/bazel/setup@40b2cbdbcc40f36f125d721c4e8decd3bb607ea4 + uses: angular/dev-infra/github-actions/bazel/setup@47572aba6019f368057c00966ac7ce354b1d65bc - name: Setup Bazel RBE - uses: angular/dev-infra/github-actions/bazel/configure-remote@40b2cbdbcc40f36f125d721c4e8decd3bb607ea4 + uses: angular/dev-infra/github-actions/bazel/configure-remote@47572aba6019f368057c00966ac7ce354b1d65bc - name: Run CLI E2E tests run: yarn bazel test --define=E2E_SHARD_TOTAL=3 --define=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.${{ matrix.subset }}_node${{ matrix.node }} @@ -155,12 +155,12 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Initialize environment - uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@40b2cbdbcc40f36f125d721c4e8decd3bb607ea4 + uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@47572aba6019f368057c00966ac7ce354b1d65bc - name: Install node modules run: yarn install --immutable - name: Setup Bazel - uses: angular/dev-infra/github-actions/bazel/setup@40b2cbdbcc40f36f125d721c4e8decd3bb607ea4 + uses: angular/dev-infra/github-actions/bazel/setup@47572aba6019f368057c00966ac7ce354b1d65bc - name: Setup Bazel RBE - uses: angular/dev-infra/github-actions/bazel/configure-remote@40b2cbdbcc40f36f125d721c4e8decd3bb607ea4 + uses: angular/dev-infra/github-actions/bazel/configure-remote@47572aba6019f368057c00966ac7ce354b1d65bc - name: Run CLI E2E tests run: yarn bazel test --define=E2E_SHARD_TOTAL=6 --define=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.snapshots.${{ matrix.subset }}_node${{ matrix.node }} From 18ea0db9dc0f5967351793451d132019ba3c1a7c Mon Sep 17 00:00:00 2001 From: Alan Agius <17563226+alan-agius4@users.noreply.github.com> Date: Thu, 13 Mar 2025 09:55:03 +0000 Subject: [PATCH 77/87] release: cut the v18.2.15 release --- CHANGELOG.md | 12 ++++++++++++ package.json | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5cbd49f91311..7e33cf3e3c40 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,15 @@ +<a name="18.2.15"></a> + +# 18.2.15 (2025-03-13) + +### @angular-devkit/build-angular + +| Commit | Type | Description | +| --------------------------------------------------------------------------------------------------- | ---- | --------------------- | +| [255c8a50d](https://github.com/angular/angular-cli/commit/255c8a50d2214747c8121e963afcd96cbff39293) | fix | update babel packages | + +<!-- CHANGELOG SPLIT MARKER --> + <a name="18.2.14"></a> # 18.2.14 (2025-01-29) diff --git a/package.json b/package.json index 60718e34c859..9d2b3f8b5af1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@angular/devkit-repo", - "version": "18.2.14", + "version": "18.2.15", "private": true, "description": "Software Development Kit for Angular", "keywords": [ From 4267a80c5cd1e9e6aaae0f9090e21c2d71a6887f Mon Sep 17 00:00:00 2001 From: Alan Agius <17563226+alan-agius4@users.noreply.github.com> Date: Tue, 25 Mar 2025 07:46:10 +0000 Subject: [PATCH 78/87] fix(@angular-devkit/build-angular): remove `@vitejs/plugin-basic-ssl` from dependencies This dependency is not used in this package. Closes #29921 --- packages/angular_devkit/build_angular/BUILD.bazel | 1 - packages/angular_devkit/build_angular/package.json | 1 - yarn.lock | 1 - 3 files changed, 3 deletions(-) diff --git a/packages/angular_devkit/build_angular/BUILD.bazel b/packages/angular_devkit/build_angular/BUILD.bazel index 3a19f71b208c..fc6a0f43ad91 100644 --- a/packages/angular_devkit/build_angular/BUILD.bazel +++ b/packages/angular_devkit/build_angular/BUILD.bazel @@ -154,7 +154,6 @@ ts_library( "@npm//@types/picomatch", "@npm//@types/semver", "@npm//@types/watchpack", - "@npm//@vitejs/plugin-basic-ssl", "@npm//@web/test-runner", "@npm//ajv", "@npm//ansi-colors", diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json index 0217743c824a..4bdaf4c675ae 100644 --- a/packages/angular_devkit/build_angular/package.json +++ b/packages/angular_devkit/build_angular/package.json @@ -22,7 +22,6 @@ "@babel/runtime": "7.26.10", "@discoveryjs/json-ext": "0.6.1", "@ngtools/webpack": "0.0.0-PLACEHOLDER", - "@vitejs/plugin-basic-ssl": "1.1.0", "ansi-colors": "4.1.3", "autoprefixer": "10.4.20", "babel-loader": "9.1.3", diff --git a/yarn.lock b/yarn.lock index 8cab8b89e647..fd9ba174a0a8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -75,7 +75,6 @@ __metadata: "@babel/runtime": "npm:7.26.10" "@discoveryjs/json-ext": "npm:0.6.1" "@ngtools/webpack": "npm:0.0.0-PLACEHOLDER" - "@vitejs/plugin-basic-ssl": "npm:1.1.0" ansi-colors: "npm:4.1.3" autoprefixer: "npm:10.4.20" babel-loader: "npm:9.1.3" From 9c2904d0d3a7b2790b27d21c1ff23e6d8a01c4f0 Mon Sep 17 00:00:00 2001 From: Alan Agius <17563226+alan-agius4@users.noreply.github.com> Date: Wed, 26 Mar 2025 07:54:18 +0000 Subject: [PATCH 79/87] fix(@angular/build): update vite to 5.4.15 This fixes https://github.com/vitejs/vite/security/advisories/GHSA-x574-m823-4x7w Closes #29936 --- package.json | 2 +- packages/angular/build/package.json | 2 +- yarn.lock | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index 9d2b3f8b5af1..d4bcb3ad9345 100644 --- a/package.json +++ b/package.json @@ -201,7 +201,7 @@ "undici": "6.19.7", "verdaccio": "5.32.1", "verdaccio-auth-memory": "^10.0.0", - "vite": "5.4.14", + "vite": "5.4.15", "watchpack": "2.4.1", "webpack": "5.94.0", "webpack-dev-middleware": "7.4.2", diff --git a/packages/angular/build/package.json b/packages/angular/build/package.json index 0f420f8f4ca4..00a946ba789c 100644 --- a/packages/angular/build/package.json +++ b/packages/angular/build/package.json @@ -41,7 +41,7 @@ "rollup": "4.22.4", "sass": "1.77.6", "semver": "7.6.3", - "vite": "5.4.14", + "vite": "5.4.15", "watchpack": "2.4.1" }, "peerDependencies": { diff --git a/yarn.lock b/yarn.lock index fd9ba174a0a8..1e652162a413 100644 --- a/yarn.lock +++ b/yarn.lock @@ -399,7 +399,7 @@ __metadata: rollup: "npm:4.22.4" sass: "npm:1.77.6" semver: "npm:7.6.3" - vite: "npm:5.4.14" + vite: "npm:5.4.15" watchpack: "npm:2.4.1" peerDependencies: "@angular/compiler-cli": ^18.0.0 @@ -803,7 +803,7 @@ __metadata: undici: "npm:6.19.7" verdaccio: "npm:5.32.1" verdaccio-auth-memory: "npm:^10.0.0" - vite: "npm:5.4.14" + vite: "npm:5.4.15" watchpack: "npm:2.4.1" webpack: "npm:5.94.0" webpack-dev-middleware: "npm:7.4.2" @@ -18249,9 +18249,9 @@ __metadata: languageName: node linkType: hard -"vite@npm:5.4.14": - version: 5.4.14 - resolution: "vite@npm:5.4.14" +"vite@npm:5.4.15": + version: 5.4.15 + resolution: "vite@npm:5.4.15" dependencies: esbuild: "npm:^0.21.3" fsevents: "npm:~2.3.3" @@ -18288,7 +18288,7 @@ __metadata: optional: true bin: vite: bin/vite.js - checksum: 10c0/8842933bd70ca6a98489a0bb9c8464bec373de00f9a97c8c7a4e64b24d15c88bfaa8c1acb38a68c3e5eb49072ffbccb146842c2d4edcdd036a9802964cffe3d1 + checksum: 10c0/f8a4893bf9d57fe3ded6dc0a2278e8ded707fc9cf38d5a3255fe3caaeea41c52f29bf4deb5e85c9e8dbc8848e9046a7306727ca3fb7b67847d75ee2f2afda5e5 languageName: node linkType: hard From e4b6363ae6696151f62f53f370283469bec41a0f Mon Sep 17 00:00:00 2001 From: Alan Agius <17563226+alan-agius4@users.noreply.github.com> Date: Wed, 26 Mar 2025 09:41:05 +0000 Subject: [PATCH 80/87] release: cut the v18.2.16 release --- CHANGELOG.md | 18 ++++++++++++++++++ package.json | 2 +- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7e33cf3e3c40..562aa5824a94 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,21 @@ +<a name="18.2.16"></a> + +# 18.2.16 (2025-03-26) + +### @angular-devkit/build-angular + +| Commit | Type | Description | +| --------------------------------------------------------------------------------------------------- | ---- | --------------------------------------------------- | +| [4267a80c5](https://github.com/angular/angular-cli/commit/4267a80c5cd1e9e6aaae0f9090e21c2d71a6887f) | fix | remove `@vitejs/plugin-basic-ssl` from dependencies | + +### @angular/build + +| Commit | Type | Description | +| --------------------------------------------------------------------------------------------------- | ---- | --------------------- | +| [9c2904d0d](https://github.com/angular/angular-cli/commit/9c2904d0d3a7b2790b27d21c1ff23e6d8a01c4f0) | fix | update vite to 5.4.15 | + +<!-- CHANGELOG SPLIT MARKER --> + <a name="18.2.15"></a> # 18.2.15 (2025-03-13) diff --git a/package.json b/package.json index d4bcb3ad9345..8121c9a9e7d0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@angular/devkit-repo", - "version": "18.2.15", + "version": "18.2.16", "private": true, "description": "Software Development Kit for Angular", "keywords": [ From 247ceff7f7d71901f51dbab1c1a5235d59e45847 Mon Sep 17 00:00:00 2001 From: Alan Agius <17563226+alan-agius4@users.noreply.github.com> Date: Wed, 2 Apr 2025 09:12:03 +0000 Subject: [PATCH 81/87] fix(@angular/build): update vite to 5.4.16 due to a security issues Addresses GHSA-4r4m-qw57-chr8 Closes #29996 --- package.json | 2 +- packages/angular/build/package.json | 2 +- yarn.lock | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index 8121c9a9e7d0..3c088bb35af9 100644 --- a/package.json +++ b/package.json @@ -201,7 +201,7 @@ "undici": "6.19.7", "verdaccio": "5.32.1", "verdaccio-auth-memory": "^10.0.0", - "vite": "5.4.15", + "vite": "5.4.16", "watchpack": "2.4.1", "webpack": "5.94.0", "webpack-dev-middleware": "7.4.2", diff --git a/packages/angular/build/package.json b/packages/angular/build/package.json index 00a946ba789c..6aab2fb1ac22 100644 --- a/packages/angular/build/package.json +++ b/packages/angular/build/package.json @@ -41,7 +41,7 @@ "rollup": "4.22.4", "sass": "1.77.6", "semver": "7.6.3", - "vite": "5.4.15", + "vite": "5.4.16", "watchpack": "2.4.1" }, "peerDependencies": { diff --git a/yarn.lock b/yarn.lock index 1e652162a413..0f0a5ba374ee 100644 --- a/yarn.lock +++ b/yarn.lock @@ -399,7 +399,7 @@ __metadata: rollup: "npm:4.22.4" sass: "npm:1.77.6" semver: "npm:7.6.3" - vite: "npm:5.4.15" + vite: "npm:5.4.16" watchpack: "npm:2.4.1" peerDependencies: "@angular/compiler-cli": ^18.0.0 @@ -803,7 +803,7 @@ __metadata: undici: "npm:6.19.7" verdaccio: "npm:5.32.1" verdaccio-auth-memory: "npm:^10.0.0" - vite: "npm:5.4.15" + vite: "npm:5.4.16" watchpack: "npm:2.4.1" webpack: "npm:5.94.0" webpack-dev-middleware: "npm:7.4.2" @@ -18249,9 +18249,9 @@ __metadata: languageName: node linkType: hard -"vite@npm:5.4.15": - version: 5.4.15 - resolution: "vite@npm:5.4.15" +"vite@npm:5.4.16": + version: 5.4.16 + resolution: "vite@npm:5.4.16" dependencies: esbuild: "npm:^0.21.3" fsevents: "npm:~2.3.3" @@ -18288,7 +18288,7 @@ __metadata: optional: true bin: vite: bin/vite.js - checksum: 10c0/f8a4893bf9d57fe3ded6dc0a2278e8ded707fc9cf38d5a3255fe3caaeea41c52f29bf4deb5e85c9e8dbc8848e9046a7306727ca3fb7b67847d75ee2f2afda5e5 + checksum: 10c0/10faad2614c24a4ff65a680acfe9f71a90eba6c291ecf2d98919eb72c16d7d39b40e54e859d6a48c139a497829c3546cd2ae95be31f1a4145cba560d3d6e1b12 languageName: node linkType: hard From 303bee91957cc0a98cd8827a41b6a5bfef872be8 Mon Sep 17 00:00:00 2001 From: Jan Martin <jan.krems@gmail.com> Date: Wed, 2 Apr 2025 09:42:45 -0700 Subject: [PATCH 82/87] release: cut the v18.2.17 release --- CHANGELOG.md | 12 ++++++++++++ package.json | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 562aa5824a94..e690e3dc3389 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,15 @@ +<a name="18.2.17"></a> + +# 18.2.17 (2025-04-02) + +### @angular/build + +| Commit | Type | Description | +| --------------------------------------------------------------------------------------------------- | ---- | ---------------------------------------------- | +| [247ceff7f](https://github.com/angular/angular-cli/commit/247ceff7f7d71901f51dbab1c1a5235d59e45847) | fix | update vite to 5.4.16 due to a security issues | + +<!-- CHANGELOG SPLIT MARKER --> + <a name="18.2.16"></a> # 18.2.16 (2025-03-26) diff --git a/package.json b/package.json index 3c088bb35af9..3f95a56a92d5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@angular/devkit-repo", - "version": "18.2.16", + "version": "18.2.17", "private": true, "description": "Software Development Kit for Angular", "keywords": [ From 4245ca7b434e0aa859c805c459ce50238601b940 Mon Sep 17 00:00:00 2001 From: Alan Agius <17563226+alan-agius4@users.noreply.github.com> Date: Wed, 9 Apr 2025 06:23:00 +0000 Subject: [PATCH 83/87] fix(@angular/build): update vite to 5.4.17 This fixes GHSA-xcj6-pq6g-qj4x Closes #30056 --- package.json | 2 +- packages/angular/build/package.json | 2 +- yarn.lock | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index 3f95a56a92d5..d9fff3177a18 100644 --- a/package.json +++ b/package.json @@ -201,7 +201,7 @@ "undici": "6.19.7", "verdaccio": "5.32.1", "verdaccio-auth-memory": "^10.0.0", - "vite": "5.4.16", + "vite": "~5.4.17", "watchpack": "2.4.1", "webpack": "5.94.0", "webpack-dev-middleware": "7.4.2", diff --git a/packages/angular/build/package.json b/packages/angular/build/package.json index 6aab2fb1ac22..380edf29b4e4 100644 --- a/packages/angular/build/package.json +++ b/packages/angular/build/package.json @@ -41,7 +41,7 @@ "rollup": "4.22.4", "sass": "1.77.6", "semver": "7.6.3", - "vite": "5.4.16", + "vite": "~5.4.17", "watchpack": "2.4.1" }, "peerDependencies": { diff --git a/yarn.lock b/yarn.lock index 0f0a5ba374ee..2c32a8bab185 100644 --- a/yarn.lock +++ b/yarn.lock @@ -399,7 +399,7 @@ __metadata: rollup: "npm:4.22.4" sass: "npm:1.77.6" semver: "npm:7.6.3" - vite: "npm:5.4.16" + vite: "npm:~5.4.17" watchpack: "npm:2.4.1" peerDependencies: "@angular/compiler-cli": ^18.0.0 @@ -803,7 +803,7 @@ __metadata: undici: "npm:6.19.7" verdaccio: "npm:5.32.1" verdaccio-auth-memory: "npm:^10.0.0" - vite: "npm:5.4.16" + vite: "npm:~5.4.17" watchpack: "npm:2.4.1" webpack: "npm:5.94.0" webpack-dev-middleware: "npm:7.4.2" @@ -18249,9 +18249,9 @@ __metadata: languageName: node linkType: hard -"vite@npm:5.4.16": - version: 5.4.16 - resolution: "vite@npm:5.4.16" +"vite@npm:~5.4.17": + version: 5.4.17 + resolution: "vite@npm:5.4.17" dependencies: esbuild: "npm:^0.21.3" fsevents: "npm:~2.3.3" @@ -18288,7 +18288,7 @@ __metadata: optional: true bin: vite: bin/vite.js - checksum: 10c0/10faad2614c24a4ff65a680acfe9f71a90eba6c291ecf2d98919eb72c16d7d39b40e54e859d6a48c139a497829c3546cd2ae95be31f1a4145cba560d3d6e1b12 + checksum: 10c0/3322bd6d8da30cbc87b1b24cd14fdbca75abb36de81217d1062c8b4c574a1a0d28d11dfe23a3eed08b3d179d2bdc1510e0d7b9f3e1b722a45bd7631c7cec72eb languageName: node linkType: hard From 5dae85adb3491c40048c7db9e46b8fed89f1a826 Mon Sep 17 00:00:00 2001 From: Alan Agius <17563226+alan-agius4@users.noreply.github.com> Date: Wed, 9 Apr 2025 06:36:18 +0000 Subject: [PATCH 84/87] ci: update angular dev-infra actions This is needed to refresh the tokens --- .../assistant-to-the-branch-manager.yml | 2 +- .github/workflows/ci.yml | 42 +++++++++---------- .github/workflows/dev-infra.yml | 4 +- .github/workflows/feature-requests.yml | 2 +- .github/workflows/pr.yml | 34 +++++++-------- 5 files changed, 42 insertions(+), 42 deletions(-) diff --git a/.github/workflows/assistant-to-the-branch-manager.yml b/.github/workflows/assistant-to-the-branch-manager.yml index db83a4227fcc..80e4137f473e 100644 --- a/.github/workflows/assistant-to-the-branch-manager.yml +++ b/.github/workflows/assistant-to-the-branch-manager.yml @@ -16,6 +16,6 @@ jobs: - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 with: persist-credentials: false - - uses: angular/dev-infra/github-actions/branch-manager@47572aba6019f368057c00966ac7ce354b1d65bc + - uses: angular/dev-infra/github-actions/branch-manager@b45dfa77df2021b23eeda5928ca6cd8bb89b21e7 with: angular-robot-key: ${{ secrets.ANGULAR_ROBOT_PRIVATE_KEY }} diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5b80b308ed0f..1d79da4519e0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,7 +21,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Initialize environment - uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@47572aba6019f368057c00966ac7ce354b1d65bc + uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@b45dfa77df2021b23eeda5928ca6cd8bb89b21e7 - name: Install node modules run: yarn install --immutable - name: Generate JSON schema types @@ -42,11 +42,11 @@ jobs: runs-on: ubuntu-latest steps: - name: Initialize environment - uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@47572aba6019f368057c00966ac7ce354b1d65bc + uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@b45dfa77df2021b23eeda5928ca6cd8bb89b21e7 - name: Setup Bazel - uses: angular/dev-infra/github-actions/bazel/setup@47572aba6019f368057c00966ac7ce354b1d65bc + uses: angular/dev-infra/github-actions/bazel/setup@b45dfa77df2021b23eeda5928ca6cd8bb89b21e7 - name: Setup Bazel RBE - uses: angular/dev-infra/github-actions/bazel/configure-remote@47572aba6019f368057c00966ac7ce354b1d65bc + uses: angular/dev-infra/github-actions/bazel/configure-remote@b45dfa77df2021b23eeda5928ca6cd8bb89b21e7 - name: Install node modules run: yarn install --immutable - name: Build release targets @@ -56,11 +56,11 @@ jobs: runs-on: ubuntu-latest steps: - name: Initialize environment - uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@47572aba6019f368057c00966ac7ce354b1d65bc + uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@b45dfa77df2021b23eeda5928ca6cd8bb89b21e7 - name: Setup Bazel - uses: angular/dev-infra/github-actions/bazel/setup@47572aba6019f368057c00966ac7ce354b1d65bc + uses: angular/dev-infra/github-actions/bazel/setup@b45dfa77df2021b23eeda5928ca6cd8bb89b21e7 - name: Setup Bazel RBE - uses: angular/dev-infra/github-actions/bazel/configure-remote@47572aba6019f368057c00966ac7ce354b1d65bc + uses: angular/dev-infra/github-actions/bazel/configure-remote@b45dfa77df2021b23eeda5928ca6cd8bb89b21e7 - name: Install node modules run: yarn install --immutable - name: Run module and package tests @@ -90,13 +90,13 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Initialize environment - uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@47572aba6019f368057c00966ac7ce354b1d65bc + uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@b45dfa77df2021b23eeda5928ca6cd8bb89b21e7 - name: Install node modules run: yarn install --immutable - name: Setup Bazel - uses: angular/dev-infra/github-actions/bazel/setup@47572aba6019f368057c00966ac7ce354b1d65bc + uses: angular/dev-infra/github-actions/bazel/setup@b45dfa77df2021b23eeda5928ca6cd8bb89b21e7 - name: Setup Bazel RBE - uses: angular/dev-infra/github-actions/bazel/configure-remote@47572aba6019f368057c00966ac7ce354b1d65bc + uses: angular/dev-infra/github-actions/bazel/configure-remote@b45dfa77df2021b23eeda5928ca6cd8bb89b21e7 - name: Run CLI E2E tests run: yarn bazel test --define=E2E_SHARD_TOTAL=6 --define=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.${{ matrix.subset }}_node${{ matrix.node }} @@ -111,13 +111,13 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Initialize environment - uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@47572aba6019f368057c00966ac7ce354b1d65bc + uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@b45dfa77df2021b23eeda5928ca6cd8bb89b21e7 - name: Install node modules run: yarn install --immutable - name: Setup Bazel - uses: angular/dev-infra/github-actions/bazel/setup@47572aba6019f368057c00966ac7ce354b1d65bc + uses: angular/dev-infra/github-actions/bazel/setup@b45dfa77df2021b23eeda5928ca6cd8bb89b21e7 - name: Setup Bazel RBE - uses: angular/dev-infra/github-actions/bazel/configure-remote@47572aba6019f368057c00966ac7ce354b1d65bc + uses: angular/dev-infra/github-actions/bazel/configure-remote@b45dfa77df2021b23eeda5928ca6cd8bb89b21e7 - name: Run CLI E2E tests run: yarn bazel test --define=E2E_SHARD_TOTAL=3 --define=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.${{ matrix.subset }}_node${{ matrix.node }} @@ -132,13 +132,13 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Initialize environment - uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@47572aba6019f368057c00966ac7ce354b1d65bc + uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@b45dfa77df2021b23eeda5928ca6cd8bb89b21e7 - name: Install node modules run: yarn install --immutable - name: Setup Bazel - uses: angular/dev-infra/github-actions/bazel/setup@47572aba6019f368057c00966ac7ce354b1d65bc + uses: angular/dev-infra/github-actions/bazel/setup@b45dfa77df2021b23eeda5928ca6cd8bb89b21e7 - name: Setup Bazel RBE - uses: angular/dev-infra/github-actions/bazel/configure-remote@47572aba6019f368057c00966ac7ce354b1d65bc + uses: angular/dev-infra/github-actions/bazel/configure-remote@b45dfa77df2021b23eeda5928ca6cd8bb89b21e7 - name: Run CLI E2E tests run: yarn bazel test --define=E2E_SHARD_TOTAL=6 --define=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.snapshots.${{ matrix.subset }}_node${{ matrix.node }} @@ -149,13 +149,13 @@ jobs: SAUCE_TUNNEL_IDENTIFIER: angular-cli-${{ github.workflow }}-${{ github.run_number }} steps: - name: Initialize environment - uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@47572aba6019f368057c00966ac7ce354b1d65bc + uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@b45dfa77df2021b23eeda5928ca6cd8bb89b21e7 - name: Install node modules run: yarn install --immutable - name: Setup Bazel - uses: angular/dev-infra/github-actions/bazel/setup@47572aba6019f368057c00966ac7ce354b1d65bc + uses: angular/dev-infra/github-actions/bazel/setup@b45dfa77df2021b23eeda5928ca6cd8bb89b21e7 - name: Setup Bazel RBE - uses: angular/dev-infra/github-actions/bazel/configure-remote@47572aba6019f368057c00966ac7ce354b1d65bc + uses: angular/dev-infra/github-actions/bazel/configure-remote@b45dfa77df2021b23eeda5928ca6cd8bb89b21e7 - name: Run E2E Browser tests env: SAUCE_USERNAME: ${{ vars.SAUCE_USERNAME }} @@ -182,11 +182,11 @@ jobs: CIRCLE_BRANCH: ${{ github.ref_name }} steps: - name: Initialize environment - uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@47572aba6019f368057c00966ac7ce354b1d65bc + uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@b45dfa77df2021b23eeda5928ca6cd8bb89b21e7 - name: Install node modules run: yarn install --immutable - name: Setup Bazel - uses: angular/dev-infra/github-actions/bazel/setup@47572aba6019f368057c00966ac7ce354b1d65bc + uses: angular/dev-infra/github-actions/bazel/setup@b45dfa77df2021b23eeda5928ca6cd8bb89b21e7 - run: yarn admin snapshots --verbose env: SNAPSHOT_BUILDS_GITHUB_TOKEN: ${{ secrets.SNAPSHOT_BUILDS_GITHUB_TOKEN }} diff --git a/.github/workflows/dev-infra.yml b/.github/workflows/dev-infra.yml index 44846786e854..9b463f5ea679 100644 --- a/.github/workflows/dev-infra.yml +++ b/.github/workflows/dev-infra.yml @@ -13,13 +13,13 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - - uses: angular/dev-infra/github-actions/commit-message-based-labels@47572aba6019f368057c00966ac7ce354b1d65bc + - uses: angular/dev-infra/github-actions/commit-message-based-labels@b45dfa77df2021b23eeda5928ca6cd8bb89b21e7 with: angular-robot-key: ${{ secrets.ANGULAR_ROBOT_PRIVATE_KEY }} post_approval_changes: runs-on: ubuntu-latest steps: - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - - uses: angular/dev-infra/github-actions/post-approval-changes@47572aba6019f368057c00966ac7ce354b1d65bc + - uses: angular/dev-infra/github-actions/post-approval-changes@b45dfa77df2021b23eeda5928ca6cd8bb89b21e7 with: angular-robot-key: ${{ secrets.ANGULAR_ROBOT_PRIVATE_KEY }} diff --git a/.github/workflows/feature-requests.yml b/.github/workflows/feature-requests.yml index 5e922d9c70f0..dd958b875b54 100644 --- a/.github/workflows/feature-requests.yml +++ b/.github/workflows/feature-requests.yml @@ -16,6 +16,6 @@ jobs: if: github.repository == 'angular/angular-cli' runs-on: ubuntu-latest steps: - - uses: angular/dev-infra/github-actions/feature-request@47572aba6019f368057c00966ac7ce354b1d65bc + - uses: angular/dev-infra/github-actions/feature-request@b45dfa77df2021b23eeda5928ca6cd8bb89b21e7 with: angular-robot-key: ${{ secrets.ANGULAR_ROBOT_PRIVATE_KEY }} diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index fcdb1b25d798..2433194ec7c0 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -34,7 +34,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Initialize environment - uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@47572aba6019f368057c00966ac7ce354b1d65bc + uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@b45dfa77df2021b23eeda5928ca6cd8bb89b21e7 - name: Setup ESLint Caching uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4.2.2 with: @@ -54,7 +54,7 @@ jobs: - name: Run Validation run: yarn admin validate - name: Check Package Licenses - uses: angular/dev-infra/github-actions/linting/licenses@47572aba6019f368057c00966ac7ce354b1d65bc + uses: angular/dev-infra/github-actions/linting/licenses@b45dfa77df2021b23eeda5928ca6cd8bb89b21e7 - name: Check tooling setup run: yarn check-tooling-setup - name: Check commit message @@ -70,11 +70,11 @@ jobs: runs-on: ubuntu-latest steps: - name: Initialize environment - uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@47572aba6019f368057c00966ac7ce354b1d65bc + uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@b45dfa77df2021b23eeda5928ca6cd8bb89b21e7 - name: Setup Bazel - uses: angular/dev-infra/github-actions/bazel/setup@47572aba6019f368057c00966ac7ce354b1d65bc + uses: angular/dev-infra/github-actions/bazel/setup@b45dfa77df2021b23eeda5928ca6cd8bb89b21e7 - name: Setup Bazel RBE - uses: angular/dev-infra/github-actions/bazel/configure-remote@47572aba6019f368057c00966ac7ce354b1d65bc + uses: angular/dev-infra/github-actions/bazel/configure-remote@b45dfa77df2021b23eeda5928ca6cd8bb89b21e7 - name: Install node modules run: yarn install --immutable - name: Build release targets @@ -90,11 +90,11 @@ jobs: runs-on: ubuntu-latest steps: - name: Initialize environment - uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@47572aba6019f368057c00966ac7ce354b1d65bc + uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@b45dfa77df2021b23eeda5928ca6cd8bb89b21e7 - name: Setup Bazel - uses: angular/dev-infra/github-actions/bazel/setup@47572aba6019f368057c00966ac7ce354b1d65bc + uses: angular/dev-infra/github-actions/bazel/setup@b45dfa77df2021b23eeda5928ca6cd8bb89b21e7 - name: Setup Bazel RBE - uses: angular/dev-infra/github-actions/bazel/configure-remote@47572aba6019f368057c00966ac7ce354b1d65bc + uses: angular/dev-infra/github-actions/bazel/configure-remote@b45dfa77df2021b23eeda5928ca6cd8bb89b21e7 - name: Install node modules run: yarn install --immutable - name: Run module and package tests @@ -111,13 +111,13 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Initialize environment - uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@47572aba6019f368057c00966ac7ce354b1d65bc + uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@b45dfa77df2021b23eeda5928ca6cd8bb89b21e7 - name: Install node modules run: yarn install --immutable - name: Setup Bazel - uses: angular/dev-infra/github-actions/bazel/setup@47572aba6019f368057c00966ac7ce354b1d65bc + uses: angular/dev-infra/github-actions/bazel/setup@b45dfa77df2021b23eeda5928ca6cd8bb89b21e7 - name: Setup Bazel RBE - uses: angular/dev-infra/github-actions/bazel/configure-remote@47572aba6019f368057c00966ac7ce354b1d65bc + uses: angular/dev-infra/github-actions/bazel/configure-remote@b45dfa77df2021b23eeda5928ca6cd8bb89b21e7 - name: Run CLI E2E tests run: yarn bazel test --define=E2E_SHARD_TOTAL=6 --define=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.${{ matrix.subset }}_node${{ matrix.node }} @@ -132,13 +132,13 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Initialize environment - uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@47572aba6019f368057c00966ac7ce354b1d65bc + uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@b45dfa77df2021b23eeda5928ca6cd8bb89b21e7 - name: Install node modules run: yarn install --immutable - name: Setup Bazel - uses: angular/dev-infra/github-actions/bazel/setup@47572aba6019f368057c00966ac7ce354b1d65bc + uses: angular/dev-infra/github-actions/bazel/setup@b45dfa77df2021b23eeda5928ca6cd8bb89b21e7 - name: Setup Bazel RBE - uses: angular/dev-infra/github-actions/bazel/configure-remote@47572aba6019f368057c00966ac7ce354b1d65bc + uses: angular/dev-infra/github-actions/bazel/configure-remote@b45dfa77df2021b23eeda5928ca6cd8bb89b21e7 - name: Run CLI E2E tests run: yarn bazel test --define=E2E_SHARD_TOTAL=3 --define=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.${{ matrix.subset }}_node${{ matrix.node }} @@ -155,12 +155,12 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Initialize environment - uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@47572aba6019f368057c00966ac7ce354b1d65bc + uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@b45dfa77df2021b23eeda5928ca6cd8bb89b21e7 - name: Install node modules run: yarn install --immutable - name: Setup Bazel - uses: angular/dev-infra/github-actions/bazel/setup@47572aba6019f368057c00966ac7ce354b1d65bc + uses: angular/dev-infra/github-actions/bazel/setup@b45dfa77df2021b23eeda5928ca6cd8bb89b21e7 - name: Setup Bazel RBE - uses: angular/dev-infra/github-actions/bazel/configure-remote@47572aba6019f368057c00966ac7ce354b1d65bc + uses: angular/dev-infra/github-actions/bazel/configure-remote@b45dfa77df2021b23eeda5928ca6cd8bb89b21e7 - name: Run CLI E2E tests run: yarn bazel test --define=E2E_SHARD_TOTAL=6 --define=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.snapshots.${{ matrix.subset }}_node${{ matrix.node }} From 2b1dc211e5d0f520942e778958d12d4116f6c23e Mon Sep 17 00:00:00 2001 From: Doug Parker <dgp1130@users.noreply.github.com> Date: Wed, 9 Apr 2025 10:15:05 -0700 Subject: [PATCH 85/87] release: cut the v18.2.18 release --- CHANGELOG.md | 12 ++++++++++++ package.json | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e690e3dc3389..852c99c576fa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,15 @@ +<a name="18.2.18"></a> + +# 18.2.18 (2025-04-09) + +### @angular/build + +| Commit | Type | Description | +| --------------------------------------------------------------------------------------------------- | ---- | --------------------- | +| [4245ca7b4](https://github.com/angular/angular-cli/commit/4245ca7b434e0aa859c805c459ce50238601b940) | fix | update vite to 5.4.17 | + +<!-- CHANGELOG SPLIT MARKER --> + <a name="18.2.17"></a> # 18.2.17 (2025-04-02) diff --git a/package.json b/package.json index d9fff3177a18..ce936f67d24c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@angular/devkit-repo", - "version": "18.2.17", + "version": "18.2.18", "private": true, "description": "Software Development Kit for Angular", "keywords": [ From 01cc617bc0e0a5a30c3b86f679494500a914c574 Mon Sep 17 00:00:00 2001 From: Charles Lyding <19598772+clydin@users.noreply.github.com> Date: Thu, 17 Apr 2025 21:24:16 -0400 Subject: [PATCH 86/87] fix(@angular-devkit/build-angular): update http-proxy-middleware to v3.0.5 Addresses https://github.com/advisories/GHSA-4www-5p9h-95mh --- package.json | 2 +- packages/angular_devkit/build_angular/package.json | 2 +- yarn.lock | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index ce936f67d24c..373145f6d323 100644 --- a/package.json +++ b/package.json @@ -139,7 +139,7 @@ "express": "4.19.2", "fast-glob": "3.3.2", "http-proxy": "^1.18.1", - "http-proxy-middleware": "3.0.3", + "http-proxy-middleware": "3.0.5", "https-proxy-agent": "7.0.5", "husky": "9.1.4", "ini": "4.1.3", diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json index 4bdaf4c675ae..a1f1e0e641ed 100644 --- a/packages/angular_devkit/build_angular/package.json +++ b/packages/angular_devkit/build_angular/package.json @@ -31,7 +31,7 @@ "css-loader": "7.1.2", "esbuild-wasm": "0.23.0", "fast-glob": "3.3.2", - "http-proxy-middleware": "3.0.3", + "http-proxy-middleware": "3.0.5", "https-proxy-agent": "7.0.5", "istanbul-lib-instrument": "6.0.3", "jsonc-parser": "3.3.1", diff --git a/yarn.lock b/yarn.lock index 2c32a8bab185..0dd2baabd9e7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -85,7 +85,7 @@ __metadata: esbuild: "npm:0.23.0" esbuild-wasm: "npm:0.23.0" fast-glob: "npm:3.3.2" - http-proxy-middleware: "npm:3.0.3" + http-proxy-middleware: "npm:3.0.5" https-proxy-agent: "npm:7.0.5" istanbul-lib-instrument: "npm:6.0.3" jsonc-parser: "npm:3.3.1" @@ -741,7 +741,7 @@ __metadata: express: "npm:4.19.2" fast-glob: "npm:3.3.2" http-proxy: "npm:^1.18.1" - http-proxy-middleware: "npm:3.0.3" + http-proxy-middleware: "npm:3.0.5" https-proxy-agent: "npm:7.0.5" husky: "npm:9.1.4" ini: "npm:4.1.3" @@ -10777,9 +10777,9 @@ __metadata: languageName: node linkType: hard -"http-proxy-middleware@npm:3.0.3": - version: 3.0.3 - resolution: "http-proxy-middleware@npm:3.0.3" +"http-proxy-middleware@npm:3.0.5": + version: 3.0.5 + resolution: "http-proxy-middleware@npm:3.0.5" dependencies: "@types/http-proxy": "npm:^1.17.15" debug: "npm:^4.3.6" @@ -10787,7 +10787,7 @@ __metadata: is-glob: "npm:^4.0.3" is-plain-object: "npm:^5.0.0" micromatch: "npm:^4.0.8" - checksum: 10c0/c4d68a10d8d42f02e59f7dc8249c98d1ac03aecee177b42c2d8b6a0cb6b71c6688e759e5387f4cdb570150070ca1c6808b38010cbdf67f4500a2e75671a36e05 + checksum: 10c0/89ff3c8fe65b22b8042a6173ae1b8f77c5171f7eecf3c8b5d6dcffe3c9d688acae7bcf498cc08d1525f566dc0781efaec4e2ddc49224b1f16f020de7987a446b languageName: node linkType: hard From cfb0a4f5a90b0e440f47ef607bf7a54bb28d3d27 Mon Sep 17 00:00:00 2001 From: Alan Agius <17563226+alan-agius4@users.noreply.github.com> Date: Wed, 23 Apr 2025 08:35:03 +0000 Subject: [PATCH 87/87] release: cut the v18.2.19 release --- CHANGELOG.md | 12 ++++++++++++ package.json | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 852c99c576fa..7afe0797e7d1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,15 @@ +<a name="18.2.19"></a> + +# 18.2.19 (2025-04-23) + +### @angular-devkit/build-angular + +| Commit | Type | Description | +| --------------------------------------------------------------------------------------------------- | ---- | -------------------------------------- | +| [01cc617bc](https://github.com/angular/angular-cli/commit/01cc617bc0e0a5a30c3b86f679494500a914c574) | fix | update http-proxy-middleware to v3.0.5 | + +<!-- CHANGELOG SPLIT MARKER --> + <a name="18.2.18"></a> # 18.2.18 (2025-04-09) diff --git a/package.json b/package.json index 373145f6d323..cea4a3f4aa3c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@angular/devkit-repo", - "version": "18.2.18", + "version": "18.2.19", "private": true, "description": "Software Development Kit for Angular", "keywords": [