diff --git a/.tav.yml b/.tav.yml index c27cccd050..7fd1ae6e54 100644 --- a/.tav.yml +++ b/.tav.yml @@ -481,7 +481,7 @@ undici: - versions: mode: max-7 include: '>=6.0.0 <7' - node: '>=18' + node: '>=18.17.0' commands: node test/instrumentation/modules/undici/undici.test.js - versions: mode: max-7 diff --git a/package-lock.json b/package-lock.json index a406357831..6d7a0926e1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -17497,9 +17497,9 @@ } }, "node_modules/undici": { - "version": "6.11.1", - "resolved": "https://registry.npmjs.org/undici/-/undici-6.11.1.tgz", - "integrity": "sha512-KyhzaLJnV1qa3BSHdj4AZ2ndqI0QWPxYzaIOio0WzcEJB9gvuysprJSLtpvc2D9mhR9jPDUk7xlJlZbH2KR5iw==", + "version": "6.13.0", + "resolved": "https://registry.npmjs.org/undici/-/undici-6.13.0.tgz", + "integrity": "sha512-Q2rtqmZWrbP8nePMq7mOJIN98M0fYvSgV89vwl/BQRT4mDOeY2GXZngfGpcBBhtky3woM7G24wZV3Q304Bv6cw==", "dev": true, "engines": { "node": ">=18.0" @@ -31672,9 +31672,9 @@ "dev": true }, "undici": { - "version": "6.11.1", - "resolved": "https://registry.npmjs.org/undici/-/undici-6.11.1.tgz", - "integrity": "sha512-KyhzaLJnV1qa3BSHdj4AZ2ndqI0QWPxYzaIOio0WzcEJB9gvuysprJSLtpvc2D9mhR9jPDUk7xlJlZbH2KR5iw==", + "version": "6.13.0", + "resolved": "https://registry.npmjs.org/undici/-/undici-6.13.0.tgz", + "integrity": "sha512-Q2rtqmZWrbP8nePMq7mOJIN98M0fYvSgV89vwl/BQRT4mDOeY2GXZngfGpcBBhtky3woM7G24wZV3Q304Bv6cw==", "dev": true }, "undici-types": { diff --git a/test/_is_undici_incompat.js b/test/_is_undici_incompat.js index f2ac0a9da7..0584eb6491 100644 --- a/test/_is_undici_incompat.js +++ b/test/_is_undici_incompat.js @@ -29,7 +29,10 @@ function isUndiciIncompat() { const undiciVer = require('undici/package.json').version; const msg = `undici@${undiciVer} is incompatible with node@${nodeVer}`; - if (satisfies(undiciVer, '>=6.0.0') && satisfies(nodeVer, '<18.0.0')) { + if (satisfies(undiciVer, '>=6.13.0') && satisfies(nodeVer, '<18.17.0')) { + // See discussion at https://github.com/nodejs/undici/issues/3123 + return msg; + } else if (satisfies(undiciVer, '>=6.0.0') && satisfies(nodeVer, '<18.0.0')) { return msg; } else if ( satisfies(undiciVer, '>=5.28.0') &&