From 3b2335268985d565e1eaf5cae20554ad235249a2 Mon Sep 17 00:00:00 2001 From: Jonathan Le Page Date: Fri, 5 Mar 2021 13:29:03 +0000 Subject: [PATCH] Update to Jupyterlab 3.0 --- js/package.json | 5 +++-- js/src/qgrid.widget.js | 6 ------ js/webpack.config.js | 2 +- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/js/package.json b/js/package.json index dd2a139f..3e128c4c 100644 --- a/js/package.json +++ b/js/package.json @@ -31,8 +31,9 @@ "webpack-cli": "^3.3.11" }, "dependencies": { - "@jupyter-widgets/base": "^1.1 || ^2 || ^3", - "@jupyter-widgets/controls": "^1 || ^2", + "@jupyter-widgets/base": "^1.1 || ^2 || ^3 || ^4", + "@jupyter-widgets/controls": "^1 || ^2 || ^3", + "clean": "^4.0.2", "jquery": "^3.2.1", "jquery-ui-dist": "^1.12.1", "moment": "^2.24.0", diff --git a/js/src/qgrid.widget.js b/js/src/qgrid.widget.js index 7c5efd37..d58ccdac 100644 --- a/js/src/qgrid.widget.js +++ b/js/src/qgrid.widget.js @@ -8,12 +8,6 @@ var text_filter = require('./qgrid.textfilter.js'); var boolean_filter = require('./qgrid.booleanfilter.js'); var editors = require('./qgrid.editors.js'); var dialog = null; -try { - dialog = require('base/js/dialog'); -} catch (e) { - console.warn("Qgrid was unable to load base/js/dialog. " + - "Full screen button won't be available"); -} var jquery_ui = require('jquery-ui-dist/jquery-ui.min.js'); require('slickgrid-qgrid/slick.core.js'); diff --git a/js/webpack.config.js b/js/webpack.config.js index 4386585c..86a4106d 100644 --- a/js/webpack.config.js +++ b/js/webpack.config.js @@ -61,7 +61,7 @@ module.exports = [ module: { rules: rules }, - externals: ['@jupyter-widgets/base', '@jupyter-widgets/controls', 'base/js/dialog'], + externals: ['@jupyter-widgets/base', '@jupyter-widgets/controls'], plugins: plugins, mode: 'production' },