Remove setLazyProp for cookies for all requests

vercel · Sep 14, 2023 · 65fcb56 · 65fcb56
1 parent 7efe257
commit 65fcb56
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 5 deletions.
diff --git a/packages/next/src/server/base-server.ts b/packages/next/src/server/base-server.ts
@@ -791,8 +791,6 @@ export default abstract class Server<ServerOptions extends Options = Options> {
         return
       }
 
-      setLazyProp({ req: req as any }, 'cookies', getCookieParser(req.headers))
-
       // Parse url if parsedUrl not provided
       if (!parsedUrl || typeof parsedUrl !== 'object') {
         parsedUrl = parseUrl(req.url!, true)

diff --git a/packages/next/src/server/lib/router-utils/resolve-routes.ts b/packages/next/src/server/lib/router-utils/resolve-routes.ts
@@ -154,7 +154,6 @@ export function getResolveRoutes(
     addRequestMeta(req, '__NEXT_INIT_URL', initUrl)
     addRequestMeta(req, '__NEXT_INIT_QUERY', { ...parsedUrl.query })
     addRequestMeta(req, '_protocol', protocol)
-    setLazyProp({ req }, 'cookies', () => getCookieParser(req.headers)())
 
     if (!isUpgradeReq) {
       addRequestMeta(req, '__NEXT_CLONABLE_BODY', getCloneableBody(req))

diff --git a/packages/next/src/server/render.tsx b/packages/next/src/server/render.tsx
@@ -15,7 +15,12 @@ import type {
 } from '../shared/lib/utils'
 import type { ImageConfigComplete } from '../shared/lib/image-config'
 import type { Redirect } from '../lib/load-custom-routes'
-import type { NextApiRequestCookies, __ApiPreviewProps } from './api-utils'
+import {
+  getCookieParser,
+  type NextApiRequestCookies,
+  type __ApiPreviewProps,
+  setLazyProp,
+} from './api-utils'
 import type { FontManifest, FontConfig } from './font-utils'
 import type { LoadComponentsReturnType, ManifestItem } from './load-components'
 import type {
@@ -386,6 +391,9 @@ export async function renderToHTMLImpl(
   renderOpts: Omit<RenderOpts, keyof RenderOptsExtra>,
   extra: RenderOptsExtra
 ): Promise<RenderResult> {
+  // Adds support for reading `cookies` in `getServerSideProps` when SSR.
+  setLazyProp({ req: req as any }, 'cookies', getCookieParser(req.headers))
+
   const renderResultMeta: RenderResultMetadata = {}
 
   // In dev we invalidate the cache by appending a timestamp to the resource URL.

diff --git a/packages/next/src/shared/lib/router/utils/prepare-destination.ts b/packages/next/src/shared/lib/router/utils/prepare-destination.ts
@@ -13,6 +13,7 @@ import {
   isInterceptionRouteAppPath,
 } from '../../../../server/future/helpers/interception-routes'
 import { NEXT_RSC_UNION_QUERY } from '../../../../client/components/app-router-headers'
+import { getCookieParser } from '../../../../server/api-utils'
 
 /**
  * Ensure only a-zA-Z are used for param names for proper interpolating
@@ -64,7 +65,13 @@ export function matchHas(
         break
       }
       case 'cookie': {
-        value = (req as any).cookies[hasItem.key]
+        if ('cookies' in req) {
+          value = req.cookies[hasItem.key]
+        } else {
+          const cookies = getCookieParser(req.headers)()
+          value = cookies[hasItem.key]
+        }
+
         break
       }
       case 'query': {