Merge pull request #3560 from IgniteUI/update-19

Update 19

Author: Lipata

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

@@ -49,7 +49,7 @@ jobs:
         run: npm config set ${{secrets.IG_SCOPE}}:_auth=${{secrets.IG_TOKEN}}
 
       - name: Install dependencies
-        run: npm ci
+        run: npm ci --legacy-peer-deps
 
       - name: Run lint
         run: npm run lint

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

@@ -54,7 +54,7 @@ jobs:
         run: npm config set ${{secrets.IG_SCOPE}}:_auth=${{secrets.IG_TOKEN}}
 
       - name: Install dependencies
-        run: npm ci
+        run: npm ci --legacy-peer-deps
 
       - name: Run lint
         run: npm run lint

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-pipelines.yml

@@ -17,7 +17,7 @@ steps:
 - task: Npm@1
   inputs:
     command: 'custom'
-    customCommand: 'install'
+    customCommand: 'install --legacy-peer-deps'
     customEndpoint: 'public proget'
   env:
     AZURE_PIPELINES: "true"

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')) {