From cd2ff0b041a0702ee13c11068b24c573410a008a Mon Sep 17 00:00:00 2001
From: karismann <46601673+karismann@users.noreply.github.com>
Date: Fri, 8 Feb 2019 19:44:48 +0100
Subject: [PATCH] [angular-typescript] Wrong Typescript Version for Angular 6
 with Npm (#2097)

The Angular Compiler 6 requires TypeScript >=2.7.2 and <2.10.0
---
 .../codegen/languages/TypeScriptAngularClientCodegen.java   | 6 +++---
 .../builds/with-npm/package.json                            | 6 +++---
 .../builds/with-npm/package.json                            | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAngularClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAngularClientCodegen.java
index 820e103a362..e13e42f8635 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAngularClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAngularClientCodegen.java
@@ -225,7 +225,7 @@ public class TypeScriptAngularClientCodegen extends AbstractTypeScriptClientCode
             // Angular v7 requires typescript ">=3.1.1 <3.2.0"
             additionalProperties.put("tsVersion", ">=3.1.1 <3.2.0");
         } else if (ngVersion.atLeast("6.0.0")) {
-            additionalProperties.put("tsVersion", ">=2.1.5 <2.7.0");
+            additionalProperties.put("tsVersion", ">=2.7.2 and <2.10.0");
         } else if (ngVersion.atLeast("5.0.0")) {
             additionalProperties.put("tsVersion", ">=2.1.5 <2.7.0");
         } else {
@@ -268,8 +268,8 @@ public class TypeScriptAngularClientCodegen extends AbstractTypeScriptClientCode
             additionalProperties.put("tsickleVersion", "0.34.0");
         } else if (ngVersion.atLeast("6.0.0")) {
             // compatible versions with typescript version
-            additionalProperties.put("ngPackagrVersion", "2.4.5");
-            additionalProperties.put("tsickleVersion", "0.27.5");
+            additionalProperties.put("ngPackagrVersion", "3.0.6");
+            additionalProperties.put("tsickleVersion", "0.32.1");
         } else if (ngVersion.atLeast("5.0.0")) {
             // compatible versions with typescript version
             additionalProperties.put("ngPackagrVersion", "2.4.5");
diff --git a/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/with-npm/package.json b/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/with-npm/package.json
index c3b7ab71c4d..a93bbe8609a 100644
--- a/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/with-npm/package.json
+++ b/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/with-npm/package.json
@@ -27,12 +27,12 @@
     "@angular/common": "^6.0.0",
     "@angular/compiler": "^6.0.0",
     "@angular/platform-browser": "^6.0.0",
-    "ng-packagr": "^2.4.5",
-    "tsickle": "^0.27.5",
+    "ng-packagr": "^3.0.6",
+    "tsickle": "^0.32.1",
     "reflect-metadata": "^0.1.3",
     "rxjs": "^6.1.0",
     "zone.js": "^0.8.26",
-    "typescript": ">=2.1.5 <2.7.0"
+    "typescript": ">=2.7.2 and <2.10.0"
   },
   "publishConfig": {
     "registry": "https://skimdb.npmjs.com/registry"
diff --git a/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/with-npm/package.json b/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/with-npm/package.json
index c3b7ab71c4d..a93bbe8609a 100644
--- a/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/with-npm/package.json
+++ b/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/with-npm/package.json
@@ -27,12 +27,12 @@
     "@angular/common": "^6.0.0",
     "@angular/compiler": "^6.0.0",
     "@angular/platform-browser": "^6.0.0",
-    "ng-packagr": "^2.4.5",
-    "tsickle": "^0.27.5",
+    "ng-packagr": "^3.0.6",
+    "tsickle": "^0.32.1",
     "reflect-metadata": "^0.1.3",
     "rxjs": "^6.1.0",
     "zone.js": "^0.8.26",
-    "typescript": ">=2.1.5 <2.7.0"
+    "typescript": ">=2.7.2 and <2.10.0"
   },
   "publishConfig": {
     "registry": "https://skimdb.npmjs.com/registry"