Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to JupyterLab 4.0.0a23 #6336

Merged
merged 10 commits into from
Apr 4, 2022
Merged

Update to JupyterLab 4.0.0a23 #6336

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
a72a8b1
Update to JupyterLab 4.0.0a23
jtpio Apr 1, 2022
092ada0
Move menu items to the settings
jtpio Apr 1, 2022
e16b32a
Add back filebrowser toolbar widgets
jtpio Apr 3, 2022
ee969fe
Switch to create new dropdown
jtpio Apr 3, 2022
fb93690
Add icon to dropwdown menu
jtpio Apr 3, 2022
0058729
Remove leftover commands
jtpio Apr 3, 2022
6357d3f
Include codemirror commands plugin in edit
jtpio Apr 3, 2022
02caaa0
Update smoke test
jtpio Apr 3, 2022
4b146c1
Fix help menu and reference snapshots
jtpio Apr 3, 2022
86b52a7
Move new file and directory down in the menu
jtpio Apr 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/actions/build-dist/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ runs:
- name: Install dependencies
shell: bash
run: |
python -m pip install --upgrade jupyter_packaging~=0.10 "jupyterlab>=4.0.0a22,<5" build
python -m pip install --upgrade jupyter_packaging~=0.10 "jupyterlab>=4.0.0a23,<5" build

- name: Build pypi distributions
shell: bash
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/buildutils.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:

- name: Install dependencies
run: |
python -m pip install -U "jupyterlab>=4.0.0a22,<5" jupyter_packaging~=0.10
python -m pip install -U "jupyterlab>=4.0.0a23,<5" jupyter_packaging~=0.10
jlpm
jlpm run build

Expand Down Expand Up @@ -80,6 +80,6 @@ jobs:

