From c2524ab4be3465d0122618da240946c9d25cada0 Mon Sep 17 00:00:00 2001
From: Damyan Petev <damyanpetev@users.noreply.github.com>
Date: Mon, 27 Nov 2023 13:46:37 +0200
Subject: [PATCH 1/4] refactor(migrations,ng-add): mark up type imports

(cherry picked from commit 9a0df57e28eb9e71424b8661e35a58986cf0af94)
---
 projects/igniteui-angular/migrations/common/ServerHost.ts | 2 +-
 .../igniteui-angular/migrations/common/UpdateChanges.ts   | 2 +-
 .../migrations/common/filterSourceDirs.ts                 | 3 ++-
 projects/igniteui-angular/migrations/common/tsUtils.ts    | 4 ++--
 projects/igniteui-angular/migrations/common/util.ts       | 6 +++---
 .../igniteui-angular/migrations/update-10_1_0/index.ts    | 2 +-
 .../igniteui-angular/migrations/update-10_2_0/index.ts    | 2 +-
 .../igniteui-angular/migrations/update-11_0_0/index.ts    | 4 ++--
 .../igniteui-angular/migrations/update-11_1_0/index.ts    | 4 ++--
 .../igniteui-angular/migrations/update-12_0_0/index.ts    | 4 ++--
 .../igniteui-angular/migrations/update-12_1_0/index.ts    | 4 ++--
 .../igniteui-angular/migrations/update-13_0_0/index.ts    | 8 ++++----
 .../igniteui-angular/migrations/update-13_1_0/index.ts    | 4 ++--
 .../igniteui-angular/migrations/update-13_2_0/index.ts    | 2 +-
 .../igniteui-angular/migrations/update-14_1_0/index.ts    | 2 +-
 .../igniteui-angular/migrations/update-15_0_0/index.ts    | 2 +-
 .../igniteui-angular/migrations/update-15_0_11/index.ts   | 2 +-
 .../igniteui-angular/migrations/update-15_0_4/index.ts    | 2 +-
 .../igniteui-angular/migrations/update-15_1_0/index.ts    | 6 +++---
 .../igniteui-angular/migrations/update-16_0_0/index.ts    | 2 +-
 .../igniteui-angular/migrations/update-16_1_0/index.ts    | 4 ++--
 .../igniteui-angular/migrations/update-17_0_0/index.ts    | 4 ++--
 projects/igniteui-angular/migrations/update-6/index.ts    | 2 +-
 projects/igniteui-angular/migrations/update-6_01/index.ts | 2 +-
 projects/igniteui-angular/migrations/update-6_02/index.ts | 2 +-
 projects/igniteui-angular/migrations/update-6_1/index.ts  | 2 +-
 projects/igniteui-angular/migrations/update-6_2/index.ts  | 2 +-
 .../igniteui-angular/migrations/update-6_2_1/index.ts     | 2 +-
 .../igniteui-angular/migrations/update-7_0_2/index.ts     | 2 +-
 .../igniteui-angular/migrations/update-7_2_0/index.ts     | 2 +-
 .../igniteui-angular/migrations/update-7_3_4/index.ts     | 2 +-
 .../igniteui-angular/migrations/update-8_2_0/index.ts     | 2 +-
 .../igniteui-angular/migrations/update-8_2_3/index.ts     | 2 +-
 .../igniteui-angular/migrations/update-8_2_6/index.ts     | 2 +-
 .../igniteui-angular/migrations/update-9_0_0/index.ts     | 2 +-
 .../igniteui-angular/migrations/update-9_0_1/index.ts     | 2 +-
 .../igniteui-angular/migrations/update-9_1_0/index.ts     | 2 +-
 .../igniteui-angular/schematics/ng-add/add-normalize.ts   | 2 +-
 projects/igniteui-angular/schematics/ng-add/index.ts      | 5 +++--
 .../schematics/utils/dependency-handler.ts                | 4 ++--
 .../igniteui-angular/schematics/utils/package-handler.ts  | 2 +-
 projects/igniteui-angular/schematics/utils/util.ts        | 2 +-
 42 files changed, 61 insertions(+), 59 deletions(-)

diff --git a/projects/igniteui-angular/migrations/common/ServerHost.ts b/projects/igniteui-angular/migrations/common/ServerHost.ts
index aa83f41286c..c98305300f7 100644
--- a/projects/igniteui-angular/migrations/common/ServerHost.ts
+++ b/projects/igniteui-angular/migrations/common/ServerHost.ts
@@ -1,4 +1,4 @@
-import { Tree } from '@angular-devkit/schematics';
+import type { Tree } from '@angular-devkit/schematics';
 import * as pathFs from 'path';
 import * as ts from 'typescript/lib/tsserverlibrary';
 import { CUSTOM_TS_PLUGIN_NAME, CUSTOM_TS_PLUGIN_PATH } from './tsUtils';
diff --git a/projects/igniteui-angular/migrations/common/UpdateChanges.ts b/projects/igniteui-angular/migrations/common/UpdateChanges.ts
index a5d6ef6355b..74a6c220baa 100644
--- a/projects/igniteui-angular/migrations/common/UpdateChanges.ts
+++ b/projects/igniteui-angular/migrations/common/UpdateChanges.ts
@@ -2,7 +2,7 @@ import * as fs from 'fs';
 import * as path from 'path';
 import * as ts from 'typescript';
 import * as tss from 'typescript/lib/tsserverlibrary';
