Merge branch 'master' of https://github.com/reduxjs/redux-toolkit into scoped-jsx

aryaemami59 · aryaemami59 · commit c66d620a6844 · 2024-04-30T20:43:48.000-05:00
diff --git a/examples/query/react/kitchen-sink/src/mocks/setupTests.tsx b/examples/query/react/kitchen-sink/src/mocks/setupTests.tsx
@@ -23,7 +23,7 @@ export const setupTests = () => {
     path?: string
   }
   function renderWithProvider(
-    children: React.ReactChild,
+    children: React.ReactElement | number | string,
     { route, path }: RenderOptions = { route: '/', path: '' },
   ) {
     const history = createMemoryHistory()

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ export const setupTests = () => {`
`23`	`23`	`path?: string`
`24`	`24`	`}`
`25`	`25`	`function renderWithProvider(`
`26`		`- children: React.ReactChild,`
	`26`	`+ children: React.ReactElement \| number \| string,`
`27`	`27`	`{ route, path }: RenderOptions = { route: '/', path: '' },`
`28`	`28`	`) {`
`29`	`29`	`const history = createMemoryHistory()`