fix(e2e): revert changes for $fetch inference to unbreak build

danielroe · danielroe · commit dd295d39acf9 · 2024-04-17T10:23:23.000+01:00
diff --git a/package.json b/package.json
@@ -103,6 +103,7 @@
     "h3": "*",
     "happy-dom": "^9.10.9 || ^10.0.0 || ^11.0.0 || ^12.0.0 || ^13.0.0 || ^14.0.0",
     "jsdom": "^22.0.0 || ^23.0.0 || ^24.0.0",
+    "nitropack": "*",
     "playwright-core": "^1.34.3",
     "vite": "*",
     "vitest": "^0.34.6 || ^1.0.0",
@@ -153,4 +154,4 @@
     "node": "^14.18.0 || >=16.10.0"
   },
   "packageManager": "pnpm@8.15.5"
-}
+}
diff --git a/src/core/server.ts b/src/core/server.ts
@@ -3,7 +3,6 @@ import { getRandomPort, waitForPort } from 'get-port-please'
 import type { FetchOptions } from 'ofetch'
 import { $fetch as _$fetch, fetch as _fetch } from 'ofetch'
 import * as _kit from '@nuxt/kit'
-import type { $Fetch } from 'nitropack'
 import { resolve } from 'pathe'
 import { useTestContext } from './context'
 
@@ -39,7 +38,7 @@ export async function startServer(options: StartServerOptions = {}) {
     for (let i = 0; i < 150; i++) {
       await new Promise(resolve => setTimeout(resolve, 100))
       try {
-        const res = await $fetch<string>(ctx.nuxt!.options.app.baseURL, { responseType: 'text' })
+        const res = await $fetch(ctx.nuxt!.options.app.baseURL, { responseType: 'text' }) as string
         if (!res.includes('__NUXT_LOADING__')) {
           return
         }
@@ -79,9 +78,10 @@ export function fetch(path: string, options?: RequestInit) {
   return _fetch(url(path), options)
 }
 
-export const $fetch = (function $fetch(path: string, options?: FetchOptions) {
+// TODO: fix type inference of `$fetch`
+export function $fetch(path: string, options?: FetchOptions) {
   return _$fetch(url(path), options)
-}) as $Fetch
+}
 
 export function url(path: string) {
   const ctx = useTestContext()
