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.

Sign up for GitHub

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

Jump to bottom

fix: Mermaid and Math rendering in Jupyter Lab and VSCode #480

Merged
merged 6 commits into from Feb 9, 2024
Merged

fix: Mermaid and Math rendering in Jupyter Lab and VSCode #480

merged 6 commits into from Feb 9, 2024

Conversation

iisakkirotko
Copy link
Collaborator

Should fix #175, and partially fix #446

@iisakkirotko Graphite App
Copy link
Collaborator Author

iisakkirotko commented Jan 24, 2024 •
edited

This stack of pull requests is managed by Graphite. Learn more about stacking.

Join @iisakkirotko and the rest of your teammates on Graphite Graphite

This was referenced Jan 24, 2024
Merged
Merged
Merged
Merged
@iisakkirotko iisakkirotko force-pushed the 01-24-fix_Mermaid_and_Math_rendering_in_Jupyter_Lab_and_VSCode branch from a2bc37d to 8d4fe2a Compare January 25, 2024 14:33
@maartenbreddels maartenbreddels force-pushed the 01-24-fix_solara.server.jupyter.server_extension_not_activating branch from fa65a1a to 080894e Compare January 29, 2024 12:31
maartenbreddels added a commit that referenced this pull request Jan 29, 2024
@maartenbreddels
refactor: split assets settings in server and non-server parts
da06303 
Based on:
 * #479
 * #480
 * #486

We decided that using the proxy and the cdn if the proxy is not used
is not only something to be used in solara server. In vscode
or colab, we cannot use the proxy, and need to use the cdn directly.
@maartenbreddels maartenbreddels mentioned this pull request Jan 29, 2024
Merged
@iisakkirotko iisakkirotko force-pushed the 01-24-fix_Mermaid_and_Math_rendering_in_Jupyter_Lab_and_VSCode branch from f26b0e4 to fc01053 Compare January 29, 2024 13:47
@iisakkirotko iisakkirotko changed the base branch from 01-24-fix_solara.server.jupyter.server_extension_not_activating to master January 29, 2024 13:47
maartenbreddels
maartenbreddels reviewed Jan 29, 2024
View reviewed changes
Copy link
Contributor

@maartenbreddels maartenbreddels left a comment

Choose a reason for hiding this comment

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

Lets go with the changes we discussed over a call, and keep the katex part in

solara/components/markdown.py Outdated Show resolved Hide resolved
packages/solara-widget-manager/package.json Outdated Show resolved Hide resolved
packages/solara-widget-manager/src/mermaid.ts Outdated Show resolved Hide resolved
packages/solara-widget-manager8/package.json Outdated Show resolved Hide resolved
solara/components/markdown.py Outdated Show resolved Hide resolved
solara/components/markdown.py Outdated Show resolved Hide resolved
solara/components/markdown.py Outdated Show resolved Hide resolved
solara/components/markdown.py Outdated Show resolved Hide resolved
maartenbreddels added a commit that referenced this pull request Jan 30, 2024
@maartenbreddels
refactor: split assets settings in server and non-server parts
0ad109c 
Based on:
 * #479
 * #480
 * #486

We decided that using the proxy and the cdn if the proxy is not used
is not only something to be used in solara server. In vscode
or colab, we cannot use the proxy, and need to use the cdn directly.
maartenbreddels added a commit that referenced this pull request Jan 30, 2024
@maartenbreddels
refactor: split assets settings in server and non-server parts (#487)
2e0b110 
Based on:
 * #479
 * #480
 * #486

We decided that using the proxy and the cdn if the proxy is not used
is not only something to be used in solara server. In vscode
or colab, we cannot use the proxy, and need to use the cdn directly.
@maartenbreddels
Copy link
Contributor

See #487 and #488 for the refactor based on our discussions yesterday.

@iisakkirotko iisakkirotko force-pushed the 01-24-fix_Mermaid_and_Math_rendering_in_Jupyter_Lab_and_VSCode branch from c8dde04 to f882941 Compare January 30, 2024 10:29
maartenbreddels
maartenbreddels requested changes Feb 9, 2024
View reviewed changes
Copy link
Contributor

@maartenbreddels maartenbreddels left a comment

Choose a reason for hiding this comment

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

After a small change we can merge I think. Surprised it does not fail the build on the renderMermaid actually!

packages/solara-vuetify-app/src/solara.js Outdated Show resolved Hide resolved
packages/solara-vuetify3-app/src/solara.js Outdated Show resolved Hide resolved
@iisakkirotko iisakkirotko merged commit 0237408 into master Feb 9, 2024
46 of 47 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@maartenbreddels maartenbreddels maartenbreddels requested changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
2 participants
@iisakkirotko @maartenbreddels