igniteui-angular 18.2.0-beta.0 → 18.2.0-beta.2

package/migrations/common/UpdateChanges.js

@@ -12,7 +12,7 @@ const tss = require("typescript/lib/tsserverlibrary");
 const schema_1 = require("./schema");
 const tsUtils_1 = require("./tsUtils");
 const util_1 = require("./util");
-const ServerHost_1 = require("./ServerHost");
+const project_service_container_1 = require("./project-service-container");
 const TSCONFIG_PATH = 'tsconfig.json';
 var InputPropertyType;
 (function (InputPropertyType) {
@@ -33,31 +33,15 @@ class UpdateChanges {
         this._shouldInvokeLS = val;
     }
     get projectService() {
-        if (!this._projectService) {
-            this._projectService = (0, tsUtils_1.createProjectService)(this.serverHost);
-            // Force Angular service to compile project on initial load w/ configure project
-            // otherwise if the first compilation occurs on an HTML file the project won't have proper refs
-            // and no actual angular metadata will be resolved for the rest of the migration
-            // TODO: this patter/issue might be obsolete; if so, should be safe to return _projectService directly
-            const mainRelPath = this.getWorkspaceProjectEntryPath();
-            if (!mainRelPath) {
-                return null;
-            }
-            // patch TSConfig so it includes angularOptions.strictTemplates
-            // ivy ls requires this in order to function properly on templates
-            this.patchTsConfig();
-            const mainAbsPath = path.resolve(this._projectService.currentDirectory, mainRelPath);
-            const scriptInfo = this._projectService.getOrCreateScriptInfoForNormalizedPath(tss.server.toNormalizedPath(mainAbsPath), false);
-            this._projectService.openClientFile(scriptInfo.fileName);
-            try {
-                const project = this._projectService.findProject(scriptInfo.containingProjects[0].getProjectName());
-                project.getLanguageService().getSemanticDiagnostics(mainAbsPath);
-            }
-            catch (err) {
-                this.context.logger.warn("An error occurred during TypeScript project service setup. Some migrations relying on language services might not be applied.");
-            }
+        const projectService = project_service_container_1.serviceContainer.projectService;
+        if (!project_service_container_1.serviceContainer.configured) {
+            this.configureForAngularLS(projectService);
+            project_service_container_1.serviceContainer.configured = true;
         }
-        return this._projectService;
+        return projectService;
+    }
+    get serverHost() {
+        return project_service_container_1.serviceContainer.serverHost;
     }
     get templateFiles() {
         if (!this._templateFiles.length) {
@@ -132,7 +116,8 @@ class UpdateChanges {
         this.themeChanges = this.loadConfig('theme-changes.json');
         this.importsChanges = this.loadConfig('imports.json');
         this.membersChanges = this.loadConfig('members.json');
-        this.serverHost = new ServerHost_1.ServerHost(this.host);
+        // update LS server host with the schematics tree:
+        this.serverHost.host = this.host;
     }
     /** Apply configured changes to the Host Tree */
     applyChanges() {
@@ -588,7 +573,7 @@ class UpdateChanges {
             return;
         }
         // attempt to find a main tsconfig from workspace:
-        const wsProject = this.workspace.projects[0];
+        const wsProject = Object.values(this.workspace.projects)[0];
         // technically could be per-project, but assuming there's at least one main tsconfig for IDE support
         const projectConfig = (_b = (_a = wsProject.architect) === null || _a === void 0 ? void 0 : _a.build) === null || _b === void 0 ? void 0 : _b.options['tsConfig'];
         if (!projectConfig || !this.host.exists(projectConfig)) {
@@ -731,6 +716,31 @@ class UpdateChanges {
         project.addMissingFileRoot(scriptInfo.fileName);
         return project;
     }
+    /**
+     * Force Angular service to compile project on initial load w/ configured project
+     * otherwise if the first compilation occurs on an HTML file the project won't have proper refs
+     * and no actual angular metadata will be resolved for the rest of the migration
+     */
+    configureForAngularLS(projectService) {
+        // TODO: this pattern/issue might be obsolete
+        const mainRelPath = this.getWorkspaceProjectEntryPath();
+        if (!mainRelPath) {
+            return;
+        }
+        // patch TSConfig so it includes angularOptions.strictTemplates
+        // ivy ls requires this in order to function properly on templates
+        this.patchTsConfig();
+        const mainAbsPath = path.resolve(projectService.currentDirectory, mainRelPath);
+        const scriptInfo = projectService.getOrCreateScriptInfoForNormalizedPath(tss.server.toNormalizedPath(mainAbsPath), false);
+        projectService.openClientFile(scriptInfo.fileName);
+        try {
+            const project = projectService.findProject(scriptInfo.containingProjects[0].getProjectName());
+            project.getLanguageService().getSemanticDiagnostics(mainAbsPath);
+        }
+        catch (err) {
+            this.context.logger.warn("An error occurred during TypeScript project service setup. Some migrations relying on language services might not be applied.");
+        }
+    }
     getWorkspaceProjectEntryPath() {
         var _a, _b;
         const projectKeys = Object.keys(this.workspace.projects);
@@ -742,8 +752,8 @@ class UpdateChanges {
         for (const key of projectKeys) {
             const wsProject = this.workspace.projects[key];
             // intentionally compare against string values of the enum to avoid hard import
-            if (wsProject.projectType == "application" && ((_b = (_a = wsProject.architect) === null || _a === void 0 ? void 0 : _a.build) === null || _b === void 0 ? void 0 : _b.options['main'])) {
-                return wsProject.architect.build.options['main'];
+            if (wsProject.projectType == "application" && ((_b = (_a = wsProject.architect) === null || _a === void 0 ? void 0 : _a.build) === null || _b === void 0 ? void 0 : _b.options)) {
+                return wsProject.architect.build.options['browser'] || wsProject.architect.build.options['main'];
             }
             else if (wsProject.projectType == "library") {
                 // TODO: attempt to resolve from project ng-package.json or tsConfig

package/migrations/common/project-service-container.d.ts

@@ -0,0 +1,11 @@
+import * as tss from 'typescript/lib/tsserverlibrary';
+import { ServerHost } from './ServerHost';
+export declare class ProjectServiceContainer {
+    private _serverHost;
+    private _projectService;
+    /** Indicates additional config adjustments after init have been made */
+    configured: boolean;
+    get serverHost(): ServerHost;
+    get projectService(): tss.server.ProjectService;
+}
+export declare const serviceContainer: ProjectServiceContainer;

package/migrations/common/project-service-container.js

@@ -0,0 +1,25 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.serviceContainer = exports.ProjectServiceContainer = void 0;
+const tsUtils_1 = require("./tsUtils");
+const ServerHost_1 = require("./ServerHost");
+class ProjectServiceContainer {
+    constructor() {
+        /** Indicates additional config adjustments after init have been made */
+        this.configured = false;
+    }
+    get serverHost() {
+        if (!this._serverHost) {
+            this._serverHost = new ServerHost_1.ServerHost(null);
+        }
+        return this._serverHost;
+    }
+    get projectService() {
+        if (!this._projectService) {
+            this._projectService = (0, tsUtils_1.createProjectService)(this.serverHost);
+        }
+        return this._projectService;
+    }
+}
+exports.ProjectServiceContainer = ProjectServiceContainer;
+exports.serviceContainer = new ProjectServiceContainer();

package/migrations/update-13_0_0/changes/members.json

@@ -19,7 +19,7 @@
             "member": "selectedItems()",
             "replaceWith": "selection",
             "definedIn": [
-                "IgxComboBaseDirective"
+                "IgxComboComponent"
             ]
         },
         {

package/migrations/update-18_2_0/changes/inputs.json

@@ -0,0 +1,14 @@
+{
+    "$schema": "../../common/schema/binding.schema.json",
+    "changes": [
+        {
+            "name": "fields",
+            "replaceWith": "entities",
+            "valueTransform": "fields_to_entities",
+            "owner": {
+                "selector": "igx-query-builder",
+                "type": "component"
+            }
+        }
+    ]
+}

package/migrations/update-18_2_0/changes/theme-changes.json

@@ -18,6 +18,12 @@
       "replaceWith": "$sb-track-bg-color",
       "owner": "scrollbar-theme",
       "type": "property"
+    },
+    {
+      "name": "$border-width",
+      "remove": true,
+      "owner": "badge-theme",
+      "type":"property"
     }
   ]
 }

package/migrations/update-18_2_0/index.js

@@ -14,5 +14,41 @@ const version = '18.2.0';
 exports.default = () => (host, context) => __awaiter(void 0, void 0, void 0, function* () {
     context.logger.info(`Applying migration for Ignite UI for Angular to version ${version}`);
     const update = new UpdateChanges_1.UpdateChanges(__dirname, host, context);
+    update.addValueTransform('fields_to_entities', (args) => {
+        args.bindingType = UpdateChanges_1.InputPropertyType.EVAL;
+        args.value = `[{ name: '', fields: ${args.value}}]`;
+    });
+    const IG_COLORS = [
+        'primary-',
+        'primary-A',
+        'secondary-',
+        'secondary-A',
+        'gray-',
+        'surface-',
+        'surface-A',
+        'info-',
+        'info-A',
+        'success-',
+        'success-A',
+        'warn-',
+        'warn-A',
+        'error-',
+        'error-A'
+    ];
+    const hslaColor = 'hsla?\\(var\\(--ig-attr(\\d)00\\)\\)';
+    for (const entryPath of update.sassFiles) {
+        let content = host.read(entryPath).toString();
+        IG_COLORS.forEach(color => {
+            let prop = hslaColor.replace('attr', color);
+            const regex = new RegExp(prop, 'g');
+            if (regex.test(content)) {
+                let newColor = prop.replace(/hsla\?\\\(var\\\(--ig-/g, 'var\(--ig-');
+                newColor = newColor.replace('(\\d)', '$1');
+                newColor = newColor.replace('\\)\\)', ')');
+                content = content.replace(regex, newColor);
+                host.overwrite(entryPath, content);
+            }
+        });
+    }
     update.applyChanges();
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "igniteui-angular",
-  "version": "18.2.0-beta.0",
+  "version": "18.2.0-beta.2",
   "description": "Ignite UI for Angular is a dependency-free Angular toolkit for building modern web apps",
   "author": "Infragistics",
   "license": "SEE LICENSE IN LICENSE",
@@ -74,7 +74,7 @@
     "igniteui-trial-watermark": "^3.0.2",
     "lodash-es": "^4.17.21",
     "uuid": "^9.0.0",
-    "igniteui-theming": "^14.2.0-beta.1",
+    "igniteui-theming": "^14.2.0-beta.3",
     "@igniteui/material-icons-extended": "^3.0.0"
   },
   "peerDependencies": {