Skip to content

Commit 882eb81

Browse files
hbcarloshbcarlos
authored
1. Upgrade dependencies (#39)
2. Migrate code 3. Fix dependencies and support windowing 4. Updates tests
1 parent 1046c85 commit 882eb81

File tree

20 files changed

+21291
-15580
lines changed

20 files changed

+21291
-15580
lines changed

‎.github/workflows/build.yml‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1
1919

2020
- name: Install dependencies
21-
run: python -m pip install -U jupyterlab~=3.1
21+
run: python -m pip install -U jupyterlab~=4.0
2222

2323
- name: Lint the extension
2424
run: |
@@ -60,8 +60,6 @@ jobs:
6060
runs-on: ubuntu-latest
6161

6262
steps:
63-
- name: Checkout
64-
uses: actions/checkout@v3
6563
- name: Install Python
6664
uses: actions/setup-python@v4
6765
with:
@@ -77,14 +75,14 @@ jobs:
7775
sudo rm -rf $(which node)
7876
sudo rm -rf $(which node)
7977
80-
pip install "jupyterlab~=3.1" jupyterlab_rise*.whl
78+
pip install "jupyterlab~=4.0" jupyterlab_rise*.whl
8179
8280
jupyter server extension list
8381
jupyter server extension list 2>&1 | grep -ie "jupyterlab_rise.*OK"
8482
8583
jupyter labextension list
8684
jupyter labextension list 2>&1 | grep -ie "jupyterlab-rise.*OK"
87-
python -m jupyterlab.browser_check --no-chrome-test
85+
python -m jupyterlab.browser_check --no-browser-test
8886
8987
integration-tests:
9088
name: Integration tests
@@ -109,7 +107,7 @@ jobs:
109107
- name: Install the extension
110108
run: |
111109
set -eux
112-
python -m pip install "jupyterlab~=3.1" jupyterlab_rise*.whl
110+
python -m pip install "jupyterlab~=4.0" jupyterlab_rise*.whl
113111
114112
- name: Install dependencies
115113
working-directory: ui-tests

‎.github/workflows/check-release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- name: Install Dependencies
1717
run: |
1818
# Install dependencies for bump_version script
19-
python -m pip install hatch "jupyterlab~=3.1"
19+
python -m pip install hatch "jupyterlab~=4.0"
2020
- name: Check Release
2121
uses: jupyter-server/jupyter_releaser/.github/actions/check-release@v2
2222
with:

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
*.bundle.*
2+
.yarn
23
lib/
34
node_modules/
45
.eslintcache

‎.yarnrc.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
enableImmutableInstalls: false
2+
3+
nodeLinker: node-modules

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ RISE: "Live" Reveal.js JupyterLab Slideshow extension.
66

77
## Requirements
88

9-
- JupyterLab >= 3.0
9+
- JupyterLab >= 4.0
1010

1111
## Install
1212

‎app/index.js‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -104,14 +104,21 @@ async function main() {
104104
require('@jupyterlab/codemirror-extension').default.filter(({ id }) =>
105105
[
106106
'@jupyterlab/codemirror-extension:services',
107-
'@jupyterlab/codemirror-extension:codemirror'
107+
'@jupyterlab/codemirror-extension:codemirror',
108+
'@jupyterlab/codemirror-extension:languages',
109+
'@jupyterlab/codemirror-extension:extensions',
110+
'@jupyterlab/codemirror-extension:themes'
108111
].includes(id)
109112
),
110113
require('@jupyterlab/docmanager-extension').default.filter(({ id }) =>
111-
['@jupyterlab/docmanager-extension:plugin'].includes(id)
114+
[
115+
'@jupyterlab/docmanager-extension:plugin',
116+
'@jupyterlab/docmanager-extension:manager',
117+
'@jupyterlab/docmanager-extension:opener'
118+
].includes(id)
112119
),
113-
require('@jupyterlab/docprovider-extension'),
114-
require('@jupyterlab/mathjax2-extension'),
120+
require('@jupyterlab/mathjax-extension'),
121+
require('@jupyterlab/markedparser-extension'),
115122
require('@jupyterlab/notebook-extension').default.filter(({ id }) =>
116123
[
117124
'@jupyterlab/notebook-extension:factory',

‎app/package.json‎

Lines changed: 46 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -12,55 +12,56 @@
1212
"watch": "webpack --config ./webpack.config.watch.js"
1313
},
1414
"resolutions": {
15-
"@jupyterlab/application-extension": "^3.0.0",
16-
"@jupyterlab/apputils-extension": "^3.0.0",
17-
"@jupyterlab/codemirror-extension": "^3.0.0",
18-
"@jupyterlab/coreutils": "^5.0.0",
19-
"@jupyterlab/docmanager-extension": "^3.0.0",
20-
"@jupyterlab/docprovider-extension": "^3.0.0",
21-
"@jupyterlab/javascript-extension": "^3.0.0",
22-
"@jupyterlab/json-extension": "^3.0.0",
23-
"@jupyterlab/mathjax2-extension": "^3.0.0",
24-
"@jupyterlab/notebook-extension": "^3.0.0",
25-
"@jupyterlab/outputarea": "^3.0.0",
26-
"@jupyterlab/pdf-extension": "^3.0.0",
27-
"@jupyterlab/rendermime-extension": "^3.0.0",
28-
"@jupyterlab/shortcuts-extension": "^3.0.0",
29-
"@jupyterlab/translation-extension": "^3.0.0",
30-
"@jupyterlab/vega5-extension": "^3.0.0",
31-
"@lumino/application": "^1.25.0",
32-
"@lumino/domutils": "^1.7.0",
33-
"@lumino/dragdrop": "^1.12.0",
34-
"@lumino/properties": "^1.7.0",
35-
"@lumino/virtualdom": "^1.13.0",
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",
33+
"@lumino/domutils": "^2.0.0",
34+
"@lumino/dragdrop": "^2.0.0",
35+
"@lumino/properties": "^2.0.0",
36+
"@lumino/virtualdom": "^2.0.0",
3637
"jupyterlab-rise-application": "~0.1.0",
37-
"react": "~17.0.2",
38-
"react-dom": "~17.0.2",
38+
"react": "~18.2.0",
39+
"react-dom": "~18.2.0",
3940
"yjs": "~13.5.10"
4041
},
4142
"dependencies": {
42-
"@jupyterlab/application-extension": "^3.0.0",
43-
"@jupyterlab/apputils-extension": "^3.0.0",
44-
"@jupyterlab/codemirror-extension": "^3.0.0",
45-
"@jupyterlab/coreutils": "^5.0.0",
46-
"@jupyterlab/docmanager-extension": "^3.0.0",
47-
"@jupyterlab/docprovider-extension": "^3.0.0",
48-
"@jupyterlab/javascript-extension": "^3.0.0",
49-
"@jupyterlab/json-extension": "^3.0.0",
50-
"@jupyterlab/mathjax2-extension": "^3.0.0",
51-
"@jupyterlab/notebook-extension": "^3.0.0",
52-
"@jupyterlab/pdf-extension": "^3.0.0",
53-
"@jupyterlab/rendermime-extension": "^3.0.0",
54-
"@jupyterlab/shortcuts-extension": "^3.0.0",
55-
"@jupyterlab/theme-dark-extension": "^3.0.0",
56-
"@jupyterlab/theme-light-extension": "^3.0.0",
57-
"@jupyterlab/translation-extension": "^3.0.0",
58-
"@jupyterlab/vega5-extension": "^3.0.0",
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",
5960
"jupyterlab-rise-application": "^0.2.1"
6061
},
6162
"devDependencies": {
62-
"@jupyterlab/builder": "^3.0.0",
63-
"@jupyterlab/buildutils": "^3.0.0",
63+
"@jupyterlab/builder": "^4.0.2",
64+
"@jupyterlab/buildutils": "^4.0.2",
6465
"@types/rimraf": "^3.0.0",
6566
"css-loader": "~5.0.1",
6667
"file-loader": "~5.0.2",
@@ -71,6 +72,7 @@
7172
"playwright": "^1.12.3",
7273
"raw-loader": "~4.0.0",
7374
"rimraf": "~3.0.2",
75+
"source-map-loader": "^4.0.1",
7476
"style-loader": "~1.0.1",
7577
"svg-url-loader": "~6.0.0",
7678
"url-loader": "~4.1.1",
@@ -89,10 +91,10 @@
8991
"@jupyterlab/codemirror-extension",
9092
"@jupyterlab/coreutils",
9193
"@jupyterlab/docmanager-extension",
92-
"@jupyterlab/docprovider-extension",
9394
"@jupyterlab/javascript-extension",
9495
"@jupyterlab/json-extension",
95-
"@jupyterlab/mathjax2-extension",
96+
"@jupyterlab/mathjax-extension",
97+
"@jupyterlab/markedparser-extension",
9698
"@jupyterlab/notebook-extension",
9799
"@jupyterlab/pdf-extension",
98100
"@jupyterlab/rendermime-extension",
@@ -111,7 +113,6 @@
111113
"@jupyterlab/codeeditor",
112114
"@jupyterlab/coreutils",
113115
"@jupyterlab/docmanager",
114-
"@jupyterlab/docprovider",
115116
"@jupyterlab/filebrowser",
116117
"@jupyterlab/fileeditor",
117118
"@jupyterlab/mainmenu",

‎binder/environment.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ channels:
1111

1212
dependencies:
1313
# runtime dependencies
14-
- jupyterlab >=3,<4.0.0a0
14+
- jupyterlab >=4,<5.0.0a0
1515
# labextension build dependencies
1616
- nodejs >=18,<19
1717
- pip

‎package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
"workspaces": {
1313
"packages": [
1414
"app",
15+
"ui-tests",
1516
"packages/*"
1617
]
1718
},
@@ -41,7 +42,6 @@
4142
"build": "lerna run build",
4243
"build:prod": "lerna run build:prod",
4344
"clean": "lerna run clean",
44-
"install": "lerna bootstrap",
4545
"eslint": "jlpm eslint:check --fix",
4646
"eslint:check": "eslint . --cache --ext .ts,.tsx",
4747
"lint": "jlpm stylelint && jlpm prettier && jlpm eslint",
@@ -73,6 +73,6 @@
7373
"stylelint-config-recommended": "^13.0.0",
7474
"stylelint-config-standard": "~34.0.0",
7575
"ts-jest": "^26.0.0",
76-
"typescript": "~4.3.0"
76+
"typescript": "~5.0.4"
7777
}
78-
}
78+
}

‎packages/application/package.json‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -35,27 +35,27 @@
3535
"watch": "tsc -b --watch --preserveWatchOutput"
3636
},
3737
"dependencies": {
38-
"@jupyterlab/application": "^3.0.0",
39-
"@jupyterlab/apputils": "^3.0.0",
40-
"@jupyterlab/cells": "^3.0.0",
41-
"@jupyterlab/coreutils": "^5.0.0",
42-
"@jupyterlab/docmanager": "^3.0.0",
43-
"@jupyterlab/docregistry": "^3.0.0",
44-
"@jupyterlab/mathjax2": "^3.0.0",
45-
"@jupyterlab/notebook": "^3.0.0",
46-
"@jupyterlab/rendermime-interfaces": "^3.0.0",
47-
"@jupyterlab/services": "^6.0.0",
48-
"@jupyterlab/settingregistry": "^3.0.0",
49-
"@jupyterlab/theme-light-extension": "^3.0.0",
50-
"@lumino/commands": "^1.17.0",
51-
"@lumino/messaging": "^1.9.0",
52-
"@lumino/signaling": "^1.9.0",
53-
"@lumino/widgets": "^1.28.0",
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",
51+
"@lumino/messaging": "^2.0.0",
52+
"@lumino/signaling": "^2.0.0",
53+
"@lumino/widgets": "^2.0.1",
5454
"reveal.js": "^4.4.0",
5555
"reveal.js-plugins": "^4.1.5"
5656
},
5757
"devDependencies": {
58-
"@jupyterlab/builder": "^3.0.0",
58+
"@jupyterlab/builder": "^4.0.2",
5959
"@types/codemirror": "^5.60.7",
6060
"@types/reveal.js": "^4.3.0",
6161
"@typescript-eslint/eslint-plugin": "^6.1.0",
@@ -67,7 +67,7 @@
6767
"npm-run-all": "^4.1.5",
6868
"prettier": "^3.0.0",
6969
"rimraf": "^3.0.2",
70-
"typescript": "~4.3.0"
70+
"typescript": "~5.0.4"
7171
},
7272
"sideEffects": [
7373
"style/*.css",

0 commit comments

Comments
 (0)