-import { SchematicContext, Tree, FileVisitor } from '@angular-devkit/schematics';
+import type { SchematicContext, Tree, FileVisitor } from '@angular-devkit/schematics';
 import type { WorkspaceSchema } from '@schematics/angular/utility/workspace-models';
 import {
     ClassChanges, BindingChanges, SelectorChange,
diff --git a/projects/igniteui-angular/migrations/common/filterSourceDirs.ts b/projects/igniteui-angular/migrations/common/filterSourceDirs.ts
index 78a121a1fa1..bddc648b3bf 100644
--- a/projects/igniteui-angular/migrations/common/filterSourceDirs.ts
+++ b/projects/igniteui-angular/migrations/common/filterSourceDirs.ts
@@ -1,4 +1,5 @@
-import { filter, Rule, SchematicContext, Tree } from '@angular-devkit/schematics';
+import { filter } from '@angular-devkit/schematics';
+import type { Rule, SchematicContext, Tree } from '@angular-devkit/schematics';
 import { getWorkspace, getWorkspacePath, getProjectPaths } from './util';
 
 /**
diff --git a/projects/igniteui-angular/migrations/common/tsUtils.ts b/projects/igniteui-angular/migrations/common/tsUtils.ts
index 30a7774e946..acc9758477d 100644
--- a/projects/igniteui-angular/migrations/common/tsUtils.ts
+++ b/projects/igniteui-angular/migrations/common/tsUtils.ts
@@ -1,7 +1,7 @@
 import * as ts from 'typescript';
 import * as tss from 'typescript/lib/tsserverlibrary';
-import { Tree } from '@angular-devkit/schematics';
-import { MemberChange } from './schema';
+import type { Tree } from '@angular-devkit/schematics';
+import type { MemberChange } from './schema';
 import { escapeRegExp } from './util';
 import { Logger } from './tsLogger';
 import { TSLanguageService } from './tsPlugin/TSLanguageService';
diff --git a/projects/igniteui-angular/migrations/common/util.ts b/projects/igniteui-angular/migrations/common/util.ts
index 6c9a80ec034..cc88df41181 100644
--- a/projects/igniteui-angular/migrations/common/util.ts
+++ b/projects/igniteui-angular/migrations/common/util.ts
@@ -1,9 +1,9 @@
 import { normalize } from '@angular-devkit/core';
 import * as path from 'path';
-import { SchematicContext, Tree } from '@angular-devkit/schematics';
-import { WorkspaceSchema, WorkspaceProject } from '@schematics/angular/utility/workspace-models';
+import type { SchematicContext, Tree } from '@angular-devkit/schematics';
+import type { WorkspaceSchema, WorkspaceProject } from '@schematics/angular/utility/workspace-models';
 import { execSync } from 'child_process';
-import {
+import type {
     Attribute,
     Block,
     BlockParameter,
diff --git a/projects/igniteui-angular/migrations/update-10_1_0/index.ts b/projects/igniteui-angular/migrations/update-10_1_0/index.ts
index 1a958608bfd..1cddde51999 100644
--- a/projects/igniteui-angular/migrations/update-10_1_0/index.ts
+++ b/projects/igniteui-angular/migrations/update-10_1_0/index.ts
@@ -1,4 +1,4 @@
-import {
+import type {
     Rule,
     SchematicContext,
     Tree
diff --git a/projects/igniteui-angular/migrations/update-10_2_0/index.ts b/projects/igniteui-angular/migrations/update-10_2_0/index.ts
index 1135bda1527..5a484ec17c1 100644
--- a/projects/igniteui-angular/migrations/update-10_2_0/index.ts
+++ b/projects/igniteui-angular/migrations/update-10_2_0/index.ts
@@ -1,4 +1,4 @@
-import { Rule, SchematicContext, Tree } from '@angular-devkit/schematics';
+import type { Rule, SchematicContext, Tree } from '@angular-devkit/schematics';
 import { UpdateChanges } from '../common/UpdateChanges';
 
 const version = '10.2.0';
diff --git a/projects/igniteui-angular/migrations/update-11_0_0/index.ts b/projects/igniteui-angular/migrations/update-11_0_0/index.ts
index c1b036a8b86..3a102f7da64 100644
--- a/projects/igniteui-angular/migrations/update-11_0_0/index.ts
+++ b/projects/igniteui-angular/migrations/update-11_0_0/index.ts
@@ -1,5 +1,5 @@
-import { Element } from '@angular/compiler';
-import { Rule, SchematicContext, Tree } from '@angular-devkit/schematics';
+import type { Element } from '@angular/compiler';
+import type { Rule, SchematicContext, Tree } from '@angular-devkit/schematics';
 import { UpdateChanges } from '../common/UpdateChanges';
 import { FileChange, findElementNodes, getAttribute, getSourceOffset, hasAttribute, parseFile, serializeNodes } from '../common/util';
 import { nativeImport } from '../common/import-helper.js';
diff --git a/projects/igniteui-angular/migrations/update-11_1_0/index.ts b/projects/igniteui-angular/migrations/update-11_1_0/index.ts
index 72799bb47cd..09c0745dbdf 100644
--- a/projects/igniteui-angular/migrations/update-11_1_0/index.ts
+++ b/projects/igniteui-angular/migrations/update-11_1_0/index.ts
@@ -1,5 +1,5 @@
-import { Rule, SchematicContext, Tree } from '@angular-devkit/schematics';
-import { Options } from '../../schematics/interfaces/options';
+import type { Rule, SchematicContext, Tree } from '@angular-devkit/schematics';
+import type { Options } from '../../schematics/interfaces/options';
 import { UpdateChanges } from '../common/UpdateChanges';
 
 const version = '11.1.0';
diff --git a/projects/igniteui-angular/migrations/update-12_0_0/index.ts b/projects/igniteui-angular/migrations/update-12_0_0/index.ts
index 7995ee73fc2..046906f046b 100644
--- a/projects/igniteui-angular/migrations/update-12_0_0/index.ts
+++ b/projects/igniteui-angular/migrations/update-12_0_0/index.ts
@@ -1,5 +1,5 @@
-import { Element } from '@angular/compiler';
-import { Rule, SchematicContext, Tree } from '@angular-devkit/schematics';
+import type { Element } from '@angular/compiler';
+import type { Rule, SchematicContext, Tree } from '@angular-devkit/schematics';
 import { UpdateChanges } from '../common/UpdateChanges';
 import { FileChange, getAttribute, findElementNodes, getSourceOffset, hasAttribute, parseFile } from '../common/util';
 import { nativeImport } from '../common/import-helper.js';
diff --git a/projects/igniteui-angular/migrations/update-12_1_0/index.ts b/projects/igniteui-angular/migrations/update-12_1_0/index.ts
index 75791681c85..94ec58c6458 100644
--- a/projects/igniteui-angular/migrations/update-12_1_0/index.ts
+++ b/projects/igniteui-angular/migrations/update-12_1_0/index.ts
@@ -1,5 +1,5 @@
-import { Element } from '@angular/compiler';
-import { Rule, SchematicContext, Tree } from '@angular-devkit/schematics';
+import type { Element } from '@angular/compiler';
+import type { Rule, SchematicContext, Tree } from '@angular-devkit/schematics';
 import { UpdateChanges } from '../common/UpdateChanges';
 import {
   FileChange, findElementNodes, getAttribute, getSourceOffset, hasAttribute, parseFile,
diff --git a/projects/igniteui-angular/migrations/update-13_0_0/index.ts b/projects/igniteui-angular/migrations/update-13_0_0/index.ts
index 89f487a9d96..b8fca29d0f4 100644
--- a/projects/igniteui-angular/migrations/update-13_0_0/index.ts
+++ b/projects/igniteui-angular/migrations/update-13_0_0/index.ts
@@ -1,10 +1,10 @@
-import { Element, Text } from '@angular/compiler';
-import {
+import type { Element, Text } from '@angular/compiler';
+import type {
     Rule,
     SchematicContext,
     Tree
 } from '@angular-devkit/schematics';
-import { Options } from '../../schematics/interfaces/options';
+import type { Options } from '../../schematics/interfaces/options';
 import { UpdateChanges } from '../common/UpdateChanges';
 import { FileChange, findElementNodes, getAttribute, getSourceOffset, hasAttribute, parseFile } from '../common/util';
 import { nativeImport } from '../common/import-helper.js';
@@ -191,7 +191,7 @@ export default (options: Options): Rule =>
             const replaceText = file.content.substring(startTag.start, endTag.end);
             result += '\n' + replaceText;
         });
-        
+
         return result + `\n</igx-grid-toolbar>`;
     };
 
diff --git a/projects/igniteui-angular/migrations/update-13_1_0/index.ts b/projects/igniteui-angular/migrations/update-13_1_0/index.ts
index 15a57510163..0f31d8b1b97 100644
--- a/projects/igniteui-angular/migrations/update-13_1_0/index.ts
+++ b/projects/igniteui-angular/migrations/update-13_1_0/index.ts
@@ -1,9 +1,9 @@
-import {
+import type {
   Rule,
   SchematicContext,
   Tree
 } from '@angular-devkit/schematics';
-import { Element } from '@angular/compiler';
+import type { Element } from '@angular/compiler';
 import { nativeImport } from '../common/import-helper.js';
 import { UpdateChanges } from '../common/UpdateChanges';
 import { FileChange, findElementNodes, getAttribute, getSourceOffset, hasAttribute, parseFile } from '../common/util';
diff --git a/projects/igniteui-angular/migrations/update-13_2_0/index.ts b/projects/igniteui-angular/migrations/update-13_2_0/index.ts
index 7760c778b68..f895372ca6e 100644
--- a/projects/igniteui-angular/migrations/update-13_2_0/index.ts
+++ b/projects/igniteui-angular/migrations/update-13_2_0/index.ts
@@ -1,4 +1,4 @@
-import {
+import type {
     Rule,
     SchematicContext,
     Tree
diff --git a/projects/igniteui-angular/migrations/update-14_1_0/index.ts b/projects/igniteui-angular/migrations/update-14_1_0/index.ts
index 7c8c6870ac2..e3fd71eaa35 100644
--- a/projects/igniteui-angular/migrations/update-14_1_0/index.ts
+++ b/projects/igniteui-angular/migrations/update-14_1_0/index.ts
@@ -1,4 +1,4 @@
-import {
+import type {
     Rule,
     SchematicContext,
     Tree
diff --git a/projects/igniteui-angular/migrations/update-15_0_0/index.ts b/projects/igniteui-angular/migrations/update-15_0_0/index.ts
index 73d0897b2a3..ac3cd4e6c68 100644
--- a/projects/igniteui-angular/migrations/update-15_0_0/index.ts
+++ b/projects/igniteui-angular/migrations/update-15_0_0/index.ts
@@ -1,4 +1,4 @@
-import {
+import type {
     Rule,
     SchematicContext,
     Tree
diff --git a/projects/igniteui-angular/migrations/update-15_0_11/index.ts b/projects/igniteui-angular/migrations/update-15_0_11/index.ts
index 7c50babb98e..21f977aac62 100644
--- a/projects/igniteui-angular/migrations/update-15_0_11/index.ts
+++ b/projects/igniteui-angular/migrations/update-15_0_11/index.ts
@@ -1,4 +1,4 @@
-import {
+import type {
     Rule,
     SchematicContext,
     Tree
diff --git a/projects/igniteui-angular/migrations/update-15_0_4/index.ts b/projects/igniteui-angular/migrations/update-15_0_4/index.ts
index 745e24e509f..0a2bf397033 100644
--- a/projects/igniteui-angular/migrations/update-15_0_4/index.ts
+++ b/projects/igniteui-angular/migrations/update-15_0_4/index.ts
@@ -1,4 +1,4 @@
-import {
+import type {
     Rule,
     SchematicContext,
     Tree
diff --git a/projects/igniteui-angular/migrations/update-15_1_0/index.ts b/projects/igniteui-angular/migrations/update-15_1_0/index.ts
index 50bf1ca5aa2..251c84b8374 100644
--- a/projects/igniteui-angular/migrations/update-15_1_0/index.ts
+++ b/projects/igniteui-angular/migrations/update-15_1_0/index.ts
@@ -1,11 +1,11 @@
-import {
+import type {
     Rule,
     SchematicContext,
     Tree
 } from '@angular-devkit/schematics';
-import { Element } from '@angular/compiler';
+import type { Element } from '@angular/compiler';
 import { nativeImport } from '../common/import-helper.js';
-import { Options } from '../../schematics/interfaces/options';
+import type { Options } from '../../schematics/interfaces/options';
 import { BoundPropertyObject, InputPropertyType, UpdateChanges } from '../common/UpdateChanges';
 import { FileChange, findElementNodes, getAttribute, getSourceOffset, parseFile, hasAttribute } from '../common/util';
 
diff --git a/projects/igniteui-angular/migrations/update-16_0_0/index.ts b/projects/igniteui-angular/migrations/update-16_0_0/index.ts
index 52cdbbcc724..0436f7f2292 100644
--- a/projects/igniteui-angular/migrations/update-16_0_0/index.ts
+++ b/projects/igniteui-angular/migrations/update-16_0_0/index.ts
@@ -1,4 +1,4 @@
-import {
+import type {
     Rule,
     SchematicContext,
     Tree
diff --git a/projects/igniteui-angular/migrations/update-16_1_0/index.ts b/projects/igniteui-angular/migrations/update-16_1_0/index.ts
index a718f92f48e..e0d8a96d57e 100644
--- a/projects/igniteui-angular/migrations/update-16_1_0/index.ts
+++ b/projects/igniteui-angular/migrations/update-16_1_0/index.ts
@@ -1,4 +1,4 @@
-import {
+import type {
     Rule,
     SchematicContext,
     Tree
@@ -6,7 +6,7 @@ import {
 import { UpdateChanges } from '../common/UpdateChanges';
 import { FileChange, findElementNodes, getAttribute, getSourceOffset, hasAttribute, parseFile } from '../common/util';
 import { nativeImport } from '../common/import-helper.js';
-import { Element } from '@angular/compiler';
+import type { Element } from '@angular/compiler';
 
 const version = '16.1.0';
 
diff --git a/projects/igniteui-angular/migrations/update-17_0_0/index.ts b/projects/igniteui-angular/migrations/update-17_0_0/index.ts
index 96fc12c1e24..ab7395f9665 100644
--- a/projects/igniteui-angular/migrations/update-17_0_0/index.ts
+++ b/projects/igniteui-angular/migrations/update-17_0_0/index.ts
@@ -1,9 +1,9 @@
-import {
+import type {
     Rule,
     SchematicContext,
     Tree
 } from '@angular-devkit/schematics';
-import { Element } from '@angular/compiler';
+import type { Element } from '@angular/compiler';
 import * as ts from 'typescript';
 import { UpdateChanges } from '../common/UpdateChanges';
 import { nativeImport } from '../common/import-helper.js';
diff --git a/projects/igniteui-angular/migrations/update-6/index.ts b/projects/igniteui-angular/migrations/update-6/index.ts
index be8f19e079a..a848f39692d 100644
--- a/projects/igniteui-angular/migrations/update-6/index.ts
+++ b/projects/igniteui-angular/migrations/update-6/index.ts
@@ -1,4 +1,4 @@
-import {
+import type {
   Rule,
   SchematicContext,
   Tree
diff --git a/projects/igniteui-angular/migrations/update-6_01/index.ts b/projects/igniteui-angular/migrations/update-6_01/index.ts
index 9afdb12e0c8..ebe6d374e83 100644
--- a/projects/igniteui-angular/migrations/update-6_01/index.ts
+++ b/projects/igniteui-angular/migrations/update-6_01/index.ts
@@ -1,4 +1,4 @@
-import {
+import type {
     Rule,
     SchematicContext,
     Tree
diff --git a/projects/igniteui-angular/migrations/update-6_02/index.ts b/projects/igniteui-angular/migrations/update-6_02/index.ts
index a3dfcbbf946..d05b938eadf 100644
--- a/projects/igniteui-angular/migrations/update-6_02/index.ts
+++ b/projects/igniteui-angular/migrations/update-6_02/index.ts
@@ -1,4 +1,4 @@
-import {
+import type {
     Rule,
     SchematicContext,
     Tree
diff --git a/projects/igniteui-angular/migrations/update-6_1/index.ts b/projects/igniteui-angular/migrations/update-6_1/index.ts
index 4d746545419..1d1d131f268 100644
--- a/projects/igniteui-angular/migrations/update-6_1/index.ts
+++ b/projects/igniteui-angular/migrations/update-6_1/index.ts
@@ -1,4 +1,4 @@
-import {
+import type {
     Rule,
     SchematicContext,
     Tree
diff --git a/projects/igniteui-angular/migrations/update-6_2/index.ts b/projects/igniteui-angular/migrations/update-6_2/index.ts
index 2c7a17624a7..916fd52b928 100644
--- a/projects/igniteui-angular/migrations/update-6_2/index.ts
+++ b/projects/igniteui-angular/migrations/update-6_2/index.ts
@@ -1,4 +1,4 @@
-import {
+import type {
     Rule,
     SchematicContext,
     Tree
diff --git a/projects/igniteui-angular/migrations/update-6_2_1/index.ts b/projects/igniteui-angular/migrations/update-6_2_1/index.ts
index c1421e912a3..ebfe228fd77 100644
--- a/projects/igniteui-angular/migrations/update-6_2_1/index.ts
+++ b/projects/igniteui-angular/migrations/update-6_2_1/index.ts
@@ -1,4 +1,4 @@
-import {
+import type {
     Rule,
     SchematicContext,
     Tree
diff --git a/projects/igniteui-angular/migrations/update-7_0_2/index.ts b/projects/igniteui-angular/migrations/update-7_0_2/index.ts
index 6ca48e75bdd..f76479f14fe 100644
--- a/projects/igniteui-angular/migrations/update-7_0_2/index.ts
+++ b/projects/igniteui-angular/migrations/update-7_0_2/index.ts
@@ -1,4 +1,4 @@
-import {
+import type {
     Rule,
     SchematicContext,
     Tree
diff --git a/projects/igniteui-angular/migrations/update-7_2_0/index.ts b/projects/igniteui-angular/migrations/update-7_2_0/index.ts
index c9bd6aead3d..8a4e3bbe1d1 100644
--- a/projects/igniteui-angular/migrations/update-7_2_0/index.ts
+++ b/projects/igniteui-angular/migrations/update-7_2_0/index.ts
@@ -1,4 +1,4 @@
-import {
+import type {
     Rule,
     SchematicContext,
     Tree
diff --git a/projects/igniteui-angular/migrations/update-7_3_4/index.ts b/projects/igniteui-angular/migrations/update-7_3_4/index.ts
index 4ae6dd37bba..1ef4e4184b9 100644
--- a/projects/igniteui-angular/migrations/update-7_3_4/index.ts
+++ b/projects/igniteui-angular/migrations/update-7_3_4/index.ts
@@ -1,4 +1,4 @@
-import {
+import type {
     Rule,
     SchematicContext,
     Tree
diff --git a/projects/igniteui-angular/migrations/update-8_2_0/index.ts b/projects/igniteui-angular/migrations/update-8_2_0/index.ts
index dcb9c330d8e..a37bc996b2a 100644
--- a/projects/igniteui-angular/migrations/update-8_2_0/index.ts
+++ b/projects/igniteui-angular/migrations/update-8_2_0/index.ts
@@ -1,4 +1,4 @@
-import {
+import type {
     Rule,
     SchematicContext,
     Tree
diff --git a/projects/igniteui-angular/migrations/update-8_2_3/index.ts b/projects/igniteui-angular/migrations/update-8_2_3/index.ts
index cf343d72ddd..f01da8bebae 100644
--- a/projects/igniteui-angular/migrations/update-8_2_3/index.ts
+++ b/projects/igniteui-angular/migrations/update-8_2_3/index.ts
@@ -1,4 +1,4 @@
-import {
+import type {
     Rule,
     SchematicContext,
     Tree
diff --git a/projects/igniteui-angular/migrations/update-8_2_6/index.ts b/projects/igniteui-angular/migrations/update-8_2_6/index.ts
index 66a762b3134..f0b07109e1d 100644
--- a/projects/igniteui-angular/migrations/update-8_2_6/index.ts
+++ b/projects/igniteui-angular/migrations/update-8_2_6/index.ts
@@ -1,4 +1,4 @@
-import {
+import type {
     Rule,
     SchematicContext,
     Tree
diff --git a/projects/igniteui-angular/migrations/update-9_0_0/index.ts b/projects/igniteui-angular/migrations/update-9_0_0/index.ts
index b7df2c5f5de..082ad15e349 100644
--- a/projects/igniteui-angular/migrations/update-9_0_0/index.ts
+++ b/projects/igniteui-angular/migrations/update-9_0_0/index.ts
@@ -1,4 +1,4 @@
-import {
+import type {
     Rule,
     SchematicContext,
     Tree
diff --git a/projects/igniteui-angular/migrations/update-9_0_1/index.ts b/projects/igniteui-angular/migrations/update-9_0_1/index.ts
index dfbecc5c27a..75e7addbd6d 100644
--- a/projects/igniteui-angular/migrations/update-9_0_1/index.ts
+++ b/projects/igniteui-angular/migrations/update-9_0_1/index.ts
@@ -1,4 +1,4 @@
-import {
+import type {
     Rule,
     SchematicContext,
     Tree
diff --git a/projects/igniteui-angular/migrations/update-9_1_0/index.ts b/projects/igniteui-angular/migrations/update-9_1_0/index.ts
index 5bf720d2341..f2ee77c0b86 100644
--- a/projects/igniteui-angular/migrations/update-9_1_0/index.ts
+++ b/projects/igniteui-angular/migrations/update-9_1_0/index.ts
@@ -1,4 +1,4 @@
-import {
+import type {
     Rule,
     SchematicContext,
     Tree
diff --git a/projects/igniteui-angular/schematics/ng-add/add-normalize.ts b/projects/igniteui-angular/schematics/ng-add/add-normalize.ts
index 2d8419aada9..0cd3688d474 100644
--- a/projects/igniteui-angular/schematics/ng-add/add-normalize.ts
+++ b/projects/igniteui-angular/schematics/ng-add/add-normalize.ts
@@ -1,6 +1,6 @@
 import * as path from 'path';
 
-import { Tree } from '@angular-devkit/schematics';
+import type { Tree } from '@angular-devkit/schematics';
 import { addPackageToPkgJson } from '../utils/dependency-handler';
 import { JsonArray, workspaces } from '@angular-devkit/core';
 import { ProjectType } from '../utils/util';
diff --git a/projects/igniteui-angular/schematics/ng-add/index.ts b/projects/igniteui-angular/schematics/ng-add/index.ts
index 388cad4d18d..9d8385d3edd 100644
--- a/projects/igniteui-angular/schematics/ng-add/index.ts
+++ b/projects/igniteui-angular/schematics/ng-add/index.ts
@@ -1,6 +1,7 @@
 import { workspaces } from '@angular-devkit/core';
-import { chain, Rule, SchematicContext, Tree } from '@angular-devkit/schematics';
-import { Options } from '../interfaces/options';
+import { chain } from '@angular-devkit/schematics';
+import type { Rule, SchematicContext, Tree } from '@angular-devkit/schematics';
+import type { Options } from '../interfaces/options';
 import { installPackageJsonDependencies } from '../utils/package-handler';
 import { logSuccess, addDependencies } from '../utils/dependency-handler';
 import { addResetCss } from './add-normalize';
diff --git a/projects/igniteui-angular/schematics/utils/dependency-handler.ts b/projects/igniteui-angular/schematics/utils/dependency-handler.ts
index d31bdd5da8f..fe4ff0b9a02 100644
--- a/projects/igniteui-angular/schematics/utils/dependency-handler.ts
+++ b/projects/igniteui-angular/schematics/utils/dependency-handler.ts
@@ -1,6 +1,6 @@
 import { workspaces } from '@angular-devkit/core';
-import { SchematicContext, Rule, Tree } from '@angular-devkit/schematics';
-import { Options } from '../interfaces/options';
+import type { SchematicContext, Rule, Tree } from '@angular-devkit/schematics';
+import type { Options } from '../interfaces/options';
 import { createHost, ProjectType } from './util';
 
 export enum PackageTarget {
diff --git a/projects/igniteui-angular/schematics/utils/package-handler.ts b/projects/igniteui-angular/schematics/utils/package-handler.ts
index 4e7499cf364..f2b67c6583b 100644
--- a/projects/igniteui-angular/schematics/utils/package-handler.ts
+++ b/projects/igniteui-angular/schematics/utils/package-handler.ts
@@ -1,4 +1,4 @@
-import { Rule, SchematicContext, Tree } from '@angular-devkit/schematics';
+import type { Rule, SchematicContext, Tree } from '@angular-devkit/schematics';
 import { RunSchematicTask, NodePackageInstallTask } from '@angular-devkit/schematics/tasks';
 
 const extSchematicModule = '@igniteui/angular-schematics';
diff --git a/projects/igniteui-angular/schematics/utils/util.ts b/projects/igniteui-angular/schematics/utils/util.ts
index 0ee74bdabc6..89a01d36365 100644
--- a/projects/igniteui-angular/schematics/utils/util.ts
+++ b/projects/igniteui-angular/schematics/utils/util.ts
@@ -1,4 +1,4 @@
-import { Tree } from '@angular-devkit/schematics';
+import type { Tree } from '@angular-devkit/schematics';
 import { workspaces } from '@angular-devkit/core';
 
 // from '@schematics/angular/utility/workspace-models'

From 8b0c2901fcf2d9c4fc8b1216c5bb5430b9ff618a Mon Sep 17 00:00:00 2001
From: Damyan Petev <damyanpetev@users.noreply.github.com>
Date: Mon, 27 Nov 2023 13:54:26 +0200
Subject: [PATCH 2/4] fix(migrations,ng-add): turn on encapsulation for
 devkit/schematics deps

(cherry picked from commit 41b66ac6e1db019d650fd573ece6a05b4db7dd5b)
---
 projects/igniteui-angular/migrations/migration-collection.json | 1 +
 projects/igniteui-angular/schematics/collection.json           | 1 +
 2 files changed, 2 insertions(+)

diff --git a/projects/igniteui-angular/migrations/migration-collection.json b/projects/igniteui-angular/migrations/migration-collection.json
index b5542287a41..4a0cb584ad6 100644
--- a/projects/igniteui-angular/migrations/migration-collection.json
+++ b/projects/igniteui-angular/migrations/migration-collection.json
@@ -1,5 +1,6 @@
 {
     "$schema": "../../../node_modules/@angular-devkit/schematics/collection-schema.json",
+    "encapsulation": true,
     "schematics": {
         "migration-01": {
             "version": "6.0.0",
diff --git a/projects/igniteui-angular/schematics/collection.json b/projects/igniteui-angular/schematics/collection.json
index 17fb19bab43..188a5c579ab 100644
--- a/projects/igniteui-angular/schematics/collection.json
+++ b/projects/igniteui-angular/schematics/collection.json
@@ -1,5 +1,6 @@
 {
   "$schema": "../../../node_modules/@angular-devkit/schematics/collection-schema.json",
+  "encapsulation": true,
   "schematics": {
     "ng-add": {
       "description": "Installs the needed dependencies onto the host application.",

From 8d3d9ea17ba4df0cf3f5d2868f3840b3e25f59e2 Mon Sep 17 00:00:00 2001
From: Damyan Petev <damyanpetev@users.noreply.github.com>
Date: Mon, 27 Nov 2023 19:22:21 +0200
Subject: [PATCH 3/4] fix(migrations): replaceMatch circular ref

(cherry picked from commit 0094f3bc97f55ffb87a856d9e8debd34831ad92d)
---
 .../igniteui-angular/migrations/common/UpdateChanges.ts     | 4 ++--
 projects/igniteui-angular/migrations/common/tsUtils.ts      | 5 -----
 projects/igniteui-angular/migrations/common/util.ts         | 6 +++++-
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/projects/igniteui-angular/migrations/common/UpdateChanges.ts b/projects/igniteui-angular/migrations/common/UpdateChanges.ts
index 74a6c220baa..6688e671ffe 100644
--- a/projects/igniteui-angular/migrations/common/UpdateChanges.ts
+++ b/projects/igniteui-angular/migrations/common/UpdateChanges.ts
@@ -9,11 +9,11 @@ import {
     SelectorChanges, ThemeChanges, ImportsChanges, MemberChanges, ThemeChange, ThemeType
 } from './schema';
 import {
-    getLanguageService, getRenamePositions, getIdentifierPositions, replaceMatch,
+    getLanguageService, getRenamePositions, getIdentifierPositions,
     createProjectService, isMemberIgniteUI, NG_LANG_SERVICE_PACKAGE_NAME, NG_CORE_PACKAGE_NAME, findMatches
 } from './tsUtils';
 import {
-    getProjectPaths, getWorkspace, getProjects, escapeRegExp,
+    getProjectPaths, getWorkspace, getProjects, escapeRegExp, replaceMatch,
     getPackageManager, canResolvePackage, tryInstallPackage, tryUninstallPackage, getPackageVersion
 } from './util';
 import { ServerHost } from './ServerHost';
diff --git a/projects/igniteui-angular/migrations/common/tsUtils.ts b/projects/igniteui-angular/migrations/common/tsUtils.ts
index acc9758477d..1c74a906bdd 100644
--- a/projects/igniteui-angular/migrations/common/tsUtils.ts
+++ b/projects/igniteui-angular/migrations/common/tsUtils.ts
@@ -144,11 +144,6 @@ export const findMatches = (content: string, toFind: string): number[] => {
     return matchesPositions;
 };
 
-export const replaceMatch = (content: string, toReplace: string, replaceWith: string, index: number): string =>
-    content.substring(0, index) +
-    replaceWith +
-    content.substring(index + toReplace.length, content.length);
-
 //#region Language Service
 
 /**
diff --git a/projects/igniteui-angular/migrations/common/util.ts b/projects/igniteui-angular/migrations/common/util.ts
index cc88df41181..20d5eae9e09 100644
--- a/projects/igniteui-angular/migrations/common/util.ts
+++ b/projects/igniteui-angular/migrations/common/util.ts
@@ -17,7 +17,6 @@ import type {
     Text,
     Visitor
 } from '@angular/compiler';
-import { replaceMatch } from './tsUtils';
 
 const configPaths = ['/.angular.json', '/angular.json'];
 
@@ -58,6 +57,11 @@ export const getProjects = (config: WorkspaceSchema): WorkspaceProject[] => {
 
 export const escapeRegExp = (string) => string.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'); // $& means the whole matched string
 
+export const replaceMatch = (content: string, toReplace: string, replaceWith: string, index: number): string =>
+    content.substring(0, index) +
+    replaceWith +
+    content.substring(index + toReplace.length, content.length);
+
 export const supports = (name: string): boolean => {
     try {
         execSync(`${name} --version`, { stdio: 'ignore' });

From 50f4905613f27a7ae3e649335485dcd90d3c6197 Mon Sep 17 00:00:00 2001
From: Damyan Petev <damyanpetev@users.noreply.github.com>
Date: Wed, 29 Nov 2023 14:09:30 +0200
Subject: [PATCH 4/4] fix(migrations): use bare specifier to escape
 encapsulation on dynamic import

(cherry picked from commit 6594096dacf0570f001197106bffe21364302410)
---
 projects/igniteui-angular/migrations/tsconfig.json        | 8 ++++++++
 .../igniteui-angular/migrations/update-11_0_0/index.ts    | 3 ++-
 .../igniteui-angular/migrations/update-12_0_0/index.ts    | 3 ++-
 .../igniteui-angular/migrations/update-12_1_0/index.ts    | 3 ++-
 .../igniteui-angular/migrations/update-13_0_0/index.ts    | 3 ++-
 .../igniteui-angular/migrations/update-13_1_0/index.ts    | 3 ++-
 .../igniteui-angular/migrations/update-15_1_0/index.ts    | 3 ++-
 .../igniteui-angular/migrations/update-16_1_0/index.ts    | 3 ++-
 .../igniteui-angular/migrations/update-17_0_0/index.ts    | 3 ++-
 9 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/projects/igniteui-angular/migrations/tsconfig.json b/projects/igniteui-angular/migrations/tsconfig.json
index ec6da77dd55..1a3c48b5253 100644
--- a/projects/igniteui-angular/migrations/tsconfig.json
+++ b/projects/igniteui-angular/migrations/tsconfig.json
@@ -8,6 +8,14 @@
         "typeRoots": [
             "../../../node_modules/@types"
         ],
+        "paths": {
+            "igniteui-angular/*": [
+                "../*"
+            ],
+            "@infragistics/igniteui-angular/*": [
+                "../*"
+            ],
+        }
     },
     "exclude": [
         "../../../node_modules",
diff --git a/projects/igniteui-angular/migrations/update-11_0_0/index.ts b/projects/igniteui-angular/migrations/update-11_0_0/index.ts
index 3a102f7da64..399cb35243e 100644
--- a/projects/igniteui-angular/migrations/update-11_0_0/index.ts
+++ b/projects/igniteui-angular/migrations/update-11_0_0/index.ts
@@ -2,7 +2,8 @@ import type { Element } from '@angular/compiler';
 import type { Rule, SchematicContext, Tree } from '@angular-devkit/schematics';
 import { UpdateChanges } from '../common/UpdateChanges';
 import { FileChange, findElementNodes, getAttribute, getSourceOffset, hasAttribute, parseFile, serializeNodes } from '../common/util';
-import { nativeImport } from '../common/import-helper.js';
+// use bare specifier to escape the schematics encapsulation for the dynamic import:
+import { nativeImport } from 'igniteui-angular/migrations/common/import-helper.js';
 
 const version = '11.0.0';
 
diff --git a/projects/igniteui-angular/migrations/update-12_0_0/index.ts b/projects/igniteui-angular/migrations/update-12_0_0/index.ts
index 046906f046b..fd86c593697 100644
--- a/projects/igniteui-angular/migrations/update-12_0_0/index.ts
+++ b/projects/igniteui-angular/migrations/update-12_0_0/index.ts
@@ -2,7 +2,8 @@ import type { Element } from '@angular/compiler';
 import type { Rule, SchematicContext, Tree } from '@angular-devkit/schematics';
 import { UpdateChanges } from '../common/UpdateChanges';
 import { FileChange, getAttribute, findElementNodes, getSourceOffset, hasAttribute, parseFile } from '../common/util';
-import { nativeImport } from '../common/import-helper.js';
+// use bare specifier to escape the schematics encapsulation for the dynamic import:
+import { nativeImport } from 'igniteui-angular/migrations/common/import-helper.js';
 import { Options } from '../../schematics/interfaces/options';
 
 const version = '12.0.0';
diff --git a/projects/igniteui-angular/migrations/update-12_1_0/index.ts b/projects/igniteui-angular/migrations/update-12_1_0/index.ts
index 94ec58c6458..47fe2714bef 100644
--- a/projects/igniteui-angular/migrations/update-12_1_0/index.ts
+++ b/projects/igniteui-angular/migrations/update-12_1_0/index.ts
@@ -5,7 +5,8 @@ import {
   FileChange, findElementNodes, getAttribute, getSourceOffset, hasAttribute, parseFile,
   serializeNodes, makeNgIf, stringifyAttributes
 } from '../common/util';
-import { nativeImport } from '../common/import-helper.js';
+// use bare specifier to escape the schematics encapsulation for the dynamic import:
+import { nativeImport } from 'igniteui-angular/migrations/common/import-helper.js';
 
 const version = '12.1.0';
 
diff --git a/projects/igniteui-angular/migrations/update-13_0_0/index.ts b/projects/igniteui-angular/migrations/update-13_0_0/index.ts
index b8fca29d0f4..520e5300640 100644
--- a/projects/igniteui-angular/migrations/update-13_0_0/index.ts
+++ b/projects/igniteui-angular/migrations/update-13_0_0/index.ts
@@ -7,7 +7,8 @@ import type {
 import type { Options } from '../../schematics/interfaces/options';
 import { UpdateChanges } from '../common/UpdateChanges';
 import { FileChange, findElementNodes, getAttribute, getSourceOffset, hasAttribute, parseFile } from '../common/util';
-import { nativeImport } from '../common/import-helper.js';
+// use bare specifier to escape the schematics encapsulation for the dynamic import:
+import { nativeImport } from 'igniteui-angular/migrations/common/import-helper.js';
 
 const version = '13.0.0';
 
diff --git a/projects/igniteui-angular/migrations/update-13_1_0/index.ts b/projects/igniteui-angular/migrations/update-13_1_0/index.ts
index 0f31d8b1b97..27cc705502c 100644
--- a/projects/igniteui-angular/migrations/update-13_1_0/index.ts
+++ b/projects/igniteui-angular/migrations/update-13_1_0/index.ts
@@ -4,7 +4,8 @@ import type {
   Tree
 } from '@angular-devkit/schematics';
 import type { Element } from '@angular/compiler';
-import { nativeImport } from '../common/import-helper.js';
+// use bare specifier to escape the schematics encapsulation for the dynamic import:
+import { nativeImport } from 'igniteui-angular/migrations/common/import-helper.js';
 import { UpdateChanges } from '../common/UpdateChanges';
 import { FileChange, findElementNodes, getAttribute, getSourceOffset, hasAttribute, parseFile } from '../common/util';
 
diff --git a/projects/igniteui-angular/migrations/update-15_1_0/index.ts b/projects/igniteui-angular/migrations/update-15_1_0/index.ts
index 251c84b8374..554d4f87309 100644
--- a/projects/igniteui-angular/migrations/update-15_1_0/index.ts
+++ b/projects/igniteui-angular/migrations/update-15_1_0/index.ts
@@ -4,7 +4,8 @@ import type {
     Tree
 } from '@angular-devkit/schematics';
 import type { Element } from '@angular/compiler';
-import { nativeImport } from '../common/import-helper.js';
+// use bare specifier to escape the schematics encapsulation for the dynamic import:
+import { nativeImport } from 'igniteui-angular/migrations/common/import-helper.js';
 import type { Options } from '../../schematics/interfaces/options';
 import { BoundPropertyObject, InputPropertyType, UpdateChanges } from '../common/UpdateChanges';
 import { FileChange, findElementNodes, getAttribute, getSourceOffset, parseFile, hasAttribute } from '../common/util';
diff --git a/projects/igniteui-angular/migrations/update-16_1_0/index.ts b/projects/igniteui-angular/migrations/update-16_1_0/index.ts
index e0d8a96d57e..4f20ed322f4 100644
--- a/projects/igniteui-angular/migrations/update-16_1_0/index.ts
+++ b/projects/igniteui-angular/migrations/update-16_1_0/index.ts
@@ -5,7 +5,8 @@ import type {
 } from '@angular-devkit/schematics';
 import { UpdateChanges } from '../common/UpdateChanges';
 import { FileChange, findElementNodes, getAttribute, getSourceOffset, hasAttribute, parseFile } from '../common/util';
-import { nativeImport } from '../common/import-helper.js';
+// use bare specifier to escape the schematics encapsulation for the dynamic import:
+import { nativeImport } from 'igniteui-angular/migrations/common/import-helper.js';
 import type { Element } from '@angular/compiler';
 
 const version = '16.1.0';
diff --git a/projects/igniteui-angular/migrations/update-17_0_0/index.ts b/projects/igniteui-angular/migrations/update-17_0_0/index.ts
index ab7395f9665..fc63c790366 100644
--- a/projects/igniteui-angular/migrations/update-17_0_0/index.ts
+++ b/projects/igniteui-angular/migrations/update-17_0_0/index.ts
@@ -6,7 +6,8 @@ import type {
 import type { Element } from '@angular/compiler';
 import * as ts from 'typescript';
 import { UpdateChanges } from '../common/UpdateChanges';
-import { nativeImport } from '../common/import-helper.js';
+// use bare specifier to escape the schematics encapsulation for the dynamic import:
+import { nativeImport } from 'igniteui-angular/migrations/common/import-helper.js';
 import { namedImportFilter } from '../common/tsUtils';
 import { FileChange, findElementNodes, getAttribute, getSourceOffset, hasAttribute, parseFile } from '../common/util';