Skip to content

Commit afb13c2

Browse files
authored
Fix type error from merge (#70481)
x-ref: #70410 x-ref: #70435
1 parent e2ae5e9 commit afb13c2

File tree

2 files changed

+15
-13
lines changed

2 files changed

+15
-13
lines changed

packages/next/src/server/use-cache/use-cache-wrapper.ts

+11-13
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ async function generateCacheEntry(
8181
fn: any
8282
): Promise<ReadableStream> {
8383
const temporaryReferences = createServerTemporaryReferenceSet()
84-
const [, args] = await decodeReply(encodedArguments, serverManifest, {
84+
const [, args] = await decodeReply<any[]>(encodedArguments, serverManifest, {
8585
temporaryReferences,
8686
})
8787

@@ -117,19 +117,17 @@ async function generateCacheEntry(
117117
const reader = savedStream.getReader()
118118
const erroringSavedStream = new ReadableStream({
119119
pull(controller) {
120-
return reader
121-
.read()
122-
.then(({ done, value }: { done: boolean; value: any }) => {
123-
if (done) {
124-
if (didError) {
125-
controller.error(firstError)
126-
} else {
127-
controller.close()
128-
}
129-
return
120+
return reader.read().then(({ done, value }) => {
121+
if (done) {
122+
if (didError) {
123+
controller.error(firstError)
124+
} else {
125+
controller.close()
130126
}
131-
controller.enqueue(value)
132-
})
127+
return
128+
}
129+
controller.enqueue(value)
130+
})
133131
},
134132
cancel(reason: any) {
135133
reader.cancel(reason)

packages/next/types/$$compiled.internal.d.ts

+4
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,17 @@ declare module 'react-server-dom-webpack/server.edge' {
3939
}
4040
},
4141
options?: {
42+
temporaryReferences?: string
43+
environmentName?: string
4244
filterStackFrame?: (url: string, functionName: string) => boolean
4345
onError?: (error: unknown) => void
4446
onPostpone?: (reason: string) => void
4547
signal?: AbortSignal
4648
}
4749
): ReadableStream<Uint8Array>
4850

51+
export function createTemporaryReferenceSet(...args: any[]): any
52+
4953
type ServerManifest = {}
5054

5155
export function decodeReply<T>(

0 commit comments

Comments
 (0)