From b7eddd72a773013c5ed7bfdbb612390da46a499e Mon Sep 17 00:00:00 2001 From: Anna Bocharova Date: Tue, 23 Jul 2024 00:12:14 +0200 Subject: [PATCH 1/4] Upgrading `merge-descriptors` with allowing minors in v5 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d3e2f0a190..166db2e8ad 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ "finalhandler": "1.2.0", "fresh": "0.5.2", "http-errors": "2.0.0", - "merge-descriptors": "1.0.1", + "merge-descriptors": "^1.0.3", "methods": "~1.1.2", "mime-types": "~2.1.34", "on-finished": "2.4.1", From 5df3770c1d73c9ddcd1db14004afee2e1b935cb7 Mon Sep 17 00:00:00 2001 From: Anna Bocharova Date: Fri, 23 Aug 2024 10:41:23 +0200 Subject: [PATCH 2/4] Using ^2.0.0 as per request --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 166db2e8ad..3f3b067a65 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ "finalhandler": "1.2.0", "fresh": "0.5.2", "http-errors": "2.0.0", - "merge-descriptors": "^1.0.3", + "merge-descriptors": "^2.0.0", "methods": "~1.1.2", "mime-types": "~2.1.34", "on-finished": "2.4.1", From baf61729c291b878da7bbc1a964c642f62c6c7d8 Mon Sep 17 00:00:00 2001 From: Anna Bocharova Date: Fri, 23 Aug 2024 13:43:56 +0000 Subject: [PATCH 3/4] Reflecting in History.md. --- History.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/History.md b/History.md index d8306a5d5b..7f0f80e1f5 100644 --- a/History.md +++ b/History.md @@ -9,7 +9,7 @@ unreleased * deps: send@1.0.0 * change: - `res.clearCookie` will ignore user provided `maxAge` and `expires` options -* deps: debug@4.3.6 +* deps: debug@4.3.6, merge-descriptors@^2.0.0 5.0.0-beta.3 / 2024-03-25 ========================= From 16171e7437aa2469da1089c4b735be020d71309b Mon Sep 17 00:00:00 2001 From: Anna Bocharova Date: Fri, 23 Aug 2024 20:17:17 +0200 Subject: [PATCH 4/4] Update History.md --- History.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/History.md b/History.md index 7f0f80e1f5..05730e259e 100644 --- a/History.md +++ b/History.md @@ -9,7 +9,8 @@ unreleased * deps: send@1.0.0 * change: - `res.clearCookie` will ignore user provided `maxAge` and `expires` options -* deps: debug@4.3.6, merge-descriptors@^2.0.0 +* deps: debug@4.3.6 +* deps: merge-descriptors@^2.0.0 5.0.0-beta.3 / 2024-03-25 =========================