Merge branch 'master' into mpopov/outline-button-focus

Author: simeonoff

CHANGELOG.md

@@ -50,6 +50,8 @@ All notable changes for each version of this project will be documented in this
     - Added `groupSortingDirection` input, which allows you to set groups sorting order.
 - `IgxGrid`, `IgxTreeGrid`, `IgxHierarchicalGrid`
     - Added new directives for re-templating header sorting indicators - `IgxSortHeaderIconDirective`, `IgxSortAscendingHeaderIconDirective` and `IgxSortDescendingHeaderIconDirective`.
+- `IgxGrid`
+    - Exposed a `groupStrategy` input that functions similarly to `sortStrategy`, allowing customization of the grouping behavior of the grid. Please, refer to the [Group By ](https://www.infragistics.com/products/ignite-ui-angular/angular/components/grid/groupby) topic for more information.
 - `IgxDialog`
     - Added `focusTrap` input to set whether the Tab key focus is trapped within the dialog when opened. Defaults to `true`.
 
@@ -101,8 +103,6 @@ All notable changes for each version of this project will be documented in this
         ```
     - `IgxColumnActionsComponent`
         - **Breaking Change** -  Input `columns` has been removed. Use `igxGrid` `columns` input instead.
-    - `igxGrid`
-    - Exposed a `groupStrategy` input that functions similarly to `sortStrategy`, allowing customization of the grouping behavior of the grid. Please, refer to the [Group By ](https://www.infragistics.com/products/ignite-ui-angular/angular/components/grid/groupby) topic for more information.
 - `IgxCarousel`
     - **Breaking Changes** - The carousel animation type `CarouselAnimationType` is renamed to `HorizontalAnimationType`.
 

package-lock.json

@@ -112,15 +112,11 @@
     "igniteui-sassdoc-theme": "^1.1.4",
     "jasmine": "~3.6.0",
     "jasmine-core": "~3.6.0",
-    "jasmine-spec-reporter": "~5.0.2",
     "karma": "^6.3.7",
     "karma-chrome-launcher": "~3.1.0",
     "karma-coverage": "^2.0.3",
     "karma-jasmine": "~3.3.0",
-    "karma-jasmine-html-reporter": "~1.5.4",
     "karma-jasmine-spec-tags": "~1.3.0",
-    "karma-junit-reporter": "~2.0.1",
-    "karma-spec-reporter": "~0.0.32",
     "lunr": "^2.3.8",
     "ng-packagr": "^13.0.0",
     "pngcrush": "^2.0.1",

package.json

@@ -17,8 +17,6 @@ module.exports = function (config) {
         require('karma-coverage'),
         require('karma-chrome-launcher'),
         require('karma-jasmine-spec-tags'),
-        require('karma-jasmine-html-reporter'),
-        require('karma-spec-reporter'),
         require('@angular-devkit/build-angular/plugins/karma')
     ],
     parallelOptions: {
@@ -41,20 +39,10 @@ module.exports = function (config) {
       subdir: '.',
       reporters: [
         // reporters not supporting the `file` property
-        { type: 'html' },
-        { type: 'json' },
-        { type: 'lcovonly' },
+        { type: 'lcov' },
       ]
     },
     reporters: ['progress', 'coverage'],
-    specReporter: {
-        suppressSkipped: true,
-        suppressErrorSummary: false,
-        suppressFailed: false,
-        suppressPassed: false,
-        showSpecTiming: false,
-        failFast: false
-    },
     port: 9876,
     colors: true,
     logLevel: config.LOG_INFO,

projects/igniteui-angular/karma.conf.js

@@ -42,8 +42,8 @@ export class UpdateChanges {
             // and no actual angular metadata will be resolved for the rest of the migration
             const wsProject = this.workspace.projects[this.workspace.defaultProject] || this.workspace.projects[0];
             const mainRelPath = wsProject.architect?.build?.options['main'] ?
-            path.join(wsProject.root, wsProject.architect?.build?.options['main']) :
-            `src/main.ts`;
+                path.join(wsProject.root, wsProject.architect?.build?.options['main']) :
+                `src/main.ts`;
             // patch TSConfig so it includes angularOptions.strictTemplates
             // ivy ls requires this in order to function properly on templates
             this.patchTsConfig();
@@ -491,9 +491,8 @@ export class UpdateChanges {
         // use the absolute path for ALL LS operations
         // do not overwrite the entryPath, as Tree operations require relative paths
         const changes = new Set<{ change; position }>();
-        let langServ;
+        let langServ: tss.LanguageService;
         for (const change of memberChanges.changes) {
-
             if (!content.includes(change.member)) {
                 continue;
             }
@@ -532,7 +531,7 @@ export class UpdateChanges {
                 originalContent = this.serverHost.readFile(this.tsconfigPath);
             } catch {
                 this.context?.logger
-                .warn(`Could not read ${this.tsconfigPath}. Some Angular Ivy features might be unavailable during migrations.`);
+                    .warn(`Could not read ${this.tsconfigPath}. Some Angular Ivy features might be unavailable during migrations.`);
                 return;
             }
             let content;
@@ -542,17 +541,17 @@ export class UpdateChanges {
                 content = result.config;
             } else {
                 this.context?.logger
-                .warn(`Could not parse ${this.tsconfigPath}. Angular Ivy language service might be unavailable during migrations.`);
+                    .warn(`Could not parse ${this.tsconfigPath}. Angular Ivy language service might be unavailable during migrations.`);
                 this.context?.logger
-                .warn(`Error:\n${result.error}`);
+                    .warn(`Error:\n${result.error}`);
                 return;
             }
             if (!content.angularCompilerOptions) {
                 content.angularCompilerOptions = {};
             }
             if (!content.angularCompilerOptions.strictTemplates) {
                 this.context?.logger
-                .info(`Adding 'angularCompilerOptions.strictTemplates' to ${this.tsconfigPath} for migration run.`);
+                    .info(`Adding 'angularCompilerOptions.strictTemplates' to ${this.tsconfigPath} for migration run.`);
                 content.angularCompilerOptions.strictTemplates = true;
                 this.host.overwrite(this.tsconfigPath, JSON.stringify(content));
                 // store initial state and restore it once migrations are finished