Add typescript 5.x as an allowed version. (#18674)

* Add typescript 5.x as an allowed version. * Adjust version ranges to keep tests passing. * Update the typescript-rxjs sample.
2024-05-15 13:09:55 -07:00 · 2024-05-15 13:09:55 -07:00 · 7e94c873f7
commit 7e94c873f7
parent 70130edaab
32 changed files with 1567 additions and 7412 deletions
--- a/modules/openapi-generator/src/main/resources/typescript-aurelia/package.json.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-aurelia/package.json.mustache
@ -22,6 +22,6 @@
  },
  "devDependencies": {
    "tslint": "^3.15.1",
-    "typescript": "^4.0"
+    "typescript": "^4.0 || ^5.0"
  }
 }
--- a/modules/openapi-generator/src/main/resources/typescript-axios/package.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-axios/package.mustache
@ -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": {
--- a/modules/openapi-generator/src/main/resources/typescript-fetch/package.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-fetch/package.mustache
@ -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": {
--- a/modules/openapi-generator/src/main/resources/typescript-jquery/package.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-jquery/package.mustache
@ -19,7 +19,7 @@
    },
    "devDependencies": {
        "@types/jquery": "^3.1",
-        "typescript": "^4.0"
+        "typescript": "^4.0 || ^5.0"
    }{{#npmRepository}},
    "publishConfig": {
        "registry": "{{npmRepository}}"
--- a/modules/openapi-generator/src/main/resources/typescript-nestjs/package.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-nestjs/package.mustache
@ -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": {
--- a/modules/openapi-generator/src/main/resources/typescript-node/package.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-node/package.mustache
@ -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}}"
--- a/modules/openapi-generator/src/main/resources/typescript-redux-query/package.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-redux-query/package.mustache
@ -17,7 +17,7 @@
    "redux-query": "^3.2.0"
  },
  "devDependencies": {
-    "typescript": "^4.0"
+    "typescript": "^4.0 || ^5.0"
  }{{#npmRepository}},{{/npmRepository}}
 {{#npmRepository}}
  "publishConfig": {
--- a/modules/openapi-generator/src/main/resources/typescript-rxjs/package.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-rxjs/package.mustache
@ -17,7 +17,7 @@
    "rxjs": "^7.2.0"
  },
  "devDependencies": {
-    "typescript": "^4.0"
+    "typescript": "^4.0 || ^5.0"
  }{{#npmRepository}},{{/npmRepository}}
 {{#npmRepository}}
  "publishConfig": {
--- a/modules/openapi-generator/src/test/resources/integrationtests/typescript/node-es5-expected/package.json
+++ b/modules/openapi-generator/src/test/resources/integrationtests/typescript/node-es5-expected/package.json
@ -17,7 +17,7 @@
        "request": "^2.72.0"
    },
    "devDependencies": {
-        "typescript": "^4.0",
+        "typescript": "^4.0 || ^5.0",
        "typings": "^0.8.1"
    }
 }
--- a/modules/openapi-generator/src/test/resources/integrationtests/typescript/objectsWithEnums-expected/package.json
+++ b/modules/openapi-generator/src/test/resources/integrationtests/typescript/objectsWithEnums-expected/package.json
@ -20,7 +20,7 @@
        "rewire": "^3.0.2"
    },
    "devDependencies": {
-        "typescript": "^4.0",
+        "typescript": "^4.0 || ^5.0",
        "@types/node": "8.10.34"
    }
 }
--- a/samples/client/echo_api/typescript-axios/build/package.json
+++ b/samples/client/echo_api/typescript-axios/build/package.json
@ -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"
  }
 }
--- a/samples/client/petstore/typescript-aurelia/default/package.json
+++ b/samples/client/petstore/typescript-aurelia/default/package.json
@ -22,6 +22,6 @@
  },
  "devDependencies": {
    "tslint": "^3.15.1",
-    "typescript": "^4.0"
+    "typescript": "^4.0 || ^5.0"
  }
 }
--- a/samples/client/petstore/typescript-axios/builds/es6-target/package.json
+++ b/samples/client/petstore/typescript-axios/builds/es6-target/package.json
@ -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"
--- a/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/package.json
+++ b/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/package.json
@ -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"
--- a/samples/client/petstore/typescript-axios/builds/with-npm-version/package.json
+++ b/samples/client/petstore/typescript-axios/builds/with-npm-version/package.json
@ -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"
--- a/samples/client/petstore/typescript-fetch/builds/es6-target/package.json
+++ b/samples/client/petstore/typescript-fetch/builds/es6-target/package.json
@ -16,7 +16,7 @@
    "prepare": "npm run build"
  },
  "devDependencies": {
-    "typescript": "^4.0"
+    "typescript": "^4.0 || ^5.0"
  },
  "publishConfig": {
    "registry": "https://skimdb.npmjs.com/registry"
--- a/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/package.json
+++ b/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/package.json
@ -14,7 +14,7 @@
    "prepare": "npm run build"
  },
  "devDependencies": {
-    "typescript": "^4.0"
+    "typescript": "^4.0 || ^5.0"
  },
  "publishConfig": {
    "registry": "https://skimdb.npmjs.com/registry"
--- a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/package.json
+++ b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/package.json
@ -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"
--- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/package-lock.json
+++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/package-lock.json
@ -1,36 +1,28 @@
 {
  "name": "@openapitools/typescript-fetch-petstore",
  "version": "1.0.0",
-  "lockfileVersion": 2,
+  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "@openapitools/typescript-fetch-petstore",
      "version": "1.0.0",
      "devDependencies": {
-        "typescript": "^4.0"
+        "typescript": "^4.0 || ^5.0"
      }
    },
    "node_modules/typescript": {
-      "version": "4.6.3",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.6.3.tgz",
-      "integrity": "sha512-yNIatDa5iaofVozS/uQJEl3JRWLKKGJKh6Yaiv0GLGSuhpFJe7P3SbHZ8/yjAHRQwKRoA6YZqlfjXWmVzoVSMw==",
+      "version": "5.4.5",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.5.tgz",
+      "integrity": "sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==",
      "dev": true,
      "bin": {
        "tsc": "bin/tsc",
        "tsserver": "bin/tsserver"
      },
      "engines": {
-        "node": ">=4.2.0"
+        "node": ">=14.17"
      }
    }
-  },
-  "dependencies": {
-    "typescript": {
-      "version": "4.6.3",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.6.3.tgz",
-      "integrity": "sha512-yNIatDa5iaofVozS/uQJEl3JRWLKKGJKh6Yaiv0GLGSuhpFJe7P3SbHZ8/yjAHRQwKRoA6YZqlfjXWmVzoVSMw==",
-      "dev": true
-    }
  }
 }
--- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/package.json
+++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/package.json
@ -14,7 +14,7 @@
    "prepare": "npm run build"
  },
  "devDependencies": {
-    "typescript": "^4.0"
+    "typescript": "^4.0 || ^5.0"
  },
  "publishConfig": {
    "registry": "https://skimdb.npmjs.com/registry"
--- a/samples/client/petstore/typescript-fetch/builds/without-runtime-checks/package.json
+++ b/samples/client/petstore/typescript-fetch/builds/without-runtime-checks/package.json
@ -14,7 +14,7 @@
    "prepare": "npm run build"
  },
  "devDependencies": {
-    "typescript": "^4.0"
+    "typescript": "^4.0 || ^5.0"
  },
  "publishConfig": {
    "registry": "https://skimdb.npmjs.com/registry"
--- a/samples/client/petstore/typescript-fetch/tests/default/package-lock.json
+++ b/samples/client/petstore/typescript-fetch/tests/default/package-lock.json
--- a/samples/client/petstore/typescript-fetch/tests/default/package.json
+++ b/samples/client/petstore/typescript-fetch/tests/default/package.json
@ -26,7 +26,7 @@
    "node-fetch": "^2.2.0",
    "ts-loader": "^2.3.0",
    "tsify": "^3.0.4",
-    "typescript": "^4.0",
+    "typescript": "^4.0 || ^5.0",
    "typings": "^2.1.1",
    "webpack": "^1.13.0"
  },
