From c255e473ccb9c2abd5d896c0217dda0e16e93d2d Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Mon, 24 Nov 2025 09:37:08 +0000
Subject: [PATCH 01/11] Initial plan


From 15b9082e2ec5b75148c3a77c36597c92fc51e2d7 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Mon, 24 Nov 2025 09:47:49 +0000
Subject: [PATCH 02/11] chore: update Angular and igniteui-angular to 21.0.0

Co-authored-by: Lipata <2621802+Lipata@users.noreply.github.com>
---
 packages/igx-templates/constants.ts           |  2 +-
 .../projects/_base/files/package.json         | 54 +++++++++----------
 .../projects/side-nav-auth/files/package.json | 48 ++++++++---------
 .../igx-ts/projects/_base/files/package.json  | 38 ++++++-------
 .../projects/side-nav-auth/files/package.json | 48 ++++++++---------
 5 files changed, 94 insertions(+), 96 deletions(-)

diff --git a/packages/igx-templates/constants.ts b/packages/igx-templates/constants.ts
index 2a11957b5..7134038fd 100644
--- a/packages/igx-templates/constants.ts
+++ b/packages/igx-templates/constants.ts
@@ -1 +1 @@
-export const IGNITEUI_ANGULAR_PACKAGE = "igniteui-angular@~20.1.0";
+export const IGNITEUI_ANGULAR_PACKAGE = "igniteui-angular@~21.0.0";
diff --git a/packages/igx-templates/igx-ts-legacy/projects/_base/files/package.json b/packages/igx-templates/igx-ts-legacy/projects/_base/files/package.json
index 50e9e1930..df1163405 100644
--- a/packages/igx-templates/igx-ts-legacy/projects/_base/files/package.json
+++ b/packages/igx-templates/igx-ts-legacy/projects/_base/files/package.json
@@ -11,16 +11,16 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "~20.3.0",
-    "@angular/common": "~20.3.0",
-    "@angular/compiler": "~20.3.0",
-    "@angular/core": "~20.3.0",
-    "@angular/forms": "~20.3.0",
-    "@angular/platform-browser": "~20.3.0",
-    "@angular/platform-browser-dynamic": "~20.3.0",
-    "@angular/router": "~20.3.0",
+    "@angular/animations": "~21.0.0",
+    "@angular/common": "~21.0.0",
+    "@angular/compiler": "~21.0.0",
+    "@angular/core": "~21.0.0",
+    "@angular/forms": "~21.0.0",
+    "@angular/platform-browser": "~21.0.0",
+    "@angular/platform-browser-dynamic": "~21.0.0",
+    "@angular/router": "~21.0.0",
     "hammerjs": "~2.0.8",
-    "igniteui-angular": "~20.1.0",
+    "igniteui-angular": "~21.0.0",
     "minireset.css": "~0.0.7",
     "rxjs": "~7.8.1",
     "tslib": "~2.8.1",
@@ -28,35 +28,33 @@
   },
   "overrides": {
     "reveal-sdk-wrappers-angular": {
-      "@angular/core": "^20.3.0",
-      "@angular/common": "^20.3.0",
-      "rxjs": "~7.8.1"
-    },
-    "rxjs": "~7.8.1"
+      "@angular/core": "^21.0.0",
+      "@angular/common": "^21.0.0"
+    }
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "~20.3.0",
-    "@angular-eslint/builder": "~20.3.0",
-    "@angular-eslint/eslint-plugin": "~20.3.0",
-    "@angular-eslint/eslint-plugin-template": "~20.3.0",
-    "@angular-eslint/schematics": "~20.3.0",
-    "@angular-eslint/template-parser": "~20.3.0",
-    "@angular/cli": "~20.3.0",
-    "@angular/compiler-cli": "~20.3.0",
+    "@angular-devkit/build-angular": "~21.0.0",
+    "@angular-eslint/builder": "~21.0.1",
+    "@angular-eslint/eslint-plugin": "~21.0.1",
+    "@angular-eslint/eslint-plugin-template": "~21.0.1",
+    "@angular-eslint/schematics": "~21.0.1",
+    "@angular-eslint/template-parser": "~21.0.1",
+    "@angular/cli": "~21.0.0",
+    "@angular/compiler-cli": "~21.0.0",
     "@types/jasmine": "~5.1.4",
-    "@typescript-eslint/eslint-plugin": "~8.45.0",
-    "@typescript-eslint/parser": "~8.45.0",
-    "eslint": "~9.36.0",
+    "@typescript-eslint/eslint-plugin": "~8.47.0",
+    "@typescript-eslint/parser": "~8.47.0",
+    "eslint": "~9.39.1",
     "eslint-plugin-import": "^2.32.0",
     "eslint-plugin-prefer-arrow": "^1.2.3",
-    "eslint-plugin-unicorn": "^61.0.2",
+    "eslint-plugin-unicorn": "^62.0.0",
     "igniteui-cli": "~<%=cliVersion%>",
-    "jasmine-core": "~5.11.0",
+    "jasmine-core": "~5.12.1",
     "karma": "~6.4.4",
     "karma-chrome-launcher": "~3.2.0",
     "karma-coverage": "~2.2.1",
     "karma-jasmine": "~5.1.0",
     "karma-jasmine-html-reporter": "~2.1.0",
-    "typescript": "~5.9.2"
+    "typescript": "~5.9.3"
   }
 }
diff --git a/packages/igx-templates/igx-ts-legacy/projects/side-nav-auth/files/package.json b/packages/igx-templates/igx-ts-legacy/projects/side-nav-auth/files/package.json
index 38d707866..576fd0f60 100644
--- a/packages/igx-templates/igx-ts-legacy/projects/side-nav-auth/files/package.json
+++ b/packages/igx-templates/igx-ts-legacy/projects/side-nav-auth/files/package.json
@@ -11,49 +11,49 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "~20.3.0",
-    "@angular/common": "~20.3.0",
-    "@angular/compiler": "~20.3.0",
-    "@angular/core": "~20.3.0",
-    "@angular/forms": "~20.3.0",
-    "@angular/platform-browser": "~20.3.0",
-    "@angular/platform-browser-dynamic": "~20.3.0",
-    "@angular/router": "~20.3.0",
+    "@angular/animations": "~21.0.0",
+    "@angular/common": "~21.0.0",
+    "@angular/compiler": "~21.0.0",
+    "@angular/core": "~21.0.0",
+    "@angular/forms": "~21.0.0",
+    "@angular/platform-browser": "~21.0.0",
+    "@angular/platform-browser-dynamic": "~21.0.0",
+    "@angular/router": "~21.0.0",
     "angular-auth-oidc-client": "~15.0.4",
     "hammerjs": "~2.0.8",
-    "igniteui-angular": "~20.1.0",
+    "igniteui-angular": "~21.0.0",
     "minireset.css": "~0.0.7",
     "rxjs": "~7.8.0",
     "tslib": "~2.8.1",
     "zone.js": "~0.15.0"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "~20.3.0",
-    "@angular-eslint/builder": "~20.3.0",
-    "@angular-eslint/eslint-plugin": "~20.3.0",
-    "@angular-eslint/eslint-plugin-template": "~20.3.0",
-    "@angular-eslint/schematics": "~20.3.0",
-    "@angular-eslint/template-parser": "~20.3.0",
-    "@angular/cli": "~20.3.0",
-    "@angular/compiler-cli": "~20.3.0",
-    "@angular/language-service": "~20.3.0",
+    "@angular-devkit/build-angular": "~21.0.0",
+    "@angular-eslint/builder": "~21.0.1",
+    "@angular-eslint/eslint-plugin": "~21.0.1",
+    "@angular-eslint/eslint-plugin-template": "~21.0.1",
+    "@angular-eslint/schematics": "~21.0.1",
+    "@angular-eslint/template-parser": "~21.0.1",
+    "@angular/cli": "~21.0.0",
+    "@angular/compiler-cli": "~21.0.0",
+    "@angular/language-service": "~21.0.0",
     "@types/facebook-js-sdk": "~3.3.6",
     "@types/hammerjs": "~2.0.41",
     "@types/jasmine": "~5.1.4",
     "@types/jasminewd2": "~2.0.3",
-    "@typescript-eslint/eslint-plugin": "~8.45.0",
-    "@typescript-eslint/parser": "~8.45.0",
-    "eslint": "~9.36.0",
+    "@typescript-eslint/eslint-plugin": "~8.47.0",
+    "@typescript-eslint/parser": "~8.47.0",
+    "eslint": "~9.39.1",
     "eslint-plugin-import": "^2.32.0",
     "eslint-plugin-prefer-arrow": "^1.2.3",
-    "eslint-plugin-unicorn": "^61.0.2",
+    "eslint-plugin-unicorn": "^62.0.0",
     "igniteui-cli": "~<%=cliVersion%>",
-    "jasmine-core": "~5.11.0",
+    "jasmine-core": "~5.12.1",
     "karma": "~6.4.4",
     "karma-chrome-launcher": "~3.2.0",
     "karma-coverage": "~2.2.1",
     "karma-jasmine": "~5.1.0",
     "karma-jasmine-html-reporter": "~2.1.0",
-    "typescript": "~5.9.2"
+    "typescript": "~5.9.3"
   }
 }
diff --git a/packages/igx-templates/igx-ts/projects/_base/files/package.json b/packages/igx-templates/igx-ts/projects/_base/files/package.json
index c1de4b5f0..193be3301 100644
--- a/packages/igx-templates/igx-ts/projects/_base/files/package.json
+++ b/packages/igx-templates/igx-ts/projects/_base/files/package.json
@@ -11,16 +11,16 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "~20.3.0",
-    "@angular/common": "~20.3.0",
-    "@angular/compiler": "~20.3.0",
-    "@angular/core": "~20.3.0",
-    "@angular/forms": "~20.3.0",
-    "@angular/platform-browser": "~20.3.0",
-    "@angular/platform-browser-dynamic": "~20.3.0",
-    "@angular/router": "~20.3.0",
+    "@angular/animations": "~21.0.0",
+    "@angular/common": "~21.0.0",
+    "@angular/compiler": "~21.0.0",
+    "@angular/core": "~21.0.0",
+    "@angular/forms": "~21.0.0",
+    "@angular/platform-browser": "~21.0.0",
+    "@angular/platform-browser-dynamic": "~21.0.0",
+    "@angular/router": "~21.0.0",
     "hammerjs": "~2.0.8",
-    "igniteui-angular": "~20.1.0",
+    "igniteui-angular": "~21.0.0",
     "minireset.css": "~0.0.7",
     "rxjs": "~7.8.1",
     "tslib": "~2.8.1",
@@ -28,28 +28,28 @@
   },
   "overrides": {
     "reveal-sdk-wrappers-angular": {
-      "@angular/core": "^20.3.0",
-      "@angular/common": "^20.3.0",
+      "@angular/core": "^21.0.0",
+      "@angular/common": "^21.0.0",
       "rxjs": "~7.8.1"
     },
     "glob": "^11.0.3",
     "rimraf": "^6.0.1"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "~20.3.0",
-    "@angular/cli": "~20.3.0",
-    "@angular/compiler-cli": "~20.3.0",
+    "@angular-devkit/build-angular": "~21.0.0",
+    "@angular/cli": "~21.0.0",
+    "@angular/compiler-cli": "~21.0.0",
     "@types/jasmine": "~5.1.4",
-    "angular-eslint": "~20.3.0",
-    "eslint": "~9.35.0",
+    "angular-eslint": "~21.0.1",
+    "eslint": "~9.39.1",
     "igniteui-cli": "~<%=cliVersion%>",
-    "jasmine-core": "~5.11.0",
+    "jasmine-core": "~5.12.1",
     "karma": "~6.4.4",
     "karma-chrome-launcher": "~3.2.0",
     "karma-coverage": "~2.2.1",
     "karma-jasmine": "~5.1.0",
     "karma-jasmine-html-reporter": "~2.1.0",
-    "typescript": "~5.9.2",
-    "typescript-eslint": "~8.40.0"
+    "typescript": "~5.9.3",
+    "typescript-eslint": "~8.47.0"
   }
 }
diff --git a/packages/igx-templates/igx-ts/projects/side-nav-auth/files/package.json b/packages/igx-templates/igx-ts/projects/side-nav-auth/files/package.json
index 18fe5d832..66a4d4429 100644
--- a/packages/igx-templates/igx-ts/projects/side-nav-auth/files/package.json
+++ b/packages/igx-templates/igx-ts/projects/side-nav-auth/files/package.json
@@ -11,48 +11,48 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "~20.3.0",
-    "@angular/common": "~20.3.0",
-    "@angular/compiler": "~20.3.0",
-    "@angular/core": "~20.3.0",
-    "@angular/forms": "~20.3.0",
-    "@angular/platform-browser": "~20.3.0",
-    "@angular/platform-browser-dynamic": "~20.3.0",
-    "@angular/router": "~20.3.0",
+    "@angular/animations": "~21.0.0",
+    "@angular/common": "~21.0.0",
+    "@angular/compiler": "~21.0.0",
+    "@angular/core": "~21.0.0",
+    "@angular/forms": "~21.0.0",
+    "@angular/platform-browser": "~21.0.0",
+    "@angular/platform-browser-dynamic": "~21.0.0",
+    "@angular/router": "~21.0.0",
     "angular-auth-oidc-client": "~15.0.4",
     "hammerjs": "~2.0.8",
-    "igniteui-angular": "~20.1.0",
+    "igniteui-angular": "~21.0.0",
     "minireset.css": "~0.0.7",
     "rxjs": "~7.8.0",
     "tslib": "~2.8.1",
     "zone.js": "~0.14.0"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "~20.3.0",
-    "@angular-eslint/builder": "~20.3.0",
-    "@angular-eslint/eslint-plugin": "~20.3.0",
-    "@angular-eslint/eslint-plugin-template": "~20.3.0",
-    "@angular-eslint/schematics": "~20.3.0",
-    "@angular-eslint/template-parser": "~20.3.0",
-    "@angular/cli": "~20.3.0",
-    "@angular/compiler-cli": "~20.3.0",
-    "@angular/language-service": "~20.3.0",
+    "@angular-devkit/build-angular": "~21.0.0",
+    "@angular-eslint/builder": "~21.0.1",
+    "@angular-eslint/eslint-plugin": "~21.0.1",
+    "@angular-eslint/eslint-plugin-template": "~21.0.1",
+    "@angular-eslint/schematics": "~21.0.1",
+    "@angular-eslint/template-parser": "~21.0.1",
+    "@angular/cli": "~21.0.0",
+    "@angular/compiler-cli": "~21.0.0",
+    "@angular/language-service": "~21.0.0",
     "@types/facebook-js-sdk": "~3.3.6",
     "@types/hammerjs": "~2.0.46",
     "@types/jasmine": "~5.1.4",
-    "@typescript-eslint/eslint-plugin": "~8.45.0",
-    "@typescript-eslint/parser": "~8.45.0",
-    "eslint": "~9.36.0",
+    "@typescript-eslint/eslint-plugin": "~8.47.0",
+    "@typescript-eslint/parser": "~8.47.0",
+    "eslint": "~9.39.1",
     "eslint-plugin-import": "^2.32.0",
     "eslint-plugin-prefer-arrow": "^1.2.3",
-    "eslint-plugin-unicorn": "^61.0.2",
+    "eslint-plugin-unicorn": "^62.0.0",
     "igniteui-cli": "~<%=cliVersion%>",
-    "jasmine-core": "~5.11.0",
+    "jasmine-core": "~5.12.1",
     "karma": "~6.4.4",
     "karma-chrome-launcher": "~3.2.0",
     "karma-coverage": "~2.2.1",
     "karma-jasmine": "~5.1.0",
     "karma-jasmine-html-reporter": "~2.1.0",
-    "typescript": "~5.9.2"
+    "typescript": "~5.9.3"
   }
 }

From 77190fa1f16c765b4af4a019735410bc7135a347 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Mon, 24 Nov 2025 09:50:21 +0000
Subject: [PATCH 03/11] fix: restore rxjs override in igx-ts-legacy
 reveal-sdk-wrappers-angular

Co-authored-by: Lipata <2621802+Lipata@users.noreply.github.com>
---
 .../igx-ts-legacy/projects/_base/files/package.json            | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/igx-templates/igx-ts-legacy/projects/_base/files/package.json b/packages/igx-templates/igx-ts-legacy/projects/_base/files/package.json
index df1163405..779e53a59 100644
--- a/packages/igx-templates/igx-ts-legacy/projects/_base/files/package.json
+++ b/packages/igx-templates/igx-ts-legacy/projects/_base/files/package.json
@@ -29,7 +29,8 @@
   "overrides": {
     "reveal-sdk-wrappers-angular": {
       "@angular/core": "^21.0.0",
-      "@angular/common": "^21.0.0"
+      "@angular/common": "^21.0.0",
+      "rxjs": "~7.8.1"
     }
   },
   "devDependencies": {

From 769090cf0a6d1077c8b7c6367948e8652e8e4bee Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Mon, 24 Nov 2025 11:42:38 +0000
Subject: [PATCH 04/11] feat: update tsconfig for Angular 21 best practices -
 add stricter compiler options, use Bundler moduleResolution, and preserve
 module

Co-authored-by: Lipata <2621802+Lipata@users.noreply.github.com>
---
 .../igx-ts-legacy/projects/_base/files/tsconfig.json     | 9 +++++++--
 .../igx-ts/projects/_base/files/tsconfig.json            | 3 ++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/packages/igx-templates/igx-ts-legacy/projects/_base/files/tsconfig.json b/packages/igx-templates/igx-ts-legacy/projects/_base/files/tsconfig.json
index b154bbef8..be62961d6 100644
--- a/packages/igx-templates/igx-ts-legacy/projects/_base/files/tsconfig.json
+++ b/packages/igx-templates/igx-ts-legacy/projects/_base/files/tsconfig.json
@@ -5,16 +5,21 @@
     "baseUrl": "./",
     "outDir": "./dist/out-tsc",
     "forceConsistentCasingInFileNames": true,
+    "noImplicitOverride": true,
+    "noPropertyAccessFromIndexSignature": true,
+    "noImplicitReturns": true,
+    "noFallthroughCasesInSwitch": true,
     "skipLibCheck": true,
+    "isolatedModules": true,
     "strict": true,
     "sourceMap": true,
     "declaration": false,
     "downlevelIteration": true,
     "experimentalDecorators": true,
-    "moduleResolution": "node",
+    "moduleResolution": "Bundler",
     "importHelpers": true,
     "target": "ES2022",
-    "module": "ES2022",
+    "module": "preserve",
     "useDefineForClassFields": false,
     "lib": [
       "ES2022",
diff --git a/packages/igx-templates/igx-ts/projects/_base/files/tsconfig.json b/packages/igx-templates/igx-ts/projects/_base/files/tsconfig.json
index 56b390da9..30b933646 100644
--- a/packages/igx-templates/igx-ts/projects/_base/files/tsconfig.json
+++ b/packages/igx-templates/igx-ts/projects/_base/files/tsconfig.json
@@ -9,6 +9,7 @@
     "noImplicitReturns": true,
     "noFallthroughCasesInSwitch": true,
     "skipLibCheck": true,
+    "isolatedModules": true,
     "esModuleInterop": true,
     "sourceMap": true,
     "declaration": false,
@@ -16,7 +17,7 @@
     "moduleResolution": "Bundler",
     "importHelpers": true,
     "target": "ES2022",
-    "module": "ES2022",
+    "module": "preserve",
     "useDefineForClassFields": false,
     "lib": [
       "ES2022",

From f5e7d599ad078507438d555ceacc9a12a9852729 Mon Sep 17 00:00:00 2001
From: lipata <nikolay.alipiev@gmail.com>
Date: Tue, 25 Nov 2025 15:12:17 +0200
Subject: [PATCH 05/11] chore: add overrides for DV, until their 21.0 release.

---
 .../projects/_base/files/package.json          | 18 ++++++++++++++++++
 .../igx-ts/projects/_base/files/package.json   | 18 ++++++++++++++++++
 2 files changed, 36 insertions(+)

diff --git a/packages/igx-templates/igx-ts-legacy/projects/_base/files/package.json b/packages/igx-templates/igx-ts-legacy/projects/_base/files/package.json
index 779e53a59..6a35d763e 100644
--- a/packages/igx-templates/igx-ts-legacy/projects/_base/files/package.json
+++ b/packages/igx-templates/igx-ts-legacy/projects/_base/files/package.json
@@ -31,6 +31,24 @@
       "@angular/core": "^21.0.0",
       "@angular/common": "^21.0.0",
       "rxjs": "~7.8.1"
+    },
+    "igniteui-angular-charts": {
+      "@angular/core": "^21.0.0",
+      "@angular/common": "^21.0.0",
+      "@angular/compiler": "^21.0.0",
+      "rxjs": "~7.8.1"
+    },
+    "igniteui-angular-gauges": {
+      "@angular/core": "^21.0.0",
+      "@angular/common": "^21.0.0",
+      "@angular/compiler": "^21.0.0",
+      "rxjs": "~7.8.1"
+    },
+    "igniteui-angular-maps": {
+      "@angular/core": "^21.0.0",
+      "@angular/common": "^21.0.0",
+      "@angular/compiler": "^21.0.0",
+      "rxjs": "~7.8.1"
     }
   },
   "devDependencies": {
diff --git a/packages/igx-templates/igx-ts/projects/_base/files/package.json b/packages/igx-templates/igx-ts/projects/_base/files/package.json
index 193be3301..834f9e2ad 100644
--- a/packages/igx-templates/igx-ts/projects/_base/files/package.json
+++ b/packages/igx-templates/igx-ts/projects/_base/files/package.json
@@ -32,6 +32,24 @@
       "@angular/common": "^21.0.0",
       "rxjs": "~7.8.1"
     },
+    "igniteui-angular-charts": {
+      "@angular/core": "^21.0.0",
+      "@angular/common": "^21.0.0",
+      "@angular/compiler": "^21.0.0",
+      "rxjs": "~7.8.1"
+    },
+    "igniteui-angular-gauges": {
+      "@angular/core": "^21.0.0",
+      "@angular/common": "^21.0.0",
+      "@angular/compiler": "^21.0.0",
+      "rxjs": "~7.8.1"
+    },
+    "igniteui-angular-maps": {
+      "@angular/core": "^21.0.0",
+      "@angular/common": "^21.0.0",
+      "@angular/compiler": "^21.0.0",
+      "rxjs": "~7.8.1"
+    },
     "glob": "^11.0.3",
     "rimraf": "^6.0.1"
   },

