Merge branch 'master' into fix-#6030-master

Author: rkaraivanov

.travis.yml

@@ -39,7 +39,7 @@ before_deploy:
 - cd dist/igniteui-angular
 # update package versions
 - npm version "${TRAVIS_TAG}" --no-git-tag-version --save
-- if [[ "${TRAVIS_TAG}" == *"beta"* || "${TRAVIS_TAG}" == *"rc"* ]]; then export NPM_TAG="next"; else export NPM_TAG="latest"; fi
+- if [[ "${TRAVIS_TAG}" == *"alpha"* || "${TRAVIS_TAG}" == *"beta"* || "${TRAVIS_TAG}" == *"rc"* ]]; then export NPM_TAG="next"; else export NPM_TAG="latest"; fi
 
 # copy readme
 - cp ../../README.md README.md

CHANGELOG.md

@@ -1,6 +1,18 @@
 # Ignite UI for Angular Change Log
 
 All notable changes for each version of this project will be documented in this file.
+
+## 9.0.0
+
+### General
+- Added support for the Ivy renderer.
+- **Breaking Changes** The following classes have been renamed. Using `ng update` will apply automatically migrate your project to use the new names.
+    - `IgxDropDownBase` -> `IgxDropDownBaseDirective`
+    - `IgxDropDownItemBase` -> `IgxDropDownBaseDirective`
+    - `IgxGridBaseComponent` -> `IgxGridBaseDirective`
+    - `IgxRowComponent` -> `IgxRowDirective`
+    - `IgxHierarchicalGridBaseComponent` -> `IgxHierarchicalGridBaseDirective`
+
 ## 8.2.4
 
 ### RTL Support

projects/igniteui-angular/migrations/migration-collection.json

@@ -55,6 +55,11 @@
             "version": "8.2.3",
             "description": "Updates Ignite UI for Angular from v8.2.0 to v8.2.3",
             "factory": "./update-8_2_3"
+        },
+        "migration-12": {
+            "version": "9.0.0",
+            "description": "Updates Ignite UI for Angular from v8.2.x to v9.2.0",
+            "factory": "./update-9_0_0"
         }
     }
 }

projects/igniteui-angular/migrations/update-9_0_0/changes/classes.json

@@ -0,0 +1,25 @@
+{
+    "$schema": "../../common/schema/class.schema.json",
+    "changes": [
+        {
+            "name": "IgxDropDownBase",
+            "replaceWith": "IgxDropDownBaseDirective"
+        },
+        {
+            "name": "IgxDropDownItemBase",
+            "replaceWith": "IgxDropDownItemBaseDirective"
+        },
+        {
+            "name": "IgxGridBaseComponent",
+            "replaceWith": "IgxGridBaseDirective"
+        },
+        {
+            "name": "IgxRowComponent",
+            "replaceWith": "IgxRowDirective"
+        },
+        {
+            "name": "IgxHierarchicalGridBaseComponent",
+            "replaceWith": "IgxHierarchicalGridBaseDirective"
+        }
+    ]
+}

projects/igniteui-angular/migrations/update-9_0_0/index.spec.ts

@@ -0,0 +1,46 @@
+import * as path from 'path';
+
+// tslint:disable:no-implicit-dependencies
+import { virtualFs } from '@angular-devkit/core';
+import { EmptyTree } from '@angular-devkit/schematics';
+// tslint:disable-next-line:no-submodule-imports
+import { SchematicTestRunner, UnitTestTree } from '@angular-devkit/schematics/testing';
+
+describe('Update 9.0.0', () => {
+    let appTree: UnitTestTree;
+    const schematicRunner = new SchematicTestRunner('ig-migrate', path.join(__dirname, '../migration-collection.json'));
+    const configJson = {
+        defaultProject: 'testProj',
+        projects: {
+            testProj: {
+                sourceRoot: '/testSrc'
+            }
+        },
+        schematics: {
+            '@schematics/angular:component': {
+                prefix: 'appPrefix'
+            }
+        }
+      };
+
+    beforeEach(() => {
+        appTree = new UnitTestTree(new EmptyTree());
+        appTree.create('/angular.json', JSON.stringify(configJson));
+    });
+
+    it('should update base class names.', done => {
+        appTree.create(
+            '/testSrc/appPrefix/component/test.component.ts',
+            `import { IgxDropDownBase, IgxDropDownItemBase, IgxGridBaseComponent,
+                IgxRowComponent, IgxHierarchicalGridBaseComponent } from 'igniteui-angular';
+            `);
+
+        const tree = schematicRunner.runSchematic('migration-12', {}, appTree);
+        expect(tree.readContent('/testSrc/appPrefix/component/test.component.ts'))
+            .toEqual(
+            `import { IgxDropDownBaseDirective, IgxDropDownItemBaseDirective, IgxGridBaseDirective,
+                IgxRowDirective, IgxHierarchicalGridBaseDirective } from 'igniteui-angular';
+            `);
+        done();
+    });
+});

projects/igniteui-angular/migrations/update-9_0_0/index.ts

@@ -0,0 +1,17 @@
+import {
+    Rule,
+    SchematicContext,
+    Tree
+} from '@angular-devkit/schematics';
+import { UpdateChanges } from '../common/UpdateChanges';
+
+const version = '9.0.0';
+
+export default function(): Rule {
+    return (host: Tree, context: SchematicContext) => {
+        context.logger.info(`Applying migration for Ignite UI for Angular to version ${version}`);
+
+        const update = new UpdateChanges(__dirname, host, context);
+        update.applyChanges();
+    };
+}

projects/igniteui-angular/ng-package.prod.json

@@ -2,7 +2,11 @@
   "$schema": "../../node_modules/ng-packagr/ng-package.schema.json",
   "dest": "../../dist/igniteui-angular",
   "lib": {
-    "entryFile": "src/public_api.ts"
+    "entryFile": "src/public_api.ts",
+    "umdModuleIds": {
+      "jszip/dist/jszip": "JSZip",
+      "resize-observer-polyfill": "ResizeObserver"
+    }
   },
   "whitelistedNonPeerDependencies": [
       "@types/hammerjs",

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