Merge remote-tracking branch 'origin/master' into scattergl_glpixelratio

 - and resolves conflicts in
 - src/traces/parcoords/parcoords.js
 - test/image/baselines/gl2d_parcoords_dark_background.png
 - test/image/mocks/gl2d_parcoords_dark_background.json

Author: archmoj

.circleci/config.yml

@@ -170,6 +170,12 @@ jobs:
             echo https://$CIRCLE_BUILD_NUM-$PROJECT_NUM-gh.circle-artifacts.com/0/dist/plotly.js
             echo https://$CIRCLE_BUILD_NUM-$PROJECT_NUM-gh.circle-artifacts.com/0/dist/plotly.min.js
             echo https://$CIRCLE_BUILD_NUM-$PROJECT_NUM-gh.circle-artifacts.com/0/dist/plot-schema.json
+      - run:
+          name: Test validation using node.js and jsdom
+          command: npm run test-plain-obj
+      - run:
+          name: Test plotly.min.js import using requirejs
+          command: npm run test-requirejs
       - run:
           name: Test plotly bundles againt unexpected characters
           command: npm run no-bad-char
@@ -184,9 +190,6 @@ jobs:
           environment:
             NODE_OPTIONS: --max_old_space_size=4096
           command: npm run no-dup-keys
-      - run:
-          name: Test plotly.min.js import using requirejs
-          command: npm run test-requirejs
 
 workflows:
   version: 2

.eslintignore

@@ -1,5 +1,4 @@
 node_modules
-vendor
 dist
 build
 

devtools/test_dashboard/index.html

@@ -19,7 +19,7 @@
   </div>
   <div id="snapshot"></div>
 
-  <script src="../../vendor/extras/mathjax/MathJax.js?config=TeX-AMS-MML_SVG"></script>
+  <script src="../../node_modules/mathjax/MathJax.js?config=TeX-AMS-MML_SVG"></script>
   <script id="source" src="../../build/plotly.js" charset="utf-8"></script>
   <script src="../../build/test_dashboard-bundle.js" charset="utf-8"></script>
 </body>

package-lock.json

@@ -43,11 +43,13 @@
     "test-syntax": "node tasks/test_syntax.js && npm run find-strings -- --no-output",
     "test-bundle": "node tasks/test_bundle.js",
     "test-requirejs": "node tasks/test_requirejs.js",
+    "test-plain-obj": "node tasks/test_plain_obj.js",
     "test": "npm run test-jasmine -- --nowatch && npm run test-bundle && npm run test-image && npm run test-export && npm run test-syntax && npm run lint",
     "start-test_dashboard": "node devtools/test_dashboard/server.js",
     "start-image_viewer": "node devtools/image_viewer/server.js",
     "start": "npm run start-test_dashboard",
     "baseline": "node tasks/baseline.js",
+    "noci-baseline": "npm run cibuild && ./tasks/noci_test.sh image && git checkout dist && echo 'Please do not commit unless the change was expected!'",
     "preversion": "check-node-version --node 12 --npm 6.14 && npm-link-check && npm ls --prod",
     "version": "npm run build && npm run no-bad-char && git add -A dist build src/version.js",
     "postversion": "node -e \"console.log('Version bumped and committed. If ok, run: git push && git push --tags')\"",
@@ -163,6 +165,7 @@
     "karma-viewport": "^1.0.7",
     "lodash": "^4.17.20",
     "madge": "^3.12.0",
+    "mathjax": "2.7.5",
     "minify-stream": "^2.1.0",
     "mkdirp": "^1.0.4",
     "node-sass": "^5.0.0",

package.json

@@ -755,6 +755,16 @@ function alignHTMLWith(_base, container, options) {
     };
 }
 
