Unverified Commit 45fe26f5 authored by Shu Ding's avatar Shu Ding Committed by GitHub

Fix missing option in `createFromFetch` (#47216)

This PR makes sure that `callServer` is specified in all Flight response creation calls. Added a test to cover HMR.

https://vercel.slack.com/archives/C03KAR5DCKC/p1678997184339409
parent bfed3985
......@@ -4,6 +4,7 @@ import type { ReactElement } from "react";
// @ts-expect-error
import { version } from "next/package.json";
import { createFromReadableStream } from "next/dist/compiled/react-server-dom-webpack/client";
import { callServer } from 'next/dist/client/app-call-server';
import { HeadManagerContext } from "next/dist/shared/lib/head-manager-context";
......@@ -109,7 +110,7 @@ function useInitialServerResponse(cacheKey: string) {
},
});
const newResponse = createFromReadableStream(readable);
const newResponse = createFromReadableStream(readable, { callServer });
rscCache.set(cacheKey, newResponse);
return newResponse;
......
......@@ -12,6 +12,7 @@ import {
RSC_CONTENT_TYPE_HEADER,
} from '../app-router-headers'
import { urlToUrlWithoutFlightMarker } from '../app-router'
import { callServer } from '../../app-call-server'
/**
* Fetch the flight data for the provided url. Takes in the current router state to decide what to render server-side.
......@@ -75,7 +76,9 @@ export async function fetchServerResponse(
}
// Handle the `fetch` readable stream that can be unwrapped by `React.use`.
const flightData: FlightData = await createFromFetch(Promise.resolve(res))
const flightData: FlightData = await createFromFetch(Promise.resolve(res), {
callServer,
})
return [flightData, canonicalUrl]
} catch (err) {
console.error(
......
......@@ -7,7 +7,7 @@ createNextDescribe(
files: __dirname,
skipDeployment: true,
},
({ next }) => {
({ next, isNextDev }) => {
it('should handle basic actions correctly', async () => {
const browser = await next.browser('/server')
......@@ -83,5 +83,34 @@ createNextDescribe(
await browser.elementByCss('#dec').click()
await check(() => browser.elementByCss('h1').text(), '3')
})
if (isNextDev) {
describe('HMR', () => {
it('should support updating the action', async () => {
const filePath = 'app/server/actions.js'
const origContent = await next.readFile(filePath)
try {
const browser = await next.browser('/server')
const cnt = await browser.elementByCss('h1').text()
expect(cnt).toBe('0')
await browser.elementByCss('#inc').click()
await check(() => browser.elementByCss('h1').text(), '1')
await next.patchFile(
filePath,
origContent.replace('return value + 1', 'return value + 1000')
)
await browser.elementByCss('#inc').click()
await check(() => browser.elementByCss('h1').text(), '1001')
} finally {
await next.patchFile(filePath, origContent)
}
})
})
}
}
)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment