Remove classic template

Author: martinRenou

.gitignore

@@ -30,13 +30,11 @@ config.rst
 package-lock.json
 
 share/jupyter/voila/templates/base/static/*voila.js
-share/jupyter/voila/templates/base/static/*.[woff|woff2|eot|svg]
-
-share/jupyter/voila/templates/classic/static/labvariables.css
-share/jupyter/voila/templates/classic/static/materialcolors.css
-
-share/jupyter/voila/templates/reveal/static/labvariables.css
-share/jupyter/voila/templates/reveal/static/materialcolors.css
+share/jupyter/voila/templates/base/static/*.woff
+share/jupyter/voila/templates/base/static/*.woff2
+share/jupyter/voila/templates/base/static/*.eot
+share/jupyter/voila/templates/base/static/*.svg
+share/jupyter/voila/templates/base/static/*.ttf
 
 lib
 

docs/source/customize.rst

@@ -41,9 +41,6 @@ Like nbconvert, Voilà supports the **light** and **dark** themes by default, bu
    pip install jupyterlab_miami_nights
    voila <path-to-notebook> --theme=jupyterlab_miami_nights
 
-.. warning::
-   Theme are specific to the "lab" template, they will not work for the "classic" template
-
 .. note::
    Changing the theme from the notebook metadata may change in the future if this features moves to nbconvert.
 
@@ -247,7 +244,7 @@ Here is an example of the configuration file. This file needs to be placed in th
       """Do your stuffs here"""
       return notebook
 
-   c.Voila.prelaunch_hook = hook_function 
+   c.Voila.prelaunch_hook = hook_function
 
 - Start Voila from a python script:
 
@@ -273,7 +270,7 @@ Here is an example of a custom `prelaunch-hook` to execute a notebook with `pape
             from papermill.parameterize import parameterize_notebook
 
             # setup for papermill
-            # 
+            #
             # these two blocks are done
             # to avoid triggering errors
             # in papermill's notebook
@@ -423,7 +420,7 @@ For more information about these options, check out the `Jupyter Server <https:/
 Preheated kernels
 ==================
 
-Since Voilà needs to start a new jupyter kernel and execute the requested notebook in this kernel for every connection, this would lead to a long waiting time before the widgets can be displayed in the browser. 
+Since Voilà needs to start a new jupyter kernel and execute the requested notebook in this kernel for every connection, this would lead to a long waiting time before the widgets can be displayed in the browser.
 To reduce this waiting time, especially for heavy notebooks, users can activate the preheating kernel option of Voilà.
 
 .. warning::
@@ -451,25 +448,25 @@ will set the variable "FOO" in all preheated kernels.
 
 If the pool size does not match the user's requirements, or some notebooks need to use specific environment variables..., additional settings are needed.  The easiest way to change these settings is to provide a file named `voila.json` in the same folder containing the notebooks. Settings for preheating kernel ( list of notebooks does not need preheated kernels, number of kernels in pool, refilling delay, environment variables for starting kernel...) can be set under the `VoilaKernelManager` class name.
 
-Here is an example of settings with explanations for preheating kernel option. 
+Here is an example of settings with explanations for preheating kernel option.
 
 .. code-block:: python
 
    # voila.json
    {
       "VoilaConfiguration": {
          # Activate or deactivate preheat kernel option.
-         "preheat_kernel": true 
+         "preheat_kernel": true
       },
       "VoilaKernelManager": {
          # A list of notebook name or regex patterns to exclude notebooks from using preheat kernel.
          "preheat_blacklist": [
             "notebook-does-not-need-preheat.ipynb",
             "^.*foo.*$",
             ...
-         ], 
+         ],
          # Configuration for kernel pools
-         "kernel_pools_config": { 
+         "kernel_pools_config": {
             # Setting for `voila.ipynb` notebook
             "voila.ipynb": {
                "pool_size": 3, # Size of pool
@@ -515,7 +512,7 @@ In normal mode, Voilà users can get the `query string` at run time through the
 .. code-block:: python
 
    import os
-   query_string = os.getenv('QUERY_STRING') 
+   query_string = os.getenv('QUERY_STRING')
 
 In preheating kernel mode, users can prepend with ``wait_for_request`` from ``voila.utils``
 
@@ -536,9 +533,9 @@ If the Voilà websocket handler is not started with the default protocol (`ws`),
    {
       ...
       "VoilaKernelManager": {
-         "kernel_pools_config": { 
+         "kernel_pools_config": {
             "foo.ipynb": {
-               "kernel_env_variables": { 
+               "kernel_env_variables": {
                   "VOILA_APP_IP": "192.168.1.1",
                   "VOILA_APP_PORT": "6789",
                   "VOILA_WS_PROTOCOL": "wss"
@@ -561,7 +558,7 @@ Hiding output and code cells based on cell tags
 Voilà uses `nbconvert <https://github.com/jupyter/nbconvert>`_ under the hood to render the notebooks so we can benefit from some of its advanced functionalities to hide code and output cells based on cell tags.
 
 To hide the cell output for every cell in your notebook that has been tagged (`how to tag <https://jupyter-notebook.readthedocs.io/en/stable/changelog.html#cell-tags>`_) with "hide" in Voilà::
-    
+
     voila --TagRemovePreprocessor.remove_all_outputs_tags='{"hide"}' your_notebook.ipynb
 
 To hide both the code cell and the output cell (if any) for every cell that has been tagged with "hide"::

hatch_build.py

@@ -40,16 +40,15 @@
     "@lumino/properties": "^1.5.2",
     "@lumino/signaling": "^1.7.2",
     "@lumino/virtualdom": "^1.11.2",
-    "@lumino/widgets": "^1.26.2",
-    "react": "^17.0.1"
+    "@lumino/widgets": "^1.26.2"
   },
   "devDependencies": {
     "@babel/core": "^7.2.2",
     "@babel/preset-env": "^7.3.1",
     "@jupyterlab/builder": "^3.0.0",
     "@types/node": "^18.8.3",
     "babel-loader": "^8.0.5",
-    "css-loader": "~5.0.2",
+    "css-loader": "^6.7.2",
     "file-loader": "^6.2.0",
     "fs-extra": "^9.1.0",
     "glob": "~7.1.6",
@@ -58,7 +57,8 @@
     "p-limit": "^2.2.2",
     "raw-loader": "^4.0.2",
     "rimraf": "^3.0.2",
-    "style-loader": "^2.0.0",
+    "sass-loader": "^13.2.0",
+    "style-loader": "^3.3.1",
     "svg-url-loader": "^7.1.1",
     "typescript": "~4.1.3",
     "url-loader": "^4.1.1",

packages/voila/package.json

@@ -12,8 +12,6 @@
 
 // Inspired by: https://github.com/jupyterlab/jupyterlab/blob/master/dev_mode/index.js
 
-import './style.css';
-
 import { PageConfig, URLExt } from '@jupyterlab/coreutils';
 
 import { VoilaApp } from './app';

packages/voila/src/main.ts

@@ -27,9 +27,7 @@ fs.ensureDirSync(buildDir);
 
 // Copy files to the build directory
 const libDir = path.resolve(__dirname, 'lib');
-const style = path.resolve(__dirname, 'style.css');
 fs.copySync(libDir, buildDir);
-fs.copySync(style, path.resolve(buildDir, 'style.css'));
 
 const extras = Build.ensureAssets({
   packageNames: names,
@@ -38,6 +36,7 @@ const extras = Build.ensureAssets({
 
 // Make a bootstrap entrypoint
 const entryPoint = path.join(buildDir, 'bootstrap.js');
+const styleEntryPoint = path.join(buildDir, 'style.js');
 
 if (process.env.NODE_ENV === 'production') {
   baseConfig.mode = 'production';
@@ -58,7 +57,11 @@ const distRoot = path.resolve(
 module.exports = [
   merge(baseConfig, {
     mode: 'development',
-    entry: ['./publicpath.js', './' + path.relative(__dirname, entryPoint)],
+    entry: [
+      './' + path.relative(__dirname, styleEntryPoint),
+      './publicpath.js',
+      './' + path.relative(__dirname, entryPoint)
+    ],
     output: {
       path: distRoot,
       library: {

packages/voila/style.css

@@ -83,9 +83,6 @@ artifacts = [
     "share/jupyter/voila/templates"
 ]
 
-[tool.hatch.build.hooks.custom]
-path = "hatch_build.py"
-
 [tool.hatch.build.targets.wheel.shared-data]
 "etc/jupyter" = "etc/jupyter"
 "voila/labextension" = "share/jupyter/labextensions/@voila-dashboards/jupyterlab-preview"
@@ -105,17 +102,9 @@ dependencies = [
 build-function = "hatch_jupyter_builder.npm_builder"
 ensured-targets = [
     "voila/labextension/static/style.js",
-    "share/jupyter/voila/templates/classic/static/materialcolors.css",
-    "share/jupyter/voila/templates/classic/static/labvariables.css",
-    "share/jupyter/voila/templates/reveal/static/materialcolors.css",
-    "share/jupyter/voila/templates/reveal/static/labvariables.css",
 ]
 skip-if-exists = [
     "voila/labextension/static/style.js",
-    "share/jupyter/voila/templates/classic/static/materialcolors.css",
-    "share/jupyter/voila/templates/classic/static/labvariables.css",
-    "share/jupyter/voila/templates/reveal/static/materialcolors.css",
-    "share/jupyter/voila/templates/reveal/static/labvariables.css",
 ]
 
 [tool.hatch.build.hooks.jupyter-builder.editable-build-kwargs]