fix: support vite (#193)

Doing the require in this fashion seems to work better with vite.

Author: achingbrain

package.json

@@ -15,6 +15,7 @@
     "./src/http/fetch.js": "./src/http/fetch.browser.js",
     "./src/temp-dir.js": "./src/temp-dir.browser.js",
     "./src/path-join.js": "./src/path-join.browser.js",
+    "./src/fetch.js": "./src/fetch.browser.js",
     "./src/files/glob-source.js": false,
     "./test/files/glob-source.spec.js": false,
     "electron-fetch": false,

src/env.js

@@ -7,10 +7,10 @@ const IS_ELECTRON = isElectron()
 const IS_BROWSER = IS_ENV_WITH_DOM && !IS_ELECTRON
 const IS_ELECTRON_MAIN = IS_ELECTRON && !IS_ENV_WITH_DOM
 const IS_ELECTRON_RENDERER = IS_ELECTRON && IS_ENV_WITH_DOM
-const IS_NODE = typeof require === 'function' && typeof globalThis.process !== 'undefined' && typeof globalThis.process.release !== 'undefined' && globalThis.process.release.name === 'node' && !IS_ELECTRON
+const IS_NODE = typeof require === 'function' && typeof process !== 'undefined' && typeof process.release !== 'undefined' && process.release.name === 'node' && !IS_ELECTRON
 // @ts-ignore - we either ignore worker scope or dom scope
 const IS_WEBWORKER = typeof importScripts === 'function' && typeof self !== 'undefined' && typeof WorkerGlobalScope !== 'undefined' && self instanceof WorkerGlobalScope
-const IS_TEST = typeof globalThis.process !== 'undefined' && typeof globalThis.process.env !== 'undefined' && globalThis.process.env.NODE_ENV === 'test'
+const IS_TEST = typeof process !== 'undefined' && typeof process.env !== 'undefined' && process.env.NODE_ENV === 'test'
 const IS_REACT_NATIVE = typeof navigator !== 'undefined' && navigator.product === 'ReactNative'
 
 module.exports = {

src/fetch.browser.js

@@ -0,0 +1,10 @@
+'use strict'
+
+/**
+ * @typedef {globalThis.Headers} Headers
+ * @typedef {globalThis.Request} Request
+ * @typedef {globalThis.Response} Response
+ */
+
+// use window.fetch if it is available, fall back to node-fetch if not
+module.exports = require('native-fetch')

src/fetch.js

@@ -1,10 +1,18 @@
 'use strict'
 
+/**
+ * @typedef {globalThis.Headers} Headers
+ * @typedef {globalThis.Request} Request
+ * @typedef {globalThis.Response} Response
+ */
+
 const { isElectronMain } = require('./env')
 
-if (isElectronMain) {
-  module.exports = require('electron-fetch')
-} else {
 // use window.fetch if it is available, fall back to node-fetch if not
-  module.exports = require('native-fetch')
+let impl = 'native-fetch'
+
+if (isElectronMain) {
+  impl = 'electron-fetch'
 }
+
+module.exports = require(impl)

src/http.js

@@ -91,9 +91,11 @@ class HTTP {
   async fetch (resource, options = {}) {
     /** @type {HTTPOptions} */
     const opts = merge(this.opts, options)
+    // @ts-expect-error
     const headers = new Headers(opts.headers)
 
     // validate resource type
+    // @ts-expect-error
     if (typeof resource !== 'string' && !(resource instanceof URL || resource instanceof Request)) {
       throw new TypeError('`resource` must be a string, URL, or Request')
     }
@@ -125,12 +127,15 @@ class HTTP {
     // @ts-ignore
     const signal = anySignal([abortController.signal, opts.signal])
 
+    /** @type {ExtendedResponse} */
+    // @ts-expect-error additional fields are assigned below
     const response = await timeout(
       fetch(
         url.toString(),
         {
           ...opts,
           signal,
+          // @ts-expect-error non-browser fetch implementations may take extra options
           timeout: undefined,
           headers
         }
@@ -146,8 +151,8 @@ class HTTP {
       throw new HTTPError(response)
     }
 
-    response.iterator = function () {
-      return fromStream(response.body)
+    response.iterator = async function * () {
+      yield * fromStream(response.body)
     }
 
     response.ndjson = async function * () {

src/http/fetch.browser.js

@@ -1,6 +1,7 @@
 'use strict'
 
 const { TimeoutError, AbortError } = require('./error')
+// @ts-expect-error
 const { Response, Request, Headers, default: fetch } = require('../fetch')
 
 /**

src/http/fetch.js

@@ -1,9 +1,22 @@
 'use strict'
 
+/**
+ * @typedef {object} fetchImpl
+ * @property {globalThis.fetch} fetchImpl.fetch
+ * @property {globalThis.Request} fetchImpl.Request
+ * @property {globalThis.Response} fetchImpl.Response
+ * @property {globalThis.Headers} fetchImpl.Headers
+ */
+
+let implName = './fetch.node'
+
 if (typeof XMLHttpRequest === 'function') {
   // Electron has `XMLHttpRequest` and should get the browser implementation
   // instead of node.
-  module.exports = require('./fetch.browser')
-} else {
-  module.exports = require('./fetch.node')
+  implName = './fetch.browser'
 }
+
+/** @type {fetchImpl} */
+const fetch = require(implName)
+
+module.exports = fetch

src/http/fetch.node.js

@@ -33,7 +33,9 @@ const withUploadProgress = (options) => {
   // and `ArrayBuffer`s to strings.
     const content = normalizeBody(body)
 
+    // @ts-expect-error this is node-fetch
     const rsp = new Response(content)
+    // @ts-expect-error this is node-fetch
     const source = iterateBodyWithProgress(/** @type {NodeReadableStream} */(rsp.body), onUploadProgress)
     return {
       ...options,

tsconfig.json

@@ -1,7 +1,8 @@
 {
     "extends": "aegir/src/config/tsconfig.aegir.json",
     "compilerOptions": {
-        "outDir": "dist"
+        "outDir": "dist",
+        "emitDeclarationOnly": true
     },
     "include": [
         "test",