diff --git a/.github/workflows/buildutils.yml b/.github/workflows/buildutils.yml index 5db58093d3..637a5a6561 100644 --- a/.github/workflows/buildutils.yml +++ b/.github/workflows/buildutils.yml @@ -29,7 +29,7 @@ jobs: - name: Install dependencies run: | - python -m pip install -U "jupyterlab>=4.3.0a1,<4.4" hatch + python -m pip install -U "jupyterlab>=4.3.0rc0,<4.4" hatch jlpm jlpm run build @@ -79,6 +79,6 @@ jobs: - name: Install dependencies run: | - python -m pip install -U "jupyterlab>=4.3.0a1,<4.4" pip + python -m pip install -U "jupyterlab>=4.3.0rc0,<4.4" pip jlpm jlpm run build diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 8184b2eb1a..6bf7c8067c 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -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.3.0a1,<4.4"] + additional_dependencies: ["traitlets>=5.13", "tornado", "jupyter_server>=2.10", "jupyterlab_server>=2.25", "jupyterlab>=4.3.0rc0,<4.4"] - repo: https://github.com/pre-commit/pygrep-hooks rev: 'v1.10.0' diff --git a/app/package.json b/app/package.json index b05f2cd0c1..4be939ad67 100644 --- a/app/package.json +++ b/app/package.json @@ -23,99 +23,99 @@ "@jupyter-notebook/tree": "~7.3.0-alpha.1", "@jupyter-notebook/tree-extension": "~7.3.0-alpha.1", "@jupyter-notebook/ui-components": "~7.3.0-alpha.1", - "@jupyter/ydoc": "~2.0.1", - "@jupyterlab/application": "~4.3.0-alpha.1", - "@jupyterlab/application-extension": "~4.3.0-alpha.1", - "@jupyterlab/apputils": "~4.4.0-alpha.1", - "@jupyterlab/apputils-extension": "~4.3.0-alpha.1", - "@jupyterlab/attachments": "~4.3.0-alpha.1", - "@jupyterlab/cell-toolbar": "~4.3.0-alpha.1", - "@jupyterlab/cell-toolbar-extension": "~4.3.0-alpha.1", - "@jupyterlab/celltags-extension": "~4.3.0-alpha.1", - "@jupyterlab/codeeditor": "~4.3.0-alpha.1", - "@jupyterlab/codemirror": "~4.3.0-alpha.1", - "@jupyterlab/codemirror-extension": "~4.3.0-alpha.1", - "@jupyterlab/completer": "~4.3.0-alpha.1", - "@jupyterlab/completer-extension": "~4.3.0-alpha.1", - "@jupyterlab/console": "~4.3.0-alpha.1", - "@jupyterlab/console-extension": "~4.3.0-alpha.1", - "@jupyterlab/coreutils": "~6.3.0-alpha.1", - "@jupyterlab/csvviewer-extension": "~4.3.0-alpha.1", - "@jupyterlab/debugger": "~4.3.0-alpha.1", - "@jupyterlab/debugger-extension": "~4.3.0-alpha.1", - "@jupyterlab/docmanager": "~4.3.0-alpha.1", - "@jupyterlab/docmanager-extension": "~4.3.0-alpha.1", - "@jupyterlab/documentsearch": "~4.3.0-alpha.1", - "@jupyterlab/documentsearch-extension": "~4.3.0-alpha.1", - "@jupyterlab/extensionmanager": "~4.3.0-alpha.1", - "@jupyterlab/extensionmanager-extension": "~4.3.0-alpha.1", - "@jupyterlab/filebrowser": "~4.3.0-alpha.1", - "@jupyterlab/filebrowser-extension": "~4.3.0-alpha.1", - "@jupyterlab/fileeditor": "~4.3.0-alpha.1", - "@jupyterlab/fileeditor-extension": "~4.3.0-alpha.1", - "@jupyterlab/help-extension": "~4.3.0-alpha.1", - "@jupyterlab/htmlviewer": "~4.3.0-alpha.1", - "@jupyterlab/htmlviewer-extension": "~4.3.0-alpha.1", - "@jupyterlab/hub-extension": "~4.3.0-alpha.1", - "@jupyterlab/imageviewer": "~4.3.0-alpha.1", - "@jupyterlab/imageviewer-extension": "~4.3.0-alpha.1", - "@jupyterlab/javascript-extension": "~4.3.0-alpha.1", - "@jupyterlab/json-extension": "~4.3.0-alpha.1", - "@jupyterlab/lsp": "~4.3.0-alpha.1", - "@jupyterlab/lsp-extension": "~4.3.0-alpha.1", - "@jupyterlab/mainmenu": "~4.3.0-alpha.1", - "@jupyterlab/mainmenu-extension": "~4.3.0-alpha.1", - "@jupyterlab/markdownviewer": "~4.3.0-alpha.1", - "@jupyterlab/markdownviewer-extension": "~4.3.0-alpha.1", - "@jupyterlab/markedparser-extension": "~4.3.0-alpha.1", - "@jupyterlab/mathjax-extension": "~4.3.0-alpha.1", - "@jupyterlab/mermaid": "~4.3.0-alpha.1", - "@jupyterlab/mermaid-extension": "~4.3.0-alpha.1", - "@jupyterlab/metadataform": "~4.3.0-alpha.1", - "@jupyterlab/metadataform-extension": "~4.3.0-alpha.1", - "@jupyterlab/notebook": "~4.3.0-alpha.1", - "@jupyterlab/notebook-extension": "~4.3.0-alpha.1", - "@jupyterlab/observables": "~5.3.0-alpha.1", - "@jupyterlab/outputarea": "~4.3.0-alpha.1", - "@jupyterlab/pdf-extension": "~4.3.0-alpha.1", - "@jupyterlab/pluginmanager-extension": "~4.3.0-alpha.1", - "@jupyterlab/rendermime": "~4.3.0-alpha.1", - "@jupyterlab/rendermime-interfaces": "~3.11.0-alpha.1", - "@jupyterlab/running-extension": "~4.3.0-alpha.1", - "@jupyterlab/services": "~7.3.0-alpha.1", - "@jupyterlab/settingeditor": "~4.3.0-alpha.1", - "@jupyterlab/settingeditor-extension": "~4.3.0-alpha.1", - "@jupyterlab/settingregistry": "~4.3.0-alpha.1", - "@jupyterlab/shortcuts-extension": "~5.1.0-alpha.1", - "@jupyterlab/statedb": "~4.3.0-alpha.1", - "@jupyterlab/statusbar": "~4.3.0-alpha.1", - "@jupyterlab/terminal": "~4.3.0-alpha.1", - "@jupyterlab/terminal-extension": "~4.3.0-alpha.1", - "@jupyterlab/theme-dark-extension": "~4.3.0-alpha.1", - "@jupyterlab/theme-dark-high-contrast-extension": "~4.3.0-alpha.1", - "@jupyterlab/theme-light-extension": "~4.3.0-alpha.1", - "@jupyterlab/toc-extension": "~6.3.0-alpha.1", - "@jupyterlab/tooltip": "~4.3.0-alpha.1", - "@jupyterlab/tooltip-extension": "~4.3.0-alpha.1", - "@jupyterlab/translation": "~4.3.0-alpha.1", - "@jupyterlab/translation-extension": "~4.3.0-alpha.1", - "@jupyterlab/ui-components": "~4.3.0-alpha.1", - "@jupyterlab/ui-components-extension": "~4.3.0-alpha.1", - "@jupyterlab/vega5-extension": "~4.3.0-alpha.1", + "@jupyter/ydoc": "~3.0.0-a8", + "@jupyterlab/application": "~4.3.0-rc.0", + "@jupyterlab/application-extension": "~4.3.0-rc.0", + "@jupyterlab/apputils": "~4.4.0-rc.0", + "@jupyterlab/apputils-extension": "~4.3.0-rc.0", + "@jupyterlab/attachments": "~4.3.0-rc.0", + "@jupyterlab/cell-toolbar": "~4.3.0-rc.0", + "@jupyterlab/cell-toolbar-extension": "~4.3.0-rc.0", + "@jupyterlab/celltags-extension": "~4.3.0-rc.0", + "@jupyterlab/codeeditor": "~4.3.0-rc.0", + "@jupyterlab/codemirror": "~4.3.0-rc.0", + "@jupyterlab/codemirror-extension": "~4.3.0-rc.0", + "@jupyterlab/completer": "~4.3.0-rc.0", + "@jupyterlab/completer-extension": "~4.3.0-rc.0", + "@jupyterlab/console": "~4.3.0-rc.0", + "@jupyterlab/console-extension": "~4.3.0-rc.0", + "@jupyterlab/coreutils": "~6.3.0-rc.0", + "@jupyterlab/csvviewer-extension": "~4.3.0-rc.0", + "@jupyterlab/debugger": "~4.3.0-rc.0", + "@jupyterlab/debugger-extension": "~4.3.0-rc.0", + "@jupyterlab/docmanager": "~4.3.0-rc.0", + "@jupyterlab/docmanager-extension": "~4.3.0-rc.0", + "@jupyterlab/documentsearch": "~4.3.0-rc.0", + "@jupyterlab/documentsearch-extension": "~4.3.0-rc.0", + "@jupyterlab/extensionmanager": "~4.3.0-rc.0", + "@jupyterlab/extensionmanager-extension": "~4.3.0-rc.0", + "@jupyterlab/filebrowser": "~4.3.0-rc.0", + "@jupyterlab/filebrowser-extension": "~4.3.0-rc.0", + "@jupyterlab/fileeditor": "~4.3.0-rc.0", + "@jupyterlab/fileeditor-extension": "~4.3.0-rc.0", + "@jupyterlab/help-extension": "~4.3.0-rc.0", + "@jupyterlab/htmlviewer": "~4.3.0-rc.0", + "@jupyterlab/htmlviewer-extension": "~4.3.0-rc.0", + "@jupyterlab/hub-extension": "~4.3.0-rc.0", + "@jupyterlab/imageviewer": "~4.3.0-rc.0", + "@jupyterlab/imageviewer-extension": "~4.3.0-rc.0", + "@jupyterlab/javascript-extension": "~4.3.0-rc.0", + "@jupyterlab/json-extension": "~4.3.0-rc.0", + "@jupyterlab/lsp": "~4.3.0-rc.0", + "@jupyterlab/lsp-extension": "~4.3.0-rc.0", + "@jupyterlab/mainmenu": "~4.3.0-rc.0", + "@jupyterlab/mainmenu-extension": "~4.3.0-rc.0", + "@jupyterlab/markdownviewer": "~4.3.0-rc.0", + "@jupyterlab/markdownviewer-extension": "~4.3.0-rc.0", + "@jupyterlab/markedparser-extension": "~4.3.0-rc.0", + "@jupyterlab/mathjax-extension": "~4.3.0-rc.0", + "@jupyterlab/mermaid": "~4.3.0-rc.0", + "@jupyterlab/mermaid-extension": "~4.3.0-rc.0", + "@jupyterlab/metadataform": "~4.3.0-rc.0", + "@jupyterlab/metadataform-extension": "~4.3.0-rc.0", + "@jupyterlab/notebook": "~4.3.0-rc.0", + "@jupyterlab/notebook-extension": "~4.3.0-rc.0", + "@jupyterlab/observables": "~5.3.0-rc.0", + "@jupyterlab/outputarea": "~4.3.0-rc.0", + "@jupyterlab/pdf-extension": "~4.3.0-rc.0", + "@jupyterlab/pluginmanager-extension": "~4.3.0-rc.0", + "@jupyterlab/rendermime": "~4.3.0-rc.0", + "@jupyterlab/rendermime-interfaces": "~3.11.0-rc.0", + "@jupyterlab/running-extension": "~4.3.0-rc.0", + "@jupyterlab/services": "~7.3.0-rc.0", + "@jupyterlab/settingeditor": "~4.3.0-rc.0", + "@jupyterlab/settingeditor-extension": "~4.3.0-rc.0", + "@jupyterlab/settingregistry": "~4.3.0-rc.0", + "@jupyterlab/shortcuts-extension": "~5.1.0-rc.0", + "@jupyterlab/statedb": "~4.3.0-rc.0", + "@jupyterlab/statusbar": "~4.3.0-rc.0", + "@jupyterlab/terminal": "~4.3.0-rc.0", + "@jupyterlab/terminal-extension": "~4.3.0-rc.0", + "@jupyterlab/theme-dark-extension": "~4.3.0-rc.0", + "@jupyterlab/theme-dark-high-contrast-extension": "~4.3.0-rc.0", + "@jupyterlab/theme-light-extension": "~4.3.0-rc.0", + "@jupyterlab/toc-extension": "~6.3.0-rc.0", + "@jupyterlab/tooltip": "~4.3.0-rc.0", + "@jupyterlab/tooltip-extension": "~4.3.0-rc.0", + "@jupyterlab/translation": "~4.3.0-rc.0", + "@jupyterlab/translation-extension": "~4.3.0-rc.0", + "@jupyterlab/ui-components": "~4.3.0-rc.0", + "@jupyterlab/ui-components-extension": "~4.3.0-rc.0", + "@jupyterlab/vega5-extension": "~4.3.0-rc.0", "@lezer/common": "~1.2.1", "@lezer/highlight": "~1.2.0", - "@lumino/algorithm": "~2.0.1", - "@lumino/application": "~2.3.1", - "@lumino/commands": "~2.3.0", - "@lumino/coreutils": "~2.1.2", - "@lumino/disposable": "~2.1.2", - "@lumino/domutils": "~2.0.1", - "@lumino/dragdrop": "~2.1.4", - "@lumino/messaging": "~2.0.1", - "@lumino/properties": "~2.0.1", - "@lumino/signaling": "~2.1.2", - "@lumino/virtualdom": "~2.0.1", - "@lumino/widgets": "~2.3.2", + "@lumino/algorithm": "~2.0.2", + "@lumino/application": "~2.4.1", + "@lumino/commands": "~2.3.1", + "@lumino/coreutils": "~2.2.0", + "@lumino/disposable": "~2.1.3", + "@lumino/domutils": "~2.0.2", + "@lumino/dragdrop": "~2.1.5", + "@lumino/messaging": "~2.0.2", + "@lumino/properties": "~2.0.2", + "@lumino/signaling": "~2.1.3", + "@lumino/virtualdom": "~2.0.2", + "@lumino/widgets": "~2.5.0", "react": "~18.2.0", "react-dom": "~18.2.0", "yjs": "~13.6.8" @@ -132,60 +132,60 @@ "@jupyter-notebook/tree": "^7.3.0-alpha.1", "@jupyter-notebook/tree-extension": "^7.3.0-alpha.1", "@jupyter-notebook/ui-components": "^7.3.0-alpha.1", - "@jupyterlab/application-extension": "~4.3.0-alpha.1", - "@jupyterlab/apputils-extension": "~4.3.0-alpha.1", - "@jupyterlab/attachments": "~4.3.0-alpha.1", - "@jupyterlab/cell-toolbar-extension": "~4.3.0-alpha.1", - "@jupyterlab/celltags-extension": "~4.3.0-alpha.1", - "@jupyterlab/codemirror": "~4.3.0-alpha.1", - "@jupyterlab/codemirror-extension": "~4.3.0-alpha.1", - "@jupyterlab/completer-extension": "~4.3.0-alpha.1", - "@jupyterlab/console-extension": "~4.3.0-alpha.1", - "@jupyterlab/coreutils": "~6.3.0-alpha.1", - "@jupyterlab/csvviewer-extension": "~4.3.0-alpha.1", - "@jupyterlab/debugger-extension": "~4.3.0-alpha.1", - "@jupyterlab/docmanager-extension": "~4.3.0-alpha.1", - "@jupyterlab/documentsearch-extension": "~4.3.0-alpha.1", - "@jupyterlab/extensionmanager-extension": "~4.3.0-alpha.1", - "@jupyterlab/filebrowser-extension": "~4.3.0-alpha.1", - "@jupyterlab/fileeditor-extension": "~4.3.0-alpha.1", - "@jupyterlab/help-extension": "~4.3.0-alpha.1", - "@jupyterlab/htmlviewer-extension": "~4.3.0-alpha.1", - "@jupyterlab/hub-extension": "~4.3.0-alpha.1", - "@jupyterlab/imageviewer-extension": "~4.3.0-alpha.1", - "@jupyterlab/javascript-extension": "~4.3.0-alpha.1", - "@jupyterlab/json-extension": "~4.3.0-alpha.1", - "@jupyterlab/lsp": "~4.3.0-alpha.1", - "@jupyterlab/lsp-extension": "~4.3.0-alpha.1", - "@jupyterlab/mainmenu-extension": "~4.3.0-alpha.1", - "@jupyterlab/markdownviewer-extension": "~4.3.0-alpha.1", - "@jupyterlab/markedparser-extension": "~4.3.0-alpha.1", - "@jupyterlab/mathjax-extension": "~4.3.0-alpha.1", - "@jupyterlab/mermaid-extension": "~4.3.0-alpha.1", - "@jupyterlab/metadataform-extension": "~4.3.0-alpha.1", - "@jupyterlab/notebook-extension": "~4.3.0-alpha.1", - "@jupyterlab/pdf-extension": "~4.3.0-alpha.1", - "@jupyterlab/pluginmanager-extension": "~4.3.0-alpha.1", - "@jupyterlab/running-extension": "~4.3.0-alpha.1", - "@jupyterlab/settingeditor": "~4.3.0-alpha.1", - "@jupyterlab/settingeditor-extension": "~4.3.0-alpha.1", - "@jupyterlab/shortcuts-extension": "~5.1.0-alpha.1", - "@jupyterlab/terminal-extension": "~4.3.0-alpha.1", - "@jupyterlab/theme-dark-extension": "~4.3.0-alpha.1", - "@jupyterlab/theme-dark-high-contrast-extension": "~4.3.0-alpha.1", - "@jupyterlab/theme-light-extension": "~4.3.0-alpha.1", - "@jupyterlab/toc-extension": "~6.3.0-alpha.1", - "@jupyterlab/tooltip-extension": "~4.3.0-alpha.1", - "@jupyterlab/translation-extension": "~4.3.0-alpha.1", - "@jupyterlab/ui-components-extension": "~4.3.0-alpha.1", - "@jupyterlab/vega5-extension": "~4.3.0-alpha.1", + "@jupyterlab/application-extension": "~4.3.0-rc.0", + "@jupyterlab/apputils-extension": "~4.3.0-rc.0", + "@jupyterlab/attachments": "~4.3.0-rc.0", + "@jupyterlab/cell-toolbar-extension": "~4.3.0-rc.0", + "@jupyterlab/celltags-extension": "~4.3.0-rc.0", + "@jupyterlab/codemirror": "~4.3.0-rc.0", + "@jupyterlab/codemirror-extension": "~4.3.0-rc.0", + "@jupyterlab/completer-extension": "~4.3.0-rc.0", + "@jupyterlab/console-extension": "~4.3.0-rc.0", + "@jupyterlab/coreutils": "~6.3.0-rc.0", + "@jupyterlab/csvviewer-extension": "~4.3.0-rc.0", + "@jupyterlab/debugger-extension": "~4.3.0-rc.0", + "@jupyterlab/docmanager-extension": "~4.3.0-rc.0", + "@jupyterlab/documentsearch-extension": "~4.3.0-rc.0", + "@jupyterlab/extensionmanager-extension": "~4.3.0-rc.0", + "@jupyterlab/filebrowser-extension": "~4.3.0-rc.0", + "@jupyterlab/fileeditor-extension": "~4.3.0-rc.0", + "@jupyterlab/help-extension": "~4.3.0-rc.0", + "@jupyterlab/htmlviewer-extension": "~4.3.0-rc.0", + "@jupyterlab/hub-extension": "~4.3.0-rc.0", + "@jupyterlab/imageviewer-extension": "~4.3.0-rc.0", + "@jupyterlab/javascript-extension": "~4.3.0-rc.0", + "@jupyterlab/json-extension": "~4.3.0-rc.0", + "@jupyterlab/lsp": "~4.3.0-rc.0", + "@jupyterlab/lsp-extension": "~4.3.0-rc.0", + "@jupyterlab/mainmenu-extension": "~4.3.0-rc.0", + "@jupyterlab/markdownviewer-extension": "~4.3.0-rc.0", + "@jupyterlab/markedparser-extension": "~4.3.0-rc.0", + "@jupyterlab/mathjax-extension": "~4.3.0-rc.0", + "@jupyterlab/mermaid-extension": "~4.3.0-rc.0", + "@jupyterlab/metadataform-extension": "~4.3.0-rc.0", + "@jupyterlab/notebook-extension": "~4.3.0-rc.0", + "@jupyterlab/pdf-extension": "~4.3.0-rc.0", + "@jupyterlab/pluginmanager-extension": "~4.3.0-rc.0", + "@jupyterlab/running-extension": "~4.3.0-rc.0", + "@jupyterlab/settingeditor": "~4.3.0-rc.0", + "@jupyterlab/settingeditor-extension": "~4.3.0-rc.0", + "@jupyterlab/shortcuts-extension": "~5.1.0-rc.0", + "@jupyterlab/terminal-extension": "~4.3.0-rc.0", + "@jupyterlab/theme-dark-extension": "~4.3.0-rc.0", + "@jupyterlab/theme-dark-high-contrast-extension": "~4.3.0-rc.0", + "@jupyterlab/theme-light-extension": "~4.3.0-rc.0", + "@jupyterlab/toc-extension": "~6.3.0-rc.0", + "@jupyterlab/tooltip-extension": "~4.3.0-rc.0", + "@jupyterlab/translation-extension": "~4.3.0-rc.0", + "@jupyterlab/ui-components-extension": "~4.3.0-rc.0", + "@jupyterlab/vega5-extension": "~4.3.0-rc.0", "react": "^18.2.0", "react-dom": "^18.2.0", "yjs": "^13.5.40" }, "devDependencies": { - "@jupyterlab/builder": "~4.3.0-alpha.1", - "@jupyterlab/buildutils": "~4.3.0-alpha.1", + "@jupyterlab/builder": "~4.3.0-rc.0", + "@jupyterlab/buildutils": "~4.3.0-rc.0", "@types/rimraf": "^3.0.2", "css-loader": "~5.0.1", "extra-watch-webpack-plugin": "^1.0.3", diff --git a/buildutils/package.json b/buildutils/package.json index 5818890cac..b79a8eeb6e 100644 --- a/buildutils/package.json +++ b/buildutils/package.json @@ -29,7 +29,7 @@ "watch": "tsc -w --listEmittedFiles" }, "dependencies": { - "@jupyterlab/buildutils": "~4.3.0-alpha.1", + "@jupyterlab/buildutils": "~4.3.0-rc.0", "commander": "^6.2.0", "fs-extra": "^9.1.0", "typescript": "~5.0.2" diff --git a/notebook/templates/consoles.html b/notebook/templates/consoles.html index 00fa72d3e5..67616dfd7c 100644 --- a/notebook/templates/consoles.html +++ b/notebook/templates/consoles.html @@ -12,7 +12,7 @@ {% endif %} - + {# Copy so we do not modify the page_config with updates. #} {% set page_config_full = page_config.copy() %} diff --git a/notebook/templates/edit.html b/notebook/templates/edit.html index 9a4548b5ad..ee45f02d11 100644 --- a/notebook/templates/edit.html +++ b/notebook/templates/edit.html @@ -8,7 +8,7 @@ {% endblock %} - + {# Copy so we do not modify the page_config with updates. #} {% set page_config_full = page_config.copy() %} diff --git a/notebook/templates/error.html b/notebook/templates/error.html index 895abe8028..c08d8b1994 100644 --- a/notebook/templates/error.html +++ b/notebook/templates/error.html @@ -14,7 +14,7 @@ - + {% block stylesheet %}