Merge branch '17.0.x' into ddincheva/summarySize-17.0

Author: kdinev

angular.json

@@ -15,15 +15,11 @@
       },
       "architect": {
         "build": {
-          "builder": "@angular-devkit/build-angular:application",
+          "builder": "@angular-devkit/build-angular:browser",
           "options": {
             "outputPath": "dist/igniteui-dev-demos",
+            "main": "./src/main.ts",
             "index": "src/index.html",
-            "browser": "src/main.ts",
-            "server": "src/main.server.ts",
-            "ssr": {
-              "entry": "src/server.ts"
-            },
             "polyfills": [
                 "zone.js",
                 "hammerjs"
@@ -39,6 +35,7 @@
             ],
             "scripts": [],
             "extractLicenses": false,
+            "buildOptimizer": false,
             "sourceMap": true,
             "optimization": false,
             "namedChunks": true,

package.json

@@ -3,7 +3,7 @@
   "version": "0.0.0",
   "scripts": {
     "ng": "ng",
-    "start": "ng serve --open --configuration hmr",
+    "start": "ng serve --open --hmr",
     "build": "ng build --configuration production",
     "test": "ng test igniteui-angular",
     "lint": "ng lint",
@@ -39,6 +39,8 @@
     "build:typedoc:ja:staging": "set NODE_ENV=staging && node ./scripts/build-typedoc.mjs --localize=jp",
     "build:typedoc:en:production": "set NODE_ENV=production && node ./scripts/build-typedoc.mjs --localize=en",
     "build:typedoc:en:staging": "set NODE_ENV=staging && node ./scripts/build-typedoc.mjs --localize=en",
+    "build:sassdoc:export": "gulp sassdocBuildJson --convert true --exportDir ./extras/sassdoc && gulp sassdocCleanOutputDir",
+    "build:sassdoc:import": "gulp sassdocImportJson --render true --importDir ./extras/sassdoc",
     "build:sassdoc:en:production": "set NODE_ENV=production && set SASSDOC_LANG=en && gulp sassdocBuildEN",
     "build:sassdoc:en:staging": "set NODE_ENV=staging && set SASSDOC_LANG=en && gulp sassdocBuildEN",
     "build:sassdoc:ja:production": "set NODE_ENV=production && set SASSDOC_LANG=jp && gulp sassdocBuildJA --render true",
@@ -138,4 +140,4 @@
     "typedoc-plugin-localization": "^3.0.3",
     "typescript": "5.2.2"
   }
-}
+}

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';

projects/igniteui-angular/migrations/common/UpdateChanges.ts

@@ -2,18 +2,18 @@ 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,
     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';

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';
 
 /**

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';
@@ -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
 
 /**

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,
@@ -17,7 +17,6 @@ import {
     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' });

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",

projects/igniteui-angular/migrations/tsconfig.json

@@ -8,6 +8,14 @@
         "typeRoots": [
             "../../../node_modules/@types"
         ],
+        "paths": {
+            "igniteui-angular/*": [
+                "../*"
+            ],
+            "@infragistics/igniteui-angular/*": [
+                "../*"
+            ],
+        }
     },
     "exclude": [
         "../../../node_modules",

projects/igniteui-angular/migrations/update-10_1_0/index.ts

@@ -1,4 +1,4 @@
-import {
+import type {
     Rule,
     SchematicContext,
     Tree