Merge pull request #120 from SylvainCorlay/fixup-jlab-extension

Fixup Jupyterlab extension for 0.4.0

js/src/extension.ts

@@ -4,14 +4,14 @@
 
 // Configure requirejs
 if (window['require'] !== undefined) {
-    window['require'].config({
-        map: {
-            "*" : {
-                "ipysheet": "nbextensions/ipysheet/index",
-                "jupyter-js-widgets": "nbextensions/jupyter-js-widgets/extension"
-            }
-        }
-    });
+  window['require'].config({
+    map: {
+      "*" : {
+        "ipysheet": "nbextensions/ipysheet/index",
+        "jupyter-js-widgets": "nbextensions/jupyter-js-widgets/extension"
+      }
+    }
+  });
 }
 
 // Export the required load_ipython_extention

js/src/labplugin.ts

@@ -1,7 +1,6 @@
-import * as sheet from './sheet';
-import * as renderer from './renderer';
 import * as base from '@jupyter-widgets/base';
 import {version} from './version';
+import * as sheet from './sheet';
 
 const ipysheetPlugin = {
     id: 'ipysheet',
@@ -16,17 +15,4 @@ const ipysheetPlugin = {
     autoStart: true
 };
 
-const rendererPlugin = {
-    id: 'ipysheet:renderer',
-    requires: [base.IJupyterWidgetRegistry],
-    activate: function(app, widgets) {
-        widgets.registerWidget({
-            name: 'ipysheet/renderer',
-            version: version,
-            exports: renderer
-        });
-    },
-    autoStart: true
-};
-
-export default [ipysheetPlugin, rendererPlugin];
+export default ipysheetPlugin;

js/src/renderer.ts

@@ -1,7 +1,7 @@
 import * as widgets  from '@jupyter-widgets/base';
 import * as Handsontable from 'handsontable';
 import {extend} from 'lodash';
-import {version, semver_range} from './version';
+import {semver_range} from './version';
 import {safeEval} from './worker_eval';
 
 let RendererModel = widgets.WidgetModel.extend({
@@ -29,5 +29,5 @@ let RendererModel = widgets.WidgetModel.extend({
 });
 
 export {
-    RendererModel, version
+    RendererModel 
 };

js/src/sheet.ts

@@ -1,14 +1,17 @@
 import * as widgets  from '@jupyter-widgets/base';
 import {cloneDeep, extend, includes as contains, each, debounce, times, map, unzip as transpose} from 'lodash';
 import {semver_range} from './version';
+import {RendererModel} from './renderer';
 import './widget_cell_type';
+
 // @ts-ignore
 import * as Handsontable from 'handsontable';
 
+// CSS
 import 'pikaday/css/pikaday.css';
 import 'handsontable/dist/handsontable.min.css';
-import '@jupyter-widgets/controls/css/materialcolors.css'
-import '@jupyter-widgets/controls/css/labvariables.css'
+import '@jupyter-widgets/controls/css/materialcolors.css';
+import '@jupyter-widgets/controls/css/labvariables.css';
 import '../css/custom.css';
 
 
@@ -514,5 +517,5 @@ export {
     SheetModel,
     SheetView,
     CellRangeModel,
-    Handsontable
+    RendererModel
 };

js/tsconfig.json

@@ -12,7 +12,7 @@
     "inlineSourceMap": true
   },
   "include": [
-      "./src/**/*",
+      "./src/**/*"
   ],
   "exclude": [
         "node_modules",