Merge pull request #89 from kreuzerk/feature/angular13

Feature/angular13
nivekcode · Mar 3, 2022 · ca2a3e6 · ca2a3e6
2 parents 4be70c8 + 84ccf38
commit ca2a3e6
Show file tree

Hide file tree

Showing 13 changed files with 10,188 additions and 9,621 deletions.
diff --git a/.gitignore b/.gitignore
@@ -35,6 +35,7 @@ speed-measure-plugin.json
 .history/*
 
 # misc
+/.angular/cache
 /.sass-cache
 /connect.lock
 /coverage

diff --git a/angular.json b/angular.json
@@ -1,5 +1,8 @@
 {
   "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
+  "cli": {
+    "analytics": false
+  },
   "version": 1,
   "newProjectRoot": "projects",
   "projects": {
@@ -20,18 +23,6 @@
               "tsConfig": "projects/ng-sortgrid/tsconfig.lib.json"
             }
           }
-        },
-        "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
-          "options": {
-            "tsConfig": [
-              "projects/ng-sortgrid/tsconfig.lib.json",
-              "projects/ng-sortgrid/tsconfig.spec.json"
-            ],
-            "exclude": [
-              "**/node_modules/**"
-            ]
-          }
         }
       }
     },
@@ -113,18 +104,6 @@
           "options": {
             "browserTarget": "ng-sortgrid-demo:build"
           }
-        },
-        "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
-          "options": {
-            "tsConfig": [
-              "projects/ng-sortgrid-demo/tsconfig.app.json",
-              "projects/ng-sortgrid-demo/tsconfig.spec.json"
-            ],
-            "exclude": [
-              "**/node_modules/**"
-            ]
-          }
         }
       }
     }

diff --git a/jest.base.config.js b/jest.base.config.js
@@ -1,4 +1,5 @@
 module.exports = {
   preset: 'jest-preset-angular',
-  setupFilesAfterEnv: ['<rootDir>/../../setupJest.ts']
+  setupFilesAfterEnv: ['<rootDir>/../../setupJest.ts'],
+  globalSetup: 'jest-preset-angular/global-setup',
 };