Skip to content

Commit fbceca5

Browse files
Y3drkfcollonval
Y3drk
and
fcollonval
authored
Add Mermaid dependecies to application/package.json (#80)
* new packages - idea for fixing the issue * Fix adding support for mermaid --------- Co-authored-by: Frédéric Collonval <[email protected]>
1 parent 47158d9 commit fbceca5

File tree

7 files changed

+2771
-1278
lines changed

7 files changed

+2771
-1278
lines changed

‎app/index.js

+3-1
Original file line numberDiff line numberDiff line change
@@ -120,11 +120,13 @@ async function main() {
120120
),
121121
require('@jupyterlab/mathjax-extension'),
122122
require('@jupyterlab/markedparser-extension'),
123+
require('@jupyterlab/mermaid-extension'),
123124
require('@jupyterlab/notebook-extension').default.filter(({ id }) =>
124125
[
125126
'@jupyterlab/notebook-extension:factory',
126127
'@jupyterlab/notebook-extension:tracker',
127-
'@jupyterlab/notebook-extension:widget-factory'
128+
'@jupyterlab/notebook-extension:widget-factory',
129+
'@jupyterlab/notebook-extension:cell-executor'
128130
].includes(id)
129131
),
130132
require('@jupyterlab/rendermime-extension'),

‎app/package.json

+64-40
Original file line numberDiff line numberDiff line change
@@ -12,56 +12,68 @@
1212
"watch": "webpack --config ./webpack.config.watch.js"
1313
},
1414
"resolutions": {
15-
"@jupyterlab/application-extension": "^4.0.2",
16-
"@jupyterlab/apputils-extension": "^4.0.2",
17-
"@jupyterlab/codemirror-extension": "^4.0.2",
18-
"@jupyterlab/coreutils": "^6.0.2",
19-
"@jupyterlab/docmanager-extension": "^4.0.2",
20-
"@jupyterlab/fileeditor": "^4.0.2",
21-
"@jupyterlab/javascript-extension": "^4.0.2",
22-
"@jupyterlab/json-extension": "^4.0.2",
23-
"@jupyterlab/mathjax-extension": "^4.0.2",
24-
"@jupyterlab/markedparser-extension": "^4.0.2",
25-
"@jupyterlab/notebook-extension": "^4.0.2",
26-
"@jupyterlab/outputarea": "^4.0.2",
27-
"@jupyterlab/pdf-extension": "^4.0.2",
28-
"@jupyterlab/rendermime-extension": "^4.0.2",
29-
"@jupyterlab/shortcuts-extension": "^4.0.2",
30-
"@jupyterlab/translation-extension": "^4.0.2",
31-
"@jupyterlab/vega5-extension": "^4.0.2",
32-
"@lumino/application": "^2.0.1",
15+
"@codemirror/language": "^6.0.0",
16+
"@codemirror/state": "^6.2.0",
17+
"@codemirror/view": "^6.9.6",
18+
"@jupyter/react-components": "~0.13.3",
19+
"@jupyter/web-components": "~0.13.3",
20+
"@jupyter/ydoc": "~1.1.1",
21+
"@jupyterlab/application-extension": "^4.1.0",
22+
"@jupyterlab/apputils-extension": "^4.1.0",
23+
"@jupyterlab/codemirror-extension": "^4.1.0",
24+
"@jupyterlab/coreutils": "^6.1.0",
25+
"@jupyterlab/docmanager-extension": "^4.1.0",
26+
"@jupyterlab/fileeditor": "^4.1.0",
27+
"@jupyterlab/javascript-extension": "^4.1.0",
28+
"@jupyterlab/json-extension": "^4.1.0",
29+
"@jupyterlab/mathjax-extension": "^4.1.0",
30+
"@jupyterlab/markedparser-extension": "^4.1.0",
31+
"@jupyterlab/mermaid-extension": "^4.1.0",
32+
"@jupyterlab/notebook-extension": "^4.1.0",
33+
"@jupyterlab/outputarea": "^4.1.0",
34+
"@jupyterlab/pdf-extension": "^4.1.0",
35+
"@jupyterlab/rendermime-extension": "^4.1.0",
36+
"@jupyterlab/shortcuts-extension": "^4.1.0",
37+
"@jupyterlab/translation-extension": "^4.1.0",
38+
"@jupyterlab/vega5-extension": "^4.1.0",
39+
"@lezer/common": "^1.0.0",
40+
"@lezer/highlight": "^1.0.0",
41+
"@lumino/application": "^2.3.0",
3342
"@lumino/domutils": "^2.0.0",
3443
"@lumino/dragdrop": "^2.0.0",
3544
"@lumino/properties": "^2.0.0",
3645
"@lumino/virtualdom": "^2.0.0",
46+
"@microsoft/fast-element": "^1.12.0",
47+
"@microsoft/fast-foundation": "^2.49.2",
3748
"jupyterlab-rise-application": "~0.1.0",
38-
"react": "~18.2.0",
39-
"react-dom": "~18.2.0",
40-
"yjs": "~13.5.10"
49+
"react": "^18.2.0",
50+
"react-dom": "^18.2.0",
51+
"yjs": "^13.5.40"
4152
},
4253
"dependencies": {
43-
"@jupyterlab/application-extension": "^4.0.2",
44-
"@jupyterlab/apputils-extension": "^4.0.2",
45-
"@jupyterlab/codemirror-extension": "^4.0.2",
46-
"@jupyterlab/coreutils": "^6.0.2",
47-
"@jupyterlab/docmanager-extension": "^4.0.2",
48-
"@jupyterlab/javascript-extension": "^4.0.2",
49-
"@jupyterlab/json-extension": "^4.0.2",
50-
"@jupyterlab/markedparser-extension": "^4.0.2",
51-
"@jupyterlab/mathjax-extension": "^4.0.2",
52-
"@jupyterlab/notebook-extension": "^4.0.2",
53-
"@jupyterlab/pdf-extension": "^4.0.2",
54-
"@jupyterlab/rendermime-extension": "^4.0.2",
55-
"@jupyterlab/shortcuts-extension": "^4.0.2",
56-
"@jupyterlab/theme-dark-extension": "^4.0.2",
57-
"@jupyterlab/theme-light-extension": "^4.0.2",
58-
"@jupyterlab/translation-extension": "^4.0.2",
59-
"@jupyterlab/vega5-extension": "^4.0.2",
54+
"@jupyterlab/application-extension": "^4.1.0",
55+
"@jupyterlab/apputils-extension": "^4.1.0",
56+
"@jupyterlab/codemirror-extension": "^4.1.0",
57+
"@jupyterlab/coreutils": "^6.1.0",
58+
"@jupyterlab/docmanager-extension": "^4.1.0",
59+
"@jupyterlab/javascript-extension": "^4.1.0",
60+
"@jupyterlab/json-extension": "^4.1.0",
61+
"@jupyterlab/markedparser-extension": "^4.1.0",
62+
"@jupyterlab/mathjax-extension": "^4.1.0",
63+
"@jupyterlab/mermaid-extension": "^4.1.0",
64+
"@jupyterlab/notebook-extension": "^4.1.0",
65+
"@jupyterlab/pdf-extension": "^4.1.0",
66+
"@jupyterlab/rendermime-extension": "^4.1.0",
67+
"@jupyterlab/shortcuts-extension": "^4.1.0",
68+
"@jupyterlab/theme-dark-extension": "^4.1.0",
69+
"@jupyterlab/theme-light-extension": "^4.1.0",
70+
"@jupyterlab/translation-extension": "^4.1.0",
71+
"@jupyterlab/vega5-extension": "^4.1.0",
6072
"jupyterlab-rise-application": "^0.42.0"
6173
},
6274
"devDependencies": {
63-
"@jupyterlab/builder": "^4.0.2",
64-
"@jupyterlab/buildutils": "^4.0.2",
75+
"@jupyterlab/builder": "^4.1.0",
76+
"@jupyterlab/buildutils": "^4.1.0",
6577
"@types/rimraf": "^3.0.0",
6678
"css-loader": "~5.0.1",
6779
"file-loader": "~5.0.2",
@@ -95,6 +107,7 @@
95107
"@jupyterlab/json-extension",
96108
"@jupyterlab/mathjax-extension",
97109
"@jupyterlab/markedparser-extension",
110+
"@jupyterlab/mermaid-extension",
98111
"@jupyterlab/notebook-extension",
99112
"@jupyterlab/pdf-extension",
100113
"@jupyterlab/rendermime-extension",
@@ -107,6 +120,12 @@
107120
"jupyterlab-rise"
108121
],
109122
"singletonPackages": [
123+
"@codemirror/language",
124+
"@codemirror/state",
125+
"@codemirror/view",
126+
"@jupyter/react-components",
127+
"@jupyter/web-components",
128+
"@jupyter/ydoc",
110129
"@jupyterlab/application",
111130
"@jupyterlab/apputils",
112131
"@jupyterlab/codemirror",
@@ -116,6 +135,7 @@
116135
"@jupyterlab/filebrowser",
117136
"@jupyterlab/fileeditor",
118137
"@jupyterlab/mainmenu",
138+
"@jupyterlab/mermaid",
119139
"@jupyterlab/notebook",
120140
"@jupyterlab/observables",
121141
"@jupyterlab/outputarea",
@@ -127,6 +147,8 @@
127147
"@jupyterlab/statusbar",
128148
"@jupyterlab/translation",
129149
"@jupyterlab/ui-components",
150+
"@lezer/common",
151+
"@lezer/highlight",
130152
"@lumino/algorithm",
131153
"@lumino/application",
132154
"@lumino/commands",
@@ -139,6 +161,8 @@
139161
"@lumino/signaling",
140162
"@lumino/virtualdom",
141163
"@lumino/widgets",
164+
"@microsoft/fast-element",
165+
"@microsoft/fast-foundation",
142166
"react",
143167
"react-dom",
144168
"yjs"

‎examples/mermaid.ipynb

+41
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
{
2+
"cells": [
3+
{
4+
"cell_type": "markdown",
5+
"id": "f4ac2984-399b-482e-9da4-3d87b4e34aed",
6+
"metadata": {},
7+
"source": [
8+
"# Mermaid test\n",
9+
"\n",
10+
"```mermaid\n",
11+
"sequenceDiagram\n",
12+
" Alice->>+John: Hello John, how are you?\n",
13+
" Alice->>+John: John, can you hear me?\n",
14+
" John-->>-Alice: Hi Alice, I can hear you!\n",
15+
" John-->>-Alice: I feel great!\n",
16+
"```"
17+
]
18+
}
19+
],
20+
"metadata": {
21+
"kernelspec": {
22+
"display_name": "Python 3 (ipykernel)",
23+
"language": "python",
24+
"name": "python3"
25+
},
26+
"language_info": {
27+
"codemirror_mode": {
28+
"name": "ipython",
29+
"version": 3
30+
},
31+
"file_extension": ".py",
32+
"mimetype": "text/x-python",
33+
"name": "python",
34+
"nbconvert_exporter": "python",
35+
"pygments_lexer": "ipython3",
36+
"version": "3.12.8"
37+
}
38+
},
39+
"nbformat": 4,
40+
"nbformat_minor": 5
41+
}

‎packages/application/package.json

+19-20
Original file line numberDiff line numberDiff line change
@@ -28,35 +28,34 @@
2828
"url": "https://github.com/jupyterlab-contrib/rise.git"
2929
},
3030
"scripts": {
31-
"build": "yarn run build:prod",
31+
"build": "tsc --sourceMap",
3232
"build:prod": "tsc -b",
3333
"build:test": "tsc --build tsconfig.test.json",
3434
"clean": "rimraf lib tsconfig.tsbuildinfo",
35-
"watch": "tsc -b --watch --preserveWatchOutput"
35+
"watch": "tsc -b --watch --preserveWatchOutput --sourceMap"
3636
},
3737
"dependencies": {
38-
"@jupyterlab/application": "^4.0.2",
39-
"@jupyterlab/apputils": "^4.0.2",
40-
"@jupyterlab/cells": "^4.0.2",
41-
"@jupyterlab/coreutils": "^6.0.2",
42-
"@jupyterlab/docmanager": "^4.0.2",
43-
"@jupyterlab/docregistry": "^4.0.2",
44-
"@jupyterlab/mathjax2": "^4.0.0-alpha.21",
45-
"@jupyterlab/notebook": "^4.0.2",
46-
"@jupyterlab/rendermime-interfaces": "^3.8.3",
47-
"@jupyterlab/services": "^6.0.2",
48-
"@jupyterlab/settingregistry": "^4.0.2",
49-
"@jupyterlab/theme-light-extension": "^4.0.2",
50-
"@lumino/commands": "^2.0.1",
38+
"@jupyterlab/application": "^4.1.0",
39+
"@jupyterlab/apputils": "^4.1.0",
40+
"@jupyterlab/cells": "^4.1.0",
41+
"@jupyterlab/coreutils": "^6.1.0",
42+
"@jupyterlab/docmanager": "^4.1.0",
43+
"@jupyterlab/docregistry": "^4.1.0",
44+
"@jupyterlab/mathjax-extension": "^4.1.0",
45+
"@jupyterlab/notebook": "^4.1.0",
46+
"@jupyterlab/rendermime-interfaces": "^3.9.0",
47+
"@jupyterlab/services": "^6.1.0",
48+
"@jupyterlab/settingregistry": "^4.1.0",
49+
"@jupyterlab/theme-light-extension": "^4.1.0",
50+
"@lumino/commands": "^2.2.0",
5151
"@lumino/messaging": "^2.0.0",
52-
"@lumino/signaling": "^2.0.0",
53-
"@lumino/widgets": "^2.0.1",
52+
"@lumino/signaling": "^2.1.0",
53+
"@lumino/widgets": "^2.3.0",
5454
"reveal.js": "^4.4.0",
5555
"reveal.js-plugins": "^4.1.5"
5656
},
5757
"devDependencies": {
58-
"@jupyterlab/builder": "^4.0.2",
59-
"@types/codemirror": "^5.60.7",
58+
"@jupyterlab/builder": "^4.1.0",
6059
"@types/reveal.js": "^4.3.0",
6160
"@typescript-eslint/eslint-plugin": "^6.1.0",
6261
"@typescript-eslint/parser": "^6.1.0",
@@ -67,7 +66,7 @@
6766
"npm-run-all": "^4.1.5",
6867
"prettier": "^3.0.0",
6968
"rimraf": "^5.0.0",
70-
"typescript": "~5.0.4"
69+
"typescript": "~5.1.6"
7170
},
7271
"sideEffects": [
7372
"style/*.css",

‎packages/lab/package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,14 @@
3232
"build": "jlpm run build:lib && jlpm run build:labextension:dev",
3333
"build:labextension": "jupyter labextension build .",
3434
"build:labextension:dev": "jupyter labextension build --development True .",
35-
"build:lib": "tsc",
36-
"build:prod": "jlpm run build:lib && jlpm run build:labextension",
35+
"build:lib": "tsc --sourceMap",
36+
"build:prod": "tsc && jlpm run build:labextension",
3737
"clean": "jlpm run clean:lib && jlpm run clean:labextension",
3838
"clean:labextension": "rimraf ../../jupyterlab_rise/labextension",
3939
"clean:lib": "rimraf lib tsconfig.tsbuildinfo",
4040
"watch": "run-p watch:src watch:labextension",
4141
"watch:labextension": "jupyter labextension watch .",
42-
"watch:src": "tsc -w -d"
42+
"watch:src": "tsc -w -d --sourceMap"
4343
},
4444
"dependencies": {
4545
"@jupyterlab/application": "^4.0.2",
@@ -61,7 +61,7 @@
6161
"devDependencies": {
6262
"@jupyterlab/builder": "^4.0.2",
6363
"rimraf": "~5.0.0",
64-
"typescript": "~5.0.4"
64+
"typescript": "~5.1.6"
6565
},
6666
"sideEffects": [
6767
"style/*.css",

‎pyproject.toml

+1-6
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ build-backend = "hatchling.build"
66
name = "jupyterlab_rise"
77
readme = "README.md"
88
license = { file = "LICENSE" }
9-
requires-python = ">=3.8"
9+
requires-python = ">=3.9"
1010
classifiers = [
1111
"Framework :: Jupyter",
1212
"Framework :: Jupyter :: JupyterLab",
@@ -16,11 +16,6 @@ classifiers = [
1616
"License :: OSI Approved :: BSD License",
1717
"Programming Language :: Python",
1818
"Programming Language :: Python :: 3",
19-
"Programming Language :: Python :: 3.8",
20-
"Programming Language :: Python :: 3.9",
21-
"Programming Language :: Python :: 3.10",
22-
"Programming Language :: Python :: 3.11",
23-
"Programming Language :: Python :: 3.12",
2419
]
2520
dependencies = [
2621
"jupyter_server>=2.0.1,<3",

0 commit comments

Comments
 (0)