From 977a888e6a88a397d38eba1e80e36516d568eff5 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Tue, 29 Mar 2022 18:42:51 +0000
Subject: [PATCH 01/17] fix(deps): update react monorepo to v18

---
 design-system/packages/button/package.json    |  2 +-
 design-system/packages/core/package.json      |  8 +++---
 design-system/packages/fields/package.json    |  2 +-
 design-system/packages/icons/package.json     |  4 +--
 design-system/packages/loading/package.json   |  2 +-
 design-system/packages/modals/package.json    |  2 +-
 design-system/packages/notice/package.json    |  2 +-
 design-system/packages/options/package.json   |  4 +--
 design-system/packages/pill/package.json      |  4 +--
 design-system/packages/popover/package.json   |  8 +++---
 .../packages/segmented-control/package.json   |  4 +--
 design-system/packages/toast/package.json     |  4 +--
 design-system/packages/tooltip/package.json   |  8 +++---
 design-system/website/package.json            |  4 +--
 docs/package.json                             |  4 +--
 examples-staging/auth/package.json            |  4 +--
 examples-staging/basic/package.json           |  4 +--
 examples-staging/ecommerce/package.json       |  4 +--
 examples-staging/embedded-nextjs/package.json |  4 +--
 examples-staging/roles/package.json           |  4 +--
 package.json                                  |  4 +--
 packages/auth/package.json                    |  4 +--
 packages/cloudinary/package.json              |  2 +-
 packages/core/package.json                    |  4 +--
 packages/document-renderer/package.json       |  4 +--
 packages/fields-document/package.json         |  2 +-
 yarn.lock                                     | 27 +++++++++++--------
 27 files changed, 67 insertions(+), 62 deletions(-)

diff --git a/design-system/packages/button/package.json b/design-system/packages/button/package.json
index ced226cb2fb..474af505eae 100644
--- a/design-system/packages/button/package.json
+++ b/design-system/packages/button/package.json
@@ -12,7 +12,7 @@
     "@keystone-ui/core": "^4.0.0",
     "@keystone-ui/icons": "^5.0.0",
     "@keystone-ui/loading": "^5.0.0",
