Skip to content

Commit

Permalink
Fix adding support for mermaid
Browse files Browse the repository at this point in the history
  • Loading branch information
@fcollonval
fcollonval committed Dec 30, 2024
1 parent 15b60fa commit ca7f261
Show file tree
Hide file tree
Showing 7 changed files with 3,345 additions and 1,791 deletions.
4 changes: 3 additions & 1 deletion app/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,11 +120,13 @@ async function main() {
),
require('@jupyterlab/mathjax-extension'),
require('@jupyterlab/markedparser-extension'),
require('@jupyterlab/mermaid-extension'),
require('@jupyterlab/notebook-extension').default.filter(({ id }) =>
[
'@jupyterlab/notebook-extension:factory',
'@jupyterlab/notebook-extension:tracker',
'@jupyterlab/notebook-extension:widget-factory'
'@jupyterlab/notebook-extension:widget-factory',
'@jupyterlab/notebook-extension:cell-executor'
].includes(id)
),
require('@jupyterlab/rendermime-extension'),
Expand Down
104 changes: 64 additions & 40 deletions app/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,56 +12,68 @@
"watch": "webpack --config ./webpack.config.watch.js"
},
"resolutions": {
"@jupyterlab/application-extension": "^4.0.2",
"@jupyterlab/apputils-extension": "^4.0.2",
"@jupyterlab/codemirror-extension": "^4.0.2",
"@jupyterlab/coreutils": "^6.0.2",
"@jupyterlab/docmanager-extension": "^4.0.2",
"@jupyterlab/fileeditor": "^4.0.2",
"@jupyterlab/javascript-extension": "^4.0.2",
"@jupyterlab/json-extension": "^4.0.2",
"@jupyterlab/mathjax-extension": "^4.0.2",
"@jupyterlab/markedparser-extension": "^4.0.2",
"@jupyterlab/notebook-extension": "^4.0.2",
"@jupyterlab/outputarea": "^4.0.2",
"@jupyterlab/pdf-extension": "^4.0.2",
"@jupyterlab/rendermime-extension": "^4.0.2",
"@jupyterlab/shortcuts-extension": "^4.0.2",
"@jupyterlab/translation-extension": "^4.0.2",
"@jupyterlab/vega5-extension": "^4.0.2",
"@lumino/application": "^2.0.1",
"@codemirror/language": "^6.0.0",
"@codemirror/state": "^6.2.0",
"@codemirror/view": "^6.9.6",
"@jupyter/react-components": "~0.13.3",
"@jupyter/web-components": "~0.13.3",
"@jupyter/ydoc": "~1.1.1",
"@jupyterlab/application-extension": "^4.1.0",
"@jupyterlab/apputils-extension": "^4.1.0",
"@jupyterlab/codemirror-extension": "^4.1.0",
"@jupyterlab/coreutils": "^6.1.0",
"@jupyterlab/docmanager-extension": "^4.1.0",
"@jupyterlab/fileeditor": "^4.1.0",
"@jupyterlab/javascript-extension": "^4.1.0",
"@jupyterlab/json-extension": "^4.1.0",
"@jupyterlab/mathjax-extension": "^4.1.0",
"@jupyterlab/markedparser-extension": "^4.1.0",
"@jupyterlab/mermaid-extension": "^4.1.0",
"@jupyterlab/notebook-extension": "^4.1.0",
"@jupyterlab/outputarea": "^4.1.0",
"@jupyterlab/pdf-extension": "^4.1.0",
"@jupyterlab/rendermime-extension": "^4.1.0",
"@jupyterlab/shortcuts-extension": "^4.1.0",
"@jupyterlab/translation-extension": "^4.1.0",
"@jupyterlab/vega5-extension": "^4.1.0",
"@lezer/common": "^1.0.0",
"@lezer/highlight": "^1.0.0",
"@lumino/application": "^2.3.0",
"@lumino/domutils": "^2.0.0",
"@lumino/dragdrop": "^2.0.0",
"@lumino/properties": "^2.0.0",
"@lumino/virtualdom": "^2.0.0",
"@microsoft/fast-element": "^1.12.0",
"@microsoft/fast-foundation": "^2.49.2",
"jupyterlab-rise-application": "~0.1.0",
"react": "~18.2.0",
"react-dom": "~18.2.0",
"yjs": "~13.5.10"
"react": "^18.2.0",
"react-dom": "^18.2.0",
"yjs": "^13.5.40"
},
"dependencies": {
"@jupyterlab/application-extension": "^4.0.2",
"@jupyterlab/apputils-extension": "^4.0.2",
"@jupyterlab/codemirror-extension": "^4.0.2",
"@jupyterlab/coreutils": "^6.0.2",
"@jupyterlab/docmanager-extension": "^4.0.2",
"@jupyterlab/javascript-extension": "^4.0.2",
"@jupyterlab/json-extension": "^4.0.2",
"@jupyterlab/markedparser-extension": "^4.0.2",
"@jupyterlab/mathjax-extension": "^4.0.2",
"@jupyterlab/notebook-extension": "^4.0.2",
"@jupyterlab/pdf-extension": "^4.0.2",
"@jupyterlab/rendermime-extension": "^4.0.2",
"@jupyterlab/shortcuts-extension": "^4.0.2",
"@jupyterlab/theme-dark-extension": "^4.0.2",
"@jupyterlab/theme-light-extension": "^4.0.2",
"@jupyterlab/translation-extension": "^4.0.2",
"@jupyterlab/vega5-extension": "^4.0.2",
"@jupyterlab/application-extension": "^4.1.0",
"@jupyterlab/apputils-extension": "^4.1.0",
"@jupyterlab/codemirror-extension": "^4.1.0",
"@jupyterlab/coreutils": "^6.1.0",
"@jupyterlab/docmanager-extension": "^4.1.0",
"@jupyterlab/javascript-extension": "^4.1.0",
"@jupyterlab/json-extension": "^4.1.0",
"@jupyterlab/markedparser-extension": "^4.1.0",
"@jupyterlab/mathjax-extension": "^4.1.0",
"@jupyterlab/mermaid-extension": "^4.1.0",
"@jupyterlab/notebook-extension": "^4.1.0",
"@jupyterlab/pdf-extension": "^4.1.0",
"@jupyterlab/rendermime-extension": "^4.1.0",
"@jupyterlab/shortcuts-extension": "^4.1.0",
"@jupyterlab/theme-dark-extension": "^4.1.0",
"@jupyterlab/theme-light-extension": "^4.1.0",
"@jupyterlab/translation-extension": "^4.1.0",
"@jupyterlab/vega5-extension": "^4.1.0",
"jupyterlab-rise-application": "^0.42.0"
},
"devDependencies": {
"@jupyterlab/builder": "^4.0.2",
"@jupyterlab/buildutils": "^4.0.2",
"@jupyterlab/builder": "^4.1.0",
"@jupyterlab/buildutils": "^4.1.0",
"@types/rimraf": "^3.0.0",
"css-loader": "~5.0.1",
"file-loader": "~5.0.2",
Expand Down Expand Up @@ -95,6 +107,7 @@
"@jupyterlab/json-extension",
"@jupyterlab/mathjax-extension",
"@jupyterlab/markedparser-extension",
"@jupyterlab/mermaid-extension",
"@jupyterlab/notebook-extension",
"@jupyterlab/pdf-extension",
"@jupyterlab/rendermime-extension",
Expand All @@ -107,6 +120,12 @@
"jupyterlab-rise"
],
"singletonPackages": [
"@codemirror/language",
"@codemirror/state",
"@codemirror/view",
"@jupyter/react-components",
"@jupyter/web-components",
"@jupyter/ydoc",
"@jupyterlab/application",
"@jupyterlab/apputils",
"@jupyterlab/codemirror",
Expand All @@ -116,6 +135,7 @@
"@jupyterlab/filebrowser",
"@jupyterlab/fileeditor",
"@jupyterlab/mainmenu",
"@jupyterlab/mermaid",
"@jupyterlab/notebook",
"@jupyterlab/observables",
"@jupyterlab/outputarea",
Expand All @@ -127,6 +147,8 @@
"@jupyterlab/statusbar",
"@jupyterlab/translation",
"@jupyterlab/ui-components",
"@lezer/common",
"@lezer/highlight",
"@lumino/algorithm",
"@lumino/application",
"@lumino/commands",
Expand All @@ -139,6 +161,8 @@
"@lumino/signaling",
"@lumino/virtualdom",
"@lumino/widgets",
"@microsoft/fast-element",
"@microsoft/fast-foundation",
"react",
"react-dom",
"yjs"
Expand Down
41 changes: 41 additions & 0 deletions examples/mermaid.ipynb
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
{
"cells": [
{
"cell_type": "markdown",
"id": "f4ac2984-399b-482e-9da4-3d87b4e34aed",
"metadata": {},
"source": [
"# Mermaid test\n",
"\n",
"```mermaid\n",
"sequenceDiagram\n",
" Alice->>+John: Hello John, how are you?\n",
" Alice->>+John: John, can you hear me?\n",
" John-->>-Alice: Hi Alice, I can hear you!\n",
" John-->>-Alice: I feel great!\n",
"```"
]
}
],
"metadata": {
"kernelspec": {
"display_name": "Python 3 (ipykernel)",
"language": "python",
"name": "python3"
},
"language_info": {
"codemirror_mode": {
"name": "ipython",
"version": 3
},
"file_extension": ".py",
"mimetype": "text/x-python",
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.12.8"
}
},
"nbformat": 4,
"nbformat_minor": 5
}
41 changes: 19 additions & 22 deletions packages/application/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,37 +28,34 @@
"url": "https://github.com/jupyterlab-contrib/rise.git"
},
"scripts": {
"build": "yarn run build:prod",
"build": "tsc --sourceMap",
"build:prod": "tsc -b",
"build:test": "tsc --build tsconfig.test.json",
"clean": "rimraf lib tsconfig.tsbuildinfo",
"watch": "tsc -b --watch --preserveWatchOutput"
"watch": "tsc -b --watch --preserveWatchOutput --sourceMap"
},
"dependencies": {
"@jupyterlab/application": "^4.0.2",
"@jupyterlab/apputils": "^4.0.2",
"@jupyterlab/cells": "^4.0.2",
"@jupyterlab/coreutils": "^6.0.2",
"@jupyterlab/docmanager": "^4.0.2",
"@jupyterlab/docregistry": "^4.0.2",
"@jupyterlab/mathjax2": "^4.0.0-alpha.21",
"@jupyterlab/notebook": "^4.0.2",
"@jupyterlab/rendermime-interfaces": "^3.8.3",
"@jupyterlab/services": "^6.0.2",
"@jupyterlab/settingregistry": "^4.0.2",
"@jupyterlab/theme-light-extension": "^4.0.2",
"@jupyterlab/mermaid": "~4.1.0-alpha.0",
"@jupyterlab/mermaid-extension": "~4.1.0-alpha.0",
"@lumino/commands": "^2.0.1",
"@jupyterlab/application": "^4.1.0",
"@jupyterlab/apputils": "^4.1.0",
"@jupyterlab/cells": "^4.1.0",
"@jupyterlab/coreutils": "^6.1.0",
"@jupyterlab/docmanager": "^4.1.0",
"@jupyterlab/docregistry": "^4.1.0",
"@jupyterlab/mathjax-extension": "^4.1.0",
"@jupyterlab/notebook": "^4.1.0",
"@jupyterlab/rendermime-interfaces": "^3.9.0",
"@jupyterlab/services": "^6.1.0",
"@jupyterlab/settingregistry": "^4.1.0",
"@jupyterlab/theme-light-extension": "^4.1.0",
"@lumino/commands": "^2.2.0",
"@lumino/messaging": "^2.0.0",
"@lumino/signaling": "^2.0.0",
"@lumino/widgets": "^2.0.1",
"@lumino/signaling": "^2.1.0",
"@lumino/widgets": "^2.3.0",
"reveal.js": "^4.4.0",
"reveal.js-plugins": "^4.1.5"
},
"devDependencies": {
"@jupyterlab/builder": "^4.0.2",
"@types/codemirror": "^5.60.7",
"@jupyterlab/builder": "^4.1.0",
"@types/reveal.js": "^4.3.0",
"@typescript-eslint/eslint-plugin": "^6.1.0",
"@typescript-eslint/parser": "^6.1.0",
Expand All @@ -69,7 +66,7 @@
"npm-run-all": "^4.1.5",
"prettier": "^3.0.0",
"rimraf": "^5.0.0",
"typescript": "~5.0.4"
"typescript": "~5.1.6"
},
"sideEffects": [
"style/*.css",
Expand Down
8 changes: 4 additions & 4 deletions packages/lab/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,14 @@
"build": "jlpm run build:lib && jlpm run build:labextension:dev",
"build:labextension": "jupyter labextension build .",
"build:labextension:dev": "jupyter labextension build --development True .",
"build:lib": "tsc",
"build:prod": "jlpm run build:lib && jlpm run build:labextension",
"build:lib": "tsc --sourceMap",
"build:prod": "tsc && jlpm run build:labextension",
"clean": "jlpm run clean:lib && jlpm run clean:labextension",
"clean:labextension": "rimraf ../../jupyterlab_rise/labextension",
"clean:lib": "rimraf lib tsconfig.tsbuildinfo",
"watch": "run-p watch:src watch:labextension",
"watch:labextension": "jupyter labextension watch .",
"watch:src": "tsc -w -d"
"watch:src": "tsc -w -d --sourceMap"
},
"dependencies": {
"@jupyterlab/application": "^4.0.2",
Expand All @@ -61,7 +61,7 @@
"devDependencies": {
"@jupyterlab/builder": "^4.0.2",
"rimraf": "~5.0.0",
"typescript": "~5.0.4"
"typescript": "~5.1.6"
},
"sideEffects": [
"style/*.css",
Expand Down
6 changes: 1 addition & 5 deletions pyproject.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ build-backend = "hatchling.build"
name = "jupyterlab_rise"
readme = "README.md"
license = { file = "LICENSE" }
requires-python = ">=3.8"
requires-python = ">=3.9"
classifiers = [
"Framework :: Jupyter",
"Framework :: Jupyter :: JupyterLab",
Expand All @@ -16,10 +16,6 @@ classifiers = [
"License :: OSI Approved :: BSD License",
"Programming Language :: Python",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
]
dependencies = [
"jupyter_server>=2.0.1,<3"
Expand Down
Loading

0 comments on commit ca7f261

Please sign in to comment.