Skip to content

Commit

Permalink
chore(deps-dev): bump undici from 5.28.2 to 6.2.1 (elastic#3805)
Browse files Browse the repository at this point in the history
Undici@6 requires Node.js 18 or later.

Co-authored-by: Trent Mick <trent.mick@elastic.co>
  • Loading branch information
2 people authored and PeterEinberger committed Aug 20, 2024
1 parent c348bbd commit 5b6194e
Show file tree
Hide file tree
Showing 4 changed files with 48 additions and 19 deletions.
18 changes: 12 additions & 6 deletions .tav.yml
Original file line number Diff line number Diff line change
Expand Up @@ -503,10 +503,16 @@ aws-sdk:
# - In undici@4.7.1 the `request.origin` property was added, which we need
# in the 'undici:request:create' diagnostic message.
undici:
versions: '4.7.1 || 4.10.4 || 5.1.1 || 5.12.0 || 5.22.0 || 5.27.1 || ^5.28.2'
commands: node test/instrumentation/modules/undici/undici.test.js
# Test v4.7.1, latest v5 and 5 versions in between.
update-versions:
mode: max-5
include: '>=4.7.1 <6'
- versions: '^6.0.0'
node: '>=18'
commands: node test/instrumentation/modules/undici/undici.test.js
update-versions:
mode: max-5
include: '>=6.0.0 <7'
- versions: '4.7.1 || 4.10.4 || 5.1.1 || 5.12.0 || 5.22.0 || 5.27.1 || ^5.28.2'
commands: node test/instrumentation/modules/undici/undici.test.js
# Test v4.7.1, latest v5 and 5 versions in between.
update-versions:
mode: max-5
include: '>=4.7.1 <6'

37 changes: 29 additions & 8 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@
"thunky": "^1.1.0",
"tree-kill": "^1.2.2",
"typescript": "^5.0.2",
"undici": "^5.8.0",
"undici": "^6.2.1",
"vasync": "^2.2.0",
"wait-on": "^7.0.1",
"ws": "^7.2.1"
Expand Down
10 changes: 6 additions & 4 deletions test/_is_undici_incompat.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

'use strict';

var semver = require('semver');
const { satisfies } = require('semver');

/**
* Return whether the current 'undici' version is incompatible with the
Expand All @@ -29,9 +29,11 @@ function isUndiciIncompat() {
const undiciVer = require('undici/package.json').version;
const msg = `undici@${undiciVer} is incompatible with node@${nodeVer}`;

if (
semver.satisfies(undiciVer, '>=5.28.0') &&
semver.satisfies(nodeVer, '<14.18.0')
if (satisfies(undiciVer, '>=6.0.0') && satisfies(nodeVer, '<18.0.0')) {
return msg;
} else if (
satisfies(undiciVer, '>=5.28.0') &&
satisfies(nodeVer, '<14.18.0')
) {
return msg;
}
Expand Down

0 comments on commit 5b6194e

Please sign in to comment.