diff --git a/packages/voila/index.js b/packages/voila/index.js index aa7e0b78d..0d08d00a0 100644 --- a/packages/voila/index.js +++ b/packages/voila/index.js @@ -70,17 +70,12 @@ async function main() { const disabled = []; let mods = [ // @jupyterlab plugins - require('@jupyterlab/apputils-extension').default.filter(({ id }) => - [ - '@jupyterlab/apputils-extension:settings', - '@jupyterlab/apputils-extension:themes' - ].includes(id) - ), // TODO: re-add after updating to 3.1 lab packages // require('@jupyterlab/markdownviewer-extension'), require('@jupyterlab/mathjax2-extension'), require('@jupyterlab/rendermime-extension'), // TODO: add the settings endpoint to re-enable the theme plugins? + // This would also need the theme manager plugin and settings // require('@jupyterlab/theme-light-extension'), // require('@jupyterlab/theme-dark-extension'), require('./plugins') diff --git a/packages/voila/package.json b/packages/voila/package.json index 36fb5030d..afbc5d362 100644 --- a/packages/voila/package.json +++ b/packages/voila/package.json @@ -11,13 +11,10 @@ "@jupyter-widgets/base": "^4.0.0", "@jupyter-widgets/controls": "^3.0.0", "@jupyter-widgets/jupyterlab-manager": "^3.0.0", - "@jupyterlab/apputils-extension": "^3.0.0", "@jupyterlab/json-extension": "^3.0.0", "@jupyterlab/markdownviewer-extension": "^3.0.0", "@jupyterlab/mathjax2-extension": "^3.0.0", "@jupyterlab/rendermime-extension": "^3.0.0", - "@jupyterlab/theme-light-extension": "^3.0.0", - "@jupyterlab/theme-dark-extension": "^3.0.0", "@jupyterlab/application": "^3.0.0", "@jupyterlab/apputils": "^3.0.0", "@jupyterlab/coreutils": "^5.0.0", diff --git a/packages/voila/style.css b/packages/voila/style.css index 1dc644aa8..03b669625 100644 --- a/packages/voila/style.css +++ b/packages/voila/style.css @@ -1,5 +1,3 @@ -@import url('~@jupyterlab/theme-light-extension/style/index.css'); - @import url('~@lumino/widgets/style/index.css'); @import url('~@jupyter-widgets/controls/css/widgets.built.css'); diff --git a/yarn.lock b/yarn.lock index f468fb932..8e80daed3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1280,30 +1280,6 @@ "@lumino/signaling" "^1.4.3" "@lumino/widgets" "^1.16.1" -"@jupyterlab/apputils-extension@^3.0.0": - version "3.0.6" - resolved "https://registry.yarnpkg.com/@jupyterlab/apputils-extension/-/apputils-extension-3.0.6.tgz#6b30d7b24d8de37e3771c07636988f23b1a7774e" - integrity sha512-XpJlVqtWJjcnvj5uzZ6cN/H1UcQvuj2iHJF/k564Bbi0mxg5bLytjwf7ZEBzhW6Y+m5RxKmKlnoEagtucbpPGQ== - dependencies: - "@jupyterlab/application" "^3.0.6" - "@jupyterlab/apputils" "^3.0.5" - "@jupyterlab/coreutils" "^5.0.3" - "@jupyterlab/docregistry" "^3.0.6" - "@jupyterlab/filebrowser" "^3.0.6" - "@jupyterlab/mainmenu" "^3.0.5" - "@jupyterlab/services" "^6.0.5" - "@jupyterlab/settingregistry" "^3.0.3" - "@jupyterlab/statedb" "^3.0.3" - "@jupyterlab/translation" "^3.0.5" - "@jupyterlab/ui-components" "^3.0.4" - "@lumino/algorithm" "^1.3.3" - "@lumino/commands" "^1.12.0" - "@lumino/coreutils" "^1.5.3" - "@lumino/disposable" "^1.4.3" - "@lumino/polling" "^1.3.3" - "@lumino/widgets" "^1.16.1" - es6-promise "~4.2.8" - "@jupyterlab/apputils@^3.0.0", "@jupyterlab/apputils@^3.0.5": version "3.0.5" resolved "https://registry.yarnpkg.com/@jupyterlab/apputils/-/apputils-3.0.5.tgz#1eb682e20f5da98ea7c1d2b3909ea8c17565f607" @@ -1599,7 +1575,7 @@ "@lumino/signaling" "^1.4.3" "@lumino/widgets" "^1.16.1" -"@jupyterlab/mainmenu@^3.0.0", "@jupyterlab/mainmenu@^3.0.5": +"@jupyterlab/mainmenu@^3.0.0": version "3.0.5" resolved "https://registry.yarnpkg.com/@jupyterlab/mainmenu/-/mainmenu-3.0.5.tgz#0376f3202bb61ef83077581ab1155dd2025578cd" integrity sha512-2rziVmmr3/Sl84PzzGYfcGfvjB1tx9aLQVJF+iMvKLEWtPZAsObCVK0SZLPb1S/f942l6/tC87nNOMinIFujBw== @@ -1859,24 +1835,6 @@ simulate-event "~1.4.0" ts-jest "^26.3.0" -"@jupyterlab/theme-dark-extension@^3.0.0": - version "3.0.6" - resolved "https://registry.yarnpkg.com/@jupyterlab/theme-dark-extension/-/theme-dark-extension-3.0.6.tgz#8e17bdc12c5fd69b0e0cbf681ef7764966fe774a" - integrity sha512-VNM2013+j36XHHPz3EUVWHWU//ZrqDuhfVtPbpTBTuqu/Esb7bAUKoTiPSrRPnDoyaLdPs3UHRG1ZxalI48Z8g== - dependencies: - "@jupyterlab/application" "^3.0.6" - "@jupyterlab/apputils" "^3.0.5" - "@jupyterlab/translation" "^3.0.5" - -"@jupyterlab/theme-light-extension@^3.0.0": - version "3.0.6" - resolved "https://registry.yarnpkg.com/@jupyterlab/theme-light-extension/-/theme-light-extension-3.0.6.tgz#6a1162b33e7467c025369d07aae099c2229ad030" - integrity sha512-RBg5EZLY0M1BaeTMMFdljrVgiAkdSJJEdBTneteZk0iW02jdezIzncPpyUXbgjAW62BO7aroGS3FLlJ7dwmAHA== - dependencies: - "@jupyterlab/application" "^3.0.6" - "@jupyterlab/apputils" "^3.0.5" - "@jupyterlab/translation" "^3.0.5" - "@jupyterlab/translation@^3.0.0", "@jupyterlab/translation@^3.0.5": version "3.0.5" resolved "https://registry.yarnpkg.com/@jupyterlab/translation/-/translation-3.0.5.tgz#8706f48e6989d4aaa8613fa88e348a84ae87eade" @@ -5110,7 +5068,7 @@ es-to-primitive@^1.2.1: is-date-object "^1.0.1" is-symbol "^1.0.2" -es6-promise@^4.0.3, es6-promise@~4.2.8: +es6-promise@^4.0.3: version "4.2.8" resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.8.tgz#4eb21594c972bc40553d276e510539143db53e0a" integrity sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==