Merge branch 'rkaraivanov/grids-restructure' of https://github.com/IgniteUI/igniteui-angular.git

Author: MKirova

projects/igniteui-angular/package.json

@@ -79,7 +79,7 @@
         "web-animations-js": "^2.3.2"
     },
     "devDependencies": {
-        "igniteui-cli": "~4.2.0"
+        "@igniteui/angular-schematics": "^8.2.500-beta.0"
     },
     "ng-update": {
         "migrations": "./migrations/migration-collection.json"

projects/igniteui-angular/schematics/ng-add/index.spec.ts

@@ -106,8 +106,8 @@ describe('ng-add schematics', () => {
     runner.runSchematic('ng-add', { normalizeCss: false }, tree);
     const pkgJsonData = JSON.parse(tree.readContent('/package.json'));
 
-    expect(pkgJsonData.devDependencies['igniteui-cli']).toBeTruthy();
-    expect(pkgJsonData.dependencies['igniteui-cli']).toBeFalsy();
+    expect(pkgJsonData.devDependencies['@igniteui/angular-schematics']).toBeTruthy();
+    expect(pkgJsonData.dependencies['@igniteui/angular-schematics']).toBeFalsy();
   });
 
   it('should properly add polyfills', () => {

projects/igniteui-angular/schematics/utils/dependency-handler.ts

@@ -4,6 +4,8 @@ import { getWorkspace } from '@schematics/angular/utility/config';
 import { Options } from '../interfaces/options';
 import { WorkspaceProject, ProjectType, WorkspaceSchema } from '@schematics/angular/utility/workspace-models';
 
+const schematicsPackage = '@igniteui/angular-schematics';
+
 function logIncludingDependency(context: SchematicContext, pkg: string, version: string): void {
     context.logger.info(`Including ${pkg} - Version: ${version}`);
 }
@@ -65,7 +67,7 @@ export function addDependencies(options: Options): Rule {
             }
         });
 
-        addPackageToPkgJson(tree, 'igniteui-cli', pkgJson.devDependencies['igniteui-cli'], devDependencies);
+        addPackageToPkgJson(tree, schematicsPackage, pkgJson.devDependencies[schematicsPackage], devDependencies);
         return tree;
     };
 }

projects/igniteui-angular/schematics/utils/package-handler.ts

@@ -1,7 +1,7 @@
 import { Rule, SchematicContext, Tree } from '@angular-devkit/schematics';
 import { RunSchematicTask, NodePackageInstallTask } from '@angular-devkit/schematics/tasks';
 
-const extSchematicModule = 'igniteui-cli';
+const extSchematicModule = '@igniteui/angular-schematics';
 const schematicName = 'cli-config';
 
 export function installPackageJsonDependencies(options: any): Rule {