Skip to content

Commit

Permalink
Add typescript 5.x as an allowed version. (OpenAPITools#18674)
Browse files Browse the repository at this point in the history 
* Add typescript 5.x as an allowed version.

* Adjust version ranges to keep tests passing.

* Update the typescript-rxjs sample.
  • Loading branch information
@jyasskin
jyasskin authored and Renato Mameli committed May 17, 2024
1 parent 73b98c8 commit 6859083
Show file tree
Hide file tree
Showing 32 changed files with 3,399 additions and 9,244 deletions.
2 changes: 1 addition & 1 deletion modules/openapi-generator/src/main/resources/typescript-aurelia/package.json.mustache
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@
},
"devDependencies": {
"tslint": "^3.15.1",
"typescript": "^4.0"
"typescript": "^4.0 || ^5.0"
}
}
4 changes: 2 additions & 2 deletions modules/openapi-generator/src/main/resources/typescript-axios/package.mustache
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
"axios": "^1.6.1"
},
"devDependencies": {
"@types/node": "^12.11.5",
"typescript": "^4.0"
"@types/node": "12.11.5 - 12.20.42",
"typescript": "^4.0 || ^5.0"
}{{#npmRepository}},{{/npmRepository}}
{{#npmRepository}}
"publishConfig": {
Expand Down
2 changes: 1 addition & 1 deletion modules/openapi-generator/src/main/resources/typescript-fetch/package.mustache
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"redux-ts-simple": "^3.2.0",
"reselect": "^4.0.0",
{{/sagasAndRecords}}
"typescript": "^4.0"
"typescript": "^4.0 || ^5.0"
}{{#npmRepository}},{{/npmRepository}}
{{#npmRepository}}
"publishConfig": {
Expand Down
2 changes: 1 addition & 1 deletion modules/openapi-generator/src/main/resources/typescript-jquery/package.mustache
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
},
"devDependencies": {
"@types/jquery": "^3.1",
"typescript": "^4.0"
"typescript": "^4.0 || ^5.0"
}{{#npmRepository}},
"publishConfig": {
"registry": "{{npmRepository}}"
Expand Down
2 changes: 1 addition & 1 deletion modules/openapi-generator/src/main/resources/typescript-nestjs/package.mustache
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"ts-node": "8.3.0",
"tsconfig-paths": "3.8.0",
"tslint": "5.18.0",
"typescript": "^4.0",
"typescript": "^4.0 || ^5.0",
"wait-on": "^3.2.0"
},
"jest": {
Expand Down
2 changes: 1 addition & 1 deletion modules/openapi-generator/src/main/resources/typescript-node/package.mustache
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"@types/bluebird": "^3.5.33",
"@types/node": "^12",
"@types/request": "^2.48.8",
"typescript": "^4.0"
"typescript": "^4.0 || ^5.0"
}{{#npmRepository}},
"publishConfig": {
"registry": "{{npmRepository}}"
Expand Down
2 changes: 1 addition & 1 deletion modules/openapi-generator/src/main/resources/typescript-redux-query/package.mustache
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"redux-query": "^3.2.0"
},
"devDependencies": {
"typescript": "^4.0"
"typescript": "^4.0 || ^5.0"
}{{#npmRepository}},{{/npmRepository}}
{{#npmRepository}}
"publishConfig": {
Expand Down
2 changes: 1 addition & 1 deletion modules/openapi-generator/src/main/resources/typescript-rxjs/package.mustache
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"rxjs": "^7.2.0"
},
"devDependencies": {
"typescript": "^4.0"
"typescript": "^4.0 || ^5.0"
}{{#npmRepository}},{{/npmRepository}}
{{#npmRepository}}
"publishConfig": {
Expand Down
2 changes: 1 addition & 1 deletion ...i-generator/src/test/resources/integrationtests/typescript/node-es5-expected/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"request": "^2.72.0"
},
"devDependencies": {
"typescript": "^4.0",
"typescript": "^4.0 || ^5.0",
"typings": "^0.8.1"
}
}
2 changes: 1 addition & 1 deletion ...tor/src/test/resources/integrationtests/typescript/objectsWithEnums-expected/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"rewire": "^3.0.2"
},
"devDependencies": {
"typescript": "^4.0",
"typescript": "^4.0 || ^5.0",
"@types/node": "8.10.34"
}
}
4 changes: 2 additions & 2 deletions samples/client/echo_api/typescript-axios/build/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"axios": "^1.6.1"
},
"devDependencies": {
"@types/node": "^12.11.5",
"typescript": "^4.0"
"@types/node": "12.11.5 - 12.20.42",
"typescript": "^4.0 || ^5.0"
}
}
2 changes: 1 addition & 1 deletion samples/client/petstore/typescript-aurelia/default/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@
},
"devDependencies": {
"tslint": "^3.15.1",
"typescript": "^4.0"
"typescript": "^4.0 || ^5.0"
}
}
4 changes: 2 additions & 2 deletions samples/client/petstore/typescript-axios/builds/es6-target/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
"axios": "^1.6.1"
},
"devDependencies": {
"@types/node": "^12.11.5",
"typescript": "^4.0"
"@types/node": "12.11.5 - 12.20.42",
"typescript": "^4.0 || ^5.0"
},
"publishConfig": {
"registry": "https://skimdb.npmjs.com/registry"
Expand Down
4 changes: 2 additions & 2 deletions ...etstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
"axios": "^1.6.1"
},
"devDependencies": {
"@types/node": "^12.11.5",
"typescript": "^4.0"
"@types/node": "12.11.5 - 12.20.42",
"typescript": "^4.0 || ^5.0"
},
"publishConfig": {
"registry": "https://skimdb.npmjs.com/registry"
Expand Down
4 changes: 2 additions & 2 deletions samples/client/petstore/typescript-axios/builds/with-npm-version/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
"axios": "^1.6.1"
},
"devDependencies": {
"@types/node": "^12.11.5",
"typescript": "^4.0"
"@types/node": "12.11.5 - 12.20.42",
"typescript": "^4.0 || ^5.0"
},
"publishConfig": {
"registry": "https://skimdb.npmjs.com/registry"
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/typescript-fetch/builds/es6-target/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"prepare": "npm run build"
},
"devDependencies": {
"typescript": "^4.0"
"typescript": "^4.0 || ^5.0"
},
"publishConfig": {
"registry": "https://skimdb.npmjs.com/registry"
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"prepare": "npm run build"
},
"devDependencies": {
"typescript": "^4.0"
"typescript": "^4.0 || ^5.0"
},
"publishConfig": {
"registry": "https://skimdb.npmjs.com/registry"
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/typescript-fetch/builds/sagas-and-records/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"redux-saga": "^1.1.3",
"redux-ts-simple": "^3.2.0",
"reselect": "^4.0.0",
"typescript": "^4.0"
"typescript": "^4.0 || ^5.0"
},
"publishConfig": {
"registry": "https://skimdb.npmjs.com/registry"
Expand Down
20 changes: 6 additions & 14 deletions samples/client/petstore/typescript-fetch/builds/with-npm-version/package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion samples/client/petstore/typescript-fetch/builds/with-npm-version/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"prepare": "npm run build"
},
"devDependencies": {
"typescript": "^4.0"
"typescript": "^4.0 || ^5.0"
},
"publishConfig": {
"registry": "https://skimdb.npmjs.com/registry"
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/typescript-fetch/builds/without-runtime-checks/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"prepare": "npm run build"
},
"devDependencies": {
"typescript": "^4.0"
"typescript": "^4.0 || ^5.0"
},
"publishConfig": {
"registry": "https://skimdb.npmjs.com/registry"
Expand Down
Loading

0 comments on commit 6859083

Please sign in to comment.