From 6930bdc26fc130ac55bb8b4d4d04434b65ed68e9 Mon Sep 17 00:00:00 2001 From: Andrew Clark Date: Wed, 4 Oct 2023 14:59:33 -0400 Subject: [PATCH] Remove prefix from `formState` option `useFormState` is now in canary. --- fixtures/flight/server/global.js | 2 +- fixtures/flight/src/index.js | 2 +- packages/react-dom/src/client/ReactDOMRoot.js | 6 +++--- .../src/server/ReactDOMFizzServerBrowser.js | 4 ++-- .../react-dom/src/server/ReactDOMFizzServerBun.js | 4 ++-- .../react-dom/src/server/ReactDOMFizzServerEdge.js | 4 ++-- .../react-dom/src/server/ReactDOMFizzServerNode.js | 4 ++-- .../src/__tests__/ReactFlightDOMForm-test.js | 14 +++++++------- 8 files changed, 20 insertions(+), 20 deletions(-) diff --git a/fixtures/flight/server/global.js b/fixtures/flight/server/global.js index 421a7d7527a66..180d46072b7ce 100644 --- a/fixtures/flight/server/global.js +++ b/fixtures/flight/server/global.js @@ -173,7 +173,7 @@ app.all('/', async function (req, res, next) { res.set('Content-type', 'text/html'); const {pipe} = renderToPipeableStream(React.createElement(Root), { bootstrapScripts: mainJSChunks, - experimental_formState: lazyFormState, + formState: lazyFormState, }); pipe(res); } catch (e) { diff --git a/fixtures/flight/src/index.js b/fixtures/flight/src/index.js index dd5a6b02b7681..c888a8a53bf32 100644 --- a/fixtures/flight/src/index.js +++ b/fixtures/flight/src/index.js @@ -48,7 +48,7 @@ async function hydrateApp() { // the state needs to be transported as part of the HTML stream. We intend // to add a feature to Fizz for this, but for now it's up to the // metaframework to implement correctly. - experimental_formState: formState, + formState: formState, }); } diff --git a/packages/react-dom/src/client/ReactDOMRoot.js b/packages/react-dom/src/client/ReactDOMRoot.js index 3ce35d4a20e51..ea36929cac5e5 100644 --- a/packages/react-dom/src/client/ReactDOMRoot.js +++ b/packages/react-dom/src/client/ReactDOMRoot.js @@ -57,7 +57,7 @@ export type HydrateRootOptions = { unstable_transitionCallbacks?: TransitionTracingCallbacks, identifierPrefix?: string, onRecoverableError?: (error: mixed) => void, - experimental_formState?: ReactFormState | null, + formState?: ReactFormState | null, ... }; @@ -326,8 +326,8 @@ export function hydrateRoot( transitionCallbacks = options.unstable_transitionCallbacks; } if (enableAsyncActions && enableFormActions) { - if (options.experimental_formState !== undefined) { - formState = options.experimental_formState; + if (options.formState !== undefined) { + formState = options.formState; } } } diff --git a/packages/react-dom/src/server/ReactDOMFizzServerBrowser.js b/packages/react-dom/src/server/ReactDOMFizzServerBrowser.js index 8b0d915fc3272..245122071e103 100644 --- a/packages/react-dom/src/server/ReactDOMFizzServerBrowser.js +++ b/packages/react-dom/src/server/ReactDOMFizzServerBrowser.js @@ -43,7 +43,7 @@ type Options = { onPostpone?: (reason: string) => void, unstable_externalRuntimeSrc?: string | BootstrapScriptDescriptor, importMap?: ImportMap, - experimental_formState?: ReactFormState | null, + formState?: ReactFormState | null, }; type ResumeOptions = { @@ -121,7 +121,7 @@ function renderToReadableStream( onShellError, onFatalError, options ? options.onPostpone : undefined, - options ? options.experimental_formState : undefined, + options ? options.formState : undefined, ); if (options && options.signal) { const signal = options.signal; diff --git a/packages/react-dom/src/server/ReactDOMFizzServerBun.js b/packages/react-dom/src/server/ReactDOMFizzServerBun.js index 029f4cb42d8bf..9bcd19fb748a5 100644 --- a/packages/react-dom/src/server/ReactDOMFizzServerBun.js +++ b/packages/react-dom/src/server/ReactDOMFizzServerBun.js @@ -40,7 +40,7 @@ type Options = { onPostpone?: (reason: string) => void, unstable_externalRuntimeSrc?: string | BootstrapScriptDescriptor, importMap?: ImportMap, - experimental_formState?: ReactFormState | null, + formState?: ReactFormState | null, }; // TODO: Move to sub-classing ReadableStream. @@ -111,7 +111,7 @@ function renderToReadableStream( onShellError, onFatalError, options ? options.onPostpone : undefined, - options ? options.experimental_formState : undefined, + options ? options.formState : undefined, ); if (options && options.signal) { const signal = options.signal; diff --git a/packages/react-dom/src/server/ReactDOMFizzServerEdge.js b/packages/react-dom/src/server/ReactDOMFizzServerEdge.js index 8b0d915fc3272..245122071e103 100644 --- a/packages/react-dom/src/server/ReactDOMFizzServerEdge.js +++ b/packages/react-dom/src/server/ReactDOMFizzServerEdge.js @@ -43,7 +43,7 @@ type Options = { onPostpone?: (reason: string) => void, unstable_externalRuntimeSrc?: string | BootstrapScriptDescriptor, importMap?: ImportMap, - experimental_formState?: ReactFormState | null, + formState?: ReactFormState | null, }; type ResumeOptions = { @@ -121,7 +121,7 @@ function renderToReadableStream( onShellError, onFatalError, options ? options.onPostpone : undefined, - options ? options.experimental_formState : undefined, + options ? options.formState : undefined, ); if (options && options.signal) { const signal = options.signal; diff --git a/packages/react-dom/src/server/ReactDOMFizzServerNode.js b/packages/react-dom/src/server/ReactDOMFizzServerNode.js index 11e3eada2efb5..db77734a6af71 100644 --- a/packages/react-dom/src/server/ReactDOMFizzServerNode.js +++ b/packages/react-dom/src/server/ReactDOMFizzServerNode.js @@ -59,7 +59,7 @@ type Options = { onPostpone?: (reason: string) => void, unstable_externalRuntimeSrc?: string | BootstrapScriptDescriptor, importMap?: ImportMap, - experimental_formState?: ReactFormState | null, + formState?: ReactFormState | null, }; type ResumeOptions = { @@ -103,7 +103,7 @@ function createRequestImpl(children: ReactNodeList, options: void | Options) { options ? options.onShellError : undefined, undefined, options ? options.onPostpone : undefined, - options ? options.experimental_formState : undefined, + options ? options.formState : undefined, ); } diff --git a/packages/react-server-dom-webpack/src/__tests__/ReactFlightDOMForm-test.js b/packages/react-server-dom-webpack/src/__tests__/ReactFlightDOMForm-test.js index f179bc6acbb21..25657ae91fd3c 100644 --- a/packages/react-server-dom-webpack/src/__tests__/ReactFlightDOMForm-test.js +++ b/packages/react-server-dom-webpack/src/__tests__/ReactFlightDOMForm-test.js @@ -454,7 +454,7 @@ describe('ReactFlightDOMForm', () => { ); const postbackSsrStream = await ReactDOMServer.renderToReadableStream( postbackResponse, - {experimental_formState: formState}, + {formState: formState}, ); await readIntoContainer(postbackSsrStream); @@ -468,7 +468,7 @@ describe('ReactFlightDOMForm', () => { // also does. Remove dev condition once FlightServer.act() is available. await act(() => { ReactDOMClient.hydrateRoot(container, postbackResponse, { - experimental_formState: formState, + formState: formState, }); }); expect(container.textContent).toBe('121'); @@ -552,7 +552,7 @@ describe('ReactFlightDOMForm', () => { ); const postbackSsrStream = await ReactDOMServer.renderToReadableStream( postbackResponse, - {experimental_formState: formState}, + {formState: formState}, ); await readIntoContainer(postbackSsrStream); @@ -584,7 +584,7 @@ describe('ReactFlightDOMForm', () => { ); const postbackSsrStream2 = await ReactDOMServer.renderToReadableStream( postbackResponse2, - {experimental_formState: formState2}, + {formState: formState2}, ); await readIntoContainer(postbackSsrStream2); @@ -668,7 +668,7 @@ describe('ReactFlightDOMForm', () => { ); const postbackSsrStream = await ReactDOMServer.renderToReadableStream( postbackResponse, - {experimental_formState: formState}, + {formState: formState}, ); await readIntoContainer(postbackSsrStream); @@ -744,7 +744,7 @@ describe('ReactFlightDOMForm', () => { ); const postbackSsrStream = await ReactDOMServer.renderToReadableStream( postbackResponse, - {experimental_formState: formState}, + {formState: formState}, ); await readIntoContainer(postbackSsrStream); @@ -772,7 +772,7 @@ describe('ReactFlightDOMForm', () => { ); const postbackSsrStream2 = await ReactDOMServer.renderToReadableStream( postbackResponse2, - {experimental_formState: formState2}, + {formState: formState2}, ); await readIntoContainer(postbackSsrStream2);