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

Author: jonmmease

.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

@@ -164,6 +164,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

@@ -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/ \

tasks/noci_test.sh

@@ -58,8 +58,8 @@ function getInfoContent() {
         '<script src="mathjax/MathJax.js?config=TeX-AMS-MML_SVG"></script>',
         '```',
         '',
-        'You can get the relevant MathJax files in `./vendor/extras/mathjax/` or from the internet',
-        'e.g. "https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.3/MathJax.js?config=TeX-AMS-MML_SVG.js"',
+        'You can get the relevant MathJax files from the internet e.g.',
+        '"https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS-MML_SVG.js"',
         '',
         'By default, plotly.js will modify the global MathJax configuration on load.',
         'This can lead to undesirable behavior if plotly.js is loaded alongside',

tasks/stats.js

@@ -6,7 +6,6 @@ var pathToSrc = path.join(pathToRoot, 'src/');
 var pathToLib = path.join(pathToRoot, 'lib/');
 var pathToImageTest = path.join(pathToRoot, 'test/image');
 var pathToStrictD3Module = path.join(pathToRoot, 'test/strict-d3.js');
-var pathToVendor = path.join(pathToRoot, 'vendor/');
 var pathToDist = path.join(pathToRoot, 'dist/');
 var pathToBuild = path.join(pathToRoot, 'build/');
 
@@ -45,7 +44,6 @@ module.exports = {
     pathToSrc: pathToSrc,
     pathToLib: pathToLib,
     pathToBuild: pathToBuild,
-    pathToVendor: pathToVendor,
     pathToDist: pathToDist,
 
     pathToPlotlyIndex: path.join(pathToLib, 'index.js'),