drop node-fetch and simplify codebase

.github/workflows/checks.yml

@@ -15,7 +15,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 18
           cache: 'npm'
       - name: Install dependencies
         run: npm ci --ignore-scripts

README.md

@@ -1,12 +1,4 @@
 # @exodus/fetch
 
-A small wrapper around global fetch and `node-fetch`:
-
-1. In React Native, global `fetch` is used without importing `node-fetch`
-
-2. In Browser, global `fetch` is used without importing `node-fetch`
-
-3. Otherwise `node-fetch` is imported, but when `window.fetch` is present (e.g. in Electron
-   `renderer` process), it is used.
-
-4. Otherwise (e.g. in Electron `browser` process and Node.js), `node-fetch` is used.
+Using this as a wrapper for `node-fetch` is deprecated,
+since all active Node.js versions implement global `fetch`

create-fetchival.js

@@ -8,7 +8,7 @@ function query(params) {
     .join('&')}`
 }
 
-function createFetchival({ fetch }) {
+function createFetchival({ fetch = require('./fetch') } = {}) {
   async function _fetch(method, url, opts, data) {
     // Unlike fetchival, don't silently ignore and override
     if (opts.body) throw new Error('unexpected pre-set body option')

fetch.js

@@ -1,20 +1,6 @@
 'use strict'
 
-// This file is structured this way to allow webpack to optimize out
-// the require calls based on hardcoded process.type per bundle.
-// Do not refactor or deduplicate.
+// This is deprecated, just use global fetch instead
+// All supported Node.js versions have it, and the only fallback here was node-fetch
 
-// Try to use global browser APIs (e.g. if in Electron), otherwise require impls
-if (typeof process !== 'undefined' && process) {
-  // Node.js or Electron with Node.js integration
-  if (process.type === 'renderer' || process.type === 'worker') {
-    // Electron renderer with Node.js integration
-    module.exports = fetch
-  } else {
-    // Node.js or Electron browser process
-    module.exports = typeof fetch === 'undefined' ? require('node-fetch') : fetch.bind(globalThis)
-  }
-} else {
-  // Browser or Electron without Node.js integration
-  module.exports = fetch
-}
+module.exports = globalThis.fetch.bind(globalThis)

fetchival.js

@@ -1,6 +1,3 @@
-const fetchival = require('./fetchival.browser')
-const fetch = require('./fetch')
+const createFetchival = require('./create-fetchival')
 
-if (!fetchival.fetch) fetchival.fetch = fetch
-
-module.exports = fetchival
+module.exports = createFetchival()

index.browser.js

@@ -1,9 +1,10 @@
 'use strict'
 
-// Don't need to require node-fetch here, global fetch is defined
-// Same for global WebSocket
+// NOTE: use targeted imports in new code, main import is deprecated
 
-const fetchival = require('./fetchival.browser.js')
-const fetch = require('./fetch.browser.js')
+// Don't need to require ws here, global WebSocket is defined
+
+const fetchival = require('./fetchival.js')
+const fetch = require('./fetch.js')
 
 module.exports = { fetch, WebSocket, fetchival }

index.js

@@ -1,6 +1,6 @@
 'use strict'
 
-// NOTE: use targeted imports in new code
+// NOTE: use targeted imports in new code, main import is deprecated
 
 const fetch = require('./fetch')
 const WebSocket = require('./websocket')

package.json

@@ -17,80 +17,38 @@
       "node": "./index.js",
       "default": "./index.js"
     },
-    "./fetch": {
-      "browser": "./fetch.browser.js",
-      "react-native": "./fetch.native.js",
-      "node": "./fetch.js",
-      "default": "./fetch.js"
-    },
+    "./fetch": "./fetch.js",
     "./websocket": {
       "browser": "./websocket.browser.js",
       "react-native": "./websocket.native.js",
       "node": "./websocket.js",
       "default": "./websocket.js"
     },
-    "./core": {
-      "browser": "./core.js",
-      "react-native": "./core.js",
-      "node": "./core.js",
-      "default": "./core.js"
-    },
-    "./experimental/fetchival": {
-      "browser": "./experimental/fetchival.js",
-      "react-native": "./experimental/fetchival.js",
-      "node": "./experimental/fetchival.js",
-      "default": "./experimental/fetchival.js"
-    },
-    "./experimental/create-fetchival": {
-      "default": "./experimental/create-fetchival.js"
-    },
-    "./fetchival": {
-      "browser": "./fetchival.browser.js",
-      "react-native": "./fetchival.js",
-      "node": "./fetchival.js",
-      "default": "./fetchival.js"
-    },
-    "./create-fetchival": {
-      "default": "./create-fetchival.js"
-    },
-    "./wretch": {
-      "browser": "./wretch.browser.js",
-      "react-native": "./wretch.js",
-      "node": "./wretch.js",
-      "default": "./wretch.js"
-    },
-    "./url": {
-      "browser": "./url.js",
-      "react-native": "./url.js",
-      "node": "./url.js",
-      "default": "./url.js"
-    }
+    "./core": "./core.js",
+    "./experimental/fetchival": "./experimental/fetchival.js",
+    "./experimental/create-fetchival": "./experimental/create-fetchival.js",
+    "./fetchival": "./fetchival.js",
+    "./create-fetchival": "./create-fetchival.js",
+    "./wretch": "./wretch.js",
+    "./url": "./url.js"
   },
   "browser": {
-    "./fetchival.js": "./fetchival.browser.js",
-    "./wretch.js": "./wretch.browser.js",
-    "./fetch.js": "./fetch.browser.js",
     "./websocket.js": "./websocket.browser.js",
     "./index.js": "./index.browser.js"
   },
   "react-native": {
-    "./fetch.js": "./fetch.native.js",
     "./websocket.js": "./websocket.native.js"
   },
   "files": [
     "experimental/fetchival.js",
     "experimental/create-fetchival.js",
     "core.js",
-    "fetch.browser.js",
-    "fetch.native.js",
     "fetch.js",
     "websocket.browser.js",
     "websocket.native.js",
     "websocket.js",
     "create-fetchival.js",
-    "fetchival.browser.js",
     "fetchival.js",
-    "wretch.browser.js",
     "wretch.js",
     "url.js",
     "index.browser.js",
@@ -107,7 +65,6 @@
   "author": "Exodus Movement Inc.",
   "license": "MIT",
   "dependencies": {
-    "node-fetch": "^2.6.0",
     "wretch": "^1.5.2",
     "ws": "^6.1.0"
   },

wretch.js

@@ -1,7 +1 @@
-// NOTE: does not export Wretcher
-const wretch = require('./wretch.browser')
-const fetch = require('./fetch')
-
-wretch().polyfills({ fetch })
-
-module.exports = wretch
+module.exports = require('wretch')