merge #156

developit · developit · commit 47384d53d325 · 2022-12-30T21:45:45.000-05:00
diff --git a/package.json b/package.json
@@ -2,17 +2,28 @@
   "name": "unfetch",
   "version": "4.2.0",
   "description": "Bare minimum fetch polyfill in 500 bytes",
-  "unpkg": "polyfill/index.js",
-  "main": "dist/unfetch.js",
-  "module": "dist/unfetch.module.js",
-  "jsnext:main": "dist/unfetch.module.js",
-  "umd:main": "dist/unfetch.umd.js",
+  "unpkg": "./polyfill/index.js",
+  "main": "./dist/unfetch.js",
+  "module": "./dist/unfetch.mjs",
+  "jsnext:main": "./dist/unfetch.mjs",
+  "umd:main": "./dist/unfetch.umd.js",
   "scripts": {
     "test": "eslint && jest",
-    "build": "microbundle src/index.mjs && microbundle -f cjs polyfill/polyfill.mjs -o polyfill/index.js --no-sourcemap && cp dist/unfetch.module.js dist/unfetch.es.js",
+    "build": "microbundle src/index.mjs -f cjs,esm,umd && microbundle polyfill/polyfill.mjs -o polyfill/index.js -f cjs --no-sourcemap && cp dist/unfetch.module.js dist/unfetch.es.js",
     "prepare": "npm run -s build",
     "release": "cross-var npm run build -s && cross-var git commit -am $npm_package_version && cross-var git tag $npm_package_version && git push && git push --tags && npm publish"
   },
+  "exports": {
+    ".": {
+      "import": "./index.mjs",
+      "default": "./index.js"
+    },
+    "./polyfill": {
+      "default": "./polyfill/index.js"
+    },
+    "./package.json": "./package.json",
+    "./*": "./*"
+  },
   "workspaces": [
     "./packages/isomorphic-unfetch"
   ],
diff --git a/packages/isomorphic-unfetch/browser.mjs b/packages/isomorphic-unfetch/browser.mjs
@@ -0,0 +1,2 @@
+import fetch from 'unfetch';
+export default self.fetch || (self.fetch = fetch);
diff --git a/packages/isomorphic-unfetch/index.js b/packages/isomorphic-unfetch/index.js
@@ -1,7 +1,12 @@
-function r(m){return m && m.default || m;}
-module.exports = global.fetch = global.fetch || (
-	typeof process=='undefined' ? r(require('unfetch')) : (function(url, opts) {
-		const fetch = (...args) => import('node-fetch').then(({default: fetch}) => fetch(...args));
-		return r(fetch)(String(url).replace(/^\/\//g,'https://'), opts);
-	})
-);
+function r(m) {
+	return (m && m.default) || m;
+}
+module.exports = global.fetch =
+	global.fetch ||
+	(typeof process == "undefined"
+		? r(require("unfetch"))
+		: function (url, opts) {
+				if (typeof url === "string" || url instanceof URL)
+					url = String(url).replace(/^\/\//g, "https://");
+				return import("node-fetch").then((m) => r(m)(url, opts));
+		  });
diff --git a/packages/isomorphic-unfetch/index.mjs b/packages/isomorphic-unfetch/index.mjs
@@ -0,0 +1,12 @@
+export default global.fetch =
+	global.fetch ||
+	(typeof process == "undefined"
+		? function (url, opts) {
+			return import('unfetch').then(m => (m.default || m)(url, opts));
+		}
+		: function (url, opts) {
+				if (typeof url === "string" || url instanceof URL) {
+					url = String(url).replace(/^\/\//g, "https://");
+				}
+				return import("node-fetch").then((m) => (m.default || m)(url, opts));
+		  });
diff --git a/packages/isomorphic-unfetch/package.json b/packages/isomorphic-unfetch/package.json
@@ -7,6 +7,17 @@
     "index.d.ts",
     "browser.js"
   ],
+  "exports": {
+    ".": {
+      "import": "./index.mjs",
+      "default": "./index.js"
+    },
+    "./browser": {
+      "import": "./browser.mjs",
+      "default": "./browser.js"
+    },
+    "./package.json": "./package.json"
+  },
   "license": "MIT",
   "repository": "developit/unfetch",
   "browser": "browser.js",
diff --git a/polyfill/package.json b/polyfill/package.json
@@ -1,5 +1,5 @@
 {
   "name": "unfetch-polyfill",
-  "main": "index.js",
-  "module": "polyfill.module.js"
+  "source": "polyfill.mjs",
+  "main": "index.js"
 }

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+import fetch from 'unfetch';`
	`2`	`+export default self.fetch \|\| (self.fetch = fetch);`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "unfetch-polyfill",`
`3`		`- "main": "index.js",`
`4`		`- "module": "polyfill.module.js"`
	`3`	`+ "source": "polyfill.mjs",`
	`4`	`+ "main": "index.js"`
`5`	`5`	`}`