diff --git a/docker/seed/Dockerfile.ts b/docker/seed/Dockerfile.ts index 7b99f4fe486..d5a4f58f290 100644 --- a/docker/seed/Dockerfile.ts +++ b/docker/seed/Dockerfile.ts @@ -1,44 +1,28 @@ FROM node:lts-slim -RUN yarn add \ - # jest - jest@29.7.0 \ - @types/jest@29.5.5 \ - # node fetch - node-fetch@2.7.0 \ - @types/node-fetch@2.6.9 \ - # node - @types/node@17.0.33 \ - # qs - qs@6.11.2 \ - @types/qs@6.9.8 \ - # url join +RUN yarn add \ + jest@^29.7.0 \ + @types/jest@^29.5.14 \ + node-fetch@^2.7.0 \ + @types/node-fetch@^2.6.12 \ + @types/node@^17.0.41 \ + qs@^6.13.1 \ + @types/qs@^6.9.17 \ url-join@4.0.1 \ @types/url-join@4.0.1 \ - # readable stream - readable-stream@4.5.2 \ - @types/readable-stream@4.0.15 \ - # form data - form-data@4.0.0 \ - # formdata-node - formdata-node@6.0.3 \ - # jest env jsdom - jest-environment-jsdom@29.7.0 \ - # js base64 - "js-base64@3.7.2" \ - # prettier - prettier@2.7.1 \ - # ts jest - ts-jest@29.1.1 \ - # typescript - "typescript@4.6.4" \ - # form data encoder - form-data-encoder@4.0.2 \ - # webpack - ts-loader@9.3.1 \ - webpack@5.94.0 \ - # fetch mock jest - fetch-mock-jest@1.5.1 + readable-stream@^4.5.2 \ + @types/readable-stream@^4.0.18 \ + form-data@^4.0.0 \ + formdata-node@^6.0.3 \ + jest-environment-jsdom@^29.7.0 \ + js-base64@3.7.7 \ + prettier@^3.4.2 \ + ts-jest@^29.1.1 \ + typescript@~5.7.2 \ + form-data-encoder@^4.0.2 \ + ts-loader@^9.5.1 \ + webpack@^5.97.1 \ + fetch-mock-jest@^1.5.1 # Installs tsc RUN npm install -g typescript diff --git a/generators/typescript-v2/dynamic-snippets/package.json b/generators/typescript-v2/dynamic-snippets/package.json index b275e7dbd11..9855a8d572a 100644 --- a/generators/typescript-v2/dynamic-snippets/package.json +++ b/generators/typescript-v2/dynamic-snippets/package.json @@ -42,7 +42,7 @@ "prettier": "^3.4.2", "string.prototype.replaceall": "^1.0.10", "tsup": "^8.3.5", - "typescript": "4.6.4", + "typescript": "5.7.2", "vitest": "^2.0.5" } } diff --git a/generators/typescript/express/cli/docker/cache_heavy_dependencies.sh b/generators/typescript/express/cli/docker/cache_heavy_dependencies.sh index 0fa603bb56c..6682910e08c 100755 --- a/generators/typescript/express/cli/docker/cache_heavy_dependencies.sh +++ b/generators/typescript/express/cli/docker/cache_heavy_dependencies.sh @@ -16,8 +16,8 @@ yarn add \ axios@0.27.2 \ esbuild@0.16.15 \ express@4.18.2 \ - prettier@2.7.1 \ - typescript@4.6.4 \ + prettier@3.4.2 \ + typescript@5.7.2 \ url-join@4.0.1 cd .. diff --git a/generators/typescript/sdk/cli/browser-docker/cache_heavy_dependencies.sh b/generators/typescript/sdk/cli/browser-docker/cache_heavy_dependencies.sh index 710cb606460..ade2615bd7e 100755 --- a/generators/typescript/sdk/cli/browser-docker/cache_heavy_dependencies.sh +++ b/generators/typescript/sdk/cli/browser-docker/cache_heavy_dependencies.sh @@ -14,7 +14,8 @@ yarn add \ @types/node-fetch@^2.6.12 \ @types/node@^17.0.41 \ @types/qs@^6.9.17 \ - form-data@^4.0.1 \ + @types/url-join@4.0.1 \ + form-data@^4.0.0 \ jest-environment-jsdom@^29.7.0 \ jest@^29.7.0 \ js-base64@^3.7.7 \ @@ -23,7 +24,7 @@ yarn add \ qs@^6.13.1 \ ts-jest@^29.1.1 \ typescript@~5.7.2 \ - url-join@^5.0.0 + url-join@4.0.1 cd .. /bin/rm -rf $project_name diff --git a/generators/typescript/sdk/cli/node-docker/Dockerfile b/generators/typescript/sdk/cli/node-docker/Dockerfile index 92368240eff..728168b8d07 100644 --- a/generators/typescript/sdk/cli/node-docker/Dockerfile +++ b/generators/typescript/sdk/cli/node-docker/Dockerfile @@ -7,42 +7,26 @@ RUN apk --no-cache add git zip \ RUN yarn init --yes RUN yarn add \ - # jest jest@^29.7.0 \ @types/jest@^29.5.14 \ - # node fetch node-fetch@^2.7.0 \ @types/node-fetch@^2.6.12 \ - # node @types/node@^17.0.41 \ - # qs qs@^6.13.1 \ @types/qs@^6.9.17 \ - # url join url-join@^5.0.0 \ - # readable stream readable-stream@^4.6.0 \ @types/readable-stream@^4.0.18 \ - # form data - form-data@^4.0.1 \ - # formdata-node + form-data@^4.0.0 \ formdata-node@^6.0.3 \ - # jest env jsdom jest-environment-jsdom@^29.7.0 \ - # js base64 js-base64@^3.7.7 \ - # prettier prettier@^3.4.2 \ - # ts jest ts-jest@^29.1.1 \ - # typescript typescript@~5.7.2 \ - # form data encoder form-data-encoder@^4.0.2 \ - # webpack ts-loader@^9.5.1 \ webpack@^5.97.1 \ - # fetch mock jest fetch-mock-jest@^1.5.1 COPY generators/typescript/utils/core-utilities/fetcher/src/ /assets/fetcher diff --git a/packages/cli/api-importers/openapi/openapi-ir/package.json b/packages/cli/api-importers/openapi/openapi-ir/package.json index 4b447e84590..1eadb2e873a 100644 --- a/packages/cli/api-importers/openapi/openapi-ir/package.json +++ b/packages/cli/api-importers/openapi/openapi-ir/package.json @@ -38,6 +38,6 @@ "vitest": "^2.1.4", "@trivago/prettier-plugin-sort-imports": "^5.2.1", "prettier": "^3.4.2", - "typescript": "4.6.4" + "typescript": "5.7.2" } } \ No newline at end of file diff --git a/packages/generators/docker/cache_heavy_deps.sh b/packages/generators/docker/cache_heavy_deps.sh index 408eb591150..ade2615bd7e 100644 --- a/packages/generators/docker/cache_heavy_deps.sh +++ b/packages/generators/docker/cache_heavy_deps.sh @@ -10,20 +10,20 @@ cd $project_name yarn init --yes yarn add \ - @types/jest@29.5.5 \ - @types/node-fetch@2.6.9 \ - @types/node@17.0.33 \ - @types/qs@6.9.8 \ + @types/jest@^29.5.14 \ + @types/node-fetch@^2.6.12 \ + @types/node@^17.0.41 \ + @types/qs@^6.9.17 \ @types/url-join@4.0.1 \ - form-data@4.0.0 \ - jest-environment-jsdom@29.7.0 \ - jest@29.7.0 \ - js-base64@3.7.2" - node-fetch@2.7.0 \ - prettier@2.7.1 \ - qs@6.11.2 \ - ts-jest@29.1.1 \ - typescript@4.6.4" \ + form-data@^4.0.0 \ + jest-environment-jsdom@^29.7.0 \ + jest@^29.7.0 \ + js-base64@^3.7.7 \ + node-fetch@^2.7.0 \ + prettier@^3.4.2 \ + qs@^6.13.1 \ + ts-jest@^29.1.1 \ + typescript@~5.7.2 \ url-join@4.0.1 cd .. diff --git a/packages/ir-sdk/package.json b/packages/ir-sdk/package.json index 99f3824488d..1048ce81f1d 100644 --- a/packages/ir-sdk/package.json +++ b/packages/ir-sdk/package.json @@ -35,6 +35,6 @@ "vitest": "^2.1.4", "@trivago/prettier-plugin-sort-imports": "^5.2.1", "prettier": "^3.4.2", - "typescript": "4.6.4" + "typescript": "5.7.2" } } \ No newline at end of file diff --git a/packages/scripts/package.json b/packages/scripts/package.json index d84d9351b8b..4dce5c0ec08 100644 --- a/packages/scripts/package.json +++ b/packages/scripts/package.json @@ -42,7 +42,7 @@ "vitest": "^2.1.4", "@trivago/prettier-plugin-sort-imports": "^5.2.1", "prettier": "^3.4.2", - "typescript": "4.6.4", + "typescript": "5.7.2", "tsup": "^8.0.2", "@types/yargs": "^17.0.32", "yaml": "^2.4.5" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 4e485bc799c..07e77f00007 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1561,10 +1561,10 @@ importers: version: 1.0.10 tsup: specifier: ^8.3.5 - version: 8.3.5(postcss@8.4.49)(typescript@4.6.4)(yaml@2.3.3) + version: 8.3.5(postcss@8.4.49)(typescript@5.7.2)(yaml@2.3.3) typescript: - specifier: 4.6.4 - version: 4.6.4 + specifier: 5.7.2 + version: 5.7.2 vitest: specifier: ^2.0.5 version: 2.1.8(@types/node@18.15.3)(jsdom@20.0.3)(sass@1.72.0)(terser@5.31.5) @@ -3707,8 +3707,8 @@ importers: specifier: ^3.4.2 version: 3.4.2 typescript: - specifier: 4.6.4 - version: 4.6.4 + specifier: 5.7.2 + version: 5.7.2 vitest: specifier: ^2.1.4 version: 2.1.8(@types/node@18.15.3)(jsdom@20.0.3)(sass@1.72.0)(terser@5.31.5) @@ -6969,8 +6969,8 @@ importers: specifier: ^3.4.2 version: 3.4.2 typescript: - specifier: 4.6.4 - version: 4.6.4 + specifier: 5.7.2 + version: 5.7.2 vitest: specifier: ^2.1.4 version: 2.1.8(@types/node@18.7.18)(jsdom@20.0.3)(sass@1.72.0)(terser@5.31.5) @@ -7006,10 +7006,10 @@ importers: version: 3.4.2 tsup: specifier: ^8.0.2 - version: 8.3.5(postcss@8.4.49)(typescript@4.6.4)(yaml@2.3.3) + version: 8.3.5(postcss@8.4.49)(typescript@5.7.2)(yaml@2.3.3) typescript: - specifier: 4.6.4 - version: 4.6.4 + specifier: 5.7.2 + version: 5.7.2 vitest: specifier: ^2.1.4 version: 2.1.8(@types/node@18.7.18)(jsdom@20.0.3)(sass@1.72.0)(terser@5.31.5) @@ -22586,33 +22586,6 @@ snapshots: tslib@2.6.2: {} - tsup@8.3.5(postcss@8.4.49)(typescript@4.6.4)(yaml@2.3.3): - dependencies: - bundle-require: 5.0.0(esbuild@0.24.0) - cac: 6.7.14 - chokidar: 4.0.1 - consola: 3.2.3 - debug: 4.3.7 - esbuild: 0.24.0 - joycon: 3.1.1 - picocolors: 1.1.1 - postcss-load-config: 6.0.1(postcss@8.4.49)(yaml@2.3.3) - resolve-from: 5.0.0 - rollup: 4.24.0 - source-map: 0.8.0-beta.0 - sucrase: 3.35.0 - tinyexec: 0.3.1 - tinyglobby: 0.2.9 - tree-kill: 1.2.2 - optionalDependencies: - postcss: 8.4.49 - typescript: 4.6.4 - transitivePeerDependencies: - - jiti - - supports-color - - tsx - - yaml - tsup@8.3.5(postcss@8.4.49)(typescript@5.7.2)(yaml@2.3.3): dependencies: bundle-require: 5.0.0(esbuild@0.24.0)