Skip to content

Commit 6b0c316

Browse files
committed
added latest versions for typescript-angular generator
1 parent 1a10163 commit 6b0c316

File tree

2 files changed

+29
-18
lines changed

2 files changed

+29
-18
lines changed

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/TypeScriptAngularClientCodegen.java

Lines changed: 29 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -167,55 +167,76 @@ private void addNpmPackageGeneration(SemVer ngVersion) {
167167
}
168168

169169
// Set the typescript version compatible to the Angular version
170-
if (ngVersion.atLeast("11.0.0")) {
170+
if (ngVersion.atLeast("15.0.0")) {
171+
additionalProperties.put("tsVersion", ">=4.8.2 <4.10.0");
172+
additionalProperties.put("rxjsVersion", "7.5.5");
173+
additionalProperties.put("ngPackagrVersion", "15.0.2");
174+
additionalProperties.put("zonejsVersion", "0.11.5");
175+
176+
additionalProperties.put("skipHttpImport", true);
177+
} else if (ngVersion.atLeast("14.0.0")) {
178+
additionalProperties.put("tsVersion", ">=4.6.0 <=4.8.0");
179+
additionalProperties.put("rxjsVersion", "7.5.5");
180+
additionalProperties.put("ngPackagrVersion", "14.0.2");
181+
additionalProperties.put("zonejsVersion", "0.11.5");
182+
183+
additionalProperties.put("skipHttpImport", true);
184+
} else if (ngVersion.atLeast("13.0.0")) {
185+
additionalProperties.put("tsVersion", ">=4.4.2 <4.5.0");
186+
additionalProperties.put("rxjsVersion", "7.4.0");
187+
additionalProperties.put("ngPackagrVersion", "13.0.3");
188+
additionalProperties.put("zonejsVersion", "0.11.4");
189+
190+
additionalProperties.put("skipHttpImport", true);
191+
} else if (ngVersion.atLeast("12.0.0")) {
192+
additionalProperties.put("tsVersion", ">=4.3.0 <4.4.0");
193+
additionalProperties.put("rxjsVersion", "7.4.0");
194+
additionalProperties.put("ngPackagrVersion", "12.2.1");
195+
additionalProperties.put("zonejsVersion", "0.11.4");
196+
197+
additionalProperties.put("skipHttpImport", true);
198+
} else if (ngVersion.atLeast("11.0.0")) {
171199
additionalProperties.put("tsVersion", ">=4.0.0 <4.1.0");
172200
additionalProperties.put("rxjsVersion", "6.6.0");
173201
additionalProperties.put("ngPackagrVersion", "11.0.2");
174-
additionalProperties.put("tsickleVersion", "0.39.1");
175202
additionalProperties.put("zonejsVersion", "0.11.3");
176203

177204
additionalProperties.put("skipHttpImport", true);
178205
} else if (ngVersion.atLeast("10.0.0")) {
179206
additionalProperties.put("tsVersion", ">=3.9.2 <4.0.0");
180207
additionalProperties.put("rxjsVersion", "6.6.0");
181208
additionalProperties.put("ngPackagrVersion", "10.0.3");
182-
additionalProperties.put("tsickleVersion", "0.39.1");
183209
additionalProperties.put("zonejsVersion", "0.10.2");
184210

185211
additionalProperties.put("skipHttpImport", true);
186212
} else if (ngVersion.atLeast("9.0.0")) {
187213
additionalProperties.put("tsVersion", ">=3.6.0 <3.8.0");
188214
additionalProperties.put("rxjsVersion", "6.5.3");
189215
additionalProperties.put("ngPackagrVersion", "9.0.1");
190-
additionalProperties.put("tsickleVersion", "0.38.0");
191216
additionalProperties.put("zonejsVersion", "0.10.2");
192217

193218
additionalProperties.put("skipHttpImport", true);
194219
} else if (ngVersion.atLeast("8.0.0")) {
195220
additionalProperties.put("tsVersion", ">=3.4.0 <3.6.0");
196221
additionalProperties.put("rxjsVersion", "6.5.0");
197222
additionalProperties.put("ngPackagrVersion", "5.4.0");
198-
additionalProperties.put("tsickleVersion", "0.35.0");
199223
additionalProperties.put("zonejsVersion", "0.9.1");
200224

201225
additionalProperties.put("skipHttpImport", true);
202226
} else if (ngVersion.atLeast("7.0.0")) {
203227
additionalProperties.put("tsVersion", ">=3.1.1 <3.2.0");
204228
additionalProperties.put("rxjsVersion", "6.3.0");
205229
additionalProperties.put("ngPackagrVersion", "5.1.0");
206-
additionalProperties.put("tsickleVersion", "0.34.0");
207230
additionalProperties.put("zonejsVersion", "0.8.26");
208231
} else if (ngVersion.atLeast("6.0.0")) {
209232
additionalProperties.put("tsVersion", ">=2.7.2 and <2.10.0");
210233
additionalProperties.put("rxjsVersion", "6.1.0");
211234
additionalProperties.put("ngPackagrVersion", "3.0.6");
212-
additionalProperties.put("tsickleVersion", "0.32.1");
213235
additionalProperties.put("zonejsVersion", "0.8.26");
214236
} else {
215237
additionalProperties.put("tsVersion", ">=2.1.5 and <2.8");
216238
additionalProperties.put("rxjsVersion", "6.1.0");
217239
additionalProperties.put("ngPackagrVersion", "3.0.6");
218-
additionalProperties.put("tsickleVersion", "0.32.1");
219240
additionalProperties.put("zonejsVersion", "0.8.26");
220241
}
221242

modules/swagger-codegen/src/main/resources/typescript-angular/package.mustache

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,6 @@
2121
"postinstall": "npm run build"
2222
},
2323
{{/useNgPackagr}}
24-
"peerDependencies": {
25-
"@angular/core": "^{{ngVersion}}",
26-
{{^skipHttpImport}}
27-
"@angular/http": "^{{ngVersion}}",
28-
{{/skipHttpImport}}
29-
"@angular/common": "^{{ngVersion}}",
30-
"@angular/compiler": "^{{ngVersion}}",
31-
"rxjs": "^{{rxjsVersion}}",
32-
"zone.js": "^{{zonejsVersion}}"
33-
},
3424
"devDependencies": {
3525
"@angular/compiler-cli": "^{{ngVersion}}",
3626
"@angular/core": "^{{ngVersion}}",

0 commit comments

Comments
 (0)