From 27efeca7c1399d66972372021af629a49a799f1d Mon Sep 17 00:00:00 2001 From: Mihail Date: Sun, 29 Sep 2024 15:55:42 +0300 Subject: [PATCH 1/4] Update express to v5 --- .gitignore | 1 + package.json | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index fd4f2b0..22d59e5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ node_modules .DS_Store +.idea diff --git a/package.json b/package.json index 09aa001..a753532 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,7 @@ "node": "^18.15.0 || >=20.4.0" }, "peerDependencies": { - "@types/express": "^4.0.29", + "@types/express": "^5.0.0", "@types/koa": "^2.11.4", "graphql": "^16.3.0" }, @@ -70,12 +70,12 @@ "object-path": "^0.11.8" }, "devDependencies": { - "@types/express": "^4.17.17", + "@types/express": "^5.0.0", "@types/koa": "^2.13.8", "coverage-node": "^8.0.0", "eslint": "^8.48.0", "eslint-plugin-simple-import-sort": "^10.0.0", - "express": "^4.18.2", + "express": "^5.0.0", "form-data-encoder": "^3.0.0", "graphql": "^16.8.0", "koa": "^2.14.2", From 016f196c819218992adcb582497a06e72254d3fb Mon Sep 17 00:00:00 2001 From: Jayden Seric Date: Tue, 1 Oct 2024 17:20:46 +1000 Subject: [PATCH 2/4] Revert change to the `.gitignore` file. --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index 22d59e5..fd4f2b0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,2 @@ node_modules .DS_Store -.idea From 77624ee83c7c8aad2804ec7285d84611a5c7ea49 Mon Sep 17 00:00:00 2001 From: Jayden Seric Date: Tue, 1 Oct 2024 17:25:31 +1000 Subject: [PATCH 3/4] Also support `@types/express` v4. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a753532..da8af29 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,7 @@ "node": "^18.15.0 || >=20.4.0" }, "peerDependencies": { - "@types/express": "^5.0.0", + "@types/express": "4.0.29 - 5", "@types/koa": "^2.11.4", "graphql": "^16.3.0" }, From c7d394b386d539b5e6727b0d57bcfdd29f3d6b47 Mon Sep 17 00:00:00 2001 From: Jayden Seric Date: Tue, 1 Oct 2024 17:33:51 +1000 Subject: [PATCH 4/4] Add a changelog entry. --- changelog.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changelog.md b/changelog.md index 6842bc5..3a10e06 100644 --- a/changelog.md +++ b/changelog.md @@ -9,6 +9,10 @@ - Refactored tests to use the standard `AbortController`, `fetch`, `File`, and `FormData` APIs available in modern Node.js and removed the dev dependencies [`node-abort-controller`](https://npm.im/node-abort-controller) and [`node-fetch`](https://npm.im/node-fetch). - Replaced the test utility function `streamToString` with the function `text` from `node:stream/consumers` that’s available in modern Node.js. +### Minor + +- Support Express v5 by updating the optional peer dependency [`@types/express`](https://npm.im/@types/express) to `4.0.29 - 5` and the dev dependency [`express`](https://npm.im/express) to v5, via [#389](https://github.com/jaydenseric/graphql-upload/pull/389). + ### Patch - Updated GitHub Actions CI config: