Updated fetch exists check

package.json

@@ -74,7 +74,7 @@
  "tsd": "^0.28.1",
  "typescript": "^5.0.4",
  "uvu": "^0.5.6",
- "@types/node-fetch":"^2.6.3"
+ "@types/node-fetch": "^2.6.3"
  },
  "publishConfig": {
  "registry": "https://wombat-dressing-room.appspot.com"

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)
  }

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',

test/cli.test.js

@@ -15,7 +15,7 @@
 import { suite } from 'uvu'
 import * as assert from 'uvu/assert'
 import '../build/globals.js'
-import { isNodeEighteenOrGreaterThanEighteen } from './utils/test-utils.js'
+import { isNativeFetchExists } from './utils/test-utils.js'
 
 const test = suite('cli')
 
@@ -98,17 +98,17 @@ test('supports `--prefix` flag ', async () => {
 })
 
 test('scripts from https', async () => {
- if (!isNodeEighteenOrGreaterThanEighteen) {
- return true;
+ if (!isNativeFetchExists) {
+ return true
  }
  $`cat ${path.resolve('test/fixtures/echo.http')} | nc -l 8080`
  let out = await $`node build/cli.js http://127.0.0.1:8080/echo.mjs`
  assert.match(out.stderr, 'test')
 })
 
 test('scripts from https not ok', async () => {
- if (!isNodeEighteenOrGreaterThanEighteen) {
- return true;
+ if (!isNativeFetchExists) {
+ return true
  }
  $`echo $'HTTP/1.1 500\n\n' | nc -l 8081`
  let out = await $`node build/cli.js http://127.0.0.1:8081`.nothrow()

test/goods.test.js

@@ -16,7 +16,7 @@ import chalk from 'chalk'
 import { suite } from 'uvu'
 import * as assert from 'uvu/assert'
 
-import { isNodeEighteenOrGreaterThanEighteen } from './utils/test-utils.js'
+import { isNativeFetchExists } from './utils/test-utils.js'
 import '../build/globals.js'
 
 const test = suite('goods')
@@ -50,9 +50,9 @@ test('globby available', async () => {
 })
 
 test('fetch() works', async () => {
- if(!isNodeEighteenOrGreaterThanEighteen){
- return true; 
- } 
+ if (!isNativeFetchExists) {
+  return true
+ }
  assert.match(
  await fetch('https://medv.io').then((res) => res.text()),
  /Anton Medvedev/

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 }