Merge pull request #3590 from IgniteUI/vnext

Updating master with vnext

Author: ChronosSF

angular.Samples.nuspec

@@ -10,6 +10,6 @@
     <description>This is a package that can be used with Octopus deployer</description>
     </metadata>
     <files>
-        <file src="dist\$path$\**\*.*" target="\" />
+        <file src="dist\$path$\browser\**\*.*" target="\" />
     </files>
 </package>

angular.json

@@ -10,11 +10,12 @@
       "prefix": "app",
       "architect": {
         "build": {
-          "builder": "@angular-devkit/build-angular:browser",
+          "builder": "@angular-devkit/build-angular:application",
           "options": {
-            "outputPath": "dist/app",
+            "outputPath": {
+              "base": "dist/app"
+            },
             "index": "src/index.html",
-            "main": "src/main.ts",
             "tsConfig": "src/tsconfig.app.json",
             "polyfills": [
                 "zone.js",
@@ -28,16 +29,15 @@
               "src/styles.scss"
             ],
             "scripts": [],
-            "vendorChunk": true,
             "extractLicenses": false,
-            "buildOptimizer": false,
             "optimization": false,
             "namedChunks": true,
             "sourceMap": true,
             "progress": true,
             "stylePreprocessorOptions": {
                 "includePaths": ["node_modules"]
-            }
+            },
+            "browser": "src/main.ts"
           },
           "configurations": {
             "production": {
@@ -51,8 +51,6 @@
               "outputHashing": "all",
               "namedChunks": false,
               "extractLicenses": true,
-              "vendorChunk": false,
-              "buildOptimizer": true,
               "sourceMap": false,
               "fileReplacements": [
                 {
@@ -125,12 +123,15 @@
       "prefix": "app",
       "architect": {
         "build": {
-          "builder": "@angular-devkit/build-angular:browser",
+          "builder": "@angular-devkit/build-angular:application",
           "options": {
-            "outputPath": "dist/app-lob",
+            "outputPath": {
+              "base": "dist/app-lob"
+            },
             "index": "projects/app-lob/src/index.html",
-            "main": "projects/app-lob/src/main.ts",
-            "polyfills": "projects/app-lob/src/polyfills.ts",
+            "polyfills": [
+              "projects/app-lob/src/polyfills.ts"
+            ],
             "tsConfig": "projects/app-lob/tsconfig.app.json",
             "assets": [
               "projects/app-lob/src/favicon.ico",
@@ -140,9 +141,7 @@
               "projects/app-lob/src/styles.scss"
             ],
             "scripts": [],
-            "vendorChunk": true,
             "extractLicenses": false,
-            "buildOptimizer": false,
             "sourceMap": {
               "scripts": true,
               "styles": true,
@@ -155,7 +154,8 @@
             "stylePreprocessorOptions": {
                 "includePaths": ["node_modules"]
             },
-            "preserveSymlinks": true
+            "preserveSymlinks": true,
+            "browser": "projects/app-lob/src/main.ts"
           },
           "configurations": {
             "production": {
@@ -170,8 +170,6 @@
               "sourceMap": false,
               "namedChunks": false,
               "extractLicenses": true,
-              "vendorChunk": false,
-              "buildOptimizer": true,
               "budgets": [
                 {
                   "type": "initial",
@@ -249,12 +247,15 @@
       "prefix": "app",
       "architect": {
         "build": {
-          "builder": "@angular-devkit/build-angular:browser",
+          "builder": "@angular-devkit/build-angular:application",
           "options": {
-            "outputPath": "dist/app-crm",
+            "outputPath": {
+              "base": "dist/app-crm"
+            },
             "index": "projects/app-crm/src/index.html",
-            "main": "projects/app-crm/src/main.ts",
-            "polyfills": "projects/app-crm/src/polyfills.ts",
+            "polyfills": [
+              "projects/app-crm/src/polyfills.ts"
+            ],
             "tsConfig": "projects/app-crm/tsconfig.app.json",
             "assets": [
               "projects/app-crm/src/favicon.ico",
@@ -264,9 +265,7 @@
               "projects/app-crm/src/styles.scss"
             ],
             "scripts": [],
-            "vendorChunk": true,
             "extractLicenses": false,
-            "buildOptimizer": false,
             "sourceMap": {
               "scripts": true,
               "styles": true,
@@ -278,7 +277,8 @@
             "namedChunks": true,
             "stylePreprocessorOptions": {
                 "includePaths": ["node_modules"]
-            }
+            },
+            "browser": "projects/app-crm/src/main.ts"
           },
           "configurations": {
             "production": {
@@ -293,8 +293,6 @@
               "sourceMap": false,
               "namedChunks": false,
               "extractLicenses": true,
-              "vendorChunk": false,
-              "buildOptimizer": true,
               "budgets": [
                 {
                   "type": "initial",

azure-devops/app-cd.yml

@@ -33,10 +33,8 @@ steps:
       script: |
         # List of files to update
         $files = @(
-            "projects/app-lob/src/app/grid-dynamic-chart-data/grid-dynamic-chart-data.module.ts",
             "projects/app-lob/src/app/grid-dynamic-chart-data/grid-dynamic-chart-data.component.ts",
             "projects/app-lob/src/app/grid-dynamic-chart-data/data-analysis-dock-manager/data-analysis-dock-manager.component.ts",
-            "projects/app-lob/src/app/app.module.ts",
             "package.json")
         foreach ($file in $files) {
           (Get-Content -Path $file) -replace 'igniteui-angular-extras', '$(ReplacementText)' | Set-Content -Path $file

azure-devops/app-crm-cd-yml

@@ -33,10 +33,8 @@ steps:
       script: |
         # List of files to update
         $files = @(
-            "projects/app-lob/src/app/grid-dynamic-chart-data/grid-dynamic-chart-data.module.ts",
             "projects/app-lob/src/app/grid-dynamic-chart-data/grid-dynamic-chart-data.component.ts",
             "projects/app-lob/src/app/grid-dynamic-chart-data/data-analysis-dock-manager/data-analysis-dock-manager.component.ts",
-            "projects/app-lob/src/app/app.module.ts",
             "package.json")
         foreach ($file in $files) {
           (Get-Content -Path $file) -replace 'igniteui-angular-extras', '$(ReplacementText)' | Set-Content -Path $file

azure-devops/app-lob-cd.yml

@@ -33,10 +33,8 @@ steps:
       script: |
         # List of files to update
         $files = @(
-            "projects/app-lob/src/app/grid-dynamic-chart-data/grid-dynamic-chart-data.module.ts",
             "projects/app-lob/src/app/grid-dynamic-chart-data/grid-dynamic-chart-data.component.ts",
             "projects/app-lob/src/app/grid-dynamic-chart-data/data-analysis-dock-manager/data-analysis-dock-manager.component.ts",
-            "projects/app-lob/src/app/app.module.ts",
             "package.json")
         foreach ($file in $files) {
           (Get-Content -Path $file) -replace 'igniteui-angular-extras', '$(ReplacementText)' | Set-Content -Path $file

azure-devops/templates/cd-template.yml

@@ -112,17 +112,17 @@ steps:
   - task: CopyFiles@2
     displayName: Copy web.config
     inputs:
-      SourceFolder: $(Build.SourcesDirectory)
+      SourceFolder: $(Build.SourcesDirectory)/projects/app-crm/
       Contents: web.config
-      TargetFolder: $(Build.SourcesDirectory)/${{ parameters.targetFolder }}
+      TargetFolder: $(Build.SourcesDirectory)/${{ parameters.targetFolder }}/browser
 
   - script: |
-      sed -i 's/${{ parameters.findRegex }}/${{ parameters.submoduleDir }}/g' $(Build.SourcesDirectory)/${{ parameters.targetFolder }}/web.config
+      sed -i 's/${{ parameters.findRegex }}/${{ parameters.submoduleDir }}/g' $(Build.SourcesDirectory)/${{ parameters.targetFolder }}/browser/web.config
     displayName: 'Update web.config file'
     workingDirectory: ${{ parameters.workingDir }}
 
   - script: |
-      sourcePath="$(Build.SourcesDirectory)/${{ parameters.targetFolder }}"
+      sourcePath="$(Build.SourcesDirectory)/${{ parameters.targetFolder }}/browser"
       destinationZip="$(Build.ArtifactStagingDirectory)/output.zip"
       cd "$sourcePath"
       zip -r "$destinationZip" ./

gulpfile.js

@@ -84,7 +84,7 @@ const createPrependerdLobStructure = (cb) => {
 
 const addPrerenderedLobPages = (cb) => {
     const { metadata } = require('./projects/app-lob/src/app/metadata');
-    const indexFilePath = path.resolve(__dirname, './', 'dist/app-lob', 'index.html');
+    const indexFilePath = path.resolve(__dirname, './', 'dist/app-lob/browser', 'index.html');
 
     // read in the index.html file
     fs.readFile(indexFilePath, 'utf8', function (err, data) {
@@ -237,10 +237,6 @@ 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 copyGitHooks = async (cb) => {
 
     if (process.env.AZURE_PIPELINES || process.env.TRAVIS || process.env.CI || !fs.existsSync('.git')) {