Merge pull request #3233 from IgniteUI/vNext

Mass Merge vNext to master

Author: hanastasov

.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

.github/workflows/build-app-crm.yml

@@ -43,7 +43,7 @@ jobs:
             cache: 'npm'
 
       - name: Install dependencies
-        run: npm ci --force
+        run: npm ci
 
       - name: Run lint
         run: npm run lint

.github/workflows/build-app-lob.yml

@@ -48,7 +48,7 @@ jobs:
             cache: 'npm'
 
       - name: Install dependencies
-        run: npm ci --force
+        run: npm ci
 
       - name: Run lint
         run: npm run lint

.gitignore

@@ -11,6 +11,7 @@
 # samples assets
 /src/assets/samples
 /projects/app-lob/src/assets/samples
+/projects/app-crm/src/assets/samples
 
 # IDEs and editors
 /.idea

.vscode/launch.json

@@ -27,6 +27,19 @@
             ],
             "console": "internalConsole",
         },
+        {
+            "name": "Launch App CRM Live-editing",
+            "type": "node",
+            "request": "launch",
+            "program": "${workspaceRoot}/node_modules/gulp/bin/gulp.js",
+            "stopOnEntry": false,
+            "args": ["generate-live-editing", "--appCrm=true"],
+            "cwd": "${workspaceRoot}",
+            "runtimeArgs": [
+                "--nolazy"
+            ],
+            "console": "internalConsole",
+        },
         {
             "name": "Launch Repositoryfy",
             "type": "node",

angular.json

@@ -29,7 +29,7 @@
             "buildOptimizer": false,
             "optimization": false,
             "namedChunks": true,
-            "sourceMap": false,
+            "sourceMap": true,
             "progress": true,
             "stylePreprocessorOptions": {
                 "includePaths": ["node_modules"]
@@ -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

@@ -12,7 +12,7 @@ steps:
 - script: npm config set $(igScope):_auth=$(token)
   displayName: 'Npm config auth'
 
-- script: npm ci --force
+- script: npm ci
   displayName: 'Install dependencies'
   env:
     AZURE_PIPELINES: "true"

gulpfile.js

@@ -19,25 +19,36 @@ const submodule = "igniteui-live-editing-samples";
 gulp.task("generate-live-editing", async () => {
     var appDv = argv.appDv !== undefined && argv.appDv.toLowerCase().trim() === "true";
     const liveEditingOptions = appDv ?
-    {
-        platform: 'angular',
-        projectDir: "./projects/app-lob",
-        samplesDir: "./projects/app-lob/src/assets",
-        configGeneratorPath: "./live-editing/generators/AppDVConfigGenerators.ts",
-        module: {
-            moduleName: "DV_MODULE_ROUTES", routerPath: './live-editing/Routes.ts',
+        {
+            platform: 'angular',
+            projectDir: "./projects/app-lob",
+            samplesDir: "./projects/app-lob/src/assets",
+            configGeneratorPath: "./live-editing/generators/AppDVConfigGenerators.ts",
+            module: {
+                moduleName: "DV_MODULE_ROUTES", routerPath: './live-editing/Routes.ts',
+            }
         }
-    }
         :
-    {
-        platform: 'angular',
-        samplesDir: "./src/assets",
-        configGeneratorPath: "./live-editing/generators/ConfigGenerators.ts",
-        module: {
-            moduleName: "MODULE_ROUTES", routerPath: './live-editing/Routes.ts',
-        },
-        additionalSharedStyles: ["_variables.scss", "_app-layout.scss"]
-    }
+        (argv.appCrm  ?
+            {
+                platform: 'angular',
+                projectDir: "./projects/app-crm",
+                samplesDir: "./projects/app-crm/src/assets",
+                configGeneratorPath: "./live-editing/generators/AppCRMConfigGenerators.ts",
+                module: {
+                    moduleName: "CRM_MODULE_ROUTES", routerPath: './live-editing/Routes.ts',
+                }
+            }
+            :
+            {
+                platform: 'angular',
+                samplesDir: "./src/assets",
+                configGeneratorPath: "./live-editing/generators/ConfigGenerators.ts",
+                module: {
+                    moduleName: "MODULE_ROUTES", routerPath: './live-editing/Routes.ts',
+                },
+                additionalSharedStyles: ["_variables.scss", "_app-layout.scss"]
+            })
     await generateLiveEditing(liveEditingOptions);
 });
 
@@ -128,96 +139,101 @@ const getSampleNameFromFileName = (fileName, sampleBaseDir) => fileName.replace(
 var assetsRegex = new RegExp(/([\.]{0,2}\/)*assets\//g);
 
 const processApp = (projectPath, dest, directoriesToExclude) => {
-    if(!fs.existsSync(submodule)) {
+    if (!fs.existsSync(submodule)) {
         return console.error("No submodule found");
     }
     const directories = [];
     const appExcludedDirectories = excludedDirectories.concat(directoriesToExclude);
     const appDir = fs.readdirSync(projectPath + "/app", "utf-8");
-    appDir.filter(dir => appExcludedDirectories.indexOf(dir) === -1 )
-          .forEach(child => {
-            if(fs.lstatSync(`${projectPath + "/app"}/${child}`).isDirectory()) {
+    appDir.filter(dir => appExcludedDirectories.indexOf(dir) === -1)
+        .forEach(child => {
+            if (fs.lstatSync(`${projectPath + "/app"}/${child}`).isDirectory()) {
                 directories.push(child);
             }
-    });
+        });
+        
     const jsonSamplesPath = path.join(__dirname, `${projectPath}/assets/samples`);
     const sharedJson = JSON.parse(fs.readFileSync(path.join(jsonSamplesPath, "/shared.json")));
     const submoduleAppDest = submodule + `/${dest}/`;
-    if(!fs.existsSync(submoduleAppDest)) {
+    if (!fs.existsSync(submoduleAppDest)) {
         fs.mkdirSync(submoduleAppDest);
     }
 
     let i = 0;
-    return gulp.src([`${jsonSamplesPath}/*.json`,`!${jsonSamplesPath}/shared.json`, `!${jsonSamplesPath}/meta.json`])
-               .pipe(es.map((file, cb) => {
-                    fs.readFile(file.path, 'utf-8', (err, content) => {
-                        // Adjust sample application bundle files
-                        const jsonObj = JSON.parse(content);
-                        const additionals = [];
-                        const packageJson =
-                        {
-                            "path": "package.json",
-                            "hasRelativeAssetsUrls": false,
-                            "content": JSON.stringify({
-                                    "dependencies": JSON.parse(jsonObj.sampleDependencies),
-                                    "devDependencies": sharedJson.devDependencies }, null, 2)
-                        }
-                        additionals.push(packageJson);
-
-                        if(jsonObj.addTsConfig) {
-                            additionals.push(sharedJson.tsConfig);
-                        }
-
-                        jsonObj.sampleFiles = jsonObj.sampleFiles.concat(sharedJson.files).concat(additionals);
-
-                        // Configure sample application file structure
-                        const fileName = file.path.substring(file.base.length + 1).replace(".json", "");
-                        let sampleBaseDir = fileName.indexOf("--") !== -1 ? fileName.substring(0, fileName.indexOf("--")) : "";
-                        if(sampleBaseDir && !fs.existsSync(submoduleAppDest + sampleBaseDir)) {
-                            fs.mkdirSync(submoduleAppDest + sampleBaseDir);
-                        }
-                        const sampleName = sampleBaseDir ? getSampleNameFromFileName(fileName, sampleBaseDir) : fileName;
-                        const sampleAppPath = submoduleAppDest + sampleBaseDir + "/" + sampleName;
-                        if(!fs.existsSync(sampleAppPath)) {
-                            fs.mkdirSync(sampleAppPath);
-                        }
-
-                        // Distribute Sample Files
-                        jsonObj.sampleFiles.forEach(sampleFile => {
-                            let sampleContent;
-                            const isProduction = argv.prod !== undefined && argv.prod.toLowerCase().trim() === "true";
-                            const assetsUrl = `https://${isProduction ? "www." : "staging."}infragistics.com/${dest}/assets/`;
-                            if(sampleFile.hasRelativeAssetsUrls) {
-                                sampleContent = sampleFile.content.replace(assetsRegex, assetsUrl);
-                            } else {
-                                sampleContent = sampleFile.content;
+    return gulp.src([`${jsonSamplesPath}/*.json`, `!${jsonSamplesPath}/shared.json`, `!${jsonSamplesPath}/meta.json`])
+        .pipe(es.map((file, cb) => {
+            fs.readFile(file.path, 'utf-8', (err, content) => {
+                // Adjust sample application bundle files
+                const jsonObj = JSON.parse(content);
+                const additionals = [];
+                const packageJson =
+                {
+                    "path": "package.json",
+                    "hasRelativeAssetsUrls": false,
+                    "content": JSON.stringify({
+                        "dependencies": JSON.parse(jsonObj.sampleDependencies),
+                        "devDependencies": sharedJson.devDependencies
+                    }, null, 2)
+                }
+                additionals.push(packageJson);
+
+                if (jsonObj.addTsConfig) {
+                    additionals.push(sharedJson.tsConfig);
+                }
+
+                jsonObj.sampleFiles = jsonObj.sampleFiles.concat(sharedJson.files).concat(additionals);
+
+                // Configure sample application file structure
+                const fileName = file.path.substring(file.base.length + 1).replace(".json", "");
+                let sampleBaseDir = fileName.indexOf("--") !== -1 ? fileName.substring(0, fileName.indexOf("--")) : "";
+                if (sampleBaseDir && !fs.existsSync(submoduleAppDest + sampleBaseDir)) {
+                    fs.mkdirSync(submoduleAppDest + sampleBaseDir);
+                }
+                const sampleName = sampleBaseDir ? getSampleNameFromFileName(fileName, sampleBaseDir) : fileName;
+                const sampleAppPath = submoduleAppDest + sampleBaseDir + "/" + sampleName;
+
+                if (!fs.existsSync(sampleAppPath)) {
+                    fs.mkdirSync(sampleAppPath);
+                }
+
+                // Distribute Sample Files
+                jsonObj.sampleFiles.forEach(sampleFile => {
+                    let sampleContent;
+                    const isProduction = argv.prod !== undefined && argv.prod.toLowerCase().trim() === "true";
+                    const assetsUrl = `https://${isProduction ? "www." : "staging."}infragistics.com/${dest}/assets/`;
+                    if (sampleFile.hasRelativeAssetsUrls) {
+                        sampleContent = sampleFile.content.replace(assetsRegex, assetsUrl);
+                    } else {
+                        sampleContent = sampleFile.content;
+                    }
+                    const paths = sampleFile.path.replace("./", "").split("/");
+                    let tempPath = "";
+                    paths.forEach(p => {
+                        tempPath += p + "/";
+                        if (p.indexOf(".") !== -1) {
+                            fs.writeFileSync(sampleAppPath + "/" + tempPath, sampleContent);
+                        } else
+                            if (!fs.existsSync(sampleAppPath + "/" + tempPath)) {
+                                fs.mkdirSync(sampleAppPath + "/" + tempPath)
                             }
-                            const paths = sampleFile.path.replace("./", "").split("/");
-                            let tempPath = "";
-                            paths.forEach(p => {
-                                tempPath += p + "/";
-                                if(p.indexOf(".") !== -1) {
-                                    fs.writeFileSync(sampleAppPath + "/" + tempPath, sampleContent);
-                                } else
-                                if(!fs.existsSync(sampleAppPath + "/" + tempPath)) {
-                                    fs.mkdirSync(sampleAppPath + "/" + tempPath)
-                                }
-                            })
-                        });
-                        i++;
-                        console.log(`Processing ${fileName}.json with SCSS styling`);
-                        cb(null, file);
                     })
-               }))
-               .on("error", () => console.log(err))
-               .on("end", () => console.log(`Geneared ${i} applications with SCSS in ${dest.toUpperCase()} project.`));
+                });
+                i++;
+                console.log(`Processing ${fileName}.json with SCSS styling`);
+                cb(null, file);
+            })
+        }))
+        .on("error", () => console.log(err))
+        .on("end", () => console.log(`Generated ${i} applications with SCSS in ${dest.toUpperCase()} project.`));
 }
 
-const processDemosWithScss = () =>  processApp("src", "angular-demos", "data");
+const processDemosWithScss = () => processApp("src", "angular-demos", "data");
 const processDemosLobWithScss = () => processApp("projects/app-lob/src", "angular-demos-lob", "services");
+const processDemosCrmWithScss = () => processApp("projects/app-crm/src", "angular-demos-grid-crm");
 
 let repositoryfyAngularDemos;
 let repositoryfyAngularDemosLob;
+let repositoryfyAngularDemosCrm;
 
 const cleanupAngularDemos = (cb) => {
     fsExtra.removeSync(submodule + "/angular-demos");
@@ -230,5 +246,13 @@ const cleanupAngularDemosLob = (cb) => {
     fsExtra.mkdirSync(submodule + "/angular-demos-lob");
     cb();
 }
+
+const cleanupAngularDemosCrm = (cb) => {
+    fsExtra.removeSync(submodule + "/angular-demos-grid-crm");
+    fsExtra.mkdirSync(submodule + "/angular-demos-grid-crm");
+    cb();
+}
+
 exports.repositoryfyAngularDemos = repositoryfyAngularDemos = gulp.series(cleanupAngularDemos, processDemosWithScss);
-exports.repositoryfyAngularDemosLob = repositoryfyAngularDemosLob =  gulp.series(cleanupAngularDemosLob, processDemosLobWithScss);
+exports.repositoryfyAngularDemosLob = repositoryfyAngularDemosLob = gulp.series(cleanupAngularDemosLob, processDemosLobWithScss);
+exports.repositoryfyAngularDemosCrm = repositoryfyAngularDemosCrm = gulp.series(cleanupAngularDemosCrm, processDemosCrmWithScss);

live-editing/Routes.ts

@@ -3,6 +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/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';
@@ -46,6 +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 { AppModule } from '../projects/app-crm/src/app/app.module';
 
 export const MODULE_ROUTES = [
     {
@@ -157,3 +159,11 @@ export const DV_MODULE_ROUTES = [
         routes: GridFinJSDockManagerRoutingModule.gridFinJsDockManagerGridRoutes
     }
 ];
+
+export const CRM_MODULE_ROUTES = [
+    {
+        module: AppModule,
+        path: 'grid-crm',
+        routes: GridCRMRouting.gridCrmRoutes
+    }
+];