Support for JupyterLab 2

README.rst

@@ -216,7 +216,7 @@ to do this.
 
 #. If desired, install the labextension::
 
-    jupyter labextension install js/
+    jupyter labextension link js/
 
 #. Run the notebook as you normally would with the following command::
 

js/package.json

@@ -1,6 +1,6 @@
 {
   "name": "qgrid2",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "description": "An Interactive Grid for Sorting and Filtering DataFrames in Jupyter Notebook",
   "author": "Quantopian Inc.",
   "main": "src/index.js",
@@ -16,27 +16,28 @@
   ],
   "scripts": {
     "clean": "rimraf dist/",
-    "prepublish": "webpack",
+    "prepare": "webpack",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "devDependencies": {
-    "jshint": "^2.9.5",
-    "rimraf": "^2.6.1",
-    "webpack": "^3.5.5"
+    "css-loader": "^3.4.2",
+    "expose-loader": "^0.7.5",
+    "file-loader": "^6.0.0",
+    "jshint": "^2.11.0",
+    "json-loader": "^0.5.7",
+    "rimraf": "^3.0.2",
+    "style-loader": "^1.1.3",
+    "webpack": "^4.42.0",
+    "webpack-cli": "^3.3.11"
   },
   "dependencies": {
-    "@jupyter-widgets/base": "^1.1 || ^2",
-    "@jupyter-widgets/controls": "^1.0.0 || ^1.5.1",
-    "css-loader": "^0.28.7",
-    "expose-loader": "^0.7.3",
-    "file-loader": "^0.11.2",
+    "@jupyter-widgets/base": "^1.1 || ^2 || ^3",
+    "@jupyter-widgets/controls": "^1 || ^2",
     "jquery": "^3.2.1",
-    "jquery-ui-dist": "1.12.1",
-    "json-loader": "^0.5.4",
-    "moment": "^2.18.1",
+    "jquery-ui-dist": "^1.12.1",
+    "moment": "^2.24.0",
     "slickgrid-qgrid": "0.0.5",
-    "style-loader": "^0.18.2",
-    "underscore": "^1.8.3"
+    "underscore": "^1.9.2"
   },
   "jshintConfig": {
     "esversion": 6

js/src/qgrid.widget.js

@@ -36,8 +36,8 @@ class QgridModel extends widgets.DOMWidgetModel {
       _view_name : 'QgridView',
       _model_module : 'qgrid',
       _view_module : 'qgrid',
-      _model_module_version : '^1.1.1',
-      _view_module_version : '^1.1.1',
+      _model_module_version : '^1.1.2',
+      _view_module_version : '^1.1.2',
       _df_json: '',
       _columns: {}
     });

js/webpack.config.js

@@ -42,7 +42,8 @@ module.exports = [
             path: path.resolve(__dirname, '..', 'qgrid', 'static'),
             libraryTarget: 'amd'
         },
-        plugins: plugins
+        plugins: plugins,
+        mode: 'production'
     },
     {// Bundle for the notebook containing the custom widget views and models
      //
@@ -61,7 +62,8 @@ module.exports = [
             rules: rules
         },
         externals: ['@jupyter-widgets/base', '@jupyter-widgets/controls', 'base/js/dialog'],
-        plugins: plugins
+        plugins: plugins,
+        mode: 'production'
     },
     {// Embeddable qgrid bundle
      //
@@ -89,6 +91,7 @@ module.exports = [
             rules: rules
         },
         externals: ['@jupyter-widgets/base', '@jupyter-widgets/controls'],
-        plugins: plugins
+        plugins: plugins,
+        mode: 'production'
     }
 ];

qgrid/_version.py

@@ -1,4 +1,4 @@
-version_info = (1, 3, 0, "final")
+version_info = (1, 3, 1, "final")
 
 _specifier_ = {"alpha": "a", "beta": "b", "candidate": "rc", "final": ""}
 

qgrid/grid.py

@@ -566,8 +566,8 @@ class can be constructed directly but that's not recommended because
     _model_name = Unicode('QgridModel').tag(sync=True)
     _view_module = Unicode('qgrid').tag(sync=True)
     _model_module = Unicode('qgrid').tag(sync=True)
-    _view_module_version = Unicode('1.1.1').tag(sync=True)
-    _model_module_version = Unicode('1.1.1').tag(sync=True)
+    _view_module_version = Unicode('^1.1.3').tag(sync=True)
+    _model_module_version = Unicode('^1.1.3').tag(sync=True)
 
     _df = Instance(pd.DataFrame)
     _df_json = Unicode('', sync=True)