Skip to content

Generators tweaks #12088

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 10, 2023
Merged

Generators tweaks #12088

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6b0c316
added latest versions for typescript-angular generator
HugoMario Mar 10, 2023
3396a17
removed not working link from nuget config file
HugoMario Mar 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 29 additions & 8 deletions ...er-codegen/src/main/java/io/swagger/codegen/languages/TypeScriptAngularClientCodegen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,55 +167,76 @@ private void addNpmPackageGeneration(SemVer ngVersion) {
}

// Set the typescript version compatible to the Angular version
if (ngVersion.atLeast("11.0.0")) {
if (ngVersion.atLeast("15.0.0")) {
additionalProperties.put("tsVersion", ">=4.8.2 <4.10.0");
additionalProperties.put("rxjsVersion", "7.5.5");
additionalProperties.put("ngPackagrVersion", "15.0.2");
additionalProperties.put("zonejsVersion", "0.11.5");

additionalProperties.put("skipHttpImport", true);
} else if (ngVersion.atLeast("14.0.0")) {
additionalProperties.put("tsVersion", ">=4.6.0 <=4.8.0");
additionalProperties.put("rxjsVersion", "7.5.5");
additionalProperties.put("ngPackagrVersion", "14.0.2");
additionalProperties.put("zonejsVersion", "0.11.5");

additionalProperties.put("skipHttpImport", true);
} else if (ngVersion.atLeast("13.0.0")) {
additionalProperties.put("tsVersion", ">=4.4.2 <4.5.0");
additionalProperties.put("rxjsVersion", "7.4.0");
additionalProperties.put("ngPackagrVersion", "13.0.3");
additionalProperties.put("zonejsVersion", "0.11.4");

additionalProperties.put("skipHttpImport", true);
} else if (ngVersion.atLeast("12.0.0")) {
additionalProperties.put("tsVersion", ">=4.3.0 <4.4.0");
additionalProperties.put("rxjsVersion", "7.4.0");
additionalProperties.put("ngPackagrVersion", "12.2.1");
additionalProperties.put("zonejsVersion", "0.11.4");

additionalProperties.put("skipHttpImport", true);
} else if (ngVersion.atLeast("11.0.0")) {
additionalProperties.put("tsVersion", ">=4.0.0 <4.1.0");
additionalProperties.put("rxjsVersion", "6.6.0");
additionalProperties.put("ngPackagrVersion", "11.0.2");
additionalProperties.put("tsickleVersion", "0.39.1");
additionalProperties.put("zonejsVersion", "0.11.3");

additionalProperties.put("skipHttpImport", true);
} else if (ngVersion.atLeast("10.0.0")) {
additionalProperties.put("tsVersion", ">=3.9.2 <4.0.0");
additionalProperties.put("rxjsVersion", "6.6.0");
additionalProperties.put("ngPackagrVersion", "10.0.3");
additionalProperties.put("tsickleVersion", "0.39.1");
additionalProperties.put("zonejsVersion", "0.10.2");

additionalProperties.put("skipHttpImport", true);
} else if (ngVersion.atLeast("9.0.0")) {
additionalProperties.put("tsVersion", ">=3.6.0 <3.8.0");
additionalProperties.put("rxjsVersion", "6.5.3");
additionalProperties.put("ngPackagrVersion", "9.0.1");
additionalProperties.put("tsickleVersion", "0.38.0");
additionalProperties.put("zonejsVersion", "0.10.2");

additionalProperties.put("skipHttpImport", true);
} else if (ngVersion.atLeast("8.0.0")) {
additionalProperties.put("tsVersion", ">=3.4.0 <3.6.0");
additionalProperties.put("rxjsVersion", "6.5.0");
additionalProperties.put("ngPackagrVersion", "5.4.0");
additionalProperties.put("tsickleVersion", "0.35.0");
additionalProperties.put("zonejsVersion", "0.9.1");

additionalProperties.put("skipHttpImport", true);
} else if (ngVersion.atLeast("7.0.0")) {
additionalProperties.put("tsVersion", ">=3.1.1 <3.2.0");
additionalProperties.put("rxjsVersion", "6.3.0");
additionalProperties.put("ngPackagrVersion", "5.1.0");
additionalProperties.put("tsickleVersion", "0.34.0");
additionalProperties.put("zonejsVersion", "0.8.26");
} else if (ngVersion.atLeast("6.0.0")) {
additionalProperties.put("tsVersion", ">=2.7.2 and <2.10.0");
additionalProperties.put("rxjsVersion", "6.1.0");
additionalProperties.put("ngPackagrVersion", "3.0.6");
additionalProperties.put("tsickleVersion", "0.32.1");
additionalProperties.put("zonejsVersion", "0.8.26");
} else {
additionalProperties.put("tsVersion", ">=2.1.5 and <2.8");
additionalProperties.put("rxjsVersion", "6.1.0");
additionalProperties.put("ngPackagrVersion", "3.0.6");
additionalProperties.put("tsickleVersion", "0.32.1");
additionalProperties.put("zonejsVersion", "0.8.26");
}

Expand Down
1 change: 0 additions & 1 deletion modules/swagger-codegen/src/main/resources/aspnetcore/NuGet.Config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
<packageSources>
<!--To inherit the global NuGet package sources remove the <clear/> line below -->
<clear />
<add key="dotnet-core" value="https://www.myget.org/F/dotnet-core/api/v3/index.json" />
<add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
</packageSources>
</configuration>
10 changes: 0 additions & 10 deletions modules/swagger-codegen/src/main/resources/typescript-angular/package.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,6 @@
"postinstall": "npm run build"
},
{{/useNgPackagr}}
"peerDependencies": {
"@angular/core": "^{{ngVersion}}",
{{^skipHttpImport}}
"@angular/http": "^{{ngVersion}}",
{{/skipHttpImport}}
"@angular/common": "^{{ngVersion}}",
"@angular/compiler": "^{{ngVersion}}",
"rxjs": "^{{rxjsVersion}}",
"zone.js": "^{{zonejsVersion}}"
},
"devDependencies": {
"@angular/compiler-cli": "^{{ngVersion}}",
"@angular/core": "^{{ngVersion}}",
Expand Down