Skip to content

Commit

Permalink
Fix: respect init.cache if fetch input is request instance
Browse files Browse the repository at this point in the history
  • Loading branch information
huozhi committed Jan 18, 2024
1 parent 9e6c207 commit c523908
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 1 deletion.
3 changes: 2 additions & 1 deletion packages/next/src/server/lib/patch-fetch.ts
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,8 @@ export function patchFetch({
typeof (input as Request).method === 'string'

const getRequestMeta = (field: string) => {
let value = isRequestInput ? (input as any)[field] : null
// If request input is present but init is not, retrieve from input first.
const value = isRequestInput && !init ? (input as any)[field] : null
return value || (init as any)?.[field]
}

Expand Down
12 changes: 12 additions & 0 deletions test/e2e/app-dir/logging/app/fetch-no-store/page.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
export default async function Page() {
await fetch(
new Request(
'https://next-data-api-endpoint.vercel.app/api/random?request-input'
),
{
cache: 'no-store',
}
)

return <div>Hello World!</div>
}
10 changes: 10 additions & 0 deletions test/e2e/app-dir/logging/fetch-logging.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,16 @@ createNextDescribe(
expect(output).toContain('Cache missed reason: (noStore call)')
})
})

it('should respect request.init.cache when use with fetch input is instance', async () => {
const logLength = next.cliOutput.length
await next.fetch('/fetch-no-store')

await retry(() => {
const output = stripAnsi(next.cliOutput.slice(logLength))
expect(output).toContain('Cache missed reason: (cache: no-store)')
})
})
}
} else {
// No fetches logging enabled
Expand Down

0 comments on commit c523908

Please sign in to comment.