merge 0543793

Author: Kully

codegen/validators.py

@@ -240,4 +240,4 @@ def write_data_validator_py(outdir, base_trace_node: TraceNode):
     # Write file
     # ----------
     filepath = opath.join(outdir, 'validators', '_data.py')
-    format_and_write_source_py(source, filepath)
+    format_and_write_source_py(source, filepath)

js/package-lock.json

@@ -20,20 +20,18 @@
   ],
   "scripts": {
     "clean": "rimraf dist/ && rimraf ../plotlywidget/static",
-    "build": "webpack",
-    "prepublish": "npm run clean && npm run build",
+    "prepublish": "webpack",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "devDependencies": {
-    "json-loader": "^0.5.4",
-    "webpack": "^3.5.5",
+    "webpack": "^3.10.0",
     "rimraf": "^2.6.1",
     "ify-loader": "^1.1.0"
   },
   "dependencies": {
     "plotly.js": "^1.35.2",
-    "@jupyter-widgets/base": "^1.0.4",
-    "lodash": "^4.0"
+    "@jupyter-widgets/base": "^1.0.0",
+    "lodash": "^4.17.4"
   },
   "jupyterlab": {
     "extension": "src/jupyterlab-plugin"

js/package.json

@@ -1,12 +1,3 @@
-// Entry point for the notebook bundle containing custom model definitions.
-//
-// Setup notebook base URL
-//
-// Some static assets may be required by the custom widget javascript. The base
-// url for the notebook is not known at build time and is therefore computed
-// dynamically.
-__webpack_public_path__ = document.querySelector('body').getAttribute('data-base-url') + 'nbextensions/plotlywidget/';
-
 // Export widget models and views, and the npm package version number.
 module.exports = require('./Figure.js');
 module.exports['version'] = require('../package.json').version;

js/src/index.js

@@ -5,8 +5,7 @@ var version = require('./package.json').version;
 // stored in a separate local variable.
 var rules = [
     { test: /\.css$/, use: ['style-loader', 'css-loader']},
-    { test: /\.json$/, use: 'json-loader' },
-    { test: /\.js$/, use: 'ify-loader' }
+    { test: /\.js$/, use: ['ify-loader']}
 ];