Skip to content

Commit 5942d77

Browse files
authored
Merge pull request #6336 from jtpio/update-lab-alpha-23
Update to JupyterLab 4.0.0a23
2 parents 64eed5c + 86b52a7 commit 5942d77

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+1301
-1193
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.0a22,<5" build
12+
python -m pip install --upgrade jupyter_packaging~=0.10 "jupyterlab>=4.0.0a23,<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.0a22,<5" jupyter_packaging~=0.10
28+
python -m pip install -U "jupyterlab>=4.0.0a23,<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.0a22,<5" jupyter_packaging~=0.10 pip
83+
python -m pip install -U "jupyterlab>=4.0.0a23,<5" jupyter_packaging~=0.10 pip
8484
jlpm
8585
jlpm run build

app/index.js

+5-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,8 @@ async function main() {
7575
[
7676
'@jupyterlab/application-extension:commands',
7777
'@jupyterlab/application-extension:context-menu',
78-
'@jupyterlab/application-extension:faviconbusy'
78+
'@jupyterlab/application-extension:faviconbusy',
79+
'@jupyterlab/application-extension:top-spacer'
7980
].includes(id)
8081
),
8182
require('@jupyterlab/apputils-extension').default.filter(({ id }) =>
@@ -195,6 +196,9 @@ async function main() {
195196
}
196197
case 'edit': {
197198
baseMods = baseMods.concat([
199+
require('@jupyterlab/codemirror-extension').default.filter(({ id }) =>
200+
['@jupyterlab/codemirror-extension:commands'].includes(id)
201+
),
198202
require('@jupyterlab/fileeditor-extension').default.filter(({ id }) =>
199203
['@jupyterlab/fileeditor-extension:completer'].includes(id)
200204
),

app/package.json

+88-88
Original file line numberDiff line numberDiff line change
@@ -21,62 +21,62 @@
2121
"@jupyter-notebook/terminal-extension": "~7.0.0-alpha.2",
2222
"@jupyter-notebook/tree-extension": "~7.0.0-alpha.2",
2323
"@jupyter-notebook/ui-components": "~7.0.0-alpha.2",
24-
"@jupyterlab/application": "~4.0.0-alpha.7",
25-
"@jupyterlab/application-extension": "~4.0.0-alpha.7",
26-
"@jupyterlab/apputils": "~4.0.0-alpha.7",
27-
"@jupyterlab/apputils-extension": "~4.0.0-alpha.7",
28-
"@jupyterlab/celltags": "~4.0.0-alpha.7",
29-
"@jupyterlab/codeeditor": "~4.0.0-alpha.7",
30-
"@jupyterlab/codemirror-extension": "~4.0.0-alpha.7",
31-
"@jupyterlab/completer": "~4.0.0-alpha.7",
32-
"@jupyterlab/completer-extension": "~4.0.0-alpha.7",
33-
"@jupyterlab/console": "~4.0.0-alpha.7",
34-
"@jupyterlab/console-extension": "~4.0.0-alpha.7",
35-
"@jupyterlab/coreutils": "~6.0.0-alpha.7",
36-
"@jupyterlab/docmanager": "~4.0.0-alpha.7",
37-
"@jupyterlab/docmanager-extension": "~4.0.0-alpha.7",
38-
"@jupyterlab/docprovider": "~4.0.0-alpha.7",
39-
"@jupyterlab/docprovider-extension": "~4.0.0-alpha.7",
40-
"@jupyterlab/documentsearch": "~4.0.0-alpha.7",
41-
"@jupyterlab/documentsearch-extension": "~4.0.0-alpha.7",
42-
"@jupyterlab/filebrowser": "~4.0.0-alpha.7",
43-
"@jupyterlab/filebrowser-extension": "~4.0.0-alpha.7",
44-
"@jupyterlab/fileeditor": "~4.0.0-alpha.7",
45-
"@jupyterlab/fileeditor-extension": "~4.0.0-alpha.7",
46-
"@jupyterlab/hub-extension": "~4.0.0-alpha.7",
47-
"@jupyterlab/javascript-extension": "~4.0.0-alpha.7",
48-
"@jupyterlab/json-extension": "~4.0.0-alpha.7",
49-
"@jupyterlab/mainmenu": "~4.0.0-alpha.7",
50-
"@jupyterlab/mainmenu-extension": "~4.0.0-alpha.7",
51-
"@jupyterlab/markedparser-extension": "~4.0.0-alpha.6",
52-
"@jupyterlab/mathjax2-extension": "~4.0.0-alpha.7",
53-
"@jupyterlab/notebook": "~4.0.0-alpha.7",
54-
"@jupyterlab/notebook-extension": "~4.0.0-alpha.7",
55-
"@jupyterlab/observables": "~5.0.0-alpha.7",
56-
"@jupyterlab/outputarea": "~4.0.0-alpha.7",
57-
"@jupyterlab/pdf-extension": "~4.0.0-alpha.7",
58-
"@jupyterlab/rendermime": "~4.0.0-alpha.7",
59-
"@jupyterlab/rendermime-extension": "~4.0.0-alpha.7",
60-
"@jupyterlab/rendermime-interfaces": "~4.0.0-alpha.7",
61-
"@jupyterlab/running-extension": "~4.0.0-alpha.7",
62-
"@jupyterlab/services": "~7.0.0-alpha.7",
63-
"@jupyterlab/settingregistry": "~4.0.0-alpha.7",
64-
"@jupyterlab/shared-models": "~4.0.0-alpha.7",
65-
"@jupyterlab/shortcuts-extension": "~4.0.0-alpha.7",
66-
"@jupyterlab/statedb": "~4.0.0-alpha.7",
67-
"@jupyterlab/statusbar": "~4.0.0-alpha.7",
68-
"@jupyterlab/terminal": "~4.0.0-alpha.7",
69-
"@jupyterlab/terminal-extension": "~4.0.0-alpha.7",
70-
"@jupyterlab/theme-dark-extension": "~4.0.0-alpha.7",
71-
"@jupyterlab/theme-light-extension": "~4.0.0-alpha.7",
72-
"@jupyterlab/tooltip": "~4.0.0-alpha.7",
73-
"@jupyterlab/tooltip-extension": "~4.0.0-alpha.7",
74-
"@jupyterlab/translation": "~4.0.0-alpha.7",
75-
"@jupyterlab/translation-extension": "~4.0.0-alpha.7",
76-
"@jupyterlab/ui-components": "~4.0.0-alpha.22",
77-
"@jupyterlab/user": "~4.0.0-alpha.7",
78-
"@jupyterlab/user-extension": "~4.0.0-alpha.7",
79-
"@jupyterlab/vega5-extension": "~4.0.0-alpha.7",
24+
"@jupyterlab/application": "~4.0.0-alpha.8",
25+
"@jupyterlab/application-extension": "~4.0.0-alpha.8",
26+
"@jupyterlab/apputils": "~4.0.0-alpha.8",
27+
"@jupyterlab/apputils-extension": "~4.0.0-alpha.8",
28+
"@jupyterlab/celltags": "~4.0.0-alpha.8",
29+
"@jupyterlab/codeeditor": "~4.0.0-alpha.8",
30+
"@jupyterlab/codemirror-extension": "~4.0.0-alpha.8",
31+
"@jupyterlab/completer": "~4.0.0-alpha.8",
32+
"@jupyterlab/completer-extension": "~4.0.0-alpha.8",
33+
"@jupyterlab/console": "~4.0.0-alpha.8",
34+
"@jupyterlab/console-extension": "~4.0.0-alpha.8",
35+
"@jupyterlab/coreutils": "~6.0.0-alpha.8",
36+
"@jupyterlab/docmanager": "~4.0.0-alpha.8",
37+
"@jupyterlab/docmanager-extension": "~4.0.0-alpha.8",
38+
"@jupyterlab/docprovider": "~4.0.0-alpha.8",
39+
"@jupyterlab/docprovider-extension": "~4.0.0-alpha.8",
40+
"@jupyterlab/documentsearch": "~4.0.0-alpha.8",
41+
"@jupyterlab/documentsearch-extension": "~4.0.0-alpha.8",
42+
"@jupyterlab/filebrowser": "~4.0.0-alpha.8",
43+
"@jupyterlab/filebrowser-extension": "~4.0.0-alpha.8",
44+
"@jupyterlab/fileeditor": "~4.0.0-alpha.8",
45+
"@jupyterlab/fileeditor-extension": "~4.0.0-alpha.8",
46+
"@jupyterlab/hub-extension": "~4.0.0-alpha.8",
47+
"@jupyterlab/javascript-extension": "~4.0.0-alpha.8",
48+
"@jupyterlab/json-extension": "~4.0.0-alpha.8",
49+
"@jupyterlab/mainmenu": "~4.0.0-alpha.8",
50+
"@jupyterlab/mainmenu-extension": "~4.0.0-alpha.8",
51+
"@jupyterlab/markedparser-extension": "~4.0.0-alpha.8",
52+
"@jupyterlab/mathjax2-extension": "~4.0.0-alpha.8",
53+
"@jupyterlab/notebook": "~4.0.0-alpha.8",
54+
"@jupyterlab/notebook-extension": "~4.0.0-alpha.8",
55+
"@jupyterlab/observables": "~5.0.0-alpha.8",
56+
"@jupyterlab/outputarea": "~4.0.0-alpha.8",
57+
"@jupyterlab/pdf-extension": "~4.0.0-alpha.8",
58+
"@jupyterlab/rendermime": "~4.0.0-alpha.8",
59+
"@jupyterlab/rendermime-extension": "~4.0.0-alpha.8",
60+
"@jupyterlab/rendermime-interfaces": "~4.0.0-alpha.8",
61+
"@jupyterlab/running-extension": "~4.0.0-alpha.8",
62+
"@jupyterlab/services": "~7.0.0-alpha.8",
63+
"@jupyterlab/settingregistry": "~4.0.0-alpha.8",
64+
"@jupyterlab/shared-models": "~4.0.0-alpha.8",
65+
"@jupyterlab/shortcuts-extension": "~4.0.0-alpha.8",
66+
"@jupyterlab/statedb": "~4.0.0-alpha.8",
67+
"@jupyterlab/statusbar": "~4.0.0-alpha.8",
68+
"@jupyterlab/terminal": "~4.0.0-alpha.8",
69+
"@jupyterlab/terminal-extension": "~4.0.0-alpha.8",
70+
"@jupyterlab/theme-dark-extension": "~4.0.0-alpha.8",
71+
"@jupyterlab/theme-light-extension": "~4.0.0-alpha.8",
72+
"@jupyterlab/tooltip": "~4.0.0-alpha.8",
73+
"@jupyterlab/tooltip-extension": "~4.0.0-alpha.8",
74+
"@jupyterlab/translation": "~4.0.0-alpha.8",
75+
"@jupyterlab/translation-extension": "~4.0.0-alpha.8",
76+
"@jupyterlab/ui-components": "~4.0.0-alpha.23",
77+
"@jupyterlab/user": "~4.0.0-alpha.8",
78+
"@jupyterlab/user-extension": "~4.0.0-alpha.8",
79+
"@jupyterlab/vega5-extension": "~4.0.0-alpha.8",
8080
"@lumino/algorithm": "~1.9.1",
8181
"@lumino/application": "~1.28.1",
8282
"@lumino/commands": "~1.20.0",
@@ -104,40 +104,40 @@
104104
"@jupyter-notebook/terminal-extension": "^7.0.0-alpha.2",
105105
"@jupyter-notebook/tree-extension": "^7.0.0-alpha.2",
106106
"@jupyter-notebook/ui-components": "^7.0.0-alpha.2",
107-
"@jupyterlab/application-extension": "^4.0.0-alpha.7",
108-
"@jupyterlab/apputils-extension": "^4.0.0-alpha.7",
109-
"@jupyterlab/celltags": "^4.0.0-alpha.7",
110-
"@jupyterlab/codemirror-extension": "^4.0.0-alpha.7",
111-
"@jupyterlab/completer-extension": "^4.0.0-alpha.7",
112-
"@jupyterlab/console-extension": "^4.0.0-alpha.7",
113-
"@jupyterlab/coreutils": "~6.0.0-alpha.7",
114-
"@jupyterlab/docmanager-extension": "^4.0.0-alpha.7",
115-
"@jupyterlab/docprovider-extension": "^4.0.0-alpha.7",
116-
"@jupyterlab/documentsearch-extension": "^4.0.0-alpha.7",
117-
"@jupyterlab/filebrowser-extension": "^4.0.0-alpha.7",
118-
"@jupyterlab/fileeditor-extension": "^4.0.0-alpha.7",
119-
"@jupyterlab/hub-extension": "^4.0.0-alpha.7",
120-
"@jupyterlab/javascript-extension": "^4.0.0-alpha.7",
121-
"@jupyterlab/json-extension": "^4.0.0-alpha.7",
122-
"@jupyterlab/mainmenu-extension": "^4.0.0-alpha.7",
123-
"@jupyterlab/markedparser-extension": "^4.0.0-alpha.6",
124-
"@jupyterlab/mathjax2-extension": "^4.0.0-alpha.7",
125-
"@jupyterlab/notebook-extension": "^4.0.0-alpha.7",
126-
"@jupyterlab/pdf-extension": "^4.0.0-alpha.7",
127-
"@jupyterlab/rendermime-extension": "^4.0.0-alpha.7",
128-
"@jupyterlab/running-extension": "^4.0.0-alpha.7",
129-
"@jupyterlab/shortcuts-extension": "^4.0.0-alpha.7",
130-
"@jupyterlab/terminal-extension": "^4.0.0-alpha.7",
131-
"@jupyterlab/theme-dark-extension": "^4.0.0-alpha.7",
132-
"@jupyterlab/theme-light-extension": "^4.0.0-alpha.7",
133-
"@jupyterlab/tooltip-extension": "^4.0.0-alpha.7",
134-
"@jupyterlab/translation-extension": "^4.0.0-alpha.7",
135-
"@jupyterlab/user-extension": "^4.0.0-alpha.7",
136-
"@jupyterlab/vega5-extension": "^4.0.0-alpha.7"
107+
"@jupyterlab/application-extension": "^4.0.0-alpha.8",
108+
"@jupyterlab/apputils-extension": "^4.0.0-alpha.8",
109+
"@jupyterlab/celltags": "^4.0.0-alpha.8",
110+
"@jupyterlab/codemirror-extension": "^4.0.0-alpha.8",
111+
"@jupyterlab/completer-extension": "^4.0.0-alpha.8",
112+
"@jupyterlab/console-extension": "^4.0.0-alpha.8",
113+
"@jupyterlab/coreutils": "~6.0.0-alpha.8",
114+
"@jupyterlab/docmanager-extension": "^4.0.0-alpha.8",
115+
"@jupyterlab/docprovider-extension": "^4.0.0-alpha.8",
116+
"@jupyterlab/documentsearch-extension": "^4.0.0-alpha.8",
117+
"@jupyterlab/filebrowser-extension": "^4.0.0-alpha.8",
118+
"@jupyterlab/fileeditor-extension": "^4.0.0-alpha.8",
119+
"@jupyterlab/hub-extension": "^4.0.0-alpha.8",
120+
"@jupyterlab/javascript-extension": "^4.0.0-alpha.8",
121+
"@jupyterlab/json-extension": "^4.0.0-alpha.8",
122+
"@jupyterlab/mainmenu-extension": "^4.0.0-alpha.8",
123+
"@jupyterlab/markedparser-extension": "^4.0.0-alpha.8",
124+
"@jupyterlab/mathjax2-extension": "^4.0.0-alpha.8",
125+
"@jupyterlab/notebook-extension": "^4.0.0-alpha.8",
126+
"@jupyterlab/pdf-extension": "^4.0.0-alpha.8",
127+
"@jupyterlab/rendermime-extension": "^4.0.0-alpha.8",
128+
"@jupyterlab/running-extension": "^4.0.0-alpha.8",
129+
"@jupyterlab/shortcuts-extension": "^4.0.0-alpha.8",
130+
"@jupyterlab/terminal-extension": "^4.0.0-alpha.8",
131+
"@jupyterlab/theme-dark-extension": "^4.0.0-alpha.8",
132+
"@jupyterlab/theme-light-extension": "^4.0.0-alpha.8",
133+
"@jupyterlab/tooltip-extension": "^4.0.0-alpha.8",
134+
"@jupyterlab/translation-extension": "^4.0.0-alpha.8",
135+
"@jupyterlab/user-extension": "^4.0.0-alpha.8",
136+
"@jupyterlab/vega5-extension": "^4.0.0-alpha.8"
137137
},
138138
"devDependencies": {
139-
"@jupyterlab/builder": "^4.0.0-alpha.7",
140-
"@jupyterlab/buildutils": "^4.0.0-alpha.7",
139+
"@jupyterlab/builder": "^4.0.0-alpha.8",
140+
"@jupyterlab/buildutils": "^4.0.0-alpha.8",
141141
"@types/rimraf": "^3.0.0",
142142
"css-loader": "~5.0.1",
143143
"file-loader": "~5.0.2",

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.7",
33+
"@jupyterlab/buildutils": "^4.0.0-alpha.8",
3434
"commander": "^6.2.0",
3535
"fs-extra": "^9.1.0",
3636
"typescript": "~4.1.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.7",
45+
"@jupyterlab/buildutils": "^4.0.0-alpha.8",
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

+12-12
Original file line numberDiff line numberDiff line change
@@ -41,18 +41,18 @@
4141
"dependencies": {
4242
"@jupyter-notebook/application": "^7.0.0-alpha.2",
4343
"@jupyter-notebook/ui-components": "^7.0.0-alpha.2",
44-
"@jupyterlab/application": "^4.0.0-alpha.7",
45-
"@jupyterlab/apputils": "^4.0.0-alpha.7",
46-
"@jupyterlab/celltags": "^4.0.0-alpha.7",
47-
"@jupyterlab/codeeditor": "^4.0.0-alpha.7",
48-
"@jupyterlab/codemirror": "^4.0.0-alpha.7",
49-
"@jupyterlab/console": "^4.0.0-alpha.7",
50-
"@jupyterlab/coreutils": "^6.0.0-alpha.7",
51-
"@jupyterlab/docmanager": "^4.0.0-alpha.7",
52-
"@jupyterlab/docregistry": "^4.0.0-alpha.7",
53-
"@jupyterlab/mainmenu": "^4.0.0-alpha.7",
54-
"@jupyterlab/settingregistry": "^4.0.0-alpha.7",
55-
"@jupyterlab/translation": "^4.0.0-alpha.7",
44+
"@jupyterlab/application": "^4.0.0-alpha.8",
45+
"@jupyterlab/apputils": "^4.0.0-alpha.8",
46+
"@jupyterlab/celltags": "^4.0.0-alpha.8",
47+
"@jupyterlab/codeeditor": "^4.0.0-alpha.8",
48+
"@jupyterlab/codemirror": "^4.0.0-alpha.8",
49+
"@jupyterlab/console": "^4.0.0-alpha.8",
50+
"@jupyterlab/coreutils": "^6.0.0-alpha.8",
51+
"@jupyterlab/docmanager": "^4.0.0-alpha.8",
52+
"@jupyterlab/docregistry": "^4.0.0-alpha.8",
53+
"@jupyterlab/mainmenu": "^4.0.0-alpha.8",
54+
"@jupyterlab/settingregistry": "^4.0.0-alpha.8",
55+
"@jupyterlab/translation": "^4.0.0-alpha.8",
5656
"@lumino/coreutils": "^1.12.0",
5757
"@lumino/disposable": "^1.10.1",
5858
"@lumino/widgets": "^1.31.1"

packages/application-extension/schema/menus.json

+31
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,37 @@
1515
"rank": 20
1616
}
1717
]
18+
},
19+
{
20+
"id": "jp-mainmenu-run",
21+
"items": [
22+
{
23+
"type": "separator",
24+
"rank": 1000
25+
},
26+
{
27+
"type": "submenu",
28+
"rank": 1010,
29+
"submenu": {
30+
"id": "jp-runmenu-change-cell-type",
31+
"label": "Cell Type",
32+
"items": [
33+
{
34+
"command": "notebook:change-cell-to-code",
35+
"rank": 0
36+
},
37+
{
38+
"command": "notebook:change-cell-to-markdown",
39+
"rank": 0
40+
},
41+
{
42+
"command": "notebook:change-cell-to-raw",
43+
"rank": 0
44+
}
45+
]
46+
}
47+
}
48+
]
1849
}
1950
]
2051
},
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
{
2+
"title": "Jupyter Notebook Pages",
3+
"description": "Jupyter Notebook Pages",
4+
"jupyter.lab.menus": {
5+
"main": [
6+
{
7+
"id": "jp-mainmenu-view",
8+
"items": [
9+
{
10+
"command": "application:open-lab",
11+
"rank": 2
12+
},
13+
{
14+
"command": "application:open-tree",
15+
"rank": 2
16+
}
17+
]
18+
}
19+
]
20+
},
21+
"properties": {},
22+
"additionalProperties": false,
23+
"type": "object"
24+
}

packages/application-extension/schema/top.json

+13
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,19 @@
33
"jupyter.lab.setting-icon-label": "Jupyter Notebook Top Area",
44
"title": "Jupyter Notebook Top Area",
55
"description": "Jupyter Notebook Top Area settings",
6+
"jupyter.lab.menus": {
7+
"main": [
8+
{
9+
"id": "jp-mainmenu-view",
10+
"items": [
11+
{
12+
"command": "application:toggle-top",
13+
"rank": 2
14+
}
15+
]
16+
}
17+
]
18+
},
619
"properties": {
720
"visible": {
821
"type": "boolean",
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"title": "Jupyter Notebook Zen Mode",
3+
"description": "Jupyter Notebook Zen Mode",
4+
"jupyter.lab.menus": {
5+
"main": [
6+
{
7+
"id": "jp-mainmenu-view",
8+
"items": [
9+
{
10+
"command": "application:toggle-zen",
11+
"rank": 3
12+
}
13+
]
14+
}
15+
]
16+
},
17+
"properties": {},
18+
"additionalProperties": false,
19+
"type": "object"
20+
}

0 commit comments

Comments
 (0)