--- a/samples/client/petstore/typescript-jquery/npm/package.json
+++ b/samples/client/petstore/typescript-jquery/npm/package.json
@ -19,7 +19,7 @@
    },
    "devDependencies": {
        "@types/jquery": "^3.1",
-        "typescript": "^4.0"
+        "typescript": "^4.0 || ^5.0"
    },
    "publishConfig": {
        "registry": "https://skimdb.npmjs.com/registry"
--- a/samples/client/petstore/typescript-nestjs-v6-provided-in-root/builds/default/package.json
+++ b/samples/client/petstore/typescript-nestjs-v6-provided-in-root/builds/default/package.json
@ -50,7 +50,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": {
--- a/samples/client/petstore/typescript-nestjs-v8-provided-in-root/builds/default/package.json
+++ b/samples/client/petstore/typescript-nestjs-v8-provided-in-root/builds/default/package.json
@ -51,7 +51,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": {
--- a/samples/client/petstore/typescript-node/npm/package.json
+++ b/samples/client/petstore/typescript-node/npm/package.json
@ -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"
    },
    "publishConfig": {
        "registry": "https://skimdb.npmjs.com/registry"
--- a/samples/client/petstore/typescript-redux-query/builds/with-npm-version/package.json
+++ b/samples/client/petstore/typescript-redux-query/builds/with-npm-version/package.json
@ -17,7 +17,7 @@
    "redux-query": "^3.2.0"
  },
  "devDependencies": {
-    "typescript": "^4.0"
+    "typescript": "^4.0 || ^5.0"
  },
  "publishConfig": {
    "registry": "https://skimdb.npmjs.com/registry"
--- a/samples/client/petstore/typescript-rxjs/builds/es6-target/package.json
+++ b/samples/client/petstore/typescript-rxjs/builds/es6-target/package.json
@ -17,7 +17,7 @@
    "rxjs": "^7.2.0"
  },
  "devDependencies": {
-    "typescript": "^4.0"
+    "typescript": "^4.0 || ^5.0"
  },
  "publishConfig": {
    "registry": "https://skimdb.npmjs.com/registry"
--- a/samples/client/petstore/typescript-rxjs/builds/with-npm-version/package.json
+++ b/samples/client/petstore/typescript-rxjs/builds/with-npm-version/package.json
@ -17,7 +17,7 @@
    "rxjs": "^7.2.0"
  },
  "devDependencies": {
-    "typescript": "^4.0"
+    "typescript": "^4.0 || ^5.0"
  },
  "publishConfig": {
    "registry": "https://skimdb.npmjs.com/registry"
--- a/samples/openapi3/client/petstore/typescript/tests/default/package.json
+++ b/samples/openapi3/client/petstore/typescript/tests/default/package.json
@ -12,10 +12,10 @@
    "build": "tsc"
  },
  "devDependencies": {
-    "@types/chai": "^4.0.1",
+    "@types/chai": "4.0.1 - 4.1.x",
    "@types/isomorphic-fetch": "0.0.34",
    "@types/mocha": "^2.2.41",
-    "@types/node": "^8.10.38",
+    "@types/node": "8.10.38 - 8.10.62",
    "chai": "^4.1.0",
    "mocha": "^5.2.0",
    "ts-loader": "^2.3.0",
--- a/samples/openapi3/client/petstore/typescript/tests/object_params/package.json
+++ b/samples/openapi3/client/petstore/typescript/tests/object_params/package.json
@ -12,10 +12,10 @@
    "build": "tsc"
  },
  "devDependencies": {
-    "@types/chai": "^4.0.1",
+    "@types/chai": "4.0.1 - 4.1.x",
    "@types/isomorphic-fetch": "0.0.34",
    "@types/mocha": "^2.2.41",
-    "@types/node": "^8.10.38",
+    "@types/node": "8.10.38 - 8.10.62",
    "chai": "^4.1.0",
    "mocha": "^5.2.0",
    "ts-loader": "^2.3.0",