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(template-webpack): use css-loader instead of file-loader #1036

Merged
merged 3 commits into from
Jul 18, 2019

Conversation

shimaore
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:

Instead of relying on the style-loader/url/file-loader pipeline, we use the style-loader/css-loader pipeline. This means the CSS ends up embedded in the JavaScript code generated by webpack, but it appears to work better.

This is not as optimal (the CSS ends up embedded in the JS file built by webpack), but it should work.
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.

Just one change, otherwise this looks good.

packages/template/webpack/src/WebpackTemplate.ts Outdated Show resolved Hide resolved
@malept malept changed the title fix(template-webpack): use css-loader fix(template-webpack): use css-loader instead of file-loader Jul 17, 2019
@shimaore
Copy link
Contributor Author

Right, not removing file-loader was pure lazyness on my part, didn't want to check the remainder of the template in case it was used somewhere else… it wasn't.

@malept malept merged commit 62b7c19 into electron:master Jul 18, 2019
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.

2 participants