Merge pull request #974 from mathjax/v4.0-beta.3

dpvc · web-flow · commit 49db078a876c · 2023-07-19T14:04:01.000-04:00
Update version to beta.3
diff --git a/components/mjs/node-main/node-main.js b/components/mjs/node-main/node-main.js
@@ -58,6 +58,8 @@ if (path.basename(dir) === 'node-main') {
     return REQUIRE(name.charAt(0) === '.' ? path.resolve(ROOT, name) :
                    name.charAt(0) === '[' ? Package.resolvePath(name) : name);
   };
+} else {
+  CONFIG.paths.mathjax = dir;
 }
 
 /*
diff --git a/components/root-pack.js b/components/root-pack.js
@@ -0,0 +1,4 @@
+//
+//  Do what __dirname does in webpack
+//
+export const esRoot = () => '/';
diff --git a/components/webpack.common.cjs b/components/webpack.common.cjs
@@ -66,12 +66,16 @@ function fullPath(resource) {
  */
 const PLUGINS = function (js, dir, target, font, jax, name) {
   //
-  // Replace a11y/util with the webpack version
+  // Replace a11y/util and components/mjs/root with the webpack versions
   //
   const plugins = [
     new webpack.NormalModuleReplacementPlugin(
       /components\/[cm]js\/a11y\/util\.js/,
       './util-pack.js'
+    ),
+    new webpack.NormalModuleReplacementPlugin(
+      /mjs\/components\/mjs\/root\.js/,
+      '../../../components/root-pack.js'
     )
   ];
 
@@ -185,7 +189,7 @@ const RESOLVE = function (js, dir, target, libs) {
   // The resolve object to use
   //
   return {
-    plugins: [new ResolveReplacementPlugin()],
+    plugins: [new ResolveReplacementPlugin()]
   };
 }
 
@@ -197,10 +201,12 @@ const RESOLVE = function (js, dir, target, libs) {
  * @param {{
  *          name: string,     // The name of the component to create
  *          js: string,       // The path to the compiled .js files (default is mathjax js directory)
+ *          target: string,   // 'mjs' or 'cjs' (defaults to 'mjs')
+ *          bundle: string,   // name of sub-directory where packed files go (defaults to 'bundle')
  *          libs: string[],   // Array of paths to component lib directories to link against
  *          dir: string,      // The directory of the component being built
  *          dist: string,     // The path to the directory where the component .js file will be placed
- *                                (defaults to es5 or es6 in the same directory as the js directory)
+ *                                (defaults to the bundle directory in the same directory as the js directory)
  *          font: boolean,    // false to replace default font with no font
  *          jax: string,      // the jax whose default font should be redirected
  *        }}  options
diff --git a/components/webpack.config.cjs b/components/webpack.config.cjs
@@ -1,6 +1,6 @@
 /*************************************************************
  *
- *  Copyright (c) 2023-2023 The MathJax Consortium
+ *  Copyright (c) 2023 The MathJax Consortium
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/components/webpack.config.mjs b/components/webpack.config.mjs
@@ -1,6 +1,6 @@
 /*************************************************************
  *
- *  Copyright (c) 2023-2023 The MathJax Consortium
+ *  Copyright (c) 2023 The MathJax Consortium
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mathjax-full",
-  "version": "4.0.0-beta.2",
+  "version": "4.0.0-beta.3",
   "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",
@@ -134,7 +134,7 @@
     "webpack-cli": "^5.1.1"
   },
   "dependencies": {
-    "mathjax-modern-font": "^4.0.0-beta.1",
+    "mathjax-modern-font": "^4.0.0-beta.3",
     "mhchemparser": "^4.2.1",
     "mj-context-menu": "^0.9.1",
     "speech-rule-engine": "^4.1.0-beta.7"
diff --git a/ts/components/cjs/root.ts b/ts/components/cjs/root.ts
@@ -1,6 +1,6 @@
 /*************************************************************
  *
- *  Copyright (c) 2023-2023 The MathJax Consortium
+ *  Copyright (c) 2023 The MathJax Consortium
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/ts/components/mjs/root.ts b/ts/components/mjs/root.ts
@@ -1,6 +1,6 @@
 /*************************************************************
  *
- *  Copyright (c) 2023-2023 The MathJax Consortium
+ *  Copyright (c) 2023 The MathJax Consortium
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/ts/components/version.ts b/ts/components/version.ts
@@ -1,6 +1,6 @@
 /*************************************************************
  *
- *  Copyright (c) 2022-2023 The MathJax Consortium
+ *  Copyright (c) 2023 The MathJax Consortium
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -22,4 +22,4 @@
  * @author dpvc@mathjax.org (Davide Cervone)
  */
 
-export const VERSION = '4.0.0-beta.1';
+export const VERSION = '4.0.0-beta.3';
diff --git a/ts/input/mathml/mml3/cjs/xsltFilename.ts b/ts/input/mathml/mml3/cjs/xsltFilename.ts
@@ -1,6 +1,6 @@
 /*************************************************************
  *
- *  Copyright (c) 2023-2023 The MathJax Consortium
+ *  Copyright (c) 2023 The MathJax Consortium
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/ts/input/mathml/mml3/mjs/xsltFilename.ts b/ts/input/mathml/mml3/mjs/xsltFilename.ts
@@ -1,6 +1,6 @@
 /*************************************************************
  *
- *  Copyright (c) 2023-2023 The MathJax Consortium
+ *  Copyright (c) 2023 The MathJax Consortium
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/ts/output/svg/Wrappers/zero.ts b/ts/output/svg/Wrappers/zero.ts
@@ -1,6 +1,6 @@
 /*************************************************************
  *
- *  Copyright (c) 2023-2023 The MathJax Consortium
+ *  Copyright (c) 2023 The MathJax Consortium
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/ts/ui/menu/mj-context-menu.ts b/ts/ui/menu/mj-context-menu.ts
@@ -1,6 +1,6 @@
 /*************************************************************
  *
- *  Copyright (c) 2023-2023 The MathJax Consortium
+ *  Copyright (c) 2023 The MathJax Consortium
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/ts/util/asyncLoad/esm.ts b/ts/util/asyncLoad/esm.ts
@@ -1,6 +1,6 @@
 /*************************************************************
  *
- *  Copyright (c) 2023-2023 The MathJax Consortium
+ *  Copyright (c) 2023 The MathJax Consortium
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.

Original file line number	Diff line number	Diff line change
`@@ -58,6 +58,8 @@ if (path.basename(dir) === 'node-main') {`
`58`	`58`	`return REQUIRE(name.charAt(0) === '.' ? path.resolve(ROOT, name) :`
`59`	`59`	`name.charAt(0) === '[' ? Package.resolvePath(name) : name);`
`60`	`60`	`};`
	`61`	`+} else {`
	`62`	`+ CONFIG.paths.mathjax = dir;`
`61`	`63`	`}`
`62`	`64`
`63`	`65`	`/*`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +//
 +//  Do what __dirname does in webpack
 +//
 +export const esRoot = () => '/';
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`/*************************************************************`
`2`	`2`	`*`
`3`		`- * Copyright (c) 2023-2023 The MathJax Consortium`
	`3`	`+ * Copyright (c) 2023 The MathJax Consortium`
`4`	`4`	`*`
`5`	`5`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`6`	`6`	`* you may not use this file except in compliance with the License.`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`/*************************************************************`
`2`	`2`	`*`
`3`		`- * Copyright (c) 2022-2023 The MathJax Consortium`
	`3`	`+ * Copyright (c) 2023 The MathJax Consortium`
`4`	`4`	`*`
`5`	`5`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`6`	`6`	`* you may not use this file except in compliance with the License.`
`@@ -22,4 +22,4 @@`
`22`	`22`	`* @author [email protected] (Davide Cervone)`
`23`	`23`	`*/`
`24`	`24`
`25`		`-export const VERSION = '4.0.0-beta.1';`
	`25`	`+export const VERSION = '4.0.0-beta.3';`