- name: Install dependencies
run: |
python -m pip install -U "jupyterlab>=4.0.0a22,<5" jupyter_packaging~=0.10 pip
python -m pip install -U "jupyterlab>=4.0.0a23,<5" jupyter_packaging~=0.10 pip
jlpm
jlpm run build
6 changes: 5 additions & 1 deletion app/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,8 @@ async function main() {
[
'@jupyterlab/application-extension:commands',
'@jupyterlab/application-extension:context-menu',
'@jupyterlab/application-extension:faviconbusy'
'@jupyterlab/application-extension:faviconbusy',
'@jupyterlab/application-extension:top-spacer'
].includes(id)
),
require('@jupyterlab/apputils-extension').default.filter(({ id }) =>
Expand Down Expand Up @@ -195,6 +196,9 @@ async function main() {
}
case 'edit': {
baseMods = baseMods.concat([
require('@jupyterlab/codemirror-extension').default.filter(({ id }) =>
['@jupyterlab/codemirror-extension:commands'].includes(id)
),
require('@jupyterlab/fileeditor-extension').default.filter(({ id }) =>
['@jupyterlab/fileeditor-extension:completer'].includes(id)
),
Expand Down
176 changes: 88 additions & 88 deletions app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,62 +21,62 @@
"@jupyter-notebook/terminal-extension": "~7.0.0-alpha.2",
"@jupyter-notebook/tree-extension": "~7.0.0-alpha.2",
"@jupyter-notebook/ui-components": "~7.0.0-alpha.2",
"@jupyterlab/application": "~4.0.0-alpha.7",
"@jupyterlab/application-extension": "~4.0.0-alpha.7",
"@jupyterlab/apputils": "~4.0.0-alpha.7",
"@jupyterlab/apputils-extension": "~4.0.0-alpha.7",
"@jupyterlab/celltags": "~4.0.0-alpha.7",
"@jupyterlab/codeeditor": "~4.0.0-alpha.7",
"@jupyterlab/codemirror-extension": "~4.0.0-alpha.7",
"@jupyterlab/completer": "~4.0.0-alpha.7",
"@jupyterlab/completer-extension": "~4.0.0-alpha.7",
"@jupyterlab/console": "~4.0.0-alpha.7",
"@jupyterlab/console-extension": "~4.0.0-alpha.7",
"@jupyterlab/coreutils": "~6.0.0-alpha.7",
"@jupyterlab/docmanager": "~4.0.0-alpha.7",
"@jupyterlab/docmanager-extension": "~4.0.0-alpha.7",
"@jupyterlab/docprovider": "~4.0.0-alpha.7",
"@jupyterlab/docprovider-extension": "~4.0.0-alpha.7",
"@jupyterlab/documentsearch": "~4.0.0-alpha.7",
"@jupyterlab/documentsearch-extension": "~4.0.0-alpha.7",
"@jupyterlab/filebrowser": "~4.0.0-alpha.7",
"@jupyterlab/filebrowser-extension": "~4.0.0-alpha.7",
"@jupyterlab/fileeditor": "~4.0.0-alpha.7",
"@jupyterlab/fileeditor-extension": "~4.0.0-alpha.7",
"@jupyterlab/hub-extension": "~4.0.0-alpha.7",
"@jupyterlab/javascript-extension": "~4.0.0-alpha.7",
"@jupyterlab/json-extension": "~4.0.0-alpha.7",
"@jupyterlab/mainmenu": "~4.0.0-alpha.7",
"@jupyterlab/mainmenu-extension": "~4.0.0-alpha.7",
"@jupyterlab/markedparser-extension": "~4.0.0-alpha.6",
"@jupyterlab/mathjax2-extension": "~4.0.0-alpha.7",
"@jupyterlab/notebook": "~4.0.0-alpha.7",
"@jupyterlab/notebook-extension": "~4.0.0-alpha.7",
"@jupyterlab/observables": "~5.0.0-alpha.7",
"@jupyterlab/outputarea": "~4.0.0-alpha.7",
"@jupyterlab/pdf-extension": "~4.0.0-alpha.7",
"@jupyterlab/rendermime": "~4.0.0-alpha.7",
"@jupyterlab/rendermime-extension": "~4.0.0-alpha.7",
"@jupyterlab/rendermime-interfaces": "~4.0.0-alpha.7",
"@jupyterlab/running-extension": "~4.0.0-alpha.7",
"@jupyterlab/services": "~7.0.0-alpha.7",
"@jupyterlab/settingregistry": "~4.0.0-alpha.7",
"@jupyterlab/shared-models": "~4.0.0-alpha.7",
"@jupyterlab/shortcuts-extension": "~4.0.0-alpha.7",
"@jupyterlab/statedb": "~4.0.0-alpha.7",
"@jupyterlab/statusbar": "~4.0.0-alpha.7",
"@jupyterlab/terminal": "~4.0.0-alpha.7",
"@jupyterlab/terminal-extension": "~4.0.0-alpha.7",
"@jupyterlab/theme-dark-extension": "~4.0.0-alpha.7",
"@jupyterlab/theme-light-extension": "~4.0.0-alpha.7",
"@jupyterlab/tooltip": "~4.0.0-alpha.7",
"@jupyterlab/tooltip-extension": "~4.0.0-alpha.7",
"@jupyterlab/translation": "~4.0.0-alpha.7",
"@jupyterlab/translation-extension": "~4.0.0-alpha.7",
"@jupyterlab/ui-components": "~4.0.0-alpha.22",
"@jupyterlab/user": "~4.0.0-alpha.7",
"@jupyterlab/user-extension": "~4.0.0-alpha.7",
"@jupyterlab/vega5-extension": "~4.0.0-alpha.7",
"@jupyterlab/application": "~4.0.0-alpha.8",
"@jupyterlab/application-extension": "~4.0.0-alpha.8",
"@jupyterlab/apputils": "~4.0.0-alpha.8",
"@jupyterlab/apputils-extension": "~4.0.0-alpha.8",
"@jupyterlab/celltags": "~4.0.0-alpha.8",
"@jupyterlab/codeeditor": "~4.0.0-alpha.8",
"@jupyterlab/codemirror-extension": "~4.0.0-alpha.8",
"@jupyterlab/completer": "~4.0.0-alpha.8",
"@jupyterlab/completer-extension": "~4.0.0-alpha.8",
"@jupyterlab/console": "~4.0.0-alpha.8",
"@jupyterlab/console-extension": "~4.0.0-alpha.8",
"@jupyterlab/coreutils": "~6.0.0-alpha.8",
"@jupyterlab/docmanager": "~4.0.0-alpha.8",
"@jupyterlab/docmanager-extension": "~4.0.0-alpha.8",
"@jupyterlab/docprovider": "~4.0.0-alpha.8",
"@jupyterlab/docprovider-extension": "~4.0.0-alpha.8",
"@jupyterlab/documentsearch": "~4.0.0-alpha.8",
"@jupyterlab/documentsearch-extension": "~4.0.0-alpha.8",
"@jupyterlab/filebrowser": "~4.0.0-alpha.8",
"@jupyterlab/filebrowser-extension": "~4.0.0-alpha.8",
"@jupyterlab/fileeditor": "~4.0.0-alpha.8",
"@jupyterlab/fileeditor-extension": "~4.0.0-alpha.8",
"@jupyterlab/hub-extension": "~4.0.0-alpha.8",
"@jupyterlab/javascript-extension": "~4.0.0-alpha.8",
"@jupyterlab/json-extension": "~4.0.0-alpha.8",
"@jupyterlab/mainmenu": "~4.0.0-alpha.8",
"@jupyterlab/mainmenu-extension": "~4.0.0-alpha.8",
"@jupyterlab/markedparser-extension": "~4.0.0-alpha.8",
"@jupyterlab/mathjax2-extension": "~4.0.0-alpha.8",
"@jupyterlab/notebook": "~4.0.0-alpha.8",
"@jupyterlab/notebook-extension": "~4.0.0-alpha.8",
"@jupyterlab/observables": "~5.0.0-alpha.8",
"@jupyterlab/outputarea": "~4.0.0-alpha.8",
"@jupyterlab/pdf-extension": "~4.0.0-alpha.8",
"@jupyterlab/rendermime": "~4.0.0-alpha.8",
"@jupyterlab/rendermime-extension": "~4.0.0-alpha.8",
"@jupyterlab/rendermime-interfaces": "~4.0.0-alpha.8",
"@jupyterlab/running-extension": "~4.0.0-alpha.8",
"@jupyterlab/services": "~7.0.0-alpha.8",
"@jupyterlab/settingregistry": "~4.0.0-alpha.8",
"@jupyterlab/shared-models": "~4.0.0-alpha.8",
"@jupyterlab/shortcuts-extension": "~4.0.0-alpha.8",
"@jupyterlab/statedb": "~4.0.0-alpha.8",
"@jupyterlab/statusbar": "~4.0.0-alpha.8",
"@jupyterlab/terminal": "~4.0.0-alpha.8",
"@jupyterlab/terminal-extension": "~4.0.0-alpha.8",
"@jupyterlab/theme-dark-extension": "~4.0.0-alpha.8",
"@jupyterlab/theme-light-extension": "~4.0.0-alpha.8",
"@jupyterlab/tooltip": "~4.0.0-alpha.8",
"@jupyterlab/tooltip-extension": "~4.0.0-alpha.8",
"@jupyterlab/translation": "~4.0.0-alpha.8",
"@jupyterlab/translation-extension": "~4.0.0-alpha.8",
"@jupyterlab/ui-components": "~4.0.0-alpha.23",
"@jupyterlab/user": "~4.0.0-alpha.8",
"@jupyterlab/user-extension": "~4.0.0-alpha.8",
"@jupyterlab/vega5-extension": "~4.0.0-alpha.8",
"@lumino/algorithm": "~1.9.1",
"@lumino/application": "~1.28.1",
"@lumino/commands": "~1.20.0",
Expand Down Expand Up @@ -104,40 +104,40 @@
"@jupyter-notebook/terminal-extension": "^7.0.0-alpha.2",
"@jupyter-notebook/tree-extension": "^7.0.0-alpha.2",
"@jupyter-notebook/ui-components": "^7.0.0-alpha.2",
"@jupyterlab/application-extension": "^4.0.0-alpha.7",
"@jupyterlab/apputils-extension": "^4.0.0-alpha.7",
"@jupyterlab/celltags": "^4.0.0-alpha.7",
"@jupyterlab/codemirror-extension": "^4.0.0-alpha.7",
"@jupyterlab/completer-extension": "^4.0.0-alpha.7",
"@jupyterlab/console-extension": "^4.0.0-alpha.7",
"@jupyterlab/coreutils": "~6.0.0-alpha.7",
"@jupyterlab/docmanager-extension": "^4.0.0-alpha.7",
"@jupyterlab/docprovider-extension": "^4.0.0-alpha.7",
"@jupyterlab/documentsearch-extension": "^4.0.0-alpha.7",
"@jupyterlab/filebrowser-extension": "^4.0.0-alpha.7",
"@jupyterlab/fileeditor-extension": "^4.0.0-alpha.7",
"@jupyterlab/hub-extension": "^4.0.0-alpha.7",
"@jupyterlab/javascript-extension": "^4.0.0-alpha.7",
"@jupyterlab/json-extension": "^4.0.0-alpha.7",
"@jupyterlab/mainmenu-extension": "^4.0.0-alpha.7",
"@jupyterlab/markedparser-extension": "^4.0.0-alpha.6",
"@jupyterlab/mathjax2-extension": "^4.0.0-alpha.7",
"@jupyterlab/notebook-extension": "^4.0.0-alpha.7",
"@jupyterlab/pdf-extension": "^4.0.0-alpha.7",
"@jupyterlab/rendermime-extension": "^4.0.0-alpha.7",
"@jupyterlab/running-extension": "^4.0.0-alpha.7",
"@jupyterlab/shortcuts-extension": "^4.0.0-alpha.7",
"@jupyterlab/terminal-extension": "^4.0.0-alpha.7",
"@jupyterlab/theme-dark-extension": "^4.0.0-alpha.7",
"@jupyterlab/theme-light-extension": "^4.0.0-alpha.7",
"@jupyterlab/tooltip-extension": "^4.0.0-alpha.7",
"@jupyterlab/translation-extension": "^4.0.0-alpha.7",
"@jupyterlab/user-extension": "^4.0.0-alpha.7",
"@jupyterlab/vega5-extension": "^4.0.0-alpha.7"
"@jupyterlab/application-extension": "^4.0.0-alpha.8",
"@jupyterlab/apputils-extension": "^4.0.0-alpha.8",
"@jupyterlab/celltags": "^4.0.0-alpha.8",
"@jupyterlab/codemirror-extension": "^4.0.0-alpha.8",
"@jupyterlab/completer-extension": "^4.0.0-alpha.8",
"@jupyterlab/console-extension": "^4.0.0-alpha.8",
"@jupyterlab/coreutils": "~6.0.0-alpha.8",
"@jupyterlab/docmanager-extension": "^4.0.0-alpha.8",
"@jupyterlab/docprovider-extension": "^4.0.0-alpha.8",
"@jupyterlab/documentsearch-extension": "^4.0.0-alpha.8",
"@jupyterlab/filebrowser-extension": "^4.0.0-alpha.8",
"@jupyterlab/fileeditor-extension": "^4.0.0-alpha.8",
"@jupyterlab/hub-extension": "^4.0.0-alpha.8",
"@jupyterlab/javascript-extension": "^4.0.0-alpha.8",
"@jupyterlab/json-extension": "^4.0.0-alpha.8",
"@jupyterlab/mainmenu-extension": "^4.0.0-alpha.8",
"@jupyterlab/markedparser-extension": "^4.0.0-alpha.8",
"@jupyterlab/mathjax2-extension": "^4.0.0-alpha.8",
"@jupyterlab/notebook-extension": "^4.0.0-alpha.8",
"@jupyterlab/pdf-extension": "^4.0.0-alpha.8",
"@jupyterlab/rendermime-extension": "^4.0.0-alpha.8",
"@jupyterlab/running-extension": "^4.0.0-alpha.8",
"@jupyterlab/shortcuts-extension": "^4.0.0-alpha.8",
"@jupyterlab/terminal-extension": "^4.0.0-alpha.8",
"@jupyterlab/theme-dark-extension": "^4.0.0-alpha.8",
"@jupyterlab/theme-light-extension": "^4.0.0-alpha.8",
"@jupyterlab/tooltip-extension": "^4.0.0-alpha.8",
"@jupyterlab/translation-extension": "^4.0.0-alpha.8",
"@jupyterlab/user-extension": "^4.0.0-alpha.8",
"@jupyterlab/vega5-extension": "^4.0.0-alpha.8"
},
"devDependencies": {
"@jupyterlab/builder": "^4.0.0-alpha.7",
"@jupyterlab/buildutils": "^4.0.0-alpha.7",
"@jupyterlab/builder": "^4.0.0-alpha.8",
"@jupyterlab/buildutils": "^4.0.0-alpha.8",
"@types/rimraf": "^3.0.0",
"css-loader": "~5.0.1",
"file-loader": "~5.0.2",
Expand Down
2 changes: 1 addition & 1 deletion buildutils/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"watch": "tsc -w --listEmittedFiles"
},
"dependencies": {
"@jupyterlab/buildutils": "^4.0.0-alpha.7",
"@jupyterlab/buildutils": "^4.0.0-alpha.8",
"commander": "^6.2.0",
"fs-extra": "^9.1.0",
"typescript": "~4.1.3"
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"watch:lib": "lerna exec --stream --scope @jupyter-notebook/metapackage jlpm watch"
},
"devDependencies": {
"@jupyterlab/buildutils": "^4.0.0-alpha.7",
"@jupyterlab/buildutils": "^4.0.0-alpha.8",
"@typescript-eslint/eslint-plugin": "^4.2.0",
"@typescript-eslint/parser": "^4.2.0",
"eslint": "^7.10.0",
Expand Down
24 changes: 12 additions & 12 deletions packages/application-extension/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,18 +41,18 @@
"dependencies": {
"@jupyter-notebook/application": "^7.0.0-alpha.2",
"@jupyter-notebook/ui-components": "^7.0.0-alpha.2",
"@jupyterlab/application": "^4.0.0-alpha.7",
"@jupyterlab/apputils": "^4.0.0-alpha.7",
"@jupyterlab/celltags": "^4.0.0-alpha.7",
"@jupyterlab/codeeditor": "^4.0.0-alpha.7",
"@jupyterlab/codemirror": "^4.0.0-alpha.7",
"@jupyterlab/console": "^4.0.0-alpha.7",
"@jupyterlab/coreutils": "^6.0.0-alpha.7",
"@jupyterlab/docmanager": "^4.0.0-alpha.7",
"@jupyterlab/docregistry": "^4.0.0-alpha.7",
"@jupyterlab/mainmenu": "^4.0.0-alpha.7",
"@jupyterlab/settingregistry": "^4.0.0-alpha.7",
"@jupyterlab/translation": "^4.0.0-alpha.7",
"@jupyterlab/application": "^4.0.0-alpha.8",
"@jupyterlab/apputils": "^4.0.0-alpha.8",
"@jupyterlab/celltags": "^4.0.0-alpha.8",
"@jupyterlab/codeeditor": "^4.0.0-alpha.8",
"@jupyterlab/codemirror": "^4.0.0-alpha.8",
"@jupyterlab/console": "^4.0.0-alpha.8",
"@jupyterlab/coreutils": "^6.0.0-alpha.8",
"@jupyterlab/docmanager": "^4.0.0-alpha.8",
"@jupyterlab/docregistry": "^4.0.0-alpha.8",
"@jupyterlab/mainmenu": "^4.0.0-alpha.8",
"@jupyterlab/settingregistry": "^4.0.0-alpha.8",
"@jupyterlab/translation": "^4.0.0-alpha.8",
"@lumino/coreutils": "^1.12.0",
"@lumino/disposable": "^1.10.1",
"@lumino/widgets": "^1.31.1"
Expand Down
31 changes: 31 additions & 0 deletions packages/application-extension/schema/menus.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,37 @@
"rank": 20
}
]
},
{
"id": "jp-mainmenu-run",
"items": [
{
"type": "separator",
"rank": 1000
},
{
"type": "submenu",
"rank": 1010,
"submenu": {
"id": "jp-runmenu-change-cell-type",
"label": "Cell Type",
"items": [
{
"command": "notebook:change-cell-to-code",
"rank": 0
},
{
"command": "notebook:change-cell-to-markdown",
"rank": 0
},
{
"command": "notebook:change-cell-to-raw",
"rank": 0
}
]
}
}
]
}
]
},
Expand Down
24 changes: 24 additions & 0 deletions packages/application-extension/schema/pages.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"title": "Jupyter Notebook Pages",
"description": "Jupyter Notebook Pages",
"jupyter.lab.menus": {
"main": [
{
"id": "jp-mainmenu-view",
"items": [
{
"command": "application:open-lab",
"rank": 2
},
{
"command": "application:open-tree",
"rank": 2
}
]
}
]
},
"properties": {},
"additionalProperties": false,
"type": "object"
}
13 changes: 13 additions & 0 deletions packages/application-extension/schema/top.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,19 @@
"jupyter.lab.setting-icon-label": "Jupyter Notebook Top Area",
"title": "Jupyter Notebook Top Area",
"description": "Jupyter Notebook Top Area settings",
"jupyter.lab.menus": {
"main": [
{
"id": "jp-mainmenu-view",
"items": [
{
"command": "application:toggle-top",
"rank": 2
}
]
}
]
},
"properties": {
"visible": {
"type": "boolean",
Expand Down
20 changes: 20 additions & 0 deletions packages/application-extension/schema/zen.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"title": "Jupyter Notebook Zen Mode",
"description": "Jupyter Notebook Zen Mode",
"jupyter.lab.menus": {
"main": [
{
"id": "jp-mainmenu-view",
"items": [
{
"command": "application:toggle-zen",
"rank": 3
}
]
}
]
},
"properties": {},
"additionalProperties": false,
"type": "object"
}
Loading