From eb245d2e2e428ba97b736f506691a47d6c37257c Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Tue, 25 Nov 2025 13:20:30 +0000
Subject: [PATCH 06/11] feat: add @angular/build package and switch to
 @angular/build:application builder

Co-authored-by: Lipata <2621802+Lipata@users.noreply.github.com>
---
 .../igx-ts-legacy/projects/_base/files/angular.json           | 4 ++--
 .../igx-ts-legacy/projects/_base/files/package.json           | 1 +
 .../igx-ts-legacy/projects/side-nav-auth/files/package.json   | 1 +
 .../igx-templates/igx-ts/projects/_base/files/angular.json    | 4 ++--
 .../igx-templates/igx-ts/projects/_base/files/package.json    | 1 +
 .../igx-ts/projects/side-nav-auth/files/package.json          | 1 +
 6 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/packages/igx-templates/igx-ts-legacy/projects/_base/files/angular.json b/packages/igx-templates/igx-ts-legacy/projects/_base/files/angular.json
index 14c2e036d..9333b9e45 100644
--- a/packages/igx-templates/igx-ts-legacy/projects/_base/files/angular.json
+++ b/packages/igx-templates/igx-ts-legacy/projects/_base/files/angular.json
@@ -20,7 +20,7 @@
       "prefix": "app",
       "architect": {
         "build": {
-          "builder": "@angular-devkit/build-angular:application",
+          "builder": "@angular/build:application",
           "options": {
             "outputPath": "dist/<%=dashName%>",
             "index": "src/index.html",
@@ -74,7 +74,7 @@
           "defaultConfiguration": "production"
         },
         "serve": {
-          "builder": "@angular-devkit/build-angular:dev-server",
+          "builder": "@angular/build:dev-server",
           "configurations": {
             "production": {
               "buildTarget": "<%=dashName%>:build:production"
diff --git a/packages/igx-templates/igx-ts-legacy/projects/_base/files/package.json b/packages/igx-templates/igx-ts-legacy/projects/_base/files/package.json
index 6a35d763e..b3de59fcd 100644
--- a/packages/igx-templates/igx-ts-legacy/projects/_base/files/package.json
+++ b/packages/igx-templates/igx-ts-legacy/projects/_base/files/package.json
@@ -52,6 +52,7 @@
     }
   },
   "devDependencies": {
+    "@angular/build": "~21.0.0",
     "@angular-devkit/build-angular": "~21.0.0",
     "@angular-eslint/builder": "~21.0.1",
     "@angular-eslint/eslint-plugin": "~21.0.1",
diff --git a/packages/igx-templates/igx-ts-legacy/projects/side-nav-auth/files/package.json b/packages/igx-templates/igx-ts-legacy/projects/side-nav-auth/files/package.json
index 576fd0f60..319c4217a 100644
--- a/packages/igx-templates/igx-ts-legacy/projects/side-nav-auth/files/package.json
+++ b/packages/igx-templates/igx-ts-legacy/projects/side-nav-auth/files/package.json
@@ -28,6 +28,7 @@
     "zone.js": "~0.15.0"
   },
   "devDependencies": {
+    "@angular/build": "~21.0.0",
     "@angular-devkit/build-angular": "~21.0.0",
     "@angular-eslint/builder": "~21.0.1",
     "@angular-eslint/eslint-plugin": "~21.0.1",
diff --git a/packages/igx-templates/igx-ts/projects/_base/files/angular.json b/packages/igx-templates/igx-ts/projects/_base/files/angular.json
index 24c35dfd1..0cf83fe77 100644
--- a/packages/igx-templates/igx-ts/projects/_base/files/angular.json
+++ b/packages/igx-templates/igx-ts/projects/_base/files/angular.json
@@ -15,7 +15,7 @@
 			"prefix": "app",
 			"architect": {
 				"build": {
-					"builder": "@angular-devkit/build-angular:application",
+					"builder": "@angular/build:application",
 					"options": {
 						"outputPath": "dist/<%=dashName%>",
 						"index": "src/index.html",
@@ -66,7 +66,7 @@
 					"defaultConfiguration": "production"
 				},
 				"serve": {
-					"builder": "@angular-devkit/build-angular:dev-server",
+					"builder": "@angular/build:dev-server",
 					"configurations": {
 						"production": {
 							"buildTarget": "<%=dashName%>:build:production"
diff --git a/packages/igx-templates/igx-ts/projects/_base/files/package.json b/packages/igx-templates/igx-ts/projects/_base/files/package.json
index 834f9e2ad..87a5e29ae 100644
--- a/packages/igx-templates/igx-ts/projects/_base/files/package.json
+++ b/packages/igx-templates/igx-ts/projects/_base/files/package.json
@@ -54,6 +54,7 @@
     "rimraf": "^6.0.1"
   },
   "devDependencies": {
+    "@angular/build": "~21.0.0",
     "@angular-devkit/build-angular": "~21.0.0",
     "@angular/cli": "~21.0.0",
     "@angular/compiler-cli": "~21.0.0",
diff --git a/packages/igx-templates/igx-ts/projects/side-nav-auth/files/package.json b/packages/igx-templates/igx-ts/projects/side-nav-auth/files/package.json
index 66a4d4429..070f9b2e6 100644
--- a/packages/igx-templates/igx-ts/projects/side-nav-auth/files/package.json
+++ b/packages/igx-templates/igx-ts/projects/side-nav-auth/files/package.json
@@ -28,6 +28,7 @@
     "zone.js": "~0.14.0"
   },
   "devDependencies": {
+    "@angular/build": "~21.0.0",
     "@angular-devkit/build-angular": "~21.0.0",
     "@angular-eslint/builder": "~21.0.1",
     "@angular-eslint/eslint-plugin": "~21.0.1",

From ba25036053ad83f161bff1b0c78550daceabd15b Mon Sep 17 00:00:00 2001
From: lipata <nikolay.alipiev@gmail.com>
Date: Tue, 25 Nov 2025 15:51:23 +0200
Subject: [PATCH 07/11] fix: adapt templates to API changes

---
 .../files/src/app/__path__/__filePrefix__.component.ts     | 2 +-
 .../files/src/app/__path__/__filePrefix__.component.ts     | 2 +-
 .../files/src/app/__path__/__filePrefix__.component.ts     | 6 +++---
 .../igx-ts-legacy/projects/_base/files/package.json        | 2 +-
 .../files/src/app/__path__/__filePrefix__.component.ts     | 2 +-
 .../files/src/app/__path__/__filePrefix__.component.ts     | 2 +-
 .../files/src/app/__path__/__filePrefix__.component.ts     | 7 +++----
 .../igx-templates/igx-ts/projects/_base/files/package.json | 2 +-
 8 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/packages/igx-templates/igx-ts-legacy/custom-templates/crm-grid/files/src/app/__path__/__filePrefix__.component.ts b/packages/igx-templates/igx-ts-legacy/custom-templates/crm-grid/files/src/app/__path__/__filePrefix__.component.ts
index cf84b489a..2a800375f 100644
--- a/packages/igx-templates/igx-ts-legacy/custom-templates/crm-grid/files/src/app/__path__/__filePrefix__.component.ts
+++ b/packages/igx-templates/igx-ts-legacy/custom-templates/crm-grid/files/src/app/__path__/__filePrefix__.component.ts
@@ -49,7 +49,7 @@ export class <%=ClassName%>Component implements OnInit, AfterViewInit {
   public earliestSummary = EarliestSummary;
   public soonSummary = SoonSummary;
 
-  public cols!: QueryList<ColumnType>;
+  public cols!: QueryList<IgxColumnComponent>;
   public hiddenColsLength: number = 0;
   public pinnedColsLength: number = 0;
 
diff --git a/packages/igx-templates/igx-ts-legacy/grid/default/files/src/app/__path__/__filePrefix__.component.ts b/packages/igx-templates/igx-ts-legacy/grid/default/files/src/app/__path__/__filePrefix__.component.ts
index 359b85735..db6cd0557 100644
--- a/packages/igx-templates/igx-ts-legacy/grid/default/files/src/app/__path__/__filePrefix__.component.ts
+++ b/packages/igx-templates/igx-ts-legacy/grid/default/files/src/app/__path__/__filePrefix__.component.ts
@@ -16,7 +16,7 @@ export class <%=ClassName%>Component implements OnInit {
     this.localData = employeesData;
   }
 
-  public onColumnInit(column: ColumnType): void {
+  public onColumnInit(column: IgxColumnComponent): void {
     if (column.field === 'RegistererDate') {
       column.formatter = (date => date.toLocaleDateString());
     }
diff --git a/packages/igx-templates/igx-ts-legacy/hierarchical-grid/hierarchical-grid-batch-editing/files/src/app/__path__/__filePrefix__.component.ts b/packages/igx-templates/igx-ts-legacy/hierarchical-grid/hierarchical-grid-batch-editing/files/src/app/__path__/__filePrefix__.component.ts
index ab89d1fec..96b58f5b4 100644
--- a/packages/igx-templates/igx-ts-legacy/hierarchical-grid/hierarchical-grid-batch-editing/files/src/app/__path__/__filePrefix__.component.ts
+++ b/packages/igx-templates/igx-ts-legacy/hierarchical-grid/hierarchical-grid-batch-editing/files/src/app/__path__/__filePrefix__.component.ts
@@ -1,7 +1,7 @@
 import { Component, ViewChild } from '@angular/core';
 import { IgxDialogComponent, IgxGridComponent, IgxHierarchicalGridComponent,
   IgxRowIslandComponent, Transaction } from '<%=igxPackage%>';
-import { GridType } from '<%=igxPackage%>/lib/grids/common/grid.interface';
+
 import { SINGERS } from './data';
 import { Singer } from './singer';
 
@@ -58,13 +58,13 @@ export class <%=ClassName%>Component {
 
   public formatter = (a: number): number => a;
 
-  public undo(grid: GridType): void {
+  public undo(grid: IgxHierarchicalGridComponent): void {
     /* exit edit mode */
     grid.crudService.endEdit(/* commit the edit transaction */ false);
     grid.transactions.undo();
   }
 
-  public redo(grid: GridType): void {
+  public redo(grid: IgxHierarchicalGridComponent): void {
     grid.transactions.redo();
   }
 
diff --git a/packages/igx-templates/igx-ts-legacy/projects/_base/files/package.json b/packages/igx-templates/igx-ts-legacy/projects/_base/files/package.json
index b3de59fcd..107add4ad 100644
--- a/packages/igx-templates/igx-ts-legacy/projects/_base/files/package.json
+++ b/packages/igx-templates/igx-ts-legacy/projects/_base/files/package.json
@@ -20,7 +20,7 @@
     "@angular/platform-browser-dynamic": "~21.0.0",
     "@angular/router": "~21.0.0",
     "hammerjs": "~2.0.8",
-    "igniteui-angular": "~21.0.0",
+    "igniteui-angular": "~21.0.0-alpha.6",
     "minireset.css": "~0.0.7",
     "rxjs": "~7.8.1",
     "tslib": "~2.8.1",
diff --git a/packages/igx-templates/igx-ts/custom-templates/crm-grid/files/src/app/__path__/__filePrefix__.component.ts b/packages/igx-templates/igx-ts/custom-templates/crm-grid/files/src/app/__path__/__filePrefix__.component.ts
index 9de06eca0..64c3a2355 100644
--- a/packages/igx-templates/igx-ts/custom-templates/crm-grid/files/src/app/__path__/__filePrefix__.component.ts
+++ b/packages/igx-templates/igx-ts/custom-templates/crm-grid/files/src/app/__path__/__filePrefix__.component.ts
@@ -93,7 +93,7 @@ export class <%=ClassName%>Component implements OnInit, AfterViewInit {
   public earliestSummary = EarliestSummary;
   public soonSummary = SoonSummary;
 
-  public cols!: QueryList<ColumnType>;
+  public cols!: QueryList<IgxColumnComponent>;
   public hiddenColsLength = 0;
   public pinnedColsLength = 0;
 
diff --git a/packages/igx-templates/igx-ts/grid/default/files/src/app/__path__/__filePrefix__.component.ts b/packages/igx-templates/igx-ts/grid/default/files/src/app/__path__/__filePrefix__.component.ts
index 99b674da6..43a997421 100644
--- a/packages/igx-templates/igx-ts/grid/default/files/src/app/__path__/__filePrefix__.component.ts
+++ b/packages/igx-templates/igx-ts/grid/default/files/src/app/__path__/__filePrefix__.component.ts
@@ -17,7 +17,7 @@ export class <%=ClassName%>Component implements OnInit {
     this.localData = employeesData;
   }
 
-  public onColumnInit(column: ColumnType): void {
+  public onColumnInit(column: IgxColumnComponent): void {
     if (column.field === 'RegistererDate') {
       column.formatter = (date => date.toLocaleDateString());
     }
diff --git a/packages/igx-templates/igx-ts/hierarchical-grid/hierarchical-grid-batch-editing/files/src/app/__path__/__filePrefix__.component.ts b/packages/igx-templates/igx-ts/hierarchical-grid/hierarchical-grid-batch-editing/files/src/app/__path__/__filePrefix__.component.ts
index 0b92bee65..cc80b30f8 100644
--- a/packages/igx-templates/igx-ts/hierarchical-grid/hierarchical-grid-batch-editing/files/src/app/__path__/__filePrefix__.component.ts
+++ b/packages/igx-templates/igx-ts/hierarchical-grid/hierarchical-grid-batch-editing/files/src/app/__path__/__filePrefix__.component.ts
@@ -13,8 +13,7 @@ import {
   IgxInputGroupComponent,
   IgxLabelDirective,
   IgxInputDirective,
-  IgxCheckboxComponent,
-  GridType
+  IgxCheckboxComponent
 } from '<%=igxPackage%>';
 import { ReactiveFormsModule, FormsModule } from '@angular/forms';
 import { SINGERS } from './data';
@@ -90,13 +89,13 @@ export class <%=ClassName%>Component {
 
   public formatter = (a: number): number => a;
 
-  public undo(grid: GridType): void {
+  public undo(grid: any): void {
     /* exit edit mode */
     grid.crudService.endEdit(/* commit the edit transaction */ false);
     grid.transactions.undo();
   }
 
-  public redo(grid: GridType): void {
+  public redo(grid: any): void {
     grid.transactions.redo();
   }
 
diff --git a/packages/igx-templates/igx-ts/projects/_base/files/package.json b/packages/igx-templates/igx-ts/projects/_base/files/package.json
index 87a5e29ae..888a63864 100644
--- a/packages/igx-templates/igx-ts/projects/_base/files/package.json
+++ b/packages/igx-templates/igx-ts/projects/_base/files/package.json
@@ -20,7 +20,7 @@
     "@angular/platform-browser-dynamic": "~21.0.0",
     "@angular/router": "~21.0.0",
     "hammerjs": "~2.0.8",
-    "igniteui-angular": "~21.0.0",
+    "igniteui-angular": "~21.0.0-alpha.6",
     "minireset.css": "~0.0.7",
     "rxjs": "~7.8.1",
     "tslib": "~2.8.1",

From ff51ac1962454c27a13062b68c96bc022caca375 Mon Sep 17 00:00:00 2001
From: lipata <nikolay.alipiev@gmail.com>
Date: Tue, 25 Nov 2025 16:00:28 +0200
Subject: [PATCH 08/11] chore: release 14.8.0-beta.0

---
 packages/cli/package.json           | 14 +++++++-------
 packages/core/package.json          |  6 +++---
 packages/igx-templates/package.json |  6 +++---
 packages/ng-schematics/package.json | 16 ++++++++--------
 4 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/packages/cli/package.json b/packages/cli/package.json
index b35f8c732..07c2a078e 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "igniteui-cli",
-  "version": "14.7.1",
+  "version": "14.8.0-beta.0",
   "description": "CLI tool for creating Ignite UI projects",
   "keywords": [
     "CLI",
@@ -76,8 +76,8 @@
     "all": true
   },
   "dependencies": {
-    "@igniteui/angular-templates": "~20.1.1471",
-    "@igniteui/cli-core": "~14.7.1",
+    "@igniteui/angular-templates": "~21.0.1480-beta.0",
+    "@igniteui/cli-core": "~14.8.0-beta.0",
     "@inquirer/prompts": "^7.9.0",
     "@types/yargs": "^17.0.33",
     "chalk": "^5.3.0",
@@ -89,14 +89,14 @@
     "yargs": "^17.7.2"
   },
   "devDependencies": {
-    "@angular-devkit/core": "^19.0.0",
-    "@angular-devkit/schematics": "^19.0.0",
-    "@schematics/angular": "~19.0.0",
+    "@angular-devkit/core": "^21.0.0",
+    "@angular-devkit/schematics": "^21.0.0",
+    "@schematics/angular": "~21.0.0",
     "@types/jasmine": "^5.1.4",
     "@types/node": "^22.5.5",
     "browser-sync": "^3.0.3",
     "coveralls-next": "^4.2.1",
-    "jasmine": "^5.3.0",
+    "jasmine": "^5.12.0",
     "jasmine-spec-reporter": "^7.0.0",
     "nyc": "^17.0.0",
     "rxjs": "^7.8.1",
diff --git a/packages/core/package.json b/packages/core/package.json
index c108b51fd..0cab6bd38 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@igniteui/cli-core",
-  "version": "14.7.1",
+  "version": "14.8.0-beta.0",
   "description": "Base types and functionality for Ignite UI CLI",
   "repository": {
     "type": "git",
@@ -16,10 +16,10 @@
     "chalk": "^2.3.2",
     "glob": "^11.0.0",
     "through2": "^2.0.3",
-    "typescript": "~5.5.4"
+    "typescript": "~5.9.3"
   },
   "devDependencies": {
-    "@angular-devkit/schematics": "^19.0.0",
+    "@angular-devkit/schematics": "^21.0.0",
     "@inquirer/type": "^3.0.0"
   }
 }
diff --git a/packages/igx-templates/package.json b/packages/igx-templates/package.json
index 5d890e6af..a97c9cb3b 100644
--- a/packages/igx-templates/package.json
+++ b/packages/igx-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@igniteui/angular-templates",
-  "version": "20.1.1471",
+  "version": "21.0.1480-beta.0",
   "description": "Templates for Ignite UI for Angular projects and components",
   "repository": {
     "type": "git",
@@ -12,7 +12,7 @@
   "author": "Infragistics",
   "license": "MIT",
   "dependencies": {
-    "@igniteui/cli-core": "~14.7.1",
-    "typescript": "~5.5.4"
+    "@igniteui/cli-core": "~14.8.0-beta.0",
+    "typescript": "~5.9.3"
   }
 }
diff --git a/packages/ng-schematics/package.json b/packages/ng-schematics/package.json
index af191449b..331387b15 100644
--- a/packages/ng-schematics/package.json
+++ b/packages/ng-schematics/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@igniteui/angular-schematics",
-  "version": "20.1.1471",
+  "version": "21.0.1480-beta.0",
   "description": "Ignite UI for Angular Schematics for ng new and ng generate",
   "repository": {
     "type": "git",
@@ -18,11 +18,11 @@
   "license": "MIT",
   "schematics": "./src/collection.json",
   "dependencies": {
-    "@angular-devkit/core": "^19.0.0",
-    "@angular-devkit/schematics": "^19.0.0",
-    "@igniteui/angular-templates": "~20.1.1471",
-    "@igniteui/cli-core": "~14.7.1",
-    "@schematics/angular": "~19.0.0",
+    "@angular-devkit/core": "^21.0.0",
+    "@angular-devkit/schematics": "^21.0.0",
+    "@igniteui/angular-templates": "~21.0.1480-beta.0",
+    "@igniteui/cli-core": "~14.8.0-beta.0",
+    "@schematics/angular": "~21.0.0",
     "minimatch": "^10.0.1",
     "rxjs": "^7.8.1"
   },
@@ -30,8 +30,8 @@
     "@types/jasmine": "^5.1.4",
     "@types/minimatch": "^5.1.2",
     "@types/node": "^22.5.5",
-    "jasmine": "^5.3.0",
-    "typescript": "~5.6.2"
+    "jasmine": "^5.12.0",
+    "typescript": "~5.9.3"
   },
   "ng-update": {
     "migrations": "./src/migrations/migration-collection.json"

From f81c29284cfa8945b828b2777bab12b2392dd536 Mon Sep 17 00:00:00 2001
From: lipata <nikolay.alipiev@gmail.com>
Date: Tue, 25 Nov 2025 16:06:11 +0200
Subject: [PATCH 09/11] revert: use compatible typescript

---
 packages/core/package.json          | 2 +-
 packages/igx-templates/package.json | 2 +-
 packages/ng-schematics/package.json | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/core/package.json b/packages/core/package.json
index 0cab6bd38..fe9765930 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -16,7 +16,7 @@
     "chalk": "^2.3.2",
     "glob": "^11.0.0",
     "through2": "^2.0.3",
-    "typescript": "~5.9.3"
+    "typescript": "~5.5.4"
   },
   "devDependencies": {
     "@angular-devkit/schematics": "^21.0.0",
diff --git a/packages/igx-templates/package.json b/packages/igx-templates/package.json
index a97c9cb3b..71afa361a 100644
--- a/packages/igx-templates/package.json
+++ b/packages/igx-templates/package.json
@@ -13,6 +13,6 @@
   "license": "MIT",
   "dependencies": {
     "@igniteui/cli-core": "~14.8.0-beta.0",
-    "typescript": "~5.9.3"
+    "typescript": "~5.5.4"
   }
 }
diff --git a/packages/ng-schematics/package.json b/packages/ng-schematics/package.json
index 331387b15..e12f412c2 100644
--- a/packages/ng-schematics/package.json
+++ b/packages/ng-schematics/package.json
@@ -31,7 +31,7 @@
     "@types/minimatch": "^5.1.2",
     "@types/node": "^22.5.5",
     "jasmine": "^5.12.0",
-    "typescript": "~5.9.3"
+    "typescript": "~5.6.2"
   },
   "ng-update": {
     "migrations": "./src/migrations/migration-collection.json"

From e9b112f1e71110efdfe8a10f59c5004587dc26e9 Mon Sep 17 00:00:00 2001
From: lipata <nikolay.alipiev@gmail.com>
Date: Tue, 25 Nov 2025 16:14:22 +0200
Subject: [PATCH 10/11] revert: use stable ng schematics packages

---
 packages/ng-schematics/package.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/ng-schematics/package.json b/packages/ng-schematics/package.json
index e12f412c2..02d87c09d 100644
--- a/packages/ng-schematics/package.json
+++ b/packages/ng-schematics/package.json
@@ -18,11 +18,11 @@
   "license": "MIT",
   "schematics": "./src/collection.json",
   "dependencies": {
-    "@angular-devkit/core": "^21.0.0",
-    "@angular-devkit/schematics": "^21.0.0",
+    "@angular-devkit/core": "^19.0.0",
+    "@angular-devkit/schematics": "^19.0.0",
     "@igniteui/angular-templates": "~21.0.1480-beta.0",
     "@igniteui/cli-core": "~14.8.0-beta.0",
-    "@schematics/angular": "~21.0.0",
+    "@schematics/angular": "~19.0.0",
     "minimatch": "^10.0.1",
     "rxjs": "^7.8.1"
   },

From 1c77d513bfcc2636d61099c0e1bf22fa068d5e35 Mon Sep 17 00:00:00 2001
From: lipata <nikolay.alipiev@gmail.com>
Date: Mon, 1 Dec 2025 14:03:26 +0200
Subject: [PATCH 11/11] chore: revert changes after a fix in the library

---
 .../files/src/app/__path__/__filePrefix__.component.ts       | 2 +-
 .../files/src/app/__path__/__filePrefix__.component.ts       | 2 +-
 .../files/src/app/__path__/__filePrefix__.component.ts       | 5 +++--
 .../files/src/app/__path__/__filePrefix__.component.ts       | 2 +-
 .../files/src/app/__path__/__filePrefix__.component.ts       | 2 +-
 .../files/src/app/__path__/__filePrefix__.component.ts       | 5 +++--
 6 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/packages/igx-templates/igx-ts-legacy/custom-templates/crm-grid/files/src/app/__path__/__filePrefix__.component.ts b/packages/igx-templates/igx-ts-legacy/custom-templates/crm-grid/files/src/app/__path__/__filePrefix__.component.ts
index 2a800375f..cf84b489a 100644
--- a/packages/igx-templates/igx-ts-legacy/custom-templates/crm-grid/files/src/app/__path__/__filePrefix__.component.ts
+++ b/packages/igx-templates/igx-ts-legacy/custom-templates/crm-grid/files/src/app/__path__/__filePrefix__.component.ts
@@ -49,7 +49,7 @@ export class <%=ClassName%>Component implements OnInit, AfterViewInit {
   public earliestSummary = EarliestSummary;
   public soonSummary = SoonSummary;
 
-  public cols!: QueryList<IgxColumnComponent>;
+  public cols!: QueryList<ColumnType>;
   public hiddenColsLength: number = 0;
   public pinnedColsLength: number = 0;
 
diff --git a/packages/igx-templates/igx-ts-legacy/grid/default/files/src/app/__path__/__filePrefix__.component.ts b/packages/igx-templates/igx-ts-legacy/grid/default/files/src/app/__path__/__filePrefix__.component.ts
index db6cd0557..359b85735 100644
--- a/packages/igx-templates/igx-ts-legacy/grid/default/files/src/app/__path__/__filePrefix__.component.ts
+++ b/packages/igx-templates/igx-ts-legacy/grid/default/files/src/app/__path__/__filePrefix__.component.ts
@@ -16,7 +16,7 @@ export class <%=ClassName%>Component implements OnInit {
     this.localData = employeesData;
   }
 
-  public onColumnInit(column: IgxColumnComponent): void {
+  public onColumnInit(column: ColumnType): void {
     if (column.field === 'RegistererDate') {
       column.formatter = (date => date.toLocaleDateString());
     }
diff --git a/packages/igx-templates/igx-ts-legacy/hierarchical-grid/hierarchical-grid-batch-editing/files/src/app/__path__/__filePrefix__.component.ts b/packages/igx-templates/igx-ts-legacy/hierarchical-grid/hierarchical-grid-batch-editing/files/src/app/__path__/__filePrefix__.component.ts
index 96b58f5b4..15294a22a 100644
--- a/packages/igx-templates/igx-ts-legacy/hierarchical-grid/hierarchical-grid-batch-editing/files/src/app/__path__/__filePrefix__.component.ts
+++ b/packages/igx-templates/igx-ts-legacy/hierarchical-grid/hierarchical-grid-batch-editing/files/src/app/__path__/__filePrefix__.component.ts
@@ -1,6 +1,7 @@
 import { Component, ViewChild } from '@angular/core';
 import { IgxDialogComponent, IgxGridComponent, IgxHierarchicalGridComponent,
   IgxRowIslandComponent, Transaction } from '<%=igxPackage%>';
+import { GridType } from '<%=igxPackage%>/lib/grids/common/grid.interface';
 
 import { SINGERS } from './data';
 import { Singer } from './singer';
@@ -58,13 +59,13 @@ export class <%=ClassName%>Component {
 
   public formatter = (a: number): number => a;
 
-  public undo(grid: IgxHierarchicalGridComponent): void {
+  public undo(grid: GridType): void {
     /* exit edit mode */
     grid.crudService.endEdit(/* commit the edit transaction */ false);
     grid.transactions.undo();
   }
 
-  public redo(grid: IgxHierarchicalGridComponent): void {
+  public redo(grid: GridType): void {
     grid.transactions.redo();
   }
 
diff --git a/packages/igx-templates/igx-ts/custom-templates/crm-grid/files/src/app/__path__/__filePrefix__.component.ts b/packages/igx-templates/igx-ts/custom-templates/crm-grid/files/src/app/__path__/__filePrefix__.component.ts
index 64c3a2355..9de06eca0 100644
--- a/packages/igx-templates/igx-ts/custom-templates/crm-grid/files/src/app/__path__/__filePrefix__.component.ts
+++ b/packages/igx-templates/igx-ts/custom-templates/crm-grid/files/src/app/__path__/__filePrefix__.component.ts
@@ -93,7 +93,7 @@ export class <%=ClassName%>Component implements OnInit, AfterViewInit {
   public earliestSummary = EarliestSummary;
   public soonSummary = SoonSummary;
 
-  public cols!: QueryList<IgxColumnComponent>;
+  public cols!: QueryList<ColumnType>;
   public hiddenColsLength = 0;
   public pinnedColsLength = 0;
 
diff --git a/packages/igx-templates/igx-ts/grid/default/files/src/app/__path__/__filePrefix__.component.ts b/packages/igx-templates/igx-ts/grid/default/files/src/app/__path__/__filePrefix__.component.ts
index 43a997421..99b674da6 100644
--- a/packages/igx-templates/igx-ts/grid/default/files/src/app/__path__/__filePrefix__.component.ts
+++ b/packages/igx-templates/igx-ts/grid/default/files/src/app/__path__/__filePrefix__.component.ts
@@ -17,7 +17,7 @@ export class <%=ClassName%>Component implements OnInit {
     this.localData = employeesData;
   }
 
-  public onColumnInit(column: IgxColumnComponent): void {
+  public onColumnInit(column: ColumnType): void {
     if (column.field === 'RegistererDate') {
       column.formatter = (date => date.toLocaleDateString());
     }
diff --git a/packages/igx-templates/igx-ts/hierarchical-grid/hierarchical-grid-batch-editing/files/src/app/__path__/__filePrefix__.component.ts b/packages/igx-templates/igx-ts/hierarchical-grid/hierarchical-grid-batch-editing/files/src/app/__path__/__filePrefix__.component.ts
index cc80b30f8..dfa6859fe 100644
--- a/packages/igx-templates/igx-ts/hierarchical-grid/hierarchical-grid-batch-editing/files/src/app/__path__/__filePrefix__.component.ts
+++ b/packages/igx-templates/igx-ts/hierarchical-grid/hierarchical-grid-batch-editing/files/src/app/__path__/__filePrefix__.component.ts
@@ -13,7 +13,8 @@ import {
   IgxInputGroupComponent,
   IgxLabelDirective,
   IgxInputDirective,
-  IgxCheckboxComponent
+  IgxCheckboxComponent,
+  GridType
 } from '<%=igxPackage%>';
 import { ReactiveFormsModule, FormsModule } from '@angular/forms';
 import { SINGERS } from './data';
@@ -89,7 +90,7 @@ export class <%=ClassName%>Component {
 
   public formatter = (a: number): number => a;
 
-  public undo(grid: any): void {
+  public undo(grid: GridType): void {
     /* exit edit mode */
     grid.crudService.endEdit(/* commit the edit transaction */ false);
     grid.transactions.undo();