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

Jump to bottom

Update to JupyterLab 4.2.0b0 #7312

Merged
merged 9 commits into from
Apr 10, 2024
Merged

Update to JupyterLab 4.2.0b0 #7312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d6e096a
Update to JupyterLab 4.2.0b0
jtpio Apr 3, 2024
f84c4a5
fix currentChanged
jtpio Apr 3, 2024
e908ab2
fix releaser hook
jtpio Apr 3, 2024
d57280d
Bump galata
jtpio Apr 4, 2024
9018f57
add cell executor
jtpio Apr 5, 2024
42a7432
Fix full CSS
jtpio Apr 5, 2024
2bba503
Default to defer for now
jtpio Apr 9, 2024
77e6ae5
undo max-width adjustment for now
jtpio Apr 9, 2024
f501c2b
add TODO
jtpio Apr 9, 2024
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
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 @@ -29,7 +29,7 @@ jobs:

- name: Install dependencies
run: |
python -m pip install -U "jupyterlab>=4.2.0a2,<4.3" hatch
python -m pip install -U "jupyterlab>=4.2.0b0,<4.3" 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.2.0a2,<4.3" pip
python -m pip install -U "jupyterlab>=4.2.0b0,<4.3" pip
jlpm
jlpm run build
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
View file
Open in desktop
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.2.0a2,<4.3"]
additional_dependencies: ["traitlets>=5.13", "tornado", "jupyter_server>=2.10", "jupyterlab_server>=2.25", "jupyterlab>=4.2.0b0,<4.3"]

- repo: https://github.com/pre-commit/pygrep-hooks
rev: 'v1.10.0'
Expand Down
98 changes: 50 additions & 48 deletions app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,59 +131,59 @@
"@jupyter-notebook/tree": "^7.2.0-alpha.0",
"@jupyter-notebook/tree-extension": "^7.2.0-alpha.0",
"@jupyter-notebook/ui-components": "^7.2.0-alpha.0",
"@jupyterlab/application-extension": "~4.2.0-alpha.2",
"@jupyterlab/apputils-extension": "~4.2.0-alpha.2",
"@jupyterlab/attachments": "~4.2.0-alpha.2",
"@jupyterlab/cell-toolbar-extension": "~4.2.0-alpha.2",
"@jupyterlab/celltags-extension": "~4.2.0-alpha.2",
"@jupyterlab/codemirror": "~4.2.0-alpha.2",
"@jupyterlab/codemirror-extension": "~4.2.0-alpha.2",
"@jupyterlab/completer-extension": "~4.2.0-alpha.2",
"@jupyterlab/console-extension": "~4.2.0-alpha.2",
"@jupyterlab/coreutils": "~6.2.0-alpha.2",
"@jupyterlab/csvviewer-extension": "~4.2.0-alpha.2",
"@jupyterlab/debugger-extension": "~4.2.0-alpha.2",
"@jupyterlab/docmanager-extension": "~4.2.0-alpha.2",
"@jupyterlab/documentsearch-extension": "~4.2.0-alpha.2",
"@jupyterlab/extensionmanager-extension": "~4.2.0-alpha.2",
"@jupyterlab/filebrowser-extension": "~4.2.0-alpha.2",
"@jupyterlab/fileeditor-extension": "~4.2.0-alpha.2",
"@jupyterlab/help-extension": "~4.2.0-alpha.2",
"@jupyterlab/htmlviewer-extension": "~4.2.0-alpha.2",
"@jupyterlab/hub-extension": "~4.2.0-alpha.2",
"@jupyterlab/imageviewer-extension": "~4.2.0-alpha.2",
"@jupyterlab/javascript-extension": "~4.2.0-alpha.2",
"@jupyterlab/json-extension": "~4.2.0-alpha.2",
"@jupyterlab/lsp": "~4.2.0-alpha.2",
"@jupyterlab/lsp-extension": "~4.2.0-alpha.2",
"@jupyterlab/mainmenu-extension": "~4.2.0-alpha.2",
"@jupyterlab/markdownviewer-extension": "~4.2.0-alpha.2",
"@jupyterlab/markedparser-extension": "~4.2.0-alpha.2",
"@jupyterlab/mathjax-extension": "~4.2.0-alpha.2",
"@jupyterlab/mermaid-extension": "~4.2.0-alpha.2",
"@jupyterlab/metadataform-extension": "~4.2.0-alpha.2",
"@jupyterlab/notebook-extension": "~4.2.0-alpha.2",
"@jupyterlab/pdf-extension": "~4.2.0-alpha.2",
"@jupyterlab/pluginmanager-extension": "~4.2.0-alpha.2",
"@jupyterlab/running-extension": "~4.2.0-alpha.2",
"@jupyterlab/settingeditor": "~4.2.0-alpha.2",
"@jupyterlab/settingeditor-extension": "~4.2.0-alpha.2",
"@jupyterlab/shortcuts-extension": "~4.2.0-alpha.2",
"@jupyterlab/terminal-extension": "~4.2.0-alpha.2",
"@jupyterlab/theme-dark-extension": "~4.2.0-alpha.2",
"@jupyterlab/theme-light-extension": "~4.2.0-alpha.2",
"@jupyterlab/toc-extension": "~6.2.0-alpha.2",
"@jupyterlab/tooltip-extension": "~4.2.0-alpha.2",
"@jupyterlab/translation-extension": "~4.2.0-alpha.2",
"@jupyterlab/ui-components-extension": "~4.2.0-alpha.2",
"@jupyterlab/vega5-extension": "~4.2.0-alpha.2",
"@jupyterlab/application-extension": "~4.2.0-beta.0",
"@jupyterlab/apputils-extension": "~4.2.0-beta.0",
"@jupyterlab/attachments": "~4.2.0-beta.0",
"@jupyterlab/cell-toolbar-extension": "~4.2.0-beta.0",
"@jupyterlab/celltags-extension": "~4.2.0-beta.0",
"@jupyterlab/codemirror": "~4.2.0-beta.0",
"@jupyterlab/codemirror-extension": "~4.2.0-beta.0",
"@jupyterlab/completer-extension": "~4.2.0-beta.0",
"@jupyterlab/console-extension": "~4.2.0-beta.0",
"@jupyterlab/coreutils": "~6.2.0-beta.0",
"@jupyterlab/csvviewer-extension": "~4.2.0-beta.0",
"@jupyterlab/debugger-extension": "~4.2.0-beta.0",
"@jupyterlab/docmanager-extension": "~4.2.0-beta.0",
"@jupyterlab/documentsearch-extension": "~4.2.0-beta.0",
"@jupyterlab/extensionmanager-extension": "~4.2.0-beta.0",
"@jupyterlab/filebrowser-extension": "~4.2.0-beta.0",
"@jupyterlab/fileeditor-extension": "~4.2.0-beta.0",
"@jupyterlab/help-extension": "~4.2.0-beta.0",
"@jupyterlab/htmlviewer-extension": "~4.2.0-beta.0",
"@jupyterlab/hub-extension": "~4.2.0-beta.0",
"@jupyterlab/imageviewer-extension": "~4.2.0-beta.0",
"@jupyterlab/javascript-extension": "~4.2.0-beta.0",
"@jupyterlab/json-extension": "~4.2.0-beta.0",
"@jupyterlab/lsp": "~4.2.0-beta.0",
"@jupyterlab/lsp-extension": "~4.2.0-beta.0",
"@jupyterlab/mainmenu-extension": "~4.2.0-beta.0",
"@jupyterlab/markdownviewer-extension": "~4.2.0-beta.0",
"@jupyterlab/markedparser-extension": "~4.2.0-beta.0",
"@jupyterlab/mathjax-extension": "~4.2.0-beta.0",
"@jupyterlab/mermaid-extension": "~4.2.0-beta.0",
"@jupyterlab/metadataform-extension": "~4.2.0-beta.0",
"@jupyterlab/notebook-extension": "~4.2.0-beta.0",
"@jupyterlab/pdf-extension": "~4.2.0-beta.0",
"@jupyterlab/pluginmanager-extension": "~4.2.0-beta.0",
"@jupyterlab/running-extension": "~4.2.0-beta.0",
"@jupyterlab/settingeditor": "~4.2.0-beta.0",
"@jupyterlab/settingeditor-extension": "~4.2.0-beta.0",
"@jupyterlab/shortcuts-extension": "~5.0.0-beta.0",
"@jupyterlab/terminal-extension": "~4.2.0-beta.0",
"@jupyterlab/theme-dark-extension": "~4.2.0-beta.0",
"@jupyterlab/theme-light-extension": "~4.2.0-beta.0",
"@jupyterlab/toc-extension": "~6.2.0-beta.0",
"@jupyterlab/tooltip-extension": "~4.2.0-beta.0",
"@jupyterlab/translation-extension": "~4.2.0-beta.0",
"@jupyterlab/ui-components-extension": "~4.2.0-beta.0",
"@jupyterlab/vega5-extension": "~4.2.0-beta.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"yjs": "^13.5.40"
},
"devDependencies": {
"@jupyterlab/builder": "~4.2.0-alpha.2",
"@jupyterlab/buildutils": "~4.2.0-alpha.2",
"@jupyterlab/builder": "~4.2.0-beta.0",
"@jupyterlab/buildutils": "~4.2.0-beta.0",
"@types/rimraf": "^3.0.2",
"css-loader": "~5.0.1",
"extra-watch-webpack-plugin": "^1.0.3",
Expand Down Expand Up @@ -247,6 +247,7 @@
"@jupyterlab/completer-extension:manager"
],
"@jupyterlab/console-extension": [
"@jupyterlab/console-extension:cell-executor",
"@jupyterlab/console-extension:completer",
"@jupyterlab/console-extension:factory",
"@jupyterlab/console-extension:foreign",
Expand Down Expand Up @@ -282,6 +283,7 @@
"@jupyterlab/mathjax-extension": true,
"@jupyterlab/mermaid-extension": true,
"@jupyterlab/notebook-extension": [
"@jupyterlab/notebook-extension:cell-executor",
"@jupyterlab/notebook-extension:code-console",
"@jupyterlab/notebook-extension:export",
"@jupyterlab/notebook-extension:factory",
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 @@ -29,7 +29,7 @@
"watch": "tsc -w --listEmittedFiles"
},
"dependencies": {
"@jupyterlab/buildutils": "~4.2.0-alpha.2",
"@jupyterlab/buildutils": "~4.2.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
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
"yjs": "^13.5.40"
},
"devDependencies": {
"@jupyterlab/buildutils": "~4.2.0-alpha.2",
"@jupyterlab/buildutils": "~4.2.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
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,17 +40,17 @@
"dependencies": {
"@jupyter-notebook/application": "^7.2.0-alpha.0",
"@jupyter-notebook/ui-components": "^7.2.0-alpha.0",
"@jupyterlab/application": "~4.2.0-alpha.2",
"@jupyterlab/apputils": "~4.3.0-alpha.2",
"@jupyterlab/codeeditor": "~4.2.0-alpha.2",
"@jupyterlab/console": "~4.2.0-alpha.2",
"@jupyterlab/coreutils": "~6.2.0-alpha.2",
"@jupyterlab/docmanager": "~4.2.0-alpha.2",
"@jupyterlab/docregistry": "~4.2.0-alpha.2",
"@jupyterlab/mainmenu": "~4.2.0-alpha.2",
"@jupyterlab/rendermime": "~4.2.0-alpha.2",
"@jupyterlab/settingregistry": "~4.2.0-alpha.2",
"@jupyterlab/translation": "~4.2.0-alpha.2",
"@jupyterlab/application": "~4.2.0-beta.0",
"@jupyterlab/apputils": "~4.3.0-beta.0",
"@jupyterlab/codeeditor": "~4.2.0-beta.0",
"@jupyterlab/console": "~4.2.0-beta.0",
"@jupyterlab/coreutils": "~6.2.0-beta.0",
"@jupyterlab/docmanager": "~4.2.0-beta.0",
"@jupyterlab/docregistry": "~4.2.0-beta.0",
"@jupyterlab/mainmenu": "~4.2.0-beta.0",
"@jupyterlab/rendermime": "~4.2.0-beta.0",
"@jupyterlab/settingregistry": "~4.2.0-beta.0",
"@jupyterlab/translation": "~4.2.0-beta.0",
"@lumino/coreutils": "^2.1.2",
"@lumino/disposable": "^2.1.2",
"@lumino/widgets": "^2.3.2"
Expand Down
12 changes: 6 additions & 6 deletions packages/application/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,11 @@
"watch": "tsc -b --watch"
},
"dependencies": {
"@jupyterlab/application": "~4.2.0-alpha.2",
"@jupyterlab/coreutils": "~6.2.0-alpha.2",
"@jupyterlab/docregistry": "~4.2.0-alpha.2",
"@jupyterlab/rendermime-interfaces": "~3.10.0-alpha.2",
"@jupyterlab/ui-components": "~4.2.0-alpha.2",
"@jupyterlab/application": "~4.2.0-beta.0",
"@jupyterlab/coreutils": "~6.2.0-beta.0",
"@jupyterlab/docregistry": "~4.2.0-beta.0",
"@jupyterlab/rendermime-interfaces": "~3.10.0-beta.0",
"@jupyterlab/ui-components": "~4.2.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.2.0-alpha.2",
"@jupyterlab/testutils": "~4.2.0-beta.0",
"@types/jest": "^29.2.5",
"jest": "^29.3.1",
"rimraf": "^3.0.2",
Expand Down
26 changes: 21 additions & 5 deletions packages/application/src/shell.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,13 @@ import { find } from '@lumino/algorithm';
import { JSONExt, PromiseDelegate, Token } from '@lumino/coreutils';
import { ISignal, Signal } from '@lumino/signaling';

import { BoxLayout, Panel, SplitPanel, Widget } from '@lumino/widgets';
import {
BoxLayout,
FocusTracker,
Panel,
SplitPanel,
Widget,
} from '@lumino/widgets';
import { PanelHandler, SidePanelHandler } from './panelhandler';

/**
Expand Down Expand Up @@ -163,7 +169,10 @@ export class NotebookShell extends Widget implements JupyterFrontEnd.IShell {
/**
* A signal emitted when the current widget changes.
*/
get currentChanged(): ISignal<NotebookShell, void> {
get currentChanged(): ISignal<
JupyterFrontEnd.IShell,
FocusTracker.IChangedArgs<Widget>
> {
return this._currentChanged;
}

Expand Down Expand Up @@ -314,16 +323,21 @@ export class NotebookShell extends Widget implements JupyterFrontEnd.IShell {
case 'menu':
return this._menuHandler.addWidget(widget, rank);
case 'main':
case undefined:
case undefined: {
if (this._main.widgets.length > 0) {
// do not add the widget if there is already one
return;
}
const previousWidget = this.currentWidget;
this._main.addWidget(widget);
this._main.update();
this._currentChanged.emit(void 0);
this._currentChanged.emit({
newValue: widget,
oldValue: previousWidget,
});
this._mainWidgetLoaded.resolve();
break;
}
case 'left':
return this._leftHandler.addWidget(widget, rank);
case 'right':
Expand Down Expand Up @@ -429,7 +443,9 @@ export class NotebookShell extends Widget implements JupyterFrontEnd.IShell {
private _skipLinkWidgetHandler: Private.SkipLinkWidgetHandler;
private _main: Panel;
private _translator: ITranslator = nullTranslator;
private _currentChanged = new Signal<this, void>(this);
private _currentChanged = new Signal<this, FocusTracker.IChangedArgs<Widget>>(
this
);
private _mainWidgetLoaded = new PromiseDelegate<void>();
private _userLayout: INotebookShell.IUserLayout;
}
Expand Down
6 changes: 3 additions & 3 deletions packages/console-extension/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@
},
"dependencies": {
"@jupyter-notebook/application": "^7.2.0-alpha.0",
"@jupyterlab/application": "~4.2.0-alpha.2",
"@jupyterlab/console": "~4.2.0-alpha.2",
"@jupyterlab/coreutils": "~6.2.0-alpha.2",
"@jupyterlab/application": "~4.2.0-beta.0",
"@jupyterlab/console": "~4.2.0-beta.0",
"@jupyterlab/coreutils": "~6.2.0-beta.0",
"@lumino/algorithm": "^2.0.1"
},
"devDependencies": {
Expand Down
10 changes: 5 additions & 5 deletions packages/docmanager-extension/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,11 @@
},
"dependencies": {
"@jupyter-notebook/application": "^7.2.0-alpha.0",
"@jupyterlab/application": "~4.2.0-alpha.2",
"@jupyterlab/coreutils": "~6.2.0-alpha.2",
"@jupyterlab/docmanager": "~4.2.0-alpha.2",
"@jupyterlab/docregistry": "~4.2.0-alpha.2",
"@jupyterlab/services": "~7.2.0-alpha.2",
"@jupyterlab/application": "~4.2.0-beta.0",
"@jupyterlab/coreutils": "~6.2.0-beta.0",
"@jupyterlab/docmanager": "~4.2.0-beta.0",
"@jupyterlab/docregistry": "~4.2.0-beta.0",
"@jupyterlab/services": "~7.2.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
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@
},
"dependencies": {
"@jupyter-notebook/application": "^7.2.0-alpha.0",
"@jupyterlab/application": "~4.2.0-alpha.2",
"@jupyterlab/documentsearch": "~4.2.0-alpha.2",
"@jupyterlab/application": "~4.2.0-beta.0",
"@jupyterlab/documentsearch": "~4.2.0-beta.0",
"@lumino/widgets": "^2.3.2"
},
"devDependencies": {
Expand Down
8 changes: 4 additions & 4 deletions packages/help-extension/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@
},
"dependencies": {
"@jupyter-notebook/ui-components": "^7.2.0-alpha.0",
"@jupyterlab/application": "~4.2.0-alpha.2",
"@jupyterlab/apputils": "~4.3.0-alpha.2",
"@jupyterlab/mainmenu": "~4.2.0-alpha.2",
"@jupyterlab/translation": "~4.2.0-alpha.2",
"@jupyterlab/application": "~4.2.0-beta.0",
"@jupyterlab/apputils": "~4.3.0-beta.0",
"@jupyterlab/mainmenu": "~4.2.0-beta.0",
"@jupyterlab/translation": "~4.2.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
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,18 +44,18 @@
},
"dependencies": {
"@jupyter-notebook/application": "^7.2.0-alpha.0",
"@jupyterlab/application": "~4.2.0-alpha.2",
"@jupyterlab/apputils": "~4.3.0-alpha.2",
"@jupyterlab/coreutils": "~6.2.0-alpha.2",
"@jupyterlab/docregistry": "~4.2.0-alpha.2",
"@jupyterlab/notebook": "~4.2.0-alpha.2",
"@jupyterlab/translation": "~4.2.0-alpha.2",
"@jupyterlab/ui-components": "~4.2.0-alpha.2",
"@jupyterlab/application": "~4.2.0-beta.0",
"@jupyterlab/apputils": "~4.3.0-beta.0",
"@jupyterlab/coreutils": "~6.2.0-beta.0",
"@jupyterlab/docregistry": "~4.2.0-beta.0",
"@jupyterlab/notebook": "~4.2.0-beta.0",
"@jupyterlab/translation": "~4.2.0-beta.0",
"@jupyterlab/ui-components": "~4.2.0-beta.0",
"@lumino/commands": "^2.3.0",
"@lumino/disposable": "^2.1.2"
},
"devDependencies": {
"@jupyterlab/builder": "~4.2.0-alpha.2",
"@jupyterlab/builder": "~4.2.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
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,13 @@
},
"dependencies": {
"@jupyter-notebook/application": "^7.2.0-alpha.0",
"@jupyterlab/application": "~4.2.0-alpha.2",
"@jupyterlab/apputils": "~4.3.0-alpha.2",
"@jupyterlab/cells": "~4.2.0-alpha.2",
"@jupyterlab/docmanager": "~4.2.0-alpha.2",
"@jupyterlab/notebook": "~4.2.0-alpha.2",
"@jupyterlab/settingregistry": "~4.2.0-alpha.2",
"@jupyterlab/translation": "~4.2.0-alpha.2",
"@jupyterlab/application": "~4.2.0-beta.0",
"@jupyterlab/apputils": "~4.3.0-beta.0",
"@jupyterlab/cells": "~4.2.0-beta.0",
"@jupyterlab/docmanager": "~4.2.0-beta.0",
"@jupyterlab/notebook": "~4.2.0-beta.0",
"@jupyterlab/settingregistry": "~4.2.0-beta.0",
"@jupyterlab/translation": "~4.2.0-beta.0",
"@lumino/polling": "^2.1.2",
"@lumino/widgets": "^2.3.2",
"react": "^18.2.0",
Expand Down
Loading
Loading