Skip to content

Commit 808dd82

Browse files
authored
Merge pull request #7394 from plotly/change-mathjax-packaging
Update to use @plotly/mathjax-v(2|3) instead of just mathjax-v(2|3)
2 parents b1c9ce5 + 6b42340 commit 808dd82

File tree

10 files changed

+29
-29
lines changed

10 files changed

+29
-29
lines changed

devtools/test_dashboard/index-mathjax3.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ <h4>no MathJax: Apple: $2, Orange: $3</h4>
3737
}
3838
};
3939
</script>
40-
<script src="../../node_modules/mathjax-v3/es5/tex-svg.js"></script>
40+
<script src="../../node_modules/@plotly/mathjax-v3/es5/tex-svg.js"></script>
4141
<script charset="utf-8" id="source" src="../../build/plotly.js" type="module"></script>
4242
<script charset="utf-8" src="../../build/test_dashboard-bundle.js"></script>
4343
</body>

devtools/test_dashboard/index-mathjax3chtml.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
}
6161
};
6262
</script>
63-
<script src="../../node_modules/mathjax-v3/es5/tex-chtml.js"></script>
63+
<script src="../../node_modules/@plotly/mathjax-v3/es5/tex-chtml.js"></script>
6464

6565
<script charset="utf-8" id="source" src="../../build/plotly.js" type="module"></script>
6666
<script charset="utf-8" src="../../build/test_dashboard-bundle.js"></script>

devtools/test_dashboard/index-strict.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
</div>
2323
<div id="snapshot"></div>
2424

25-
<script src="../../node_modules/mathjax-v2/MathJax.js?config=TeX-AMS-MML_SVG"></script>
25+
<script src="../../node_modules/@plotly/mathjax-v2/MathJax.js?config=TeX-AMS-MML_SVG"></script>
2626
<script charset="utf-8" id="source" src="../../build/plotly.js"></script>
2727
<script charset="utf-8" src="../../build/test_dashboard-bundle.js"></script>
2828
</body>

devtools/test_dashboard/index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
</div>
2222
<div id="snapshot"></div>
2323

24-
<script src="../../node_modules/mathjax-v2/MathJax.js?config=TeX-AMS-MML_SVG"></script>
24+
<script src="../../node_modules/@plotly/mathjax-v2/MathJax.js?config=TeX-AMS-MML_SVG"></script>
2525
<script charset="utf-8" id="source" src="../../build/plotly.js"></script>
2626
<script charset="utf-8" src="../../build/test_dashboard-bundle.js"></script>
2727
</body>

package-lock.json

+16-16
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,8 @@
161161
"karma-viewport": "1.0.2",
162162
"lodash": "^4.17.21",
163163
"madge": "^8.0.0",
164-
"mathjax-v2": "npm:mathjax@2.7.5",
165-
"mathjax-v3": "npm:mathjax@^3.2.2",
164+
"@plotly/mathjax-v2": "npm:mathjax@2.7.5",
165+
"@plotly/mathjax-v3": "npm:mathjax@^3.2.2",
166166
"minify-stream": "^2.1.0",
167167
"npm-link-check": "^5.0.1",
168168
"open": "^8.4.2",

tasks/noci_test.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ test_image () {
2828
$root/../orca/bin/orca.js graph \
2929
$root/test/image/mocks/mapbox_osm-style.json \
3030
$root/test/image/mocks/mapbox_density0-legend.json \
31-
--mathjax $root/node_modules/mathjax-v2/MathJax.js \
31+
--mathjax $root/node_modules/@plotly/mathjax-v2/MathJax.js \
3232
--plotly $root/build/plotly.js \
3333
--mapbox-access-token "pk.eyJ1IjoicGxvdGx5LWRvY3MiLCJhIjoiY2xpMGYyNWgxMGJhdzNzbXhtNGI0Nnk0aSJ9.0oBvi_UUZ0O1N0xk0yfRwg" \
3434
--output-dir $root/test/image/baselines/ \

test/jasmine/bundle_tests/mathjax_config_test.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ describe('Test MathJax v' + mathjaxVersion + ' config test:', function() {
2828
}
2929

3030
var src = mathjaxVersion === 3 ?
31-
'/base/node_modules/mathjax-v3/es5/tex-svg.js' :
32-
'/base/node_modules/mathjax-v2/MathJax.js?config=TeX-AMS_SVG';
31+
'/base/node_modules/@plotly/mathjax-v3/es5/tex-svg.js' :
32+
'/base/node_modules/@plotly/mathjax-v2/MathJax.js?config=TeX-AMS_SVG';
3333

3434
loadScript(src, done);
3535
});

test/jasmine/bundle_tests/mathjax_test.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ var mathjaxVersion = __karma__.config.mathjaxVersion;
1111
describe('Test MathJax v' + mathjaxVersion + ':', function() {
1212
beforeAll(function(done) {
1313
var src = mathjaxVersion === 3 ?
14-
'/base/node_modules/mathjax-v3/es5/tex-svg.js' :
15-
'/base/node_modules/mathjax-v2/MathJax.js?config=TeX-AMS-MML_SVG';
14+
'/base/node_modules/@plotly/mathjax-v3/es5/tex-svg.js' :
15+
'/base/node_modules/@plotly/mathjax-v2/MathJax.js?config=TeX-AMS-MML_SVG';
1616

1717
// N.B. we have to load MathJax "dynamically" as Karma
1818
// does not undefined the MathJax's `?config=` parameter.

test/jasmine/karma.conf.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,8 @@ if(isFullSuite) {
119119

120120
var pathToCustomMatchers = path.join(__dirname, 'assets', 'custom_matchers.js');
121121
var pathToSaneTopojsonDist = path.join(__dirname, '..', '..', 'node_modules', 'sane-topojson', 'dist');
122-
var pathToMathJax2 = path.join(__dirname, '..', '..', 'node_modules', 'mathjax-v2');
123-
var pathToMathJax3 = path.join(__dirname, '..', '..', 'node_modules', 'mathjax-v3');
122+
var pathToMathJax2 = path.join(__dirname, '..', '..', 'node_modules', '@plotly/mathjax-v2');
123+
var pathToMathJax3 = path.join(__dirname, '..', '..', 'node_modules', '@plotly/mathjax-v3');
124124
var pathToVirtualWebgl = path.join(__dirname, '..', '..', 'node_modules', 'virtual-webgl', 'src', 'virtual-webgl.js');
125125

126126
var reporters = [];

0 commit comments

Comments
 (0)