Merge pull request #997 from mathjax/issue3086

Improve build tools for use with third-party extensions. (mathjax/MathJax#3086)
mathjax · Sep 15, 2023 · 4d2f170 · 4d2f170
2 parents 04fb966 + d2ea1c7
commit 4d2f170
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/components/bin/build b/components/bin/build
@@ -79,7 +79,7 @@ const EXCLUDE = new Map((config.exclude || []).map(name => [name, true]));  // f
 const EXCLUDESUBDIRS = !!config.excludeSubdirs;                             // exclude subdirectories or not
 const JS = config.js || config.mathjax || mjPath;                           // path to the compiled .js files
 const LIB = config.lib || './lib';                                          // path to the lib directory to create
-const TS = config.ts || JS.replace(/[cm]js$/, 'ts');                        // path to the .ts files
+const TS = config.ts || path.join(JS, '..', 'ts');                          // path to the .ts files
 const GLOBAL = config.global || mjGlobal;                                   // path to the global.js file
 const VERSION = config.version || mjGlobal.replace(/global/, 'version');    // path to the version.js file
 const TYPE = config.type || getType();                                      // the module type

diff --git a/components/bin/pack b/components/bin/pack
@@ -104,6 +104,7 @@ async function webpackLib(dir) {
     if (!config) return;
     const jsdir = (config.js ? path.resolve(dir, config.js).replace(/js$/, target) : jsPath);
     const jsRE = fileRegExp(jsdir);
+    const jsRE2 = (config.js ? fileRegExp(path.resolve(dir, config.js)) : /^$/);
     const libRE = fileRegExp(path.resolve(jsdir, '..', 'components'));
 
     //
@@ -131,7 +132,8 @@ async function webpackLib(dir) {
             .replace(rootRE, '[mathjax]')
             .replace(fontRE, '[$1]/$2')
             .replace(jsRE,   '[js]')
-            .replace(libRE,  '[lib]');
+            .replace(jsRE2,  '[js]')
+            .replace(libRE,  '[build]');
         if (name.charAt(0) !== '.' && name.charAt(0) !== '[') {
           name = path.relative(dir, name);
         }

diff --git a/components/webpack.common.cjs b/components/webpack.common.cjs
@@ -67,6 +67,7 @@ function fullPath(resource) {
 const PLUGINS = function (js, dir, target, font, jax, name) {
   //
   // Replace a11y/util and components/mjs/root with the webpack versions
+  //   and map mathjax-full/js to mathjax-full/${target}
   //
   const plugins = [
     new webpack.NormalModuleReplacementPlugin(
@@ -76,6 +77,12 @@ const PLUGINS = function (js, dir, target, font, jax, name) {
     new webpack.NormalModuleReplacementPlugin(
       /mjs\/components\/mjs\/root\.js/,
       '../../../components/root-pack.js'
+    ),
+    new webpack.NormalModuleReplacementPlugin(
+      /mathjax-full\/js\//,
+      function (resource) {
+        resource.request = resource.request.replace(/mathjax-full\/js\//, `mathjax-full/${target}/`);
+      }
     )
   ];