Merge branch 'master' into better-types

developit · web-flow · commit 9f2ca625f179 · 2020-09-29T10:26:49.000-04:00
diff --git a/package.json b/package.json
@@ -4,12 +4,12 @@
   "description": "Bare minimum fetch polyfill in 500 bytes",
   "unpkg": "polyfill/index.js",
   "main": "dist/unfetch.js",
-  "module": "dist/unfetch.mjs",
-  "jsnext:main": "dist/unfetch.mjs",
+  "module": "dist/unfetch.module.js",
+  "jsnext:main": "dist/unfetch.module.js",
   "umd:main": "dist/unfetch.umd.js",
   "scripts": {
     "test": "eslint src test && jest",
-    "build": "microbundle src/index.mjs && microbundle -f cjs polyfill/polyfill.mjs -o polyfill/index.js --no-sourcemap && cp dist/unfetch.mjs dist/unfetch.es.js",
+    "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",
     "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"
   },
diff --git a/packages/isomorphic-unfetch/browser.js b/packages/isomorphic-unfetch/browser.js
@@ -1 +1 @@
-module.exports = window.fetch || (window.fetch = require('unfetch').default || require('unfetch'));
+module.exports = self.fetch || (self.fetch = require('unfetch').default || require('unfetch'));
diff --git a/packages/isomorphic-unfetch/index.js b/packages/isomorphic-unfetch/index.js
@@ -1,5 +1,6 @@
+function r(m){return m && m.default || m;}
 module.exports = global.fetch = global.fetch || (
-	typeof process=='undefined' ? (require('unfetch').default || require('unfetch')) : (function(url, opts) {
-		return (require('node-fetch').default || require('node-fetch'))(url.replace(/^\/\//g,'https://'), opts);
+	typeof process=='undefined' ? r(require('unfetch')) : (function(url, opts) {
+		return r(require('node-fetch'))(String(url).replace(/^\/\//g,'https://'), opts);
 	})
 );
diff --git a/packages/isomorphic-unfetch/package-lock.json b/packages/isomorphic-unfetch/package-lock.json
diff --git a/packages/isomorphic-unfetch/package.json b/packages/isomorphic-unfetch/package.json
@@ -12,9 +12,8 @@
   "browser": "browser.js",
   "main": "index.js",
   "types": "index.d.ts",
-  "license": "MIT",
   "dependencies": {
-    "node-fetch": "^2.2.0",
+    "node-fetch": "^2.6.1",
     "unfetch": "^4.0.0"
   }
 }
diff --git a/polyfill/package.json b/polyfill/package.json
@@ -1,5 +1,5 @@
 {
   "name": "unfetch-polyfill",
   "main": "index.js",
-  "module": "polyfill.mjs"
+  "module": "polyfill.module.js"
 }
diff --git a/polyfill/polyfill.mjs b/polyfill/polyfill.mjs
@@ -1,2 +1,2 @@
-import unfetch from '../src/index.mjs';
+import unfetch from '..';
 if (!self.fetch) self.fetch = unfetch;

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-module.exports = window.fetch \|\| (window.fetch = require('unfetch').default \|\| require('unfetch'));`
	`1`	`+module.exports = self.fetch \|\| (self.fetch = require('unfetch').default \|\| require('unfetch'));`
Original file line number	Diff line number	Diff line change
`@@ -12,9 +12,8 @@`
`12`	`12`	`"browser": "browser.js",`
`13`	`13`	`"main": "index.js",`
`14`	`14`	`"types": "index.d.ts",`
`15`		`- "license": "MIT",`
`16`	`15`	`"dependencies": {`
`17`		`- "node-fetch": "^2.2.0",`
	`16`	`+ "node-fetch": "^2.6.1",`
`18`	`17`	`"unfetch": "^4.0.0"`
`19`	`18`	`}`
`20`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "unfetch-polyfill",`
`3`	`3`	`"main": "index.js",`
`4`		`- "module": "polyfill.mjs"`
	`4`	`+ "module": "polyfill.module.js"`
`5`	`5`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-import unfetch from '../src/index.mjs';`
	`1`	`+import unfetch from '..';`
`2`	`2`	`if (!self.fetch) self.fetch = unfetch;`