Merge branch 'master' into polyfill-ie11

developit · web-flow · commit 7e3f2443b559 · 2020-09-29T10:23:19.000-04:00
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,6 +1,6 @@
 function r(m){return m && m.default || m;}
 module.exports = global.fetch = global.fetch || (
 	typeof process=='undefined' ? r(require('unfetch')) : (function(url, opts) {
-		return r(require('node-fetch'))(url.replace(/^\/\//g,'https://'), 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"
   }
 }

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'));`