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

Reorder of webpackConfig merge #13040

Merged

Conversation

matthewturk
Copy link
Contributor

The merge order of the different webpack config items currently pre-empts any
.html-catching rules.

References

Code changes

This changes the webpackConfig merge order to allow it to pre-empt the rule for
.html files. Putting the .html rule after the inclusion of webpackConfig
allows extension developers to override that rule, which is helpful for
situations such as VueJS extensions that use vue-loader. Previously,
vue-loader was testing if .vue.html would be caught by it. The order of
config merging prevented the .vue.html from being executed. This change
shouldn't affect any situations where .html was not being specified in the
webpackConfig override.

Closes #13032.

User-facing changes

This should not have any user-facing changes, and any developer-facing changes
should only arise in the case that a webpackConfig rule was specified and
not caught by the overridden configuration, which would arguably not be
intended behavior anyway.

Backwards-incompatible changes

There should be no changes.

This changes the webpackConfig merge order to allow it to pre-empt the rule
for .html files.

Closes jupyterlab#13032.
@jupyterlab-probot
Copy link

Thanks for making a pull request to jupyterlab!
To try out this branch on binder, follow this link: Binder

@welcome
Copy link

welcome bot commented Sep 2, 2022

Thanks for submitting your first pull request! You are awesome! 🤗

If you haven't done so already, check out Jupyter's Code of Conduct. Also, please make sure you followed the pull request template, as this will help us review your contribution more quickly.
welcome
You can meet the other Jovyans by joining our Discourse forum. There is also a intro thread there where you can stop by and say Hi! 👋

Welcome to the Jupyter community! 🎉

Copy link
Member

@fcollonval fcollonval left a comment

Choose a reason for hiding this comment

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

Thanks a lot for the PR @matthewturk

I have a suggestion to fix the linter error otherwise this is looking good.

You can add co-authors to a commit in GitHub with a special expression in the commit description: see documentation. But I'm find not being a co-author.

@fcollonval
Copy link
Member

Don't worry about the license header error.

Co-authored-by: Frédéric Collonval <fcollonval@users.noreply.github.com>
@matthewturk
Copy link
Contributor Author

@fcollonval Thank you for the linter help! I thought I had correctly set it up in vscode, but ... looks like I hadn't. :)

Copy link
Member

@fcollonval fcollonval left a comment

Choose a reason for hiding this comment

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

Thanks @matthewturk

@fcollonval fcollonval merged commit e3b4410 into jupyterlab:master Sep 2, 2022
@welcome
Copy link

welcome bot commented Sep 2, 2022

Congrats on your first merged pull request in this project! 🎉
congrats
Thank you for contributing, we are very proud of you! ❤️

@fcollonval
Copy link
Member

@meeseeksdev please backport to 3.4.x

@lumberbot-app
Copy link

lumberbot-app bot commented Sep 2, 2022

Owee, I'm MrMeeseeks, Look at me.

There seem to be a conflict, please backport manually. Here are approximate instructions:

  1. Checkout backport branch and update it.
git checkout 3.4.x
git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
git cherry-pick -x -m1 e3b441061391fe625c32b7136f6e1e685853c53b
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
git commit -am 'Backport PR #13040: Reorder of webpackConfig merge'
  1. Push to a named branch:
git push YOURFORK 3.4.x:auto-backport-of-pr-13040-on-3.4.x
  1. Create a PR against branch 3.4.x, I would have named this PR:

"Backport PR #13040 on branch 3.4.x (Reorder of webpackConfig merge)"

And apply the correct labels and milestones.

Congratulations — you did some good work! Hopefully your backport PR will be tested by the continuous integration and merged soon!

Remember to remove the Still Needs Manual Backport label once the PR gets merged.

If these instructions are inaccurate, feel free to suggest an improvement.

fcollonval pushed a commit to fcollonval/jupyterlab that referenced this pull request Sep 2, 2022
jtpio pushed a commit that referenced this pull request Sep 5, 2022
Co-authored-by: Matthew Turk <matthewturk@gmail.com>
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 6, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Prepend webpack rules with webpackConfig to catch .vue.html files
2 participants