+exports.makeTextShadow = function(offset, color) {
+    var x = offset + 'px ';
+    var y = offset + 'px ';
+    var b = '1px ';
+    return x + y + b + color + ', ' +
+        '-' + x + '-' + y + b + color + ', ' +
+        x + '-' + y + b + color + ', ' +
+        '-' + x + y + b + color;
+};
+
 /*
  * Editable title
  * @param {d3.selection} context: the element being edited. Normally text,

src/lib/svg_text_utils.js

@@ -238,11 +238,7 @@ function performPlot(parcatsModels, graphDiv, layout, svg) {
             })
         .attr('alignment-baseline', 'middle')
 
-        .style('text-shadow',
-            paperColor + ' -1px  1px 2px, ' +
-            paperColor + ' 1px  1px 2px, ' +
-            paperColor + '  1px -1px 2px, ' +
-            paperColor + ' -1px -1px 2px')
+        .style('text-shadow', svgTextUtils.makeTextShadow(1, paperColor))
         .style('fill', 'rgb(0, 0, 0)')
         .attr('x',
             function(d) {

src/traces/parcats/parcats.js

@@ -652,12 +652,7 @@ module.exports = function parcoords(gd, cdModule, layout, callbacks) {
         .attr('stroke-width', '1px');
 
     axis.selectAll('text')
-        .style('text-shadow',
-            paperColor + ' 1px 1px 1px #fff, ' +
-            paperColor + ' -1px -1px 1px #fff, ' +
-            paperColor + ' 1px -1px 1px #fff, ' +
-            paperColor + ' -1px 1px 1px #fff'
-        )
+        .style('text-shadow', svgTextUtils.makeTextShadow(1, paperColor))
         .style('cursor', 'default');
 
     var axisHeading = axisOverlays.selectAll('.' + c.cn.axisHeading)

src/traces/parcoords/parcoords.js

@@ -15,6 +15,7 @@ var keyFun = gup.keyFun;
 var repeat = gup.repeat;
 var unwrap = gup.unwrap;
 var interpolateNumber = require('d3-interpolate').interpolateNumber;
+var svgTextUtils = require('../../lib/svg_text_utils');
 
 var Registry = require('../../registry');
 
@@ -1024,7 +1025,7 @@ module.exports = function(gd, svg, calcData, layout, callbacks) {
 
     nodeLabel
         .style('text-shadow', function(d) {
-            return d.horizontal ? '-1px 1px 1px #fff, 1px 1px 1px #fff, 1px -1px 1px #fff, -1px -1px 1px #fff' : 'none';
+            return d.horizontal ? svgTextUtils.makeTextShadow(1, '#fff') : 'none';
         })
         .each(function(d) {Drawing.font(nodeLabel, d.textFont);});
 

src/traces/sankey/render.js

@@ -26,9 +26,21 @@ test_jasmine () {
 # since the update to [email protected], we must use orca
 # as mapbox-gl versions >0.22.1 aren't supported on [email protected] used in the
 # 'old' image server
+#
+# due to mathjax upgrade to v2.7.5, we are unable to test mathjax mocks in the
+# 'old' image server and we use orca
+#
 test_image () {
     $root/../orca/bin/orca.js graph \
         $root/test/image/mocks/mapbox_* \
+        $root/test/image/mocks/mathjax.json \
+        $root/test/image/mocks/ternary-mathjax.json \
+        $root/test/image/mocks/table_plain_birds.json \
+        $root/test/image/mocks/table_wrapped_birds.json \
+        $root/test/image/mocks/parcats_grid_subplots.json \
+        $root/test/image/mocks/legend_mathjax_title_and_items.json \
+        $root/test/image/mocks/table_latex_multitrace_scatter.json \
+        --mathjax $root/node_modules/mathjax/MathJax.js \
         --plotly $root/build/plotly.js \
         --mapbox-access-token "pk.eyJ1IjoicGxvdGx5LWpzLXRlc3RzIiwiYSI6ImNrNG9meTJmOTAxa3UzZm10dWdteDQ2eWMifQ.2REjOFyIrleMqwS8H8y1-A" \
         --output-dir $root/test/image/baselines/ \