Merge pull request #1285 from mathjax/update/workers

Update weborker code to work with te CDN

Author: dpvc

components/mjs/a11y/speech/speech.js

@@ -7,18 +7,21 @@ import {SpeechHandler} from '#js/a11y/speech.js';
 
 if (MathJax.loader) {
   let path = Package.resolvePath('[sre]', false);
-  if (!hasWindow) {
+  let maps = Package.resolvePath('[mathmaps]', false);
+  if (hasWindow) {
+    path = new URL(path, location).href;
+    maps = new URL(maps, location).href;
+  } else {
     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}/package.json`).replace(/\/[^\/]*$/, '');
+      maps = REQUIRE.resolve(`${maps}/base.json`).replace(/\/[^\/]*$/, '');
     } else {
-      path = '';
+      path = maps = '';
     }
   }
   if (path) {
-    combineDefaults(MathJax.config, 'options', { worker: { path } });
+    combineDefaults(MathJax.config, 'options', { worker: { path, maps } });
   }
 }
 

components/mjs/a11y/sre/workerpool/config.json

@@ -67,7 +67,8 @@ export const dependencies = {
 export const paths = {
   tex: '[mathjax]/input/tex/extensions',
   mml: '[mathjax]/input/mml/extensions',
-  sre: '[mathjax]/sre'
+  sre: '[mathjax]/sre',
+  mathmaps: '[sre]/mathmaps',
 };
 
 export const provides = {

components/mjs/a11y/sre/workerpool/speech-workerpool.js

@@ -75,6 +75,7 @@ export const source = {
   'a11y/complexity': `${src}/a11y/complexity/complexity.js`,
   'a11y/explorer': `${src}/a11y/explorer/explorer.js`,
   'a11y/sre': `${src}/a11y/sre/sre.js`,
+  '[mathmaps]': `${src}/../../bundle/sre/mathmaps`,
   'ui/lazy': `${src}/ui/lazy/lazy.js`,
   'ui/menu': `${src}/ui/menu/menu.js`,
   'ui/safe': `${src}/ui/safe/safe.js`,

components/mjs/a11y/sre/workerpool/webpack.cjs

@@ -1,2 +1 @@
-import './init.js';
 export * from '#js/a11y/sre/sre.js';

components/mjs/dependencies.js

@@ -170,6 +170,6 @@
     "@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.6"
+    "speech-rule-engine": "5.0.0-alpha.7"
   }
 }