wip enable lab extensions

jupyterlab/__init__.py

@@ -11,6 +11,9 @@ from notebook.base.handlers import IPythonHandler, FileFindHandler
 from jinja2 import FileSystemLoader
 from notebook.utils import url_path_join as ujoin
 
+
+
+
 #-----------------------------------------------------------------------------
 # Module globals
 #-----------------------------------------------------------------------------
@@ -30,6 +33,10 @@ FILE_LOADER = FileSystemLoader(HERE)
 BUILT_FILES = os.path.join(HERE, 'build')
 PREFIX = '/lab'
 EXTENSION_PREFIX = '/labextension'
+with open(os.path.join(HERE, '..', 'package.json')) as f:
+    packagejson = json.load(f)
+
+__version__ = packagejson['version']
 
 
 def get_lab_extension_manifest_data_by_folder(folder):
@@ -47,6 +54,7 @@ def get_lab_extension_manifest_data_by_folder(folder):
 def get_lab_extension_manifest_data_by_name(name):
     """Get the manifest data for a given lab extension folder
     """
+    from .labextensions import _lab_extension_dirs
     for exts in _lab_extension_dirs():
         full_dest = os.path.join(exts, name)
         if os.path.exists(full_dest):
@@ -75,13 +83,13 @@ class LabHandler(IPythonHandler):
                 data = get_lab_extension_manifest_data_by_name(name)
                 for value in data.values():
                     if value.get('entry', None):
-                        entries.push(value['entry'])
-                        bundles.push('%s/%s/%s' % (
+                        entries.append(value['entry'])
+                        bundles.append('%s/%s/%s' % (
                             EXTENSION_PREFIX, name, value['files'][0]
                         ))
                     for fname in value['files']:
                         if os.path.splitext(fname)[1] == '.css':
-                            css_files.push('%s/%s/%s' % (
+                            css_files.append('%s/%s/%s' % (
                                 EXTENSION_PREFIX, name, fname
                             ))
 

jupyterlab/index.js

@@ -17,6 +17,10 @@ require('jupyterlab/lib/default-theme/index.css');
  */
 function validateEntryPoint(entryPoint) {
   var data = jupyter.require(entryPoint);
+  // We use the default export from es6 modules.
+  if (data.__esModule) {
+    data = data.default;
+  }
   if (!Array.isArray(data)) {
     data = [data];
   }

jupyterlab/labextensions.py

@@ -29,7 +29,7 @@ from jupyter_core.paths import (
 from ipython_genutils.path import ensure_dir_exists
 from ipython_genutils.py3compat import string_types, cast_unicode_py2
 from ipython_genutils.tempdir import TemporaryDirectory
-from ._version import __version__
+from . import __version__
 
 from traitlets.config.manager import BaseJSONConfigManager
 from traitlets.utils.importstring import import_item

jupyterlab/package.json

@@ -10,7 +10,7 @@
     "font-awesome": "^4.6.1",
     "fs-extra": "^0.30.0",
     "jupyterlab": "file:../",
-    "jupyterlab-extension-builder": "^0.1.0",
+    "jupyterlab-extension-builder": "^0.3.0",
     "material-design-icons": "^2.2.3",
     "semver": "^5.3.0",
     "webpack-config": "^6.1.2"