Skip to content

Conversation

anonrig
Copy link
Member

@anonrig anonrig commented Jun 18, 2024

Backports #50322 to v20

cc @nodejs/releasers @joyeecheung @GeoffreyBooth

@nodejs-github-bot
Copy link
Collaborator

Review requested:

  • @nodejs/actions
  • @nodejs/gyp
  • @nodejs/loaders
  • @nodejs/security-wg
  • @nodejs/startup
  • @nodejs/tsc
  • @nodejs/url

@nodejs-github-bot nodejs-github-bot added lib / src Issues and PRs related to general changes in the lib or src directory. needs-ci PRs that need a full CI run. v20.x Issues that can be reproduced on v20.x or PRs targeting the v20.x-staging branch. labels Jun 18, 2024
@anonrig anonrig changed the title Backport 50322 to 20 [v20.x backport] src: move package_json_reader cache to c++ Jun 18, 2024
@anonrig anonrig force-pushed the backport-50322-to-20 branch from 8f0ec43 to ff40d15 Compare June 18, 2024 16:28
@marco-ippolito marco-ippolito added the request-ci Add this label to start a Jenkins CI on a PR. label Jun 18, 2024
@richardlau
Copy link
Member

Backport-PR-URL should refer to this PR (while PR-URL refers to the original PR). You don't need to manually add Backport-PR-URL to the commits as node-core/utils will add if missing (if git node land --backport is used to land).

@github-actions github-actions bot removed the request-ci Add this label to start a Jenkins CI on a PR. label Jun 18, 2024
@nodejs-github-bot
Copy link
Collaborator

@anonrig
Copy link
Member Author

anonrig commented Jun 18, 2024

Backport-PR-URL should refer to this PR (while PR-URL refers to the original PR). You don't need to manually add Backport-PR-URL to the commits as node-core/utils will add if missing (if git node land --backport is used to land).

I used git node backport 50322 --to=20 but unfortunately it didn't add at all. I'll update the PR once the existing tests pass (to avoid re-running again)

@joyeecheung
Copy link
Member

I think @richardlau meant that you only need to keep the commit message as-is and additional URLs will be added when they land on v20.x-staging.

@marco-ippolito
Copy link
Member

can you please rebase? there are some undici commits we removed from staging

@anonrig anonrig force-pushed the backport-50322-to-20 branch from ff40d15 to b447a68 Compare June 27, 2024 15:20
anonrig added 3 commits June 27, 2024 11:22
PR-URL: nodejs#50322
Reviewed-By: Jacob Smith <[email protected]>
Reviewed-By: Matteo Collina <[email protected]>
Reviewed-By: Antoine du Hamel <[email protected]>
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Geoffrey Booth <[email protected]>
Co-authored-by: Daniel Lemire <[email protected]>
PR-URL: nodejs#50322
Reviewed-By: Jacob Smith <[email protected]>
Reviewed-By: Matteo Collina <[email protected]>
Reviewed-By: Antoine du Hamel <[email protected]>
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Geoffrey Booth <[email protected]>

# Conflicts:
#	lib/internal/modules/package_json_reader.js
#	src/node_file.cc
#	test/parallel/test-module-binding.js
PR-URL: nodejs#50322
Reviewed-By: Jacob Smith <[email protected]>
Reviewed-By: Matteo Collina <[email protected]>
Reviewed-By: Antoine du Hamel <[email protected]>
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Geoffrey Booth <[email protected]>
@anonrig anonrig force-pushed the backport-50322-to-20 branch from b447a68 to af801aa Compare June 27, 2024 17:36
@anonrig anonrig requested a review from marco-ippolito July 15, 2024 15:25
@marco-ippolito marco-ippolito added the request-ci Add this label to start a Jenkins CI on a PR. label Jul 15, 2024
@github-actions github-actions bot removed the request-ci Add this label to start a Jenkins CI on a PR. label Jul 15, 2024
@nodejs-github-bot
Copy link
Collaborator

@marco-ippolito
Copy link
Member

@anonrig there is some issue with the backport, does not compile

@targos targos force-pushed the v20.x-staging branch 2 times, most recently from 47be236 to 9e1c229 Compare October 2, 2024 14:06
@anonrig anonrig closed this Dec 11, 2024
@joyeecheung
Copy link
Member

This is blocking the require(esm) backport. I will try to backport it again.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

lib / src Issues and PRs related to general changes in the lib or src directory. needs-ci PRs that need a full CI run. v20.x Issues that can be reproduced on v20.x or PRs targeting the v20.x-staging branch.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants