Merge remote-tracking branch 'origin/vNext' into sstoychev/remove-always-auth

Author: ChronosSF

.browserslistrc

@@ -9,4 +9,5 @@ Firefox ESR
 not > 0.5%
 not last 2 versions
 not dead
-not IE 9-11
+not IE 9-11
+Safari >=15

angular.json

@@ -91,7 +91,12 @@
             "assets": [
               "src/assets",
               "src/favicon.ico"
-            ]
+            ],
+            "stylePreprocessorOptions": {
+              "includePaths": [
+                "node_modules"
+              ]
+            }
           }
         },
         "lint": {
@@ -209,7 +214,12 @@
             "styles": [
               "projects/app-lob/src/styles.scss"
             ],
-            "scripts": []
+            "scripts": [],
+            "stylePreprocessorOptions": {
+              "includePaths": [
+                "node_modules"
+              ]
+            }
           }
         },
         "lint": {
@@ -339,7 +349,12 @@
             "styles": [
               "projects/app-crm/src/styles.scss"
             ],
-            "scripts": []
+            "scripts": [],
+            "stylePreprocessorOptions": {
+              "includePaths": [
+                "node_modules"
+              ]
+            }
           }
         },
         "lint": {

azure-pipelines.yml

@@ -6,7 +6,7 @@ steps:
 - script: npm config set @infragistics:registry $(npmRegistry)
   displayName: 'Npm add registry'
 
-# - script: npm config set $(igScope)
+# - script: npm config set $(igScope):always-auth=true
 #   displayName: 'Npm config'
 
 - script: npm config set $(igScope):_auth=$(token)

live-editing/Routes.ts

@@ -3,8 +3,7 @@ import * as GridFinjsRouting from '../projects/app-lob/src/app/grid-finjs/grid-f
 import { GridFinjsModule } from '../projects/app-lob/src/app/grid-finjs/grid-finjs.module';
 import * as TreeGridFinjsRouting from '../projects/app-lob/src/app/treegrid-finjs/treegrid-finjs-routing.module';
 import { TreeGridFinjsModule } from '../projects/app-lob/src/app/treegrid-finjs/treegrid-finjs.module';
-
-import * as GridCRMRouting from '../projects/app-crm/src/app/grid-crm/grid-crm-routing.module';
+import * as GridCRMRouting from '../projects/app-crm/src/app/app-routing.module';
 
 import * as GridsDVRouting from '../projects/app-lob/src/app/grid/grids-routing.module';
 import { GridsDVModule } from '../projects/app-lob/src/app/grid/grids.module';
@@ -48,9 +47,7 @@ import { PaginationModule } from '../src/app/pagination/pagination.module';
 import * as PaginatorRouting from '../src/app/pagination/pagination-routing.module';
 import { PivotGridsModule } from '../src/app/pivot-grid/pivot-grids.module';
 import { PivotGridsRoutingModule } from '../src/app/pivot-grid/pivot-grids-routing.module';
-import { GridCRMComponent } from '../projects/app-crm/src/app/grid-crm/grid-crm.component';
 import { AppModule } from '../projects/app-crm/src/app/app.module';
-import { GridsCrmModule } from '../projects/app-crm/src/app/grid-crm/grid-crm.module';
 
 export const MODULE_ROUTES = [
     {
@@ -165,7 +162,7 @@ export const DV_MODULE_ROUTES = [
 
 export const CRM_MODULE_ROUTES = [
     {
-        module: GridsCrmModule,
+        module: AppModule,
         path: 'grid-crm',
         routes: GridCRMRouting.gridCrmRoutes
     }

live-editing/configs/CardConfigGenerator.ts

@@ -5,6 +5,7 @@ IgxChipsModule,
 IgxDividerModule,
 IgxExpansionPanelModule,
 IgxIconModule,
+IgxLayoutModule,
 IgxListModule,
 IgxRippleModule,
 IgxSliderModule} from 'igniteui-angular';
@@ -74,14 +75,16 @@ export class CardConfigGenerator implements IConfigGenerator {
                     'IgxIconModule',
                     'IgxCardModule',
                     'IgxDividerModule',
+                    'IgxLayoutModule',
                     'CardSample2Component'
                 ],
                 ngDeclarations: ['CardSample2Component'],
                 ngImports: [
                     'IgxButtonModule',
                     'IgxIconModule',
                     'IgxCardModule',
-                    'IgxDividerModule'
+                    'IgxDividerModule',
+                    'IgxLayoutModule',
                 ]
             }),
             additionalFiles: [

live-editing/configs/GridConfigGenerator.ts

@@ -1421,6 +1421,17 @@ export class GridConfigGenerator implements IConfigGenerator {
             })
         }));
 
+        configs.push(new Config({
+            component: 'GridStatePersistenceSampleComponent',
+            additionalFiles: ['/src/app/directives/prevent-scroll.directive.ts', '/src/app/data/financialData.ts', '/src/app/services/financial.service.ts'],
+            appModuleConfig: new AppModuleConfig({
+                imports: ['GridStatePersistenceSampleComponent', 'IgxAvatarModule', 'IgxGridModule', 'IgxSwitchModule',
+                    'IgxExcelExporterService', 'IgxCsvExporterService', 'IgxPreventDocumentScrollModule', 'FinancialDataService'],
+                ngDeclarations: ['GridStatePersistenceSampleComponent'],
+                ngImports: ['IgxPreventDocumentScrollModule', 'IgxAvatarModule', 'IgxGridModule', 'IgxSwitchModule'],
+                ngProviders: ['FinancialDataService']
+            })
+        }));
 
         return configs;
     }

live-editing/configs/TreeGridConfigGenerator.ts

@@ -654,7 +654,9 @@ export class TreeGridConfigGenerator implements IConfigGenerator {
             additionalFiles: [
                 '/src/app/directives/prevent-scroll.directive.ts',
                 '/src/app/tree-grid/tree-grid-group-by-load-on-demand-sample/remoteService.ts',
-                '/src/app/data/invoiceData.ts'
+                '/src/app/data/invoiceData.ts',
+                '/src/_variables.scss',
+                '/src/_app-layout.scss'
             ],
             appModuleConfig: new AppModuleConfig({
                 imports: ['IgxPreventDocumentScrollModule', 'IgxTreeGridModule', 'TreeGridGroupByLoadOnDemandComponent'],