Merge branch 'vNext' into sivanova/snackbar-refactoring

Author: zdrawku

projects/app-crm/.browserslistrc renamed to .browserslistrc

@@ -16,8 +16,7 @@
         "createDefaultProgram": true
       },
       "extends": [
-        "plugin:@angular-eslint/ng-cli-compat",
-        "plugin:@angular-eslint/ng-cli-compat--formatting-add-on",
+        "plugin:@angular-eslint/recommended",
         "plugin:@angular-eslint/template/process-inline-templates"
       ],
       "rules": {
@@ -40,7 +39,6 @@
         "comma-dangle": "error",
         "no-underscore-dangle": "off",
         "id-blacklist": "error",
-        "import/no-extraneous-dependencies": "error",
         "import/no-internal-modules": "off",
         "no-bitwise": "off",
         "no-duplicate-case": "error",

.eslintrc.json

@@ -32,6 +32,7 @@
 !.vscode/extensions.json
 
 # misc
+/.angular/cache
 /.sass-cache
 /connect.lock
 /coverage

.gitignore

@@ -39,7 +39,7 @@ npm run build:app-lob
 ## Dev Server
 
 ### Default App
-To start the application dev server (including IE support) run:
+To start the application dev server run:
 
 ```
 npm run start
@@ -53,7 +53,7 @@ npm run start:es6
 
 ### Line of Business App
 
-To start the application dev server (including IE support) run:
+To start the application dev server run:
 ```
 npm run start:app-lob
 ```
@@ -64,7 +64,7 @@ npm run start:app-lob
 
 ### Default App
 
-To generate the live editing applications along with the dev server (including IE support) run:
+To generate the live editing applications along with the dev server run:
 ```
 npm run start:live-editing
 ```
@@ -76,14 +76,14 @@ npm run start:live-editing:es6
 ```
 
 
-To generate live editing applications, using only **Sass** for styling (excluding IE and Edge support) run:
+To generate live editing applications, using only **Sass** for styling run:
 ```
 npm run start:live-editing:noCss
 ```
 
 ### Line of Business App
 
-To generate the live editing applications along with the dev server (including IE support) run:
+To generate the live editing applications along with the dev server run:
 ```
 npm run start:app-lob:live-editing
 ```
@@ -100,7 +100,7 @@ Live-editing [documentation could be found here](https://github.com/IgniteUI/ign
 
 One of the most important functionality is the Configurator Generator as each Ignite UI for Angular component has a separate configurations (config) generator - [read the following section if you are interested in the actual structure and how to configure it](https://github.com/IgniteUI/igniteui-live-editing#configuration-generator).
 ### Live-Editing Watcher
-Use this command to start the server with capability to regenerate [live editing](https://github.com/IgniteUI/igniteui-angular-samples/blob/master/live-editing/README.md) JSON files (e.g. `"/src/assets/samples/avatar-sample-3.json"`) when a change related to the samples is made (including IE support):
+Use this command to start the server with capability to regenerate [live editing](https://github.com/IgniteUI/igniteui-angular-samples/blob/master/live-editing/README.md) JSON files (e.g. `"/src/assets/samples/avatar-sample-3.json"`) when a change related to the samples is made:
 
 ```
 npm run start:watch-live-editing

README.md

@@ -54,36 +54,6 @@
                                     "with": "src/environments/environment.prod.ts"
                                 }
                             ]
-                        },
-                        "es5": {
-                            "budgets": [
-                                {
-                                    "type": "anyComponentStyle",
-                                    "maximumWarning": "900kb"
-                                }
-                            ],
-                            "tsConfig": "src/tsconfig-es5.app.json"
-                        },
-                        "es5Prod": {
-                            "budgets": [
-                                {
-                                    "type": "anyComponentStyle",
-                                    "maximumWarning": "900kb"
-                                }
-                            ],
-                            "optimization": true,
-                            "outputHashing": "all",
-                            "namedChunks": false,
-                            "extractLicenses": true,
-                            "vendorChunk": false,
-                            "buildOptimizer": true,
-                            "fileReplacements": [
-                                {
-                                    "replace": "src/environments/environment.ts",
-                                    "with": "src/environments/environment.prod.ts"
-                                }
-                            ],
-                            "tsConfig": "src/tsconfig-es5.app.json"
                         }
                     }
                 },
@@ -95,12 +65,6 @@
                     "configurations": {
                         "production": {
                             "browserTarget": "my-app:build:production"
-                        },
-                        "es5": {
-                            "browserTarget": "my-app:build:es5"
-                        },
-                        "es5Prod": {
-                            "browserTarget": "my-app:build:es5Prod"
                         }
                     }
                 },
@@ -205,15 +169,6 @@
                                     "maximumError": "900kb"
                                 }
                             ]
-                        },
-                        "es5": {
-                            "budgets": [
-                                {
-                                    "type": "anyComponentStyle",
-                                    "maximumWarning": "900kb"
-                                }
-                            ],
-                            "tsConfig": "projects/app-lob/tsconfig-es5.app.json"
                         }
                     }
                 },
@@ -225,9 +180,6 @@
                     "configurations": {
                         "production": {
                             "browserTarget": "app-lob:build:production"
-                        },
-                        "es5": {
-                            "browserTarget": "app-lob:build:es5"
                         }
                     }
                 },
@@ -344,15 +296,6 @@
                                     "maximumError": "900kb"
                                 }
                             ]
-                        },
-                        "es5": {
-                            "budgets": [
-                                {
-                                    "type": "anyComponentStyle",
-                                    "maximumWarning": "900kb"
-                                }
-                            ],
-                            "tsConfig": "projects/app-crm/tsconfig-es5.app.json"
                         }
                     }
                 },
@@ -364,9 +307,6 @@
                     "configurations": {
                         "production": {
                             "browserTarget": "app-crm:build:production"
-                        },
-                        "es5": {
-                            "browserTarget": "app-crm:build:es5"
                         }
                     }
                 },

angular.json

@@ -4,7 +4,7 @@
     "outDir": "../out-tsc/e2e",
     "baseUrl": "./",
     "module": "commonjs",
-    "target": "es5",
+    "target": "es6",
     "types": [
       "jasmine",
       "jasminewd2",

e2e/tsconfig.json

@@ -1,18 +1,22 @@
 /* eslint-disable @typescript-eslint/naming-convention */
-import {HttpClientModule} from '@angular/common/http';
-import {IgxButtonModule,
-IgxCardModule,
-IgxComboModule,
-IgxSelectModule,
-IgxSwitchModule,
-IgxToastModule,
-IgxIconModule,
-IgxPrefixModule} from 'igniteui-angular';
-import {AppModuleConfig, Config, IConfigGenerator} from 'igniteui-live-editing';
+import { HttpClientModule } from '@angular/common/http';
+import {
+    IgxButtonModule,
+    IgxButtonGroupModule,
+    IgxCardModule,
+    IgxComboModule,
+    IgxSelectModule,
+    IgxSwitchModule,
+    IgxToastModule,
+    IgxIconModule,
+    IgxPrefixModule
+} from 'igniteui-angular';
+import { IgxFinancialChartModule } from 'igniteui-angular-charts';
+import { AppModuleConfig, Config, IConfigGenerator } from 'igniteui-live-editing';
 export class ComboConfigGenerator implements IConfigGenerator {
     public additionalImports = {
         RemoteNWindService: '../../src/app/services/remoteNwind.service'
-};
+    };
     public generateConfigs(): Config[] {
         const configs = new Array<Config>();
 
@@ -37,17 +41,6 @@ export class ComboConfigGenerator implements IConfigGenerator {
             component: 'ComboStylingComponent'
         }));
 
-        configs.push(new Config({
-            additionalFiles: ['/src/app/lists/combo/cascading-combos/local-data.ts'],
-            appModuleConfig: new AppModuleConfig({
-                imports: ['IgxComboModule', 'IgxSelectModule', 'CascadingCombosComponent'],
-                ngDeclarations: ['CascadingCombosComponent'],
-                ngImports: ['IgxComboModule', 'IgxSelectModule']
-            }),
-            component: 'CascadingCombosComponent',
-            shortenComponentPathBy: '/lists/combo/'
-        }));
-
         configs.push(new Config({
             additionalFiles: ['/src/app/lists/combo/combo-main/local-data.ts'],
             appModuleConfig: new AppModuleConfig({
@@ -91,17 +84,6 @@ export class ComboConfigGenerator implements IConfigGenerator {
             component: 'ComboOverlayComponent'
         }));
 
-        configs.push(new Config({
-            additionalFiles: ['/src/app/lists/combo/combo-single-selection/local-data.ts'],
-            appModuleConfig: new AppModuleConfig({
-                imports: ['IgxComboModule', 'ComboSingleSelectionComponent'],
-                ngDeclarations: ['ComboSingleSelectionComponent'],
-                ngImports: ['IgxComboModule']
-            }),
-            component: 'ComboSingleSelectionComponent',
-            shortenComponentPathBy: '/lists/combo/'
-        }));
-
         configs.push(new Config({
             additionalFiles: ['/src/app/lists/combo/combo-binding/cities.ts'],
             appModuleConfig: new AppModuleConfig({
@@ -124,6 +106,50 @@ export class ComboConfigGenerator implements IConfigGenerator {
             shortenComponentPathBy: '/lists/combo/'
         }));
 
+        configs.push(new Config({
+            additionalFiles: ['/src/app/data/stocks-data.ts'],
+            appModuleConfig: new AppModuleConfig({
+                imports: ['IgxButtonGroupModule', 'IgxComboModule', 'IgxFinancialChartModule', 'SimpleComboMainComponent'],
+                ngDeclarations: ['SimpleComboMainComponent'],
+                ngImports: ['IgxButtonGroupModule', 'IgxComboModule', 'IgxFinancialChartModule']
+            }),
+            component: 'SimpleComboMainComponent',
+            shortenComponentPathBy: '/lists/combo/'
+        }));
+
+        configs.push(new Config({
+            additionalFiles: ['/src/app/data/cities15000-regions-countries.ts'],
+            appModuleConfig: new AppModuleConfig({
+                imports: ['IgxComboModule', 'SimpleComboUsageComponent'],
+                ngDeclarations: ['SimpleComboUsageComponent'],
+                ngImports: ['IgxComboModule']
+            }),
+            component: 'SimpleComboUsageComponent',
+            shortenComponentPathBy: '/lists/combo/'
+        }));
+
+        configs.push(new Config({
+            additionalFiles: ['/src/app/data/cities15000-regions-countries.ts'],
+            appModuleConfig: new AppModuleConfig({
+                imports: ['IgxComboModule', 'SimpleComboCascadingComponent'],
+                ngDeclarations: ['SimpleComboCascadingComponent'],
+                ngImports: ['IgxComboModule']
+            }),
+            component: 'SimpleComboCascadingComponent',
+            shortenComponentPathBy: '/lists/combo/'
+        }));
+
+        configs.push(new Config({
+            additionalFiles: ['/src/app/data/cities15000-regions-countries.ts'],
+            appModuleConfig: new AppModuleConfig({
+                imports: ['IgxComboModule', 'SimpleComboStylingComponent'],
+                ngDeclarations: ['SimpleComboStylingComponent'],
+                ngImports: ['IgxComboModule']
+            }),
+            component: 'SimpleComboStylingComponent',
+            shortenComponentPathBy: '/lists/combo/'
+        }));
+
         return configs;
     }
 }

live-editing/configs/ComboConfigGenerator.ts

@@ -588,7 +588,7 @@ export class GridConfigGenerator implements IConfigGenerator {
         // Grid with Action Strip
         configs.push(new Config({
             component: 'GridActionStripSampleComponent',
-            additionalFiles: ['/src/app/directives/prevent-scroll.directive.ts', '/src/app/data/nwindData.ts', '/src/app/data/utils.ts'],
+            additionalFiles: ['/src/app/directives/prevent-scroll.directive.ts', '/src/app/data/nwindData.ts'],
             appModuleConfig: new AppModuleConfig({
                 imports: ['GridActionStripSampleComponent', 'IgxGridModule', 'IgxDialogModule', 'IgxButtonModule',
                     'IgxFocusModule', 'IgxPreventDocumentScrollModule', 'IgxActionStripModule'],

live-editing/configs/GridConfigGenerator.ts

@@ -860,6 +860,16 @@ export class HierarchicalGridConfigGenerator implements IConfigGenerator {
             })
         }));
 
+        configs.push(new Config({
+            component: 'HGridActionStripSampleComponent',
+            additionalFiles: ['/src/app/directives/prevent-scroll.directive.ts', '/src/app/data/nwindData.ts', '/src/app/data/utils.ts'],
+            appModuleConfig: new AppModuleConfig({
+                imports: ['HGridActionStripSampleComponent', 'IgxHierarchicalGridModule', 'IgxDialogModule', 'IgxButtonModule', 'IgxPreventDocumentScrollModule', 'IgxActionStripModule'],
+                ngDeclarations: ['HGridActionStripSampleComponent'],
+                ngImports: ['IgxPreventDocumentScrollModule', 'IgxHierarchicalGridModule', 'IgxDialogModule', 'IgxButtonModule', 'IgxActionStripModule']
+            })
+        }));
+
         return configs;
     }
 }

live-editing/configs/HierarchicalGridConfigGenerator.ts

@@ -1095,6 +1095,16 @@ export class TreeGridConfigGenerator implements IConfigGenerator {
             shortenComponentPathBy: '/tree-grid/'
         }));
 
+        configs.push(new Config({
+            component: 'TreeGridActionStripSampleComponent',
+            additionalFiles: ['/src/app/directives/prevent-scroll.directive.ts', '/src/app/tree-grid/data/employees-flat-detailed.ts', '/src/app/data/utils.ts'],
+            appModuleConfig: new AppModuleConfig({
+                imports: ['TreeGridActionStripSampleComponent', 'IgxTreeGridModule', 'IgxDialogModule', 'IgxButtonModule', 'IgxPreventDocumentScrollModule', 'IgxActionStripModule'],
+                ngDeclarations: ['TreeGridActionStripSampleComponent'],
+                ngImports: ['IgxPreventDocumentScrollModule', 'IgxTreeGridModule', 'IgxDialogModule', 'IgxButtonModule', 'IgxActionStripModule']
+            })
+        }));
+
         return configs;
     }
 }