Skip to content

Commit 4bfaaac

Browse files
jtpiojtpio
authored
Merge pull request #6429 from jtpio/update-lab
Update to JupyterLab 4.0.0a25
2 parents 6c6bd4b + 417afc5 commit 4bfaaac

File tree

37 files changed

+2138
-1907
lines changed

37 files changed

+2138
-1907
lines changed

‎.github/actions/build-dist/action.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ runs:
99
- name: Install dependencies
1010
shell: bash
1111
run: |
12-
python -m pip install --upgrade jupyter_packaging~=0.10 "jupyterlab>=4.0.0a24,<5" build
12+
python -m pip install --upgrade jupyter_packaging~=0.10 "jupyterlab>=4.0.0a25,<5" build
1313
1414
- name: Build pypi distributions
1515
shell: bash

‎.github/workflows/buildutils.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525

2626
- name: Install dependencies
2727
run: |
28-
python -m pip install -U "jupyterlab>=4.0.0a24,<5" jupyter_packaging~=0.10
28+
python -m pip install -U "jupyterlab>=4.0.0a25,<5" jupyter_packaging~=0.10
2929
jlpm
3030
jlpm run build
3131
@@ -80,6 +80,6 @@ jobs:
8080

8181
- name: Install dependencies
8282
run: |
83-
python -m pip install -U "jupyterlab>=4.0.0a24,<5" jupyter_packaging~=0.10 pip
83+
python -m pip install -U "jupyterlab>=4.0.0a25,<5" jupyter_packaging~=0.10 pip
8484
jlpm
8585
jlpm run build

‎app/index.js

