@igniteui/angular-schematics 14.0.1003 → 14.0.1004-beta.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@igniteui/angular-schematics",
-  "version": "14.0.1003",
+  "version": "14.0.1004-beta.0",
   "description": "Ignite UI for Angular Schematics for ng new and ng generate",
   "repository": {
     "type": "git",
@@ -22,8 +22,8 @@
   "dependencies": {
     "@angular-devkit/core": "~14.0.0",
     "@angular-devkit/schematics": "~14.0.0",
-    "@igniteui/angular-templates": "~14.0.1003",
-    "@igniteui/cli-core": "~10.0.3",
+    "@igniteui/angular-templates": "~14.0.1004-beta.0",
+    "@igniteui/cli-core": "~10.0.4-beta.0",
     "@schematics/angular": "~14.0.0",
     "rxjs": "^6.6.3"
   },

package/src/cli-config/index.js

@@ -63,13 +63,15 @@ function addTypographyToProj() {
 }
 function importBrowserAnimations() {
     return (tree) => __awaiter(this, void 0, void 0, function* () {
-        const project = yield (0, theme_import_1.getDefaultProject)(tree);
-        const moduleFile = `${project.sourceRoot}/app/app.module.ts`;
-        if (tree.exists(moduleFile)) {
-            const mainModule = new cli_core_1.TypeScriptFileUpdate(moduleFile);
-            mainModule.addNgModuleMeta({ import: "BrowserAnimationsModule", from: "@angular/platform-browser/animations" });
-            mainModule.finalize();
-        }
+        const projects = yield (0, theme_import_1.getProjects)(tree);
+        projects.forEach(project => {
+            const moduleFile = `${project.sourceRoot}/app/app.module.ts`;
+            if (tree.exists(moduleFile)) {
+                const mainModule = new cli_core_1.TypeScriptFileUpdate(moduleFile);
+                mainModule.addNgModuleMeta({ import: "BrowserAnimationsModule", from: "@angular/platform-browser/animations" });
+                mainModule.finalize();
+            }
+        });
     });
 }
 function importStyles() {

package/src/utils/cli-config.js

@@ -13,6 +13,7 @@ exports.createCliConfig = void 0;
 const core_1 = require("@angular-devkit/core");
 const schematics_1 = require("@angular-devkit/schematics");
 const cli_core_1 = require("@igniteui/cli-core");
+const theme_import_1 = require("./theme-import");
 function createCliConfig() {
     return (tree, context) => __awaiter(this, void 0, void 0, function* () {
         context.logger.info(``);
@@ -40,18 +41,16 @@ function GetCliConfig(tree) {
         }
         const cliConfig = require("../cli-config/files/ignite-ui-cli.json");
         cliConfig.version = cli_core_1.Util.version();
-        const userPort = getPort(workspace);
+        const projects = yield (0, theme_import_1.getProjects)(tree);
+        const userPort = getPort(projects.values().next().value);
         if (userPort) {
             cliConfig.project.defaultPort = userPort;
         }
         return cliConfig;
     });
 }
-function getPort(workspace) {
+function getPort(project) {
     var _a;
-    const project = workspace.extensions.defaultProject ?
-        workspace.projects.get(workspace.extensions.defaultProject) :
-        workspace.projects.values().next().value;
     const projectServe = (_a = project === null || project === void 0 ? void 0 : project.targets.get("serve")) === null || _a === void 0 ? void 0 : _a.options;
     if (projectServe) {
         return projectServe.port;

package/src/utils/theme-import.d.ts

@@ -2,4 +2,4 @@ import { workspaces } from "@angular-devkit/core";
 import { Tree } from "@angular-devkit/schematics/src/tree/interface";
 export declare function importDefaultTheme(tree: Tree): Promise<void>;
 export declare function addFontsToIndexHtml(tree: Tree): Promise<void>;
-export declare function getDefaultProject(tree: Tree): Promise<workspaces.ProjectDefinition>;
+export declare function getProjects(tree: Tree): Promise<workspaces.ProjectDefinitionCollection>;

package/src/utils/theme-import.js

@@ -9,48 +9,53 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDefaultProject = exports.addFontsToIndexHtml = exports.importDefaultTheme = void 0;
+exports.getProjects = exports.addFontsToIndexHtml = exports.importDefaultTheme = void 0;
 const core_1 = require("@angular-devkit/core");
 const angular_templates_1 = require("@igniteui/angular-templates");
 const cli_core_1 = require("@igniteui/cli-core");
 const path = require("path");
 function importDefaultTheme(tree) {
     return __awaiter(this, void 0, void 0, function* () {
-        const sourceRoot = (yield getDefaultProject(tree)).sourceRoot;
-        if (!sourceRoot) {
-            return;
-        }
-        const pathWithoutExt = path.join(sourceRoot, "styles");
-        if (tree.exists(`${pathWithoutExt}.sass`)) {
-            importDefaultThemeSass(tree, `${pathWithoutExt}.sass`);
-            return;
-        }
-        else if (tree.exists(`${pathWithoutExt}.scss`)) {
-            importDefaultThemeSass(tree, `${pathWithoutExt}.scss`);
-            return;
+        const projects = yield getProjects(tree);
+        for (const project of projects.values()) {
+            const sourceRoot = project === null || project === void 0 ? void 0 : project.sourceRoot;
+            if (!sourceRoot) {
+                continue;
+            }
+            const pathWithoutExt = path.join(sourceRoot, "styles");
+            if (tree.exists(`${pathWithoutExt}.sass`)) {
+                importDefaultThemeSass(tree, `${pathWithoutExt}.sass`);
+                continue;
+            }
+            else if (tree.exists(`${pathWithoutExt}.scss`)) {
+                importDefaultThemeSass(tree, `${pathWithoutExt}.scss`);
+                continue;
+            }
+            yield importIgDefaultTheme(tree);
+            continue;
         }
-        yield importIgDefaultTheme(tree);
-        return;
     });
 }
 exports.importDefaultTheme = importDefaultTheme;
 function addFontsToIndexHtml(tree) {
-    var _a, _b;
     return __awaiter(this, void 0, void 0, function* () {
         const titillium = '<link href="https://fonts.googleapis.com/css?family=Titillium+Web" rel="stylesheet">';
         const materialIcons = '<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">';
-        const project = yield getDefaultProject(tree);
-        const targetFile = (_b = (_a = project.targets.get("build")) === null || _a === void 0 ? void 0 : _a.options) === null || _b === void 0 ? void 0 : _b.index;
-        if (targetFile && tree.exists(targetFile)) {
-            let content = tree.read(targetFile).toString();
-            if (!content.includes(titillium)) {
-                content = content.replace("</head>", `  ${titillium}\n</head>`);
+        const projects = yield getProjects(tree);
+        projects.forEach(project => {
+            var _a, _b;
+            const targetFile = (_b = (_a = project.targets.get("build")) === null || _a === void 0 ? void 0 : _a.options) === null || _b === void 0 ? void 0 : _b.index;
+            if (targetFile && tree.exists(targetFile)) {
+                let content = tree.read(targetFile).toString();
+                if (!content.includes(titillium)) {
+                    content = content.replace("</head>", `  ${titillium}\n</head>`);
+                }
+                if (!content.includes(materialIcons)) {
+                    content = content.replace("</head>", `  ${materialIcons}\n</head>`);
+                }
+                tree.overwrite(targetFile, content);
             }
-            if (!content.includes(materialIcons)) {
-                content = content.replace("</head>", `  ${materialIcons}\n</head>`);
-            }
-            tree.overwrite(targetFile, content);
-        }
+        });
     });
 }
 exports.addFontsToIndexHtml = addFontsToIndexHtml;
@@ -85,16 +90,13 @@ function importIgDefaultTheme(tree) {
         yield core_1.workspaces.writeWorkspace(workspace, host);
     });
 }
-function getDefaultProject(tree) {
+function getProjects(tree) {
     return __awaiter(this, void 0, void 0, function* () {
         const { workspace } = yield core_1.workspaces.readWorkspace("/", (0, cli_core_1.createWorkspaceHost)(tree));
-        const project = workspace.extensions.defaultProject ?
-            workspace.projects.get(workspace.extensions.defaultProject) :
-            workspace.projects.values().next().value;
-        return project;
+        return workspace.projects;
     });
 }
-exports.getDefaultProject = getDefaultProject;
+exports.getProjects = getProjects;
 function importDefaultThemeToAngularWorkspace(workspace, key) {
     const igxPackage = (0, angular_templates_1.resolveIgxPackage)(angular_templates_1.NPM_PACKAGE);
     const cssImport = `node_modules/${igxPackage}/styles/igniteui-angular.css`;