Resolved #143 - Upgrade angular to v5

aspnetboilerplate · Nov 21, 2017 · 829b179 · 829b179
1 parent 02235e5
commit 829b179
Show file tree

Hide file tree

Showing 4 changed files with 676 additions and 1,010 deletions.
diff --git a/angular/nswag/service.config.nswag b/angular/nswag/service.config.nswag
@@ -1,4 +1,4 @@
-{
+{
   "runtime": "Default",
   "swaggerGenerator": {
     "fromSwagger": {
@@ -38,6 +38,7 @@
       "importRequiredTypes": true,
       "useGetBaseUrlMethod": false,
       "baseUrlTokenName": "API_BASE_URL",
+      "injectionTokenType": "InjectionToken",
       "output": "../src/shared/service-proxies/service-proxies.ts"
     },
     "swaggerToCSharpClient": {
@@ -112,4 +113,4 @@
       "output": null
     }
   }
-}
+}
diff --git a/angular/package.json b/angular/package.json
@@ -13,15 +13,15 @@
     },
     "private": true,
     "dependencies": {
-        "@angular/animations": "^4.3.6",
-        "@angular/common": "^4.3.6",
-        "@angular/compiler": "^4.3.6",
-        "@angular/core": "^4.3.6",
-        "@angular/forms": "^4.3.6",
-        "@angular/http": "^4.3.6",
-        "@angular/platform-browser": "^4.3.6",
-        "@angular/platform-browser-dynamic": "^4.3.6",
-        "@angular/router": "^4.3.6",
+        "@angular/animations": "^5.0.2",
+        "@angular/common": "^5.0.2",
+        "@angular/compiler": "^5.0.2",
+        "@angular/core": "^5.0.2",
+        "@angular/forms": "^5.0.2",
+        "@angular/http": "^5.0.2",
+        "@angular/platform-browser": "^5.0.2",
+        "@angular/platform-browser-dynamic": "^5.0.2",
+        "@angular/router": "^5.0.2",
         "@types/bootstrap": "^3.3.33",
         "@types/jquery": "^3.2.12",
         "@types/jquery.blockui": "0.0.28",
@@ -31,8 +31,8 @@
         "@types/moment-timezone": "^0.2.34",
         "@types/signalr": "^2.2.33",
         "@types/toastr": "^2.1.33",
-        "abp-ng2-module": "^1.2.4",
-        "abp-web-resources": "^3.1.0",
+        "abp-ng2-module": "^1.3.0",
+        "abp-web-resources": "^3.2.2",
         "animate.css": "^3.5.2",
         "block-ui": "^2.70.1",
         "bootstrap": "^3.3.7",
@@ -57,7 +57,7 @@
         "node-waves": "^0.7.5",
         "push.js": "1.0.4",
         "raphael": "^2.2.7",
-        "rxjs": "^5.3.0",
+        "rxjs": "^5.5.2",
         "signalr": "^2.2.1",
         "simple-line-icons": "^2.4.1",
         "spin.js": "^2.3.2",
@@ -68,8 +68,8 @@
         "zone.js": "0.8.18"
     },
     "devDependencies": {
-        "@angular/cli": "^1.3.2",
-        "@angular/compiler-cli": "^4.3.6",
+        "@angular/cli": "^1.5.0",
+        "@angular/compiler-cli": "^5.0.2",
         "@angularclass/hmr": "^2.1.3",
         "@types/jasmine": "^2.5.38",
         "@types/node": "^8.0.27",
@@ -82,10 +82,10 @@
         "karma-coverage-istanbul-reporter": "^1.3.0",
         "karma-jasmine": "^1.1.0",
         "karma-jasmine-html-reporter": "^0.2.2",
-        "nswag": "^11.6.1",
+        "nswag": "^11.12.7",
         "protractor": "^5.1.1",
         "ts-node": "^3.3.0",
         "tslint": "^5.7.0",
-        "typescript": "2.5.3"
+        "typescript": "2.4.2"
     }
 }