Skip to content

[v21.x backport] deps: update undici to 6.6.2 - #51768

Closed
targos wants to merge 2 commits into
nodejs:v21.x-stagingfrom
targos:undici-backport-v21
Closed

[v21.x backport] deps: update undici to 6.6.2#51768
targos wants to merge 2 commits into
nodejs:v21.x-stagingfrom
targos:undici-backport-v21

Conversation

@targos

@targostargos commented Feb 15, 2024

Copy link
Copy Markdown
Member

This commit is the result of reverting the v5.28.3 security update
and then cleanly cherry-picking all 6.x updates from main until
6.6.2, which also includes the security fix.

Reverts: 9d2ac2b
Includes:

@nodejs-github-bot

nodejs-github-bot commented Feb 15, 2024

Copy link
Copy Markdown
Collaborator

Review requested:

  • @nodejs/security-wg

@nodejs-github-botnodejs-github-bot added dependencies Pull requests that update a dependency file. needs-ci PRs that need a full CI run. v21.x labels Feb 15, 2024
@targostargos added the request-ci Add this label to start a Jenkins CI on a PR. label Feb 15, 2024
@github-actionsgithub-actionsBot removed the request-ci Add this label to start a Jenkins CI on a PR. label Feb 15, 2024
@nodejs-github-bot

nodejs-github-bot commented Feb 15, 2024

Copy link
Copy Markdown
Collaborator

CI: https://ci.nodejs.org/job/node-test-pull-request/57098/

@nodejs-github-bot

nodejs-github-bot commented Feb 19, 2024

Copy link
Copy Markdown
Collaborator

CI: https://ci.nodejs.org/job/node-test-pull-request/57180/

@targos

targos commented Feb 19, 2024

Copy link
Copy Markdown
MemberAuthor

I'll wait for #51792 to rebase.

@targos

targos commented Feb 20, 2024

Copy link
Copy Markdown
MemberAuthor

Rebased.

@targostargos added the request-ci Add this label to start a Jenkins CI on a PR. label Feb 20, 2024
@github-actionsgithub-actionsBot removed the request-ci Add this label to start a Jenkins CI on a PR. label Feb 20, 2024
@nodejs-github-bot

nodejs-github-bot commented Feb 20, 2024

Copy link
Copy Markdown
Collaborator

CI: https://ci.nodejs.org/job/node-test-pull-request/57189/

@nodejs-github-bot

nodejs-github-bot commented Feb 20, 2024

Copy link
Copy Markdown
Collaborator

CI: https://ci.nodejs.org/job/node-test-pull-request/57195/

@targostargos mentioned this pull request Feb 20, 2024
Closed
@nodejs-github-bot

nodejs-github-bot commented Feb 21, 2024

Copy link
Copy Markdown
Collaborator

CI: https://ci.nodejs.org/job/node-test-pull-request/57237/

@nodejs-github-bot

nodejs-github-bot commented Feb 21, 2024

Copy link
Copy Markdown
Collaborator

CI: https://ci.nodejs.org/job/node-test-pull-request/57265/

@marco-ippolito

marco-ippolito commented Feb 26, 2024

Copy link
Copy Markdown
Member

@targos can you rebase, the CI should fine fine now

@targos

targos commented Feb 26, 2024

Copy link
Copy Markdown
MemberAuthor

@marco-ippolito My branch is already up-to-date wrt. v21.x-staging

@nodejs-github-bot

nodejs-github-bot commented Feb 26, 2024

Copy link
Copy Markdown
Collaborator

CI: https://ci.nodejs.org/job/node-test-pull-request/57431/

@marco-ippolitomarco-ippolito added the request-ci Add this label to start a Jenkins CI on a PR. label Feb 27, 2024
@github-actionsgithub-actionsBot removed the request-ci Add this label to start a Jenkins CI on a PR. label Feb 27, 2024
@nodejs-github-bot

nodejs-github-bot commented Feb 27, 2024

Copy link
Copy Markdown
Collaborator

CI: https://ci.nodejs.org/job/node-test-pull-request/57457/

@nodejs-github-bot

nodejs-github-bot commented Feb 27, 2024

Copy link
Copy Markdown
Collaborator

CI: https://ci.nodejs.org/job/node-test-pull-request/57459/

@nodejs-github-bot

nodejs-github-bot commented Feb 27, 2024

Copy link
Copy Markdown
Collaborator

CI: https://ci.nodejs.org/job/node-test-pull-request/57464/

@jeremymeng@marco-ippolito
Revert "fs: remove workaround for esm package"
5aacd62
This reverts commit 95b1989.
It appears that the workaround is still needed: issue nodejs#51081
Backport-PR-URL: nodejs#51390
PR-URL: nodejs#51390Fixes: nodejs#51081
Reviewed-By: Marco Ippolito <marcoippolito54@gmail.com>
@nodejs-github-bot

nodejs-github-bot commented Feb 27, 2024

Copy link
Copy Markdown
Collaborator

CI: https://ci.nodejs.org/job/node-test-pull-request/57466/

@nodejs-github-bot

nodejs-github-bot commented Feb 27, 2024

Copy link
Copy Markdown
Collaborator

CI: https://ci.nodejs.org/job/node-test-pull-request/57473/

@targos@marco-ippolito
deps: update undici to 6.6.2
d8a328f
This commit is the result of reverting the v5.28.3 security update
and then cleanly cherry-picking all 6.x updates from `main` until
6.6.2, which also includes the security fix.
@marco-ippolitomarco-ippolito added the request-ci Add this label to start a Jenkins CI on a PR. label Feb 28, 2024
@github-actionsgithub-actionsBot removed the request-ci Add this label to start a Jenkins CI on a PR. label Feb 28, 2024
@nodejs-github-bot

nodejs-github-bot commented Feb 28, 2024

Copy link
Copy Markdown
Collaborator

CI: https://ci.nodejs.org/job/node-test-pull-request/57494/

@nodejs-github-bot

nodejs-github-bot commented Feb 29, 2024

Copy link
Copy Markdown
Collaborator

CI: https://ci.nodejs.org/job/node-test-pull-request/57495/

marco-ippolito pushed a commit that referenced this pull request Feb 29, 2024
@targos@marco-ippolito
deps: update undici to 6.6.2
4ebb944
This commit is the result of reverting the v5.28.3 security update
and then cleanly cherry-picking all 6.x updates from `main` until
6.6.2, which also includes the security fix.
Backport-PR-URL: #51768
PR-URL: #51667
Reviewed-By: Marco Ippolito <marcoippolito54@gmail.com>
@marco-ippolito

marco-ippolito commented Mar 1, 2024

Copy link
Copy Markdown
Member

Landed in 4ebb944

@targos
targos deleted the undici-backport-v21 branch March 1, 2024 15:42
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@RafaelGSSRafaelGSSRafaelGSS approved these changes
@marco-ippolitomarco-ippolitomarco-ippolito approved these changes

Assignees

No one assigned

Labels

dependenciesPull requests that update a dependency file.needs-ciPRs that need a full CI run.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@targos@nodejs-github-bot@marco-ippolito@RafaelGSS@jeremymeng