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

Adds jupyter-ui-toolkit packages in shared scope #7530

Merged
merged 2 commits into from
Dec 4, 2024

Conversation

brichet
Copy link
Collaborator

@brichet brichet commented Dec 4, 2024

This PR adds the 2 packages from jupyter-ui-toolkit in the shared scope of Notebook.

These packages have been included in jupyterlab as singleton in jupyterlab/jupyterlab@3d525a2.

Without this change, an extension depending on one of these packages would not work.

Thanks @jtpio for your help on this.

Copy link
Contributor

github-actions bot commented Dec 4, 2024

Binder 👈 Launch a Binder on branch brichet/notebook/ui-toolkit_shared_scope

@jtpio jtpio added this to the 7.3.x milestone Dec 4, 2024
Copy link
Member

@jtpio jtpio left a comment

Choose a reason for hiding this comment

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

Thanks!

Left a minor comment, otherwise looks good 👍

app/package.json Outdated
@@ -12,6 +12,8 @@
"resolutions": {
"@codemirror/state": "~6.4.1",
"@codemirror/view": "~6.28.3",
"@jupyter/react-components": "^0.16.6",
"@jupyter/web-components": "^0.16.6",
Copy link
Member

Choose a reason for hiding this comment

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

Maybe we can move the @jupyter/ydoc line below next to these new packages, so it's easier to notice (and somewhat sorted) while looking at the resolutions?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Good catch, I moved the new entries instead to follow the ASCII order.

@brichet
Copy link
Collaborator Author

brichet commented Dec 4, 2024

Since the corresponding PR in jupyterlab has been published in 4.1, we should probably backport this one to 7.2.x and 7.1.x branches.

@jtpio
Copy link
Member

jtpio commented Dec 4, 2024

I guess it would be fine to backport to 7.2.x since 7.3.0 was released today. Not sure it's worth it for 7.1.0 though, unless someone actively requests it, and since it probably affects just a few extensions?

@jtpio jtpio merged commit 21d0306 into jupyter:main Dec 4, 2024
31 checks passed
@brichet brichet deleted the ui-toolkit_shared_scope branch December 4, 2024 15:45
@jtpio
Copy link
Member

jtpio commented Dec 4, 2024

@meeseeksdev please backport to 7.2.x

Copy link

lumberbot-app bot commented Dec 4, 2024

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 7.2.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 21d0306ecef93ea23bf063bc1d8a0580450cd4df
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
git commit -am 'Backport PR #7530: Adds jupyter-ui-toolkit packages in shared scope'
  1. Push to a named branch:
git push YOURFORK 7.2.x:auto-backport-of-pr-7530-on-7.2.x
  1. Create a PR against branch 7.2.x, I would have named this PR:

"Backport PR #7530 on branch 7.2.x (Adds jupyter-ui-toolkit packages in shared scope)"

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.

@brichet
Copy link
Collaborator Author

brichet commented Dec 4, 2024

I can do it

@jtpio
Copy link
Member

jtpio commented Dec 4, 2024

ah meeseek was not able to do the backport, hopefully the manual backport is not too painful since it's just a few lines.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants