Remove prefix from formState option (facebook#27460)

acdlite · Umeshmalik · commit 552b724a158a · 2023-10-08T20:10:05.000Z
`useFormState` is now in canary.
diff --git 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
@@ -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
@@ -57,7 +57,7 @@ export type HydrateRootOptions = {
   unstable_transitionCallbacks?: TransitionTracingCallbacks,
   identifierPrefix?: string,
   onRecoverableError?: (error: mixed) => void,
-  experimental_formState?: ReactFormState<any, any> | null,
+  formState?: ReactFormState<any, any> | 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
@@ -43,7 +43,7 @@ type Options = {
   onPostpone?: (reason: string) => void,
   unstable_externalRuntimeSrc?: string | BootstrapScriptDescriptor,
   importMap?: ImportMap,
-  experimental_formState?: ReactFormState<any, any> | null,
+  formState?: ReactFormState<any, any> | 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
@@ -40,7 +40,7 @@ type Options = {
   onPostpone?: (reason: string) => void,
   unstable_externalRuntimeSrc?: string | BootstrapScriptDescriptor,
   importMap?: ImportMap,
-  experimental_formState?: ReactFormState<any, any> | null,
+  formState?: ReactFormState<any, any> | 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
@@ -43,7 +43,7 @@ type Options = {
   onPostpone?: (reason: string) => void,
   unstable_externalRuntimeSrc?: string | BootstrapScriptDescriptor,
   importMap?: ImportMap,
-  experimental_formState?: ReactFormState<any, any> | null,
+  formState?: ReactFormState<any, any> | 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
@@ -59,7 +59,7 @@ type Options = {
   onPostpone?: (reason: string) => void,
   unstable_externalRuntimeSrc?: string | BootstrapScriptDescriptor,
   importMap?: ImportMap,
-  experimental_formState?: ReactFormState<any, any> | null,
+  formState?: ReactFormState<any, any> | 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
@@ -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);
 

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ async function hydrateApp() {`
`48`	`48`	`// the state needs to be transported as part of the HTML stream. We intend`
`49`	`49`	`// to add a feature to Fizz for this, but for now it's up to the`
`50`	`50`	`// metaframework to implement correctly.`
`51`		`- experimental_formState: formState,`
	`51`	`+ formState: formState,`
`52`	`52`	`});`
`53`	`53`	`}`
`54`	`54`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ export type HydrateRootOptions = {`
`57`	`57`	`unstable_transitionCallbacks?: TransitionTracingCallbacks,`
`58`	`58`	`identifierPrefix?: string,`
`59`	`59`	`onRecoverableError?: (error: mixed) => void,`
`60`		`- experimental_formState?: ReactFormState<any, any> \| null,`
	`60`	`+ formState?: ReactFormState<any, any> \| null,`
`61`	`61`	`...`
`62`	`62`	`};`
`63`	`63`
`@@ -326,8 +326,8 @@ export function hydrateRoot(`
`326`	`326`	`transitionCallbacks = options.unstable_transitionCallbacks;`
`327`	`327`	`}`
`328`	`328`	`if (enableAsyncActions && enableFormActions) {`
`329`		`- if (options.experimental_formState !== undefined) {`
`330`		`- formState = options.experimental_formState;`
	`329`	`+ if (options.formState !== undefined) {`
	`330`	`+ formState = options.formState;`
`331`	`331`	`}`
`332`	`332`	`}`
`333`	`333`	`}`