Skip to content

Commit 284b3e9

Browse files
committed
Merge branch 'release-next'
2 parents 570e6d8 + 8d7ed4d commit 284b3e9

File tree

79 files changed

+2275
-729
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+2275
-729
lines changed

CHANGELOG.md

Lines changed: 175 additions & 126 deletions
Large diffs are not rendered by default.

contributors.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,7 @@
189189
- johnpangalos
190190
- jonkoops
191191
- joseph0926
192+
- jplhomer
192193
- jrakotoharisoa
193194
- jrestall
194195
- juanpprieto
@@ -239,6 +240,7 @@
239240
- m-shojaei
240241
- machour
241242
- majamarijan
243+
- Malien
242244
- Manc
243245
- manzano78
244246
- marc2332

docs/api/hooks/useFetcher.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,9 @@ function SomeComponent() {
5151
method: "post",
5252
encType: "application/json"
5353
})
54+
55+
// reset fetcher
56+
fetcher.unstable_reset()
5457
}
5558
```
5659

docs/api/rsc/RSCStaticRouter.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,13 @@ routeRSCServerRequest({
4646
fetchServer,
4747
createFromReadableStream,
4848
async renderHTML(getPayload) {
49-
const payload = await getPayload();
49+
const payload = getPayload();
5050

5151
return await renderHTMLToReadableStream(
5252
<RSCStaticRouter getPayload={getPayload} />,
5353
{
5454
bootstrapScriptContent,
55-
formState: await getFormState(payload),
55+
formState: await payload.formState,
5656
}
5757
);
5858
},

docs/api/rsc/routeRSCServerRequest.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,13 @@ routeRSCServerRequest({
4848
fetchServer,
4949
createFromReadableStream,
5050
async renderHTML(getPayload) {
51-
const payload = await getPayload();
51+
const payload = getPayload();
5252

5353
return await renderHTMLToReadableStream(
5454
<RSCStaticRouter getPayload={getPayload} />,
5555
{
5656
bootstrapScriptContent,
57-
formState: await getFormState(payload),
57+
formState: await payload.formState,
5858
}
5959
);
6060
},
@@ -75,7 +75,7 @@ async function routeRSCServerRequest({
7575
fetchServer: (request: Request) => Promise<Response>;
7676
createFromReadableStream: SSRCreateFromReadableStreamFunction;
7777
renderHTML: (
78-
getPayload: () => Promise<RSCPayload>,
78+
getPayload: () => DecodedPayload,
7979
) => ReadableStream<Uint8Array> | Promise<ReadableStream<Uint8Array>>;
8080
hydrate?: boolean;
8181
}): Promise<Response>

0 commit comments

Comments
 (0)