Skip to content

Commit 452dfbd

Browse files
authored
Merge pull request #23 from flexmonster/angular-18
Updated to Angular 18
2 parents 3c8d5dd + 4fd98cc commit 452dfbd

10 files changed

+18
-192
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Table of contents:
2323

2424
## Prerequisites
2525

26-
- [Node.js 18 through 20](https://nodejs.org/en/)
26+
- [Node.js 18 through 20, and above 22](https://nodejs.org/en/)
2727

2828
## Installation
2929

angular.json

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -75,35 +75,18 @@
7575
"builder": "@angular-devkit/build-angular:dev-server",
7676
"configurations": {
7777
"production": {
78-
"browserTarget": "pivot-angular:build:production"
78+
"buildTarget": "pivot-angular:build:production"
7979
},
8080
"development": {
81-
"browserTarget": "pivot-angular:build:development"
81+
"buildTarget": "pivot-angular:build:development"
8282
}
8383
},
8484
"defaultConfiguration": "development"
8585
},
8686
"extract-i18n": {
8787
"builder": "@angular-devkit/build-angular:extract-i18n",
8888
"options": {
89-
"browserTarget": "pivot-angular:build"
90-
}
91-
},
92-
"test": {
93-
"builder": "@angular-devkit/build-angular:karma",
94-
"options": {
95-
"main": "src/test.ts",
96-
"polyfills": "src/polyfills.ts",
97-
"tsConfig": "tsconfig.spec.json",
98-
"karmaConfig": "karma.conf.js",
99-
"assets": [
100-
"src/favicon.ico",
101-
"src/assets"
102-
],
103-
"styles": [
104-
"src/styles.css"
105-
],
106-
"scripts": []
89+
"browserTarget": "pivot-angular:build:production,development"
10790
}
10891
}
10992
}

e2e/app.e2e-spec.ts

Lines changed: 0 additions & 14 deletions
This file was deleted.

e2e/app.po.ts

Lines changed: 0 additions & 11 deletions
This file was deleted.

e2e/tsconfig.e2e.json

Lines changed: 0 additions & 14 deletions
This file was deleted.

karma.conf.js

Lines changed: 0 additions & 44 deletions
This file was deleted.

package.json

Lines changed: 14 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -6,41 +6,35 @@
66
"ng": "ng",
77
"start": "ng serve --open",
88
"build": "ng build",
9-
"watch": "ng build --watch --configuration development",
10-
"test": "ng test"
9+
"watch": "ng build --watch --configuration development"
1110
},
1211
"private": true,
1312
"dependencies": {
1413
"@amcharts/amcharts4": "^4.10.22",
1514
"@amcharts/amcharts5": "^5.3.3",
16-
"@angular/animations": "^17.0.1",
17-
"@angular/common": "^17.0.1",
18-
"@angular/compiler": "^17.0.1",
19-
"@angular/core": "^17.0.1",
20-
"@angular/forms": "^17.0.1",
21-
"@angular/platform-browser": "^17.0.1",
22-
"@angular/platform-browser-dynamic": "^17.0.1",
23-
"@angular/router": "^17.0.1",
15+
"@angular/animations": "^18.0.2",
16+
"@angular/common": "^18.0.2",
17+
"@angular/compiler": "^18.0.2",
18+
"@angular/core": "^18.0.2",
19+
"@angular/forms": "^18.0.2",
20+
"@angular/platform-browser": "^18.0.2",
21+
"@angular/platform-browser-dynamic": "^18.0.2",
22+
"@angular/router": "^18.0.2",
2423
"express": "^4.18.2",
25-
"highcharts": "^9.2.2",
24+
"highcharts": "^11.4.3",
2625
"ngx-flexmonster": "latest",
2726
"path": "^0.12.7",
2827
"rxjs": "^7.4.0",
2928
"tslib": "^2.3.0",
3029
"zone.js": "~0.14.0"
3130
},
3231
"devDependencies": {
33-
"@angular-devkit/build-angular": "^17.0.1",
34-
"@angular/cli": "^17.0.1",
35-
"@angular/compiler-cli": "^17.0.0",
36-
"@types/jasmine": "~3.8.0",
37-
"@types/node": "^12.11.1",
38-
"jasmine-core": "~5.1.1",
39-
"karma": "~6.4.2",
32+
"@angular-devkit/build-angular": "^18.0.2",
33+
"@angular/cli": "^18.0.2",
34+
"@angular/compiler-cli": "^18.0.2",
35+
"@types/node": "^20.14.2",
4036
"karma-chrome-launcher": "~3.1.0",
4137
"karma-coverage": "~2.0.3",
42-
"karma-jasmine": "~4.0.0",
43-
"karma-jasmine-html-reporter": "~1.7.0",
4438
"typescript": "^5.0.2"
4539
}
4640
}

src/app/app.component.spec.ts

Lines changed: 0 additions & 35 deletions
This file was deleted.

src/test.ts

Lines changed: 0 additions & 15 deletions
This file was deleted.

tsconfig.spec.json

Lines changed: 0 additions & 18 deletions
This file was deleted.

0 commit comments

Comments
 (0)