Skip to content

Commit 269d013

Browse files
authored
Merge pull request #47 from kreuzerk/feature/angular10
feature(upgrade): upgrade ng-sortgrid to Angular 10 BREAKING CHANGE: upgrade sortgrid to Angular 10
2 parents 067f724 + 6446477 commit 269d013

25 files changed

+13498
-10835
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[![Travis build badge](https://img.shields.io/travis/kreuzerk/ng-sortgrid.svg)](https://travis-ci.org/kreuzerk/ng-sortgrid)
22
[![codecov](https://codecov.io/gh/kreuzerk/ng-sortgrid/branch/master/graph/badge.svg)](https://codecov.io/gh/kreuzerk/ng-sortgrid)
3-
[![angular9](https://img.shields.io/badge/angular%209%20ready-true-green.svg)]()
3+
[![angular10](https://img.shields.io/badge/angular%2010%20ready-true-green.svg)]()
44

55
# Ng-sortgrid
66

angular.json

Lines changed: 1 addition & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,6 @@
2121
}
2222
}
2323
},
24-
"test": {
25-
"builder": "@angular-devkit/build-angular:karma",
26-
"options": {
27-
"main": "projects/ng-sortgrid/src/test.ts",
28-
"tsConfig": "projects/ng-sortgrid/tsconfig.spec.json",
29-
"karmaConfig": "projects/ng-sortgrid/karma.conf.js"
30-
}
31-
},
3224
"lint": {
3325
"builder": "@angular-devkit/build-angular:tslint",
3426
"options": {
@@ -68,8 +60,7 @@
6860
"projects/ng-sortgrid/src/lib/ngsg.css",
6961
"node_modules/@fortawesome/fontawesome-free/css/all.css"
7062
],
71-
"scripts": [],
72-
"es5BrowserSupport": true
63+
"scripts": []
7364
},
7465
"configurations": {
7566
"production": {
@@ -119,23 +110,6 @@
119110
"browserTarget": "ng-sortgrid-demo:build"
120111
}
121112
},
122-
"test": {
123-
"builder": "@angular-devkit/build-angular:karma",
124-
"options": {
125-
"main": "projects/ng-sortgrid-demo/src/test.ts",
126-
"polyfills": "projects/ng-sortgrid-demo/src/polyfills.ts",
127-
"tsConfig": "projects/ng-sortgrid-demo/tsconfig.spec.json",
128-
"karmaConfig": "projects/ng-sortgrid-demo/karma.conf.js",
129-
"styles": [
130-
"projects/ng-sortgrid-demo/src/styles.css"
131-
],
132-
"scripts": [],
133-
"assets": [
134-
"projects/ng-sortgrid-demo/src/favicon.ico",
135-
"projects/ng-sortgrid-demo/src/assets"
136-
]
137-
}
138-
},
139113
"lint": {
140114
"builder": "@angular-devkit/build-angular:tslint",
141115
"options": {

jest.base.config.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
module.exports = {
2+
preset: 'jest-preset-angular',
3+
setupFilesAfterEnv: ['<rootDir>/../../setupJest.ts']
4+
};

0 commit comments

Comments
 (0)