-    "react": "^17.0.2"
+    "react": "^18.0.0"
   },
   "engines": {
     "node": "^14.15 || ^16.13"
diff --git a/design-system/packages/core/package.json b/design-system/packages/core/package.json
index 5637703ede8..78f96b1f7b0 100644
--- a/design-system/packages/core/package.json
+++ b/design-system/packages/core/package.json
@@ -6,12 +6,12 @@
   "module": "dist/keystone-ui-core.esm.js",
   "devDependencies": {
     "@types/react": "^17.0.37",
-    "react": "^17.0.2",
-    "react-dom": "^17.0.2"
+    "react": "^18.0.0",
+    "react-dom": "^18.0.0"
   },
   "peerDependencies": {
-    "react": "^17.0.2",
-    "react-dom": "^17.0.2"
+    "react": "^18.0.0",
+    "react-dom": "^18.0.0"
   },
   "dependencies": {
     "@babel/runtime": "^7.16.3",
diff --git a/design-system/packages/fields/package.json b/design-system/packages/fields/package.json
index 1c0b7bb4910..45f3782f571 100644
--- a/design-system/packages/fields/package.json
+++ b/design-system/packages/fields/package.json
@@ -13,7 +13,7 @@
     "@keystone-ui/icons": "^5.0.0",
     "@keystone-ui/popover": "^5.0.1",
     "date-fns": "^2.26.0",
-    "react": "^17.0.2",
+    "react": "^18.0.0",
     "react-day-picker": "^8.0.4",
     "react-focus-lock": "^2.7.1",
     "react-select": "^5.2.1"
diff --git a/design-system/packages/icons/package.json b/design-system/packages/icons/package.json
index 70285f21992..1ee7826ed48 100644
--- a/design-system/packages/icons/package.json
+++ b/design-system/packages/icons/package.json
@@ -17,7 +17,7 @@
     "feather-icons": "^4.28.0",
     "fs-extra": "^10.0.0",
     "globby": "^11.0.4",
-    "react": "^17.0.2",
+    "react": "^18.0.0",
     "to-pascal-case": "^1.0.0"
   },
   "dependencies": {
@@ -25,7 +25,7 @@
     "@keystone-ui/core": "^4.0.0"
   },
   "peerDependencies": {
-    "react": "^17.0.2"
+    "react": "^18.0.0"
   },
   "engines": {
     "node": "^14.15 || ^16.13"
diff --git a/design-system/packages/loading/package.json b/design-system/packages/loading/package.json
index 054dbd20813..817649579ed 100644
--- a/design-system/packages/loading/package.json
+++ b/design-system/packages/loading/package.json
@@ -10,7 +10,7 @@
   "dependencies": {
     "@babel/runtime": "^7.16.3",
     "@keystone-ui/core": "^4.0.0",
-    "react": "^17.0.2"
+    "react": "^18.0.0"
   },
   "engines": {
     "node": "^14.15 || ^16.13"
diff --git a/design-system/packages/modals/package.json b/design-system/packages/modals/package.json
index c6540bf3194..b9287f41942 100644
--- a/design-system/packages/modals/package.json
+++ b/design-system/packages/modals/package.json
@@ -11,7 +11,7 @@
     "@babel/runtime": "^7.16.3",
     "@keystone-ui/button": "^6.0.0",
     "@keystone-ui/core": "^4.0.0",
-    "react": "^17.0.2",
+    "react": "^18.0.0",
     "react-focus-lock": "^2.7.1",
     "react-remove-scroll": "^2.4.3",
     "react-transition-group": "^4.4.2"
diff --git a/design-system/packages/notice/package.json b/design-system/packages/notice/package.json
index 9f02809477b..d9a78cb8649 100644
--- a/design-system/packages/notice/package.json
+++ b/design-system/packages/notice/package.json
@@ -12,7 +12,7 @@
     "@keystone-ui/button": "^6.0.0",
     "@keystone-ui/core": "^4.0.0",
     "@keystone-ui/icons": "^5.0.0",
-    "react": "^17.0.2"
+    "react": "^18.0.0"
   },
   "engines": {
     "node": "^14.15 || ^16.13"
diff --git a/design-system/packages/options/package.json b/design-system/packages/options/package.json
index 17970dcaf37..d0f75527e81 100644
--- a/design-system/packages/options/package.json
+++ b/design-system/packages/options/package.json
@@ -5,10 +5,10 @@
   "main": "dist/keystone-ui-options.cjs.js",
   "module": "dist/keystone-ui-options.esm.js",
   "peerDependencies": {
-    "react": "^17.0.2"
+    "react": "^18.0.0"
   },
   "devDependencies": {
-    "react": "^17.0.2"
+    "react": "^18.0.0"
   },
   "dependencies": {
     "@babel/runtime": "^7.16.3",
diff --git a/design-system/packages/pill/package.json b/design-system/packages/pill/package.json
index cf9ac6024de..655988cc4f0 100644
--- a/design-system/packages/pill/package.json
+++ b/design-system/packages/pill/package.json
@@ -5,10 +5,10 @@
   "main": "dist/keystone-ui-pill.cjs.js",
   "module": "dist/keystone-ui-pill.esm.js",
   "peerDependencies": {
-    "react": "^17.0.2"
+    "react": "^18.0.0"
   },
   "devDependencies": {
-    "react": "^17.0.2"
+    "react": "^18.0.0"
   },
   "dependencies": {
     "@babel/runtime": "^7.16.3",
diff --git a/design-system/packages/popover/package.json b/design-system/packages/popover/package.json
index 9c0b4e65698..beae4db2366 100644
--- a/design-system/packages/popover/package.json
+++ b/design-system/packages/popover/package.json
@@ -5,12 +5,12 @@
   "main": "dist/keystone-ui-popover.cjs.js",
   "module": "dist/keystone-ui-popover.esm.js",
   "peerDependencies": {
-    "react": "^17.0.2",
-    "react-dom": "^17.0.2"
+    "react": "^18.0.0",
+    "react-dom": "^18.0.0"
   },
   "devDependencies": {
-    "react": "^17.0.2",
-    "react-dom": "^17.0.2"
+    "react": "^18.0.0",
+    "react-dom": "^18.0.0"
   },
   "dependencies": {
     "@babel/runtime": "^7.16.3",
diff --git a/design-system/packages/segmented-control/package.json b/design-system/packages/segmented-control/package.json
index 10fa8a4c0ba..61a98f76606 100644
--- a/design-system/packages/segmented-control/package.json
+++ b/design-system/packages/segmented-control/package.json
@@ -6,14 +6,14 @@
   "module": "dist/keystone-ui-segmented-control.esm.js",
   "devDependencies": {
     "@types/react": "^17.0.37",
-    "react": "^17.0.2"
+    "react": "^18.0.0"
   },
   "dependencies": {
     "@babel/runtime": "^7.16.3",
     "@keystone-ui/core": "^4.0.0"
   },
   "peerDependencies": {
-    "react": "^17.0.2"
+    "react": "^18.0.0"
   },
   "engines": {
     "node": "^14.15 || ^16.13"
diff --git a/design-system/packages/toast/package.json b/design-system/packages/toast/package.json
index aa800427268..d1ce9a598cf 100644
--- a/design-system/packages/toast/package.json
+++ b/design-system/packages/toast/package.json
@@ -6,7 +6,7 @@
   "module": "dist/keystone-ui-toast.esm.js",
   "devDependencies": {
     "@types/react": "^17.0.37",
-    "react": "^17.0.2"
+    "react": "^18.0.0"
   },
   "dependencies": {
     "@babel/runtime": "^7.16.3",
@@ -14,7 +14,7 @@
     "@keystone-ui/icons": "^5.0.0"
   },
   "peerDependencies": {
-    "react": "^17.0.2"
+    "react": "^18.0.0"
   },
   "engines": {
     "node": "^14.15 || ^16.13"
diff --git a/design-system/packages/tooltip/package.json b/design-system/packages/tooltip/package.json
index 2dc63fddec9..ae449a18c5b 100644
--- a/design-system/packages/tooltip/package.json
+++ b/design-system/packages/tooltip/package.json
@@ -5,12 +5,12 @@
   "main": "dist/keystone-ui-tooltip.cjs.js",
   "module": "dist/keystone-ui-tooltip.esm.js",
   "peerDependencies": {
-    "react": "^17.0.2",
-    "react-dom": "^17.0.2"
+    "react": "^18.0.0",
+    "react-dom": "^18.0.0"
   },
   "devDependencies": {
-    "react": "^17.0.2",
-    "react-dom": "^17.0.2"
+    "react": "^18.0.0",
+    "react-dom": "^18.0.0"
   },
   "dependencies": {
     "@babel/runtime": "^7.16.3",
diff --git a/design-system/website/package.json b/design-system/website/package.json
index 6ec633fc6d8..011caa78a73 100644
--- a/design-system/website/package.json
+++ b/design-system/website/package.json
@@ -25,8 +25,8 @@
     "@types/react-dom": "^17.0.11",
     "@types/tinycolor2": "^1.4.3",
     "next": "^12.1.0",
-    "react": "^17.0.2",
-    "react-dom": "^17.0.2",
+    "react": "^18.0.0",
+    "react-dom": "^18.0.0",
     "tinycolor2": "^1.4.2"
   },
   "devDependencies": {
diff --git a/docs/package.json b/docs/package.json
index 8de8a8f0b4a..41366ddbf96 100644
--- a/docs/package.json
+++ b/docs/package.json
@@ -33,8 +33,8 @@
     "next": "^12.1.0",
     "next-compose-plugins": "^2.2.1",
     "prism-react-renderer": "^1.2.1",
-    "react": "^17.0.2",
-    "react-dom": "^17.0.2",
+    "react": "^18.0.0",
+    "react-dom": "^18.0.0",
     "react-focus-lock": "^2.7.1",
     "react-toast-notifications": "^2.5.1",
     "remark-gfm": "^1.0.0",
diff --git a/examples-staging/auth/package.json b/examples-staging/auth/package.json
index a15542d8391..6a0ef09048d 100644
--- a/examples-staging/auth/package.json
+++ b/examples-staging/auth/package.json
@@ -12,8 +12,8 @@
     "@keystone-6/auth": "^2.0.0",
     "@keystone-6/core": "^1.1.0",
     "next": "^12.1.0",
-    "react": "^17.0.2",
-    "react-dom": "^17.0.2"
+    "react": "^18.0.0",
+    "react-dom": "^18.0.0"
   },
   "devDependencies": {
     "typescript": "^4.4.4"
diff --git a/examples-staging/basic/package.json b/examples-staging/basic/package.json
index 814f825be63..34a65f2aaac 100644
--- a/examples-staging/basic/package.json
+++ b/examples-staging/basic/package.json
@@ -21,8 +21,8 @@
     "@types/react": "^17.0.37",
     "graphql": "^15.8.0",
     "graphql-tag": "^2.12.6",
-    "react": "^17.0.2",
-    "react-dom": "^17.0.2",
+    "react": "^18.0.0",
+    "react-dom": "^18.0.0",
     "uuid": "^8.3.2"
   },
   "devDependencies": {
diff --git a/examples-staging/ecommerce/package.json b/examples-staging/ecommerce/package.json
index edac54c89cb..9fc75488386 100644
--- a/examples-staging/ecommerce/package.json
+++ b/examples-staging/ecommerce/package.json
@@ -23,8 +23,8 @@
     "dotenv": "^11.0.0",
     "next": "^12.1.0",
     "nodemailer": "^6.7.1",
-    "react": "^17.0.2",
-    "react-dom": "^17.0.2",
+    "react": "^18.0.0",
+    "react-dom": "^18.0.0",
     "stripe": "^9.0.0"
   },
   "devDependencies": {
diff --git a/examples-staging/embedded-nextjs/package.json b/examples-staging/embedded-nextjs/package.json
index b6598137aa1..5bcf7f39f78 100644
--- a/examples-staging/embedded-nextjs/package.json
+++ b/examples-staging/embedded-nextjs/package.json
@@ -12,8 +12,8 @@
     "@keystone-6/core": "^1.0.0",
     "dotenv": "^11.0.0",
     "next": "^12.1.0",
-    "react": "^17.0.2",
-    "react-dom": "^17.0.2"
+    "react": "^18.0.0",
+    "react-dom": "^18.0.0"
   },
   "devDependencies": {
     "typescript": "^4.4.4"
diff --git a/examples-staging/roles/package.json b/examples-staging/roles/package.json
index ff24848b7ba..a97b778cd0d 100644
--- a/examples-staging/roles/package.json
+++ b/examples-staging/roles/package.json
@@ -12,8 +12,8 @@
     "@keystone-6/auth": "^2.0.0",
     "@keystone-6/core": "^1.1.0",
     "next": "^12.1.0",
-    "react": "^17.0.2",
-    "react-dom": "^17.0.2"
+    "react": "^18.0.0",
+    "react-dom": "^18.0.0"
   },
   "devDependencies": {
     "typescript": "^4.4.4"
diff --git a/package.json b/package.json
index d7d2b2d5537..476a3687088 100644
--- a/package.json
+++ b/package.json
@@ -69,8 +69,8 @@
     "is-ci": "^3.0.1",
     "jest": "^27.3.1",
     "prettier": "^2.5.0",
-    "react": "^17.0.2",
-    "react-dom": "^17.0.2",
+    "react": "^18.0.0",
+    "react-dom": "^18.0.0",
     "remark-cli": "^6.0.1",
     "remark-frontmatter": "^1.3.3",
     "remark-toc": "^5.1.1",
diff --git a/packages/auth/package.json b/packages/auth/package.json
index 1e1e4d59a4e..d60e7ee6db4 100644
--- a/packages/auth/package.json
+++ b/packages/auth/package.json
@@ -20,11 +20,11 @@
   },
   "devDependencies": {
     "@keystone-6/core": "^1.1.0",
-    "react": "^17.0.2"
+    "react": "^18.0.0"
   },
   "peerDependencies": {
     "@keystone-6/core": "^1.1.0",
-    "react": "^17.0.2"
+    "react": "^18.0.0"
   },
   "preconstruct": {
     "entrypoints": [
diff --git a/packages/cloudinary/package.json b/packages/cloudinary/package.json
index a0b0600945e..d54d3e59fe2 100644
--- a/packages/cloudinary/package.json
+++ b/packages/cloudinary/package.json
@@ -14,7 +14,7 @@
     "cloudinary": "^1.27.1",
     "cuid": "^2.1.8",
     "graphql-upload": "^13.0.0",
-    "react": "^17.0.2"
+    "react": "^18.0.0"
   },
   "peerDependencies": {
     "@keystone-6/core": "^1.1.0"
diff --git a/packages/core/package.json b/packages/core/package.json
index 1c88fed1693..c19af4018e0 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -113,8 +113,8 @@
     "prettier": "^2.5.0",
     "prisma": "3.12.0",
     "prompts": "^2.4.2",
-    "react": "^17.0.2",
-    "react-dom": "^17.0.2",
+    "react": "^18.0.0",
+    "react-dom": "^18.0.0",
     "resolve": "^1.20.0",
     "source-map-support": "^0.5.20",
     "supertest": "^6.1.6",
diff --git a/packages/document-renderer/package.json b/packages/document-renderer/package.json
index f80a3b44cd5..44ba2a0e471 100644
--- a/packages/document-renderer/package.json
+++ b/packages/document-renderer/package.json
@@ -6,10 +6,10 @@
   "main": "dist/keystone-6-document-renderer.cjs.js",
   "module": "dist/keystone-6-document-renderer.esm.js",
   "peerDependencies": {
-    "react": "^16.14.0 || 17"
+    "react": "18"
   },
   "devDependencies": {
-    "react": "^17.0.2"
+    "react": "^18.0.0"
   },
   "engines": {
     "node": "^14.15 || ^16.13"
diff --git a/packages/fields-document/package.json b/packages/fields-document/package.json
index c18a05fcf7f..526f3210bf2 100644
--- a/packages/fields-document/package.json
+++ b/packages/fields-document/package.json
@@ -48,7 +48,7 @@
     "mdast-util-gfm-strikethrough": "^0.2.3",
     "micromark-extension-gfm-autolink-literal": "0.5.7",
     "micromark-extension-gfm-strikethrough": "0.6.5",
-    "react": "^17.0.2",
+    "react": "^18.0.0",
     "scroll-into-view-if-needed": "^2.2.28",
     "slate": "^0.67.1",
     "slate-history": "^0.66.0",
diff --git a/yarn.lock b/yarn.lock
index 686feb8b89f..46bff9cf0fd 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -11037,14 +11037,13 @@ react-day-picker@^8.0.4:
   dependencies:
     "@reach/auto-id" "^0.16.0"
 
-react-dom@^17.0.2:
-  version "17.0.2"
-  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-17.0.2.tgz#ecffb6845e3ad8dbfcdc498f0d0a939736502c23"
-  integrity sha512-s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA==
+react-dom@^18.0.0:
+  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"
-    object-assign "^4.1.1"
-    scheduler "^0.20.2"
+    scheduler "^0.21.0"
 
 react-fast-compare@^3.0.1:
   version "3.2.0"
@@ -11148,6 +11147,13 @@ react@^17.0.2:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
 
+react@^18.0.0:
+  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"
+
 read-pkg-up@7.0.1, read-pkg-up@^7.0.1:
   version "7.0.1"
   resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-7.0.1.tgz#f3a6135758459733ae2b95638056e1854e7ef507"
@@ -11713,13 +11719,12 @@ saxes@^5.0.1:
   dependencies:
     xmlchars "^2.2.0"
 
-scheduler@^0.20.2:
-  version "0.20.2"
-  resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.20.2.tgz#4baee39436e34aa93b4874bddcbf0fe8b8b50e91"
-  integrity sha512-2eWfGgAqqWFGqtdMmcL5zCMK1U8KlXv8SQFGglL3CEtd0aDVDWgeF/YoCmvln55m5zSk3J/20hTaSBeSObsQDQ==
+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"
-    object-assign "^4.1.1"
 
 scroll-into-view-if-needed@^2.2.20, scroll-into-view-if-needed@^2.2.28:
   version "2.2.28"

From f8d11fe31e170c17bdaf62510b4d43ec1ca07d71 Mon Sep 17 00:00:00 2001
From: Josh Calder <josh@opensaas.com.au>
Date: Thu, 21 Apr 2022 14:39:46 +1000
Subject: [PATCH 02/17] update examples to `"react": "^18.0.0"`

---
 examples/custom-admin-ui-logo/package.json       | 2 +-
 examples/custom-admin-ui-navigation/package.json | 2 +-
 examples/custom-admin-ui-pages/package.json      | 2 +-
 examples/custom-field-view/package.json          | 2 +-
 examples/custom-field/package.json               | 2 +-
 examples/document-field/package.json             | 2 +-
 yarn.lock                                        | 8 --------
 7 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/examples/custom-admin-ui-logo/package.json b/examples/custom-admin-ui-logo/package.json
index ad81b36a042..43dcf969255 100644
--- a/examples/custom-admin-ui-logo/package.json
+++ b/examples/custom-admin-ui-logo/package.json
@@ -12,7 +12,7 @@
     "@keystone-6/core": "^1.0.0",
     "@keystone-ui/core": "^4.0.0",
     "next": "^12.1.0",
-    "react": "^17.0.2"
+    "react": "^18.0.0"
   },
   "devDependencies": {
     "typescript": "^4.4.4"
diff --git a/examples/custom-admin-ui-navigation/package.json b/examples/custom-admin-ui-navigation/package.json
index 5942a9b8300..495fb5c1b93 100644
--- a/examples/custom-admin-ui-navigation/package.json
+++ b/examples/custom-admin-ui-navigation/package.json
@@ -10,7 +10,7 @@
   },
   "dependencies": {
     "@keystone-6/core": "^1.0.0",
-    "react": "^17.0.2"
+    "react": "^18.0.0"
   },
   "devDependencies": {
     "typescript": "^4.4.4"
diff --git a/examples/custom-admin-ui-pages/package.json b/examples/custom-admin-ui-pages/package.json
index 8ceb6723a80..31a7ad06f7f 100644
--- a/examples/custom-admin-ui-pages/package.json
+++ b/examples/custom-admin-ui-pages/package.json
@@ -11,7 +11,7 @@
   "dependencies": {
     "@keystone-6/core": "^1.0.0",
     "@keystone-ui/core": "^4.0.0",
-    "react": "^17.0.2"
+    "react": "^18.0.0"
   },
   "devDependencies": {
     "typescript": "^4.4.4"
diff --git a/examples/custom-field-view/package.json b/examples/custom-field-view/package.json
index 1cdd2438276..36f18b69285 100644
--- a/examples/custom-field-view/package.json
+++ b/examples/custom-field-view/package.json
@@ -15,7 +15,7 @@
     "@keystone-ui/core": "^4.0.0",
     "@keystone-ui/fields": "^6.0.0",
     "@keystone-ui/icons": "^5.0.0",
-    "react": "^17.0.2"
+    "react": "^18.0.0"
   },
   "devDependencies": {
     "typescript": "^4.4.4"
diff --git a/examples/custom-field/package.json b/examples/custom-field/package.json
index 596e763f7a0..0b03b5d2828 100644
--- a/examples/custom-field/package.json
+++ b/examples/custom-field/package.json
@@ -11,7 +11,7 @@
   "dependencies": {
     "@keystone-6/core": "^1.0.0",
     "@keystone-ui/fields": "^6.0.0",
-    "react": "^17.0.2"
+    "react": "^18.0.0"
   },
   "devDependencies": {
     "typescript": "^4.4.4"
diff --git a/examples/document-field/package.json b/examples/document-field/package.json
index f8a2d43a345..2c61d14fa00 100644
--- a/examples/document-field/package.json
+++ b/examples/document-field/package.json
@@ -15,7 +15,7 @@
     "@keystone-6/fields-document": "^2.0.0",
     "@preconstruct/next": "^4.0.0",
     "next": "^12.1.0",
-    "react": "^17.0.2"
+    "react": "^18.0.0"
   },
   "devDependencies": {
     "typescript": "^4.4.4"
diff --git a/yarn.lock b/yarn.lock
index 46bff9cf0fd..8828729819a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -11139,14 +11139,6 @@ react-transition-group@^4.3.0, react-transition-group@^4.4.1, react-transition-g
     loose-envify "^1.4.0"
     prop-types "^15.6.2"
 
-react@^17.0.2:
-  version "17.0.2"
-  resolved "https://registry.yarnpkg.com/react/-/react-17.0.2.tgz#d0b5cc516d29eb3eee383f75b62864cfb6800037"
-  integrity sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA==
-  dependencies:
-    loose-envify "^1.1.0"
-    object-assign "^4.1.1"
-
 react@^18.0.0:
   version "18.0.0"
   resolved "https://registry.yarnpkg.com/react/-/react-18.0.0.tgz#b468736d1f4a5891f38585ba8e8fb29f91c3cb96"

From 8f8b5b9f2f3296a3758b32acd2da82b5c664d045 Mon Sep 17 00:00:00 2001
From: Josh Calder <josh@opensaas.com.au>
Date: Thu, 21 Apr 2022 19:47:19 +1000
Subject: [PATCH 03/17] upgrade next and react testing library

---
 design-system/website/package.json            |   2 +-
 docs/package.json                             |   2 +-
 examples-staging/auth/package.json            |   2 +-
 examples-staging/ecommerce/package.json       |   2 +-
 examples-staging/embedded-nextjs/package.json |   2 +-
 examples-staging/roles/package.json           |   2 +-
 examples/custom-admin-ui-logo/package.json    |   2 +-
 examples/document-field/package.json          |   2 +-
 packages/core/package.json                    |   6 +-
 packages/fields-document/package.json         |   2 +-
 yarn.lock                                     | 206 ++++++++++--------
 11 files changed, 125 insertions(+), 105 deletions(-)

diff --git a/design-system/website/package.json b/design-system/website/package.json
index 011caa78a73..ddb445ebb94 100644
--- a/design-system/website/package.json
+++ b/design-system/website/package.json
@@ -24,7 +24,7 @@
     "@types/react": "^17.0.37",
     "@types/react-dom": "^17.0.11",
     "@types/tinycolor2": "^1.4.3",
-    "next": "^12.1.0",
+    "next": "^12.1.5",
     "react": "^18.0.0",
     "react-dom": "^18.0.0",
     "tinycolor2": "^1.4.2"
diff --git a/docs/package.json b/docs/package.json
index 41366ddbf96..34e7814d34e 100644
--- a/docs/package.json
+++ b/docs/package.json
@@ -30,7 +30,7 @@
     "date-fns": "^2.26.0",
     "facepaint": "^1.2.1",
     "lodash.debounce": "^4.0.8",
-    "next": "^12.1.0",
+    "next": "^12.1.5",
     "next-compose-plugins": "^2.2.1",
     "prism-react-renderer": "^1.2.1",
     "react": "^18.0.0",
diff --git a/examples-staging/auth/package.json b/examples-staging/auth/package.json
index 6a0ef09048d..20f44901a46 100644
--- a/examples-staging/auth/package.json
+++ b/examples-staging/auth/package.json
@@ -11,7 +11,7 @@
   "dependencies": {
     "@keystone-6/auth": "^2.0.0",
     "@keystone-6/core": "^1.1.0",
-    "next": "^12.1.0",
+    "next": "^12.1.5",
     "react": "^18.0.0",
     "react-dom": "^18.0.0"
   },
diff --git a/examples-staging/ecommerce/package.json b/examples-staging/ecommerce/package.json
index 9fc75488386..b6c89989349 100644
--- a/examples-staging/ecommerce/package.json
+++ b/examples-staging/ecommerce/package.json
@@ -21,7 +21,7 @@
     "@keystone-6/core": "^1.1.0",
     "@types/nodemailer": "^6.4.4",
     "dotenv": "^11.0.0",
-    "next": "^12.1.0",
+    "next": "^12.1.5",
     "nodemailer": "^6.7.1",
     "react": "^18.0.0",
     "react-dom": "^18.0.0",
diff --git a/examples-staging/embedded-nextjs/package.json b/examples-staging/embedded-nextjs/package.json
index 5bcf7f39f78..d96a17c4e7a 100644
--- a/examples-staging/embedded-nextjs/package.json
+++ b/examples-staging/embedded-nextjs/package.json
@@ -11,7 +11,7 @@
   "dependencies": {
     "@keystone-6/core": "^1.0.0",
     "dotenv": "^11.0.0",
-    "next": "^12.1.0",
+    "next": "^12.1.5",
     "react": "^18.0.0",
     "react-dom": "^18.0.0"
   },
diff --git a/examples-staging/roles/package.json b/examples-staging/roles/package.json
index a97b778cd0d..9fa3a5c4864 100644
--- a/examples-staging/roles/package.json
+++ b/examples-staging/roles/package.json
@@ -11,7 +11,7 @@
   "dependencies": {
     "@keystone-6/auth": "^2.0.0",
     "@keystone-6/core": "^1.1.0",
-    "next": "^12.1.0",
+    "next": "^12.1.5",
     "react": "^18.0.0",
     "react-dom": "^18.0.0"
   },
diff --git a/examples/custom-admin-ui-logo/package.json b/examples/custom-admin-ui-logo/package.json
index 43dcf969255..e0bcff619bb 100644
--- a/examples/custom-admin-ui-logo/package.json
+++ b/examples/custom-admin-ui-logo/package.json
@@ -11,7 +11,7 @@
   "dependencies": {
     "@keystone-6/core": "^1.0.0",
     "@keystone-ui/core": "^4.0.0",
-    "next": "^12.1.0",
+    "next": "^12.1.5",
     "react": "^18.0.0"
   },
   "devDependencies": {
diff --git a/examples/document-field/package.json b/examples/document-field/package.json
index 2c61d14fa00..a760654857f 100644
--- a/examples/document-field/package.json
+++ b/examples/document-field/package.json
@@ -14,7 +14,7 @@
     "@keystone-6/document-renderer": "^1.0.0",
     "@keystone-6/fields-document": "^2.0.0",
     "@preconstruct/next": "^4.0.0",
-    "next": "^12.1.0",
+    "next": "^12.1.5",
     "react": "^18.0.0"
   },
   "devDependencies": {
diff --git a/packages/core/package.json b/packages/core/package.json
index c19af4018e0..5503c219931 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -103,7 +103,7 @@
     "memoize-one": "^6.0.0",
     "meow": "^9.0.0",
     "micro": "^9.3.4",
-    "next": "^12.1.0",
+    "next": "^12.1.5",
     "node-fetch": "^2.6.7",
     "normalize-path": "^3.0.0",
     "object-hash": "^3.0.0",
@@ -123,8 +123,8 @@
   },
   "devDependencies": {
     "@testing-library/dom": "^8.11.1",
-    "@testing-library/react": "^12.1.2",
-    "@testing-library/user-event": "^14.0.0",
+    "@testing-library/react": "^13.1.1",
+    "@testing-library/user-event": "^13.5.0",
     "@types/bytes": "^3.1.1",
     "fast-glob": "^3.2.7",
     "fixturez": "^1.1.0",
diff --git a/packages/fields-document/package.json b/packages/fields-document/package.json
index 526f3210bf2..a5d4d5994d5 100644
--- a/packages/fields-document/package.json
+++ b/packages/fields-document/package.json
@@ -57,7 +57,7 @@
   "repository": "https://github.com/keystonejs/keystone/tree/main/packages/fields-document",
   "devDependencies": {
     "@keystone-6/core": "*",
-    "@testing-library/react": "^12.1.2",
+    "@testing-library/react": "^13.1.1",
     "array.prototype.flat": "^1.2.5",
     "jest-diff": "^27.3.1",
     "pretty-format": "^27.3.1",
diff --git a/yarn.lock b/yarn.lock
index 8828729819a..040de854258 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2243,70 +2243,75 @@
     call-me-maybe "^1.0.1"
     glob-to-regexp "^0.3.0"
 
-"@next/env@12.1.0":
-  version "12.1.0"
-  resolved "https://registry.yarnpkg.com/@next/env/-/env-12.1.0.tgz#73713399399b34aa5a01771fb73272b55b22c314"
-  integrity sha512-nrIgY6t17FQ9xxwH3jj0a6EOiQ/WDHUos35Hghtr+SWN/ntHIQ7UpuvSi0vaLzZVHQWaDupKI+liO5vANcDeTQ==
+"@next/env@12.1.5":
+  version "12.1.5"
+  resolved "https://registry.yarnpkg.com/@next/env/-/env-12.1.5.tgz#a21ba6708022d630402ca2b340316e69a0296dfc"
+  integrity sha512-+34yUJslfJi7Lyx6ELuN8nWcOzi27izfYnZIC1Dqv7kmmfiBVxgzR3BXhlvEMTKC2IRJhXVs2FkMY+buQe3k7Q==
 
 "@next/mdx@^12.0.7":
   version "12.0.7"
   resolved "https://registry.yarnpkg.com/@next/mdx/-/mdx-12.0.7.tgz#5095198e85a0fe6d3687db9813aa373f185dece8"
   integrity sha512-yudu/ZxkFznvcQtVKKWkLYVja4kCah/yz09x5tpphr5g+xmaJNA6RylheaORIY8qdgdKRqVXt3hMnpfdH9bBtw==
 
-"@next/swc-android-arm64@12.1.0":
-  version "12.1.0"
-  resolved "https://registry.yarnpkg.com/@next/swc-android-arm64/-/swc-android-arm64-12.1.0.tgz#865ba3a9afc204ff2bdeea49dd64d58705007a39"
-  integrity sha512-/280MLdZe0W03stA69iL+v6I+J1ascrQ6FrXBlXGCsGzrfMaGr7fskMa0T5AhQIVQD4nA/46QQWxG//DYuFBcA==
-
-"@next/swc-darwin-arm64@12.1.0":
-  version "12.1.0"
-  resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-12.1.0.tgz#08e8b411b8accd095009ed12efbc2f1d4d547135"
-  integrity sha512-R8vcXE2/iONJ1Unf5Ptqjk6LRW3bggH+8drNkkzH4FLEQkHtELhvcmJwkXcuipyQCsIakldAXhRbZmm3YN1vXg==
-
-"@next/swc-darwin-x64@12.1.0":
-  version "12.1.0"
-  resolved "https://registry.yarnpkg.com/@next/swc-darwin-x64/-/swc-darwin-x64-12.1.0.tgz#fcd684497a76e8feaca88db3c394480ff0b007cd"
-  integrity sha512-ieAz0/J0PhmbZBB8+EA/JGdhRHBogF8BWaeqR7hwveb6SYEIJaDNQy0I+ZN8gF8hLj63bEDxJAs/cEhdnTq+ug==
-
-"@next/swc-linux-arm-gnueabihf@12.1.0":
-  version "12.1.0"
-  resolved "https://registry.yarnpkg.com/@next/swc-linux-arm-gnueabihf/-/swc-linux-arm-gnueabihf-12.1.0.tgz#9ec6380a27938a5799aaa6035c205b3c478468a7"
-  integrity sha512-njUd9hpl6o6A5d08dC0cKAgXKCzm5fFtgGe6i0eko8IAdtAPbtHxtpre3VeSxdZvuGFh+hb0REySQP9T1ttkog==
-
-"@next/swc-linux-arm64-gnu@12.1.0":
-  version "12.1.0"
-  resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-12.1.0.tgz#7f4196dff1049cea479607c75b81033ae2dbd093"
-  integrity sha512-OqangJLkRxVxMhDtcb7Qn1xjzFA3s50EIxY7mljbSCLybU+sByPaWAHY4px97ieOlr2y4S0xdPKkQ3BCAwyo6Q==
-
-"@next/swc-linux-arm64-musl@12.1.0":
-  version "12.1.0"
-  resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-12.1.0.tgz#b445f767569cdc2dddee785ca495e1a88c025566"
-  integrity sha512-hB8cLSt4GdmOpcwRe2UzI5UWn6HHO/vLkr5OTuNvCJ5xGDwpPXelVkYW/0+C3g5axbDW2Tym4S+MQCkkH9QfWA==
-
-"@next/swc-linux-x64-gnu@12.1.0":
-  version "12.1.0"
-  resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-12.1.0.tgz#67610e9be4fbc987de7535f1bcb17e45fe12f90e"
-  integrity sha512-OKO4R/digvrVuweSw/uBM4nSdyzsBV5EwkUeeG4KVpkIZEe64ZwRpnFB65bC6hGwxIBnTv5NMSnJ+0K/WmG78A==
-
-"@next/swc-linux-x64-musl@12.1.0":
-  version "12.1.0"
-  resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-12.1.0.tgz#ea19a23db08a9f2e34ac30401f774cf7d1669d31"
-  integrity sha512-JohhgAHZvOD3rQY7tlp7NlmvtvYHBYgY0x5ZCecUT6eCCcl9lv6iV3nfu82ErkxNk1H893fqH0FUpznZ/H3pSw==
-
-"@next/swc-win32-arm64-msvc@12.1.0":
-  version "12.1.0"
-  resolved "https://registry.yarnpkg.com/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-12.1.0.tgz#eadf054fc412085659b98e145435bbba200b5283"
-  integrity sha512-T/3gIE6QEfKIJ4dmJk75v9hhNiYZhQYAoYm4iVo1TgcsuaKLFa+zMPh4056AHiG6n9tn2UQ1CFE8EoybEsqsSw==
-
-"@next/swc-win32-ia32-msvc@12.1.0":
-  version "12.1.0"
-  resolved "https://registry.yarnpkg.com/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-12.1.0.tgz#68faeae10c89f698bf9d28759172b74c9c21bda1"
-  integrity sha512-iwnKgHJdqhIW19H9PRPM9j55V6RdcOo6rX+5imx832BCWzkDbyomWnlzBfr6ByUYfhohb8QuH4hSGEikpPqI0Q==
-
-"@next/swc-win32-x64-msvc@12.1.0":
-  version "12.1.0"
-  resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-12.1.0.tgz#d27e7e76c87a460a4da99c5bfdb1618dcd6cd064"
-  integrity sha512-aBvcbMwuanDH4EMrL2TthNJy+4nP59Bimn8egqv6GHMVj0a44cU6Au4PjOhLNqEh9l+IpRGBqMTzec94UdC5xg==
+"@next/swc-android-arm-eabi@12.1.5":
+  version "12.1.5"
+  resolved "https://registry.yarnpkg.com/@next/swc-android-arm-eabi/-/swc-android-arm-eabi-12.1.5.tgz#36729ab3dfd7743e82cfe536b43254dcb146620c"
+  integrity sha512-SKnGTdYcoN04Y2DvE0/Y7/MjkA+ltsmbuH/y/hR7Ob7tsj+8ZdOYuk+YvW1B8dY20nDPHP58XgDTSm2nA8BzzA==
+
+"@next/swc-android-arm64@12.1.5":
+  version "12.1.5"
+  resolved "https://registry.yarnpkg.com/@next/swc-android-arm64/-/swc-android-arm64-12.1.5.tgz#52578f552305c92d0b9b81d603c9643fb71e0835"
+  integrity sha512-YXiqgQ/9Rxg1dXp6brXbeQM1JDx9SwUY/36JiE+36FXqYEmDYbxld9qkX6GEzkc5rbwJ+RCitargnzEtwGW0mw==
+
+"@next/swc-darwin-arm64@12.1.5":
+  version "12.1.5"
+  resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-12.1.5.tgz#3d5b53211484c72074f4975ba0ec2b1107db300e"
+  integrity sha512-y8mhldb/WFZ6lFeowkGfi0cO/lBdiBqDk4T4LZLvCpoQp4Or/NzUN6P5NzBQZ5/b4oUHM/wQICEM+1wKA4qIVw==
+
+"@next/swc-darwin-x64@12.1.5":
+  version "12.1.5"
+  resolved "https://registry.yarnpkg.com/@next/swc-darwin-x64/-/swc-darwin-x64-12.1.5.tgz#adcabb732d226453777c0d37d58eaff9328b66fd"
+  integrity sha512-wqJ3X7WQdTwSGi0kIDEmzw34QHISRIQ5uvC+VXmsIlCPFcMA+zM5723uh8NfuKGquDMiEMS31a83QgkuHMYbwQ==
+
+"@next/swc-linux-arm-gnueabihf@12.1.5":
+  version "12.1.5"
+  resolved "https://registry.yarnpkg.com/@next/swc-linux-arm-gnueabihf/-/swc-linux-arm-gnueabihf-12.1.5.tgz#82a7cde67482b756bc65fbebf1dfa8a782074e93"
+  integrity sha512-WnhdM5duONMvt2CncAl+9pim0wBxDS2lHoo7ub/o/i1bRbs11UTzosKzEXVaTDCUkCX2c32lIDi1WcN2ZPkcdw==
+
+"@next/swc-linux-arm64-gnu@12.1.5":
+  version "12.1.5"
+  resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-12.1.5.tgz#f82ca014504950aab751e81f467492e9be0bad5d"
+  integrity sha512-Jq2H68yQ4bLUhR/XQnbw3LDW0GMQn355qx6rU36BthDLeGue7YV7MqNPa8GKvrpPocEMW77nWx/1yI6w6J07gw==
+
+"@next/swc-linux-arm64-musl@12.1.5":
+  version "12.1.5"
+  resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-12.1.5.tgz#f811ec9f4b12a978426c284c95ab2f515ddf7f9e"
+  integrity sha512-KgPjwdbhDqXI7ghNN8V/WAiLquc9Ebe8KBrNNEL0NQr+yd9CyKJ6KqjayVkmX+hbHzbyvbui/5wh/p3CZQ9xcQ==
+
+"@next/swc-linux-x64-gnu@12.1.5":
+  version "12.1.5"
+  resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-12.1.5.tgz#d44857257e6d20dc841998951d584ab1f25772c3"
+  integrity sha512-O2ErUTvCJ6DkNTSr9pbu1n3tcqykqE/ebty1rwClzIYdOgpB3T2MfEPP+K7GhUR87wmN/hlihO9ch7qpVFDGKw==
+
+"@next/swc-linux-x64-musl@12.1.5":
+  version "12.1.5"
+  resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-12.1.5.tgz#3cc523abadc9a2a6de680593aff06e71cc29ecef"
+  integrity sha512-1eIlZmlO/VRjxxzUBcVosf54AFU3ltAzHi+BJA+9U/lPxCYIsT+R4uO3QksRzRjKWhVQMRjEnlXyyq5SKJm7BA==
+
+"@next/swc-win32-arm64-msvc@12.1.5":
+  version "12.1.5"
+  resolved "https://registry.yarnpkg.com/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-12.1.5.tgz#c62232d869f1f9b22e8f24e4e7f05307c20f30ca"
+  integrity sha512-oromsfokbEuVb0CBLLE7R9qX3KGXucZpsojLpzUh1QJjuy1QkrPJncwr8xmWQnwgtQ6ecMWXgXPB+qtvizT9Tw==
+
+"@next/swc-win32-ia32-msvc@12.1.5":
+  version "12.1.5"
+  resolved "https://registry.yarnpkg.com/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-12.1.5.tgz#2bd9b28a9ba730d12a493e7d9d18e150fe89d496"
+  integrity sha512-a/51L5KzBpeZSW9LbekMo3I3Cwul+V+QKwbEIMA+Qwb2qrlcn1L9h3lt8cHqNTFt2y72ce6aTwDTw1lyi5oIRA==
+
+"@next/swc-win32-x64-msvc@12.1.5":
+  version "12.1.5"
+  resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-12.1.5.tgz#02f377e4d41eaaacf265e34bab9bacd8efc4a351"
+  integrity sha512-/SoXW1Ntpmpw3AXAzfDRaQidnd8kbZ2oSni8u5z0yw6t4RwJvmdZy1eOaAADRThWKV+2oU90++LSnXJIwBRWYQ==
 
 "@nodelib/fs.scandir@2.1.5":
   version "2.1.5"
@@ -2929,7 +2934,7 @@
   resolved "https://registry.yarnpkg.com/@tediousjs/connection-string/-/connection-string-0.3.0.tgz#23f7af793a365cc3b6a149ec1320f1e28c4242ff"
   integrity sha512-d/keJiNKfpHo+GmSB8QcsAwBx8h+V1UbdozA5TD+eSLXprNY53JAYub47J9evsSKWDdNG5uVj0FiMozLKuzowQ==
 
-"@testing-library/dom@^8.0.0", "@testing-library/dom@^8.11.1":
+"@testing-library/dom@^8.11.1":
   version "8.11.1"
   resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-8.11.1.tgz#03fa2684aa09ade589b460db46b4c7be9fc69753"
   integrity sha512-3KQDyx9r0RKYailW2MiYrSSKEfH0GTkI51UGEvJenvcoDoeRYs0PZpi2SXqtnMClQvCqdtTTpOfFETDTVADpAg==
@@ -2943,6 +2948,20 @@
     lz-string "^1.4.4"
     pretty-format "^27.0.2"
 
+"@testing-library/dom@^8.5.0":
+  version "8.13.0"
+  resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-8.13.0.tgz#bc00bdd64c7d8b40841e27a70211399ad3af46f5"
+  integrity sha512-9VHgfIatKNXQNaZTtLnalIy0jNZzY35a4S3oi08YAt9Hv1VsfZ/DfA45lM8D/UhtHBGJ4/lGwp0PZkVndRkoOQ==
+  dependencies:
+    "@babel/code-frame" "^7.10.4"
+    "@babel/runtime" "^7.12.5"
+    "@types/aria-query" "^4.2.0"
+    aria-query "^5.0.0"
+    chalk "^4.1.0"
+    dom-accessibility-api "^0.5.9"
+    lz-string "^1.4.4"
+    pretty-format "^27.0.2"
+
 "@testing-library/jest-dom@^5.15.0":
   version "5.15.0"
   resolved "https://registry.yarnpkg.com/@testing-library/jest-dom/-/jest-dom-5.15.0.tgz#4f5295dbc476a14aec3b07176434b3d51aae5da7"
@@ -2958,13 +2977,14 @@
     lodash "^4.17.15"
     redent "^3.0.0"
 
-"@testing-library/react@^12.1.2":
-  version "12.1.2"
-  resolved "https://registry.yarnpkg.com/@testing-library/react/-/react-12.1.2.tgz#f1bc9a45943461fa2a598bb4597df1ae044cfc76"
-  integrity sha512-ihQiEOklNyHIpo2Y8FREkyD1QAea054U0MVbwH1m8N9TxeFz+KoJ9LkqoKqJlzx2JDm56DVwaJ1r36JYxZM05g==
+"@testing-library/react@^13.1.1":
+  version "13.1.1"
+  resolved "https://registry.yarnpkg.com/@testing-library/react/-/react-13.1.1.tgz#6c1635e25acca8ca5be8ee3b19ad1391681c5846"
+  integrity sha512-8mirlAa0OKaUvnqnZF6MdAh2tReYA2KtWVw1PKvaF5EcCZqgK5pl8iF+3uW90JdG5Ua2c2c2E2wtLdaug3dsVg==
   dependencies:
     "@babel/runtime" "^7.12.5"
-    "@testing-library/dom" "^8.0.0"
+    "@testing-library/dom" "^8.5.0"
+    "@types/react-dom" "^18.0.0"
 
 "@testing-library/user-event@^14.0.0":
   version "14.0.0"
@@ -3494,6 +3514,13 @@
   dependencies:
     "@types/react" "*"
 
+"@types/react-dom@^18.0.0":
+  version "18.0.1"
+  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-18.0.1.tgz#cb3cc10ea91141b12c71001fede1017acfbce4db"
+  integrity sha512-jCwTXvHtRLiyVvKm9aEdHXs8rflVOGd5Sl913JZrPshfXjn8NYsTNZOz70bCsA31IR0TOqwi3ad+X4tSCBoMTw==
+  dependencies:
+    "@types/react" "*"
+
 "@types/react-transition-group@^4.4.0":
   version "4.4.4"
   resolved "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-4.4.4.tgz#acd4cceaa2be6b757db61ed7b432e103242d163e"
@@ -9924,28 +9951,28 @@ next-sitemap@^2.0.0:
     "@corex/deepmerge" "^2.6.148"
     minimist "^1.2.5"
 
-next@^12.1.0:
-  version "12.1.0"
-  resolved "https://registry.yarnpkg.com/next/-/next-12.1.0.tgz#c33d753b644be92fc58e06e5a214f143da61dd5d"
-  integrity sha512-s885kWvnIlxsUFHq9UGyIyLiuD0G3BUC/xrH0CEnH5lHEWkwQcHOORgbDF0hbrW9vr/7am4ETfX4A7M6DjrE7Q==
+next@^12.1.5:
+  version "12.1.5"
+  resolved "https://registry.yarnpkg.com/next/-/next-12.1.5.tgz#7a07687579ddce61ee519493e1c178d83abac063"
+  integrity sha512-YGHDpyfgCfnT5GZObsKepmRnne7Kzp7nGrac07dikhutWQug7hHg85/+sPJ4ZW5Q2pDkb+n0FnmLkmd44htIJQ==
   dependencies:
-    "@next/env" "12.1.0"
+    "@next/env" "12.1.5"
     caniuse-lite "^1.0.30001283"
     postcss "8.4.5"
-    styled-jsx "5.0.0"
-    use-subscription "1.5.1"
+    styled-jsx "5.0.1"
   optionalDependencies:
-    "@next/swc-android-arm64" "12.1.0"
-    "@next/swc-darwin-arm64" "12.1.0"
-    "@next/swc-darwin-x64" "12.1.0"
-    "@next/swc-linux-arm-gnueabihf" "12.1.0"
-    "@next/swc-linux-arm64-gnu" "12.1.0"
-    "@next/swc-linux-arm64-musl" "12.1.0"
-    "@next/swc-linux-x64-gnu" "12.1.0"
-    "@next/swc-linux-x64-musl" "12.1.0"
-    "@next/swc-win32-arm64-msvc" "12.1.0"
-    "@next/swc-win32-ia32-msvc" "12.1.0"
-    "@next/swc-win32-x64-msvc" "12.1.0"
+    "@next/swc-android-arm-eabi" "12.1.5"
+    "@next/swc-android-arm64" "12.1.5"
+    "@next/swc-darwin-arm64" "12.1.5"
+    "@next/swc-darwin-x64" "12.1.5"
+    "@next/swc-linux-arm-gnueabihf" "12.1.5"
+    "@next/swc-linux-arm64-gnu" "12.1.5"
+    "@next/swc-linux-arm64-musl" "12.1.5"
+    "@next/swc-linux-x64-gnu" "12.1.5"
+    "@next/swc-linux-x64-musl" "12.1.5"
+    "@next/swc-win32-arm64-msvc" "12.1.5"
+    "@next/swc-win32-ia32-msvc" "12.1.5"
+    "@next/swc-win32-x64-msvc" "12.1.5"
 
 nexus@^1.1.0:
   version "1.1.0"
@@ -12417,10 +12444,10 @@ style-to-object@^0.3.0:
   dependencies:
     inline-style-parser "0.1.1"
 
-styled-jsx@5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/styled-jsx/-/styled-jsx-5.0.0.tgz#816b4b92e07b1786c6b7111821750e0ba4d26e77"
-  integrity sha512-qUqsWoBquEdERe10EW8vLp3jT25s/ssG1/qX5gZ4wu15OZpmSMFI2v+fWlRhLfykA5rFtlJ1ME8A8pm/peV4WA==
+styled-jsx@5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/styled-jsx/-/styled-jsx-5.0.1.tgz#78fecbbad2bf95ce6cd981a08918ce4696f5fc80"
+  integrity sha512-+PIZ/6Uk40mphiQJJI1202b+/dYeTVd9ZnMPR80pgiWbjIwvN2zIp4r9et0BgqBuShh48I0gttPlAXA7WVvBxw==
 
 stylis@4.0.13:
   version "4.0.13"
@@ -13403,13 +13430,6 @@ use-sidecar@^1.0.1, use-sidecar@^1.0.5:
     detect-node-es "^1.1.0"
     tslib "^1.9.3"
 
-use-subscription@1.5.1:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/use-subscription/-/use-subscription-1.5.1.tgz#73501107f02fad84c6dd57965beb0b75c68c42d1"
-  integrity sha512-Xv2a1P/yReAjAbhylMfFplFKj9GssgTwN7RlcTxBujFQcloStWNDQdc4g4NRWH9xS4i/FDk04vQBptAXoF3VcA==
-  dependencies:
-    object-assign "^4.1.1"
-
 use@^3.1.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f"

From 1d4bca514ec59c7b684278173952fccf40534f5c Mon Sep 17 00:00:00 2001
From: Josh Calder <josh@opensaas.com.au>
Date: Mon, 25 Apr 2022 20:50:33 +1000
Subject: [PATCH 04/17] Add extra `waitForSelector` to admin-ui tests

---
 tests/admin-ui-tests/filters.test.ts    | 1 +
 tests/admin-ui-tests/navigation.test.ts | 1 +
 2 files changed, 2 insertions(+)

diff --git a/tests/admin-ui-tests/filters.test.ts b/tests/admin-ui-tests/filters.test.ts
index 7f0a2c61436..bcba60a5a51 100644
--- a/tests/admin-ui-tests/filters.test.ts
+++ b/tests/admin-ui-tests/filters.test.ts
@@ -74,6 +74,7 @@ adminUITests('./tests/test-projects/basic', browserType => {
 
       // Assert that there's only one result.
       await page.waitForSelector('table tbody tr');
+      await page.waitForSelector('text=Task-not-assigned-0', { state: 'detached' });
       const filteredElements = await page.$$('table tbody tr');
       expect(filteredElements.length).toBe(1);
     });
diff --git a/tests/admin-ui-tests/navigation.test.ts b/tests/admin-ui-tests/navigation.test.ts
index 6cb274828a0..d6fb03ea565 100644
--- a/tests/admin-ui-tests/navigation.test.ts
+++ b/tests/admin-ui-tests/navigation.test.ts
@@ -59,6 +59,7 @@ adminUITests('./tests/test-projects/basic', browserType => {
     await page.click('button[title="Create Task"]');
     await page.fill('id=label', 'Test Task');
     await Promise.all([page.waitForNavigation(), page.click('button[type="submit"]')]);
+    await page.hover('nav a:has-text("Tasks")');
     const element = await page.waitForSelector('nav a:has-text("Tasks")');
     const ariaCurrent = await element?.getAttribute('aria-current');
     expect(ariaCurrent).toBe('location');

From 0daaea3ad0c532b8c378932f949ee7698ea29ab1 Mon Sep 17 00:00:00 2001
From: Josh Calder <josh@opensaas.com.au>
Date: Wed, 27 Apr 2022 14:17:52 +1000
Subject: [PATCH 05/17] expand react version on document-renderer

---
 packages/document-renderer/package.json | 4 ++--
 yarn.lock                               | 9 +++++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/packages/document-renderer/package.json b/packages/document-renderer/package.json
index 44ba2a0e471..a230f3e6937 100644
--- a/packages/document-renderer/package.json
+++ b/packages/document-renderer/package.json
@@ -6,10 +6,10 @@
   "main": "dist/keystone-6-document-renderer.cjs.js",
   "module": "dist/keystone-6-document-renderer.esm.js",
   "peerDependencies": {
-    "react": "18"
+    "react": "^16.14.0 || 17 | 18"
   },
   "devDependencies": {
-    "react": "^18.0.0"
+    "react": "^16.14.0 || 17 | 18"
   },
   "engines": {
     "node": "^14.15 || ^16.13"
diff --git a/yarn.lock b/yarn.lock
index 040de854258..89b24cd07b0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -11166,6 +11166,15 @@ react-transition-group@^4.3.0, react-transition-group@^4.4.1, react-transition-g
     loose-envify "^1.4.0"
     prop-types "^15.6.2"
 
+"react@^16.14.0 || 17 | 18":
+  version "16.14.0"
+  resolved "https://registry.yarnpkg.com/react/-/react-16.14.0.tgz#94d776ddd0aaa37da3eda8fc5b6b18a4c9a3114d"
+  integrity sha512-0X2CImDkJGApiAlcf0ODKIneSwBPhqJawOa5wCtKbu7ZECrmS26NvtSILynQ66cgkT/RJ4LidJOc3bUESwmU8g==
+  dependencies:
+    loose-envify "^1.1.0"
+    object-assign "^4.1.1"
+    prop-types "^15.6.2"
+
 react@^18.0.0:
   version "18.0.0"
   resolved "https://registry.yarnpkg.com/react/-/react-18.0.0.tgz#b468736d1f4a5891f38585ba8e8fb29f91c3cb96"

From 9ea3ebc2bf56f8c9d6bb0826b34b508bcc2dca42 Mon Sep 17 00:00:00 2001
From: Josh Calder <josh@opensaas.com.au>
Date: Wed, 27 Apr 2022 14:21:24 +1000
Subject: [PATCH 06/17] add changeset

---
 .changeset/small-islands-marry.md | 36 +++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 .changeset/small-islands-marry.md

diff --git a/.changeset/small-islands-marry.md b/.changeset/small-islands-marry.md
new file mode 100644
index 00000000000..14a2cb92869
--- /dev/null
+++ b/.changeset/small-islands-marry.md
@@ -0,0 +1,36 @@
+---
+'@keystone-ui/button': major
+'@keystone-ui/core': major
+'@keystone-ui/fields': major
+'@keystone-ui/icons': major
+'@keystone-ui/loading': major
+'@keystone-ui/modals': major
+'@keystone-ui/notice': major
+'@keystone-ui/options': major
+'@keystone-ui/pill': major
+'@keystone-ui/popover': major
+'@keystone-ui/segmented-control': major
+'@keystone-ui/toast': major
+'@keystone-ui/tooltip': major
+'@keystone-ui/website': major
+'@keystone-6/auth': major
+'@keystone-6/cloudinary': major
+'@keystone-6/core': major
+'@keystone-6/document-renderer': major
+'@keystone-6/fields-document': major
+'@keystone-6/website': patch
+'@keystone-6/example-auth': patch
+'@keystone-6/examples-app-basic': patch
+'@keystone-6/example-ecommerce': patch
+'@keystone-6/example-embedded-nextjs': patch
+'@keystone-6/example-roles': patch
+'@keystone-6/example-custom-admin-ui-logo': patch
+'@keystone-6/example-custom-admin-ui-navigation': patch
+'@keystone-6/example-custom-admin-ui-pages': patch
+'@keystone-6/example-custom-field': patch
+'@keystone-6/example-custom-field-view': patch
+'@keystone-6/example-document-field': patch
+'@keystone-6/admin-ui-tests': patch
+---
+
+upgrade dependancy `"react": "^18.0.0"`

From 96fa04cfb95ae0a13ef1ee177e7bd8878909e235 Mon Sep 17 00:00:00 2001
From: Josh Calder <josh@opensaas.com.au>
Date: Thu, 28 Apr 2022 14:22:05 +1000
Subject: [PATCH 07/17] Update @types/React and fix types

Co-authored-by: Mitchell Hamilton <mitchellhamilton@users.noreply.github.com>
---
 design-system/packages/button/package.json    |  2 +-
 design-system/packages/core/package.json      |  2 +-
 design-system/packages/fields/package.json    |  2 +-
 .../packages/fields/src/DatePicker/index.tsx  |  2 +-
 design-system/packages/icons/package.json     |  2 +-
 design-system/packages/loading/package.json   |  2 +-
 design-system/packages/modals/package.json    |  2 +-
 .../packages/modals/src/DrawerController.tsx  |  4 ++--
 design-system/packages/notice/package.json    |  2 +-
 .../packages/segmented-control/package.json   |  2 +-
 design-system/packages/toast/package.json     |  2 +-
 design-system/website/package.json            |  4 ++--
 docs/components/primitives/Button.tsx         |  4 ++--
 docs/package.json                             |  4 ++--
 docs/pages/_document.tsx                      |  4 ++--
 examples-staging/basic/package.json           |  2 +-
 packages/cloudinary/package.json              |  2 +-
 packages/core/package.json                    |  2 +-
 .../admin-ui/pages/ItemPage/index.tsx         |  2 +-
 packages/fields-document/package.json         |  2 +-
 .../src/DocumentEditor/utils.ts               |  2 +-
 yarn.lock                                     | 21 +++++++------------
 22 files changed, 33 insertions(+), 40 deletions(-)

diff --git a/design-system/packages/button/package.json b/design-system/packages/button/package.json
index 474af505eae..b299ab5a25a 100644
--- a/design-system/packages/button/package.json
+++ b/design-system/packages/button/package.json
@@ -5,7 +5,7 @@
   "main": "dist/keystone-ui-button.cjs.js",
   "module": "dist/keystone-ui-button.esm.js",
   "devDependencies": {
-    "@types/react": "^17.0.37"
+    "@types/react": "^18.0.8"
   },
   "dependencies": {
     "@babel/runtime": "^7.16.3",
diff --git a/design-system/packages/core/package.json b/design-system/packages/core/package.json
index 78f96b1f7b0..387c630f35d 100644
--- a/design-system/packages/core/package.json
+++ b/design-system/packages/core/package.json
@@ -5,7 +5,7 @@
   "main": "dist/keystone-ui-core.cjs.js",
   "module": "dist/keystone-ui-core.esm.js",
   "devDependencies": {
-    "@types/react": "^17.0.37",
+    "@types/react": "^18.0.8",
     "react": "^18.0.0",
     "react-dom": "^18.0.0"
   },
diff --git a/design-system/packages/fields/package.json b/design-system/packages/fields/package.json
index 45f3782f571..402e80ad88b 100644
--- a/design-system/packages/fields/package.json
+++ b/design-system/packages/fields/package.json
@@ -5,7 +5,7 @@
   "main": "dist/keystone-ui-fields.cjs.js",
   "module": "dist/keystone-ui-fields.esm.js",
   "devDependencies": {
-    "@types/react": "^17.0.37"
+    "@types/react": "^18.0.8"
   },
   "dependencies": {
     "@babel/runtime": "^7.16.3",
diff --git a/design-system/packages/fields/src/DatePicker/index.tsx b/design-system/packages/fields/src/DatePicker/index.tsx
index abccf86928f..3a785057650 100644
--- a/design-system/packages/fields/src/DatePicker/index.tsx
+++ b/design-system/packages/fields/src/DatePicker/index.tsx
@@ -27,7 +27,7 @@ export type DatePickerProps = {
 
 export function useEventCallback<Func extends (...args: any) => any>(callback: Func): Func {
   const callbackRef = useRef(callback);
-  const cb = useCallback((...args) => {
+  const cb = useCallback((...args: any[]) => {
     return callbackRef.current(...args);
   }, []);
   useEffect(() => {
diff --git a/design-system/packages/icons/package.json b/design-system/packages/icons/package.json
index 1ee7826ed48..55cc17b2f19 100644
--- a/design-system/packages/icons/package.json
+++ b/design-system/packages/icons/package.json
@@ -12,7 +12,7 @@
     "@svgr/plugin-jsx": "^6.0.0",
     "@svgr/plugin-prettier": "^5.5.0",
     "@svgr/plugin-svgo": "^6.0.0",
-    "@types/react": "^17.0.37",
+    "@types/react": "^18.0.8",
     "chalk": "^4.1.2",
     "feather-icons": "^4.28.0",
     "fs-extra": "^10.0.0",
diff --git a/design-system/packages/loading/package.json b/design-system/packages/loading/package.json
index 817649579ed..a60e6e49398 100644
--- a/design-system/packages/loading/package.json
+++ b/design-system/packages/loading/package.json
@@ -5,7 +5,7 @@
   "main": "dist/keystone-ui-loading.cjs.js",
   "module": "dist/keystone-ui-loading.esm.js",
   "devDependencies": {
-    "@types/react": "^17.0.37"
+    "@types/react": "^18.0.8"
   },
   "dependencies": {
     "@babel/runtime": "^7.16.3",
diff --git a/design-system/packages/modals/package.json b/design-system/packages/modals/package.json
index b9287f41942..e8a42f8adbb 100644
--- a/design-system/packages/modals/package.json
+++ b/design-system/packages/modals/package.json
@@ -5,7 +5,7 @@
   "main": "dist/keystone-ui-modals.cjs.js",
   "module": "dist/keystone-ui-modals.esm.js",
   "devDependencies": {
-    "@types/react": "^17.0.37"
+    "@types/react": "^18.0.8"
   },
   "dependencies": {
     "@babel/runtime": "^7.16.3",
diff --git a/design-system/packages/modals/src/DrawerController.tsx b/design-system/packages/modals/src/DrawerController.tsx
index 30e10a934e1..d6039f50ef8 100644
--- a/design-system/packages/modals/src/DrawerController.tsx
+++ b/design-system/packages/modals/src/DrawerController.tsx
@@ -26,8 +26,8 @@ export const useDrawerControllerContext = () => {
 export const DrawerController = ({ isOpen, children }: DrawerControllerProps) => {
   return (
     <Transition appear mountOnEnter unmountOnExit in={isOpen} timeout={150}>
-      {(transitionState: TransitionState) => (
-        <DrawerControllerContextProvider value={transitionState}>
+      {(transitionState) => (
+        transitionState === 'unmounted' ? null : <DrawerControllerContextProvider value={transitionState}>
           {children}
         </DrawerControllerContextProvider>
       )}
diff --git a/design-system/packages/notice/package.json b/design-system/packages/notice/package.json
index d9a78cb8649..98cdb4b4fdd 100644
--- a/design-system/packages/notice/package.json
+++ b/design-system/packages/notice/package.json
@@ -5,7 +5,7 @@
   "main": "dist/keystone-ui-notice.cjs.js",
   "module": "dist/keystone-ui-notice.esm.js",
   "devDependencies": {
-    "@types/react": "^17.0.37"
+    "@types/react": "^18.0.8"
   },
   "dependencies": {
     "@babel/runtime": "^7.16.3",
diff --git a/design-system/packages/segmented-control/package.json b/design-system/packages/segmented-control/package.json
index 61a98f76606..68ca6c7a59b 100644
--- a/design-system/packages/segmented-control/package.json
+++ b/design-system/packages/segmented-control/package.json
@@ -5,7 +5,7 @@
   "main": "dist/keystone-ui-segmented-control.cjs.js",
   "module": "dist/keystone-ui-segmented-control.esm.js",
   "devDependencies": {
-    "@types/react": "^17.0.37",
+    "@types/react": "^18.0.8",
     "react": "^18.0.0"
   },
   "dependencies": {
diff --git a/design-system/packages/toast/package.json b/design-system/packages/toast/package.json
index d1ce9a598cf..02c28466d4f 100644
--- a/design-system/packages/toast/package.json
+++ b/design-system/packages/toast/package.json
@@ -5,7 +5,7 @@
   "main": "dist/keystone-ui-toast.cjs.js",
   "module": "dist/keystone-ui-toast.esm.js",
   "devDependencies": {
-    "@types/react": "^17.0.37",
+    "@types/react": "^18.0.8",
     "react": "^18.0.0"
   },
   "dependencies": {
diff --git a/design-system/website/package.json b/design-system/website/package.json
index ddb445ebb94..dbd7ae3a063 100644
--- a/design-system/website/package.json
+++ b/design-system/website/package.json
@@ -21,8 +21,8 @@
     "@keystone-ui/toast": "^5.0.0",
     "@keystone-ui/tooltip": "^5.0.0",
     "@preconstruct/next": "^4.0.0",
-    "@types/react": "^17.0.37",
-    "@types/react-dom": "^17.0.11",
+    "@types/react": "^18.0.8",
+    "@types/react-dom": "^18.0.0",
     "@types/tinycolor2": "^1.4.3",
     "next": "^12.1.5",
     "react": "^18.0.0",
diff --git a/docs/components/primitives/Button.tsx b/docs/components/primitives/Button.tsx
index 082feb0bcb1..e75fdfc0caf 100644
--- a/docs/components/primitives/Button.tsx
+++ b/docs/components/primitives/Button.tsx
@@ -1,6 +1,6 @@
 /** @jsxRuntime classic */
 /** @jsx jsx */
-import { Fragment, FunctionComponent, ReactNode } from 'react';
+import { Fragment, ElementType, ReactNode } from 'react';
 import { jsx } from '@emotion/react';
 import Link from 'next/link';
 
@@ -128,7 +128,7 @@ export const Button = forwardRefWithAs<'button', ButtonProps>(
     },
     ref
   ) => {
-    let Wrapper: FunctionComponent = Fragment;
+    let Wrapper: ElementType<{ children: ReactNode }> = Fragment;
 
     if (Tag === 'a' && !href) {
       Tag = 'button';
diff --git a/docs/package.json b/docs/package.json
index 34e7814d34e..4eabde00aab 100644
--- a/docs/package.json
+++ b/docs/package.json
@@ -23,8 +23,8 @@
     "@sindresorhus/slugify": "^1.1.2",
     "@types/gtag.js": "^0.0.10",
     "@types/mdx-js__react": "^1.5.5",
-    "@types/react": "^17.0.37",
-    "@types/react-dom": "^17.0.11",
+    "@types/react": "^18.0.8",
+    "@types/react-dom": "^18.0.0",
     "classnames": "^2.3.1",
     "copy-to-clipboard": "^3.3.1",
     "date-fns": "^2.26.0",
diff --git a/docs/pages/_document.tsx b/docs/pages/_document.tsx
index cc05d32ab8e..b2245a1a5da 100644
--- a/docs/pages/_document.tsx
+++ b/docs/pages/_document.tsx
@@ -31,7 +31,7 @@ class MyDocument extends Document {
     return {
       ...initialProps,
       styles: (
-        <React.Fragment>
+        [<React.Fragment key="1">
           {initialProps.styles}
           {data!.styles.map((data, i) => (
             <style
@@ -40,7 +40,7 @@ class MyDocument extends Document {
               dangerouslySetInnerHTML={{ __html: data.css }}
             />
           ))}
-        </React.Fragment>
+        </React.Fragment>]
       ),
     };
   }
diff --git a/examples-staging/basic/package.json b/examples-staging/basic/package.json
index 34a65f2aaac..8fb64ad5129 100644
--- a/examples-staging/basic/package.json
+++ b/examples-staging/basic/package.json
@@ -18,7 +18,7 @@
     "@keystone-ui/fields": "^6.0.1",
     "@keystone-ui/icons": "^5.0.0",
     "@keystone-ui/tooltip": "^5.0.0",
-    "@types/react": "^17.0.37",
+    "@types/react": "^18.0.8",
     "graphql": "^15.8.0",
     "graphql-tag": "^2.12.6",
     "react": "^18.0.0",
diff --git a/packages/cloudinary/package.json b/packages/cloudinary/package.json
index d54d3e59fe2..10631bd0170 100644
--- a/packages/cloudinary/package.json
+++ b/packages/cloudinary/package.json
@@ -10,7 +10,7 @@
     "@keystone-ui/core": "^4.0.0",
     "@keystone-ui/fields": "^6.0.1",
     "@keystone-ui/pill": "^6.0.0",
-    "@types/react": "^17.0.37",
+    "@types/react": "^18.0.8",
     "cloudinary": "^1.27.1",
     "cuid": "^2.1.8",
     "graphql-upload": "^13.0.0",
diff --git a/packages/core/package.json b/packages/core/package.json
index 5503c219931..4d6f240c930 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -65,7 +65,7 @@
     "@types/pluralize": "^0.0.29",
     "@types/prettier": "^2.4.2",
     "@types/prompts": "^2.0.14",
-    "@types/react": "^17.0.37",
+    "@types/react": "^18.0.8",
     "@types/source-map-support": "^0.5.4",
     "@types/supertest": "^2.0.11",
     "@types/uid-safe": "^2.1.2",
diff --git a/packages/core/src/___internal-do-not-use-will-break-in-patch/admin-ui/pages/ItemPage/index.tsx b/packages/core/src/___internal-do-not-use-will-break-in-patch/admin-ui/pages/ItemPage/index.tsx
index d90ccb30634..2d63fc0903d 100644
--- a/packages/core/src/___internal-do-not-use-will-break-in-patch/admin-ui/pages/ItemPage/index.tsx
+++ b/packages/core/src/___internal-do-not-use-will-break-in-patch/admin-ui/pages/ItemPage/index.tsx
@@ -52,7 +52,7 @@ type ItemPageProps = {
 
 function useEventCallback<Func extends (...args: any) => any>(callback: Func): Func {
   const callbackRef = useRef(callback);
-  const cb = useCallback((...args) => {
+  const cb = useCallback((...args: any[]) => {
     return callbackRef.current(...args);
   }, []);
   useEffect(() => {
diff --git a/packages/fields-document/package.json b/packages/fields-document/package.json
index a5d4d5994d5..e0c3e7cd4cb 100644
--- a/packages/fields-document/package.json
+++ b/packages/fields-document/package.json
@@ -33,7 +33,7 @@
     "@keystone-ui/icons": "^5.0.0",
     "@keystone-ui/popover": "^5.0.1",
     "@keystone-ui/tooltip": "^5.0.0",
-    "@types/react": "^17.0.37",
+    "@types/react": "^18.0.8",
     "apollo-server-errors": "^3.3.0",
     "apply-ref": "^1.0.0",
     "fp-ts": "^2.11.5",
diff --git a/packages/fields-document/src/DocumentEditor/utils.ts b/packages/fields-document/src/DocumentEditor/utils.ts
index 3f0f5a3a667..62f431aa8f3 100644
--- a/packages/fields-document/src/DocumentEditor/utils.ts
+++ b/packages/fields-document/src/DocumentEditor/utils.ts
@@ -93,7 +93,7 @@ export function useElementWithSetNodes<TElement extends Element>(
 
 export function useEventCallback<Func extends (...args: any) => any>(callback: Func): Func {
   const callbackRef = useRef(callback);
-  const cb = useCallback((...args) => {
+  const cb = useCallback((...args: any[]) => {
     return callbackRef.current(...args);
   }, []);
   useEffect(() => {
diff --git a/yarn.lock b/yarn.lock
index 89b24cd07b0..cfbb9903126 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3507,13 +3507,6 @@
   resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.4.tgz#cd667bcfdd025213aafb7ca5915a932590acdcdc"
   integrity sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==
 
-"@types/react-dom@^17.0.11":
-  version "17.0.11"
-  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.11.tgz#e1eadc3c5e86bdb5f7684e00274ae228e7bcc466"
-  integrity sha512-f96K3k+24RaLGVu/Y2Ng3e1EbZ8/cVJvypZWd7cy0ofCBaf2lcM46xNhycMZ2xGwbBjRql7hOlZ+e2WlJ5MH3Q==
-  dependencies:
-    "@types/react" "*"
-
 "@types/react-dom@^18.0.0":
   version "18.0.1"
   resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-18.0.1.tgz#cb3cc10ea91141b12c71001fede1017acfbce4db"
@@ -3528,10 +3521,10 @@
   dependencies:
     "@types/react" "*"
 
-"@types/react@*", "@types/react@>=16", "@types/react@^17.0.37":
-  version "17.0.37"
-  resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.37.tgz#6884d0aa402605935c397ae689deed115caad959"
-  integrity sha512-2FS1oTqBGcH/s0E+CjrCCR9+JMpsu9b69RTFO+40ua43ZqP5MmQ4iUde/dMjWR909KxZwmOQIFq6AV6NjEG5xg==
+"@types/react@*", "@types/react@>=16", "@types/react@^18.0.8":
+  version "18.0.8"
+  resolved "https://registry.yarnpkg.com/@types/react/-/react-18.0.8.tgz#a051eb380a9fbcaa404550543c58e1cf5ce4ab87"
+  integrity sha512-+j2hk9BzCOrrOSJASi5XiOyBbERk9jG5O73Ya4M0env5Ixi6vUNli4qy994AINcEF+1IEHISYFfIT4zwr++LKw==
   dependencies:
     "@types/prop-types" "*"
     "@types/scheduler" "*"
@@ -11176,9 +11169,9 @@ react-transition-group@^4.3.0, react-transition-group@^4.4.1, react-transition-g
     prop-types "^15.6.2"
 
 react@^18.0.0:
-  version "18.0.0"
-  resolved "https://registry.yarnpkg.com/react/-/react-18.0.0.tgz#b468736d1f4a5891f38585ba8e8fb29f91c3cb96"
-  integrity sha512-x+VL6wbT4JRVPm7EGxXhZ8w8LTROaxPXOqhlGyVSrv0sB1jkyFGgXxJ8LVoPRLvPR6/CIZGFmfzqUa2NYeMr2A==
+  version "18.1.0"
+  resolved "https://registry.yarnpkg.com/react/-/react-18.1.0.tgz#6f8620382decb17fdc5cc223a115e2adbf104890"
+  integrity sha512-4oL8ivCz5ZEPyclFQXaNksK3adutVS8l2xzZU0cqEFrE9Sb7fC0EFK5uEk74wIreL1DERyjvsU915j1pcT2uEQ==
   dependencies:
     loose-envify "^1.1.0"
 

From 30e20e078b942c480130654490e73ec8ca035471 Mon Sep 17 00:00:00 2001
From: Josh Calder <josh@opensaas.com.au>
Date: Tue, 3 May 2022 15:45:16 +1000
Subject: [PATCH 08/17] prettier

---
 .../packages/modals/src/DrawerController.tsx         | 12 +++++++-----
 docs/pages/_document.tsx                             |  8 ++++----
 packages/core/package.json                           |  2 +-
 yarn.lock                                            |  6 +++---
 4 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/design-system/packages/modals/src/DrawerController.tsx b/design-system/packages/modals/src/DrawerController.tsx
index d6039f50ef8..bc7cf68f1d7 100644
--- a/design-system/packages/modals/src/DrawerController.tsx
+++ b/design-system/packages/modals/src/DrawerController.tsx
@@ -26,11 +26,13 @@ export const useDrawerControllerContext = () => {
 export const DrawerController = ({ isOpen, children }: DrawerControllerProps) => {
   return (
     <Transition appear mountOnEnter unmountOnExit in={isOpen} timeout={150}>
-      {(transitionState) => (
-        transitionState === 'unmounted' ? null : <DrawerControllerContextProvider value={transitionState}>
-          {children}
-        </DrawerControllerContextProvider>
-      )}
+      {transitionState =>
+        transitionState === 'unmounted' ? null : (
+          <DrawerControllerContextProvider value={transitionState}>
+            {children}
+          </DrawerControllerContextProvider>
+        )
+      }
     </Transition>
   );
 };
diff --git a/docs/pages/_document.tsx b/docs/pages/_document.tsx
index b2245a1a5da..e36f6ded29a 100644
--- a/docs/pages/_document.tsx
+++ b/docs/pages/_document.tsx
@@ -30,8 +30,8 @@ class MyDocument extends Document {
     const initialProps = await Document.getInitialProps(ctx);
     return {
       ...initialProps,
-      styles: (
-        [<React.Fragment key="1">
+      styles: [
+        <React.Fragment key="1">
           {initialProps.styles}
           {data!.styles.map((data, i) => (
             <style
@@ -40,8 +40,8 @@ class MyDocument extends Document {
               dangerouslySetInnerHTML={{ __html: data.css }}
             />
           ))}
-        </React.Fragment>]
-      ),
+        </React.Fragment>,
+      ],
     };
   }
 
diff --git a/packages/core/package.json b/packages/core/package.json
index 4d6f240c930..01496bb8539 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -124,7 +124,7 @@
   "devDependencies": {
     "@testing-library/dom": "^8.11.1",
     "@testing-library/react": "^13.1.1",
-    "@testing-library/user-event": "^13.5.0",
+    "@testing-library/user-event": "^14.0.0",
     "@types/bytes": "^3.1.1",
     "fast-glob": "^3.2.7",
     "fixturez": "^1.1.0",
diff --git a/yarn.lock b/yarn.lock
index cfbb9903126..f690ed7855a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2987,9 +2987,9 @@
     "@types/react-dom" "^18.0.0"
 
 "@testing-library/user-event@^14.0.0":
-  version "14.0.0"
-  resolved "https://registry.yarnpkg.com/@testing-library/user-event/-/user-event-14.0.0.tgz#3906aa6f0e56fd012d73559f5f05c02e63ba18dd"
-  integrity sha512-hZhjNrle/DMi1ziHwHy8LS0fYJtf+cID7fuG5+4h+Bk83xQaRDQT/DlqfL4hJYw3mxW6KTIxoODrhGnhqJebdQ==
+  version "14.1.1"
+  resolved "https://registry.yarnpkg.com/@testing-library/user-event/-/user-event-14.1.1.tgz#e1ff6118896e4b22af31e5ea2f9da956adde23d8"
+  integrity sha512-XrjH/iEUqNl9lF2HX9YhPNV7Amntkcnpw0Bo1KkRzowNDcgSN9i0nm4Q8Oi5wupgdfPaJNMAWa61A+voD6Kmwg==
 
 "@timsuchanek/copy@1.4.5":
   version "1.4.5"

From 47af5834675a0d071b1e9fed520b2ac559278625 Mon Sep 17 00:00:00 2001
From: Josh Calder <josh@opensaas.com.au>
Date: Tue, 3 May 2022 16:49:59 +1000
Subject: [PATCH 09/17] Update packages/document-renderer/package.json

Co-authored-by: Mitchell Hamilton <mitchell@hamil.town>
---
 packages/document-renderer/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/document-renderer/package.json b/packages/document-renderer/package.json
index a230f3e6937..5a835a64cb6 100644
--- a/packages/document-renderer/package.json
+++ b/packages/document-renderer/package.json
@@ -9,7 +9,7 @@
     "react": "^16.14.0 || 17 | 18"
   },
   "devDependencies": {
-    "react": "^16.14.0 || 17 | 18"
+    "react": "^18.0.0"
   },
   "engines": {
     "node": "^14.15 || ^16.13"

From e4d7020d9e397bcbf3c91e0c024e3d3dfda62923 Mon Sep 17 00:00:00 2001
From: Josh Calder <josh@opensaas.com.au>
Date: Tue, 3 May 2022 16:50:05 +1000
Subject: [PATCH 10/17] Update .changeset/small-islands-marry.md

Co-authored-by: Mitchell Hamilton <mitchell@hamil.town>
---
 .changeset/small-islands-marry.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.changeset/small-islands-marry.md b/.changeset/small-islands-marry.md
index 14a2cb92869..58c83a045fb 100644
--- a/.changeset/small-islands-marry.md
+++ b/.changeset/small-islands-marry.md
@@ -16,7 +16,7 @@
 '@keystone-6/auth': major
 '@keystone-6/cloudinary': major
 '@keystone-6/core': major
-'@keystone-6/document-renderer': major
+'@keystone-6/document-renderer': minor
 '@keystone-6/fields-document': major
 '@keystone-6/website': patch
 '@keystone-6/example-auth': patch

From 96e0ca7eee682b77f49aed30c9b09d9ea9d028aa Mon Sep 17 00:00:00 2001
From: Josh Calder <josh@opensaas.com.au>
Date: Tue, 3 May 2022 19:51:31 +1000
Subject: [PATCH 11/17] fixup DrawerController

---
 design-system/packages/modals/src/DrawerController.tsx | 8 +++-----
 yarn.lock                                              | 9 ---------
 2 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/design-system/packages/modals/src/DrawerController.tsx b/design-system/packages/modals/src/DrawerController.tsx
index bc7cf68f1d7..17f3d51d319 100644
--- a/design-system/packages/modals/src/DrawerController.tsx
+++ b/design-system/packages/modals/src/DrawerController.tsx
@@ -8,7 +8,7 @@ type DrawerControllerProps = {
   children: ReactNode;
 };
 
-const DrawerControllerContext = React.createContext<null | TransitionState>(null);
+const DrawerControllerContext = React.createContext<null | 'unmounted' | TransitionState>(null);
 
 export const DrawerControllerContextProvider = DrawerControllerContext.Provider;
 
@@ -26,13 +26,11 @@ export const useDrawerControllerContext = () => {
 export const DrawerController = ({ isOpen, children }: DrawerControllerProps) => {
   return (
     <Transition appear mountOnEnter unmountOnExit in={isOpen} timeout={150}>
-      {transitionState =>
-        transitionState === 'unmounted' ? null : (
+      {(transitionState) => (
           <DrawerControllerContextProvider value={transitionState}>
             {children}
           </DrawerControllerContextProvider>
-        )
-      }
+      )}
     </Transition>
   );
 };
diff --git a/yarn.lock b/yarn.lock
index f690ed7855a..95fcd6e867b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -11159,15 +11159,6 @@ react-transition-group@^4.3.0, react-transition-group@^4.4.1, react-transition-g
     loose-envify "^1.4.0"
     prop-types "^15.6.2"
 
-"react@^16.14.0 || 17 | 18":
-  version "16.14.0"
-  resolved "https://registry.yarnpkg.com/react/-/react-16.14.0.tgz#94d776ddd0aaa37da3eda8fc5b6b18a4c9a3114d"
-  integrity sha512-0X2CImDkJGApiAlcf0ODKIneSwBPhqJawOa5wCtKbu7ZECrmS26NvtSILynQ66cgkT/RJ4LidJOc3bUESwmU8g==
-  dependencies:
-    loose-envify "^1.1.0"
-    object-assign "^4.1.1"
-    prop-types "^15.6.2"
-
 react@^18.0.0:
   version "18.1.0"
   resolved "https://registry.yarnpkg.com/react/-/react-18.1.0.tgz#6f8620382decb17fdc5cc223a115e2adbf104890"

From a3e73cb80a6ec0d8a824b2dfc0e8b48d8223bcdc Mon Sep 17 00:00:00 2001
From: Josh Calder <josh@opensaas.com.au>
Date: Tue, 3 May 2022 19:55:57 +1000
Subject: [PATCH 12/17] prettier

---
 design-system/packages/modals/src/DrawerController.tsx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/design-system/packages/modals/src/DrawerController.tsx b/design-system/packages/modals/src/DrawerController.tsx
index 17f3d51d319..df20c97f364 100644
--- a/design-system/packages/modals/src/DrawerController.tsx
+++ b/design-system/packages/modals/src/DrawerController.tsx
@@ -26,10 +26,10 @@ export const useDrawerControllerContext = () => {
 export const DrawerController = ({ isOpen, children }: DrawerControllerProps) => {
   return (
     <Transition appear mountOnEnter unmountOnExit in={isOpen} timeout={150}>
-      {(transitionState) => (
-          <DrawerControllerContextProvider value={transitionState}>
-            {children}
-          </DrawerControllerContextProvider>
+      {transitionState => (
+        <DrawerControllerContextProvider value={transitionState}>
+          {children}
+        </DrawerControllerContextProvider>
       )}
     </Transition>
   );

From 2a6ea6b2908b4e54f33947b1ecc79bbec421f945 Mon Sep 17 00:00:00 2001
From: Josh Calder <josh@opensaas.com.au>
Date: Tue, 3 May 2022 20:17:27 +1000
Subject: [PATCH 13/17] Drawer Controller Types

---
 design-system/packages/modals/src/DrawerBase.tsx       | 2 ++
 design-system/packages/modals/src/DrawerController.tsx | 2 +-
 design-system/packages/modals/src/types.ts             | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/design-system/packages/modals/src/DrawerBase.tsx b/design-system/packages/modals/src/DrawerBase.tsx
index 2c27c6d2359..7103856c9d5 100644
--- a/design-system/packages/modals/src/DrawerBase.tsx
+++ b/design-system/packages/modals/src/DrawerBase.tsx
@@ -32,6 +32,7 @@ const blanketTransition = {
   entered: { opacity: 1 },
   exiting: { opacity: 0 },
   exited: { opacity: 0 },
+  unmounted: { opacity: 0 },
 };
 
 export const DrawerBase = ({
@@ -142,5 +143,6 @@ function getDialogTransition(depth: number) {
     entered: { transform: transformValue },
     exiting: { transform: 'translateX(100%)' },
     exited: { transform: 'translateX(100%)' },
+    unmounted: { transform: 'none' },
   };
 }
diff --git a/design-system/packages/modals/src/DrawerController.tsx b/design-system/packages/modals/src/DrawerController.tsx
index df20c97f364..90436738694 100644
--- a/design-system/packages/modals/src/DrawerController.tsx
+++ b/design-system/packages/modals/src/DrawerController.tsx
@@ -8,7 +8,7 @@ type DrawerControllerProps = {
   children: ReactNode;
 };
 
-const DrawerControllerContext = React.createContext<null | 'unmounted' | TransitionState>(null);
+const DrawerControllerContext = React.createContext<null | TransitionState>(null);
 
 export const DrawerControllerContextProvider = DrawerControllerContext.Provider;
 
diff --git a/design-system/packages/modals/src/types.ts b/design-system/packages/modals/src/types.ts
index cfdfc8e0da5..7ace12b05d8 100644
--- a/design-system/packages/modals/src/types.ts
+++ b/design-system/packages/modals/src/types.ts
@@ -10,4 +10,4 @@ export type ActionsType = {
   };
 };
 
-export type TransitionState = 'entering' | 'entered' | 'exiting' | 'exited';
+export type TransitionState = 'entering' | 'entered' | 'exiting' | 'exited' | 'unmounted';

From 6bd0810dc11ee33fbaafe97ef3e317a92d6e490e Mon Sep 17 00:00:00 2001
From: mitchellhamilton <mitchell@hamil.town>
Date: Wed, 4 May 2022 09:37:30 +1000
Subject: [PATCH 14/17] Fix navigation prevention

---
 .../admin-ui/pages/ItemPage/index.tsx         |  4 +-
 .../admin-ui/components/CreateItemDrawer.tsx  | 11 ++++-
 .../admin-ui/utils/usePreventNavigation.tsx   | 43 ++++++++++---------
 3 files changed, 34 insertions(+), 24 deletions(-)

diff --git a/packages/core/src/___internal-do-not-use-will-break-in-patch/admin-ui/pages/ItemPage/index.tsx b/packages/core/src/___internal-do-not-use-will-break-in-patch/admin-ui/pages/ItemPage/index.tsx
index 2d63fc0903d..9ae542f9531 100644
--- a/packages/core/src/___internal-do-not-use-will-break-in-patch/admin-ui/pages/ItemPage/index.tsx
+++ b/packages/core/src/___internal-do-not-use-will-break-in-patch/admin-ui/pages/ItemPage/index.tsx
@@ -148,8 +148,8 @@ function ItemForm({
   });
   const labelFieldValue = state.item.data?.[list.labelField];
   const itemId = state.item.data?.id!;
-
-  usePreventNavigation(!!changedFields.size);
+  const hasChangedFields = !!changedFields.size;
+  usePreventNavigation(useMemo(() => ({ current: hasChangedFields }), [hasChangedFields]));
   return (
     <Box marginTop="xlarge">
       <GraphQLErrorNotice
diff --git a/packages/core/src/admin-ui/components/CreateItemDrawer.tsx b/packages/core/src/admin-ui/components/CreateItemDrawer.tsx
index 614abb99911..24fa3856cd8 100644
--- a/packages/core/src/admin-ui/components/CreateItemDrawer.tsx
+++ b/packages/core/src/admin-ui/components/CreateItemDrawer.tsx
@@ -1,7 +1,7 @@
 /** @jsxRuntime classic */
 /** @jsx jsx */
 
-import { useCallback, useMemo, useState } from 'react';
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import isDeepEqual from 'fast-deep-equal';
 import { jsx, Box } from '@keystone-ui/core';
 import { Drawer } from '@keystone-ui/modals';
@@ -78,7 +78,13 @@ export function CreateItemDrawer({
 
   const shouldPreventNavigation = !returnedData?.item && Object.keys(data).length !== 0;
 
-  usePreventNavigation(shouldPreventNavigation);
+  const shouldPreventNavigationRef = useRef(shouldPreventNavigation);
+
+  useEffect(() => {
+    shouldPreventNavigationRef.current = shouldPreventNavigation;
+  }, [shouldPreventNavigation]);
+
+  usePreventNavigation(shouldPreventNavigationRef);
 
   return (
     <Drawer
@@ -100,6 +106,7 @@ export function CreateItemDrawer({
               },
             })
               .then(({ data }) => {
+                shouldPreventNavigationRef.current = false;
                 const label = data.item.label || data.item.id;
                 onCreate({ id: data.item.id, label });
                 toasts.addToast({
diff --git a/packages/core/src/admin-ui/utils/usePreventNavigation.tsx b/packages/core/src/admin-ui/utils/usePreventNavigation.tsx
index 0bce388317d..d4353fc65d8 100644
--- a/packages/core/src/admin-ui/utils/usePreventNavigation.tsx
+++ b/packages/core/src/admin-ui/utils/usePreventNavigation.tsx
@@ -1,28 +1,31 @@
 import { useEffect } from 'react';
 import { useRouter } from '../router';
 
-export function usePreventNavigation(shouldPreventNavigation: boolean) {
+export function usePreventNavigation(shouldPreventNavigationRef: { current: boolean }) {
   const router = useRouter();
 
   useEffect(() => {
-    if (shouldPreventNavigation) {
-      const clientSideRouteChangeHandler = () => {
-        if (!window.confirm('There are unsaved changes, are you sure you want to exit?')) {
-          // throwing from here seems to be the only way to prevent the navigation
-          // we're throwing just a string here rather than an error because throwing an error
-          // causes Next to show an error overlay in dev but it doesn't show the overlay when we throw a string
-          throw 'Navigation cancelled by user';
-        }
-      };
-      router.events.on('routeChangeStart', clientSideRouteChangeHandler);
-      const beforeUnloadHandler = (event: BeforeUnloadEvent) => {
+    const clientSideRouteChangeHandler = () => {
+      if (
+        shouldPreventNavigationRef.current &&
+        !window.confirm('There are unsaved changes, are you sure you want to exit?')
+      ) {
+        // throwing from here seems to be the only way to prevent the navigation
+        // we're throwing just a string here rather than an error because throwing an error
+        // causes Next to show an error overlay in dev but it doesn't show the overlay when we throw a string
+        throw 'Navigation cancelled by user';
+      }
+    };
+    router.events.on('routeChangeStart', clientSideRouteChangeHandler);
+    const beforeUnloadHandler = (event: BeforeUnloadEvent) => {
+      if (shouldPreventNavigationRef.current) {
         event.preventDefault();
-      };
-      window.addEventListener('beforeunload', beforeUnloadHandler);
-      return () => {
-        router.events.off('routeChangeStart', clientSideRouteChangeHandler);
-        window.removeEventListener('beforeunload', beforeUnloadHandler);
-      };
-    }
-  }, [shouldPreventNavigation, router.events]);
+      }
+    };
+    window.addEventListener('beforeunload', beforeUnloadHandler);
+    return () => {
+      router.events.off('routeChangeStart', clientSideRouteChangeHandler);
+      window.removeEventListener('beforeunload', beforeUnloadHandler);
+    };
+  }, [shouldPreventNavigationRef, router.events]);
 }

From 8050f8fed882aa0afa693a85da85604baee9aa6b Mon Sep 17 00:00:00 2001
From: Josh Calder <josh.calder@thinkmill.com.au>
Date: Mon, 16 May 2022 15:20:17 +1000
Subject: [PATCH 15/17] upgrade to react 18.1.0

---
 .changeset/small-islands-marry.md             |  2 +-
 design-system/packages/button/package.json    |  4 +-
 design-system/packages/core/package.json      | 10 ++--
 design-system/packages/fields/package.json    |  4 +-
 design-system/packages/icons/package.json     |  6 +--
 design-system/packages/loading/package.json   |  4 +-
 design-system/packages/modals/package.json    |  4 +-
 design-system/packages/notice/package.json    |  4 +-
 design-system/packages/options/package.json   |  4 +-
 design-system/packages/pill/package.json      |  4 +-
 design-system/packages/popover/package.json   |  8 ++--
 .../packages/segmented-control/package.json   |  6 +--
 design-system/packages/toast/package.json     |  6 +--
 design-system/packages/tooltip/package.json   |  8 ++--
 design-system/website/package.json            |  8 ++--
 docs/package.json                             |  8 ++--
 examples-staging/auth/package.json            |  4 +-
 examples-staging/basic/package.json           |  6 +--
 examples-staging/ecommerce/package.json       |  4 +-
 examples-staging/embedded-nextjs/package.json |  4 +-
 examples-staging/roles/package.json           |  4 +-
 examples/custom-admin-ui-logo/package.json    |  2 +-
 .../custom-admin-ui-navigation/package.json   |  2 +-
 examples/custom-admin-ui-pages/package.json   |  2 +-
 examples/custom-field-view/package.json       |  2 +-
 examples/custom-field/package.json            |  2 +-
 examples/document-field/package.json          |  2 +-
 package.json                                  |  4 +-
 packages/auth/package.json                    |  4 +-
 packages/cloudinary/package.json              |  4 +-
 packages/core/package.json                    |  8 ++--
 packages/document-renderer/package.json       |  2 +-
 packages/fields-document/package.json         |  6 +--
 yarn.lock                                     | 46 +++++++++++++------
 34 files changed, 107 insertions(+), 91 deletions(-)

diff --git a/.changeset/small-islands-marry.md b/.changeset/small-islands-marry.md
index 58c83a045fb..eac6d2c257b 100644
--- a/.changeset/small-islands-marry.md
+++ b/.changeset/small-islands-marry.md
@@ -33,4 +33,4 @@
 '@keystone-6/admin-ui-tests': patch
 ---
 
-upgrade dependancy `"react": "^18.0.0"`
+upgrade dependancy `"react": "^18.1.0"`
diff --git a/design-system/packages/button/package.json b/design-system/packages/button/package.json
index b299ab5a25a..f113d456114 100644
--- a/design-system/packages/button/package.json
+++ b/design-system/packages/button/package.json
@@ -5,14 +5,14 @@
   "main": "dist/keystone-ui-button.cjs.js",
   "module": "dist/keystone-ui-button.esm.js",
   "devDependencies": {
-    "@types/react": "^18.0.8"
+    "@types/react": "^18.0.9"
   },
   "dependencies": {
     "@babel/runtime": "^7.16.3",
     "@keystone-ui/core": "^4.0.0",
     "@keystone-ui/icons": "^5.0.0",
     "@keystone-ui/loading": "^5.0.0",
-    "react": "^18.0.0"
+    "react": "^18.1.0"
   },
   "engines": {
     "node": "^14.15 || ^16.13"
diff --git a/design-system/packages/core/package.json b/design-system/packages/core/package.json
index 387c630f35d..5998020ddb4 100644
--- a/design-system/packages/core/package.json
+++ b/design-system/packages/core/package.json
@@ -5,13 +5,13 @@
   "main": "dist/keystone-ui-core.cjs.js",
   "module": "dist/keystone-ui-core.esm.js",
   "devDependencies": {
-    "@types/react": "^18.0.8",
-    "react": "^18.0.0",
-    "react-dom": "^18.0.0"
+    "@types/react": "^18.0.9",
+    "react": "^18.1.0",
+    "react-dom": "^18.1.0"
   },
   "peerDependencies": {
-    "react": "^18.0.0",
-    "react-dom": "^18.0.0"
+    "react": "^18.1.0",
+    "react-dom": "^18.1.0"
   },
   "dependencies": {
     "@babel/runtime": "^7.16.3",
diff --git a/design-system/packages/fields/package.json b/design-system/packages/fields/package.json
index f393c305a12..efa68a4e4a0 100644
--- a/design-system/packages/fields/package.json
+++ b/design-system/packages/fields/package.json
@@ -5,7 +5,7 @@
   "main": "dist/keystone-ui-fields.cjs.js",
   "module": "dist/keystone-ui-fields.esm.js",
   "devDependencies": {
-    "@types/react": "^18.0.8"
+    "@types/react": "^18.0.9"
   },
   "dependencies": {
     "@babel/runtime": "^7.16.3",
@@ -13,7 +13,7 @@
     "@keystone-ui/icons": "^5.0.0",
     "@keystone-ui/popover": "^5.0.1",
     "date-fns": "^2.26.0",
-    "react": "^18.0.0",
+    "react": "^18.1.0",
     "react-day-picker": "^8.0.4",
     "react-focus-lock": "^2.7.1",
     "react-select": "^5.2.1"
diff --git a/design-system/packages/icons/package.json b/design-system/packages/icons/package.json
index 55cc17b2f19..98a01f8b151 100644
--- a/design-system/packages/icons/package.json
+++ b/design-system/packages/icons/package.json
@@ -12,12 +12,12 @@
     "@svgr/plugin-jsx": "^6.0.0",
     "@svgr/plugin-prettier": "^5.5.0",
     "@svgr/plugin-svgo": "^6.0.0",
-    "@types/react": "^18.0.8",
+    "@types/react": "^18.0.9",
     "chalk": "^4.1.2",
     "feather-icons": "^4.28.0",
     "fs-extra": "^10.0.0",
     "globby": "^11.0.4",
-    "react": "^18.0.0",
+    "react": "^18.1.0",
     "to-pascal-case": "^1.0.0"
   },
   "dependencies": {
@@ -25,7 +25,7 @@
     "@keystone-ui/core": "^4.0.0"
   },
   "peerDependencies": {
-    "react": "^18.0.0"
+    "react": "^18.1.0"
   },
   "engines": {
     "node": "^14.15 || ^16.13"
diff --git a/design-system/packages/loading/package.json b/design-system/packages/loading/package.json
index a60e6e49398..5b2fc582152 100644
--- a/design-system/packages/loading/package.json
+++ b/design-system/packages/loading/package.json
@@ -5,12 +5,12 @@
   "main": "dist/keystone-ui-loading.cjs.js",
   "module": "dist/keystone-ui-loading.esm.js",
   "devDependencies": {
-    "@types/react": "^18.0.8"
+    "@types/react": "^18.0.9"
   },
   "dependencies": {
     "@babel/runtime": "^7.16.3",
     "@keystone-ui/core": "^4.0.0",
-    "react": "^18.0.0"
+    "react": "^18.1.0"
   },
   "engines": {
     "node": "^14.15 || ^16.13"
diff --git a/design-system/packages/modals/package.json b/design-system/packages/modals/package.json
index e8a42f8adbb..4058dc3f118 100644
--- a/design-system/packages/modals/package.json
+++ b/design-system/packages/modals/package.json
@@ -5,13 +5,13 @@
   "main": "dist/keystone-ui-modals.cjs.js",
   "module": "dist/keystone-ui-modals.esm.js",
   "devDependencies": {
-    "@types/react": "^18.0.8"
+    "@types/react": "^18.0.9"
   },
   "dependencies": {
     "@babel/runtime": "^7.16.3",
     "@keystone-ui/button": "^6.0.0",
     "@keystone-ui/core": "^4.0.0",
-    "react": "^18.0.0",
+    "react": "^18.1.0",
     "react-focus-lock": "^2.7.1",
     "react-remove-scroll": "^2.4.3",
     "react-transition-group": "^4.4.2"
diff --git a/design-system/packages/notice/package.json b/design-system/packages/notice/package.json
index 98cdb4b4fdd..26828a15bb4 100644
--- a/design-system/packages/notice/package.json
+++ b/design-system/packages/notice/package.json
@@ -5,14 +5,14 @@
   "main": "dist/keystone-ui-notice.cjs.js",
   "module": "dist/keystone-ui-notice.esm.js",
   "devDependencies": {
-    "@types/react": "^18.0.8"
+    "@types/react": "^18.0.9"
   },
   "dependencies": {
     "@babel/runtime": "^7.16.3",
     "@keystone-ui/button": "^6.0.0",
     "@keystone-ui/core": "^4.0.0",
     "@keystone-ui/icons": "^5.0.0",
-    "react": "^18.0.0"
+    "react": "^18.1.0"
   },
   "engines": {
     "node": "^14.15 || ^16.13"
diff --git a/design-system/packages/options/package.json b/design-system/packages/options/package.json
index d0f75527e81..7194f9257e0 100644
--- a/design-system/packages/options/package.json
+++ b/design-system/packages/options/package.json
@@ -5,10 +5,10 @@
   "main": "dist/keystone-ui-options.cjs.js",
   "module": "dist/keystone-ui-options.esm.js",
   "peerDependencies": {
-    "react": "^18.0.0"
+    "react": "^18.1.0"
   },
   "devDependencies": {
-    "react": "^18.0.0"
+    "react": "^18.1.0"
   },
   "dependencies": {
     "@babel/runtime": "^7.16.3",
diff --git a/design-system/packages/pill/package.json b/design-system/packages/pill/package.json
index 655988cc4f0..0ace711a6c3 100644
--- a/design-system/packages/pill/package.json
+++ b/design-system/packages/pill/package.json
@@ -5,10 +5,10 @@
   "main": "dist/keystone-ui-pill.cjs.js",
   "module": "dist/keystone-ui-pill.esm.js",
   "peerDependencies": {
-    "react": "^18.0.0"
+    "react": "^18.1.0"
   },
   "devDependencies": {
-    "react": "^18.0.0"
+    "react": "^18.1.0"
   },
   "dependencies": {
     "@babel/runtime": "^7.16.3",
diff --git a/design-system/packages/popover/package.json b/design-system/packages/popover/package.json
index beae4db2366..762f89c853c 100644
--- a/design-system/packages/popover/package.json
+++ b/design-system/packages/popover/package.json
@@ -5,12 +5,12 @@
   "main": "dist/keystone-ui-popover.cjs.js",
   "module": "dist/keystone-ui-popover.esm.js",
   "peerDependencies": {
-    "react": "^18.0.0",
-    "react-dom": "^18.0.0"
+    "react": "^18.1.0",
+    "react-dom": "^18.1.0"
   },
   "devDependencies": {
-    "react": "^18.0.0",
-    "react-dom": "^18.0.0"
+    "react": "^18.1.0",
+    "react-dom": "^18.1.0"
   },
   "dependencies": {
     "@babel/runtime": "^7.16.3",
diff --git a/design-system/packages/segmented-control/package.json b/design-system/packages/segmented-control/package.json
index 9373205d112..60ed44effca 100644
--- a/design-system/packages/segmented-control/package.json
+++ b/design-system/packages/segmented-control/package.json
@@ -5,15 +5,15 @@
   "main": "dist/keystone-ui-segmented-control.cjs.js",
   "module": "dist/keystone-ui-segmented-control.esm.js",
   "devDependencies": {
-    "@types/react": "^18.0.8",
-    "react": "^18.0.0"
+    "@types/react": "^18.0.9",
+    "react": "^18.1.0"
   },
   "dependencies": {
     "@babel/runtime": "^7.16.3",
     "@keystone-ui/core": "^4.0.0"
   },
   "peerDependencies": {
-    "react": "^18.0.0"
+    "react": "^18.1.0"
   },
   "engines": {
     "node": "^14.15 || ^16.13"
diff --git a/design-system/packages/toast/package.json b/design-system/packages/toast/package.json
index 02c28466d4f..40ede750b01 100644
--- a/design-system/packages/toast/package.json
+++ b/design-system/packages/toast/package.json
@@ -5,8 +5,8 @@
   "main": "dist/keystone-ui-toast.cjs.js",
   "module": "dist/keystone-ui-toast.esm.js",
   "devDependencies": {
-    "@types/react": "^18.0.8",
-    "react": "^18.0.0"
+    "@types/react": "^18.0.9",
+    "react": "^18.1.0"
   },
   "dependencies": {
     "@babel/runtime": "^7.16.3",
@@ -14,7 +14,7 @@
     "@keystone-ui/icons": "^5.0.0"
   },
   "peerDependencies": {
-    "react": "^18.0.0"
+    "react": "^18.1.0"
   },
   "engines": {
     "node": "^14.15 || ^16.13"
diff --git a/design-system/packages/tooltip/package.json b/design-system/packages/tooltip/package.json
index ae449a18c5b..bb4ad7e810f 100644
--- a/design-system/packages/tooltip/package.json
+++ b/design-system/packages/tooltip/package.json
@@ -5,12 +5,12 @@
   "main": "dist/keystone-ui-tooltip.cjs.js",
   "module": "dist/keystone-ui-tooltip.esm.js",
   "peerDependencies": {
-    "react": "^18.0.0",
-    "react-dom": "^18.0.0"
+    "react": "^18.1.0",
+    "react-dom": "^18.1.0"
   },
   "devDependencies": {
-    "react": "^18.0.0",
-    "react-dom": "^18.0.0"
+    "react": "^18.1.0",
+    "react-dom": "^18.1.0"
   },
   "dependencies": {
     "@babel/runtime": "^7.16.3",
diff --git a/design-system/website/package.json b/design-system/website/package.json
index dbd7ae3a063..53bae89b438 100644
--- a/design-system/website/package.json
+++ b/design-system/website/package.json
@@ -21,12 +21,12 @@
     "@keystone-ui/toast": "^5.0.0",
     "@keystone-ui/tooltip": "^5.0.0",
     "@preconstruct/next": "^4.0.0",
-    "@types/react": "^18.0.8",
-    "@types/react-dom": "^18.0.0",
+    "@types/react": "^18.0.9",
+    "@types/react-dom": "^18.0.4",
     "@types/tinycolor2": "^1.4.3",
     "next": "^12.1.5",
-    "react": "^18.0.0",
-    "react-dom": "^18.0.0",
+    "react": "^18.1.0",
+    "react-dom": "^18.1.0",
     "tinycolor2": "^1.4.2"
   },
   "devDependencies": {
diff --git a/docs/package.json b/docs/package.json
index 4eabde00aab..b9d1369796f 100644
--- a/docs/package.json
+++ b/docs/package.json
@@ -23,8 +23,8 @@
     "@sindresorhus/slugify": "^1.1.2",
     "@types/gtag.js": "^0.0.10",
     "@types/mdx-js__react": "^1.5.5",
-    "@types/react": "^18.0.8",
-    "@types/react-dom": "^18.0.0",
+    "@types/react": "^18.0.9",
+    "@types/react-dom": "^18.0.4",
     "classnames": "^2.3.1",
     "copy-to-clipboard": "^3.3.1",
     "date-fns": "^2.26.0",
@@ -33,8 +33,8 @@
     "next": "^12.1.5",
     "next-compose-plugins": "^2.2.1",
     "prism-react-renderer": "^1.2.1",
-    "react": "^18.0.0",
-    "react-dom": "^18.0.0",
+    "react": "^18.1.0",
+    "react-dom": "^18.1.0",
     "react-focus-lock": "^2.7.1",
     "react-toast-notifications": "^2.5.1",
     "remark-gfm": "^1.0.0",
diff --git a/examples-staging/auth/package.json b/examples-staging/auth/package.json
index a01efb14fa4..4433cc5ea1b 100644
--- a/examples-staging/auth/package.json
+++ b/examples-staging/auth/package.json
@@ -12,8 +12,8 @@
     "@keystone-6/auth": "^2.0.0",
     "@keystone-6/core": "^1.1.1",
     "next": "^12.1.5",
-    "react": "^18.0.0",
-    "react-dom": "^18.0.0"
+    "react": "^18.1.0",
+    "react-dom": "^18.1.0"
   },
   "devDependencies": {
     "typescript": "^4.4.4"
diff --git a/examples-staging/basic/package.json b/examples-staging/basic/package.json
index be57ab23cca..dad3bf20d15 100644
--- a/examples-staging/basic/package.json
+++ b/examples-staging/basic/package.json
@@ -18,11 +18,11 @@
     "@keystone-ui/fields": "^6.1.0",
     "@keystone-ui/icons": "^5.0.0",
     "@keystone-ui/tooltip": "^5.0.0",
-    "@types/react": "^18.0.8",
+    "@types/react": "^18.0.9",
     "graphql": "^15.8.0",
     "graphql-tag": "^2.12.6",
-    "react": "^18.0.0",
-    "react-dom": "^18.0.0",
+    "react": "^18.1.0",
+    "react-dom": "^18.1.0",
     "uuid": "^8.3.2"
   },
   "devDependencies": {
diff --git a/examples-staging/ecommerce/package.json b/examples-staging/ecommerce/package.json
index a8467872a14..dd2f2140225 100644
--- a/examples-staging/ecommerce/package.json
+++ b/examples-staging/ecommerce/package.json
@@ -23,8 +23,8 @@
     "dotenv": "^16.0.0",
     "next": "^12.1.5",
     "nodemailer": "^6.7.1",
-    "react": "^18.0.0",
-    "react-dom": "^18.0.0",
+    "react": "^18.1.0",
+    "react-dom": "^18.1.0",
     "stripe": "^9.0.0"
   },
   "devDependencies": {
diff --git a/examples-staging/embedded-nextjs/package.json b/examples-staging/embedded-nextjs/package.json
index d9e24a6a0b8..1e062e3fc20 100644
--- a/examples-staging/embedded-nextjs/package.json
+++ b/examples-staging/embedded-nextjs/package.json
@@ -12,8 +12,8 @@
     "@keystone-6/core": "^1.1.1",
     "dotenv": "^16.0.0",
     "next": "^12.1.5",
-    "react": "^18.0.0",
-    "react-dom": "^18.0.0"
+    "react": "^18.1.0",
+    "react-dom": "^18.1.0"
   },
   "devDependencies": {
     "typescript": "^4.4.4"
diff --git a/examples-staging/roles/package.json b/examples-staging/roles/package.json
index d989f5c8762..eef7abbb547 100644
--- a/examples-staging/roles/package.json
+++ b/examples-staging/roles/package.json
@@ -12,8 +12,8 @@
     "@keystone-6/auth": "^2.0.0",
     "@keystone-6/core": "^1.1.1",
     "next": "^12.1.5",
-    "react": "^18.0.0",
-    "react-dom": "^18.0.0"
+    "react": "^18.1.0",
+    "react-dom": "^18.1.0"
   },
   "devDependencies": {
     "typescript": "^4.4.4"
diff --git a/examples/custom-admin-ui-logo/package.json b/examples/custom-admin-ui-logo/package.json
index 54883215650..66e2951856b 100644
--- a/examples/custom-admin-ui-logo/package.json
+++ b/examples/custom-admin-ui-logo/package.json
@@ -12,7 +12,7 @@
     "@keystone-6/core": "^1.1.1",
     "@keystone-ui/core": "^4.0.0",
     "next": "^12.1.5",
-    "react": "^18.0.0"
+    "react": "^18.1.0"
   },
   "devDependencies": {
     "typescript": "^4.4.4"
diff --git a/examples/custom-admin-ui-navigation/package.json b/examples/custom-admin-ui-navigation/package.json
index c5fd2e62fbf..3b57b118d2e 100644
--- a/examples/custom-admin-ui-navigation/package.json
+++ b/examples/custom-admin-ui-navigation/package.json
@@ -10,7 +10,7 @@
   },
   "dependencies": {
     "@keystone-6/core": "^1.1.1",
-    "react": "^18.0.0"
+    "react": "^18.1.0"
   },
   "devDependencies": {
     "typescript": "^4.4.4"
diff --git a/examples/custom-admin-ui-pages/package.json b/examples/custom-admin-ui-pages/package.json
index 5273dd6a92e..7733cdb2816 100644
--- a/examples/custom-admin-ui-pages/package.json
+++ b/examples/custom-admin-ui-pages/package.json
@@ -11,7 +11,7 @@
   "dependencies": {
     "@keystone-6/core": "^1.1.1",
     "@keystone-ui/core": "^4.0.0",
-    "react": "^18.0.0"
+    "react": "^18.1.0"
   },
   "devDependencies": {
     "typescript": "^4.4.4"
diff --git a/examples/custom-field-view/package.json b/examples/custom-field-view/package.json
index b823818a15d..e950431fcc5 100644
--- a/examples/custom-field-view/package.json
+++ b/examples/custom-field-view/package.json
@@ -15,7 +15,7 @@
     "@keystone-ui/core": "^4.0.0",
     "@keystone-ui/fields": "^6.1.0",
     "@keystone-ui/icons": "^5.0.0",
-    "react": "^18.0.0"
+    "react": "^18.1.0"
   },
   "devDependencies": {
     "typescript": "^4.4.4"
diff --git a/examples/custom-field/package.json b/examples/custom-field/package.json
index b1482d4f547..fccf8a7ad7b 100644
--- a/examples/custom-field/package.json
+++ b/examples/custom-field/package.json
@@ -11,7 +11,7 @@
   "dependencies": {
     "@keystone-6/core": "^1.1.1",
     "@keystone-ui/fields": "^6.1.0",
-    "react": "^18.0.0"
+    "react": "^18.1.0"
   },
   "devDependencies": {
     "typescript": "^4.4.4"
diff --git a/examples/document-field/package.json b/examples/document-field/package.json
index b0c854a0c43..8dad4639364 100644
--- a/examples/document-field/package.json
+++ b/examples/document-field/package.json
@@ -15,7 +15,7 @@
     "@keystone-6/fields-document": "^2.0.1",
     "@preconstruct/next": "^4.0.0",
     "next": "^12.1.5",
-    "react": "^18.0.0"
+    "react": "^18.1.0"
   },
   "devDependencies": {
     "typescript": "^4.4.4"
diff --git a/package.json b/package.json
index 476a3687088..c3ce980b84d 100644
--- a/package.json
+++ b/package.json
@@ -69,8 +69,8 @@
     "is-ci": "^3.0.1",
     "jest": "^27.3.1",
     "prettier": "^2.5.0",
-    "react": "^18.0.0",
-    "react-dom": "^18.0.0",
+    "react": "^18.1.0",
+    "react-dom": "^18.1.0",
     "remark-cli": "^6.0.1",
     "remark-frontmatter": "^1.3.3",
     "remark-toc": "^5.1.1",
diff --git a/packages/auth/package.json b/packages/auth/package.json
index d60e7ee6db4..511d9cdd9f6 100644
--- a/packages/auth/package.json
+++ b/packages/auth/package.json
@@ -20,11 +20,11 @@
   },
   "devDependencies": {
     "@keystone-6/core": "^1.1.0",
-    "react": "^18.0.0"
+    "react": "^18.1.0"
   },
   "peerDependencies": {
     "@keystone-6/core": "^1.1.0",
-    "react": "^18.0.0"
+    "react": "^18.1.0"
   },
   "preconstruct": {
     "entrypoints": [
diff --git a/packages/cloudinary/package.json b/packages/cloudinary/package.json
index 10631bd0170..445c6824103 100644
--- a/packages/cloudinary/package.json
+++ b/packages/cloudinary/package.json
@@ -10,11 +10,11 @@
     "@keystone-ui/core": "^4.0.0",
     "@keystone-ui/fields": "^6.0.1",
     "@keystone-ui/pill": "^6.0.0",
-    "@types/react": "^18.0.8",
+    "@types/react": "^18.0.9",
     "cloudinary": "^1.27.1",
     "cuid": "^2.1.8",
     "graphql-upload": "^13.0.0",
-    "react": "^18.0.0"
+    "react": "^18.1.0"
   },
   "peerDependencies": {
     "@keystone-6/core": "^1.1.0"
diff --git a/packages/core/package.json b/packages/core/package.json
index 86a48d7a219..37d21b2b954 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -65,7 +65,7 @@
     "@types/pluralize": "^0.0.29",
     "@types/prettier": "^2.4.2",
     "@types/prompts": "^2.0.14",
-    "@types/react": "^18.0.8",
+    "@types/react": "^18.0.9",
     "@types/source-map-support": "^0.5.4",
     "@types/supertest": "^2.0.11",
     "@types/uid-safe": "^2.1.2",
@@ -113,8 +113,8 @@
     "prettier": "^2.5.0",
     "prisma": "3.12.0",
     "prompts": "^2.4.2",
-    "react": "^18.0.0",
-    "react-dom": "^18.0.0",
+    "react": "^18.1.0",
+    "react-dom": "^18.1.0",
     "resolve": "^1.20.0",
     "source-map-support": "^0.5.20",
     "supertest": "^6.1.6",
@@ -123,7 +123,7 @@
   },
   "devDependencies": {
     "@testing-library/dom": "^8.11.1",
-    "@testing-library/react": "^13.1.1",
+    "@testing-library/react": "^13.2.0",
     "@testing-library/user-event": "^14.0.0",
     "@types/bytes": "^3.1.1",
     "fast-glob": "^3.2.7",
diff --git a/packages/document-renderer/package.json b/packages/document-renderer/package.json
index 5a835a64cb6..6a705d66417 100644
--- a/packages/document-renderer/package.json
+++ b/packages/document-renderer/package.json
@@ -9,7 +9,7 @@
     "react": "^16.14.0 || 17 | 18"
   },
   "devDependencies": {
-    "react": "^18.0.0"
+    "react": "^18.1.0"
   },
   "engines": {
     "node": "^14.15 || ^16.13"
diff --git a/packages/fields-document/package.json b/packages/fields-document/package.json
index ee7c853676b..4c27f27f69c 100644
--- a/packages/fields-document/package.json
+++ b/packages/fields-document/package.json
@@ -33,7 +33,7 @@
     "@keystone-ui/icons": "^5.0.0",
     "@keystone-ui/popover": "^5.0.1",
     "@keystone-ui/tooltip": "^5.0.0",
-    "@types/react": "^18.0.8",
+    "@types/react": "^18.0.9",
     "apollo-server-errors": "^3.3.0",
     "apply-ref": "^1.0.0",
     "fp-ts": "^2.11.5",
@@ -48,7 +48,7 @@
     "mdast-util-gfm-strikethrough": "^0.2.3",
     "micromark-extension-gfm-autolink-literal": "0.5.7",
     "micromark-extension-gfm-strikethrough": "0.6.5",
-    "react": "^18.0.0",
+    "react": "^18.1.0",
     "scroll-into-view-if-needed": "^2.2.28",
     "slate": "^0.67.1",
     "slate-history": "^0.66.0",
@@ -57,7 +57,7 @@
   "repository": "https://github.com/keystonejs/keystone/tree/main/packages/fields-document",
   "devDependencies": {
     "@keystone-6/core": "*",
-    "@testing-library/react": "^13.1.1",
+    "@testing-library/react": "^13.2.0",
     "array.prototype.flat": "^1.2.5",
     "jest-diff": "^27.3.1",
     "pretty-format": "^27.3.1",
diff --git a/yarn.lock b/yarn.lock
index b6333f39147..0bb52e8c83e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2977,10 +2977,10 @@
     lodash "^4.17.15"
     redent "^3.0.0"
 
-"@testing-library/react@^13.1.1":
-  version "13.1.1"
-  resolved "https://registry.yarnpkg.com/@testing-library/react/-/react-13.1.1.tgz#6c1635e25acca8ca5be8ee3b19ad1391681c5846"
-  integrity sha512-8mirlAa0OKaUvnqnZF6MdAh2tReYA2KtWVw1PKvaF5EcCZqgK5pl8iF+3uW90JdG5Ua2c2c2E2wtLdaug3dsVg==
+"@testing-library/react@^13.2.0":
+  version "13.2.0"
+  resolved "https://registry.yarnpkg.com/@testing-library/react/-/react-13.2.0.tgz#2db00bc94d71c4e90e5c25582e90a650ae2925bf"
+  integrity sha512-Bprbz/SZVONCJy5f7hcihNCv313IJXdYiv0nSJklIs1SQCIHHNlnGNkosSXnGZTmesyGIcBGNppYhXcc11pb7g==
   dependencies:
     "@babel/runtime" "^7.12.5"
     "@testing-library/dom" "^8.5.0"
@@ -3514,6 +3514,13 @@
   dependencies:
     "@types/react" "*"
 
+"@types/react-dom@^18.0.4":
+  version "18.0.4"
+  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-18.0.4.tgz#dcbcadb277bcf6c411ceff70069424c57797d375"
+  integrity sha512-FgTtbqPOCI3dzZPZoC2T/sx3L34qxy99ITWn4eoSA95qPyXDMH0ALoAqUp49ITniiJFsXUVBtalh/KffMpg21Q==
+  dependencies:
+    "@types/react" "*"
+
 "@types/react-transition-group@^4.4.0":
   version "4.4.4"
   resolved "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-4.4.4.tgz#acd4cceaa2be6b757db61ed7b432e103242d163e"
@@ -3521,7 +3528,7 @@
   dependencies:
     "@types/react" "*"
 
-"@types/react@*", "@types/react@>=16", "@types/react@^18.0.8":
+"@types/react@*", "@types/react@>=16":
   version "18.0.8"
   resolved "https://registry.yarnpkg.com/@types/react/-/react-18.0.8.tgz#a051eb380a9fbcaa404550543c58e1cf5ce4ab87"
   integrity sha512-+j2hk9BzCOrrOSJASi5XiOyBbERk9jG5O73Ya4M0env5Ixi6vUNli4qy994AINcEF+1IEHISYFfIT4zwr++LKw==
@@ -3530,6 +3537,15 @@
     "@types/scheduler" "*"
     csstype "^3.0.2"
 
+"@types/react@^18.0.9":
+  version "18.0.9"
+  resolved "https://registry.yarnpkg.com/@types/react/-/react-18.0.9.tgz#d6712a38bd6cd83469603e7359511126f122e878"
+  integrity sha512-9bjbg1hJHUm4De19L1cHiW0Jvx3geel6Qczhjd0qY5VKVE2X5+x77YxAepuCwVh4vrgZJdgEJw48zrhRIeF4Nw==
+  dependencies:
+    "@types/prop-types" "*"
+    "@types/scheduler" "*"
+    csstype "^3.0.2"
+
 "@types/redis@^2.8.32":
   version "2.8.32"
   resolved "https://registry.yarnpkg.com/@types/redis/-/redis-2.8.32.tgz#1d3430219afbee10f8cfa389dad2571a05ecfb11"
@@ -11052,13 +11068,13 @@ react-day-picker@^8.0.4:
   dependencies:
     "@reach/auto-id" "^0.16.0"
 
-react-dom@^18.0.0:
-  version "18.0.0"
-  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-18.0.0.tgz#26b88534f8f1dbb80853e1eabe752f24100d8023"
-  integrity sha512-XqX7uzmFo0pUceWFCt7Gff6IyIMzFUn7QMZrbrQfGxtaxXZIcGQzoNpRLE3fQLnS4XzLLPMZX2T9TRcSrasicw==
+react-dom@^18.1.0:
+  version "18.1.0"
+  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-18.1.0.tgz#7f6dd84b706408adde05e1df575b3a024d7e8a2f"
+  integrity sha512-fU1Txz7Budmvamp7bshe4Zi32d0ll7ect+ccxNu9FlObT605GOEB8BfO4tmRJ39R5Zj831VCpvQ05QPBW5yb+w==
   dependencies:
     loose-envify "^1.1.0"
-    scheduler "^0.21.0"
+    scheduler "^0.22.0"
 
 react-fast-compare@^3.0.1:
   version "3.2.0"
@@ -11154,7 +11170,7 @@ react-transition-group@^4.3.0, react-transition-group@^4.4.1, react-transition-g
     loose-envify "^1.4.0"
     prop-types "^15.6.2"
 
-react@^18.0.0:
+react@^18.1.0:
   version "18.1.0"
   resolved "https://registry.yarnpkg.com/react/-/react-18.1.0.tgz#6f8620382decb17fdc5cc223a115e2adbf104890"
   integrity sha512-4oL8ivCz5ZEPyclFQXaNksK3adutVS8l2xzZU0cqEFrE9Sb7fC0EFK5uEk74wIreL1DERyjvsU915j1pcT2uEQ==
@@ -11726,10 +11742,10 @@ saxes@^5.0.1:
   dependencies:
     xmlchars "^2.2.0"
 
-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==
+scheduler@^0.22.0:
+  version "0.22.0"
+  resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.22.0.tgz#83a5d63594edf074add9a7198b1bae76c3db01b8"
+  integrity sha512-6QAm1BgQI88NPYymgGQLCZgvep4FyePDWFpXVK+zNSUgHwlqpJy8VEh8Et0KxTACS4VWwMousBElAZOH9nkkoQ==
   dependencies:
     loose-envify "^1.1.0"
 

From 600a78ee3a97d033d7e534cdc9dcf1c4a4281168 Mon Sep 17 00:00:00 2001
From: Josh Calder <josh.calder@thinkmill.com.au>
Date: Mon, 16 May 2022 15:26:59 +1000
Subject: [PATCH 16/17] lock fix

---
 yarn.lock | 20 ++------------------
 1 file changed, 2 insertions(+), 18 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 0bb52e8c83e..b30cfdf6584 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3507,14 +3507,7 @@
   resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.4.tgz#cd667bcfdd025213aafb7ca5915a932590acdcdc"
   integrity sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==
 
-"@types/react-dom@^18.0.0":
-  version "18.0.1"
-  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-18.0.1.tgz#cb3cc10ea91141b12c71001fede1017acfbce4db"
-  integrity sha512-jCwTXvHtRLiyVvKm9aEdHXs8rflVOGd5Sl913JZrPshfXjn8NYsTNZOz70bCsA31IR0TOqwi3ad+X4tSCBoMTw==
-  dependencies:
-    "@types/react" "*"
-
-"@types/react-dom@^18.0.4":
+"@types/react-dom@^18.0.0", "@types/react-dom@^18.0.4":
   version "18.0.4"
   resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-18.0.4.tgz#dcbcadb277bcf6c411ceff70069424c57797d375"
   integrity sha512-FgTtbqPOCI3dzZPZoC2T/sx3L34qxy99ITWn4eoSA95qPyXDMH0ALoAqUp49ITniiJFsXUVBtalh/KffMpg21Q==
@@ -3528,16 +3521,7 @@
   dependencies:
     "@types/react" "*"
 
-"@types/react@*", "@types/react@>=16":
-  version "18.0.8"
-  resolved "https://registry.yarnpkg.com/@types/react/-/react-18.0.8.tgz#a051eb380a9fbcaa404550543c58e1cf5ce4ab87"
-  integrity sha512-+j2hk9BzCOrrOSJASi5XiOyBbERk9jG5O73Ya4M0env5Ixi6vUNli4qy994AINcEF+1IEHISYFfIT4zwr++LKw==
-  dependencies:
-    "@types/prop-types" "*"
-    "@types/scheduler" "*"
-    csstype "^3.0.2"
-
-"@types/react@^18.0.9":
+"@types/react@*", "@types/react@>=16", "@types/react@^18.0.9":
   version "18.0.9"
   resolved "https://registry.yarnpkg.com/@types/react/-/react-18.0.9.tgz#d6712a38bd6cd83469603e7359511126f122e878"
   integrity sha512-9bjbg1hJHUm4De19L1cHiW0Jvx3geel6Qczhjd0qY5VKVE2X5+x77YxAepuCwVh4vrgZJdgEJw48zrhRIeF4Nw==

From 8a36589124078b91f92f0a05a30f2b1ce664d52b Mon Sep 17 00:00:00 2001
From: Mitchell Hamilton <mitchell@hamil.town>
Date: Fri, 20 May 2022 09:13:02 +1000
Subject: [PATCH 17/17] Update packages/document-renderer/package.json

---
 packages/document-renderer/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/document-renderer/package.json b/packages/document-renderer/package.json
index 6a705d66417..3403431ced7 100644
--- a/packages/document-renderer/package.json
+++ b/packages/document-renderer/package.json
@@ -6,7 +6,7 @@
   "main": "dist/keystone-6-document-renderer.cjs.js",
   "module": "dist/keystone-6-document-renderer.esm.js",
   "peerDependencies": {
-    "react": "^16.14.0 || 17 | 18"
+    "react": "^16.14.0 || 17 || 18"
   },
   "devDependencies": {
     "react": "^18.1.0"