#5481 Update to ipywidgets v7 (#5770)

* #5481 update to ipywidgets v7 * #5481 treat widgets modules as externals amd modules * #5481 Fixed test to be compatible with changes required by ipywidgets 7. * #5481 keep ipywidgets v7 version up to date with master * #5481 resolve mimebundle validation error * #5481 update the required ipywidgets version * #5481 Fixed tests.
twosigma · Aug 21, 2017 · 404822a · 404822a
1 parent 34ab326
commit 404822a
Show file tree

Hide file tree

Showing 29 changed files with 694 additions and 405 deletions.
diff --git a/beakerx/js/package.json b/beakerx/js/package.json
@@ -31,6 +31,7 @@
     "url-loader": "^0.5.9"
   },
   "dependencies": {
+    "@jupyter-widgets/controls": "^0.6.8",
     "base64-loader": "^1.0.0",
     "big.js": "^3.1.3",
     "d3": "^4.9.1",
@@ -48,7 +49,6 @@
     "html-loader": "^0.4.5",
     "jquery-contextmenu": "^2.4.5",
     "jquery-ui": "^1.12.1",
-    "jupyter-js-widgets": "^2.1.4",
     "moment": "^2.17.1",
     "moment-timezone": "^0.5.13",
     "underscore": "^1.8.3",

diff --git a/beakerx/js/src/CyclingDisplayBox.js b/beakerx/js/src/CyclingDisplayBox.js
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-var widgets = require('jupyter-js-widgets');
+var widgets = require('@jupyter-widgets/controls');
 var _ = require('underscore');
 
 var interval = undefined;

diff --git a/beakerx/js/src/EasyForm.js b/beakerx/js/src/EasyForm.js
@@ -15,7 +15,8 @@
  */
 
 var ENTER_KEY_CODE = 13;
-var widgets = require('jupyter-js-widgets');
+var widgets = require('@jupyter-widgets/base');
+var controls = require('@jupyter-widgets/controls');
 var _ = require('underscore');
 
 var selectMultipleWidget = require('./easyForm/selectMultipleWidget');
@@ -24,7 +25,7 @@ var datePickerWidget = require('./easyForm/datePickerWidget');
 var textWidget = require('./easyForm/textWidget');
 var comboBoxWidget = require('./easyForm/comboBoxWidget');
 
-widgets.TextView.prototype.handleEnterKeyPress = function() {
+controls.TextView.prototype.handleEnterKeyPress = function() {
   if (e.keyCode == 13) {
     this.send({ event: 'submit' });
     e.preventDefault();
@@ -51,7 +52,7 @@ var EasyFormModel = widgets.DOMWidgetModel.extend({
   }, widgets.DOMWidgetModel.serializers)
 });
 
-var EasyFormView = widgets.BoxView.extend({
+var EasyFormView = controls.BoxView.extend({
   render: function() {
     var that = this;
 

diff --git a/beakerx/js/src/GridView.js b/beakerx/js/src/GridView.js
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-var widgets = require('jupyter-js-widgets');
+var widgets = require('@jupyter-widgets/controls');
 var _ = require('underscore');
 
 require('./gridView/grid-view.scss');

diff --git a/beakerx/js/src/Plot.js b/beakerx/js/src/Plot.js
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-var widgets = require('jupyter-js-widgets');
+var widgets = require('@jupyter-widgets/base');
 var _ = require('underscore');
 var d3 = require('d3');
 

diff --git a/beakerx/js/src/TabView.js b/beakerx/js/src/TabView.js
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-var widgets = require('jupyter-js-widgets');
+var widgets = require('@jupyter-widgets/controls');
 var _ = require('underscore');
 
 var TabModel = widgets.TabModel.extend({

diff --git a/beakerx/js/src/TableDisplay.js b/beakerx/js/src/TableDisplay.js
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-var widgets = require('jupyter-js-widgets');
+var widgets = require('@jupyter-widgets/base');
 var _ = require('underscore');
 var $ = require('jquery');
 

diff --git a/beakerx/js/src/easyForm/comboBoxWidget.js b/beakerx/js/src/easyForm/comboBoxWidget.js
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-var widgets = require('jupyter-js-widgets');
+var widgets = require('@jupyter-widgets/controls');
 var _ = require('underscore');
 var comboBox = require('../comboBox/jQueryComboBox');
 

diff --git a/beakerx/js/src/easyForm/datePickerWidget.js b/beakerx/js/src/easyForm/datePickerWidget.js
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-var widgets = require('jupyter-js-widgets');
+var widgets = require('@jupyter-widgets/controls');
 var _ = require('underscore');
 var moment = require('moment');
 

diff --git a/beakerx/js/src/easyForm/selectMultipleSingleWidget.js b/beakerx/js/src/easyForm/selectMultipleSingleWidget.js
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-var widgets = require('jupyter-js-widgets');
+var widgets = require('@jupyter-widgets/controls');
 var _ = require('underscore');
 
 var SelectMultipleSingleModel = widgets.SelectModel.extend({

diff --git a/beakerx/js/src/easyForm/selectMultipleWidget.js b/beakerx/js/src/easyForm/selectMultipleWidget.js
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-var widgets = require('jupyter-js-widgets');
+var widgets = require('@jupyter-widgets/controls');
 var _ = require('underscore');
 
 var SelectMultipleModel = widgets.SelectMultipleModel.extend({

diff --git a/beakerx/js/src/easyForm/textWidget.js b/beakerx/js/src/easyForm/textWidget.js
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-var widgets = require('jupyter-js-widgets');
+var widgets = require('@jupyter-widgets/controls');
 var _ = require('underscore');
 
 var TextModel = widgets.TextModel.extend({

diff --git a/beakerx/js/src/extension.js b/beakerx/js/src/extension.js
@@ -24,7 +24,9 @@ if (window.require) {
         map: {
             "*" : {
                 "beakerx": "nbextensions/beakerx/index",
-                "jupyter-js-widgets": "nbextensions/jupyter-js-widgets/extension"
+                "@jupyter-widgets/controls": "nbextensions/jupyter-js-widgets/extension",
+                "@jupyter-widgets/base": "nbextensions/jupyter-js-widgets/extension",
+                '@jupyter-widgets/output': 'nbextensions/jupyter-js-widgets/extension'
             }
         }
     });

diff --git a/beakerx/js/webpack.config.js b/beakerx/js/webpack.config.js
@@ -107,7 +107,7 @@ module.exports = [
       modules: ['web_modules', 'node_modules'],
       extensions: ['.jsx','.js','.less','.css']
     },
-    externals: ['jupyter-js-widgets'],
+    externals: ['@jupyter-widgets/controls', '@jupyter-widgets/base'],
     watchOptions: {
       ignored: /node_modules/
     },
@@ -142,7 +142,7 @@ module.exports = [
       modules: ['web_modules', 'node_modules'],
       extensions: ['.jsx','.js','.less','.css']
     },
-    externals: ['jupyter-js-widgets', '@jupyter-widgets/base'],
+    externals: ['@jupyter-widgets/controls', '@jupyter-widgets/base', '@jupyter-widgets/base'],
     plugins: plugins
   }
 ];