Skip to content

fix: ESM-from-CJS import when CJK is in path#48855

Merged
codebytere merged 1 commit into
electron:mainfrom
indutny-signal:fix/backport-node-upstream-fix
Nov 10, 2025
Merged

fix: ESM-from-CJS import when CJK is in path#48855
codebytere merged 1 commit into
electron:mainfrom
indutny-signal:fix/backport-node-upstream-fix

Conversation

@indutny-signal

@indutny-signal indutny-signal commented Nov 8, 2025

Copy link
Copy Markdown
Contributor

Description of Change

Upstream fix: nodejs/node#60575

Checklist

Release Notes

Notes: fix: ESM-from-CJS import when CJK characters are in path

cc @VerteDinde

@indutny-signal indutny-signal requested a review from a team as a code owner November 8, 2025 15:26
@electron-cation electron-cation Bot added the new-pr 🌱 PR opened recently label Nov 8, 2025
@indutny-signal indutny-signal force-pushed the fix/backport-node-upstream-fix branch from 39f37b9 to 7de72cb Compare November 8, 2025 16:02
@indutny-signal indutny-signal changed the title fix: ESM-from-CJS import on when CJK is in path fix: ESM-from-CJS import when CJK is in path Nov 8, 2025

@deepak1556 deepak1556 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@deepak1556 deepak1556 added semver/patch backwards-compatible bug fixes target/40-x-y PR should also be added to the "40-x-y" branch. labels Nov 10, 2025
@electron-cation electron-cation Bot removed the new-pr 🌱 PR opened recently label Nov 10, 2025
@deepak1556

Copy link
Copy Markdown
Member

Once merged can you open backport for 39-x-y which is based on Node.js 22.x, we can then backport it to other 22.x release branches.

@indutny

indutny commented Nov 10, 2025

Copy link
Copy Markdown
Contributor

Absolutely!

@indutny

indutny commented Nov 10, 2025

Copy link
Copy Markdown
Contributor

Thank you!

@codebytere codebytere merged commit 6399527 into electron:main Nov 10, 2025
62 checks passed
@release-clerk

release-clerk Bot commented Nov 10, 2025

Copy link
Copy Markdown

Release Notes Persisted

fix: ESM-from-CJS import when CJK characters are in path

@trop

trop Bot commented Nov 10, 2025

Copy link
Copy Markdown
Contributor

I have automatically backported this PR to "40-x-y", please check out #48862

@trop trop Bot added in-flight/40-x-y and removed target/40-x-y PR should also be added to the "40-x-y" branch. labels Nov 10, 2025
@indutny-signal

Copy link
Copy Markdown
Contributor Author

@deepak1556 I have a branch in works, but I think this might actually apply cleanly if we auto-backport.

@indutny-signal indutny-signal deleted the fix/backport-node-upstream-fix branch November 10, 2025 15:43
@indutny-signal

Copy link
Copy Markdown
Contributor Author

Or maybe not. Now that I think line numbers in the patch will be all off. Anyway, I'm building the branch to make sure it works locally and submitting a PR in an hour or so.

indutny-signal added a commit to indutny-signal/electron that referenced this pull request Nov 10, 2025
@indutny-signal

Copy link
Copy Markdown
Contributor Author

@deepak1556 opened #48873 . I'm still building locally, though.

@trop

trop Bot commented Nov 10, 2025

Copy link
Copy Markdown
Contributor

@indutny-signal has manually backported this PR to "39-x-y", please check out #48873

@trop trop Bot added in-flight/39-x-y merged/39-x-y PR was merged to the "39-x-y" branch. and removed in-flight/39-x-y labels Nov 10, 2025
@trop trop Bot added in-flight/38-x-y merged/40-x-y PR was merged to the "40-x-y" branch. merged/38-x-y PR was merged to the "38-x-y" branch. and removed in-flight/40-x-y in-flight/38-x-y labels Nov 10, 2025
nilayarya pushed a commit to nilayarya/electron that referenced this pull request Nov 21, 2025
nilayarya added a commit to nilayarya/electron that referenced this pull request Nov 21, 2025
nilayarya added a commit to nilayarya/electron that referenced this pull request Nov 21, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

merged/38-x-y PR was merged to the "38-x-y" branch. merged/39-x-y PR was merged to the "39-x-y" branch. merged/40-x-y PR was merged to the "40-x-y" branch. semver/patch backwards-compatible bug fixes

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants