Merge pull request #3651 from IgniteUI/vnext

Updating prod with vnext changes

Author: ChronosSF

angular.json

@@ -18,8 +18,8 @@
             "index": "src/index.html",
             "tsConfig": "src/tsconfig.app.json",
             "polyfills": [
-                "zone.js",
-                "hammerjs"
+              "zone.js",
+              "hammerjs"
             ],
             "assets": [
               "src/assets",
@@ -35,9 +35,16 @@
             "sourceMap": true,
             "progress": true,
             "stylePreprocessorOptions": {
-                "includePaths": ["node_modules"]
+              "includePaths": [
+                "node_modules"
+              ]
             },
-            "browser": "src/main.ts"
+            "browser": "src/main.ts",
+            "server": "src/main.server.ts",
+            "outputMode": "static",
+            "ssr": {
+              "entry": "src/server.ts"
+            }
           },
           "configurations": {
             "production": {
@@ -152,10 +159,17 @@
             "optimization": false,
             "namedChunks": true,
             "stylePreprocessorOptions": {
-                "includePaths": ["node_modules"]
+              "includePaths": [
+                "node_modules"
+              ]
             },
             "preserveSymlinks": true,
-            "browser": "projects/app-lob/src/main.ts"
+            "browser": "projects/app-lob/src/main.ts",
+            "server": "projects/app-lob/src/main.server.ts",
+            "outputMode": "static",
+            "ssr": {
+              "entry": "projects/app-lob/src/server.ts"
+            }
           },
           "configurations": {
             "production": {
@@ -276,9 +290,16 @@
             "optimization": false,
             "namedChunks": true,
             "stylePreprocessorOptions": {
-                "includePaths": ["node_modules"]
+              "includePaths": [
+                "node_modules"
+              ]
             },
-            "browser": "projects/app-crm/src/main.ts"
+            "browser": "projects/app-crm/src/main.ts",
+            "server": "projects/app-crm/src/main.server.ts",
+            "outputMode": "static",
+            "ssr": {
+              "entry": "projects/app-crm/src/server.ts"
+            }
           },
           "configurations": {
             "production": {

azure-devops/app-cd.yml

@@ -13,11 +13,13 @@ pool:
   vmImage: ubuntu-latest
 
 variables:
-  githubToken: <value> # Add a GitHub token in Libraries
-  ReplacementText: '@infragistics/igniteui-angular-extras'
+- group: live-editing-samples-pat
+- name: ReplacementText
+  value: '@infragistics/igniteui-angular-extras'
 
 steps:
   - checkout: self
+    persistCredentials: true
     clean: true
     fetchTags: true
 
@@ -78,10 +80,12 @@ steps:
   - template: templates/cd-template.yml
     parameters:
       customCommand: run generate-live-editing
+      gitHubToken: $(GITHUB_TOKEN)
       workingDir: $(Build.SourcesDirectory)
       submoduleDir: angular-demos
       baseHref: \/angular-demos\/
       targetFolder: dist/app
       findRegex: angular-demos
       npmBuildCommand: 'run build-ci'
       repositoryfy: true
+      repositoryfyCommand: 'repositoryfyAngularDemos'

azure-devops/app-crm-cd-yml

@@ -13,11 +13,13 @@ pool:
   vmImage: ubuntu-latest
 
 variables:
-  githubToken: <value> # Add a GitHub token in Libraries
-  ReplacementText: '@infragistics/igniteui-angular-extras'
+- group: live-editing-samples-pat
+- name: ReplacementText
+  value: '@infragistics/igniteui-angular-extras'
 
 steps:
   - checkout: self
+    persistCredentials: true
     clean: true
     fetchTags: true
 
@@ -78,6 +80,7 @@ steps:
   - template: templates/cd-template.yml
     parameters:
       customCommand: run generate-live-editing:app-crm
+      gitHubToken: $(GITHUB_TOKEN)
       workingDir: $(Build.SourcesDirectory)
       submoduleDir: angular-demos-crm
       baseHref: \/angular-demos-grid-crm\/

azure-devops/app-lob-cd.yml

@@ -13,11 +13,13 @@ pool:
   vmImage: ubuntu-latest
 
 variables:
-  githubToken: <value> # Add a GitHub token in Libraries
-  ReplacementText: '@infragistics/igniteui-angular-extras'
+- group: live-editing-samples-pat
+- name: ReplacementText
+  value: '@infragistics/igniteui-angular-extras'
 
 steps:
   - checkout: self
+    persistCredentials: true
     clean: true
     fetchTags: true
 
@@ -78,10 +80,12 @@ steps:
   - template: templates/cd-template.yml
     parameters:
       customCommand: run generate-live-editing:app-lob
+      gitHubToken: $(GITHUB_TOKEN)
       workingDir: $(Build.SourcesDirectory)
       submoduleDir: angular-demos-lob
       baseHref: \/angular-demos-lob\/
       targetFolder: dist/app-lob
       findRegex: angular-demos
       npmBuildCommand: 'run build-ci:app-lob'
       repositoryfy: true
+      repositoryfyCommand: 'repositoryfyAngularDemosLob'

azure-devops/templates/cd-template.yml

@@ -2,6 +2,8 @@
 parameters:
   - name: customCommand
     type: string
+  - name: gitHubToken
+    type: string
   - name: workingDir
     type: string
   - name: submoduleDir
@@ -22,6 +24,9 @@ parameters:
   - name: repositoryfy
     type: boolean
     default: false
+  - name: repositoryfyCommand
+    type: string
+    default: ''
 
 steps:
   # - task: CmdLine@2
@@ -121,6 +126,11 @@ steps:
     displayName: 'Update web.config file'
     workingDirectory: ${{ parameters.workingDir }}
 
+  - script: |
+      mv "$(Build.SourcesDirectory)/${{ parameters.targetFolder }}/browser/index.csr.html" "$(Build.SourcesDirectory)/${{ parameters.targetFolder }}/browser/index.html"
+      echo "File renamed successfully."
+    displayName: Rename index.csr.html to index.html
+
   - script: |
       sourcePath="$(Build.SourcesDirectory)/${{ parameters.targetFolder }}/browser"
       destinationZip="$(Build.ArtifactStagingDirectory)/output.zip"
@@ -137,32 +147,32 @@ steps:
 
   - task: Npm@1
     displayName: Staging - Repositorify Angular Demos and LOB Demos
-    condition: and(eq(variables['Build.SourceBranchName'], 'vNext'), eq(variables['repositoryfy'], 'true'))
+    condition: and(eq(variables['Build.SourceBranchName'], 'vNext'), eq(${{ parameters.repositoryfy }}, 'true'))
     inputs:
       command: custom
       workingDir: ${{ parameters.workingDir }}
       verbose: false
-      customCommand: run repositoryfyAngularDemosLob
+      customCommand: run ${{ parameters.repositoryfyCommand }}
 
   - task: Npm@1
     displayName: Production - Repositorify Angular Demos
-    condition: and(eq(variables['Build.SourceBranchName'], 'master'), contains(variables['build.reason'], 'CI'), eq(variables['repositoryfy'], 'true'))
+    condition: and(eq(variables['Build.SourceBranchName'], 'master'), contains(variables['build.reason'], 'CI'), eq(${{ parameters.repositoryfy }}, 'true'))
     inputs:
       command: custom
       workingDir: ${{ parameters.workingDir }}
       verbose: false
-      customCommand: run repositoryfyAngularDemosLob:prod
+      customCommand: run ${{ parameters.repositoryfyCommand }}:prod
 
   - task: CmdLine@2
     displayName: Stage changes
-    condition: eq(variables['repositoryfy'], 'true')
+    condition: eq(${{ parameters.repositoryfy }}, 'true')
     inputs:
       script: git add .
       workingDirectory: ${{ parameters.workingDir }}/igniteui-live-editing-samples/${{ parameters.submoduleDir }}
 
   - task: CmdLine@2
     displayName: 'Check if there are any changes to be committed'
-    condition: eq(variables['repositoryfy'], 'true')
+    condition: eq(${{ parameters.repositoryfy }}, 'true')
     inputs:
       script: |
         # Check for changes
@@ -171,24 +181,26 @@ steps:
           echo "##vso[task.logissue type=warning]No changes to commit."
           exit 0
         else
-          echo "##vso[task.setvariable variable=changesDetected;isOutput=true]true"
+          echo "##vso[task.setvariable variable=changesDetected;]true"
         fi
       workingDirectory: ${{ parameters.workingDir }}/igniteui-live-editing-samples/${{ parameters.submoduleDir }}
 
-  - task: CmdLine@2
+  - script: |
+      git config --global user.name "tfsbuild"
+      git config --global user.email "[email protected]"
+      git config --global credential.helper store
+      echo "https://x-access-token:$(GITHUB_TOKEN)@github.com" > ~/.git-credentials
+      git commit -m "Automated repository update"
     displayName: Commit changes
-    condition: and(eq(variables['changesDetected'], 'true'), eq(variables['repositoryfy'], 'true'))
-    inputs:
-      script: |
-        git config user.name "tfsbuild"
-        git config user.email "[email protected]"
-        git add .
-        git commit -m "Automated repository update"
-      workingDirectory: ${{ parameters.workingDir }}/igniteui-live-editing-samples/${{ parameters.submoduleDir }}
+    condition: and(eq(variables['changesDetected'], true), eq(${{ parameters.repositoryfy }}, 'true'))
+    env:
+      GITHUB_TOKEN: ${{ parameters.gitHubToken }}
+    workingDirectory: ${{ parameters.workingDir }}/igniteui-live-editing-samples/${{ parameters.submoduleDir }}
 
   - task: CmdLine@2
     displayName: Push changes
-    condition: and(eq(variables['changesDetected'], 'true'), eq(variables['repositoryfy'], 'true'))
+    condition: and(eq(variables['changesDetected'], true), eq(${{ parameters.repositoryfy }}, 'true'))
     inputs:
       script: git push
       workingDirectory: ${{ parameters.workingDir }}/igniteui-live-editing-samples/${{ parameters.submoduleDir }}
+    continueOnError: true

gulpfile.js

@@ -30,7 +30,7 @@ gulp.task("generate-live-editing", async () => {
             }
         }
         :
-        (argv.appCrm  ?
+        (argv.appCrm ?
             {
                 platform: 'angular',
                 projectDir: "./projects/app-crm",
@@ -213,16 +213,18 @@ const processApp = (projectPath, dest, directoriesToExclude) => {
                     const paths = sampleFile.path.replace("./", "").split("/");
                     let tempPath = "";
                     paths.forEach(p => {
-                        tempPath += p + "/";
+                        tempPath += p;
                         if (p.indexOf(".") !== -1 && p !== codesandboxConfigFolder) {
                             fs.writeFileSync(sampleAppPath + "/" + tempPath, sampleContent);
-                        } else
+                        } else {
                             if (p === 'Dockerfile') {
                                 fs.writeFileSync(sampleAppPath + "/" + tempPath, sampleContent);
                             } else if (!fs.existsSync(sampleAppPath + "/" + tempPath)) {
                                 fs.mkdirSync(sampleAppPath + "/" + tempPath)
                             }
-                    })
+                        }
+                        tempPath += "/";
+                    });
                 });
                 i++;
                 console.log(`Processing ${fileName}.json with SCSS styling`);

live-editing/configs/DockManagerConfigGenerator.ts

@@ -1,5 +1,4 @@
-import {CUSTOM_ELEMENTS_SCHEMA} from '@angular/core';
-import {AppModuleConfig, Config, IConfigGenerator} from 'igniteui-live-editing'
+import { Config, IConfigGenerator} from 'igniteui-live-editing'
 import { BaseAppConfig } from './BaseConfig';
 export class DockManagerConfigGenerator implements IConfigGenerator {
 
@@ -13,7 +12,9 @@ export class DockManagerConfigGenerator implements IConfigGenerator {
         configs.push(new Config({
             component: 'DockManagerComponent',
             additionalDependencies: ["igniteui-dockmanager"],
-            appConfig: BaseAppConfig,
+            appConfig: { ...BaseAppConfig,
+                additionalAdjustments: [dockManagerImport, defineCustomElements]
+            },
             shortenComponentPathBy: "/layouts/dock-manager/"
         }));
 

live-editing/configs/app-dv-configs/DVGridConfig.ts

@@ -99,7 +99,9 @@ export class DVGridConfigGenerator implements IConfigGenerator {
                 '/projects/app-lob/src/app/grid-finjs-dock-manager/dock-slot.component.ts',
                 '/projects/app-lob/src/_app-layout.scss', '/projects/app-lob/src/_variables.scss'
             ],
-            appConfig: BaseAppConfig
+            appConfig: { ...BaseAppConfig,
+                additionalAdjustments: [dockManagerImport, defineCustomElements]
+            }
         }));
 
         return configs;