@igniteui/angular-schematics 17.1.13111 → 17.1.13112-beta.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@igniteui/angular-schematics",
-  "version": "17.1.13111",
+  "version": "17.1.13112-beta.2",
   "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": "~17.1.13111",
-    "@igniteui/cli-core": "~13.1.11",
+    "@igniteui/angular-templates": "^17.1.13112-beta.2",
+    "@igniteui/cli-core": "^13.1.12-beta.2",
     "@schematics/angular": "~14.0.0",
     "rxjs": "^6.6.3"
   },

package/src/cli-config/index.js

@@ -11,7 +11,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 const core_1 = require("@angular-devkit/core");
 const schematics_1 = require("@angular-devkit/schematics");
-const angular_templates_1 = require("@igniteui/angular-templates");
 const cli_core_1 = require("@igniteui/cli-core");
 const cli_config_1 = require("../utils/cli-config");
 const NgFileSystem_1 = require("../utils/NgFileSystem");
@@ -40,7 +39,7 @@ function getDependencyVersion(pkg, tree) {
 }
 function displayVersionMismatch() {
     return (tree, context) => {
-        const igxPackage = (0, angular_templates_1.resolveIgxPackage)(angular_templates_1.NPM_PACKAGE);
+        const igxPackage = (0, cli_core_1.resolvePackage)(cli_core_1.NPM_ANGULAR);
         const pkgJson = JSON.parse(tree.read(`/node_modules/${igxPackage}/package.json`).toString());
         const ngKey = "@angular/core";
         const ngCommonKey = "@angular/common";

package/src/cli-config/index_spec.js

@@ -12,7 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const path = require("path");
 const schematics_1 = require("@angular-devkit/schematics");
 const testing_1 = require("@angular-devkit/schematics/testing");
-const angular_templates_1 = require("@igniteui/angular-templates");
+const cli_core_1 = require("@igniteui/cli-core");
 describe("cli-config schematic", () => {
     const collectionPath = path.join(__dirname, "../collection.json");
     const runner = new testing_1.SchematicTestRunner("cli-schematics", collectionPath);
@@ -44,7 +44,7 @@ describe("cli-config schematic", () => {
         devDependencies: {},
         peerDependencies: {}
     };
-    function createIgPkgJson(igxPkg = angular_templates_1.NPM_PACKAGE) {
+    function createIgPkgJson(igxPkg = cli_core_1.NPM_ANGULAR) {
         const filePath = `node_modules/${igxPkg}/package.json`;
         tree.create(filePath, JSON.stringify(pkgJsonConfig));
         const pkgJson = JSON.parse(tree.readContent(filePath));
@@ -55,7 +55,7 @@ describe("cli-config schematic", () => {
         pkgJson.peerDependencies[angularCore] = targetVersion;
         tree.overwrite(filePath, JSON.stringify(pkgJson));
     }
-    function populatePkgJson(igxPkg = angular_templates_1.NPM_PACKAGE) {
+    function populatePkgJson(igxPkg = cli_core_1.NPM_ANGULAR) {
         const targetFile = "/package.json";
         const angularCore = "@angular/core";
         const angularCommon = "@angular/common";
@@ -118,19 +118,19 @@ describe("cli-config schematic", () => {
         tree.create(targetFile, "");
         yield runner.runSchematicAsync("cli-config", {}, tree).toPromise();
         let content = tree.readContent(targetFile);
-        expect(content.includes(`@use "${angular_templates_1.NPM_PACKAGE}`)).toBeTruthy();
+        expect(content.includes(`@use "${cli_core_1.NPM_ANGULAR}`)).toBeTruthy();
         tree.overwrite(targetFile, "");
         resetTree();
-        createIgPkgJson(angular_templates_1.FEED_PACKAGE);
-        populatePkgJson(angular_templates_1.FEED_PACKAGE);
+        createIgPkgJson(cli_core_1.FEED_ANGULAR);
+        populatePkgJson(cli_core_1.FEED_ANGULAR);
         yield runner.runSchematicAsync("cli-config", {}, tree).toPromise();
         content = tree.readContent(targetFile);
-        expect(content.includes(`@use "${angular_templates_1.FEED_PACKAGE}`)).toBeTruthy();
+        expect(content.includes(`@use "${cli_core_1.FEED_ANGULAR}`)).toBeTruthy();
     }));
     it("should add the default css theme to the workspace", () => __awaiter(void 0, void 0, void 0, function* () {
         const targetFile = "/angular.json";
         expect(tree.exists(targetFile)).toBeTruthy();
-        let targetImport = `node_modules/${angular_templates_1.NPM_PACKAGE}/styles/igniteui-angular.css`;
+        let targetImport = `node_modules/${cli_core_1.NPM_ANGULAR}/styles/igniteui-angular.css`;
         yield runner.runSchematicAsync("cli-config", {}, tree).toPromise();
         let workspace = JSON.parse(tree.read("/angular.json").toString());
         expect(workspace.projects.testProj.architect.build.options.styles.filter((s) => s.includes(targetImport)).length)
@@ -138,9 +138,9 @@ describe("cli-config schematic", () => {
         expect(workspace.projects.testProj.architect.test.options.styles.filter((s) => s.includes(targetImport)).length)
             .toBeGreaterThan(0);
         resetTree();
-        createIgPkgJson(angular_templates_1.FEED_PACKAGE);
-        populatePkgJson(angular_templates_1.FEED_PACKAGE);
-        targetImport = `node_modules/${angular_templates_1.FEED_PACKAGE}/styles/igniteui-angular.css`;
+        createIgPkgJson(cli_core_1.FEED_ANGULAR);
+        populatePkgJson(cli_core_1.FEED_ANGULAR);
+        targetImport = `node_modules/${cli_core_1.FEED_ANGULAR}/styles/igniteui-angular.css`;
         yield runner.runSchematicAsync("cli-config", {}, tree).toPromise();
         workspace = JSON.parse(tree.read("/angular.json").toString());
         expect(workspace.projects.testProj.architect.build.options.styles.filter((s) => s.includes(targetImport)).length)
@@ -166,14 +166,14 @@ describe("cli-config schematic", () => {
         tree.create(targetFile, "");
         yield runner.runSchematicAsync("cli-config", {}, tree).toPromise();
         let content = tree.readContent(targetFile);
-        expect(content.includes(`@use "${angular_templates_1.NPM_PACKAGE}`)).toBeTruthy();
+        expect(content.includes(`@use "${cli_core_1.NPM_ANGULAR}`)).toBeTruthy();
         tree.overwrite(targetFile, "");
         resetTree();
-        createIgPkgJson(angular_templates_1.FEED_PACKAGE);
-        populatePkgJson(angular_templates_1.FEED_PACKAGE);
+        createIgPkgJson(cli_core_1.FEED_ANGULAR);
+        populatePkgJson(cli_core_1.FEED_ANGULAR);
         yield runner.runSchematicAsync("cli-config", {}, tree).toPromise();
         content = tree.readContent(targetFile);
-        expect(content.includes(`@use "${angular_templates_1.FEED_PACKAGE}`)).toBeTruthy();
+        expect(content.includes(`@use "${cli_core_1.FEED_ANGULAR}`)).toBeTruthy();
     }));
     it("should add BrowserAnimationsModule to app.module.ts", () => __awaiter(void 0, void 0, void 0, function* () {
         const moduleContent = `import { NgModule } from '@angular/core';
@@ -245,12 +245,12 @@ export const appConfig: ApplicationConfig = {
             }
         });
         yield runner.runSchematicAsync("cli-config", {}, tree).toPromise();
-        let pattern = new RegExp(`WARNING Version mismatch detected - ${angular_templates_1.NPM_PACKAGE}`);
+        let pattern = new RegExp(`WARNING Version mismatch detected - ${cli_core_1.NPM_ANGULAR}`);
         expect(warns).toContain(jasmine.stringMatching(pattern));
         resetTree();
-        createIgPkgJson(angular_templates_1.FEED_PACKAGE);
-        populatePkgJson(angular_templates_1.FEED_PACKAGE);
-        pattern = new RegExp(`WARNING Version mismatch detected - ${angular_templates_1.FEED_PACKAGE}`);
+        createIgPkgJson(cli_core_1.FEED_ANGULAR);
+        populatePkgJson(cli_core_1.FEED_ANGULAR);
+        pattern = new RegExp(`WARNING Version mismatch detected - ${cli_core_1.FEED_ANGULAR}`);
         yield runner.runSchematicAsync("cli-config", {}, tree).toPromise();
         expect(warns).toContain(jasmine.stringMatching(pattern));
     }));

package/src/utils/theme-import.js

@@ -11,7 +11,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 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) {
@@ -60,7 +59,7 @@ function addFontsToIndexHtml(tree) {
 }
 exports.addFontsToIndexHtml = addFontsToIndexHtml;
 function importDefaultThemeSass(tree, filePath) {
-    const igxPackage = (0, angular_templates_1.resolveIgxPackage)(angular_templates_1.NPM_PACKAGE);
+    const igxPackage = (0, cli_core_1.resolvePackage)(cli_core_1.NPM_ANGULAR);
     const sassImports = `
 @use "${igxPackage}/theming" as *;
 // Uncomment the following lines if you want to add a custom palette:
@@ -98,7 +97,7 @@ function getProjects(tree) {
 }
 exports.getProjects = getProjects;
 function importDefaultThemeToAngularWorkspace(workspace, key) {
-    const igxPackage = (0, angular_templates_1.resolveIgxPackage)(angular_templates_1.NPM_PACKAGE);
+    const igxPackage = (0, cli_core_1.resolvePackage)(cli_core_1.NPM_ANGULAR);
     const cssImport = `node_modules/${igxPackage}/styles/igniteui-angular.css`;
     const project = workspace.extensions.defaultProject ?
         workspace.projects.get(workspace.extensions.defaultProject) :