Clean up nbextension paths

Author: philippjfr

jupyter_bokeh/__init__.py

@@ -2,7 +2,6 @@
 
 from pathlib import Path
 
-from .nbextension import _jupyter_nbextension_paths
 from ._version import __version__
 
 HERE = Path(__file__).parent.resolve()
@@ -15,3 +14,11 @@ def _jupyter_labextension_paths():
         "src": "labextension",
         "dest": data["name"]
     }]
+
+def _jupyter_nbextension_paths():
+    return [{
+        "section": "notebook",
+        "src": "nbextension/static",
+        "dest": "jupyter_bokeh",
+        "require": "jupyter_bokeh/extension",
+    }]

jupyter_bokeh/nbextension/__init__.py

@@ -19,7 +19,7 @@
 name = "jupyter_bokeh"
 
 lab_path = (HERE / name / "labextension")
-nb_path = (HERE / name / "nbextension" / "static")
+nb_path = (HERE / name / "nbextension")
 
 # Representative files that should exist after a successful build
 jstargets = [
@@ -35,8 +35,8 @@
 
 data_files_spec = [
     ("share/jupyter/labextensions/%s" % labext_name, str(lab_path), "**"),
-    ("share/jupyter/labextensions/%s/static" % labext_name, str(HERE), "install.json"),
-    ("share/jupyter/nbextensions/%s/static" % labext_name, str(nb_path), '**'),
+    ("share/jupyter/labextensions/%s" % labext_name, str(HERE), "install.json"),
+    ("share/jupyter/nbextensions/%s" % labext_name, str(nb_path), '**'),
     ("etc/jupyter/nbconfig/notebook.d", str(HERE), "jupyter_bokeh.json")
 ]
 

jupyter_bokeh/nbextension/static/extension.js renamed to jupyter_bokeh/nbextension/extension.js

@@ -19,7 +19,7 @@ module.exports = [
     entry: "./lib/extension.js",
     output: {
       filename: "index.js",
-      path: path.resolve(__dirname, "jupyter_bokeh", "nbextension", "static"),
+      path: path.resolve(__dirname, "jupyter_bokeh", "nbextension"),
       libraryTarget: "amd",
     },
     externals,