chore: merge with master

Author: Gozala

CHANGELOG.md

@@ -1,3 +1,13 @@
+<a name="4.0.0"></a>
+# [4.0.0](https://github.com/ipfs/js-ipfs-utils/compare/v3.0.0...v4.0.0) (2020-10-10)
+
+
+### Bug Fixes
+
+* use native fetch if available ([#62](https://github.com/ipfs/js-ipfs-utils/issues/62)) ([9b0ff2f](https://github.com/ipfs/js-ipfs-utils/commit/9b0ff2f))
+
+
+
 <a name="3.0.0"></a>
 # [3.0.0](https://github.com/ipfs/js-ipfs-utils/compare/v2.4.0...v3.0.0) (2020-08-18)
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ipfs-utils",
-  "version": "3.0.0",
+  "version": "4.0.0",
   "description": "Package to aggregate shared logic and dependencies for the IPFS ecosystem",
   "main": "src/index.js",
   "author": "Hugo Dias <hugomrdias@gmail.com>",
@@ -17,7 +17,8 @@
     "./src/text-decoder.js": "./src/text-decoder.browser.js",
     "./src/temp-dir.js": "./src/temp-dir.browser.js",
     "./src/path-join.js": "./src/path-join.browser.js",
-    "./test/files/glob-source.spec.js": false
+    "./test/files/glob-source.spec.js": false,
+    "@achingbrain/electron-fetch": false
   },
   "repository": "github:ipfs/js-ipfs-utils",
   "scripts": {
@@ -37,6 +38,7 @@
     "abort-controller": "^3.0.0",
     "any-signal": "^2.1.0",
     "buffer": "^5.6.0",
+    "@achingbrain/electron-fetch": "^1.7.2",
     "err-code": "^2.0.0",
     "fs-extra": "^9.0.1",
     "is-electron": "^2.2.0",
@@ -46,6 +48,7 @@
     "nanoid": "^3.1.3",
     "native-abort-controller": "0.0.3",
     "native-fetch": "^2.0.0",
+    "node-fetch": "^2.6.0",
     "stream-to-it": "^0.2.0",
     "it-to-stream": "^0.1.2"
   },

src/fetch.js

@@ -0,0 +1,10 @@
+'use strict'
+
+const { isElectronMain } = require('./env')
+
+if (isElectronMain) {
+  module.exports = require('@achingbrain/electron-fetch')
+} else {
+  // use window.fetch if it is available, fall back to node-fetch if not
+  module.exports = require('native-fetch')
+}

src/http/fetch.browser.js

@@ -2,7 +2,7 @@
 /* eslint-env browser */
 
 const { TimeoutError, AbortError } = require('./error')
-const fetch = require('native-fetch')
+const fetch = require('../fetch')
 const { Request, Response, Headers } = fetch
 
 /**

src/http/fetch.node.js

@@ -3,7 +3,7 @@
 
 /** @type {import('node-fetch') & typeof fetch} */
 // @ts-ignore
-const nodeFetch = require('native-fetch')
+const nodeFetch = require('../fetch')
 const toStream = require('it-to-stream')
 const { Buffer } = require('buffer')
 const { Request, Response, Headers } = nodeFetch