Skip to content

fix: allow folders in extra-resource (#1852)#1879

Merged
erikian merged 1 commit intoelectron:mainfrom
zhujin917:fix/1852-extra-resource-folders
Feb 13, 2026
Merged

fix: allow folders in extra-resource (#1852)#1879
erikian merged 1 commit intoelectron:mainfrom
zhujin917:fix/1852-extra-resource-folders

Conversation

@zhujin917
Copy link
Contributor

  • I have read the contribution documentation for this project.
  • I agree to follow the code of conduct that this project follows, as appropriate.
  • The changes are appropriately documented (if applicable).
  • The changes have sufficient test coverage (if applicable).
  • The testsuite passes successfully on my local machine (if applicable).

Summarize your changes:
Allow the extraResource field to accept folders. Fixes #1852.

As mentioned in #1852, since using graceful-fs's fs.promises.cp without options to copy extraResource, it can no longer copy folders. However, the document does not specify that the extraResource field cannot accept folders. Moreover, in versions v18.4.4 and earlier, it could also accept folders. Therefore, I believe this fix is appropriate.

@zhujin917 zhujin917 requested a review from a team as a code owner February 12, 2026 11:52
@erikian
Copy link
Member

erikian commented Feb 12, 2026

@zhujin917 thanks for the PR! The Electron org requires signed commits for all contributions, could you please do that and update your branch?

@zhujin917 zhujin917 force-pushed the fix/1852-extra-resource-folders branch from 819694b to b9f7516 Compare February 13, 2026 07:37
@zhujin917 zhujin917 closed this Feb 13, 2026
@zhujin917 zhujin917 force-pushed the fix/1852-extra-resource-folders branch from 84525c0 to 13d93d3 Compare February 13, 2026 08:04
@zhujin917 zhujin917 reopened this Feb 13, 2026
@zhujin917
Copy link
Contributor Author

Sorry for accidentally force pushing wrong commit :(
@erikian I have rebased from latest code and signed my commit. Please review it, thanks!

Copy link
Member

@erikian erikian left a comment

Choose a reason for hiding this comment

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

Thanks!

@erikian erikian enabled auto-merge (squash) February 13, 2026 13:38
@erikian erikian merged commit 03a3242 into electron:main Feb 13, 2026
9 checks passed
@welcome
Copy link

welcome bot commented Feb 13, 2026

Thanks for your contribution! 🎉

@electron-npm-package-publisher

🎉 This PR is included in version 19.0.5 🎉

The release is available on:

Your semantic-release bot 📦🚀

@zhujin917 zhujin917 deleted the fix/1852-extra-resource-folders branch February 13, 2026 23:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

--extra-resource does not accept directories or wildcards anymore

2 participants