Merge branch 'master' into dTsvetkov/fix-lint-warnings-summary-sorting

Author: zdrawku

.github/workflows/nodejs.yml

@@ -23,6 +23,8 @@ jobs:
         uses: actions/checkout@v2
       - name: Use Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v1
+        with:
+            node-version: ${{ matrix.node-version }}
       - name: Install packages
         run: npm ci
       - name: Lint

CHANGELOG.md

@@ -1,6 +1,22 @@
 # Ignite UI for Angular Change Log
 
 All notable changes for each version of this project will be documented in this file.
+
+## 12.0.0
+
+### Themes:
+- Breaking Changes:
+    - `IgxButton` theme has been simplified. The number of theme params (`igx-button-theme`) has been reduced significantly and no longer includes prefixed parameters (`flat-*`, `raised-*`, etc.). See the migration guide to update existing button themes. Updates performed with `ng update` will migrate existing button themes but some additional tweaking may be required to account for the abscense of prefixed params.
+
+## 11.1.1
+
+### New Features
+- `IgxAutocomplete`
+    - Exported the component instance in the template with the name `igxAutocomplete`.
+
+    ```html
+    <input type="text" [igxAutocomplete]="townsPanel" #autocompleteRef="igxAutocomplete"/>
+    ```
 ## 11.1.0
 
 ### New Features
@@ -132,6 +148,16 @@ All notable changes for each version of this project will be documented in this
         - `onRowExport` to `rowExporting`
         - `onExportEnded` to `exportEnded`
 
+## 11.0.15
+
+### New Features
+- `IgxAutocomplete`
+    - Exported the component instance in the template with the name `igxAutocomplete`.
+
+    ```html
+    <input type="text" [igxAutocomplete]="townsPanel" #autocompleteRef="igxAutocomplete"/>
+    ```
+
 ## 11.0.4
 
 ### General
@@ -169,6 +195,16 @@ All notable changes for each version of this project will be documented in this
 - `IgxOverlay`
     - New functionality to automatically determine the correct animation that is needed when showing an overlay content. This is used with Auto Position strategy, where the `IgxOverlay` content is flipped, depending on the available space.
 
+## 10.2.15
+
+### New Features
+- `IgxAutocomplete`
+    - Exported the component instance in the template with the name `igxAutocomplete`.
+
+    ```html
+    <input type="text" [igxAutocomplete]="townsPanel" #autocompleteRef="igxAutocomplete"/>
+    ```
+
 ## 10.2.0
 
 ### General

projects/igniteui-angular/migrations/common/UpdateChanges.spec.ts

@@ -768,4 +768,76 @@ export class AppModule { }`);
 <igx-component newProp="leaveMeBe">STRING</igx-component>`);
         done();
     });
+
+    describe('Project loading', () => {
+        it('should correctly load project files', () => {
+            const tsFile = '/src/component.ts';
+            const htmlFile = '/src/component.html';
+            const scssFile = '/src/component.scss';
+            const sassFile = '/src/component.sass';
+            appTree.overwrite('/angular.json', JSON.stringify({
+                projects: {
+                    testProj: {
+                        sourceRoot: '/src'
+                    }
+                }
+            }));
+            appTree.create(tsFile, '');
+            appTree.create(htmlFile, '');
+            appTree.create(scssFile, '');
+            appTree.create(sassFile, '');
+
+            // skip loading json config files
+            spyOn(fs, 'existsSync').and.returnValue(false);
+
+            const update = new UnitUpdateChanges(__dirname, appTree);
+            expect(update.tsFiles).toContain(tsFile);
+            expect(update.templateFiles).toContain(htmlFile);
+            expect(update.sassFiles).toContain(scssFile);
+            expect(update.sassFiles).toContain(sassFile);
+        });
+
+        it('should correctly load multiple and library project files', () => {
+            const tsFile = 'component.ts';
+            const htmlFile = 'component.html';
+            const scssFile = 'component.scss';
+            const sassFile = 'component.sass';
+            const workspace = {
+                projects: {
+                    testProj: {
+                        projectType: 'application',
+                        sourceRoot: 'src-one'
+                    },
+                    test2Proj: {
+                        projectType: 'application',
+                        sourceRoot: '/src-two'
+                    },
+                    libProj: {
+                        projectType: 'library',
+                        sourceRoot: 'src-lib'
+                    }
+                }
+            };
+            appTree.overwrite('/angular.json', JSON.stringify(workspace));
+            for (const projName of Object.keys(workspace.projects)) {
+                const root = workspace.projects[projName].sourceRoot;
+                appTree.create(path.posix.join(root, tsFile), '');
+                appTree.create(path.posix.join(root, htmlFile), '');
+                appTree.create(path.posix.join(root, scssFile), '');
+                appTree.create(path.posix.join(root, sassFile), '');
+            }
+
+            // skip loading json config files
+            spyOn(fs, 'existsSync').and.returnValue(false);
+
+            const update = new UnitUpdateChanges(__dirname, appTree);
+            for (const projName of Object.keys(workspace.projects)) {
+                const root = workspace.projects[projName].sourceRoot;
+                expect(update.tsFiles).toContain(path.posix.join(`/${root}`, tsFile));
+                expect(update.templateFiles).toContain(path.posix.join(`/${root}`, htmlFile));
+                expect(update.sassFiles).toContain(path.posix.join(`/${root}`, scssFile));
+                expect(update.sassFiles).toContain(path.posix.join(`/${root}`, sassFile));
+            }
+        });
+    });
 });

projects/igniteui-angular/migrations/common/UpdateChanges.ts

@@ -333,15 +333,19 @@ export class UpdateChanges {
                 for (const match of matches) {
                     if (match.indexOf(change.name) !== -1) {
                         const name = change.name.replace('$', '\\$');
+                        const replaceWith = change.replaceWith?.replace('$', '\\$');
                         const reg = new RegExp(String.raw`^\s*${name}:`);
+                        const existing = new RegExp(String.raw`${replaceWith}:`);
                         const opening = `${change.owner}(`;
                         const closing = /\s*\);$/.exec(match).pop();
                         const body = match.substr(opening.length, match.length - opening.length - closing.length);
 
                         let params = this.splitFunctionProps(body);
                         params = params.reduce((arr, param) => {
                             if (reg.test(param)) {
-                                if (!change.remove) {
+                                const duplicate = !!replaceWith && arr.some(p => existing.test(p));
+
+                                if (!change.remove && !duplicate) {
                                     arr.push(param.replace(change.name, change.replaceWith));
                                 }
                             } else {

projects/igniteui-angular/migrations/common/util.ts

@@ -1,7 +1,7 @@
 import { normalize } from '@angular-devkit/core';
 import * as path from 'path';
 import { SchematicContext, Tree } from '@angular-devkit/schematics';
-import { WorkspaceSchema, WorkspaceProject, ProjectType } from '@schematics/angular/utility/workspace-models';
+import { WorkspaceSchema, WorkspaceProject } from '@schematics/angular/utility/workspace-models';
 import { execSync } from 'child_process';
 import {
     Attribute,
@@ -19,15 +19,12 @@ import { replaceMatch } from './tsUtils';
 
 const configPaths = ['/.angular.json', '/angular.json'];
 
-export const getProjectPaths = (config: WorkspaceSchema, appendPrefix = true): string[] => {
+export const getProjectPaths = (config: WorkspaceSchema): string[] => {
     const sourceDirs = [];
 
     const projects = getProjects(config);
     for (const proj of projects) {
-        let sourcePath = path.join('/', proj.sourceRoot);
-        if (appendPrefix && (proj.prefix)) {
-            sourcePath = path.join(sourcePath, proj.prefix);
-        }
+        const sourcePath = path.join('/', proj.sourceRoot);
         sourceDirs.push(normalize(sourcePath));
     }
     return sourceDirs;
@@ -43,16 +40,16 @@ export const getWorkspace = (host: Tree): WorkspaceSchema => {
     return null;
 };
 
-export const getProjects = (config: WorkspaceSchema): WorkspaceProject<ProjectType.Application>[] => {
-    const projects: WorkspaceProject<ProjectType.Application>[] = [];
+export const getProjects = (config: WorkspaceSchema): WorkspaceProject[] => {
+    const projects: WorkspaceProject[] = [];
 
     for (const projName of Object.keys(config.projects)) {
         const proj = config.projects[projName];
-        if ((proj.projectType && proj.projectType !== ProjectType.Application) ||
-            (proj.architect && proj.architect.e2e && !proj.architect.build)) {
+        if ((proj.architect && proj.architect.e2e && !proj.architect.build)) {
+            // skip old style e2e-only projects
             continue;
         }
-        projects.push(proj as WorkspaceProject<ProjectType.Application>);
+        projects.push(proj);
     }
     return projects;
 };