Remove the esm wrapper, rely on commonjs autodetection (#599)

mcollina · web-flow · commit 2366fa34e30a · 2021-03-17T14:37:22.000+01:00
* Remove the esm wrapper, rely on commonjs autodetection Fixes #598
diff --git a/index.js b/index.js
@@ -15,14 +15,14 @@ function undici (url, opts) {
   return new Pool(url, opts)
 }
 
-undici.Pool = Pool
-undici.Client = Client
-undici.errors = errors
+module.exports = undici
 
-undici.Agent = Agent
-undici.request = request
-undici.stream = stream
-undici.pipeline = pipeline
-undici.setGlobalAgent = setGlobalAgent
+module.exports.Pool = Pool
+module.exports.Client = Client
+module.exports.errors = errors
 
-module.exports = undici
+module.exports.Agent = Agent
+module.exports.request = request
+module.exports.stream = stream
+module.exports.pipeline = pipeline
+module.exports.setGlobalAgent = setGlobalAgent
diff --git a/package.json b/package.json
@@ -4,7 +4,6 @@
   "description": "An HTTP/1.1 client, written from scratch for Node.js",
   "main": "index.js",
   "types": "index.d.ts",
-  "module": "wrapper.mjs",
   "scripts": {
     "lint": "standard | snazzy",
     "test": "tap test/*.js --no-coverage && jest test/jest/test",
@@ -44,6 +43,7 @@
     "proxy": "^1.0.2",
     "proxyquire": "^2.0.1",
     "sinon": "^9.2.4",
+    "semver": "^5.7.1",
     "snazzy": "^8.0.0",
     "standard": "^14.3.4",
     "tap": "^14.10.8",
diff --git a/test/esm-wrapper.js b/test/esm-wrapper.js
@@ -1,14 +1,19 @@
 'use strict'
+const semver = require('semver')
 
-;(async () => {
-  try {
-    await import('./esm-wrapper.mjs')
-  } catch (e) {
-    if (e.message === 'Not supported') {
-      require('tap') // shows skipped
-      return
+if (!semver.satisfies(process.version, '>= v14.13.0 || ^12.20.0')) {
+  require('tap') // shows skipped
+} else {
+  ;(async () => {
+    try {
+      await import('./esm-wrapper.mjs')
+    } catch (e) {
+      if (e.message === 'Not supported') {
+        require('tap') // shows skipped
+        return
+      }
+      console.error(e.stack)
+      process.exitCode = 1
     }
-    console.error(e.stack)
-    process.exitCode = 1
-  }
-})()
+  })()
+}
diff --git a/test/esm-wrapper.mjs b/test/esm-wrapper.mjs
@@ -2,7 +2,7 @@ import tap from 'tap'
 
 import { createServer } from 'http'
 
-import { Client, errors } from '../wrapper.mjs'
+import { Client, errors, Pool, Agent, request, stream, pipeline, setGlobalAgent } from '../index.js'
 
 const { test } = tap
 
@@ -76,3 +76,14 @@ test('imported errors work with request args validation promise', (t) => {
     t.ok(err instanceof errors.InvalidArgumentError)
   })
 })
+
+test('name dexports', (t) => {
+  t.is(typeof Client, 'function')
+  t.is(typeof Pool, 'function')
+  t.is(typeof Agent, 'function')
+  t.is(typeof request, 'function')
+  t.is(typeof stream, 'function')
+  t.is(typeof pipeline, 'function')
+  t.is(typeof setGlobalAgent, 'function')
+  t.end()
+})
diff --git a/wrapper.mjs b/wrapper.mjs