+10-2
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ async function main() {
7676
'@jupyterlab/application-extension:commands',
7777
'@jupyterlab/application-extension:context-menu',
7878
'@jupyterlab/application-extension:faviconbusy',
79+
'@jupyterlab/application-extension:top-bar',
7980
'@jupyterlab/application-extension:top-spacer'
8081
].includes(id)
8182
),
@@ -162,6 +163,7 @@ async function main() {
162163
'@jupyterlab/filebrowser-extension:download',
163164
'@jupyterlab/filebrowser-extension:file-upload-status',
164165
'@jupyterlab/filebrowser-extension:open-with',
166+
'@jupyterlab/filebrowser-extension:search',
165167
'@jupyterlab/filebrowser-extension:share-file'
166168
].includes(id)
167169
),
@@ -174,7 +176,10 @@ async function main() {
174176
baseMods = baseMods.concat([
175177
require('@jupyterlab/cell-toolbar-extension'),
176178
require('@jupyterlab/notebook-extension').default.filter(({ id }) =>
177-
['@jupyterlab/notebook-extension:completer'].includes(id)
179+
[
180+
'@jupyterlab/notebook-extension:completer',
181+
'@jupyterlab/notebook-extension:search'
182+
].includes(id)
178183
),
179184
require('@jupyterlab/tooltip-extension').default.filter(({ id }) =>
180185
[
@@ -202,7 +207,10 @@ async function main() {
202207
['@jupyterlab/codemirror-extension:commands'].includes(id)
203208
),
204209
require('@jupyterlab/fileeditor-extension').default.filter(({ id }) =>
205-
['@jupyterlab/fileeditor-extension:completer'].includes(id)
210+
[
211+
'@jupyterlab/fileeditor-extension:completer',
212+
'@jupyterlab/fileeditor-extension:search'
213+
].includes(id)
206214
),
207215
require('@jupyterlab/filebrowser-extension').default.filter(({ id }) =>
208216
['@jupyterlab/filebrowser-extension:browser'].includes(id)

‎app/package.json

+94-94
Original file line numberDiff line numberDiff line change
@@ -21,66 +21,66 @@
2121
"@jupyter-notebook/terminal-extension": "~7.0.0-alpha.3",
2222
"@jupyter-notebook/tree-extension": "~7.0.0-alpha.3",
2323
"@jupyter-notebook/ui-components": "~7.0.0-alpha.3",
24-
"@jupyterlab/application": "~4.0.0-alpha.9",
25-
"@jupyterlab/application-extension": "~4.0.0-alpha.9",
26-
"@jupyterlab/apputils": "~4.0.0-alpha.9",
27-
"@jupyterlab/apputils-extension": "~4.0.0-alpha.9",
28-
"@jupyterlab/cell-toolbar": "~4.0.0-alpha.7",
29-
"@jupyterlab/cell-toolbar-extension": "~4.0.0-alpha.7",
30-
"@jupyterlab/celltags": "~4.0.0-alpha.9",
31-
"@jupyterlab/codeeditor": "~4.0.0-alpha.9",
32-
"@jupyterlab/codemirror-extension": "~4.0.0-alpha.9",
33-
"@jupyterlab/completer": "~4.0.0-alpha.9",
34-
"@jupyterlab/completer-extension": "~4.0.0-alpha.9",
35-
"@jupyterlab/console": "~4.0.0-alpha.9",
36-
"@jupyterlab/console-extension": "~4.0.0-alpha.9",
37-
"@jupyterlab/coreutils": "~6.0.0-alpha.9",
38-
"@jupyterlab/docmanager": "~4.0.0-alpha.9",
39-
"@jupyterlab/docmanager-extension": "~4.0.0-alpha.9",
40-
"@jupyterlab/docprovider": "~4.0.0-alpha.9",
41-
"@jupyterlab/docprovider-extension": "~4.0.0-alpha.9",
42-
"@jupyterlab/documentsearch": "~4.0.0-alpha.9",
43-
"@jupyterlab/documentsearch-extension": "~4.0.0-alpha.9",
44-
"@jupyterlab/filebrowser": "~4.0.0-alpha.9",
45-
"@jupyterlab/filebrowser-extension": "~4.0.0-alpha.9",
46-
"@jupyterlab/fileeditor": "~4.0.0-alpha.9",
47-
"@jupyterlab/fileeditor-extension": "~4.0.0-alpha.9",
48-
"@jupyterlab/hub-extension": "~4.0.0-alpha.9",
49-
"@jupyterlab/javascript-extension": "~4.0.0-alpha.9",
50-
"@jupyterlab/json-extension": "~4.0.0-alpha.9",
51-
"@jupyterlab/mainmenu": "~4.0.0-alpha.9",
52-
"@jupyterlab/mainmenu-extension": "~4.0.0-alpha.9",
53-
"@jupyterlab/markedparser-extension": "~4.0.0-alpha.9",
54-
"@jupyterlab/mathjax2-extension": "~4.0.0-alpha.9",
55-
"@jupyterlab/notebook": "~4.0.0-alpha.9",
56-
"@jupyterlab/notebook-extension": "~4.0.0-alpha.9",
57-
"@jupyterlab/observables": "~5.0.0-alpha.9",
58-
"@jupyterlab/outputarea": "~4.0.0-alpha.9",
59-
"@jupyterlab/pdf-extension": "~4.0.0-alpha.9",
60-
"@jupyterlab/rendermime": "~4.0.0-alpha.9",
61-
"@jupyterlab/rendermime-extension": "~4.0.0-alpha.9",
62-
"@jupyterlab/rendermime-interfaces": "~4.0.0-alpha.9",
63-
"@jupyterlab/running-extension": "~4.0.0-alpha.9",
64-
"@jupyterlab/services": "~7.0.0-alpha.9",
65-
"@jupyterlab/settingregistry": "~4.0.0-alpha.9",
66-
"@jupyterlab/shared-models": "~4.0.0-alpha.9",
67-
"@jupyterlab/shortcuts-extension": "~4.0.0-alpha.9",
68-
"@jupyterlab/statedb": "~4.0.0-alpha.9",
69-
"@jupyterlab/statusbar": "~4.0.0-alpha.9",
70-
"@jupyterlab/terminal": "~4.0.0-alpha.9",
71-
"@jupyterlab/terminal-extension": "~4.0.0-alpha.9",
72-
"@jupyterlab/theme-dark-extension": "~4.0.0-alpha.9",
73-
"@jupyterlab/theme-light-extension": "~4.0.0-alpha.9",
74-
"@jupyterlab/tooltip": "~4.0.0-alpha.9",
75-
"@jupyterlab/tooltip-extension": "~4.0.0-alpha.9",
76-
"@jupyterlab/translation": "~4.0.0-alpha.9",
77-
"@jupyterlab/translation-extension": "~4.0.0-alpha.9",
78-
"@jupyterlab/ui-components": "~4.0.0-alpha.24",
79-
"@jupyterlab/user": "~4.0.0-alpha.9",
80-
"@jupyterlab/user-extension": "~4.0.0-alpha.9",
81-
"@jupyterlab/vega5-extension": "~4.0.0-alpha.9",
24+
"@jupyterlab/application": "~4.0.0-alpha.10",
25+
"@jupyterlab/application-extension": "~4.0.0-alpha.10",
26+
"@jupyterlab/apputils": "~4.0.0-alpha.10",
27+
"@jupyterlab/apputils-extension": "~4.0.0-alpha.10",
28+
"@jupyterlab/cell-toolbar": "~4.0.0-alpha.10",
29+
"@jupyterlab/cell-toolbar-extension": "~4.0.0-alpha.10",
30+
"@jupyterlab/celltags": "~4.0.0-alpha.10",
31+
"@jupyterlab/codeeditor": "~4.0.0-alpha.10",
32+
"@jupyterlab/codemirror-extension": "~4.0.0-alpha.10",
33+
"@jupyterlab/completer": "~4.0.0-alpha.10",
34+
"@jupyterlab/completer-extension": "~4.0.0-alpha.10",
35+
"@jupyterlab/console": "~4.0.0-alpha.10",
36+
"@jupyterlab/console-extension": "~4.0.0-alpha.10",
37+
"@jupyterlab/coreutils": "~6.0.0-alpha.10",
38+
"@jupyterlab/docmanager": "~4.0.0-alpha.10",
39+
"@jupyterlab/docmanager-extension": "~4.0.0-alpha.10",
40+
"@jupyterlab/docprovider": "~4.0.0-alpha.10",
41+
"@jupyterlab/docprovider-extension": "~4.0.0-alpha.10",
42+
"@jupyterlab/documentsearch": "~4.0.0-alpha.10",
43+
"@jupyterlab/documentsearch-extension": "~4.0.0-alpha.10",
44+
"@jupyterlab/filebrowser": "~4.0.0-alpha.10",
45+
"@jupyterlab/filebrowser-extension": "~4.0.0-alpha.10",
46+
"@jupyterlab/fileeditor": "~4.0.0-alpha.10",
47+
"@jupyterlab/fileeditor-extension": "~4.0.0-alpha.10",
48+
"@jupyterlab/hub-extension": "~4.0.0-alpha.10",
49+
"@jupyterlab/javascript-extension": "~4.0.0-alpha.10",
50+
"@jupyterlab/json-extension": "~4.0.0-alpha.10",
51+
"@jupyterlab/mainmenu": "~4.0.0-alpha.10",
52+
"@jupyterlab/mainmenu-extension": "~4.0.0-alpha.10",
53+
"@jupyterlab/markedparser-extension": "~4.0.0-alpha.10",
54+
"@jupyterlab/mathjax2-extension": "~4.0.0-alpha.10",
55+
"@jupyterlab/notebook": "~4.0.0-alpha.10",
56+
"@jupyterlab/notebook-extension": "~4.0.0-alpha.10",
57+
"@jupyterlab/observables": "~5.0.0-alpha.10",
58+
"@jupyterlab/outputarea": "~4.0.0-alpha.10",
59+
"@jupyterlab/pdf-extension": "~4.0.0-alpha.10",
60+
"@jupyterlab/rendermime": "~4.0.0-alpha.10",
61+
"@jupyterlab/rendermime-extension": "~4.0.0-alpha.10",
62+
"@jupyterlab/rendermime-interfaces": "~3.8.0-alpha.10",
63+
"@jupyterlab/running-extension": "~4.0.0-alpha.10",
64+
"@jupyterlab/services": "~7.0.0-alpha.10",
65+
"@jupyterlab/settingregistry": "~4.0.0-alpha.10",
66+
"@jupyterlab/shared-models": "~4.0.0-alpha.10",
67+
"@jupyterlab/shortcuts-extension": "~4.0.0-alpha.10",
68+
"@jupyterlab/statedb": "~4.0.0-alpha.10",
69+
"@jupyterlab/statusbar": "~4.0.0-alpha.10",
70+
"@jupyterlab/terminal": "~4.0.0-alpha.10",
71+
"@jupyterlab/terminal-extension": "~4.0.0-alpha.10",
72+
"@jupyterlab/theme-dark-extension": "~4.0.0-alpha.10",
73+
"@jupyterlab/theme-light-extension": "~4.0.0-alpha.10",
74+
"@jupyterlab/tooltip": "~4.0.0-alpha.10",
75+
"@jupyterlab/tooltip-extension": "~4.0.0-alpha.10",
76+
"@jupyterlab/translation": "~4.0.0-alpha.10",
77+
"@jupyterlab/translation-extension": "~4.0.0-alpha.10",
78+
"@jupyterlab/ui-components": "~4.0.0-alpha.25",
79+
"@jupyterlab/user": "~4.0.0-alpha.10",
80+
"@jupyterlab/user-extension": "~4.0.0-alpha.10",
81+
"@jupyterlab/vega5-extension": "~4.0.0-alpha.10",
8282
"@lumino/algorithm": "~1.9.1",
83-
"@lumino/application": "~1.28.1",
83+
"@lumino/application": "~1.29.0",
8484
"@lumino/commands": "~1.20.0",
8585
"@lumino/coreutils": "~1.12.0",
8686
"@lumino/disposable": "~1.10.1",
@@ -90,10 +90,10 @@
9090
"@lumino/properties": "~1.8.1",
9191
"@lumino/signaling": "~1.10.1",
9292
"@lumino/virtualdom": "~1.14.1",
93-
"@lumino/widgets": "~1.31.1",
93+
"@lumino/widgets": "~1.32.0",
9494
"react": "~17.0.2",
9595
"react-dom": "~17.0.2",
96-
"yjs": "~13.5.28"
96+
"yjs": "~13.5.38"
9797
},
9898
"dependencies": {
9999
"@jupyter-notebook/application": "^7.0.0-alpha.3",
@@ -106,41 +106,41 @@
106106
"@jupyter-notebook/terminal-extension": "^7.0.0-alpha.3",
107107
"@jupyter-notebook/tree-extension": "^7.0.0-alpha.3",
108108
"@jupyter-notebook/ui-components": "^7.0.0-alpha.3",
109-
"@jupyterlab/application-extension": "^4.0.0-alpha.9",
110-
"@jupyterlab/apputils-extension": "^4.0.0-alpha.9",
111-
"@jupyterlab/cell-toolbar-extension": "^4.0.0-alpha.7",
112-
"@jupyterlab/celltags": "^4.0.0-alpha.9",
113-
"@jupyterlab/codemirror-extension": "^4.0.0-alpha.9",
114-
"@jupyterlab/completer-extension": "^4.0.0-alpha.9",
115-
"@jupyterlab/console-extension": "^4.0.0-alpha.9",
116-
"@jupyterlab/coreutils": "~6.0.0-alpha.9",
117-
"@jupyterlab/docmanager-extension": "^4.0.0-alpha.9",
118-
"@jupyterlab/docprovider-extension": "^4.0.0-alpha.9",
119-
"@jupyterlab/documentsearch-extension": "^4.0.0-alpha.9",
120-
"@jupyterlab/filebrowser-extension": "^4.0.0-alpha.9",
121-
"@jupyterlab/fileeditor-extension": "^4.0.0-alpha.9",
122-
"@jupyterlab/hub-extension": "^4.0.0-alpha.9",
123-
"@jupyterlab/javascript-extension": "^4.0.0-alpha.9",
124-
"@jupyterlab/json-extension": "^4.0.0-alpha.9",
125-
"@jupyterlab/mainmenu-extension": "^4.0.0-alpha.9",
126-
"@jupyterlab/markedparser-extension": "^4.0.0-alpha.9",
127-
"@jupyterlab/mathjax2-extension": "^4.0.0-alpha.9",
128-
"@jupyterlab/notebook-extension": "^4.0.0-alpha.9",
129-
"@jupyterlab/pdf-extension": "^4.0.0-alpha.9",
130-
"@jupyterlab/rendermime-extension": "^4.0.0-alpha.9",
131-
"@jupyterlab/running-extension": "^4.0.0-alpha.9",
132-
"@jupyterlab/shortcuts-extension": "^4.0.0-alpha.9",
133-
"@jupyterlab/terminal-extension": "^4.0.0-alpha.9",
134-
"@jupyterlab/theme-dark-extension": "^4.0.0-alpha.9",
135-
"@jupyterlab/theme-light-extension": "^4.0.0-alpha.9",
136-
"@jupyterlab/tooltip-extension": "^4.0.0-alpha.9",
137-
"@jupyterlab/translation-extension": "^4.0.0-alpha.9",
138-
"@jupyterlab/user-extension": "^4.0.0-alpha.9",
139-
"@jupyterlab/vega5-extension": "^4.0.0-alpha.9"
109+
"@jupyterlab/application-extension": "^4.0.0-alpha.10",
110+
"@jupyterlab/apputils-extension": "^4.0.0-alpha.10",
111+
"@jupyterlab/cell-toolbar-extension": "^4.0.0-alpha.10",
112+
"@jupyterlab/celltags": "^4.0.0-alpha.10",
113+
"@jupyterlab/codemirror-extension": "^4.0.0-alpha.10",
114+
"@jupyterlab/completer-extension": "^4.0.0-alpha.10",
115+
"@jupyterlab/console-extension": "^4.0.0-alpha.10",
116+
"@jupyterlab/coreutils": "~6.0.0-alpha.10",
117+
"@jupyterlab/docmanager-extension": "^4.0.0-alpha.10",
118+
"@jupyterlab/docprovider-extension": "^4.0.0-alpha.10",
119+
"@jupyterlab/documentsearch-extension": "^4.0.0-alpha.10",
120+
"@jupyterlab/filebrowser-extension": "^4.0.0-alpha.10",
121+
"@jupyterlab/fileeditor-extension": "^4.0.0-alpha.10",
122+
"@jupyterlab/hub-extension": "^4.0.0-alpha.10",
123+
"@jupyterlab/javascript-extension": "^4.0.0-alpha.10",
124+
"@jupyterlab/json-extension": "^4.0.0-alpha.10",
125+
"@jupyterlab/mainmenu-extension": "^4.0.0-alpha.10",
126+
"@jupyterlab/markedparser-extension": "^4.0.0-alpha.10",
127+
"@jupyterlab/mathjax2-extension": "^4.0.0-alpha.10",
128+
"@jupyterlab/notebook-extension": "^4.0.0-alpha.10",
129+
"@jupyterlab/pdf-extension": "^4.0.0-alpha.10",
130+
"@jupyterlab/rendermime-extension": "^4.0.0-alpha.10",
131+
"@jupyterlab/running-extension": "^4.0.0-alpha.10",
132+
"@jupyterlab/shortcuts-extension": "^4.0.0-alpha.10",
133+
"@jupyterlab/terminal-extension": "^4.0.0-alpha.10",
134+
"@jupyterlab/theme-dark-extension": "^4.0.0-alpha.10",
135+
"@jupyterlab/theme-light-extension": "^4.0.0-alpha.10",
136+
"@jupyterlab/tooltip-extension": "^4.0.0-alpha.10",
137+
"@jupyterlab/translation-extension": "^4.0.0-alpha.10",
138+
"@jupyterlab/user-extension": "^4.0.0-alpha.10",
139+
"@jupyterlab/vega5-extension": "^4.0.0-alpha.10"
140140
},
141141
"devDependencies": {
142-
"@jupyterlab/builder": "^4.0.0-alpha.9",
143-
"@jupyterlab/buildutils": "^4.0.0-alpha.9",
142+
"@jupyterlab/builder": "^4.0.0-alpha.10",
143+
"@jupyterlab/buildutils": "^4.0.0-alpha.10",
144144
"@types/rimraf": "^3.0.0",
145145
"css-loader": "~5.0.1",
146146
"fs-extra": "^8.1.0",

‎buildutils/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
"watch": "tsc -w --listEmittedFiles"
3131
},
3232
"dependencies": {
33-
"@jupyterlab/buildutils": "^4.0.0-alpha.9",
33+
"@jupyterlab/buildutils": "^4.0.0-alpha.10",
3434
"commander": "^6.2.0",
3535
"fs-extra": "^9.1.0",
3636
"typescript": "~4.6.3"

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
"watch:lib": "lerna exec --stream --scope @jupyter-notebook/metapackage jlpm watch"
4343
},
4444
"devDependencies": {
45-
"@jupyterlab/buildutils": "^4.0.0-alpha.9",
45+
"@jupyterlab/buildutils": "^4.0.0-alpha.10",
4646
"@typescript-eslint/eslint-plugin": "^4.2.0",
4747
"@typescript-eslint/parser": "^4.2.0",
4848
"eslint": "^7.10.0",

‎packages/application-extension/package.json

+13-13
Original file line numberDiff line numberDiff line change
@@ -41,21 +41,21 @@
4141
"dependencies": {
4242
"@jupyter-notebook/application": "^7.0.0-alpha.3",
4343
"@jupyter-notebook/ui-components": "^7.0.0-alpha.3",
44-
"@jupyterlab/application": "^4.0.0-alpha.9",
45-
"@jupyterlab/apputils": "^4.0.0-alpha.9",
46-
"@jupyterlab/celltags": "^4.0.0-alpha.9",
47-
"@jupyterlab/codeeditor": "^4.0.0-alpha.9",
48-
"@jupyterlab/codemirror": "^4.0.0-alpha.9",
49-
"@jupyterlab/console": "^4.0.0-alpha.9",
50-
"@jupyterlab/coreutils": "^6.0.0-alpha.9",
51-
"@jupyterlab/docmanager": "^4.0.0-alpha.9",
52-
"@jupyterlab/docregistry": "^4.0.0-alpha.9",
53-
"@jupyterlab/mainmenu": "^4.0.0-alpha.9",
54-
"@jupyterlab/settingregistry": "^4.0.0-alpha.9",
55-
"@jupyterlab/translation": "^4.0.0-alpha.9",
44+
"@jupyterlab/application": "^4.0.0-alpha.10",
45+
"@jupyterlab/apputils": "^4.0.0-alpha.10",
46+
"@jupyterlab/celltags": "^4.0.0-alpha.10",
47+
"@jupyterlab/codeeditor": "^4.0.0-alpha.10",
48+
"@jupyterlab/codemirror": "^4.0.0-alpha.10",
49+
"@jupyterlab/console": "^4.0.0-alpha.10",
50+
"@jupyterlab/coreutils": "^6.0.0-alpha.10",
51+
"@jupyterlab/docmanager": "^4.0.0-alpha.10",
52+
"@jupyterlab/docregistry": "^4.0.0-alpha.10",
53+
"@jupyterlab/mainmenu": "^4.0.0-alpha.10",
54+
"@jupyterlab/settingregistry": "^4.0.0-alpha.10",
55+
"@jupyterlab/translation": "^4.0.0-alpha.10",
5656
"@lumino/coreutils": "^1.12.0",
5757
"@lumino/disposable": "^1.10.1",
58-
"@lumino/widgets": "^1.31.1"
58+
"@lumino/widgets": "^1.32.0"
5959
},
6060
"devDependencies": {
6161
"rimraf": "~3.0.0",

‎packages/application-extension/schema/title.json

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"title": "Title widget",
3+
"description": "Title widget",
4+
"jupyter.lab.toolbars": {
5+
"TopBar": [{ "name": "widgetTitle", "rank": 10 }]
6+
},
7+
"properties": {},
8+
"additionalProperties": false,
9+
"type": "object"
10+
}

0 commit comments

Comments
 (0)