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.

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.0a30 #6566

Merged
merged 14 commits into from
Oct 13, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
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.0a29,<5" build
python -m pip install --upgrade jupyter_packaging~=0.10 "jupyterlab>=4.0.0a30,<5" build

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

- name: Install dependencies
run: |
python -m pip install -U "jupyterlab>=4.0.0a29,<5" hatch
python -m pip install -U "jupyterlab>=4.0.0a30,<5" hatch
jlpm
jlpm run build

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

- name: Install dependencies
run: |
python -m pip install -U "jupyterlab>=4.0.0a29,<5" pip
python -m pip install -U "jupyterlab>=4.0.0a30,<5" pip
jlpm
jlpm run build
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -126,3 +126,6 @@ ui-tests/playwright-report

# VSCode
.vscode

# RTC
.jupyter_ystore.db
14 changes: 5 additions & 9 deletions app/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ async function main() {
'@jupyterlab/application-extension:commands',
'@jupyterlab/application-extension:context-menu',
'@jupyterlab/application-extension:faviconbusy',
'@jupyterlab/application-extension:router',
'@jupyterlab/application-extension:top-bar',
'@jupyterlab/application-extension:top-spacer'
].includes(id)
Expand All @@ -92,10 +93,7 @@ async function main() {
].includes(id)
),
require('@jupyterlab/codemirror-extension').default.filter(({ id }) =>
[
'@jupyterlab/codemirror-extension:services',
'@jupyterlab/codemirror-extension:codemirror'
].includes(id)
['@jupyterlab/codemirror-extension:services'].includes(id)
),
require('@jupyterlab/completer-extension').default.filter(({ id }) =>
[
Expand All @@ -115,6 +113,7 @@ async function main() {
[
'@jupyterlab/docmanager-extension:plugin',
'@jupyterlab/docmanager-extension:download',
'@jupyterlab/docmanager-extension:contexts',
'@jupyterlab/docmanager-extension:manager'
].includes(id)
),
Expand Down Expand Up @@ -224,17 +223,14 @@ 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',
'@jupyterlab/fileeditor-extension:search'
].includes(id)
),
require('@jupyterlab/filebrowser-extension').default.filter(({ id }) =>
['@jupyterlab/filebrowser-extension:browser'].includes(id)
require('@jupyterlab/codemirror-extension').default.filter(({ id }) =>
['@jupyterlab/codemirror-extension:commands'].includes(id)
)
]);
break;
Expand Down
209 changes: 108 additions & 101 deletions app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,68 +22,71 @@
"@jupyter-notebook/tree": "~7.0.0-alpha.6",
"@jupyter-notebook/tree-extension": "~7.0.0-alpha.6",
"@jupyter-notebook/ui-components": "~7.0.0-alpha.6",
"@jupyterlab/application": "~4.0.0-alpha.14",
"@jupyterlab/application-extension": "~4.0.0-alpha.14",
"@jupyterlab/apputils": "~4.0.0-alpha.14",
"@jupyterlab/apputils-extension": "~4.0.0-alpha.14",
"@jupyterlab/cell-toolbar": "~4.0.0-alpha.14",
"@jupyterlab/cell-toolbar-extension": "~4.0.0-alpha.14",
"@jupyterlab/celltags": "~4.0.0-alpha.14",
"@jupyterlab/celltags-extension": "~4.0.0-alpha.14",
"@jupyterlab/codeeditor": "~4.0.0-alpha.14",
"@jupyterlab/codemirror-extension": "~4.0.0-alpha.14",
"@jupyterlab/collaboration": "~4.0.0-alpha.14",
"@jupyterlab/collaboration-extension": "~4.0.0-alpha.14",
"@jupyterlab/completer": "~4.0.0-alpha.14",
"@jupyterlab/completer-extension": "~4.0.0-alpha.14",
"@jupyterlab/console": "~4.0.0-alpha.14",
"@jupyterlab/console-extension": "~4.0.0-alpha.14",
"@jupyterlab/coreutils": "~6.0.0-alpha.14",
"@jupyterlab/docmanager": "~4.0.0-alpha.14",
"@jupyterlab/docmanager-extension": "~4.0.0-alpha.14",
"@jupyterlab/docprovider": "~4.0.0-alpha.14",
"@jupyterlab/docprovider-extension": "~4.0.0-alpha.14",
"@jupyterlab/documentsearch": "~4.0.0-alpha.14",
"@jupyterlab/documentsearch-extension": "~4.0.0-alpha.14",
"@jupyterlab/filebrowser": "~4.0.0-alpha.14",
"@jupyterlab/filebrowser-extension": "~4.0.0-alpha.14",
"@jupyterlab/fileeditor": "~4.0.0-alpha.14",
"@jupyterlab/fileeditor-extension": "~4.0.0-alpha.14",
"@jupyterlab/hub-extension": "~4.0.0-alpha.14",
"@jupyterlab/javascript-extension": "~4.0.0-alpha.14",
"@jupyterlab/json-extension": "~4.0.0-alpha.14",
"@jupyterlab/lsp": "~4.0.0-alpha.14",
"@jupyterlab/lsp-extension": "~4.0.0-alpha.14",
"@jupyterlab/mainmenu": "~4.0.0-alpha.14",
"@jupyterlab/mainmenu-extension": "~4.0.0-alpha.14",
"@jupyterlab/markedparser-extension": "~4.0.0-alpha.14",
"@jupyterlab/mathjax2-extension": "~4.0.0-alpha.14",
"@jupyterlab/notebook": "~4.0.0-alpha.14",
"@jupyterlab/notebook-extension": "~4.0.0-alpha.14",
"@jupyterlab/observables": "~5.0.0-alpha.14",
"@jupyterlab/outputarea": "~4.0.0-alpha.14",
"@jupyterlab/pdf-extension": "~4.0.0-alpha.14",
"@jupyterlab/rendermime": "~4.0.0-alpha.14",
"@jupyterlab/rendermime-extension": "~4.0.0-alpha.14",
"@jupyterlab/rendermime-interfaces": "~3.8.0-alpha.14",
"@jupyterlab/running-extension": "~4.0.0-alpha.14",
"@jupyterlab/services": "~7.0.0-alpha.14",
"@jupyterlab/settingregistry": "~4.0.0-alpha.14",
"@jupyterlab/shared-models": "~4.0.0-alpha.14",
"@jupyterlab/shortcuts-extension": "~4.0.0-alpha.14",
"@jupyterlab/statedb": "~4.0.0-alpha.14",
"@jupyterlab/statusbar": "~4.0.0-alpha.14",
"@jupyterlab/terminal": "~4.0.0-alpha.14",
"@jupyterlab/terminal-extension": "~4.0.0-alpha.14",
"@jupyterlab/theme-dark-extension": "~4.0.0-alpha.14",
"@jupyterlab/theme-light-extension": "~4.0.0-alpha.14",
"@jupyterlab/toc-extension": "~6.0.0-alpha.14",
"@jupyterlab/tooltip": "~4.0.0-alpha.14",
"@jupyterlab/tooltip-extension": "~4.0.0-alpha.14",
"@jupyterlab/translation": "~4.0.0-alpha.14",
"@jupyterlab/translation-extension": "~4.0.0-alpha.14",
"@jupyterlab/ui-components": "~4.0.0-alpha.29",
"@jupyterlab/vega5-extension": "~4.0.0-alpha.14",
"@jupyterlab/application": "~4.0.0-alpha.15",
"@jupyterlab/application-extension": "~4.0.0-alpha.15",
"@jupyterlab/apputils": "~4.0.0-alpha.15",
"@jupyterlab/apputils-extension": "~4.0.0-alpha.15",
"@jupyterlab/cell-toolbar": "~4.0.0-alpha.15",
"@jupyterlab/cell-toolbar-extension": "~4.0.0-alpha.15",
"@jupyterlab/celltags": "~4.0.0-alpha.15",
"@jupyterlab/celltags-extension": "~4.0.0-alpha.15",
"@jupyterlab/codeeditor": "~4.0.0-alpha.15",
"@jupyterlab/codemirror": "~4.0.0-alpha.15",
"@jupyterlab/codemirror-extension": "~4.0.0-alpha.15",
"@jupyterlab/collaboration": "~4.0.0-alpha.15",
"@jupyterlab/collaboration-extension": "~4.0.0-alpha.15",
"@jupyterlab/completer": "~4.0.0-alpha.15",
"@jupyterlab/completer-extension": "~4.0.0-alpha.15",
"@jupyterlab/console": "~4.0.0-alpha.15",
"@jupyterlab/console-extension": "~4.0.0-alpha.15",
"@jupyterlab/coreutils": "~6.0.0-alpha.15",
"@jupyterlab/debugger": "~4.0.0-alpha.15",
"@jupyterlab/debugger-extension": "~4.0.0-alpha.15",
"@jupyterlab/docmanager": "~4.0.0-alpha.15",
"@jupyterlab/docmanager-extension": "~4.0.0-alpha.15",
"@jupyterlab/docprovider": "~4.0.0-alpha.15",
"@jupyterlab/docprovider-extension": "~4.0.0-alpha.15",
"@jupyterlab/documentsearch": "~4.0.0-alpha.15",
"@jupyterlab/documentsearch-extension": "~4.0.0-alpha.15",
"@jupyterlab/filebrowser": "~4.0.0-alpha.15",
"@jupyterlab/filebrowser-extension": "~4.0.0-alpha.15",
"@jupyterlab/fileeditor": "~4.0.0-alpha.15",
"@jupyterlab/fileeditor-extension": "~4.0.0-alpha.15",
"@jupyterlab/hub-extension": "~4.0.0-alpha.15",
"@jupyterlab/javascript-extension": "~4.0.0-alpha.15",
"@jupyterlab/json-extension": "~4.0.0-alpha.15",
"@jupyterlab/lsp": "~4.0.0-alpha.15",
"@jupyterlab/lsp-extension": "~4.0.0-alpha.15",
"@jupyterlab/mainmenu": "~4.0.0-alpha.15",
"@jupyterlab/mainmenu-extension": "~4.0.0-alpha.15",
"@jupyterlab/markedparser-extension": "~4.0.0-alpha.15",
"@jupyterlab/mathjax2-extension": "~4.0.0-alpha.15",
"@jupyterlab/notebook": "~4.0.0-alpha.15",
"@jupyterlab/notebook-extension": "~4.0.0-alpha.15",
"@jupyterlab/observables": "~5.0.0-alpha.15",
"@jupyterlab/outputarea": "~4.0.0-alpha.15",
"@jupyterlab/pdf-extension": "~4.0.0-alpha.15",
"@jupyterlab/rendermime": "~4.0.0-alpha.15",
"@jupyterlab/rendermime-extension": "~4.0.0-alpha.15",
"@jupyterlab/rendermime-interfaces": "~3.8.0-alpha.15",
"@jupyterlab/running-extension": "~4.0.0-alpha.15",
"@jupyterlab/services": "~7.0.0-alpha.15",
"@jupyterlab/settingregistry": "~4.0.0-alpha.15",
"@jupyterlab/shared-models": "~4.0.0-alpha.15",
"@jupyterlab/shortcuts-extension": "~4.0.0-alpha.15",
"@jupyterlab/statedb": "~4.0.0-alpha.15",
"@jupyterlab/statusbar": "~4.0.0-alpha.15",
"@jupyterlab/terminal": "~4.0.0-alpha.15",
"@jupyterlab/terminal-extension": "~4.0.0-alpha.15",
"@jupyterlab/theme-dark-extension": "~4.0.0-alpha.15",
"@jupyterlab/theme-light-extension": "~4.0.0-alpha.15",
"@jupyterlab/toc-extension": "~6.0.0-alpha.15",
"@jupyterlab/tooltip": "~4.0.0-alpha.15",
"@jupyterlab/tooltip-extension": "~4.0.0-alpha.15",
"@jupyterlab/translation": "~4.0.0-alpha.15",
"@jupyterlab/translation-extension": "~4.0.0-alpha.15",
"@jupyterlab/ui-components": "~4.0.0-alpha.30",
"@jupyterlab/vega5-extension": "~4.0.0-alpha.15",
"@lumino/algorithm": "~2.0.0-alpha.6",
"@lumino/application": "~2.0.0-alpha.6",
"@lumino/commands": "~2.0.0-alpha.6",
Expand Down Expand Up @@ -112,46 +115,48 @@
"@jupyter-notebook/tree": "^7.0.0-alpha.6",
"@jupyter-notebook/tree-extension": "^7.0.0-alpha.6",
"@jupyter-notebook/ui-components": "^7.0.0-alpha.6",
"@jupyterlab/application-extension": "^4.0.0-alpha.14",
"@jupyterlab/apputils-extension": "^4.0.0-alpha.14",
"@jupyterlab/cell-toolbar-extension": "^4.0.0-alpha.14",
"@jupyterlab/celltags": "^4.0.0-alpha.14",
"@jupyterlab/celltags-extension": "^4.0.0-alpha.14",
"@jupyterlab/codemirror-extension": "^4.0.0-alpha.14",
"@jupyterlab/collaboration-extension": "^4.0.0-alpha.14",
"@jupyterlab/completer-extension": "^4.0.0-alpha.14",
"@jupyterlab/console-extension": "^4.0.0-alpha.14",
"@jupyterlab/coreutils": "^6.0.0-alpha.14",
"@jupyterlab/debugger-extension": "^4.0.0-alpha.14",
"@jupyterlab/docmanager-extension": "^4.0.0-alpha.14",
"@jupyterlab/docprovider-extension": "^4.0.0-alpha.14",
"@jupyterlab/documentsearch-extension": "^4.0.0-alpha.14",
"@jupyterlab/filebrowser-extension": "^4.0.0-alpha.14",
"@jupyterlab/fileeditor-extension": "^4.0.0-alpha.14",
"@jupyterlab/hub-extension": "^4.0.0-alpha.14",
"@jupyterlab/javascript-extension": "^4.0.0-alpha.14",
"@jupyterlab/json-extension": "^4.0.0-alpha.14",
"@jupyterlab/lsp": "^4.0.0-alpha.14",
"@jupyterlab/lsp-extension": "^4.0.0-alpha.14",
"@jupyterlab/mainmenu-extension": "^4.0.0-alpha.14",
"@jupyterlab/markedparser-extension": "^4.0.0-alpha.14",
"@jupyterlab/mathjax2-extension": "^4.0.0-alpha.14",
"@jupyterlab/notebook-extension": "^4.0.0-alpha.14",
"@jupyterlab/pdf-extension": "^4.0.0-alpha.14",
"@jupyterlab/rendermime-extension": "^4.0.0-alpha.14",
"@jupyterlab/running-extension": "^4.0.0-alpha.14",
"@jupyterlab/shortcuts-extension": "^4.0.0-alpha.14",
"@jupyterlab/terminal-extension": "^4.0.0-alpha.14",
"@jupyterlab/theme-dark-extension": "^4.0.0-alpha.14",
"@jupyterlab/theme-light-extension": "^4.0.0-alpha.14",
"@jupyterlab/toc-extension": "^6.0.0-alpha.14",
"@jupyterlab/tooltip-extension": "^4.0.0-alpha.14",
"@jupyterlab/translation-extension": "^4.0.0-alpha.14",
"@jupyterlab/vega5-extension": "^4.0.0-alpha.14"
"@jupyterlab/application-extension": "^4.0.0-alpha.15",
"@jupyterlab/apputils-extension": "^4.0.0-alpha.15",
"@jupyterlab/cell-toolbar-extension": "^4.0.0-alpha.15",
"@jupyterlab/celltags": "^4.0.0-alpha.15",
"@jupyterlab/celltags-extension": "^4.0.0-alpha.15",
"@jupyterlab/codemirror": "^4.0.0-alpha.15",
"@jupyterlab/codemirror-extension": "^4.0.0-alpha.15",
"@jupyterlab/collaboration-extension": "^4.0.0-alpha.15",
"@jupyterlab/completer-extension": "^4.0.0-alpha.15",
"@jupyterlab/console-extension": "^4.0.0-alpha.15",
"@jupyterlab/coreutils": "^6.0.0-alpha.15",
"@jupyterlab/debugger-extension": "^4.0.0-alpha.15",
"@jupyterlab/docmanager-extension": "^4.0.0-alpha.15",
"@jupyterlab/docprovider-extension": "^4.0.0-alpha.15",
"@jupyterlab/documentsearch-extension": "^4.0.0-alpha.15",
"@jupyterlab/filebrowser-extension": "^4.0.0-alpha.15",
"@jupyterlab/fileeditor-extension": "^4.0.0-alpha.15",
"@jupyterlab/hub-extension": "^4.0.0-alpha.15",
"@jupyterlab/javascript-extension": "^4.0.0-alpha.15",
"@jupyterlab/json-extension": "^4.0.0-alpha.15",
"@jupyterlab/lsp": "^4.0.0-alpha.15",
"@jupyterlab/lsp-extension": "^4.0.0-alpha.15",
"@jupyterlab/mainmenu-extension": "^4.0.0-alpha.15",
"@jupyterlab/markedparser-extension": "^4.0.0-alpha.15",
"@jupyterlab/mathjax2-extension": "^4.0.0-alpha.15",
"@jupyterlab/notebook-extension": "^4.0.0-alpha.15",
"@jupyterlab/pdf-extension": "^4.0.0-alpha.15",
"@jupyterlab/rendermime-extension": "^4.0.0-alpha.15",
"@jupyterlab/running-extension": "^4.0.0-alpha.15",
"@jupyterlab/shortcuts-extension": "^4.0.0-alpha.15",
"@jupyterlab/terminal-extension": "^4.0.0-alpha.15",
"@jupyterlab/theme-dark-extension": "^4.0.0-alpha.15",
"@jupyterlab/theme-light-extension": "^4.0.0-alpha.15",
"@jupyterlab/toc-extension": "^6.0.0-alpha.15",
"@jupyterlab/tooltip-extension": "^4.0.0-alpha.15",
"@jupyterlab/translation-extension": "^4.0.0-alpha.15",
"@jupyterlab/ui-components-extension": "^4.0.0-alpha.15",
"@jupyterlab/vega5-extension": "^4.0.0-alpha.15"
},
"devDependencies": {
"@jupyterlab/builder": "^4.0.0-alpha.14",
"@jupyterlab/buildutils": "^4.0.0-alpha.14",
"@jupyterlab/builder": "^4.0.0-alpha.15",
"@jupyterlab/buildutils": "^4.0.0-alpha.15",
"@types/rimraf": "^3.0.2",
"css-loader": "~5.0.1",
"fs-extra": "^8.1.0",
Expand Down Expand Up @@ -204,7 +209,8 @@
"@jupyterlab/theme-dark-extension",
"@jupyterlab/theme-light-extension",
"@jupyterlab/tooltip-extension",
"@jupyterlab/translation-extension"
"@jupyterlab/translation-extension",
"@jupyterlab/ui-components-extension"
],
"singletonPackages": [
"@jupyter-notebook/tree",
Expand All @@ -213,6 +219,7 @@
"@jupyterlab/cell-toolbar",
"@jupyterlab/celltags",
"@jupyterlab/codeeditor",
"@jupyterlab/codemirror",
"@jupyterlab/collaboration",
"@jupyterlab/completer",
"@jupyterlab/console",
Expand Down
2 changes: 1 addition & 1 deletion buildutils/package.json
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.14",
"@jupyterlab/buildutils": "^4.0.0-alpha.15",
"commander": "^6.2.0",
"fs-extra": "^9.1.0",
"typescript": "~4.7.3"
Expand Down
2 changes: 1 addition & 1 deletion package.json
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.14",
"@jupyterlab/buildutils": "^4.0.0-alpha.15",
"@typescript-eslint/eslint-plugin": "^4.2.0",
"@typescript-eslint/parser": "^4.2.0",
"eslint": "^7.10.0",
Expand Down
23 changes: 11 additions & 12 deletions packages/application-extension/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,18 +41,17 @@
"dependencies": {
"@jupyter-notebook/application": "^7.0.0-alpha.6",
"@jupyter-notebook/ui-components": "^7.0.0-alpha.6",
"@jupyterlab/application": "^4.0.0-alpha.14",
"@jupyterlab/apputils": "^4.0.0-alpha.14",
"@jupyterlab/celltags": "^4.0.0-alpha.14",
"@jupyterlab/codeeditor": "^4.0.0-alpha.14",
"@jupyterlab/codemirror": "^4.0.0-alpha.14",
"@jupyterlab/console": "^4.0.0-alpha.14",
"@jupyterlab/coreutils": "^6.0.0-alpha.14",
"@jupyterlab/docmanager": "^4.0.0-alpha.14",
"@jupyterlab/docregistry": "^4.0.0-alpha.14",
"@jupyterlab/mainmenu": "^4.0.0-alpha.14",
"@jupyterlab/settingregistry": "^4.0.0-alpha.14",
"@jupyterlab/translation": "^4.0.0-alpha.14",
"@jupyterlab/application": "^4.0.0-alpha.15",
"@jupyterlab/apputils": "^4.0.0-alpha.15",
"@jupyterlab/celltags": "^4.0.0-alpha.15",
"@jupyterlab/codeeditor": "^4.0.0-alpha.15",
"@jupyterlab/console": "^4.0.0-alpha.15",
"@jupyterlab/coreutils": "^6.0.0-alpha.15",
"@jupyterlab/docmanager": "^4.0.0-alpha.15",
"@jupyterlab/docregistry": "^4.0.0-alpha.15",
"@jupyterlab/mainmenu": "^4.0.0-alpha.15",
"@jupyterlab/settingregistry": "^4.0.0-alpha.15",
"@jupyterlab/translation": "^4.0.0-alpha.15",
"@lumino/coreutils": "^2.0.0-alpha.6",
"@lumino/disposable": "^2.0.0-alpha.6",
"@lumino/widgets": "^2.0.0-alpha.6"
Expand Down
Loading