Remove workaround for the toolbar settings (#352)

* Remove workaround for the toolbar settings

* Update to the latets `@jupyterlab` packages

* Update JupyterLab Python dependency

* Fix `@jupyterlab/apputils:toolbar-registry` plugin name

* Update yarn.lock

* Update Lumino packages

* Fix dependencies

* Select console-extension plugins

* Fix typo

* Fix missing toolbar registry token

* Update reference snapshots
This commit is contained in:
Jeremy Tuloup 2022-02-28 17:08:03 +01:00 committed by GitHub
parent de683b6a30
commit 27881b5f66
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
34 changed files with 3180 additions and 3394 deletions

View File

@ -85,8 +85,7 @@ async function main() {
'@jupyterlab/apputils-extension:state',
'@jupyterlab/apputils-extension:themes',
'@jupyterlab/apputils-extension:themes-palette-menu',
// TODO: rename to @jupyterlab/ when fixed and released upstream
'@jupyter/apputils-extension:toolbar-registry'
'@jupyterlab/apputils-extension:toolbar-registry'
].includes(id)
),
require('@jupyterlab/codemirror-extension').default.filter(({ id }) =>
@ -98,7 +97,15 @@ async function main() {
require('@jupyterlab/completer-extension').default.filter(({ id }) =>
['@jupyterlab/completer-extension:manager'].includes(id)
),
require('@jupyterlab/console-extension'),
require('@jupyterlab/console-extension').default.filter(({ id }) =>
[
'@jupyterlab/console-extension:completer',
'@jupyterlab/console-extension:cursor-position',
'@jupyterlab/console-extension:factory',
'@jupyterlab/console-extension:foreign',
'@jupyterlab/console-extension:tracker'
].includes(id)
),
require('@jupyterlab/docmanager-extension').default.filter(({ id }) =>
[
'@jupyterlab/docmanager-extension:plugin',

View File

@ -11,73 +11,73 @@
"watch": "webpack --config ./webpack.config.watch.js"
},
"resolutions": {
"@jupyterlab/application": "~4.0.0-alpha.4",
"@jupyterlab/application-extension": "~4.0.0-alpha.4",
"@jupyterlab/apputils": "~4.0.0-alpha.4",
"@jupyterlab/apputils-extension": "~4.0.0-alpha.4",
"@jupyterlab/celltags": "~4.0.0-alpha.4",
"@jupyterlab/codeeditor": "~4.0.0-alpha.4",
"@jupyterlab/codemirror-extension": "~4.0.0-alpha.4",
"@jupyterlab/completer": "~4.0.0-alpha.4",
"@jupyterlab/completer-extension": "~4.0.0-alpha.4",
"@jupyterlab/console": "~4.0.0-alpha.4",
"@jupyterlab/console-extension": "~4.0.0-alpha.4",
"@jupyterlab/coreutils": "~6.0.0-alpha.4",
"@jupyterlab/docmanager": "~4.0.0-alpha.4",
"@jupyterlab/docmanager-extension": "~4.0.0-alpha.4",
"@jupyterlab/docprovider": "~4.0.0-alpha.4",
"@jupyterlab/docprovider-extension": "~4.0.0-alpha.4",
"@jupyterlab/documentsearch": "~4.0.0-alpha.4",
"@jupyterlab/documentsearch-extension": "~4.0.0-alpha.4",
"@jupyterlab/filebrowser": "~4.0.0-alpha.4",
"@jupyterlab/filebrowser-extension": "~4.0.0-alpha.4",
"@jupyterlab/fileeditor": "~4.0.0-alpha.4",
"@jupyterlab/fileeditor-extension": "~4.0.0-alpha.4",
"@jupyterlab/hub-extension": "~4.0.0-alpha.4",
"@jupyterlab/javascript-extension": "~4.0.0-alpha.4",
"@jupyterlab/json-extension": "~4.0.0-alpha.4",
"@jupyterlab/mainmenu": "~4.0.0-alpha.4",
"@jupyterlab/mainmenu-extension": "~4.0.0-alpha.4",
"@jupyterlab/mathjax2-extension": "~4.0.0-alpha.4",
"@jupyterlab/notebook": "~4.0.0-alpha.4",
"@jupyterlab/notebook-extension": "~4.0.0-alpha.4",
"@jupyterlab/observables": "~5.0.0-alpha.4",
"@jupyterlab/outputarea": "~4.0.0-alpha.4",
"@jupyterlab/pdf-extension": "~4.0.0-alpha.4",
"@jupyterlab/rendermime": "~4.0.0-alpha.4",
"@jupyterlab/rendermime-extension": "~4.0.0-alpha.4",
"@jupyterlab/rendermime-interfaces": "~4.0.0-alpha.4",
"@jupyterlab/running-extension": "~4.0.0-alpha.4",
"@jupyterlab/services": "~7.0.0-alpha.4",
"@jupyterlab/settingregistry": "~4.0.0-alpha.4",
"@jupyterlab/shared-models": "~4.0.0-alpha.4",
"@jupyterlab/shortcuts-extension": "~4.0.0-alpha.4",
"@jupyterlab/statedb": "~4.0.0-alpha.4",
"@jupyterlab/statusbar": "~4.0.0-alpha.4",
"@jupyterlab/terminal": "~4.0.0-alpha.4",
"@jupyterlab/terminal-extension": "~4.0.0-alpha.4",
"@jupyterlab/theme-dark-extension": "~4.0.0-alpha.4",
"@jupyterlab/theme-light-extension": "~4.0.0-alpha.4",
"@jupyterlab/tooltip": "~4.0.0-alpha.4",
"@jupyterlab/tooltip-extension": "~4.0.0-alpha.4",
"@jupyterlab/translation": "~4.0.0-alpha.4",
"@jupyterlab/translation-extension": "~4.0.0-alpha.4",
"@jupyterlab/ui-components": "~4.0.0-alpha.19",
"@jupyterlab/user": "~4.0.0-alpha.4",
"@jupyterlab/user-extension": "~4.0.0-alpha.4",
"@jupyterlab/vega5-extension": "~4.0.0-alpha.4",
"@jupyterlab/application": "~4.0.0-alpha.5",
"@jupyterlab/application-extension": "~4.0.0-alpha.5",
"@jupyterlab/apputils": "~4.0.0-alpha.5",
"@jupyterlab/apputils-extension": "~4.0.0-alpha.5",
"@jupyterlab/celltags": "~4.0.0-alpha.5",
"@jupyterlab/codeeditor": "~4.0.0-alpha.5",
"@jupyterlab/codemirror-extension": "~4.0.0-alpha.5",
"@jupyterlab/completer": "~4.0.0-alpha.5",
"@jupyterlab/completer-extension": "~4.0.0-alpha.5",
"@jupyterlab/console": "~4.0.0-alpha.5",
"@jupyterlab/console-extension": "~4.0.0-alpha.5",
"@jupyterlab/coreutils": "~6.0.0-alpha.5",
"@jupyterlab/docmanager": "~4.0.0-alpha.5",
"@jupyterlab/docmanager-extension": "~4.0.0-alpha.5",
"@jupyterlab/docprovider": "~4.0.0-alpha.5",
"@jupyterlab/docprovider-extension": "~4.0.0-alpha.5",
"@jupyterlab/documentsearch": "~4.0.0-alpha.5",
"@jupyterlab/documentsearch-extension": "~4.0.0-alpha.5",
"@jupyterlab/filebrowser": "~4.0.0-alpha.5",
"@jupyterlab/filebrowser-extension": "~4.0.0-alpha.5",
"@jupyterlab/fileeditor": "~4.0.0-alpha.5",
"@jupyterlab/fileeditor-extension": "~4.0.0-alpha.5",
"@jupyterlab/hub-extension": "~4.0.0-alpha.5",
"@jupyterlab/javascript-extension": "~4.0.0-alpha.5",
"@jupyterlab/json-extension": "~4.0.0-alpha.5",
"@jupyterlab/mainmenu": "~4.0.0-alpha.5",
"@jupyterlab/mainmenu-extension": "~4.0.0-alpha.5",
"@jupyterlab/mathjax2-extension": "~4.0.0-alpha.5",
"@jupyterlab/notebook": "~4.0.0-alpha.5",
"@jupyterlab/notebook-extension": "~4.0.0-alpha.5",
"@jupyterlab/observables": "~5.0.0-alpha.5",
"@jupyterlab/outputarea": "~4.0.0-alpha.5",
"@jupyterlab/pdf-extension": "~4.0.0-alpha.5",
"@jupyterlab/rendermime": "~4.0.0-alpha.5",
"@jupyterlab/rendermime-extension": "~4.0.0-alpha.5",
"@jupyterlab/rendermime-interfaces": "~4.0.0-alpha.5",
"@jupyterlab/running-extension": "~4.0.0-alpha.5",
"@jupyterlab/services": "~7.0.0-alpha.5",
"@jupyterlab/settingregistry": "~4.0.0-alpha.5",
"@jupyterlab/shared-models": "~4.0.0-alpha.5",
"@jupyterlab/shortcuts-extension": "~4.0.0-alpha.5",
"@jupyterlab/statedb": "~4.0.0-alpha.5",
"@jupyterlab/statusbar": "~4.0.0-alpha.5",
"@jupyterlab/terminal": "~4.0.0-alpha.5",
"@jupyterlab/terminal-extension": "~4.0.0-alpha.5",
"@jupyterlab/theme-dark-extension": "~4.0.0-alpha.5",
"@jupyterlab/theme-light-extension": "~4.0.0-alpha.5",
"@jupyterlab/tooltip": "~4.0.0-alpha.5",
"@jupyterlab/tooltip-extension": "~4.0.0-alpha.5",
"@jupyterlab/translation": "~4.0.0-alpha.5",
"@jupyterlab/translation-extension": "~4.0.0-alpha.5",
"@jupyterlab/ui-components": "~4.0.0-alpha.20",
"@jupyterlab/user": "~4.0.0-alpha.5",
"@jupyterlab/user-extension": "~4.0.0-alpha.5",
"@jupyterlab/vega5-extension": "~4.0.0-alpha.5",
"@lumino/algorithm": "~1.9.1",
"@lumino/application": "~1.27.1",
"@lumino/commands": "~1.19.1",
"@lumino/coreutils": "~1.11.1",
"@lumino/application": "~1.28.1",
"@lumino/commands": "~1.20.0",
"@lumino/coreutils": "~1.12.0",
"@lumino/disposable": "~1.10.1",
"@lumino/domutils": "~1.8.1",
"@lumino/dragdrop": "~1.13.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.30.1",
"@lumino/widgets": "~1.31.1",
"@retrolab/application": "~0.4.0-alpha.0",
"@retrolab/application-extension": "~0.4.0-alpha.0",
"@retrolab/console-extension": "~0.4.0-alpha.0",
@ -90,38 +90,38 @@
"@retrolab/ui-components": "~0.4.0-alpha.0",
"react": "~17.0.2",
"react-dom": "~17.0.2",
"yjs": "~13.5.23"
"yjs": "~13.5.27"
},
"dependencies": {
"@jupyterlab/application-extension": "^4.0.0-alpha.4",
"@jupyterlab/apputils-extension": "^4.0.0-alpha.4",
"@jupyterlab/celltags": "^4.0.0-alpha.4",
"@jupyterlab/codemirror-extension": "^4.0.0-alpha.4",
"@jupyterlab/completer-extension": "^4.0.0-alpha.4",
"@jupyterlab/console-extension": "^4.0.0-alpha.4",
"@jupyterlab/coreutils": "~6.0.0-alpha.4",
"@jupyterlab/docmanager-extension": "^4.0.0-alpha.4",
"@jupyterlab/docprovider-extension": "^4.0.0-alpha.4",
"@jupyterlab/documentsearch-extension": "^4.0.0-alpha.4",
"@jupyterlab/filebrowser-extension": "^4.0.0-alpha.4",
"@jupyterlab/fileeditor-extension": "^4.0.0-alpha.4",
"@jupyterlab/hub-extension": "^4.0.0-alpha.4",
"@jupyterlab/javascript-extension": "^4.0.0-alpha.4",
"@jupyterlab/json-extension": "^4.0.0-alpha.4",
"@jupyterlab/mainmenu-extension": "^4.0.0-alpha.4",
"@jupyterlab/mathjax2-extension": "^4.0.0-alpha.4",
"@jupyterlab/notebook-extension": "^4.0.0-alpha.4",
"@jupyterlab/pdf-extension": "^4.0.0-alpha.4",
"@jupyterlab/rendermime-extension": "^4.0.0-alpha.4",
"@jupyterlab/running-extension": "^4.0.0-alpha.4",
"@jupyterlab/shortcuts-extension": "^4.0.0-alpha.4",
"@jupyterlab/terminal-extension": "^4.0.0-alpha.4",
"@jupyterlab/theme-dark-extension": "^4.0.0-alpha.4",
"@jupyterlab/theme-light-extension": "^4.0.0-alpha.4",
"@jupyterlab/tooltip-extension": "^4.0.0-alpha.4",
"@jupyterlab/translation-extension": "^4.0.0-alpha.4",
"@jupyterlab/user-extension": "^4.0.0-alpha.4",
"@jupyterlab/vega5-extension": "^4.0.0-alpha.4",
"@jupyterlab/application-extension": "^4.0.0-alpha.5",
"@jupyterlab/apputils-extension": "^4.0.0-alpha.5",
"@jupyterlab/celltags": "^4.0.0-alpha.5",
"@jupyterlab/codemirror-extension": "^4.0.0-alpha.5",
"@jupyterlab/completer-extension": "^4.0.0-alpha.5",
"@jupyterlab/console-extension": "^4.0.0-alpha.5",
"@jupyterlab/coreutils": "~6.0.0-alpha.5",
"@jupyterlab/docmanager-extension": "^4.0.0-alpha.5",
"@jupyterlab/docprovider-extension": "^4.0.0-alpha.5",
"@jupyterlab/documentsearch-extension": "^4.0.0-alpha.5",
"@jupyterlab/filebrowser-extension": "^4.0.0-alpha.5",
"@jupyterlab/fileeditor-extension": "^4.0.0-alpha.5",
"@jupyterlab/hub-extension": "^4.0.0-alpha.5",
"@jupyterlab/javascript-extension": "^4.0.0-alpha.5",
"@jupyterlab/json-extension": "^4.0.0-alpha.5",
"@jupyterlab/mainmenu-extension": "^4.0.0-alpha.5",
"@jupyterlab/mathjax2-extension": "^4.0.0-alpha.5",
"@jupyterlab/notebook-extension": "^4.0.0-alpha.5",
"@jupyterlab/pdf-extension": "^4.0.0-alpha.5",
"@jupyterlab/rendermime-extension": "^4.0.0-alpha.5",
"@jupyterlab/running-extension": "^4.0.0-alpha.5",
"@jupyterlab/shortcuts-extension": "^4.0.0-alpha.5",
"@jupyterlab/terminal-extension": "^4.0.0-alpha.5",
"@jupyterlab/theme-dark-extension": "^4.0.0-alpha.5",
"@jupyterlab/theme-light-extension": "^4.0.0-alpha.5",
"@jupyterlab/tooltip-extension": "^4.0.0-alpha.5",
"@jupyterlab/translation-extension": "^4.0.0-alpha.5",
"@jupyterlab/user-extension": "^4.0.0-alpha.5",
"@jupyterlab/vega5-extension": "^4.0.0-alpha.5",
"@retrolab/application": "^0.4.0-alpha.0",
"@retrolab/application-extension": "^0.4.0-alpha.0",
"@retrolab/console-extension": "^0.4.0-alpha.0",
@ -134,8 +134,8 @@
"@retrolab/ui-components": "^0.4.0-alpha.0"
},
"devDependencies": {
"@jupyterlab/builder": "^4.0.0-alpha.4",
"@jupyterlab/buildutils": "^4.0.0-alpha.4",
"@jupyterlab/builder": "^4.0.0-alpha.5",
"@jupyterlab/buildutils": "^4.0.0-alpha.5",
"@types/rimraf": "^3.0.0",
"css-loader": "~5.0.1",
"file-loader": "~5.0.2",

View File

@ -30,7 +30,7 @@
"watch": "tsc -w --listEmittedFiles"
},
"dependencies": {
"@jupyterlab/buildutils": "^4.0.0-alpha.4",
"@jupyterlab/buildutils": "^4.0.0-alpha.5",
"commander": "^6.2.0",
"fs-extra": "^9.1.0",
"typescript": "~4.1.3"

View File

@ -45,7 +45,7 @@
}
},
"devDependencies": {
"@jupyterlab/buildutils": "^4.0.0-alpha.4",
"@jupyterlab/buildutils": "^4.0.0-alpha.5",
"@typescript-eslint/eslint-plugin": "^4.2.0",
"@typescript-eslint/parser": "^4.2.0",
"eslint": "^7.10.0",

View File

@ -39,21 +39,21 @@
"watch": "tsc -b --watch"
},
"dependencies": {
"@jupyterlab/application": "^4.0.0-alpha.4",
"@jupyterlab/apputils": "^4.0.0-alpha.4",
"@jupyterlab/celltags": "^4.0.0-alpha.4",
"@jupyterlab/codeeditor": "^4.0.0-alpha.4",
"@jupyterlab/codemirror": "^4.0.0-alpha.4",
"@jupyterlab/console": "^4.0.0-alpha.4",
"@jupyterlab/coreutils": "^6.0.0-alpha.4",
"@jupyterlab/docmanager": "^4.0.0-alpha.4",
"@jupyterlab/docregistry": "^4.0.0-alpha.4",
"@jupyterlab/mainmenu": "^4.0.0-alpha.4",
"@jupyterlab/settingregistry": "^4.0.0-alpha.4",
"@jupyterlab/application": "^4.0.0-alpha.5",
"@jupyterlab/apputils": "^4.0.0-alpha.5",
"@jupyterlab/celltags": "^4.0.0-alpha.5",
"@jupyterlab/codeeditor": "^4.0.0-alpha.5",
"@jupyterlab/codemirror": "^4.0.0-alpha.5",
"@jupyterlab/console": "^4.0.0-alpha.5",
"@jupyterlab/coreutils": "^6.0.0-alpha.5",
"@jupyterlab/docmanager": "^4.0.0-alpha.5",
"@jupyterlab/docregistry": "^4.0.0-alpha.5",
"@jupyterlab/mainmenu": "^4.0.0-alpha.5",
"@jupyterlab/settingregistry": "^4.0.0-alpha.5",
"@jupyterlab/translation": "^4.0.0-alpha.4",
"@lumino/coreutils": "^1.11.1",
"@lumino/coreutils": "^1.12.0",
"@lumino/disposable": "^1.10.1",
"@lumino/widgets": "^1.30.1",
"@lumino/widgets": "^1.31.1",
"@retrolab/application": "^0.4.0-alpha.0",
"@retrolab/ui-components": "^0.4.0-alpha.0"
},

View File

@ -157,12 +157,10 @@ const opener: JupyterFrontEndPlugin<void> = {
id: '@retrolab/application-extension:opener',
autoStart: true,
requires: [IRouter, IDocumentManager],
optional: [ISettingRegistry],
activate: (
app: JupyterFrontEnd,
router: IRouter,
docManager: IDocumentManager,
settingRegistry: ISettingRegistry | null
docManager: IDocumentManager
): void => {
const { commands } = app;
@ -181,9 +179,6 @@ const opener: JupyterFrontEndPlugin<void> = {
app.restored.then(async () => {
// TODO: get factory from file type instead?
if (ext === '.ipynb') {
// TODO: fix upstream?
await settingRegistry?.load('@jupyterlab/notebook-extension:panel');
await Promise.resolve();
docManager.open(file, NOTEBOOK_FACTORY, undefined, {
ref: '_noref'
});

View File

@ -43,22 +43,22 @@
"watch": "tsc -b --watch"
},
"dependencies": {
"@jupyterlab/application": "^4.0.0-alpha.4",
"@jupyterlab/coreutils": "^6.0.0-alpha.4",
"@jupyterlab/docregistry": "^4.0.0-alpha.4",
"@jupyterlab/rendermime-interfaces": "^4.0.0-alpha.4",
"@jupyterlab/application": "^4.0.0-alpha.5",
"@jupyterlab/coreutils": "^6.0.0-alpha.5",
"@jupyterlab/docregistry": "^4.0.0-alpha.5",
"@jupyterlab/rendermime-interfaces": "^4.0.0-alpha.5",
"@jupyterlab/ui-components": "^4.0.0-alpha.19",
"@lumino/algorithm": "^1.9.1",
"@lumino/coreutils": "^1.11.1",
"@lumino/coreutils": "^1.12.0",
"@lumino/messaging": "^1.10.1",
"@lumino/polling": "^1.9.1",
"@lumino/polling": "^1.10.0",
"@lumino/signaling": "^1.10.1",
"@lumino/widgets": "^1.30.1"
"@lumino/widgets": "^1.31.1"
},
"devDependencies": {
"@babel/core": "^7.11.6",
"@babel/preset-env": "^7.12.1",
"@jupyterlab/testutils": "^4.0.0-alpha.4",
"@jupyterlab/testutils": "^4.0.0-alpha.5",
"@types/jest": "^26.0.10",
"jest": "^26.4.2",
"rimraf": "~3.0.0",

View File

@ -39,9 +39,9 @@
"watch": "tsc -b --watch"
},
"dependencies": {
"@jupyterlab/application": "^4.0.0-alpha.4",
"@jupyterlab/console": "^4.0.0-alpha.4",
"@jupyterlab/coreutils": "^6.0.0-alpha.4",
"@jupyterlab/application": "^4.0.0-alpha.5",
"@jupyterlab/console": "^4.0.0-alpha.5",
"@jupyterlab/coreutils": "^6.0.0-alpha.5",
"@lumino/algorithm": "^1.9.1"
},
"devDependencies": {

View File

@ -39,11 +39,11 @@
"watch": "tsc -b --watch"
},
"dependencies": {
"@jupyterlab/application": "^4.0.0-alpha.4",
"@jupyterlab/coreutils": "^6.0.0-alpha.4",
"@jupyterlab/docmanager": "^4.0.0-alpha.4",
"@jupyterlab/docregistry": "^4.0.0-alpha.4",
"@jupyterlab/services": "^7.0.0-alpha.4",
"@jupyterlab/application": "^4.0.0-alpha.5",
"@jupyterlab/coreutils": "^6.0.0-alpha.5",
"@jupyterlab/docmanager": "^4.0.0-alpha.5",
"@jupyterlab/docregistry": "^4.0.0-alpha.5",
"@jupyterlab/services": "^7.0.0-alpha.5",
"@lumino/algorithm": "^1.9.1"
},
"devDependencies": {

View File

@ -39,9 +39,9 @@
"watch": "tsc -b --watch"
},
"dependencies": {
"@jupyterlab/application": "^4.0.0-alpha.4",
"@jupyterlab/documentsearch": "^4.0.0-alpha.4",
"@lumino/widgets": "^1.30.1",
"@jupyterlab/application": "^4.0.0-alpha.5",
"@jupyterlab/documentsearch": "^4.0.0-alpha.5",
"@lumino/widgets": "^1.31.1",
"@retrolab/application": "^0.4.0-alpha.0"
},
"devDependencies": {

View File

@ -39,9 +39,9 @@
"watch": "tsc -b --watch"
},
"dependencies": {
"@jupyterlab/application": "^4.0.0-alpha.4",
"@jupyterlab/apputils": "^4.0.0-alpha.4",
"@jupyterlab/mainmenu": "^4.0.0-alpha.4",
"@jupyterlab/application": "^4.0.0-alpha.5",
"@jupyterlab/apputils": "^4.0.0-alpha.5",
"@jupyterlab/mainmenu": "^4.0.0-alpha.5",
"@jupyterlab/translation": "^4.0.0-alpha.4",
"@retrolab/ui-components": "^0.4.0-alpha.0"
},

View File

@ -43,19 +43,19 @@
"watch:src": "tsc -w"
},
"dependencies": {
"@jupyterlab/application": "^4.0.0-alpha.4",
"@jupyterlab/apputils": "^4.0.0-alpha.4",
"@jupyterlab/coreutils": "^6.0.0-alpha.4",
"@jupyterlab/docregistry": "^4.0.0-alpha.4",
"@jupyterlab/mainmenu": "^4.0.0-alpha.4",
"@jupyterlab/notebook": "^4.0.0-alpha.4",
"@jupyterlab/application": "^4.0.0-alpha.5",
"@jupyterlab/apputils": "^4.0.0-alpha.5",
"@jupyterlab/coreutils": "^6.0.0-alpha.5",
"@jupyterlab/docregistry": "^4.0.0-alpha.5",
"@jupyterlab/mainmenu": "^4.0.0-alpha.5",
"@jupyterlab/notebook": "^4.0.0-alpha.5",
"@jupyterlab/translation": "^4.0.0-alpha.4",
"@lumino/commands": "^1.19.1",
"@lumino/commands": "^1.20.0",
"@lumino/disposable": "^1.10.1",
"@retrolab/application": "^0.4.0-alpha.0"
},
"devDependencies": {
"@jupyterlab/builder": "^4.0.0-alpha.4",
"@jupyterlab/builder": "^4.0.0-alpha.5",
"rimraf": "~3.0.0",
"typescript": "~4.1.3"
},
@ -64,7 +64,8 @@
},
"jupyterlab": {
"extension": true,
"outputDir": "../../retrolab/labextension"
"outputDir": "../../retrolab/labextension",
"schemaDir": "schema"
},
"styleModule": "style/index.js"
}

View File

@ -0,0 +1,10 @@
{
"title": "Interface Switcher",
"description": "Interface Switcher settings.",
"jupyter.lab.toolbars": {
"Notebook": [{ "name": "interfaceSwitcher", "rank": 990 }]
},
"properties": {},
"additionalProperties": false,
"type": "object"
}

View File

@ -7,7 +7,7 @@ import {
JupyterFrontEndPlugin
} from '@jupyterlab/application';
import { ICommandPalette } from '@jupyterlab/apputils';
import { ICommandPalette, IToolbarWidgetRegistry } from '@jupyterlab/apputils';
import { PageConfig } from '@jupyterlab/coreutils';
@ -65,7 +65,8 @@ const launchButtons: JupyterFrontEndPlugin<void> = {
ICommandPalette,
IMainMenu,
IRetroShell,
ILabShell
ILabShell,
IToolbarWidgetRegistry
],
activate: (
app: JupyterFrontEnd,
@ -74,7 +75,8 @@ const launchButtons: JupyterFrontEndPlugin<void> = {
palette: ICommandPalette | null,
menu: IMainMenu | null,
retroShell: IRetroShell | null,
labShell: ILabShell | null
labShell: ILabShell | null,
toolbarRegistry: IToolbarWidgetRegistry | null
) => {
if (!notebookTracker) {
// to prevent showing the toolbar button in non-notebook pages
@ -148,13 +150,18 @@ const launchButtons: JupyterFrontEndPlugin<void> = {
});
}
notebookTracker.widgetAdded.connect(
async (sender: INotebookTracker, panel: NotebookPanel) => {
panel.toolbar.insertBefore('kernelName', 'interface-switcher', menubar);
await panel.context.ready;
commands.notifyCommandChanged();
}
);
if (toolbarRegistry) {
toolbarRegistry.registerFactory<NotebookPanel>(
'Notebook',
'interfaceSwitcher',
panel => {
const menubar = new MenuBar();
menubar.addMenu(switcher);
menubar.addClass('jp-InterfaceSwitcher');
return menubar;
}
);
}
}
};

View File

@ -0,0 +1,11 @@
/*-----------------------------------------------------------------------------
| Copyright (c) Jupyter Development Team.
| Distributed under the terms of the Modified BSD License.
|----------------------------------------------------------------------------*/
.jp-InterfaceSwitcher {
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
}

View File

@ -39,15 +39,15 @@
"watch": "tsc -b --watch"
},
"dependencies": {
"@jupyterlab/application": "^4.0.0-alpha.4",
"@jupyterlab/apputils": "^4.0.0-alpha.4",
"@jupyterlab/cells": "^4.0.0-alpha.4",
"@jupyterlab/docmanager": "^4.0.0-alpha.4",
"@jupyterlab/notebook": "^4.0.0-alpha.4",
"@jupyterlab/settingregistry": "^4.0.0-alpha.4",
"@jupyterlab/application": "^4.0.0-alpha.5",
"@jupyterlab/apputils": "^4.0.0-alpha.5",
"@jupyterlab/cells": "^4.0.0-alpha.5",
"@jupyterlab/docmanager": "^4.0.0-alpha.5",
"@jupyterlab/notebook": "^4.0.0-alpha.5",
"@jupyterlab/settingregistry": "^4.0.0-alpha.5",
"@jupyterlab/translation": "^4.0.0-alpha.4",
"@lumino/polling": "^1.9.1",
"@lumino/widgets": "^1.30.1",
"@lumino/polling": "^1.10.0",
"@lumino/widgets": "^1.31.1",
"@retrolab/application": "^0.4.0-alpha.0"
},
"devDependencies": {

View File

@ -39,9 +39,9 @@
"watch": "tsc -b --watch"
},
"dependencies": {
"@jupyterlab/application": "^4.0.0-alpha.4",
"@jupyterlab/coreutils": "^6.0.0-alpha.4",
"@jupyterlab/terminal": "^4.0.0-alpha.4",
"@jupyterlab/application": "^4.0.0-alpha.5",
"@jupyterlab/coreutils": "^6.0.0-alpha.5",
"@jupyterlab/terminal": "^4.0.0-alpha.5",
"@lumino/algorithm": "^1.9.1"
},
"devDependencies": {

View File

@ -39,20 +39,20 @@
"watch": "tsc -b --watch"
},
"dependencies": {
"@jupyterlab/application": "^4.0.0-alpha.4",
"@jupyterlab/apputils": "^4.0.0-alpha.4",
"@jupyterlab/coreutils": "^6.0.0-alpha.4",
"@jupyterlab/docmanager": "^4.0.0-alpha.4",
"@jupyterlab/filebrowser": "^4.0.0-alpha.4",
"@jupyterlab/mainmenu": "^4.0.0-alpha.4",
"@jupyterlab/services": "^7.0.0-alpha.4",
"@jupyterlab/settingregistry": "^4.0.0-alpha.4",
"@jupyterlab/statedb": "^4.0.0-alpha.4",
"@jupyterlab/application": "^4.0.0-alpha.5",
"@jupyterlab/apputils": "^4.0.0-alpha.5",
"@jupyterlab/coreutils": "^6.0.0-alpha.5",
"@jupyterlab/docmanager": "^4.0.0-alpha.5",
"@jupyterlab/filebrowser": "^4.0.0-alpha.5",
"@jupyterlab/mainmenu": "^4.0.0-alpha.5",
"@jupyterlab/services": "^7.0.0-alpha.5",
"@jupyterlab/settingregistry": "^4.0.0-alpha.5",
"@jupyterlab/statedb": "^4.0.0-alpha.5",
"@jupyterlab/translation": "^4.0.0-alpha.4",
"@jupyterlab/ui-components": "^4.0.0-alpha.19",
"@lumino/algorithm": "^1.9.1",
"@lumino/commands": "^1.19.1",
"@lumino/widgets": "^1.30.1",
"@lumino/commands": "^1.20.0",
"@lumino/widgets": "^1.31.1",
"@retrolab/application": "^0.4.0-alpha.0"
},
"devDependencies": {

View File

@ -50,7 +50,7 @@
"devDependencies": {
"@babel/core": "^7.10.2",
"@babel/preset-env": "^7.10.2",
"@jupyterlab/testutils": "^4.0.0-alpha.4",
"@jupyterlab/testutils": "^4.0.0-alpha.5",
"@types/jest": "^26.0.10",
"babel-loader": "^8.0.6",
"jest": "^26.4.2",

View File

@ -1,5 +1,5 @@
[build-system]
requires = ["jupyter_packaging~=0.10", "jupyterlab>=4.0.0a19,<5"]
requires = ["jupyter_packaging~=0.10", "jupyterlab>=4.0.0a20,<5"]
build-backend = "jupyter_packaging.build_api"
[license]

View File

@ -28,7 +28,7 @@ include_package_data = True
packages = find:
python_requires = >=3.7
install_requires =
jupyterlab>=4.0.0a19,<5
jupyterlab>=4.0.0a20,<5
jupyterlab_server~=2.3
jupyter_server~=1.4
nbclassic~=0.2

Binary file not shown.

Before

Width:  |  Height:  |  Size: 46 KiB

After

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 38 KiB

After

Width:  |  Height:  |  Size: 40 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 21 KiB

After

Width:  |  Height:  |  Size: 22 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.7 KiB

After

Width:  |  Height:  |  Size: 9.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 24 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 26 KiB

After

Width:  |  Height:  |  Size: 26 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 24 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 29 KiB

After

Width:  |  Height:  |  Size: 29 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 25 KiB

After

Width:  |  Height:  |  Size: 25 KiB

6179
yarn.lock

File diff suppressed because it is too large Load Diff