Skip to content

Commit 829b179

Browse files
Resolved #143 - Upgrade angular to v5
1 parent 02235e5 commit 829b179

File tree

4 files changed

+676
-1010
lines changed

4 files changed

+676
-1010
lines changed

angular/nswag/service.config.nswag

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{
1+
{
22
"runtime": "Default",
33
"swaggerGenerator": {
44
"fromSwagger": {
@@ -38,6 +38,7 @@
3838
"importRequiredTypes": true,
3939
"useGetBaseUrlMethod": false,
4040
"baseUrlTokenName": "API_BASE_URL",
41+
"injectionTokenType": "InjectionToken",
4142
"output": "../src/shared/service-proxies/service-proxies.ts"
4243
},
4344
"swaggerToCSharpClient": {
@@ -112,4 +113,4 @@
112113
"output": null
113114
}
114115
}
115-
}
116+
}

angular/package.json

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@
1313
},
1414
"private": true,
1515
"dependencies": {
16-
"@angular/animations": "^4.3.6",
17-
"@angular/common": "^4.3.6",
18-
"@angular/compiler": "^4.3.6",
19-
"@angular/core": "^4.3.6",
20-
"@angular/forms": "^4.3.6",
21-
"@angular/http": "^4.3.6",
22-
"@angular/platform-browser": "^4.3.6",
23-
"@angular/platform-browser-dynamic": "^4.3.6",
24-
"@angular/router": "^4.3.6",
16+
"@angular/animations": "^5.0.2",
17+
"@angular/common": "^5.0.2",
18+
"@angular/compiler": "^5.0.2",
19+
"@angular/core": "^5.0.2",
20+
"@angular/forms": "^5.0.2",
21+
"@angular/http": "^5.0.2",
22+
"@angular/platform-browser": "^5.0.2",
23+
"@angular/platform-browser-dynamic": "^5.0.2",
24+
"@angular/router": "^5.0.2",
2525
"@types/bootstrap": "^3.3.33",
2626
"@types/jquery": "^3.2.12",
2727
"@types/jquery.blockui": "0.0.28",
@@ -31,8 +31,8 @@
3131
"@types/moment-timezone": "^0.2.34",
3232
"@types/signalr": "^2.2.33",
3333
"@types/toastr": "^2.1.33",
34-
"abp-ng2-module": "^1.2.4",
35-
"abp-web-resources": "^3.1.0",
34+
"abp-ng2-module": "^1.3.0",
35+
"abp-web-resources": "^3.2.2",
3636
"animate.css": "^3.5.2",
3737
"block-ui": "^2.70.1",
3838
"bootstrap": "^3.3.7",
@@ -57,7 +57,7 @@
5757
"node-waves": "^0.7.5",
5858
"push.js": "1.0.4",
5959
"raphael": "^2.2.7",
60-
"rxjs": "^5.3.0",
60+
"rxjs": "^5.5.2",
6161
"signalr": "^2.2.1",
6262
"simple-line-icons": "^2.4.1",
6363
"spin.js": "^2.3.2",
@@ -68,8 +68,8 @@
6868
"zone.js": "0.8.18"
6969
},
7070
"devDependencies": {
71-
"@angular/cli": "^1.3.2",
72-
"@angular/compiler-cli": "^4.3.6",
71+
"@angular/cli": "^1.5.0",
72+
"@angular/compiler-cli": "^5.0.2",
7373
"@angularclass/hmr": "^2.1.3",
7474
"@types/jasmine": "^2.5.38",
7575
"@types/node": "^8.0.27",
@@ -82,10 +82,10 @@
8282
"karma-coverage-istanbul-reporter": "^1.3.0",
8383
"karma-jasmine": "^1.1.0",
8484
"karma-jasmine-html-reporter": "^0.2.2",
85-
"nswag": "^11.6.1",
85+
"nswag": "^11.12.7",
8686
"protractor": "^5.1.1",
8787
"ts-node": "^3.3.0",
8888
"tslint": "^5.7.0",
89-
"typescript": "2.5.3"
89+
"typescript": "2.4.2"
9090
}
9191
}

0 commit comments

Comments
 (0)