From 6aefb35e8fd1d9299f06a54ce2877822bc2d9f4f Mon Sep 17 00:00:00 2001 From: Mark Erikson Date: Tue, 12 Apr 2022 23:11:18 -0400 Subject: [PATCH 1/2] Remove leftover `.only` --- test/integration/ssr.spec.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/integration/ssr.spec.tsx b/test/integration/ssr.spec.tsx index e7c437d64..42e7a2256 100644 --- a/test/integration/ssr.spec.tsx +++ b/test/integration/ssr.spec.tsx @@ -126,7 +126,7 @@ describe('New v8 serverState behavior', () => { jest.clearAllMocks() }) - it.only('Handles hydration correctly', async () => { + it('Handles hydration correctly', async () => { const ssrStore = createStore(dataSlice.reducer) // Simulating loading all data before rendering the app From db94ad09eb2b9daf65098c82bf21d21ecd7f3b79 Mon Sep 17 00:00:00 2001 From: Mark Erikson Date: Tue, 12 Apr 2022 23:25:29 -0400 Subject: [PATCH 2/2] Widen React peer deps and add optional Redux dep for types --- package.json | 12 ++++++++---- yarn.lock | 11 +++++++---- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index dc08e4a16..065c4b1d1 100644 --- a/package.json +++ b/package.json @@ -40,10 +40,11 @@ "coverage": "codecov" }, "peerDependencies": { - "@types/react": "^18.0.0", - "react": "^18.0.0", - "react-dom": "^18.0.0", - "react-native": "^0.64.1" + "@types/react": "^16.8 || ^17.0 || ^18.0", + "react": "^16.8 || ^17.0 || ^18.0", + "react-dom": "^16.8 || ^17.0 || ^18.0", + "react-native": ">=0.59", + "redux": "^4" }, "peerDependenciesMeta": { "@types/react": { @@ -54,6 +55,9 @@ }, "react-native": { "optional": true + }, + "redux": { + "optional": true } }, "dependencies": { diff --git a/yarn.lock b/yarn.lock index c8856fd44..180a8aa2c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8931,10 +8931,11 @@ __metadata: typescript: ^4.3.4 use-sync-external-store: ^1.0.0 peerDependencies: - "@types/react": ^18.0.0 - react: ^18.0.0 - react-dom: ^18.0.0 - react-native: ^0.64.1 + "@types/react": ^16.8 || ^17.0 || ^18.0 + react: ^16.8 || ^17.0 || ^18.0 + react-dom: ^16.8 || ^17.0 || ^18.0 + react-native: ">=0.59" + redux: ^4 peerDependenciesMeta: "@types/react": optional: true @@ -8942,6 +8943,8 @@ __metadata: optional: true react-native: optional: true + redux: + optional: true languageName: unknown linkType: soft