diff --git a/devtools/test_dashboard/index-mathjax3.html b/devtools/test_dashboard/index-mathjax3.html index c2365f1bd12..510e839fa7f 100644 --- a/devtools/test_dashboard/index-mathjax3.html +++ b/devtools/test_dashboard/index-mathjax3.html @@ -37,7 +37,7 @@

no MathJax: Apple: $2, Orange: $3

} }; - + diff --git a/devtools/test_dashboard/index-mathjax3chtml.html b/devtools/test_dashboard/index-mathjax3chtml.html index 99178717a07..795c5688703 100644 --- a/devtools/test_dashboard/index-mathjax3chtml.html +++ b/devtools/test_dashboard/index-mathjax3chtml.html @@ -60,7 +60,7 @@ } }; - + diff --git a/devtools/test_dashboard/index-strict.html b/devtools/test_dashboard/index-strict.html index 59a2ca658d9..6c309cd211b 100644 --- a/devtools/test_dashboard/index-strict.html +++ b/devtools/test_dashboard/index-strict.html @@ -22,7 +22,7 @@
- + diff --git a/devtools/test_dashboard/index.html b/devtools/test_dashboard/index.html index 3aa41a0b346..c2fc16aa4c5 100644 --- a/devtools/test_dashboard/index.html +++ b/devtools/test_dashboard/index.html @@ -21,7 +21,7 @@
- + diff --git a/package-lock.json b/package-lock.json index 1d5b49b4cca..20a59565e44 100644 --- a/package-lock.json +++ b/package-lock.json @@ -65,6 +65,8 @@ }, "devDependencies": { "@biomejs/biome": "1.8.3", + "@plotly/mathjax-v2": "npm:mathjax@2.7.5", + "@plotly/mathjax-v3": "npm:mathjax@^3.2.2", "amdefine": "^1.0.1", "assert": "^2.1.0", "browserify-transform-tools": "^1.7.0", @@ -102,8 +104,6 @@ "karma-viewport": "1.0.2", "lodash": "^4.17.21", "madge": "^8.0.0", - "mathjax-v2": "npm:mathjax@2.7.5", - "mathjax-v3": "npm:mathjax@^3.2.2", "minify-stream": "^2.1.0", "npm-link-check": "^5.0.1", "open": "^8.4.2", @@ -1103,6 +1103,20 @@ "node": ">=6.4.0" } }, + "node_modules/@plotly/mathjax-v2": { + "name": "mathjax", + "version": "2.7.5", + "resolved": "https://registry.npmjs.org/mathjax/-/mathjax-2.7.5.tgz", + "integrity": "sha512-OzsJNitEHAJB3y4IIlPCAvS0yoXwYjlo2Y4kmm9KQzyIBZt2d8yKRalby3uTRNN4fZQiGL2iMXjpdP1u2Rq2DQ==", + "dev": true + }, + "node_modules/@plotly/mathjax-v3": { + "name": "mathjax", + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/mathjax/-/mathjax-3.2.2.tgz", + "integrity": "sha512-Bt+SSVU8eBG27zChVewOicYs7Xsdt40qm4+UpHyX7k0/O9NliPc+x77k1/FEsPsjKPZGJvtRZM1vO+geW0OhGw==", + "dev": true + }, "node_modules/@plotly/point-cluster": { "version": "3.1.9", "resolved": "https://registry.npmjs.org/@plotly/point-cluster/-/point-cluster-3.1.9.tgz", @@ -6982,20 +6996,6 @@ "node": ">=0.10.0" } }, - "node_modules/mathjax-v2": { - "name": "mathjax", - "version": "2.7.5", - "resolved": "https://registry.npmjs.org/mathjax/-/mathjax-2.7.5.tgz", - "integrity": "sha512-OzsJNitEHAJB3y4IIlPCAvS0yoXwYjlo2Y4kmm9KQzyIBZt2d8yKRalby3uTRNN4fZQiGL2iMXjpdP1u2Rq2DQ==", - "dev": true - }, - "node_modules/mathjax-v3": { - "name": "mathjax", - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/mathjax/-/mathjax-3.2.2.tgz", - "integrity": "sha512-Bt+SSVU8eBG27zChVewOicYs7Xsdt40qm4+UpHyX7k0/O9NliPc+x77k1/FEsPsjKPZGJvtRZM1vO+geW0OhGw==", - "dev": true - }, "node_modules/media-typer": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", diff --git a/package.json b/package.json index 02e3f4a1df2..2bcb0c8d0d9 100644 --- a/package.json +++ b/package.json @@ -161,8 +161,8 @@ "karma-viewport": "1.0.2", "lodash": "^4.17.21", "madge": "^8.0.0", - "mathjax-v2": "npm:mathjax@2.7.5", - "mathjax-v3": "npm:mathjax@^3.2.2", + "@plotly/mathjax-v2": "npm:mathjax@2.7.5", + "@plotly/mathjax-v3": "npm:mathjax@^3.2.2", "minify-stream": "^2.1.0", "npm-link-check": "^5.0.1", "open": "^8.4.2", diff --git a/tasks/noci_test.sh b/tasks/noci_test.sh index 4d50039e206..96539f6653b 100755 --- a/tasks/noci_test.sh +++ b/tasks/noci_test.sh @@ -28,7 +28,7 @@ test_image () { $root/../orca/bin/orca.js graph \ $root/test/image/mocks/mapbox_osm-style.json \ $root/test/image/mocks/mapbox_density0-legend.json \ - --mathjax $root/node_modules/mathjax-v2/MathJax.js \ + --mathjax $root/node_modules/@plotly/mathjax-v2/MathJax.js \ --plotly $root/build/plotly.js \ --mapbox-access-token "pk.eyJ1IjoicGxvdGx5LWRvY3MiLCJhIjoiY2xpMGYyNWgxMGJhdzNzbXhtNGI0Nnk0aSJ9.0oBvi_UUZ0O1N0xk0yfRwg" \ --output-dir $root/test/image/baselines/ \ diff --git a/test/jasmine/bundle_tests/mathjax_config_test.js b/test/jasmine/bundle_tests/mathjax_config_test.js index 530564d889a..1d80b6ca933 100644 --- a/test/jasmine/bundle_tests/mathjax_config_test.js +++ b/test/jasmine/bundle_tests/mathjax_config_test.js @@ -28,8 +28,8 @@ describe('Test MathJax v' + mathjaxVersion + ' config test:', function() { } var src = mathjaxVersion === 3 ? - '/base/node_modules/mathjax-v3/es5/tex-svg.js' : - '/base/node_modules/mathjax-v2/MathJax.js?config=TeX-AMS_SVG'; + '/base/node_modules/@plotly/mathjax-v3/es5/tex-svg.js' : + '/base/node_modules/@plotly/mathjax-v2/MathJax.js?config=TeX-AMS_SVG'; loadScript(src, done); }); diff --git a/test/jasmine/bundle_tests/mathjax_test.js b/test/jasmine/bundle_tests/mathjax_test.js index 9aac4406653..4b5d03a4b4b 100644 --- a/test/jasmine/bundle_tests/mathjax_test.js +++ b/test/jasmine/bundle_tests/mathjax_test.js @@ -11,8 +11,8 @@ var mathjaxVersion = __karma__.config.mathjaxVersion; describe('Test MathJax v' + mathjaxVersion + ':', function() { beforeAll(function(done) { var src = mathjaxVersion === 3 ? - '/base/node_modules/mathjax-v3/es5/tex-svg.js' : - '/base/node_modules/mathjax-v2/MathJax.js?config=TeX-AMS-MML_SVG'; + '/base/node_modules/@plotly/mathjax-v3/es5/tex-svg.js' : + '/base/node_modules/@plotly/mathjax-v2/MathJax.js?config=TeX-AMS-MML_SVG'; // N.B. we have to load MathJax "dynamically" as Karma // does not undefined the MathJax's `?config=` parameter. diff --git a/test/jasmine/karma.conf.js b/test/jasmine/karma.conf.js index eb350abccfe..f66235d7593 100644 --- a/test/jasmine/karma.conf.js +++ b/test/jasmine/karma.conf.js @@ -119,8 +119,8 @@ if(isFullSuite) { var pathToCustomMatchers = path.join(__dirname, 'assets', 'custom_matchers.js'); var pathToSaneTopojsonDist = path.join(__dirname, '..', '..', 'node_modules', 'sane-topojson', 'dist'); -var pathToMathJax2 = path.join(__dirname, '..', '..', 'node_modules', 'mathjax-v2'); -var pathToMathJax3 = path.join(__dirname, '..', '..', 'node_modules', 'mathjax-v3'); +var pathToMathJax2 = path.join(__dirname, '..', '..', 'node_modules', '@plotly/mathjax-v2'); +var pathToMathJax3 = path.join(__dirname, '..', '..', 'node_modules', '@plotly/mathjax-v3'); var pathToVirtualWebgl = path.join(__dirname, '..', '..', 'node_modules', 'virtual-webgl', 'src', 'virtual-webgl.js'); var reporters = [];