Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Update version to beta.3 #974

Merged
merged 3 commits into from
Jul 19, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions components/mjs/node-main/node-main.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

/*
Expand Down
4 changes: 4 additions & 0 deletions components/root-pack.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
//
// Do what __dirname does in webpack
//
export const esRoot = () => '/';
12 changes: 9 additions & 3 deletions components/webpack.common.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -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'
)
];

Expand Down Expand Up @@ -185,7 +189,7 @@ const RESOLVE = function (js, dir, target, libs) {
// The resolve object to use
//
return {
plugins: [new ResolveReplacementPlugin()],
plugins: [new ResolveReplacementPlugin()]
};
}

Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion components/webpack.config.cjs
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion components/webpack.config.mjs
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
18 changes: 8 additions & 10 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion ts/components/cjs/root.ts
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion ts/components/mjs/root.ts
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
4 changes: 2 additions & 2 deletions ts/components/version.ts
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -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';
2 changes: 1 addition & 1 deletion ts/input/mathml/mml3/cjs/xsltFilename.ts
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion ts/input/mathml/mml3/mjs/xsltFilename.ts
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion ts/output/svg/Wrappers/zero.ts
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion ts/ui/menu/mj-context-menu.ts
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion ts/util/asyncLoad/esm.ts
Original file line number Diff line number Diff line change
@@ -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.
Expand Down