Skip to content

Commit ca2a3e6

Browse files
authored
Merge pull request #89 from kreuzerk/feature/angular13
Feature/angular13
2 parents 4be70c8 + 84ccf38 commit ca2a3e6

File tree

13 files changed

+10188
-9621
lines changed

13 files changed

+10188
-9621
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ speed-measure-plugin.json
3535
.history/*
3636

3737
# misc
38+
/.angular/cache
3839
/.sass-cache
3940
/connect.lock
4041
/coverage

angular.json

Lines changed: 3 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
{
22
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
3+
"cli": {
4+
"analytics": false
5+
},
36
"version": 1,
47
"newProjectRoot": "projects",
58
"projects": {
@@ -20,18 +23,6 @@
2023
"tsConfig": "projects/ng-sortgrid/tsconfig.lib.json"
2124
}
2225
}
23-
},
24-
"lint": {
25-
"builder": "@angular-devkit/build-angular:tslint",
26-
"options": {
27-
"tsConfig": [
28-
"projects/ng-sortgrid/tsconfig.lib.json",
29-
"projects/ng-sortgrid/tsconfig.spec.json"
30-
],
31-
"exclude": [
32-
"**/node_modules/**"
33-
]
34-
}
3526
}
3627
}
3728
},
@@ -113,18 +104,6 @@
113104
"options": {
114105
"browserTarget": "ng-sortgrid-demo:build"
115106
}
116-
},
117-
"lint": {
118-
"builder": "@angular-devkit/build-angular:tslint",
119-
"options": {
120-
"tsConfig": [
121-
"projects/ng-sortgrid-demo/tsconfig.app.json",
122-
"projects/ng-sortgrid-demo/tsconfig.spec.json"
123-
],
124-
"exclude": [
125-
"**/node_modules/**"
126-
]
127-
}
128107
}
129108
}
130109
}

jest.base.config.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
module.exports = {
22
preset: 'jest-preset-angular',
3-
setupFilesAfterEnv: ['<rootDir>/../../setupJest.ts']
3+
setupFilesAfterEnv: ['<rootDir>/../../setupJest.ts'],
4+
globalSetup: 'jest-preset-angular/global-setup',
45
};

0 commit comments

Comments
 (0)