From 8ce57fea5fc906b55c02c42bb775e65da831f772 Mon Sep 17 00:00:00 2001 From: cexbrayat Date: Thu, 17 Oct 2024 11:31:04 +0200 Subject: [PATCH 01/11] refactor(@schematics/angular): spacing fixes after experimental zoneless introduction --- .../files/module-files/src/app/app.component.spec.ts.template | 4 ++-- .../standalone-files/src/app/app.component.spec.ts.template | 4 ++-- .../files/standalone-files/src/app/app.config.ts.template | 4 +--- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/packages/schematics/angular/application/files/module-files/src/app/app.component.spec.ts.template b/packages/schematics/angular/application/files/module-files/src/app/app.component.spec.ts.template index acd295776916..1575222d09d9 100644 --- a/packages/schematics/angular/application/files/module-files/src/app/app.component.spec.ts.template +++ b/packages/schematics/angular/application/files/module-files/src/app/app.component.spec.ts.template @@ -11,8 +11,8 @@ describe('AppComponent', () => { ],<% } %> declarations: [ AppComponent - ], - <% if(experimentalZoneless) { %>providers: [provideExperimentalZonelessChangeDetection()]<% } %> + ],<% if(experimentalZoneless) { %> + providers: [provideExperimentalZonelessChangeDetection()]<% } %> }).compileComponents(); }); diff --git a/packages/schematics/angular/application/files/standalone-files/src/app/app.component.spec.ts.template b/packages/schematics/angular/application/files/standalone-files/src/app/app.component.spec.ts.template index 94a09da84375..300f7b6466ae 100644 --- a/packages/schematics/angular/application/files/standalone-files/src/app/app.component.spec.ts.template +++ b/packages/schematics/angular/application/files/standalone-files/src/app/app.component.spec.ts.template @@ -5,8 +5,8 @@ import { AppComponent } from './app.component'; describe('AppComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ - imports: [AppComponent], - <% if(experimentalZoneless) { %>providers: [provideExperimentalZonelessChangeDetection()]<% } %> + imports: [AppComponent],<% if(experimentalZoneless) { %> + providers: [provideExperimentalZonelessChangeDetection()]<% } %> }).compileComponents(); }); diff --git a/packages/schematics/angular/application/files/standalone-files/src/app/app.config.ts.template b/packages/schematics/angular/application/files/standalone-files/src/app/app.config.ts.template index 26c02f5e489a..98551b4f24d0 100644 --- a/packages/schematics/angular/application/files/standalone-files/src/app/app.config.ts.template +++ b/packages/schematics/angular/application/files/standalone-files/src/app/app.config.ts.template @@ -4,7 +4,5 @@ import { provideRouter } from '@angular/router'; import { routes } from './app.routes';<% } %> export const appConfig: ApplicationConfig = { - providers: [ - <% if(experimentalZoneless) { %>provideExperimentalZonelessChangeDetection()<% } else { %>provideZoneChangeDetection({ eventCoalescing: true })<% } %><% if (routing) {%>, provideRouter(routes)<% } %> - ] + providers: [<% if(experimentalZoneless) { %>provideExperimentalZonelessChangeDetection()<% } else { %>provideZoneChangeDetection({ eventCoalescing: true })<% } %><% if (routing) {%>, provideRouter(routes)<% } %>] }; From 3db884a12ae582526789f5d2f80fea15d06157e3 Mon Sep 17 00:00:00 2001 From: Angular Robot Date: Thu, 17 Oct 2024 05:14:42 +0000 Subject: [PATCH 02/11] build: update angular --- package.json | 24 +-- packages/angular/ssr/package.json | 12 +- packages/ngtools/webpack/package.json | 4 +- tests/legacy-cli/e2e/ng-snapshot/package.json | 26 +-- yarn.lock | 188 +++++++++--------- 5 files changed, 127 insertions(+), 127 deletions(-) diff --git a/package.json b/package.json index 7db57e2cdaf0..98f3864fce67 100644 --- a/package.json +++ b/package.json @@ -52,23 +52,23 @@ }, "devDependencies": { "@ampproject/remapping": "2.3.0", - "@angular/animations": "19.0.0-next.9", + "@angular/animations": "19.0.0-next.10", "@angular/bazel": "patch:@angular/bazel@https%3A//github.com/angular/bazel-builds.git%23commit=07617f0f8540d27f8895b1820a6f994e1e5b7277#~/.yarn/patches/@angular-bazel-https-9848736cf4.patch", "@angular/build-tooling": "https://github.com/angular/dev-infra-private-build-tooling-builds.git#2692c81ef1068e15c7b7eaf3ecc7a65cbdd25c9f", "@angular/cdk": "19.0.0-next.8", - "@angular/common": "19.0.0-next.9", - "@angular/compiler": "19.0.0-next.9", - "@angular/compiler-cli": "19.0.0-next.9", - "@angular/core": "19.0.0-next.9", - "@angular/forms": "19.0.0-next.9", - "@angular/localize": "19.0.0-next.9", + "@angular/common": "19.0.0-next.10", + "@angular/compiler": "19.0.0-next.10", + "@angular/compiler-cli": "19.0.0-next.10", + "@angular/core": "19.0.0-next.10", + "@angular/forms": "19.0.0-next.10", + "@angular/localize": "19.0.0-next.10", "@angular/material": "19.0.0-next.8", "@angular/ng-dev": "https://github.com/angular/dev-infra-private-ng-dev-builds.git#2659cef857ffd127dbbbcbb28bb2dc4ca8625b50", - "@angular/platform-browser": "19.0.0-next.9", - "@angular/platform-browser-dynamic": "19.0.0-next.9", - "@angular/platform-server": "19.0.0-next.9", - "@angular/router": "19.0.0-next.9", - "@angular/service-worker": "19.0.0-next.9", + "@angular/platform-browser": "19.0.0-next.10", + "@angular/platform-browser-dynamic": "19.0.0-next.10", + "@angular/platform-server": "19.0.0-next.10", + "@angular/router": "19.0.0-next.10", + "@angular/service-worker": "19.0.0-next.10", "@babel/core": "7.25.8", "@babel/generator": "7.25.7", "@babel/helper-annotate-as-pure": "7.25.7", diff --git a/packages/angular/ssr/package.json b/packages/angular/ssr/package.json index 408e1acb6813..af3108f8b38e 100644 --- a/packages/angular/ssr/package.json +++ b/packages/angular/ssr/package.json @@ -22,12 +22,12 @@ "@angular/router": "^19.0.0-next.0" }, "devDependencies": { - "@angular/common": "19.0.0-next.9", - "@angular/compiler": "19.0.0-next.9", - "@angular/core": "19.0.0-next.9", - "@angular/platform-browser": "19.0.0-next.9", - "@angular/platform-server": "19.0.0-next.9", - "@angular/router": "19.0.0-next.9", + "@angular/common": "19.0.0-next.10", + "@angular/compiler": "19.0.0-next.10", + "@angular/core": "19.0.0-next.10", + "@angular/platform-browser": "19.0.0-next.10", + "@angular/platform-server": "19.0.0-next.10", + "@angular/router": "19.0.0-next.10", "@bazel/runfiles": "^5.8.1" }, "schematics": "./schematics/collection.json", diff --git a/packages/ngtools/webpack/package.json b/packages/ngtools/webpack/package.json index 74c7190827a9..d5f3b92ae9c7 100644 --- a/packages/ngtools/webpack/package.json +++ b/packages/ngtools/webpack/package.json @@ -27,8 +27,8 @@ }, "devDependencies": { "@angular-devkit/core": "0.0.0-PLACEHOLDER", - "@angular/compiler": "19.0.0-next.9", - "@angular/compiler-cli": "19.0.0-next.9", + "@angular/compiler": "19.0.0-next.10", + "@angular/compiler-cli": "19.0.0-next.10", "typescript": "5.6.3", "webpack": "5.95.0" } diff --git a/tests/legacy-cli/e2e/ng-snapshot/package.json b/tests/legacy-cli/e2e/ng-snapshot/package.json index 5f8fffece73f..9cd110a971df 100644 --- a/tests/legacy-cli/e2e/ng-snapshot/package.json +++ b/tests/legacy-cli/e2e/ng-snapshot/package.json @@ -2,21 +2,21 @@ "description": "snapshot versions of Angular for e2e testing", "private": true, "dependencies": { - "@angular/animations": "github:angular/animations-builds#a6515a9123c48cd4d9ee31daa69ded6b8b357872", + "@angular/animations": "github:angular/animations-builds#ef3ce5e787d5f870c0f7c21510706400fa11722e", "@angular/cdk": "github:angular/cdk-builds#376404c773bc651f313e7d5e0f42dd6fabfb55db", - "@angular/common": "github:angular/common-builds#faf058aea686cb610b9c75cd98aba047154533c4", - "@angular/compiler": "github:angular/compiler-builds#395e6976d7b1c04978ed31f3170a336722ffd09d", - "@angular/compiler-cli": "github:angular/compiler-cli-builds#0259f5b926a6ce5dd876647d4efbc8f3ffea161c", - "@angular/core": "github:angular/core-builds#74c060d5d256a166378c2f90a56ed3d17d7fee59", - "@angular/forms": "github:angular/forms-builds#12f75f8344cd94bdcefff7daee7a97c73a06c0ba", - "@angular/language-service": "github:angular/language-service-builds#8c45bf63422029cdaa203183860d4186cdd57d94", - "@angular/localize": "github:angular/localize-builds#b156942dac5030f1fa39f4230cec96de895f9b9f", + "@angular/common": "github:angular/common-builds#049304f01a5bc5e758539932769598d13c72ab4c", + "@angular/compiler": "github:angular/compiler-builds#c487461b6699cba896b46bef755c0b0d5452ba8e", + "@angular/compiler-cli": "github:angular/compiler-cli-builds#e47428be5964227c77a133e1d8f5ab791cba9d20", + "@angular/core": "github:angular/core-builds#dab315712fdf6edcf7a1e15a8b04180df014de7b", + "@angular/forms": "github:angular/forms-builds#2e42a6e88be33a5931aee21bf53d0a08a70ab04f", + "@angular/language-service": "github:angular/language-service-builds#2d1d429c1a5d043966ad12dadb06c1e6c02dce90", + "@angular/localize": "github:angular/localize-builds#ef01885e209ca3e94e450695af8f42623fb92718", "@angular/material": "github:angular/material-builds#051bc235964598b6a616a52510217c9e5fea9c46", "@angular/material-moment-adapter": "github:angular/material-moment-adapter-builds#d6c95738690917961d6c0d3ff1759ca707b696bf", - "@angular/platform-browser": "github:angular/platform-browser-builds#691e91fffa748582a74896e98b65de4d30f01116", - "@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds#e7ec7c4ecfcc1be1d88090d5743e93085641acfe", - "@angular/platform-server": "github:angular/platform-server-builds#63dcbb67c5582b8ed2d347b3168acf643658d834", - "@angular/router": "github:angular/router-builds#5d188935296281cc596afc3d50c1d0d73c0dd5bd", - "@angular/service-worker": "github:angular/service-worker-builds#4baac08899ac332404262b8252de24950e89498a" + "@angular/platform-browser": "github:angular/platform-browser-builds#cd5b7869733a23f948158c8490f1a52807c14023", + "@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds#5978ab37e4047188628783eba84ebca1596ce9d1", + "@angular/platform-server": "github:angular/platform-server-builds#17444a8ea00f2c0d67783056590ef77f54ffcae7", + "@angular/router": "github:angular/router-builds#17d028eade1086859bbb05e7f9c9f79db4faabff", + "@angular/service-worker": "github:angular/service-worker-builds#a585fa97bfcdbdc0bbf6d088ccdd1610eb2aa35c" } } diff --git a/yarn.lock b/yarn.lock index 5d8ad77da8f0..daf0bc4aa3e0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -245,14 +245,14 @@ __metadata: languageName: unknown linkType: soft -"@angular/animations@npm:19.0.0-next.9": - version: 19.0.0-next.9 - resolution: "@angular/animations@npm:19.0.0-next.9" +"@angular/animations@npm:19.0.0-next.10": + version: 19.0.0-next.10 + resolution: "@angular/animations@npm:19.0.0-next.10" dependencies: tslib: "npm:^2.3.0" peerDependencies: - "@angular/core": 19.0.0-next.9 - checksum: 10c0/ddf350f623a49b45a6e10e6cc687441b0974106aab03606e54c2b610bcf5fc49eb27be0ab26620eb593d45629ca5a7ed091643c149c8739abfaa68b212996891 + "@angular/core": 19.0.0-next.10 + checksum: 10c0/332065e9833b6e876008aa345a55c8621b7cc3dee51734eb57b1181bf6db9325210cb4715de58dbdc0ac04dded94db556d43783f2f082f8b11e40bbe88447fd6 languageName: node linkType: hard @@ -542,21 +542,21 @@ __metadata: languageName: unknown linkType: soft -"@angular/common@npm:19.0.0-next.9": - version: 19.0.0-next.9 - resolution: "@angular/common@npm:19.0.0-next.9" +"@angular/common@npm:19.0.0-next.10": + version: 19.0.0-next.10 + resolution: "@angular/common@npm:19.0.0-next.10" dependencies: tslib: "npm:^2.3.0" peerDependencies: - "@angular/core": 19.0.0-next.9 + "@angular/core": 19.0.0-next.10 rxjs: ^6.5.3 || ^7.4.0 - checksum: 10c0/3f1c4e15c70b821a4b908e236897f11cb776e8c8be52f71ad408978bd2ec26d277e8d022916e28937c1465967b387fefa561ff58c51bc57f739b9629df8ed205 + checksum: 10c0/d9af4fa90ac321745131b4be3430cda36cb7976290a15cafec4b859413687b3f097a8ebe3d550b86a836506e5ffdf497cf21c9e968a9c89402f161192ef718d0 languageName: node linkType: hard -"@angular/compiler-cli@npm:19.0.0-next.9": - version: 19.0.0-next.9 - resolution: "@angular/compiler-cli@npm:19.0.0-next.9" +"@angular/compiler-cli@npm:19.0.0-next.10": + version: 19.0.0-next.10 + resolution: "@angular/compiler-cli@npm:19.0.0-next.10" dependencies: "@babel/core": "npm:7.25.2" "@jridgewell/sourcemap-codec": "npm:^1.4.14" @@ -567,39 +567,39 @@ __metadata: tslib: "npm:^2.3.0" yargs: "npm:^17.2.1" peerDependencies: - "@angular/compiler": 19.0.0-next.9 + "@angular/compiler": 19.0.0-next.10 typescript: ">=5.5 <5.7" bin: ng-xi18n: bundles/src/bin/ng_xi18n.js ngc: bundles/src/bin/ngc.js ngcc: bundles/ngcc/index.js - checksum: 10c0/3c0dd266e0b004f7d66d84235b77ff71b521324d572ea5f104e7e1a5aba8aa7454896104d6df2dfe765ea8899399f8a6410b420a1091f4711b5afcbbbdaffcc4 + checksum: 10c0/5518bb05917a3c76d12f7edea200701d38370301ee433bd6f41ad6d6f449c78f91a303cd229cddc44dfd5a717d17935d4eb0edb317f8d006d67a45fa1da928fe languageName: node linkType: hard -"@angular/compiler@npm:19.0.0-next.9": - version: 19.0.0-next.9 - resolution: "@angular/compiler@npm:19.0.0-next.9" +"@angular/compiler@npm:19.0.0-next.10": + version: 19.0.0-next.10 + resolution: "@angular/compiler@npm:19.0.0-next.10" dependencies: tslib: "npm:^2.3.0" peerDependencies: - "@angular/core": 19.0.0-next.9 + "@angular/core": 19.0.0-next.10 peerDependenciesMeta: "@angular/core": optional: true - checksum: 10c0/a59171fd1ed2d14ca781e272a2763fc176d72090f27a7c2fcdabe148900926b4b7ec1dc362d7e182fa77ff297d80b7b1110204b2056bb878d0de0ca787522576 + checksum: 10c0/d47bea126b88ca1c69128afc75c0594a956440814d1f90f6a35244df571f21d154597a9e41dcb276e799453f9c4278318a648546d1a4ab317f698d88d1b38c04 languageName: node linkType: hard -"@angular/core@npm:19.0.0-next.9": - version: 19.0.0-next.9 - resolution: "@angular/core@npm:19.0.0-next.9" +"@angular/core@npm:19.0.0-next.10": + version: 19.0.0-next.10 + resolution: "@angular/core@npm:19.0.0-next.10" dependencies: tslib: "npm:^2.3.0" peerDependencies: rxjs: ^6.5.3 || ^7.4.0 zone.js: ~0.15.0 - checksum: 10c0/80d0052e1b10dccc6652ef07755451158611ee7675c493c803d7f4021f41a4ab4c05e27af374064c8a74e12703f73697a19b24d650aa9eb5306f8c9d067ab304 + checksum: 10c0/2f5bd110ed0ded090f5b096207ac269bdf10de7f95880a60a35b2eaab911475ddd1226c16979aecce2dd4119f7369c2994a5341e86fc7fa8bebf54f55cd693cc languageName: node linkType: hard @@ -630,23 +630,23 @@ __metadata: resolution: "@angular/devkit-repo@workspace:." dependencies: "@ampproject/remapping": "npm:2.3.0" - "@angular/animations": "npm:19.0.0-next.9" + "@angular/animations": "npm:19.0.0-next.10" "@angular/bazel": "patch:@angular/bazel@https%3A//github.com/angular/bazel-builds.git%23commit=07617f0f8540d27f8895b1820a6f994e1e5b7277#~/.yarn/patches/@angular-bazel-https-9848736cf4.patch" "@angular/build-tooling": "https://github.com/angular/dev-infra-private-build-tooling-builds.git#2692c81ef1068e15c7b7eaf3ecc7a65cbdd25c9f" "@angular/cdk": "npm:19.0.0-next.8" - "@angular/common": "npm:19.0.0-next.9" - "@angular/compiler": "npm:19.0.0-next.9" - "@angular/compiler-cli": "npm:19.0.0-next.9" - "@angular/core": "npm:19.0.0-next.9" - "@angular/forms": "npm:19.0.0-next.9" - "@angular/localize": "npm:19.0.0-next.9" + "@angular/common": "npm:19.0.0-next.10" + "@angular/compiler": "npm:19.0.0-next.10" + "@angular/compiler-cli": "npm:19.0.0-next.10" + "@angular/core": "npm:19.0.0-next.10" + "@angular/forms": "npm:19.0.0-next.10" + "@angular/localize": "npm:19.0.0-next.10" "@angular/material": "npm:19.0.0-next.8" "@angular/ng-dev": "https://github.com/angular/dev-infra-private-ng-dev-builds.git#2659cef857ffd127dbbbcbb28bb2dc4ca8625b50" - "@angular/platform-browser": "npm:19.0.0-next.9" - "@angular/platform-browser-dynamic": "npm:19.0.0-next.9" - "@angular/platform-server": "npm:19.0.0-next.9" - "@angular/router": "npm:19.0.0-next.9" - "@angular/service-worker": "npm:19.0.0-next.9" + "@angular/platform-browser": "npm:19.0.0-next.10" + "@angular/platform-browser-dynamic": "npm:19.0.0-next.10" + "@angular/platform-server": "npm:19.0.0-next.10" + "@angular/router": "npm:19.0.0-next.10" + "@angular/service-worker": "npm:19.0.0-next.10" "@babel/core": "npm:7.25.8" "@babel/generator": "npm:7.25.7" "@babel/helper-annotate-as-pure": "npm:7.25.7" @@ -800,36 +800,36 @@ __metadata: languageName: unknown linkType: soft -"@angular/forms@npm:19.0.0-next.9": - version: 19.0.0-next.9 - resolution: "@angular/forms@npm:19.0.0-next.9" +"@angular/forms@npm:19.0.0-next.10": + version: 19.0.0-next.10 + resolution: "@angular/forms@npm:19.0.0-next.10" dependencies: tslib: "npm:^2.3.0" peerDependencies: - "@angular/common": 19.0.0-next.9 - "@angular/core": 19.0.0-next.9 - "@angular/platform-browser": 19.0.0-next.9 + "@angular/common": 19.0.0-next.10 + "@angular/core": 19.0.0-next.10 + "@angular/platform-browser": 19.0.0-next.10 rxjs: ^6.5.3 || ^7.4.0 - checksum: 10c0/aaa3d7332e52a32c8eade8a4db830447cfb16787f187dcf744b0fba069c787231899a92cacfb06ead53bb10bfca586e594f0df364d29aaf0e90d4f61e964efab + checksum: 10c0/8aca3d4cf90599498571cbaddea67d79f07283a610758a020330d56274222ce77b85f71dd46ba40d22854e07805acb327072564fa9bc14539c189bb5f78084d1 languageName: node linkType: hard -"@angular/localize@npm:19.0.0-next.9": - version: 19.0.0-next.9 - resolution: "@angular/localize@npm:19.0.0-next.9" +"@angular/localize@npm:19.0.0-next.10": + version: 19.0.0-next.10 + resolution: "@angular/localize@npm:19.0.0-next.10" dependencies: "@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": 19.0.0-next.9 - "@angular/compiler-cli": 19.0.0-next.9 + "@angular/compiler": 19.0.0-next.10 + "@angular/compiler-cli": 19.0.0-next.10 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/523ba4e0f538780b4fe2f1e984dade05a72040b1e9d717271054743104bdbdac3d1edd6b8ad92ffa289ac04b0190667b2919fc88c2bd5a0bb285ff94eb30022e + checksum: 10c0/f91c6dea65cddf030b1ed5168ee2e0bd4bb9aec53a3f79d9b6e824da31765bcf9d5570097c9b4d7c87b313a4dfd19961c0ea76279ad8112b71d8286d3cc95f9b languageName: node linkType: hard @@ -870,49 +870,49 @@ __metadata: languageName: node linkType: hard -"@angular/platform-browser-dynamic@npm:19.0.0-next.9": - version: 19.0.0-next.9 - resolution: "@angular/platform-browser-dynamic@npm:19.0.0-next.9" +"@angular/platform-browser-dynamic@npm:19.0.0-next.10": + version: 19.0.0-next.10 + resolution: "@angular/platform-browser-dynamic@npm:19.0.0-next.10" dependencies: tslib: "npm:^2.3.0" peerDependencies: - "@angular/common": 19.0.0-next.9 - "@angular/compiler": 19.0.0-next.9 - "@angular/core": 19.0.0-next.9 - "@angular/platform-browser": 19.0.0-next.9 - checksum: 10c0/0b8c8723fc4810985ad19eb38a1adc79ffccdd9f88e0ba3d3ae24a5996b855d5fa41c1c05bcd233d0f9755435933c280ebe486b5bd8a0cd7a1145dffc4d7a9e9 + "@angular/common": 19.0.0-next.10 + "@angular/compiler": 19.0.0-next.10 + "@angular/core": 19.0.0-next.10 + "@angular/platform-browser": 19.0.0-next.10 + checksum: 10c0/ddf9e23b6ea1fb272d6a4e5884703ca5aa97306632dd86ba8346fdd54ffdb99c0b17629d88ea22aa7e67d30cf6687964bf35f3312b180b129c4e7b12410c91d2 languageName: node linkType: hard -"@angular/platform-browser@npm:19.0.0-next.9": - version: 19.0.0-next.9 - resolution: "@angular/platform-browser@npm:19.0.0-next.9" +"@angular/platform-browser@npm:19.0.0-next.10": + version: 19.0.0-next.10 + resolution: "@angular/platform-browser@npm:19.0.0-next.10" dependencies: tslib: "npm:^2.3.0" peerDependencies: - "@angular/animations": 19.0.0-next.9 - "@angular/common": 19.0.0-next.9 - "@angular/core": 19.0.0-next.9 + "@angular/animations": 19.0.0-next.10 + "@angular/common": 19.0.0-next.10 + "@angular/core": 19.0.0-next.10 peerDependenciesMeta: "@angular/animations": optional: true - checksum: 10c0/a02b48878bb4b2dd624232bded002ceb025c88c443327ce1d3462d99b0534d3554f767a1842abde3d19840a23ec90cc602585e18853171ea171f9b74e5473037 + checksum: 10c0/fec51e3465b51acdf91791e67a182d53ef3646d3a2535b2efdbfb7a2471dc85aba11d6d5542802fc100abb62358e3a6795253bed78a00cd335201fa55aa5d0fa languageName: node linkType: hard -"@angular/platform-server@npm:19.0.0-next.9": - version: 19.0.0-next.9 - resolution: "@angular/platform-server@npm:19.0.0-next.9" +"@angular/platform-server@npm:19.0.0-next.10": + version: 19.0.0-next.10 + resolution: "@angular/platform-server@npm:19.0.0-next.10" dependencies: tslib: "npm:^2.3.0" xhr2: "npm:^0.2.0" peerDependencies: - "@angular/animations": 19.0.0-next.9 - "@angular/common": 19.0.0-next.9 - "@angular/compiler": 19.0.0-next.9 - "@angular/core": 19.0.0-next.9 - "@angular/platform-browser": 19.0.0-next.9 - checksum: 10c0/ca2c901481354ba49e8f3528ed1b6e65490850bb0b6bb23609da034af1e6f8f2ceea574309b58c80c437c4b2ab2dcc47d08c0993ef4f3b88fbc1cfcabb32feb1 + "@angular/animations": 19.0.0-next.10 + "@angular/common": 19.0.0-next.10 + "@angular/compiler": 19.0.0-next.10 + "@angular/core": 19.0.0-next.10 + "@angular/platform-browser": 19.0.0-next.10 + checksum: 10c0/ca6e4973ca5160c4d4dd51acd12e92e7c848c2a3a25ef03b6fa8f209a9f6a7452483dad45b0ea2a845beb66932bdfaab2bf411d48e0bdb0e6068b7022c03920c languageName: node linkType: hard @@ -931,31 +931,31 @@ __metadata: languageName: unknown linkType: soft -"@angular/router@npm:19.0.0-next.9": - version: 19.0.0-next.9 - resolution: "@angular/router@npm:19.0.0-next.9" +"@angular/router@npm:19.0.0-next.10": + version: 19.0.0-next.10 + resolution: "@angular/router@npm:19.0.0-next.10" dependencies: tslib: "npm:^2.3.0" peerDependencies: - "@angular/common": 19.0.0-next.9 - "@angular/core": 19.0.0-next.9 - "@angular/platform-browser": 19.0.0-next.9 + "@angular/common": 19.0.0-next.10 + "@angular/core": 19.0.0-next.10 + "@angular/platform-browser": 19.0.0-next.10 rxjs: ^6.5.3 || ^7.4.0 - checksum: 10c0/97522b51507cb53671cc410c1db115a8f593bf3eb263692bd6052c8a0c2fe9df0e5141412ca3a6eab8c2295d75dbb803b2e631ae5a25665985897ed858a2845d + checksum: 10c0/39e163cd6148f4298517f4bd5c0bc1488e93a765041a51b0d5e81fd05fde4897e422e64f1956debf4d365e912e955314f59a853df8d85b9da31e8eb3de4c40bb languageName: node linkType: hard -"@angular/service-worker@npm:19.0.0-next.9": - version: 19.0.0-next.9 - resolution: "@angular/service-worker@npm:19.0.0-next.9" +"@angular/service-worker@npm:19.0.0-next.10": + version: 19.0.0-next.10 + resolution: "@angular/service-worker@npm:19.0.0-next.10" dependencies: tslib: "npm:^2.3.0" peerDependencies: - "@angular/common": 19.0.0-next.9 - "@angular/core": 19.0.0-next.9 + "@angular/common": 19.0.0-next.10 + "@angular/core": 19.0.0-next.10 bin: ngsw-config: ngsw-config.js - checksum: 10c0/0548cc25a68fa67e4803b1459265aa8222932ae87ba4e6b00e19e665259f2cfed27017fba268580a073d6da8084da7ff214546437cc30e0642eaed344985984e + checksum: 10c0/0db1691e0e1217548e18d4c3d76e1aad9de61aca0984d15196c205cb6beb21dcc297b7c14f1b76e07aace369cae8b5b7b43fa1e7187fbf20b05b77536ead3b69 languageName: node linkType: hard @@ -963,12 +963,12 @@ __metadata: version: 0.0.0-use.local resolution: "@angular/ssr@workspace:packages/angular/ssr" dependencies: - "@angular/common": "npm:19.0.0-next.9" - "@angular/compiler": "npm:19.0.0-next.9" - "@angular/core": "npm:19.0.0-next.9" - "@angular/platform-browser": "npm:19.0.0-next.9" - "@angular/platform-server": "npm:19.0.0-next.9" - "@angular/router": "npm:19.0.0-next.9" + "@angular/common": "npm:19.0.0-next.10" + "@angular/compiler": "npm:19.0.0-next.10" + "@angular/core": "npm:19.0.0-next.10" + "@angular/platform-browser": "npm:19.0.0-next.10" + "@angular/platform-server": "npm:19.0.0-next.10" + "@angular/router": "npm:19.0.0-next.10" "@bazel/runfiles": "npm:^5.8.1" tslib: "npm:^2.3.0" peerDependencies: @@ -3470,8 +3470,8 @@ __metadata: resolution: "@ngtools/webpack@workspace:packages/ngtools/webpack" dependencies: "@angular-devkit/core": "npm:0.0.0-PLACEHOLDER" - "@angular/compiler": "npm:19.0.0-next.9" - "@angular/compiler-cli": "npm:19.0.0-next.9" + "@angular/compiler": "npm:19.0.0-next.10" + "@angular/compiler-cli": "npm:19.0.0-next.10" typescript: "npm:5.6.3" webpack: "npm:5.95.0" peerDependencies: From 3cbbf456c12d8224420a14389325c9939d2fd194 Mon Sep 17 00:00:00 2001 From: Alan Agius Date: Thu, 17 Oct 2024 09:35:32 +0000 Subject: [PATCH 03/11] refactor: handle standalone by default change In tests, add `standalone: false` where it's missing. Note: In the future, we should update our integration tests to use a standalone app. --- .../hello-world-app/src/app/app.component.ts | 1 + .../tests/behavior/rebuild-errors_spec.ts | 5 +- .../tests/behavior/rebuild-general_spec.ts | 1 + .../behavior/rebuild-web-workers_spec.ts | 1 + .../behavior/web-workers-application_spec.ts | 1 + .../tests/options/app-shell_spec.ts | 1 + .../options/external-dependencies_spec.ts | 1 + .../src/builders/app-shell/app-shell_spec.ts | 1 + .../src/builders/browser/specs/styles_spec.ts | 4 ++ .../src/builders/browser/specs/svg_spec.ts | 1 + .../tests/behavior/rebuild-errors_spec.ts | 12 ++-- .../karma/tests/behavior/fake-async_spec.ts | 1 + .../karma/tests/options/assets_spec.ts | 1 + .../karma/tests/options/code-coverage_spec.ts | 1 + .../karma/tests/options/styles_spec.ts | 2 + .../tests/options/web-worker-tsconfig_spec.ts | 1 + .../src/builders/prerender/works_spec.ts | 1 + .../projects/lib/src/lib/lib.module.ts | 19 ------ .../projects/lib/src/public-api.ts | 1 - .../test/angular-app/src/app/app.component.ts | 1 + .../legacy-cli/e2e/tests/basic/standalone.ts | 58 ------------------- .../e2e/tests/misc/trusted-types.ts | 2 +- 22 files changed, 31 insertions(+), 86 deletions(-) delete mode 100644 packages/angular_devkit/build_angular/test/hello-world-lib/projects/lib/src/lib/lib.module.ts delete mode 100644 tests/legacy-cli/e2e/tests/basic/standalone.ts diff --git a/modules/testing/builder/projects/hello-world-app/src/app/app.component.ts b/modules/testing/builder/projects/hello-world-app/src/app/app.component.ts index 5fd7d4fed2bc..93a041e8aec7 100644 --- a/modules/testing/builder/projects/hello-world-app/src/app/app.component.ts +++ b/modules/testing/builder/projects/hello-world-app/src/app/app.component.ts @@ -10,6 +10,7 @@ import { Component } from '@angular/core'; @Component({ selector: 'app-root', + standalone: false, templateUrl: './app.component.html', styleUrls: ['./app.component.css'], }) diff --git a/packages/angular/build/src/builders/application/tests/behavior/rebuild-errors_spec.ts b/packages/angular/build/src/builders/application/tests/behavior/rebuild-errors_spec.ts index 3153e0bd659a..196cbf4e6b5d 100644 --- a/packages/angular/build/src/builders/application/tests/behavior/rebuild-errors_spec.ts +++ b/packages/angular/build/src/builders/application/tests/behavior/rebuild-errors_spec.ts @@ -27,7 +27,7 @@ describeBuilder(buildApplication, APPLICATION_BUILDER_INFO, (harness) => { const goodDirectiveContents = ` import { Directive, Input } from '@angular/core'; - @Directive({ selector: 'dir' }) + @Directive({ selector: 'dir', standalone: false }) export class Dir { @Input() foo: number; } @@ -66,6 +66,7 @@ describeBuilder(buildApplication, APPLICATION_BUILDER_INFO, (harness) => { import { Component } from '@angular/core' @Component({ selector: 'app-root', + standalone: false, template: '', }) export class AppComponent { } @@ -87,7 +88,7 @@ describeBuilder(buildApplication, APPLICATION_BUILDER_INFO, (harness) => { 'src/app/dir.ts', ` import { Directive, Input } from '@angular/core'; - @Directive({ selector: 'dir' }) + @Directive({ selector: 'dir', standalone: false }) export class Dir { @Input() foo: string; } diff --git a/packages/angular/build/src/builders/application/tests/behavior/rebuild-general_spec.ts b/packages/angular/build/src/builders/application/tests/behavior/rebuild-general_spec.ts index efa632bf6574..ca88f94e5b63 100644 --- a/packages/angular/build/src/builders/application/tests/behavior/rebuild-general_spec.ts +++ b/packages/angular/build/src/builders/application/tests/behavior/rebuild-general_spec.ts @@ -38,6 +38,7 @@ describeBuilder(buildApplication, APPLICATION_BUILDER_INFO, (harness) => { import './file-a'; @Component({ selector: 'app-root', + standalone: false, template: 'App component', }) export class AppComponent { } diff --git a/packages/angular/build/src/builders/application/tests/behavior/rebuild-web-workers_spec.ts b/packages/angular/build/src/builders/application/tests/behavior/rebuild-web-workers_spec.ts index 00385d7e8793..421e51f99f5b 100644 --- a/packages/angular/build/src/builders/application/tests/behavior/rebuild-web-workers_spec.ts +++ b/packages/angular/build/src/builders/application/tests/behavior/rebuild-web-workers_spec.ts @@ -47,6 +47,7 @@ describeBuilder(buildApplication, APPLICATION_BUILDER_INFO, (harness) => { import { Component } from '@angular/core' @Component({ selector: 'app-root', + standalone: false, template: '

Worker Test

', }) export class AppComponent { diff --git a/packages/angular/build/src/builders/application/tests/behavior/web-workers-application_spec.ts b/packages/angular/build/src/builders/application/tests/behavior/web-workers-application_spec.ts index e42c5c5fd0df..135d5ff68165 100644 --- a/packages/angular/build/src/builders/application/tests/behavior/web-workers-application_spec.ts +++ b/packages/angular/build/src/builders/application/tests/behavior/web-workers-application_spec.ts @@ -42,6 +42,7 @@ describeBuilder(buildApplication, APPLICATION_BUILDER_INFO, (harness) => { import { Component } from '@angular/core' @Component({ selector: 'app-root', + standalone: false, template: '

Worker Test

', }) export class AppComponent { diff --git a/packages/angular/build/src/builders/application/tests/options/app-shell_spec.ts b/packages/angular/build/src/builders/application/tests/options/app-shell_spec.ts index 4964aacc59ea..afcc67e189aa 100644 --- a/packages/angular/build/src/builders/application/tests/options/app-shell_spec.ts +++ b/packages/angular/build/src/builders/application/tests/options/app-shell_spec.ts @@ -16,6 +16,7 @@ const appShellRouteFiles: Record = { @Component({ selector: 'app-app-shell', + standalone: false, styles: ['div { color: #fff; }'], template: '

app-shell works!

', }) diff --git a/packages/angular/build/src/builders/application/tests/options/external-dependencies_spec.ts b/packages/angular/build/src/builders/application/tests/options/external-dependencies_spec.ts index 27106874bca6..feb9b6447c3b 100644 --- a/packages/angular/build/src/builders/application/tests/options/external-dependencies_spec.ts +++ b/packages/angular/build/src/builders/application/tests/options/external-dependencies_spec.ts @@ -61,6 +61,7 @@ describeBuilder(buildApplication, APPLICATION_BUILDER_INFO, (harness) => { import { Component } from '@angular/core' @Component({ selector: 'app-root', + standalone: false, template: '

Worker Test

', }) export class AppComponent { diff --git a/packages/angular_devkit/build_angular/src/builders/app-shell/app-shell_spec.ts b/packages/angular_devkit/build_angular/src/builders/app-shell/app-shell_spec.ts index b40e1d60a9d9..3174a7db82e7 100644 --- a/packages/angular_devkit/build_angular/src/builders/app-shell/app-shell_spec.ts +++ b/packages/angular_devkit/build_angular/src/builders/app-shell/app-shell_spec.ts @@ -34,6 +34,7 @@ describe('AppShell Builder', () => { @Component({ selector: 'app-app-shell', + standalone: false, templateUrl: './app-shell.component.html', }) export class AppShellComponent implements OnInit { diff --git a/packages/angular_devkit/build_angular/src/builders/browser/specs/styles_spec.ts b/packages/angular_devkit/build_angular/src/builders/browser/specs/styles_spec.ts index 9856bff2adb0..b2e79124c40c 100644 --- a/packages/angular_devkit/build_angular/src/builders/browser/specs/styles_spec.ts +++ b/packages/angular_devkit/build_angular/src/builders/browser/specs/styles_spec.ts @@ -73,6 +73,7 @@ describe('Browser Builder styles', () => { @Component({ selector: 'app-root', + standalone: false, templateUrl: './app.component.html', styleUrls: [] }) @@ -92,6 +93,7 @@ describe('Browser Builder styles', () => { @Component({ selector: 'app-root', + standalone: false, templateUrl: './app.component.html', styles: ['div { mask-composite: add; }'], }) @@ -118,6 +120,7 @@ describe('Browser Builder styles', () => { @Component({ selector: 'app-root', + standalone: false, templateUrl: './app.component.html', styles: ['div { mask-composite: add; }'], }) @@ -637,6 +640,7 @@ describe('Browser Builder styles', () => { @Component({ selector: 'app-root', + standalone: false, templateUrl: './app.component.html', styleUrls: ['../styles.css'] }) diff --git a/packages/angular_devkit/build_angular/src/builders/browser/specs/svg_spec.ts b/packages/angular_devkit/build_angular/src/builders/browser/specs/svg_spec.ts index 2a8f9d8b7726..92f5fd0cda7b 100644 --- a/packages/angular_devkit/build_angular/src/builders/browser/specs/svg_spec.ts +++ b/packages/angular_devkit/build_angular/src/builders/browser/specs/svg_spec.ts @@ -33,6 +33,7 @@ describe('Browser Builder allow svg', () => { @Component({ selector: 'app-root', + standalone: false, templateUrl: './app.component.svg', styleUrls: [] }) diff --git a/packages/angular_devkit/build_angular/src/builders/browser/tests/behavior/rebuild-errors_spec.ts b/packages/angular_devkit/build_angular/src/builders/browser/tests/behavior/rebuild-errors_spec.ts index 903668643ae2..ea4501600bab 100644 --- a/packages/angular_devkit/build_angular/src/builders/browser/tests/behavior/rebuild-errors_spec.ts +++ b/packages/angular_devkit/build_angular/src/builders/browser/tests/behavior/rebuild-errors_spec.ts @@ -22,7 +22,7 @@ describeBuilder(buildWebpackBrowser, BROWSER_BUILDER_INFO, (harness) => { const goodDirectiveContents = ` import { Directive, Input } from '@angular/core'; - @Directive({ selector: 'dir' }) + @Directive({ selector: 'dir', standalone: false }) export class Dir { @Input() foo: number; } @@ -61,6 +61,7 @@ describeBuilder(buildWebpackBrowser, BROWSER_BUILDER_INFO, (harness) => { import { Component } from '@angular/core' @Component({ selector: 'app-root', + standalone: false, template: '', }) export class AppComponent { } @@ -82,7 +83,7 @@ describeBuilder(buildWebpackBrowser, BROWSER_BUILDER_INFO, (harness) => { 'src/app/dir.ts', ` import { Directive, Input } from '@angular/core'; - @Directive({ selector: 'dir' }) + @Directive({ selector: 'dir', standalone: false }) export class Dir { @Input() foo: string; } @@ -162,7 +163,7 @@ describeBuilder(buildWebpackBrowser, BROWSER_BUILDER_INFO, (harness) => { 'src/app/dir.ts', ` import { Directive, Input } from '@angular/core'; - @Directive({ selector: 'dir' }) + @Directive({ selector: 'dir', standalone: false }) export class Dir { @Input() foo: number; } @@ -172,7 +173,7 @@ describeBuilder(buildWebpackBrowser, BROWSER_BUILDER_INFO, (harness) => { // Same selector with a different type on the `foo` property but initially no `@Input` const goodDirectiveContents = ` import { Directive } from '@angular/core'; - @Directive({ selector: 'dir' }) + @Directive({ selector: 'dir', standalone: false }) export class Dir2 { foo: string; } @@ -210,6 +211,7 @@ describeBuilder(buildWebpackBrowser, BROWSER_BUILDER_INFO, (harness) => { import { Component } from '@angular/core' @Component({ selector: 'app-root', + standalone: false, template: '', }) export class AppComponent { } @@ -231,7 +233,7 @@ describeBuilder(buildWebpackBrowser, BROWSER_BUILDER_INFO, (harness) => { 'src/app/dir2.ts', ` import { Directive, Input } from '@angular/core'; - @Directive({ selector: 'dir' }) + @Directive({ selector: 'dir', standalone: false }) export class Dir2 { @Input() foo: string; } diff --git a/packages/angular_devkit/build_angular/src/builders/karma/tests/behavior/fake-async_spec.ts b/packages/angular_devkit/build_angular/src/builders/karma/tests/behavior/fake-async_spec.ts index 463dd625ac7f..355ddda8ed43 100644 --- a/packages/angular_devkit/build_angular/src/builders/karma/tests/behavior/fake-async_spec.ts +++ b/packages/angular_devkit/build_angular/src/builders/karma/tests/behavior/fake-async_spec.ts @@ -22,6 +22,7 @@ describeKarmaBuilder(execute, KARMA_BUILDER_INFO, (harness, setupTarget) => { @Component({ selector: 'app-root', + standalone: false, template: '', }) export class AppComponent { 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 a1a2005c8ab0..058facf64a84 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 @@ -47,6 +47,7 @@ describeKarmaBuilder(execute, KARMA_BUILDER_INFO, (harness, setupTarget) => { @Component({ selector: 'app-root', + standalone: false, template: '

{{ asset.content }}

' }) export class AppComponent { 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 109cc30a4b56..a8849ba643ef 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 @@ -79,6 +79,7 @@ describeKarmaBuilder(execute, KARMA_BUILDER_INFO, (harness, setupTarget) => { @Component({ selector: 'app-root', + standalone: false, templateUrl: './app.component.html', styleUrls: ['./app.component.css'] }) 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 909fcb1a1e09..6ede50e6945c 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 @@ -23,6 +23,7 @@ describeKarmaBuilder(execute, KARMA_BUILDER_INFO, (harness, setupTarget) => { @Component({ selector: 'app-root', + standalone: false, template: '

Hello World

' }) export class AppComponent { @@ -79,6 +80,7 @@ describeKarmaBuilder(execute, KARMA_BUILDER_INFO, (harness, setupTarget) => { import { HttpClient } from '@angular/common/http'; @Component({ selector: 'app-root', + standalone: false, template: '

{{ asset.content }}

' }) export class AppComponent { 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 6c3b74cf0a5e..9c1d6af166d0 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 @@ -45,6 +45,7 @@ describeKarmaBuilder(execute, KARMA_BUILDER_INFO, (harness, setupTarget, isAppli @Component({ selector: 'app-root', + standalone: false, template: '' }) export class AppComponent { diff --git a/packages/angular_devkit/build_angular/src/builders/prerender/works_spec.ts b/packages/angular_devkit/build_angular/src/builders/prerender/works_spec.ts index c54f4c434e7c..abc9fc483554 100644 --- a/packages/angular_devkit/build_angular/src/builders/prerender/works_spec.ts +++ b/packages/angular_devkit/build_angular/src/builders/prerender/works_spec.ts @@ -27,6 +27,7 @@ describe('Prerender Builder', () => { @Component({ selector: 'app-foo', + standalone: false, template: '

foo works!

', }) export class FooComponent {} diff --git a/packages/angular_devkit/build_angular/test/hello-world-lib/projects/lib/src/lib/lib.module.ts b/packages/angular_devkit/build_angular/test/hello-world-lib/projects/lib/src/lib/lib.module.ts deleted file mode 100644 index 33f5b7a71126..000000000000 --- a/packages/angular_devkit/build_angular/test/hello-world-lib/projects/lib/src/lib/lib.module.ts +++ /dev/null @@ -1,19 +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 { NgModule } from '@angular/core'; -import { LibComponent } from './lib.component'; -import { LibService } from './lib.service'; - -@NgModule({ - imports: [ - ], - declarations: [LibComponent], - providers: [LibService] -}) -export class LibModule { } diff --git a/packages/angular_devkit/build_angular/test/hello-world-lib/projects/lib/src/public-api.ts b/packages/angular_devkit/build_angular/test/hello-world-lib/projects/lib/src/public-api.ts index 0df48c2f1f1d..b641e95d8900 100644 --- a/packages/angular_devkit/build_angular/test/hello-world-lib/projects/lib/src/public-api.ts +++ b/packages/angular_devkit/build_angular/test/hello-world-lib/projects/lib/src/public-api.ts @@ -12,4 +12,3 @@ export * from './lib/lib.service'; export * from './lib/lib.component'; -export * from './lib/lib.module'; diff --git a/packages/angular_devkit/build_webpack/test/angular-app/src/app/app.component.ts b/packages/angular_devkit/build_webpack/test/angular-app/src/app/app.component.ts index 5fd7d4fed2bc..93a041e8aec7 100644 --- a/packages/angular_devkit/build_webpack/test/angular-app/src/app/app.component.ts +++ b/packages/angular_devkit/build_webpack/test/angular-app/src/app/app.component.ts @@ -10,6 +10,7 @@ import { Component } from '@angular/core'; @Component({ selector: 'app-root', + standalone: false, templateUrl: './app.component.html', styleUrls: ['./app.component.css'], }) diff --git a/tests/legacy-cli/e2e/tests/basic/standalone.ts b/tests/legacy-cli/e2e/tests/basic/standalone.ts deleted file mode 100644 index 79471b00a4ba..000000000000 --- a/tests/legacy-cli/e2e/tests/basic/standalone.ts +++ /dev/null @@ -1,58 +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 - * - * @fileoverview - * Tests the minimal conversion of a newly generated application - * to use a single standalone component. - */ - -import { writeFile } from '../../utils/fs'; -import { ng } from '../../utils/process'; - -/** - * An application main file that uses a standalone component with - * bootstrapApplication to start the application. `ng-template` and - * `ngIf` are used to ensure that `CommonModule` and `imports` are - * working in standalone mode. - */ -const STANDALONE_MAIN_CONTENT = ` -import { Component } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { bootstrapApplication, provideProtractorTestingSupport } from '@angular/platform-browser'; - -@Component({ - selector: 'app-root', - standalone: true, - template: \` - -
-

Hello, {{name}}

-
- - \`, - imports: [CommonModule], -}) -export class AppComponent { - name = 'test-project'; - isVisible = true; -} - -bootstrapApplication(AppComponent, { - providers: [ provideProtractorTestingSupport() ], -}); -`; - -export default async function () { - // Update to a standalone application - await writeFile('src/main.ts', STANDALONE_MAIN_CONTENT); - - // Execute a production build - await ng('build'); - - // Perform the default E2E tests - await ng('e2e', 'test-project'); -} diff --git a/tests/legacy-cli/e2e/tests/misc/trusted-types.ts b/tests/legacy-cli/e2e/tests/misc/trusted-types.ts index a820dd8b419d..3c927f15ad8d 100644 --- a/tests/legacy-cli/e2e/tests/misc/trusted-types.ts +++ b/tests/legacy-cli/e2e/tests/misc/trusted-types.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.dev/license */ -import { appendToFile, prependToFile, replaceInFile, writeFile } from '../../utils/fs'; +import { replaceInFile, writeFile } from '../../utils/fs'; import { ng } from '../../utils/process'; import { updateJsonFile } from '../../utils/project'; From 1f4428f0b3c06288f8845470c5f8ed5e3bb6daf1 Mon Sep 17 00:00:00 2001 From: Angular Robot Date: Thu, 17 Oct 2024 03:20:26 +0000 Subject: [PATCH 04/11] build: update all non-major dependencies --- package.json | 2 +- packages/angular/build/package.json | 2 +- .../angular_devkit/build_angular/package.json | 2 +- yarn.lock | 22 +++++++++++++++---- 4 files changed, 21 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index 98f3864fce67..9cfee4404b88 100644 --- a/package.json +++ b/package.json @@ -186,7 +186,7 @@ "rollup": "4.24.0", "rollup-plugin-sourcemaps": "^0.6.0", "rxjs": "7.8.1", - "sass": "1.79.5", + "sass": "1.80.1", "sass-loader": "16.0.2", "semver": "7.6.3", "shelljs": "^0.8.5", diff --git a/packages/angular/build/package.json b/packages/angular/build/package.json index aa3978f7197b..58d2133ab78e 100644 --- a/packages/angular/build/package.json +++ b/packages/angular/build/package.json @@ -39,7 +39,7 @@ "picomatch": "4.0.2", "piscina": "4.7.0", "rollup": "4.24.0", - "sass": "1.79.5", + "sass": "1.80.1", "semver": "7.6.3", "vite": "5.4.9", "watchpack": "2.4.2" diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json index c2f146c8f56f..a2ebabdace15 100644 --- a/packages/angular_devkit/build_angular/package.json +++ b/packages/angular_devkit/build_angular/package.json @@ -48,7 +48,7 @@ "postcss-loader": "8.1.1", "resolve-url-loader": "5.0.0", "rxjs": "7.8.1", - "sass": "1.79.5", + "sass": "1.80.1", "sass-loader": "16.0.2", "semver": "7.6.3", "source-map-loader": "5.0.0", diff --git a/yarn.lock b/yarn.lock index daf0bc4aa3e0..95bea598a055 100644 --- a/yarn.lock +++ b/yarn.lock @@ -102,7 +102,7 @@ __metadata: postcss-loader: "npm:8.1.1" resolve-url-loader: "npm:5.0.0" rxjs: "npm:7.8.1" - sass: "npm:1.79.5" + sass: "npm:1.80.1" sass-loader: "npm:16.0.2" semver: "npm:7.6.3" source-map-loader: "npm:5.0.0" @@ -396,7 +396,7 @@ __metadata: picomatch: "npm:4.0.2" piscina: "npm:4.7.0" rollup: "npm:4.24.0" - sass: "npm:1.79.5" + sass: "npm:1.80.1" semver: "npm:7.6.3" vite: "npm:5.4.9" watchpack: "npm:2.4.2" @@ -764,7 +764,7 @@ __metadata: rollup: "npm:4.24.0" rollup-plugin-sourcemaps: "npm:^0.6.0" rxjs: "npm:7.8.1" - sass: "npm:1.79.5" + sass: "npm:1.80.1" sass-loader: "npm:16.0.2" semver: "npm:7.6.3" shelljs: "npm:^0.8.5" @@ -15724,7 +15724,21 @@ __metadata: languageName: node linkType: hard -"sass@npm:1.79.5, sass@npm:^1.79.5": +"sass@npm:1.80.1": + version: 1.80.1 + resolution: "sass@npm:1.80.1" + dependencies: + "@parcel/watcher": "npm:^2.4.1" + chokidar: "npm:^4.0.0" + immutable: "npm:^4.0.0" + source-map-js: "npm:>=0.6.2 <2.0.0" + bin: + sass: sass.js + checksum: 10c0/91ec2b8bcba4c3c68c047fdcbe04cb82646b5cc6446e04d9134ff3c642d9895363de5cbf88869f0a6aa81bcd2de9b8ccba7df7ff35d33a07a18754014ee7a31a + languageName: node + linkType: hard + +"sass@npm:^1.79.5": version: 1.79.5 resolution: "sass@npm:1.79.5" dependencies: From 1654acf0ff3010b619a22d11f17eec9975d8e2a2 Mon Sep 17 00:00:00 2001 From: Charles Lyding <19598772+clydin@users.noreply.github.com> Date: Thu, 17 Oct 2024 10:11:20 -0400 Subject: [PATCH 05/11] fix(@angular/build): relax constraints on external stylesheet component id The number of digits in the component identifier that is generated at runtime can vary. The check for a valid identifier now accounts for this case. --- .../build/src/tools/vite/middlewares/assets-middleware.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 e5d04887aa44..a2633c21af27 100644 --- a/packages/angular/build/src/tools/vite/middlewares/assets-middleware.ts +++ b/packages/angular/build/src/tools/vite/middlewares/assets-middleware.ts @@ -88,7 +88,7 @@ export function createAngularAssetsMiddleware( // Shim the stylesheet if a component ID is provided if (componentId.length > 0) { // Validate component ID - if (/^[_.\-\p{Letter}\d]+-c\d{9}$/u.test(componentId)) { + if (/^[_.\-\p{Letter}\d]+-c\d+$/u.test(componentId)) { loadEsmModule('@angular/compiler') .then((compilerModule) => { const encapsulatedData = compilerModule.encapsulateStyle( From 0b5e5c43def65421db88609a2f61b214dfebe748 Mon Sep 17 00:00:00 2001 From: Charles Lyding <19598772+clydin@users.noreply.github.com> Date: Fri, 18 Oct 2024 09:32:40 -0400 Subject: [PATCH 06/11] refactor(@angular/build): add helper types to internal HTML rewriter The `StartTag` and `EndTag` types are now also exported along with the `htmlRewritingStream` factory. These types are commonly used with the rewriter and by exporting them reduces the need to manually extract them from the underlying methods. --- .../build/src/utils/index-file/html-rewriting-stream.ts | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/packages/angular/build/src/utils/index-file/html-rewriting-stream.ts b/packages/angular/build/src/utils/index-file/html-rewriting-stream.ts index 5ae7c397904d..dbeeadcb2fc1 100644 --- a/packages/angular/build/src/utils/index-file/html-rewriting-stream.ts +++ b/packages/angular/build/src/utils/index-file/html-rewriting-stream.ts @@ -8,10 +8,16 @@ import { Readable } from 'node:stream'; import { pipeline } from 'node:stream/promises'; +import type { RewritingStream } from 'parse5-html-rewriting-stream'; import { loadEsmModule } from '../load-esm'; +// Export helper types for the rewriter +export type StartTag = Parameters[0]; +export type EndTag = Parameters[0]; +export type { RewritingStream }; + export async function htmlRewritingStream(content: string): Promise<{ - rewriter: import('parse5-html-rewriting-stream').RewritingStream; + rewriter: RewritingStream; transformedContent: () => Promise; }> { const { RewritingStream } = await loadEsmModule( From b63607c773ac838c100ef99cd823c5a9eff36f4a Mon Sep 17 00:00:00 2001 From: Angular Robot Date: Fri, 18 Oct 2024 05:17:35 +0000 Subject: [PATCH 07/11] build: update dependency pacote to v20 --- package.json | 2 +- packages/angular/cli/package.json | 2 +- yarn.lock | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index 9cfee4404b88..2cfc992b1829 100644 --- a/package.json +++ b/package.json @@ -172,7 +172,7 @@ "npm-pick-manifest": "10.0.0", "open": "10.1.0", "ora": "5.4.1", - "pacote": "19.0.1", + "pacote": "20.0.0", "parse5-html-rewriting-stream": "7.0.0", "picomatch": "4.0.2", "piscina": "4.7.0", diff --git a/packages/angular/cli/package.json b/packages/angular/cli/package.json index 3a15607deee3..ebd471afd398 100644 --- a/packages/angular/cli/package.json +++ b/packages/angular/cli/package.json @@ -34,7 +34,7 @@ "listr2": "8.2.5", "npm-package-arg": "12.0.0", "npm-pick-manifest": "10.0.0", - "pacote": "19.0.1", + "pacote": "20.0.0", "resolve": "1.22.8", "semver": "7.6.3", "symbol-observable": "4.0.0", diff --git a/yarn.lock b/yarn.lock index 95bea598a055..600f44915c32 100644 --- a/yarn.lock +++ b/yarn.lock @@ -532,7 +532,7 @@ __metadata: listr2: "npm:8.2.5" npm-package-arg: "npm:12.0.0" npm-pick-manifest: "npm:10.0.0" - pacote: "npm:19.0.1" + pacote: "npm:20.0.0" resolve: "npm:1.22.8" semver: "npm:7.6.3" symbol-observable: "npm:4.0.0" @@ -750,7 +750,7 @@ __metadata: npm-pick-manifest: "npm:10.0.0" open: "npm:10.1.0" ora: "npm:5.4.1" - pacote: "npm:19.0.1" + pacote: "npm:20.0.0" parse5-html-rewriting-stream: "npm:7.0.0" picomatch: "npm:4.0.2" piscina: "npm:4.7.0" @@ -14182,9 +14182,9 @@ __metadata: languageName: node linkType: hard -"pacote@npm:19.0.1": - version: 19.0.1 - resolution: "pacote@npm:19.0.1" +"pacote@npm:20.0.0": + version: 20.0.0 + resolution: "pacote@npm:20.0.0" dependencies: "@npmcli/git": "npm:^6.0.0" "@npmcli/installed-package-contents": "npm:^3.0.0" @@ -14205,7 +14205,7 @@ __metadata: tar: "npm:^6.1.11" bin: pacote: bin/index.js - checksum: 10c0/01a1fe755ec7333904c36cd6058e4fcdcfa2869799b929a4a57eb3ac3ca87023825c76aa9e6337904f08f760bff790b592c018357d331acc4c26d2cc273bbc51 + checksum: 10c0/435c385446ecc81b1eb1584f4fa3cb102e630a22877f39b5c1a92eddfeaf222bd027b205e32632be2801e3bcbe525165cdffb5ceca5c13bbc81f8132fe1ba49e languageName: node linkType: hard From c28f5ca7460cc769471046bba45d0d03708f1de7 Mon Sep 17 00:00:00 2001 From: Angular Robot Date: Fri, 18 Oct 2024 17:17:19 +0000 Subject: [PATCH 08/11] build: update angular --- package.json | 4 +-- tests/legacy-cli/e2e/ng-snapshot/package.json | 32 +++++++++---------- yarn.lock | 22 ++++++------- 3 files changed, 29 insertions(+), 29 deletions(-) diff --git a/package.json b/package.json index 2cfc992b1829..f643b75db748 100644 --- a/package.json +++ b/package.json @@ -55,14 +55,14 @@ "@angular/animations": "19.0.0-next.10", "@angular/bazel": "patch:@angular/bazel@https%3A//github.com/angular/bazel-builds.git%23commit=07617f0f8540d27f8895b1820a6f994e1e5b7277#~/.yarn/patches/@angular-bazel-https-9848736cf4.patch", "@angular/build-tooling": "https://github.com/angular/dev-infra-private-build-tooling-builds.git#2692c81ef1068e15c7b7eaf3ecc7a65cbdd25c9f", - "@angular/cdk": "19.0.0-next.8", + "@angular/cdk": "19.0.0-next.9", "@angular/common": "19.0.0-next.10", "@angular/compiler": "19.0.0-next.10", "@angular/compiler-cli": "19.0.0-next.10", "@angular/core": "19.0.0-next.10", "@angular/forms": "19.0.0-next.10", "@angular/localize": "19.0.0-next.10", - "@angular/material": "19.0.0-next.8", + "@angular/material": "19.0.0-next.9", "@angular/ng-dev": "https://github.com/angular/dev-infra-private-ng-dev-builds.git#2659cef857ffd127dbbbcbb28bb2dc4ca8625b50", "@angular/platform-browser": "19.0.0-next.10", "@angular/platform-browser-dynamic": "19.0.0-next.10", diff --git a/tests/legacy-cli/e2e/ng-snapshot/package.json b/tests/legacy-cli/e2e/ng-snapshot/package.json index 9cd110a971df..f3a9d403de76 100644 --- a/tests/legacy-cli/e2e/ng-snapshot/package.json +++ b/tests/legacy-cli/e2e/ng-snapshot/package.json @@ -2,21 +2,21 @@ "description": "snapshot versions of Angular for e2e testing", "private": true, "dependencies": { - "@angular/animations": "github:angular/animations-builds#ef3ce5e787d5f870c0f7c21510706400fa11722e", - "@angular/cdk": "github:angular/cdk-builds#376404c773bc651f313e7d5e0f42dd6fabfb55db", - "@angular/common": "github:angular/common-builds#049304f01a5bc5e758539932769598d13c72ab4c", - "@angular/compiler": "github:angular/compiler-builds#c487461b6699cba896b46bef755c0b0d5452ba8e", - "@angular/compiler-cli": "github:angular/compiler-cli-builds#e47428be5964227c77a133e1d8f5ab791cba9d20", - "@angular/core": "github:angular/core-builds#dab315712fdf6edcf7a1e15a8b04180df014de7b", - "@angular/forms": "github:angular/forms-builds#2e42a6e88be33a5931aee21bf53d0a08a70ab04f", - "@angular/language-service": "github:angular/language-service-builds#2d1d429c1a5d043966ad12dadb06c1e6c02dce90", - "@angular/localize": "github:angular/localize-builds#ef01885e209ca3e94e450695af8f42623fb92718", - "@angular/material": "github:angular/material-builds#051bc235964598b6a616a52510217c9e5fea9c46", - "@angular/material-moment-adapter": "github:angular/material-moment-adapter-builds#d6c95738690917961d6c0d3ff1759ca707b696bf", - "@angular/platform-browser": "github:angular/platform-browser-builds#cd5b7869733a23f948158c8490f1a52807c14023", - "@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds#5978ab37e4047188628783eba84ebca1596ce9d1", - "@angular/platform-server": "github:angular/platform-server-builds#17444a8ea00f2c0d67783056590ef77f54ffcae7", - "@angular/router": "github:angular/router-builds#17d028eade1086859bbb05e7f9c9f79db4faabff", - "@angular/service-worker": "github:angular/service-worker-builds#a585fa97bfcdbdc0bbf6d088ccdd1610eb2aa35c" + "@angular/animations": "github:angular/animations-builds#713e5a461295d667e795a09b0282a29eb28c9a4e", + "@angular/cdk": "github:angular/cdk-builds#b1aab578130273498e5599bba8dc22d60879f0df", + "@angular/common": "github:angular/common-builds#7b37794dc87085c23015ad6555af183fcac89fa3", + "@angular/compiler": "github:angular/compiler-builds#09bc973d5a9abf6ffd02b636d81b236ac8ea4a2a", + "@angular/compiler-cli": "github:angular/compiler-cli-builds#d339dc83459a9ec7221d9e332e1281ff0e67888f", + "@angular/core": "github:angular/core-builds#edc8f3b11c785c65785e5d811b0fe5d08e51f70d", + "@angular/forms": "github:angular/forms-builds#fee6f56fa0bb2b7ec73601c78db10c6933d9b124", + "@angular/language-service": "github:angular/language-service-builds#1a0f1973ff4a2a8a122e5499de4c9c55fc2e6d3b", + "@angular/localize": "github:angular/localize-builds#5c9a05df791d1089213ffaa3051ec283b3cf3cb9", + "@angular/material": "github:angular/material-builds#bbe6f81ffb65c9bc46fd0aab2022ec37ea1c567e", + "@angular/material-moment-adapter": "github:angular/material-moment-adapter-builds#3a6b7d376c7626a60ca1351bb0416d67b678804f", + "@angular/platform-browser": "github:angular/platform-browser-builds#7b1abcbef00078296add317ea1826f7e2aeb99a7", + "@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds#4dbdbd225a58c517c524cc493a4d1b45f7b74b8a", + "@angular/platform-server": "github:angular/platform-server-builds#b46986ab28b832f6b27f9b632c35c0f566970bc6", + "@angular/router": "github:angular/router-builds#e7ffe984edaea146ebf47ae07238b0dfd84f3bf0", + "@angular/service-worker": "github:angular/service-worker-builds#5a0e6a8dd34b2aa07ce13d6d1837a784f0e92c4d" } } diff --git a/yarn.lock b/yarn.lock index 600f44915c32..46101c883c81 100644 --- a/yarn.lock +++ b/yarn.lock @@ -499,9 +499,9 @@ __metadata: languageName: node linkType: hard -"@angular/cdk@npm:19.0.0-next.8": - version: 19.0.0-next.8 - resolution: "@angular/cdk@npm:19.0.0-next.8" +"@angular/cdk@npm:19.0.0-next.9": + version: 19.0.0-next.9 + resolution: "@angular/cdk@npm:19.0.0-next.9" dependencies: parse5: "npm:^7.1.2" tslib: "npm:^2.3.0" @@ -512,7 +512,7 @@ __metadata: dependenciesMeta: parse5: optional: true - checksum: 10c0/2260611f20c6fffcbb0c9d2e896e58e2863e22c5f090ebef04bcf7e8d2e05ce54c59d7b806167a4219dfa992fd23a7d638dc636cfd6646bb6efcc17140fbb488 + checksum: 10c0/75f05477de98c2ff253db2f97a76be9f527babc2c9f0e1048b5876d3f88e86bb73f0b5ae6cb4e15827ec26f1ba7811f02da0cc1b34e87b75e4318b0141a70e36 languageName: node linkType: hard @@ -633,14 +633,14 @@ __metadata: "@angular/animations": "npm:19.0.0-next.10" "@angular/bazel": "patch:@angular/bazel@https%3A//github.com/angular/bazel-builds.git%23commit=07617f0f8540d27f8895b1820a6f994e1e5b7277#~/.yarn/patches/@angular-bazel-https-9848736cf4.patch" "@angular/build-tooling": "https://github.com/angular/dev-infra-private-build-tooling-builds.git#2692c81ef1068e15c7b7eaf3ecc7a65cbdd25c9f" - "@angular/cdk": "npm:19.0.0-next.8" + "@angular/cdk": "npm:19.0.0-next.9" "@angular/common": "npm:19.0.0-next.10" "@angular/compiler": "npm:19.0.0-next.10" "@angular/compiler-cli": "npm:19.0.0-next.10" "@angular/core": "npm:19.0.0-next.10" "@angular/forms": "npm:19.0.0-next.10" "@angular/localize": "npm:19.0.0-next.10" - "@angular/material": "npm:19.0.0-next.8" + "@angular/material": "npm:19.0.0-next.9" "@angular/ng-dev": "https://github.com/angular/dev-infra-private-ng-dev-builds.git#2659cef857ffd127dbbbcbb28bb2dc4ca8625b50" "@angular/platform-browser": "npm:19.0.0-next.10" "@angular/platform-browser-dynamic": "npm:19.0.0-next.10" @@ -833,20 +833,20 @@ __metadata: languageName: node linkType: hard -"@angular/material@npm:19.0.0-next.8": - version: 19.0.0-next.8 - resolution: "@angular/material@npm:19.0.0-next.8" +"@angular/material@npm:19.0.0-next.9": + version: 19.0.0-next.9 + resolution: "@angular/material@npm:19.0.0-next.9" dependencies: tslib: "npm:^2.3.0" peerDependencies: "@angular/animations": ^19.0.0-0 || ^19.1.0-0 || ^19.2.0-0 || ^19.3.0-0 || ^20.0.0-0 - "@angular/cdk": 19.0.0-next.8 + "@angular/cdk": 19.0.0-next.9 "@angular/common": ^19.0.0-0 || ^19.1.0-0 || ^19.2.0-0 || ^19.3.0-0 || ^20.0.0-0 "@angular/core": ^19.0.0-0 || ^19.1.0-0 || ^19.2.0-0 || ^19.3.0-0 || ^20.0.0-0 "@angular/forms": ^19.0.0-0 || ^19.1.0-0 || ^19.2.0-0 || ^19.3.0-0 || ^20.0.0-0 "@angular/platform-browser": ^19.0.0-0 || ^19.1.0-0 || ^19.2.0-0 || ^19.3.0-0 || ^20.0.0-0 rxjs: ^6.5.3 || ^7.4.0 - checksum: 10c0/d2bea66d149bfc550afddde340db49028515f4bf38e74c5da10073fe2c5991b8bf9e1cc8f1dd71b62e6710ac00697639ec8eb3aaf508a1f39dd6844d507f854c + checksum: 10c0/96a210ae211b4d85920d87ca551a61f7c63fab02791d415e609ac55252bc7d9839602c48562ed70ecfb7aea5a7d177bcd7c08b94cec36fe06fb58bf37eccbf97 languageName: node linkType: hard From c38ff4347334175aa07e5c84564e2208b08f9434 Mon Sep 17 00:00:00 2001 From: Angular Robot Date: Fri, 18 Oct 2024 05:17:21 +0000 Subject: [PATCH 09/11] build: update all non-major dependencies --- package.json | 8 +- packages/angular/build/package.json | 2 +- .../angular_devkit/build_angular/package.json | 4 +- yarn.lock | 166 +++++++++--------- 4 files changed, 90 insertions(+), 90 deletions(-) diff --git a/package.json b/package.json index f643b75db748..d969bee53c4e 100644 --- a/package.json +++ b/package.json @@ -84,7 +84,7 @@ "@bazel/concatjs": "patch:@bazel/concatjs@npm%3A5.8.1#~/.yarn/patches/@bazel-concatjs-npm-5.8.1-1bf81df846.patch", "@bazel/jasmine": "patch:@bazel/jasmine@npm%3A5.8.1#~/.yarn/patches/@bazel-jasmine-npm-5.8.1-3370fee155.patch", "@bazel/runfiles": "^5.8.1", - "@discoveryjs/json-ext": "0.6.1", + "@discoveryjs/json-ext": "0.6.2", "@inquirer/confirm": "5.0.0", "@inquirer/prompts": "7.0.0", "@listr2/prompt-adapter-inquirer": "2.0.17", @@ -114,8 +114,8 @@ "@types/yargs": "^17.0.20", "@types/yargs-parser": "^21.0.0", "@types/yarnpkg__lockfile": "^1.1.5", - "@typescript-eslint/eslint-plugin": "8.9.0", - "@typescript-eslint/parser": "8.9.0", + "@typescript-eslint/eslint-plugin": "8.10.0", + "@typescript-eslint/parser": "8.10.0", "@vitejs/plugin-basic-ssl": "1.1.0", "@web/test-runner": "^0.19.0", "@yarnpkg/lockfile": "1.1.0", @@ -186,7 +186,7 @@ "rollup": "4.24.0", "rollup-plugin-sourcemaps": "^0.6.0", "rxjs": "7.8.1", - "sass": "1.80.1", + "sass": "1.80.2", "sass-loader": "16.0.2", "semver": "7.6.3", "shelljs": "^0.8.5", diff --git a/packages/angular/build/package.json b/packages/angular/build/package.json index 58d2133ab78e..01b0f04fb8a3 100644 --- a/packages/angular/build/package.json +++ b/packages/angular/build/package.json @@ -39,7 +39,7 @@ "picomatch": "4.0.2", "piscina": "4.7.0", "rollup": "4.24.0", - "sass": "1.80.1", + "sass": "1.80.2", "semver": "7.6.3", "vite": "5.4.9", "watchpack": "2.4.2" diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json index a2ebabdace15..5e899571d094 100644 --- a/packages/angular_devkit/build_angular/package.json +++ b/packages/angular_devkit/build_angular/package.json @@ -20,7 +20,7 @@ "@babel/plugin-transform-runtime": "7.25.7", "@babel/preset-env": "7.25.8", "@babel/runtime": "7.25.7", - "@discoveryjs/json-ext": "0.6.1", + "@discoveryjs/json-ext": "0.6.2", "@ngtools/webpack": "0.0.0-PLACEHOLDER", "@vitejs/plugin-basic-ssl": "1.1.0", "ansi-colors": "4.1.3", @@ -48,7 +48,7 @@ "postcss-loader": "8.1.1", "resolve-url-loader": "5.0.0", "rxjs": "7.8.1", - "sass": "1.80.1", + "sass": "1.80.2", "sass-loader": "16.0.2", "semver": "7.6.3", "source-map-loader": "5.0.0", diff --git a/yarn.lock b/yarn.lock index 46101c883c81..9c8ce2efe948 100644 --- a/yarn.lock +++ b/yarn.lock @@ -73,7 +73,7 @@ __metadata: "@babel/plugin-transform-runtime": "npm:7.25.7" "@babel/preset-env": "npm:7.25.8" "@babel/runtime": "npm:7.25.7" - "@discoveryjs/json-ext": "npm:0.6.1" + "@discoveryjs/json-ext": "npm:0.6.2" "@ngtools/webpack": "npm:0.0.0-PLACEHOLDER" "@vitejs/plugin-basic-ssl": "npm:1.1.0" ansi-colors: "npm:4.1.3" @@ -102,7 +102,7 @@ __metadata: postcss-loader: "npm:8.1.1" resolve-url-loader: "npm:5.0.0" rxjs: "npm:7.8.1" - sass: "npm:1.80.1" + sass: "npm:1.80.2" sass-loader: "npm:16.0.2" semver: "npm:7.6.3" source-map-loader: "npm:5.0.0" @@ -396,7 +396,7 @@ __metadata: picomatch: "npm:4.0.2" piscina: "npm:4.7.0" rollup: "npm:4.24.0" - sass: "npm:1.80.1" + sass: "npm:1.80.2" semver: "npm:7.6.3" vite: "npm:5.4.9" watchpack: "npm:2.4.2" @@ -662,7 +662,7 @@ __metadata: "@bazel/concatjs": "patch:@bazel/concatjs@npm%3A5.8.1#~/.yarn/patches/@bazel-concatjs-npm-5.8.1-1bf81df846.patch" "@bazel/jasmine": "patch:@bazel/jasmine@npm%3A5.8.1#~/.yarn/patches/@bazel-jasmine-npm-5.8.1-3370fee155.patch" "@bazel/runfiles": "npm:^5.8.1" - "@discoveryjs/json-ext": "npm:0.6.1" + "@discoveryjs/json-ext": "npm:0.6.2" "@inquirer/confirm": "npm:5.0.0" "@inquirer/prompts": "npm:7.0.0" "@listr2/prompt-adapter-inquirer": "npm:2.0.17" @@ -692,8 +692,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.9.0" - "@typescript-eslint/parser": "npm:8.9.0" + "@typescript-eslint/eslint-plugin": "npm:8.10.0" + "@typescript-eslint/parser": "npm:8.10.0" "@vitejs/plugin-basic-ssl": "npm:1.1.0" "@web/test-runner": "npm:^0.19.0" "@yarnpkg/lockfile": "npm:1.1.0" @@ -764,7 +764,7 @@ __metadata: rollup: "npm:4.24.0" rollup-plugin-sourcemaps: "npm:^0.6.0" rxjs: "npm:7.8.1" - sass: "npm:1.80.1" + sass: "npm:1.80.2" sass-loader: "npm:16.0.2" semver: "npm:7.6.3" shelljs: "npm:^0.8.5" @@ -2398,10 +2398,10 @@ __metadata: languageName: node linkType: hard -"@discoveryjs/json-ext@npm:0.6.1": - version: 0.6.1 - resolution: "@discoveryjs/json-ext@npm:0.6.1" - checksum: 10c0/116838b9685f26ce88335703f0f0cb84a242f9db93a6b408676c314a3bfd916ef405d84c3ff427e882dc4775b586e3a8a9d88fecc07cc93cbd33f6d560db29bf +"@discoveryjs/json-ext@npm:0.6.2": + version: 0.6.2 + resolution: "@discoveryjs/json-ext@npm:0.6.2" + checksum: 10c0/e7e9d18ab2f45780b2a29b68dc933c579c4f06c372b3c837c2a2d8d11678cad20be4b3f0df5444fda098b6c36af7987d2eb1b08fb7040cf110232d14df5c6f58 languageName: node linkType: hard @@ -5415,15 +5415,15 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/eslint-plugin@npm:8.9.0": - version: 8.9.0 - resolution: "@typescript-eslint/eslint-plugin@npm:8.9.0" +"@typescript-eslint/eslint-plugin@npm:8.10.0": + version: 8.10.0 + resolution: "@typescript-eslint/eslint-plugin@npm:8.10.0" dependencies: "@eslint-community/regexpp": "npm:^4.10.0" - "@typescript-eslint/scope-manager": "npm:8.9.0" - "@typescript-eslint/type-utils": "npm:8.9.0" - "@typescript-eslint/utils": "npm:8.9.0" - "@typescript-eslint/visitor-keys": "npm:8.9.0" + "@typescript-eslint/scope-manager": "npm:8.10.0" + "@typescript-eslint/type-utils": "npm:8.10.0" + "@typescript-eslint/utils": "npm:8.10.0" + "@typescript-eslint/visitor-keys": "npm:8.10.0" graphemer: "npm:^1.4.0" ignore: "npm:^5.3.1" natural-compare: "npm:^1.4.0" @@ -5434,25 +5434,35 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 10c0/07f273dc270268980bbf65ea5e0c69d05377e42dbdb2dd3f4a1293a3536c049ddfb548eb9ec6e60394c2361c4a15b62b8246951f83e16a9d16799578a74dc691 + checksum: 10c0/4b77ba9c865a2a14e238cd330b5901f0274b8ce1c13324fccd0339b8eea82a50a4709394c903fd8cd5bd0d3aebace0761ff9a4a19fa20b00bb61349b7671c035 languageName: node linkType: hard -"@typescript-eslint/parser@npm:8.9.0": - version: 8.9.0 - resolution: "@typescript-eslint/parser@npm:8.9.0" +"@typescript-eslint/parser@npm:8.10.0": + version: 8.10.0 + resolution: "@typescript-eslint/parser@npm:8.10.0" dependencies: - "@typescript-eslint/scope-manager": "npm:8.9.0" - "@typescript-eslint/types": "npm:8.9.0" - "@typescript-eslint/typescript-estree": "npm:8.9.0" - "@typescript-eslint/visitor-keys": "npm:8.9.0" + "@typescript-eslint/scope-manager": "npm:8.10.0" + "@typescript-eslint/types": "npm:8.10.0" + "@typescript-eslint/typescript-estree": "npm:8.10.0" + "@typescript-eslint/visitor-keys": "npm:8.10.0" debug: "npm:^4.3.4" peerDependencies: eslint: ^8.57.0 || ^9.0.0 peerDependenciesMeta: typescript: optional: true - checksum: 10c0/aca7c838de85fb700ecf5682dc6f8f90a0fbfe09a3044a176c0dc3ffd9c5e7105beb0919a30824f46b02223a74119b4f5a9834a0663328987f066cb359b5dbed + checksum: 10c0/7becb2457c085c239838d301796074b790f46dd38c9fbc14ec1dec8e993c7115cd8a66cdc07983c3a68a2dd92e24e8acc49d69a4ebcc29e9869957eb52d1cb74 + languageName: node + linkType: hard + +"@typescript-eslint/scope-manager@npm:8.10.0": + version: 8.10.0 + resolution: "@typescript-eslint/scope-manager@npm:8.10.0" + dependencies: + "@typescript-eslint/types": "npm:8.10.0" + "@typescript-eslint/visitor-keys": "npm:8.10.0" + checksum: 10c0/b8bb8635c4d6c00a3578d6265e3ee0f5d96d0c9dee534ed588aa411c3f4497fd71cce730c3ae7571e52453d955b191bc9edcc47c9af21a20c90e9a20f2371108 languageName: node linkType: hard @@ -5466,28 +5476,25 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/scope-manager@npm:8.9.0": - version: 8.9.0 - resolution: "@typescript-eslint/scope-manager@npm:8.9.0" +"@typescript-eslint/type-utils@npm:8.10.0": + version: 8.10.0 + resolution: "@typescript-eslint/type-utils@npm:8.10.0" dependencies: - "@typescript-eslint/types": "npm:8.9.0" - "@typescript-eslint/visitor-keys": "npm:8.9.0" - checksum: 10c0/1fb77a982e3384d8cabd64678ea8f9de328708080ff9324bf24a44da4e8d7b7692ae4820efc3ef36027bf0fd6a061680d3c30ce63d661fb31e18970fca5e86c5 - languageName: node - linkType: hard - -"@typescript-eslint/type-utils@npm:8.9.0": - version: 8.9.0 - resolution: "@typescript-eslint/type-utils@npm:8.9.0" - dependencies: - "@typescript-eslint/typescript-estree": "npm:8.9.0" - "@typescript-eslint/utils": "npm:8.9.0" + "@typescript-eslint/typescript-estree": "npm:8.10.0" + "@typescript-eslint/utils": "npm:8.10.0" debug: "npm:^4.3.4" ts-api-utils: "npm:^1.3.0" peerDependenciesMeta: typescript: optional: true - checksum: 10c0/aff06afda9ac7d12f750e76c8f91ed8b56eefd3f3f4fbaa93a64411ec9e0bd2c2972f3407e439320d98062b16f508dce7604b8bb2b803fded9d3148e5ee721b1 + checksum: 10c0/1af8fce8394279e6ac7bcef449a132072ee36e374c8d557564246ffe7150230844901ca0305e29525bf37c87010e03bf8bedec76fccbfe1e41931cb4f274e208 + languageName: node + linkType: hard + +"@typescript-eslint/types@npm:8.10.0": + version: 8.10.0 + resolution: "@typescript-eslint/types@npm:8.10.0" + checksum: 10c0/f27dd43c8383e02e914a254257627e393dfc0f08b0f74a253c106813ae361f090271b2f3f2ef588fa3ca1329897d873da595bb5641fe8e3091b25eddca24b5d2 languageName: node linkType: hard @@ -5498,19 +5505,12 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/types@npm:8.9.0": - version: 8.9.0 - resolution: "@typescript-eslint/types@npm:8.9.0" - checksum: 10c0/8d901b7ed2f943624c24f7fa67f7be9d49a92554d54c4f27397c05b329ceff59a9ea246810b53ff36fca08760c14305dd4ce78fbac7ca0474311b0575bf49010 - languageName: node - linkType: hard - -"@typescript-eslint/typescript-estree@npm:8.8.1": - version: 8.8.1 - resolution: "@typescript-eslint/typescript-estree@npm:8.8.1" +"@typescript-eslint/typescript-estree@npm:8.10.0": + version: 8.10.0 + resolution: "@typescript-eslint/typescript-estree@npm:8.10.0" dependencies: - "@typescript-eslint/types": "npm:8.8.1" - "@typescript-eslint/visitor-keys": "npm:8.8.1" + "@typescript-eslint/types": "npm:8.10.0" + "@typescript-eslint/visitor-keys": "npm:8.10.0" debug: "npm:^4.3.4" fast-glob: "npm:^3.3.2" is-glob: "npm:^4.0.3" @@ -5520,16 +5520,16 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 10c0/e3b9bc1e925c07833237044271cdc9bd8bdba3e2143dcfc5bf3bf481c89731b666a6fad25333a4b1980ac2f4c6f5e6e42c71206f73f3704e319f6b3b67463a6a + checksum: 10c0/535a740fe25be0e28fe68c41e3264273d1e5169c9f938e08cc0e3415c357726f43efa44621960108c318fc3305c425d29f3223b6e731d44d67f84058a8947304 languageName: node linkType: hard -"@typescript-eslint/typescript-estree@npm:8.9.0": - version: 8.9.0 - resolution: "@typescript-eslint/typescript-estree@npm:8.9.0" +"@typescript-eslint/typescript-estree@npm:8.8.1": + version: 8.8.1 + resolution: "@typescript-eslint/typescript-estree@npm:8.8.1" dependencies: - "@typescript-eslint/types": "npm:8.9.0" - "@typescript-eslint/visitor-keys": "npm:8.9.0" + "@typescript-eslint/types": "npm:8.8.1" + "@typescript-eslint/visitor-keys": "npm:8.8.1" debug: "npm:^4.3.4" fast-glob: "npm:^3.3.2" is-glob: "npm:^4.0.3" @@ -5539,21 +5539,21 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 10c0/bb5ec70727f07d1575e95f9d117762636209e1ab073a26c4e873e1e5b4617b000d300a23d294ad81693f7e99abe3e519725452c30b235a253edcd85b6ae052b0 + checksum: 10c0/e3b9bc1e925c07833237044271cdc9bd8bdba3e2143dcfc5bf3bf481c89731b666a6fad25333a4b1980ac2f4c6f5e6e42c71206f73f3704e319f6b3b67463a6a languageName: node linkType: hard -"@typescript-eslint/utils@npm:8.9.0": - version: 8.9.0 - resolution: "@typescript-eslint/utils@npm:8.9.0" +"@typescript-eslint/utils@npm:8.10.0": + version: 8.10.0 + resolution: "@typescript-eslint/utils@npm:8.10.0" dependencies: "@eslint-community/eslint-utils": "npm:^4.4.0" - "@typescript-eslint/scope-manager": "npm:8.9.0" - "@typescript-eslint/types": "npm:8.9.0" - "@typescript-eslint/typescript-estree": "npm:8.9.0" + "@typescript-eslint/scope-manager": "npm:8.10.0" + "@typescript-eslint/types": "npm:8.10.0" + "@typescript-eslint/typescript-estree": "npm:8.10.0" peerDependencies: eslint: ^8.57.0 || ^9.0.0 - checksum: 10c0/af13e3d501060bdc5fa04b131b3f9a90604e5c1d4845d1f8bd94b703a3c146a76debfc21fe65a7f3a0459ed6c57cf2aa3f0a052469bb23b6f35ff853fe9495b1 + checksum: 10c0/a21a2933517176abd00fcd5d8d80023e35dc3d89d5746bbac43790b4e984ab1f371117db08048bce7f42d54c64f4e0e35161149f8f34fd25a27bff9d1110fd16 languageName: node linkType: hard @@ -5571,23 +5571,23 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/visitor-keys@npm:8.8.1": - version: 8.8.1 - resolution: "@typescript-eslint/visitor-keys@npm:8.8.1" +"@typescript-eslint/visitor-keys@npm:8.10.0": + version: 8.10.0 + resolution: "@typescript-eslint/visitor-keys@npm:8.10.0" dependencies: - "@typescript-eslint/types": "npm:8.8.1" + "@typescript-eslint/types": "npm:8.10.0" eslint-visitor-keys: "npm:^3.4.3" - checksum: 10c0/6f917090b61277bd443aa851c532c4a9cc91ad57aedf185c5dff0c530f158cce84ef815833bd8deffa87f0bbf7a9f1abd1e02e30af2463c4e7f27c0c08f59080 + checksum: 10c0/14721c4ac939640d5fd1ee1b6eeb07604b11a6017e319e21dcc71e7aac2992341fc7ae1992d977bad4433b6a1d0d1c0c279e6927316b26245f6e333f922fa458 languageName: node linkType: hard -"@typescript-eslint/visitor-keys@npm:8.9.0": - version: 8.9.0 - resolution: "@typescript-eslint/visitor-keys@npm:8.9.0" +"@typescript-eslint/visitor-keys@npm:8.8.1": + version: 8.8.1 + resolution: "@typescript-eslint/visitor-keys@npm:8.8.1" dependencies: - "@typescript-eslint/types": "npm:8.9.0" + "@typescript-eslint/types": "npm:8.8.1" eslint-visitor-keys: "npm:^3.4.3" - checksum: 10c0/e33208b946841f1838d87d64f4ee230f798e68bdce8c181d3ac0abb567f758cb9c4bdccc919d493167869f413ca4c400e7db0f7dd7e8fc84ab6a8344076a7458 + checksum: 10c0/6f917090b61277bd443aa851c532c4a9cc91ad57aedf185c5dff0c530f158cce84ef815833bd8deffa87f0bbf7a9f1abd1e02e30af2463c4e7f27c0c08f59080 languageName: node linkType: hard @@ -15724,9 +15724,9 @@ __metadata: languageName: node linkType: hard -"sass@npm:1.80.1": - version: 1.80.1 - resolution: "sass@npm:1.80.1" +"sass@npm:1.80.2": + version: 1.80.2 + resolution: "sass@npm:1.80.2" dependencies: "@parcel/watcher": "npm:^2.4.1" chokidar: "npm:^4.0.0" @@ -15734,7 +15734,7 @@ __metadata: source-map-js: "npm:>=0.6.2 <2.0.0" bin: sass: sass.js - checksum: 10c0/91ec2b8bcba4c3c68c047fdcbe04cb82646b5cc6446e04d9134ff3c642d9895363de5cbf88869f0a6aa81bcd2de9b8ccba7df7ff35d33a07a18754014ee7a31a + checksum: 10c0/0006e2ee7a732abaa96a663167b078b8d53b4d7fe5ce435636a8bca6e8a3b6ebc12308c0725f577a456329ed962436d96cfcdd50a8e733ed4c4e4590f21243c9 languageName: node linkType: hard From 44077f54e9a95afa5c1f85cf198aaa3412ee08d8 Mon Sep 17 00:00:00 2001 From: Alan Agius Date: Mon, 21 Oct 2024 06:48:17 +0000 Subject: [PATCH 10/11] fix(@angular/ssr): designate package as side-effect free Add `sideEffects` in the `package.json` --- packages/angular/ssr/package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/angular/ssr/package.json b/packages/angular/ssr/package.json index af3108f8b38e..98b358791856 100644 --- a/packages/angular/ssr/package.json +++ b/packages/angular/ssr/package.json @@ -30,6 +30,7 @@ "@angular/router": "19.0.0-next.10", "@bazel/runfiles": "^5.8.1" }, + "sideEffects": false, "schematics": "./schematics/collection.json", "repository": { "type": "git", From 94dbacf447cba5c8a98c5fb6ad843c7c71244a48 Mon Sep 17 00:00:00 2001 From: Alan Agius Date: Mon, 21 Oct 2024 07:59:26 +0000 Subject: [PATCH 11/11] refactor(@angular/ssr): remove `useDefineForClassFields` This removes `useDefineForClassFields` to leave static field instead of using static blocks. --- packages/angular/ssr/src/app-engine.ts | 2 +- tsconfig-build-ng.json | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/angular/ssr/src/app-engine.ts b/packages/angular/ssr/src/app-engine.ts index 31b2e804f23c..1017c3327098 100644 --- a/packages/angular/ssr/src/app-engine.ts +++ b/packages/angular/ssr/src/app-engine.ts @@ -30,7 +30,7 @@ export class AngularAppEngine { * * @private */ - static ɵhooks = new Hooks(); + static ɵhooks = /* #__PURE__*/ new Hooks(); /** * Provides access to the hooks for extending or modifying the server application's behavior. diff --git a/tsconfig-build-ng.json b/tsconfig-build-ng.json index aae7b4dc2228..746d77208378 100644 --- a/tsconfig-build-ng.json +++ b/tsconfig-build-ng.json @@ -8,8 +8,6 @@ "compilerOptions": { "module": "esnext", "target": "es2022", - // Keep the below in sync with ng_module.bzl - "useDefineForClassFields": false, "lib": ["es2020", "dom"], // don't auto-discover @types/node, it results in a ///