Merge pull request #1284 from mathjax/fix/sre-root

Fix problem with sre-root

Author: dpvc

components/mjs/a11y/speech/speech.js

@@ -8,11 +8,11 @@ import {SpeechHandler} from '#js/a11y/speech.js';
 if (MathJax.loader) {
   let path = Package.resolvePath('[sre]', false);
   if (!hasWindow) {
-    if (MathJax.config.loader.require?.resolve) {
-      const require = MathJax.config.loader.require;
+    const REQUIRE = typeof require !== 'undefined' ? require : MathJax.config.loader.require;
+    if (REQUIRE?.resolve) {
       const pool = MathJax.config.options?.worker?.pool || 'speech-workerpool.js';
       path = path.replace(/\/bundle\/sre$/, '/cjs/a11y/sre');
-      path = require.resolve(`${path}/${pool}`).replace(/\/[^\/]*$/, '');
+      path = REQUIRE.resolve(`${path}/${pool}`).replace(/\/[^\/]*$/, '');
     } else {
       path = '';
     }

components/mjs/a11y/sre/sre.js

@@ -1,5 +1,4 @@
 import './lib/sre.js';
-import './sre_config.js';
 import * as Sre from '#js/a11y/sre.js';
 
 export {Sre};

components/mjs/a11y/sre/sre_config.js

@@ -0,0 +1,7 @@
+//
+//  Replacement for __dirname for sre-root directory
+//
+
+import { mjxRoot } from '@mathjax/src/components/root-pack.js';
+
+export const sreRoot = () => mjxRoot() + '/sre';

components/sre-pack.js

@@ -62,6 +62,10 @@ const PLUGINS = function (js, dir, target, font, jax, name) {
       /mjs\/components\/mjs\/root\.js/,
       '../../../components/root-pack.js'
     ),
+    new webpack.NormalModuleReplacementPlugin(
+      /mjs\/components\/mjs\/sre-root\.js/,
+      '../../../components/sre-pack.js'
+    ),
     new webpack.NormalModuleReplacementPlugin(
       /mathjax-full\/js\//,
       function (resource) {

components/webpack.common.cjs

@@ -1,6 +1,6 @@
 {
   "name": "@mathjax/src",
-  "version": "4.0.0-rc.1",
+  "version": "4.0.0-rc.2",
   "description": "Beautiful and accessible math in all browsers. MathJax is an open-source JavaScript display engine for LaTeX, MathML, and AsciiMath notation that works in all browsers and in server-side node applications. This package includes the source code as well as the packaged components.",
   "keywords": [
     "MathJax",
@@ -167,9 +167,9 @@
     ]
   },
   "dependencies": {
-    "@mathjax/mathjax-newcm-font": "4.0.0-rc.1",
+    "@mathjax/mathjax-newcm-font": "4.0.0-rc.2",
     "mhchemparser": "^4.2.1",
     "mj-context-menu": "^0.9.1",
-    "speech-rule-engine": "5.0.0-alpha.5"
+    "speech-rule-engine": "5.0.0-alpha.6"
   }
 }

package.json

@@ -30,5 +30,5 @@ declare const __dirname: string;
  * @return {string}   The MathJax component root directory
  */
 export function mjxRoot(): string {
-  return __dirname.replace(/[cm]js\/components\/[cm]js$/, (_) => 'bundle');
+  return __dirname.replace(/[cm]js\/components\/[cm]js$/, 'bundle');
 }

pnpm-lock.yaml

@@ -27,7 +27,7 @@
 declare const __dirname: string;
 
 /**
- * @return {string}   The MathJax component root directory
+ * @return {string}   The MathJax mjs SRE root directory
  */
 export function sreRoot(): string {
   return __dirname.replace(/components\/[cm]js$/, 'a11y/sre');

ts/components/cjs/root.ts

@@ -27,6 +27,6 @@
 export function mjxRoot(): string {
   return new URL(import.meta.url).pathname.replace(
     /[cm]js\/components\/[cm]js\/root.js$/,
-    (_) => 'bundle'
+    'bundle'
   );
 }