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

Add worker-loader #8593

Merged
merged 1 commit into from Jun 22, 2020
Merged

Add worker-loader #8593

merged 1 commit into from Jun 22, 2020

Conversation

blink1073
Copy link
Member

@blink1073 blink1073 commented Jun 20, 2020

References

Fixes #8587

Code changes

Adds worker-loader as a dev dependency to the application.

User-facing changes

jupyter lab build no longer fails for a missing worker-loader dependency.

Backwards-incompatible changes

None

@blink1073 blink1073 added this to the 2.2 milestone Jun 20, 2020
@jupyterlab-dev-mode
Copy link

jupyterlab-dev-mode bot commented Jun 20, 2020

Thanks for making a pull request to JupyterLab!

To try out this branch on binder, follow this link: Binder

Copy link
Contributor

@echarles echarles left a comment

LGTM

@blink1073 blink1073 merged commit c11a8b7 into jupyterlab:master Jun 22, 2020
38 of 39 checks passed
@blink1073
Copy link
Member Author

blink1073 commented Jun 22, 2020

@meeseeksdev please backport to 2.1.x

@meeseeksdev
Copy link

meeseeksdev bot commented Jun 22, 2020

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 2.1.x
$ git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
$ git cherry-pick -m1 c11a8b78e016cca5855f98ab71f8bd590a36b28e
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
$ git commit -am 'Backport PR #8593: Add worker-loader'
  1. Push to a named branch :
git push YOURFORK 2.1.x:auto-backport-of-pr-8593-on-2.1.x
  1. Create a PR against branch 2.1.x, I would have named this PR:

"Backport PR #8593 on branch 2.1.x"

And apply the correct labels and milestones.

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

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

@blink1073 blink1073 mentioned this pull request Jun 23, 2020
saulshanabrook pushed a commit that referenced this issue Jun 25, 2020
@github-actions github-actions bot added the status:resolved-locked Closed issues are locked after 30 days inactivity. Please open a new issue for related discussion. label Feb 8, 2021
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Feb 8, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
status:resolved-locked Closed issues are locked after 30 days inactivity. Please open a new issue for related discussion. tag:Build System
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants