Merge branch 'master' into update-aspnetcore-data

telerik · Mar 5, 2024 · f6df04d · f6df04d
2 parents ed7f20b + 11ce21a
commit f6df04d
Show file tree

Hide file tree

Showing 59 changed files with 21,830 additions and 14,695 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -59,6 +59,12 @@ jobs:
           npm ci
       # npm run lint
 
+      - name: Build Grid Live Data app
+        working-directory: ./examples-standalone/grid-live-data
+        run: |
+          npm ci
+          npm run build
+
   standalone-examples-node14:
     runs-on: ubuntu-latest
 
@@ -113,11 +119,5 @@ jobs:
           npm ci
           npm run build
 
-      - name: Build Grid Live Data app
-        working-directory: ./examples-standalone/grid-live-data
-        run: |
-          npm ci
-          npm run build
-
       - name: Cleanup
         run: git clean -xdf
diff --git a/examples-standalone/grid-csp-enabled/.browserslistrc b/examples-standalone/grid-csp-enabled/.browserslistrc
diff --git a/examples-standalone/grid-csp-enabled/angular.json b/examples-standalone/grid-csp-enabled/angular.json
@@ -5,22 +5,20 @@
   "projects": {
     "grid-csp-enabled": {
       "projectType": "application",
-      "schematics": {
-        "@schematics/angular:application": {
-          "strict": true
-        }
-      },
+      "schematics": {},
       "root": "",
       "sourceRoot": "src",
       "prefix": "app",
       "architect": {
         "build": {
-          "builder": "@angular-devkit/build-angular:browser",
+          "builder": "@angular-devkit/build-angular:application",
           "options": {
             "outputPath": "dist/grid-csp-enabled",
             "index": "src/index.html",
-            "main": "src/main.ts",
-            "polyfills": "src/polyfills.ts",
+            "browser": "src/main.ts",
+            "polyfills": [
+              "zone.js"
+            ],
             "tsConfig": "tsconfig.app.json",
             "assets": [
               "src/favicon.ico",
@@ -48,21 +46,12 @@
                   "maximumError": "4kb"
                 }
               ],
-              "fileReplacements": [
-                {
-                  "replace": "src/environments/environment.ts",
-                  "with": "src/environments/environment.prod.ts"
-                }
-              ],
               "outputHashing": "all"
             },
             "development": {
-              "buildOptimizer": false,
               "optimization": false,
-              "vendorChunk": true,
               "extractLicenses": false,
-              "sourceMap": true,
-              "namedChunks": true
+              "sourceMap": true
             }
           },
           "defaultConfiguration": "production"
@@ -71,27 +60,28 @@
           "builder": "@angular-devkit/build-angular:dev-server",
           "configurations": {
             "production": {
-              "browserTarget": "grid-csp-enabled:build:production"
+              "buildTarget": "grid-csp-enabled:build:production"
             },
             "development": {
-              "browserTarget": "grid-csp-enabled:build:development"
+              "buildTarget": "grid-csp-enabled:build:development"
             }
           },
           "defaultConfiguration": "development"
         },
         "extract-i18n": {
           "builder": "@angular-devkit/build-angular:extract-i18n",
           "options": {
-            "browserTarget": "grid-csp-enabled:build"
+            "buildTarget": "grid-csp-enabled:build"
           }
         },
         "test": {
           "builder": "@angular-devkit/build-angular:karma",
           "options": {
-            "main": "src/test.ts",
-            "polyfills": "src/polyfills.ts",
+            "polyfills": [
+              "zone.js",
+              "zone.js/testing"
+            ],
             "tsConfig": "tsconfig.spec.json",
-            "karmaConfig": "karma.conf.js",
             "assets": [
               "src/favicon.ico",
               "src/assets"
@@ -107,6 +97,5 @@
         }
       }
     }
-  },
-  "defaultProject": "grid-csp-enabled"
+  }
 }
diff --git a/examples-standalone/grid-csp-enabled/karma.conf.js b/examples-standalone/grid-csp-enabled/karma.conf.js