Fixed ngPackagr and Angular 8 support

Author: hypery2k

src/main/java/io/swagger/codegen/v3/generators/typescript/TypeScriptAngularClientCodegen.java

@@ -125,10 +125,12 @@ public void processOpts() {
             LOGGER.info("  (you can select the angular version by setting the additionalProperty ngVersion)");
         }
         additionalProperties.put(NG_VERSION, ngVersion);
+        additionalProperties.put("useNgPackagr", ngVersion.atLeast("8.0.0"));
         additionalProperties.put("useRxJS6", ngVersion.atLeast("6.0.0"));
         additionalProperties.put("injectionToken", ngVersion.atLeast("4.0.0") ? "InjectionToken" : "OpaqueToken");
         additionalProperties.put("injectionTokenTyped", ngVersion.atLeast("4.0.0"));
         additionalProperties.put("useHttpClient", ngVersion.atLeast("4.3.0"));
+        additionalProperties.put("useHttpClientPackage", ngVersion.atLeast("4.3.0") && !ngVersion.atLeast("8.0.0"));
         if (!ngVersion.atLeast("4.3.0")) {
             supportingFiles.add(new SupportingFile("rxjs-operators.mustache", getIndexDirectory(), "rxjs-operators.ts"));
         }

src/main/resources/handlebars/typescript-angular/package.mustache

@@ -22,8 +22,8 @@
   },
   {{/useNgPackagr}}
   "peerDependencies": {
-    "@angular/core": "^{{ngVersion}}",
-    "@angular/http": "^{{ngVersion}}",
+    "@angular/core": "^{{ngVersion}}",{{#useHttpClientPackage}}
+    "@angular/http": "^{{ngVersion}}",{{/useHttpClientPackage}}
     "@angular/common": "^{{ngVersion}}",
     "@angular/compiler": "^{{ngVersion}}",
     "core-js": "^2.4.0",
@@ -34,12 +34,12 @@
   },
   "devDependencies": {
     "@angular/compiler-cli": "^{{ngVersion}}",
-    "@angular/core": "^{{ngVersion}}",
-    "@angular/http": "^{{ngVersion}}",
+    "@angular/core": "^{{ngVersion}}",,{{#useHttpClientPackage}}
+    "@angular/http": "^{{ngVersion}}",{{/useHttpClientPackage}}
     "@angular/common": "^{{ngVersion}}",
     "@angular/compiler": "^{{ngVersion}}",
     "@angular/platform-browser": "^{{ngVersion}}",{{#useNgPackagr}}
-    "ng-packagr": {{#useOldNgPackagr}}"^1.6.0"{{/useOldNgPackagr}}{{^useOldNgPackagr}}{{#useRxJS6}}"5.3.0"{{/useRxJS6}}{{^useRxJS6}}"^2.4.1"{{/useRxJS6}}{{/useOldNgPackagr}},{{/useNgPackagr}}
+    "ng-packagr": {{#useOldNgPackagr}}"^1.6.0"{{/useOldNgPackagr}}{{^useOldNgPackagr}}{{#useRxJS6}}"5.5.1"{{/useRxJS6}}{{^useRxJS6}}"^2.4.1"{{/useRxJS6}}{{/useOldNgPackagr}},{{/useNgPackagr}}
     "reflect-metadata": "^0.1.3",
     "rxjs": "{{#useRxJS6}}~6.3.3{{/useRxJS6}}{{^useRxJS6}}^5.4.0{{/useRxJS6}}",
     "zone.js": "^0.7.6",

src/main/resources/mustache/typescript-angular/package.mustache

@@ -22,8 +22,8 @@
   },
   {{/useNgPackagr}}
   "peerDependencies": {
-    "@angular/core": "^{{ngVersion}}",
-    "@angular/http": "^{{ngVersion}}",
+    "@angular/core": "^{{ngVersion}}",{{^useHttpClientPackage}}
+    "@angular/http": "^{{ngVersion}}",{{/useHttpClientPackage}}
     "@angular/common": "^{{ngVersion}}",
     "@angular/compiler": "^{{ngVersion}}",
     "core-js": "^2.4.0",
@@ -33,8 +33,8 @@
   },
   "devDependencies": {
     "@angular/compiler-cli": "^{{ngVersion}}",
-    "@angular/core": "^{{ngVersion}}",
-    "@angular/http": "^{{ngVersion}}",
+    "@angular/core": "^{{ngVersion}}",{{^useHttpClientPackage}}
+    "@angular/http": "^{{ngVersion}}",{{/useHttpClientPackage}}
     "@angular/common": "^{{ngVersion}}",
     "@angular/compiler": "^{{ngVersion}}",
     "@angular/platform-browser": "^{{ngVersion}}",{{#useNgPackagr}}