Merge branch 'main' into feat/react-19

Author: eps1lon

.all-contributorsrc

@@ -1362,6 +1362,15 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "trappar",
+      "name": "Jeff Way",
+      "avatar_url": "https://avatars.githubusercontent.com/u/525726?v=4",
+      "profile": "https://github.com/trappar",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "contributorsPerLine": 7,

README.md

@@ -631,6 +631,7 @@ Thanks goes to these people ([emoji key][emojis]):
     <tr>
       <td align="center" valign="top" width="14.28%"><a href="http://cmdcolin.github.io"><img src="https://avatars.githubusercontent.com/u/6511937?v=4?s=100" width="100px;" alt="Colin Diesh"/><br /><sub><b>Colin Diesh</b></sub></a><br /><a href="https://github.com/testing-library/react-testing-library/commits?author=cmdcolin" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="14.28%"><a href="http://yinm.info"><img src="https://avatars.githubusercontent.com/u/13295106?v=4?s=100" width="100px;" alt="Yusuke Iinuma"/><br /><sub><b>Yusuke Iinuma</b></sub></a><br /><a href="https://github.com/testing-library/react-testing-library/commits?author=yinm" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/trappar"><img src="https://avatars.githubusercontent.com/u/525726?v=4?s=100" width="100px;" alt="Jeff Way"/><br /><sub><b>Jeff Way</b></sub></a><br /><a href="https://github.com/testing-library/react-testing-library/commits?author=trappar" title="Code">💻</a></td>
     </tr>
   </tbody>
 </table>

types/index.d.ts

@@ -39,7 +39,7 @@ export type RenderResult<
     maxLength?: number,
     options?: prettyFormat.OptionsReceived,
   ) => void
-  rerender: (ui: React.ReactElement) => void
+  rerender: (ui: React.ReactNode) => void
   unmount: () => void
   asFragment: () => DocumentFragment
 } & {[P in keyof Q]: BoundFunction<Q[P]>}
@@ -85,7 +85,7 @@ export interface RenderOptions<
    *
    *  @see https://testing-library.com/docs/react-testing-library/api/#wrapper
    */
-  wrapper?: React.JSXElementConstructor<{children: React.ReactElement}>
+  wrapper?: React.JSXElementConstructor<{children: React.ReactNode}>
 }
 
 type Omit<T, K extends keyof T> = Pick<T, Exclude<keyof T, K>>
@@ -98,11 +98,11 @@ export function render<
   Container extends Element | DocumentFragment = HTMLElement,
   BaseElement extends Element | DocumentFragment = Container,
 >(
-  ui: React.ReactElement,
+  ui: React.ReactNode,
   options: RenderOptions<Q, Container, BaseElement>,
 ): RenderResult<Q, Container, BaseElement>
 export function render(
-  ui: React.ReactElement,
+  ui: React.ReactNode,
   options?: Omit<RenderOptions, 'queries'>,
 ): RenderResult
 

types/test.tsx

@@ -123,18 +123,18 @@ export function testQueries() {
 }
 
 export function wrappedRender(
-  ui: React.ReactElement,
+  ui: React.ReactNode,
   options?: pure.RenderOptions,
 ) {
-  const Wrapper = ({children}: {children: React.ReactElement}): JSX.Element => {
+  const Wrapper = ({children}: {children: React.ReactNode}): JSX.Element => {
     return <div>{children}</div>
   }
 
   return pure.render(ui, {wrapper: Wrapper, ...options})
 }
 
 export function wrappedRenderB(
-  ui: React.ReactElement,
+  ui: React.ReactNode,
   options?: pure.RenderOptions,
 ) {
   const Wrapper: React.FunctionComponent<{children?: React.ReactNode}> = ({
@@ -147,7 +147,7 @@ export function wrappedRenderB(
 }
 
 export function wrappedRenderC(
-  ui: React.ReactElement,
+  ui: React.ReactNode,
   options?: pure.RenderOptions,
 ) {
   interface AppWrapperProps {