perfected umd

nicolas-van · Dec 14, 2020 · 748d690 · 748d690
1 parent c5c142e
commit 748d690
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 29 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 /node_modules
 /dist
 /coverage
+/babel.config.cjs
diff --git a/babel-browser.config.cjs b/babel-browser.config.cjs
@@ -0,0 +1,9 @@
+module.exports = {
+  presets: [
+    ['@babel/preset-env', {
+      targets: {
+        ie: '8'
+      }
+    }]
+  ]
+}
diff --git a/babel-node.config.cjs b/babel-node.config.cjs
@@ -0,0 +1,9 @@
+module.exports = {
+  presets: [
+    ['@babel/preset-env', {
+      targets: {
+        node: '15.4.0'
+      }
+    }]
+  ]
+}
diff --git a/babel.config.cjs b/babel.config.cjs
diff --git a/dev/test-umd.html b/dev/test-umd.html
@@ -2,11 +2,10 @@
   <head>
     <script src="../dist/modern-async.umd.js"></script>
     <script>
-      console.log(unknown)
-      /*
-      window.modernAsync.asyncRoot(async () => {
+      modernAsync.asyncRoot(async () => {
+        await modernAsync.delay()
         console.log('hello')
-      })*/
+      })
     </script>
   </head>
 </html>
diff --git a/jest-node.config.cjs b/jest-node.config.cjs
@@ -172,7 +172,7 @@ module.exports = {
   // A map from regular expressions to paths to transformers
   // transform: {},
   transform: {
-    '\\.mjs': 'babel-jest'
+    '\\.mjs': ['babel-jest', {}]
   },
 
   // An array of regexp pattern strings that are matched against all source file paths, matched files will

diff --git a/package.json b/package.json
@@ -11,13 +11,15 @@
   },
   "browser": "./src/dist/modern-async.umd.js",
   "scripts": {
-    "build": "rollup -c rollup.config.js",
+    "build": "npm run set-babel-browser && rollup -c rollup.config.js",
     "test": "npm run lint && npm run coverage",
     "coverage": "npm run jest-node -- --coverage",
     "lint": "eslint -c .eslintrc.cjs \"src/**/*.mjs\"",
-    "jest-node": "jest --config=./jest-node.config.cjs",
+    "jest-node": "npm run set-babel-node && jest --config=./jest-node.config.cjs",
     "docs": "jsdoc -c .jsdoc.json && node dev/docs-collect-version-numbers.cjs",
-    "babel": "babel --ignore \"**/*.test.js\" --out-dir dist/babel --config-file ./babel.config.js src"
+    "babel": "babel --ignore \"**/*.test.js\" --out-dir dist/babel --config-file ./babel.config.js src",
+    "set-babel-node": "cp babel-node.config.cjs babel.config.cjs",
+    "set-babel-browser": "cp babel-browser.config.cjs babel.config.cjs"
   },
   "repository": {
     "type": "git",

diff --git a/rollup.config.js b/rollup.config.js
@@ -1,7 +1,7 @@
 
 import { nodeResolve } from '@rollup/plugin-node-resolve'
 import commonjs from '@rollup/plugin-commonjs'
-import { getBabelOutputPlugin } from '@rollup/plugin-babel'
+import babel from '@rollup/plugin-babel'
 
 export default [{
   input: 'src/modern-async.mjs',
@@ -14,26 +14,12 @@ export default [{
   input: 'src/modern-async-umd.mjs',
   output: {
     file: 'dist/modern-async.umd.js',
-    format: 'esm'
+    format: 'umd',
+    name: 'modernAsync'
   },
   plugins: [
     nodeResolve(),
     commonjs(),
-    getBabelOutputPlugin({
-      presets: [
-        ['@babel/preset-env', {
-          targets: {
-            ie: '8'
-          }
-        }]
-      ],
-      plugins: [
-        ['@babel/plugin-transform-modules-umd',{
-          globals: {
-            unknown: 'modernAsync'
-          }
-        }]
-      ]
-    })
+    babel({ babelHelpers: 'bundled' })
   ]
 }]