Updated fetch exists check

google · Jan 1, 2024 · f431250 · f431250
1 parent 34afa8d
commit f431250
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/src/goods.ts b/src/goods.ts
@@ -20,7 +20,7 @@ import { createInterface } from 'node:readline'
 import { $, within, ProcessOutput } from './core.js'
 import {
   Duration,
-  isNodeEighteenOrGreaterThanEighteen,
+  isNativeFetchExists,
   isString,
   parseDuration,
 } from './util.js'
@@ -57,7 +57,7 @@ export function sleep(duration: Duration) {
 }
 
 export async function globalFetch(url: RequestInfo, init?: RequestInit) {
-  if (isNodeEighteenOrGreaterThanEighteen) {
+  if (isNativeFetchExists) {
     $.log({ kind: 'fetch', url, init })
     return (globalThis as any).fetch(url, init)
   }

diff --git a/src/util.ts b/src/util.ts
@@ -341,8 +341,7 @@ export function formatCmd(cmd?: string): string {
   return out + '\n'
 }
 
-export const isNodeEighteenOrGreaterThanEighteen =
-  process.versions && Number(process.versions.node.split('.')[0]) >= 18
+export const isNativeFetchExists = 'fetch' in globalThis
 
 const reservedWords = [
   'if',

diff --git a/test/utils/test-utils.js b/test/utils/test-utils.js
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-const isNodeEighteenOrGreaterThanEighteen =
-  process.versions && Number(process.versions.node.split('.')[0]) >= 18
+const isNativeFetchExists = 'fetch' in globalThis
 
-export { isNodeEighteenOrGreaterThanEighteen }
+export { isNativeFetchExists }