Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(webpack-plugin): Ensure asset relocator injected code works with nodeIntegration disabled #2396

Merged
merged 3 commits into from
Jul 23, 2021

Conversation

timfish
Copy link
Contributor

@timfish timfish commented Jul 22, 2021

  • 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).

Fixes #2395

@codecov
Copy link

codecov bot commented Jul 22, 2021

Codecov Report

Merging #2396 (4fda813) into master (760382c) will increase coverage by 0.03%.
The diff coverage is 100.00%.

❗ Current head 4fda813 differs from pull request most recent head 2daf053. Consider uploading reports for the commit 2daf053 to get more accurate results
Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2396      +/-   ##
==========================================
+ Coverage   72.61%   72.65%   +0.03%     
==========================================
  Files          91       91              
  Lines        2330     2333       +3     
  Branches      436      437       +1     
==========================================
+ Hits         1692     1695       +3     
  Misses        473      473              
  Partials      165      165              
Impacted Files Coverage Δ
packages/plugin/webpack/src/WebpackConfig.ts 98.73% <ø> (ø)
...ges/plugin/webpack/src/util/AssetRelocatorPatch.ts 81.25% <100.00%> (+4.32%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 760382c...2daf053. Read the comment docs.

Copy link
Member

@malept malept left a comment

Choose a reason for hiding this comment

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

This largely looks good to me. I just have a question about a potential refactor.

packages/plugin/webpack/src/util/AssetRelocatorPatch.ts Outdated Show resolved Hide resolved
@malept malept enabled auto-merge (squash) July 23, 2021 15:36
@malept malept merged commit 146fc31 into electron:master Jul 23, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

AssetsRelocatorPatch injection can break compiled renderers
2 participants