Skip to content
This repository has been archived by the owner on Feb 16, 2023. It is now read-only.

Remove workaround for the toolbar settings #352

Merged
merged 11 commits into from
Feb 28, 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
13 changes: 10 additions & 3 deletions app/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 }) =>
Expand All @@ -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',
Expand Down
184 changes: 92 additions & 92 deletions app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand All @@ -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",
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.4",
"@jupyterlab/buildutils": "^4.0.0-alpha.5",
"commander": "^6.2.0",
"fs-extra": "^9.1.0",
"typescript": "~4.1.3"
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
26 changes: 13 additions & 13 deletions packages/application-extension/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
7 changes: 1 addition & 6 deletions packages/application-extension/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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'
});
Expand Down
16 changes: 8 additions & 8 deletions packages/application/package.json
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.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",
Expand Down
6 changes: 3 additions & 3 deletions packages/console-extension/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
10 changes: 5 additions & 5 deletions packages/docmanager-extension/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
6 changes: 3 additions & 3 deletions packages/documentsearch-extension/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
Loading