Skip to content

Commit

Permalink
Update to JupyterLab 4.1.0b0 (#7196)
Browse files Browse the repository at this point in the history 
* Update `yarn.lock`

* Update to JupyterLab 4.1.0b0

* Fix rendermime-interfaces

* CSS tweaks

* more CSS tweaks

* lint
  • Loading branch information
@jtpio
jtpio authored Dec 21, 2023
1 parent d67c3cb commit 165b84e
Show file tree
Hide file tree
Showing 20 changed files with 1,241 additions and 1,235 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/buildutils.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:

- name: Install dependencies
run: |
python -m pip install -U "jupyterlab>=4.1.0a4,<5" hatch
python -m pip install -U "jupyterlab>=4.1.0b0,<5" hatch
jlpm
jlpm run build
Expand Down Expand Up @@ -79,6 +79,6 @@ jobs:

- name: Install dependencies
run: |
python -m pip install -U "jupyterlab>=4.1.0a4,<5" pip
python -m pip install -U "jupyterlab>=4.1.0b0,<5" pip
jlpm
jlpm run build
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ repos:
files: "^notebook"
stages: [manual]
args: ["--install-types", "--non-interactive"]
additional_dependencies: ["traitlets>=5.13", "tornado", "jupyter_server>=2.10", "jupyterlab_server>=2.25", "jupyterlab>=4.1.0a4"]
additional_dependencies: ["traitlets>=5.13", "tornado", "jupyter_server>=2.10", "jupyterlab_server>=2.25", "jupyterlab>=4.1.0b0"]

- repo: https://github.com/pre-commit/pygrep-hooks
rev: 'v1.10.0'
Expand Down
94 changes: 47 additions & 47 deletions app/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,58 +130,58 @@
"@jupyter-notebook/tree": "^7.1.0-alpha.1",
"@jupyter-notebook/tree-extension": "^7.1.0-alpha.1",
"@jupyter-notebook/ui-components": "^7.1.0-alpha.1",
"@jupyterlab/application-extension": "^4.1.0-alpha.4",
"@jupyterlab/apputils-extension": "^4.1.0-alpha.4",
"@jupyterlab/attachments": "^4.1.0-alpha.4",
"@jupyterlab/cell-toolbar-extension": "^4.1.0-alpha.4",
"@jupyterlab/celltags-extension": "^4.1.0-alpha.4",
"@jupyterlab/codemirror": "^4.1.0-alpha.4",
"@jupyterlab/codemirror-extension": "^4.1.0-alpha.4",
"@jupyterlab/completer-extension": "^4.1.0-alpha.4",
"@jupyterlab/console-extension": "^4.1.0-alpha.4",
"@jupyterlab/coreutils": "^6.1.0-alpha.4",
"@jupyterlab/csvviewer-extension": "^4.1.0-alpha.4",
"@jupyterlab/debugger-extension": "^4.1.0-alpha.4",
"@jupyterlab/docmanager-extension": "^4.1.0-alpha.4",
"@jupyterlab/documentsearch-extension": "^4.1.0-alpha.4",
"@jupyterlab/extensionmanager-extension": "^4.1.0-alpha.4",
"@jupyterlab/filebrowser-extension": "^4.1.0-alpha.4",
"@jupyterlab/fileeditor-extension": "^4.1.0-alpha.4",
"@jupyterlab/help-extension": "^4.1.0-alpha.4",
"@jupyterlab/htmlviewer-extension": "^4.1.0-alpha.4",
"@jupyterlab/hub-extension": "^4.1.0-alpha.4",
"@jupyterlab/imageviewer-extension": "^4.1.0-alpha.4",
"@jupyterlab/javascript-extension": "^4.1.0-alpha.4",
"@jupyterlab/json-extension": "^4.1.0-alpha.4",
"@jupyterlab/lsp": "^4.1.0-alpha.4",
"@jupyterlab/lsp-extension": "^4.1.0-alpha.4",
"@jupyterlab/mainmenu-extension": "^4.1.0-alpha.4",
"@jupyterlab/markdownviewer-extension": "^4.1.0-alpha.4",
"@jupyterlab/markedparser-extension": "^4.1.0-alpha.4",
"@jupyterlab/mathjax-extension": "^4.1.0-alpha.4",
"@jupyterlab/mermaid-extension": "^4.1.0-alpha.4",
"@jupyterlab/metadataform-extension": "^4.1.0-alpha.4",
"@jupyterlab/notebook-extension": "^4.1.0-alpha.4",
"@jupyterlab/pdf-extension": "^4.1.0-alpha.4",
"@jupyterlab/running-extension": "^4.1.0-alpha.4",
"@jupyterlab/settingeditor": "^4.1.0-alpha.4",
"@jupyterlab/settingeditor-extension": "^4.1.0-alpha.4",
"@jupyterlab/shortcuts-extension": "^4.1.0-alpha.4",
"@jupyterlab/terminal-extension": "^4.1.0-alpha.4",
"@jupyterlab/theme-dark-extension": "^4.1.0-alpha.4",
"@jupyterlab/theme-light-extension": "^4.1.0-alpha.4",
"@jupyterlab/toc-extension": "^6.1.0-alpha.4",
"@jupyterlab/tooltip-extension": "^4.1.0-alpha.4",
"@jupyterlab/translation-extension": "^4.1.0-alpha.4",
"@jupyterlab/ui-components-extension": "^4.1.0-alpha.4",
"@jupyterlab/vega5-extension": "^4.1.0-alpha.4",
"@jupyterlab/application-extension": "^4.1.0-beta.0",
"@jupyterlab/apputils-extension": "^4.1.0-beta.0",
"@jupyterlab/attachments": "^4.1.0-beta.0",
"@jupyterlab/cell-toolbar-extension": "^4.1.0-beta.0",
"@jupyterlab/celltags-extension": "^4.1.0-beta.0",
"@jupyterlab/codemirror": "^4.1.0-beta.0",
"@jupyterlab/codemirror-extension": "^4.1.0-beta.0",
"@jupyterlab/completer-extension": "^4.1.0-beta.0",
"@jupyterlab/console-extension": "^4.1.0-beta.0",
"@jupyterlab/coreutils": "^6.1.0-beta.0",
"@jupyterlab/csvviewer-extension": "^4.1.0-beta.0",
"@jupyterlab/debugger-extension": "^4.1.0-beta.0",
"@jupyterlab/docmanager-extension": "^4.1.0-beta.0",
"@jupyterlab/documentsearch-extension": "^4.1.0-beta.0",
"@jupyterlab/extensionmanager-extension": "^4.1.0-beta.0",
"@jupyterlab/filebrowser-extension": "^4.1.0-beta.0",
"@jupyterlab/fileeditor-extension": "^4.1.0-beta.0",
"@jupyterlab/help-extension": "^4.1.0-beta.0",
"@jupyterlab/htmlviewer-extension": "^4.1.0-beta.0",
"@jupyterlab/hub-extension": "^4.1.0-beta.0",
"@jupyterlab/imageviewer-extension": "^4.1.0-beta.0",
"@jupyterlab/javascript-extension": "^4.1.0-beta.0",
"@jupyterlab/json-extension": "^4.1.0-beta.0",
"@jupyterlab/lsp": "^4.1.0-beta.0",
"@jupyterlab/lsp-extension": "^4.1.0-beta.0",
"@jupyterlab/mainmenu-extension": "^4.1.0-beta.0",
"@jupyterlab/markdownviewer-extension": "^4.1.0-beta.0",
"@jupyterlab/markedparser-extension": "^4.1.0-beta.0",
"@jupyterlab/mathjax-extension": "^4.1.0-beta.0",
"@jupyterlab/mermaid-extension": "^4.1.0-beta.0",
"@jupyterlab/metadataform-extension": "^4.1.0-beta.0",
"@jupyterlab/notebook-extension": "^4.1.0-beta.0",
"@jupyterlab/pdf-extension": "^4.1.0-beta.0",
"@jupyterlab/running-extension": "^4.1.0-beta.0",
"@jupyterlab/settingeditor": "^4.1.0-beta.0",
"@jupyterlab/settingeditor-extension": "^4.1.0-beta.0",
"@jupyterlab/shortcuts-extension": "^4.1.0-beta.0",
"@jupyterlab/terminal-extension": "^4.1.0-beta.0",
"@jupyterlab/theme-dark-extension": "^4.1.0-beta.0",
"@jupyterlab/theme-light-extension": "^4.1.0-beta.0",
"@jupyterlab/toc-extension": "^6.1.0-beta.0",
"@jupyterlab/tooltip-extension": "^4.1.0-beta.0",
"@jupyterlab/translation-extension": "^4.1.0-beta.0",
"@jupyterlab/ui-components-extension": "^4.1.0-beta.0",
"@jupyterlab/vega5-extension": "^4.1.0-beta.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"yjs": "^13.5.40"
},
"devDependencies": {
"@jupyterlab/builder": "^4.1.0-alpha.4",
"@jupyterlab/buildutils": "^4.1.0-alpha.4",
"@jupyterlab/builder": "^4.1.0-beta.0",
"@jupyterlab/buildutils": "^4.1.0-beta.0",
"@types/rimraf": "^3.0.2",
"css-loader": "~5.0.1",
"extra-watch-webpack-plugin": "^1.0.3",
Expand Down
2 changes: 1 addition & 1 deletion buildutils/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"watch": "tsc -w --listEmittedFiles"
},
"dependencies": {
"@jupyterlab/buildutils": "^4.1.0-alpha.4",
"@jupyterlab/buildutils": "^4.1.0-beta.0",
"commander": "^6.2.0",
"fs-extra": "^9.1.0",
"typescript": "~5.0.2"
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
"yjs": "^13.5.40"
},
"devDependencies": {
"@jupyterlab/buildutils": "^4.1.0-alpha.4",
"@jupyterlab/buildutils": "^4.1.0-beta.0",
"@typescript-eslint/eslint-plugin": "^5.55.0",
"@typescript-eslint/parser": "^5.55.0",
"eslint": "^8.36.0",
Expand Down
22 changes: 11 additions & 11 deletions packages/application-extension/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,17 +40,17 @@
"dependencies": {
"@jupyter-notebook/application": "^7.1.0-alpha.1",
"@jupyter-notebook/ui-components": "^7.1.0-alpha.1",
"@jupyterlab/application": "^4.1.0-alpha.4",
"@jupyterlab/apputils": "^4.2.0-alpha.4",
"@jupyterlab/codeeditor": "^4.1.0-alpha.4",
"@jupyterlab/console": "^4.1.0-alpha.4",
"@jupyterlab/coreutils": "^6.1.0-alpha.4",
"@jupyterlab/docmanager": "^4.1.0-alpha.4",
"@jupyterlab/docregistry": "^4.1.0-alpha.4",
"@jupyterlab/mainmenu": "^4.1.0-alpha.4",
"@jupyterlab/rendermime": "^4.1.0-alpha.4",
"@jupyterlab/settingregistry": "^4.1.0-alpha.4",
"@jupyterlab/translation": "^4.1.0-alpha.4",
"@jupyterlab/application": "^4.1.0-beta.0",
"@jupyterlab/apputils": "^4.2.0-beta.0",
"@jupyterlab/codeeditor": "^4.1.0-beta.0",
"@jupyterlab/console": "^4.1.0-beta.0",
"@jupyterlab/coreutils": "^6.1.0-beta.0",
"@jupyterlab/docmanager": "^4.1.0-beta.0",
"@jupyterlab/docregistry": "^4.1.0-beta.0",
"@jupyterlab/mainmenu": "^4.1.0-beta.0",
"@jupyterlab/rendermime": "^4.1.0-beta.0",
"@jupyterlab/settingregistry": "^4.1.0-beta.0",
"@jupyterlab/translation": "^4.1.0-beta.0",
"@lumino/coreutils": "^2.1.2",
"@lumino/disposable": "^2.1.2",
"@lumino/widgets": "^2.3.1"
Expand Down
12 changes: 6 additions & 6 deletions packages/application/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,11 @@
"watch": "tsc -b --watch"
},
"dependencies": {
"@jupyterlab/application": "^4.1.0-alpha.4",
"@jupyterlab/coreutils": "^6.1.0-alpha.4",
"@jupyterlab/docregistry": "^4.1.0-alpha.4",
"@jupyterlab/rendermime-interfaces": "^3.9.0-alpha.3",
"@jupyterlab/ui-components": "^4.1.0-alpha.4",
"@jupyterlab/application": "^4.1.0-beta.0",
"@jupyterlab/coreutils": "^6.1.0-beta.0",
"@jupyterlab/docregistry": "^4.1.0-beta.0",
"@jupyterlab/rendermime-interfaces": "^3.9.0-beta.0",
"@jupyterlab/ui-components": "^4.1.0-beta.0",
"@lumino/algorithm": "^2.0.1",
"@lumino/coreutils": "^2.1.2",
"@lumino/messaging": "^2.0.1",
Expand All @@ -57,7 +57,7 @@
"devDependencies": {
"@babel/core": "^7.11.6",
"@babel/preset-env": "^7.12.1",
"@jupyterlab/testutils": "^4.1.0-alpha.4",
"@jupyterlab/testutils": "^4.1.0-beta.0",
"@types/jest": "^29.2.5",
"jest": "^29.3.1",
"rimraf": "^3.0.2",
Expand Down
6 changes: 3 additions & 3 deletions packages/console-extension/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@
},
"dependencies": {
"@jupyter-notebook/application": "^7.1.0-alpha.1",
"@jupyterlab/application": "^4.1.0-alpha.4",
"@jupyterlab/console": "^4.1.0-alpha.4",
"@jupyterlab/coreutils": "^6.1.0-alpha.4",
"@jupyterlab/application": "^4.1.0-beta.0",
"@jupyterlab/console": "^4.1.0-beta.0",
"@jupyterlab/coreutils": "^6.1.0-beta.0",
"@lumino/algorithm": "^2.0.1"
},
"devDependencies": {
Expand Down
10 changes: 5 additions & 5 deletions packages/docmanager-extension/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,11 @@
},
"dependencies": {
"@jupyter-notebook/application": "^7.1.0-alpha.1",
"@jupyterlab/application": "^4.1.0-alpha.4",
"@jupyterlab/coreutils": "^6.1.0-alpha.4",
"@jupyterlab/docmanager": "^4.1.0-alpha.4",
"@jupyterlab/docregistry": "^4.1.0-alpha.4",
"@jupyterlab/services": "^7.1.0-alpha.4",
"@jupyterlab/application": "^4.1.0-beta.0",
"@jupyterlab/coreutils": "^6.1.0-beta.0",
"@jupyterlab/docmanager": "^4.1.0-beta.0",
"@jupyterlab/docregistry": "^4.1.0-beta.0",
"@jupyterlab/services": "^7.1.0-beta.0",
"@lumino/algorithm": "^2.0.1",
"@lumino/signaling": "^2.1.2"
},
Expand Down
4 changes: 2 additions & 2 deletions packages/documentsearch-extension/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@
},
"dependencies": {
"@jupyter-notebook/application": "^7.1.0-alpha.1",
"@jupyterlab/application": "^4.1.0-alpha.4",
"@jupyterlab/documentsearch": "^4.1.0-alpha.4",
"@jupyterlab/application": "^4.1.0-beta.0",
"@jupyterlab/documentsearch": "^4.1.0-beta.0",
"@lumino/widgets": "^2.3.1"
},
"devDependencies": {
Expand Down
8 changes: 4 additions & 4 deletions packages/help-extension/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@
},
"dependencies": {
"@jupyter-notebook/ui-components": "^7.1.0-alpha.1",
"@jupyterlab/application": "^4.1.0-alpha.4",
"@jupyterlab/apputils": "^4.2.0-alpha.4",
"@jupyterlab/mainmenu": "^4.1.0-alpha.4",
"@jupyterlab/translation": "^4.1.0-alpha.4",
"@jupyterlab/application": "^4.1.0-beta.0",
"@jupyterlab/apputils": "^4.2.0-beta.0",
"@jupyterlab/mainmenu": "^4.1.0-beta.0",
"@jupyterlab/translation": "^4.1.0-beta.0",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
Expand Down
16 changes: 8 additions & 8 deletions packages/lab-extension/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,18 +44,18 @@
},
"dependencies": {
"@jupyter-notebook/application": "^7.1.0-alpha.1",
"@jupyterlab/application": "^4.1.0-alpha.4",
"@jupyterlab/apputils": "^4.2.0-alpha.4",
"@jupyterlab/coreutils": "^6.1.0-alpha.4",
"@jupyterlab/docregistry": "^4.1.0-alpha.4",
"@jupyterlab/notebook": "^4.1.0-alpha.4",
"@jupyterlab/translation": "^4.1.0-alpha.4",
"@jupyterlab/ui-components": "^4.1.0-alpha.4",
"@jupyterlab/application": "^4.1.0-beta.0",
"@jupyterlab/apputils": "^4.2.0-beta.0",
"@jupyterlab/coreutils": "^6.1.0-beta.0",
"@jupyterlab/docregistry": "^4.1.0-beta.0",
"@jupyterlab/notebook": "^4.1.0-beta.0",
"@jupyterlab/translation": "^4.1.0-beta.0",
"@jupyterlab/ui-components": "^4.1.0-beta.0",
"@lumino/commands": "^2.2.0",
"@lumino/disposable": "^2.1.2"
},
"devDependencies": {
"@jupyterlab/builder": "^4.1.0-alpha.4",
"@jupyterlab/builder": "^4.1.0-beta.0",
"rimraf": "^3.0.2",
"typescript": "~5.0.2"
},
Expand Down
14 changes: 7 additions & 7 deletions packages/notebook-extension/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,13 @@
},
"dependencies": {
"@jupyter-notebook/application": "^7.1.0-alpha.1",
"@jupyterlab/application": "^4.1.0-alpha.4",
"@jupyterlab/apputils": "^4.2.0-alpha.4",
"@jupyterlab/cells": "^4.1.0-alpha.4",
"@jupyterlab/docmanager": "^4.1.0-alpha.4",
"@jupyterlab/notebook": "^4.1.0-alpha.4",
"@jupyterlab/settingregistry": "^4.1.0-alpha.4",
"@jupyterlab/translation": "^4.1.0-alpha.4",
"@jupyterlab/application": "^4.1.0-beta.0",
"@jupyterlab/apputils": "^4.2.0-beta.0",
"@jupyterlab/cells": "^4.1.0-beta.0",
"@jupyterlab/docmanager": "^4.1.0-beta.0",
"@jupyterlab/notebook": "^4.1.0-beta.0",
"@jupyterlab/settingregistry": "^4.1.0-beta.0",
"@jupyterlab/translation": "^4.1.0-beta.0",
"@lumino/polling": "^2.1.2",
"@lumino/widgets": "^2.3.1",
"react": "^18.2.0",
Expand Down
15 changes: 9 additions & 6 deletions packages/notebook-extension/style/base.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ body[data-notebook='notebooks'] .jp-NotebookPanel-toolbar {
padding-right: calc(calc(100% - var(--jp-notebook-max-width)) * 0.5);
}

body[data-notebook='notebooks'] .jp-Notebook {
body[data-notebook='notebooks'] .jp-WindowedPanel-outer {
padding-top: unset;
padding-left: calc(calc(100% - var(--jp-notebook-max-width)) * 0.5);
padding-right: calc(
Expand Down Expand Up @@ -51,7 +51,7 @@ body[data-notebook='notebooks'] .jp-Notebook.jp-mod-scrollPastEnd::after {

/* Fix background colors */

body[data-notebook='notebooks'] .jp-Notebook > * {
body[data-notebook='notebooks'] .jp-WindowedPanel-outer > * {
background: var(--jp-layout-color0);
}

Expand All @@ -69,7 +69,7 @@ body[data-notebook='notebooks']
padding-top: calc(2 * var(--jp-notebook-padding));
}

body[data-notebook='notebooks'] .jp-WindowedPanel-window > *:last-child {
body[data-notebook='notebooks'] .jp-WindowedPanel-viewport > *:last-child {
padding-bottom: calc(2 * var(--jp-notebook-padding));
}

Expand Down Expand Up @@ -135,7 +135,7 @@ body[data-format='mobile'] .jp-NotebookCheckpoint {
display: none;
}

body[data-format='mobile'] .jp-Notebook > *:first-child {
body[data-format='mobile'] .jp-WindowedPanel-outer > *:first-child {
margin-top: 0;
}

Expand All @@ -145,13 +145,16 @@ body[data-format='mobile'] .jp-ToolbarButton .jp-DebuggerBugButton {

/* Virtual Notebook fixes */

body[data-notebook='notebooks'] .jp-WindowedPanel-window {
body[data-notebook='notebooks'] .jp-WindowedPanel-viewport {
background: var(--jp-layout-color0);
padding: unset;
}

/* Notebook box shadow */

body[data-notebook='notebooks'] .jp-Notebook > *:first-child:not(:last-child) {
body[data-notebook='notebooks']
.jp-WindowedPanel-outer
> *:first-child:not(:last-child) {
box-shadow: var(--jp-elevation-z4);
}

Expand Down
6 changes: 3 additions & 3 deletions packages/terminal-extension/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@
},
"dependencies": {
"@jupyter-notebook/application": "^7.1.0-alpha.1",
"@jupyterlab/application": "^4.1.0-alpha.4",
"@jupyterlab/coreutils": "^6.1.0-alpha.4",
"@jupyterlab/terminal": "^4.1.0-alpha.4",
"@jupyterlab/application": "^4.1.0-beta.0",
"@jupyterlab/coreutils": "^6.1.0-beta.0",
"@jupyterlab/terminal": "^4.1.0-beta.0",
"@lumino/algorithm": "^2.0.1"
},
"devDependencies": {
Expand Down
Loading

0 comments on commit 165b84e

Please sign in to comment.