Merge branch 'master' into mrickert/feat/analytics

jamonholmgren · web-flow · commit 017c3aa053b1 · 2024-01-23T08:51:24.000-08:00
diff --git a/apps/reactotron-app/package.json b/apps/reactotron-app/package.json
@@ -83,7 +83,7 @@
     "@storybook/addon-links": "^5.2.8",
     "@storybook/addons": "^5.2.8",
     "@storybook/react": "^5.2.8",
-    "@testing-library/react-hooks": "^8.0.1",
+    "@testing-library/react": "^14.1.2",
     "@types/jest": "^29.5.7",
     "@types/react": "18.2.35",
     "@types/react-dom": "18.2.14",
diff --git a/apps/reactotron-app/src/renderer/contexts/Layout/useLayout.test.ts b/apps/reactotron-app/src/renderer/contexts/Layout/useLayout.test.ts
@@ -1,4 +1,4 @@
-import { act, renderHook } from "@testing-library/react-hooks/dom"
+import { act, renderHook } from "@testing-library/react"
 
 import useLayout from "./useLayout"
 
diff --git a/apps/reactotron-app/src/renderer/contexts/Standalone/useStandalone.test.ts b/apps/reactotron-app/src/renderer/contexts/Standalone/useStandalone.test.ts
@@ -1,4 +1,4 @@
-import { act, renderHook } from "@testing-library/react-hooks/dom"
+import { act, renderHook } from "@testing-library/react"
 
 import useStandalone from "./useStandalone"
 
diff --git a/lib/reactotron-core-ui/package.json b/lib/reactotron-core-ui/package.json
@@ -55,8 +55,8 @@
     "stringify-object": "5.0.0"
   },
   "peerDependencies": {
-    "react": ">=17.0.2",
-    "react-dom": ">=17.0.2",
+    "react": ">=18.2.0",
+    "react-dom": ">=18.2.0",
     "react-icons": ">=4.2.0",
     "react-modal": ">=3.16.1",
     "react-motion": ">=0.5.2",
@@ -74,7 +74,7 @@
     "@storybook/addon-links": "6.1.21",
     "@storybook/addons": "6.1.21",
     "@storybook/react": "6.1.21",
-    "@testing-library/react-hooks": "8.0.1",
+    "@testing-library/react": "^14.1.2",
     "@types/jest": "^29.5.7",
     "@types/react": "18.2.35",
     "@types/react-dom": "18.2.14",
diff --git a/lib/reactotron-core-ui/src/contexts/CustomCommands/useCustomCommands.test.tsx b/lib/reactotron-core-ui/src/contexts/CustomCommands/useCustomCommands.test.tsx
@@ -1,6 +1,6 @@
 /* eslint-disable react/display-name */
 import React from "react"
-import { act, renderHook } from "@testing-library/react-hooks"
+import { act, renderHook } from "@testing-library/react"
 
 import ReactotronContext from "../Reactotron"
 import { CommandType } from "reactotron-core-contract"
diff --git a/lib/reactotron-core-ui/src/contexts/ReactNative/useStorybook.test.tsx b/lib/reactotron-core-ui/src/contexts/ReactNative/useStorybook.test.tsx
@@ -1,6 +1,6 @@
 /* eslint-disable react/display-name */
 import React from "react"
-import { act, renderHook } from "@testing-library/react-hooks"
+import { act, renderHook } from "@testing-library/react"
 
 import ReactotronContext from "../Reactotron"
 import { CommandType } from "reactotron-core-contract"
diff --git a/lib/reactotron-core-ui/src/contexts/Reactotron/useReactotron.test.ts b/lib/reactotron-core-ui/src/contexts/Reactotron/useReactotron.test.ts
@@ -1,4 +1,4 @@
-import { act, renderHook } from "@testing-library/react-hooks"
+import { act, renderHook } from "@testing-library/react"
 
 import useReactotron from "./useReactotron"
 
diff --git a/lib/reactotron-core-ui/src/contexts/State/useSnapshots.test.tsx b/lib/reactotron-core-ui/src/contexts/State/useSnapshots.test.tsx
@@ -1,6 +1,6 @@
 /* eslint-disable react/display-name */
 import React from "react"
-import { act, renderHook } from "@testing-library/react-hooks"
+import { act, renderHook } from "@testing-library/react"
 
 import { CommandType } from "reactotron-core-contract"
 import ReactotronContext from "../Reactotron"
diff --git a/lib/reactotron-core-ui/src/contexts/State/useSubscriptions.test.tsx b/lib/reactotron-core-ui/src/contexts/State/useSubscriptions.test.tsx
@@ -1,6 +1,6 @@
 /* eslint-disable react/display-name */
 import React from "react"
-import { act, renderHook } from "@testing-library/react-hooks"
+import { act, renderHook } from "@testing-library/react"
 
 import ReactotronContext from "../Reactotron"
 
diff --git a/lib/reactotron-core-ui/src/contexts/Timeline/useTimeline.test.ts b/lib/reactotron-core-ui/src/contexts/Timeline/useTimeline.test.ts
@@ -1,4 +1,4 @@
-import { act, renderHook } from "@testing-library/react-hooks"
+import { act, renderHook } from "@testing-library/react"
 
 import { CommandType } from "reactotron-core-contract"
 
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { act, renderHook } from "@testing-library/react-hooks/dom"`
	`1`	`+import { act, renderHook } from "@testing-library/react"`
`2`	`2`
`3`	`3`	`import useLayout from "./useLayout"`
`4`	`4`