Merge branch 'master' into didimmova/update-chip-paddings

didimmova · web-flow · commit 41a02f6a9c36 · 2026-04-16T17:08:26.000+03:00
diff --git a/gulpfile.js b/gulpfile.js
@@ -62,11 +62,6 @@ module.exports.copyMigrations = (cb) => {
         '!**/tsconfig.json'
     ]).pipe(gulp.dest('./dist/igniteui-angular/migrations'));
 
-
-    gulp.src([
-        './projects/igniteui-angular/migrations/common/import-helper.js'
-    ]).pipe(gulp.dest('./dist/igniteui-angular/migrations/common'));
-
     cb();
 };
 
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -82,7 +82,7 @@
     "express": "^5.2.1",
     "fflate": "^0.8.1",
     "igniteui-i18n-core": "^1.0.2",
-    "igniteui-theming": "^25.2.0",
+    "igniteui-theming": "^26.0.0",
     "igniteui-trial-watermark": "^3.1.0",
     "jspdf": "^4.2.1",
     "lodash-es": "^4.17.21",
diff --git a/projects/igniteui-angular/.npmignore b/projects/igniteui-angular/.npmignore
@@ -1,2 +1,4 @@
 # Nested package.json's are only needed for development.
-**/package.json
+**/package.json
+!migrations/package.json
+!schematics/package.json
diff --git a/projects/igniteui-angular/core/src/core/styles/components/grid/_grid-theme.scss b/projects/igniteui-angular/core/src/core/styles/components/grid/_grid-theme.scss
@@ -892,12 +892,14 @@
         &%igx-grid__tr--ghost {
             background: var-get($theme, 'row-ghost-background');
             color: var-get($theme, 'row-drag-color');
+            outline: rem(1px) solid var-get($theme, 'row-ghost-border-color');
             z-index: 10002;
 
             @include css-vars((
                 name: 'igx-grid-row',
                 row-ghost-background: map.get($theme, 'row-ghost-background'),
-                row-drag-color: map.get($theme, 'row-drag-color')
+                row-drag-color: map.get($theme, 'row-drag-color'),
+                row-ghost-border-color: map.get($theme, 'row-ghost-border-color')
             ));
         }
     }
diff --git a/projects/igniteui-angular/core/src/core/styles/components/progress/circular/_circular-theme.scss b/projects/igniteui-angular/core/src/core/styles/components/progress/circular/_circular-theme.scss
@@ -157,7 +157,7 @@
 
     %inner {
         stroke-width: var(--stroke-thickness);
-        stroke: var-get($theme, 'base-circle-color');
+        stroke: var-get($theme, 'track-color');
     }
 
     %outer {
diff --git a/projects/igniteui-angular/migrations/common/import-helper.js b/projects/igniteui-angular/migrations/common/import-helper.js
diff --git a/projects/igniteui-angular/migrations/common/util.ts b/projects/igniteui-angular/migrations/common/util.ts
@@ -19,7 +19,7 @@ import type {
     Node,
     Text,
     Visitor
-} from '@angular/compiler';
+} from '@angular/compiler' with { "resolution-mode": "import" };
 
 const configPaths = ['/.angular.json', '/angular.json'];
 
diff --git a/projects/igniteui-angular/migrations/migration-collection.json b/projects/igniteui-angular/migrations/migration-collection.json
@@ -279,6 +279,11 @@
             "factory": "./update-21_1_0_add-agent-skills",
             "recommended": true,
             "optional": true
+        },
+        "migration-55": {
+            "version": "21.2.0",
+            "description": "Updates Ignite UI for Angular from v21.1.x to v21.2.0",
+            "factory": "./update-21_2_0"
         }
     }
 }
diff --git a/projects/igniteui-angular/migrations/package.json b/projects/igniteui-angular/migrations/package.json
@@ -0,0 +1,3 @@
+{
+    "type": "commonjs"
+}
diff --git a/projects/igniteui-angular/migrations/tsconfig.json b/projects/igniteui-angular/migrations/tsconfig.json
@@ -1,7 +1,13 @@
 {
+    "ts-node": {
+        "compilerOptions": {
+            // explicitly force ts-node into CommonJS mode, otherwise spies on modules like `fs` fail as those are not configurable in ESM context
+            "module": "CommonJS"
+        }
+    },
     "compilerOptions": {
         "target": "es6",
-        "module": "commonjs",
+        "module": "node16",
         "sourceMap": false,
         "declaration": true,
         "outDir": "../../../dist/igniteui-angular/migrations",
diff --git a/projects/igniteui-angular/migrations/update-11_0_0/index.ts b/projects/igniteui-angular/migrations/update-11_0_0/index.ts
@@ -1,17 +1,16 @@
-import type { Element } from '@angular/compiler';
+import type { Element } from '@angular/compiler' with { "resolution-mode": "import" };
 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';
-// 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';
 
 export default (): Rule => async (host: Tree, context: SchematicContext) => {
     context.logger.info(
         `Applying migration for Ignite UI for Angular to version ${version}`
     );
-    const { HtmlParser, getHtmlTagDefinition } = await nativeImport('@angular/compiler') as typeof import('@angular/compiler');
+    // bare specifier escapes schematics encapsulation for the compiler dynamic import:
+    const { HtmlParser, getHtmlTagDefinition } = await import('@angular/compiler');
 
     const update = new UpdateChanges(__dirname, host, context);
 
diff --git a/projects/igniteui-angular/migrations/update-12_0_0/index.ts b/projects/igniteui-angular/migrations/update-12_0_0/index.ts
@@ -1,10 +1,8 @@
-import type { Element } from '@angular/compiler';
+import type { Element } from '@angular/compiler' with { "resolution-mode": "import" };
 import type { Rule, SchematicContext, Tree } from '@angular-devkit/schematics';
 import { UpdateChanges } from '../common/UpdateChanges';
 import { FileChange, getAttribute, findElementNodes, getSourceOffset, hasAttribute, parseFile } from '../common/util';
-// 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';
+import type { Options } from '../../schematics/interfaces/options';
 
 const version = '12.0.0';
 
@@ -14,7 +12,8 @@ export default (options: Options): Rule =>
             `Applying migration for Ignite UI for Angular to version ${version}`
         );
 
-        const { HtmlParser } = await nativeImport('@angular/compiler') as typeof import('@angular/compiler');
+        // bare specifier escapes schematics encapsulation for the compiler dynamic import:
+        const { HtmlParser } = await import('@angular/compiler');
 
         // eslint-disable-next-line max-len
         const UPDATE_NOTE = `<!--NOTE: This component has been updated by Infragistics migration: v${version}\nPlease check your template whether all bindings/event handlers are correct.-->\n`;
diff --git a/projects/igniteui-angular/migrations/update-12_1_0/index.ts b/projects/igniteui-angular/migrations/update-12_1_0/index.ts
@@ -1,19 +1,18 @@
-import type { Element } from '@angular/compiler';
+import type { Element } from '@angular/compiler' with { "resolution-mode": "import" };
 import type { Rule, SchematicContext, Tree } from '@angular-devkit/schematics';
 import { UpdateChanges } from '../common/UpdateChanges';
 import {
   FileChange, findElementNodes, getAttribute, getSourceOffset, hasAttribute, parseFile,
   serializeNodes, makeNgIf, stringifyAttributes
 } from '../common/util';
-// 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';
 
 export default (): Rule => async (host: Tree, context: SchematicContext) => {
   context.logger.info(`Applying migration for Ignite UI for Angular to version ${version}`);
 
-  const { HtmlParser, getHtmlTagDefinition } = await nativeImport('@angular/compiler') as typeof import('@angular/compiler');
+  // bare specifier escapes schematics encapsulation for the compiler dynamic import:
+  const { HtmlParser, getHtmlTagDefinition } = await import('@angular/compiler');
 
   const update = new UpdateChanges(__dirname, host, context);
   const TAGS = ['igx-grid', 'igx-tree-grid', 'igx-hierarchical-grid'];
diff --git a/projects/igniteui-angular/migrations/update-13_0_0/index.ts b/projects/igniteui-angular/migrations/update-13_0_0/index.ts
@@ -1,4 +1,4 @@
-import type { Element, Text } from '@angular/compiler';
+import type { Element, Text } from '@angular/compiler' with { "resolution-mode": "import" };
 import type {
     Rule,
     SchematicContext,
@@ -7,8 +7,6 @@ import type {
 import type { Options } from '../../schematics/interfaces/options';
 import { UpdateChanges } from '../common/UpdateChanges';
 import { FileChange, findElementNodes, getAttribute, getSourceOffset, hasAttribute, parseFile } from '../common/util';
-// 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';
 
@@ -27,7 +25,8 @@ export default (options: Options): Rule =>
         '[exportExcel]', 'exportExcel', '[exportExcelText]', 'exportExcelText',
         '[exportCsv]', 'exportCsv', '[exportCsvText]', 'exportCsvText', '[exportText]', 'exportText'];
         const actionsLeft = ['igx-grid-toolbar-advanced-filtering'];
-        const { HtmlParser } = await nativeImport('@angular/compiler') as typeof import('@angular/compiler');
+        // bare specifier escapes schematics encapsulation for the compiler dynamic import:
+        const { HtmlParser } = await import('@angular/compiler');
 
         const moduleTsFiles = tsFiles.filter(x => x.endsWith('.module.ts'));
         for (const path of moduleTsFiles) {
diff --git a/projects/igniteui-angular/migrations/update-13_1_0/index.ts b/projects/igniteui-angular/migrations/update-13_1_0/index.ts
@@ -3,17 +3,16 @@ import type {
   SchematicContext,
   Tree
 } from '@angular-devkit/schematics';
-import type { Element } from '@angular/compiler';
-// 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' with { "resolution-mode": "import" };
 import { UpdateChanges } from '../common/UpdateChanges';
 import { FileChange, findElementNodes, getAttribute, getSourceOffset, hasAttribute, parseFile } from '../common/util';
 
 const version = '13.1.0';
 
 export default (): Rule => async (host: Tree, context: SchematicContext) => {
   context.logger.info(`Applying migration for Ignite UI for Angular to version ${version}`);
-  const { HtmlParser } = await nativeImport('@angular/compiler') as typeof import('@angular/compiler');
+  // bare specifier escapes schematics encapsulation for the compiler dynamic import:
+  const { HtmlParser } = await import('@angular/compiler');
 
   const update = new UpdateChanges(__dirname, host, context);
   const GRID_TAGS = ['igx-grid', 'igx-tree-grid', 'igx-hierarchical-grid', 'igx-row-island'];
diff --git a/projects/igniteui-angular/migrations/update-15_1_0/index.ts b/projects/igniteui-angular/migrations/update-15_1_0/index.ts
@@ -3,9 +3,7 @@ import type {
     SchematicContext,
     Tree
 } from '@angular-devkit/schematics';
-import type { Element } from '@angular/compiler';
-// 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' with { "resolution-mode": "import" };
 import type { Options } from '../../schematics/interfaces/options';
 import { BoundPropertyObject, InputPropertyType, UpdateChanges } from '../common/UpdateChanges';
 import { FileChange, findElementNodes, getAttribute, getSourceOffset, parseFile, hasAttribute } from '../common/util';
@@ -15,7 +13,8 @@ const version = '15.1.0';
 export default (options: Options): Rule => async (host: Tree, context: SchematicContext) => {
     context.logger.info(`Applying migration for Ignite UI for Angular to version ${version}`);
 
-    const { HtmlParser } = await nativeImport('@angular/compiler') as typeof import('@angular/compiler');
+    // bare specifier escapes schematics encapsulation for the compiler dynamic import:
+    const { HtmlParser } = await import('@angular/compiler');
     const update = new UpdateChanges(__dirname, host, context);
     const cardsToMigrate = new Set<any>();
     const CARD_ACTIONS = ['igx-card-actions'];
diff --git a/projects/igniteui-angular/migrations/update-16_1_0/index.ts b/projects/igniteui-angular/migrations/update-16_1_0/index.ts
@@ -5,15 +5,14 @@ import type {
 } from '@angular-devkit/schematics';
 import { UpdateChanges } from '../common/UpdateChanges';
 import { FileChange, findElementNodes, getAttribute, getSourceOffset, hasAttribute, parseFile } from '../common/util';
-// 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';
+import type { Element } from '@angular/compiler' with { "resolution-mode": "import" };
 
 const version = '16.1.0';
 
 export default (): Rule => async (host: Tree, context: SchematicContext) => {
     context.logger.info(`Applying migration for Ignite UI for Angular to version ${version}`);
-    const { HtmlParser } = await nativeImport('@angular/compiler') as typeof import('@angular/compiler');
+    // bare specifier escapes schematics encapsulation for the compiler dynamic import:
+    const { HtmlParser } = await import('@angular/compiler');
     const update = new UpdateChanges(__dirname, host, context);
     update.applyChanges();
 
diff --git a/projects/igniteui-angular/migrations/update-17_0_0/index.ts b/projects/igniteui-angular/migrations/update-17_0_0/index.ts
@@ -3,19 +3,18 @@ import type {
     SchematicContext,
     Tree
 } from '@angular-devkit/schematics';
-import type { Element } from '@angular/compiler';
+import type { Element } from '@angular/compiler' with { "resolution-mode": "import" };
 import * as ts from 'typescript';
 import { UpdateChanges } from '../common/UpdateChanges';
-// use bare specifier to escape the schematics encapsulation for the dynamic import:
-import { nativeImport } from 'igniteui-angular/migrations/common/import-helper.js';
 import { igNamedImportFilter } from '../common/tsUtils';
 import { FileChange, findElementNodes, getAttribute, getSourceOffset, hasAttribute, parseFile } from '../common/util';
 
 const version = '17.0.0';
 
 export default (): Rule => async (host: Tree, context: SchematicContext) => {
     context.logger.info(`Applying migration for Ignite UI for Angular to version ${version}`);
-    const { HtmlParser } = await nativeImport('@angular/compiler') as typeof import('@angular/compiler');
+    // bare specifier escapes schematics encapsulation for the compiler dynamic import:
+    const { HtmlParser } = await import('@angular/compiler');
     const update = new UpdateChanges(__dirname, host, context);
     const changes = new Map<string, FileChange[]>();
     const prop = ['type'];
diff --git a/projects/igniteui-angular/migrations/update-17_1_0/index.ts b/projects/igniteui-angular/migrations/update-17_1_0/index.ts
@@ -5,15 +5,14 @@ import {
 } from '@angular-devkit/schematics';
 import { UpdateChanges } from '../common/UpdateChanges';
 import { FileChange, findElementNodes, getAttribute, getSourceOffset, hasAttribute, parseFile } from '../common/util';
-// use bare specifier to escape the schematics encapsulation for the dynamic import:
-import { nativeImport } from 'igniteui-angular/migrations/common/import-helper.js';
-import { Element } from '@angular/compiler';
+import type { Element } from '@angular/compiler' with { "resolution-mode": "import" };
 
 const version = '17.1.0';
 
 export default (): Rule => async (host: Tree, context: SchematicContext) => {
     context.logger.info(`Applying migration for Ignite UI for Angular to version ${version}`);
-    const { HtmlParser } = await nativeImport('@angular/compiler') as typeof import('@angular/compiler');
+    // bare specifier escapes schematics encapsulation for the compiler dynamic import:
+    const { HtmlParser } = await import('@angular/compiler');
     const update = new UpdateChanges(__dirname, host, context);
     const changes = new Map<string, FileChange[]>();
     const tags = ['button', 'span', 'a', 'div', 'igx-prefix', 'igx-suffix']
diff --git a/projects/igniteui-angular/migrations/update-18_0_0/index.ts b/projects/igniteui-angular/migrations/update-18_0_0/index.ts
@@ -1,7 +1,6 @@
 import { Rule, SchematicContext, SchematicsException, Tree } from "@angular-devkit/schematics";
 import { FileChange, findElementNodes, getAttribute, getProjects, getSourceOffset, getWorkspace, hasAttribute, parseFile } from '../common/util';
-import { nativeImport } from 'igniteui-angular/migrations/common/import-helper.js';
-import type { Element } from '@angular/compiler';
+import type { Element } from '@angular/compiler' with { "resolution-mode": "import" };
 import { BoundPropertyObject, InputPropertyType, UpdateChanges } from "../common/UpdateChanges";
 
 const version = "18.0.0";
@@ -10,7 +9,8 @@ export default (): Rule => async (host: Tree, context: SchematicContext) => {
     context.logger.info(
         `Applying migration for Ignite UI for Angular to version ${version}`,
     );
-    const { HtmlParser } = await nativeImport('@angular/compiler') as typeof import('@angular/compiler');
+    // bare specifier escapes schematics encapsulation for the compiler dynamic import:
+    const { HtmlParser } = await import('@angular/compiler');
     const update = new UpdateChanges(__dirname, host, context);
     const changes = new Map<string, FileChange[]>();
     const prop = ["displayDensity", "[displayDensity]"];
diff --git a/projects/igniteui-angular/migrations/update-20_0_6/index.ts b/projects/igniteui-angular/migrations/update-20_0_6/index.ts
@@ -1,4 +1,3 @@
-import { Element } from '@angular/compiler';
 import type { Rule, SchematicContext, Tree } from '@angular-devkit/schematics';
 import { UpdateChanges } from '../common/UpdateChanges';
 import {
@@ -7,7 +6,6 @@ import {
   getSourceOffset,
   parseFile
 } from '../common/util';
-import { nativeImport } from 'igniteui-angular/migrations/common/import-helper.js';
 
 const version = '20.0.6';
 
@@ -16,7 +14,8 @@ export default (): Rule => async (host: Tree, context: SchematicContext) => {
     `Applying migration for Ignite UI for Angular to version ${version}`
   );
 
-  const { HtmlParser } = (await nativeImport('@angular/compiler')) as typeof import('@angular/compiler');
+  // bare specifier escapes schematics encapsulation for the compiler dynamic import:
+  const { HtmlParser, Element } = await import('@angular/compiler');
 
   const update = new UpdateChanges(__dirname, host, context);
   const changes = new Map<string, FileChange[]>();
diff --git a/projects/igniteui-angular/package.json b/projects/igniteui-angular/package.json
@@ -75,7 +75,7 @@
         "igniteui-trial-watermark": "^3.1.0",
         "jspdf": "^4.2.1",
         "lodash-es": "^4.17.21",
-        "igniteui-theming": "^25.2.0",
+        "igniteui-theming": "^26.0.0",
         "igniteui-i18n-core": "^1.0.2",
         "@igniteui/material-icons-extended": "^3.1.0"
     },
diff --git a/projects/igniteui-angular/schematics/package.json b/projects/igniteui-angular/schematics/package.json
@@ -0,0 +1,3 @@
+{
+    "type": "commonjs"
+}
diff --git a/projects/igniteui-angular/schematics/tsconfig.json b/projects/igniteui-angular/schematics/tsconfig.json
@@ -1,7 +1,7 @@
 {
     "compilerOptions": {
         "target": "es6",
-        "module": "commonjs",
+        "module": "node16",
         "sourceMap": false,
         "composite": true,
         "declaration": true,

Original file line number	Diff line number	Diff line change
`@@ -157,7 +157,7 @@`
`157`	`157`
`158`	`158`	`%inner {`
`159`	`159`	`stroke-width: var(--stroke-thickness);`
`160`		`- stroke: var-get($theme, 'base-circle-color');`
	`160`	`+ stroke: var-get($theme, 'track-color');`
`161`	`161`	`}`
`162`	`162`
`163`	`163`	`%outer {`
Original file line number	Diff line number	Diff line change
`@@ -279,6 +279,11 @@`
`279`	`279`	`"factory": "./update-21_1_0_add-agent-skills",`
`280`	`280`	`"recommended": true,`
`281`	`281`	`"optional": true`
	`282`	`+ },`
	`283`	`+ "migration-55": {`
	`284`	`+ "version": "21.2.0",`
	`285`	`+ "description": "Updates Ignite UI for Angular from v21.1.x to v21.2.0",`
	`286`	`+ "factory": "./update-21_2_0"`
`282`	`287`	`}`
`283`	`288`	`}`
`284`	`289`	`}`