Skip to content

Commit

Permalink
Update to Lumino 2
Browse files Browse the repository at this point in the history
  • Loading branch information
@afshin
afshin committed Sep 6, 2022
1 parent 4e830ec commit 59e03e2
Show file tree
Hide file tree
Showing 20 changed files with 2,206 additions and 2,126 deletions.
2 changes: 1 addition & 1 deletion app/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ async function main() {
require('@jupyterlab/theme-dark-extension'),
require('@jupyterlab/translation-extension'),
// Add the "Hub Control Panel" menu option when running in JupyterHub
require('@jupyterlab/user-extension'),
require('@jupyterlab/collaboration-extension'),
require('@jupyterlab/hub-extension')
];

Expand Down
204 changes: 102 additions & 102 deletions app/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,76 +22,76 @@
"@jupyter-notebook/tree": "~7.0.0-alpha.5",
"@jupyter-notebook/tree-extension": "~7.0.0-alpha.5",
"@jupyter-notebook/ui-components": "~7.0.0-alpha.5",
"@jupyterlab/application": "~4.0.0-alpha.10",
"@jupyterlab/application-extension": "~4.0.0-alpha.10",
"@jupyterlab/apputils": "~4.0.0-alpha.10",
"@jupyterlab/apputils-extension": "~4.0.0-alpha.10",
"@jupyterlab/cell-toolbar": "~4.0.0-alpha.10",
"@jupyterlab/cell-toolbar-extension": "~4.0.0-alpha.10",
"@jupyterlab/celltags": "~4.0.0-alpha.10",
"@jupyterlab/codeeditor": "~4.0.0-alpha.10",
"@jupyterlab/codemirror-extension": "~4.0.0-alpha.10",
"@jupyterlab/completer": "~4.0.0-alpha.10",
"@jupyterlab/completer-extension": "~4.0.0-alpha.10",
"@jupyterlab/console": "~4.0.0-alpha.10",
"@jupyterlab/console-extension": "~4.0.0-alpha.10",
"@jupyterlab/application": "~4.0.0-alpha.13",
"@jupyterlab/application-extension": "~4.0.0-alpha.13",
"@jupyterlab/apputils": "~4.0.0-alpha.13",
"@jupyterlab/apputils-extension": "~4.0.0-alpha.13",
"@jupyterlab/cell-toolbar": "~4.0.0-alpha.13",
"@jupyterlab/cell-toolbar-extension": "~4.0.0-alpha.13",
"@jupyterlab/celltags": "~4.0.0-alpha.13",
"@jupyterlab/codeeditor": "~4.0.0-alpha.13",
"@jupyterlab/codemirror-extension": "~4.0.0-alpha.13",
"@jupyterlab/collaboration": "~4.0.0-alpha.13",
"@jupyterlab/collaboration-extension": "~4.0.0-alpha.13",
"@jupyterlab/completer": "~4.0.0-alpha.13",
"@jupyterlab/completer-extension": "~4.0.0-alpha.13",
"@jupyterlab/console": "~4.0.0-alpha.13",
"@jupyterlab/console-extension": "~4.0.0-alpha.13",
"@jupyterlab/coreutils": "~6.0.0-alpha.10",
"@jupyterlab/docmanager": "~4.0.0-alpha.10",
"@jupyterlab/docmanager-extension": "~4.0.0-alpha.10",
"@jupyterlab/docprovider": "~4.0.0-alpha.10",
"@jupyterlab/docprovider-extension": "~4.0.0-alpha.10",
"@jupyterlab/documentsearch": "~4.0.0-alpha.10",
"@jupyterlab/documentsearch-extension": "~4.0.0-alpha.10",
"@jupyterlab/filebrowser": "~4.0.0-alpha.10",
"@jupyterlab/filebrowser-extension": "~4.0.0-alpha.10",
"@jupyterlab/fileeditor": "~4.0.0-alpha.10",
"@jupyterlab/fileeditor-extension": "~4.0.0-alpha.10",
"@jupyterlab/hub-extension": "~4.0.0-alpha.10",
"@jupyterlab/javascript-extension": "~4.0.0-alpha.10",
"@jupyterlab/json-extension": "~4.0.0-alpha.10",
"@jupyterlab/mainmenu": "~4.0.0-alpha.10",
"@jupyterlab/mainmenu-extension": "~4.0.0-alpha.10",
"@jupyterlab/markedparser-extension": "~4.0.0-alpha.10",
"@jupyterlab/mathjax2-extension": "~4.0.0-alpha.10",
"@jupyterlab/notebook": "~4.0.0-alpha.10",
"@jupyterlab/notebook-extension": "~4.0.0-alpha.10",
"@jupyterlab/docmanager": "~4.0.0-alpha.13",
"@jupyterlab/docmanager-extension": "~4.0.0-alpha.13",
"@jupyterlab/docprovider": "~4.0.0-alpha.13",
"@jupyterlab/docprovider-extension": "~4.0.0-alpha.13",
"@jupyterlab/documentsearch": "~4.0.0-alpha.13",
"@jupyterlab/documentsearch-extension": "~4.0.0-alpha.13",
"@jupyterlab/filebrowser": "~4.0.0-alpha.13",
"@jupyterlab/filebrowser-extension": "~4.0.0-alpha.13",
"@jupyterlab/fileeditor": "~4.0.0-alpha.13",
"@jupyterlab/fileeditor-extension": "~4.0.0-alpha.13",
"@jupyterlab/hub-extension": "~4.0.0-alpha.13",
"@jupyterlab/javascript-extension": "~4.0.0-alpha.13",
"@jupyterlab/json-extension": "~4.0.0-alpha.13",
"@jupyterlab/mainmenu": "~4.0.0-alpha.13",
"@jupyterlab/mainmenu-extension": "~4.0.0-alpha.13",
"@jupyterlab/markedparser-extension": "~4.0.0-alpha.13",
"@jupyterlab/mathjax2-extension": "~4.0.0-alpha.13",
"@jupyterlab/notebook": "~4.0.0-alpha.13",
"@jupyterlab/notebook-extension": "~4.0.0-alpha.13",
"@jupyterlab/observables": "~5.0.0-alpha.10",
"@jupyterlab/outputarea": "~4.0.0-alpha.10",
"@jupyterlab/pdf-extension": "~4.0.0-alpha.10",
"@jupyterlab/rendermime": "~4.0.0-alpha.10",
"@jupyterlab/rendermime-extension": "~4.0.0-alpha.10",
"@jupyterlab/rendermime-interfaces": "~3.8.0-alpha.10",
"@jupyterlab/running-extension": "~4.0.0-alpha.10",
"@jupyterlab/outputarea": "~4.0.0-alpha.13",
"@jupyterlab/pdf-extension": "~4.0.0-alpha.13",
"@jupyterlab/rendermime": "~4.0.0-alpha.13",
"@jupyterlab/rendermime-extension": "~4.0.0-alpha.13",
"@jupyterlab/rendermime-interfaces": "~3.8.0-alpha.13",
"@jupyterlab/running-extension": "~4.0.0-alpha.13",
"@jupyterlab/services": "~7.0.0-alpha.10",
"@jupyterlab/settingregistry": "~4.0.0-alpha.10",
"@jupyterlab/shared-models": "~4.0.0-alpha.10",
"@jupyterlab/shortcuts-extension": "~4.0.0-alpha.10",
"@jupyterlab/statedb": "~4.0.0-alpha.10",
"@jupyterlab/statusbar": "~4.0.0-alpha.10",
"@jupyterlab/terminal": "~4.0.0-alpha.10",
"@jupyterlab/terminal-extension": "~4.0.0-alpha.10",
"@jupyterlab/theme-dark-extension": "~4.0.0-alpha.10",
"@jupyterlab/theme-light-extension": "~4.0.0-alpha.10",
"@jupyterlab/tooltip": "~4.0.0-alpha.10",
"@jupyterlab/tooltip-extension": "~4.0.0-alpha.10",
"@jupyterlab/translation": "~4.0.0-alpha.10",
"@jupyterlab/translation-extension": "~4.0.0-alpha.10",
"@jupyterlab/ui-components": "~4.0.0-alpha.25",
"@jupyterlab/user": "~4.0.0-alpha.10",
"@jupyterlab/user-extension": "~4.0.0-alpha.10",
"@jupyterlab/vega5-extension": "~4.0.0-alpha.10",
"@lumino/algorithm": "~1.9.1",
"@lumino/application": "~1.29.0",
"@lumino/commands": "~1.20.0",
"@lumino/coreutils": "~1.12.0",
"@lumino/disposable": "~1.10.1",
"@lumino/domutils": "~1.8.1",
"@lumino/dragdrop": "~1.14.0",
"@lumino/messaging": "~1.10.1",
"@lumino/properties": "~1.8.1",
"@lumino/signaling": "~1.10.1",
"@lumino/virtualdom": "~1.14.1",
"@lumino/widgets": "~1.32.0",
"@jupyterlab/settingregistry": "~4.0.0-alpha.13",
"@jupyterlab/shared-models": "~4.0.0-alpha.13",
"@jupyterlab/shortcuts-extension": "~4.0.0-alpha.13",
"@jupyterlab/statedb": "~4.0.0-alpha.13",
"@jupyterlab/statusbar": "~4.0.0-alpha.13",
"@jupyterlab/terminal": "~4.0.0-alpha.13",
"@jupyterlab/terminal-extension": "~4.0.0-alpha.13",
"@jupyterlab/theme-dark-extension": "~4.0.0-alpha.13",
"@jupyterlab/theme-light-extension": "~4.0.0-alpha.13",
"@jupyterlab/tooltip": "~4.0.0-alpha.13",
"@jupyterlab/tooltip-extension": "~4.0.0-alpha.13",
"@jupyterlab/translation": "~4.0.0-alpha.13",
"@jupyterlab/translation-extension": "~4.0.0-alpha.13",
"@jupyterlab/ui-components": "~4.0.0-alpha.28",
"@jupyterlab/vega5-extension": "~4.0.0-alpha.13",
"@lumino/algorithm": "^2.0.0-alpha.1",
"@lumino/application": "^2.0.0-alpha.1",
"@lumino/commands": "^2.0.0-alpha.1",
"@lumino/coreutils": "^2.0.0-alpha.1",
"@lumino/disposable": "^2.0.0-alpha.1",
"@lumino/domutils": "^2.0.0-alpha.1",
"@lumino/dragdrop": "^2.0.0-alpha.1",
"@lumino/messaging": "^2.0.0-alpha.1",
"@lumino/properties": "^2.0.0-alpha.1",
"@lumino/signaling": "^2.0.0-alpha.1",
"@lumino/virtualdom": "^2.0.0-alpha.1",
"@lumino/widgets": "^2.0.0-alpha.1",
"react": "~17.0.2",
"react-dom": "~17.0.2",
"yjs": "~13.5.38"
Expand All @@ -108,41 +108,41 @@
"@jupyter-notebook/tree": "^7.0.0-alpha.5",
"@jupyter-notebook/tree-extension": "^7.0.0-alpha.5",
"@jupyter-notebook/ui-components": "^7.0.0-alpha.5",
"@jupyterlab/application-extension": "^4.0.0-alpha.10",
"@jupyterlab/apputils-extension": "^4.0.0-alpha.10",
"@jupyterlab/cell-toolbar-extension": "^4.0.0-alpha.10",
"@jupyterlab/celltags": "^4.0.0-alpha.10",
"@jupyterlab/codemirror-extension": "^4.0.0-alpha.10",
"@jupyterlab/completer-extension": "^4.0.0-alpha.10",
"@jupyterlab/console-extension": "^4.0.0-alpha.10",
"@jupyterlab/application-extension": "^4.0.0-alpha.13",
"@jupyterlab/apputils-extension": "^4.0.0-alpha.13",
"@jupyterlab/cell-toolbar-extension": "^4.0.0-alpha.13",
"@jupyterlab/celltags": "^4.0.0-alpha.13",
"@jupyterlab/collaboration-extension": "^4.0.0-alpha.13",
"@jupyterlab/codemirror-extension": "^4.0.0-alpha.13",
"@jupyterlab/completer-extension": "^4.0.0-alpha.13",
"@jupyterlab/console-extension": "^4.0.0-alpha.13",
"@jupyterlab/coreutils": "~6.0.0-alpha.10",
"@jupyterlab/docmanager-extension": "^4.0.0-alpha.10",
"@jupyterlab/docprovider-extension": "^4.0.0-alpha.10",
"@jupyterlab/documentsearch-extension": "^4.0.0-alpha.10",
"@jupyterlab/filebrowser-extension": "^4.0.0-alpha.10",
"@jupyterlab/fileeditor-extension": "^4.0.0-alpha.10",
"@jupyterlab/hub-extension": "^4.0.0-alpha.10",
"@jupyterlab/javascript-extension": "^4.0.0-alpha.10",
"@jupyterlab/json-extension": "^4.0.0-alpha.10",
"@jupyterlab/mainmenu-extension": "^4.0.0-alpha.10",
"@jupyterlab/markedparser-extension": "^4.0.0-alpha.10",
"@jupyterlab/mathjax2-extension": "^4.0.0-alpha.10",
"@jupyterlab/notebook-extension": "^4.0.0-alpha.10",
"@jupyterlab/pdf-extension": "^4.0.0-alpha.10",
"@jupyterlab/rendermime-extension": "^4.0.0-alpha.10",
"@jupyterlab/running-extension": "^4.0.0-alpha.10",
"@jupyterlab/shortcuts-extension": "^4.0.0-alpha.10",
"@jupyterlab/terminal-extension": "^4.0.0-alpha.10",
"@jupyterlab/theme-dark-extension": "^4.0.0-alpha.10",
"@jupyterlab/theme-light-extension": "^4.0.0-alpha.10",
"@jupyterlab/tooltip-extension": "^4.0.0-alpha.10",
"@jupyterlab/translation-extension": "^4.0.0-alpha.10",
"@jupyterlab/user-extension": "^4.0.0-alpha.10",
"@jupyterlab/vega5-extension": "^4.0.0-alpha.10"
"@jupyterlab/docmanager-extension": "^4.0.0-alpha.13",
"@jupyterlab/docprovider-extension": "^4.0.0-alpha.13",
"@jupyterlab/documentsearch-extension": "^4.0.0-alpha.13",
"@jupyterlab/filebrowser-extension": "^4.0.0-alpha.13",
"@jupyterlab/fileeditor-extension": "^4.0.0-alpha.13",
"@jupyterlab/hub-extension": "^4.0.0-alpha.13",
"@jupyterlab/javascript-extension": "^4.0.0-alpha.13",
"@jupyterlab/json-extension": "^4.0.0-alpha.13",
"@jupyterlab/mainmenu-extension": "^4.0.0-alpha.13",
"@jupyterlab/markedparser-extension": "^4.0.0-alpha.13",
"@jupyterlab/mathjax2-extension": "^4.0.0-alpha.13",
"@jupyterlab/notebook-extension": "^4.0.0-alpha.13",
"@jupyterlab/pdf-extension": "^4.0.0-alpha.13",
"@jupyterlab/rendermime-extension": "^4.0.0-alpha.13",
"@jupyterlab/running-extension": "^4.0.0-alpha.13",
"@jupyterlab/shortcuts-extension": "^4.0.0-alpha.13",
"@jupyterlab/terminal-extension": "^4.0.0-alpha.13",
"@jupyterlab/theme-dark-extension": "^4.0.0-alpha.13",
"@jupyterlab/theme-light-extension": "^4.0.0-alpha.13",
"@jupyterlab/tooltip-extension": "^4.0.0-alpha.13",
"@jupyterlab/translation-extension": "^4.0.0-alpha.13",
"@jupyterlab/vega5-extension": "^4.0.0-alpha.13"
},
"devDependencies": {
"@jupyterlab/builder": "^4.0.0-alpha.10",
"@jupyterlab/buildutils": "^4.0.0-alpha.10",
"@jupyterlab/builder": "^4.0.0-alpha.13",
"@jupyterlab/buildutils": "^4.0.0-alpha.13",
"@types/rimraf": "^3.0.0",
"css-loader": "~5.0.1",
"fs-extra": "^8.1.0",
Expand All @@ -163,6 +163,7 @@
"name": "Jupyter Notebook",
"extensions": [
"@jupyter-notebook/application-extension",
"@jupyterlab/collaboration-extension",
"@jupyter-notebook/console-extension",
"@jupyter-notebook/docmanager-extension",
"@jupyter-notebook/documentsearch-extension",
Expand Down Expand Up @@ -192,8 +193,7 @@
"@jupyterlab/theme-dark-extension",
"@jupyterlab/theme-light-extension",
"@jupyterlab/tooltip-extension",
"@jupyterlab/translation-extension",
"@jupyterlab/user-extension"
"@jupyterlab/translation-extension"
],
"singletonPackages": [
"@jupyter-notebook/tree",
Expand All @@ -202,6 +202,7 @@
"@jupyterlab/cell-toolbar",
"@jupyterlab/celltags",
"@jupyterlab/codeeditor",
"@jupyterlab/collaboration",
"@jupyterlab/completer",
"@jupyterlab/console",
"@jupyterlab/coreutils",
Expand All @@ -224,7 +225,6 @@
"@jupyterlab/terminal",
"@jupyterlab/tooltip",
"@jupyterlab/translation",
"@jupyterlab/user",
"@jupyterlab/ui-components",
"@lumino/algorithm",
"@lumino/application",
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 @@ -30,7 +30,7 @@
"watch": "tsc -w --listEmittedFiles"
},
"dependencies": {
"@jupyterlab/buildutils": "^4.0.0-alpha.10",
"@jupyterlab/buildutils": "^4.0.0-alpha.13",
"commander": "^6.2.0",
"fs-extra": "^9.1.0",
"typescript": "~4.6.3"
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
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.10",
"@jupyterlab/buildutils": "^4.0.0-alpha.13",
"@typescript-eslint/eslint-plugin": "^4.2.0",
"@typescript-eslint/parser": "^4.2.0",
"eslint": "^7.10.0",
Expand Down
30 changes: 15 additions & 15 deletions packages/application-extension/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,21 +41,21 @@
"dependencies": {
"@jupyter-notebook/application": "^7.0.0-alpha.5",
"@jupyter-notebook/ui-components": "^7.0.0-alpha.5",
"@jupyterlab/application": "^4.0.0-alpha.10",
"@jupyterlab/apputils": "^4.0.0-alpha.10",
"@jupyterlab/celltags": "^4.0.0-alpha.10",
"@jupyterlab/codeeditor": "^4.0.0-alpha.10",
"@jupyterlab/codemirror": "^4.0.0-alpha.10",
"@jupyterlab/console": "^4.0.0-alpha.10",
"@jupyterlab/coreutils": "^6.0.0-alpha.10",
"@jupyterlab/docmanager": "^4.0.0-alpha.10",
"@jupyterlab/docregistry": "^4.0.0-alpha.10",
"@jupyterlab/mainmenu": "^4.0.0-alpha.10",
"@jupyterlab/settingregistry": "^4.0.0-alpha.10",
"@jupyterlab/translation": "^4.0.0-alpha.10",
"@lumino/coreutils": "^1.12.0",
"@lumino/disposable": "^1.10.1",
"@lumino/widgets": "^1.32.0"
"@jupyterlab/application": "^4.0.0-alpha.13",
"@jupyterlab/apputils": "^4.0.0-alpha.13",
"@jupyterlab/celltags": "^4.0.0-alpha.13",
"@jupyterlab/codeeditor": "^4.0.0-alpha.13",
"@jupyterlab/codemirror": "^4.0.0-alpha.13",
"@jupyterlab/console": "^4.0.0-alpha.13",
"@jupyterlab/coreutils": "^6.0.0-alpha.13",
"@jupyterlab/docmanager": "^4.0.0-alpha.13",
"@jupyterlab/docregistry": "^4.0.0-alpha.13",
"@jupyterlab/mainmenu": "^4.0.0-alpha.13",
"@jupyterlab/settingregistry": "^4.0.0-alpha.13",
"@jupyterlab/translation": "^4.0.0-alpha.13",
"@lumino/coreutils": "^2.0.0-alpha.1",
"@lumino/disposable": "^2.0.0-alpha.1",
"@lumino/widgets": "^2.0.0-alpha.1"
},
"devDependencies": {
"rimraf": "~3.0.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/application-extension/src/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -442,7 +442,7 @@ const title: JupyterFrontEndPlugin<void> = {
return;
}

const result = await renameDialog(docManager, current.context.path);
const result = await renameDialog(docManager, current.context);

// activate the current widget to bring the focus
if (current) {
Expand All @@ -453,7 +453,7 @@ const title: JupyterFrontEndPlugin<void> = {
return;
}

const newPath = current.context.path ?? result.path;
const newPath = current.context.path;
const basename = PathExt.basename(newPath);

h.textContent = basename.replace(STRIP_IPYNB, '');
Expand Down
24 changes: 12 additions & 12 deletions packages/application/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,22 +43,22 @@
"watch": "tsc -b --watch"
},
"dependencies": {
"@jupyterlab/application": "^4.0.0-alpha.10",
"@jupyterlab/coreutils": "^6.0.0-alpha.10",
"@jupyterlab/docregistry": "^4.0.0-alpha.10",
"@jupyterlab/rendermime-interfaces": "^3.8.0-alpha.10",
"@jupyterlab/ui-components": "^4.0.0-alpha.25",
"@lumino/algorithm": "^1.9.1",
"@lumino/coreutils": "^1.12.0",
"@lumino/messaging": "^1.10.1",
"@lumino/polling": "^1.10.0",
"@lumino/signaling": "^1.10.1",
"@lumino/widgets": "^1.32.0"
"@jupyterlab/application": "^4.0.0-alpha.13",
"@jupyterlab/coreutils": "^6.0.0-alpha.13",
"@jupyterlab/docregistry": "^4.0.0-alpha.13",
"@jupyterlab/rendermime-interfaces": "^3.8.0-alpha.13",
"@jupyterlab/ui-components": "^4.0.0-alpha.28",
"@lumino/algorithm": "^2.0.0-alpha.1",
"@lumino/coreutils": "^2.0.0-alpha.1",
"@lumino/messaging": "^2.0.0-alpha.1",
"@lumino/polling": "^2.0.0-alpha.1",
"@lumino/signaling": "^2.0.0-alpha.1",
"@lumino/widgets": "^2.0.0-alpha.1"
},
"devDependencies": {
"@babel/core": "^7.11.6",
"@babel/preset-env": "^7.12.1",
"@jupyterlab/testutils": "^4.0.0-alpha.10",
"@jupyterlab/testutils": "^4.0.0-alpha.13",
"@types/jest": "^26.0.10",
"jest": "^26.4.2",
"rimraf": "~3.0.0",
Expand Down
5 changes: 1 addition & 4 deletions packages/application/src/app.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,7 @@ export class NotebookApp extends JupyterFrontEnd<INotebookShell> {
* @param options The instantiation options for an application.
*/
constructor(options: NotebookApp.IOptions = { shell: new NotebookShell() }) {
super({
...options,
shell: options.shell ?? new NotebookShell()
});
super({ ...options, shell: options.shell ?? new NotebookShell() });
if (options.mimeExtensions) {
for (const plugin of createRendermimePlugins(options.mimeExtensions)) {
this.registerPlugin(plugin);
Expand Down
Loading

0 comments on commit 59e03e2

Please sign in to comment.