Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions packages/next/src/server/lib/patch-fetch.ts
Original file line number Diff line number Diff line change
Expand Up @@ -236,8 +236,9 @@ export function patchFetch({
typeof (input as Request).method === 'string'

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

// If the staticGenerationStore is not available, we can't do any
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