Merge branch '17.0.x' into gedinakova/fflateUpdate-17.0

Author: kdinev

angular.json

@@ -15,15 +15,11 @@
       },
       "architect": {
         "build": {
-          "builder": "@angular-devkit/build-angular:application",
+          "builder": "@angular-devkit/build-angular:browser",
           "options": {
             "outputPath": "dist/igniteui-dev-demos",
+            "main": "./src/main.ts",
             "index": "src/index.html",
-            "browser": "src/main.ts",
-            "server": "src/main.server.ts",
-            "ssr": {
-              "entry": "src/server.ts"
-            },
             "polyfills": [
                 "zone.js",
                 "hammerjs"
@@ -39,6 +35,7 @@
             ],
             "scripts": [],
             "extractLicenses": false,
+            "buildOptimizer": false,
             "sourceMap": true,
             "optimization": false,
             "namedChunks": true,
@@ -255,11 +252,11 @@
       "prefix": "app",
       "architect": {
         "build": {
-          "builder": "@angular-devkit/build-angular:browser",
+          "builder": "@angular-devkit/build-angular:application",
           "options": {
             "outputPath": "dist/bundle-test",
             "index": "projects/bundle-test/src/index.html",
-            "main": "projects/bundle-test/src/main.ts",
+            "browser": "projects/bundle-test/src/main.ts",
             "polyfills": [
               "zone.js"
             ],
@@ -293,9 +290,7 @@
               "sourceMap": true
             },
             "development": {
-              "buildOptimizer": false,
               "optimization": false,
-              "vendorChunk": true,
               "extractLicenses": false,
               "sourceMap": true,
               "namedChunks": true