fix: update return for useRequestEvent to include undefined (#1089)

nuxt · Jan 30, 2024 · dd79c81 · dd79c81
1 parent 039b8b4
commit dd79c81
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/packages/bridge/src/runtime/composables/cookie.ts b/packages/bridge/src/runtime/composables/cookie.ts
@@ -95,9 +95,10 @@ export function useCookie<T = string | null | undefined> (name: string, _opts?:
     const nuxtApp = useNuxtApp()
     const writeFinalCookieValue = () => {
       if (opts.readonly || isEqual(cookie.value, cookies[name])) { return }
-      writeServerCookie(useRequestEvent(nuxtApp), name, cookie.value, opts as CookieOptions<any>)
+      writeServerCookie(useRequestEvent(nuxtApp)!, name, cookie.value, opts as CookieOptions<any>)
     }
 
+    // @ts-expect-error
     const unhook = nuxtApp.hooks.hookOnce('app:rendered', writeFinalCookieValue)
     nuxtApp.hooks.hookOnce('app:error', () => {
       unhook() // don't write cookie subsequently when app:rendered is called
@@ -110,7 +111,7 @@ export function useCookie<T = string | null | undefined> (name: string, _opts?:
 
 function readRawCookies (opts: CookieOptions = {}): Record<string, string> {
   if (process.server) {
-    return parse(getRequestHeader(useRequestEvent(), 'cookie') || '', opts)
+    return parse(getRequestHeader(useRequestEvent()!, 'cookie') || '', opts)
   } else if (process.client) {
     return parse(document.cookie, opts)
   }

diff --git a/packages/bridge/src/runtime/composables/ssr.ts b/packages/bridge/src/runtime/composables/ssr.ts
@@ -13,7 +13,10 @@ export function useRequestHeaders (include?: any[]) {
   return Object.fromEntries(include.map(key => key.toLowerCase()).filter(key => headers[key]).map(key => [key, headers[key]]))
 }
 
-export function useRequestEvent (nuxtApp: NuxtAppCompat = useNuxtApp()): H3Event {
+export function useRequestEvent (nuxtApp: NuxtAppCompat = useNuxtApp()): H3Event | undefined {
+  if (process.client || !nuxtApp.ssrContext) {
+    return undefined
+  }
   // check if H3 event is available
   if (nuxtApp.ssrContext?.event) { return nuxtApp.ssrContext.event }
   // Check if we created H3 event manually before