Merge remote-tracking branch 'upstream/master' into 1714-rewriteRelat…

…iveImportExtensions-support

.github/workflows/runTestsOnPush.yml

@@ -8,13 +8,13 @@ jobs:
       matrix:
         node-version: [18, 20, 21]
         os: [macos-latest, ubuntu-latest, windows-latest]
-        typescript-version: ['^4.9.5', '^5.2.2']
+        typescript-version: ['^5.0.0']
 
     steps:
       - uses: actions/checkout@master
 
       - name: Setup Node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node-version }}
           cache: yarn

packages/cli/package.json

@@ -33,10 +33,10 @@
     "@tsoa/runtime": "^6.5.1",
     "@types/multer": "^1.4.12",
     "fs-extra": "^11.2.0",
-    "glob": "^11.0.0",
+    "glob": "^10.3.10",
     "handlebars": "^4.7.8",
     "merge-anything": "^5.1.7",
-    "minimatch": "^10.0.1",
+    "minimatch": "^9.0.1",
     "ts-deepmerge": "^7.0.2",
     "typescript": "^5.7.2",
     "validator": "^13.12.0",

packages/cli/src/routeGeneration/routeGenerator.ts

@@ -143,7 +143,7 @@ export abstract class AbstractRouteGenerator<Config extends ExtendedRoutesConfig
           fileSize: 8388608, // 8mb
         },
         ...this.options.multerOpts,
-      },
+      } as Config['multerOpts'],
       useSecurity: this.metadata.controllers.some(controller => controller.methods.some(method => !!method.security.length)),
       esm: this.options.esm,
     };

tests/esm/package.json

@@ -21,14 +21,16 @@
   },
   "engineStrict": true,
   "devDependencies": {
-    "@types/chai-as-promised": "^8.0.0",
-    "@types/mocha": "^10.0.8",
+    "@types/chai-as-promised": "^8.0.1",
+    "@types/mocha": "^10.0.10",
     "@types/node": "^16.18.23",
     "chai": "^4.3.10",
     "chai-as-promised": "^7.1.1",
+    "lerna": "^8.1.9",
     "mocha": "^10.7.3",
+    "prettier": "^3.4.2",
     "ts-node": "^10.9.2",
-    "tslib": "^2.7.0",
-    "typescript": "^5.6.2"
+    "tslib": "^2.8.1",
+    "typescript": "^5.7.2"
   }
 }

tests/package.json

@@ -26,7 +26,7 @@
   "author": "Luke Autry <[email protected]> (http://www.lukeautry.com)",
   "license": "MIT",
   "devDependencies": {
-    "@hapi/hapi": "^21.3.10",
+    "@hapi/hapi": "^21.3.12",
     "@koa/multer": "^3.0.2",
     "@koa/router": "^13.1.0",
     "@types/body-parser": "^1.19.5",
@@ -35,43 +35,43 @@
     "@types/koa": "^2.15.0",
     "@types/koa-bodyparser": "^4.3.12",
     "@types/koa__router": "^12.0.4",
-    "@types/method-override": "0.0.35",
-    "@types/mocha": "^10.0.8",
+    "@types/method-override": "3.0.0",
+    "@types/mocha": "^10.0.10",
     "@types/multer": "1.4.12",
     "@types/node": "^18.0.0",
     "@types/promise.any": "^2.0.3",
     "@types/sinon": "^17.0.3",
     "@types/supertest": "^6.0.2",
     "@typescript-eslint/eslint-plugin": "6.16.0",
     "@typescript-eslint/parser": "^6.16.0",
-    "aws-cdk-lib": "^2.159.1",
+    "aws-cdk-lib": "^2.172.0",
     "body-parser": "^1.20.3",
     "chai": "^4.3.10",
     "chalk": "^4.1.2",
-    "constructs": "^10.3.0",
+    "constructs": "^10.4.2",
     "cross-env": "^7.0.3",
     "eslint": "^8.56.0",
     "eslint-config-prettier": "^9.1.0",
-    "express": "^4.21.0",
+    "express": "^4.21.2",
     "husky": "^8.0.3",
-    "inversify": "^6.0.2",
+    "inversify": "^6.1.6",
     "inversify-binding-decorators": "^4.0.0",
     "joi": "^17.13.3",
     "koa": "^2.15.3",
     "koa-bodyparser": "^4.4.0",
-    "lerna": "^8.1.8",
+    "lerna": "^8.1.9",
     "lint-staged": "^15.2.10",
     "method-override": "^3.0.0",
     "mocha": "^10.7.3",
     "multer": "^1.4.5-lts.1",
-    "prettier": "^3.3.3",
+    "prettier": "^3.4.2",
     "reflect-metadata": "^0.2.2",
     "rimraf": "^5.0.5",
     "sinon": "^19.0.2",
     "supertest": "^7.0.0",
     "ts-node": "^10.9.2",
     "tsconfig-paths": "^4.2.0",
-    "typescript": "^5.6.2"
+    "typescript": "^5.7.2"
   },
   "repository": {
     "type": "git",