Unverified Commit 0bfd4801 authored by Andrew Clark's avatar Andrew Clark Committed by GitHub

Restrict useFormState in Server Components (#55417)

I based my changes on #49331, which did this for useFormStatus.

While I was editing the file, I noticed that useOptimistic was incorrectly categorized as a `react-dom` package export, but it's actually exported from `react`. So I fixed that, too.
Co-authored-by: 's avatarZack Tanner <1939140+ztanner@users.noreply.github.com>
parent 676e3aeb
...@@ -592,7 +592,7 @@ pub fn server_components<C: Comments>( ...@@ -592,7 +592,7 @@ pub fn server_components<C: Comments>(
JsWord::from("flushSync"), JsWord::from("flushSync"),
JsWord::from("unstable_batchedUpdates"), JsWord::from("unstable_batchedUpdates"),
JsWord::from("experimental_useFormStatus"), JsWord::from("experimental_useFormStatus"),
JsWord::from("experimental_useOptimistic"), JsWord::from("experimental_useFormState"),
], ],
invalid_server_react_apis: vec![ invalid_server_react_apis: vec![
JsWord::from("Component"), JsWord::from("Component"),
...@@ -609,6 +609,7 @@ pub fn server_components<C: Comments>( ...@@ -609,6 +609,7 @@ pub fn server_components<C: Comments>(
JsWord::from("useState"), JsWord::from("useState"),
JsWord::from("useSyncExternalStore"), JsWord::from("useSyncExternalStore"),
JsWord::from("useTransition"), JsWord::from("useTransition"),
JsWord::from("experimental_useOptimistic"),
], ],
}) })
} }
...@@ -16,6 +16,8 @@ import { ...@@ -16,6 +16,8 @@ import {
useSyncExternalStore, useSyncExternalStore,
} from 'react' } from 'react'
import { experimental_useOptimistic as useOptimistic } from 'react'
export default function () { export default function () {
return null return null
} }
...@@ -2,6 +2,7 @@ import { useState } from 'react'; ...@@ -2,6 +2,7 @@ import { useState } from 'react';
import { createContext } from 'react'; import { createContext } from 'react';
import { useEffect, useImperativeHandle } from 'react'; import { useEffect, useImperativeHandle } from 'react';
import { Component, createFactory, PureComponent, useDeferredValue, useInsertionEffect, useLayoutEffect, useReducer, useRef, useSyncExternalStore } from 'react'; import { Component, createFactory, PureComponent, useDeferredValue, useInsertionEffect, useLayoutEffect, useReducer, useRef, useSyncExternalStore } from 'react';
import { experimental_useOptimistic as useOptimistic } from 'react';
export default function() { export default function() {
return null; return null;
} }
...@@ -97,3 +97,10 @@ ...@@ -97,3 +97,10 @@
: ^^^^^^^^^^^^^^^^^^^^ : ^^^^^^^^^^^^^^^^^^^^
17 | } from 'react' 17 | } from 'react'
`---- `----
x NEXT_RSC_ERR_REACT_API: experimental_useOptimistic
,-[input.js:18:1]
18 |
19 | import { experimental_useOptimistic as useOptimistic } from 'react'
: ^^^^^^^^^^^^^^^^^^^^^^^^^^
`----
import { findDOMNode, flushSync, unstable_batchedUpdates } from 'react-dom' import { findDOMNode, flushSync, unstable_batchedUpdates } from 'react-dom'
import { import {
experimental_useOptimistic as useOptimistic,
experimental_useFormStatus, experimental_useFormStatus,
experimental_useFormState,
} from 'react-dom' } from 'react-dom'
export default function () { export default function () {
......
import { findDOMNode, flushSync, unstable_batchedUpdates } from 'react-dom'; import { findDOMNode, flushSync, unstable_batchedUpdates } from 'react-dom';
import { experimental_useOptimistic as useOptimistic, experimental_useFormStatus } from 'react-dom'; import { experimental_useFormStatus, experimental_useFormState } from 'react-dom';
export default function() { export default function() {
return null; return null;
} }
...@@ -17,18 +17,18 @@ ...@@ -17,18 +17,18 @@
: ^^^^^^^^^^^^^^^^^^^^^^^ : ^^^^^^^^^^^^^^^^^^^^^^^
`---- `----
x NEXT_RSC_ERR_REACT_API: experimental_useOptimistic x NEXT_RSC_ERR_REACT_API: experimental_useFormStatus
,-[input.js:3:1] ,-[input.js:3:1]
3 | import { 3 | import {
4 | experimental_useOptimistic as useOptimistic, 4 | experimental_useFormStatus,
: ^^^^^^^^^^^^^^^^^^^^^^^^^^ : ^^^^^^^^^^^^^^^^^^^^^^^^^^
5 | experimental_useFormStatus, 5 | experimental_useFormState,
`---- `----
x NEXT_RSC_ERR_REACT_API: experimental_useFormStatus x NEXT_RSC_ERR_REACT_API: experimental_useFormState
,-[input.js:4:1] ,-[input.js:4:1]
4 | experimental_useOptimistic as useOptimistic, 4 | experimental_useFormStatus,
5 | experimental_useFormStatus, 5 | experimental_useFormState,
: ^^^^^^^^^^^^^^^^^^^^^^^^^^ : ^^^^^^^^^^^^^^^^^^^^^^^^^
6 | } from 'react-dom' 6 | } from 'react-dom'
`---- `----
import { findDOMNode, flushSync, unstable_batchedUpdates } from 'react-dom' import { findDOMNode, flushSync, unstable_batchedUpdates } from 'react-dom'
import { import {
experimental_useOptimistic as useOptimistic,
experimental_useFormStatus, experimental_useFormStatus,
experimental_useFormState,
} from 'react-dom' } from 'react-dom'
export default function () { export default function () {
......
import { findDOMNode, flushSync, unstable_batchedUpdates } from 'react-dom'; import { findDOMNode, flushSync, unstable_batchedUpdates } from 'react-dom';
import { experimental_useOptimistic as useOptimistic, experimental_useFormStatus } from 'react-dom'; import { experimental_useFormStatus, experimental_useFormState } from 'react-dom';
export default function() { export default function() {
return null; return null;
} }
...@@ -258,19 +258,12 @@ describe('Error Overlay for server components', () => { ...@@ -258,19 +258,12 @@ describe('Error Overlay for server components', () => {
) )
await check(async () => { await check(async () => {
expect( const html = await browser.eval('document.documentElement.innerHTML')
await browser expect(html).toContain('experimental_useOptimistic')
.waitForElementByCss('#nextjs__container_errors_desc')
.text()
).toContain(
'experimental_useOptimistic only works in Client Components. Add the "use client" directive at the top of the file to use it. Read more: https://nextjs.org/docs/messages/react-client-hook-in-server-component'
)
return 'success' return 'success'
}, 'success') }, 'success')
expect(next.cliOutput).toContain( expect(next.cliOutput).toContain('experimental_useOptimistic')
'experimental_useOptimistic only works in Client Components. Add the "use client" directive at the top of the file to use it. Read more: https://nextjs.org/docs/messages/react-client-hook-in-server-component'
)
await cleanup() await cleanup()
}) })
......
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