From da108e76e992bb29cddac0637a5a7b14df014acb Mon Sep 17 00:00:00 2001 From: Maria Hutt Date: Fri, 27 Jun 2025 13:50:27 -0700 Subject: [PATCH 01/13] chore(angular): upgrade base tsconfig to latest --- .../angular/test/apps/ng16/e2e/tsconfig.json | 20 ++++++++++++++++ .../angular/test/apps/ng17/e2e/tsconfig.json | 20 ++++++++++++++++ .../angular/test/apps/ng18/e2e/tsconfig.json | 20 ++++++++++++++++ .../angular/test/apps/ng19/e2e/tsconfig.json | 13 ----------- .../angular/test/apps/ng20/e2e/tsconfig.json | 13 ----------- packages/angular/test/base/e2e/tsconfig.json | 23 +++++++------------ 6 files changed, 68 insertions(+), 41 deletions(-) create mode 100644 packages/angular/test/apps/ng16/e2e/tsconfig.json create mode 100644 packages/angular/test/apps/ng17/e2e/tsconfig.json create mode 100644 packages/angular/test/apps/ng18/e2e/tsconfig.json delete mode 100644 packages/angular/test/apps/ng19/e2e/tsconfig.json delete mode 100644 packages/angular/test/apps/ng20/e2e/tsconfig.json diff --git a/packages/angular/test/apps/ng16/e2e/tsconfig.json b/packages/angular/test/apps/ng16/e2e/tsconfig.json new file mode 100644 index 00000000000..60db7b9af7c --- /dev/null +++ b/packages/angular/test/apps/ng16/e2e/tsconfig.json @@ -0,0 +1,20 @@ +{ + "angularCompilerOptions": { + "fullTemplateTypeCheck": true, + "strictMetadataEmit" : true + }, + "extends": "../tsconfig.json", + "include": [ + "src/**spec.ts", + "../cypress/support/index.d.ts" + ], + "compilerOptions": { + "outDir": "../out-tsc/app", + "module": "commonjs", + "target": "es5", + "types": [ + "cypress", + "node" + ] + } +} diff --git a/packages/angular/test/apps/ng17/e2e/tsconfig.json b/packages/angular/test/apps/ng17/e2e/tsconfig.json new file mode 100644 index 00000000000..60db7b9af7c --- /dev/null +++ b/packages/angular/test/apps/ng17/e2e/tsconfig.json @@ -0,0 +1,20 @@ +{ + "angularCompilerOptions": { + "fullTemplateTypeCheck": true, + "strictMetadataEmit" : true + }, + "extends": "../tsconfig.json", + "include": [ + "src/**spec.ts", + "../cypress/support/index.d.ts" + ], + "compilerOptions": { + "outDir": "../out-tsc/app", + "module": "commonjs", + "target": "es5", + "types": [ + "cypress", + "node" + ] + } +} diff --git a/packages/angular/test/apps/ng18/e2e/tsconfig.json b/packages/angular/test/apps/ng18/e2e/tsconfig.json new file mode 100644 index 00000000000..60db7b9af7c --- /dev/null +++ b/packages/angular/test/apps/ng18/e2e/tsconfig.json @@ -0,0 +1,20 @@ +{ + "angularCompilerOptions": { + "fullTemplateTypeCheck": true, + "strictMetadataEmit" : true + }, + "extends": "../tsconfig.json", + "include": [ + "src/**spec.ts", + "../cypress/support/index.d.ts" + ], + "compilerOptions": { + "outDir": "../out-tsc/app", + "module": "commonjs", + "target": "es5", + "types": [ + "cypress", + "node" + ] + } +} diff --git a/packages/angular/test/apps/ng19/e2e/tsconfig.json b/packages/angular/test/apps/ng19/e2e/tsconfig.json deleted file mode 100644 index 42bc6d45bca..00000000000 --- a/packages/angular/test/apps/ng19/e2e/tsconfig.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "extends": "../tsconfig.json", - "compilerOptions": { - "outDir": "../out-tsc/e2e", - "module": "commonjs", - "target": "ES2022", - "types": ["cypress", "node"] - }, - "include": [ - "../cypress/**/*.ts", - "../cypress/support/**/*.ts" - ] -} diff --git a/packages/angular/test/apps/ng20/e2e/tsconfig.json b/packages/angular/test/apps/ng20/e2e/tsconfig.json deleted file mode 100644 index 42bc6d45bca..00000000000 --- a/packages/angular/test/apps/ng20/e2e/tsconfig.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "extends": "../tsconfig.json", - "compilerOptions": { - "outDir": "../out-tsc/e2e", - "module": "commonjs", - "target": "ES2022", - "types": ["cypress", "node"] - }, - "include": [ - "../cypress/**/*.ts", - "../cypress/support/**/*.ts" - ] -} diff --git a/packages/angular/test/base/e2e/tsconfig.json b/packages/angular/test/base/e2e/tsconfig.json index 60db7b9af7c..42bc6d45bca 100644 --- a/packages/angular/test/base/e2e/tsconfig.json +++ b/packages/angular/test/base/e2e/tsconfig.json @@ -1,20 +1,13 @@ { - "angularCompilerOptions": { - "fullTemplateTypeCheck": true, - "strictMetadataEmit" : true - }, "extends": "../tsconfig.json", - "include": [ - "src/**spec.ts", - "../cypress/support/index.d.ts" - ], "compilerOptions": { - "outDir": "../out-tsc/app", + "outDir": "../out-tsc/e2e", "module": "commonjs", - "target": "es5", - "types": [ - "cypress", - "node" - ] - } + "target": "ES2022", + "types": ["cypress", "node"] + }, + "include": [ + "../cypress/**/*.ts", + "../cypress/support/**/*.ts" + ] } From 4f6ccc031cc3b75636b24059221f630797f5786d Mon Sep 17 00:00:00 2001 From: Maria Hutt Date: Fri, 27 Jun 2025 13:53:58 -0700 Subject: [PATCH 02/13] chore(angular): move gitkeep to base --- packages/angular/test/apps/ng17/e2e/src/.gitkeep | 0 packages/angular/test/apps/ng18/e2e/src/.gitkeep | 0 packages/angular/test/apps/ng19/e2e/src/.gitkeep | 0 packages/angular/test/apps/ng20/e2e/src/.gitkeep | 0 packages/angular/test/{apps/ng16 => base}/e2e/src/.gitkeep | 0 5 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 packages/angular/test/apps/ng17/e2e/src/.gitkeep delete mode 100644 packages/angular/test/apps/ng18/e2e/src/.gitkeep delete mode 100644 packages/angular/test/apps/ng19/e2e/src/.gitkeep delete mode 100644 packages/angular/test/apps/ng20/e2e/src/.gitkeep rename packages/angular/test/{apps/ng16 => base}/e2e/src/.gitkeep (100%) diff --git a/packages/angular/test/apps/ng17/e2e/src/.gitkeep b/packages/angular/test/apps/ng17/e2e/src/.gitkeep deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/packages/angular/test/apps/ng18/e2e/src/.gitkeep b/packages/angular/test/apps/ng18/e2e/src/.gitkeep deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/packages/angular/test/apps/ng19/e2e/src/.gitkeep b/packages/angular/test/apps/ng19/e2e/src/.gitkeep deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/packages/angular/test/apps/ng20/e2e/src/.gitkeep b/packages/angular/test/apps/ng20/e2e/src/.gitkeep deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/packages/angular/test/apps/ng16/e2e/src/.gitkeep b/packages/angular/test/base/e2e/src/.gitkeep similarity index 100% rename from packages/angular/test/apps/ng16/e2e/src/.gitkeep rename to packages/angular/test/base/e2e/src/.gitkeep From 92a13ed0444c49c33244766b47b4432b669fdd64 Mon Sep 17 00:00:00 2001 From: Maria Hutt Date: Fri, 27 Jun 2025 13:56:28 -0700 Subject: [PATCH 03/13] chore(angular): update base tsconfig.spec --- .../apps/{ng19 => ng16}/tsconfig.spec.json | 6 ++++-- .../apps/{ng20 => ng17}/tsconfig.spec.json | 6 ++++-- .../angular/test/apps/ng18/tsconfig.spec.json | 18 ++++++++++++++++++ packages/angular/test/base/tsconfig.spec.json | 6 ++---- 4 files changed, 28 insertions(+), 8 deletions(-) rename packages/angular/test/apps/{ng19 => ng16}/tsconfig.spec.json (78%) rename packages/angular/test/apps/{ng20 => ng17}/tsconfig.spec.json (78%) create mode 100644 packages/angular/test/apps/ng18/tsconfig.spec.json diff --git a/packages/angular/test/apps/ng19/tsconfig.spec.json b/packages/angular/test/apps/ng16/tsconfig.spec.json similarity index 78% rename from packages/angular/test/apps/ng19/tsconfig.spec.json rename to packages/angular/test/apps/ng16/tsconfig.spec.json index 1a72093d48c..d9e7e7e8624 100644 --- a/packages/angular/test/apps/ng19/tsconfig.spec.json +++ b/packages/angular/test/apps/ng16/tsconfig.spec.json @@ -2,11 +2,13 @@ "extends": "./tsconfig.json", "compilerOptions": { "outDir": "./out-tsc/spec", - "module": "commonjs", - "types": ["jasmine", "node"] + "types": [ + "node" + ] }, "files": [ "src/test.ts", + "src/zone-flags.ts", "src/polyfills.ts" ], "include": [ diff --git a/packages/angular/test/apps/ng20/tsconfig.spec.json b/packages/angular/test/apps/ng17/tsconfig.spec.json similarity index 78% rename from packages/angular/test/apps/ng20/tsconfig.spec.json rename to packages/angular/test/apps/ng17/tsconfig.spec.json index 1a72093d48c..d9e7e7e8624 100644 --- a/packages/angular/test/apps/ng20/tsconfig.spec.json +++ b/packages/angular/test/apps/ng17/tsconfig.spec.json @@ -2,11 +2,13 @@ "extends": "./tsconfig.json", "compilerOptions": { "outDir": "./out-tsc/spec", - "module": "commonjs", - "types": ["jasmine", "node"] + "types": [ + "node" + ] }, "files": [ "src/test.ts", + "src/zone-flags.ts", "src/polyfills.ts" ], "include": [ diff --git a/packages/angular/test/apps/ng18/tsconfig.spec.json b/packages/angular/test/apps/ng18/tsconfig.spec.json new file mode 100644 index 00000000000..d9e7e7e8624 --- /dev/null +++ b/packages/angular/test/apps/ng18/tsconfig.spec.json @@ -0,0 +1,18 @@ +{ + "extends": "./tsconfig.json", + "compilerOptions": { + "outDir": "./out-tsc/spec", + "types": [ + "node" + ] + }, + "files": [ + "src/test.ts", + "src/zone-flags.ts", + "src/polyfills.ts" + ], + "include": [ + "src/**/*.spec.ts", + "src/**/*.d.ts" + ] +} diff --git a/packages/angular/test/base/tsconfig.spec.json b/packages/angular/test/base/tsconfig.spec.json index d9e7e7e8624..1a72093d48c 100644 --- a/packages/angular/test/base/tsconfig.spec.json +++ b/packages/angular/test/base/tsconfig.spec.json @@ -2,13 +2,11 @@ "extends": "./tsconfig.json", "compilerOptions": { "outDir": "./out-tsc/spec", - "types": [ - "node" - ] + "module": "commonjs", + "types": ["jasmine", "node"] }, "files": [ "src/test.ts", - "src/zone-flags.ts", "src/polyfills.ts" ], "include": [ From 97effb503fc5ad0f67a91a86179234b528bd3eee Mon Sep 17 00:00:00 2001 From: Maria Hutt Date: Fri, 27 Jun 2025 13:58:13 -0700 Subject: [PATCH 04/13] chore(angular): update base tsconfig.server --- .../apps/{ng19 => ng16}/tsconfig.server.json | 14 ++++++-------- .../apps/{ng20 => ng17}/tsconfig.server.json | 14 ++++++-------- .../angular/test/apps/ng18/tsconfig.server.json | 17 +++++++++++++++++ packages/angular/test/base/tsconfig.server.json | 14 ++++++++------ 4 files changed, 37 insertions(+), 22 deletions(-) rename packages/angular/test/apps/{ng19 => ng16}/tsconfig.server.json (56%) rename packages/angular/test/apps/{ng20 => ng17}/tsconfig.server.json (56%) create mode 100644 packages/angular/test/apps/ng18/tsconfig.server.json diff --git a/packages/angular/test/apps/ng19/tsconfig.server.json b/packages/angular/test/apps/ng16/tsconfig.server.json similarity index 56% rename from packages/angular/test/apps/ng19/tsconfig.server.json rename to packages/angular/test/apps/ng16/tsconfig.server.json index e9e74484cda..79cf4f15fcd 100644 --- a/packages/angular/test/apps/ng19/tsconfig.server.json +++ b/packages/angular/test/apps/ng16/tsconfig.server.json @@ -1,17 +1,15 @@ { - "extends": "./tsconfig.json", + "extends": "./tsconfig.app.json", "compilerOptions": { "outDir": "./out-tsc/app-server", - "target": "ES2016", - "module": "commonjs", - "types": ["node"] + "target": "es2016", + "types": [ + "node" + ] }, "files": [ "src/main.server.ts", - "src/server.ts" - ], - "include": [ - "src/**/*.d.ts" + "server.ts" ], "angularCompilerOptions": { "entryModule": "./src/app/app.server.module#AppServerModule" diff --git a/packages/angular/test/apps/ng20/tsconfig.server.json b/packages/angular/test/apps/ng17/tsconfig.server.json similarity index 56% rename from packages/angular/test/apps/ng20/tsconfig.server.json rename to packages/angular/test/apps/ng17/tsconfig.server.json index e9e74484cda..79cf4f15fcd 100644 --- a/packages/angular/test/apps/ng20/tsconfig.server.json +++ b/packages/angular/test/apps/ng17/tsconfig.server.json @@ -1,17 +1,15 @@ { - "extends": "./tsconfig.json", + "extends": "./tsconfig.app.json", "compilerOptions": { "outDir": "./out-tsc/app-server", - "target": "ES2016", - "module": "commonjs", - "types": ["node"] + "target": "es2016", + "types": [ + "node" + ] }, "files": [ "src/main.server.ts", - "src/server.ts" - ], - "include": [ - "src/**/*.d.ts" + "server.ts" ], "angularCompilerOptions": { "entryModule": "./src/app/app.server.module#AppServerModule" diff --git a/packages/angular/test/apps/ng18/tsconfig.server.json b/packages/angular/test/apps/ng18/tsconfig.server.json new file mode 100644 index 00000000000..79cf4f15fcd --- /dev/null +++ b/packages/angular/test/apps/ng18/tsconfig.server.json @@ -0,0 +1,17 @@ +{ + "extends": "./tsconfig.app.json", + "compilerOptions": { + "outDir": "./out-tsc/app-server", + "target": "es2016", + "types": [ + "node" + ] + }, + "files": [ + "src/main.server.ts", + "server.ts" + ], + "angularCompilerOptions": { + "entryModule": "./src/app/app.server.module#AppServerModule" + } +} diff --git a/packages/angular/test/base/tsconfig.server.json b/packages/angular/test/base/tsconfig.server.json index 79cf4f15fcd..e9e74484cda 100644 --- a/packages/angular/test/base/tsconfig.server.json +++ b/packages/angular/test/base/tsconfig.server.json @@ -1,15 +1,17 @@ { - "extends": "./tsconfig.app.json", + "extends": "./tsconfig.json", "compilerOptions": { "outDir": "./out-tsc/app-server", - "target": "es2016", - "types": [ - "node" - ] + "target": "ES2016", + "module": "commonjs", + "types": ["node"] }, "files": [ "src/main.server.ts", - "server.ts" + "src/server.ts" + ], + "include": [ + "src/**/*.d.ts" ], "angularCompilerOptions": { "entryModule": "./src/app/app.server.module#AppServerModule" From 0f4ba04931a655a9da80f7c60b61278be0de2162 Mon Sep 17 00:00:00 2001 From: Maria Hutt Date: Fri, 27 Jun 2025 14:18:40 -0700 Subject: [PATCH 05/13] chore(angular): update base tsconfig --- packages/angular/test/apps/ng19/tsconfig.json | 35 ------------------- packages/angular/test/apps/ng20/tsconfig.json | 35 ------------------- packages/angular/test/base/tsconfig.json | 26 ++++++++++---- 3 files changed, 20 insertions(+), 76 deletions(-) delete mode 100644 packages/angular/test/apps/ng19/tsconfig.json delete mode 100644 packages/angular/test/apps/ng20/tsconfig.json diff --git a/packages/angular/test/apps/ng19/tsconfig.json b/packages/angular/test/apps/ng19/tsconfig.json deleted file mode 100644 index 0842e119c0f..00000000000 --- a/packages/angular/test/apps/ng19/tsconfig.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "compileOnSave": false, - "compilerOptions": { - "outDir": "./dist/out-tsc", - "forceConsistentCasingInFileNames": true, - "strict": true, - "esModuleInterop": true, - "noImplicitOverride": true, - "noPropertyAccessFromIndexSignature": true, - "noImplicitReturns": true, - "noFallthroughCasesInSwitch": true, - "sourceMap": true, - "declaration": false, - "experimentalDecorators": true, - "moduleResolution": "node", - "importHelpers": true, - "target": "ES2022", - "module": "ES2022", - "emitDecoratorMetadata": true, - "typeRoots": ["node_modules/@types"], - "lib": ["ES2022", "dom"], - "plugins": [ - { - "name": "typescript-eslint-language-service" - } - ], - "useDefineForClassFields": false - }, - "angularCompilerOptions": { - "enableI18nLegacyMessageIdFormat": false, - "strictInjectionParameters": true, - "strictInputAccessModifiers": true, - "strictTemplates": true - } -} diff --git a/packages/angular/test/apps/ng20/tsconfig.json b/packages/angular/test/apps/ng20/tsconfig.json deleted file mode 100644 index 0842e119c0f..00000000000 --- a/packages/angular/test/apps/ng20/tsconfig.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "compileOnSave": false, - "compilerOptions": { - "outDir": "./dist/out-tsc", - "forceConsistentCasingInFileNames": true, - "strict": true, - "esModuleInterop": true, - "noImplicitOverride": true, - "noPropertyAccessFromIndexSignature": true, - "noImplicitReturns": true, - "noFallthroughCasesInSwitch": true, - "sourceMap": true, - "declaration": false, - "experimentalDecorators": true, - "moduleResolution": "node", - "importHelpers": true, - "target": "ES2022", - "module": "ES2022", - "emitDecoratorMetadata": true, - "typeRoots": ["node_modules/@types"], - "lib": ["ES2022", "dom"], - "plugins": [ - { - "name": "typescript-eslint-language-service" - } - ], - "useDefineForClassFields": false - }, - "angularCompilerOptions": { - "enableI18nLegacyMessageIdFormat": false, - "strictInjectionParameters": true, - "strictInputAccessModifiers": true, - "strictTemplates": true - } -} diff --git a/packages/angular/test/base/tsconfig.json b/packages/angular/test/base/tsconfig.json index f2be806b423..0842e119c0f 100644 --- a/packages/angular/test/base/tsconfig.json +++ b/packages/angular/test/base/tsconfig.json @@ -1,21 +1,35 @@ { "compileOnSave": false, "compilerOptions": { - "importHelpers": true, "outDir": "./dist/out-tsc", + "forceConsistentCasingInFileNames": true, + "strict": true, + "esModuleInterop": true, + "noImplicitOverride": true, + "noPropertyAccessFromIndexSignature": true, + "noImplicitReturns": true, + "noFallthroughCasesInSwitch": true, "sourceMap": true, "declaration": false, + "experimentalDecorators": true, "moduleResolution": "node", - "module": "es2020", - "target": "es2020", + "importHelpers": true, + "target": "ES2022", + "module": "ES2022", "emitDecoratorMetadata": true, - "experimentalDecorators": true, "typeRoots": ["node_modules/@types"], - "lib": ["es2018", "dom"], + "lib": ["ES2022", "dom"], "plugins": [ { "name": "typescript-eslint-language-service" } - ] + ], + "useDefineForClassFields": false + }, + "angularCompilerOptions": { + "enableI18nLegacyMessageIdFormat": false, + "strictInjectionParameters": true, + "strictInputAccessModifiers": true, + "strictTemplates": true } } From 8a95b19414e5f95ab81ff5b0b2fdfe28ca501119 Mon Sep 17 00:00:00 2001 From: Maria Hutt Date: Fri, 27 Jun 2025 14:20:28 -0700 Subject: [PATCH 06/13] chore(angular): update base tsconfig.app --- packages/angular/test/apps/ng16/tsconfig.app.json | 12 ++++++++++++ packages/angular/test/apps/ng17/tsconfig.app.json | 12 ++++++++++++ packages/angular/test/apps/ng18/tsconfig.app.json | 12 ++++++++++++ packages/angular/test/apps/ng19/tsconfig.app.json | 14 -------------- packages/angular/test/apps/ng20/tsconfig.app.json | 14 -------------- packages/angular/test/base/tsconfig.app.json | 10 ++++++---- 6 files changed, 42 insertions(+), 32 deletions(-) create mode 100644 packages/angular/test/apps/ng16/tsconfig.app.json create mode 100644 packages/angular/test/apps/ng17/tsconfig.app.json create mode 100644 packages/angular/test/apps/ng18/tsconfig.app.json delete mode 100644 packages/angular/test/apps/ng19/tsconfig.app.json delete mode 100644 packages/angular/test/apps/ng20/tsconfig.app.json diff --git a/packages/angular/test/apps/ng16/tsconfig.app.json b/packages/angular/test/apps/ng16/tsconfig.app.json new file mode 100644 index 00000000000..f74770a5863 --- /dev/null +++ b/packages/angular/test/apps/ng16/tsconfig.app.json @@ -0,0 +1,12 @@ +{ + "extends": "./tsconfig.json", + "compilerOptions": { + "outDir": "./out-tsc/app" + }, + "files": [ + "src/main.ts", + "src/polyfills.ts", + "src/zone-flags.ts" + ], + "include": ["src/**/*.d.ts"] +} diff --git a/packages/angular/test/apps/ng17/tsconfig.app.json b/packages/angular/test/apps/ng17/tsconfig.app.json new file mode 100644 index 00000000000..f74770a5863 --- /dev/null +++ b/packages/angular/test/apps/ng17/tsconfig.app.json @@ -0,0 +1,12 @@ +{ + "extends": "./tsconfig.json", + "compilerOptions": { + "outDir": "./out-tsc/app" + }, + "files": [ + "src/main.ts", + "src/polyfills.ts", + "src/zone-flags.ts" + ], + "include": ["src/**/*.d.ts"] +} diff --git a/packages/angular/test/apps/ng18/tsconfig.app.json b/packages/angular/test/apps/ng18/tsconfig.app.json new file mode 100644 index 00000000000..f74770a5863 --- /dev/null +++ b/packages/angular/test/apps/ng18/tsconfig.app.json @@ -0,0 +1,12 @@ +{ + "extends": "./tsconfig.json", + "compilerOptions": { + "outDir": "./out-tsc/app" + }, + "files": [ + "src/main.ts", + "src/polyfills.ts", + "src/zone-flags.ts" + ], + "include": ["src/**/*.d.ts"] +} diff --git a/packages/angular/test/apps/ng19/tsconfig.app.json b/packages/angular/test/apps/ng19/tsconfig.app.json deleted file mode 100644 index f758d9820d5..00000000000 --- a/packages/angular/test/apps/ng19/tsconfig.app.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "extends": "./tsconfig.json", - "compilerOptions": { - "outDir": "./out-tsc/app", - "types": [] - }, - "files": [ - "src/main.ts", - "src/polyfills.ts" - ], - "include": [ - "src/**/*.d.ts" - ] -} diff --git a/packages/angular/test/apps/ng20/tsconfig.app.json b/packages/angular/test/apps/ng20/tsconfig.app.json deleted file mode 100644 index f758d9820d5..00000000000 --- a/packages/angular/test/apps/ng20/tsconfig.app.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "extends": "./tsconfig.json", - "compilerOptions": { - "outDir": "./out-tsc/app", - "types": [] - }, - "files": [ - "src/main.ts", - "src/polyfills.ts" - ], - "include": [ - "src/**/*.d.ts" - ] -} diff --git a/packages/angular/test/base/tsconfig.app.json b/packages/angular/test/base/tsconfig.app.json index f74770a5863..f758d9820d5 100644 --- a/packages/angular/test/base/tsconfig.app.json +++ b/packages/angular/test/base/tsconfig.app.json @@ -1,12 +1,14 @@ { "extends": "./tsconfig.json", "compilerOptions": { - "outDir": "./out-tsc/app" + "outDir": "./out-tsc/app", + "types": [] }, "files": [ "src/main.ts", - "src/polyfills.ts", - "src/zone-flags.ts" + "src/polyfills.ts" ], - "include": ["src/**/*.d.ts"] + "include": [ + "src/**/*.d.ts" + ] } From 867dffc5c670784152f9e7fd8e686a1539250ad3 Mon Sep 17 00:00:00 2001 From: Maria Hutt Date: Fri, 27 Jun 2025 14:22:19 -0700 Subject: [PATCH 07/13] chore(angular): remove extra server files --- packages/angular/test/apps/ng19/server.ts | 57 ----------------------- packages/angular/test/apps/ng20/server.ts | 57 ----------------------- 2 files changed, 114 deletions(-) delete mode 100644 packages/angular/test/apps/ng19/server.ts delete mode 100644 packages/angular/test/apps/ng20/server.ts diff --git a/packages/angular/test/apps/ng19/server.ts b/packages/angular/test/apps/ng19/server.ts deleted file mode 100644 index cbd3cd9efc2..00000000000 --- a/packages/angular/test/apps/ng19/server.ts +++ /dev/null @@ -1,57 +0,0 @@ -import 'zone.js/dist/zone-node'; - -import { ngExpressEngine } from '@nguniversal/express-engine'; -import * as express from 'express'; -import { join } from 'path'; - -import { AppServerModule } from './src/main.server'; -import { APP_BASE_HREF } from '@angular/common'; - -// The Express app is exported so that it can be used by serverless Functions. -export function app() { - const server = express(); - const distFolder = join(process.cwd(), 'dist/test-app/browser'); - - // Our Universal express-engine (found @ https://github.com/angular/universal/tree/master/modules/express-engine) - server.engine('html', ngExpressEngine({ - bootstrap: AppServerModule, - })); - - server.set('view engine', 'html'); - server.set('views', distFolder); - - // Example Express Rest API endpoints - // app.get('/api/**', (req, res) => { }); - // Serve static files from /browser - server.get('*.*', express.static(distFolder, { - maxAge: '1y' - })); - - // All regular routes use the Universal engine - server.get('*', (req, res) => { - res.render('index', { req, providers: [{ provide: APP_BASE_HREF, useValue: req.baseUrl }] }); - }); - - return server; -} - -function run() { - const port = process.env.PORT || 4000; - - // Start up the Node server - const server = app(); - server.listen(port, () => { - console.log(`Node Express server listening on http://localhost:${port}`); - }); -} - -// Webpack will replace 'require' with '__webpack_require__' -// '__non_webpack_require__' is a proxy to Node 'require' -// The below code is to ensure that the server is run only when not requiring the bundle. -declare const __non_webpack_require__: NodeRequire; -const mainModule = __non_webpack_require__.main; -if (mainModule && mainModule.filename === __filename) { - run(); -} - -export * from './src/main.server'; diff --git a/packages/angular/test/apps/ng20/server.ts b/packages/angular/test/apps/ng20/server.ts deleted file mode 100644 index cbd3cd9efc2..00000000000 --- a/packages/angular/test/apps/ng20/server.ts +++ /dev/null @@ -1,57 +0,0 @@ -import 'zone.js/dist/zone-node'; - -import { ngExpressEngine } from '@nguniversal/express-engine'; -import * as express from 'express'; -import { join } from 'path'; - -import { AppServerModule } from './src/main.server'; -import { APP_BASE_HREF } from '@angular/common'; - -// The Express app is exported so that it can be used by serverless Functions. -export function app() { - const server = express(); - const distFolder = join(process.cwd(), 'dist/test-app/browser'); - - // Our Universal express-engine (found @ https://github.com/angular/universal/tree/master/modules/express-engine) - server.engine('html', ngExpressEngine({ - bootstrap: AppServerModule, - })); - - server.set('view engine', 'html'); - server.set('views', distFolder); - - // Example Express Rest API endpoints - // app.get('/api/**', (req, res) => { }); - // Serve static files from /browser - server.get('*.*', express.static(distFolder, { - maxAge: '1y' - })); - - // All regular routes use the Universal engine - server.get('*', (req, res) => { - res.render('index', { req, providers: [{ provide: APP_BASE_HREF, useValue: req.baseUrl }] }); - }); - - return server; -} - -function run() { - const port = process.env.PORT || 4000; - - // Start up the Node server - const server = app(); - server.listen(port, () => { - console.log(`Node Express server listening on http://localhost:${port}`); - }); -} - -// Webpack will replace 'require' with '__webpack_require__' -// '__non_webpack_require__' is a proxy to Node 'require' -// The below code is to ensure that the server is run only when not requiring the bundle. -declare const __non_webpack_require__: NodeRequire; -const mainModule = __non_webpack_require__.main; -if (mainModule && mainModule.filename === __filename) { - run(); -} - -export * from './src/main.server'; From 3cd5e1354d6a040fd54fdf27e9617b3f1ef8b0bb Mon Sep 17 00:00:00 2001 From: Maria Hutt Date: Fri, 27 Jun 2025 14:25:05 -0700 Subject: [PATCH 08/13] chore(angular): update angular.json --- .../test/apps/{ng19 => ng16}/angular.json | 12 +- packages/angular/test/apps/ng20/angular.json | 156 ------------------ packages/angular/test/base/angular.json | 12 +- 3 files changed, 12 insertions(+), 168 deletions(-) rename packages/angular/test/apps/{ng19 => ng16}/angular.json (92%) delete mode 100644 packages/angular/test/apps/ng20/angular.json diff --git a/packages/angular/test/apps/ng19/angular.json b/packages/angular/test/apps/ng16/angular.json similarity index 92% rename from packages/angular/test/apps/ng19/angular.json rename to packages/angular/test/apps/ng16/angular.json index 6fc18fbac80..2d5b6774e3d 100644 --- a/packages/angular/test/apps/ng19/angular.json +++ b/packages/angular/test/apps/ng16/angular.json @@ -78,14 +78,14 @@ "serve": { "builder": "@angular-devkit/build-angular:dev-server", "options": { - "buildTarget": "test-app:build" + "browserTarget": "test-app:build" }, "configurations": { "production": { - "buildTarget": "test-app:build:production" + "browserTarget": "test-app:build:production" }, "development": { - "buildTarget": "test-app:build:development" + "browserTarget": "test-app:build:development" } }, "defaultConfiguration": "development" @@ -93,7 +93,7 @@ "extract-i18n": { "builder": "@angular-devkit/build-angular:extract-i18n", "options": { - "buildTarget": "test-app:build" + "browserTarget": "test-app:build" } }, "lint": { @@ -124,7 +124,7 @@ } }, "serve-ssr": { - "builder": "@angular-devkit/build-angular:ssr-dev-server", + "builder": "@nguniversal/builders:ssr-dev-server", "options": { "browserTarget": "test-app:build", "serverTarget": "test-app:server" @@ -137,7 +137,7 @@ } }, "prerender": { - "builder": "@angular-devkit/build-angular:prerender", + "builder": "@nguniversal/builders:prerender", "options": { "browserTarget": "test-app:build:production", "serverTarget": "test-app:server:production", diff --git a/packages/angular/test/apps/ng20/angular.json b/packages/angular/test/apps/ng20/angular.json deleted file mode 100644 index 6fc18fbac80..00000000000 --- a/packages/angular/test/apps/ng20/angular.json +++ /dev/null @@ -1,156 +0,0 @@ -{ - "$schema": "./node_modules/@angular/cli/lib/config/schema.json", - "version": 1, - "newProjectRoot": "projects", - "projects": { - "test-app": { - "root": "", - "sourceRoot": "src", - "projectType": "application", - "prefix": "app", - "schematics": {}, - "architect": { - "build": { - "builder": "@angular-devkit/build-angular:browser", - "options": { - "outputPath": "dist/test-app/browser", - "index": "src/index.html", - "main": "src/main.ts", - "polyfills": "src/polyfills.ts", - "tsConfig": "tsconfig.app.json", - "buildOptimizer": true, - "assets": [ - "src/favicon.ico", - { - "glob": "**/*", - "input": "src/assets", - "output": "assets" - }, - { - "glob": "**/*.svg", - "input": "node_modules/ionicons/dist/ionicons/svg", - "output": "./svg" - } - ], - "styles": ["src/styles.css"], - "scripts": [] - }, - "configurations": { - "production": { - "fileReplacements": [ - { - "replace": "src/environments/environment.ts", - "with": "src/environments/environment.prod.ts" - } - ], - "optimization": true, - "outputHashing": "all", - "sourceMap": false, - "namedChunks": false, - "aot": true, - "progress": false, - "extractLicenses": true, - "vendorChunk": false, - "buildOptimizer": true, - "budgets": [ - { - "type": "initial", - "maximumWarning": "2mb", - "maximumError": "5mb" - }, - { - "type": "anyComponentStyle", - "maximumWarning": "6kb" - } - ] - }, - "development": { - "buildOptimizer": false, - "optimization": false, - "vendorChunk": true, - "extractLicenses": false, - "sourceMap": true, - "namedChunks": true - } - }, - "defaultConfiguration": "production" - }, - "serve": { - "builder": "@angular-devkit/build-angular:dev-server", - "options": { - "buildTarget": "test-app:build" - }, - "configurations": { - "production": { - "buildTarget": "test-app:build:production" - }, - "development": { - "buildTarget": "test-app:build:development" - } - }, - "defaultConfiguration": "development" - }, - "extract-i18n": { - "builder": "@angular-devkit/build-angular:extract-i18n", - "options": { - "buildTarget": "test-app:build" - } - }, - "lint": { - "builder": "@angular-eslint/builder:lint", - "options": { - "lintFilePatterns": ["src/**/*.ts", "src/**/*.html"] - } - }, - "server": { - "builder": "@angular-devkit/build-angular:server", - "options": { - "outputPath": "dist/test-app/server", - "main": "server.ts", - "tsConfig": "tsconfig.server.json" - }, - "configurations": { - "production": { - "outputHashing": "media", - "fileReplacements": [ - { - "replace": "src/environments/environment.ts", - "with": "src/environments/environment.prod.ts" - } - ], - "sourceMap": false, - "optimization": true - } - } - }, - "serve-ssr": { - "builder": "@angular-devkit/build-angular:ssr-dev-server", - "options": { - "browserTarget": "test-app:build", - "serverTarget": "test-app:server" - }, - "configurations": { - "production": { - "browserTarget": "test-app:build:production", - "serverTarget": "test-app:server:production" - } - } - }, - "prerender": { - "builder": "@angular-devkit/build-angular:prerender", - "options": { - "browserTarget": "test-app:build:production", - "serverTarget": "test-app:server:production", - "routes": [] - } - } - } - } - }, - "cli": { - "schematicCollections": ["@angular-eslint/schematics"], - "cache": { - "enabled": false - } - } -} diff --git a/packages/angular/test/base/angular.json b/packages/angular/test/base/angular.json index 2d5b6774e3d..6fc18fbac80 100644 --- a/packages/angular/test/base/angular.json +++ b/packages/angular/test/base/angular.json @@ -78,14 +78,14 @@ "serve": { "builder": "@angular-devkit/build-angular:dev-server", "options": { - "browserTarget": "test-app:build" + "buildTarget": "test-app:build" }, "configurations": { "production": { - "browserTarget": "test-app:build:production" + "buildTarget": "test-app:build:production" }, "development": { - "browserTarget": "test-app:build:development" + "buildTarget": "test-app:build:development" } }, "defaultConfiguration": "development" @@ -93,7 +93,7 @@ "extract-i18n": { "builder": "@angular-devkit/build-angular:extract-i18n", "options": { - "browserTarget": "test-app:build" + "buildTarget": "test-app:build" } }, "lint": { @@ -124,7 +124,7 @@ } }, "serve-ssr": { - "builder": "@nguniversal/builders:ssr-dev-server", + "builder": "@angular-devkit/build-angular:ssr-dev-server", "options": { "browserTarget": "test-app:build", "serverTarget": "test-app:server" @@ -137,7 +137,7 @@ } }, "prerender": { - "builder": "@nguniversal/builders:prerender", + "builder": "@angular-devkit/build-angular:prerender", "options": { "browserTarget": "test-app:build:production", "serverTarget": "test-app:server:production", From 9fe7c7b470ed15a981d359ad9350e1b67f830f40 Mon Sep 17 00:00:00 2001 From: Maria Hutt Date: Fri, 27 Jun 2025 14:29:10 -0700 Subject: [PATCH 09/13] chore(angular): update main.server --- .../test/apps/{ng19 => ng16}/src/main.server.ts | 7 +------ .../test/apps/{ng20 => ng17}/src/main.server.ts | 7 +------ packages/angular/test/apps/ng18/src/main.server.ts | 10 ++++++++++ packages/angular/test/base/src/main.server.ts | 7 ++++++- 4 files changed, 18 insertions(+), 13 deletions(-) rename packages/angular/test/apps/{ng19 => ng16}/src/main.server.ts (55%) rename packages/angular/test/apps/{ng20 => ng17}/src/main.server.ts (55%) create mode 100644 packages/angular/test/apps/ng18/src/main.server.ts diff --git a/packages/angular/test/apps/ng19/src/main.server.ts b/packages/angular/test/apps/ng16/src/main.server.ts similarity index 55% rename from packages/angular/test/apps/ng19/src/main.server.ts rename to packages/angular/test/apps/ng16/src/main.server.ts index bc1a12688de..10150a7181e 100644 --- a/packages/angular/test/apps/ng19/src/main.server.ts +++ b/packages/angular/test/apps/ng16/src/main.server.ts @@ -2,14 +2,9 @@ import { enableProdMode } from '@angular/core'; import { environment } from './environments/environment'; -import { AppServerModule } from './app/app.server.module'; - if (environment.production) { enableProdMode(); } export { AppServerModule } from './app/app.server.module'; -export { renderModule } from '@angular/platform-server'; - -// Add a default export -export default AppServerModule; +export { renderModule, renderModuleFactory } from '@angular/platform-server'; diff --git a/packages/angular/test/apps/ng20/src/main.server.ts b/packages/angular/test/apps/ng17/src/main.server.ts similarity index 55% rename from packages/angular/test/apps/ng20/src/main.server.ts rename to packages/angular/test/apps/ng17/src/main.server.ts index bc1a12688de..10150a7181e 100644 --- a/packages/angular/test/apps/ng20/src/main.server.ts +++ b/packages/angular/test/apps/ng17/src/main.server.ts @@ -2,14 +2,9 @@ import { enableProdMode } from '@angular/core'; import { environment } from './environments/environment'; -import { AppServerModule } from './app/app.server.module'; - if (environment.production) { enableProdMode(); } export { AppServerModule } from './app/app.server.module'; -export { renderModule } from '@angular/platform-server'; - -// Add a default export -export default AppServerModule; +export { renderModule, renderModuleFactory } from '@angular/platform-server'; diff --git a/packages/angular/test/apps/ng18/src/main.server.ts b/packages/angular/test/apps/ng18/src/main.server.ts new file mode 100644 index 00000000000..10150a7181e --- /dev/null +++ b/packages/angular/test/apps/ng18/src/main.server.ts @@ -0,0 +1,10 @@ +import { enableProdMode } from '@angular/core'; + +import { environment } from './environments/environment'; + +if (environment.production) { + enableProdMode(); +} + +export { AppServerModule } from './app/app.server.module'; +export { renderModule, renderModuleFactory } from '@angular/platform-server'; diff --git a/packages/angular/test/base/src/main.server.ts b/packages/angular/test/base/src/main.server.ts index 10150a7181e..bc1a12688de 100644 --- a/packages/angular/test/base/src/main.server.ts +++ b/packages/angular/test/base/src/main.server.ts @@ -2,9 +2,14 @@ import { enableProdMode } from '@angular/core'; import { environment } from './environments/environment'; +import { AppServerModule } from './app/app.server.module'; + if (environment.production) { enableProdMode(); } export { AppServerModule } from './app/app.server.module'; -export { renderModule, renderModuleFactory } from '@angular/platform-server'; +export { renderModule } from '@angular/platform-server'; + +// Add a default export +export default AppServerModule; From 2061a7b91a93205aa83f0bdcc1a3f25b8114687a Mon Sep 17 00:00:00 2001 From: Maria Hutt Date: Fri, 27 Jun 2025 14:32:23 -0700 Subject: [PATCH 10/13] chore(angular): update app-routing.module --- .../test/apps/ng16/src/app/app-routing.module.ts | 10 ---------- .../test/apps/ng17/src/app/app-routing.module.ts | 10 ---------- .../test/apps/ng18/src/app/app-routing.module.ts | 10 ---------- .../test/apps/ng19/src/app/app-routing.module.ts | 10 ---------- .../test/apps/ng20/src/app/app-routing.module.ts | 10 ---------- .../angular/test/base/src/app/app-routing.module.ts | 2 +- 6 files changed, 1 insertion(+), 51 deletions(-) delete mode 100644 packages/angular/test/apps/ng16/src/app/app-routing.module.ts delete mode 100644 packages/angular/test/apps/ng17/src/app/app-routing.module.ts delete mode 100644 packages/angular/test/apps/ng18/src/app/app-routing.module.ts delete mode 100644 packages/angular/test/apps/ng19/src/app/app-routing.module.ts delete mode 100644 packages/angular/test/apps/ng20/src/app/app-routing.module.ts diff --git a/packages/angular/test/apps/ng16/src/app/app-routing.module.ts b/packages/angular/test/apps/ng16/src/app/app-routing.module.ts deleted file mode 100644 index 3cf2c268f85..00000000000 --- a/packages/angular/test/apps/ng16/src/app/app-routing.module.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; - -import { routes } from './app.routes'; - -@NgModule({ - imports: [RouterModule.forRoot(routes, { bindToComponentInputs: true })], - exports: [RouterModule] -}) -export class AppRoutingModule { } diff --git a/packages/angular/test/apps/ng17/src/app/app-routing.module.ts b/packages/angular/test/apps/ng17/src/app/app-routing.module.ts deleted file mode 100644 index 3cf2c268f85..00000000000 --- a/packages/angular/test/apps/ng17/src/app/app-routing.module.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; - -import { routes } from './app.routes'; - -@NgModule({ - imports: [RouterModule.forRoot(routes, { bindToComponentInputs: true })], - exports: [RouterModule] -}) -export class AppRoutingModule { } diff --git a/packages/angular/test/apps/ng18/src/app/app-routing.module.ts b/packages/angular/test/apps/ng18/src/app/app-routing.module.ts deleted file mode 100644 index 3cf2c268f85..00000000000 --- a/packages/angular/test/apps/ng18/src/app/app-routing.module.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; - -import { routes } from './app.routes'; - -@NgModule({ - imports: [RouterModule.forRoot(routes, { bindToComponentInputs: true })], - exports: [RouterModule] -}) -export class AppRoutingModule { } diff --git a/packages/angular/test/apps/ng19/src/app/app-routing.module.ts b/packages/angular/test/apps/ng19/src/app/app-routing.module.ts deleted file mode 100644 index 3cf2c268f85..00000000000 --- a/packages/angular/test/apps/ng19/src/app/app-routing.module.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; - -import { routes } from './app.routes'; - -@NgModule({ - imports: [RouterModule.forRoot(routes, { bindToComponentInputs: true })], - exports: [RouterModule] -}) -export class AppRoutingModule { } diff --git a/packages/angular/test/apps/ng20/src/app/app-routing.module.ts b/packages/angular/test/apps/ng20/src/app/app-routing.module.ts deleted file mode 100644 index 3cf2c268f85..00000000000 --- a/packages/angular/test/apps/ng20/src/app/app-routing.module.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; - -import { routes } from './app.routes'; - -@NgModule({ - imports: [RouterModule.forRoot(routes, { bindToComponentInputs: true })], - exports: [RouterModule] -}) -export class AppRoutingModule { } diff --git a/packages/angular/test/base/src/app/app-routing.module.ts b/packages/angular/test/base/src/app/app-routing.module.ts index 0feced8896a..3cf2c268f85 100644 --- a/packages/angular/test/base/src/app/app-routing.module.ts +++ b/packages/angular/test/base/src/app/app-routing.module.ts @@ -4,7 +4,7 @@ import { RouterModule } from '@angular/router'; import { routes } from './app.routes'; @NgModule({ - imports: [RouterModule.forRoot(routes)], + imports: [RouterModule.forRoot(routes, { bindToComponentInputs: true })], exports: [RouterModule] }) export class AppRoutingModule { } From 4039ed1236d74d47923eba93e3dc51cae9b1199f Mon Sep 17 00:00:00 2001 From: Maria Hutt Date: Fri, 27 Jun 2025 14:34:48 -0700 Subject: [PATCH 11/13] chore(angular): update version-test-routing.module --- .../version-test-routing.module.ts | 25 ------------------- .../version-test-routing.module.ts | 25 ------------------- .../version-test-routing.module.ts | 25 ------------------- .../version-test-routing.module.ts | 25 ------------------- .../version-test-routing.module.ts | 25 ------------------- .../version-test-routing.module.ts | 15 ++++++++--- 6 files changed, 12 insertions(+), 128 deletions(-) delete mode 100644 packages/angular/test/apps/ng16/src/app/lazy/version-test/version-test-routing.module.ts delete mode 100644 packages/angular/test/apps/ng17/src/app/lazy/version-test/version-test-routing.module.ts delete mode 100644 packages/angular/test/apps/ng18/src/app/lazy/version-test/version-test-routing.module.ts delete mode 100644 packages/angular/test/apps/ng19/src/app/lazy/version-test/version-test-routing.module.ts delete mode 100644 packages/angular/test/apps/ng20/src/app/lazy/version-test/version-test-routing.module.ts diff --git a/packages/angular/test/apps/ng16/src/app/lazy/version-test/version-test-routing.module.ts b/packages/angular/test/apps/ng16/src/app/lazy/version-test/version-test-routing.module.ts deleted file mode 100644 index 0aedfecabef..00000000000 --- a/packages/angular/test/apps/ng16/src/app/lazy/version-test/version-test-routing.module.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { NgModule } from "@angular/core"; -import { RouterModule } from "@angular/router"; - -@NgModule({ - imports: [ - RouterModule.forChild([ - { - path: 'modal-nav-params', - loadComponent: () => import('./modal-nav-params/modal-nav-params.component').then(m => m.ModalNavParamsComponent), - }, - { - path: 'bind-route/:id', - data: { - title: 'data:bindToComponentInputs' - }, - resolve: { - name: () => 'resolve:bindToComponentInputs' - }, - loadComponent: () => import('./bind-component-inputs/bind-component-inputs.component').then(c => c.BindComponentInputsComponent) - } - ]) - ], - exports: [RouterModule] -}) -export class VersionTestRoutingModule { } diff --git a/packages/angular/test/apps/ng17/src/app/lazy/version-test/version-test-routing.module.ts b/packages/angular/test/apps/ng17/src/app/lazy/version-test/version-test-routing.module.ts deleted file mode 100644 index 0aedfecabef..00000000000 --- a/packages/angular/test/apps/ng17/src/app/lazy/version-test/version-test-routing.module.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { NgModule } from "@angular/core"; -import { RouterModule } from "@angular/router"; - -@NgModule({ - imports: [ - RouterModule.forChild([ - { - path: 'modal-nav-params', - loadComponent: () => import('./modal-nav-params/modal-nav-params.component').then(m => m.ModalNavParamsComponent), - }, - { - path: 'bind-route/:id', - data: { - title: 'data:bindToComponentInputs' - }, - resolve: { - name: () => 'resolve:bindToComponentInputs' - }, - loadComponent: () => import('./bind-component-inputs/bind-component-inputs.component').then(c => c.BindComponentInputsComponent) - } - ]) - ], - exports: [RouterModule] -}) -export class VersionTestRoutingModule { } diff --git a/packages/angular/test/apps/ng18/src/app/lazy/version-test/version-test-routing.module.ts b/packages/angular/test/apps/ng18/src/app/lazy/version-test/version-test-routing.module.ts deleted file mode 100644 index 0aedfecabef..00000000000 --- a/packages/angular/test/apps/ng18/src/app/lazy/version-test/version-test-routing.module.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { NgModule } from "@angular/core"; -import { RouterModule } from "@angular/router"; - -@NgModule({ - imports: [ - RouterModule.forChild([ - { - path: 'modal-nav-params', - loadComponent: () => import('./modal-nav-params/modal-nav-params.component').then(m => m.ModalNavParamsComponent), - }, - { - path: 'bind-route/:id', - data: { - title: 'data:bindToComponentInputs' - }, - resolve: { - name: () => 'resolve:bindToComponentInputs' - }, - loadComponent: () => import('./bind-component-inputs/bind-component-inputs.component').then(c => c.BindComponentInputsComponent) - } - ]) - ], - exports: [RouterModule] -}) -export class VersionTestRoutingModule { } diff --git a/packages/angular/test/apps/ng19/src/app/lazy/version-test/version-test-routing.module.ts b/packages/angular/test/apps/ng19/src/app/lazy/version-test/version-test-routing.module.ts deleted file mode 100644 index 0aedfecabef..00000000000 --- a/packages/angular/test/apps/ng19/src/app/lazy/version-test/version-test-routing.module.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { NgModule } from "@angular/core"; -import { RouterModule } from "@angular/router"; - -@NgModule({ - imports: [ - RouterModule.forChild([ - { - path: 'modal-nav-params', - loadComponent: () => import('./modal-nav-params/modal-nav-params.component').then(m => m.ModalNavParamsComponent), - }, - { - path: 'bind-route/:id', - data: { - title: 'data:bindToComponentInputs' - }, - resolve: { - name: () => 'resolve:bindToComponentInputs' - }, - loadComponent: () => import('./bind-component-inputs/bind-component-inputs.component').then(c => c.BindComponentInputsComponent) - } - ]) - ], - exports: [RouterModule] -}) -export class VersionTestRoutingModule { } diff --git a/packages/angular/test/apps/ng20/src/app/lazy/version-test/version-test-routing.module.ts b/packages/angular/test/apps/ng20/src/app/lazy/version-test/version-test-routing.module.ts deleted file mode 100644 index 0aedfecabef..00000000000 --- a/packages/angular/test/apps/ng20/src/app/lazy/version-test/version-test-routing.module.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { NgModule } from "@angular/core"; -import { RouterModule } from "@angular/router"; - -@NgModule({ - imports: [ - RouterModule.forChild([ - { - path: 'modal-nav-params', - loadComponent: () => import('./modal-nav-params/modal-nav-params.component').then(m => m.ModalNavParamsComponent), - }, - { - path: 'bind-route/:id', - data: { - title: 'data:bindToComponentInputs' - }, - resolve: { - name: () => 'resolve:bindToComponentInputs' - }, - loadComponent: () => import('./bind-component-inputs/bind-component-inputs.component').then(c => c.BindComponentInputsComponent) - } - ]) - ], - exports: [RouterModule] -}) -export class VersionTestRoutingModule { } diff --git a/packages/angular/test/base/src/app/lazy/version-test/version-test-routing.module.ts b/packages/angular/test/base/src/app/lazy/version-test/version-test-routing.module.ts index e64eac0b60e..0aedfecabef 100644 --- a/packages/angular/test/base/src/app/lazy/version-test/version-test-routing.module.ts +++ b/packages/angular/test/base/src/app/lazy/version-test/version-test-routing.module.ts @@ -1,13 +1,22 @@ import { NgModule } from "@angular/core"; import { RouterModule } from "@angular/router"; -import { VersionTestComponent } from "./version-test.component"; @NgModule({ imports: [ RouterModule.forChild([ { - path: '', - component: VersionTestComponent + path: 'modal-nav-params', + loadComponent: () => import('./modal-nav-params/modal-nav-params.component').then(m => m.ModalNavParamsComponent), + }, + { + path: 'bind-route/:id', + data: { + title: 'data:bindToComponentInputs' + }, + resolve: { + name: () => 'resolve:bindToComponentInputs' + }, + loadComponent: () => import('./bind-component-inputs/bind-component-inputs.component').then(c => c.BindComponentInputsComponent) } ]) ], From 1167c97ae009d5df8b4eed51e82fd687d69f32e0 Mon Sep 17 00:00:00 2001 From: Maria Hutt Date: Fri, 27 Jun 2025 14:40:04 -0700 Subject: [PATCH 12/13] chore(angular): add modal-nav-params to base --- .../modal-nav-params.component.ts | 44 ------------------- .../modal-nav-params/nav-root.component.ts | 36 --------------- .../modal-nav-params.component.ts | 0 .../modal-nav-params/nav-root.component.ts | 0 4 files changed, 80 deletions(-) delete mode 100644 packages/angular/test/apps/ng20/src/app/lazy/version-test/modal-nav-params/modal-nav-params.component.ts delete mode 100644 packages/angular/test/apps/ng20/src/app/lazy/version-test/modal-nav-params/nav-root.component.ts rename packages/angular/test/{apps/ng19 => base}/src/app/lazy/version-test/modal-nav-params/modal-nav-params.component.ts (100%) rename packages/angular/test/{apps/ng19 => base}/src/app/lazy/version-test/modal-nav-params/nav-root.component.ts (100%) diff --git a/packages/angular/test/apps/ng20/src/app/lazy/version-test/modal-nav-params/modal-nav-params.component.ts b/packages/angular/test/apps/ng20/src/app/lazy/version-test/modal-nav-params/modal-nav-params.component.ts deleted file mode 100644 index 4f67b0f8639..00000000000 --- a/packages/angular/test/apps/ng20/src/app/lazy/version-test/modal-nav-params/modal-nav-params.component.ts +++ /dev/null @@ -1,44 +0,0 @@ -import { Component } from "@angular/core"; -import { IonicModule } from "@ionic/angular"; // Only import IonicModule - -import { NavRootComponent } from "./nav-root.component"; // Import the NavRootComponent - -@Component({ - selector: 'app-modal-nav-params', - template: ` - - - Modal Nav Params - - - - Open Modal - - - - - - Close - - - - - - - - - - `, - standalone: true, - imports: [IonicModule] // Only import IonicModule here, remove NavRootComponent -}) -export class ModalNavParamsComponent { - - root = NavRootComponent; // Use the root component in the ion-nav - rootParams = { - params: { - id: 123 - } - }; - -} diff --git a/packages/angular/test/apps/ng20/src/app/lazy/version-test/modal-nav-params/nav-root.component.ts b/packages/angular/test/apps/ng20/src/app/lazy/version-test/modal-nav-params/nav-root.component.ts deleted file mode 100644 index 0327da6f53b..00000000000 --- a/packages/angular/test/apps/ng20/src/app/lazy/version-test/modal-nav-params/nav-root.component.ts +++ /dev/null @@ -1,36 +0,0 @@ -import { Component, OnInit } from "@angular/core"; - -import { IonicModule } from "@ionic/angular"; - -/** - * This is used to track if any occurrences of - * the ion-nav root component being attached to - * the DOM result in the rootParams not being - * assigned to the component instance. - * - * https://github.com/ionic-team/ionic-framework/issues/27146 - */ -let rootParamsException = false; - -@Component({ - selector: 'app-modal-content', - template: ` - {{ hasException ? 'ERROR' : 'OK' }} - `, - imports: [IonicModule] -}) -export class NavRootComponent implements OnInit { - - params: any; - - ngOnInit() { - if (this.params === undefined) { - rootParamsException = true; - } - } - - get hasException() { - return rootParamsException; - } - -} diff --git a/packages/angular/test/apps/ng19/src/app/lazy/version-test/modal-nav-params/modal-nav-params.component.ts b/packages/angular/test/base/src/app/lazy/version-test/modal-nav-params/modal-nav-params.component.ts similarity index 100% rename from packages/angular/test/apps/ng19/src/app/lazy/version-test/modal-nav-params/modal-nav-params.component.ts rename to packages/angular/test/base/src/app/lazy/version-test/modal-nav-params/modal-nav-params.component.ts diff --git a/packages/angular/test/apps/ng19/src/app/lazy/version-test/modal-nav-params/nav-root.component.ts b/packages/angular/test/base/src/app/lazy/version-test/modal-nav-params/nav-root.component.ts similarity index 100% rename from packages/angular/test/apps/ng19/src/app/lazy/version-test/modal-nav-params/nav-root.component.ts rename to packages/angular/test/base/src/app/lazy/version-test/modal-nav-params/nav-root.component.ts From 1d675613d6da3ad8de9b8fbf76ff3c5863732485 Mon Sep 17 00:00:00 2001 From: Maria Hutt Date: Fri, 27 Jun 2025 16:05:29 -0700 Subject: [PATCH 13/13] docs(angular): add reason for syncing --- docs/angular/testing.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/docs/angular/testing.md b/docs/angular/testing.md index edc568866cd..4e18351378e 100644 --- a/docs/angular/testing.md +++ b/docs/angular/testing.md @@ -4,7 +4,7 @@ Ionic Framework supports multiple versions of Angular. As a result, we need to v ## Syncing Local Changes -The Angular test app supports syncing your locally built changes for validation. +The Angular test app supports syncing your locally built changes for validation. This allows you to test local changes like `core` without having to publish a new version of the package. 1. Build the `core` directory. 2. Navigate to `packages/angular` and run `npm run sync`. @@ -16,6 +16,12 @@ The Angular test app supports syncing your locally built changes for validation. From here you can either build the application or start a local dev server. When re-syncing changes, you will need to [wipe or disable the application cache](#application-cache). +> [!NOTE] +> Syncing is required to verify that the minimal supported Angular version is still compatible with the latest Ionic Framework changes. +> For example, Ionic Framework 8 supports Angular 16, but the latest version of Ionic Framework may not be compatible with Angular 16. Syncing allows you to verify that the latest changes are still compatible with the minimal supported version. +> +> Support for the minimal version and maximum version can be found on the [Support page](https://ionicframework.com/docs/reference/support#ionic-angular) of the Ionic Framework documentation. + ## Application Cache Angular CLI creates a cache of several files on disk by default in the `.angular` directory. This decreases the time taken to build the test application. However, the cache makes it difficult to quickly sync and check local changes of Ionic. As a result, the `.angular` cache is disabled by default in the test app projects.