From 8993bab7c00de6e8ea14c5be35f015542f24ca2f Mon Sep 17 00:00:00 2001
From: Shu Ding <g@shud.in>
Date: Tue, 5 Apr 2022 16:46:29 +0200
Subject: [PATCH] Update React 18 dependencies (#1824)

* update react@next deps

* update react 18

Co-authored-by: Jiachi Liu <inbox@huozhi.im>
---
 package.json                               |  4 +--
 test/use-swr-concurrent-rendering.test.tsx | 10 +++---
 yarn.lock                                  | 41 ++++++++++------------
 3 files changed, 25 insertions(+), 30 deletions(-)

diff --git a/package.json b/package.json
index a86dc3e93..9674c988c 100644
--- a/package.json
+++ b/package.json
@@ -102,8 +102,8 @@
     "prettier": "2.5.0",
     "react": "17.0.1",
     "react-dom": "17.0.1",
-    "react-dom-experimental": "npm:react-dom@alpha",
-    "react-experimental": "npm:react@alpha",
+    "react-dom-18": "npm:react-dom@18",
+    "react-18": "npm:react@18",
     "rimraf": "3.0.2",
     "swr": "link:./",
     "typescript": "4.4.3"
diff --git a/test/use-swr-concurrent-rendering.test.tsx b/test/use-swr-concurrent-rendering.test.tsx
index c179092bf..0041e4e1a 100644
--- a/test/use-swr-concurrent-rendering.test.tsx
+++ b/test/use-swr-concurrent-rendering.test.tsx
@@ -9,14 +9,12 @@ let React // swc transformer requires to define React at the top
 
 describe('useSWR - concurrent rendering', () => {
   let ReactDOM, act, useSWR, reactRoot, renderWithConfig
-  beforeAll(() => {
+  beforeEach(() => {
     jest.resetModules()
     jest.mock('scheduler', () => require('scheduler/unstable_mock'))
-    jest.mock('react', () => require('react-experimental'))
-    jest.mock('react-dom', () => require('react-dom-experimental'))
-    jest.mock('react-dom/test-utils', () =>
-      require('react-dom-experimental/test-utils')
-    )
+    jest.mock('react', () => require('react-18'))
+    jest.mock('react-dom', () => require('react-dom-18'))
+    jest.mock('react-dom/test-utils', () => require('react-dom-18/test-utils'))
     React = require('react')
     ReactDOM = require('react-dom')
     act = require('react-dom/test-utils').act
diff --git a/yarn.lock b/yarn.lock
index c70b5e6cc..ba184afce 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5500,14 +5500,20 @@ randombytes@^2.1.0:
   dependencies:
     safe-buffer "^5.1.0"
 
-"react-dom-experimental@npm:react-dom@alpha":
-  version "18.0.0-alpha-baff3f200-20210921"
-  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-18.0.0-alpha-baff3f200-20210921.tgz#b79513c6baf7d46a1a96cb7fcce9d0f9cc647ad2"
-  integrity sha512-BzCuXsZFZ0GJQAiJPUCpzDuXj5U7o4tzUhl5pmqjIWT1BhmjVjIDOxD7acKdxv86uQArXXHHt9KbvuNewTP2ag==
+"react-18@npm:react@18":
+  version "18.0.0"
+  resolved "https://registry.yarnpkg.com/react/-/react-18.0.0.tgz#b468736d1f4a5891f38585ba8e8fb29f91c3cb96"
+  integrity sha512-x+VL6wbT4JRVPm7EGxXhZ8w8LTROaxPXOqhlGyVSrv0sB1jkyFGgXxJ8LVoPRLvPR6/CIZGFmfzqUa2NYeMr2A==
   dependencies:
     loose-envify "^1.1.0"
-    object-assign "^4.1.1"
-    scheduler "0.21.0-alpha-baff3f200-20210921"
+
+"react-dom-18@npm:react-dom@18":
+  version "18.0.0"
+  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-18.0.0.tgz#26b88534f8f1dbb80853e1eabe752f24100d8023"
+  integrity sha512-XqX7uzmFo0pUceWFCt7Gff6IyIMzFUn7QMZrbrQfGxtaxXZIcGQzoNpRLE3fQLnS4XzLLPMZX2T9TRcSrasicw==
+  dependencies:
+    loose-envify "^1.1.0"
+    scheduler "^0.21.0"
 
 react-dom@17.0.1:
   version "17.0.1"
@@ -5518,14 +5524,6 @@ react-dom@17.0.1:
     object-assign "^4.1.1"
     scheduler "^0.20.1"
 
-"react-experimental@npm:react@alpha":
-  version "18.0.0-alpha-baff3f200-20210921"
-  resolved "https://registry.yarnpkg.com/react/-/react-18.0.0-alpha-baff3f200-20210921.tgz#2f36c00d87282d864e627ba1f5286981955f821e"
-  integrity sha512-T3VEpIKpMitpaEt1gjpSRepQ2x+vcAK+ySZ4CgeT6VVpgvb9EVdYzuWNyS+qCIMTJI2XxV02Ze9O/jAndJMzaw==
-  dependencies:
-    loose-envify "^1.1.0"
-    object-assign "^4.1.1"
-
 react-is@^16.8.1:
   version "16.13.1"
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
@@ -5807,14 +5805,6 @@ saxes@^5.0.1:
   dependencies:
     xmlchars "^2.2.0"
 
-scheduler@0.21.0-alpha-baff3f200-20210921:
-  version "0.21.0-alpha-baff3f200-20210921"
-  resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.21.0-alpha-baff3f200-20210921.tgz#a37bd518480778555e577443b6bfcc1c3b78c685"
-  integrity sha512-54soKvnnQG6CiPlRwrg9l9ierBB7WzcShEMLK2Fd5v9HSJ6bufNcBpsTTIsniMXHdMnwDfZcZ0KjpRbuwCC8KQ==
-  dependencies:
-    loose-envify "^1.1.0"
-    object-assign "^4.1.1"
-
 scheduler@^0.20.1:
   version "0.20.2"
   resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.20.2.tgz#4baee39436e34aa93b4874bddcbf0fe8b8b50e91"
@@ -5823,6 +5813,13 @@ scheduler@^0.20.1:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
 
+scheduler@^0.21.0:
+  version "0.21.0"
+  resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.21.0.tgz#6fd2532ff5a6d877b6edb12f00d8ab7e8f308820"
+  integrity sha512-1r87x5fz9MXqswA2ERLo0EbOAU74DpIUO090gIasYTqlVoJeMcl+Z1Rg7WHz+qtPujhS/hGIt9kxZOYBV3faRQ==
+  dependencies:
+    loose-envify "^1.1.0"
+
 semver-compare@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc"