Merge pull request #1304 from mathjax/update/node-main

Improve loading of @mathjax/src by import and require

Author: dpvc

components/mjs/node-main/node-main.cjs

@@ -2,4 +2,4 @@ if (!global.MathJax) global.MathJax = {};
 
 global.MathJax.__dirname = __dirname;
 
-module.exports = require('./node-main.js');
+module.exports = require('./node-main.js').MathJax;

components/mjs/node-main/node-main.js

@@ -27,8 +27,10 @@ import '../core/core.js';
 import '../adaptors/liteDOM/liteDOM.js';
 import {source} from '../source.js';
 
-const path = eval('require("path")');          // get path from node, not webpack
-const dir = global.MathJax.config.__dirname;   // set up by node-main.mjs or node-main.cjs
+const MathJax = global.MathJax;
+
+const path = eval('require("path")');   // get path from node, not webpack
+const dir = MathJax.config.__dirname;   // set up by node-main.mjs or node-main.cjs
 
 /*
  * Set up the initial configuration
@@ -78,7 +80,7 @@ MathJax._.mathjax.mathjax.asyncLoad = function (name) {
  * The init() function returns a promise that is resolved when MathJax is loaded and ready, and that
  * is passed the MathJax global variable when it is called.
  */
-const init = (config = {}) => {
+const init = MathJax.init = (config = {}) => {
   combineConfig(MathJax.config, config);
   return Loader.load(...CONFIG.load)
     .then(() => CONFIG.ready())
@@ -88,6 +90,6 @@ const init = (config = {}) => {
 }
 
 /*
- * Export the init() function
+ * Export MathJax (with its init() function)
  */
-export {init};
+export {MathJax};

components/mjs/node-main/node-main.mjs

@@ -1,2 +1,4 @@
 import './node-main-setup.mjs';
-export * from './node-main.js';
+import {MathJax} from './node-main.js';
+export default MathJax;
+export const init = MathJax.init;

components/mjs/node-main/webpack.cjs

@@ -1,8 +1,8 @@
 module.exports = (pkg) => {
   pkg.output.library = {
-    name: 'init',
+    name: 'MathJax',
     type: 'commonjs',
-    export: 'init'
+    export: ['MathJax'],
   }
   return pkg;
-}
+}