From a2f8b29996a8e757aca97d545f1d4f303f61f228 Mon Sep 17 00:00:00 2001 From: Scott Draves Date: Mon, 21 Aug 2017 17:55:34 -0400 Subject: [PATCH] Revert "#5481 Update to ipywidgets v7 (#5770)" This reverts commit 404822a4323204b275ef0aeb0285e73636796021. --- beakerx/js/package.json | 2 +- beakerx/js/src/CyclingDisplayBox.js | 2 +- beakerx/js/src/EasyForm.js | 7 +- beakerx/js/src/GridView.js | 2 +- beakerx/js/src/Plot.js | 2 +- beakerx/js/src/TabView.js | 2 +- beakerx/js/src/TableDisplay.js | 2 +- beakerx/js/src/easyForm/comboBoxWidget.js | 2 +- beakerx/js/src/easyForm/datePickerWidget.js | 2 +- .../easyForm/selectMultipleSingleWidget.js | 2 +- .../js/src/easyForm/selectMultipleWidget.js | 2 +- beakerx/js/src/easyForm/textWidget.js | 2 +- beakerx/js/src/extension.js | 4 +- beakerx/js/webpack.config.js | 4 +- beakerx/js/yarn.lock | 922 +++++++----------- beakerx/setup.py | 16 +- .../twosigma/beakerx/kernel/comm/Comm.java | 46 +- .../kernel/handler/CommOpenHandler.java | 2 +- .../com/twosigma/beakerx/widgets/Widget.java | 10 +- .../beakerx/easyform/EasyFormTest.java | 3 +- .../beakerx/jupyter/SearchMessages.java | 10 +- .../object/DisplayOutputContainerTest.java | 2 +- .../beakerx/widgets/DisplayWidgetTest.java | 5 +- .../beakerx/widgets/TestWidgetUtils.java | 31 +- .../widgets/selectioncontainer/TabTest.java | 3 +- .../beakerx/widgets/strings/TextTest.java | 3 +- .../gradle/wrapper/gradle-wrapper.properties | 4 +- .../examples/GroovyExamplesSetupTest.java | 3 +- .../groovy/widgets/InteractiveTest.java | 2 +- 29 files changed, 405 insertions(+), 694 deletions(-) diff --git a/beakerx/js/package.json b/beakerx/js/package.json index c36bff71a4..b5f4939743 100644 --- a/beakerx/js/package.json +++ b/beakerx/js/package.json @@ -31,7 +31,6 @@ "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", @@ -49,6 +48,7 @@ "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 index 3aa61fb06d..4cc4758645 100644 --- a/beakerx/js/src/CyclingDisplayBox.js +++ b/beakerx/js/src/CyclingDisplayBox.js @@ -14,7 +14,7 @@ * limitations under the License. */ -var widgets = require('@jupyter-widgets/controls'); +var widgets = require('jupyter-js-widgets'); var _ = require('underscore'); var interval = undefined; diff --git a/beakerx/js/src/EasyForm.js b/beakerx/js/src/EasyForm.js index 477f2aacc8..5df02d5df5 100644 --- a/beakerx/js/src/EasyForm.js +++ b/beakerx/js/src/EasyForm.js @@ -15,8 +15,7 @@ */ var ENTER_KEY_CODE = 13; -var widgets = require('@jupyter-widgets/base'); -var controls = require('@jupyter-widgets/controls'); +var widgets = require('jupyter-js-widgets'); var _ = require('underscore'); var selectMultipleWidget = require('./easyForm/selectMultipleWidget'); @@ -25,7 +24,7 @@ var datePickerWidget = require('./easyForm/datePickerWidget'); var textWidget = require('./easyForm/textWidget'); var comboBoxWidget = require('./easyForm/comboBoxWidget'); -controls.TextView.prototype.handleEnterKeyPress = function() { +widgets.TextView.prototype.handleEnterKeyPress = function() { if (e.keyCode == 13) { this.send({ event: 'submit' }); e.preventDefault(); @@ -52,7 +51,7 @@ var EasyFormModel = widgets.DOMWidgetModel.extend({ }, widgets.DOMWidgetModel.serializers) }); -var EasyFormView = controls.BoxView.extend({ +var EasyFormView = widgets.BoxView.extend({ render: function() { var that = this; diff --git a/beakerx/js/src/GridView.js b/beakerx/js/src/GridView.js index 717f07739e..72a3b38494 100644 --- a/beakerx/js/src/GridView.js +++ b/beakerx/js/src/GridView.js @@ -14,7 +14,7 @@ * limitations under the License. */ -var widgets = require('@jupyter-widgets/controls'); +var widgets = require('jupyter-js-widgets'); var _ = require('underscore'); require('./gridView/grid-view.scss'); diff --git a/beakerx/js/src/Plot.js b/beakerx/js/src/Plot.js index 4003f05450..27c7b8389c 100644 --- a/beakerx/js/src/Plot.js +++ b/beakerx/js/src/Plot.js @@ -14,7 +14,7 @@ * limitations under the License. */ -var widgets = require('@jupyter-widgets/base'); +var widgets = require('jupyter-js-widgets'); var _ = require('underscore'); var d3 = require('d3'); diff --git a/beakerx/js/src/TabView.js b/beakerx/js/src/TabView.js index 8c3150d948..86b9614da2 100644 --- a/beakerx/js/src/TabView.js +++ b/beakerx/js/src/TabView.js @@ -14,7 +14,7 @@ * limitations under the License. */ -var widgets = require('@jupyter-widgets/controls'); +var widgets = require('jupyter-js-widgets'); var _ = require('underscore'); var TabModel = widgets.TabModel.extend({ diff --git a/beakerx/js/src/TableDisplay.js b/beakerx/js/src/TableDisplay.js index 9202041692..82c37e0589 100644 --- a/beakerx/js/src/TableDisplay.js +++ b/beakerx/js/src/TableDisplay.js @@ -14,7 +14,7 @@ * limitations under the License. */ -var widgets = require('@jupyter-widgets/base'); +var widgets = require('jupyter-js-widgets'); var _ = require('underscore'); var $ = require('jquery'); diff --git a/beakerx/js/src/easyForm/comboBoxWidget.js b/beakerx/js/src/easyForm/comboBoxWidget.js index 393af64dfe..ccc9ef0748 100644 --- 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-widgets/controls'); +var widgets = require('jupyter-js-widgets'); var _ = require('underscore'); var comboBox = require('../comboBox/jQueryComboBox'); diff --git a/beakerx/js/src/easyForm/datePickerWidget.js b/beakerx/js/src/easyForm/datePickerWidget.js index 46fb373f43..e3d6ae3288 100644 --- 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-widgets/controls'); +var widgets = require('jupyter-js-widgets'); var _ = require('underscore'); var moment = require('moment'); diff --git a/beakerx/js/src/easyForm/selectMultipleSingleWidget.js b/beakerx/js/src/easyForm/selectMultipleSingleWidget.js index ac1756fed1..ddcc5e378d 100644 --- 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-widgets/controls'); +var widgets = require('jupyter-js-widgets'); var _ = require('underscore'); var SelectMultipleSingleModel = widgets.SelectModel.extend({ diff --git a/beakerx/js/src/easyForm/selectMultipleWidget.js b/beakerx/js/src/easyForm/selectMultipleWidget.js index 2de9b9a149..c3872bef37 100644 --- 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-widgets/controls'); +var widgets = require('jupyter-js-widgets'); var _ = require('underscore'); var SelectMultipleModel = widgets.SelectMultipleModel.extend({ diff --git a/beakerx/js/src/easyForm/textWidget.js b/beakerx/js/src/easyForm/textWidget.js index dd037ef6cb..9a51304450 100644 --- 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-widgets/controls'); +var widgets = require('jupyter-js-widgets'); var _ = require('underscore'); var TextModel = widgets.TextModel.extend({ diff --git a/beakerx/js/src/extension.js b/beakerx/js/src/extension.js index 605e217fda..a1c4e96d98 100644 --- a/beakerx/js/src/extension.js +++ b/beakerx/js/src/extension.js @@ -24,9 +24,7 @@ if (window.require) { map: { "*" : { "beakerx": "nbextensions/beakerx/index", - "@jupyter-widgets/controls": "nbextensions/jupyter-js-widgets/extension", - "@jupyter-widgets/base": "nbextensions/jupyter-js-widgets/extension", - '@jupyter-widgets/output': 'nbextensions/jupyter-js-widgets/extension' + "jupyter-js-widgets": "nbextensions/jupyter-js-widgets/extension" } } }); diff --git a/beakerx/js/webpack.config.js b/beakerx/js/webpack.config.js index bae079a827..24209c2d32 100644 --- 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-widgets/controls', '@jupyter-widgets/base'], + externals: ['jupyter-js-widgets'], watchOptions: { ignored: /node_modules/ }, @@ -142,7 +142,7 @@ module.exports = [ modules: ['web_modules', 'node_modules'], extensions: ['.jsx','.js','.less','.css'] }, - externals: ['@jupyter-widgets/controls', '@jupyter-widgets/base', '@jupyter-widgets/base'], + externals: ['jupyter-js-widgets', '@jupyter-widgets/base'], plugins: plugins } ]; diff --git a/beakerx/js/yarn.lock b/beakerx/js/yarn.lock index b91f85708a..92441d09f9 100644 --- a/beakerx/js/yarn.lock +++ b/beakerx/js/yarn.lock @@ -2,186 +2,39 @@ # yarn lockfile v1 -"@jupyter-widgets/base@^0.6.9": - version "0.6.9" - resolved "https://registry.yarnpkg.com/@jupyter-widgets/base/-/base-0.6.9.tgz#640ffb504f48d57ed7b865771d611e67f67dccb6" - dependencies: - "@jupyter-widgets/schema" "^0.3.0-beta.7" - "@jupyterlab/services" "^0.48.0" - "@phosphor/algorithm" "^1.1.0" - "@phosphor/domutils" "^1.1.0" - "@phosphor/messaging" "^1.2.0" - "@phosphor/widgets" "^1.2.0" - "@types/backbone" "^1.3.33" - "@types/lodash" "^4.14.66" - "@types/semver" "^5.3.30" - backbone "1.2.3" - jquery "^3.1.1" - semver "^5.1.0" - underscore "^1.8.3" - -"@jupyter-widgets/controls@^0.6.8": - version "0.6.15" - resolved "https://registry.yarnpkg.com/@jupyter-widgets/controls/-/controls-0.6.15.tgz#8dd141cf31f6c8a5659d8fdfe8d51005f9459c30" - dependencies: - "@jupyter-widgets/base" "^0.6.9" - "@jupyter-widgets/schema" "^0.3.0-beta.7" - "@jupyterlab/services" "^0.48.0" - "@phosphor/algorithm" "^1.1.0" - "@phosphor/domutils" "^1.1.0" - "@phosphor/messaging" "^1.2.0" - "@phosphor/widgets" "^1.2.0" - "@types/backbone" "^1.3.33" - "@types/semver" "^5.3.30" - backbone "1.2.3" - d3-format "^0.5.1" - font-awesome "^4.7.0" - jquery "^3.1.1" - jquery-ui "^1.12.1" - semver "^5.1.0" - underscore "^1.8.3" - -"@jupyter-widgets/schema@^0.3.0-beta.7": - version "0.3.0-beta.7" - resolved "https://registry.yarnpkg.com/@jupyter-widgets/schema/-/schema-0.3.0-beta.7.tgz#9da5fee1e2ad5cda666ab1f93b4ef4653cf0e303" - -"@jupyterlab/coreutils@^0.9.0": - version "0.9.0" - resolved "https://registry.yarnpkg.com/@jupyterlab/coreutils/-/coreutils-0.9.0.tgz#cf24a9a15ce433602bc00a80884314a7a91b0d7a" +"@jupyterlab/services@^0.35.0": + version "0.35.1" + resolved "https://registry.yarnpkg.com/@jupyterlab/services/-/services-0.35.1.tgz#9bc0e940b381231cfd3033d8adbe90ca7cafdbf1" dependencies: - "@phosphor/algorithm" "^1.1.1" - "@phosphor/coreutils" "^1.2.0" - "@phosphor/disposable" "^1.1.1" - "@phosphor/messaging" "^1.2.1" - "@phosphor/signaling" "^1.2.1" - ajv "^5.1.5" + "@types/minimist" "^1.1.29" minimist "^1.2.0" - moment "^2.17.1" path-posix "^1.0.0" - url-parse "^1.1.8" - -"@jupyterlab/services@^0.48.0": - version "0.48.0" - resolved "https://registry.yarnpkg.com/@jupyterlab/services/-/services-0.48.0.tgz#aa79074ec4e867a33f4163feef4897d015d85399" - dependencies: - "@jupyterlab/coreutils" "^0.9.0" - "@phosphor/algorithm" "^1.1.1" - "@phosphor/coreutils" "^1.2.0" - "@phosphor/disposable" "^1.1.1" - "@phosphor/signaling" "^1.2.1" - "@types/text-encoding" "0.0.30" - -"@phosphor/algorithm@^1.1.0", "@phosphor/algorithm@^1.1.1", "@phosphor/algorithm@^1.1.2": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@phosphor/algorithm/-/algorithm-1.1.2.tgz#fd1de9104c9a7f34e92864586ddf2e7f2e7779e8" - -"@phosphor/collections@^1.1.2": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@phosphor/collections/-/collections-1.1.2.tgz#c4c0b8b91129905fb36a9f243f2dbbde462dab8d" - dependencies: - "@phosphor/algorithm" "^1.1.2" - -"@phosphor/commands@^1.4.0": - version "1.4.0" - resolved "https://registry.yarnpkg.com/@phosphor/commands/-/commands-1.4.0.tgz#7e236a4c015daf37a9586fde29188c3dac20162f" - dependencies: - "@phosphor/algorithm" "^1.1.2" - "@phosphor/coreutils" "^1.3.0" - "@phosphor/disposable" "^1.1.2" - "@phosphor/domutils" "^1.1.2" - "@phosphor/keyboard" "^1.1.2" - "@phosphor/signaling" "^1.2.2" - -"@phosphor/coreutils@^1.2.0", "@phosphor/coreutils@^1.3.0": - version "1.3.0" - resolved "https://registry.yarnpkg.com/@phosphor/coreutils/-/coreutils-1.3.0.tgz#63292d381c012c5ab0d0196e83ced829b7e04a42" - -"@phosphor/disposable@^1.1.1", "@phosphor/disposable@^1.1.2": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@phosphor/disposable/-/disposable-1.1.2.tgz#a192dd6a2e6c69d5d09d39ecf334dab93778060e" - dependencies: - "@phosphor/algorithm" "^1.1.2" - -"@phosphor/domutils@^1.1.0", "@phosphor/domutils@^1.1.2": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@phosphor/domutils/-/domutils-1.1.2.tgz#e2efeb052f398c42b93b89e9bab26af15cc00514" - -"@phosphor/dragdrop@^1.3.0": - version "1.3.0" - resolved "https://registry.yarnpkg.com/@phosphor/dragdrop/-/dragdrop-1.3.0.tgz#7ce6ad39d6ca216d62a56f78104d02a77ae67307" - dependencies: - "@phosphor/coreutils" "^1.3.0" - "@phosphor/disposable" "^1.1.2" - -"@phosphor/keyboard@^1.1.2": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@phosphor/keyboard/-/keyboard-1.1.2.tgz#3e32234451764240a98e148034d5a8797422dd1f" - -"@phosphor/messaging@^1.2.0", "@phosphor/messaging@^1.2.1", "@phosphor/messaging@^1.2.2": - version "1.2.2" - resolved "https://registry.yarnpkg.com/@phosphor/messaging/-/messaging-1.2.2.tgz#7d896ddd3797b94a347708ded13da5783db75c14" - dependencies: - "@phosphor/algorithm" "^1.1.2" - "@phosphor/collections" "^1.1.2" - -"@phosphor/properties@^1.1.2": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@phosphor/properties/-/properties-1.1.2.tgz#78cc77eff452839da02255de48e814946cc09a28" - -"@phosphor/signaling@^1.2.1", "@phosphor/signaling@^1.2.2": - version "1.2.2" - resolved "https://registry.yarnpkg.com/@phosphor/signaling/-/signaling-1.2.2.tgz#3fcf97ca88e38bfb357fe8fe6bf7513347a514a9" - dependencies: - "@phosphor/algorithm" "^1.1.2" - -"@phosphor/virtualdom@^1.1.2": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@phosphor/virtualdom/-/virtualdom-1.1.2.tgz#ce55c86eef31e5d0e26b1dc96ea32bd684458f41" - dependencies: - "@phosphor/algorithm" "^1.1.2" - -"@phosphor/widgets@^1.2.0": - version "1.5.0" - resolved "https://registry.yarnpkg.com/@phosphor/widgets/-/widgets-1.5.0.tgz#5f998e86f5fde78d8aa44d7dc147686ca661681e" - dependencies: - "@phosphor/algorithm" "^1.1.2" - "@phosphor/commands" "^1.4.0" - "@phosphor/coreutils" "^1.3.0" - "@phosphor/disposable" "^1.1.2" - "@phosphor/domutils" "^1.1.2" - "@phosphor/dragdrop" "^1.3.0" - "@phosphor/keyboard" "^1.1.2" - "@phosphor/messaging" "^1.2.2" - "@phosphor/properties" "^1.1.2" - "@phosphor/signaling" "^1.2.2" - "@phosphor/virtualdom" "^1.1.2" + phosphor "^0.7.0" + url "^0.11.0" + url-join "^1.1.0" "@types/backbone@^1.3.33": - version "1.3.34" - resolved "https://registry.yarnpkg.com/@types/backbone/-/backbone-1.3.34.tgz#0d614dab700e58daf9c3c37075299fc66803dbc2" + version "1.3.33" + resolved "https://registry.yarnpkg.com/@types/backbone/-/backbone-1.3.33.tgz#33ab2e71619dd1d5adc477b689292fee7a34d4a3" dependencies: "@types/jquery" "*" "@types/underscore" "*" "@types/jquery@*": - version "3.2.11" - resolved "https://registry.yarnpkg.com/@types/jquery/-/jquery-3.2.11.tgz#9119f91bb103b16ae8c4375b019a9b341b409f50" + version "2.0.45" + resolved "https://registry.yarnpkg.com/@types/jquery/-/jquery-2.0.45.tgz#cb99133aac1d997a820d6cf7258c91291c0a2adf" -"@types/lodash@^4.14.66": - version "4.14.72" - resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.72.tgz#f090cf6eb1fee1647a0efa1ebe18b0b78ed551c6" +"@types/minimist@^1.1.29": + version "1.2.0" + resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.0.tgz#69a23a3ad29caf0097f06eda59b361ee2f0639f6" "@types/semver@^5.3.30": - version "5.3.33" - resolved "https://registry.yarnpkg.com/@types/semver/-/semver-5.3.33.tgz#58ebb6c8c48e161e24f8901915e7184900d341f7" - -"@types/text-encoding@0.0.30": - version "0.0.30" - resolved "https://registry.yarnpkg.com/@types/text-encoding/-/text-encoding-0.0.30.tgz#2ad7bc19287094c9d2754d238e0994dd2995781f" + version "5.3.31" + resolved "https://registry.yarnpkg.com/@types/semver/-/semver-5.3.31.tgz#b999d7d935f43f5207b01b00d3de20852f4ca75f" "@types/underscore@*": - version "1.8.1" - resolved "https://registry.yarnpkg.com/@types/underscore/-/underscore-1.8.1.tgz#bf5d680f24277284d4e42fed86bd86e5a59a44a4" + version "1.8.0" + resolved "https://registry.yarnpkg.com/@types/underscore/-/underscore-1.8.0.tgz#7a22ef584d6fe59af2e407bae079e2b7f8a5102f" abbrev@1: version "1.1.0" @@ -198,27 +51,25 @@ acorn@^4.0.3: resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.13.tgz#105495ae5361d697bd195c825192e1ad7f253787" acorn@^5.0.0: - version "5.1.1" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.1.1.tgz#53fe161111f912ab999ee887a90a0bc52822fd75" + version "5.0.3" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.0.3.tgz#c460df08491463f028ccb82eab3730bf01087b3d" ajv-keywords@^1.1.1: version "1.5.1" resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-1.5.1.tgz#314dd0a4b3368fad3dfcdc54ede6171b886daf3c" -ajv@^4.7.0, ajv@^4.9.1: +ajv@^4.7.0, ajv@^4.9.0, ajv@^4.9.1: version "4.11.8" resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.8.tgz#82ffb02b29e662ae53bdc20af15947706739c536" dependencies: co "^4.6.0" json-stable-stringify "^1.0.1" -ajv@^5.0.0, ajv@^5.1.5: - version "5.2.2" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.2.2.tgz#47c68d69e86f5d953103b0074a9430dc63da5e39" +ajv@^5.0.0: + version "5.1.5" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.1.5.tgz#8734931b601f00d4feef7c65738d77d1b65d1f68" dependencies: co "^4.6.0" - fast-deep-equal "^1.0.0" - json-schema-traverse "^0.3.0" json-stable-stringify "^1.0.1" align-text@^0.1.1, align-text@^0.1.3: @@ -245,22 +96,16 @@ ansi-styles@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" -ansi-styles@^3.1.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.0.tgz#c159b8d5be0f9e5a6f346dab94f16ce022161b88" - dependencies: - color-convert "^1.9.0" - anymatch@^1.3.0: - version "1.3.2" - resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-1.3.2.tgz#553dcb8f91e3c889845dfdba34c77721b90b9d7a" + version "1.3.0" + resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-1.3.0.tgz#a3e52fa39168c825ff57b0248126ce5a8ff95507" dependencies: + arrify "^1.0.0" micromatch "^2.1.5" - normalize-path "^2.0.0" aproba@^1.0.3: - version "1.1.2" - resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.1.2.tgz#45c6629094de4e96f693ef7eab74ae079c240fc1" + version "1.1.1" + resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.1.1.tgz#95d3600f07710aa0e9298c726ad5ecf2eacbabab" are-we-there-yet@~1.1.2: version "1.1.4" @@ -282,8 +127,8 @@ arr-diff@^2.0.0: arr-flatten "^1.0.1" arr-flatten@^1.0.1: - version "1.1.0" - resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1" + version "1.0.3" + resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.0.3.tgz#a274ed85ac08849b6bd7847c4580745dc51adfb1" array-find-index@^1.0.1: version "1.0.2" @@ -293,6 +138,10 @@ array-unique@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53" +arrify@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d" + asn1.js@^4.0.0: version "4.9.1" resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-4.9.1.tgz#48ba240b45a9280e94748990ba597d216617fd40" @@ -332,8 +181,8 @@ async-foreach@^0.1.3: resolved "https://registry.yarnpkg.com/async-foreach/-/async-foreach-0.1.3.tgz#36121f845c0578172de419a97dbeb1d16ec34542" async@^2.1.2, async@^2.1.5: - version "2.5.0" - resolved "https://registry.yarnpkg.com/async/-/async-2.5.0.tgz#843190fd6b7357a0b9e1c956edddd5ec8462b54d" + version "2.4.0" + resolved "https://registry.yarnpkg.com/async/-/async-2.4.0.tgz#4990200f18ea5b837c2cc4f8c031a6985c385611" dependencies: lodash "^4.14.0" @@ -368,23 +217,19 @@ babel-code-frame@^6.11.0: esutils "^2.0.2" js-tokens "^3.0.0" -backbone@1.2.3: - version "1.2.3" - resolved "https://registry.yarnpkg.com/backbone/-/backbone-1.2.3.tgz#c22cfd07fc86ebbeae61d18929ed115e999d65b9" +backbone@1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/backbone/-/backbone-1.2.0.tgz#aba52f2a3caae117d871fa074eadfc9ed3193ee7" dependencies: underscore ">=1.7.0" -balanced-match@^0.4.2: +balanced-match@^0.4.1, balanced-match@^0.4.2: version "0.4.2" resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-0.4.2.tgz#cb3f3e3c732dc0f01ee70b403f302e61d7709838" -balanced-match@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" - base64-js@^1.0.2: - version "1.2.1" - resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.2.1.tgz#a91947da1f4a516ea38e5b4ec0ec3773675e0886" + version "1.2.0" + resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.2.0.tgz#a39992d723584811982be5e290bb6a53d86700f1" base64-loader@^1.0.0: version "1.0.0" @@ -401,8 +246,8 @@ big.js@^3.1.3: resolved "https://registry.yarnpkg.com/big.js/-/big.js-3.1.3.tgz#4cada2193652eb3ca9ec8e55c9015669c9806978" binary-extensions@^1.0.0: - version "1.9.0" - resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.9.0.tgz#66506c16ce6f4d6928a5b3cd6a33ca41e941e37b" + version "1.8.0" + resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.8.0.tgz#48ec8d16df4377eae5fa5884682480af4d95c774" block-stream@*: version "0.0.9" @@ -411,8 +256,8 @@ block-stream@*: inherits "~2.0.0" bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0: - version "4.11.8" - resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.8.tgz#2cde09eb5ee341f484746bb0309b3253b1b1442f" + version "4.11.6" + resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.6.tgz#53344adb14617a13f6e8dd2ce28905d1c0ba3215" boom@2.x.x: version "2.10.1" @@ -421,10 +266,10 @@ boom@2.x.x: hoek "2.x.x" brace-expansion@^1.1.7: - version "1.1.8" - resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.8.tgz#c07b211c7c952ec1f8efd51a77ef0d1d3990a292" + version "1.1.7" + resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.7.tgz#3effc3c50e000531fb720eaff80f0ae8ef23cf59" dependencies: - balanced-match "^1.0.0" + balanced-match "^0.4.1" concat-map "0.0.1" braces@^1.8.2: @@ -497,6 +342,10 @@ browserslist@^1.3.6, browserslist@^1.5.2, browserslist@^1.7.6: caniuse-db "^1.0.30000639" electron-to-chromium "^1.2.7" +buffer-shims@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/buffer-shims/-/buffer-shims-1.0.0.tgz#9978ce317388c649ad8793028c3477ef044a8b51" + buffer-xor@^1.0.2: version "1.0.3" resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9" @@ -553,8 +402,8 @@ caniuse-api@^1.5.2: lodash.uniq "^4.5.0" caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639: - version "1.0.30000713" - resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000713.tgz#ea01761840b5f148faf94ec5f34d0aa1d321966f" + version "1.0.30000670" + resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000670.tgz#90d33b79e3090e25829c311113c56d6b1788bf43" caseless@~0.12.0: version "0.12.0" @@ -577,15 +426,7 @@ chalk@^1.1.0, chalk@^1.1.1, chalk@^1.1.3: strip-ansi "^3.0.0" supports-color "^2.0.0" -chalk@^2.0.1: - version "2.1.0" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.1.0.tgz#ac5becf14fa21b99c6c92ca7a7d7cfd5b17e743e" - dependencies: - ansi-styles "^3.1.0" - escape-string-regexp "^1.0.5" - supports-color "^4.0.0" - -chokidar@^1.7.0: +chokidar@^1.4.3: version "1.7.0" resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468" dependencies: @@ -601,21 +442,20 @@ chokidar@^1.7.0: fsevents "^1.0.0" cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3: - version "1.0.4" - resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz#8760e4ecc272f4c363532f926d874aae2c1397de" + version "1.0.3" + resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.3.tgz#eeabf194419ce900da3018c207d212f2a6df0a07" dependencies: inherits "^2.0.1" - safe-buffer "^5.0.1" clap@^1.0.9: - version "1.2.0" - resolved "https://registry.yarnpkg.com/clap/-/clap-1.2.0.tgz#59c90fe3e137104746ff19469a27a634ff68c857" + version "1.1.3" + resolved "https://registry.yarnpkg.com/clap/-/clap-1.1.3.tgz#b3bd36e93dd4cbfb395a3c26896352445265c05b" dependencies: chalk "^1.1.3" clean-css@4.1.x: - version "4.1.7" - resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.1.7.tgz#b9aea4f85679889cf3eae8b40349ec4ebdfdd032" + version "4.1.3" + resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.1.3.tgz#07cfe8980edb20d455ddc23aadcf1e04c6e509ce" dependencies: source-map "0.5.x" @@ -635,13 +475,14 @@ cliui@^3.2.0: strip-ansi "^3.0.1" wrap-ansi "^2.0.0" -clone-deep@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-0.3.0.tgz#348c61ae9cdbe0edfe053d91ff4cc521d790ede8" +clone-deep@^0.2.4: + version "0.2.4" + resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-0.2.4.tgz#4e73dd09e9fb971cc38670c5dced9c1896481cc6" dependencies: - for-own "^1.0.0" + for-own "^0.1.3" is-plain-object "^2.0.1" - kind-of "^3.2.2" + kind-of "^3.0.2" + lazy-cache "^1.0.3" shallow-clone "^0.1.2" clone@^1.0.2: @@ -653,8 +494,8 @@ co@^4.6.0: resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184" coa@~1.0.1: - version "1.0.4" - resolved "https://registry.yarnpkg.com/coa/-/coa-1.0.4.tgz#a9ef153660d6a86a8bdec0289a5c684d217432fd" + version "1.0.1" + resolved "https://registry.yarnpkg.com/coa/-/coa-1.0.1.tgz#7f959346cfc8719e3f7233cd6852854a7c67d8a3" dependencies: q "^1.1.2" @@ -662,15 +503,15 @@ code-point-at@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" -color-convert@^1.3.0, color-convert@^1.9.0: +color-convert@^1.3.0: version "1.9.0" resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.0.tgz#1accf97dd739b983bf994d56fec8f95853641b7a" dependencies: color-name "^1.1.1" color-name@^1.0.0, color-name@^1.1.1: - version "1.1.3" - resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" + version "1.1.2" + resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.2.tgz#5c8ab72b64bd2215d617ae9559ebb148475cf98d" color-string@^0.3.0: version "0.3.0" @@ -704,9 +545,11 @@ combined-stream@^1.0.5, combined-stream@~1.0.5: dependencies: delayed-stream "~1.0.0" -commander@2, commander@2.11.x, commander@~2.11.0: - version "2.11.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-2.11.0.tgz#157152fd1e7a6c8d98a5b715cf376df928004563" +commander@2, commander@2.9.x, commander@~2.9.0: + version "2.9.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz#9c99094176e12240cb22d6c5146098400fe0f7d4" + dependencies: + graceful-readlink ">= 1.0.0" concat-map@0.0.1: version "0.0.1" @@ -726,7 +569,7 @@ constants-browserify@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75" -core-util-is@1.0.2, core-util-is@~1.0.0: +core-util-is@~1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" @@ -771,8 +614,8 @@ cryptiles@2.x.x: boom "2.x.x" crypto-browserify@^3.11.0: - version "3.11.1" - resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.11.1.tgz#948945efc6757a400d6e5e5af47194d10064279f" + version "3.11.0" + resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.11.0.tgz#3652a0906ab9b2a7e0c3ce66a408e957a2485522" dependencies: browserify-cipher "^1.0.0" browserify-sign "^4.0.0" @@ -808,6 +651,14 @@ css-loader@^0.28.4: postcss-value-parser "^3.3.0" source-list-map "^0.1.7" +css-selector-tokenizer@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/css-selector-tokenizer/-/css-selector-tokenizer-0.6.0.tgz#6445f582c7930d241dcc5007a43d6fcb8f073152" + dependencies: + cssesc "^0.1.0" + fastparse "^1.1.1" + regexpu-core "^1.0.0" + css-selector-tokenizer@^0.7.0: version "0.7.0" resolved "https://registry.yarnpkg.com/css-selector-tokenizer/-/css-selector-tokenizer-0.7.0.tgz#e6988474ae8c953477bf5e7efecfceccd9cf4c86" @@ -874,9 +725,9 @@ d3-array@1, d3-array@1.2.0, d3-array@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/d3-array/-/d3-array-1.2.0.tgz#147d269720e174c4057a7f42be8b0f3f2ba53108" -d3-axis@1.0.8: - version "1.0.8" - resolved "https://registry.yarnpkg.com/d3-axis/-/d3-axis-1.0.8.tgz#31a705a0b535e65759de14173a31933137f18efa" +d3-axis@1.0.7: + version "1.0.7" + resolved "https://registry.yarnpkg.com/d3-axis/-/d3-axis-1.0.7.tgz#048433d307061f62d1d248e2930c01d7b6738cd8" d3-brush@1.0.4: version "1.0.4" @@ -895,9 +746,9 @@ d3-chord@1.0.4: d3-array "1" d3-path "1" -d3-collection@1, d3-collection@1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/d3-collection/-/d3-collection-1.0.4.tgz#342dfd12837c90974f33f1cc0a785aea570dcdc2" +d3-collection@1, d3-collection@1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/d3-collection/-/d3-collection-1.0.3.tgz#00bdea94fbc1628d435abbae2f4dc2164e37dd34" d3-color@1, d3-color@1.0.3: version "1.0.3" @@ -907,9 +758,9 @@ d3-dispatch@1, d3-dispatch@1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/d3-dispatch/-/d3-dispatch-1.0.3.tgz#46e1491eaa9b58c358fce5be4e8bed626e7871f8" -d3-drag@1, d3-drag@1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/d3-drag/-/d3-drag-1.1.1.tgz#b5155304433b18ba38726b2184d0098e820dc64b" +d3-drag@1, d3-drag@1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/d3-drag/-/d3-drag-1.1.0.tgz#4a49b4d77a42e9e3d5a0ef3b492b14aaa2e5a733" dependencies: d3-dispatch "1" d3-selection "1" @@ -949,9 +800,9 @@ d3-geo@1.6.4: dependencies: d3-array "1" -d3-hierarchy@1.1.5: - version "1.1.5" - resolved "https://registry.yarnpkg.com/d3-hierarchy/-/d3-hierarchy-1.1.5.tgz#a1c845c42f84a206bcf1c01c01098ea4ddaa7a26" +d3-hierarchy@1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/d3-hierarchy/-/d3-hierarchy-1.1.4.tgz#96c3942f3f21cf997a11b4edf00dde2a77b4c6d0" d3-interpolate@1, d3-interpolate@1.1.5: version "1.1.5" @@ -1004,9 +855,9 @@ d3-selection@1, d3-selection@1.1.0, d3-selection@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/d3-selection/-/d3-selection-1.1.0.tgz#1998684896488f839ca0372123da34f1d318809c" -d3-shape@1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/d3-shape/-/d3-shape-1.2.0.tgz#45d01538f064bafd05ea3d6d2cb748fd8c41f777" +d3-shape@1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/d3-shape/-/d3-shape-1.1.1.tgz#50a1037e48a79f5b8fd9d58cde52799aeb1f7723" dependencies: d3-path "1" @@ -1016,13 +867,13 @@ d3-time-format@2, d3-time-format@2.0.5: dependencies: d3-time "1" -d3-time@1, d3-time@1.0.7: - version "1.0.7" - resolved "https://registry.yarnpkg.com/d3-time/-/d3-time-1.0.7.tgz#94caf6edbb7879bb809d0d1f7572bc48482f7270" - -d3-timer@1, d3-timer@1.0.6: +d3-time@1, d3-time@1.0.6: version "1.0.6" - resolved "https://registry.yarnpkg.com/d3-timer/-/d3-timer-1.0.6.tgz#4044bf15d7025c06ce7d1149f73cd07b54dbd784" + resolved "https://registry.yarnpkg.com/d3-time/-/d3-time-1.0.6.tgz#a55b13d7d15d3a160ae91708232e0835f1d5e945" + +d3-timer@1, d3-timer@1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/d3-timer/-/d3-timer-1.0.5.tgz#b266d476c71b0d269e7ac5f352b410a3b6fe6ef0" d3-transition@1, d3-transition@1.1.0: version "1.1.0" @@ -1039,9 +890,9 @@ d3-voronoi@1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/d3-voronoi/-/d3-voronoi-1.1.2.tgz#1687667e8f13a2d158c80c1480c5a29cb0d8973c" -d3-zoom@1.5.0: - version "1.5.0" - resolved "https://registry.yarnpkg.com/d3-zoom/-/d3-zoom-1.5.0.tgz#8417de9a077f98f9ce83b1998efb8ee12b4db26e" +d3-zoom@1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/d3-zoom/-/d3-zoom-1.2.0.tgz#b3231f4f9386241475defe1c557bfd3fde1065fb" dependencies: d3-dispatch "1" d3-drag "1" @@ -1050,23 +901,23 @@ d3-zoom@1.5.0: d3-transition "1" d3@^4.9.1: - version "4.10.0" - resolved "https://registry.yarnpkg.com/d3/-/d3-4.10.0.tgz#0bcca3a3b614e2fd45b1b5bd0b9164d57352a862" + version "4.9.1" + resolved "https://registry.yarnpkg.com/d3/-/d3-4.9.1.tgz#f860be9252261a3c14eea64b1d2590d14f4db838" dependencies: d3-array "1.2.0" - d3-axis "1.0.8" + d3-axis "1.0.7" d3-brush "1.0.4" d3-chord "1.0.4" - d3-collection "1.0.4" + d3-collection "1.0.3" d3-color "1.0.3" d3-dispatch "1.0.3" - d3-drag "1.1.1" + d3-drag "1.1.0" d3-dsv "1.0.5" d3-ease "1.0.3" d3-force "1.0.6" d3-format "1.2.0" d3-geo "1.6.4" - d3-hierarchy "1.1.5" + d3-hierarchy "1.1.4" d3-interpolate "1.1.5" d3-path "1.0.5" d3-polygon "1.0.3" @@ -1076,13 +927,13 @@ d3@^4.9.1: d3-request "1.0.5" d3-scale "1.0.6" d3-selection "1.1.0" - d3-shape "1.2.0" - d3-time "1.0.7" + d3-shape "1.1.1" + d3-time "1.0.6" d3-time-format "2.0.5" - d3-timer "1.0.6" + d3-timer "1.0.5" d3-transition "1.1.0" d3-voronoi "1.1.2" - d3-zoom "1.5.0" + d3-zoom "1.2.0" dashdash@^1.12.0: version "1.14.1" @@ -1156,13 +1007,7 @@ datatables.net-select@^1.2.2: datatables.net ">=1.10.9" jquery ">=1.7" -datatables.net@>=1.10.9: - version "2.1.1" - resolved "https://registry.yarnpkg.com/datatables.net/-/datatables.net-2.1.1.tgz#6f1103ef08054642aecf85e7e25efd592822ee78" - dependencies: - jquery ">=1.7" - -datatables.net@^1.10.15: +datatables.net@>=1.10.9, datatables.net@^1.10.15: version "1.10.15" resolved "https://registry.yarnpkg.com/datatables.net/-/datatables.net-1.10.15.tgz#c789077bbfe385e75ff5a233fa5f23251a72df68" dependencies: @@ -1173,8 +1018,8 @@ date-now@^0.1.4: resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b" debug@^2.2.0: - version "2.6.8" - resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.8.tgz#e731531ca2ede27d188222427da17821d68ff4fc" + version "2.6.7" + resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.7.tgz#92bad1f6d05bbb6bba22cca88bcd0ec894c2861e" dependencies: ms "2.0.0" @@ -1213,10 +1058,6 @@ diffie-hellman@^5.0.0: miller-rabin "^4.0.0" randombytes "^2.0.0" -dom-walk@^0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/dom-walk/-/dom-walk-0.1.1.tgz#672226dc74c8f799ad35307df936aba11acd6018" - domain-browser@^1.1.1: version "1.1.7" resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.1.7.tgz#867aa4b093faa05f1de08c06f4d7b21fdf8698bc" @@ -1228,8 +1069,8 @@ ecc-jsbn@~0.1.1: jsbn "~0.1.0" electron-to-chromium@^1.2.7: - version "1.3.18" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.18.tgz#3dcc99da3e6b665f6abbc71c28ad51a2cd731a9c" + version "1.3.11" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.11.tgz#744761df1d67b492b322ce9aa0aba5393260eb61" elliptic@^6.0.0: version "6.4.0" @@ -1247,14 +1088,14 @@ emojis-list@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389" -enhanced-resolve@^3.3.0: - version "3.4.1" - resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-3.4.1.tgz#0421e339fd71419b3da13d129b3979040230476e" +enhanced-resolve@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-3.1.0.tgz#9f4b626f577245edcf4b2ad83d86e17f4f421dec" dependencies: graceful-fs "^4.1.2" memory-fs "^0.4.0" object-assign "^4.0.1" - tapable "^0.2.7" + tapable "^0.2.5" errno@^0.1.3: version "0.1.4" @@ -1275,7 +1116,7 @@ es6-templates@^0.2.2: recast "~0.11.12" through "~2.3.6" -escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5: +escape-string-regexp@^1.0.2: version "1.0.5" resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" @@ -1323,13 +1164,9 @@ extglob@^0.3.1: dependencies: is-extglob "^1.0.0" -extsprintf@1.3.0, extsprintf@^1.2.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05" - -fast-deep-equal@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz#96256a3bc975595eb36d82e9929d060d893439ff" +extsprintf@1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.0.2.tgz#e1080e0658e300b06294990cc70e1502235fd550" fastparse@^1.1.1: version "1.1.1" @@ -1370,7 +1207,7 @@ flatten@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.2.tgz#dae46a9d78fbe25292258cc1e780a41d95c03782" -font-awesome@^4.7.0: +font-awesome@^4.5.0: version "4.7.0" resolved "https://registry.yarnpkg.com/font-awesome/-/font-awesome-4.7.0.tgz#8fa8cf0411a1a31afd07b06d2902bb9fc815a133" @@ -1382,18 +1219,12 @@ for-in@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80" -for-own@^0.1.4: +for-own@^0.1.3, for-own@^0.1.4: version "0.1.5" resolved "https://registry.yarnpkg.com/for-own/-/for-own-0.1.5.tgz#5265c681a4f294dabbf17c9509b6763aa84510ce" dependencies: for-in "^1.0.1" -for-own@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/for-own/-/for-own-1.0.0.tgz#c63332f415cedc4b04dbfe70cf836494c53cb44b" - dependencies: - for-in "^1.0.1" - forever-agent@~0.6.1: version "0.6.1" resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" @@ -1411,11 +1242,11 @@ fs.realpath@^1.0.0: resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" fsevents@^1.0.0: - version "1.1.2" - resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.1.2.tgz#3282b713fb3ad80ede0e9fcf4611b5aa6fc033f4" + version "1.1.1" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.1.1.tgz#f19fd28f43eeaf761680e519a203c4d0b3d31aff" dependencies: nan "^2.3.0" - node-pre-gyp "^0.6.36" + node-pre-gyp "^0.6.29" fstream-ignore@^1.0.5: version "1.0.5" @@ -1485,35 +1316,32 @@ glob-parent@^2.0.0: is-glob "^2.0.0" glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@~7.1.1: - version "7.1.2" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15" + version "7.1.1" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.1.tgz#805211df04faaf1c63a3600306cdf5ade50b2ec8" dependencies: fs.realpath "^1.0.0" inflight "^1.0.4" inherits "2" - minimatch "^3.0.4" + minimatch "^3.0.2" once "^1.3.0" path-is-absolute "^1.0.0" -global@^4.3.2: - version "4.3.2" - resolved "https://registry.yarnpkg.com/global/-/global-4.3.2.tgz#e76989268a6c74c38908b1305b10fc0e394e9d0f" - dependencies: - min-document "^2.19.0" - process "~0.5.1" - globule@^1.0.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/globule/-/globule-1.2.0.tgz#1dc49c6822dd9e8a2fa00ba2a295006e8664bd09" + version "1.1.0" + resolved "https://registry.yarnpkg.com/globule/-/globule-1.1.0.tgz#c49352e4dc183d85893ee825385eb994bb6df45f" dependencies: glob "~7.1.1" - lodash "~4.17.4" + lodash "~4.16.4" minimatch "~3.0.2" graceful-fs@^4.1.2: version "4.1.11" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658" +"graceful-readlink@>= 1.0.0": + version "1.0.1" + resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725" + har-schema@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-1.0.5.tgz#d263135f43307c02c602afc8fe95970c0151369e" @@ -1535,10 +1363,6 @@ has-flag@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-1.0.0.tgz#9d9e793165ce017a00f00418c43f942a7b1d11fa" -has-flag@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-2.0.0.tgz#e8207af1cc7b30d446cc70b734b5e8be18f88d51" - has-unicode@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" @@ -1556,11 +1380,10 @@ hash-base@^2.0.0: inherits "^2.0.1" hash.js@^1.0.0, hash.js@^1.0.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.3.tgz#340dedbe6290187151c1ea1d777a3448935df846" + version "1.0.3" + resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.0.3.tgz#1332ff00156c0a0ffdd8236013d07b77a0451573" dependencies: - inherits "^2.0.3" - minimalistic-assert "^1.0.0" + inherits "^2.0.1" hawk@~3.1.3: version "3.1.3" @@ -1588,8 +1411,8 @@ hoek@2.x.x: resolved "https://registry.yarnpkg.com/hoek/-/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed" hosted-git-info@^2.1.4: - version "2.5.0" - resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.5.0.tgz#6d60e34b3abbc8313062c3b798ef8d901a07af3c" + version "2.4.2" + resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.4.2.tgz#0076b9f46a270506ddbaaea56496897460612a67" html-comment-regex@^1.1.0: version "1.1.1" @@ -1606,12 +1429,12 @@ html-loader@^0.4.5: object-assign "^4.1.0" html-minifier@^3.0.1: - version "3.5.3" - resolved "https://registry.yarnpkg.com/html-minifier/-/html-minifier-3.5.3.tgz#4a275e3b1a16639abb79b4c11191ff0d0fcf1ab9" + version "3.5.2" + resolved "https://registry.yarnpkg.com/html-minifier/-/html-minifier-3.5.2.tgz#d73bc3ff448942408818ce609bf3fb0ea7ef4eb7" dependencies: camel-case "3.0.x" clean-css "4.1.x" - commander "2.11.x" + commander "2.9.x" he "1.1.x" ncname "1.0.x" param-case "2.1.x" @@ -1631,12 +1454,12 @@ https-browserify@0.0.1: resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-0.0.1.tgz#3f91365cabe60b77ed0ebba24b454e3e09d95a82" iconv-lite@0.4: - version "0.4.18" - resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.18.tgz#23d8656b16aae6742ac29732ea8f0336a4789cf2" + version "0.4.17" + resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.17.tgz#4fdaa3b38acbc2c031b045d0edcdfe1ecab18c8d" -icss-replace-symbols@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz#06ea6f83679a7749e386cfe1fe812ae5db223ded" +icss-replace-symbols@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/icss-replace-symbols/-/icss-replace-symbols-1.0.2.tgz#cb0b6054eb3af6edc9ab1d62d01933e2d4c8bfa5" icss-utils@^2.1.0: version "2.1.0" @@ -1673,7 +1496,7 @@ inflight@^1.0.4: once "^1.3.0" wrappy "1" -inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3: +inherits@2, inherits@^2.0.1, inherits@~2.0.0, inherits@~2.0.1: version "2.0.3" resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" @@ -1718,8 +1541,8 @@ is-builtin-module@^1.0.0: builtin-modules "^1.0.0" is-dotfile@^1.0.0: - version "1.0.3" - resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.3.tgz#a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1" + version "1.0.2" + resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.2.tgz#2c132383f39199f8edc268ca01b9b007d205cc4d" is-equal-shallow@^0.1.3: version "0.1.3" @@ -1753,27 +1576,21 @@ is-glob@^2.0.0, is-glob@^2.0.1: dependencies: is-extglob "^1.0.0" -is-number@^2.1.0: +is-number@^2.0.2, is-number@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f" dependencies: kind-of "^3.0.2" -is-number@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195" - dependencies: - kind-of "^3.0.2" - is-plain-obj@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e" is-plain-object@^2.0.1: - version "2.0.4" - resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677" + version "2.0.1" + resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.1.tgz#4d7ca539bc9db9b737b8acb612f2318ef92f294f" dependencies: - isobject "^3.0.1" + isobject "^1.0.0" is-posix-bracket@^0.1.0: version "0.1.1" @@ -1805,29 +1622,39 @@ isexe@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" +isobject@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/isobject/-/isobject-1.0.2.tgz#f0f9b8ce92dd540fa0740882e3835a2e022ec78a" + isobject@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89" dependencies: isarray "1.0.0" -isobject@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" - isstream@~0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" +jodid25519@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/jodid25519/-/jodid25519-1.0.2.tgz#06d4912255093419477d425633606e0e90782967" + dependencies: + jsbn "~0.1.0" + jquery-contextmenu@^2.4.5: - version "2.5.0" - resolved "https://registry.yarnpkg.com/jquery-contextmenu/-/jquery-contextmenu-2.5.0.tgz#940dbadbd0f2d7e0a0a8f1bbc5e71667d8257405" + version "2.4.5" + resolved "https://registry.yarnpkg.com/jquery-contextmenu/-/jquery-contextmenu-2.4.5.tgz#e65ace060d8cdad4d0e5df7815d0d7039e517450" jquery-ui@^1.12.1: version "1.12.1" resolved "https://registry.yarnpkg.com/jquery-ui/-/jquery-ui-1.12.1.tgz#bcb4045c8dd0539c134bc1488cdd3e768a7a9e51" -jquery@>=1.7, jquery@^3.1.1: +jquery@>=1.7: + version "2.2.4" + resolved "https://registry.yarnpkg.com/jquery/-/jquery-2.2.4.tgz#2c89d6889b5eac522a7eea32c14521559c6cbf02" + +jquery@^3.1.1: version "3.2.1" resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.2.1.tgz#5c4d9de652af6cd0a770154a631bba12b015c787" @@ -1836,8 +1663,8 @@ js-base64@^2.1.8, js-base64@^2.1.9: resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.1.9.tgz#f0e80ae039a4bd654b5f281fc93f04a914a7fcce" js-tokens@^3.0.0: - version "3.0.2" - resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b" + version "3.0.1" + resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.1.tgz#08e9f132484a2c45a30907e9dc4d5567b7f114d7" js-yaml@~3.7.0: version "3.7.0" @@ -1855,12 +1682,8 @@ jsesc@~0.5.0: resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d" json-loader@^0.5.4: - version "0.5.7" - resolved "https://registry.yarnpkg.com/json-loader/-/json-loader-0.5.7.tgz#dca14a70235ff82f0ac9a3abeb60d337a365185d" - -json-schema-traverse@^0.3.0: - version "0.3.1" - resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340" + version "0.5.4" + resolved "https://registry.yarnpkg.com/json-loader/-/json-loader-0.5.4.tgz#8baa1365a632f58a3c46d20175fc6002c96e37de" json-schema@0.2.3: version "0.2.3" @@ -1885,13 +1708,37 @@ jsonify@~0.0.0: resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73" jsprim@^1.2.2: - version "1.4.1" - resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2" + version "1.4.0" + resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.0.tgz#a3b87e40298d8c380552d8cc7628a0bb95a22918" dependencies: assert-plus "1.0.0" - extsprintf "1.3.0" + extsprintf "1.0.2" json-schema "0.2.3" - verror "1.10.0" + verror "1.3.6" + +jupyter-js-widgets@^2.1.4: + version "2.1.4" + resolved "https://registry.yarnpkg.com/jupyter-js-widgets/-/jupyter-js-widgets-2.1.4.tgz#a2c8c19d706d79feb202e6dc3221bffc9d1d8edf" + dependencies: + "@jupyterlab/services" "^0.35.0" + "@types/backbone" "^1.3.33" + "@types/semver" "^5.3.30" + ajv "^4.9.0" + backbone "1.2.0" + d3-format "^0.5.1" + font-awesome "^4.5.0" + jquery "^3.1.1" + jquery-ui "^1.12.1" + jupyter-widgets-schema "^0.1.1" + lolex "^1.4.0" + phosphor "^0.7.0" + scriptjs "^2.5.8" + semver "^5.1.0" + underscore "^1.8.3" + +jupyter-widgets-schema@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/jupyter-widgets-schema/-/jupyter-widgets-schema-0.1.1.tgz#72a81328191439383ec45496a4f8184d98c81b48" kind-of@^2.0.1: version "2.0.1" @@ -1899,18 +1746,12 @@ kind-of@^2.0.1: dependencies: is-buffer "^1.0.2" -kind-of@^3.0.2, kind-of@^3.2.2: +kind-of@^3.0.2: version "3.2.2" resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64" dependencies: is-buffer "^1.1.5" -kind-of@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57" - dependencies: - is-buffer "^1.1.5" - lazy-cache@^0.2.3: version "0.2.7" resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-0.2.7.tgz#7feddf2dcb6edb77d11ef1d117ab5ffdf0ab1b65" @@ -1984,10 +1825,18 @@ lodash.uniq@^4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" -lodash@^4.0.0, lodash@^4.14.0, lodash@~4.17.4: +lodash@^4.0.0, lodash@^4.14.0: version "4.17.4" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae" +lodash@~4.16.4: + version "4.16.6" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.16.6.tgz#d22c9ac660288f3843e16ba7d2b5d06cca27d777" + +lolex@^1.4.0: + version "1.6.0" + resolved "https://registry.yarnpkg.com/lolex/-/lolex-1.6.0.tgz#3a9a0283452a47d7439e72731b9e07d7386e49f6" + longest@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097" @@ -2004,11 +1853,11 @@ lower-case@^1.1.1: resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac" lru-cache@^4.0.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.1.tgz#622e32e82488b49279114a4f9ecf45e7cd6bba55" + version "4.0.2" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.0.2.tgz#1d17679c069cda5d040991a09dbc2c0db377e55e" dependencies: - pseudomap "^1.0.2" - yallist "^2.1.2" + pseudomap "^1.0.1" + yallist "^2.0.0" macaddress@^0.2.8: version "0.2.8" @@ -2069,26 +1918,20 @@ miller-rabin@^4.0.0: bn.js "^4.0.0" brorand "^1.0.1" -mime-db@~1.29.0: - version "1.29.0" - resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.29.0.tgz#48d26d235589651704ac5916ca06001914266878" +mime-db@~1.27.0: + version "1.27.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.27.0.tgz#820f572296bbd20ec25ed55e5b5de869e5436eb1" mime-types@^2.1.12, mime-types@~2.1.7: - version "2.1.16" - resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.16.tgz#2b858a52e5ecd516db897ac2be87487830698e23" + version "2.1.15" + resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.15.tgz#a4ebf5064094569237b8cf70046776d09fc92aed" dependencies: - mime-db "~1.29.0" + mime-db "~1.27.0" mime@1.3.x: version "1.3.6" resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.6.tgz#591d84d3653a6b0b4a3b9df8de5aa8108e72e5e0" -min-document@^2.19.0: - version "2.19.0" - resolved "https://registry.yarnpkg.com/min-document/-/min-document-2.19.0.tgz#7bd282e3f5842ed295bb748cdd9f1ffa2c824685" - dependencies: - dom-walk "^0.1.0" - minimalistic-assert@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz#702be2dda6b37f4836bcb3f5db56641b64a1d3d3" @@ -2097,7 +1940,7 @@ minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a" -minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.4, minimatch@~3.0.2: +minimatch@^3.0.0, minimatch@^3.0.2, minimatch@~3.0.2: version "3.0.4" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" dependencies: @@ -2155,8 +1998,8 @@ no-case@^2.2.0: lower-case "^1.1.1" node-gyp@^3.3.1: - version "3.6.2" - resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-3.6.2.tgz#9bfbe54562286284838e750eac05295853fa1c60" + version "3.6.1" + resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-3.6.1.tgz#19561067ff185464aded478212681f47fd578cbc" dependencies: fstream "^1.0.0" glob "^7.0.3" @@ -2200,9 +2043,9 @@ node-libs-browser@^2.0.0: util "^0.10.3" vm-browserify "0.0.4" -node-pre-gyp@^0.6.36: - version "0.6.36" - resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.6.36.tgz#db604112cb74e0d477554e9b505b17abddfab786" +node-pre-gyp@^0.6.29: + version "0.6.34" + resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.6.34.tgz#94ad1c798a11d7fc67381b50d47f8cc18d9799f7" dependencies: mkdirp "^0.5.1" nopt "^4.0.1" @@ -2251,15 +2094,15 @@ nopt@^4.0.1: osenv "^0.1.4" normalize-package-data@^2.3.2, normalize-package-data@^2.3.4: - version "2.4.0" - resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.4.0.tgz#12f95a307d58352075a04907b84ac8be98ac012f" + version "2.3.8" + resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.3.8.tgz#d819eda2a9dedbd1ffa563ea4071d936782295bb" dependencies: hosted-git-info "^2.1.4" is-builtin-module "^1.0.0" semver "2 || 3 || 4 || 5" validate-npm-package-license "^3.0.1" -normalize-path@^2.0.0, normalize-path@^2.0.1: +normalize-path@^2.0.1: version "2.1.1" resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9" dependencies: @@ -2279,8 +2122,8 @@ normalize-url@^1.4.0: sort-keys "^1.0.0" "npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0, npmlog@^4.0.2: - version "4.1.2" - resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" + version "4.1.0" + resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.0.tgz#dc59bee85f64f00ed424efb2af0783df25d1c0b5" dependencies: are-we-there-yet "~1.1.2" console-control-strings "~1.1.0" @@ -2403,8 +2246,8 @@ path-type@^1.0.0: pinkie-promise "^2.0.0" pbkdf2@^3.0.3: - version "3.0.13" - resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.13.tgz#c37d295531e786b1da3e3eadc840426accb0ae25" + version "3.0.12" + resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.12.tgz#be36785c5067ea48d806ff923288c5f750b6b8a2" dependencies: create-hash "^1.1.2" create-hmac "^1.1.4" @@ -2416,14 +2259,14 @@ performance-now@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-0.2.0.tgz#33ef30c5c77d4ea21c5a53869d91b56d8f2555e5" -pify@^2.0.0: +phosphor@^0.7.0: + version "0.7.1" + resolved "https://registry.yarnpkg.com/phosphor/-/phosphor-0.7.1.tgz#fad12fe9568bc85e89c6d57326ba58d27a1d2b21" + +pify@^2.0.0, pify@^2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c" -pify@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176" - pinkie-promise@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa" @@ -2557,31 +2400,31 @@ postcss-minify-selectors@^2.0.4: postcss-selector-parser "^2.0.0" postcss-modules-extract-imports@^1.0.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.2.0.tgz#66140ecece38ef06bf0d3e355d69bf59d141ea85" + version "1.0.1" + resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.0.1.tgz#8fb3fef9a6dd0420d3f6d4353cf1ff73f2b2a341" dependencies: - postcss "^6.0.1" + postcss "^5.0.4" postcss-modules-local-by-default@^1.0.1: - version "1.2.0" - resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-1.2.0.tgz#f7d80c398c5a393fa7964466bd19500a7d61c069" + version "1.1.1" + resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-1.1.1.tgz#29a10673fa37d19251265ca2ba3150d9040eb4ce" dependencies: - css-selector-tokenizer "^0.7.0" - postcss "^6.0.1" + css-selector-tokenizer "^0.6.0" + postcss "^5.0.4" postcss-modules-scope@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-1.1.0.tgz#d6ea64994c79f97b62a72b426fbe6056a194bb90" + version "1.0.2" + resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-1.0.2.tgz#ff977395e5e06202d7362290b88b1e8cd049de29" dependencies: - css-selector-tokenizer "^0.7.0" - postcss "^6.0.1" + css-selector-tokenizer "^0.6.0" + postcss "^5.0.4" postcss-modules-values@^1.1.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-1.3.0.tgz#ecffa9d7e192518389f42ad0e83f72aec456ea20" + version "1.2.2" + resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-1.2.2.tgz#f0e7d476fe1ed88c5e4c7f97533a3e772ad94ca1" dependencies: - icss-replace-symbols "^1.1.0" - postcss "^6.0.1" + icss-replace-symbols "^1.0.2" + postcss "^5.0.14" postcss-normalize-charset@^1.1.0: version "1.1.1" @@ -2673,12 +2516,12 @@ postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0 supports-color "^3.2.3" postcss@^6.0.1: - version "6.0.8" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.8.tgz#89067a9ce8b11f8a84cbc5117efc30419a0857b3" + version "6.0.1" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.1.tgz#000dbd1f8eef217aa368b9a212c5fc40b2a8f3f2" dependencies: - chalk "^2.0.1" + chalk "^1.1.3" source-map "^0.5.6" - supports-color "^4.2.0" + supports-color "^3.2.3" prepend-http@^1.0.0: version "1.0.4" @@ -2700,15 +2543,11 @@ process@^0.11.0: version "0.11.10" resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182" -process@~0.5.1: - version "0.5.2" - resolved "https://registry.yarnpkg.com/process/-/process-0.5.2.tgz#1638d8a8e34c2f440a91db95ab9aeb677fc185cf" - prr@~0.0.0: version "0.0.0" resolved "https://registry.yarnpkg.com/prr/-/prr-0.0.0.tgz#1a84b85908325501411853d0081ee3fa86e2926a" -pseudomap@^1.0.2: +pseudomap@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3" @@ -2753,22 +2592,16 @@ querystring@0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620" -querystringify@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-1.0.0.tgz#6286242112c5b712fa654e526652bf6a13ff05cb" - randomatic@^1.1.3: - version "1.1.7" - resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-1.1.7.tgz#c7abe9cc8b87c0baa876b19fde83fd464797e38c" + version "1.1.6" + resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-1.1.6.tgz#110dcabff397e9dcff7c0789ccc0a49adf1ec5bb" dependencies: - is-number "^3.0.0" - kind-of "^4.0.0" + is-number "^2.0.2" + kind-of "^3.0.2" randombytes@^2.0.0, randombytes@^2.0.1: - version "2.0.5" - resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.0.5.tgz#dc009a246b8d09a177b4b7a0ae77bc570f4b1b79" - dependencies: - safe-buffer "^5.1.0" + version "2.0.3" + resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.0.3.tgz#674c99760901c3c4112771a31e521dc349cc09ec" rc@^1.1.7: version "1.2.1" @@ -2795,15 +2628,15 @@ read-pkg@^1.0.0: path-type "^1.0.0" readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.4, readable-stream@^2.2.6: - version "2.3.3" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.3.tgz#368f2512d79f9d46fdfc71349ae7878bbc1eb95c" + version "2.2.9" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.2.9.tgz#cf78ec6f4a6d1eb43d26488cac97f042e74b7fc8" dependencies: + buffer-shims "~1.0.0" core-util-is "~1.0.0" - inherits "~2.0.3" + inherits "~2.0.1" isarray "~1.0.0" process-nextick-args "~1.0.6" - safe-buffer "~5.1.1" - string_decoder "~1.0.3" + string_decoder "~1.0.0" util-deprecate "~1.0.1" readdirp@^2.0.0: @@ -2879,8 +2712,8 @@ relateurl@0.2.x: resolved "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9" remove-trailing-separator@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.0.2.tgz#69b062d978727ad14dc6b56ba4ab772fd8d70511" + version "1.0.1" + resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.0.1.tgz#615ebb96af559552d4bf4057c8436d486ab63cc4" repeat-element@^1.1.2: version "1.1.2" @@ -2931,10 +2764,6 @@ require-main-filename@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1" -requires-port@1.0.x: - version "1.0.0" - resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" - right-align@^0.1.1: version "0.1.3" resolved "https://registry.yarnpkg.com/right-align/-/right-align-0.1.3.tgz#61339b722fe6a3515689210d24e14c96148613ef" @@ -2958,32 +2787,32 @@ rw@1: version "1.3.3" resolved "https://registry.yarnpkg.com/rw/-/rw-1.3.3.tgz#3f862dfa91ab766b14885ef4d01124bfda074fb4" -safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@~5.1.0, safe-buffer@~5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853" +safe-buffer@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.0.1.tgz#d263ca54696cd8a306b5ca6551e92de57918fbe7" sass-graph@^2.1.1: - version "2.2.4" - resolved "https://registry.yarnpkg.com/sass-graph/-/sass-graph-2.2.4.tgz#13fbd63cd1caf0908b9fd93476ad43a51d1e0b49" + version "2.2.3" + resolved "https://registry.yarnpkg.com/sass-graph/-/sass-graph-2.2.3.tgz#2ba9f170f6cafed5b51665abe13cf319c9269c31" dependencies: glob "^7.0.0" lodash "^4.0.0" scss-tokenizer "^0.2.3" - yargs "^7.0.0" + yargs "^6.6.0" sass-loader@^6.0.5: - version "6.0.6" - resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-6.0.6.tgz#e9d5e6c1f155faa32a4b26d7a9b7107c225e40f9" + version "6.0.5" + resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-6.0.5.tgz#a847910f36442aa56c5985879d54eb519e24a328" dependencies: async "^2.1.5" - clone-deep "^0.3.0" + clone-deep "^0.2.4" loader-utils "^1.0.1" lodash.tail "^4.1.1" - pify "^3.0.0" + pify "^2.3.0" sax@~1.2.1: - version "1.2.4" - resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" + version "1.2.2" + resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.2.tgz#fd8631a23bc7826bef5d871bdb87378c95647828" schema-utils@^0.3.0: version "0.3.0" @@ -2991,6 +2820,10 @@ schema-utils@^0.3.0: dependencies: ajv "^5.0.0" +scriptjs@^2.5.8: + version "2.5.8" + resolved "https://registry.yarnpkg.com/scriptjs/-/scriptjs-2.5.8.tgz#d0c43955c2e6bad33b6e4edf7b53b8965aa7ca5f" + scss-tokenizer@^0.2.3: version "0.2.3" resolved "https://registry.yarnpkg.com/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz#8eb06db9a9723333824d3f5530641149847ce5d1" @@ -2998,11 +2831,7 @@ scss-tokenizer@^0.2.3: js-base64 "^2.1.8" source-map "^0.4.2" -"semver@2 || 3 || 4 || 5", semver@^5.1.0, semver@^5.3.0: - version "5.4.1" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.4.1.tgz#e059c09d8571f0540823733433505d3a2f00b18e" - -semver@~5.3.0: +"semver@2 || 3 || 4 || 5", semver@^5.1.0, semver@^5.3.0, semver@~5.3.0: version "5.3.0" resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f" @@ -3053,9 +2882,9 @@ source-list-map@^0.1.7: version "0.1.8" resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-0.1.8.tgz#c550b2ab5427f6b3f21f5afead88c4f5587b2106" -source-list-map@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.0.tgz#aaa47403f7b245a92fbc97ea08f250d6087ed085" +source-list-map@^1.1.1: + version "1.1.2" + resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-1.1.2.tgz#9889019d1024cce55cdc069498337ef6186a11a1" source-map@0.5.x, source-map@^0.5.3, source-map@^0.5.6, source-map@~0.5.0, source-map@~0.5.1, source-map@~0.5.3: version "0.5.6" @@ -3086,8 +2915,8 @@ sprintf-js@~1.0.2: resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" sshpk@^1.7.0: - version "1.13.1" - resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.13.1.tgz#512df6da6287144316dc4c18fe1cf1d940739be3" + version "1.13.0" + resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.13.0.tgz#ff2a3e4fd04497555fed97b39a0fd82fafb3a33c" dependencies: asn1 "~0.2.3" assert-plus "^1.0.0" @@ -3096,6 +2925,7 @@ sshpk@^1.7.0: optionalDependencies: bcrypt-pbkdf "^1.0.0" ecc-jsbn "~0.1.1" + jodid25519 "^1.0.0" jsbn "~0.1.0" tweetnacl "~0.14.0" @@ -3113,8 +2943,8 @@ stream-browserify@^2.0.1: readable-stream "^2.0.2" stream-http@^2.3.1: - version "2.7.2" - resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.7.2.tgz#40a050ec8dc3b53b33d9909415c02c0bf1abfbad" + version "2.7.1" + resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.7.1.tgz#546a51741ad5a6b07e9e31b0b10441a917df528a" dependencies: builtin-status-codes "^3.0.0" inherits "^2.0.1" @@ -3138,11 +2968,11 @@ string_decoder@^0.10.25: version "0.10.31" resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94" -string_decoder@~1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.3.tgz#0fc67d7c141825de94282dd536bec6b9bce860ab" +string_decoder@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.0.tgz#f06f41157b664d86069f84bdbdc9b0d8ab281667" dependencies: - safe-buffer "~5.1.0" + buffer-shims "~1.0.0" stringstream@~0.0.4: version "0.0.5" @@ -3171,8 +3001,8 @@ strip-json-comments@~2.0.1: resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" style-loader@^0.18.1: - version "0.18.2" - resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-0.18.2.tgz#cc31459afbcd6d80b7220ee54b291a9fd66ff5eb" + version "0.18.1" + resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-0.18.1.tgz#6afca8953c842830e5e2dc84796309880a97f7e8" dependencies: loader-utils "^1.0.2" schema-utils "^0.3.0" @@ -3187,12 +3017,6 @@ supports-color@^3.1.0, supports-color@^3.2.3: dependencies: has-flag "^1.0.0" -supports-color@^4.0.0, supports-color@^4.2.0: - version "4.2.1" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.2.1.tgz#65a4bb2631e90e02420dba5554c375a4754bb836" - dependencies: - has-flag "^2.0.0" - svgo@^0.7.0: version "0.7.2" resolved "https://registry.yarnpkg.com/svgo/-/svgo-0.7.2.tgz#9f5772413952135c6fefbf40afe6a4faa88b4bb5" @@ -3205,9 +3029,9 @@ svgo@^0.7.0: sax "~1.2.1" whet.extend "~0.9.9" -tapable@^0.2.7, tapable@~0.2.5: - version "0.2.8" - resolved "https://registry.yarnpkg.com/tapable/-/tapable-0.2.8.tgz#99372a5c999bf2df160afc0d74bed4f47948cd22" +tapable@^0.2.5, tapable@~0.2.5: + version "0.2.6" + resolved "https://registry.yarnpkg.com/tapable/-/tapable-0.2.6.tgz#206be8e188860b514425375e6f1ae89bfb01fd8d" tar-pack@^3.4.0: version "3.4.0" @@ -3235,10 +3059,9 @@ through@~2.3.6: resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" timers-browserify@^2.0.2: - version "2.0.3" - resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.3.tgz#41fd0bdc926a5feedc33a17a8e1f7d491925f7fc" + version "2.0.2" + resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.2.tgz#ab4883cf597dcd50af211349a00fbca56ac86b86" dependencies: - global "^4.3.2" setimmediate "^1.0.4" to-arraybuffer@^1.0.0: @@ -3270,15 +3093,15 @@ tweetnacl@^0.14.3, tweetnacl@~0.14.0: resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64" uglify-js@3.0.x: - version "3.0.27" - resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.0.27.tgz#a97db8c8ba6b9dba4e2f88d86aa9548fa6320034" + version "3.0.13" + resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.0.13.tgz#1871d736aa1e550c728d7e5a6556579e70925d68" dependencies: - commander "~2.11.0" + commander "~2.9.0" source-map "~0.5.1" uglify-js@^2.8.27: - version "2.8.29" - resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.29.tgz#29c5733148057bb4e1f75df35b7a9cb72e6a59dd" + version "2.8.27" + resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.27.tgz#47787f912b0f242e5b984343be8e35e95f694c9c" dependencies: source-map "~0.5.1" yargs "~3.10.0" @@ -3315,6 +3138,10 @@ upper-case@^1.1.1: version "1.1.3" resolved "https://registry.yarnpkg.com/upper-case/-/upper-case-1.1.3.tgz#f6b4501c2ec4cdd26ba78be7222961de77621598" +url-join@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/url-join/-/url-join-1.1.0.tgz#741c6c2f4596c4830d6718460920d0c92202dc78" + url-loader@^0.5.9: version "0.5.9" resolved "https://registry.yarnpkg.com/url-loader/-/url-loader-0.5.9.tgz#cc8fea82c7b906e7777019250869e569e995c295" @@ -3322,13 +3149,6 @@ url-loader@^0.5.9: loader-utils "^1.0.2" mime "1.3.x" -url-parse@^1.1.8: - version "1.1.9" - resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.1.9.tgz#c67f1d775d51f0a18911dd7b3ffad27bb9e5bd19" - dependencies: - querystringify "~1.0.0" - requires-port "1.0.x" - url@^0.11.0: version "0.11.0" resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1" @@ -3347,8 +3167,8 @@ util@0.10.3, util@^0.10.3: inherits "2.0.1" uuid@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.1.0.tgz#3dd3d3e790abc24d7b0d3a034ffababe28ebbc04" + version "3.0.1" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.0.1.tgz#6544bba2dfda8c1cf17e629a3a305e2bb1fee6c1" validate-npm-package-license@^3.0.1: version "3.0.1" @@ -3361,13 +3181,11 @@ vendors@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/vendors/-/vendors-1.0.1.tgz#37ad73c8ee417fb3d580e785312307d274847f22" -verror@1.10.0: - version "1.10.0" - resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400" +verror@1.3.6: + version "1.3.6" + resolved "https://registry.yarnpkg.com/verror/-/verror-1.3.6.tgz#cff5df12946d297d2baaefaa2689e25be01c005c" dependencies: - assert-plus "^1.0.0" - core-util-is "1.0.2" - extsprintf "^1.2.0" + extsprintf "1.0.2" vm-browserify@0.0.4: version "0.0.4" @@ -3376,30 +3194,30 @@ vm-browserify@0.0.4: indexof "0.0.1" watchpack@^1.3.1: - version "1.4.0" - resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.4.0.tgz#4a1472bcbb952bd0a9bb4036801f954dfb39faac" + version "1.3.1" + resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.3.1.tgz#7d8693907b28ce6013e7f3610aa2a1acf07dad87" dependencies: async "^2.1.2" - chokidar "^1.7.0" + chokidar "^1.4.3" graceful-fs "^4.1.2" -webpack-sources@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.0.1.tgz#c7356436a4d13123be2e2426a05d1dad9cbe65cf" +webpack-sources@^0.2.3: + version "0.2.3" + resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-0.2.3.tgz#17c62bfaf13c707f9d02c479e0dcdde8380697fb" dependencies: - source-list-map "^2.0.0" + source-list-map "^1.1.1" source-map "~0.5.3" webpack@^2.6.1: - version "2.7.0" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-2.7.0.tgz#b2a1226804373ffd3d03ea9c6bd525067034f6b1" + version "2.6.1" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-2.6.1.tgz#2e0457f0abb1ac5df3ab106c69c672f236785f07" dependencies: acorn "^5.0.0" acorn-dynamic-import "^2.0.0" ajv "^4.7.0" ajv-keywords "^1.1.1" async "^2.1.2" - enhanced-resolve "^3.3.0" + enhanced-resolve "^3.0.0" interpret "^1.0.0" json-loader "^0.5.4" json5 "^0.5.1" @@ -3413,7 +3231,7 @@ webpack@^2.6.1: tapable "~0.2.5" uglify-js "^2.8.27" watchpack "^1.3.1" - webpack-sources "^1.0.1" + webpack-sources "^0.2.3" yargs "^6.0.0" whet.extend@~0.9.9: @@ -3425,8 +3243,8 @@ which-module@^1.0.0: resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f" which@1, which@^1.2.9: - version "1.3.0" - resolved "https://registry.yarnpkg.com/which/-/which-1.3.0.tgz#ff04bdfc010ee547d780bec38e1ac1c2777d253a" + version "1.2.14" + resolved "https://registry.yarnpkg.com/which/-/which-1.2.14.tgz#9a87c4378f03e827cecaf1acdf56c736c01c14e5" dependencies: isexe "^2.0.0" @@ -3471,7 +3289,7 @@ y18n@^3.2.1: version "3.2.1" resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41" -yallist@^2.1.2: +yallist@^2.0.0: version "2.1.2" resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52" @@ -3481,13 +3299,7 @@ yargs-parser@^4.2.0: dependencies: camelcase "^3.0.0" -yargs-parser@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-5.0.0.tgz#275ecf0d7ffe05c77e64e7c86e4cd94bf0e1228a" - dependencies: - camelcase "^3.0.0" - -yargs@^6.0.0: +yargs@^6.0.0, yargs@^6.6.0: version "6.6.0" resolved "https://registry.yarnpkg.com/yargs/-/yargs-6.6.0.tgz#782ec21ef403345f830a808ca3d513af56065208" dependencies: @@ -3505,24 +3317,6 @@ yargs@^6.0.0: y18n "^3.2.1" yargs-parser "^4.2.0" -yargs@^7.0.0: - version "7.1.0" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-7.1.0.tgz#6ba318eb16961727f5d284f8ea003e8d6154d0c8" - dependencies: - camelcase "^3.0.0" - cliui "^3.2.0" - decamelize "^1.1.1" - get-caller-file "^1.0.1" - os-locale "^1.4.0" - read-pkg-up "^1.0.1" - require-directory "^2.1.1" - require-main-filename "^1.0.1" - set-blocking "^2.0.0" - string-width "^1.0.2" - which-module "^1.0.0" - y18n "^3.2.1" - yargs-parser "^5.0.0" - yargs@~3.10.0: version "3.10.0" resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.10.0.tgz#f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1" diff --git a/beakerx/setup.py b/beakerx/setup.py index 21cd6b854b..4f84e6b48e 100644 --- a/beakerx/setup.py +++ b/beakerx/setup.py @@ -18,11 +18,11 @@ from setuptools import setup, find_packages from setupbase import ( create_cmdclass, - install_node_modules, + install_node_modules, update_kernelspec_class, install_kernels, - copy_files, - run_gradle, + copy_files, + run_gradle, get_version, get_data_files, here @@ -44,7 +44,7 @@ 'custom_css' ]) cmdclass['js'] = install_node_modules( - path='js', + path='js', build_dir=os.path.join(here, 'js', 'dist'), source_dir=os.path.join(here, 'js', 'src') ) @@ -52,7 +52,7 @@ cmdclass['kernels_develop'] = install_kernels(source_dir=os.path.join(here, 'beakerx', 'static', 'kernel'), target_dir=os.path.join(here, 'beakerx', 'static', 'kernel')) cmdclass['kernelspec_class'] = update_kernelspec_class(prefix=os.environ['CONDA_PREFIX']) cmdclass['custom_css'] = copy_files( - src=os.path.join(here, 'beakerx', 'static', 'custom'), + src=os.path.join(here, 'beakerx', 'static', 'custom'), dest=os.path.join(os.environ['CONDA_PREFIX'], 'lib', 'python3.5', 'site-packages', 'notebook', 'static', 'custom') ) @@ -97,12 +97,12 @@ 'beakerx': 'static/kernel/*/kernel.json' }, data_files = [( - 'share/jupyter/nbextensions/beakerx', + 'share/jupyter/nbextensions/beakerx', get_data_files(os.path.join('beaker', 'static')) )], install_requires = [ - 'notebook >=4.4.0', - 'ipywidgets >=7.0.0', + 'notebook >=4.3.1', + 'ipywidgets >=5.1.5, <=6.0.0', 'pandas' ], zip_safe = False, diff --git a/kernel/base/src/main/java/com/twosigma/beakerx/kernel/comm/Comm.java b/kernel/base/src/main/java/com/twosigma/beakerx/kernel/comm/Comm.java index 2c4e05b504..95fbb1a8c7 100644 --- a/kernel/base/src/main/java/com/twosigma/beakerx/kernel/comm/Comm.java +++ b/kernel/base/src/main/java/com/twosigma/beakerx/kernel/comm/Comm.java @@ -35,7 +35,6 @@ import static com.twosigma.beakerx.kernel.msg.JupyterMessages.COMM_CLOSE; import static com.twosigma.beakerx.kernel.msg.JupyterMessages.COMM_MSG; import static com.twosigma.beakerx.kernel.msg.JupyterMessages.COMM_OPEN; -import static com.twosigma.beakerx.kernel.msg.JupyterMessages.DISPLAY_DATA; public class Comm { @@ -45,20 +44,16 @@ public class Comm { public static final String METHOD = "method"; public static final String UPDATE = "update"; public static final String STATE = "state"; - public static final String VERSION = "version"; public static final String COMM_ID = "comm_id"; public static final String TARGET_NAME = "target_name"; public static final String DATA = "data"; - public static final String METADATA = "metadata"; public static final String TARGET_MODULE = "target_module"; public static final String COMMS = "comms"; private String commId; - private String msgType; private String targetName; private HashMap data; - private HashMap metadata; private String targetModule; private KernelFunctionality kernel; private List> msgCallbackList = new ArrayList<>(); @@ -70,7 +65,6 @@ public Comm(String commId, String targetName) { this.commId = commId; this.targetName = targetName; this.data = new HashMap<>(); - this.metadata = new HashMap<>(); } public Comm(String commId, TargetNamesEnum targetName) { @@ -101,14 +95,6 @@ public void setData(HashMap data) { this.data = data; } - public void setMetaData(HashMap metadata) { - this.metadata = metadata; - } - - public void setMsgType(String type) { - this.msgType = type; - } - public String getTargetModule() { return targetModule; } @@ -151,22 +137,9 @@ public void open() { HashMap map = new HashMap<>(); map.put(COMM_ID, getCommId()); map.put(TARGET_NAME, getTargetName()); - - HashMap state = new HashMap<>(); - state.put(STATE, data); - state.put(METHOD, (Serializable) data.get(METHOD)); - map.put(DATA, state); - map.put(METADATA, metadata); - + map.put(DATA, data); map.put(TARGET_MODULE, getTargetModule()); message.setContent(map); - - message.setMetadata(buildMetadata()); - - if (this.msgType != null) { - message.getHeader().setType(this.msgType); - } - kernel.publish(message); kernel.addComm(getCommId(), this); } @@ -187,10 +160,7 @@ public void close() { HashMap map = new HashMap<>(); map.put(COMM_ID, getCommId()); map.put(DATA, new HashMap<>()); - map.put(METADATA, new HashMap<>()); message.setContent(map); - message.setMetadata(buildMetadata()); - kernel.removeComm(getCommId()); kernel.publish(message); } @@ -209,14 +179,7 @@ public void send(JupyterMessages type) { HashMap map = new HashMap<>(6); map.put(COMM_ID, getCommId()); map.put(DATA, data); - map.put(METADATA, metadata); message.setContent(map); - - message.setMetadata(buildMetadata()); - - if (this.msgType != null) { - message.getHeader().setType(this.msgType); - } kernel.publish(message); } @@ -242,13 +205,6 @@ public void handleMsg(Message parentMessage) { } } - private HashMap buildMetadata() { - HashMap metadata = new HashMap<>(); - metadata.put(VERSION, "2"); - - return metadata; - } - @Override public String toString() { return commId + "/" + targetName + "/" + (targetModule != null && !targetModule.isEmpty() ? targetModule : ""); diff --git a/kernel/base/src/main/java/com/twosigma/beakerx/kernel/handler/CommOpenHandler.java b/kernel/base/src/main/java/com/twosigma/beakerx/kernel/handler/CommOpenHandler.java index edde4efde5..2b0862afee 100644 --- a/kernel/base/src/main/java/com/twosigma/beakerx/kernel/handler/CommOpenHandler.java +++ b/kernel/base/src/main/java/com/twosigma/beakerx/kernel/handler/CommOpenHandler.java @@ -97,7 +97,7 @@ public static String getString(Map map, String name) { protected Comm readComm(Map map) { Comm ret = new Comm(getString(map, COMM_ID), getString(map, TARGET_NAME)); - ret.setData((HashMap) map.get(DATA)); + ret.setData((HashMap) map.get(DATA)); ret.setTargetModule(getString(map, TARGET_MODULE)); return ret; } diff --git a/kernel/base/src/main/java/com/twosigma/beakerx/widgets/Widget.java b/kernel/base/src/main/java/com/twosigma/beakerx/widgets/Widget.java index 19803c7eee..d5b8d186b2 100644 --- a/kernel/base/src/main/java/com/twosigma/beakerx/widgets/Widget.java +++ b/kernel/base/src/main/java/com/twosigma/beakerx/widgets/Widget.java @@ -93,7 +93,7 @@ public static CommActions getByAction(final String input){ public static final String MSG_THROTTLE = "msg_throttle"; public static final String METHOD = "method"; - public static final String DISPLAY = "display_data"; + public static final String DISPLAY = "display"; private Comm comm; @@ -130,16 +130,8 @@ private void sendDisplayData() { private void sendDisplay() { HashMap content = new HashMap<>(); - HashMap data = new HashMap<>(); - //These magic numbers needs to be clarified - data.put("version_major", "2"); - data.put("version_minor", "0"); - data.put("model_id", this.comm.getCommId()); - content.put(METHOD, DISPLAY); - content.put("application/vnd.jupyter.widget-view+json", data); getComm().setData(content); - getComm().setMsgType(DISPLAY); getComm().send(); } diff --git a/kernel/base/src/test/java/com/twosigma/beakerx/easyform/EasyFormTest.java b/kernel/base/src/test/java/com/twosigma/beakerx/easyform/EasyFormTest.java index fc87dbc584..6f8aa41040 100644 --- a/kernel/base/src/test/java/com/twosigma/beakerx/easyform/EasyFormTest.java +++ b/kernel/base/src/test/java/com/twosigma/beakerx/easyform/EasyFormTest.java @@ -16,7 +16,6 @@ package com.twosigma.beakerx.easyform; import static com.twosigma.beakerx.widgets.TestWidgetUtils.getData; -import static com.twosigma.beakerx.widgets.TestWidgetUtils.getState; import static com.twosigma.beakerx.widgets.TestWidgetUtils.getValueForProperty; import static com.twosigma.beakerx.widgets.TestWidgetUtils.verifyDisplayMsg; import static com.twosigma.beakerx.widgets.TestWidgetUtils.verifyInternalOpenCommMsg; @@ -265,7 +264,7 @@ private void verifyDatePicker(List messages) { } private void verifyChildren(Message message, List children) { - Map data = getState(message); + Map data = getData(message); Object[] objects = (Object[]) data.get(Box.CHILDREN); assertThat(objects.length).isEqualTo(children.size()); for (int i = 0; i < children.size(); i++) { diff --git a/kernel/base/src/test/java/com/twosigma/beakerx/jupyter/SearchMessages.java b/kernel/base/src/test/java/com/twosigma/beakerx/jupyter/SearchMessages.java index 5bcde19f82..f007cfcb6f 100644 --- a/kernel/base/src/test/java/com/twosigma/beakerx/jupyter/SearchMessages.java +++ b/kernel/base/src/test/java/com/twosigma/beakerx/jupyter/SearchMessages.java @@ -33,7 +33,7 @@ public static List getListLayout(List messages){ } public static Message getLayoutForWidget(List messages, Message widget){ - Map map = (Map) ((Map) widget.getContent().get(Comm.DATA)).get(Comm.STATE); + Map map = ((Map)widget.getContent().get(Comm.DATA)); if(map == null || map.get(Layout.LAYOUT) == null) return null; String id = ((String) map.get(Layout.LAYOUT)).replace(Layout.IPY_MODEL, ""); return getMessageByCommId(messages, id); @@ -50,13 +50,7 @@ public static List getListWidgetsByModelName(List messages, St public static List getListByDataAttr(List messages, String key, String value){ return messages.stream() .filter(m -> { - Map map; - if (key.equals(Comm.METHOD)) { - map = (Map) m.getContent().get(Comm.DATA); - } else { - map = (Map) ((Map)m.getContent().get(Comm.DATA)).get(Comm.STATE); - } - + Map map = ((Map)m.getContent().get(Comm.DATA)); return map != null && map.containsKey(key) && value.equals(map.get(key)); }) .collect(Collectors.toList()); diff --git a/kernel/base/src/test/java/com/twosigma/beakerx/jvm/object/DisplayOutputContainerTest.java b/kernel/base/src/test/java/com/twosigma/beakerx/jvm/object/DisplayOutputContainerTest.java index 9451c90cbc..bbf6dd4383 100644 --- a/kernel/base/src/test/java/com/twosigma/beakerx/jvm/object/DisplayOutputContainerTest.java +++ b/kernel/base/src/test/java/com/twosigma/beakerx/jvm/object/DisplayOutputContainerTest.java @@ -88,7 +88,7 @@ public void display_shouldDisplayOutputContainerWithTabLayout() throws Exception private void verifyTabLayout(List publishedMessages) { Message tab = SearchMessages.getListWidgetsByViewName(publishedMessages, Tab.VIEW_NAME_VALUE).get(0); - Map data = getState(tab); + Map data = getData(tab); assertThat(data.get(VIEW_NAME)).isEqualTo(Tab.VIEW_NAME_VALUE); } diff --git a/kernel/base/src/test/java/com/twosigma/beakerx/widgets/DisplayWidgetTest.java b/kernel/base/src/test/java/com/twosigma/beakerx/widgets/DisplayWidgetTest.java index 77a3674ce0..4f12bd91ca 100644 --- a/kernel/base/src/test/java/com/twosigma/beakerx/widgets/DisplayWidgetTest.java +++ b/kernel/base/src/test/java/com/twosigma/beakerx/widgets/DisplayWidgetTest.java @@ -24,11 +24,8 @@ import com.twosigma.beakerx.message.Message; import static com.twosigma.beakerx.kernel.comm.Comm.COMM_ID; -import static com.twosigma.beakerx.kernel.comm.Comm.METHOD; import static com.twosigma.beakerx.kernel.msg.JupyterMessages.COMM_MSG; -import static com.twosigma.beakerx.kernel.msg.JupyterMessages.DISPLAY_DATA; import static com.twosigma.beakerx.widgets.TestWidgetUtils.getContent; -import static com.twosigma.beakerx.widgets.TestWidgetUtils.getData; import static com.twosigma.beakerx.widgets.TestWidgetUtils.verifyDisplayMsg; import static org.assertj.core.api.Assertions.assertThat; @@ -61,7 +58,7 @@ public void shouldSendCommOpenWhenCreate() throws Exception { private void verifyCommDisplayMsg(IntSlider widget) { assertThat(groovyKernel.getPublishedMessages().size()).isEqualTo(2); Message message = groovyKernel.getPublishedMessages().get(0); - assertThat(getData(message).get(METHOD)).isEqualTo(DISPLAY_DATA.getName()); + assertThat(message.getHeader().getType()).isEqualTo(COMM_MSG.getName()); verifyDisplayMsg(message); assertThat(getContent(message).get(COMM_ID)).isEqualTo(widget.getComm().getCommId()); } diff --git a/kernel/base/src/test/java/com/twosigma/beakerx/widgets/TestWidgetUtils.java b/kernel/base/src/test/java/com/twosigma/beakerx/widgets/TestWidgetUtils.java index 0862d1399e..78752cc1e4 100644 --- a/kernel/base/src/test/java/com/twosigma/beakerx/widgets/TestWidgetUtils.java +++ b/kernel/base/src/test/java/com/twosigma/beakerx/widgets/TestWidgetUtils.java @@ -43,7 +43,7 @@ public static void verifyOpenCommMsgWitoutLayout(List messages, String String viewNameValue) { Message message = SearchMessages.getListWidgetsByViewName(messages, viewNameValue).get(0); verifyTypeMsg(message, COMM_OPEN); - Map data = getState(message); + Map data = getData(message); assertThat(data.get(Widget.MODEL_NAME)).isEqualTo(modelNameValue); assertThat(data.get(Widget.VIEW_NAME)).isEqualTo(viewNameValue); } @@ -51,7 +51,7 @@ public static void verifyOpenCommMsgWitoutLayout(List messages, String public static void verifyInternalOpenCommMsg(Message message, String modelNameValue, String viewNameValue) { verifyTypeMsg(message, COMM_OPEN); - Map data = getState(message); + Map data = getData(message); assertThat(data.get(Widget.MODEL_MODULE)).isEqualTo(BeakerxWidget.MODEL_MODULE_VALUE); assertThat(data.get(Widget.VIEW_MODULE)).isEqualTo(BeakerxWidget.VIEW_MODULE_VALUE); assertThat(data.get(Widget.MODEL_NAME)).isEqualTo(modelNameValue); @@ -70,7 +70,7 @@ public static void verifyInternalOpenCommMsgWitLayout(List messages, Message layout = SearchMessages.getLayoutForWidget(messages, widget); verifyTypeMsg(widget, COMM_OPEN); - Map data = getState(widget); + Map data = getData(widget); assertThat(data.get(Layout.LAYOUT)) .isEqualTo(Layout.IPY_MODEL + layout.getContent().get(Comm.COMM_ID)); assertThat(data.get(Widget.MODEL_MODULE)).isEqualTo(modelModule); @@ -89,16 +89,6 @@ public static Map getData(Message message) { return (Map) content.get(Comm.DATA); } - public static Map getState(Message message) { - Map content = getContent(message); - Serializable data = content.getOrDefault(Comm.DATA, null); - if (null != data) { - return (Map) ((Map) data).getOrDefault(Comm.STATE, null); - } - - return null; - } - public static Map getContent(Message message) { return message.getContent(); } @@ -115,14 +105,15 @@ public static T getValueForProperty(KernelTest kernel, String propertyName, } public static T getValueForProperty(Message message, String propertyName, Class clazz) { - Map data = TestWidgetUtils.getState(message); - assertThat(getMethod(message)).isEqualTo(Comm.UPDATE); - Object o = data.get(propertyName); + Map data = TestWidgetUtils.getData(message); + assertThat(data.get(Comm.METHOD)).isEqualTo(Comm.UPDATE); + Object o = ((Map) data.get(Comm.STATE)).get(propertyName); return clazz.cast(o); } public static void verifyDisplayMsg(Message message) { - assertThat(getMethod(message)).isEqualTo(DISPLAY); + Map data = getData(message); + assertThat(data.get(METHOD)).isEqualTo(DISPLAY); } public static void verifyDisplayMsg(List messages) { @@ -138,10 +129,4 @@ public static T findValueForProperty(KernelTest kernel, String propertyName, return getValueForProperty(messages.get(0), propertyName, clazz); } - - public static String getMethod(Message message) { - return (String) ((Map)(message.getContent().get(Comm.DATA))).get(Comm.METHOD); - - } - } diff --git a/kernel/base/src/test/java/com/twosigma/beakerx/widgets/selectioncontainer/TabTest.java b/kernel/base/src/test/java/com/twosigma/beakerx/widgets/selectioncontainer/TabTest.java index 0997299096..05a374b2a8 100644 --- a/kernel/base/src/test/java/com/twosigma/beakerx/widgets/selectioncontainer/TabTest.java +++ b/kernel/base/src/test/java/com/twosigma/beakerx/widgets/selectioncontainer/TabTest.java @@ -29,7 +29,6 @@ import java.util.Map; import static com.twosigma.beakerx.widgets.TestWidgetUtils.getData; -import static com.twosigma.beakerx.widgets.TestWidgetUtils.getState; import static com.twosigma.beakerx.widgets.TestWidgetUtils.getValueForProperty; import static com.twosigma.beakerx.widgets.TestWidgetUtils.verifyInternalOpenCommMsgWitLayout; import static java.util.Arrays.asList; @@ -65,7 +64,7 @@ public void shouldSendCommOpenWhenCreateWithChildren() throws Exception { private void verifyChildren(List children) { Message message = kernel.getPublishedMessages().get(1); - Map data = getState(message); + Map data = getData(message); Object[] objects = (Object[]) data.get(Tab.CHILDREN); assertThat(objects[0]).isEqualTo(Tab.IPY_MODEL + children.get(0).getComm().getCommId()); assertThat(objects[1]).isEqualTo(Tab.IPY_MODEL + children.get(1).getComm().getCommId()); diff --git a/kernel/base/src/test/java/com/twosigma/beakerx/widgets/strings/TextTest.java b/kernel/base/src/test/java/com/twosigma/beakerx/widgets/strings/TextTest.java index 0bc2e7f070..b395242143 100644 --- a/kernel/base/src/test/java/com/twosigma/beakerx/widgets/strings/TextTest.java +++ b/kernel/base/src/test/java/com/twosigma/beakerx/widgets/strings/TextTest.java @@ -31,7 +31,6 @@ import java.security.NoSuchAlgorithmException; import static com.twosigma.beakerx.kernel.msg.JupyterMessages.COMM_OPEN; -import static com.twosigma.beakerx.widgets.TestWidgetUtils.getState; import static com.twosigma.beakerx.widgets.Widget.MODEL_NAME; import static com.twosigma.beakerx.widgets.Widget.MODEL_MODULE; import static com.twosigma.beakerx.widgets.Widget.VIEW_NAME; @@ -100,7 +99,7 @@ public static void verifyTextField( Message layout = SearchMessages.getLayoutForWidget(messages, widget); verifyTypeMsg(widget,COMM_OPEN); - Map data = getState(widget); + Map data = getData(widget); assertThat(data.get(LAYOUT)).isEqualTo(IPY_MODEL + layout.getContent().get(Comm.COMM_ID)); assertThat(data.get(MODEL_NAME)).isEqualTo(modelNameValue); assertThat(data.get(MODEL_MODULE)).isEqualTo(modelModuleValue); diff --git a/kernel/gradle/wrapper/gradle-wrapper.properties b/kernel/gradle/wrapper/gradle-wrapper.properties index e07f24de3b..0d7c22350d 100644 --- a/kernel/gradle/wrapper/gradle-wrapper.properties +++ b/kernel/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Jul 28 11:21:51 CEST 2017 +#Tue Jul 04 15:25:34 CEST 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-bin.zip diff --git a/kernel/groovy/src/test/java/com/twosigma/beakerx/groovy/examples/GroovyExamplesSetupTest.java b/kernel/groovy/src/test/java/com/twosigma/beakerx/groovy/examples/GroovyExamplesSetupTest.java index 50d6c1a90f..b6e9d40924 100644 --- a/kernel/groovy/src/test/java/com/twosigma/beakerx/groovy/examples/GroovyExamplesSetupTest.java +++ b/kernel/groovy/src/test/java/com/twosigma/beakerx/groovy/examples/GroovyExamplesSetupTest.java @@ -29,7 +29,6 @@ import java.io.Serializable; import java.util.Map; -import static com.twosigma.beakerx.widgets.TestWidgetUtils.getState; import static org.junit.Assert.assertTrue; public abstract class GroovyExamplesSetupTest { @@ -67,7 +66,7 @@ public void assertMessageExists(final String errorMessage, final String viewName private boolean isWidget(Message message, String viewNameValue) { if (message.getContent() != null) { - Map data = getState(message); + Map data = (Map) message.getContent().get("data"); if (data != null) { Serializable easyForm = data.get(Widget.VIEW_NAME); if (easyForm != null) { diff --git a/kernel/groovy/src/test/java/com/twosigma/beakerx/groovy/widgets/InteractiveTest.java b/kernel/groovy/src/test/java/com/twosigma/beakerx/groovy/widgets/InteractiveTest.java index e3f8f71037..9bc1f63cea 100644 --- a/kernel/groovy/src/test/java/com/twosigma/beakerx/groovy/widgets/InteractiveTest.java +++ b/kernel/groovy/src/test/java/com/twosigma/beakerx/groovy/widgets/InteractiveTest.java @@ -85,7 +85,7 @@ public void valueChangeMsgCallback_createDisplayDataMessage() throws Exception { comm.handleMsg(initSyncDataMessage(comm.getCommId(), "TEST")); //then Message display = SearchMessages.getListMessagesByType( - groovyKernel.getPublishedMessages(), JupyterMessages.DISPLAY_DATA).get(2); + groovyKernel.getPublishedMessages(), JupyterMessages.DISPLAY_DATA).get(1); Map data = (Map) display.getContent().get(Comm.DATA); Assertions.assertThat(data).isNotEmpty(); Assertions.assertThat(data.get(MessageCreator.TEXT_PLAIN)).isEqualTo("TEST");