josdejong · josdejong · Sep 20, 2020 · Aug 5, 2020 · Aug 5, 2020 · Aug 5, 2020
diff --git a/.babelrc b/.babelrc
@@ -4,8 +4,6 @@
   ],
   "plugins": ["@babel/plugin-transform-object-assign"],
   "ignore": [
-    "dist/*.js",
-    "lib/**/*.js",
-    "es/**/*.js"
+    "lib/**/*.js"
   ]
-}
+}
diff --git a/.gitignore b/.gitignore
@@ -2,13 +2,13 @@
 .vscode
 .c9
 _site
-coverage
 *swp
-node_modules
 *.log
-dist
-lib
-es
-.nyc_output
 *.bak
+
+node_modules
+.nyc_output
+/coverage
+
+lib
 *.generated.js
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,5 @@
 language: node_js
 node_js:
-  - 10
   - 12
   - 14
 
@@ -12,6 +11,9 @@ jobs:
       script: npm run lint
       node_js: lts/*
       name: Lint
+    - script: npm run test:src:transpile
+      node_js: 10
+      name: Node 10
     - script: 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then npm run test:browserstack; else npm run test:browser; fi'
       node_js: lts/*
       name: Browser Test

diff --git a/README.md b/README.md
@@ -102,8 +102,8 @@ Then, the project can be build by executing the build script via npm:
 
     npm run build
 
-This will build the library math.js and math.min.js from the source files and
-put them in the folder dist.
+This will build ESM output, CommonJS output, and the bundle math.js 
+from the source files and put them in the folder lib.
 
 
 ## Test

diff --git a/bin/cli.js b/bin/cli.js
@@ -58,7 +58,7 @@ const PRECISION = 14 // decimals
  * @return {*}
  */
 function getMath () {
-  return require('../lib/bundleAny')
+  return require('../lib/cjs/defaultInstance.js').default
 }
 
 /**

diff --git a/bin/package.json b/bin/package.json
@@ -0,0 +1,3 @@
+{
+  "type": "commonjs"
+}
diff --git a/bin/repl.js b/bin/repl.js
@@ -4,7 +4,7 @@
  * This simply preloads mathjs and drops you into a REPL to
  * help interactive debugging.
  **/
-global.math = require('../lib/bundleAny')
+global.math = require('../lib/cjs/defaultInstance.js').default
 const repl = require('repl')
 
 repl.start({ useGlobal: true })
diff --git a/examples/browser/angle_configuration.html b/examples/browser/angle_configuration.html
@@ -15,7 +15,7 @@
     }
   </style>
 
-  <script src="../../dist/math.js"></script>
+  <script src="../../lib/browser/math.js"></script>
 </head>
 <body>
 

diff --git a/examples/browser/basic_usage.html b/examples/browser/basic_usage.html
@@ -3,11 +3,13 @@
 <head>
   <meta charset="utf-8">
   <title>math.js | basic usage</title>
-  <script src="../../dist/math.js"></script>
+  <script src="../../lib/browser/math.js"></script>
 </head>
 <body>
 
 <script>
+  console.log('math', math)
+
   function print(value) {
     const precision = 14
     document.write(math.format(value, precision) + '<br>')

diff --git a/examples/browser/currency_conversion.html b/examples/browser/currency_conversion.html
@@ -4,7 +4,7 @@
   <meta charset="utf-8">
   <title>math.js | currency conversion</title>
 
-  <script src="../../dist/math.js"></script>
+  <script src="../../lib/browser/math.js"></script>
 
   <style>
     body,

diff --git a/examples/browser/custom_separators.html b/examples/browser/custom_separators.html
@@ -15,7 +15,7 @@
     }
   </style>
 
-  <script src="../../dist/math.js"></script>
+  <script src="../../lib/browser/math.js"></script>
 </head>
 <body>
 

diff --git a/examples/browser/plot.html b/examples/browser/plot.html
@@ -3,7 +3,7 @@
 <head>
   <meta charset="utf-8">
   <title>math.js | plot</title>
-  <script src="../../dist/math.js"></script>
+  <script src="../../lib/browser/math.js"></script>
 
   <script src="https://cdn.plot.ly/plotly-1.35.2.min.js"></script>
 

diff --git a/examples/browser/pretty_printing_with_mathjax.html b/examples/browser/pretty_printing_with_mathjax.html
@@ -4,7 +4,7 @@
   <meta charset="utf-8">
   <title>math.js | pretty printing with MathJax</title>
 
-  <script src="../../dist/math.js"></script>
+  <script src="../../lib/browser/math.js"></script>
   <script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.3/MathJax.js?config=TeX-AMS-MML_HTMLorMML.js"></script>
 
   <style>

diff --git a/examples/browser/printing_html.html b/examples/browser/printing_html.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>math.js | printing HTML</title>
 
-	<script src="../../dist/math.js"></script>
+	<script src="../../lib/browser/math.js"></script>
 
 	<style>
 		body {

diff --git a/examples/browser/requirejs_loading.html b/examples/browser/requirejs_loading.html
@@ -9,7 +9,7 @@
 
 <script>
   // load math.js using require.js
-  require(['../../dist/math.js'], function (math) {
+  require(['../../lib/browser/math.js'], function (math) {
     // evaluate some expression
     const result = math.evaluate('1.2 * (2 + 4.5)')
     document.write(result)

diff --git a/examples/browser/rocket_trajectory_optimization.html b/examples/browser/rocket_trajectory_optimization.html
@@ -4,7 +4,7 @@
   <meta charset="utf-8">
   <title>math.js | rocket trajectory optimization</title>
 
-  <script src="../../dist/math.js"></script>
+  <script src="../../lib/browser/math.js"></script>
   <script src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.5.0/Chart.min.js"></script>
 
   <style>

diff --git a/examples/browser/webworkers/worker.js b/examples/browser/webworkers/worker.js
@@ -1,4 +1,4 @@
-importScripts('../../../dist/math.js')
+importScripts('../../../lib/browser/math.js')
 
 // create a parser
 const parser = self.math.parser()

diff --git a/examples/package.json b/examples/package.json
@@ -0,0 +1,3 @@
+{
+  "type": "commonjs"
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,7 +15,7 @@ @@
         }
       </style>
-      <script src="../../dist/math.js"></script>
+      <script src="../../lib/browser/math.js"></script>
     </head>
     <body>
@@ Expand Down @@