restyle/relayout refactor

package.json

@@ -119,7 +119,7 @@
     "gzip-size": "^3.0.0",
     "image-size": "^0.5.1",
     "jasmine-core": "^2.4.1",
-    "jsdom": "^9.5.0",
+    "jsdom": "^11.2.0",
     "karma": "^1.5.0",
     "karma-browserify": "^5.1.1",
     "karma-chrome-launcher": "^2.0.0",

tasks/bundle.js

@@ -18,25 +18,25 @@ var DEV = (arg === 'dev') || (arg === '--dev');
 
 
 // Check if style and font build files are there
-var doesFileExist = common.doesFileExist;
-if(!doesFileExist(constants.pathToCSSBuild) || !doesFileExist(constants.pathToFontSVG)) {
-    throw new Error([
-        'build/ is missing one or more files',
-        'Please run `npm run preprocess` first'
-    ].join('\n'));
-}
+// var doesFileExist = common.doesFileExist;
+// if(!doesFileExist(constants.pathToCSSBuild) || !doesFileExist(constants.pathToFontSVG)) {
+//     throw new Error([
+//         'build/ is missing one or more files',
+//         'Please run `npm run preprocess` first'
+//     ].join('\n'));
+// }
 
-// Browserify plotly.js
-_bundle(constants.pathToPlotlyIndex, constants.pathToPlotlyDist, {
-    standalone: 'Plotly',
-    debug: DEV,
-    pathToMinBundle: constants.pathToPlotlyDistMin
-});
+// // Browserify plotly.js
+// _bundle(constants.pathToPlotlyIndex, constants.pathToPlotlyDist, {
+//     standalone: 'Plotly',
+//     debug: DEV,
+//     pathToMinBundle: constants.pathToPlotlyDistMin
+// });
 
-// Browserify the geo assets
-_bundle(constants.pathToPlotlyGeoAssetsSrc, constants.pathToPlotlyGeoAssetsDist, {
-    standalone: 'PlotlyGeoAssets'
-});
+// // Browserify the geo assets
+// _bundle(constants.pathToPlotlyGeoAssetsSrc, constants.pathToPlotlyGeoAssetsDist, {
+//     standalone: 'PlotlyGeoAssets'
+// });
 
 // Browserify the plotly.js with meta
 _bundle(constants.pathToPlotlyIndex, constants.pathToPlotlyDistWithMeta, {
@@ -45,11 +45,11 @@ _bundle(constants.pathToPlotlyIndex, constants.pathToPlotlyDistWithMeta, {
     then: makeSchema(constants.pathToPlotlyDistWithMeta, constants.pathToSchema)
 });
 
-// Browserify the plotly.js partial bundles
-constants.partialBundlePaths.forEach(function(pathObj) {
-    _bundle(pathObj.index, pathObj.dist, {
-        standalone: 'Plotly',
-        debug: DEV,
-        pathToMinBundle: pathObj.distMin
-    });
-});
+// // Browserify the plotly.js partial bundles
+// constants.partialBundlePaths.forEach(function(pathObj) {
+//     _bundle(pathObj.index, pathObj.dist, {
+//         standalone: 'Plotly',
+//         debug: DEV,
+//         pathToMinBundle: pathObj.distMin
+//     });
+// });

tasks/util/make_schema.js

@@ -1,25 +1,24 @@
 var fs = require('fs');
 var path = require('path');
-var jsdom = require('jsdom');
+var JSDOM = require('jsdom').JSDOM;
 
 module.exports = function makeSchema(plotlyPath, schemaPath) {
     return function() {
         var plotlyjsCode = fs.readFileSync(plotlyPath, 'utf-8');
-        jsdom.env({
-            html: '<div></div>',
-            src: [plotlyjsCode],
-            done: function(err, window) {
-                if(err) {
-                    console.log(err);
-                    return;
-                }
 
-                var plotSchema = window.Plotly.PlotSchema.get();
-                var plotSchemaStr = JSON.stringify(plotSchema, null, 4);
-                fs.writeFileSync(schemaPath, plotSchemaStr);
+        var w = new JSDOM('', {runScripts: 'dangerously'}).window;
 
-                console.log('ok ' + path.basename(schemaPath));
-            }
-        });
+        // jsdom by itself doesn't support getContext, and adding the npm canvas
+        // package is annoying and platform-dependent.
+        // see https://github.com/tmpvar/jsdom/issues/1782
+        w.HTMLCanvasElement.prototype.getContext = function() { return null; };
+
+        w.eval(plotlyjsCode);
+
+        var plotSchema = w.Plotly.PlotSchema.get();
+        var plotSchemaStr = JSON.stringify(plotSchema, null, 4);
+        fs.writeFileSync(schemaPath, plotSchemaStr);
+
+        console.log('ok ' + path.basename(schemaPath));
     };
 };