plotly · archmoj · Feb 18, 2021 · Feb 11, 2021 · Feb 11, 2021 · Feb 10, 2021
diff --git a/.eslintignore b/.eslintignore
@@ -1,5 +1,4 @@
 node_modules
-vendor
 dist
 build
 

diff --git a/devtools/test_dashboard/index.html b/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>

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -163,6 +163,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",

diff --git a/tasks/noci_test.sh b/tasks/noci_test.sh
@@ -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/ \

diff --git a/tasks/stats.js b/tasks/stats.js
@@ -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',

diff --git a/tasks/util/constants.js b/tasks/util/constants.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'),

diff --git a/test/image/baselines/legend_mathjax_title_and_items.png b/test/image/baselines/legend_mathjax_title_and_items.png
diff --git a/test/image/baselines/mathjax.png b/test/image/baselines/mathjax.png
diff --git a/test/image/baselines/parcats_grid_subplots.png b/test/image/baselines/parcats_grid_subplots.png
diff --git a/test/image/baselines/table_latex_multitrace_scatter.png b/test/image/baselines/table_latex_multitrace_scatter.png
diff --git a/test/image/baselines/table_plain_birds.png b/test/image/baselines/table_plain_birds.png
diff --git a/test/image/baselines/table_wrapped_birds.png b/test/image/baselines/table_wrapped_birds.png
diff --git a/test/image/baselines/ternary-mathjax.png b/test/image/baselines/ternary-mathjax.png
diff --git a/test/image/compare_pixels_test.js b/test/image/compare_pixels_test.js
@@ -80,6 +80,20 @@ function unique(value, index, self) {
 }
 allMockList = allMockList.filter(unique);
 
+// Skip MathJax mocks that are tested using orca in noci_test
+var MATHJAX_LIST = [
+    'mathjax',
+    'ternary-mathjax',
+    'table_plain_birds',
+    'table_wrapped_birds',
+    'parcats_grid_subplots',
+    'legend_mathjax_title_and_items',
+    'table_latex_multitrace_scatter'
+];
+allMockList = allMockList.filter(function(e) {
+    return MATHJAX_LIST.indexOf(e) === -1;
+});
+
 // filter out untestable mocks if no pattern is specified (ie. we're testing all mocks)
 // or if flag '--filter' is provided
 console.log('');

diff --git a/test/image/index.html b/test/image/index.html
@@ -2,7 +2,7 @@
 <html>
 <body>
 <!-- this index file gets copied in to the image server docker -->
-<script src="../plotly.js/vendor/extras/mathjax/MathJax.js?config=TeX-AMS-MML_SVG"></script>
+<script src="../plotly.js/node_modules/mathjax/MathJax.js?config=TeX-AMS-MML_SVG"></script>
 <script src="../plotly.js/build/plotly.js" charset="utf-8"></script>
 <script src="../plotly.js/build/plotly-geo-assets.js" charset="utf-8"></script>
 <script src="./main.js"></script>

diff --git a/test/jasmine/bundle_tests/mathjax_test.js b/test/jasmine/bundle_tests/mathjax_test.js
@@ -24,7 +24,7 @@ describe('Test MathJax:', function() {
         mathJaxScriptTag.onerror = function() {
             fail('MathJax failed to load');
         };
-        mathJaxScriptTag.src = '/base/vendor/extras/mathjax/MathJax.js?config=TeX-AMS-MML_SVG';
+        mathJaxScriptTag.src = '/base/node_modules/mathjax/MathJax.js?config=TeX-AMS-MML_SVG';
         document.body.appendChild(mathJaxScriptTag);
     });
 

diff --git a/test/jasmine/karma.conf.js b/test/jasmine/karma.conf.js
@@ -122,7 +122,7 @@ var pathToJQuery = path.join(__dirname, 'assets', 'jquery-1.8.3.min.js');
 var pathToCustomMatchers = path.join(__dirname, 'assets', 'custom_matchers.js');
 var pathToUnpolyfill = path.join(__dirname, 'assets', 'unpolyfill.js');
 var pathToSaneTopojsonDist = path.join(__dirname, '..', '..', 'node_modules', 'sane-topojson', 'dist');
-var pathToMathJax = path.join(constants.pathToVendor, 'extras', 'mathjax');
+var pathToMathJax = path.join(__dirname, '..', '..', 'node_modules', 'mathjax');
 
 var reporters = [];
 if(argv['report-progress'] || argv['report-spec'] || argv['report-dots']) {
@@ -180,7 +180,7 @@ func.defaultConfig = {
     files: [
         pathToCustomMatchers,
         pathToUnpolyfill,
-        // available to fetch from /base/vendor/extras/mathjax/
+        // available to fetch from /base/node_modules/mathjax/
         // more info: http://karma-runner.github.io/3.0/config/files.html
         {pattern: pathToMathJax + '/**', included: false, watched: false, served: true},
         // available to fetch from /base/node_modules/sane-topojson/dist/

diff --git a/vendor/extras/mathjax/MathJax.js b/vendor/extras/mathjax/MathJax.js
diff --git a/vendor/extras/mathjax/config/TeX-AMS-MML_SVG.js b/vendor/extras/mathjax/config/TeX-AMS-MML_SVG.js
diff --git a/vendor/extras/mathjax/extensions/FontWarnings.js b/vendor/extras/mathjax/extensions/FontWarnings.js
diff --git a/vendor/extras/mathjax/extensions/HTML-CSS/handle-floats.js b/vendor/extras/mathjax/extensions/HTML-CSS/handle-floats.js
diff --git a/vendor/extras/mathjax/extensions/HelpDialog.js b/vendor/extras/mathjax/extensions/HelpDialog.js
-Original file line number
+Diff line change
@@ -1,5 +1,4 @@
     node_modules
-    vendor
     dist
     build
@@ Expand Down @@