From dc5fc3988730927384bbc6d33fd8daa1ed3b5041 Mon Sep 17 00:00:00 2001
From: Daniel Cousens <413395+dcousens@users.noreply.github.com>
Date: Wed, 27 Oct 2021 12:41:30 +1100
Subject: [PATCH 01/21] Update renovate.json

---
 renovate.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/renovate.json b/renovate.json
index c21f2374b70..1fc1e286e77 100644
--- a/renovate.json
+++ b/renovate.json
@@ -4,6 +4,7 @@
   "lockFileMaintenance": { "enabled": true },
   "separateMinorPatch": true,
   "prConcurrentLimit": 0,
+  "baseBranches": ["renovate"],
   "packageRules": [
     {
       "packagePatterns": [

From fd4cb0f1708c03c42f746b1e383e22866b763751 Mon Sep 17 00:00:00 2001
From: Daniel Cousens <413395+dcousens@users.noreply.github.com>
Date: Wed, 27 Oct 2021 12:54:22 +1100
Subject: [PATCH 02/21] git does not allow sub branches of branches

---
 renovate.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/renovate.json b/renovate.json
index 1fc1e286e77..70c2df57b8b 100644
--- a/renovate.json
+++ b/renovate.json
@@ -4,7 +4,7 @@
   "lockFileMaintenance": { "enabled": true },
   "separateMinorPatch": true,
   "prConcurrentLimit": 0,
-  "baseBranches": ["renovate"],
+  "baseBranches": ["renovating"],
   "packageRules": [
     {
       "packagePatterns": [

From db7f2311bb2ff8e1e70350cd0f087439b8404a8a Mon Sep 17 00:00:00 2001
From: Charles <cc.lee@live.com.au>
Date: Wed, 27 Oct 2021 13:02:16 +1100
Subject: [PATCH 03/21] Fix/relationship filter bug (#6837)

* replace hard-coded query param with field.path

* changeset
---
 .changeset/popular-emus-compare.md               |  5 +++++
 .../fields/types/relationship/views/index.tsx    | 16 ++++++++--------
 2 files changed, 13 insertions(+), 8 deletions(-)
 create mode 100644 .changeset/popular-emus-compare.md

diff --git a/.changeset/popular-emus-compare.md b/.changeset/popular-emus-compare.md
new file mode 100644
index 00000000000..16a98cdd06b
--- /dev/null
+++ b/.changeset/popular-emus-compare.md
@@ -0,0 +1,5 @@
+---
+'@keystone-next/keystone': patch
+---
+
+Fixed bug in LinkToRelatedItems button for double sided relationships
diff --git a/packages/keystone/src/fields/types/relationship/views/index.tsx b/packages/keystone/src/fields/types/relationship/views/index.tsx
index 4d1f437adc9..6efefc305e6 100644
--- a/packages/keystone/src/fields/types/relationship/views/index.tsx
+++ b/packages/keystone/src/fields/types/relationship/views/index.tsx
@@ -25,26 +25,26 @@ import { RelationshipSelect } from './RelationshipSelect';
 
 function LinkToRelatedItems({
   itemId,
-  isDoubleSided,
   value,
   list,
+  refFieldKey,
 }: {
   itemId: string | null;
-  isDoubleSided: boolean;
   value: FieldProps<typeof controller>['value'] & { kind: 'many' | 'one' };
   list: ListMeta;
+  refFieldKey?: string;
 }) {
   function constructQuery({
-    isDoubleSided,
+    refFieldKey,
     itemId,
     value,
   }: {
-    isDoubleSided?: boolean;
+    refFieldKey?: string;
     itemId: string | null;
     value: FieldProps<typeof controller>['value'] & { kind: 'many' | 'one' };
   }) {
-    if (isDoubleSided && itemId) {
-      return `!assignedTo_matches="${itemId}"`;
+    if (!!refFieldKey && itemId) {
+      return `!${refFieldKey}_matches="${itemId}"`;
     }
     return `!id_in="${(value?.value as { id: string; label: string }[])
       .slice(0, 100)
@@ -58,7 +58,7 @@ function LinkToRelatedItems({
   } as const;
 
   if (value.kind === 'many') {
-    const query = constructQuery({ isDoubleSided, value, itemId });
+    const query = constructQuery({ refFieldKey, value, itemId });
     return (
       <Button {...commonProps} as={Link} href={`/${list.path}?${query}`}>
         View related {list.plural}
@@ -240,7 +240,7 @@ export const Field = ({
                 : value.kind === 'one' && value.value) && (
                 <LinkToRelatedItems
                   itemId={value.id}
-                  isDoubleSided={!!field.refFieldKey}
+                  refFieldKey={field.refFieldKey}
                   list={foreignList}
                   value={value}
                 />

From cbb9df927a0f106aaa35d107961a405b0d08a751 Mon Sep 17 00:00:00 2001
From: Mitchell Hamilton <mitchell@hamil.town>
Date: Wed, 27 Oct 2021 13:18:23 +1000
Subject: [PATCH 04/21] Live reloading (#6797)

---
 .changeset/red-elephants-guess.md             |   5 +
 .changeset/small-ladybugs-greet.md            |   5 +
 .eslintignore                                 |   1 +
 .github/workflows/tests.yml                   |   9 +-
 .prettierignore                               |   1 +
 package.json                                  |   1 +
 packages/keystone/package.json                |   1 +
 .../admin-ui/next-config.ts                   |   6 +
 .../src/admin-ui/system/generateAdminUI.ts    | 111 ++++--
 .../keystone/src/admin-ui/templates/app.ts    |  26 +-
 .../keystone/src/admin-ui/templates/index.ts  |   6 +-
 packages/keystone/src/artifacts.ts            |  31 +-
 .../keystone/src/lib/core/prisma-schema.ts    |   3 +-
 packages/keystone/src/lib/createSystem.ts     |   2 +-
 packages/keystone/src/lib/migrations.ts       |  12 +-
 .../src/lib/server/createAdminUIMiddleware.ts |   6 +-
 .../src/lib/server/createExpressServer.ts     |  15 +-
 packages/keystone/src/scripts/build/build.ts  |   2 +-
 packages/keystone/src/scripts/run/dev.ts      | 326 +++++++++++++-----
 packages/keystone/src/scripts/run/start.ts    |  10 +-
 packages/keystone/src/testing.ts              |  15 +-
 tests/admin-ui-tests/filters.test.ts          |   4 +-
 tests/admin-ui-tests/init.test.ts             |   4 +-
 tests/admin-ui-tests/live-reloading.test.ts   | 158 +++++++++
 tests/admin-ui-tests/navigation.test.ts       |   4 +-
 tests/admin-ui-tests/package.json             |   1 +
 tests/admin-ui-tests/utils.ts                 |  82 +++--
 tests/examples-smoke-tests/auth.test.ts       |   4 +-
 tests/examples-smoke-tests/basic.test.ts      |   4 +-
 tests/examples-smoke-tests/blog.test.ts       |   4 +-
 .../custom-admin-ui-logo.test.ts              |   4 +-
 .../custom-admin-ui-navigation.test.ts        |   4 +-
 .../custom-admin-ui-pages.test.ts             |   4 +-
 .../custom-field-view.test.ts                 |   4 +-
 .../examples-smoke-tests/custom-field.test.ts |   4 +-
 .../default-values.test.ts                    |   4 +-
 .../document-field.test.ts                    |   4 +-
 .../ecommerce.test.disabled.ts                |   4 +-
 .../extend-graphql-schema.test.ts             |   4 +-
 tests/examples-smoke-tests/json.test.ts       |   4 +-
 tests/examples-smoke-tests/rest-api.test.ts   |   4 +-
 tests/examples-smoke-tests/roles.test.ts      |   4 +-
 .../examples-smoke-tests/task-manager.test.ts |   4 +-
 tests/examples-smoke-tests/testing.test.ts    |   4 +-
 tests/examples-smoke-tests/utils.ts           |  13 +
 .../virtual-field.test.ts                     |   4 +-
 tests/examples-smoke-tests/with-auth.test.ts  |   4 +-
 tests/test-projects/live-reloading/README.md  |   4 +
 .../test-projects/live-reloading/keystone.ts  |  11 +
 .../test-projects/live-reloading/package.json |  21 ++
 .../live-reloading/schema.graphql             | 201 +++++++++++
 .../live-reloading/schema.prisma              |  18 +
 .../schemas/changed-prisma-schema.ts          |  24 ++
 .../live-reloading/schemas/index.ts           |   1 +
 .../live-reloading/schemas/initial.ts         |  23 ++
 .../live-reloading/schemas/runtime-error.ts   |   4 +
 .../live-reloading/schemas/second.ts          |  31 ++
 .../live-reloading/schemas/syntax-error.js    |  23 ++
 yarn.lock                                     |   5 +
 59 files changed, 1080 insertions(+), 222 deletions(-)
 create mode 100644 .changeset/red-elephants-guess.md
 create mode 100644 .changeset/small-ladybugs-greet.md
 create mode 100644 tests/admin-ui-tests/live-reloading.test.ts
 create mode 100644 tests/test-projects/live-reloading/README.md
 create mode 100644 tests/test-projects/live-reloading/keystone.ts
 create mode 100644 tests/test-projects/live-reloading/package.json
 create mode 100644 tests/test-projects/live-reloading/schema.graphql
 create mode 100644 tests/test-projects/live-reloading/schema.prisma
 create mode 100644 tests/test-projects/live-reloading/schemas/changed-prisma-schema.ts
 create mode 100644 tests/test-projects/live-reloading/schemas/index.ts
 create mode 100644 tests/test-projects/live-reloading/schemas/initial.ts
 create mode 100644 tests/test-projects/live-reloading/schemas/runtime-error.ts
 create mode 100644 tests/test-projects/live-reloading/schemas/second.ts
 create mode 100644 tests/test-projects/live-reloading/schemas/syntax-error.js

diff --git a/.changeset/red-elephants-guess.md b/.changeset/red-elephants-guess.md
new file mode 100644
index 00000000000..699eb6e5fcd
--- /dev/null
+++ b/.changeset/red-elephants-guess.md
@@ -0,0 +1,5 @@
+---
+'@keystone-next/keystone': major
+---
+
+`createExpressServer` now returns `Promise<{ expressServer: Express; apolloServer: ApolloServer; }>` instead of `Promise<Express>` so that the apollo server can be stopped.
diff --git a/.changeset/small-ladybugs-greet.md b/.changeset/small-ladybugs-greet.md
new file mode 100644
index 00000000000..10ed844790b
--- /dev/null
+++ b/.changeset/small-ladybugs-greet.md
@@ -0,0 +1,5 @@
+---
+'@keystone-next/keystone': major
+---
+
+Added live reloading of your Keystone config to `keystone-next dev`
diff --git a/.eslintignore b/.eslintignore
index 2376479afd7..1704d803e92 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -3,3 +3,4 @@ coverage
 dist
 reports
 docs/public/assets/
+tests/test-projects/live-reloading/schemas/syntax-error.js
\ No newline at end of file
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index f386b4b2315..c13017c156a 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -247,7 +247,14 @@ jobs:
       DATABASE_URL: 'file:./test.db'
     strategy:
       matrix:
-        test: ['init.test.ts', 'filters.test.ts', 'list-view-crud.test.ts', 'navigation.test.ts']
+        test:
+          [
+            'init.test.ts',
+            'filters.test.ts',
+            'list-view-crud.test.ts',
+            'navigation.test.ts',
+            'live-reloading.test.ts',
+          ]
       fail-fast: false
     steps:
       - name: Checkout Repo
diff --git a/.prettierignore b/.prettierignore
index 023ecfd4978..66d02d4c6b1 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -9,3 +9,4 @@ coverage
 docs/public/assets/
 .keystone/tests
 prisma-utils/src/generated
+tests/test-projects/live-reloading/schemas/syntax-error.js
diff --git a/package.json b/package.json
index de5468a4b3d..13fe1fceb6a 100644
--- a/package.json
+++ b/package.json
@@ -57,6 +57,7 @@
     "@types/babel__core": "^7.1.16",
     "@types/jest": "^27.0.2",
     "@types/node-fetch": "^2.5.12",
+    "@types/normalize-path": "3.0.0",
     "@typescript-eslint/eslint-plugin": "^5.0.0",
     "@typescript-eslint/parser": "^5.0.0",
     "chalk-cli": "^5.0.0",
diff --git a/packages/keystone/package.json b/packages/keystone/package.json
index ee34832354c..271bd7668cd 100644
--- a/packages/keystone/package.json
+++ b/packages/keystone/package.json
@@ -105,6 +105,7 @@
     "micro": "^9.3.4",
     "next": "^11.1.0",
     "node-fetch": "^2.6.5",
+    "normalize-path": "^3.0.0",
     "object-hash": "^2.2.0",
     "p-limit": "^2.3.0",
     "pirates": "^4.0.1",
diff --git a/packages/keystone/src/___internal-do-not-use-will-break-in-patch/admin-ui/next-config.ts b/packages/keystone/src/___internal-do-not-use-will-break-in-patch/admin-ui/next-config.ts
index 5a8c4cc710b..cc359ec7454 100644
--- a/packages/keystone/src/___internal-do-not-use-will-break-in-patch/admin-ui/next-config.ts
+++ b/packages/keystone/src/___internal-do-not-use-will-break-in-patch/admin-ui/next-config.ts
@@ -24,6 +24,12 @@ export const config = withPreconstruct({
         /@keystone-next\/keystone(?!\/___internal-do-not-use-will-break-in-patch\/admin-ui\/id-field-view|\/fields\/types\/[^\/]+\/views)/,
         '.prisma/client',
       ];
+      // we need to set these to true so that when __dirname/__filename is used
+      // to resolve the location of field views, we will get a path that we can use
+      // rather than just the __dirname/__filename of the generated file.
+      // https://webpack.js.org/configuration/node/#node__filename
+      config.node.__dirname = true;
+      config.node.__filename = true;
     }
     return config;
   },
diff --git a/packages/keystone/src/admin-ui/system/generateAdminUI.ts b/packages/keystone/src/admin-ui/system/generateAdminUI.ts
index 73e14176b3e..a896a8aedff 100644
--- a/packages/keystone/src/admin-ui/system/generateAdminUI.ts
+++ b/packages/keystone/src/admin-ui/system/generateAdminUI.ts
@@ -4,6 +4,7 @@ import fs from 'fs-extra';
 import fastGlob from 'fast-glob';
 import resolve from 'resolve';
 import { GraphQLSchema } from 'graphql';
+import normalizePath from 'normalize-path';
 import type { KeystoneConfig, AdminMetaRootVal, AdminFileToWrite } from '../../types';
 import { writeAdminFiles } from '../templates';
 import { serializePathForImport } from '../utils/serializePathForImport';
@@ -33,7 +34,15 @@ export async function writeAdminFile(file: AdminFileToWrite, projectAdminPath: s
     // TODO: should we use copyFile or copy?
     await fs.copyFile(file.inputPath, outputFilename);
   }
-  if (file.mode === 'write') {
+  let content: undefined | string;
+  try {
+    content = await fs.readFile(outputFilename, 'utf8');
+  } catch (err: any) {
+    if (err.code !== 'ENOENT') {
+      throw err;
+    }
+  }
+  if (file.mode === 'write' && content !== file.src) {
     await fs.outputFile(outputFilename, file.src);
   }
   return Path.normalize(outputFilename);
@@ -43,24 +52,33 @@ export const generateAdminUI = async (
   config: KeystoneConfig,
   graphQLSchema: GraphQLSchema,
   adminMeta: AdminMetaRootVal,
-  projectAdminPath: string
+  projectAdminPath: string,
+  isLiveReload: boolean
 ) => {
-  const dir = await fs.readdir(projectAdminPath).catch(err => {
-    if (err.code === 'ENOENT') {
-      return [];
-    }
-    throw err;
-  });
+  // when we're not doing a live reload, we want to clear everything out except the .next directory (not the .next directory because it has caches)
+  // so that at least every so often, we'll clear out anything that the deleting we do during live reloads doesn't (should just be directories)
+  if (!isLiveReload) {
+    const dir = await fs.readdir(projectAdminPath).catch(err => {
+      if (err.code === 'ENOENT') {
+        return [];
+      }
+      throw err;
+    });
 
-  await Promise.all(
-    dir.map(x => {
-      if (x === '.next') return;
-      return fs.remove(Path.join(projectAdminPath, x));
-    })
-  );
+    await Promise.all(
+      dir.map(x => {
+        if (x === '.next') return;
+        return fs.remove(Path.join(projectAdminPath, x));
+      })
+    );
+  }
   const publicDirectory = Path.join(projectAdminPath, 'public');
 
   if (config.images || config.files) {
+    // when we're not doing a live reload, we've already done this with the deleting above
+    if (isLiveReload) {
+      await fs.remove(publicDirectory);
+    }
     await fs.mkdir(publicDirectory, { recursive: true });
   }
 
@@ -85,8 +103,8 @@ export const generateAdminUI = async (
   }
 
   // Write out the files configured by the user
-  const userPages = config.ui?.getAdditionalFiles?.map(x => x(config)) ?? [];
-  const userFilesToWrite = (await Promise.all(userPages)).flat();
+  const userFiles = config.ui?.getAdditionalFiles?.map(x => x(config)) ?? [];
+  const userFilesToWrite = (await Promise.all(userFiles)).flat();
   const savedFiles = await Promise.all(
     userFilesToWrite.map(file => writeAdminFile(file, projectAdminPath))
   );
@@ -94,29 +112,60 @@ export const generateAdminUI = async (
 
   // Write out the built-in admin UI files. Don't overwrite any user-defined pages.
   const configFileExists = getDoesAdminConfigExist();
-  const adminFiles = writeAdminFiles(
+  let adminFiles = writeAdminFiles(
     config,
     graphQLSchema,
     adminMeta,
     configFileExists,
-    projectAdminPath
-  );
-  await Promise.all(
-    adminFiles
-      .filter(x => !uniqueFiles.has(Path.normalize(Path.join(projectAdminPath, x.outputPath))))
-      .map(file => writeAdminFile(file, projectAdminPath))
+    projectAdminPath,
+    isLiveReload
   );
 
   // Add files to pages/ which point to any files which exist in admin/pages
   const userPagesDir = Path.join(process.cwd(), 'admin', 'pages');
-  const files = await fastGlob('**/*.{js,jsx,ts,tsx}', { cwd: userPagesDir });
+  const userPagesEntries = await fastGlob('**/*.{js,jsx,ts,tsx}', { cwd: userPagesDir });
+  for (const filename of userPagesEntries) {
+    const outputFilename = Path.join('pages', filename);
+    const path = Path.relative(
+      Path.dirname(Path.join(projectAdminPath, outputFilename)),
+      Path.join(userPagesDir, filename)
+    );
+    const importPath = serializePathForImport(path);
+    adminFiles.push({
+      mode: 'write',
+      outputPath: outputFilename,
+      src: `export { default } from ${importPath}`,
+    });
+  }
 
-  await Promise.all(
-    files.map(async filename => {
-      const outputFilename = Path.join(projectAdminPath, 'pages', filename);
-      const path = Path.relative(Path.dirname(outputFilename), Path.join(userPagesDir, filename));
-      const importPath = serializePathForImport(path);
-      await fs.outputFile(outputFilename, `export { default } from ${importPath}`);
-    })
+  adminFiles = adminFiles.filter(
+    x => !uniqueFiles.has(Path.normalize(Path.join(projectAdminPath, x.outputPath)))
   );
+
+  await Promise.all(adminFiles.map(file => writeAdminFile(file, projectAdminPath)));
+
+  // Because Next will re-compile things (or at least check things and log a bunch of stuff)
+  // if we delete pages and then re-create them, we want to avoid that when live reloading
+  // so we only delete things that shouldn't exist anymore
+  // this won't clear out empty directories, this is fine since:
+  // - they won't create pages in Admin UI which is really what this deleting is about avoiding
+  // - we'll remove them when the user restarts the process
+  if (isLiveReload) {
+    // fast-glob expects unix style paths/globs in ignore so we need to normalize to that
+    const ignore = adminFiles.map(x => normalizePath(x.outputPath));
+    ignore.push('.next');
+    ignore.push('next-env.d.ts');
+    ignore.push('public');
+    ignore.push('pages/api/__keystone_api_build.js');
+    for (const filename of uniqueFiles) {
+      ignore.push(normalizePath(filename));
+    }
+    const filesToDelete = await fastGlob(['**/*'], {
+      cwd: projectAdminPath,
+      ignore,
+      followSymbolicLinks: false,
+      absolute: true,
+    });
+    await Promise.all(filesToDelete.map(filepath => fs.remove(filepath)));
+  }
 };
diff --git a/packages/keystone/src/admin-ui/templates/app.ts b/packages/keystone/src/admin-ui/templates/app.ts
index 5167fa4da3f..9434642c355 100644
--- a/packages/keystone/src/admin-ui/templates/app.ts
+++ b/packages/keystone/src/admin-ui/templates/app.ts
@@ -20,7 +20,8 @@ export const appTemplate = (
   adminMetaRootVal: AdminMetaRootVal,
   graphQLSchema: GraphQLSchema,
   { configFileExists, projectAdminPath }: AppTemplateOptions,
-  apiPath: string
+  apiPath: string,
+  isLiveReload: boolean
 ) => {
   const result = executeSync({
     document: staticAdminMetaQuery,
@@ -34,9 +35,26 @@ export const appTemplate = (
   const adminMetaQueryResultHash = hashString(JSON.stringify(adminMeta));
 
   const allViews = adminMetaRootVal.views.map(views => {
-    const viewPath = Path.isAbsolute(views)
-      ? Path.relative(Path.join(projectAdminPath, 'pages'), views)
-      : views;
+    // during a live reload, we'll have paths from a webpack compilation which will make the paths
+    // that __dirname/__filename/require.resolve return relative to the webpack's "context" option
+    // which for Next, it's set to the directory of the Next project which is projectAdminPath here.
+    // so to get absolute paths, we need to resolve them relative to the projectAdminPath
+    // generally though, relative paths are problematic because
+    // we don't know where to resolve them from so we disallow them
+    // we're assuming that the relative paths we get
+    // of course, this isn't necessarily true but it's kinda the best we can do
+    // this means that if someone writes a relative path as a view during live reloading
+    // they'll get a more confusing error than they would get at startup
+    if (isLiveReload) {
+      views = Path.resolve(projectAdminPath, views);
+    } else if (!Path.isAbsolute(views)) {
+      throw new Error(
+        `Field views must be absolute paths, but ${JSON.stringify(
+          views
+        )} was provided. Use path.join(__dirname, './relative/path') or require.resolve('./relative/path') to get an absolute path.`
+      );
+    }
+    const viewPath = Path.relative(Path.join(projectAdminPath, 'pages'), views);
     return serializePathForImport(viewPath);
   });
   // -- TEMPLATE START
diff --git a/packages/keystone/src/admin-ui/templates/index.ts b/packages/keystone/src/admin-ui/templates/index.ts
index cc2c1039c28..311bcb96567 100644
--- a/packages/keystone/src/admin-ui/templates/index.ts
+++ b/packages/keystone/src/admin-ui/templates/index.ts
@@ -15,7 +15,8 @@ export const writeAdminFiles = (
   graphQLSchema: GraphQLSchema,
   adminMeta: AdminMetaRootVal,
   configFileExists: boolean,
-  projectAdminPath: string
+  projectAdminPath: string,
+  isLiveReload: boolean
 ): AdminFileToWrite[] => {
   if (
     config.experimental?.enableNextJsGraphqlApiEndpoint &&
@@ -38,7 +39,8 @@ export const writeAdminFiles = (
         adminMeta,
         graphQLSchema,
         { configFileExists, projectAdminPath },
-        config.graphql?.path || '/api/graphql'
+        config.graphql?.path || '/api/graphql',
+        isLiveReload
       ),
       outputPath: 'pages/_app.js',
     },
diff --git a/packages/keystone/src/artifacts.ts b/packages/keystone/src/artifacts.ts
index cb57a50c984..816aaafe86f 100644
--- a/packages/keystone/src/artifacts.ts
+++ b/packages/keystone/src/artifacts.ts
@@ -22,6 +22,15 @@ type CommittedArtifacts = {
   prisma: string;
 };
 
+export function getFormattedGraphQLSchema(schema: string) {
+  return format(
+    '# This file is automatically generated by Keystone, do not modify it manually.\n' +
+      '# Modify your Keystone config when you want to change this.\n\n' +
+      schema,
+    { parser: 'graphql' }
+  );
+}
+
 export async function getCommittedArtifacts(
   graphQLSchema: GraphQLSchema,
   config: KeystoneConfig
@@ -30,16 +39,10 @@ export async function getCommittedArtifacts(
   const prismaSchema = printPrismaSchema(
     lists,
     config.db.provider,
-    'node_modules/.prisma/client',
     config.db.prismaPreviewFeatures
   );
   return {
-    graphql: format(
-      '# This file is automatically generated by Keystone, do not modify it manually.\n' +
-        '# Modify your Keystone config when you want to change this.\n\n' +
-        printSchema(graphQLSchema),
-      { parser: 'graphql' }
-    ),
+    graphql: getFormattedGraphQLSchema(printSchema(graphQLSchema)),
     prisma: await formatSchema({
       schema: prismaSchema,
     }),
@@ -175,7 +178,7 @@ const nextGraphQLAPIDTS = `export const config: any;
 export default config;
 `;
 
-export async function generateNodeModulesArtifacts(
+export async function generateNodeModulesArtifactsWithoutPrismaClient(
   graphQLSchema: GraphQLSchema,
   config: KeystoneConfig,
   cwd: string
@@ -185,7 +188,6 @@ export async function generateNodeModulesArtifacts(
   const printedSchema = printSchema(graphQLSchema);
   const dotKeystoneDir = path.join(cwd, 'node_modules/.keystone');
   await Promise.all([
-    generatePrismaClient(cwd),
     fs.outputFile(
       path.join(dotKeystoneDir, 'types.d.ts'),
       printGeneratedTypes(printedSchema, graphQLSchema, lists)
@@ -209,6 +211,17 @@ export async function generateNodeModulesArtifacts(
   ]);
 }
 
+export async function generateNodeModulesArtifacts(
+  graphQLSchema: GraphQLSchema,
+  config: KeystoneConfig,
+  cwd: string
+) {
+  await Promise.all([
+    generatePrismaClient(cwd),
+    generateNodeModulesArtifactsWithoutPrismaClient(graphQLSchema, config, cwd),
+  ]);
+}
+
 async function generatePrismaClient(cwd: string) {
   const generator = await getGenerator({ schemaPath: getSchemaPaths(cwd).prisma });
   await generator.generate();
diff --git a/packages/keystone/src/lib/core/prisma-schema.ts b/packages/keystone/src/lib/core/prisma-schema.ts
index 2c7e7506d65..da43a150b7d 100644
--- a/packages/keystone/src/lib/core/prisma-schema.ts
+++ b/packages/keystone/src/lib/core/prisma-schema.ts
@@ -194,7 +194,6 @@ function assertDbFieldIsValidForIdField(
 export function printPrismaSchema(
   lists: ListsWithResolvedRelations,
   provider: DatabaseProvider,
-  clientDir: string,
   prismaPreviewFeatures: readonly string[] | undefined
 ) {
   let prismaFlags = '';
@@ -211,7 +210,7 @@ datasource ${provider} {
 
 generator client {
   provider = "prisma-client-js"
-  output = "${clientDir}"${prismaFlags}
+  output = "node_modules/.prisma/client"${prismaFlags}
   engineType = "binary"
 }
 \n`;
diff --git a/packages/keystone/src/lib/createSystem.ts b/packages/keystone/src/lib/createSystem.ts
index 7be2c85f392..4fc4e464f40 100644
--- a/packages/keystone/src/lib/createSystem.ts
+++ b/packages/keystone/src/lib/createSystem.ts
@@ -76,7 +76,7 @@ export function createSystem(config: KeystoneConfig) {
         // https://github.com/keystonejs/keystone/issues/5477
         // We explicitly send a SIGINT signal to the prisma child process on exit
         // to ensure that the process is cleaned up appropriately.
-        prismaClient._engine.child.kill('SIGINT');
+        prismaClient._engine.child?.kill('SIGINT');
       });
 
       const createContext = makeCreateContext({
diff --git a/packages/keystone/src/lib/migrations.ts b/packages/keystone/src/lib/migrations.ts
index 16dce4e7fa3..6f2473a48ac 100644
--- a/packages/keystone/src/lib/migrations.ts
+++ b/packages/keystone/src/lib/migrations.ts
@@ -25,8 +25,16 @@ function runMigrateWithDbUrl<T>(dbUrl: string, cb: () => T): T {
     process.env.PRISMA_HIDE_UPDATE_MESSAGE = '1';
     return cb();
   } finally {
-    process.env.DATABASE_URL = prevDBURLFromEnv;
-    process.env.PRISMA_HIDE_UPDATE_MESSAGE = prevHiddenUpdateMessage;
+    if (prevDBURLFromEnv === undefined) {
+      delete process.env.DATABASE_URL;
+    } else {
+      process.env.DATABASE_URL = prevDBURLFromEnv;
+    }
+    if (prevHiddenUpdateMessage === undefined) {
+      delete process.env.PRISMA_HIDE_UPDATE_MESSAGE;
+    } else {
+      process.env.PRISMA_HIDE_UPDATE_MESSAGE = prevHiddenUpdateMessage;
+    }
   }
 }
 
diff --git a/packages/keystone/src/lib/server/createAdminUIMiddleware.ts b/packages/keystone/src/lib/server/createAdminUIMiddleware.ts
index 5f5ff17504c..12530cf97b1 100644
--- a/packages/keystone/src/lib/server/createAdminUIMiddleware.ts
+++ b/packages/keystone/src/lib/server/createAdminUIMiddleware.ts
@@ -27,7 +27,11 @@ export const createAdminUIMiddleware = async (
   const publicPages = ui?.publicPages ?? [];
   return async (req: express.Request, res: express.Response) => {
     const { pathname } = url.parse(req.url);
-    if (pathname?.startsWith('/_next') || pathname === (graphql?.path || '/api/graphql')) {
+    if (
+      pathname?.startsWith('/_next') ||
+      pathname === (graphql?.path || '/api/graphql') ||
+      pathname === '/api/__keystone_api_build'
+    ) {
       handle(req, res);
       return;
     }
diff --git a/packages/keystone/src/lib/server/createExpressServer.ts b/packages/keystone/src/lib/server/createExpressServer.ts
index f7f5c9574ef..fbfa39bb3b3 100644
--- a/packages/keystone/src/lib/server/createExpressServer.ts
+++ b/packages/keystone/src/lib/server/createExpressServer.ts
@@ -48,6 +48,7 @@ const addApolloServer = async ({
     path: config.graphql?.path || '/api/graphql',
     cors: false,
   });
+  return apolloServer;
 };
 
 export const createExpressServer = async (
@@ -55,7 +56,7 @@ export const createExpressServer = async (
   graphQLSchema: GraphQLSchema,
   createContext: CreateContext
 ) => {
-  const server = express();
+  const expressServer = express();
 
   if (config.server?.cors) {
     // Setting config.server.cors = true will provide backwards compatible defaults
@@ -64,10 +65,10 @@ export const createExpressServer = async (
       typeof config.server.cors === 'boolean'
         ? { origin: true, credentials: true }
         : config.server.cors;
-    server.use(cors(corsConfig));
+    expressServer.use(cors(corsConfig));
   }
 
-  addHealthCheck({ config, server });
+  addHealthCheck({ config, server: expressServer });
 
   if (config.server?.extendExpressApp) {
     const createRequestContext = async (req: IncomingMessage, res: ServerResponse) =>
@@ -78,11 +79,11 @@ export const createExpressServer = async (
         req,
       });
 
-    config.server?.extendExpressApp(server, createRequestContext);
+    config.server?.extendExpressApp(expressServer, createRequestContext);
   }
 
-  await addApolloServer({
-    server,
+  const apolloServer = await addApolloServer({
+    server: expressServer,
     config,
     graphQLSchema,
     createContext,
@@ -90,5 +91,5 @@ export const createExpressServer = async (
     graphqlConfig: config.graphql,
   });
 
-  return server;
+  return { expressServer, apolloServer };
 };
diff --git a/packages/keystone/src/scripts/build/build.ts b/packages/keystone/src/scripts/build/build.ts
index 5e8aa637f47..9640e1086a9 100644
--- a/packages/keystone/src/scripts/build/build.ts
+++ b/packages/keystone/src/scripts/build/build.ts
@@ -70,7 +70,7 @@ export async function build(cwd: string) {
     console.log('✨ Skipping Admin UI code generation');
   } else {
     console.log('✨ Generating Admin UI code');
-    await generateAdminUI(config, graphQLSchema, adminMeta, getAdminPath(cwd));
+    await generateAdminUI(config, graphQLSchema, adminMeta, getAdminPath(cwd), false);
   }
 
   console.log('✨ Generating Keystone config code');
diff --git a/packages/keystone/src/scripts/run/dev.ts b/packages/keystone/src/scripts/run/dev.ts
index b8f2e1e58dd..3246fc9fc99 100644
--- a/packages/keystone/src/scripts/run/dev.ts
+++ b/packages/keystone/src/scripts/run/dev.ts
@@ -1,6 +1,10 @@
 import path from 'path';
 import url from 'url';
+import util from 'util';
 import express from 'express';
+import { GraphQLSchema, printSchema } from 'graphql';
+import fs from 'fs-extra';
+import chalk from 'chalk';
 import { generateAdminUI } from '../../admin-ui/system';
 import { devMigrations, pushPrismaSchemaToDatabase } from '../../lib/migrations';
 import { createSystem } from '../../lib/createSystem';
@@ -12,13 +16,16 @@ import { createAdminUIMiddleware } from '../../lib/server/createAdminUIMiddlewar
 import {
   generateCommittedArtifacts,
   generateNodeModulesArtifacts,
+  generateNodeModulesArtifactsWithoutPrismaClient,
+  getFormattedGraphQLSchema,
   getSchemaPaths,
   requirePrismaClient,
 } from '../../artifacts';
 import { getAdminPath, getConfigPath } from '../utils';
-
-type ExpressServer = null | ReturnType<typeof express>;
-type AdminUIMiddleware = null | ((req: express.Request, res: express.Response) => Promise<void>);
+import { AdminMetaRootVal, CreateContext, KeystoneConfig } from '../../types';
+import { serializePathForImport } from '../../admin-ui/utils/serializePathForImport';
+import { initialiseLists } from '../../lib/core/types-for-lists';
+import { printPrismaSchema } from '../../lib/core/prisma-schema';
 
 const devLoadingHTMLFilepath = path.join(
   path.dirname(require.resolve('@keystone-next/keystone/package.json')),
@@ -26,75 +33,160 @@ const devLoadingHTMLFilepath = path.join(
   'dev-loading.html'
 );
 
+const wait = (ms: number) => new Promise(resolve => setTimeout(resolve, ms));
+
 export const dev = async (cwd: string, shouldDropDatabase: boolean) => {
   console.log('✨ Starting Keystone');
 
   const app = express();
-  let expressServer: ExpressServer = null;
-  let adminUIMiddleware: AdminUIMiddleware = null;
-  const ready = () => !!(expressServer && adminUIMiddleware);
+  let expressServer: express.Express | null = null;
+  let hasAddedAdminUIMiddleware = false;
 
   let disconnect: null | (() => Promise<void>) = null;
 
+  // note that because we don't catch this throwing, if this fails it'll crash the process
+  // so that means if
+  // - you have an error in your config on startup -> will fail to start and you have to start the process manually after fixing the problem
+  // - you have an error in your config after startup -> will keep the last working version until importing the config succeeds
+  // also, if you're thinking "why not always use the Next api route to get the config"?
+  // this will get the GraphQL API up earlier
   const config = initConfig(requireSource(getConfigPath(cwd)).default);
 
-  const initKeystone = async () => {
-    const { graphQLSchema, adminMeta, getKeystone } = createSystem(config);
-
-    // Generate the Artifacts
-    console.log('✨ Generating GraphQL and Prisma schemas');
-    const prismaSchema = (await generateCommittedArtifacts(graphQLSchema, config, cwd)).prisma;
-    let keystonePromise = generateNodeModulesArtifacts(graphQLSchema, config, cwd).then(() => {
-      const prismaClient = requirePrismaClient(cwd);
-      return getKeystone(prismaClient);
-    });
+  const isReady = () =>
+    expressServer !== null && (hasAddedAdminUIMiddleware || config.ui?.isDisabled === true);
 
-    let migrationPromise: Promise<void>;
-
-    // Set up the Database
-    if (config.db.useMigrations) {
-      migrationPromise = devMigrations(
-        config.db.url,
-        prismaSchema,
-        getSchemaPaths(cwd).prisma,
-        shouldDropDatabase
-      );
-    } else {
-      migrationPromise = pushPrismaSchemaToDatabase(
-        config.db.url,
-        prismaSchema,
-        getSchemaPaths(cwd).prisma,
-        shouldDropDatabase
-      );
+  const initKeystone = async () => {
+    await fs.remove(getAdminPath(cwd));
+    const p = serializePathForImport(
+      path.relative(path.join(getAdminPath(cwd), 'pages', 'api'), `${cwd}/keystone`)
+    );
+    const { adminMeta, graphQLSchema, createContext, prismaSchema, apolloServer, ...rest } =
+      await setupInitialKeystone(config, cwd, shouldDropDatabase);
+    const prismaClient = createContext().prisma;
+    ({ disconnect, expressServer } = rest);
+    // if you've disabled the Admin UI, sorry, no live reloading
+    // the chance that someone is actually using this is probably quite low
+    // and starting Next in tests where we don't care about it would slow things down quite a bit
+    if (config.ui?.isDisabled) {
+      initKeystonePromiseResolve();
+      return;
     }
+    const adminUIMiddleware = await initAdminUI(
+      config,
+      graphQLSchema,
+      adminMeta,
+      cwd,
+      createContext
+    );
+    expressServer.use(adminUIMiddleware);
+    hasAddedAdminUIMiddleware = true;
+    initKeystonePromiseResolve();
+
+    // this exports a function which dynamically requires the config rather than directly importing it.
+    // this allows us to control exactly _when_ the gets evaluated so that we can handle errors ourselves.
+    // note this is intentionally using CommonJS and not ESM because by doing a dynamic import, webpack
+    // will generate a separate chunk for that whereas a require will be in the same bundle but the execution can still be delayed.
+    // dynamic importing didn't work on windows because it couldn't get the path to require the chunk for some reason
+    await fs.outputFile(
+      `${getAdminPath(cwd)}/pages/api/__keystone_api_build.js`,
+      `exports.getConfig = () => require(${p}).default;
+const x = Math.random();
+exports.default = function (req, res) { return res.send(x.toString()) }
+`
+    );
+    let lastVersion = '';
+    let lastError = undefined;
+    const originalPrismaSchema = printPrismaSchema(
+      initialiseLists(config.lists, config.db.provider),
+      config.db.provider,
+      config.db.prismaPreviewFeatures
+    );
+    let lastPrintedGraphQLSchema = printSchema(graphQLSchema);
+    let lastApolloServer = apolloServer;
+
+    while (true) {
+      await wait(500);
+      try {
+        // this fetching essentially does two things:
+        // - keeps the api route built, if we don't fetch it, Next will stop compiling it
+        // - returns a random number which when it changes indicates that the config _might_ have changed
+        //   note that it can go off randomly so the version changing doesn't necessarily
+        //   mean that the config has changed, Next might have just reloaded for some random reason
+        //   so we shouldn't log something like "hey, we reloaded your config"
+        //   because it would go off at times when the user didn't change their config
 
-    const [keystone] = await Promise.all([keystonePromise, migrationPromise]);
-    const { createContext } = keystone;
-
-    // Connect to the Database
-    console.log('✨ Connecting to the database');
-    await keystone.connect();
-    disconnect = () => keystone.disconnect();
-
-    // Set up the Express Server
-    console.log('✨ Creating server');
-    expressServer = await createExpressServer(config, graphQLSchema, createContext);
-    console.log(`✅ GraphQL API ready`);
-
-    // Initialise the Admin UI
-    if (!config.ui?.isDisabled) {
-      console.log('✨ Generating Admin UI code');
-      await generateAdminUI(config, graphQLSchema, adminMeta, getAdminPath(cwd));
-
-      console.log('✨ Preparing Admin UI app');
-      adminUIMiddleware = await createAdminUIMiddleware(
-        config,
-        createContext,
-        true,
-        getAdminPath(cwd)
-      );
-      expressServer.use(adminUIMiddleware);
-      console.log(`✅ Admin UI ready`);
+        const version = await fetch(`http://localhost:${port}/api/__keystone_api_build`).then(x =>
+          x.text()
+        );
+        if (lastVersion !== version) {
+          lastVersion = version;
+          const resolved = require.resolve(
+            `${getAdminPath(cwd)}/.next/server/pages/api/__keystone_api_build`
+          );
+          delete require.cache[resolved];
+          const newConfig = initConfig(require(resolved).getConfig());
+          const newPrismaSchema = printPrismaSchema(
+            initialiseLists(newConfig.lists, newConfig.db.provider),
+            newConfig.db.provider,
+            newConfig.db.prismaPreviewFeatures
+          );
+          if (originalPrismaSchema !== newPrismaSchema) {
+            console.log('Your prisma schema has changed, please restart Keystone');
+            process.exit(1);
+          }
+
+          // we only need to test for the things which influence the prisma client creation
+          // and aren't written into the prisma schema since we check whether the prisma schema has changed above
+          if (
+            newConfig.db.enableLogging !== config.db.enableLogging ||
+            newConfig.db.url !== config.db.url ||
+            newConfig.db.useMigrations !== config.db.useMigrations
+          ) {
+            console.log('Your db config has changed, please restart Keystone');
+            process.exit(1);
+          }
+          const { graphQLSchema, getKeystone, adminMeta } = createSystem(newConfig);
+          // we're not using generateCommittedArtifacts or any of the similar functions
+          // because we will never need to write a new prisma schema here
+          // and formatting the prisma schema leaves some listeners on the process
+          // which means you get a "there's probably a memory leak" warning from node
+          const newPrintedGraphQLSchema = printSchema(graphQLSchema);
+          if (newPrintedGraphQLSchema !== lastPrintedGraphQLSchema) {
+            await fs.writeFile(
+              getSchemaPaths(cwd).graphql,
+              getFormattedGraphQLSchema(newPrintedGraphQLSchema)
+            );
+            lastPrintedGraphQLSchema = newPrintedGraphQLSchema;
+          }
+
+          await generateNodeModulesArtifactsWithoutPrismaClient(graphQLSchema, newConfig, cwd);
+          await generateAdminUI(newConfig, graphQLSchema, adminMeta, getAdminPath(cwd), true);
+          const keystone = getKeystone(function fakePrismaClientClass() {
+            return prismaClient;
+          });
+          const servers = await createExpressServer(
+            newConfig,
+            graphQLSchema,
+            keystone.createContext
+          );
+
+          servers.expressServer.use(adminUIMiddleware);
+          expressServer = servers.expressServer;
+          let prevApolloServer = lastApolloServer;
+          lastApolloServer = servers.apolloServer;
+          await prevApolloServer.stop();
+          lastError = undefined;
+        }
+      } catch (err) {
+        // since Next will sometimes randomly refresh the api route even though it hasn't changed
+        // we want to avoid showing the same error again
+        const printed = util.inspect(err);
+        if (printed !== lastError) {
+          console.log('🚨', chalk.red('There was an error loading your Keystone config'));
+          console.log(printed);
+          lastError = printed;
+        }
+      }
     }
   };
 
@@ -115,12 +207,14 @@ export const dev = async (cwd: string, shouldDropDatabase: boolean) => {
 
   // Serve the dev status page for the Admin UI
   app.use('/__keystone_dev_status', (req, res) => {
-    res.json({ ready: ready() ? true : false });
+    res.json({ ready: isReady() ? true : false });
   });
   // Pass the request the express server, or serve the loading page
   app.use((req, res, next) => {
     // If both the express server and Admin UI Middleware are ready, we're go!
-    if (expressServer && adminUIMiddleware) return expressServer(req, res, next);
+    if (expressServer && (hasAddedAdminUIMiddleware || config.ui?.isDisabled === true)) {
+      return expressServer(req, res, next);
+    }
     // Otherwise, we may be able to serve the GraphQL API
     const { pathname } = url.parse(req.url);
     if (expressServer && pathname === (config.graphql?.path || '/api/graphql')) {
@@ -148,26 +242,22 @@ export const dev = async (cwd: string, shouldDropDatabase: boolean) => {
     );
     // Don't start initialising Keystone until the dev server is ready,
     // otherwise it slows down the first response significantly
-    initKeystone()
-      .then(() => {
-        initKeystonePromiseResolve();
-      })
-      .catch(err => {
-        server.close(async closeErr => {
-          if (closeErr) {
-            console.log('There was an error while closing the server');
-            console.log(closeErr);
-          }
-          try {
-            await disconnect?.();
-          } catch (err) {
-            console.log('There was an error while disconnecting from the database');
-            console.log(err);
-          }
+    initKeystone().catch(err => {
+      server.close(async closeErr => {
+        if (closeErr) {
+          console.log('There was an error while closing the server');
+          console.log(closeErr);
+        }
+        try {
+          await disconnect?.();
+        } catch (err) {
+          console.log('There was an error while disconnecting from the database');
+          console.log(err);
+        }
 
-          initKeystonePromiseReject(err);
-        });
+        initKeystonePromiseReject(err);
       });
+    });
   });
 
   await initKeystonePromise;
@@ -193,3 +283,79 @@ export const dev = async (cwd: string, shouldDropDatabase: boolean) => {
       });
     });
 };
+
+async function setupInitialKeystone(
+  config: KeystoneConfig,
+  cwd: string,
+  shouldDropDatabase: boolean
+) {
+  const { graphQLSchema, adminMeta, getKeystone } = createSystem(config);
+
+  // Generate the Artifacts
+  console.log('✨ Generating GraphQL and Prisma schemas');
+  const prismaSchema = (await generateCommittedArtifacts(graphQLSchema, config, cwd)).prisma;
+  let keystonePromise = generateNodeModulesArtifacts(graphQLSchema, config, cwd).then(() => {
+    const prismaClient = requirePrismaClient(cwd);
+    return getKeystone(prismaClient);
+  });
+
+  let migrationPromise: Promise<void>;
+
+  // Set up the Database
+  if (config.db.useMigrations) {
+    migrationPromise = devMigrations(
+      config.db.url,
+      prismaSchema,
+      getSchemaPaths(cwd).prisma,
+      shouldDropDatabase
+    );
+  } else {
+    migrationPromise = pushPrismaSchemaToDatabase(
+      config.db.url,
+      prismaSchema,
+      getSchemaPaths(cwd).prisma,
+      shouldDropDatabase
+    );
+  }
+
+  const [keystone] = await Promise.all([keystonePromise, migrationPromise]);
+  const { createContext } = keystone;
+
+  // Connect to the Database
+  console.log('✨ Connecting to the database');
+  await keystone.connect();
+
+  // Set up the Express Server
+  console.log('✨ Creating server');
+  const { apolloServer, expressServer } = await createExpressServer(
+    config,
+    graphQLSchema,
+    createContext
+  );
+  console.log(`✅ GraphQL API ready`);
+  return {
+    adminMeta,
+    disconnect: () => keystone.disconnect(),
+    expressServer,
+    apolloServer,
+    graphQLSchema,
+    createContext,
+    prismaSchema,
+  };
+}
+
+async function initAdminUI(
+  config: KeystoneConfig,
+  graphQLSchema: GraphQLSchema,
+  adminMeta: AdminMetaRootVal,
+  cwd: string,
+  createContext: CreateContext
+) {
+  console.log('✨ Generating Admin UI code');
+  await generateAdminUI(config, graphQLSchema, adminMeta, getAdminPath(cwd), false);
+
+  console.log('✨ Preparing Admin UI app');
+  const middleware = await createAdminUIMiddleware(config, createContext, true, getAdminPath(cwd));
+  console.log(`✅ Admin UI ready`);
+  return middleware;
+}
diff --git a/packages/keystone/src/scripts/run/start.ts b/packages/keystone/src/scripts/run/start.ts
index 3811d7c9165..e5e8641b0df 100644
--- a/packages/keystone/src/scripts/run/start.ts
+++ b/packages/keystone/src/scripts/run/start.ts
@@ -28,18 +28,22 @@ export const start = async (cwd: string) => {
   await keystone.connect();
 
   console.log('✨ Creating server');
-  const server = await createExpressServer(config, graphQLSchema, keystone.createContext);
+  const { expressServer } = await createExpressServer(
+    config,
+    graphQLSchema,
+    keystone.createContext
+  );
   console.log(`✅ GraphQL API ready`);
   if (!config.ui?.isDisabled) {
     console.log('✨ Preparing Admin UI Next.js app');
-    server.use(
+    expressServer.use(
       await createAdminUIMiddleware(config, keystone.createContext, false, getAdminPath(cwd))
     );
     console.log(`✅ Admin UI ready`);
   }
 
   const port = config.server?.port || process.env.PORT || 3000;
-  server.listen(port, (err?: any) => {
+  expressServer.listen(port, (err?: any) => {
     if (err) throw err;
     console.log(`⭐️ Server Ready on http://localhost:${port}`);
   });
diff --git a/packages/keystone/src/testing.ts b/packages/keystone/src/testing.ts
index 7384c3c4b44..551a8a8ab0d 100644
--- a/packages/keystone/src/testing.ts
+++ b/packages/keystone/src/testing.ts
@@ -65,8 +65,11 @@ export async function setupTestEnv({
 
   const { connect, disconnect, createContext } = getKeystone(requirePrismaClient(artifactPath));
 
-  // (config, graphQLSchema, createContext, dev, projectAdminPath, isVerbose)
-  const app = await createExpressServer(config, graphQLSchema, createContext);
+  const { expressServer: app, apolloServer } = await createExpressServer(
+    config,
+    graphQLSchema,
+    createContext
+  );
 
   const graphQLRequest: GraphQLRequest = ({ query, variables = undefined, operationName }) =>
     supertest(app)
@@ -74,7 +77,13 @@ export async function setupTestEnv({
       .send({ query, variables, operationName })
       .set('Accept', 'application/json');
 
-  return { connect, disconnect, testArgs: { context: createContext(), graphQLRequest, app } };
+  return {
+    connect,
+    disconnect: async () => {
+      await Promise.all([disconnect(), apolloServer.stop()]);
+    },
+    testArgs: { context: createContext(), graphQLRequest, app },
+  };
 }
 
 export function setupTestRunner({ config }: { config: KeystoneConfig }) {
diff --git a/tests/admin-ui-tests/filters.test.ts b/tests/admin-ui-tests/filters.test.ts
index b7550f39ff9..15d17b3d32e 100644
--- a/tests/admin-ui-tests/filters.test.ts
+++ b/tests/admin-ui-tests/filters.test.ts
@@ -1,5 +1,5 @@
 import { Browser, Page, BrowserContext } from 'playwright';
-import { adminUITests, deleteAllData, generateDataArray, makeGqlRequest } from './utils';
+import { adminUITests, deleteAllData, generateDataArray, loadIndex, makeGqlRequest } from './utils';
 
 adminUITests('./tests/test-projects/basic', browserType => {
   let browser: Browser = undefined as any;
@@ -10,7 +10,7 @@ adminUITests('./tests/test-projects/basic', browserType => {
     browser = await browserType.launch();
     context = await browser.newContext();
     page = await browser.newPage();
-    await page.goto('http://localhost:3000');
+    await loadIndex(page);
   });
 
   describe('relationship filters', () => {
diff --git a/tests/admin-ui-tests/init.test.ts b/tests/admin-ui-tests/init.test.ts
index 3774d43a4d1..64d8300e5af 100644
--- a/tests/admin-ui-tests/init.test.ts
+++ b/tests/admin-ui-tests/init.test.ts
@@ -1,5 +1,5 @@
 import { Browser, Page } from 'playwright';
-import { adminUITests, deleteAllData, generateDataArray, makeGqlRequest } from './utils';
+import { adminUITests, deleteAllData, generateDataArray, loadIndex, makeGqlRequest } from './utils';
 
 adminUITests('./tests/test-projects/basic', browserType => {
   let browser: Browser = undefined as any;
@@ -8,7 +8,7 @@ adminUITests('./tests/test-projects/basic', browserType => {
   beforeAll(async () => {
     browser = await browserType.launch();
     page = await browser.newPage();
-    await page.goto('http://localhost:3000');
+    await loadIndex(page);
   });
   test('Task List card should be visible', async () => {
     await page.waitForSelector('h3:has-text("Task")');
diff --git a/tests/admin-ui-tests/live-reloading.test.ts b/tests/admin-ui-tests/live-reloading.test.ts
new file mode 100644
index 00000000000..79e032b9015
--- /dev/null
+++ b/tests/admin-ui-tests/live-reloading.test.ts
@@ -0,0 +1,158 @@
+import path from 'path';
+import fs from 'fs/promises';
+import { Browser, Page, chromium } from 'playwright';
+import { parse, print } from 'graphql';
+import { ExecaChildProcess } from 'execa';
+import { generalStartKeystone, loadIndex, makeGqlRequest, promiseSignal } from './utils';
+
+const gql = ([content]: TemplateStringsArray) => content;
+
+const testProjectPath = path.join(__dirname, '..', 'test-projects', 'live-reloading');
+
+async function replaceSchema(
+  schema: 'changed-prisma-schema' | 'initial' | 'runtime-error' | 'second' | 'syntax-error'
+) {
+  await fs.writeFile(
+    path.join(testProjectPath, 'schemas/index.ts'),
+    `export * from './${schema}';\n`
+  );
+}
+
+const wait = (ms: number) => new Promise(resolve => setTimeout(resolve, ms));
+
+let exit = async () => {};
+let process: ExecaChildProcess = undefined as any;
+let page: Page = undefined as any;
+let browser: Browser = undefined as any;
+
+test('start keystone', async () => {
+  // just in case a previous failing test run messed things up, let's reset it
+  await replaceSchema('initial');
+  ({ exit, process } = await generalStartKeystone(testProjectPath, 'dev'));
+  browser = await chromium.launch();
+  page = await browser.newPage();
+
+  await loadIndex(page);
+});
+
+test('Creating an item with the GraphQL API and navigating to the item page for it', async () => {
+  const {
+    createSomething: { id },
+  } = await makeGqlRequest(gql`
+    mutation {
+      createSomething(data: { text: "blah" }) {
+        id
+      }
+    }
+  `);
+
+  await page.goto(`http://localhost:3000/somethings/${id}`);
+  await page.waitForSelector('label:has-text("Text")');
+
+  const element = await page.waitForSelector(
+    'label:has-text("Initial Label For Text") >> .. >> input'
+  );
+  const value = await element.inputValue();
+  expect(value).toBe('blah');
+});
+
+test('changing the label of a field updates in the Admin UI', async () => {
+  await replaceSchema('second');
+
+  const element = await page.waitForSelector(
+    'label:has-text("Very Important Text") >> .. >> input'
+  );
+  const value = await element.inputValue();
+  expect(value).toBe('blah');
+});
+
+test('adding a virtual field', async () => {
+  const element = await page.waitForSelector('label:has-text("Virtual") >> ..');
+  const value = await element.textContent();
+  expect(value).toBe('Virtualblah');
+});
+
+test('the generated schema includes schema updates', async () => {
+  // we want to make sure the field that we added worked
+  // and the change we made to the have worked
+  const schema = await fs.readFile(path.join(testProjectPath, 'schema.graphql'), 'utf8');
+  const parsed = parse(schema);
+  const objectTypes = parsed.definitions.filter(
+    x =>
+      x.kind === 'ObjectTypeDefinition' &&
+      (x.name.value === 'Query' || x.name.value === 'Something')
+  );
+  expect(objectTypes.map(x => print(x)).join('\n\n')).toMatchInlineSnapshot(`
+        "type Query {
+          someNumber: Int!
+          somethings(where: SomethingWhereInput! = {}, orderBy: [SomethingOrderByInput!]! = [], take: Int, skip: Int! = 0): [Something!]
+          something(where: SomethingWhereUniqueInput!): Something
+          somethingsCount(where: SomethingWhereInput! = {}): Int
+          keystone: KeystoneMeta!
+        }
+
+        type Something {
+          id: ID!
+          text: String
+          virtual: String
+        }"
+      `);
+});
+
+test("a syntax error is shown and doesn't crash the process", async () => {
+  await replaceSchema('syntax-error');
+  await expectContentInStdio(process, 'error - ../../schemas/syntax-error.js:4:6');
+});
+
+test("a runtime error is shown and doesn't crash the process", async () => {
+  await replaceSchema('runtime-error');
+  await expectContentInStdio(process, 'ReferenceError: doesNotExist is not defined');
+});
+
+test('errors can be recovered from', async () => {
+  await replaceSchema('initial');
+
+  const element = await page.waitForSelector(
+    'label:has-text("Initial Label For Text") >> .. >> input'
+  );
+  const value = await element.inputValue();
+  expect(value).toBe('blah');
+});
+
+test('changing the prisma schema crashes the process', async () => {
+  await replaceSchema('changed-prisma-schema');
+  await expectContentInStdio(process, 'Your prisma schema has changed, please restart Keystone');
+  // the promise will reject when it exits with a non-zero exit code which is what we're expecting here
+  await process.catch(() => {});
+  expect(process.exitCode).toBe(1);
+});
+
+afterAll(async () => {
+  await Promise.all([replaceSchema('initial'), exit(), browser.close()]);
+});
+
+async function expectContentInStdio(process: ExecaChildProcess, content: string) {
+  let promise = promiseSignal();
+  const listener = (chunk: any) => {
+    const stringified: string = chunk.toString('utf8');
+    if (stringified.includes(content)) {
+      console.log('found content');
+      promise.resolve();
+    } else {
+      console.log('did not find content, found:', stringified);
+    }
+  };
+  process.stdout!.on('data', listener);
+  process.stderr!.on('data', listener);
+  try {
+    await Promise.race([
+      promise,
+      wait(10000).then(() => {
+        throw new Error(`timed out when waiting for ${content}`);
+      }),
+    ]);
+  } finally {
+    process.stdout!.off('data', listener);
+    process.stderr!.off('data', listener);
+  }
+}
diff --git a/tests/admin-ui-tests/navigation.test.ts b/tests/admin-ui-tests/navigation.test.ts
index 689c8f13897..a717dba3075 100644
--- a/tests/admin-ui-tests/navigation.test.ts
+++ b/tests/admin-ui-tests/navigation.test.ts
@@ -1,5 +1,5 @@
 import { Browser, Page } from 'playwright';
-import { adminUITests, makeGqlRequest } from './utils';
+import { adminUITests, loadIndex, makeGqlRequest } from './utils';
 
 adminUITests('./tests/test-projects/basic', browserType => {
   let browser: Browser = undefined as any;
@@ -8,7 +8,7 @@ adminUITests('./tests/test-projects/basic', browserType => {
   beforeAll(async () => {
     browser = await browserType.launch();
     page = await browser.newPage();
-    await page.goto('http://localhost:3000');
+    await loadIndex(page);
   });
   test('Nav contains a Dashboard route by default', async () => {
     await page.waitForSelector('nav a:has-text("Dashboard")');
diff --git a/tests/admin-ui-tests/package.json b/tests/admin-ui-tests/package.json
index 39337263186..a316c4c97f9 100644
--- a/tests/admin-ui-tests/package.json
+++ b/tests/admin-ui-tests/package.json
@@ -15,6 +15,7 @@
     "@keystone-next/keystone": "*",
     "execa": "^5.1.1",
     "express": "^4.17.1",
+    "graphql": "^15.6.1",
     "playwright": "^1.15.2",
     "treekill": "^1.0.0"
   },
diff --git a/tests/admin-ui-tests/utils.ts b/tests/admin-ui-tests/utils.ts
index 95945772952..20db5f21740 100644
--- a/tests/admin-ui-tests/utils.ts
+++ b/tests/admin-ui-tests/utils.ts
@@ -7,12 +7,25 @@ import _treeKill from 'tree-kill';
 import * as playwright from 'playwright';
 import dotenv from 'dotenv';
 
+export async function loadIndex(page: playwright.Page) {
+  await page.goto('http://localhost:3000');
+  try {
+    // sometimes Next will fail to load the page the first time
+    // this is probably because Keystone is fetching the API route to compile Keystone
+    // while we're fetching an Admin UI page
+    // and Next doesn't handle fetching two pages at the same time well
+    await page.waitForSelector(':has-text("Dashboard")', { timeout: 2000 });
+  } catch {
+    await page.goto('http://localhost:3000');
+  }
+}
+
 const treeKill = promisify(_treeKill);
 
 // this'll take a while
 jest.setTimeout(10000000);
 
-const promiseSignal = (): Promise<void> & { resolve: () => void } => {
+export const promiseSignal = (): Promise<void> & { resolve: () => void } => {
   let resolve;
   let promise = new Promise<void>(_resolve => {
     resolve = _resolve;
@@ -86,36 +99,7 @@ export const adminUITests = (
     });
 
     async function startKeystone(command: 'start' | 'dev') {
-      if (!fs.existsSync(projectDir)) {
-        throw new Error(`No such file or directory ${projectDir}`);
-      }
-
-      let keystoneProcess = execa('yarn', ['keystone-next', command], {
-        cwd: projectDir,
-        env: process.env,
-      });
-
-      let adminUIReady = promiseSignal();
-      let listener = (chunk: any) => {
-        let stringified = chunk.toString('utf8');
-        if (process.env.VERBOSE) {
-          console.log(stringified);
-        }
-        if (stringified.includes('Admin UI ready')) {
-          adminUIReady.resolve();
-        }
-      };
-      keystoneProcess.stdout!.on('data', listener);
-      keystoneProcess.stderr!.on('data', listener);
-
-      cleanupKeystoneProcess = async () => {
-        keystoneProcess.stdout!.off('data', listener);
-        keystoneProcess.stderr!.off('data', listener);
-        // childProcess.kill will only kill the direct child process
-        // so we use tree-kill to kill the process and it's children
-        await treeKill(keystoneProcess.pid!);
-      };
-      await adminUIReady;
+      cleanupKeystoneProcess = (await generalStartKeystone(projectDir, command)).exit;
     }
 
     if (mode === 'dev') {
@@ -160,3 +144,39 @@ export const adminUITests = (
     });
   });
 };
+
+export async function generalStartKeystone(projectDir: string, command: 'start' | 'dev') {
+  if (!fs.existsSync(projectDir)) {
+    throw new Error(`No such file or directory ${projectDir}`);
+  }
+
+  let keystoneProcess = execa('yarn', ['keystone-next', command], {
+    cwd: projectDir,
+    env: process.env,
+  });
+
+  let adminUIReady = promiseSignal();
+  let listener = (chunk: any) => {
+    let stringified = chunk.toString('utf8');
+    if (process.env.VERBOSE) {
+      console.log(stringified);
+    }
+    if (stringified.includes('Admin UI ready')) {
+      adminUIReady.resolve();
+    }
+  };
+  keystoneProcess.stdout!.on('data', listener);
+  keystoneProcess.stderr!.on('data', listener);
+
+  await adminUIReady;
+  return {
+    process: keystoneProcess,
+    exit: async () => {
+      keystoneProcess.stdout!.off('data', listener);
+      keystoneProcess.stderr!.off('data', listener);
+      // childProcess.kill will only kill the direct child process
+      // so we use tree-kill to kill the process and it's children
+      await treeKill(keystoneProcess.pid!);
+    },
+  };
+}
diff --git a/tests/examples-smoke-tests/auth.test.ts b/tests/examples-smoke-tests/auth.test.ts
index 64bab839681..685fa6ea4c2 100644
--- a/tests/examples-smoke-tests/auth.test.ts
+++ b/tests/examples-smoke-tests/auth.test.ts
@@ -1,5 +1,5 @@
 import { Browser, Page } from 'playwright';
-import { exampleProjectTests, initFirstItemTest } from './utils';
+import { exampleProjectTests, initFirstItemTest, loadIndex } from './utils';
 
 exampleProjectTests('../examples-staging/auth', browserType => {
   let browser: Browser = undefined as any;
@@ -7,7 +7,7 @@ exampleProjectTests('../examples-staging/auth', browserType => {
   beforeAll(async () => {
     browser = await browserType.launch();
     page = await browser.newPage();
-    await page.goto('http://localhost:3000');
+    await loadIndex(page);
   });
   initFirstItemTest(() => page);
   afterAll(async () => {
diff --git a/tests/examples-smoke-tests/basic.test.ts b/tests/examples-smoke-tests/basic.test.ts
index 5fdc1120158..0414fff4bea 100644
--- a/tests/examples-smoke-tests/basic.test.ts
+++ b/tests/examples-smoke-tests/basic.test.ts
@@ -1,6 +1,6 @@
 import { Browser, Page } from 'playwright';
 import fetch from 'node-fetch';
-import { exampleProjectTests, initFirstItemTest } from './utils';
+import { exampleProjectTests, initFirstItemTest, loadIndex } from './utils';
 
 exampleProjectTests('../examples-staging/basic', browserType => {
   let browser: Browser = undefined as any;
@@ -8,7 +8,7 @@ exampleProjectTests('../examples-staging/basic', browserType => {
   beforeAll(async () => {
     browser = await browserType.launch();
     page = await browser.newPage();
-    await page.goto('http://localhost:3000');
+    await loadIndex(page);
   });
   initFirstItemTest(() => page);
   test('sign out and sign in', async () => {
diff --git a/tests/examples-smoke-tests/blog.test.ts b/tests/examples-smoke-tests/blog.test.ts
index 93af114afef..24934bc9377 100644
--- a/tests/examples-smoke-tests/blog.test.ts
+++ b/tests/examples-smoke-tests/blog.test.ts
@@ -1,5 +1,5 @@
 import { Browser, Page } from 'playwright';
-import { exampleProjectTests } from './utils';
+import { exampleProjectTests, loadIndex } from './utils';
 
 exampleProjectTests('blog', browserType => {
   let browser: Browser = undefined as any;
@@ -7,7 +7,7 @@ exampleProjectTests('blog', browserType => {
   beforeAll(async () => {
     browser = await browserType.launch();
     page = await browser.newPage();
-    await page.goto('http://localhost:3000');
+    await loadIndex(page);
   });
   test('Load list', async () => {
     await Promise.all([page.waitForNavigation(), page.click('h3:has-text("Authors")')]);
diff --git a/tests/examples-smoke-tests/custom-admin-ui-logo.test.ts b/tests/examples-smoke-tests/custom-admin-ui-logo.test.ts
index 6942b52a0a3..622eb4de26c 100644
--- a/tests/examples-smoke-tests/custom-admin-ui-logo.test.ts
+++ b/tests/examples-smoke-tests/custom-admin-ui-logo.test.ts
@@ -1,5 +1,5 @@
 import { Browser, Page } from 'playwright';
-import { exampleProjectTests } from './utils';
+import { exampleProjectTests, loadIndex } from './utils';
 
 exampleProjectTests('custom-admin-ui-logo', browserType => {
   let browser: Browser = undefined as any;
@@ -7,7 +7,7 @@ exampleProjectTests('custom-admin-ui-logo', browserType => {
   beforeAll(async () => {
     browser = await browserType.launch();
     page = await browser.newPage();
-    await page.goto('http://localhost:3000');
+    await loadIndex(page);
   });
   test('Find custom logo', async () => {
     const content = await page.textContent('h3 a');
diff --git a/tests/examples-smoke-tests/custom-admin-ui-navigation.test.ts b/tests/examples-smoke-tests/custom-admin-ui-navigation.test.ts
index 6c2f8bea251..f6435818983 100644
--- a/tests/examples-smoke-tests/custom-admin-ui-navigation.test.ts
+++ b/tests/examples-smoke-tests/custom-admin-ui-navigation.test.ts
@@ -1,5 +1,5 @@
 import { Browser, Page } from 'playwright';
-import { exampleProjectTests } from './utils';
+import { exampleProjectTests, loadIndex } from './utils';
 
 exampleProjectTests('custom-admin-ui-navigation', browserType => {
   let browser: Browser = undefined as any;
@@ -7,7 +7,7 @@ exampleProjectTests('custom-admin-ui-navigation', browserType => {
   beforeAll(async () => {
     browser = await browserType.launch();
     page = await browser.newPage();
-    await page.goto('http://localhost:3000');
+    await loadIndex(page);
   });
   test('Has a nav link to the Dashboard', async () => {
     const navElement = await page.waitForSelector('nav a:has-text("Dashboard")');
diff --git a/tests/examples-smoke-tests/custom-admin-ui-pages.test.ts b/tests/examples-smoke-tests/custom-admin-ui-pages.test.ts
index 8b3dd98613a..406c2abb73a 100644
--- a/tests/examples-smoke-tests/custom-admin-ui-pages.test.ts
+++ b/tests/examples-smoke-tests/custom-admin-ui-pages.test.ts
@@ -1,5 +1,5 @@
 import { Browser, Page } from 'playwright';
-import { exampleProjectTests } from './utils';
+import { exampleProjectTests, loadIndex } from './utils';
 
 exampleProjectTests('custom-admin-ui-pages', browserType => {
   let browser: Browser = undefined as any;
@@ -7,7 +7,7 @@ exampleProjectTests('custom-admin-ui-pages', browserType => {
   beforeAll(async () => {
     browser = await browserType.launch();
     page = await browser.newPage();
-    await page.goto('http://localhost:3000');
+    await loadIndex(page);
   });
   test('Load list', async () => {
     await page.goto('http://localhost:3000/custom-page');
diff --git a/tests/examples-smoke-tests/custom-field-view.test.ts b/tests/examples-smoke-tests/custom-field-view.test.ts
index 878d4cd22cc..005cc998734 100644
--- a/tests/examples-smoke-tests/custom-field-view.test.ts
+++ b/tests/examples-smoke-tests/custom-field-view.test.ts
@@ -1,5 +1,5 @@
 import { Browser, Page } from 'playwright';
-import { exampleProjectTests } from './utils';
+import { exampleProjectTests, loadIndex } from './utils';
 
 exampleProjectTests('custom-field-view', browserType => {
   let browser: Browser = undefined as any;
@@ -7,7 +7,7 @@ exampleProjectTests('custom-field-view', browserType => {
   beforeAll(async () => {
     browser = await browserType.launch();
     page = await browser.newPage();
-    await page.goto('http://localhost:3000');
+    await loadIndex(page);
   });
   test('Load list', async () => {
     await Promise.all([page.waitForNavigation(), page.click('h3:has-text("People")')]);
diff --git a/tests/examples-smoke-tests/custom-field.test.ts b/tests/examples-smoke-tests/custom-field.test.ts
index 3c033230106..15db2b7a94a 100644
--- a/tests/examples-smoke-tests/custom-field.test.ts
+++ b/tests/examples-smoke-tests/custom-field.test.ts
@@ -1,5 +1,5 @@
 import { Browser, Page } from 'playwright';
-import { exampleProjectTests } from './utils';
+import { exampleProjectTests, loadIndex } from './utils';
 
 exampleProjectTests('custom-field', browserType => {
   let browser: Browser = undefined as any;
@@ -7,7 +7,7 @@ exampleProjectTests('custom-field', browserType => {
   beforeAll(async () => {
     browser = await browserType.launch();
     page = await browser.newPage();
-    await page.goto('http://localhost:3000');
+    await loadIndex(page);
   });
   test('Load list', async () => {
     await Promise.all([page.waitForNavigation(), page.click('h3:has-text("Authors")')]);
diff --git a/tests/examples-smoke-tests/default-values.test.ts b/tests/examples-smoke-tests/default-values.test.ts
index dc48a98535b..61e291c6195 100644
--- a/tests/examples-smoke-tests/default-values.test.ts
+++ b/tests/examples-smoke-tests/default-values.test.ts
@@ -1,5 +1,5 @@
 import { Browser, Page } from 'playwright';
-import { exampleProjectTests } from './utils';
+import { exampleProjectTests, loadIndex } from './utils';
 
 exampleProjectTests('default-values', browserType => {
   let browser: Browser = undefined as any;
@@ -7,7 +7,7 @@ exampleProjectTests('default-values', browserType => {
   beforeAll(async () => {
     browser = await browserType.launch();
     page = await browser.newPage();
-    await page.goto('http://localhost:3000');
+    await loadIndex(page);
   });
   test('Load list', async () => {
     await Promise.all([page.waitForNavigation(), page.click('h3:has-text("People")')]);
diff --git a/tests/examples-smoke-tests/document-field.test.ts b/tests/examples-smoke-tests/document-field.test.ts
index 73ffc18b30e..07b120a8fc6 100644
--- a/tests/examples-smoke-tests/document-field.test.ts
+++ b/tests/examples-smoke-tests/document-field.test.ts
@@ -1,5 +1,5 @@
 import { Browser, Page } from 'playwright';
-import { exampleProjectTests } from './utils';
+import { exampleProjectTests, loadIndex } from './utils';
 
 exampleProjectTests('document-field', browserType => {
   let browser: Browser = undefined as any;
@@ -7,7 +7,7 @@ exampleProjectTests('document-field', browserType => {
   beforeAll(async () => {
     browser = await browserType.launch();
     page = await browser.newPage();
-    await page.goto('http://localhost:3000');
+    await loadIndex(page);
   });
   test('Load list', async () => {
     await Promise.all([page.waitForNavigation(), page.click('h3:has-text("Authors")')]);
diff --git a/tests/examples-smoke-tests/ecommerce.test.disabled.ts b/tests/examples-smoke-tests/ecommerce.test.disabled.ts
index 0e99c787aef..2f40ad3dbe9 100644
--- a/tests/examples-smoke-tests/ecommerce.test.disabled.ts
+++ b/tests/examples-smoke-tests/ecommerce.test.disabled.ts
@@ -1,5 +1,5 @@
 import { Browser, Page } from 'playwright';
-import { exampleProjectTests, initFirstItemTest } from './utils';
+import { exampleProjectTests, initFirstItemTest, loadIndex } from './utils';
 
 // this is disabled currently because it's currently failing and we want to get the tests in without being blocked on this
 
@@ -9,7 +9,7 @@ exampleProjectTests('ecommerce', browserType => {
   beforeAll(async () => {
     browser = await browserType.launch();
     page = await browser.newPage();
-    await page.goto('http://localhost:3000');
+    await loadIndex(page);
   });
   initFirstItemTest(() => page);
   afterAll(async () => {
diff --git a/tests/examples-smoke-tests/extend-graphql-schema.test.ts b/tests/examples-smoke-tests/extend-graphql-schema.test.ts
index 05e9b9c0808..fe0570957cf 100644
--- a/tests/examples-smoke-tests/extend-graphql-schema.test.ts
+++ b/tests/examples-smoke-tests/extend-graphql-schema.test.ts
@@ -1,5 +1,5 @@
 import { Browser, Page } from 'playwright';
-import { exampleProjectTests } from './utils';
+import { exampleProjectTests, loadIndex } from './utils';
 
 exampleProjectTests('extend-graphql-schema', browserType => {
   let browser: Browser = undefined as any;
@@ -7,7 +7,7 @@ exampleProjectTests('extend-graphql-schema', browserType => {
   beforeAll(async () => {
     browser = await browserType.launch();
     page = await browser.newPage();
-    await page.goto('http://localhost:3000');
+    await loadIndex(page);
   });
   test('Load list', async () => {
     await Promise.all([page.waitForNavigation(), page.click('h3:has-text("Authors")')]);
diff --git a/tests/examples-smoke-tests/json.test.ts b/tests/examples-smoke-tests/json.test.ts
index ca6efc0fff6..7c1277872ee 100644
--- a/tests/examples-smoke-tests/json.test.ts
+++ b/tests/examples-smoke-tests/json.test.ts
@@ -1,5 +1,5 @@
 import { Browser, Page } from 'playwright';
-import { exampleProjectTests } from './utils';
+import { exampleProjectTests, loadIndex } from './utils';
 
 exampleProjectTests('json', browserType => {
   let browser: Browser = undefined as any;
@@ -7,7 +7,7 @@ exampleProjectTests('json', browserType => {
   beforeAll(async () => {
     browser = await browserType.launch();
     page = await browser.newPage();
-    await page.goto('http://localhost:3000');
+    await loadIndex(page);
   });
   test('Load list', async () => {
     await Promise.all([page.waitForNavigation(), page.click('h3:has-text("People")')]);
diff --git a/tests/examples-smoke-tests/rest-api.test.ts b/tests/examples-smoke-tests/rest-api.test.ts
index 2e31e3a7088..3dbd5148d9e 100644
--- a/tests/examples-smoke-tests/rest-api.test.ts
+++ b/tests/examples-smoke-tests/rest-api.test.ts
@@ -1,6 +1,6 @@
 import { Browser, Page } from 'playwright';
 import fetch from 'node-fetch';
-import { exampleProjectTests } from './utils';
+import { exampleProjectTests, loadIndex } from './utils';
 
 exampleProjectTests('rest-api', browserType => {
   let browser: Browser = undefined as any;
@@ -8,7 +8,7 @@ exampleProjectTests('rest-api', browserType => {
   beforeAll(async () => {
     browser = await browserType.launch();
     page = await browser.newPage();
-    await page.goto('http://localhost:3000');
+    await loadIndex(page);
   });
   test('Load list', async () => {
     await Promise.all([page.waitForNavigation(), page.click('h3:has-text("People")')]);
diff --git a/tests/examples-smoke-tests/roles.test.ts b/tests/examples-smoke-tests/roles.test.ts
index 2eca6d74eb9..f6779ea39be 100644
--- a/tests/examples-smoke-tests/roles.test.ts
+++ b/tests/examples-smoke-tests/roles.test.ts
@@ -1,5 +1,5 @@
 import { Browser, Page } from 'playwright';
-import { exampleProjectTests, initFirstItemTest } from './utils';
+import { exampleProjectTests, initFirstItemTest, loadIndex } from './utils';
 
 exampleProjectTests('../examples-staging/roles', browserType => {
   let browser: Browser = undefined as any;
@@ -7,7 +7,7 @@ exampleProjectTests('../examples-staging/roles', browserType => {
   beforeAll(async () => {
     browser = await browserType.launch();
     page = await browser.newPage();
-    await page.goto('http://localhost:3000');
+    await loadIndex(page);
   });
   initFirstItemTest(() => page);
   afterAll(async () => {
diff --git a/tests/examples-smoke-tests/task-manager.test.ts b/tests/examples-smoke-tests/task-manager.test.ts
index f51a42af45f..ca4fd125535 100644
--- a/tests/examples-smoke-tests/task-manager.test.ts
+++ b/tests/examples-smoke-tests/task-manager.test.ts
@@ -1,5 +1,5 @@
 import { Browser, Page } from 'playwright';
-import { exampleProjectTests } from './utils';
+import { exampleProjectTests, loadIndex } from './utils';
 
 exampleProjectTests('task-manager', browserType => {
   let browser: Browser = undefined as any;
@@ -7,7 +7,7 @@ exampleProjectTests('task-manager', browserType => {
   beforeAll(async () => {
     browser = await browserType.launch();
     page = await browser.newPage();
-    await page.goto('http://localhost:3000');
+    await loadIndex(page);
   });
   test('Load list', async () => {
     await Promise.all([page.waitForNavigation(), page.click('h3:has-text("People")')]);
diff --git a/tests/examples-smoke-tests/testing.test.ts b/tests/examples-smoke-tests/testing.test.ts
index 14b97644ff1..94b58d7bff8 100644
--- a/tests/examples-smoke-tests/testing.test.ts
+++ b/tests/examples-smoke-tests/testing.test.ts
@@ -1,5 +1,5 @@
 import { Browser, Page } from 'playwright';
-import { exampleProjectTests, initFirstItemTest } from './utils';
+import { exampleProjectTests, initFirstItemTest, loadIndex } from './utils';
 
 exampleProjectTests('testing', browserType => {
   let browser: Browser = undefined as any;
@@ -7,7 +7,7 @@ exampleProjectTests('testing', browserType => {
   beforeAll(async () => {
     browser = await browserType.launch();
     page = await browser.newPage();
-    await page.goto('http://localhost:3000');
+    await loadIndex(page);
   });
   initFirstItemTest(() => page);
   afterAll(async () => {
diff --git a/tests/examples-smoke-tests/utils.ts b/tests/examples-smoke-tests/utils.ts
index 439f668f792..48270ec6175 100644
--- a/tests/examples-smoke-tests/utils.ts
+++ b/tests/examples-smoke-tests/utils.ts
@@ -4,6 +4,19 @@ import execa from 'execa';
 import _treeKill from 'tree-kill';
 import * as playwright from 'playwright';
 
+export async function loadIndex(page: playwright.Page) {
+  await page.goto('http://localhost:3000');
+  try {
+    // sometimes Next will fail to load the page the first time
+    // this is probably because Keystone is fetching the API route to compile Keystone
+    // while we're fetching an Admin UI page
+    // and Next doesn't handle fetching two pages at the same time well
+    await page.waitForSelector(':has-text("Dashboard")', { timeout: 2000 });
+  } catch {
+    await page.goto('http://localhost:3000');
+  }
+}
+
 async function deleteAllData(projectDir: string) {
   /**
    * As of @prisma/client@3.1.1 it appears that the prisma client runtime tries to resolve the path to the prisma schema
diff --git a/tests/examples-smoke-tests/virtual-field.test.ts b/tests/examples-smoke-tests/virtual-field.test.ts
index 42c12fb494c..952bf44e99b 100644
--- a/tests/examples-smoke-tests/virtual-field.test.ts
+++ b/tests/examples-smoke-tests/virtual-field.test.ts
@@ -1,5 +1,5 @@
 import { Browser, Page } from 'playwright';
-import { exampleProjectTests } from './utils';
+import { exampleProjectTests, loadIndex } from './utils';
 
 exampleProjectTests('virtual-field', browserType => {
   let browser: Browser = undefined as any;
@@ -7,7 +7,7 @@ exampleProjectTests('virtual-field', browserType => {
   beforeAll(async () => {
     browser = await browserType.launch();
     page = await browser.newPage();
-    await page.goto('http://localhost:3000');
+    await loadIndex(page);
   });
   test('Load list', async () => {
     await Promise.all([page.waitForNavigation(), page.click('h3:has-text("Authors")')]);
diff --git a/tests/examples-smoke-tests/with-auth.test.ts b/tests/examples-smoke-tests/with-auth.test.ts
index 8c1bf93176c..664b1efb682 100644
--- a/tests/examples-smoke-tests/with-auth.test.ts
+++ b/tests/examples-smoke-tests/with-auth.test.ts
@@ -1,5 +1,5 @@
 import { Browser, Page } from 'playwright';
-import { exampleProjectTests, initFirstItemTest } from './utils';
+import { exampleProjectTests, initFirstItemTest, loadIndex } from './utils';
 
 exampleProjectTests('with-auth', browserType => {
   let browser: Browser = undefined as any;
@@ -7,7 +7,7 @@ exampleProjectTests('with-auth', browserType => {
   beforeAll(async () => {
     browser = await browserType.launch();
     page = await browser.newPage();
-    await page.goto('http://localhost:3000');
+    await loadIndex(page);
   });
   initFirstItemTest(() => page);
   afterAll(async () => {
diff --git a/tests/test-projects/live-reloading/README.md b/tests/test-projects/live-reloading/README.md
new file mode 100644
index 00000000000..5279159b1e5
--- /dev/null
+++ b/tests/test-projects/live-reloading/README.md
@@ -0,0 +1,4 @@
+## THIS IS A TEST PROJECT
+
+The sole purpose of this project is to act as a fixture through which we run our admin-ui integration tests.
+For useful and applicable examples of how to use keystone, please visit the [examples directory](https://github.com/keystonejs/keystone/tree/main/examples/) or visit our [docs](https://next.keystonejs.com).
diff --git a/tests/test-projects/live-reloading/keystone.ts b/tests/test-projects/live-reloading/keystone.ts
new file mode 100644
index 00000000000..8e86f606688
--- /dev/null
+++ b/tests/test-projects/live-reloading/keystone.ts
@@ -0,0 +1,11 @@
+import { config } from '@keystone-next/keystone';
+import { lists, extendGraphqlSchema } from './schemas';
+
+export default config({
+  db: {
+    provider: 'sqlite',
+    url: process.env.DATABASE_URL || 'file:./test.db',
+  },
+  lists,
+  extendGraphqlSchema,
+});
diff --git a/tests/test-projects/live-reloading/package.json b/tests/test-projects/live-reloading/package.json
new file mode 100644
index 00000000000..fdabc28c2d0
--- /dev/null
+++ b/tests/test-projects/live-reloading/package.json
@@ -0,0 +1,21 @@
+{
+  "name": "@keystone-next/test-projects-live-reloading",
+  "version": "0.0.6",
+  "private": true,
+  "license": "MIT",
+  "scripts": {
+    "dev": "keystone-next dev",
+    "start": "keystone-next start",
+    "build": "keystone-next build"
+  },
+  "dependencies": {
+    "@keystone-next/keystone": "^26.1.0"
+  },
+  "devDependencies": {
+    "typescript": "^4.4.4"
+  },
+  "engines": {
+    "node": "^12.20 || >= 14.13"
+  },
+  "repository": "https://github.com/keystonejs/keystone/tree/main/tests/test-projects/live-reloading"
+}
diff --git a/tests/test-projects/live-reloading/schema.graphql b/tests/test-projects/live-reloading/schema.graphql
new file mode 100644
index 00000000000..98a59477912
--- /dev/null
+++ b/tests/test-projects/live-reloading/schema.graphql
@@ -0,0 +1,201 @@
+# This file is automatically generated by Keystone, do not modify it manually.
+# Modify your Keystone config when you want to change this.
+
+type Query {
+  someNumber: Int
+  somethings(
+    where: SomethingWhereInput! = {}
+    orderBy: [SomethingOrderByInput!]! = []
+    take: Int
+    skip: Int! = 0
+  ): [Something!]
+  something(where: SomethingWhereUniqueInput!): Something
+  somethingsCount(where: SomethingWhereInput! = {}): Int
+  keystone: KeystoneMeta!
+}
+
+type Something {
+  id: ID!
+  text: String
+}
+
+input SomethingWhereUniqueInput {
+  id: ID
+}
+
+input SomethingWhereInput {
+  AND: [SomethingWhereInput!]
+  OR: [SomethingWhereInput!]
+  NOT: [SomethingWhereInput!]
+  id: IDFilter
+  text: StringFilter
+}
+
+input IDFilter {
+  equals: ID
+  in: [ID!]
+  notIn: [ID!]
+  lt: ID
+  lte: ID
+  gt: ID
+  gte: ID
+  not: IDFilter
+}
+
+input StringFilter {
+  equals: String
+  in: [String!]
+  notIn: [String!]
+  lt: String
+  lte: String
+  gt: String
+  gte: String
+  contains: String
+  startsWith: String
+  endsWith: String
+  not: NestedStringFilter
+}
+
+input NestedStringFilter {
+  equals: String
+  in: [String!]
+  notIn: [String!]
+  lt: String
+  lte: String
+  gt: String
+  gte: String
+  contains: String
+  startsWith: String
+  endsWith: String
+  not: NestedStringFilter
+}
+
+input SomethingOrderByInput {
+  id: OrderDirection
+  text: OrderDirection
+}
+
+enum OrderDirection {
+  asc
+  desc
+}
+
+input SomethingUpdateInput {
+  text: String
+}
+
+input SomethingUpdateArgs {
+  where: SomethingWhereUniqueInput!
+  data: SomethingUpdateInput!
+}
+
+input SomethingCreateInput {
+  text: String
+}
+
+"""
+The `JSON` scalar type represents JSON values as specified by [ECMA-404](http://www.ecma-international.org/publications/files/ECMA-ST/ECMA-404.pdf).
+"""
+scalar JSON
+  @specifiedBy(
+    url: "http://www.ecma-international.org/publications/files/ECMA-ST/ECMA-404.pdf"
+  )
+
+type Mutation {
+  createSomething(data: SomethingCreateInput!): Something
+  createSomethings(data: [SomethingCreateInput!]!): [Something]
+  updateSomething(
+    where: SomethingWhereUniqueInput!
+    data: SomethingUpdateInput!
+  ): Something
+  updateSomethings(data: [SomethingUpdateArgs!]!): [Something]
+  deleteSomething(where: SomethingWhereUniqueInput!): Something
+  deleteSomethings(where: [SomethingWhereUniqueInput!]!): [Something]
+}
+
+type KeystoneMeta {
+  adminMeta: KeystoneAdminMeta!
+}
+
+type KeystoneAdminMeta {
+  enableSignout: Boolean!
+  enableSessionItem: Boolean!
+  lists: [KeystoneAdminUIListMeta!]!
+  list(key: String!): KeystoneAdminUIListMeta
+}
+
+type KeystoneAdminUIListMeta {
+  key: String!
+  itemQueryName: String!
+  listQueryName: String!
+  hideCreate: Boolean!
+  hideDelete: Boolean!
+  path: String!
+  label: String!
+  singular: String!
+  plural: String!
+  description: String
+  initialColumns: [String!]!
+  pageSize: Int!
+  labelField: String!
+  fields: [KeystoneAdminUIFieldMeta!]!
+  initialSort: KeystoneAdminUISort
+  isHidden: Boolean!
+}
+
+type KeystoneAdminUIFieldMeta {
+  path: String!
+  label: String!
+  isOrderable: Boolean!
+  isFilterable: Boolean!
+  fieldMeta: JSON
+  viewsIndex: Int!
+  customViewsIndex: Int
+  createView: KeystoneAdminUIFieldMetaCreateView!
+  listView: KeystoneAdminUIFieldMetaListView!
+  itemView(id: ID): KeystoneAdminUIFieldMetaItemView
+  search: QueryMode
+}
+
+type KeystoneAdminUIFieldMetaCreateView {
+  fieldMode: KeystoneAdminUIFieldMetaCreateViewFieldMode!
+}
+
+enum KeystoneAdminUIFieldMetaCreateViewFieldMode {
+  edit
+  hidden
+}
+
+type KeystoneAdminUIFieldMetaListView {
+  fieldMode: KeystoneAdminUIFieldMetaListViewFieldMode!
+}
+
+enum KeystoneAdminUIFieldMetaListViewFieldMode {
+  read
+  hidden
+}
+
+type KeystoneAdminUIFieldMetaItemView {
+  fieldMode: KeystoneAdminUIFieldMetaItemViewFieldMode
+}
+
+enum KeystoneAdminUIFieldMetaItemViewFieldMode {
+  edit
+  read
+  hidden
+}
+
+enum QueryMode {
+  default
+  insensitive
+}
+
+type KeystoneAdminUISort {
+  field: String!
+  direction: KeystoneAdminUISortDirection!
+}
+
+enum KeystoneAdminUISortDirection {
+  ASC
+  DESC
+}
diff --git a/tests/test-projects/live-reloading/schema.prisma b/tests/test-projects/live-reloading/schema.prisma
new file mode 100644
index 00000000000..ac941ea861d
--- /dev/null
+++ b/tests/test-projects/live-reloading/schema.prisma
@@ -0,0 +1,18 @@
+// This file is automatically generated by Keystone, do not modify it manually.
+// Modify your Keystone config when you want to change this.
+
+datasource sqlite {
+  url      = env("DATABASE_URL")
+  provider = "sqlite"
+}
+
+generator client {
+  provider   = "prisma-client-js"
+  output     = "node_modules/.prisma/client"
+  engineType = "binary"
+}
+
+model Something {
+  id   String @id @default(cuid())
+  text String @default("")
+}
\ No newline at end of file
diff --git a/tests/test-projects/live-reloading/schemas/changed-prisma-schema.ts b/tests/test-projects/live-reloading/schemas/changed-prisma-schema.ts
new file mode 100644
index 00000000000..7c050a68d6e
--- /dev/null
+++ b/tests/test-projects/live-reloading/schemas/changed-prisma-schema.ts
@@ -0,0 +1,24 @@
+import { graphQLSchemaExtension, list } from '@keystone-next/keystone';
+import { text } from '@keystone-next/keystone/fields';
+
+export const lists = {
+  Something: list({
+    fields: {
+      text: text({ label: 'Initial Label For Text' }),
+      anotherField: text(),
+    },
+  }),
+};
+
+export const extendGraphqlSchema = graphQLSchemaExtension({
+  typeDefs: `
+    extend type Query {
+      someNumber: Int
+    }
+  `,
+  resolvers: {
+    Query: {
+      someNumber: () => 1,
+    },
+  },
+});
diff --git a/tests/test-projects/live-reloading/schemas/index.ts b/tests/test-projects/live-reloading/schemas/index.ts
new file mode 100644
index 00000000000..46847cde57b
--- /dev/null
+++ b/tests/test-projects/live-reloading/schemas/index.ts
@@ -0,0 +1 @@
+export * from './initial';
diff --git a/tests/test-projects/live-reloading/schemas/initial.ts b/tests/test-projects/live-reloading/schemas/initial.ts
new file mode 100644
index 00000000000..73936ddecf9
--- /dev/null
+++ b/tests/test-projects/live-reloading/schemas/initial.ts
@@ -0,0 +1,23 @@
+import { graphQLSchemaExtension, list } from '@keystone-next/keystone';
+import { text } from '@keystone-next/keystone/fields';
+
+export const lists = {
+  Something: list({
+    fields: {
+      text: text({ label: 'Initial Label For Text' }),
+    },
+  }),
+};
+
+export const extendGraphqlSchema = graphQLSchemaExtension({
+  typeDefs: `
+    extend type Query {
+      someNumber: Int
+    }
+  `,
+  resolvers: {
+    Query: {
+      someNumber: () => 1,
+    },
+  },
+});
diff --git a/tests/test-projects/live-reloading/schemas/runtime-error.ts b/tests/test-projects/live-reloading/schemas/runtime-error.ts
new file mode 100644
index 00000000000..33cfb003795
--- /dev/null
+++ b/tests/test-projects/live-reloading/schemas/runtime-error.ts
@@ -0,0 +1,4 @@
+// @ts-ignore
+doesNotExist();
+
+export {};
diff --git a/tests/test-projects/live-reloading/schemas/second.ts b/tests/test-projects/live-reloading/schemas/second.ts
new file mode 100644
index 00000000000..1407a5cabb7
--- /dev/null
+++ b/tests/test-projects/live-reloading/schemas/second.ts
@@ -0,0 +1,31 @@
+import { graphql, graphQLSchemaExtension, list } from '@keystone-next/keystone';
+import { text, virtual } from '@keystone-next/keystone/fields';
+
+export const lists = {
+  Something: list({
+    fields: {
+      text: text({ label: 'Very Important Text' }),
+      virtual: virtual({
+        field: graphql.field({
+          type: graphql.String,
+          resolve(item) {
+            return item.text as string;
+          },
+        }),
+      }),
+    },
+  }),
+};
+
+export const extendGraphqlSchema = graphQLSchemaExtension({
+  typeDefs: `
+    extend type Query {
+      someNumber: Int!
+    }
+  `,
+  resolvers: {
+    Query: {
+      someNumber: () => 1,
+    },
+  },
+});
diff --git a/tests/test-projects/live-reloading/schemas/syntax-error.js b/tests/test-projects/live-reloading/schemas/syntax-error.js
new file mode 100644
index 00000000000..4ee092e42ac
--- /dev/null
+++ b/tests/test-projects/live-reloading/schemas/syntax-error.js
@@ -0,0 +1,23 @@
+import { graphQLSchemaExtension, list } from '@keystone-next/keystone';
+import { text } from '@keystone-next/keystone/fields';
+
+expor const lists = {
+  Something: list({
+    fields: {
+      text: text(),
+    },
+  }),
+};
+
+export const extendGraphqlSchema = graphQLSchemaExtension({
+  typeDefs: `
+    extend type Query {
+      someNumber: Int
+    }
+  `,
+  resolvers: {
+    Query: {
+      someNumber: () => 1,
+    },
+  },
+});
diff --git a/yarn.lock b/yarn.lock
index 036281f6523..dec9ec71d30 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2872,6 +2872,11 @@
   resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz#d3357479a0fdfdd5907fe67e17e0a85c906e1301"
   integrity sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==
 
+"@types/normalize-path@3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@types/normalize-path/-/normalize-path-3.0.0.tgz#bb5c46cab77b93350b4cf8d7ff1153f47189ae31"
+  integrity sha512-Nd8y/5t/7CRakPYiyPzr/IAfYusy1FkcZYFEAcoMZkwpJv2n4Wm+olW+e7xBdHEXhOnWdG9ddbar0gqZWS4x5Q==
+
 "@types/parse-json@^4.0.0":
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0"

From 903080cc863eb9c1166f35627eb56defda659730 Mon Sep 17 00:00:00 2001
From: Mitchell Hamilton <mitchell@hamil.town>
Date: Wed, 27 Oct 2021 15:22:47 +1000
Subject: [PATCH 05/21] Update references to Apollo Sandbox to GraphQL
 Playground (#6842)

---
 docs/pages/docs/guides/cli.mdx                            | 2 +-
 .../walkthroughs/embedded-mode-with-sqlite-nextjs.mdx     | 8 ++++----
 docs/pages/why-keystone.tsx                               | 2 +-
 examples/blog/README.md                                   | 4 ++--
 examples/custom-admin-ui-logo/README.md                   | 2 +-
 examples/custom-admin-ui-navigation/README.md             | 2 +-
 examples/custom-admin-ui-pages/README.md                  | 2 +-
 examples/custom-field-view/README.md                      | 2 +-
 examples/custom-field/README.md                           | 2 +-
 examples/default-values/README.md                         | 2 +-
 examples/document-field/README.md                         | 2 +-
 examples/extend-graphql-schema/README.md                  | 2 +-
 examples/json/README.md                                   | 2 +-
 examples/task-manager/README.md                           | 4 ++--
 examples/testing/README.md                                | 2 +-
 examples/virtual-field/README.md                          | 2 +-
 examples/with-auth/README.md                              | 2 +-
 17 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/docs/pages/docs/guides/cli.mdx b/docs/pages/docs/guides/cli.mdx
index a5d0f604320..823072a23ee 100644
--- a/docs/pages/docs/guides/cli.mdx
+++ b/docs/pages/docs/guides/cli.mdx
@@ -195,7 +195,7 @@ yarn keystone-next start
     heading="Getting Started with create-keystone-app"
     href="/docs/walkthroughs/getting-started-with-create-keystone-app"
     >
-    How to use Keystone's CLI app to standup a new local project with an Admin UI & the Apollo Sandbox.
+    How to use Keystone's CLI app to standup a new local project with an Admin UI & the GraphQL Playground.
   </Well>
 </RelatedContent>
 
diff --git a/docs/pages/docs/walkthroughs/embedded-mode-with-sqlite-nextjs.mdx b/docs/pages/docs/walkthroughs/embedded-mode-with-sqlite-nextjs.mdx
index b7aff709487..c03dd32e0b3 100644
--- a/docs/pages/docs/walkthroughs/embedded-mode-with-sqlite-nextjs.mdx
+++ b/docs/pages/docs/walkthroughs/embedded-mode-with-sqlite-nextjs.mdx
@@ -35,7 +35,7 @@ Here's what we're going to do:
 - Create a Next.js app
 - Embed Keystone, and run an Admin UI you can read and write to locally
 - Add a simple Keystone [Schema](/apis/schema) with a `Post` List
-- Setup a secure read-only GraphQL API endpoint (and Apollo Sandbox) that you can access in production
+- Setup a secure read-only GraphQL API endpoint (and GraphQL Playground) that you can access in production
 - Deploy the app to Vercel 🚀
 
 ## Setup a Next.js app
@@ -284,7 +284,7 @@ Run `yarn dev` again.
 
 ## Bonus: add the GraphQL API to the frontend
 
-To get a read-only GraphQL API and Apollo Sandbox in production, add `/pages/api/graphql.tsx`with the following:
+To get a read-only GraphQL API and GraphQL Playground in production, add `/pages/api/graphql.tsx`with the following:
 
 ```tsx
 // pages/api/graphql.tsx
@@ -292,7 +292,7 @@ To get a read-only GraphQL API and Apollo Sandbox in production, add `/pages/api
 export { default, config } from '.keystone/next/graphql-api';
 ```
 
-This takes the fully functional GraphQL API that Keystone is already generating and makes it available as an endpoint and Apollo Sandbox within the Next.js frontend app at [http://localhost:3000/api/graphql](http://localhost:3000/api/graphql).
+This takes the fully functional GraphQL API that Keystone is already generating and makes it available as an endpoint and GraphQL Playground within the Next.js frontend app at [http://localhost:3000/api/graphql](http://localhost:3000/api/graphql).
 
 ![A browser displaying the GraphQL playground](/assets/walkthroughs/embedded-nextjs/graphql-api.png)
 
@@ -334,7 +334,7 @@ Keystone’s Embedded mode and SQLite support gives you the option to run a self
     heading="Getting Started with create-keystone-app"
     href="/docs/walkthroughs/getting-started-with-create-keystone-app"
     >
-    How to use Keystone's CLI app to standup a new local project with an Admin UI & the Apollo Sandbox.
+    How to use Keystone's CLI app to standup a new local project with an Admin UI & the GraphQL Playground.
   </Well>
 </RelatedContent>
 
diff --git a/docs/pages/why-keystone.tsx b/docs/pages/why-keystone.tsx
index 6eced12b9e3..be619777344 100644
--- a/docs/pages/why-keystone.tsx
+++ b/docs/pages/why-keystone.tsx
@@ -645,7 +645,7 @@ export default function WhyKeystonePage() {
             <Type as="p" look="body18" color="var(--muted)" margin="1rem 0 0 0">
               Use an API-first content platform to unlocks the power of multichannel content ops.
               Connect to your audience where they want to be. Ship content to any frontend over
-              performant APIs. Use the built-in Apollo Sandbox to query with ease.
+              performant APIs. Use the built-in GraphQL Playground to query with ease.
             </Type>
           </div>
           <TweetBox
diff --git a/examples/blog/README.md b/examples/blog/README.md
index ac667f5b380..e47b87f9b9c 100644
--- a/examples/blog/README.md
+++ b/examples/blog/README.md
@@ -15,7 +15,7 @@ To run this project:
 This will start the Admin UI at [localhost:3000](http://localhost:3000).
 You can use the Admin UI to create items in your database.
 
-You can also access a Apollo Sandbox at [localhost:3000/api/graphql](http://localhost:3000/api/graphql), which allows you to directly run GraphQL queries and mutations.
+You can also access a GraphQL Playground at [localhost:3000/api/graphql](http://localhost:3000/api/graphql), which allows you to directly run GraphQL queries and mutations.
 
 Congratulations, you're now up and running with Keystone! 🚀
 
@@ -29,6 +29,6 @@ This example includes sample data. To add it to your database:
 
 ## Next steps
 
-Experiment with the code in this example to see how Keystone works, familiarise yourself with the Admin UI, and learn about the Apollo Sandbox.
+Experiment with the code in this example to see how Keystone works, familiarise yourself with the Admin UI, and learn about the GraphQL Playground.
 
 When you’ve got the hang of this base project, try a [feature project](../) to learn Keystone’s advanced features and take your knowledge to the next level.
diff --git a/examples/custom-admin-ui-logo/README.md b/examples/custom-admin-ui-logo/README.md
index 960e4975649..1b5a0f890fd 100644
--- a/examples/custom-admin-ui-logo/README.md
+++ b/examples/custom-admin-ui-logo/README.md
@@ -14,7 +14,7 @@ This will start the Admin UI at [localhost:3000](http://localhost:3000).
 
 You can use the Admin UI to create items in your database.
 
-You can also access a Apollo Sandbox at [localhost:3000/api/graphql](http://localhost:3000/api/graphql), which allows you to directly run GraphQL queries and mutations.
+You can also access a GraphQL Playground at [localhost:3000/api/graphql](http://localhost:3000/api/graphql), which allows you to directly run GraphQL queries and mutations.
 
 🚀 Congratulations, you're now up and running with Keystone!
 
diff --git a/examples/custom-admin-ui-navigation/README.md b/examples/custom-admin-ui-navigation/README.md
index 4c1f341e6d5..8fc2df99a31 100644
--- a/examples/custom-admin-ui-navigation/README.md
+++ b/examples/custom-admin-ui-navigation/README.md
@@ -14,7 +14,7 @@ This will start the Admin UI at [localhost:3000](http://localhost:3000).
 
 You can use the Admin UI to create items in your database.
 
-You can also access a Apollo Sandbox at [localhost:3000/api/graphql](http://localhost:3000/api/graphql), which allows you to directly run GraphQL queries and mutations.
+You can also access a GraphQL Playground at [localhost:3000/api/graphql](http://localhost:3000/api/graphql), which allows you to directly run GraphQL queries and mutations.
 
 ## admin/config.ts
 
diff --git a/examples/custom-admin-ui-pages/README.md b/examples/custom-admin-ui-pages/README.md
index 2e1129bc6a1..59b084aba29 100644
--- a/examples/custom-admin-ui-pages/README.md
+++ b/examples/custom-admin-ui-pages/README.md
@@ -15,7 +15,7 @@ This will start the Admin UI at [localhost:3000](http://localhost:3000).
 
 You can use the Admin UI to create items in your database.
 
-You can also access a Apollo Sandbox at [localhost:3000/api/graphql](http://localhost:3000/api/graphql), which allows you to directly run GraphQL queries and mutations.
+You can also access a GraphQL Playground at [localhost:3000/api/graphql](http://localhost:3000/api/graphql), which allows you to directly run GraphQL queries and mutations.
 
 🚀 Congratulations, you're now up and running with Keystone!
 
diff --git a/examples/custom-field-view/README.md b/examples/custom-field-view/README.md
index 8c474d71a23..949ff379372 100644
--- a/examples/custom-field-view/README.md
+++ b/examples/custom-field-view/README.md
@@ -14,7 +14,7 @@ This will start the Admin UI at [localhost:3000](http://localhost:3000).
 
 You can use the Admin UI to create items in your database.
 
-You can also access a Apollo Sandbox at [localhost:3000/api/graphql](http://localhost:3000/api/graphql), which allows you to directly run GraphQL queries and mutations.
+You can also access a GraphQL Playground at [localhost:3000/api/graphql](http://localhost:3000/api/graphql), which allows you to directly run GraphQL queries and mutations.
 
 ## Features
 
diff --git a/examples/custom-field/README.md b/examples/custom-field/README.md
index dc8bca709a5..d1444fd1f89 100644
--- a/examples/custom-field/README.md
+++ b/examples/custom-field/README.md
@@ -14,7 +14,7 @@ yarn dev
 This will start the Admin UI at [localhost:3000](http://localhost:3000).
 You can use the Admin UI to create items in your database.
 
-You can also access a Apollo Sandbox at [localhost:3000/api/graphql](http://localhost:3000/api/graphql), which allows you to directly run GraphQL queries and mutations.
+You can also access a GraphQL Playground at [localhost:3000/api/graphql](http://localhost:3000/api/graphql), which allows you to directly run GraphQL queries and mutations.
 
 ## Stars field
 
diff --git a/examples/default-values/README.md b/examples/default-values/README.md
index d81318c79b1..a66e1c10c0a 100644
--- a/examples/default-values/README.md
+++ b/examples/default-values/README.md
@@ -14,7 +14,7 @@ yarn dev
 This will start the Admin UI at [localhost:3000](http://localhost:3000).
 You can use the Admin UI to create items in your database.
 
-You can also access a Apollo Sandbox at [localhost:3000/api/graphql](http://localhost:3000/api/graphql), which allows you to directly run GraphQL queries and mutations.
+You can also access a GraphQL Playground at [localhost:3000/api/graphql](http://localhost:3000/api/graphql), which allows you to directly run GraphQL queries and mutations.
 
 ## Features
 
diff --git a/examples/document-field/README.md b/examples/document-field/README.md
index c8aae1448f2..eff2df758ad 100644
--- a/examples/document-field/README.md
+++ b/examples/document-field/README.md
@@ -14,7 +14,7 @@ yarn dev
 This will start the Admin UI at [localhost:3000](http://localhost:3000).
 You can use the Admin UI to create items in your database.
 
-You can also access a Apollo Sandbox at [localhost:3000/api/graphql](http://localhost:3000/api/graphql), which allows you to directly run GraphQL queries and mutations.
+You can also access a GraphQL Playground at [localhost:3000/api/graphql](http://localhost:3000/api/graphql), which allows you to directly run GraphQL queries and mutations.
 
 In a separate terminal, start the frontend dev server:
 
diff --git a/examples/extend-graphql-schema/README.md b/examples/extend-graphql-schema/README.md
index 880af0ae67f..5236a348053 100644
--- a/examples/extend-graphql-schema/README.md
+++ b/examples/extend-graphql-schema/README.md
@@ -14,7 +14,7 @@ yarn dev
 This will start the Admin UI at [localhost:3000](http://localhost:3000).
 You can use the Admin UI to create items in your database.
 
-You can also access a Apollo Sandbox at [localhost:3000/api/graphql](http://localhost:3000/api/graphql), which allows you to directly run GraphQL queries and mutations.
+You can also access a GraphQL Playground at [localhost:3000/api/graphql](http://localhost:3000/api/graphql), which allows you to directly run GraphQL queries and mutations.
 
 ## Features
 
diff --git a/examples/json/README.md b/examples/json/README.md
index 63e274a25b5..91cd5411754 100644
--- a/examples/json/README.md
+++ b/examples/json/README.md
@@ -14,7 +14,7 @@ yarn dev
 This will start the Admin UI at [localhost:3000](http://localhost:3000).
 You can use the Admin UI to create items in your database.
 
-You can also access a Apollo Sandbox at [localhost:3000/api/graphql](http://localhost:3000/api/graphql), which allows you to directly run GraphQL queries and mutations.
+You can also access a GraphQL Playground at [localhost:3000/api/graphql](http://localhost:3000/api/graphql), which allows you to directly run GraphQL queries and mutations.
 
 🚀 Congratulations, you're now up and running with Keystone!
 
diff --git a/examples/task-manager/README.md b/examples/task-manager/README.md
index 228dcad1989..87431499f2d 100644
--- a/examples/task-manager/README.md
+++ b/examples/task-manager/README.md
@@ -14,7 +14,7 @@ To run this project:
 
 This will start Keystone’s Admin UI at [localhost:3000](http://localhost:3000), where you can add items to an empty database.
 
-You can also access Keystone’s Apollo Sandbox at [localhost:3000/api/graphql](http://localhost:3000/api/graphql) to explore the GraphQL API, and run [queries](https://keystonejs.com/docs/guides/filters) and [mutations](https://keystonejs.com/docs/apis/graphql#mutations) on your data.
+You can also access Keystone’s GraphQL Playground at [localhost:3000/api/graphql](http://localhost:3000/api/graphql) to explore the GraphQL API, and run [queries](https://keystonejs.com/docs/guides/filters) and [mutations](https://keystonejs.com/docs/apis/graphql#mutations) on your data.
 
 Congratulations, you’re now up and running with Keystone! 🚀
 
@@ -28,6 +28,6 @@ This example includes sample data. To add it to your database:
 
 ## Next steps
 
-Experiment with the code in this example to see how Keystone works, familiarise yourself with the Admin UI, and learn about the Apollo Sandbox.
+Experiment with the code in this example to see how Keystone works, familiarise yourself with the Admin UI, and learn about the GraphQL Playground.
 
 When you’ve got the hang of this base project, try a [feature project](../) to learn Keystone’s advanced features and take your knowledge to the next level.
diff --git a/examples/testing/README.md b/examples/testing/README.md
index 6222672a372..38bff5b09cf 100644
--- a/examples/testing/README.md
+++ b/examples/testing/README.md
@@ -14,7 +14,7 @@ yarn dev
 This will start the Admin UI at [localhost:3000](http://localhost:3000).
 You can use the Admin UI to create items in your database.
 
-You can also access a Apollo Sandbox at [localhost:3000/api/graphql](http://localhost:3000/api/graphql), which allows you to directly run GraphQL queries and mutations.
+You can also access a GraphQL Playground at [localhost:3000/api/graphql](http://localhost:3000/api/graphql), which allows you to directly run GraphQL queries and mutations.
 
 ## Features
 
diff --git a/examples/virtual-field/README.md b/examples/virtual-field/README.md
index fae8b0ef5d6..cd6c02e5c4b 100644
--- a/examples/virtual-field/README.md
+++ b/examples/virtual-field/README.md
@@ -14,7 +14,7 @@ yarn dev
 This will start the Admin UI at [localhost:3000](http://localhost:3000).
 You can use the Admin UI to create items in your database.
 
-You can also access a Apollo Sandbox at [localhost:3000/api/graphql](http://localhost:3000/api/graphql), which allows you to directly run GraphQL queries and mutations.
+You can also access a GraphQL Playground at [localhost:3000/api/graphql](http://localhost:3000/api/graphql), which allows you to directly run GraphQL queries and mutations.
 
 ## Features
 
diff --git a/examples/with-auth/README.md b/examples/with-auth/README.md
index cbc69eed990..30246c1f85a 100644
--- a/examples/with-auth/README.md
+++ b/examples/with-auth/README.md
@@ -14,7 +14,7 @@ yarn dev
 This will start the Admin UI at [localhost:3000](http://localhost:3000).
 You can use the Admin UI to create items in your database.
 
-You can also access a Apollo Sandbox at [localhost:3000/api/graphql](http://localhost:3000/api/graphql), which allows you to directly run GraphQL queries and mutations.
+You can also access a GraphQL Playground at [localhost:3000/api/graphql](http://localhost:3000/api/graphql), which allows you to directly run GraphQL queries and mutations.
 
 ## Features
 

From 36174f867aeda02bad6acfe27f534b4dc01e5c5b Mon Sep 17 00:00:00 2001
From: Daniel Cousens <413395+dcousens@users.noreply.github.com>
Date: Thu, 28 Oct 2021 11:54:55 +1100
Subject: [PATCH 06/21] Don't fill `context.session` if the session is invalid
 (#6841)

* s/keystone.com/keystonejs.com

* add whitespace to unit test workflows

* move initialiseData to utils as seed(...)

* add tests

* trigger test failure

* dont return a session if data is undefined

* update examples

* throw if no .session exists on the configuration

* yarn format

* add failing test for invalid sessionData

* catch errors from invalid sessionData

* yarn format

* add changeset

* fix types for example

Co-authored-by: Daniel Cousens <dcousens@users.noreply.github.com>
---
 .changeset/slimy-rings-type.md                |   5 +
 .github/workflows/tests.yml                   |  26 +-
 examples-staging/auth/schema.ts               |   6 +-
 examples-staging/basic/schema.ts              |   6 +-
 examples-staging/ecommerce/keystone.ts        |   4 +-
 .../graphql-api-endpoint/keystone.ts          |   2 +-
 packages/auth/src/index.ts                    |  19 +-
 tests/api-tests/auth-header.test.ts           | 184 +++++++++-----
 tests/api-tests/auth.test.ts                  | 224 ++++++++++--------
 tests/api-tests/utils.ts                      |  16 +-
 10 files changed, 310 insertions(+), 182 deletions(-)
 create mode 100644 .changeset/slimy-rings-type.md

diff --git a/.changeset/slimy-rings-type.md b/.changeset/slimy-rings-type.md
new file mode 100644
index 00000000000..a391897c171
--- /dev/null
+++ b/.changeset/slimy-rings-type.md
@@ -0,0 +1,5 @@
+---
+"@keystone-next/auth": patch
+---
+
+Don't fill `context.session` if the session is invalid.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index c13017c156a..91fe87573c4 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -20,14 +20,16 @@ jobs:
           filters: |
             shouldRunTests:
               - '!{{design-system}/**,**/*.md}'
+
       - run: echo "SHOULD_RUN_TESTS=$SHOULD_RUN" >> $GITHUB_ENV
         if: github.event_name == 'pull_request'
         env:
           SHOULD_RUN: ${{ steps.filter.outputs.shouldRunTests }}
+
       - run: echo "SHOULD_RUN_TESTS=true" >> $GITHUB_ENV
         if: github.event_name != 'pull_request'
 
-  graphql-api-tests:
+  graphql_api_tests:
     name: API Tests
     needs: should_run_tests
     runs-on: ubuntu-latest
@@ -75,6 +77,7 @@ jobs:
       - name: Install Dependencies
         run: yarn
         if: needs.should_run_tests.outputs.shouldRunTests == 'true'
+
       - name: Unit tests
         if: needs.should_run_tests.outputs.shouldRunTests == 'true'
         run: yarn jest --ci --runInBand api-tests
@@ -87,7 +90,7 @@ jobs:
           TEST_ADAPTER: ${{ matrix.adapter }}
           DATABASE_URL: ${{ matrix.adapter == 'sqlite' && 'file:./dev.db' || 'postgres://keystone5:k3yst0n3@localhost:5432/test_db' }}
 
-  non-api-tests:
+  unit_tests:
     name: Package Unit Tests
     needs: should_run_tests
     runs-on: ubuntu-latest
@@ -129,6 +132,7 @@ jobs:
 
       - name: Install Dependencies
         run: yarn
+
       - name: Unit tests
         run: yarn jest --ci --runInBand --testPathIgnorePatterns=admin-ui-tests --testPathIgnorePatterns=api-tests --testPathIgnorePatterns=examples-smoke-tests --testPathIgnorePatterns=examples/testing
         env:
@@ -136,7 +140,7 @@ jobs:
           CLOUDINARY_KEY: ${{ secrets.CLOUDINARY_KEY }}
           CLOUDINARY_SECRET: ${{ secrets.CLOUDINARY_SECRET }}
 
-  example-testing:
+  examples_tests:
     name: Testing example project
     needs: should_run_tests
     runs-on: ubuntu-latest
@@ -167,7 +171,8 @@ jobs:
 
       - name: Install Dependencies
         run: yarn
-      - name: Unit tests
+
+      - name: Example unit tests
         run: cd examples/testing; yarn test
 
   examples_smoke_tests:
@@ -229,12 +234,15 @@ jobs:
       - name: Install Dependencies
         if: needs.should_run_tests.outputs.shouldRunTests == 'true'
         run: yarn
+
       - name: Install Dependencies of Browsers
         if: needs.should_run_tests.outputs.shouldRunTests == 'true'
         run: npx playwright install-deps
+
       - name: Install Browsers
         if: needs.should_run_tests.outputs.shouldRunTests == 'true'
         run: npx playwright install
+
       - name: Unit tests
         if: needs.should_run_tests.outputs.shouldRunTests == 'true'
         run: yarn jest --ci --runInBand tests/examples-smoke-tests/${{ matrix.test }}
@@ -286,12 +294,15 @@ jobs:
       - name: Install Dependencies
         if: needs.should_run_tests.outputs.shouldRunTests == 'true'
         run: yarn
+
       - name: Install Dependencies of Browsers
         if: needs.should_run_tests.outputs.shouldRunTests == 'true'
         uses: microsoft/playwright-github-action@v1
+
       - name: Install Browsers for Playwright
         if: needs.should_run_tests.outputs.shouldRunTests == 'true'
         run: node ./node_modules/playwright/install.js
+
       - name: Unit tests
         if: needs.should_run_tests.outputs.shouldRunTests == 'true'
         run: yarn jest --ci --runInBand tests/admin-ui-tests/${{ matrix.test }}
@@ -324,17 +335,24 @@ jobs:
 
       - name: Install Dependencies
         run: yarn
+
       - name: Prettier
         run: yarn lint:prettier
+
       - name: TypeScript
         run: yarn lint:types
+
       - name: ESLint
         run: yarn lint:eslint
+
       - name: Preconstruct
         run: yarn build
+
       - name: Remark
         run: yarn lint:markdown
+
       - name: Example schemas
         run: yarn lint:examples
+
       - name: Prisma Filters
         run: yarn lint:filters
diff --git a/examples-staging/auth/schema.ts b/examples-staging/auth/schema.ts
index 77e56382581..ab7d6d8a74b 100644
--- a/examples-staging/auth/schema.ts
+++ b/examples-staging/auth/schema.ts
@@ -6,12 +6,12 @@ export const lists = {
     access: {
       operation: {
         // Only allow admins to delete users
-        delete: ({ session }) => session?.data?.isAdmin,
+        delete: ({ session }) => session?.data.isAdmin,
       },
     },
     ui: {
       // Since you can't delete users unless you're an admin, we hide the UI for it
-      hideDelete: ({ session }) => !session?.data?.isAdmin,
+      hideDelete: ({ session }) => !session?.data.isAdmin,
       listView: {
         // These are the default columns that will be displayed in the list view
         initialColumns: ['name', 'email', 'isAdmin'],
@@ -34,7 +34,7 @@ export const lists = {
           // Based on the same logic as update access, the password field is editable.
           // The password field is hidden from non-Admin users (except for themselves)
           // createView: {
-          //   fieldMode: ({ session }) => (session?.data?.isAdmin ? 'edit' : 'hidden'),
+          //   fieldMode: ({ session }) => (session?.data.isAdmin ? 'edit' : 'hidden'),
           // },
           itemView: {
             fieldMode: ({ session, item }) =>
diff --git a/examples-staging/basic/schema.ts b/examples-staging/basic/schema.ts
index 9715c9c2f44..bfb22a4775e 100644
--- a/examples-staging/basic/schema.ts
+++ b/examples-staging/basic/schema.ts
@@ -16,20 +16,20 @@ import { KeystoneListsAPI } from '@keystone-next/keystone/types';
 import { componentBlocks } from './admin/fieldViews/Content';
 import { KeystoneListsTypeInfo } from '.keystone/types';
 
-// TODO: Can we generate this type based on sessionData in the main config?
 type AccessArgs = {
   session?: {
     itemId?: string;
     listKey?: string;
-    data?: {
+    data: {
       name?: string;
       isAdmin: boolean;
     };
   };
   item?: any;
 };
+
 export const access = {
-  isAdmin: ({ session }: AccessArgs) => !!session?.data?.isAdmin,
+  isAdmin: ({ session }: AccessArgs) => !!session?.data.isAdmin,
 };
 
 const randomNumber = () => Math.round(Math.random() * 10);
diff --git a/examples-staging/ecommerce/keystone.ts b/examples-staging/ecommerce/keystone.ts
index fc00f027cf7..ae3f3d96e66 100644
--- a/examples-staging/ecommerce/keystone.ts
+++ b/examples-staging/ecommerce/keystone.ts
@@ -71,9 +71,7 @@ export default withAuth(
     extendGraphqlSchema,
     ui: {
       // Show the UI only for poeple who pass this test
-      isAccessAllowed: ({ session }) =>
-        // console.log(session);
-        !!session?.data,
+      isAccessAllowed: ({ session }) => !!session,
     },
     session: statelessSessions(sessionConfig),
   })
diff --git a/examples-staging/graphql-api-endpoint/keystone.ts b/examples-staging/graphql-api-endpoint/keystone.ts
index 13357e28f09..eda05b0af70 100644
--- a/examples-staging/graphql-api-endpoint/keystone.ts
+++ b/examples-staging/graphql-api-endpoint/keystone.ts
@@ -37,7 +37,7 @@ export default auth.withAuth(
       url: process.env.DATABASE_URL || 'postgres://username:password@localhost/database-name',
     },
     ui: {
-      isAccessAllowed: context => !!context.session?.data,
+      isAccessAllowed: context => !!context.session,
     },
     lists,
     session: statelessSessions({ maxAge: sessionMaxAge, secret: sessionSecret }),
diff --git a/packages/auth/src/index.ts b/packages/auth/src/index.ts
index 619f7789221..e18bf9565a2 100644
--- a/packages/auth/src/index.ts
+++ b/packages/auth/src/index.ts
@@ -232,20 +232,17 @@ export function createAuth<GeneratedListTypes extends BaseGeneratedListTypes>({
           return;
         }
 
-        // NOTE: This is wrapped in a try-catch block because a "not found" result will currently
-        // throw; I think this needs to be reviewed, but for now this prevents a system crash when
-        // the session item is invalid
         try {
-          // If no field selection is specified, just load the id. We still load the item,
-          // because doing so validates that it exists in the database
           const data = await sudoContext.query[listKey].findOne({
             where: { id: session.itemId },
             query: sessionData || 'id',
           });
+          if (!data) return;
+
           return { ...session, itemId: session.itemId, listKey, data };
         } catch (e) {
-          // TODO: This swallows all errors, we need a way to differentiate between "not found" and
-          // actual exceptions that should be thrown
+          // TODO: the assumption is this should only be from an invalid sessionData configuration
+          //   it could be something else though, either way, result is a bad session
           return;
         }
       },
@@ -292,10 +289,10 @@ export function createAuth<GeneratedListTypes extends BaseGeneratedListTypes>({
         },
       };
     }
-    let session = keystoneConfig.session;
-    if (session && sessionData) {
-      session = withItemData(session);
-    }
+
+    if (!keystoneConfig.session) throw new TypeError('Missing .session configuration');
+    const session = withItemData(keystoneConfig.session);
+
     const existingExtendGraphQLSchema = keystoneConfig.extendGraphqlSchema;
     const listConfig = keystoneConfig.lists[listKey];
     return {
diff --git a/tests/api-tests/auth-header.test.ts b/tests/api-tests/auth-header.test.ts
index 67e35180eab..bb4f70b0c0a 100644
--- a/tests/api-tests/auth-header.test.ts
+++ b/tests/api-tests/auth-header.test.ts
@@ -4,55 +4,58 @@ import { statelessSessions } from '@keystone-next/keystone/session';
 import { createAuth } from '@keystone-next/auth';
 import type { KeystoneContext } from '@keystone-next/keystone/types';
 import { setupTestRunner, TestArgs, setupTestEnv } from '@keystone-next/keystone/testing';
-import { apiTestConfig, expectAccessDenied } from './utils';
+import { apiTestConfig, expectAccessDenied, seed } from './utils';
 
 const initialData = {
   User: [
-    { name: 'Boris Bozic', email: 'boris@keystone.com', password: 'correctbattery' },
-    { name: 'Jed Watson', email: 'jed@keystone.com', password: 'horsestaple' },
+    { name: 'Boris Bozic', email: 'boris@keystonejs.com', password: 'correctbattery' },
+    { name: 'Jed Watson', email: 'jed@keystonejs.com', password: 'horsestaple' },
   ],
 };
 
 const COOKIE_SECRET = 'qwertyuiopasdfghjlkzxcvbmnm1234567890';
-const defaultAccess = ({ context }: { context: KeystoneContext }) => !!context.session?.data;
+const defaultAccess = ({ context }: { context: KeystoneContext }) => !!context.session;
 
-const auth = createAuth({
-  listKey: 'User',
-  identityField: 'email',
-  secretField: 'password',
-  sessionData: 'id',
-});
+function setup(options?: any) {
+  const auth = createAuth({
+    listKey: 'User',
+    identityField: 'email',
+    secretField: 'password',
+    sessionData: 'id',
+    ...options,
+  });
 
-const runner = setupTestRunner({
-  config: auth.withAuth(
-    apiTestConfig({
-      lists: {
-        Post: list({
-          fields: {
-            title: text(),
-            postedAt: timestamp(),
-          },
-        }),
-        User: list({
-          fields: {
-            name: text(),
-            email: text({ isIndexed: 'unique' }),
-            password: password(),
-          },
-          access: {
-            operation: {
-              create: defaultAccess,
-              query: defaultAccess,
-              update: defaultAccess,
-              delete: defaultAccess,
+  return setupTestRunner({
+    config: auth.withAuth(
+      apiTestConfig({
+        lists: {
+          Post: list({
+            fields: {
+              title: text(),
+              postedAt: timestamp(),
             },
-          },
-        }),
-      },
-      session: statelessSessions({ secret: COOKIE_SECRET }),
-    })
-  ),
-});
+          }),
+          User: list({
+            fields: {
+              name: text(),
+              email: text({ isIndexed: 'unique' }),
+              password: password(),
+            },
+            access: {
+              operation: {
+                create: defaultAccess,
+                query: defaultAccess,
+                update: defaultAccess,
+                delete: defaultAccess,
+              },
+            },
+          }),
+        },
+        session: statelessSessions({ secret: COOKIE_SECRET }),
+      })
+    ),
+  });
+}
 
 async function login(
   graphQLRequest: TestArgs['graphQLRequest'],
@@ -78,17 +81,14 @@ async function login(
 describe('Auth testing', () => {
   test(
     'Gives access denied when not logged in',
-    runner(async ({ context }) => {
-      // seed the db
-      for (const [listKey, data] of Object.entries(initialData)) {
-        await context.sudo().query[listKey].createMany({ data });
-      }
+    setup()(async ({ context }) => {
+      await seed(context, initialData);
       const { data, errors } = await context.graphql.raw({ query: '{ users { id } }' });
       expect(data).toEqual({ users: [] });
       expect(errors).toBe(undefined);
 
       const result = await context.graphql.raw({
-        query: `mutation { updateUser(where: { email: "boris@keystone.com" }, data: { password: "new_password" }) { id } }`,
+        query: `mutation { updateUser(where: { email: "boris@keystonejs.com" }, data: { password: "new_password" }) { id } }`,
       });
       expect(result.data).toEqual({ updateUser: null });
       expectAccessDenied(result.errors, [
@@ -133,10 +133,8 @@ describe('Auth testing', () => {
   describe('logged in', () => {
     test(
       'Allows access with bearer token',
-      runner(async ({ context, graphQLRequest }) => {
-        for (const [listKey, data] of Object.entries(initialData)) {
-          await context.sudo().query[listKey].createMany({ data });
-        }
+      setup()(async ({ context, graphQLRequest }) => {
+        await seed(context, initialData);
         const { sessionToken } = await login(
           graphQLRequest,
           initialData.User[0].email,
@@ -157,10 +155,8 @@ describe('Auth testing', () => {
 
     test(
       'Allows access with cookie',
-      runner(async ({ context, graphQLRequest }) => {
-        for (const [listKey, data] of Object.entries(initialData)) {
-          await context.sudo().query[listKey].createMany({ data });
-        }
+      setup()(async ({ context, graphQLRequest }) => {
+        await seed(context, initialData);
         const { sessionToken } = await login(
           graphQLRequest,
           initialData.User[0].email,
@@ -179,5 +175,87 @@ describe('Auth testing', () => {
         expect(errors).toBe(undefined);
       })
     );
+
+    test(
+      'Invalid session receives nothing',
+      setup()(async ({ context, graphQLRequest }) => {
+        await seed(context, initialData);
+        const { body } = await graphQLRequest({ query: '{ users { id } }' }).set(
+          'Cookie',
+          `keystonejs-session=invalidfoo`
+        );
+
+        const { data, errors } = body;
+        expect(data).toHaveProperty('users');
+        expect(data.users).toHaveLength(0); // nothing
+        expect(errors).toBe(undefined);
+      })
+    );
+
+    test(
+      'Session is dropped if user is removed',
+      setup()(async ({ context, graphQLRequest }) => {
+        const { User: users } = await seed(context, initialData);
+        const { sessionToken } = await login(
+          graphQLRequest,
+          initialData.User[0].email,
+          initialData.User[0].password
+        );
+
+        {
+          const { body } = await graphQLRequest({ query: '{ users { id } }' }).set(
+            'Cookie',
+            `keystonejs-session=${sessionToken}` // still valid
+          );
+
+          const { data, errors } = body;
+          expect(data).toHaveProperty('users');
+          expect(data.users).toHaveLength(2); // something
+          expect(errors).toBe(undefined);
+        }
+
+        // delete the user we authenticated for
+        await graphQLRequest({
+          query: `mutation ($id: ID!) { deleteUser(where: { id: $id }) { id } }`,
+          variables: { id: users[0]?.id },
+        }).set('Cookie', `keystonejs-session=${sessionToken}`);
+
+        {
+          const { body } = await graphQLRequest({ query: '{ users { id } }' }).set(
+            'Cookie',
+            `keystonejs-session=${sessionToken}` // now invalid
+          );
+
+          const { data, errors } = body;
+          expect(data).toHaveProperty('users');
+          expect(data.users).toHaveLength(0); // nothing
+          expect(errors).toBe(undefined);
+        }
+      })
+    );
+
+    test(
+      'Session is dropped if sessionData configuration is invalid',
+      setup({
+        sessionData: 'id foo', // foo does not exist
+      })(async ({ context, graphQLRequest }) => {
+        await seed(context, initialData);
+        const { sessionToken } = await login(
+          graphQLRequest,
+          initialData.User[0].email,
+          initialData.User[0].password
+        );
+
+        const { body } = await graphQLRequest({ query: '{ users { id } }' }).set(
+          'Cookie',
+          `keystonejs-session=${sessionToken}`
+        );
+
+        const { data, errors } = body;
+        expect(data).toHaveProperty('users');
+        expect(data.users).toHaveLength(0); // nothing
+        expect(errors).toBe(undefined);
+      })
+    );
   });
 });
diff --git a/tests/api-tests/auth.test.ts b/tests/api-tests/auth.test.ts
index f09484348b2..8cfcd655d92 100644
--- a/tests/api-tests/auth.test.ts
+++ b/tests/api-tests/auth.test.ts
@@ -3,14 +3,13 @@ import { list } from '@keystone-next/keystone';
 import { statelessSessions } from '@keystone-next/keystone/session';
 import { createAuth } from '@keystone-next/auth';
 import { setupTestRunner, TestArgs } from '@keystone-next/keystone/testing';
-import { KeystoneContext } from '@keystone-next/keystone/types';
-import { apiTestConfig, expectInternalServerError, expectValidationError } from './utils';
+import { apiTestConfig, expectInternalServerError, expectValidationError, seed } from './utils';
 
 const initialData = {
   User: [
-    { name: 'Boris Bozic', email: 'boris@keystone.com', password: 'correctbattery' },
-    { name: 'Jed Watson', email: 'jed@keystone.com', password: 'horsestaple' },
-    { name: 'Bad User', email: 'bad@keystone.com', password: 'incorrectbattery' },
+    { name: 'Boris Bozic', email: 'boris@keystonejs.com', password: 'correctbattery' },
+    { name: 'Jed Watson', email: 'jed@keystonejs.com', password: 'horsestaple' },
+    { name: 'Bad User', email: 'bad@keystonejs.com', password: 'incorrectbattery' },
   ],
 };
 
@@ -26,7 +25,7 @@ const auth = createAuth({
   initFirstItem: { fields: ['email', 'password'], itemData: { name: 'First User' } },
   magicAuthLink: {
     sendToken: async ({ identity, token }) => {
-      if (identity === 'bad@keystone.com') {
+      if (identity === 'bad@keystonejs.com') {
         throw new Error('Error in sendToken');
       }
       MAGIC_TOKEN = token;
@@ -35,7 +34,7 @@ const auth = createAuth({
   },
   passwordResetLink: {
     sendToken: async ({ identity, token }) => {
-      if (identity === 'bad@keystone.com') {
+      if (identity === 'bad@keystonejs.com') {
         throw new Error('Error in sendToken');
       }
       MAGIC_TOKEN = token;
@@ -84,21 +83,15 @@ async function authenticateWithPassword(
   });
 }
 
-async function initialiseData(context: KeystoneContext) {
-  return context.query.User.createMany({ data: initialData.User });
-}
-
 describe('Auth testing', () => {
   describe('authenticateItemWithPassword', () => {
     test(
       'Success - set token in header and return value',
       runner(async ({ context, graphQLRequest }) => {
-        // seed the db
-        const users = await initialiseData(context);
-
+        const { User: users } = await seed(context, initialData);
         const { body, res } = (await authenticateWithPassword(
           graphQLRequest,
-          'boris@keystone.com',
+          'boris@keystonejs.com',
           'correctbattery'
         )) as any;
 
@@ -119,12 +112,11 @@ describe('Auth testing', () => {
     test(
       'Failure - bad password',
       runner(async ({ context, graphQLRequest }) => {
-        // seed the db
-        await initialiseData(context);
+        await seed(context, initialData);
 
         const { body, res } = (await authenticateWithPassword(
           graphQLRequest,
-          'boris@keystone.com',
+          'boris@keystonejs.com',
           'incorrectbattery'
         )) as any;
 
@@ -142,12 +134,11 @@ describe('Auth testing', () => {
     test(
       'Failure - bad identify value',
       runner(async ({ context, graphQLRequest }) => {
-        // seed the db
-        await initialiseData(context);
+        await seed(context, initialData);
 
         const { body, res } = (await authenticateWithPassword(
           graphQLRequest,
-          'bort@keystone.com',
+          'bort@keystonejs.com',
           'correctbattery'
         )) as any;
 
@@ -194,8 +185,7 @@ describe('Auth testing', () => {
     test(
       'Failure - items already exist',
       runner(async ({ context, graphQLRequest }) => {
-        // seed the db
-        await initialiseData(context);
+        await seed(context, initialData);
 
         const { body, res } = (await graphQLRequest({
           query: `
@@ -255,7 +245,7 @@ describe('Auth testing', () => {
     test(
       'sendItemMagicAuthLink - Success',
       runner(async ({ context, graphQLRequest }) => {
-        await initialiseData(context);
+        await seed(context, initialData);
 
         const { body } = await graphQLRequest({
           query: `
@@ -263,14 +253,14 @@ describe('Auth testing', () => {
               sendUserMagicAuthLink(email: $email)
             }
           `,
-          variables: { email: 'boris@keystone.com' },
+          variables: { email: 'boris@keystonejs.com' },
         });
         expect(body.errors).toBe(undefined);
         expect(body.data).toEqual({ sendUserMagicAuthLink: true });
 
         // Verify that token fields cant be read.
         let user = await context.query.User.findOne({
-          where: { email: 'boris@keystone.com' },
+          where: { email: 'boris@keystonejs.com' },
           query: 'magicAuthToken { isSet } magicAuthIssuedAt magicAuthRedeemedAt',
         });
         expect(user).toEqual({
@@ -281,7 +271,7 @@ describe('Auth testing', () => {
 
         // Verify that token fields have been updated
         user = await context.sudo().query.User.findOne({
-          where: { email: 'boris@keystone.com' },
+          where: { email: 'boris@keystonejs.com' },
           query: 'magicAuthToken { isSet } magicAuthIssuedAt magicAuthRedeemedAt',
         });
         expect(user).toEqual({
@@ -294,7 +284,7 @@ describe('Auth testing', () => {
     test(
       'sendItemMagicAuthLink - Failure - missing user',
       runner(async ({ context, graphQLRequest }) => {
-        await initialiseData(context);
+        await seed(context, initialData);
 
         const { body } = await graphQLRequest({
           query: `
@@ -302,7 +292,7 @@ describe('Auth testing', () => {
               sendUserMagicAuthLink(email: $email)
             }
           `,
-          variables: { email: 'bores@keystone.com' },
+          variables: { email: 'bores@keystonejs.com' },
         });
         expect(body.errors).toBe(undefined);
         expect(body.data).toEqual({ sendUserMagicAuthLink: true });
@@ -311,7 +301,7 @@ describe('Auth testing', () => {
     test(
       'sendItemMagicAuthLink - Failure - Error in sendToken',
       runner(async ({ context, graphQLRequest }) => {
-        await initialiseData(context);
+        await seed(context, initialData);
 
         const { body } = await graphQLRequest({
           query: `
@@ -319,7 +309,7 @@ describe('Auth testing', () => {
               sendUserMagicAuthLink(email: $email)
             }
           `,
-          variables: { email: 'bad@keystone.com' },
+          variables: { email: 'bad@keystonejs.com' },
         });
         expect(body.data).toEqual(null);
         expectInternalServerError(body.errors, false, [
@@ -328,7 +318,7 @@ describe('Auth testing', () => {
 
         // Verify that token fields have been updated
         const user = await context.sudo().query.User.findOne({
-          where: { email: 'bad@keystone.com' },
+          where: { email: 'bad@keystonejs.com' },
           query: 'magicAuthToken { isSet } magicAuthIssuedAt magicAuthRedeemedAt',
         });
         expect(user).toEqual({
@@ -342,14 +332,14 @@ describe('Auth testing', () => {
     test(
       'redeemItemMagicAuthToken - Success',
       runner(async ({ context, graphQLRequest }) => {
-        await initialiseData(context);
+        await seed(context, initialData);
         await graphQLRequest({
           query: `
             mutation($email: String!) {
               sendUserMagicAuthLink(email: $email)
             }
           `,
-          variables: { email: 'boris@keystone.com' },
+          variables: { email: 'boris@keystonejs.com' },
         });
 
         const { body } = await graphQLRequest({
@@ -365,12 +355,12 @@ describe('Auth testing', () => {
               }
             }
           `,
-          variables: { email: 'boris@keystone.com', token: MAGIC_TOKEN },
+          variables: { email: 'boris@keystonejs.com', token: MAGIC_TOKEN },
         });
         // Veryify we get back a token for the expected user.
 
         const user = await context.sudo().query.User.findOne({
-          where: { email: 'boris@keystone.com' },
+          where: { email: 'boris@keystonejs.com' },
           query: 'id magicAuthToken { isSet } magicAuthIssuedAt magicAuthRedeemedAt',
         });
         expect(body.errors).toBe(undefined);
@@ -389,7 +379,7 @@ describe('Auth testing', () => {
     test(
       'redeemItemMagicAuthToken - Failure - bad token',
       runner(async ({ context, graphQLRequest }) => {
-        await initialiseData(context);
+        await seed(context, initialData);
         await graphQLRequest({
           query: `
             mutation($email: String!) {
@@ -398,7 +388,7 @@ describe('Auth testing', () => {
               }
             }
           `,
-          variables: { email: 'boris@keystone.com' },
+          variables: { email: 'boris@keystonejs.com' },
         });
 
         const { body } = await graphQLRequest({
@@ -414,7 +404,7 @@ describe('Auth testing', () => {
               }
             }
           `,
-          variables: { email: 'boris@keystone.com', token: 'BAD TOKEN' },
+          variables: { email: 'boris@keystonejs.com', token: 'BAD TOKEN' },
         });
         // Generic failure message
         expect(body.errors).toBe(undefined);
@@ -429,14 +419,14 @@ describe('Auth testing', () => {
     test(
       'redeemItemMagicAuthToken - Failure - non-existent user',
       runner(async ({ context, graphQLRequest }) => {
-        await initialiseData(context);
+        await seed(context, initialData);
         await graphQLRequest({
           query: `
             mutation($email: String!) {
               sendUserMagicAuthLink(email: $email)
             }
           `,
-          variables: { email: 'boris@keystone.com' },
+          variables: { email: 'boris@keystonejs.com' },
         });
 
         const { body } = await graphQLRequest({
@@ -452,7 +442,7 @@ describe('Auth testing', () => {
               }
             }
           `,
-          variables: { email: 'missing@keystone.com', token: 'BAD TOKEN' },
+          variables: { email: 'missing@keystonejs.com', token: 'BAD TOKEN' },
         });
         // Generic failure message
         expect(body.errors).toBe(undefined);
@@ -467,14 +457,14 @@ describe('Auth testing', () => {
     test(
       'redeemItemMagicAuthToken - Failure - already redemmed',
       runner(async ({ context, graphQLRequest }) => {
-        await initialiseData(context);
+        await seed(context, initialData);
         await graphQLRequest({
           query: `
             mutation($email: String!) {
               sendUserMagicAuthLink(email: $email)
             }
           `,
-          variables: { email: 'boris@keystone.com' },
+          variables: { email: 'boris@keystonejs.com' },
         });
         // Redeem once
         await graphQLRequest({
@@ -490,7 +480,7 @@ describe('Auth testing', () => {
               }
             }
           `,
-          variables: { email: 'boris@keystone.com', token: MAGIC_TOKEN },
+          variables: { email: 'boris@keystonejs.com', token: MAGIC_TOKEN },
         });
         // Redeem twice
         const { body } = await graphQLRequest({
@@ -506,7 +496,7 @@ describe('Auth testing', () => {
               }
             }
           `,
-          variables: { email: 'boris@keystone.com', token: MAGIC_TOKEN },
+          variables: { email: 'boris@keystonejs.com', token: MAGIC_TOKEN },
         });
         // Generic failure message
         expect(body.errors).toBe(undefined);
@@ -522,18 +512,18 @@ describe('Auth testing', () => {
     test(
       'redeemItemMagicAuthToken - Failure - Token expired',
       runner(async ({ context, graphQLRequest }) => {
-        await initialiseData(context);
+        await seed(context, initialData);
         await graphQLRequest({
           query: `
             mutation($email: String!) {
               sendUserMagicAuthLink(email: $email)
             }
           `,
-          variables: { email: 'boris@keystone.com' },
+          variables: { email: 'boris@keystonejs.com' },
         });
         // Set the "issued at" date to 59 minutes ago
         let user = await context.sudo().query.User.updateOne({
-          where: { email: 'boris@keystone.com' },
+          where: { email: 'boris@keystonejs.com' },
           data: { magicAuthIssuedAt: new Date(Number(new Date()) - 59 * 60 * 1000).toISOString() },
         });
         const { body } = await graphQLRequest({
@@ -549,7 +539,7 @@ describe('Auth testing', () => {
               }
             }
           `,
-          variables: { email: 'boris@keystone.com', token: MAGIC_TOKEN },
+          variables: { email: 'boris@keystonejs.com', token: MAGIC_TOKEN },
         });
 
         expect(body.errors).toBe(undefined);
@@ -564,11 +554,11 @@ describe('Auth testing', () => {
               sendUserMagicAuthLink(email: $email)
             }
           `,
-          variables: { email: 'boris@keystone.com' },
+          variables: { email: 'boris@keystonejs.com' },
         });
         // Set the "issued at" date to 61 minutes ago
         user = await context.sudo().query.User.updateOne({
-          where: { email: 'boris@keystone.com' },
+          where: { email: 'boris@keystonejs.com' },
           data: { magicAuthIssuedAt: new Date(Number(new Date()) - 61 * 60 * 1000).toISOString() },
         });
         const result = await graphQLRequest({
@@ -584,7 +574,7 @@ describe('Auth testing', () => {
               }
             }
           `,
-          variables: { email: 'boris@keystone.com', token: MAGIC_TOKEN },
+          variables: { email: 'boris@keystonejs.com', token: MAGIC_TOKEN },
         });
 
         expect(result.body.errors).toBe(undefined);
@@ -602,7 +592,7 @@ describe('Auth testing', () => {
     test(
       'sendItemPasswordResetLink - Success',
       runner(async ({ context, graphQLRequest }) => {
-        await initialiseData(context);
+        await seed(context, initialData);
 
         const { body } = await graphQLRequest({
           query: `
@@ -610,14 +600,14 @@ describe('Auth testing', () => {
               sendUserPasswordResetLink(email: $email)
             }
           `,
-          variables: { email: 'boris@keystone.com' },
+          variables: { email: 'boris@keystonejs.com' },
         });
         expect(body.errors).toBe(undefined);
         expect(body.data).toEqual({ sendUserPasswordResetLink: true });
 
         // Verify that token fields cant be read.
         let user = await context.query.User.findOne({
-          where: { email: 'boris@keystone.com' },
+          where: { email: 'boris@keystonejs.com' },
           query: 'passwordResetToken { isSet } passwordResetIssuedAt passwordResetRedeemedAt',
         });
         expect(user).toEqual({
@@ -628,7 +618,7 @@ describe('Auth testing', () => {
 
         // Verify that token fields have been updated
         user = await context.sudo().query.User.findOne({
-          where: { email: 'boris@keystone.com' },
+          where: { email: 'boris@keystonejs.com' },
           query: 'passwordResetToken { isSet } passwordResetIssuedAt passwordResetRedeemedAt',
         });
         expect(user).toEqual({
@@ -642,7 +632,7 @@ describe('Auth testing', () => {
     test(
       'sendItemPasswordResetLink - Failure - missing user',
       runner(async ({ context, graphQLRequest }) => {
-        await initialiseData(context);
+        await seed(context, initialData);
 
         const { body } = await graphQLRequest({
           query: `
@@ -650,7 +640,7 @@ describe('Auth testing', () => {
               sendUserPasswordResetLink(email: $email)
             }
           `,
-          variables: { email: 'bores@keystone.com' },
+          variables: { email: 'bores@keystonejs.com' },
         });
         expect(body.errors).toBe(undefined);
         expect(body.data).toEqual({ sendUserPasswordResetLink: true });
@@ -659,7 +649,7 @@ describe('Auth testing', () => {
     test(
       'sendItemPasswordResetLink - Failure - Error in sendToken',
       runner(async ({ context, graphQLRequest }) => {
-        await initialiseData(context);
+        await seed(context, initialData);
 
         const { body } = await graphQLRequest({
           query: `
@@ -667,7 +657,7 @@ describe('Auth testing', () => {
               sendUserPasswordResetLink(email: $email)
             }
           `,
-          variables: { email: 'bad@keystone.com' },
+          variables: { email: 'bad@keystonejs.com' },
         });
         expect(body.data).toEqual(null);
         expectInternalServerError(body.errors, false, [
@@ -676,7 +666,7 @@ describe('Auth testing', () => {
 
         // Verify that token fields have been updated
         const user = await context.sudo().query.User.findOne({
-          where: { email: 'bad@keystone.com' },
+          where: { email: 'bad@keystonejs.com' },
           query: 'passwordResetToken { isSet } passwordResetIssuedAt passwordResetRedeemedAt',
         });
         expect(user).toEqual({
@@ -690,14 +680,14 @@ describe('Auth testing', () => {
     test(
       'redeemItemPasswordToken - Success',
       runner(async ({ context, graphQLRequest }) => {
-        await initialiseData(context);
+        await seed(context, initialData);
         await graphQLRequest({
           query: `
             mutation($email: String!) {
               sendUserPasswordResetLink(email: $email)
             }
           `,
-          variables: { email: 'boris@keystone.com' },
+          variables: { email: 'boris@keystonejs.com' },
         });
 
         const { body } = await graphQLRequest({
@@ -708,12 +698,16 @@ describe('Auth testing', () => {
               }
             }
           `,
-          variables: { email: 'boris@keystone.com', token: MAGIC_TOKEN, password: 'NEW PASSWORD' },
+          variables: {
+            email: 'boris@keystonejs.com',
+            token: MAGIC_TOKEN,
+            password: 'NEW PASSWORD',
+          },
         });
         // Veryify we get back a token for the expected user.
 
         const user = await context.sudo().query.User.findOne({
-          where: { email: 'boris@keystone.com' },
+          where: { email: 'boris@keystonejs.com' },
           query:
             'id passwordResetToken { isSet } passwordResetIssuedAt passwordResetRedeemedAt password { isSet }',
         });
@@ -732,14 +726,14 @@ describe('Auth testing', () => {
     test(
       'redeemItemPasswordToken - Failure - bad token',
       runner(async ({ context, graphQLRequest }) => {
-        await initialiseData(context);
+        await seed(context, initialData);
         await graphQLRequest({
           query: `
             mutation($email: String!) {
               sendUserPasswordResetLink(email: $email)
             }
           `,
-          variables: { email: 'boris@keystone.com' },
+          variables: { email: 'boris@keystonejs.com' },
         });
 
         const { body } = await graphQLRequest({
@@ -750,7 +744,11 @@ describe('Auth testing', () => {
               }
             }
           `,
-          variables: { email: 'boris@keystone.com', token: 'BAD TOKEN', password: 'NEW PASSWORD' },
+          variables: {
+            email: 'boris@keystonejs.com',
+            token: 'BAD TOKEN',
+            password: 'NEW PASSWORD',
+          },
         });
         // Generic failure message
         expect(body.errors).toBe(undefined);
@@ -765,14 +763,14 @@ describe('Auth testing', () => {
     test(
       'redeemItemPasswordToken - Failure - non-existent user',
       runner(async ({ context, graphQLRequest }) => {
-        await initialiseData(context);
+        await seed(context, initialData);
         await graphQLRequest({
           query: `
             mutation($email: String!) {
               sendUserPasswordResetLink(email: $email)
             }
           `,
-          variables: { email: 'boris@keystone.com' },
+          variables: { email: 'boris@keystonejs.com' },
         });
 
         const { body } = await graphQLRequest({
@@ -784,7 +782,7 @@ describe('Auth testing', () => {
             }
           `,
           variables: {
-            email: 'missing@keystone.com',
+            email: 'missing@keystonejs.com',
             token: 'BAD TOKEN',
             password: 'NEW PASSWORD',
           },
@@ -802,14 +800,14 @@ describe('Auth testing', () => {
     test(
       'redeemItemPasswordToken - Failure - already redemmed',
       runner(async ({ context, graphQLRequest }) => {
-        await initialiseData(context);
+        await seed(context, initialData);
         await graphQLRequest({
           query: `
             mutation($email: String!) {
               sendUserPasswordResetLink(email: $email)
             }
           `,
-          variables: { email: 'boris@keystone.com' },
+          variables: { email: 'boris@keystonejs.com' },
         });
         // Redeem once
         await graphQLRequest({
@@ -820,7 +818,11 @@ describe('Auth testing', () => {
               }
             }
           `,
-          variables: { email: 'boris@keystone.com', token: MAGIC_TOKEN, password: 'NEW PASSWORD' },
+          variables: {
+            email: 'boris@keystonejs.com',
+            token: MAGIC_TOKEN,
+            password: 'NEW PASSWORD',
+          },
         });
         // Redeem twice
         const { body } = await graphQLRequest({
@@ -831,7 +833,11 @@ describe('Auth testing', () => {
               }
             }
           `,
-          variables: { email: 'boris@keystone.com', token: MAGIC_TOKEN, password: 'NEW PASSWORD' },
+          variables: {
+            email: 'boris@keystonejs.com',
+            token: MAGIC_TOKEN,
+            password: 'NEW PASSWORD',
+          },
         });
         // Generic failure message
         expect(body.errors).toBe(undefined);
@@ -847,18 +853,18 @@ describe('Auth testing', () => {
     test(
       'redeemItemPasswordToken - Failure - Token expired',
       runner(async ({ context, graphQLRequest }) => {
-        await initialiseData(context);
+        await seed(context, initialData);
         await graphQLRequest({
           query: `
             mutation($email: String!) {
               sendUserPasswordResetLink(email: $email)
             }
           `,
-          variables: { email: 'boris@keystone.com' },
+          variables: { email: 'boris@keystonejs.com' },
         });
         // Set the "issued at" date to 59 minutes ago
         await context.sudo().query.User.updateOne({
-          where: { email: 'boris@keystone.com' },
+          where: { email: 'boris@keystonejs.com' },
           data: {
             passwordResetIssuedAt: new Date(Number(new Date()) - 59 * 60 * 1000).toISOString(),
           },
@@ -871,7 +877,11 @@ describe('Auth testing', () => {
               }
             }
           `,
-          variables: { email: 'boris@keystone.com', token: MAGIC_TOKEN, password: 'NEW PASSWORD' },
+          variables: {
+            email: 'boris@keystonejs.com',
+            token: MAGIC_TOKEN,
+            password: 'NEW PASSWORD',
+          },
         });
 
         expect(body.errors).toBe(undefined);
@@ -884,11 +894,11 @@ describe('Auth testing', () => {
               sendUserPasswordResetLink(email: $email)
             }
           `,
-          variables: { email: 'boris@keystone.com' },
+          variables: { email: 'boris@keystonejs.com' },
         });
         // Set the "issued at" date to 61 minutes ago
         await context.sudo().query.User.updateOne({
-          where: { email: 'boris@keystone.com' },
+          where: { email: 'boris@keystonejs.com' },
           data: {
             passwordResetIssuedAt: new Date(Number(new Date()) - 61 * 60 * 1000).toISOString(),
           },
@@ -901,7 +911,11 @@ describe('Auth testing', () => {
               }
             }
           `,
-          variables: { email: 'boris@keystone.com', token: MAGIC_TOKEN, password: 'NEW PASSWORD' },
+          variables: {
+            email: 'boris@keystonejs.com',
+            token: MAGIC_TOKEN,
+            password: 'NEW PASSWORD',
+          },
         });
 
         expect(result.body.errors).toBe(undefined);
@@ -917,14 +931,14 @@ describe('Auth testing', () => {
     test(
       'validateItemPasswordToken - Success',
       runner(async ({ context, graphQLRequest }) => {
-        await initialiseData(context);
+        await seed(context, initialData);
         await graphQLRequest({
           query: `
             mutation($email: String!) {
               sendUserPasswordResetLink(email: $email)
             }
           `,
-          variables: { email: 'boris@keystone.com' },
+          variables: { email: 'boris@keystonejs.com' },
         });
 
         const { body } = await graphQLRequest({
@@ -935,7 +949,7 @@ describe('Auth testing', () => {
               }
             }
           `,
-          variables: { email: 'boris@keystone.com', token: MAGIC_TOKEN },
+          variables: { email: 'boris@keystonejs.com', token: MAGIC_TOKEN },
         });
         expect(body.errors).toBe(undefined);
         expect(body.data).toEqual({ validateUserPasswordResetToken: null });
@@ -944,14 +958,14 @@ describe('Auth testing', () => {
     test(
       'validateItemPasswordToken - Failure - bad token',
       runner(async ({ context, graphQLRequest }) => {
-        await initialiseData(context);
+        await seed(context, initialData);
         await graphQLRequest({
           query: `
             mutation($email: String!) {
               sendUserPasswordResetLink(email: $email)
             }
           `,
-          variables: { email: 'boris@keystone.com' },
+          variables: { email: 'boris@keystonejs.com' },
         });
 
         const { body } = await graphQLRequest({
@@ -962,7 +976,7 @@ describe('Auth testing', () => {
               }
             }
           `,
-          variables: { email: 'boris@keystone.com', token: 'BAD TOKEN' },
+          variables: { email: 'boris@keystonejs.com', token: 'BAD TOKEN' },
         });
         // Generic failure message
         expect(body.errors).toBe(undefined);
@@ -977,14 +991,14 @@ describe('Auth testing', () => {
     test(
       'validateItemPasswordToken - Failure - non-existent user',
       runner(async ({ context, graphQLRequest }) => {
-        await initialiseData(context);
+        await seed(context, initialData);
         await graphQLRequest({
           query: `
             mutation($email: String!) {
               sendUserPasswordResetLink(email: $email)
             }
           `,
-          variables: { email: 'boris@keystone.com' },
+          variables: { email: 'boris@keystonejs.com' },
         });
 
         const { body } = await graphQLRequest({
@@ -995,7 +1009,7 @@ describe('Auth testing', () => {
               }
             }
           `,
-          variables: { email: 'missing@keystone.com', token: 'BAD TOKEN' },
+          variables: { email: 'missing@keystonejs.com', token: 'BAD TOKEN' },
         });
         // Generic failure message
         expect(body.errors).toBe(undefined);
@@ -1010,14 +1024,14 @@ describe('Auth testing', () => {
     test(
       'validateItemPasswordToken - Failure - already redemmed',
       runner(async ({ context, graphQLRequest }) => {
-        await initialiseData(context);
+        await seed(context, initialData);
         await graphQLRequest({
           query: `
             mutation($email: String!) {
               sendUserPasswordResetLink(email: $email)
             }
           `,
-          variables: { email: 'boris@keystone.com' },
+          variables: { email: 'boris@keystonejs.com' },
         });
         // Redeem once
         await graphQLRequest({
@@ -1028,7 +1042,11 @@ describe('Auth testing', () => {
               }
             }
           `,
-          variables: { email: 'boris@keystone.com', token: MAGIC_TOKEN, password: 'NEW PASSWORD' },
+          variables: {
+            email: 'boris@keystonejs.com',
+            token: MAGIC_TOKEN,
+            password: 'NEW PASSWORD',
+          },
         });
         // Redeem twice
         const { body } = await graphQLRequest({
@@ -1039,7 +1057,7 @@ describe('Auth testing', () => {
               }
             }
           `,
-          variables: { email: 'boris@keystone.com', token: MAGIC_TOKEN },
+          variables: { email: 'boris@keystonejs.com', token: MAGIC_TOKEN },
         });
         // Generic failure message
         expect(body.errors).toBe(undefined);
@@ -1055,18 +1073,18 @@ describe('Auth testing', () => {
     test(
       'validateItemPasswordToken - Failure - Token expired',
       runner(async ({ context, graphQLRequest }) => {
-        await initialiseData(context);
+        await seed(context, initialData);
         await graphQLRequest({
           query: `
             mutation($email: String!) {
               sendUserPasswordResetLink(email: $email)
             }
           `,
-          variables: { email: 'boris@keystone.com' },
+          variables: { email: 'boris@keystonejs.com' },
         });
         // Set the "issued at" date to 59 minutes ago
         await context.sudo().query.User.updateOne({
-          where: { email: 'boris@keystone.com' },
+          where: { email: 'boris@keystonejs.com' },
           data: {
             passwordResetIssuedAt: new Date(Number(new Date()) - 59 * 60 * 1000).toISOString(),
           },
@@ -1079,7 +1097,7 @@ describe('Auth testing', () => {
               }
             }
           `,
-          variables: { email: 'boris@keystone.com', token: MAGIC_TOKEN },
+          variables: { email: 'boris@keystonejs.com', token: MAGIC_TOKEN },
         });
 
         expect(body.errors).toBe(undefined);
@@ -1092,11 +1110,11 @@ describe('Auth testing', () => {
               sendUserPasswordResetLink(email: $email)
             }
           `,
-          variables: { email: 'boris@keystone.com' },
+          variables: { email: 'boris@keystonejs.com' },
         });
         // Set the "issued at" date to 61 minutes ago
         await context.sudo().query.User.updateOne({
-          where: { email: 'boris@keystone.com' },
+          where: { email: 'boris@keystonejs.com' },
           data: {
             passwordResetIssuedAt: new Date(Number(new Date()) - 61 * 60 * 1000).toISOString(),
           },
@@ -1109,7 +1127,7 @@ describe('Auth testing', () => {
               }
             }
           `,
-          variables: { email: 'boris@keystone.com', token: MAGIC_TOKEN },
+          variables: { email: 'boris@keystonejs.com', token: MAGIC_TOKEN },
         });
 
         expect(result.body.errors).toBe(undefined);
diff --git a/tests/api-tests/utils.ts b/tests/api-tests/utils.ts
index 668d51173cd..97b600fe496 100644
--- a/tests/api-tests/utils.ts
+++ b/tests/api-tests/utils.ts
@@ -1,4 +1,4 @@
-import { KeystoneConfig, DatabaseProvider } from '@keystone-next/keystone/types';
+import { KeystoneConfig, KeystoneContext, DatabaseProvider } from '@keystone-next/keystone/types';
 
 // This function injects the db configuration that we use for testing in CI.
 // This functionality is a keystone repo specific way of doing things, so we don't
@@ -245,3 +245,17 @@ export const expectSingleRelationshipError = (
       debug: [{ message, stacktrace: expect.stringMatching(new RegExp(`Error: ${message}\n`)) }],
     },
   ]);
+
+export async function seed<T extends Record<keyof T, Record<string, unknown>[]>>(
+  context: KeystoneContext,
+  initialData: T
+) {
+  const results: any = {};
+  for (const listKey in initialData) {
+    results[listKey as keyof T] = await context.sudo().query[listKey].createMany({
+      data: initialData[listKey as keyof T],
+    });
+  }
+
+  return results as Record<keyof T, Record<string, unknown>[]>;
+}

From d1141ea8235bca4ce88500991c24b962b06ade45 Mon Sep 17 00:00:00 2001
From: Mitchell Hamilton <mitchell@hamil.town>
Date: Thu, 28 Oct 2021 11:07:50 +1000
Subject: [PATCH 07/21] Relationship select fixes (#6839)

---
 .changeset/sixty-insects-tickle.md            |   5 +
 .../src/admin-ui/system/createAdminMeta.ts    |  35 +++---
 .../keystone/src/admin-ui/templates/index.ts  |   2 +-
 ...getRootGraphQLFieldsFromFieldController.ts |   2 +-
 .../relationship/views/RelationshipSelect.tsx | 113 +++++++++++++++---
 5 files changed, 122 insertions(+), 35 deletions(-)
 create mode 100644 .changeset/sixty-insects-tickle.md

diff --git a/.changeset/sixty-insects-tickle.md b/.changeset/sixty-insects-tickle.md
new file mode 100644
index 00000000000..2d2d458577d
--- /dev/null
+++ b/.changeset/sixty-insects-tickle.md
@@ -0,0 +1,5 @@
+---
+'@keystone-next/keystone': patch
+---
+
+Fixed overfetching, not filtering by the search and erroring when an id is searched for in the relationship select UI.
diff --git a/packages/keystone/src/admin-ui/system/createAdminMeta.ts b/packages/keystone/src/admin-ui/system/createAdminMeta.ts
index b5553990ea6..f2770e95820 100644
--- a/packages/keystone/src/admin-ui/system/createAdminMeta.ts
+++ b/packages/keystone/src/admin-ui/system/createAdminMeta.ts
@@ -1,5 +1,5 @@
-import { GraphQLString } from 'graphql';
-import type { KeystoneConfig, AdminMetaRootVal } from '../../../types';
+import { GraphQLString, isInputObjectType } from 'graphql';
+import { KeystoneConfig, AdminMetaRootVal, QueryMode } from '../../types';
 import { humanize } from '../../lib/utils';
 import { InitialisedList } from '../../lib/core/types-for-lists';
 
@@ -97,12 +97,21 @@ export function createAdminMeta(
       );
     }
     const whereInputFields = list.types.where.graphQLType.getFields();
+    const possibleSearchFields = new Map<string, 'default' | 'insensitive' | null>();
 
+    for (const fieldKey of Object.keys(list.fields)) {
+      const filterType = whereInputFields[fieldKey]?.type;
+      const fieldFilterFields = isInputObjectType(filterType) ? filterType.getFields() : undefined;
+      if (fieldFilterFields?.contains?.type === GraphQLString) {
+        possibleSearchFields.set(
+          fieldKey,
+          fieldFilterFields?.mode?.type === QueryMode.graphQLType ? 'insensitive' : 'default'
+        );
+      }
+    }
     if (config.lists[key].ui?.searchFields === undefined) {
       const labelField = adminMetaRoot.listsByKey[key].labelField;
-      const potentialFilterField =
-        whereInputFields[`${labelField}_contains_i`] || whereInputFields[`${labelField}_contains`];
-      if (potentialFilterField?.type === GraphQLString) {
+      if (possibleSearchFields.has(labelField)) {
         searchFields.add(labelField);
       }
     }
@@ -113,17 +122,11 @@ export function createAdminMeta(
       // FIXME: Disabling this entirely for now until the Admin UI can properly
       // handle `omit: ['read']` correctly.
       if (field.graphql.isEnabled.read === false) continue;
-      let search: 'default' | 'insensitive' | null = null;
-      if (searchFields.has(fieldKey)) {
-        if (whereInputFields[`${fieldKey}_contains_i`]?.type === GraphQLString) {
-          search = 'insensitive';
-        } else if (whereInputFields[`${fieldKey}_contains`]?.type === GraphQLString) {
-          search = 'default';
-        } else {
-          throw new Error(
-            `The ui.searchFields option on the ${key} list includes '${fieldKey}' but that field doesn't have a contains filter that accepts a GraphQL String`
-          );
-        }
+      let search = searchFields.has(fieldKey) ? possibleSearchFields.get(fieldKey) ?? null : null;
+      if (searchFields.has(fieldKey) && search === null) {
+        throw new Error(
+          `The ui.searchFields option on the ${key} list includes '${fieldKey}' but that field doesn't have a contains filter that accepts a GraphQL String`
+        );
       }
       adminMetaRoot.listsByKey[key].fields.push({
         label: field.label ?? humanize(fieldKey),
diff --git a/packages/keystone/src/admin-ui/templates/index.ts b/packages/keystone/src/admin-ui/templates/index.ts
index 311bcb96567..e973d69ba98 100644
--- a/packages/keystone/src/admin-ui/templates/index.ts
+++ b/packages/keystone/src/admin-ui/templates/index.ts
@@ -1,6 +1,6 @@
 import * as Path from 'path';
 import { GraphQLSchema } from 'graphql';
-import type { AdminMetaRootVal, KeystoneConfig, AdminFileToWrite } from '../../../types';
+import type { AdminMetaRootVal, KeystoneConfig, AdminFileToWrite } from '../../types';
 import { appTemplate } from './app';
 import { homeTemplate } from './home';
 import { listTemplate } from './list';
diff --git a/packages/keystone/src/admin-ui/utils/getRootGraphQLFieldsFromFieldController.ts b/packages/keystone/src/admin-ui/utils/getRootGraphQLFieldsFromFieldController.ts
index 2a62da82ecb..5446e3e6bd6 100644
--- a/packages/keystone/src/admin-ui/utils/getRootGraphQLFieldsFromFieldController.ts
+++ b/packages/keystone/src/admin-ui/utils/getRootGraphQLFieldsFromFieldController.ts
@@ -1,6 +1,6 @@
 import weakMemoize from '@emotion/weak-memoize';
 import { FragmentDefinitionNode, parse, SelectionSetNode } from 'graphql';
-import { FieldController } from '../../../types';
+import { FieldController } from '../../types';
 
 function extractRootFields(selectedFields: Set<string>, selectionSet: SelectionSetNode) {
   selectionSet.selections.forEach(selection => {
diff --git a/packages/keystone/src/fields/types/relationship/views/RelationshipSelect.tsx b/packages/keystone/src/fields/types/relationship/views/RelationshipSelect.tsx
index 83f4ac773d9..883712c5414 100644
--- a/packages/keystone/src/fields/types/relationship/views/RelationshipSelect.tsx
+++ b/packages/keystone/src/fields/types/relationship/views/RelationshipSelect.tsx
@@ -2,23 +2,34 @@
 /** @jsx jsx */
 
 import 'intersection-observer';
-import { RefObject, useEffect, useMemo, useState, createContext, useContext } from 'react';
+import { RefObject, useEffect, useMemo, useState, createContext, useContext, useRef } from 'react';
 
 import { jsx } from '@keystone-ui/core';
 import { MultiSelect, Select, selectComponents } from '@keystone-ui/fields';
 import { validate as validateUUID } from 'uuid';
 import { IdFieldConfig, ListMeta } from '../../../../types';
-import { gql, TypedDocumentNode, useQuery } from '../../../../admin-ui/apollo';
+import {
+  ApolloClient,
+  gql,
+  InMemoryCache,
+  TypedDocumentNode,
+  useApolloClient,
+  useQuery,
+} from '../../../../admin-ui/apollo';
 
 function useIntersectionObserver(cb: IntersectionObserverCallback, ref: RefObject<any>) {
+  const cbRef = useRef(cb);
   useEffect(() => {
-    let observer = new IntersectionObserver(cb, {});
+    cbRef.current = cb;
+  });
+  useEffect(() => {
+    let observer = new IntersectionObserver((...args) => cbRef.current(...args), {});
     let node = ref.current;
     if (node !== null) {
       observer.observe(node);
       return () => observer.unobserve(node);
     }
-  });
+  }, [ref]);
 }
 
 const idValidators = {
@@ -31,6 +42,20 @@ const idValidators = {
   },
 };
 
+function useDebouncedValue<T>(value: T, limitMs: number): T {
+  const [debouncedValue, setDebouncedValue] = useState(() => value);
+
+  useEffect(() => {
+    let id = setTimeout(() => {
+      setDebouncedValue(() => value);
+    }, limitMs);
+    return () => {
+      clearTimeout(id);
+    };
+  }, [value, limitMs]);
+  return debouncedValue;
+}
+
 function useFilter(search: string, list: ListMeta) {
   return useMemo(() => {
     let conditions: Record<string, any>[] = [];
@@ -39,12 +64,15 @@ function useFilter(search: string, list: ListMeta) {
       const trimmedSearch = search.trim();
       const isValidId = idValidators[idFieldKind](trimmedSearch);
       if (isValidId) {
-        conditions.push({ id: trimmedSearch });
+        conditions.push({ id: { equals: trimmedSearch } });
       }
       for (const field of Object.values(list.fields)) {
         if (field.search !== null) {
           conditions.push({
-            [`${field.path}_contains${field.search === 'insensitive' ? '_i' : ''}`]: trimmedSearch,
+            [field.path]: {
+              contains: trimmedSearch,
+              mode: field.search === 'insensitive' ? 'insensitive' : undefined,
+            },
           });
         }
       }
@@ -120,11 +148,43 @@ export const RelationshipSelect = ({
     }
   `;
 
-  const where = useFilter(search, list);
+  const debouncedSearch = useDebouncedValue(search, 200);
+  const where = useFilter(debouncedSearch, list);
+
+  const link = useApolloClient().link;
+  // we're using a local apollo client here because writing a global implementation of the typePolicies
+  // would require making assumptions about how pagination should work which won't always be right
+  const apolloClient = useMemo(
+    () =>
+      new ApolloClient({
+        link,
+        cache: new InMemoryCache({
+          typePolicies: {
+            Query: {
+              fields: {
+                [list.gqlNames.listQueryName]: {
+                  keyArgs: ['where'],
+                  merge: (existing: readonly unknown[], incoming: readonly unknown[], { args }) => {
+                    const merged = existing ? existing.slice() : [];
+                    const { skip } = args!;
+                    for (let i = 0; i < incoming.length; ++i) {
+                      merged[skip + i] = incoming[i];
+                    }
+                    return merged;
+                  },
+                },
+              },
+            },
+          },
+        }),
+      }),
+    [link, list.gqlNames.listQueryName]
+  );
 
   const { data, error, loading, fetchMore } = useQuery(QUERY, {
     fetchPolicy: 'network-only',
     variables: { where, take: initialItemsToLoad, skip: 0 },
+    client: apolloClient,
   });
 
   const count = data?.count || 0;
@@ -144,9 +204,28 @@ export const RelationshipSelect = ({
     [count]
   );
 
+  // we want to avoid fetching more again and `loading` from Apollo
+  // doesn't seem to become true when fetching more
+  const [lastFetchMore, setLastFetchMore] = useState<{
+    where: Record<string, any>;
+    extraSelection: string;
+    list: ListMeta;
+    skip: number;
+  } | null>(null);
+
   useIntersectionObserver(
     ([{ isIntersecting }]) => {
-      if (!loading && isIntersecting && options.length < count) {
+      const skip = data?.items.length;
+      if (
+        !loading &&
+        skip &&
+        isIntersecting &&
+        options.length < count &&
+        (lastFetchMore?.extraSelection !== extraSelection ||
+          lastFetchMore?.where !== where ||
+          lastFetchMore?.list !== list ||
+          lastFetchMore?.skip !== skip)
+      ) {
         const QUERY: TypedDocumentNode<
           { items: { [idField]: string; [labelField]: string | null }[] },
           { where: Record<string, any>; take: number; skip: number }
@@ -159,21 +238,21 @@ export const RelationshipSelect = ({
                 }
               }
             `;
+        setLastFetchMore({ extraSelection, list, skip, where });
         fetchMore({
           query: QUERY,
           variables: {
             where,
             take: subsequentItemsToLoad,
-            skip: data!.items.length,
-          },
-          updateQuery: (prev, { fetchMoreResult }) => {
-            if (!fetchMoreResult) return prev;
-            return {
-              ...prev,
-              items: [...prev.items, ...fetchMoreResult.items],
-            };
+            skip,
           },
-        });
+        })
+          .then(() => {
+            setLastFetchMore(null);
+          })
+          .catch(() => {
+            setLastFetchMore(null);
+          });
       }
     },
     { current: loadingIndicatorElement }

From 71600965b963e098ca77ae1261b850b9573c9f22 Mon Sep 17 00:00:00 2001
From: Mitchell Hamilton <mitchell@hamil.town>
Date: Fri, 29 Oct 2021 15:06:16 +1000
Subject: [PATCH 08/21] Update cloud integration (#6845)

---
 .changeset/fifty-buckets-think.md             |   5 +
 .changeset/good-carrots-teach.md              |   5 +
 .changeset/strong-camels-tease.md             |   5 +
 examples-staging/assets-cloud/keystone.ts     |  20 +-
 examples-staging/assets-cloud/schema.graphql  |  25 ++-
 examples-staging/assets-local/schema.graphql  |  14 +-
 examples-staging/basic/schema.graphql         |  25 ++-
 .../keystone/src/fields/types/file/index.ts   |  16 +-
 .../fields/types/file/tests/test-fixtures.ts  |   8 +-
 .../keystone/src/fields/types/file/utils.ts   |   2 +-
 .../src/fields/types/file/views/index.tsx     |   4 +-
 .../keystone/src/fields/types/image/index.ts  |  16 +-
 .../fields/types/image/tests/test-fixtures.ts |   8 +-
 .../keystone/src/fields/types/image/utils.ts  |   2 +-
 .../src/fields/types/image/views/index.tsx    |   8 +-
 packages/keystone/src/lib/cloud/assets.ts     | 148 ++++++++++++++
 .../keystone/src/lib/context/createContext.ts |   7 +-
 .../src/lib/context/createFilesContext.ts     |  41 ++--
 .../src/lib/context/createImagesContext.ts    |  68 ++-----
 packages/keystone/src/lib/createSystem.ts     |  19 +-
 .../keystone/src/lib/keystone-cloud/assets.ts | 184 ------------------
 packages/keystone/src/scripts/run/dev.ts      |   3 +-
 packages/keystone/src/session/index.ts        |   2 +-
 packages/keystone/src/types/config/index.ts   |  13 +-
 packages/keystone/src/types/context.ts        |   6 +-
 25 files changed, 326 insertions(+), 328 deletions(-)
 create mode 100644 .changeset/fifty-buckets-think.md
 create mode 100644 .changeset/good-carrots-teach.md
 create mode 100644 .changeset/strong-camels-tease.md
 create mode 100644 packages/keystone/src/lib/cloud/assets.ts
 delete mode 100644 packages/keystone/src/lib/keystone-cloud/assets.ts

diff --git a/.changeset/fifty-buckets-think.md b/.changeset/fifty-buckets-think.md
new file mode 100644
index 00000000000..907987fe1ac
--- /dev/null
+++ b/.changeset/fifty-buckets-think.md
@@ -0,0 +1,5 @@
+---
+'@keystone-next/keystone': major
+---
+
+Added `CloudImageFieldOutput` and `CloudFileFieldOutput` GraphQL types to the `image` and `file` fields respectively
diff --git a/.changeset/good-carrots-teach.md b/.changeset/good-carrots-teach.md
new file mode 100644
index 00000000000..4a654b7037b
--- /dev/null
+++ b/.changeset/good-carrots-teach.md
@@ -0,0 +1,5 @@
+---
+'@keystone-next/keystone': major
+---
+
+The `src` field on the output of `image` and `file` fields has been renamed to `url`.
diff --git a/.changeset/strong-camels-tease.md b/.changeset/strong-camels-tease.md
new file mode 100644
index 00000000000..4fabcc4fcdd
--- /dev/null
+++ b/.changeset/strong-camels-tease.md
@@ -0,0 +1,5 @@
+---
+'@keystone-next/keystone': major
+---
+
+The `getSrc` function on `ImagesContext` and `FilesContext` has been renamed to `getUrl`
diff --git a/examples-staging/assets-cloud/keystone.ts b/examples-staging/assets-cloud/keystone.ts
index ff946f754ba..59a8dfc52cf 100644
--- a/examples-staging/assets-cloud/keystone.ts
+++ b/examples-staging/assets-cloud/keystone.ts
@@ -4,12 +4,7 @@ import { lists } from './schema';
 
 dotenv.config();
 
-const {
-  KEYSTONE_CLOUD_API_KEY = '',
-  KEYSTONE_CLOUD_IMAGES_DOMAIN = '',
-  KEYSTONE_CLOUD_GRAPHQL_API_ENDPOINT = '',
-  KEYSTONE_CLOUD_REST_API_ENDPOINT = '',
-} = process.env;
+const { KEYSTONE_CLOUD_API_KEY = '' } = process.env;
 
 export default config({
   db: {
@@ -18,17 +13,18 @@ export default config({
   },
   lists,
   images: {
-    upload: 'keystone-cloud',
+    upload: 'cloud',
+    local: {
+      storagePath: 'uploads/images', // defaults to 'public/images'
+      baseUrl: 'http://localhost:3000/images', // defaults to `/images`
+    },
   },
   files: {
-    upload: 'keystone-cloud',
+    upload: 'cloud',
   },
   experimental: {
-    keystoneCloud: {
+    cloud: {
       apiKey: KEYSTONE_CLOUD_API_KEY,
-      imagesDomain: KEYSTONE_CLOUD_IMAGES_DOMAIN,
-      graphqlApiEndpoint: KEYSTONE_CLOUD_GRAPHQL_API_ENDPOINT,
-      restApiEndpoint: KEYSTONE_CLOUD_REST_API_ENDPOINT,
     },
   },
 });
diff --git a/examples-staging/assets-cloud/schema.graphql b/examples-staging/assets-cloud/schema.graphql
index cb5aa0dc762..211aabb259a 100644
--- a/examples-staging/assets-cloud/schema.graphql
+++ b/examples-staging/assets-cloud/schema.graphql
@@ -27,7 +27,7 @@ interface ImageFieldOutput {
   height: Int!
   extension: ImageExtension!
   ref: String!
-  src: String!
+  url: String!
 }
 
 enum ImageExtension {
@@ -41,7 +41,7 @@ interface FileFieldOutput {
   filename: String!
   filesize: Int!
   ref: String!
-  src: String!
+  url: String!
 }
 
 input PostWhereUniqueInput {
@@ -55,14 +55,31 @@ type LocalImageFieldOutput implements ImageFieldOutput {
   height: Int!
   extension: ImageExtension!
   ref: String!
-  src: String!
+  url: String!
+}
+
+type CloudImageFieldOutput implements ImageFieldOutput {
+  id: ID!
+  filesize: Int!
+  width: Int!
+  height: Int!
+  extension: ImageExtension!
+  ref: String!
+  url: String!
 }
 
 type LocalFileFieldOutput implements FileFieldOutput {
   filename: String!
   filesize: Int!
   ref: String!
-  src: String!
+  url: String!
+}
+
+type CloudFileFieldOutput implements FileFieldOutput {
+  filename: String!
+  filesize: Int!
+  ref: String!
+  url: String!
 }
 
 input PostWhereInput {
diff --git a/examples-staging/assets-local/schema.graphql b/examples-staging/assets-local/schema.graphql
index d35d059b01f..3df157986ab 100644
--- a/examples-staging/assets-local/schema.graphql
+++ b/examples-staging/assets-local/schema.graphql
@@ -26,7 +26,7 @@ interface ImageFieldOutput {
   height: Int!
   extension: ImageExtension!
   ref: String!
-  src: String!
+  url: String!
 }
 
 enum ImageExtension {
@@ -47,7 +47,17 @@ type LocalImageFieldOutput implements ImageFieldOutput {
   height: Int!
   extension: ImageExtension!
   ref: String!
-  src: String!
+  url: String!
+}
+
+type CloudImageFieldOutput implements ImageFieldOutput {
+  id: ID!
+  filesize: Int!
+  width: Int!
+  height: Int!
+  extension: ImageExtension!
+  ref: String!
+  url: String!
 }
 
 input PostWhereInput {
diff --git a/examples-staging/basic/schema.graphql b/examples-staging/basic/schema.graphql
index ab2911f3c6e..594194bd629 100644
--- a/examples-staging/basic/schema.graphql
+++ b/examples-staging/basic/schema.graphql
@@ -123,7 +123,7 @@ interface ImageFieldOutput {
   height: Int!
   extension: ImageExtension!
   ref: String!
-  src: String!
+  url: String!
 }
 
 enum ImageExtension {
@@ -137,7 +137,7 @@ interface FileFieldOutput {
   filename: String!
   filesize: Int!
   ref: String!
-  src: String!
+  url: String!
 }
 
 type PasswordState {
@@ -156,14 +156,31 @@ type LocalImageFieldOutput implements ImageFieldOutput {
   height: Int!
   extension: ImageExtension!
   ref: String!
-  src: String!
+  url: String!
+}
+
+type CloudImageFieldOutput implements ImageFieldOutput {
+  id: ID!
+  filesize: Int!
+  width: Int!
+  height: Int!
+  extension: ImageExtension!
+  ref: String!
+  url: String!
 }
 
 type LocalFileFieldOutput implements FileFieldOutput {
   filename: String!
   filesize: Int!
   ref: String!
-  src: String!
+  url: String!
+}
+
+type CloudFileFieldOutput implements FileFieldOutput {
+  filename: String!
+  filesize: Int!
+  ref: String!
+  url: String!
 }
 
 input UserWhereInput {
diff --git a/packages/keystone/src/fields/types/file/index.ts b/packages/keystone/src/fields/types/file/index.ts
index 1f266f36832..3ff711fd784 100644
--- a/packages/keystone/src/fields/types/file/index.ts
+++ b/packages/keystone/src/fields/types/file/index.ts
@@ -37,7 +37,7 @@ const fileFields = graphql.fields<FileData>()({
       return getFileRef(data.mode, data.filename);
     },
   }),
-  src: graphql.field({
+  url: graphql.field({
     type: graphql.nonNull(graphql.String),
     resolve(data, args, context) {
       if (!context.files) {
@@ -45,7 +45,7 @@ const fileFields = graphql.fields<FileData>()({
           'File context is undefined, this most likely means that you havent configurd keystone with a file config, see https://keystonejs.com/docs/apis/config#files for details'
         );
       }
-      return context.files.getSrc(data.mode, data.filename);
+      return context.files.getUrl(data.mode, data.filename);
     },
   }),
 });
@@ -53,7 +53,7 @@ const fileFields = graphql.fields<FileData>()({
 const FileFieldOutput = graphql.interface<FileData>()({
   name: 'FileFieldOutput',
   fields: fileFields,
-  resolveType: () => 'LocalFileFieldOutput',
+  resolveType: val => (val.mode === 'local' ? 'LocalFileFieldOutput' : 'CloudFileFieldOutput'),
 });
 
 const LocalFileFieldOutput = graphql.object<FileData>()({
@@ -62,6 +62,12 @@ const LocalFileFieldOutput = graphql.object<FileData>()({
   fields: fileFields,
 });
 
+const CloudFileFieldOutput = graphql.object<FileData>()({
+  name: 'CloudFileFieldOutput',
+  interfaces: [FileFieldOutput],
+  fields: fileFields,
+});
+
 async function inputResolver(data: FileFieldInputType, context: KeystoneContext) {
   if (data === null || data === undefined) {
     return { mode: data, filename: data, filesize: data };
@@ -109,14 +115,14 @@ export const file =
             filesize === null ||
             filename === null ||
             mode === null ||
-            (mode !== 'local' && mode !== 'keystone-cloud')
+            (mode !== 'local' && mode !== 'cloud')
           ) {
             return null;
           }
           return { mode, filename, filesize };
         },
       }),
-      unreferencedConcreteInterfaceImplementations: [LocalFileFieldOutput],
+      unreferencedConcreteInterfaceImplementations: [LocalFileFieldOutput, CloudFileFieldOutput],
       views: resolveView('file/views'),
     });
   };
diff --git a/packages/keystone/src/fields/types/file/tests/test-fixtures.ts b/packages/keystone/src/fields/types/file/tests/test-fixtures.ts
index 6701d8030c9..04e79e6a49f 100644
--- a/packages/keystone/src/fields/types/file/tests/test-fixtures.ts
+++ b/packages/keystone/src/fields/types/file/tests/test-fixtures.ts
@@ -75,13 +75,13 @@ export const crudTests = (keystoneTestWrapper: any) => {
                 __typename
                 filesize
                 ref
-                src
+                url
               }
           `,
         });
         expect(data).not.toBe(null);
         expect(data.secretFile.ref).toEqual(`local:file:${data.secretFile.filename}`);
-        expect(data.secretFile.src).toEqual(`/files/${data.secretFile.filename}`);
+        expect(data.secretFile.url).toEqual(`/files/${data.secretFile.filename}`);
         expect(data.secretFile.filesize).toEqual(3250);
         expect(data.secretFile.__typename).toEqual('LocalFileFieldOutput');
       })
@@ -100,7 +100,7 @@ export const crudTests = (keystoneTestWrapper: any) => {
               __typename
               filesize
               ref
-              src
+              url
             }
         `,
         });
@@ -116,7 +116,7 @@ export const crudTests = (keystoneTestWrapper: any) => {
               __typename
               filesize
               ref
-              src
+              url
             }
         `,
         });
diff --git a/packages/keystone/src/fields/types/file/utils.ts b/packages/keystone/src/fields/types/file/utils.ts
index fd3e27b1df0..051ad9fdc05 100644
--- a/packages/keystone/src/fields/types/file/utils.ts
+++ b/packages/keystone/src/fields/types/file/utils.ts
@@ -1,6 +1,6 @@
 import { AssetMode } from '../../../types';
 
-const FILEREGEX = /^(local|keystone-cloud):file:([^\\\/:\n]+)/;
+const FILEREGEX = /^(local|cloud):file:([^\\\/:\n]+)/;
 
 export const getFileRef = (mode: AssetMode, name: string) => `${mode}:file:${name}`;
 export const parseFileRef = (ref: string) => {
diff --git a/packages/keystone/src/fields/types/file/views/index.tsx b/packages/keystone/src/fields/types/file/views/index.tsx
index 94ff6058ad8..05226ed9646 100644
--- a/packages/keystone/src/fields/types/file/views/index.tsx
+++ b/packages/keystone/src/fields/types/file/views/index.tsx
@@ -79,7 +79,7 @@ export const controller = (config: FieldControllerConfig): FileController => {
     path: config.path,
     label: config.label,
     graphqlSelection: `${config.path} {
-        src
+        url
         filename
         ref
         filesize
@@ -91,7 +91,7 @@ export const controller = (config: FieldControllerConfig): FileController => {
       return {
         kind: 'from-server',
         data: {
-          src: value.src,
+          src: value.url,
           filename: value.filename,
           ref: value.ref,
           filesize: value.filesize,
diff --git a/packages/keystone/src/fields/types/image/index.ts b/packages/keystone/src/fields/types/image/index.ts
index cab5fb614d3..4f49a508b6c 100644
--- a/packages/keystone/src/fields/types/image/index.ts
+++ b/packages/keystone/src/fields/types/image/index.ts
@@ -41,13 +41,13 @@ const imageOutputFields = graphql.fields<ImageData>()({
       return getImageRef(data.mode, data.id, data.extension);
     },
   }),
-  src: graphql.field({
+  url: graphql.field({
     type: graphql.nonNull(graphql.String),
     resolve(data, args, context) {
       if (!context.images) {
         throw new Error('Image context is undefined');
       }
-      return context.images.getSrc(data.mode, data.id, data.extension);
+      return context.images.getUrl(data.mode, data.id, data.extension);
     },
   }),
 });
@@ -55,7 +55,7 @@ const imageOutputFields = graphql.fields<ImageData>()({
 const ImageFieldOutput = graphql.interface<ImageData>()({
   name: 'ImageFieldOutput',
   fields: imageOutputFields,
-  resolveType: () => 'LocalImageFieldOutput',
+  resolveType: val => (val.mode === 'local' ? 'LocalImageFieldOutput' : 'CloudImageFieldOutput'),
 });
 
 const LocalImageFieldOutput = graphql.object<ImageData>()({
@@ -64,6 +64,12 @@ const LocalImageFieldOutput = graphql.object<ImageData>()({
   fields: imageOutputFields,
 });
 
+const CloudImageFieldOutput = graphql.object<ImageData>()({
+  name: 'CloudImageFieldOutput',
+  interfaces: [ImageFieldOutput],
+  fields: imageOutputFields,
+});
+
 type ImageFieldInputType =
   | undefined
   | null
@@ -128,14 +134,14 @@ export const image =
             width === null ||
             id === null ||
             mode === null ||
-            (mode !== 'local' && mode !== 'keystone-cloud')
+            (mode !== 'local' && mode !== 'cloud')
           ) {
             return null;
           }
           return { mode, extension, filesize, height, width, id };
         },
       }),
-      unreferencedConcreteInterfaceImplementations: [LocalImageFieldOutput],
+      unreferencedConcreteInterfaceImplementations: [LocalImageFieldOutput, CloudImageFieldOutput],
       views: resolveView('image/views'),
     });
   };
diff --git a/packages/keystone/src/fields/types/image/tests/test-fixtures.ts b/packages/keystone/src/fields/types/image/tests/test-fixtures.ts
index adbdaf5c3e9..11993672377 100644
--- a/packages/keystone/src/fields/types/image/tests/test-fixtures.ts
+++ b/packages/keystone/src/fields/types/image/tests/test-fixtures.ts
@@ -80,14 +80,14 @@ export const crudTests = (keystoneTestWrapper: any) => {
                 height
                 extension
                 ref
-                src
+                url
               }
           `,
           });
           expect(data).not.toBe(null);
           expect(data.avatar).toEqual({
             ref: `local:image:${data.avatar.id}.jpg`,
-            src: `/images/${data.avatar.id}.jpg`,
+            url: `/images/${data.avatar.id}.jpg`,
             id: data.avatar.id,
             __typename: 'LocalImageFieldOutput',
             filesize: 3250,
@@ -135,7 +135,7 @@ export const crudTests = (keystoneTestWrapper: any) => {
               height
               extension
               ref
-              src
+              url
             }
         `,
         });
@@ -154,7 +154,7 @@ export const crudTests = (keystoneTestWrapper: any) => {
               height
               extension
               ref
-              src
+              url
             }
         `,
         });
diff --git a/packages/keystone/src/fields/types/image/utils.ts b/packages/keystone/src/fields/types/image/utils.ts
index ca654398f71..1bc5d7f3d21 100644
--- a/packages/keystone/src/fields/types/image/utils.ts
+++ b/packages/keystone/src/fields/types/image/utils.ts
@@ -1,6 +1,6 @@
 import { AssetMode, ImageExtension } from '../../../types';
 
-const IMAGEREGEX = /^(local|keystone-cloud):image:([^\\\/:\n]+)\.(gif|jpg|png|webp)$/;
+const IMAGEREGEX = /^(local|cloud):image:([^\\\/:\n]+)\.(gif|jpg|png|webp)$/;
 
 export const getImageRef = (mode: AssetMode, id: string, extension: ImageExtension) =>
   `${mode}:image:${id}.${extension}`;
diff --git a/packages/keystone/src/fields/types/image/views/index.tsx b/packages/keystone/src/fields/types/image/views/index.tsx
index 3031bd4bb26..499ba72162d 100644
--- a/packages/keystone/src/fields/types/image/views/index.tsx
+++ b/packages/keystone/src/fields/types/image/views/index.tsx
@@ -26,7 +26,7 @@ export const Cell: CellComponent = ({ item, field }) => {
         width: 24,
       }}
     >
-      <img alt={data.filename} css={{ maxHeight: '100%', maxWidth: '100%' }} src={data.src} />
+      <img alt={data.filename} css={{ maxHeight: '100%', maxWidth: '100%' }} src={data.url} />
     </div>
   );
 };
@@ -38,7 +38,7 @@ export const CardValue: CardValueComponent = ({ item, field }) => {
       <FieldLabel>{field.label}</FieldLabel>
       {data && (
         <ImageWrapper>
-          <img css={{ width: '100%' }} alt={data.filename} src={data.src} />
+          <img css={{ width: '100%' }} alt={data.filename} src={data.url} />
         </ImageWrapper>
       )}
     </FieldContainer>
@@ -85,7 +85,7 @@ export const controller = (config: FieldControllerConfig): ImageController => {
     path: config.path,
     label: config.label,
     graphqlSelection: `${config.path} {
-        src
+        url
         id
         ref
         extension
@@ -100,7 +100,7 @@ export const controller = (config: FieldControllerConfig): ImageController => {
       return {
         kind: 'from-server',
         data: {
-          src: value.src,
+          src: value.url,
           id: value.id,
           extension: value.extension,
           ref: value.ref,
diff --git a/packages/keystone/src/lib/cloud/assets.ts b/packages/keystone/src/lib/cloud/assets.ts
new file mode 100644
index 00000000000..2472023f431
--- /dev/null
+++ b/packages/keystone/src/lib/cloud/assets.ts
@@ -0,0 +1,148 @@
+import { Readable } from 'stream';
+import fetch from 'node-fetch';
+import FormData from 'form-data';
+import { FileData, ImageExtension, ImageMetadata } from '../../types/context';
+
+function formUploadBody({
+  fieldName,
+  fileName,
+  data,
+}: {
+  fieldName: string;
+  fileName: string;
+  data: Readable;
+}) {
+  const form = new FormData();
+  form.append(fieldName, data, fileName);
+  return form;
+}
+
+export type CloudAssetsAPI = {
+  images: {
+    upload(stream: Readable, id: string): Promise<ImageMetadata>;
+    url(id: string, extension: ImageExtension): string;
+    metadata(id: string, extension: ImageExtension): Promise<ImageMetadata>;
+  };
+  files: {
+    upload(stream: Readable, filename: string): Promise<FileData>;
+    url(filename: string): string;
+    metadata(filename: string): Promise<FileData>;
+  };
+};
+
+type ImageMetadataResponse = {
+  width: number;
+  height: number;
+  filesize: number;
+  extension: ImageExtension;
+};
+
+const cloudAssetsConfigCache = new Map();
+
+export async function getCloudAssetsAPI({ apiKey }: { apiKey: string }): Promise<CloudAssetsAPI> {
+  const headers = {
+    Authorization: `Bearer ${apiKey}`,
+    'x-keystone-version': `TODO 6 RC`,
+  };
+  if (!cloudAssetsConfigCache.has(apiKey)) {
+    const res = await fetch('https://init.keystonejs.cloud/api/rest/config', { headers });
+    if (!res.ok) {
+      throw new Error(`Failed to load cloud config: ${res.status}\n${await res.text()}`);
+    }
+    const json = await res.json();
+    cloudAssetsConfigCache.set(apiKey, json);
+  }
+
+  const {
+    // project,
+    assets,
+  } = cloudAssetsConfigCache.get(apiKey)!;
+  const {
+    fileGetUrl,
+    // fileDownloadUrl,
+    fileUploadUrl,
+    fileMetaUrl,
+    imageGetUrl,
+    imageUploadUrl,
+    imageMetaUrl,
+  } = assets;
+
+  return {
+    images: {
+      url(id, extension) {
+        return `${imageGetUrl}/${id}.${extension}`;
+      },
+      async metadata(id, extension): Promise<ImageMetadata> {
+        const res = await fetch(`${imageMetaUrl}/${id}.${extension}`);
+        if (!res.ok) {
+          console.error(`${res.status} ${await res.text()}`);
+          throw new Error('Error occurred when fetching image metadata');
+        }
+        const metadata: ImageMetadataResponse = await res.json();
+        return {
+          extension: metadata.extension,
+          height: metadata.height,
+          width: metadata.width,
+          filesize: metadata.filesize,
+        };
+      },
+      async upload(buffer, id) {
+        const res = await fetch(imageUploadUrl, {
+          method: 'POST',
+          body: formUploadBody({
+            data: buffer,
+            fieldName: 'image',
+            fileName: id,
+          }),
+          headers,
+        });
+        if (!res.ok) {
+          console.error(`${res.status} ${await res.text()}`);
+          throw new Error('Error occurred when uploading image');
+        }
+        const metadata: ImageMetadataResponse = await res.json();
+        return {
+          extension: metadata.extension,
+          filesize: metadata.filesize,
+          height: metadata.height,
+          width: metadata.width,
+        };
+      },
+    },
+    files: {
+      url(filename) {
+        return `${fileGetUrl}/${filename}`;
+      },
+      async metadata(filename) {
+        const res = await fetch(`${fileMetaUrl}/${filename}`);
+        if (!res.ok) {
+          console.error(`${res.status} ${await res.text()}`);
+          throw new Error('Error occurred when fetching file metadata');
+        }
+        const metadata = await res.json();
+        return {
+          mode: 'cloud',
+          filesize: metadata.filesize,
+          filename,
+        };
+      },
+      async upload(stream, filename) {
+        const res = await fetch(fileUploadUrl, {
+          method: 'POST',
+          body: formUploadBody({ data: stream, fieldName: 'file', fileName: filename }),
+          headers,
+        });
+        if (!res.ok) {
+          console.error(`${res.status} ${await res.text()}`);
+          throw new Error('Error occurred when uploading file');
+        }
+        const metadata = await res.json();
+        return {
+          mode: 'cloud',
+          filesize: metadata.filesize,
+          filename,
+        };
+      },
+    },
+  };
+}
diff --git a/packages/keystone/src/lib/context/createContext.ts b/packages/keystone/src/lib/context/createContext.ts
index 5c738300780..83f0fba5cc2 100644
--- a/packages/keystone/src/lib/context/createContext.ts
+++ b/packages/keystone/src/lib/context/createContext.ts
@@ -10,6 +10,7 @@ import {
 
 import { PrismaClient } from '../core/utils';
 import { InitialisedList } from '../core/types-for-lists';
+import { CloudAssetsAPI } from '../cloud/assets';
 import { getDbAPIFactory, itemAPIForList } from './itemAPI';
 import { createImagesContext } from './createImagesContext';
 import { createFilesContext } from './createFilesContext';
@@ -21,6 +22,7 @@ export function makeCreateContext({
   gqlNamesByList,
   config,
   lists,
+  cloudAssetsAPI,
 }: {
   graphQLSchema: GraphQLSchema;
   sudoGraphQLSchema: GraphQLSchema;
@@ -28,9 +30,10 @@ export function makeCreateContext({
   prismaClient: PrismaClient;
   gqlNamesByList: Record<string, GqlNames>;
   lists: Record<string, InitialisedList>;
+  cloudAssetsAPI: () => CloudAssetsAPI;
 }) {
-  const images = createImagesContext(config);
-  const files = createFilesContext(config);
+  const images = createImagesContext(config, cloudAssetsAPI);
+  const files = createFilesContext(config, cloudAssetsAPI);
   // We precompute these helpers here rather than every time createContext is called
   // because they involve creating a new GraphQLSchema, creating a GraphQL document AST(programmatically, not by parsing) and validating the
   // note this isn't as big of an optimisation as you would imagine(at least in comparison with the rest of the system),
diff --git a/packages/keystone/src/lib/context/createFilesContext.ts b/packages/keystone/src/lib/context/createFilesContext.ts
index d5f93c83f6a..12666fef8dd 100644
--- a/packages/keystone/src/lib/context/createFilesContext.ts
+++ b/packages/keystone/src/lib/context/createFilesContext.ts
@@ -7,11 +7,7 @@ import fs from 'fs-extra';
 import slugify from '@sindresorhus/slugify';
 import { KeystoneConfig, FilesContext } from '../../types';
 import { parseFileRef } from '../../fields/types/file/utils';
-import {
-  buildKeystoneCloudFileSrc,
-  uploadFileToKeystoneCloud,
-  getFileFromKeystoneCloud,
-} from '../keystone-cloud/assets';
+import { CloudAssetsAPI } from '../cloud/assets';
 
 const DEFAULT_BASE_URL = '/files';
 const DEFAULT_STORAGE_PATH = './public/files';
@@ -46,27 +42,25 @@ const generateSafeFilename = (
   return `${urlSafeName}-${id}`;
 };
 
-export function createFilesContext(config: KeystoneConfig): FilesContext | undefined {
+export function createFilesContext(
+  config: KeystoneConfig,
+  cloudAssets: () => CloudAssetsAPI
+): FilesContext | undefined {
   if (!config.files) {
     return;
   }
 
-  const { files, experimental } = config;
+  const { files } = config;
   const { baseUrl = DEFAULT_BASE_URL, storagePath = DEFAULT_STORAGE_PATH } = files.local || {};
-  const {
-    apiKey = '',
-    graphqlApiEndpoint = '',
-    restApiEndpoint = '',
-  } = experimental?.keystoneCloud || {};
 
   if (files.upload === 'local') {
     fs.mkdirSync(storagePath, { recursive: true });
   }
 
   return {
-    getSrc: async (mode, filename) => {
-      if (mode === 'keystone-cloud') {
-        return await buildKeystoneCloudFileSrc({ apiKey, graphqlApiEndpoint, filename });
+    getUrl: async (mode, filename) => {
+      if (mode === 'cloud') {
+        return cloudAssets().files.url(filename);
       }
 
       return `${baseUrl}/${filename}`;
@@ -80,12 +74,8 @@ export function createFilesContext(config: KeystoneConfig): FilesContext | undef
 
       const { mode, filename } = fileRef;
 
-      if (mode === 'keystone-cloud') {
-        const { filesize } = await getFileFromKeystoneCloud({
-          apiKey,
-          filename,
-          restApiEndpoint,
-        });
+      if (mode === 'cloud') {
+        const { filesize } = await cloudAssets().files.metadata(filename);
 
         return { filesize, ...fileRef };
       }
@@ -98,13 +88,8 @@ export function createFilesContext(config: KeystoneConfig): FilesContext | undef
       const { upload: mode } = files;
       const filename = generateSafeFilename(originalFilename, files.transformFilename);
 
-      if (mode === 'keystone-cloud') {
-        const { filesize } = await uploadFileToKeystoneCloud({
-          apiKey,
-          stream,
-          filename,
-          restApiEndpoint,
-        });
+      if (mode === 'cloud') {
+        const { filesize } = await cloudAssets().files.upload(stream, filename);
 
         return { mode, filesize, filename };
       }
diff --git a/packages/keystone/src/lib/context/createImagesContext.ts b/packages/keystone/src/lib/context/createImagesContext.ts
index 3ee25b5f4d2..fe2dab0f813 100644
--- a/packages/keystone/src/lib/context/createImagesContext.ts
+++ b/packages/keystone/src/lib/context/createImagesContext.ts
@@ -3,13 +3,9 @@ import { v4 as uuid } from 'uuid';
 import fs from 'fs-extra';
 import fromBuffer from 'image-type';
 import imageSize from 'image-size';
-import { KeystoneConfig, ImagesContext, ImageMetadata } from '../../types';
+import { KeystoneConfig, ImageMetadata, ImagesContext } from '../../types';
 import { parseImageRef } from '../../fields/types/image/utils';
-import {
-  buildKeystoneCloudImageSrc,
-  getImageMetadataFromKeystoneCloud,
-  uploadImageToKeystoneCloud,
-} from '../keystone-cloud/assets';
+import { CloudAssetsAPI } from '../cloud/assets';
 
 const DEFAULT_BASE_URL = '/images';
 const DEFAULT_STORAGE_PATH = './public/images';
@@ -21,16 +17,10 @@ const getImageMetadataFromBuffer = async (buffer: Buffer): Promise<ImageMetadata
     throw new Error('File type not found');
   }
 
-  if (
-    fileType.ext !== 'jpg' &&
-    fileType.ext !== 'png' &&
-    fileType.ext !== 'webp' &&
-    fileType.ext !== 'gif'
-  ) {
-    throw new Error(`${fileType.ext} is not a supported image type`);
-  }
-
   const extension = fileType.ext;
+  if (extension !== 'jpg' && extension !== 'png' && extension !== 'webp' && extension !== 'gif') {
+    throw new Error(`${extension} is not a supported image type`);
+  }
 
   const { height, width } = imageSize(buffer);
 
@@ -40,35 +30,27 @@ const getImageMetadataFromBuffer = async (buffer: Buffer): Promise<ImageMetadata
   return { width, height, filesize, extension };
 };
 
-export function createImagesContext(config: KeystoneConfig): ImagesContext | undefined {
+export function createImagesContext(
+  config: KeystoneConfig,
+  cloudAssets: () => CloudAssetsAPI
+): ImagesContext | undefined {
   if (!config.images) {
     return;
   }
 
-  const { images, experimental } = config;
+  const { images } = config;
   const { baseUrl = DEFAULT_BASE_URL, storagePath = DEFAULT_STORAGE_PATH } = images.local || {};
-  const {
-    apiKey = '',
-    imagesDomain = '',
-    restApiEndpoint = '',
-  } = experimental?.keystoneCloud || {};
 
   if (images.upload === 'local') {
     fs.mkdirSync(storagePath, { recursive: true });
   }
 
   return {
-    getSrc: async (mode, id, extension) => {
-      const filename = `${id}.${extension}`;
-
-      if (mode === 'keystone-cloud') {
-        return await buildKeystoneCloudImageSrc({
-          apiKey,
-          imagesDomain,
-          filename,
-        });
+    getUrl: async (mode, id, extension) => {
+      if (mode === 'cloud') {
+        return cloudAssets().images.url(id, extension);
       }
-
+      const filename = `${id}.${extension}`;
       return `${baseUrl}/${filename}`;
     },
     getDataFromRef: async ref => {
@@ -80,15 +62,8 @@ export function createImagesContext(config: KeystoneConfig): ImagesContext | und
 
       const { mode } = imageRef;
 
-      if (mode === 'keystone-cloud') {
-        const { id, extension } = imageRef;
-        const filename = `${id}.${extension}`;
-        const metadata = await getImageMetadataFromKeystoneCloud({
-          filename,
-          apiKey,
-          restApiEndpoint,
-        });
-
+      if (mode === 'cloud') {
+        const metadata = await cloudAssets().images.metadata(imageRef.id, imageRef.extension);
         return { ...imageRef, ...metadata };
       }
 
@@ -103,15 +78,10 @@ export function createImagesContext(config: KeystoneConfig): ImagesContext | und
       const { upload: mode } = images;
       const id = uuid();
 
-      if (mode === 'keystone-cloud') {
-        const metadata = await uploadImageToKeystoneCloud({
-          apiKey,
-          stream,
-          restApiEndpoint,
-          filename: id,
-        });
+      if (mode === 'cloud') {
+        const cloudMetadata = await cloudAssets().images.upload(stream, id);
 
-        return { mode, id, ...metadata };
+        return { mode, id, ...cloudMetadata };
       }
 
       const chunks = [];
diff --git a/packages/keystone/src/lib/createSystem.ts b/packages/keystone/src/lib/createSystem.ts
index 4fc4e464f40..ce06d8b37c0 100644
--- a/packages/keystone/src/lib/createSystem.ts
+++ b/packages/keystone/src/lib/createSystem.ts
@@ -4,6 +4,7 @@ import { createAdminMeta } from '../admin-ui/system/createAdminMeta';
 import { createGraphQLSchema } from './createGraphQLSchema';
 import { makeCreateContext } from './context/createContext';
 import { initialiseLists } from './core/types-for-lists';
+import { CloudAssetsAPI, getCloudAssetsAPI } from './cloud/assets';
 
 function getSudoGraphQLSchema(config: KeystoneConfig, provider: DatabaseProvider) {
   // This function creates a GraphQLSchema based on a modified version of the provided config.
@@ -54,7 +55,7 @@ function getSudoGraphQLSchema(config: KeystoneConfig, provider: DatabaseProvider
   return createGraphQLSchema(transformedConfig, lists, adminMeta);
 }
 
-export function createSystem(config: KeystoneConfig) {
+export function createSystem(config: KeystoneConfig, isLiveReload?: boolean) {
   const lists = initialiseLists(config.lists, config.db.provider);
 
   const adminMeta = createAdminMeta(config, lists);
@@ -79,6 +80,8 @@ export function createSystem(config: KeystoneConfig) {
         prismaClient._engine.child?.kill('SIGINT');
       });
 
+      let cloudAssetsAPI: CloudAssetsAPI = undefined!;
+
       const createContext = makeCreateContext({
         graphQLSchema,
         sudoGraphQLSchema,
@@ -88,13 +91,21 @@ export function createSystem(config: KeystoneConfig) {
           Object.entries(lists).map(([listKey, list]) => [listKey, getGqlNames(list)])
         ),
         lists,
+        cloudAssetsAPI: () => cloudAssetsAPI,
       });
 
       return {
         async connect() {
-          await prismaClient.$connect();
-          const context = createContext({ sudo: true });
-          await config.db.onConnect?.(context);
+          if (!isLiveReload) {
+            await prismaClient.$connect();
+            const context = createContext({ sudo: true });
+            await config.db.onConnect?.(context);
+          }
+          if (config.experimental?.cloud?.apiKey) {
+            cloudAssetsAPI = await getCloudAssetsAPI({
+              apiKey: config.experimental.cloud.apiKey,
+            });
+          }
         },
         async disconnect() {
           await prismaClient.$disconnect();
diff --git a/packages/keystone/src/lib/keystone-cloud/assets.ts b/packages/keystone/src/lib/keystone-cloud/assets.ts
deleted file mode 100644
index 38d576434e7..00000000000
--- a/packages/keystone/src/lib/keystone-cloud/assets.ts
+++ /dev/null
@@ -1,184 +0,0 @@
-import { Readable } from 'stream';
-import fetch from 'node-fetch';
-import FormData from 'form-data';
-import { ImageMetadata } from '../../types';
-
-const getImagesSubdomain = ({ apiKey }: { apiKey: string }): string => {
-  const [, domain] = apiKey.split('__IMAGES_DOMAIN__');
-
-  if (!domain) {
-    throw new Error(
-      'Your API key is outdated, please regenerate it and add the new key to your Keystone config'
-    );
-  }
-
-  return domain;
-};
-
-const getS3Bucket = async ({
-  apiKey,
-  graphqlApiEndpoint,
-}: {
-  apiKey: string;
-  graphqlApiEndpoint: string;
-}): Promise<{ bucketName: string; prefix: string; region: string }> => {
-  const response = await fetch(graphqlApiEndpoint, {
-    method: 'POST',
-    headers: {
-      'Content-Type': 'application/json',
-    },
-    body: JSON.stringify({
-      query: `
-        query($apiKey:String) {
-          allAmazonS3Buckets(where: { project: { apiKey: { apiKey: $apiKey } } }) {
-            bucketName,
-            prefix,
-            region
-          }
-        }
-      `,
-      variables: {
-        apiKey,
-      },
-    }),
-  });
-  const json = await response.json();
-  const { data } = json;
-  const { allAmazonS3Buckets } = data;
-
-  return allAmazonS3Buckets[0];
-};
-
-const uploadAsset = async ({
-  apiKey,
-  filename,
-  inputFieldName,
-  stream,
-  apiRoute,
-  restApiEndpoint,
-}: {
-  apiKey: string;
-  filename: string;
-  inputFieldName: string;
-  stream: Readable;
-  apiRoute: string;
-  restApiEndpoint: string;
-}): Promise<any> => {
-  const form = new FormData();
-
-  form.append(inputFieldName, stream, filename);
-
-  const response = await fetch(`${restApiEndpoint}/${apiRoute}`, {
-    method: 'POST',
-    body: form,
-    headers: {
-      Authorization: `Bearer ${apiKey}`,
-    },
-  });
-
-  return await response.json();
-};
-
-export const buildKeystoneCloudImageSrc = async ({
-  apiKey,
-  filename,
-  imagesDomain,
-}: {
-  apiKey: string;
-  filename: string;
-  imagesDomain: string;
-}) => {
-  const imagesSubdomain = getImagesSubdomain({ apiKey });
-
-  return `http://${imagesSubdomain}.${imagesDomain}/${filename}`;
-};
-
-export const buildKeystoneCloudFileSrc = async ({
-  apiKey,
-  graphqlApiEndpoint,
-  filename,
-}: {
-  apiKey: string;
-  graphqlApiEndpoint: string;
-  filename: string;
-}) => {
-  const { bucketName, prefix, region } = await getS3Bucket({ apiKey, graphqlApiEndpoint });
-
-  return `https://${bucketName}.s3.${region}.amazonaws.com/${prefix}/${filename}`;
-};
-
-export const getImageMetadataFromKeystoneCloud = async ({
-  apiKey,
-  filename,
-  restApiEndpoint,
-}: {
-  apiKey: string;
-  filename: string;
-  restApiEndpoint: string;
-}): Promise<ImageMetadata> => {
-  const response = await fetch(`${restApiEndpoint}/images/${filename}`, {
-    headers: {
-      Authorization: `Bearer ${apiKey}`,
-    },
-  });
-
-  return await response.json();
-};
-
-export const getFileFromKeystoneCloud = async ({
-  apiKey,
-  filename,
-  restApiEndpoint,
-}: {
-  apiKey: string;
-  filename: string;
-  restApiEndpoint: string;
-}): Promise<{ filesize: number }> => {
-  const response = await fetch(`${restApiEndpoint}/files/${filename}`, {
-    headers: {
-      Authorization: `Bearer ${apiKey}`,
-    },
-  });
-
-  return await response.json();
-};
-
-export const uploadImageToKeystoneCloud = async ({
-  apiKey,
-  stream,
-  filename,
-  restApiEndpoint,
-}: {
-  apiKey: string;
-  stream: Readable;
-  filename: string;
-  restApiEndpoint: string;
-}): Promise<ImageMetadata> =>
-  uploadAsset({
-    apiKey,
-    stream,
-    filename,
-    restApiEndpoint,
-    inputFieldName: 'image',
-    apiRoute: 'images',
-  });
-
-export const uploadFileToKeystoneCloud = async ({
-  apiKey,
-  stream,
-  filename,
-  restApiEndpoint,
-}: {
-  apiKey: string;
-  stream: Readable;
-  filename: string;
-  restApiEndpoint: string;
-}) =>
-  uploadAsset({
-    apiKey,
-    stream,
-    filename,
-    restApiEndpoint,
-    inputFieldName: 'file',
-    apiRoute: 'files',
-  });
diff --git a/packages/keystone/src/scripts/run/dev.ts b/packages/keystone/src/scripts/run/dev.ts
index 3246fc9fc99..532c7e43c51 100644
--- a/packages/keystone/src/scripts/run/dev.ts
+++ b/packages/keystone/src/scripts/run/dev.ts
@@ -145,7 +145,7 @@ exports.default = function (req, res) { return res.send(x.toString()) }
             console.log('Your db config has changed, please restart Keystone');
             process.exit(1);
           }
-          const { graphQLSchema, getKeystone, adminMeta } = createSystem(newConfig);
+          const { graphQLSchema, getKeystone, adminMeta } = createSystem(newConfig, true);
           // we're not using generateCommittedArtifacts or any of the similar functions
           // because we will never need to write a new prisma schema here
           // and formatting the prisma schema leaves some listeners on the process
@@ -164,6 +164,7 @@ exports.default = function (req, res) { return res.send(x.toString()) }
           const keystone = getKeystone(function fakePrismaClientClass() {
             return prismaClient;
           });
+          await keystone.connect();
           const servers = await createExpressServer(
             newConfig,
             graphQLSchema,
diff --git a/packages/keystone/src/session/index.ts b/packages/keystone/src/session/index.ts
index c734aa5af13..f0637ecde44 100644
--- a/packages/keystone/src/session/index.ts
+++ b/packages/keystone/src/session/index.ts
@@ -108,7 +108,7 @@ export function statelessSessions<T>({
       );
     },
     async start({ res, data }) {
-      let sealedData = await Iron.seal(data, secret, { ...ironOptions, ttl: maxAge * 1000 });
+      const sealedData = await Iron.seal(data, secret, { ...ironOptions, ttl: maxAge * 1000 });
 
       res.setHeader(
         'Set-Cookie',
diff --git a/packages/keystone/src/types/config/index.ts b/packages/keystone/src/types/config/index.ts
index e63205fe2e8..be793ad1737 100644
--- a/packages/keystone/src/types/config/index.ts
+++ b/packages/keystone/src/types/config/index.ts
@@ -36,8 +36,8 @@ export type KeystoneConfig = {
     generateNodeAPI?: boolean;
     /** Creates a file at `node_modules/.keystone/next/graphql-api` with `default` and `config` exports that can be re-exported in a Next API route */
     generateNextGraphqlAPI?: boolean;
-    /** Config options for Keystone Cloud */
-    keystoneCloud?: KeystoneCloudConfig;
+    /** Options for Keystone Cloud */
+    cloud?: CloudConfig;
     /** Adds the internal data structure `experimental.initialisedLists` to the context object.
      * This is not a stable API and may contain breaking changes in `patch` level releases.
      */
@@ -208,13 +208,10 @@ export type ImagesConfig = {
   };
 };
 
-// config.experimental.keystoneCloud
+// config.experimental.cloud
 
-export type KeystoneCloudConfig = {
-  apiKey: string;
-  imagesDomain: string;
-  graphqlApiEndpoint: string;
-  restApiEndpoint: string;
+export type CloudConfig = {
+  apiKey?: string;
 };
 
 // Exports from sibling packages
diff --git a/packages/keystone/src/types/context.ts b/packages/keystone/src/types/context.ts
index 93b06a80bff..c447a63df8a 100644
--- a/packages/keystone/src/types/context.ts
+++ b/packages/keystone/src/types/context.ts
@@ -153,7 +153,7 @@ export type SessionContext<T> = {
   endSession(): Promise<void>;
 };
 
-export type AssetMode = 'local' | 'keystone-cloud';
+export type AssetMode = 'local' | 'cloud';
 
 // Files API
 
@@ -164,7 +164,7 @@ export type FileData = {
 };
 
 export type FilesContext = {
-  getSrc: (mode: AssetMode, filename: string) => Promise<string>;
+  getUrl: (mode: AssetMode, filename: string) => Promise<string>;
   getDataFromRef: (ref: string) => Promise<FileData>;
   getDataFromStream: (stream: Readable, filename: string) => Promise<FileData>;
 };
@@ -186,7 +186,7 @@ export type ImageData = {
 } & ImageMetadata;
 
 export type ImagesContext = {
-  getSrc: (mode: AssetMode, id: string, extension: ImageExtension) => Promise<string>;
+  getUrl: (mode: AssetMode, id: string, extension: ImageExtension) => Promise<string>;
   getDataFromRef: (ref: string) => Promise<ImageData>;
   getDataFromStream: (stream: Readable) => Promise<ImageData>;
 };

From 44cbef5435081311acb9e68dd750f1ca289b8221 Mon Sep 17 00:00:00 2001
From: Luke Bennett <hello@lukebennett.com.au>
Date: Mon, 1 Nov 2021 10:23:25 +1100
Subject: [PATCH 09/21] Update minor typos in GraphQL errors (#6853)

* Update minor typos in GraphQL errors
---
 .changeset/tidy-readers-appear.md                       | 5 +++++
 packages/keystone/src/types/schema/graphql-ts-schema.ts | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 .changeset/tidy-readers-appear.md

diff --git a/.changeset/tidy-readers-appear.md b/.changeset/tidy-readers-appear.md
new file mode 100644
index 00000000000..b06be7706dc
--- /dev/null
+++ b/.changeset/tidy-readers-appear.md
@@ -0,0 +1,5 @@
+---
+'@keystone-next/keystone': patch
+---
+
+Updated minor typos in GraphQL errors
diff --git a/packages/keystone/src/types/schema/graphql-ts-schema.ts b/packages/keystone/src/types/schema/graphql-ts-schema.ts
index 58bd48c9f42..ee93b4c401f 100644
--- a/packages/keystone/src/types/schema/graphql-ts-schema.ts
+++ b/packages/keystone/src/types/schema/graphql-ts-schema.ts
@@ -98,13 +98,13 @@ const RFC_3339_REGEX =
 function parseDate(input: string): Date {
   if (!RFC_3339_REGEX.test(input)) {
     throw new GraphQLError(
-      'DateTime scalars must be in the form of a full ISO 8601 date-time stirng'
+      'DateTime scalars must be in the form of a full ISO 8601 date-time string'
     );
   }
   const parsed = new Date(input);
   if (isNaN(parsed.valueOf())) {
     throw new GraphQLError(
-      'DateTime scalars must be in the form of a full ISO 8601 date-time stirng'
+      'DateTime scalars must be in the form of a full ISO 8601 date-time string'
     );
   }
   return parsed;

From f3e8aac31efb3eb1573eb340e07a25920084a4aa Mon Sep 17 00:00:00 2001
From: Mitchell Hamilton <mitchell@hamil.town>
Date: Mon, 1 Nov 2021 10:31:00 +1000
Subject: [PATCH 10/21] Graphql TS schema extensions (#6856)

---
 .changeset/cool-years-shop.md                 |   5 +
 .changeset/quick-bananas-listen.md            |   5 +
 .github/workflows/tests.yml                   |   1 +
 docs/pages/docs/guides/virtual-fields.mdx     |   6 +-
 examples-staging/auth/schema.graphql          | 102 +++---
 examples-staging/basic/schema.graphql         |  58 +--
 examples-staging/ecommerce/schema.graphql     | 226 ++++++------
 .../graphql-api-endpoint/schema.graphql       | 158 ++++----
 examples-staging/roles/schema.graphql         | 158 ++++----
 .../README.md                                 |  26 ++
 .../custom-schema.ts                          |  86 +++++
 .../keystone.ts                               |  12 +
 .../package.json                              |  21 ++
 .../schema.graphql                            | 345 ++++++++++++++++++
 .../schema.prisma                             |  32 ++
 .../schema.ts                                 |  27 ++
 examples/testing/schema.graphql               | 130 +++----
 examples/with-auth/schema.graphql             | 130 +++----
 packages/auth/package.json                    |   1 -
 packages/auth/src/gql/getBaseAuthSchema.ts    | 111 +++---
 .../auth/src/gql/getInitFirstItemSchema.ts    |  34 +-
 .../auth/src/gql/getMagicAuthLinkSchema.ts    |  99 ++---
 .../auth/src/gql/getPasswordResetSchema.ts    | 100 ++---
 packages/auth/src/schema.ts                   |  72 ++--
 packages/keystone/package.json                |   1 +
 .../src/types/schema/graphql-ts-schema.ts     |   6 +-
 .../extend-graphql-schema-graphql-ts.test.ts  |  19 +
 yarn.lock                                     |   7 +
 28 files changed, 1293 insertions(+), 685 deletions(-)
 create mode 100644 .changeset/cool-years-shop.md
 create mode 100644 .changeset/quick-bananas-listen.md
 create mode 100644 examples/extend-graphql-schema-graphql-ts/README.md
 create mode 100644 examples/extend-graphql-schema-graphql-ts/custom-schema.ts
 create mode 100644 examples/extend-graphql-schema-graphql-ts/keystone.ts
 create mode 100644 examples/extend-graphql-schema-graphql-ts/package.json
 create mode 100644 examples/extend-graphql-schema-graphql-ts/schema.graphql
 create mode 100644 examples/extend-graphql-schema-graphql-ts/schema.prisma
 create mode 100644 examples/extend-graphql-schema-graphql-ts/schema.ts
 create mode 100644 tests/examples-smoke-tests/extend-graphql-schema-graphql-ts.test.ts

diff --git a/.changeset/cool-years-shop.md b/.changeset/cool-years-shop.md
new file mode 100644
index 00000000000..51e8298a8ee
--- /dev/null
+++ b/.changeset/cool-years-shop.md
@@ -0,0 +1,5 @@
+---
+'@keystone-next/keystone': minor
+---
+
+Added `graphql.extend` and `graphql.wrap`.
diff --git a/.changeset/quick-bananas-listen.md b/.changeset/quick-bananas-listen.md
new file mode 100644
index 00000000000..fd1f149109a
--- /dev/null
+++ b/.changeset/quick-bananas-listen.md
@@ -0,0 +1,5 @@
+---
+'@keystone-next/auth': major
+---
+
+Updated the way the schema extension is added, this may result in schema re-ordering.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 91fe87573c4..04fec4552ca 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -191,6 +191,7 @@ jobs:
             'document-field.test.ts',
             'default-values.test.ts',
             'extend-graphql-schema.test.ts',
+            'extend-graphql-schema-graphql-ts.test.ts',
             'json.test.ts',
             'rest-api.test.ts',
             'roles.test.ts',
diff --git a/docs/pages/docs/guides/virtual-fields.mdx b/docs/pages/docs/guides/virtual-fields.mdx
index ef085174825..3f0caf85740 100644
--- a/docs/pages/docs/guides/virtual-fields.mdx
+++ b/docs/pages/docs/guides/virtual-fields.mdx
@@ -239,12 +239,12 @@ This fragment tells the Keystone Admin UI which values to show in the item page
 
 !> This information is specifically for TypeScript users of the `graphql.object()` function with a self-referential GraphQL type.
 
-GraphQL types will often contain references to themselves and to make TypeScript allow that, you need have an explicit type annotation of `graphql.ObjectType<RootVal>` along with making `fields` a function that returns the object.
+GraphQL types will often contain references to themselves and to make TypeScript allow that, you need have an explicit type annotation of `graphql.ObjectType<Source>` along with making `fields` a function that returns the object.
 
 ```ts
-type PersonRootVal = { name: string; friends: PersonRootVal[] };
+type PersonSource = { name: string; friends: PersonSource[] };
 
-const Person: graphql.ObjectType<PersonRootVal> = graphql.object<PersonRootVal>()({
+const Person: graphql.ObjectType<PersonSource> = graphql.object<PersonSource>()({
   name: "Person",
   fields: () => ({
     name: graphql.field({ type: graphql.String }),
diff --git a/examples-staging/auth/schema.graphql b/examples-staging/auth/schema.graphql
index 1d4c4730837..2735f6df5bb 100644
--- a/examples-staging/auth/schema.graphql
+++ b/examples-staging/auth/schema.graphql
@@ -1,57 +1,6 @@
 # This file is automatically generated by Keystone, do not modify it manually.
 # Modify your Keystone config when you want to change this.
 
-input CreateInitialUserInput {
-  name: String
-  email: String
-  password: String
-}
-
-type Mutation {
-  createInitialUser(
-    data: CreateInitialUserInput!
-  ): UserAuthenticationWithPasswordSuccess!
-  authenticateUserWithPassword(
-    email: String!
-    password: String!
-  ): UserAuthenticationWithPasswordResult!
-  createUser(data: UserCreateInput!): User
-  createUsers(data: [UserCreateInput!]!): [User]
-  updateUser(where: UserWhereUniqueInput!, data: UserUpdateInput!): User
-  updateUsers(data: [UserUpdateArgs!]!): [User]
-  deleteUser(where: UserWhereUniqueInput!): User
-  deleteUsers(where: [UserWhereUniqueInput!]!): [User]
-  endSession: Boolean!
-}
-
-union AuthenticatedItem = User
-
-type Query {
-  authenticatedItem: AuthenticatedItem
-  users(
-    where: UserWhereInput! = {}
-    orderBy: [UserOrderByInput!]! = []
-    take: Int
-    skip: Int! = 0
-  ): [User!]
-  user(where: UserWhereUniqueInput!): User
-  usersCount(where: UserWhereInput! = {}): Int
-  keystone: KeystoneMeta!
-}
-
-union UserAuthenticationWithPasswordResult =
-    UserAuthenticationWithPasswordSuccess
-  | UserAuthenticationWithPasswordFailure
-
-type UserAuthenticationWithPasswordSuccess {
-  sessionToken: String!
-  item: User!
-}
-
-type UserAuthenticationWithPasswordFailure {
-  message: String!
-}
-
 type User {
   id: ID!
   name: String
@@ -167,6 +116,57 @@ scalar JSON
     url: "http://www.ecma-international.org/publications/files/ECMA-ST/ECMA-404.pdf"
   )
 
+type Mutation {
+  createUser(data: UserCreateInput!): User
+  createUsers(data: [UserCreateInput!]!): [User]
+  updateUser(where: UserWhereUniqueInput!, data: UserUpdateInput!): User
+  updateUsers(data: [UserUpdateArgs!]!): [User]
+  deleteUser(where: UserWhereUniqueInput!): User
+  deleteUsers(where: [UserWhereUniqueInput!]!): [User]
+  endSession: Boolean!
+  authenticateUserWithPassword(
+    email: String!
+    password: String!
+  ): UserAuthenticationWithPasswordResult
+  createInitialUser(
+    data: CreateInitialUserInput!
+  ): UserAuthenticationWithPasswordSuccess!
+}
+
+union UserAuthenticationWithPasswordResult =
+    UserAuthenticationWithPasswordSuccess
+  | UserAuthenticationWithPasswordFailure
+
+type UserAuthenticationWithPasswordSuccess {
+  sessionToken: String!
+  item: User!
+}
+
+type UserAuthenticationWithPasswordFailure {
+  message: String!
+}
+
+input CreateInitialUserInput {
+  name: String
+  email: String
+  password: String
+}
+
+type Query {
+  users(
+    where: UserWhereInput! = {}
+    orderBy: [UserOrderByInput!]! = []
+    take: Int
+    skip: Int! = 0
+  ): [User!]
+  user(where: UserWhereUniqueInput!): User
+  usersCount(where: UserWhereInput! = {}): Int
+  keystone: KeystoneMeta!
+  authenticatedItem: AuthenticatedItem
+}
+
+union AuthenticatedItem = User
+
 type KeystoneMeta {
   adminMeta: KeystoneAdminMeta!
 }
diff --git a/examples-staging/basic/schema.graphql b/examples-staging/basic/schema.graphql
index 594194bd629..73ca7b01878 100644
--- a/examples-staging/basic/schema.graphql
+++ b/examples-staging/basic/schema.graphql
@@ -3,7 +3,6 @@
 
 type Query {
   randomNumber: RandomNumber
-  authenticatedItem: AuthenticatedItem
   users(
     where: UserWhereInput! = {}
     orderBy: [UserOrderByInput!]! = []
@@ -29,6 +28,7 @@ type Query {
   post(where: PostWhereUniqueInput!): Post
   postsCount(where: PostWhereInput! = {}): Int
   keystone: KeystoneMeta!
+  authenticatedItem: AuthenticatedItem
 }
 
 type RandomNumber {
@@ -38,13 +38,6 @@ type RandomNumber {
 
 type Mutation {
   createRandomPosts: [Post!]!
-  createInitialUser(
-    data: CreateInitialUserInput!
-  ): UserAuthenticationWithPasswordSuccess!
-  authenticateUserWithPassword(
-    email: String!
-    password: String!
-  ): UserAuthenticationWithPasswordResult!
   createUser(data: UserCreateInput!): User
   createUsers(data: [UserCreateInput!]!): [User]
   updateUser(where: UserWhereUniqueInput!, data: UserUpdateInput!): User
@@ -67,27 +60,13 @@ type Mutation {
   deletePost(where: PostWhereUniqueInput!): Post
   deletePosts(where: [PostWhereUniqueInput!]!): [Post]
   endSession: Boolean!
-}
-
-input CreateInitialUserInput {
-  name: String
-  email: String
-  password: String
-}
-
-union AuthenticatedItem = User
-
-union UserAuthenticationWithPasswordResult =
-    UserAuthenticationWithPasswordSuccess
-  | UserAuthenticationWithPasswordFailure
-
-type UserAuthenticationWithPasswordSuccess {
-  sessionToken: String!
-  item: User!
-}
-
-type UserAuthenticationWithPasswordFailure {
-  message: String!
+  authenticateUserWithPassword(
+    email: String!
+    password: String!
+  ): UserAuthenticationWithPasswordResult
+  createInitialUser(
+    data: CreateInitialUserInput!
+  ): UserAuthenticationWithPasswordSuccess!
 }
 
 type User {
@@ -500,6 +479,27 @@ scalar JSON
     url: "http://www.ecma-international.org/publications/files/ECMA-ST/ECMA-404.pdf"
   )
 
+union UserAuthenticationWithPasswordResult =
+    UserAuthenticationWithPasswordSuccess
+  | UserAuthenticationWithPasswordFailure
+
+type UserAuthenticationWithPasswordSuccess {
+  sessionToken: String!
+  item: User!
+}
+
+type UserAuthenticationWithPasswordFailure {
+  message: String!
+}
+
+input CreateInitialUserInput {
+  name: String
+  email: String
+  password: String
+}
+
+union AuthenticatedItem = User
+
 type KeystoneMeta {
   adminMeta: KeystoneAdminMeta!
 }
diff --git a/examples-staging/ecommerce/schema.graphql b/examples-staging/ecommerce/schema.graphql
index fd9e696538d..0005565bcd9 100644
--- a/examples-staging/ecommerce/schema.graphql
+++ b/examples-staging/ecommerce/schema.graphql
@@ -4,19 +4,6 @@
 type Mutation {
   addToCart(productId: ID): CartItem
   checkout(token: String!): Order
-  sendUserPasswordResetLink(email: String!): Boolean!
-  redeemUserPasswordResetToken(
-    email: String!
-    token: String!
-    password: String!
-  ): RedeemUserPasswordResetTokenResult
-  createInitialUser(
-    data: CreateInitialUserInput!
-  ): UserAuthenticationWithPasswordSuccess!
-  authenticateUserWithPassword(
-    email: String!
-    password: String!
-  ): UserAuthenticationWithPasswordResult!
   createUser(data: UserCreateInput!): User
   createUsers(data: [UserCreateInput!]!): [User]
   updateUser(where: UserWhereUniqueInput!, data: UserUpdateInput!): User
@@ -72,108 +59,19 @@ type Mutation {
   deleteRole(where: RoleWhereUniqueInput!): Role
   deleteRoles(where: [RoleWhereUniqueInput!]!): [Role]
   endSession: Boolean!
-}
-
-type Query {
-  validateUserPasswordResetToken(
+  authenticateUserWithPassword(
+    email: String!
+    password: String!
+  ): UserAuthenticationWithPasswordResult
+  createInitialUser(
+    data: CreateInitialUserInput!
+  ): UserAuthenticationWithPasswordSuccess!
+  sendUserPasswordResetLink(email: String!): Boolean!
+  redeemUserPasswordResetToken(
     email: String!
     token: String!
-  ): ValidateUserPasswordResetTokenResult
-  authenticatedItem: AuthenticatedItem
-  users(
-    where: UserWhereInput! = {}
-    orderBy: [UserOrderByInput!]! = []
-    take: Int
-    skip: Int! = 0
-  ): [User!]
-  user(where: UserWhereUniqueInput!): User
-  usersCount(where: UserWhereInput! = {}): Int
-  products(
-    where: ProductWhereInput! = {}
-    orderBy: [ProductOrderByInput!]! = []
-    take: Int
-    skip: Int! = 0
-  ): [Product!]
-  product(where: ProductWhereUniqueInput!): Product
-  productsCount(where: ProductWhereInput! = {}): Int
-  productImages(
-    where: ProductImageWhereInput! = {}
-    orderBy: [ProductImageOrderByInput!]! = []
-    take: Int
-    skip: Int! = 0
-  ): [ProductImage!]
-  productImage(where: ProductImageWhereUniqueInput!): ProductImage
-  productImagesCount(where: ProductImageWhereInput! = {}): Int
-  cartItems(
-    where: CartItemWhereInput! = {}
-    orderBy: [CartItemOrderByInput!]! = []
-    take: Int
-    skip: Int! = 0
-  ): [CartItem!]
-  cartItem(where: CartItemWhereUniqueInput!): CartItem
-  cartItemsCount(where: CartItemWhereInput! = {}): Int
-  orderItems(
-    where: OrderItemWhereInput! = {}
-    orderBy: [OrderItemOrderByInput!]! = []
-    take: Int
-    skip: Int! = 0
-  ): [OrderItem!]
-  orderItem(where: OrderItemWhereUniqueInput!): OrderItem
-  orderItemsCount(where: OrderItemWhereInput! = {}): Int
-  orders(
-    where: OrderWhereInput! = {}
-    orderBy: [OrderOrderByInput!]! = []
-    take: Int
-    skip: Int! = 0
-  ): [Order!]
-  order(where: OrderWhereUniqueInput!): Order
-  ordersCount(where: OrderWhereInput! = {}): Int
-  roles(
-    where: RoleWhereInput! = {}
-    orderBy: [RoleOrderByInput!]! = []
-    take: Int
-    skip: Int! = 0
-  ): [Role!]
-  role(where: RoleWhereUniqueInput!): Role
-  rolesCount(where: RoleWhereInput! = {}): Int
-  keystone: KeystoneMeta!
-}
-
-type ValidateUserPasswordResetTokenResult {
-  code: PasswordResetRedemptionErrorCode!
-  message: String!
-}
-
-type RedeemUserPasswordResetTokenResult {
-  code: PasswordResetRedemptionErrorCode!
-  message: String!
-}
-
-enum PasswordResetRedemptionErrorCode {
-  FAILURE
-  TOKEN_EXPIRED
-  TOKEN_REDEEMED
-}
-
-input CreateInitialUserInput {
-  name: String
-  email: String
-  password: String
-}
-
-union AuthenticatedItem = User
-
-union UserAuthenticationWithPasswordResult =
-    UserAuthenticationWithPasswordSuccess
-  | UserAuthenticationWithPasswordFailure
-
-type UserAuthenticationWithPasswordSuccess {
-  sessionToken: String!
-  item: User!
-}
-
-type UserAuthenticationWithPasswordFailure {
-  message: String!
+    password: String!
+  ): RedeemUserPasswordResetTokenResult
 }
 
 type User {
@@ -928,6 +826,108 @@ scalar JSON
     url: "http://www.ecma-international.org/publications/files/ECMA-ST/ECMA-404.pdf"
   )
 
+union UserAuthenticationWithPasswordResult =
+    UserAuthenticationWithPasswordSuccess
+  | UserAuthenticationWithPasswordFailure
+
+type UserAuthenticationWithPasswordSuccess {
+  sessionToken: String!
+  item: User!
+}
+
+type UserAuthenticationWithPasswordFailure {
+  message: String!
+}
+
+input CreateInitialUserInput {
+  name: String
+  email: String
+  password: String
+}
+
+type RedeemUserPasswordResetTokenResult {
+  code: PasswordResetRedemptionErrorCode!
+  message: String!
+}
+
+enum PasswordResetRedemptionErrorCode {
+  FAILURE
+  TOKEN_EXPIRED
+  TOKEN_REDEEMED
+}
+
+type Query {
+  users(
+    where: UserWhereInput! = {}
+    orderBy: [UserOrderByInput!]! = []
+    take: Int
+    skip: Int! = 0
+  ): [User!]
+  user(where: UserWhereUniqueInput!): User
+  usersCount(where: UserWhereInput! = {}): Int
+  products(
+    where: ProductWhereInput! = {}
+    orderBy: [ProductOrderByInput!]! = []
+    take: Int
+    skip: Int! = 0
+  ): [Product!]
+  product(where: ProductWhereUniqueInput!): Product
+  productsCount(where: ProductWhereInput! = {}): Int
+  productImages(
+    where: ProductImageWhereInput! = {}
+    orderBy: [ProductImageOrderByInput!]! = []
+    take: Int
+    skip: Int! = 0
+  ): [ProductImage!]
+  productImage(where: ProductImageWhereUniqueInput!): ProductImage
+  productImagesCount(where: ProductImageWhereInput! = {}): Int
+  cartItems(
+    where: CartItemWhereInput! = {}
+    orderBy: [CartItemOrderByInput!]! = []
+    take: Int
+    skip: Int! = 0
+  ): [CartItem!]
+  cartItem(where: CartItemWhereUniqueInput!): CartItem
+  cartItemsCount(where: CartItemWhereInput! = {}): Int
+  orderItems(
+    where: OrderItemWhereInput! = {}
+    orderBy: [OrderItemOrderByInput!]! = []
+    take: Int
+    skip: Int! = 0
+  ): [OrderItem!]
+  orderItem(where: OrderItemWhereUniqueInput!): OrderItem
+  orderItemsCount(where: OrderItemWhereInput! = {}): Int
+  orders(
+    where: OrderWhereInput! = {}
+    orderBy: [OrderOrderByInput!]! = []
+    take: Int
+    skip: Int! = 0
+  ): [Order!]
+  order(where: OrderWhereUniqueInput!): Order
+  ordersCount(where: OrderWhereInput! = {}): Int
+  roles(
+    where: RoleWhereInput! = {}
+    orderBy: [RoleOrderByInput!]! = []
+    take: Int
+    skip: Int! = 0
+  ): [Role!]
+  role(where: RoleWhereUniqueInput!): Role
+  rolesCount(where: RoleWhereInput! = {}): Int
+  keystone: KeystoneMeta!
+  authenticatedItem: AuthenticatedItem
+  validateUserPasswordResetToken(
+    email: String!
+    token: String!
+  ): ValidateUserPasswordResetTokenResult
+}
+
+union AuthenticatedItem = User
+
+type ValidateUserPasswordResetTokenResult {
+  code: PasswordResetRedemptionErrorCode!
+  message: String!
+}
+
 type KeystoneMeta {
   adminMeta: KeystoneAdminMeta!
 }
diff --git a/examples-staging/graphql-api-endpoint/schema.graphql b/examples-staging/graphql-api-endpoint/schema.graphql
index 1fef3e4dd59..c77056f7aba 100644
--- a/examples-staging/graphql-api-endpoint/schema.graphql
+++ b/examples-staging/graphql-api-endpoint/schema.graphql
@@ -1,85 +1,6 @@
 # This file is automatically generated by Keystone, do not modify it manually.
 # Modify your Keystone config when you want to change this.
 
-input CreateInitialUserInput {
-  name: String
-  email: String
-  password: String
-}
-
-type Mutation {
-  createInitialUser(
-    data: CreateInitialUserInput!
-  ): UserAuthenticationWithPasswordSuccess!
-  authenticateUserWithPassword(
-    email: String!
-    password: String!
-  ): UserAuthenticationWithPasswordResult!
-  createUser(data: UserCreateInput!): User
-  createUsers(data: [UserCreateInput!]!): [User]
-  updateUser(where: UserWhereUniqueInput!, data: UserUpdateInput!): User
-  updateUsers(data: [UserUpdateArgs!]!): [User]
-  deleteUser(where: UserWhereUniqueInput!): User
-  deleteUsers(where: [UserWhereUniqueInput!]!): [User]
-  createPost(data: PostCreateInput!): Post
-  createPosts(data: [PostCreateInput!]!): [Post]
-  updatePost(where: PostWhereUniqueInput!, data: PostUpdateInput!): Post
-  updatePosts(data: [PostUpdateArgs!]!): [Post]
-  deletePost(where: PostWhereUniqueInput!): Post
-  deletePosts(where: [PostWhereUniqueInput!]!): [Post]
-  createTag(data: TagCreateInput!): Tag
-  createTags(data: [TagCreateInput!]!): [Tag]
-  updateTag(where: TagWhereUniqueInput!, data: TagUpdateInput!): Tag
-  updateTags(data: [TagUpdateArgs!]!): [Tag]
-  deleteTag(where: TagWhereUniqueInput!): Tag
-  deleteTags(where: [TagWhereUniqueInput!]!): [Tag]
-  endSession: Boolean!
-}
-
-union AuthenticatedItem = User
-
-type Query {
-  authenticatedItem: AuthenticatedItem
-  users(
-    where: UserWhereInput! = {}
-    orderBy: [UserOrderByInput!]! = []
-    take: Int
-    skip: Int! = 0
-  ): [User!]
-  user(where: UserWhereUniqueInput!): User
-  usersCount(where: UserWhereInput! = {}): Int
-  posts(
-    where: PostWhereInput! = {}
-    orderBy: [PostOrderByInput!]! = []
-    take: Int
-    skip: Int! = 0
-  ): [Post!]
-  post(where: PostWhereUniqueInput!): Post
-  postsCount(where: PostWhereInput! = {}): Int
-  tags(
-    where: TagWhereInput! = {}
-    orderBy: [TagOrderByInput!]! = []
-    take: Int
-    skip: Int! = 0
-  ): [Tag!]
-  tag(where: TagWhereUniqueInput!): Tag
-  tagsCount(where: TagWhereInput! = {}): Int
-  keystone: KeystoneMeta!
-}
-
-union UserAuthenticationWithPasswordResult =
-    UserAuthenticationWithPasswordSuccess
-  | UserAuthenticationWithPasswordFailure
-
-type UserAuthenticationWithPasswordSuccess {
-  sessionToken: String!
-  item: User!
-}
-
-type UserAuthenticationWithPasswordFailure {
-  message: String!
-}
-
 type User {
   id: ID!
   name: String
@@ -402,6 +323,85 @@ scalar JSON
     url: "http://www.ecma-international.org/publications/files/ECMA-ST/ECMA-404.pdf"
   )
 
+type Mutation {
+  createUser(data: UserCreateInput!): User
+  createUsers(data: [UserCreateInput!]!): [User]
+  updateUser(where: UserWhereUniqueInput!, data: UserUpdateInput!): User
+  updateUsers(data: [UserUpdateArgs!]!): [User]
+  deleteUser(where: UserWhereUniqueInput!): User
+  deleteUsers(where: [UserWhereUniqueInput!]!): [User]
+  createPost(data: PostCreateInput!): Post
+  createPosts(data: [PostCreateInput!]!): [Post]
+  updatePost(where: PostWhereUniqueInput!, data: PostUpdateInput!): Post
+  updatePosts(data: [PostUpdateArgs!]!): [Post]
+  deletePost(where: PostWhereUniqueInput!): Post
+  deletePosts(where: [PostWhereUniqueInput!]!): [Post]
+  createTag(data: TagCreateInput!): Tag
+  createTags(data: [TagCreateInput!]!): [Tag]
+  updateTag(where: TagWhereUniqueInput!, data: TagUpdateInput!): Tag
+  updateTags(data: [TagUpdateArgs!]!): [Tag]
+  deleteTag(where: TagWhereUniqueInput!): Tag
+  deleteTags(where: [TagWhereUniqueInput!]!): [Tag]
+  endSession: Boolean!
+  authenticateUserWithPassword(
+    email: String!
+    password: String!
+  ): UserAuthenticationWithPasswordResult
+  createInitialUser(
+    data: CreateInitialUserInput!
+  ): UserAuthenticationWithPasswordSuccess!
+}
+
+union UserAuthenticationWithPasswordResult =
+    UserAuthenticationWithPasswordSuccess
+  | UserAuthenticationWithPasswordFailure
+
+type UserAuthenticationWithPasswordSuccess {
+  sessionToken: String!
+  item: User!
+}
+
+type UserAuthenticationWithPasswordFailure {
+  message: String!
+}
+
+input CreateInitialUserInput {
+  name: String
+  email: String
+  password: String
+}
+
+type Query {
+  users(
+    where: UserWhereInput! = {}
+    orderBy: [UserOrderByInput!]! = []
+    take: Int
+    skip: Int! = 0
+  ): [User!]
+  user(where: UserWhereUniqueInput!): User
+  usersCount(where: UserWhereInput! = {}): Int
+  posts(
+    where: PostWhereInput! = {}
+    orderBy: [PostOrderByInput!]! = []
+    take: Int
+    skip: Int! = 0
+  ): [Post!]
+  post(where: PostWhereUniqueInput!): Post
+  postsCount(where: PostWhereInput! = {}): Int
+  tags(
+    where: TagWhereInput! = {}
+    orderBy: [TagOrderByInput!]! = []
+    take: Int
+    skip: Int! = 0
+  ): [Tag!]
+  tag(where: TagWhereUniqueInput!): Tag
+  tagsCount(where: TagWhereInput! = {}): Int
+  keystone: KeystoneMeta!
+  authenticatedItem: AuthenticatedItem
+}
+
+union AuthenticatedItem = User
+
 type KeystoneMeta {
   adminMeta: KeystoneAdminMeta!
 }
diff --git a/examples-staging/roles/schema.graphql b/examples-staging/roles/schema.graphql
index fc0188fb261..1329482666d 100644
--- a/examples-staging/roles/schema.graphql
+++ b/examples-staging/roles/schema.graphql
@@ -1,85 +1,6 @@
 # This file is automatically generated by Keystone, do not modify it manually.
 # Modify your Keystone config when you want to change this.
 
-input CreateInitialPersonInput {
-  name: String
-  email: String
-  password: String
-}
-
-type Mutation {
-  createInitialPerson(
-    data: CreateInitialPersonInput!
-  ): PersonAuthenticationWithPasswordSuccess!
-  authenticatePersonWithPassword(
-    email: String!
-    password: String!
-  ): PersonAuthenticationWithPasswordResult!
-  createTodo(data: TodoCreateInput!): Todo
-  createTodos(data: [TodoCreateInput!]!): [Todo]
-  updateTodo(where: TodoWhereUniqueInput!, data: TodoUpdateInput!): Todo
-  updateTodos(data: [TodoUpdateArgs!]!): [Todo]
-  deleteTodo(where: TodoWhereUniqueInput!): Todo
-  deleteTodos(where: [TodoWhereUniqueInput!]!): [Todo]
-  createPerson(data: PersonCreateInput!): Person
-  createPeople(data: [PersonCreateInput!]!): [Person]
-  updatePerson(where: PersonWhereUniqueInput!, data: PersonUpdateInput!): Person
-  updatePeople(data: [PersonUpdateArgs!]!): [Person]
-  deletePerson(where: PersonWhereUniqueInput!): Person
-  deletePeople(where: [PersonWhereUniqueInput!]!): [Person]
-  createRole(data: RoleCreateInput!): Role
-  createRoles(data: [RoleCreateInput!]!): [Role]
-  updateRole(where: RoleWhereUniqueInput!, data: RoleUpdateInput!): Role
-  updateRoles(data: [RoleUpdateArgs!]!): [Role]
-  deleteRole(where: RoleWhereUniqueInput!): Role
-  deleteRoles(where: [RoleWhereUniqueInput!]!): [Role]
-  endSession: Boolean!
-}
-
-union AuthenticatedItem = Person
-
-type Query {
-  authenticatedItem: AuthenticatedItem
-  todos(
-    where: TodoWhereInput! = {}
-    orderBy: [TodoOrderByInput!]! = []
-    take: Int
-    skip: Int! = 0
-  ): [Todo!]
-  todo(where: TodoWhereUniqueInput!): Todo
-  todosCount(where: TodoWhereInput! = {}): Int
-  people(
-    where: PersonWhereInput! = {}
-    orderBy: [PersonOrderByInput!]! = []
-    take: Int
-    skip: Int! = 0
-  ): [Person!]
-  person(where: PersonWhereUniqueInput!): Person
-  peopleCount(where: PersonWhereInput! = {}): Int
-  roles(
-    where: RoleWhereInput! = {}
-    orderBy: [RoleOrderByInput!]! = []
-    take: Int
-    skip: Int! = 0
-  ): [Role!]
-  role(where: RoleWhereUniqueInput!): Role
-  rolesCount(where: RoleWhereInput! = {}): Int
-  keystone: KeystoneMeta!
-}
-
-union PersonAuthenticationWithPasswordResult =
-    PersonAuthenticationWithPasswordSuccess
-  | PersonAuthenticationWithPasswordFailure
-
-type PersonAuthenticationWithPasswordSuccess {
-  sessionToken: String!
-  item: Person!
-}
-
-type PersonAuthenticationWithPasswordFailure {
-  message: String!
-}
-
 type Todo {
   id: ID!
   label: String
@@ -381,6 +302,85 @@ scalar JSON
     url: "http://www.ecma-international.org/publications/files/ECMA-ST/ECMA-404.pdf"
   )
 
+type Mutation {
+  createTodo(data: TodoCreateInput!): Todo
+  createTodos(data: [TodoCreateInput!]!): [Todo]
+  updateTodo(where: TodoWhereUniqueInput!, data: TodoUpdateInput!): Todo
+  updateTodos(data: [TodoUpdateArgs!]!): [Todo]
+  deleteTodo(where: TodoWhereUniqueInput!): Todo
+  deleteTodos(where: [TodoWhereUniqueInput!]!): [Todo]
+  createPerson(data: PersonCreateInput!): Person
+  createPeople(data: [PersonCreateInput!]!): [Person]
+  updatePerson(where: PersonWhereUniqueInput!, data: PersonUpdateInput!): Person
+  updatePeople(data: [PersonUpdateArgs!]!): [Person]
+  deletePerson(where: PersonWhereUniqueInput!): Person
+  deletePeople(where: [PersonWhereUniqueInput!]!): [Person]
+  createRole(data: RoleCreateInput!): Role
+  createRoles(data: [RoleCreateInput!]!): [Role]
+  updateRole(where: RoleWhereUniqueInput!, data: RoleUpdateInput!): Role
+  updateRoles(data: [RoleUpdateArgs!]!): [Role]
+  deleteRole(where: RoleWhereUniqueInput!): Role
+  deleteRoles(where: [RoleWhereUniqueInput!]!): [Role]
+  endSession: Boolean!
+  authenticatePersonWithPassword(
+    email: String!
+    password: String!
+  ): PersonAuthenticationWithPasswordResult
+  createInitialPerson(
+    data: CreateInitialPersonInput!
+  ): PersonAuthenticationWithPasswordSuccess!
+}
+
+union PersonAuthenticationWithPasswordResult =
+    PersonAuthenticationWithPasswordSuccess
+  | PersonAuthenticationWithPasswordFailure
+
+type PersonAuthenticationWithPasswordSuccess {
+  sessionToken: String!
+  item: Person!
+}
+
+type PersonAuthenticationWithPasswordFailure {
+  message: String!
+}
+
+input CreateInitialPersonInput {
+  name: String
+  email: String
+  password: String
+}
+
+type Query {
+  todos(
+    where: TodoWhereInput! = {}
+    orderBy: [TodoOrderByInput!]! = []
+    take: Int
+    skip: Int! = 0
+  ): [Todo!]
+  todo(where: TodoWhereUniqueInput!): Todo
+  todosCount(where: TodoWhereInput! = {}): Int
+  people(
+    where: PersonWhereInput! = {}
+    orderBy: [PersonOrderByInput!]! = []
+    take: Int
+    skip: Int! = 0
+  ): [Person!]
+  person(where: PersonWhereUniqueInput!): Person
+  peopleCount(where: PersonWhereInput! = {}): Int
+  roles(
+    where: RoleWhereInput! = {}
+    orderBy: [RoleOrderByInput!]! = []
+    take: Int
+    skip: Int! = 0
+  ): [Role!]
+  role(where: RoleWhereUniqueInput!): Role
+  rolesCount(where: RoleWhereInput! = {}): Int
+  keystone: KeystoneMeta!
+  authenticatedItem: AuthenticatedItem
+}
+
+union AuthenticatedItem = Person
+
 type KeystoneMeta {
   adminMeta: KeystoneAdminMeta!
 }
diff --git a/examples/extend-graphql-schema-graphql-ts/README.md b/examples/extend-graphql-schema-graphql-ts/README.md
new file mode 100644
index 00000000000..5e4d0ac2e8d
--- /dev/null
+++ b/examples/extend-graphql-schema-graphql-ts/README.md
@@ -0,0 +1,26 @@
+## Feature Example - Extend GraphQL Schema GraphQL TS
+
+This project demonstrates how to extend the GraphQL API provided by Keystone with custom queries and mutations using [graphql-ts](https://github.com/Thinkmill/graphql-ts).
+It builds on the [Blog](../blog) starter project.
+
+## Instructions
+
+To run this project, clone the Keystone repository locally then navigate to this directory and run:
+
+```shell
+yarn dev
+```
+
+This will start the Admin UI at [localhost:3000](http://localhost:3000).
+You can use the Admin UI to create items in your database.
+
+You can also access a GraphQL Playground at [localhost:3000/api/graphql](http://localhost:3000/api/graphql), which allows you to directly run GraphQL queries and mutations.
+
+## Features
+
+This project demonstrates how to extend the GraphQL API provided by Keystone with custom queries and mutations.
+Schema extensions are set using the [`extendGraphqlSchema`](https://keystonejs.com/docs/apis/config#extend-graphql-schema) config option.
+
+The `graphql.extend` function allows you to extend the existing query and mutation types and define new types or use existing types in your extension.
+
+See the [`@graphql-ts/schema`](https://docsmill.dev/npm/@graphql-ts/schema) and [`@graphql-ts/extend`](https://docsmill.dev/npm/@graphql-ts/extend) docs for more information.
diff --git a/examples/extend-graphql-schema-graphql-ts/custom-schema.ts b/examples/extend-graphql-schema-graphql-ts/custom-schema.ts
new file mode 100644
index 00000000000..0fc2dbf1a17
--- /dev/null
+++ b/examples/extend-graphql-schema-graphql-ts/custom-schema.ts
@@ -0,0 +1,86 @@
+import { graphql } from '@keystone-next/keystone';
+
+export const extendGraphqlSchema = graphql.extend(base => {
+  const Statistics = graphql.object<{ authorId: string }>()({
+    name: 'Statistics',
+    fields: {
+      draft: graphql.field({
+        type: graphql.Int,
+        resolve({ authorId }, args, context) {
+          return context.query.Post.count({
+            where: { author: { id: { equals: authorId } }, status: { equals: 'draft' } },
+          });
+        },
+      }),
+      published: graphql.field({
+        type: graphql.Int,
+        resolve({ authorId }, args, context) {
+          return context.query.Post.count({
+            where: { author: { id: { equals: authorId } }, status: { equals: 'published' } },
+          });
+        },
+      }),
+      latest: graphql.field({
+        type: base.object('Post'),
+        async resolve({ authorId }, args, context) {
+          const [post] = await context.db.Post.findMany({
+            take: 1,
+            orderBy: { publishDate: 'desc' },
+            where: { author: { id: { equals: authorId } } },
+          });
+          return post;
+        },
+      }),
+    },
+  });
+  return {
+    mutation: {
+      publishPost: graphql.field({
+        // base.object will return an object type from the existing schema
+        // with the name provided or throw if it doesn't exist
+        type: base.object('Post'),
+        args: { id: graphql.arg({ type: graphql.nonNull(graphql.ID) }) },
+        resolve(source, { id }, context) {
+          // Note we use `context.db.Post` here as we have a return type
+          // of Post, and this API provides results in the correct format.
+          // If you accidentally use `context.query.Post` here you can expect problems
+          // when accessing the fields in your GraphQL client.
+          return context.db.Post.updateOne({
+            where: { id },
+            data: { status: 'published', publishDate: new Date().toISOString() },
+          });
+        },
+      }),
+    },
+    query: {
+      recentPosts: graphql.field({
+        type: graphql.list(graphql.nonNull(base.object('Post'))),
+        args: {
+          id: graphql.arg({ type: graphql.nonNull(graphql.ID) }),
+          days: graphql.arg({ type: graphql.nonNull(graphql.Int), defaultValue: 7 }),
+        },
+        resolve(source, { id, days }, context) {
+          // Create a date string <days> in the past from now()
+          const cutoff = new Date(
+            new Date().setUTCDate(new Date().getUTCDate() - days)
+          ).toISOString();
+
+          // Note we use `context.db.Post` here as we have a return type
+          // of [Post], and this API provides results in the correct format.
+          // If you accidentally use `context.query.Post` here you can expect problems
+          // when accessing the fields in your GraphQL client.
+          return context.db.Post.findMany({
+            where: { author: { id: { equals: id } }, publishDate: { gt: cutoff } },
+          });
+        },
+      }),
+      stats: graphql.field({
+        type: Statistics,
+        args: { id: graphql.arg({ type: graphql.nonNull(graphql.ID) }) },
+        resolve(source, { id }) {
+          return { authorId: id };
+        },
+      }),
+    },
+  };
+});
diff --git a/examples/extend-graphql-schema-graphql-ts/keystone.ts b/examples/extend-graphql-schema-graphql-ts/keystone.ts
new file mode 100644
index 00000000000..ed98d0d9b48
--- /dev/null
+++ b/examples/extend-graphql-schema-graphql-ts/keystone.ts
@@ -0,0 +1,12 @@
+import { config } from '@keystone-next/keystone';
+import { lists } from './schema';
+import { extendGraphqlSchema } from './custom-schema';
+
+export default config({
+  db: {
+    provider: 'sqlite',
+    url: process.env.DATABASE_URL || 'file:./keystone-example.db',
+  },
+  lists,
+  extendGraphqlSchema,
+});
diff --git a/examples/extend-graphql-schema-graphql-ts/package.json b/examples/extend-graphql-schema-graphql-ts/package.json
new file mode 100644
index 00000000000..901dbeb301c
--- /dev/null
+++ b/examples/extend-graphql-schema-graphql-ts/package.json
@@ -0,0 +1,21 @@
+{
+  "name": "@keystone-next/example-extend-graphql-schema-graphql-ts",
+  "version": "1.0.9",
+  "private": true,
+  "license": "MIT",
+  "scripts": {
+    "dev": "keystone-next dev",
+    "start": "keystone-next start",
+    "build": "keystone-next build"
+  },
+  "dependencies": {
+    "@keystone-next/keystone": "^26.1.0"
+  },
+  "devDependencies": {
+    "typescript": "^4.4.4"
+  },
+  "engines": {
+    "node": "^12.20 || >= 14.13"
+  },
+  "repository": "https://github.com/keystonejs/keystone/tree/main/examples/extend-graphql-schema-graphql-ts"
+}
diff --git a/examples/extend-graphql-schema-graphql-ts/schema.graphql b/examples/extend-graphql-schema-graphql-ts/schema.graphql
new file mode 100644
index 00000000000..163c77c1f46
--- /dev/null
+++ b/examples/extend-graphql-schema-graphql-ts/schema.graphql
@@ -0,0 +1,345 @@
+# This file is automatically generated by Keystone, do not modify it manually.
+# Modify your Keystone config when you want to change this.
+
+type Post {
+  id: ID!
+  title: String
+  status: PostStatusType
+  content: String
+  publishDate: DateTime
+  author: Author
+}
+
+enum PostStatusType {
+  draft
+  published
+}
+
+scalar DateTime
+  @specifiedBy(url: "https://datatracker.ietf.org/doc/html/rfc3339#section-5.6")
+
+input PostWhereUniqueInput {
+  id: ID
+}
+
+input PostWhereInput {
+  AND: [PostWhereInput!]
+  OR: [PostWhereInput!]
+  NOT: [PostWhereInput!]
+  id: IDFilter
+  title: StringFilter
+  status: PostStatusTypeNullableFilter
+  content: StringFilter
+  publishDate: DateTimeNullableFilter
+  author: AuthorWhereInput
+}
+
+input IDFilter {
+  equals: ID
+  in: [ID!]
+  notIn: [ID!]
+  lt: ID
+  lte: ID
+  gt: ID
+  gte: ID
+  not: IDFilter
+}
+
+input StringFilter {
+  equals: String
+  in: [String!]
+  notIn: [String!]
+  lt: String
+  lte: String
+  gt: String
+  gte: String
+  contains: String
+  startsWith: String
+  endsWith: String
+  not: NestedStringFilter
+}
+
+input NestedStringFilter {
+  equals: String
+  in: [String!]
+  notIn: [String!]
+  lt: String
+  lte: String
+  gt: String
+  gte: String
+  contains: String
+  startsWith: String
+  endsWith: String
+  not: NestedStringFilter
+}
+
+input PostStatusTypeNullableFilter {
+  equals: PostStatusType
+  in: [PostStatusType!]
+  notIn: [PostStatusType!]
+  not: PostStatusTypeNullableFilter
+}
+
+input DateTimeNullableFilter {
+  equals: DateTime
+  in: [DateTime!]
+  notIn: [DateTime!]
+  lt: DateTime
+  lte: DateTime
+  gt: DateTime
+  gte: DateTime
+  not: DateTimeNullableFilter
+}
+
+input PostOrderByInput {
+  id: OrderDirection
+  title: OrderDirection
+  status: OrderDirection
+  content: OrderDirection
+  publishDate: OrderDirection
+}
+
+enum OrderDirection {
+  asc
+  desc
+}
+
+input PostUpdateInput {
+  title: String
+  status: PostStatusType
+  content: String
+  publishDate: DateTime
+  author: AuthorRelateToOneForUpdateInput
+}
+
+input AuthorRelateToOneForUpdateInput {
+  create: AuthorCreateInput
+  connect: AuthorWhereUniqueInput
+  disconnect: Boolean
+}
+
+input PostUpdateArgs {
+  where: PostWhereUniqueInput!
+  data: PostUpdateInput!
+}
+
+input PostCreateInput {
+  title: String
+  status: PostStatusType
+  content: String
+  publishDate: DateTime
+  author: AuthorRelateToOneForCreateInput
+}
+
+input AuthorRelateToOneForCreateInput {
+  create: AuthorCreateInput
+  connect: AuthorWhereUniqueInput
+}
+
+type Author {
+  id: ID!
+  name: String
+  email: String
+  posts(
+    where: PostWhereInput! = {}
+    orderBy: [PostOrderByInput!]! = []
+    take: Int
+    skip: Int! = 0
+  ): [Post!]
+  postsCount(where: PostWhereInput! = {}): Int
+}
+
+input AuthorWhereUniqueInput {
+  id: ID
+  email: String
+}
+
+input AuthorWhereInput {
+  AND: [AuthorWhereInput!]
+  OR: [AuthorWhereInput!]
+  NOT: [AuthorWhereInput!]
+  id: IDFilter
+  name: StringFilter
+  email: StringFilter
+  posts: PostManyRelationFilter
+}
+
+input PostManyRelationFilter {
+  every: PostWhereInput
+  some: PostWhereInput
+  none: PostWhereInput
+}
+
+input AuthorOrderByInput {
+  id: OrderDirection
+  name: OrderDirection
+  email: OrderDirection
+}
+
+input AuthorUpdateInput {
+  name: String
+  email: String
+  posts: PostRelateToManyForUpdateInput
+}
+
+input PostRelateToManyForUpdateInput {
+  disconnect: [PostWhereUniqueInput!]
+  set: [PostWhereUniqueInput!]
+  create: [PostCreateInput!]
+  connect: [PostWhereUniqueInput!]
+}
+
+input AuthorUpdateArgs {
+  where: AuthorWhereUniqueInput!
+  data: AuthorUpdateInput!
+}
+
+input AuthorCreateInput {
+  name: String
+  email: String
+  posts: PostRelateToManyForCreateInput
+}
+
+input PostRelateToManyForCreateInput {
+  create: [PostCreateInput!]
+  connect: [PostWhereUniqueInput!]
+}
+
+"""
+The `JSON` scalar type represents JSON values as specified by [ECMA-404](http://www.ecma-international.org/publications/files/ECMA-ST/ECMA-404.pdf).
+"""
+scalar JSON
+  @specifiedBy(
+    url: "http://www.ecma-international.org/publications/files/ECMA-ST/ECMA-404.pdf"
+  )
+
+type Mutation {
+  createPost(data: PostCreateInput!): Post
+  createPosts(data: [PostCreateInput!]!): [Post]
+  updatePost(where: PostWhereUniqueInput!, data: PostUpdateInput!): Post
+  updatePosts(data: [PostUpdateArgs!]!): [Post]
+  deletePost(where: PostWhereUniqueInput!): Post
+  deletePosts(where: [PostWhereUniqueInput!]!): [Post]
+  createAuthor(data: AuthorCreateInput!): Author
+  createAuthors(data: [AuthorCreateInput!]!): [Author]
+  updateAuthor(where: AuthorWhereUniqueInput!, data: AuthorUpdateInput!): Author
+  updateAuthors(data: [AuthorUpdateArgs!]!): [Author]
+  deleteAuthor(where: AuthorWhereUniqueInput!): Author
+  deleteAuthors(where: [AuthorWhereUniqueInput!]!): [Author]
+  publishPost(id: ID!): Post
+}
+
+type Query {
+  posts(
+    where: PostWhereInput! = {}
+    orderBy: [PostOrderByInput!]! = []
+    take: Int
+    skip: Int! = 0
+  ): [Post!]
+  post(where: PostWhereUniqueInput!): Post
+  postsCount(where: PostWhereInput! = {}): Int
+  authors(
+    where: AuthorWhereInput! = {}
+    orderBy: [AuthorOrderByInput!]! = []
+    take: Int
+    skip: Int! = 0
+  ): [Author!]
+  author(where: AuthorWhereUniqueInput!): Author
+  authorsCount(where: AuthorWhereInput! = {}): Int
+  keystone: KeystoneMeta!
+  recentPosts(id: ID!, days: Int! = 7): [Post!]
+  stats(id: ID!): Statistics
+}
+
+type Statistics {
+  draft: Int
+  published: Int
+  latest: Post
+}
+
+type KeystoneMeta {
+  adminMeta: KeystoneAdminMeta!
+}
+
+type KeystoneAdminMeta {
+  enableSignout: Boolean!
+  enableSessionItem: Boolean!
+  lists: [KeystoneAdminUIListMeta!]!
+  list(key: String!): KeystoneAdminUIListMeta
+}
+
+type KeystoneAdminUIListMeta {
+  key: String!
+  itemQueryName: String!
+  listQueryName: String!
+  hideCreate: Boolean!
+  hideDelete: Boolean!
+  path: String!
+  label: String!
+  singular: String!
+  plural: String!
+  description: String
+  initialColumns: [String!]!
+  pageSize: Int!
+  labelField: String!
+  fields: [KeystoneAdminUIFieldMeta!]!
+  initialSort: KeystoneAdminUISort
+  isHidden: Boolean!
+}
+
+type KeystoneAdminUIFieldMeta {
+  path: String!
+  label: String!
+  isOrderable: Boolean!
+  isFilterable: Boolean!
+  fieldMeta: JSON
+  viewsIndex: Int!
+  customViewsIndex: Int
+  createView: KeystoneAdminUIFieldMetaCreateView!
+  listView: KeystoneAdminUIFieldMetaListView!
+  itemView(id: ID): KeystoneAdminUIFieldMetaItemView
+  search: QueryMode
+}
+
+type KeystoneAdminUIFieldMetaCreateView {
+  fieldMode: KeystoneAdminUIFieldMetaCreateViewFieldMode!
+}
+
+enum KeystoneAdminUIFieldMetaCreateViewFieldMode {
+  edit
+  hidden
+}
+
+type KeystoneAdminUIFieldMetaListView {
+  fieldMode: KeystoneAdminUIFieldMetaListViewFieldMode!
+}
+
+enum KeystoneAdminUIFieldMetaListViewFieldMode {
+  read
+  hidden
+}
+
+type KeystoneAdminUIFieldMetaItemView {
+  fieldMode: KeystoneAdminUIFieldMetaItemViewFieldMode
+}
+
+enum KeystoneAdminUIFieldMetaItemViewFieldMode {
+  edit
+  read
+  hidden
+}
+
+enum QueryMode {
+  default
+  insensitive
+}
+
+type KeystoneAdminUISort {
+  field: String!
+  direction: KeystoneAdminUISortDirection!
+}
+
+enum KeystoneAdminUISortDirection {
+  ASC
+  DESC
+}
diff --git a/examples/extend-graphql-schema-graphql-ts/schema.prisma b/examples/extend-graphql-schema-graphql-ts/schema.prisma
new file mode 100644
index 00000000000..169b647328a
--- /dev/null
+++ b/examples/extend-graphql-schema-graphql-ts/schema.prisma
@@ -0,0 +1,32 @@
+// This file is automatically generated by Keystone, do not modify it manually.
+// Modify your Keystone config when you want to change this.
+
+datasource sqlite {
+  url      = env("DATABASE_URL")
+  provider = "sqlite"
+}
+
+generator client {
+  provider   = "prisma-client-js"
+  output     = "node_modules/.prisma/client"
+  engineType = "binary"
+}
+
+model Post {
+  id          String    @id @default(cuid())
+  title       String    @default("")
+  status      String?
+  content     String    @default("")
+  publishDate DateTime?
+  author      Author?   @relation("Post_author", fields: [authorId], references: [id])
+  authorId    String?   @map("author")
+
+  @@index([authorId])
+}
+
+model Author {
+  id    String @id @default(cuid())
+  name  String @default("")
+  email String @unique @default("")
+  posts Post[] @relation("Post_author")
+}
\ No newline at end of file
diff --git a/examples/extend-graphql-schema-graphql-ts/schema.ts b/examples/extend-graphql-schema-graphql-ts/schema.ts
new file mode 100644
index 00000000000..57fdfd53705
--- /dev/null
+++ b/examples/extend-graphql-schema-graphql-ts/schema.ts
@@ -0,0 +1,27 @@
+import { list } from '@keystone-next/keystone';
+import { select, relationship, text, timestamp } from '@keystone-next/keystone/fields';
+
+export const lists = {
+  Post: list({
+    fields: {
+      title: text({ validation: { isRequired: true } }),
+      status: select({
+        type: 'enum',
+        options: [
+          { label: 'Draft', value: 'draft' },
+          { label: 'Published', value: 'published' },
+        ],
+      }),
+      content: text(),
+      publishDate: timestamp(),
+      author: relationship({ ref: 'Author.posts', many: false }),
+    },
+  }),
+  Author: list({
+    fields: {
+      name: text({ validation: { isRequired: true } }),
+      email: text({ isIndexed: 'unique', validation: { isRequired: true } }),
+      posts: relationship({ ref: 'Post.author', many: true }),
+    },
+  }),
+};
diff --git a/examples/testing/schema.graphql b/examples/testing/schema.graphql
index 7a47b8bf0d3..9a78ec0c5cf 100644
--- a/examples/testing/schema.graphql
+++ b/examples/testing/schema.graphql
@@ -1,71 +1,6 @@
 # This file is automatically generated by Keystone, do not modify it manually.
 # Modify your Keystone config when you want to change this.
 
-input CreateInitialPersonInput {
-  name: String
-  email: String
-  password: String
-}
-
-type Mutation {
-  createInitialPerson(
-    data: CreateInitialPersonInput!
-  ): PersonAuthenticationWithPasswordSuccess!
-  authenticatePersonWithPassword(
-    email: String!
-    password: String!
-  ): PersonAuthenticationWithPasswordResult!
-  createTask(data: TaskCreateInput!): Task
-  createTasks(data: [TaskCreateInput!]!): [Task]
-  updateTask(where: TaskWhereUniqueInput!, data: TaskUpdateInput!): Task
-  updateTasks(data: [TaskUpdateArgs!]!): [Task]
-  deleteTask(where: TaskWhereUniqueInput!): Task
-  deleteTasks(where: [TaskWhereUniqueInput!]!): [Task]
-  createPerson(data: PersonCreateInput!): Person
-  createPeople(data: [PersonCreateInput!]!): [Person]
-  updatePerson(where: PersonWhereUniqueInput!, data: PersonUpdateInput!): Person
-  updatePeople(data: [PersonUpdateArgs!]!): [Person]
-  deletePerson(where: PersonWhereUniqueInput!): Person
-  deletePeople(where: [PersonWhereUniqueInput!]!): [Person]
-  endSession: Boolean!
-}
-
-union AuthenticatedItem = Person
-
-type Query {
-  authenticatedItem: AuthenticatedItem
-  tasks(
-    where: TaskWhereInput! = {}
-    orderBy: [TaskOrderByInput!]! = []
-    take: Int
-    skip: Int! = 0
-  ): [Task!]
-  task(where: TaskWhereUniqueInput!): Task
-  tasksCount(where: TaskWhereInput! = {}): Int
-  people(
-    where: PersonWhereInput! = {}
-    orderBy: [PersonOrderByInput!]! = []
-    take: Int
-    skip: Int! = 0
-  ): [Person!]
-  person(where: PersonWhereUniqueInput!): Person
-  peopleCount(where: PersonWhereInput! = {}): Int
-  keystone: KeystoneMeta!
-}
-
-union PersonAuthenticationWithPasswordResult =
-    PersonAuthenticationWithPasswordSuccess
-  | PersonAuthenticationWithPasswordFailure
-
-type PersonAuthenticationWithPasswordSuccess {
-  sessionToken: String!
-  item: Person!
-}
-
-type PersonAuthenticationWithPasswordFailure {
-  message: String!
-}
-
 type Task {
   id: ID!
   label: String
@@ -291,6 +226,71 @@ scalar JSON
     url: "http://www.ecma-international.org/publications/files/ECMA-ST/ECMA-404.pdf"
   )
 
+type Mutation {
+  createTask(data: TaskCreateInput!): Task
+  createTasks(data: [TaskCreateInput!]!): [Task]
+  updateTask(where: TaskWhereUniqueInput!, data: TaskUpdateInput!): Task
+  updateTasks(data: [TaskUpdateArgs!]!): [Task]
+  deleteTask(where: TaskWhereUniqueInput!): Task
+  deleteTasks(where: [TaskWhereUniqueInput!]!): [Task]
+  createPerson(data: PersonCreateInput!): Person
+  createPeople(data: [PersonCreateInput!]!): [Person]
+  updatePerson(where: PersonWhereUniqueInput!, data: PersonUpdateInput!): Person
+  updatePeople(data: [PersonUpdateArgs!]!): [Person]
+  deletePerson(where: PersonWhereUniqueInput!): Person
+  deletePeople(where: [PersonWhereUniqueInput!]!): [Person]
+  endSession: Boolean!
+  authenticatePersonWithPassword(
+    email: String!
+    password: String!
+  ): PersonAuthenticationWithPasswordResult
+  createInitialPerson(
+    data: CreateInitialPersonInput!
+  ): PersonAuthenticationWithPasswordSuccess!
+}
+
+union PersonAuthenticationWithPasswordResult =
+    PersonAuthenticationWithPasswordSuccess
+  | PersonAuthenticationWithPasswordFailure
+
+type PersonAuthenticationWithPasswordSuccess {
+  sessionToken: String!
+  item: Person!
+}
+
+type PersonAuthenticationWithPasswordFailure {
+  message: String!
+}
+
+input CreateInitialPersonInput {
+  name: String
+  email: String
+  password: String
+}
+
+type Query {
+  tasks(
+    where: TaskWhereInput! = {}
+    orderBy: [TaskOrderByInput!]! = []
+    take: Int
+    skip: Int! = 0
+  ): [Task!]
+  task(where: TaskWhereUniqueInput!): Task
+  tasksCount(where: TaskWhereInput! = {}): Int
+  people(
+    where: PersonWhereInput! = {}
+    orderBy: [PersonOrderByInput!]! = []
+    take: Int
+    skip: Int! = 0
+  ): [Person!]
+  person(where: PersonWhereUniqueInput!): Person
+  peopleCount(where: PersonWhereInput! = {}): Int
+  keystone: KeystoneMeta!
+  authenticatedItem: AuthenticatedItem
+}
+
+union AuthenticatedItem = Person
+
 type KeystoneMeta {
   adminMeta: KeystoneAdminMeta!
 }
diff --git a/examples/with-auth/schema.graphql b/examples/with-auth/schema.graphql
index 7a47b8bf0d3..9a78ec0c5cf 100644
--- a/examples/with-auth/schema.graphql
+++ b/examples/with-auth/schema.graphql
@@ -1,71 +1,6 @@
 # This file is automatically generated by Keystone, do not modify it manually.
 # Modify your Keystone config when you want to change this.
 
-input CreateInitialPersonInput {
-  name: String
-  email: String
-  password: String
-}
-
-type Mutation {
-  createInitialPerson(
-    data: CreateInitialPersonInput!
-  ): PersonAuthenticationWithPasswordSuccess!
-  authenticatePersonWithPassword(
-    email: String!
-    password: String!
-  ): PersonAuthenticationWithPasswordResult!
-  createTask(data: TaskCreateInput!): Task
-  createTasks(data: [TaskCreateInput!]!): [Task]
-  updateTask(where: TaskWhereUniqueInput!, data: TaskUpdateInput!): Task
-  updateTasks(data: [TaskUpdateArgs!]!): [Task]
-  deleteTask(where: TaskWhereUniqueInput!): Task
-  deleteTasks(where: [TaskWhereUniqueInput!]!): [Task]
-  createPerson(data: PersonCreateInput!): Person
-  createPeople(data: [PersonCreateInput!]!): [Person]
-  updatePerson(where: PersonWhereUniqueInput!, data: PersonUpdateInput!): Person
-  updatePeople(data: [PersonUpdateArgs!]!): [Person]
-  deletePerson(where: PersonWhereUniqueInput!): Person
-  deletePeople(where: [PersonWhereUniqueInput!]!): [Person]
-  endSession: Boolean!
-}
-
-union AuthenticatedItem = Person
-
-type Query {
-  authenticatedItem: AuthenticatedItem
-  tasks(
-    where: TaskWhereInput! = {}
-    orderBy: [TaskOrderByInput!]! = []
-    take: Int
-    skip: Int! = 0
-  ): [Task!]
-  task(where: TaskWhereUniqueInput!): Task
-  tasksCount(where: TaskWhereInput! = {}): Int
-  people(
-    where: PersonWhereInput! = {}
-    orderBy: [PersonOrderByInput!]! = []
-    take: Int
-    skip: Int! = 0
-  ): [Person!]
-  person(where: PersonWhereUniqueInput!): Person
-  peopleCount(where: PersonWhereInput! = {}): Int
-  keystone: KeystoneMeta!
-}
-
-union PersonAuthenticationWithPasswordResult =
-    PersonAuthenticationWithPasswordSuccess
-  | PersonAuthenticationWithPasswordFailure
-
-type PersonAuthenticationWithPasswordSuccess {
-  sessionToken: String!
-  item: Person!
-}
-
-type PersonAuthenticationWithPasswordFailure {
-  message: String!
-}
-
 type Task {
   id: ID!
   label: String
@@ -291,6 +226,71 @@ scalar JSON
     url: "http://www.ecma-international.org/publications/files/ECMA-ST/ECMA-404.pdf"
   )
 
+type Mutation {
+  createTask(data: TaskCreateInput!): Task
+  createTasks(data: [TaskCreateInput!]!): [Task]
+  updateTask(where: TaskWhereUniqueInput!, data: TaskUpdateInput!): Task
+  updateTasks(data: [TaskUpdateArgs!]!): [Task]
+  deleteTask(where: TaskWhereUniqueInput!): Task
+  deleteTasks(where: [TaskWhereUniqueInput!]!): [Task]
+  createPerson(data: PersonCreateInput!): Person
+  createPeople(data: [PersonCreateInput!]!): [Person]
+  updatePerson(where: PersonWhereUniqueInput!, data: PersonUpdateInput!): Person
+  updatePeople(data: [PersonUpdateArgs!]!): [Person]
+  deletePerson(where: PersonWhereUniqueInput!): Person
+  deletePeople(where: [PersonWhereUniqueInput!]!): [Person]
+  endSession: Boolean!
+  authenticatePersonWithPassword(
+    email: String!
+    password: String!
+  ): PersonAuthenticationWithPasswordResult
+  createInitialPerson(
+    data: CreateInitialPersonInput!
+  ): PersonAuthenticationWithPasswordSuccess!
+}
+
+union PersonAuthenticationWithPasswordResult =
+    PersonAuthenticationWithPasswordSuccess
+  | PersonAuthenticationWithPasswordFailure
+
+type PersonAuthenticationWithPasswordSuccess {
+  sessionToken: String!
+  item: Person!
+}
+
+type PersonAuthenticationWithPasswordFailure {
+  message: String!
+}
+
+input CreateInitialPersonInput {
+  name: String
+  email: String
+  password: String
+}
+
+type Query {
+  tasks(
+    where: TaskWhereInput! = {}
+    orderBy: [TaskOrderByInput!]! = []
+    take: Int
+    skip: Int! = 0
+  ): [Task!]
+  task(where: TaskWhereUniqueInput!): Task
+  tasksCount(where: TaskWhereInput! = {}): Int
+  people(
+    where: PersonWhereInput! = {}
+    orderBy: [PersonOrderByInput!]! = []
+    take: Int
+    skip: Int! = 0
+  ): [Person!]
+  person(where: PersonWhereUniqueInput!): Person
+  peopleCount(where: PersonWhereInput! = {}): Int
+  keystone: KeystoneMeta!
+  authenticatedItem: AuthenticatedItem
+}
+
+union AuthenticatedItem = Person
+
 type KeystoneMeta {
   adminMeta: KeystoneAdminMeta!
 }
diff --git a/packages/auth/package.json b/packages/auth/package.json
index 89c82ce3b35..a33b05a4ac3 100644
--- a/packages/auth/package.json
+++ b/packages/auth/package.json
@@ -9,7 +9,6 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.15.4",
-    "@graphql-tools/schema": "^8.2.0",
     "@keystone-ui/button": "^5.0.2",
     "@keystone-ui/core": "^3.2.1",
     "@keystone-ui/fields": "^5.0.1",
diff --git a/packages/auth/src/gql/getBaseAuthSchema.ts b/packages/auth/src/gql/getBaseAuthSchema.ts
index fed37b4162b..f8bac052be2 100644
--- a/packages/auth/src/gql/getBaseAuthSchema.ts
+++ b/packages/auth/src/gql/getBaseAuthSchema.ts
@@ -1,5 +1,5 @@
-import type { GraphQLSchemaExtension, KeystoneContext } from '@keystone-next/keystone/types';
-
+import type { ItemRootValue } from '@keystone-next/keystone/types';
+import { graphql } from '@keystone-next/keystone';
 import { AuthGqlNames, SecretFieldImpl } from '../types';
 
 import { validateSecret } from '../lib/validateSecret';
@@ -10,40 +10,65 @@ export function getBaseAuthSchema<I extends string, S extends string>({
   secretField,
   gqlNames,
   secretFieldImpl,
+  base,
 }: {
   listKey: string;
   identityField: I;
   secretField: S;
   gqlNames: AuthGqlNames;
   secretFieldImpl: SecretFieldImpl;
-}): GraphQLSchemaExtension {
-  return {
-    typeDefs: `
-      # Auth
-      union AuthenticatedItem = ${listKey}
-      type Query {
-        authenticatedItem: AuthenticatedItem
-      }
-      # Password auth
-      type Mutation {
-        ${gqlNames.authenticateItemWithPassword}(${identityField}: String!, ${secretField}: String!): ${gqlNames.ItemAuthenticationWithPasswordResult}!
-      }
-      union ${gqlNames.ItemAuthenticationWithPasswordResult} = ${gqlNames.ItemAuthenticationWithPasswordSuccess} | ${gqlNames.ItemAuthenticationWithPasswordFailure}
-      type ${gqlNames.ItemAuthenticationWithPasswordSuccess} {
-        sessionToken: String!
-        item: ${listKey}!
-      }
-      type ${gqlNames.ItemAuthenticationWithPasswordFailure} {
-        message: String!
+  base: graphql.BaseSchemaMeta;
+}) {
+  const ItemAuthenticationWithPasswordSuccess = graphql.object<{
+    sessionToken: string;
+    item: ItemRootValue;
+  }>()({
+    name: gqlNames.ItemAuthenticationWithPasswordSuccess,
+    fields: {
+      sessionToken: graphql.field({ type: graphql.nonNull(graphql.String) }),
+      item: graphql.field({ type: graphql.nonNull(base.object(listKey)) }),
+    },
+  });
+  const ItemAuthenticationWithPasswordFailure = graphql.object<{ message: string }>()({
+    name: gqlNames.ItemAuthenticationWithPasswordFailure,
+    fields: {
+      message: graphql.field({ type: graphql.nonNull(graphql.String) }),
+    },
+  });
+  const AuthenticationResult = graphql.union({
+    name: gqlNames.ItemAuthenticationWithPasswordResult,
+    types: [ItemAuthenticationWithPasswordSuccess, ItemAuthenticationWithPasswordFailure],
+    resolveType(val) {
+      if ('sessionToken' in val) {
+        return gqlNames.ItemAuthenticationWithPasswordSuccess;
       }
-    `,
-    resolvers: {
-      Mutation: {
-        async [gqlNames.authenticateItemWithPassword](
-          root: any,
-          args: { [P in I]: string } & { [P in S]: string },
-          context
-        ) {
+      return gqlNames.ItemAuthenticationWithPasswordFailure;
+    },
+  });
+  const extension = {
+    query: {
+      authenticatedItem: graphql.field({
+        type: graphql.union({
+          name: 'AuthenticatedItem',
+          types: [base.object(listKey) as graphql.ObjectType<ItemRootValue>],
+          resolveType: (root, context) => context.session?.listKey,
+        }),
+        resolve(root, args, { session, db }) {
+          if (typeof session?.itemId === 'string' && typeof session.listKey === 'string') {
+            return db[session.listKey].findOne({ where: { id: session.itemId } });
+          }
+          return null;
+        },
+      }),
+    },
+    mutation: {
+      [gqlNames.authenticateItemWithPassword]: graphql.field({
+        type: AuthenticationResult,
+        args: {
+          [identityField]: graphql.arg({ type: graphql.nonNull(graphql.String) }),
+          [secretField]: graphql.arg({ type: graphql.nonNull(graphql.String) }),
+        },
+        async resolve(root, { [identityField]: identity, [secretField]: secret }, context) {
           if (!context.startSession) {
             throw new Error('No session implementation available on context');
           }
@@ -52,9 +77,9 @@ export function getBaseAuthSchema<I extends string, S extends string>({
           const result = await validateSecret(
             secretFieldImpl,
             identityField,
-            args[identityField],
+            identity,
             secretField,
-            args[secretField],
+            secret,
             dbItemAPI
           );
 
@@ -69,28 +94,8 @@ export function getBaseAuthSchema<I extends string, S extends string>({
           });
           return { sessionToken, item: result.item };
         },
-      },
-      Query: {
-        async authenticatedItem(root, args, { session, db }) {
-          if (typeof session?.itemId === 'string' && typeof session.listKey === 'string') {
-            return db[session.listKey].findOne({ where: { id: session.itemId } });
-          }
-          return null;
-        },
-      },
-      AuthenticatedItem: {
-        __resolveType(rootVal: any, { session }: KeystoneContext) {
-          return session?.listKey;
-        },
-      },
-      // TODO: Is this the preferred approach for this?
-      [gqlNames.ItemAuthenticationWithPasswordResult]: {
-        __resolveType(rootVal: any) {
-          return rootVal.sessionToken
-            ? gqlNames.ItemAuthenticationWithPasswordSuccess
-            : gqlNames.ItemAuthenticationWithPasswordFailure;
-        },
-      },
+      }),
     },
   };
+  return { extension, ItemAuthenticationWithPasswordSuccess };
 }
diff --git a/packages/auth/src/gql/getInitFirstItemSchema.ts b/packages/auth/src/gql/getInitFirstItemSchema.ts
index a9200dc52cb..55ed8778a37 100644
--- a/packages/auth/src/gql/getInitFirstItemSchema.ts
+++ b/packages/auth/src/gql/getInitFirstItemSchema.ts
@@ -1,5 +1,6 @@
-import type { GraphQLSchemaExtension } from '@keystone-next/keystone/types';
-import { assertInputObjectType, GraphQLInputObjectType, GraphQLSchema, printType } from 'graphql';
+import { graphql } from '@keystone-next/keystone';
+import { ItemRootValue } from '@keystone-next/keystone/types';
+import { assertInputObjectType, GraphQLInputObjectType, GraphQLSchema } from 'graphql';
 
 import { AuthGqlNames, InitFirstItemConfig } from '../types';
 
@@ -9,18 +10,23 @@ export function getInitFirstItemSchema({
   itemData,
   gqlNames,
   graphQLSchema,
+  ItemAuthenticationWithPasswordSuccess,
 }: {
   listKey: string;
   fields: InitFirstItemConfig<any>['fields'];
   itemData: InitFirstItemConfig<any>['itemData'];
   gqlNames: AuthGqlNames;
   graphQLSchema: GraphQLSchema;
-}): GraphQLSchemaExtension {
+  ItemAuthenticationWithPasswordSuccess: graphql.ObjectType<{
+    item: ItemRootValue;
+    sessionToken: string;
+  }>;
+}) {
   const createInputConfig = assertInputObjectType(
     graphQLSchema.getType(`${listKey}CreateInput`)
   ).toConfig();
   const fieldsSet = new Set(fields);
-  const initialCreateInput = printType(
+  const initialCreateInput = graphql.wrap.inputObject(
     new GraphQLInputObjectType({
       ...createInputConfig,
       fields: Object.fromEntries(
@@ -30,19 +36,11 @@ export function getInitFirstItemSchema({
     })
   );
   return {
-    typeDefs: `
-        ${initialCreateInput}
-        type Mutation {
-          ${gqlNames.createInitialItem}(data: ${gqlNames.CreateInitialInput}!): ${gqlNames.ItemAuthenticationWithPasswordSuccess}!
-        }
-      `,
-    resolvers: {
-      Mutation: {
-        async [gqlNames.createInitialItem](
-          root: any,
-          { data }: { data: Record<string, any> },
-          context
-        ) {
+    mutation: {
+      [gqlNames.createInitialItem]: graphql.field({
+        type: graphql.nonNull(ItemAuthenticationWithPasswordSuccess),
+        args: { data: graphql.arg({ type: graphql.nonNull(initialCreateInput) }) },
+        async resolve(rootVal, { data }, context) {
           if (!context.startSession) {
             throw new Error('No session implementation available on context');
           }
@@ -61,7 +59,7 @@ export function getInitFirstItemSchema({
           const sessionToken = await context.startSession({ listKey, itemId: item.id.toString() });
           return { item, sessionToken };
         },
-      },
+      }),
     },
   };
 }
diff --git a/packages/auth/src/gql/getMagicAuthLinkSchema.ts b/packages/auth/src/gql/getMagicAuthLinkSchema.ts
index 95b5cb70eed..c2b16185dd1 100644
--- a/packages/auth/src/gql/getMagicAuthLinkSchema.ts
+++ b/packages/auth/src/gql/getMagicAuthLinkSchema.ts
@@ -1,52 +1,67 @@
-import type { GraphQLSchemaExtension } from '@keystone-next/keystone/types';
-
+import type { ItemRootValue } from '@keystone-next/keystone/types';
+import { graphql } from '@keystone-next/keystone';
 import { AuthGqlNames, AuthTokenTypeConfig, SecretFieldImpl } from '../types';
 
 import { createAuthToken } from '../lib/createAuthToken';
 import { validateAuthToken } from '../lib/validateAuthToken';
 import { getAuthTokenErrorMessage } from '../lib/getErrorMessage';
 
+const errorCodes = ['FAILURE', 'TOKEN_EXPIRED', 'TOKEN_REDEEMED'] as const;
+
+const MagicLinkRedemptionErrorCode = graphql.enum({
+  name: 'MagicLinkRedemptionErrorCode',
+  values: graphql.enumValues(errorCodes),
+});
+
 export function getMagicAuthLinkSchema<I extends string>({
   listKey,
   identityField,
   gqlNames,
   magicAuthLink,
   magicAuthTokenSecretFieldImpl,
+  base,
 }: {
   listKey: string;
   identityField: I;
   gqlNames: AuthGqlNames;
   magicAuthLink: AuthTokenTypeConfig;
   magicAuthTokenSecretFieldImpl: SecretFieldImpl;
-}): GraphQLSchemaExtension {
+  base: graphql.BaseSchemaMeta;
+}) {
+  const RedeemItemMagicAuthTokenFailure = graphql.object<{
+    code: typeof errorCodes[number];
+    message: string;
+  }>()({
+    name: gqlNames.RedeemItemMagicAuthTokenFailure,
+    fields: {
+      code: graphql.field({ type: graphql.nonNull(MagicLinkRedemptionErrorCode) }),
+      message: graphql.field({ type: graphql.nonNull(graphql.String) }),
+    },
+  });
+  const RedeemItemMagicAuthTokenSuccess = graphql.object<{ token: string; item: ItemRootValue }>()({
+    name: gqlNames.RedeemItemMagicAuthTokenSuccess,
+    fields: {
+      token: graphql.field({ type: graphql.nonNull(graphql.String) }),
+      item: graphql.field({ type: graphql.nonNull(base.object(listKey)) }),
+    },
+  });
+  const RedeemItemMagicAuthTokenResult = graphql.union({
+    name: gqlNames.RedeemItemMagicAuthTokenResult,
+    types: [RedeemItemMagicAuthTokenSuccess, RedeemItemMagicAuthTokenFailure],
+    resolveType(val) {
+      return 'token' in val
+        ? gqlNames.RedeemItemMagicAuthTokenSuccess
+        : gqlNames.RedeemItemMagicAuthTokenFailure;
+    },
+  });
   return {
-    typeDefs: `
-      # Magic links
-      type Mutation {
-        ${gqlNames.sendItemMagicAuthLink}(${identityField}: String!): Boolean!
-        ${gqlNames.redeemItemMagicAuthToken}(${identityField}: String!, token: String!): ${gqlNames.RedeemItemMagicAuthTokenResult}!
-      }
-      union ${gqlNames.RedeemItemMagicAuthTokenResult} = ${gqlNames.RedeemItemMagicAuthTokenSuccess} | ${gqlNames.RedeemItemMagicAuthTokenFailure}
-      type ${gqlNames.RedeemItemMagicAuthTokenSuccess} {
-        token: String!
-        item: ${listKey}!
-      }
-      type ${gqlNames.RedeemItemMagicAuthTokenFailure} {
-        code: MagicLinkRedemptionErrorCode!
-        message: String!
-      }
-      enum MagicLinkRedemptionErrorCode {
-        FAILURE
-        TOKEN_EXPIRED
-        TOKEN_REDEEMED
-      }
-    `,
-    resolvers: {
-      Mutation: {
-        async [gqlNames.sendItemMagicAuthLink](root: any, args: { [P in I]: string }, context) {
+    mutation: {
+      [gqlNames.sendItemMagicAuthLink]: graphql.field({
+        type: graphql.nonNull(graphql.Boolean),
+        args: { [identityField]: graphql.arg({ type: graphql.nonNull(graphql.String) }) },
+        async resolve(rootVal, { [identityField]: identity }, context) {
           const dbItemAPI = context.sudo().db[listKey];
           const tokenType = 'magicAuth';
-          const identity = args[identityField];
 
           const result = await createAuthToken(identityField, identity, dbItemAPI);
 
@@ -67,11 +82,14 @@ export function getMagicAuthLinkSchema<I extends string>({
           }
           return true;
         },
-        async [gqlNames.redeemItemMagicAuthToken](
-          root: any,
-          args: { [P in I]: string } & { token: string },
-          context
-        ) {
+      }),
+      [gqlNames.redeemItemMagicAuthToken]: graphql.field({
+        type: graphql.nonNull(RedeemItemMagicAuthTokenResult),
+        args: {
+          [identityField]: graphql.arg({ type: graphql.nonNull(graphql.String) }),
+          token: graphql.arg({ type: graphql.nonNull(graphql.String) }),
+        },
+        async resolve(rootVal, { [identityField]: identity, token }, context) {
           if (!context.startSession) {
             throw new Error('No session implementation available on context');
           }
@@ -83,9 +101,9 @@ export function getMagicAuthLinkSchema<I extends string>({
             magicAuthTokenSecretFieldImpl,
             tokenType,
             identityField,
-            args[identityField],
+            identity,
             magicAuthLink.tokensValidForMins,
-            args.token,
+            token,
             dbItemAPI
           );
 
@@ -105,16 +123,7 @@ export function getMagicAuthLinkSchema<I extends string>({
           });
           return { token: sessionToken, item: result.item };
         },
-      },
-
-      // TODO: Is this the preferred approach for this?
-      [gqlNames.RedeemItemMagicAuthTokenResult]: {
-        __resolveType(rootVal: any) {
-          return rootVal.token
-            ? gqlNames.RedeemItemMagicAuthTokenSuccess
-            : gqlNames.RedeemItemMagicAuthTokenFailure;
-        },
-      },
+      }),
     },
   };
 }
diff --git a/packages/auth/src/gql/getPasswordResetSchema.ts b/packages/auth/src/gql/getPasswordResetSchema.ts
index 316c63baa1a..877ee289068 100644
--- a/packages/auth/src/gql/getPasswordResetSchema.ts
+++ b/packages/auth/src/gql/getPasswordResetSchema.ts
@@ -1,11 +1,17 @@
-import type { GraphQLSchemaExtension } from '@keystone-next/keystone/types';
-
+import { graphql } from '@keystone-next/keystone';
 import { AuthGqlNames, AuthTokenTypeConfig, SecretFieldImpl } from '../types';
 
 import { createAuthToken } from '../lib/createAuthToken';
 import { validateAuthToken } from '../lib/validateAuthToken';
 import { getAuthTokenErrorMessage } from '../lib/getErrorMessage';
 
+const errorCodes = ['FAILURE', 'TOKEN_EXPIRED', 'TOKEN_REDEEMED'] as const;
+
+const PasswordResetRedemptionErrorCode = graphql.enum({
+  name: 'PasswordResetRedemptionErrorCode',
+  values: graphql.enumValues(errorCodes),
+});
+
 export function getPasswordResetSchema<I extends string, S extends string>({
   listKey,
   identityField,
@@ -20,38 +26,27 @@ export function getPasswordResetSchema<I extends string, S extends string>({
   gqlNames: AuthGqlNames;
   passwordResetLink: AuthTokenTypeConfig;
   passwordResetTokenSecretFieldImpl: SecretFieldImpl;
-}): GraphQLSchemaExtension {
+}) {
+  const getResult = (name: string) =>
+    graphql.object<{ code: typeof errorCodes[number]; message: string }>()({
+      name,
+      fields: {
+        code: graphql.field({ type: graphql.nonNull(PasswordResetRedemptionErrorCode) }),
+        message: graphql.field({ type: graphql.nonNull(graphql.String) }),
+      },
+    });
+  const ValidateItemPasswordResetTokenResult = getResult(
+    gqlNames.ValidateItemPasswordResetTokenResult
+  );
+  const RedeemItemPasswordResetTokenResult = getResult(gqlNames.RedeemItemPasswordResetTokenResult);
   return {
-    typeDefs: `
-      # Reset password
-      type Query {
-        ${gqlNames.validateItemPasswordResetToken}(${identityField}: String!, token: String!): ${gqlNames.ValidateItemPasswordResetTokenResult}
-      }
-      type Mutation {
-        ${gqlNames.sendItemPasswordResetLink}(${identityField}: String!): Boolean!
-        ${gqlNames.redeemItemPasswordResetToken}(${identityField}: String!, token: String!, ${secretField}: String!): ${gqlNames.RedeemItemPasswordResetTokenResult}
-      }
-
-      type ${gqlNames.ValidateItemPasswordResetTokenResult} {
-        code: PasswordResetRedemptionErrorCode!
-        message: String!
-      }
-      type ${gqlNames.RedeemItemPasswordResetTokenResult} {
-        code: PasswordResetRedemptionErrorCode!
-        message: String!
-      }
-      enum PasswordResetRedemptionErrorCode {
-        FAILURE
-        TOKEN_EXPIRED
-        TOKEN_REDEEMED
-      }
-    `,
-    resolvers: {
-      Mutation: {
-        async [gqlNames.sendItemPasswordResetLink](root: any, args: { [P in I]: string }, context) {
+    mutation: {
+      [gqlNames.sendItemPasswordResetLink]: graphql.field({
+        type: graphql.nonNull(graphql.Boolean),
+        args: { [identityField]: graphql.arg({ type: graphql.nonNull(graphql.String) }) },
+        async resolve(rootVal, { [identityField]: identity }, context) {
           const dbItemAPI = context.sudo().db[listKey];
           const tokenType = 'passwordReset';
-          const identity = args[identityField];
 
           const result = await createAuthToken(identityField, identity, dbItemAPI);
 
@@ -72,9 +67,17 @@ export function getPasswordResetSchema<I extends string, S extends string>({
           }
           return true;
         },
-        async [gqlNames.redeemItemPasswordResetToken](
-          root: any,
-          args: { [P in I]: string } & { [P in S]: string } & { token: string },
+      }),
+      [gqlNames.redeemItemPasswordResetToken]: graphql.field({
+        type: RedeemItemPasswordResetTokenResult,
+        args: {
+          [identityField]: graphql.arg({ type: graphql.nonNull(graphql.String) }),
+          token: graphql.arg({ type: graphql.nonNull(graphql.String) }),
+          [secretField]: graphql.arg({ type: graphql.nonNull(graphql.String) }),
+        },
+        async resolve(
+          rootVal,
+          { [identityField]: identity, token, [secretField]: secret },
           context
         ) {
           const dbItemAPI = context.sudo().db[listKey];
@@ -84,9 +87,9 @@ export function getPasswordResetSchema<I extends string, S extends string>({
             passwordResetTokenSecretFieldImpl,
             tokenType,
             identityField,
-            args[identityField],
+            identity,
             passwordResetLink.tokensValidForMins,
-            args.token,
+            token,
             dbItemAPI
           );
 
@@ -107,18 +110,21 @@ export function getPasswordResetSchema<I extends string, S extends string>({
           // (NB: Is this *really* what we want? -TL)
           await dbItemAPI.updateOne({
             where: { id: itemId },
-            data: { [secretField]: args[secretField] },
+            data: { [secretField]: secret },
           });
 
           return null;
         },
-      },
-      Query: {
-        async [gqlNames.validateItemPasswordResetToken](
-          root: any,
-          args: { [P in I]: string } & { token: string },
-          context
-        ) {
+      }),
+    },
+    query: {
+      [gqlNames.validateItemPasswordResetToken]: graphql.field({
+        type: ValidateItemPasswordResetTokenResult,
+        args: {
+          [identityField]: graphql.arg({ type: graphql.nonNull(graphql.String) }),
+          token: graphql.arg({ type: graphql.nonNull(graphql.String) }),
+        },
+        async resolve(rootVal, { [identityField]: identity, token }, context) {
           const dbItemAPI = context.sudo().db[listKey];
           const tokenType = 'passwordReset';
           const result = await validateAuthToken(
@@ -126,9 +132,9 @@ export function getPasswordResetSchema<I extends string, S extends string>({
             passwordResetTokenSecretFieldImpl,
             tokenType,
             identityField,
-            args[identityField],
+            identity,
             passwordResetLink.tokensValidForMins,
-            args.token,
+            token,
             dbItemAPI
           );
 
@@ -137,7 +143,7 @@ export function getPasswordResetSchema<I extends string, S extends string>({
           }
           return null;
         },
-      },
+      }),
     },
   };
 }
diff --git a/packages/auth/src/schema.ts b/packages/auth/src/schema.ts
index e3ee19acac8..bb089e4d190 100644
--- a/packages/auth/src/schema.ts
+++ b/packages/auth/src/schema.ts
@@ -1,4 +1,3 @@
-import { mergeSchemas } from '@graphql-tools/schema';
 import { ExtendGraphqlSchema } from '@keystone-next/keystone/types';
 
 import {
@@ -8,6 +7,7 @@ import {
   GraphQLString,
   GraphQLID,
 } from 'graphql';
+import { graphql } from '@keystone-next/keystone';
 import { AuthGqlNames, AuthTokenTypeConfig, InitFirstItemConfig, SecretFieldImpl } from './types';
 import { getBaseAuthSchema } from './gql/getBaseAuthSchema';
 import { getInitFirstItemSchema } from './gql/getInitFirstItemSchema';
@@ -38,27 +38,26 @@ export function getSecretFieldImpl(schema: GraphQLSchema, listKey: string, field
   return secretFieldImpl;
 }
 
-export const getSchemaExtension =
-  ({
-    identityField,
-    listKey,
-    secretField,
-    gqlNames,
-    initFirstItem,
-    passwordResetLink,
-    magicAuthLink,
-  }: {
-    identityField: string;
-    listKey: string;
-    secretField: string;
-    gqlNames: AuthGqlNames;
-    initFirstItem?: InitFirstItemConfig<any>;
-    passwordResetLink?: AuthTokenTypeConfig;
-    magicAuthLink?: AuthTokenTypeConfig;
-  }): ExtendGraphqlSchema =>
-  schema => {
+export const getSchemaExtension = ({
+  identityField,
+  listKey,
+  secretField,
+  gqlNames,
+  initFirstItem,
+  passwordResetLink,
+  magicAuthLink,
+}: {
+  identityField: string;
+  listKey: string;
+  secretField: string;
+  gqlNames: AuthGqlNames;
+  initFirstItem?: InitFirstItemConfig<any>;
+  passwordResetLink?: AuthTokenTypeConfig;
+  magicAuthLink?: AuthTokenTypeConfig;
+}): ExtendGraphqlSchema =>
+  graphql.extend(base => {
     const uniqueWhereInputType = assertInputObjectType(
-      schema.getType(`${listKey}WhereUniqueInput`)
+      base.schema.getType(`${listKey}WhereUniqueInput`)
     );
     const identityFieldOnUniqueWhere = uniqueWhereInputType.getFields()[identityField];
     if (
@@ -72,21 +71,25 @@ export const getSchemaExtension =
           `to the field at ${listKey}.${identityField}`
       );
     }
+    const baseSchema = getBaseAuthSchema({
+      identityField,
+      listKey,
+      secretField,
+      gqlNames,
+      secretFieldImpl: getSecretFieldImpl(base.schema, listKey, secretField),
+      base,
+    });
+
     return [
-      getBaseAuthSchema({
-        identityField,
-        listKey,
-        secretField,
-        gqlNames,
-        secretFieldImpl: getSecretFieldImpl(schema, listKey, secretField),
-      }),
+      baseSchema.extension,
       initFirstItem &&
         getInitFirstItemSchema({
           listKey,
           fields: initFirstItem.fields,
           itemData: initFirstItem.itemData,
           gqlNames,
-          graphQLSchema: schema,
+          graphQLSchema: base.schema,
+          ItemAuthenticationWithPasswordSuccess: baseSchema.ItemAuthenticationWithPasswordSuccess,
         }),
       passwordResetLink &&
         getPasswordResetSchema({
@@ -96,7 +99,7 @@ export const getSchemaExtension =
           passwordResetLink,
           gqlNames,
           passwordResetTokenSecretFieldImpl: getSecretFieldImpl(
-            schema,
+            base.schema,
             listKey,
             'passwordResetToken'
           ),
@@ -107,9 +110,8 @@ export const getSchemaExtension =
           listKey,
           magicAuthLink,
           gqlNames,
-          magicAuthTokenSecretFieldImpl: getSecretFieldImpl(schema, listKey, 'magicAuthToken'),
+          magicAuthTokenSecretFieldImpl: getSecretFieldImpl(base.schema, listKey, 'magicAuthToken'),
+          base,
         }),
-    ]
-      .filter(x => x)
-      .reduce((s, extension) => mergeSchemas({ schemas: [s], ...extension }), schema);
-  };
+    ].filter((x): x is Exclude<typeof x, undefined> => x !== undefined);
+  });
diff --git a/packages/keystone/package.json b/packages/keystone/package.json
index 271bd7668cd..a591982caac 100644
--- a/packages/keystone/package.json
+++ b/packages/keystone/package.json
@@ -32,6 +32,7 @@
     "@emotion/hash": "^0.8.0",
     "@emotion/weak-memoize": "^0.2.5",
     "@graphql-tools/schema": "^8.2.0",
+    "@graphql-ts/extend": "0.4.0",
     "@graphql-ts/schema": "0.5.0",
     "@hapi/iron": "^6.0.0",
     "@keystone-ui/button": "^5.0.2",
diff --git a/packages/keystone/src/types/schema/graphql-ts-schema.ts b/packages/keystone/src/types/schema/graphql-ts-schema.ts
index ee93b4c401f..1710e419e83 100644
--- a/packages/keystone/src/types/schema/graphql-ts-schema.ts
+++ b/packages/keystone/src/types/schema/graphql-ts-schema.ts
@@ -38,6 +38,8 @@ export type {
   ScalarType,
 } from '@graphql-ts/schema/api-without-context';
 export { bindGraphQLSchemaAPIToContext } from '@graphql-ts/schema';
+export type { BaseSchemaMeta, Extension } from '@graphql-ts/extend';
+export { extend, wrap } from '@graphql-ts/extend';
 export { field, fields, interface, interfaceField, object, union } from './schema-api-with-context';
 
 export type Context = KeystoneContext;
@@ -153,8 +155,8 @@ export type FieldResolver<
   Args extends Record<string, graphqlTsSchema.Arg<any>>,
   TType extends OutputType
 > = graphqlTsSchema.FieldResolver<Source, Args, TType, Context>;
-export type ObjectType<RootVal> = graphqlTsSchema.ObjectType<RootVal, Context>;
-export type UnionType<RootVal> = graphqlTsSchema.UnionType<RootVal, Context>;
+export type ObjectType<Source> = graphqlTsSchema.ObjectType<Source, Context>;
+export type UnionType<Source> = graphqlTsSchema.UnionType<Source, Context>;
 export type InterfaceType<
   Source,
   Fields extends Record<string, graphqlTsSchema.InterfaceField<any, OutputType, Context>>
diff --git a/tests/examples-smoke-tests/extend-graphql-schema-graphql-ts.test.ts b/tests/examples-smoke-tests/extend-graphql-schema-graphql-ts.test.ts
new file mode 100644
index 00000000000..7bf9f997735
--- /dev/null
+++ b/tests/examples-smoke-tests/extend-graphql-schema-graphql-ts.test.ts
@@ -0,0 +1,19 @@
+import { Browser, Page } from 'playwright';
+import { exampleProjectTests, loadIndex } from './utils';
+
+exampleProjectTests('extend-graphql-schema-graphql-ts', browserType => {
+  let browser: Browser = undefined as any;
+  let page: Page = undefined as any;
+  beforeAll(async () => {
+    browser = await browserType.launch();
+    page = await browser.newPage();
+    await loadIndex(page);
+  });
+  test('Load list', async () => {
+    await Promise.all([page.waitForNavigation(), page.click('h3:has-text("Authors")')]);
+    await page.waitForSelector('button:has-text("Create Author")');
+  });
+  afterAll(async () => {
+    await browser.close();
+  });
+});
diff --git a/yarn.lock b/yarn.lock
index dec9ec71d30..b53d4af78b0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1487,6 +1487,13 @@
   dependencies:
     tslib "~2.3.0"
 
+"@graphql-ts/extend@0.4.0":
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/@graphql-ts/extend/-/extend-0.4.0.tgz#20cf964cc826a32445c29a10599f52bf81b027b6"
+  integrity sha512-1+NpyJemIbEDkunwhlumXbp8XglZnFmqI84lkw0TgZHhmj5g2xE2w4s/qONQg7Qx46ekq7kaifX+AO4jy8USlA==
+  dependencies:
+    "@babel/runtime" "^7.9.2"
+
 "@graphql-ts/schema@0.5.0":
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/@graphql-ts/schema/-/schema-0.5.0.tgz#cc9cbf614ed931aff4c9987e88094a4030ad9e32"

From f5bcf8bf0fb4a2e81f05f9c2ecb4efdd99a65126 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 27 Oct 2021 15:08:21 +1100
Subject: [PATCH 11/21] Update dependency @testing-library/dom to ^8.10.1
 (#6817)

Co-authored-by: Renovate Bot <bot@renovateapp.com>
---
 packages/keystone/package.json |  2 +-
 yarn.lock                      | 26 +++++++++++++++++++++++++-
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/packages/keystone/package.json b/packages/keystone/package.json
index a591982caac..014c4ea35fc 100644
--- a/packages/keystone/package.json
+++ b/packages/keystone/package.json
@@ -123,7 +123,7 @@
     "uuid": "^8.3.2"
   },
   "devDependencies": {
-    "@testing-library/dom": "^8.7.2",
+    "@testing-library/dom": "^8.10.1",
     "@testing-library/react": "^12.1.2",
     "@testing-library/user-event": "^13.5.0",
     "@types/bytes": "^3.1.1",
diff --git a/yarn.lock b/yarn.lock
index b53d4af78b0..c00144862ab 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2423,7 +2423,7 @@
   dependencies:
     defer-to-connect "^1.0.1"
 
-"@testing-library/dom@^8.0.0", "@testing-library/dom@^8.7.2":
+"@testing-library/dom@^8.0.0":
   version "8.7.2"
   resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-8.7.2.tgz#234315c6971be380fc9cbf0b031ada3e9f0bfe09"
   integrity sha512-2zN0Zv9dMnaMAd4c/1E1ZChu4QrICyvWtkUvHFQBPhS1oG3VYGcM7SLGLYdda7187ILRXzIUOvOsbXQm4EASjA==
@@ -2437,6 +2437,20 @@
     lz-string "^1.4.4"
     pretty-format "^27.0.2"
 
+"@testing-library/dom@^8.10.1":
+  version "8.10.1"
+  resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-8.10.1.tgz#e24fed92ad51c619cf304c6f1410b4c76b1000c0"
+  integrity sha512-rab7vpf1uGig5efWwsCOn9j4/doy+W3VBoUyzX7C4y77u0wAckwc7R8nyH6e2rw0rRzKJR+gWPiAg8zhiFbxWQ==
+  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.14.1":
   version "5.14.1"
   resolved "https://registry.yarnpkg.com/@testing-library/jest-dom/-/jest-dom-5.14.1.tgz#8501e16f1e55a55d675fe73eecee32cdaddb9766"
@@ -3565,6 +3579,11 @@ aria-query@^4.2.2:
     "@babel/runtime" "^7.10.2"
     "@babel/runtime-corejs3" "^7.10.2"
 
+aria-query@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-5.0.0.tgz#210c21aaf469613ee8c9a62c7f86525e058db52c"
+  integrity sha512-V+SM7AbUwJ+EBnB8+DXs0hPZHO0W6pqBcc0dW90OwtVG02PswOu/teuARoLQjdDOH+t9pJgGnW5/Qmouf3gPJg==
+
 arr-diff@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
@@ -5305,6 +5324,11 @@ dom-accessibility-api@^0.5.6:
   resolved "https://registry.yarnpkg.com/dom-accessibility-api/-/dom-accessibility-api-0.5.8.tgz#414813012e065b5dfa8998b990460c0af12a5421"
   integrity sha512-rAfghuBPeJldxqsmZQtBbna4TqMgFe4xhYs24vPULNslbmXUdcga+CXiKWzZxyWw0FCkGKPgmizIysIvsAEN8w==
 
+dom-accessibility-api@^0.5.9:
+  version "0.5.9"
+  resolved "https://registry.yarnpkg.com/dom-accessibility-api/-/dom-accessibility-api-0.5.9.tgz#915f8531ba29a50e5c29389dbfb87a9642fef0d6"
+  integrity sha512-+KPF4o71fl6NrdnqIrJc6m44NA+Rhf1h7In2MRznejSQasWkjqmHOBUlk+pXJ77cVOSYyZeNHFwn/sjotB6+Sw==
+
 dom-helpers@^5.0.1:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-5.2.1.tgz#d9400536b2bf8225ad98fe052e029451ac40e902"

From 42f8baa16a35e6ba7569e6be866f2b4658f0a540 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 27 Oct 2021 15:25:23 +1100
Subject: [PATCH 12/21] Update dependency playwright to ^1.16.1 (#6820)

Co-authored-by: Renovate Bot <bot@renovateapp.com>
---
 tests/admin-ui-tests/package.json       |  2 +-
 tests/examples-smoke-tests/package.json |  2 +-
 yarn.lock                               | 56 ++++++++++++++++++++-----
 3 files changed, 48 insertions(+), 12 deletions(-)

diff --git a/tests/admin-ui-tests/package.json b/tests/admin-ui-tests/package.json
index a316c4c97f9..2f06fc96ef6 100644
--- a/tests/admin-ui-tests/package.json
+++ b/tests/admin-ui-tests/package.json
@@ -16,7 +16,7 @@
     "execa": "^5.1.1",
     "express": "^4.17.1",
     "graphql": "^15.6.1",
-    "playwright": "^1.15.2",
+    "playwright": "^1.16.1",
     "treekill": "^1.0.0"
   },
   "scripts": {
diff --git a/tests/examples-smoke-tests/package.json b/tests/examples-smoke-tests/package.json
index 884dee4384a..c6e93323770 100644
--- a/tests/examples-smoke-tests/package.json
+++ b/tests/examples-smoke-tests/package.json
@@ -14,7 +14,7 @@
     "@types/tough-cookie": "^4.0.1",
     "execa": "^5.1.1",
     "node-fetch": "^2.6.5",
-    "playwright": "^1.15.2",
+    "playwright": "^1.16.1",
     "tree-kill": "^1.2.2"
   }
 }
diff --git a/yarn.lock b/yarn.lock
index c00144862ab..df491cf882d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3284,7 +3284,7 @@ acorn@^8.0.0, acorn@^8.2.4:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.5.0.tgz#4512ccb99b3698c752591e9bb4472e38ad43cee2"
   integrity sha512-yXbYeFy+jUuYd3/CDcg2NkIYE991XYX/bje7LmjJigUciaeO1JR4XxXgCIV1/Zc/dRuFEyw1L0pbA+qynJkW5Q==
 
-agent-base@6:
+agent-base@6, agent-base@^6.0.2:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77"
   integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==
@@ -4636,10 +4636,10 @@ commander@^2.19.0, commander@^2.20.0, commander@^2.20.3:
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
   integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
 
-commander@^6.1.0:
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-6.2.1.tgz#0792eb682dfbc325999bb2b84fddddba110ac73c"
-  integrity sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==
+commander@^8.2.0:
+  version "8.3.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-8.3.0.tgz#4837ea1b2da67b9c616a67afbb0fafee567bca66"
+  integrity sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==
 
 commondir@^1.0.1:
   version "1.0.1"
@@ -7115,6 +7115,11 @@ io-ts@^2.0.0, io-ts@^2.2.16:
   resolved "https://registry.yarnpkg.com/io-ts/-/io-ts-2.2.16.tgz#597dffa03db1913fc318c9c6df6931cb4ed808b2"
   integrity sha512-y5TTSa6VP6le0hhmIyN0dqEXkrZeJLeC5KApJq6VLci3UEKF80lZ+KuoUs02RhBxNWlrqSNxzfI7otLX1Euv8Q==
 
+ip@^1.1.5:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a"
+  integrity sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=
+
 ipaddr.js@1.9.1:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3"
@@ -9953,12 +9958,12 @@ platform@1.3.6:
   resolved "https://registry.yarnpkg.com/platform/-/platform-1.3.6.tgz#48b4ce983164b209c2d45a107adb31f473a6e7a7"
   integrity sha512-fnWVljUchTro6RiCFvCXBbNhJc2NijN7oIQxbwsyL0buWJPG85v81ehlHI9fXrJsMNgTofEoWIQeClKpgxFLrg==
 
-playwright@^1.15.2:
-  version "1.15.2"
-  resolved "https://registry.yarnpkg.com/playwright/-/playwright-1.15.2.tgz#b350056d1fffbe5de5b1bdaca6ab73e35758baad"
-  integrity sha512-+Z+7ckihyxR6rK5q8DWC6eUbKARfXpyxpjNcoJfgwSr64lAOzjhyFQiPC/JkdIqhsLgZjxpWfl1S7fLb+wPkgA==
+playwright-core@=1.16.1:
+  version "1.16.1"
+  resolved "https://registry.yarnpkg.com/playwright-core/-/playwright-core-1.16.1.tgz#f8564359c9b0881eab1de55ca7723b21539eb585"
+  integrity sha512-SdThyChaLkvFkVEPZ/pfhiaaD4pnBTts2MYZzRMS+fYeyHzPy/FI+NUTj5Rgs+ZN9BCIrbJhfzvfYBxco/4X4A==
   dependencies:
-    commander "^6.1.0"
+    commander "^8.2.0"
     debug "^4.1.1"
     extract-zip "^2.0.1"
     https-proxy-agent "^5.0.0"
@@ -9969,10 +9974,19 @@ playwright@^1.15.2:
     proper-lockfile "^4.1.1"
     proxy-from-env "^1.1.0"
     rimraf "^3.0.2"
+    socks-proxy-agent "^6.1.0"
     stack-utils "^2.0.3"
     ws "^7.4.6"
+    yauzl "^2.10.0"
     yazl "^2.5.1"
 
+playwright@^1.16.1:
+  version "1.16.1"
+  resolved "https://registry.yarnpkg.com/playwright/-/playwright-1.16.1.tgz#c3518b02448f7fd0246e8f4ccdc38ac4f74b428d"
+  integrity sha512-D7o7itqxsJ4vx4OlcPv9brOe74M2J4gDDt9qVI9ptgtHtxCi48I8tSXE/trX1PoHFuJeeVlo+tGvhtisvPGu1A==
+  dependencies:
+    playwright-core "=1.16.1"
+
 pluralize@^8.0.0:
   version "8.0.0"
   resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-8.0.0.tgz#1a6fa16a38d12a1901e0320fa017051c539ce3b1"
@@ -11207,6 +11221,11 @@ slice-ansi@^4.0.0:
     astral-regex "^2.0.0"
     is-fullwidth-code-point "^3.0.0"
 
+smart-buffer@^4.1.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae"
+  integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==
+
 smartwrap@^1.2.3:
   version "1.2.5"
   resolved "https://registry.yarnpkg.com/smartwrap/-/smartwrap-1.2.5.tgz#45ee3e09ac234e5f7f17c16e916f511834f3cd23"
@@ -11248,6 +11267,23 @@ snapdragon@^0.8.1:
     source-map-resolve "^0.5.0"
     use "^3.1.0"
 
+socks-proxy-agent@^6.1.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-6.1.0.tgz#869cf2d7bd10fea96c7ad3111e81726855e285c3"
+  integrity sha512-57e7lwCN4Tzt3mXz25VxOErJKXlPfXmkMLnk310v/jwW20jWRVcgsOit+xNkN3eIEdB47GwnfAEBLacZ/wVIKg==
+  dependencies:
+    agent-base "^6.0.2"
+    debug "^4.3.1"
+    socks "^2.6.1"
+
+socks@^2.6.1:
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/socks/-/socks-2.6.1.tgz#989e6534a07cf337deb1b1c94aaa44296520d30e"
+  integrity sha512-kLQ9N5ucj8uIcxrDwjm0Jsqk06xdpBjGNQtpXy4Q8/QY2k+fY7nZH8CARy+hkbG+SGAovmzzuauCpBlb8FrnBA==
+  dependencies:
+    ip "^1.1.5"
+    smart-buffer "^4.1.0"
+
 source-map-resolve@^0.5.0:
   version "0.5.3"
   resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a"

From 3f0febec9e69b3ebb1568189133dde9bc515d936 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 27 Oct 2021 15:38:33 +1100
Subject: [PATCH 13/21] Update jest monorepo to ^27.3.1 (#6828)

Co-authored-by: Renovate Bot <bot@renovateapp.com>
---
 examples/testing/package.json         |   4 +-
 package.json                          |   4 +-
 packages/fields-document/package.json |   4 +-
 yarn.lock                             | 599 ++++++++++++++------------
 4 files changed, 320 insertions(+), 291 deletions(-)

diff --git a/examples/testing/package.json b/examples/testing/package.json
index 51df2258058..cee032d026b 100644
--- a/examples/testing/package.json
+++ b/examples/testing/package.json
@@ -17,8 +17,8 @@
     "@keystone-next/keystone": "^26.1.0"
   },
   "devDependencies": {
-    "babel-jest": "^27.2.5",
-    "jest": "^27.2.5",
+    "babel-jest": "^27.3.1",
+    "jest": "^27.3.1",
     "typescript": "^4.4.4"
   },
   "engines": {
diff --git a/package.json b/package.json
index 13fe1fceb6a..a2e2183d9aa 100644
--- a/package.json
+++ b/package.json
@@ -49,7 +49,7 @@
     "@babel/preset-typescript": "^7.15.0",
     "@changesets/changelog-github": "^0.4.1",
     "@changesets/cli": "^2.17.0",
-    "@jest/test-sequencer": "^27.2.5",
+    "@jest/test-sequencer": "^27.3.1",
     "@manypkg/cli": "^0.18.0",
     "@preconstruct/cli": "2.1.5",
     "@preconstruct/eslint-plugin-format-js-tag": "^0.1.0",
@@ -68,7 +68,7 @@
     "eslint-plugin-react": "^7.26.1",
     "eslint-plugin-react-hooks": "^4.2.0",
     "is-ci": "^3.0.0",
-    "jest": "^27.2.5",
+    "jest": "^27.3.1",
     "prettier": "^2.4.1",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
diff --git a/packages/fields-document/package.json b/packages/fields-document/package.json
index bcede9a68ef..87ea0348c38 100644
--- a/packages/fields-document/package.json
+++ b/packages/fields-document/package.json
@@ -58,8 +58,8 @@
     "@keystone-next/keystone": "*",
     "@testing-library/react": "^12.1.2",
     "array.prototype.flat": "^1.2.5",
-    "jest-diff": "^27.2.5",
-    "pretty-format": "^27.2.5",
+    "jest-diff": "^27.3.1",
+    "pretty-format": "^27.3.1",
     "slate-hyperscript": "^0.60.8"
   },
   "engines": {
diff --git a/yarn.lock b/yarn.lock
index df491cf882d..7dc9a54b813 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1593,27 +1593,27 @@
   resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.3.tgz#e45e384e4b8ec16bce2fd903af78450f6bf7ec98"
   integrity sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==
 
-"@jest/console@^27.2.5":
-  version "27.2.5"
-  resolved "https://registry.yarnpkg.com/@jest/console/-/console-27.2.5.tgz#bddbf8d41c191f17b52bf0c9e6c0d18605e35d6e"
-  integrity sha512-smtlRF9vNKorRMCUtJ+yllIoiY8oFmfFG7xlzsAE76nKEwXNhjPOJIsc7Dv+AUitVt76t+KjIpUP9m98Crn2LQ==
+"@jest/console@^27.3.1":
+  version "27.3.1"
+  resolved "https://registry.yarnpkg.com/@jest/console/-/console-27.3.1.tgz#e8ea3a475d3f8162f23d69efbfaa9cbe486bee93"
+  integrity sha512-RkFNWmv0iui+qsOr/29q9dyfKTTT5DCuP31kUwg7rmOKPT/ozLeGLKJKVIiOfbiKyleUZKIrHwhmiZWVe8IMdw==
   dependencies:
     "@jest/types" "^27.2.5"
     "@types/node" "*"
     chalk "^4.0.0"
-    jest-message-util "^27.2.5"
-    jest-util "^27.2.5"
+    jest-message-util "^27.3.1"
+    jest-util "^27.3.1"
     slash "^3.0.0"
 
-"@jest/core@^27.2.5":
-  version "27.2.5"
-  resolved "https://registry.yarnpkg.com/@jest/core/-/core-27.2.5.tgz#854c314708cee0d892ac4f531b9129f00a21ee69"
-  integrity sha512-VR7mQ+jykHN4WO3OvusRJMk4xCa2MFLipMS+43fpcRGaYrN1KwMATfVEXif7ccgFKYGy5D1TVXTNE4mGq/KMMA==
+"@jest/core@^27.3.1":
+  version "27.3.1"
+  resolved "https://registry.yarnpkg.com/@jest/core/-/core-27.3.1.tgz#04992ef1b58b17c459afb87ab56d81e63d386925"
+  integrity sha512-DMNE90RR5QKx0EA+wqe3/TNEwiRpOkhshKNxtLxd4rt3IZpCt+RSL+FoJsGeblRZmqdK4upHA/mKKGPPRAifhg==
   dependencies:
-    "@jest/console" "^27.2.5"
-    "@jest/reporters" "^27.2.5"
-    "@jest/test-result" "^27.2.5"
-    "@jest/transform" "^27.2.5"
+    "@jest/console" "^27.3.1"
+    "@jest/reporters" "^27.3.1"
+    "@jest/test-result" "^27.3.1"
+    "@jest/transform" "^27.3.1"
     "@jest/types" "^27.2.5"
     "@types/node" "*"
     ansi-escapes "^4.2.1"
@@ -1621,64 +1621,64 @@
     emittery "^0.8.1"
     exit "^0.1.2"
     graceful-fs "^4.2.4"
-    jest-changed-files "^27.2.5"
-    jest-config "^27.2.5"
-    jest-haste-map "^27.2.5"
-    jest-message-util "^27.2.5"
+    jest-changed-files "^27.3.0"
+    jest-config "^27.3.1"
+    jest-haste-map "^27.3.1"
+    jest-message-util "^27.3.1"
     jest-regex-util "^27.0.6"
-    jest-resolve "^27.2.5"
-    jest-resolve-dependencies "^27.2.5"
-    jest-runner "^27.2.5"
-    jest-runtime "^27.2.5"
-    jest-snapshot "^27.2.5"
-    jest-util "^27.2.5"
-    jest-validate "^27.2.5"
-    jest-watcher "^27.2.5"
+    jest-resolve "^27.3.1"
+    jest-resolve-dependencies "^27.3.1"
+    jest-runner "^27.3.1"
+    jest-runtime "^27.3.1"
+    jest-snapshot "^27.3.1"
+    jest-util "^27.3.1"
+    jest-validate "^27.3.1"
+    jest-watcher "^27.3.1"
     micromatch "^4.0.4"
     rimraf "^3.0.0"
     slash "^3.0.0"
     strip-ansi "^6.0.0"
 
-"@jest/environment@^27.2.5":
-  version "27.2.5"
-  resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-27.2.5.tgz#b85517ccfcec55690c82c56f5a01a3b30c5e3c84"
-  integrity sha512-XvUW3q6OUF+54SYFCgbbfCd/BKTwm5b2MGLoc2jINXQLKQDTCS2P2IrpPOtQ08WWZDGzbhAzVhOYta3J2arubg==
+"@jest/environment@^27.3.1":
+  version "27.3.1"
+  resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-27.3.1.tgz#2182defbce8d385fd51c5e7c7050f510bd4c86b1"
+  integrity sha512-BCKCj4mOVLme6Tanoyc9k0ultp3pnmuyHw73UHRPeeZxirsU/7E3HC4le/VDb/SMzE1JcPnto+XBKFOcoiJzVw==
   dependencies:
-    "@jest/fake-timers" "^27.2.5"
+    "@jest/fake-timers" "^27.3.1"
     "@jest/types" "^27.2.5"
     "@types/node" "*"
-    jest-mock "^27.2.5"
+    jest-mock "^27.3.0"
 
-"@jest/fake-timers@^27.2.5":
-  version "27.2.5"
-  resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-27.2.5.tgz#0c7e5762d7bfe6e269e7b49279b097a52a42f0a0"
-  integrity sha512-ZGUb6jg7BgwY+nmO0TW10bc7z7Hl2G/UTAvmxEyZ/GgNFoa31tY9/cgXmqcxnnZ7o5Xs7RAOz3G1SKIj8IVDlg==
+"@jest/fake-timers@^27.3.1":
+  version "27.3.1"
+  resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-27.3.1.tgz#1fad860ee9b13034762cdb94266e95609dfce641"
+  integrity sha512-M3ZFgwwlqJtWZ+QkBG5NmC23A9w+A6ZxNsO5nJxJsKYt4yguBd3i8TpjQz5NfCX91nEve1KqD9RA2Q+Q1uWqoA==
   dependencies:
     "@jest/types" "^27.2.5"
     "@sinonjs/fake-timers" "^8.0.1"
     "@types/node" "*"
-    jest-message-util "^27.2.5"
-    jest-mock "^27.2.5"
-    jest-util "^27.2.5"
+    jest-message-util "^27.3.1"
+    jest-mock "^27.3.0"
+    jest-util "^27.3.1"
 
-"@jest/globals@^27.2.5":
-  version "27.2.5"
-  resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-27.2.5.tgz#4115538f98ed6cee4051a90fdbd0854062902099"
-  integrity sha512-naRI537GM+enFVJQs6DcwGYPn/0vgJNb06zGVbzXfDfe/epDPV73hP1vqO37PqSKDeOXM2KInr6ymYbL1HTP7g==
+"@jest/globals@^27.3.1":
+  version "27.3.1"
+  resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-27.3.1.tgz#ce1dfb03d379237a9da6c1b99ecfaca1922a5f9e"
+  integrity sha512-Q651FWiWQAIFiN+zS51xqhdZ8g9b88nGCobC87argAxA7nMfNQq0Q0i9zTfQYgLa6qFXk2cGANEqfK051CZ8Pg==
   dependencies:
-    "@jest/environment" "^27.2.5"
+    "@jest/environment" "^27.3.1"
     "@jest/types" "^27.2.5"
-    expect "^27.2.5"
+    expect "^27.3.1"
 
-"@jest/reporters@^27.2.5":
-  version "27.2.5"
-  resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-27.2.5.tgz#65198ed1f3f4449e3f656129764dc6c5bb27ebe3"
-  integrity sha512-zYuR9fap3Q3mxQ454VWF8I6jYHErh368NwcKHWO2uy2fwByqBzRHkf9j2ekMDM7PaSTWcLBSZyd7NNxR1iHxzQ==
+"@jest/reporters@^27.3.1":
+  version "27.3.1"
+  resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-27.3.1.tgz#28b5c1f5789481e23788048fa822ed15486430b9"
+  integrity sha512-m2YxPmL9Qn1emFVgZGEiMwDntDxRRQ2D58tiDQlwYTg5GvbFOKseYCcHtn0WsI8CG4vzPglo3nqbOiT8ySBT/w==
   dependencies:
     "@bcoe/v8-coverage" "^0.2.3"
-    "@jest/console" "^27.2.5"
-    "@jest/test-result" "^27.2.5"
-    "@jest/transform" "^27.2.5"
+    "@jest/console" "^27.3.1"
+    "@jest/test-result" "^27.3.1"
+    "@jest/transform" "^27.3.1"
     "@jest/types" "^27.2.5"
     "@types/node" "*"
     chalk "^4.0.0"
@@ -1691,10 +1691,10 @@
     istanbul-lib-report "^3.0.0"
     istanbul-lib-source-maps "^4.0.0"
     istanbul-reports "^3.0.2"
-    jest-haste-map "^27.2.5"
-    jest-resolve "^27.2.5"
-    jest-util "^27.2.5"
-    jest-worker "^27.2.5"
+    jest-haste-map "^27.3.1"
+    jest-resolve "^27.3.1"
+    jest-util "^27.3.1"
+    jest-worker "^27.3.1"
     slash "^3.0.0"
     source-map "^0.6.0"
     string-length "^4.0.1"
@@ -1710,30 +1710,30 @@
     graceful-fs "^4.2.4"
     source-map "^0.6.0"
 
-"@jest/test-result@^27.2.5":
-  version "27.2.5"
-  resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-27.2.5.tgz#e9f73cf6cd5e2cc6eb3105339248dea211f9320e"
-  integrity sha512-ub7j3BrddxZ0BdSnM5JCF6cRZJ/7j3wgdX0+Dtwhw2Po+HKsELCiXUTvh+mgS4/89mpnU1CPhZxe2mTvuLPJJg==
+"@jest/test-result@^27.3.1":
+  version "27.3.1"
+  resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-27.3.1.tgz#89adee8b771877c69b3b8d59f52f29dccc300194"
+  integrity sha512-mLn6Thm+w2yl0opM8J/QnPTqrfS4FoXsXF2WIWJb2O/GBSyResL71BRuMYbYRsGt7ELwS5JGcEcGb52BNrumgg==
   dependencies:
-    "@jest/console" "^27.2.5"
+    "@jest/console" "^27.3.1"
     "@jest/types" "^27.2.5"
     "@types/istanbul-lib-coverage" "^2.0.0"
     collect-v8-coverage "^1.0.0"
 
-"@jest/test-sequencer@^27.2.5":
-  version "27.2.5"
-  resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-27.2.5.tgz#ed5ae91c00e623fb719111d58e380395e16cefbb"
-  integrity sha512-8j8fHZRfnjbbdMitMAGFKaBZ6YqvFRFJlMJzcy3v75edTOqc7RY65S9JpMY6wT260zAcL2sTQRga/P4PglCu3Q==
+"@jest/test-sequencer@^27.3.1":
+  version "27.3.1"
+  resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-27.3.1.tgz#4b3bde2dbb05ee74afdae608cf0768e3354683b1"
+  integrity sha512-siySLo07IMEdSjA4fqEnxfIX8lB/lWYsBPwNFtkOvsFQvmBrL3yj3k3uFNZv/JDyApTakRpxbKLJ3CT8UGVCrA==
   dependencies:
-    "@jest/test-result" "^27.2.5"
+    "@jest/test-result" "^27.3.1"
     graceful-fs "^4.2.4"
-    jest-haste-map "^27.2.5"
-    jest-runtime "^27.2.5"
+    jest-haste-map "^27.3.1"
+    jest-runtime "^27.3.1"
 
-"@jest/transform@^27.2.5":
-  version "27.2.5"
-  resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-27.2.5.tgz#02b08862a56dbedddf0ba3c2eae41e049a250e29"
-  integrity sha512-29lRtAHHYGALbZOx343v0zKmdOg4Sb0rsA1uSv0818bvwRhs3TyElOmTVXlrw0v1ZTqXJCAH/cmoDXimBhQOJQ==
+"@jest/transform@^27.3.1":
+  version "27.3.1"
+  resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-27.3.1.tgz#ff80eafbeabe811e9025e4b6f452126718455220"
+  integrity sha512-3fSvQ02kuvjOI1C1ssqMVBKJpZf6nwoCiSu00zAKh5nrp3SptNtZy/8s5deayHnqxhjD9CWDJ+yqQwuQ0ZafXQ==
   dependencies:
     "@babel/core" "^7.1.0"
     "@jest/types" "^27.2.5"
@@ -1742,9 +1742,9 @@
     convert-source-map "^1.4.0"
     fast-json-stable-stringify "^2.0.0"
     graceful-fs "^4.2.4"
-    jest-haste-map "^27.2.5"
+    jest-haste-map "^27.3.1"
     jest-regex-util "^27.0.6"
-    jest-util "^27.2.5"
+    jest-util "^27.3.1"
     micromatch "^4.0.4"
     pirates "^4.0.1"
     slash "^3.0.0"
@@ -3752,12 +3752,12 @@ axios@^0.21.1:
   dependencies:
     follow-redirects "^1.14.0"
 
-babel-jest@^27.2.5:
-  version "27.2.5"
-  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-27.2.5.tgz#6bbbc1bb4200fe0bfd1b1fbcbe02fc62ebed16aa"
-  integrity sha512-GC9pWCcitBhSuF7H3zl0mftoKizlswaF0E3qi+rPL417wKkCB0d+Sjjb0OfXvxj7gWiBf497ldgRMii68Xz+2g==
+babel-jest@^27.3.1:
+  version "27.3.1"
+  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-27.3.1.tgz#0636a3404c68e07001e434ac4956d82da8a80022"
+  integrity sha512-SjIF8hh/ir0peae2D6S6ZKRhUy7q/DnpH7k/V6fT4Bgs/LXXUztOpX4G2tCgq8mLo5HA9mN6NmlFMeYtKmIsTQ==
   dependencies:
-    "@jest/transform" "^27.2.5"
+    "@jest/transform" "^27.3.1"
     "@jest/types" "^27.2.5"
     "@types/babel__core" "^7.1.14"
     babel-plugin-istanbul "^6.0.0"
@@ -4445,7 +4445,7 @@ ci-info@^2.0.0:
   resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46"
   integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==
 
-ci-info@^3.1.1:
+ci-info@^3.1.1, ci-info@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.2.0.tgz#2876cb948a498797b5236f0095bc057d0dca38b6"
   integrity sha512-dVqRX7fLUm8J6FgHJ418XuIgDLZDkYcDFTeL6TA2gt5WlIZUQrrH6EZrNClwT/H0FateUsZkGIOPRrLbP+PR9A==
@@ -5878,16 +5878,16 @@ expand-brackets@^2.1.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
-expect@^27.2.5:
-  version "27.2.5"
-  resolved "https://registry.yarnpkg.com/expect/-/expect-27.2.5.tgz#16154aaa60b4d9a5b0adacfea3e4d6178f4b93fd"
-  integrity sha512-ZrO0w7bo8BgGoP/bLz+HDCI+0Hfei9jUSZs5yI/Wyn9VkG9w8oJ7rHRgYj+MA7yqqFa0IwHA3flJzZtYugShJA==
+expect@^27.3.1:
+  version "27.3.1"
+  resolved "https://registry.yarnpkg.com/expect/-/expect-27.3.1.tgz#d0f170b1f5c8a2009bab0beffd4bb94f043e38e7"
+  integrity sha512-MrNXV2sL9iDRebWPGOGFdPQRl2eDQNu/uhxIMShjjx74T6kC6jFIkmQ6OqXDtevjGUkyB2IT56RzDBqXf/QPCg==
   dependencies:
     "@jest/types" "^27.2.5"
     ansi-styles "^5.0.0"
-    jest-get-type "^27.0.6"
-    jest-matcher-utils "^27.2.5"
-    jest-message-util "^27.2.5"
+    jest-get-type "^27.3.1"
+    jest-matcher-utils "^27.3.1"
+    jest-message-util "^27.3.1"
     jest-regex-util "^27.0.6"
 
 express@^4.17.1:
@@ -7632,86 +7632,86 @@ istanbul-reports@^3.0.2:
     html-escaper "^2.0.0"
     istanbul-lib-report "^3.0.0"
 
-jest-changed-files@^27.2.5:
-  version "27.2.5"
-  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-27.2.5.tgz#9dfd550d158260bcb6fa80aff491f5647f7daeca"
-  integrity sha512-jfnNJzF89csUKRPKJ4MwZ1SH27wTmX2xiAIHUHrsb/OYd9Jbo4/SXxJ17/nnx6RIifpthk3Y+LEeOk+/dDeGdw==
+jest-changed-files@^27.3.0:
+  version "27.3.0"
+  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-27.3.0.tgz#22a02cc2b34583fc66e443171dc271c0529d263c"
+  integrity sha512-9DJs9garMHv4RhylUMZgbdCJ3+jHSkpL9aaVKp13xtXAD80qLTLrqcDZL1PHA9dYA0bCI86Nv2BhkLpLhrBcPg==
   dependencies:
     "@jest/types" "^27.2.5"
     execa "^5.0.0"
     throat "^6.0.1"
 
-jest-circus@^27.2.5:
-  version "27.2.5"
-  resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-27.2.5.tgz#573256a6fb6e447ac2fc7e0ade9375013309037f"
-  integrity sha512-eyL9IcrAxm3Saq3rmajFCwpaxaRMGJ1KJs+7hlTDinXpJmeR3P02bheM3CYohE7UfwOBmrFMJHjgo/WPcLTM+Q==
+jest-circus@^27.3.1:
+  version "27.3.1"
+  resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-27.3.1.tgz#1679e74387cbbf0c6a8b42de963250a6469e0797"
+  integrity sha512-v1dsM9II6gvXokgqq6Yh2jHCpfg7ZqV4jWY66u7npz24JnhP3NHxI0sKT7+ZMQ7IrOWHYAaeEllOySbDbWsiXw==
   dependencies:
-    "@jest/environment" "^27.2.5"
-    "@jest/test-result" "^27.2.5"
+    "@jest/environment" "^27.3.1"
+    "@jest/test-result" "^27.3.1"
     "@jest/types" "^27.2.5"
     "@types/node" "*"
     chalk "^4.0.0"
     co "^4.6.0"
     dedent "^0.7.0"
-    expect "^27.2.5"
+    expect "^27.3.1"
     is-generator-fn "^2.0.0"
-    jest-each "^27.2.5"
-    jest-matcher-utils "^27.2.5"
-    jest-message-util "^27.2.5"
-    jest-runtime "^27.2.5"
-    jest-snapshot "^27.2.5"
-    jest-util "^27.2.5"
-    pretty-format "^27.2.5"
+    jest-each "^27.3.1"
+    jest-matcher-utils "^27.3.1"
+    jest-message-util "^27.3.1"
+    jest-runtime "^27.3.1"
+    jest-snapshot "^27.3.1"
+    jest-util "^27.3.1"
+    pretty-format "^27.3.1"
     slash "^3.0.0"
     stack-utils "^2.0.3"
     throat "^6.0.1"
 
-jest-cli@^27.2.5:
-  version "27.2.5"
-  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-27.2.5.tgz#88718c8f05f1c0f209152952ecd61afe4c3311bb"
-  integrity sha512-XzfcOXi5WQrXqFYsDxq5RDOKY4FNIgBgvgf3ZBz4e/j5/aWep5KnsAYH5OFPMdX/TP/LFsYQMRH7kzJUMh6JKg==
+jest-cli@^27.3.1:
+  version "27.3.1"
+  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-27.3.1.tgz#b576f9d146ba6643ce0a162d782b40152b6b1d16"
+  integrity sha512-WHnCqpfK+6EvT62me6WVs8NhtbjAS4/6vZJnk7/2+oOr50cwAzG4Wxt6RXX0hu6m1169ZGMlhYYUNeKBXCph/Q==
   dependencies:
-    "@jest/core" "^27.2.5"
-    "@jest/test-result" "^27.2.5"
+    "@jest/core" "^27.3.1"
+    "@jest/test-result" "^27.3.1"
     "@jest/types" "^27.2.5"
     chalk "^4.0.0"
     exit "^0.1.2"
     graceful-fs "^4.2.4"
     import-local "^3.0.2"
-    jest-config "^27.2.5"
-    jest-util "^27.2.5"
-    jest-validate "^27.2.5"
+    jest-config "^27.3.1"
+    jest-util "^27.3.1"
+    jest-validate "^27.3.1"
     prompts "^2.0.1"
     yargs "^16.2.0"
 
-jest-config@^27.2.5:
-  version "27.2.5"
-  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-27.2.5.tgz#c2e4ec6ea2bf4ffd2cae3d927999fe6159cba207"
-  integrity sha512-QdENtn9b5rIIYGlbDNEcgY9LDL5kcokJnXrp7x8AGjHob/XFqw1Z6p+gjfna2sUulQsQ3ce2Fvntnv+7fKYDhQ==
+jest-config@^27.3.1:
+  version "27.3.1"
+  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-27.3.1.tgz#cb3b7f6aaa8c0a7daad4f2b9573899ca7e09bbad"
+  integrity sha512-KY8xOIbIACZ/vdYCKSopL44I0xboxC751IX+DXL2+Wx6DKNycyEfV3rryC3BPm5Uq/BBqDoMrKuqLEUNJmMKKg==
   dependencies:
     "@babel/core" "^7.1.0"
-    "@jest/test-sequencer" "^27.2.5"
+    "@jest/test-sequencer" "^27.3.1"
     "@jest/types" "^27.2.5"
-    babel-jest "^27.2.5"
+    babel-jest "^27.3.1"
     chalk "^4.0.0"
+    ci-info "^3.2.0"
     deepmerge "^4.2.2"
     glob "^7.1.1"
     graceful-fs "^4.2.4"
-    is-ci "^3.0.0"
-    jest-circus "^27.2.5"
-    jest-environment-jsdom "^27.2.5"
-    jest-environment-node "^27.2.5"
-    jest-get-type "^27.0.6"
-    jest-jasmine2 "^27.2.5"
+    jest-circus "^27.3.1"
+    jest-environment-jsdom "^27.3.1"
+    jest-environment-node "^27.3.1"
+    jest-get-type "^27.3.1"
+    jest-jasmine2 "^27.3.1"
     jest-regex-util "^27.0.6"
-    jest-resolve "^27.2.5"
-    jest-runner "^27.2.5"
-    jest-util "^27.2.5"
-    jest-validate "^27.2.5"
+    jest-resolve "^27.3.1"
+    jest-runner "^27.3.1"
+    jest-util "^27.3.1"
+    jest-validate "^27.3.1"
     micromatch "^4.0.4"
-    pretty-format "^27.2.5"
+    pretty-format "^27.3.1"
 
-jest-diff@^27.0.0, jest-diff@^27.2.5:
+jest-diff@^27.0.0:
   version "27.2.5"
   resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-27.2.5.tgz#908f7a6aca5653824516ad30e0a9fd9767e53623"
   integrity sha512-7gfwwyYkeslOOVQY4tVq5TaQa92mWfC9COsVYMNVYyJTOYAqbIkoD3twi5A+h+tAPtAelRxkqY6/xu+jwTr0dA==
@@ -7721,6 +7721,16 @@ jest-diff@^27.0.0, jest-diff@^27.2.5:
     jest-get-type "^27.0.6"
     pretty-format "^27.2.5"
 
+jest-diff@^27.3.1:
+  version "27.3.1"
+  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-27.3.1.tgz#d2775fea15411f5f5aeda2a5e02c2f36440f6d55"
+  integrity sha512-PCeuAH4AWUo2O5+ksW4pL9v5xJAcIKPUPfIhZBcG1RKv/0+dvaWTQK1Nrau8d67dp65fOqbeMdoil+6PedyEPQ==
+  dependencies:
+    chalk "^4.0.0"
+    diff-sequences "^27.0.6"
+    jest-get-type "^27.3.1"
+    pretty-format "^27.3.1"
+
 jest-docblock@^27.0.6:
   version "27.0.6"
   resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-27.0.6.tgz#cc78266acf7fe693ca462cbbda0ea4e639e4e5f3"
@@ -7728,51 +7738,56 @@ jest-docblock@^27.0.6:
   dependencies:
     detect-newline "^3.0.0"
 
-jest-each@^27.2.5:
-  version "27.2.5"
-  resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-27.2.5.tgz#378118d516db730b92096a9607b8711165946353"
-  integrity sha512-HUPWIbJT0bXarRwKu/m7lYzqxR4GM5EhKOsu0z3t0SKtbFN6skQhpAUADM4qFShBXb9zoOuag5lcrR1x/WM+Ag==
+jest-each@^27.3.1:
+  version "27.3.1"
+  resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-27.3.1.tgz#14c56bb4f18dd18dc6bdd853919b5f16a17761ff"
+  integrity sha512-E4SwfzKJWYcvOYCjOxhZcxwL+AY0uFMvdCOwvzgutJiaiodFjkxQQDxHm8FQBeTqDnSmKsQWn7ldMRzTn2zJaQ==
   dependencies:
     "@jest/types" "^27.2.5"
     chalk "^4.0.0"
-    jest-get-type "^27.0.6"
-    jest-util "^27.2.5"
-    pretty-format "^27.2.5"
+    jest-get-type "^27.3.1"
+    jest-util "^27.3.1"
+    pretty-format "^27.3.1"
 
-jest-environment-jsdom@^27.2.5:
-  version "27.2.5"
-  resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-27.2.5.tgz#21de3ad0e89441d961b592ba7561b16241279208"
-  integrity sha512-QtRpOh/RQKuXniaWcoFE2ElwP6tQcyxHu0hlk32880g0KczdonCs5P1sk5+weu/OVzh5V4Bt1rXuQthI01mBLg==
+jest-environment-jsdom@^27.3.1:
+  version "27.3.1"
+  resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-27.3.1.tgz#63ac36d68f7a9303494df783494856222b57f73e"
+  integrity sha512-3MOy8qMzIkQlfb3W1TfrD7uZHj+xx8Olix5vMENkj5djPmRqndMaXtpnaZkxmxM+Qc3lo+yVzJjzuXbCcZjAlg==
   dependencies:
-    "@jest/environment" "^27.2.5"
-    "@jest/fake-timers" "^27.2.5"
+    "@jest/environment" "^27.3.1"
+    "@jest/fake-timers" "^27.3.1"
     "@jest/types" "^27.2.5"
     "@types/node" "*"
-    jest-mock "^27.2.5"
-    jest-util "^27.2.5"
+    jest-mock "^27.3.0"
+    jest-util "^27.3.1"
     jsdom "^16.6.0"
 
-jest-environment-node@^27.2.5:
-  version "27.2.5"
-  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-27.2.5.tgz#ffa1afb3604c640ec841f044d526c65912e02cef"
-  integrity sha512-0o1LT4grm7iwrS8fIoLtwJxb/hoa3GsH7pP10P02Jpj7Mi4BXy65u46m89vEM2WfD1uFJQ2+dfDiWZNA2e6bJg==
+jest-environment-node@^27.3.1:
+  version "27.3.1"
+  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-27.3.1.tgz#af7d0eed04edafb740311b303f3fe7c8c27014bb"
+  integrity sha512-T89F/FgkE8waqrTSA7/ydMkcc52uYPgZZ6q8OaZgyiZkJb5QNNCF6oPZjH9IfPFfcc9uBWh1574N0kY0pSvTXw==
   dependencies:
-    "@jest/environment" "^27.2.5"
-    "@jest/fake-timers" "^27.2.5"
+    "@jest/environment" "^27.3.1"
+    "@jest/fake-timers" "^27.3.1"
     "@jest/types" "^27.2.5"
     "@types/node" "*"
-    jest-mock "^27.2.5"
-    jest-util "^27.2.5"
+    jest-mock "^27.3.0"
+    jest-util "^27.3.1"
 
 jest-get-type@^27.0.6:
   version "27.0.6"
   resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-27.0.6.tgz#0eb5c7f755854279ce9b68a9f1a4122f69047cfe"
   integrity sha512-XTkK5exIeUbbveehcSR8w0bhH+c0yloW/Wpl+9vZrjzztCPWrxhHwkIFpZzCt71oRBsgxmuUfxEqOYoZI2macg==
 
-jest-haste-map@^27.2.5:
-  version "27.2.5"
-  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-27.2.5.tgz#0247b7299250643472bbcf5b4ad85c72d5178e2e"
-  integrity sha512-pzO+Gw2WLponaSi0ilpzYBE0kuVJstoXBX8YWyUebR8VaXuX4tzzn0Zp23c/WaETo7XYTGv2e8KdnpiskAFMhQ==
+jest-get-type@^27.3.1:
+  version "27.3.1"
+  resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-27.3.1.tgz#a8a2b0a12b50169773099eee60a0e6dd11423eff"
+  integrity sha512-+Ilqi8hgHSAdhlQ3s12CAVNd8H96ZkQBfYoXmArzZnOfAtVAJEiPDBirjByEblvG/4LPJmkL+nBqPO3A1YJAEg==
+
+jest-haste-map@^27.3.1:
+  version "27.3.1"
+  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-27.3.1.tgz#7656fbd64bf48bda904e759fc9d93e2c807353ee"
+  integrity sha512-lYfNZIzwPccDJZIyk9Iz5iQMM/MH56NIIcGj7AFU1YyA4ewWFBl8z+YPJuSCRML/ee2cCt2y3W4K3VXPT6Nhzg==
   dependencies:
     "@jest/types" "^27.2.5"
     "@types/graceful-fs" "^4.1.2"
@@ -7782,59 +7797,59 @@ jest-haste-map@^27.2.5:
     graceful-fs "^4.2.4"
     jest-regex-util "^27.0.6"
     jest-serializer "^27.0.6"
-    jest-util "^27.2.5"
-    jest-worker "^27.2.5"
+    jest-util "^27.3.1"
+    jest-worker "^27.3.1"
     micromatch "^4.0.4"
     walker "^1.0.7"
   optionalDependencies:
     fsevents "^2.3.2"
 
-jest-jasmine2@^27.2.5:
-  version "27.2.5"
-  resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-27.2.5.tgz#baaf96c69913c52bce0100000cf0721027c0fd66"
-  integrity sha512-hdxY9Cm/CjLqu2tXeAoQHPgA4vcqlweVXYOg1+S9FeFdznB9Rti+eEBKDDkmOy9iqr4Xfbq95OkC4NFbXXPCAQ==
+jest-jasmine2@^27.3.1:
+  version "27.3.1"
+  resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-27.3.1.tgz#df6d3d07c7dafc344feb43a0072a6f09458d32b0"
+  integrity sha512-WK11ZUetDQaC09w4/j7o4FZDUIp+4iYWH/Lik34Pv7ukL+DuXFGdnmmi7dT58J2ZYKFB5r13GyE0z3NPeyJmsg==
   dependencies:
     "@babel/traverse" "^7.1.0"
-    "@jest/environment" "^27.2.5"
+    "@jest/environment" "^27.3.1"
     "@jest/source-map" "^27.0.6"
-    "@jest/test-result" "^27.2.5"
+    "@jest/test-result" "^27.3.1"
     "@jest/types" "^27.2.5"
     "@types/node" "*"
     chalk "^4.0.0"
     co "^4.6.0"
-    expect "^27.2.5"
+    expect "^27.3.1"
     is-generator-fn "^2.0.0"
-    jest-each "^27.2.5"
-    jest-matcher-utils "^27.2.5"
-    jest-message-util "^27.2.5"
-    jest-runtime "^27.2.5"
-    jest-snapshot "^27.2.5"
-    jest-util "^27.2.5"
-    pretty-format "^27.2.5"
+    jest-each "^27.3.1"
+    jest-matcher-utils "^27.3.1"
+    jest-message-util "^27.3.1"
+    jest-runtime "^27.3.1"
+    jest-snapshot "^27.3.1"
+    jest-util "^27.3.1"
+    pretty-format "^27.3.1"
     throat "^6.0.1"
 
-jest-leak-detector@^27.2.5:
-  version "27.2.5"
-  resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-27.2.5.tgz#e2edc3b37d38e8d9a527e10e456b403c3151b206"
-  integrity sha512-HYsi3GUR72bYhOGB5C5saF9sPdxGzSjX7soSQS+BqDRysc7sPeBwPbhbuT8DnOpijnKjgwWQ8JqvbmReYnt3aQ==
+jest-leak-detector@^27.3.1:
+  version "27.3.1"
+  resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-27.3.1.tgz#7fb632c2992ef707a1e73286e1e704f9cc1772b2"
+  integrity sha512-78QstU9tXbaHzwlRlKmTpjP9k4Pvre5l0r8Spo4SbFFVy/4Abg9I6ZjHwjg2QyKEAMg020XcjP+UgLZIY50yEg==
   dependencies:
-    jest-get-type "^27.0.6"
-    pretty-format "^27.2.5"
+    jest-get-type "^27.3.1"
+    pretty-format "^27.3.1"
 
-jest-matcher-utils@^27.2.5:
-  version "27.2.5"
-  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-27.2.5.tgz#4684faaa8eb32bf15e6edaead6834031897e2980"
-  integrity sha512-qNR/kh6bz0Dyv3m68Ck2g1fLW5KlSOUNcFQh87VXHZwWc/gY6XwnKofx76Qytz3x5LDWT09/2+yXndTkaG4aWg==
+jest-matcher-utils@^27.3.1:
+  version "27.3.1"
+  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-27.3.1.tgz#257ad61e54a6d4044e080d85dbdc4a08811e9c1c"
+  integrity sha512-hX8N7zXS4k+8bC1Aj0OWpGb7D3gIXxYvPNK1inP5xvE4ztbz3rc4AkI6jGVaerepBnfWB17FL5lWFJT3s7qo8w==
   dependencies:
     chalk "^4.0.0"
-    jest-diff "^27.2.5"
-    jest-get-type "^27.0.6"
-    pretty-format "^27.2.5"
+    jest-diff "^27.3.1"
+    jest-get-type "^27.3.1"
+    pretty-format "^27.3.1"
 
-jest-message-util@^27.2.5:
-  version "27.2.5"
-  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-27.2.5.tgz#ed8b7b0965247bb875a49c1f9b9ab2d1d0820028"
-  integrity sha512-ggXSLoPfIYcbmZ8glgEJZ8b+e0Msw/iddRmgkoO7lDAr9SmI65IIfv7VnvTnV4FGnIIUIjzM+fHRHO5RBvyAbQ==
+jest-message-util@^27.3.1:
+  version "27.3.1"
+  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-27.3.1.tgz#f7c25688ad3410ab10bcb862bcfe3152345c6436"
+  integrity sha512-bh3JEmxsTZ/9rTm0jQrPElbY2+y48Rw2t47uMfByNyUVR+OfPh4anuyKsGqsNkXk/TI4JbLRZx+7p7Hdt6q1yg==
   dependencies:
     "@babel/code-frame" "^7.12.13"
     "@jest/types" "^27.2.5"
@@ -7842,14 +7857,14 @@ jest-message-util@^27.2.5:
     chalk "^4.0.0"
     graceful-fs "^4.2.4"
     micromatch "^4.0.4"
-    pretty-format "^27.2.5"
+    pretty-format "^27.3.1"
     slash "^3.0.0"
     stack-utils "^2.0.3"
 
-jest-mock@^27.2.5:
-  version "27.2.5"
-  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-27.2.5.tgz#0ec38d5ff1e49c4802e7a4a8179e8d7a2fd84de0"
-  integrity sha512-HiMB3LqE9RzmeMzZARi2Bz3NoymxyP0gCid4y42ca1djffNtYFKgI220aC1VP1mUZ8rbpqZbHZOJ15093bZV/Q==
+jest-mock@^27.3.0:
+  version "27.3.0"
+  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-27.3.0.tgz#ddf0ec3cc3e68c8ccd489bef4d1f525571a1b867"
+  integrity sha512-ziZiLk0elZOQjD08bLkegBzv5hCABu/c8Ytx45nJKkysQwGaonvmTxwjLqEA4qGdasq9o2I8/HtdGMNnVsMTGw==
   dependencies:
     "@jest/types" "^27.2.5"
     "@types/node" "*"
@@ -7864,40 +7879,40 @@ jest-regex-util@^27.0.6:
   resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-27.0.6.tgz#02e112082935ae949ce5d13b2675db3d8c87d9c5"
   integrity sha512-SUhPzBsGa1IKm8hx2F4NfTGGp+r7BXJ4CulsZ1k2kI+mGLG+lxGrs76veN2LF/aUdGosJBzKgXmNCw+BzFqBDQ==
 
-jest-resolve-dependencies@^27.2.5:
-  version "27.2.5"
-  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-27.2.5.tgz#fcd8eca005b3d11ba32da443045c028164b83be1"
-  integrity sha512-BSjefped31bcvvCh++/pN9ueqqN1n0+p8/58yScuWfklLm2tbPbS9d251vJhAy0ZI2pL/0IaGhOTJrs9Y4FJlg==
+jest-resolve-dependencies@^27.3.1:
+  version "27.3.1"
+  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-27.3.1.tgz#85b99bdbdfa46e2c81c6228fc4c91076f624f6e2"
+  integrity sha512-X7iLzY8pCiYOnvYo2YrK3P9oSE8/3N2f4pUZMJ8IUcZnT81vlSonya1KTO9ZfKGuC+svE6FHK/XOb8SsoRUV1A==
   dependencies:
     "@jest/types" "^27.2.5"
     jest-regex-util "^27.0.6"
-    jest-snapshot "^27.2.5"
+    jest-snapshot "^27.3.1"
 
-jest-resolve@^27.2.5:
-  version "27.2.5"
-  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-27.2.5.tgz#04dadbfc1312a2541f5c199c5011945e9cfe5cef"
-  integrity sha512-q5irwS3oS73SKy3+FM/HL2T7WJftrk9BRzrXF92f7net5HMlS7lJMg/ZwxLB4YohKqjSsdksEw7n/jvMxV7EKg==
+jest-resolve@^27.3.1:
+  version "27.3.1"
+  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-27.3.1.tgz#0e5542172a1aa0270be6f66a65888647bdd74a3e"
+  integrity sha512-Dfzt25CFSPo3Y3GCbxynRBZzxq9AdyNN+x/v2IqYx6KVT5Z6me2Z/PsSGFSv3cOSUZqJ9pHxilao/I/m9FouLw==
   dependencies:
     "@jest/types" "^27.2.5"
     chalk "^4.0.0"
-    escalade "^3.1.1"
     graceful-fs "^4.2.4"
-    jest-haste-map "^27.2.5"
+    jest-haste-map "^27.3.1"
     jest-pnp-resolver "^1.2.2"
-    jest-util "^27.2.5"
-    jest-validate "^27.2.5"
+    jest-util "^27.3.1"
+    jest-validate "^27.3.1"
     resolve "^1.20.0"
+    resolve.exports "^1.1.0"
     slash "^3.0.0"
 
-jest-runner@^27.2.5:
-  version "27.2.5"
-  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-27.2.5.tgz#3d9d0626f351480bb2cffcfbbfac240c0097ebd4"
-  integrity sha512-n41vw9RLg5TKAnEeJK9d6pGOsBOpwE89XBniK+AD1k26oIIy3V7ogM1scbDjSheji8MUPC9pNgCrZ/FHLVDNgg==
+jest-runner@^27.3.1:
+  version "27.3.1"
+  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-27.3.1.tgz#1d594dcbf3bd8600a7e839e790384559eaf96e3e"
+  integrity sha512-r4W6kBn6sPr3TBwQNmqE94mPlYVn7fLBseeJfo4E2uCTmAyDFm2O5DYAQAFP7Q3YfiA/bMwg8TVsciP7k0xOww==
   dependencies:
-    "@jest/console" "^27.2.5"
-    "@jest/environment" "^27.2.5"
-    "@jest/test-result" "^27.2.5"
-    "@jest/transform" "^27.2.5"
+    "@jest/console" "^27.3.1"
+    "@jest/environment" "^27.3.1"
+    "@jest/test-result" "^27.3.1"
+    "@jest/transform" "^27.3.1"
     "@jest/types" "^27.2.5"
     "@types/node" "*"
     chalk "^4.0.0"
@@ -7905,30 +7920,29 @@ jest-runner@^27.2.5:
     exit "^0.1.2"
     graceful-fs "^4.2.4"
     jest-docblock "^27.0.6"
-    jest-environment-jsdom "^27.2.5"
-    jest-environment-node "^27.2.5"
-    jest-haste-map "^27.2.5"
-    jest-leak-detector "^27.2.5"
-    jest-message-util "^27.2.5"
-    jest-resolve "^27.2.5"
-    jest-runtime "^27.2.5"
-    jest-util "^27.2.5"
-    jest-worker "^27.2.5"
+    jest-environment-jsdom "^27.3.1"
+    jest-environment-node "^27.3.1"
+    jest-haste-map "^27.3.1"
+    jest-leak-detector "^27.3.1"
+    jest-message-util "^27.3.1"
+    jest-resolve "^27.3.1"
+    jest-runtime "^27.3.1"
+    jest-util "^27.3.1"
+    jest-worker "^27.3.1"
     source-map-support "^0.5.6"
     throat "^6.0.1"
 
-jest-runtime@^27.2.5:
-  version "27.2.5"
-  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-27.2.5.tgz#d144c3f6889b927aae1e695b63a41a3323b7016b"
-  integrity sha512-N0WRZ3QszKyZ3Dm27HTBbBuestsSd3Ud5ooVho47XZJ8aSKO/X1Ag8M1dNx9XzfGVRNdB/xCA3lz8MJwIzPLLA==
+jest-runtime@^27.3.1:
+  version "27.3.1"
+  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-27.3.1.tgz#80fa32eb85fe5af575865ddf379874777ee993d7"
+  integrity sha512-qtO6VxPbS8umqhEDpjA4pqTkKQ1Hy4ZSi9mDVeE9Za7LKBo2LdW2jmT+Iod3XFaJqINikZQsn2wEi0j9wPRbLg==
   dependencies:
-    "@jest/console" "^27.2.5"
-    "@jest/environment" "^27.2.5"
-    "@jest/fake-timers" "^27.2.5"
-    "@jest/globals" "^27.2.5"
+    "@jest/console" "^27.3.1"
+    "@jest/environment" "^27.3.1"
+    "@jest/globals" "^27.3.1"
     "@jest/source-map" "^27.0.6"
-    "@jest/test-result" "^27.2.5"
-    "@jest/transform" "^27.2.5"
+    "@jest/test-result" "^27.3.1"
+    "@jest/transform" "^27.3.1"
     "@jest/types" "^27.2.5"
     "@types/yargs" "^16.0.0"
     chalk "^4.0.0"
@@ -7938,14 +7952,14 @@ jest-runtime@^27.2.5:
     exit "^0.1.2"
     glob "^7.1.3"
     graceful-fs "^4.2.4"
-    jest-haste-map "^27.2.5"
-    jest-message-util "^27.2.5"
-    jest-mock "^27.2.5"
+    jest-haste-map "^27.3.1"
+    jest-message-util "^27.3.1"
+    jest-mock "^27.3.0"
     jest-regex-util "^27.0.6"
-    jest-resolve "^27.2.5"
-    jest-snapshot "^27.2.5"
-    jest-util "^27.2.5"
-    jest-validate "^27.2.5"
+    jest-resolve "^27.3.1"
+    jest-snapshot "^27.3.1"
+    jest-util "^27.3.1"
+    jest-validate "^27.3.1"
     slash "^3.0.0"
     strip-bom "^4.0.0"
     yargs "^16.2.0"
@@ -7958,10 +7972,10 @@ jest-serializer@^27.0.6:
     "@types/node" "*"
     graceful-fs "^4.2.4"
 
-jest-snapshot@^27.2.5:
-  version "27.2.5"
-  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-27.2.5.tgz#8a612fe31e2967f58ad364542198dff61f92ef32"
-  integrity sha512-2/Jkn+VN6Abwz0llBltZaiJMnL8b1j5Bp/gRIxe9YR3FCEh9qp0TXVV0dcpTGZ8AcJV1SZGQkczewkI9LP5yGw==
+jest-snapshot@^27.3.1:
+  version "27.3.1"
+  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-27.3.1.tgz#1da5c0712a252d70917d46c037054f5918c49ee4"
+  integrity sha512-APZyBvSgQgOT0XumwfFu7X3G5elj6TGhCBLbBdn3R1IzYustPGPE38F51dBWMQ8hRXa9je0vAdeVDtqHLvB6lg==
   dependencies:
     "@babel/core" "^7.7.2"
     "@babel/generator" "^7.7.2"
@@ -7969,60 +7983,60 @@ jest-snapshot@^27.2.5:
     "@babel/plugin-syntax-typescript" "^7.7.2"
     "@babel/traverse" "^7.7.2"
     "@babel/types" "^7.0.0"
-    "@jest/transform" "^27.2.5"
+    "@jest/transform" "^27.3.1"
     "@jest/types" "^27.2.5"
     "@types/babel__traverse" "^7.0.4"
     "@types/prettier" "^2.1.5"
     babel-preset-current-node-syntax "^1.0.0"
     chalk "^4.0.0"
-    expect "^27.2.5"
+    expect "^27.3.1"
     graceful-fs "^4.2.4"
-    jest-diff "^27.2.5"
-    jest-get-type "^27.0.6"
-    jest-haste-map "^27.2.5"
-    jest-matcher-utils "^27.2.5"
-    jest-message-util "^27.2.5"
-    jest-resolve "^27.2.5"
-    jest-util "^27.2.5"
+    jest-diff "^27.3.1"
+    jest-get-type "^27.3.1"
+    jest-haste-map "^27.3.1"
+    jest-matcher-utils "^27.3.1"
+    jest-message-util "^27.3.1"
+    jest-resolve "^27.3.1"
+    jest-util "^27.3.1"
     natural-compare "^1.4.0"
-    pretty-format "^27.2.5"
+    pretty-format "^27.3.1"
     semver "^7.3.2"
 
-jest-util@^27.2.5:
-  version "27.2.5"
-  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-27.2.5.tgz#88740c4024d223634a82ce7c2263e8bc6df3b3ba"
-  integrity sha512-QRhDC6XxISntMzFRd/OQ6TGsjbzA5ONO0tlAj2ElHs155x1aEr0rkYJBEysG6H/gZVH3oGFzCdAB/GA8leh8NQ==
+jest-util@^27.3.1:
+  version "27.3.1"
+  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-27.3.1.tgz#a58cdc7b6c8a560caac9ed6bdfc4e4ff23f80429"
+  integrity sha512-8fg+ifEH3GDryLQf/eKZck1DEs2YuVPBCMOaHQxVVLmQwl/CDhWzrvChTX4efLZxGrw+AA0mSXv78cyytBt/uw==
   dependencies:
     "@jest/types" "^27.2.5"
     "@types/node" "*"
     chalk "^4.0.0"
+    ci-info "^3.2.0"
     graceful-fs "^4.2.4"
-    is-ci "^3.0.0"
     picomatch "^2.2.3"
 
-jest-validate@^27.2.5:
-  version "27.2.5"
-  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-27.2.5.tgz#2d59bf1627d180f395ba58f24599b0ee0efcfbdf"
-  integrity sha512-XgYtjS89nhVe+UfkbLgcm+GgXKWgL80t9nTcNeejyO3t0Sj/yHE8BtIJqjZu9NXQksYbGImoQRXmQ1gP+Guffw==
+jest-validate@^27.3.1:
+  version "27.3.1"
+  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-27.3.1.tgz#3a395d61a19cd13ae9054af8cdaf299116ef8a24"
+  integrity sha512-3H0XCHDFLA9uDII67Bwi1Vy7AqwA5HqEEjyy934lgVhtJ3eisw6ShOF1MDmRPspyikef5MyExvIm0/TuLzZ86Q==
   dependencies:
     "@jest/types" "^27.2.5"
     camelcase "^6.2.0"
     chalk "^4.0.0"
-    jest-get-type "^27.0.6"
+    jest-get-type "^27.3.1"
     leven "^3.1.0"
-    pretty-format "^27.2.5"
+    pretty-format "^27.3.1"
 
-jest-watcher@^27.2.5:
-  version "27.2.5"
-  resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-27.2.5.tgz#41cd3e64dc5bea8a4327083d71ba7667be400567"
-  integrity sha512-umV4qGozg2Dn6DTTtqAh9puPw+DGLK9AQas7+mWjiK8t0fWMpxKg8ZXReZw7L4C88DqorsGUiDgwHNZ+jkVrkQ==
+jest-watcher@^27.3.1:
+  version "27.3.1"
+  resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-27.3.1.tgz#ba5e0bc6aa843612b54ddb7f009d1cbff7e05f3e"
+  integrity sha512-9/xbV6chABsGHWh9yPaAGYVVKurWoP3ZMCv6h+O1v9/+pkOroigs6WzZ0e9gLP/njokUwM7yQhr01LKJVMkaZA==
   dependencies:
-    "@jest/test-result" "^27.2.5"
+    "@jest/test-result" "^27.3.1"
     "@jest/types" "^27.2.5"
     "@types/node" "*"
     ansi-escapes "^4.2.1"
     chalk "^4.0.0"
-    jest-util "^27.2.5"
+    jest-util "^27.3.1"
     string-length "^4.0.1"
 
 jest-worker@27.0.0-next.5:
@@ -8043,23 +8057,23 @@ jest-worker@^26.3.0:
     merge-stream "^2.0.0"
     supports-color "^7.0.0"
 
-jest-worker@^27.2.5:
-  version "27.2.5"
-  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.2.5.tgz#ed42865661959488aa020e8a325df010597c36d4"
-  integrity sha512-HTjEPZtcNKZ4LnhSp02NEH4vE+5OpJ0EsOWYvGQpHgUMLngydESAAMH5Wd/asPf29+XUDQZszxpLg1BkIIA2aw==
+jest-worker@^27.3.1:
+  version "27.3.1"
+  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.3.1.tgz#0def7feae5b8042be38479799aeb7b5facac24b2"
+  integrity sha512-ks3WCzsiZaOPJl/oMsDjaf0TRiSv7ctNgs0FqRr2nARsovz6AWWy4oLElwcquGSz692DzgZQrCLScPNs5YlC4g==
   dependencies:
     "@types/node" "*"
     merge-stream "^2.0.0"
     supports-color "^8.0.0"
 
-jest@^27.2.5:
-  version "27.2.5"
-  resolved "https://registry.yarnpkg.com/jest/-/jest-27.2.5.tgz#7d8a5c8781a160f693beeb7c68e46c16ef948148"
-  integrity sha512-vDMzXcpQN4Ycaqu+vO7LX8pZwNNoKMhc+gSp6q1D8S6ftRk8gNW8cni3YFxknP95jxzQo23Lul0BI2FrWgnwYQ==
+jest@^27.3.1:
+  version "27.3.1"
+  resolved "https://registry.yarnpkg.com/jest/-/jest-27.3.1.tgz#b5bab64e8f56b6f7e275ba1836898b0d9f1e5c8a"
+  integrity sha512-U2AX0AgQGd5EzMsiZpYt8HyZ+nSVIh5ujQ9CPp9EQZJMjXIiSZpJNweZl0swatKRoqHWgGKM3zaSwm4Zaz87ng==
   dependencies:
-    "@jest/core" "^27.2.5"
+    "@jest/core" "^27.3.1"
     import-local "^3.0.2"
-    jest-cli "^27.2.5"
+    jest-cli "^27.3.1"
 
 joi@^17.4.0:
   version "17.4.2"
@@ -10063,6 +10077,16 @@ pretty-format@^27.0.0, pretty-format@^27.0.2, pretty-format@^27.2.5:
     ansi-styles "^5.0.0"
     react-is "^17.0.1"
 
+pretty-format@^27.3.1:
+  version "27.3.1"
+  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-27.3.1.tgz#7e9486365ccdd4a502061fa761d3ab9ca1b78df5"
+  integrity sha512-DR/c+pvFc52nLimLROYjnXPtolawm+uWDxr4FjuLDLUn+ktWnSN851KoHwHzzqq6rfCOjkzN8FLgDrSub6UDuA==
+  dependencies:
+    "@jest/types" "^27.2.5"
+    ansi-regex "^5.0.1"
+    ansi-styles "^5.0.0"
+    react-is "^17.0.1"
+
 prettysize@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/prettysize/-/prettysize-2.0.0.tgz#902c02480d865d9cc0813011c9feb4fa02ce6996"
@@ -10858,6 +10882,11 @@ resolve-url@^0.2.1:
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
   integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
 
+resolve.exports@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-1.1.0.tgz#5ce842b94b05146c0e03076985d1d0e7e48c90c9"
+  integrity sha512-J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ==
+
 resolve@1.20.0, resolve@^1.10.0, resolve@^1.12.0, resolve@^1.14.2, resolve@^1.17.0, resolve@^1.20.0:
   version "1.20.0"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975"

From 042c15c49e6afbc1d77a0a038748d6c5343dbb1b Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 27 Oct 2021 16:05:52 +1100
Subject: [PATCH 14/21] Update typescript-eslint monorepo to ^5.2.0 (#6829)

Co-authored-by: Renovate Bot <bot@renovateapp.com>
---
 package.json |  4 +--
 yarn.lock    | 92 +++++++++++++++++++++++++++++++++++++++-------------
 2 files changed, 71 insertions(+), 25 deletions(-)

diff --git a/package.json b/package.json
index a2e2183d9aa..96735607e55 100644
--- a/package.json
+++ b/package.json
@@ -58,8 +58,8 @@
     "@types/jest": "^27.0.2",
     "@types/node-fetch": "^2.5.12",
     "@types/normalize-path": "3.0.0",
-    "@typescript-eslint/eslint-plugin": "^5.0.0",
-    "@typescript-eslint/parser": "^5.0.0",
+    "@typescript-eslint/eslint-plugin": "^5.2.0",
+    "@typescript-eslint/parser": "^5.2.0",
     "chalk-cli": "^5.0.0",
     "cross-env": "^7.0.3",
     "eslint": "^7.32.0",
diff --git a/yarn.lock b/yarn.lock
index 7dc9a54b813..f51df38c862 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2771,7 +2771,7 @@
     jest-diff "^27.0.0"
     pretty-format "^27.0.0"
 
-"@types/json-schema@^7.0.7":
+"@types/json-schema@^7.0.7", "@types/json-schema@^7.0.9":
   version "7.0.9"
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.9.tgz#97edc9037ea0c38585320b28964dde3b39e4660d"
   integrity sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==
@@ -3106,29 +3106,29 @@
   resolved "https://registry.yarnpkg.com/@types/zen-observable/-/zen-observable-0.8.3.tgz#781d360c282436494b32fe7d9f7f8e64b3118aa3"
   integrity sha512-fbF6oTd4sGGy0xjHPKAt+eS2CrxJ3+6gQ3FGcBoIJR2TLAyCkCyI8JqZNy+FeON0AhVgNJoUumVoZQjBFUqHkw==
 
-"@typescript-eslint/eslint-plugin@^5.0.0":
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.0.0.tgz#ecc7cc69d1e6f342beb6ea9cf9fbc02c97a212ac"
-  integrity sha512-T6V6fCD2U0YesOedvydTnrNtsC8E+c2QzpawIpDdlaObX0OX5dLo7tLU5c64FhTZvA1Xrdim+cXDI7NPsVx8Cg==
+"@typescript-eslint/eslint-plugin@^5.2.0":
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.2.0.tgz#2bdb247cc2e2afce7efbce09afb9a6f0a8a08434"
+  integrity sha512-qQwg7sqYkBF4CIQSyRQyqsYvP+g/J0To9ZPVNJpfxfekl5RmdvQnFFTVVwpRtaUDFNvjfe/34TgY/dpc3MgNTw==
   dependencies:
-    "@typescript-eslint/experimental-utils" "5.0.0"
-    "@typescript-eslint/scope-manager" "5.0.0"
-    debug "^4.3.1"
+    "@typescript-eslint/experimental-utils" "5.2.0"
+    "@typescript-eslint/scope-manager" "5.2.0"
+    debug "^4.3.2"
     functional-red-black-tree "^1.0.1"
     ignore "^5.1.8"
-    regexpp "^3.1.0"
+    regexpp "^3.2.0"
     semver "^7.3.5"
     tsutils "^3.21.0"
 
-"@typescript-eslint/experimental-utils@5.0.0", "@typescript-eslint/experimental-utils@^5.0.0":
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-5.0.0.tgz#c7d7e67443dfb9fd93a5d060fb72c9e9b5638bbc"
-  integrity sha512-Dnp4dFIsZcPawD6CT1p5NibNUQyGSEz80sULJZkyhyna8AEqArmfwMwJPbmKzWVo4PabqNVzHYlzmcdLQWk+pg==
+"@typescript-eslint/experimental-utils@5.2.0":
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-5.2.0.tgz#e3b2cb9cd0aff9b50f68d9a414c299fd26b067e6"
+  integrity sha512-fWyT3Agf7n7HuZZRpvUYdFYbPk3iDCq6fgu3ulia4c7yxmPnwVBovdSOX7RL+k8u6hLbrXcdAehlWUVpGh6IEw==
   dependencies:
-    "@types/json-schema" "^7.0.7"
-    "@typescript-eslint/scope-manager" "5.0.0"
-    "@typescript-eslint/types" "5.0.0"
-    "@typescript-eslint/typescript-estree" "5.0.0"
+    "@types/json-schema" "^7.0.9"
+    "@typescript-eslint/scope-manager" "5.2.0"
+    "@typescript-eslint/types" "5.2.0"
+    "@typescript-eslint/typescript-estree" "5.2.0"
     eslint-scope "^5.1.1"
     eslint-utils "^3.0.0"
 
@@ -3144,15 +3144,27 @@
     eslint-scope "^5.1.1"
     eslint-utils "^3.0.0"
 
-"@typescript-eslint/parser@^5.0.0":
+"@typescript-eslint/experimental-utils@^5.0.0":
   version "5.0.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.0.0.tgz#50d1be2e0def82d73e863cceba74aeeac9973592"
-  integrity sha512-B6D5rmmQ14I1fdzs71eL3DAuvnPHTY/t7rQABrL9BLnx/H51Un8ox1xqYAchs0/V2trcoyxB1lMJLlrwrJCDgw==
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-5.0.0.tgz#c7d7e67443dfb9fd93a5d060fb72c9e9b5638bbc"
+  integrity sha512-Dnp4dFIsZcPawD6CT1p5NibNUQyGSEz80sULJZkyhyna8AEqArmfwMwJPbmKzWVo4PabqNVzHYlzmcdLQWk+pg==
   dependencies:
+    "@types/json-schema" "^7.0.7"
     "@typescript-eslint/scope-manager" "5.0.0"
     "@typescript-eslint/types" "5.0.0"
     "@typescript-eslint/typescript-estree" "5.0.0"
-    debug "^4.3.1"
+    eslint-scope "^5.1.1"
+    eslint-utils "^3.0.0"
+
+"@typescript-eslint/parser@^5.2.0":
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.2.0.tgz#dc081aa89de16b5676b10215519af3aa7b58fb72"
+  integrity sha512-Uyy4TjJBlh3NuA8/4yIQptyJb95Qz5PX//6p8n7zG0QnN4o3NF9Je3JHbVU7fxf5ncSXTmnvMtd/LDQWDk0YqA==
+  dependencies:
+    "@typescript-eslint/scope-manager" "5.2.0"
+    "@typescript-eslint/types" "5.2.0"
+    "@typescript-eslint/typescript-estree" "5.2.0"
+    debug "^4.3.2"
 
 "@typescript-eslint/scope-manager@4.33.0":
   version "4.33.0"
@@ -3170,6 +3182,14 @@
     "@typescript-eslint/types" "5.0.0"
     "@typescript-eslint/visitor-keys" "5.0.0"
 
+"@typescript-eslint/scope-manager@5.2.0":
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.2.0.tgz#7ce8e4ab2baaa0ad5282913ea8e13ce03ec6a12a"
+  integrity sha512-RW+wowZqPzQw8MUFltfKYZfKXqA2qgyi6oi/31J1zfXJRpOn6tCaZtd9b5u9ubnDG2n/EMvQLeZrsLNPpaUiFQ==
+  dependencies:
+    "@typescript-eslint/types" "5.2.0"
+    "@typescript-eslint/visitor-keys" "5.2.0"
+
 "@typescript-eslint/types@4.33.0":
   version "4.33.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.33.0.tgz#a1e59036a3b53ae8430ceebf2a919dc7f9af6d72"
@@ -3180,6 +3200,11 @@
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.0.0.tgz#25d93f6d269b2d25fdc51a0407eb81ccba60eb0f"
   integrity sha512-dU/pKBUpehdEqYuvkojmlv0FtHuZnLXFBn16zsDmlFF3LXkOpkAQ2vrKc3BidIIve9EMH2zfTlxqw9XM0fFN5w==
 
+"@typescript-eslint/types@5.2.0":
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.2.0.tgz#7ad32d15abddb0ee968a330f0ea182ea544ef7cf"
+  integrity sha512-cTk6x08qqosps6sPyP2j7NxyFPlCNsJwSDasqPNjEQ8JMD5xxj2NHxcLin5AJQ8pAVwpQ8BMI3bTxR0zxmK9qQ==
+
 "@typescript-eslint/typescript-estree@4.33.0":
   version "4.33.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.33.0.tgz#0dfb51c2908f68c5c08d82aefeaf166a17c24609"
@@ -3206,6 +3231,19 @@
     semver "^7.3.5"
     tsutils "^3.21.0"
 
+"@typescript-eslint/typescript-estree@5.2.0":
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.2.0.tgz#c22e0ff6f8a4a3f78504a80ebd686fe2870a68ae"
+  integrity sha512-RsdXq2XmVgKbm9nLsE3mjNUM7BTr/K4DYR9WfFVMUuozHWtH5gMpiNZmtrMG8GR385EOSQ3kC9HiEMJWimxd/g==
+  dependencies:
+    "@typescript-eslint/types" "5.2.0"
+    "@typescript-eslint/visitor-keys" "5.2.0"
+    debug "^4.3.2"
+    globby "^11.0.4"
+    is-glob "^4.0.3"
+    semver "^7.3.5"
+    tsutils "^3.21.0"
+
 "@typescript-eslint/visitor-keys@4.33.0":
   version "4.33.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.33.0.tgz#2a22f77a41604289b7a186586e9ec48ca92ef1dd"
@@ -3222,6 +3260,14 @@
     "@typescript-eslint/types" "5.0.0"
     eslint-visitor-keys "^3.0.0"
 
+"@typescript-eslint/visitor-keys@5.2.0":
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.2.0.tgz#03522d35df98474f08e0357171a7d1b259a88f55"
+  integrity sha512-Nk7HizaXWWCUBfLA/rPNKMzXzWS8Wg9qHMuGtT+v2/YpPij4nVXrVJc24N/r5WrrmqK31jCrZxeHqIgqRzs0Xg==
+  dependencies:
+    "@typescript-eslint/types" "5.2.0"
+    eslint-visitor-keys "^3.0.0"
+
 "@wry/context@^0.6.0":
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/@wry/context/-/context-0.6.1.tgz#c3c29c0ad622adb00f6a53303c4f965ee06ebeb2"
@@ -5086,7 +5132,7 @@ debug@2, debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.9:
   dependencies:
     ms "2.0.0"
 
-debug@4, debug@4.3.2, debug@^4.0.0, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1:
+debug@4, debug@4.3.2, debug@^4.0.0, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2:
   version "4.3.2"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz#f0a49c18ac8779e31d4a0c6029dfb76873c7428b"
   integrity sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==
@@ -10645,7 +10691,7 @@ regexp.prototype.flags@^1.3.1:
     call-bind "^1.0.2"
     define-properties "^1.1.3"
 
-regexpp@^3.1.0:
+regexpp@^3.1.0, regexpp@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2"
   integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==

From a96d1beeb1faa1210da124182bff041724eefc6d Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 27 Oct 2021 16:09:50 +1100
Subject: [PATCH 15/21] Update dependency memoize-one to v6 (#6832)

Co-authored-by: Renovate Bot <bot@renovateapp.com>
---
 packages/keystone/package.json | 2 +-
 tests/api-tests/package.json   | 2 +-
 yarn.lock                      | 7 ++++++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/packages/keystone/package.json b/packages/keystone/package.json
index 014c4ea35fc..5bfb71a43c9 100644
--- a/packages/keystone/package.json
+++ b/packages/keystone/package.json
@@ -101,7 +101,7 @@
     "image-type": "^4.1.0",
     "inflection": "^1.13.1",
     "intersection-observer": "^0.12.0",
-    "memoize-one": "^5.2.1",
+    "memoize-one": "^6.0.0",
     "meow": "^9.0.0",
     "micro": "^9.3.4",
     "next": "^11.1.0",
diff --git a/tests/api-tests/package.json b/tests/api-tests/package.json
index e400c5742f2..9302983b6fa 100644
--- a/tests/api-tests/package.json
+++ b/tests/api-tests/package.json
@@ -20,7 +20,7 @@
     "cuid": "^2.1.8",
     "globby": "^11.0.4",
     "graphql": "^15.6.1",
-    "memoize-one": "^5.2.1",
+    "memoize-one": "^6.0.0",
     "superagent": "^6.1.0",
     "supertest": "^6.1.6",
     "testcheck": "^1.0.0-rc.2",
diff --git a/yarn.lock b/yarn.lock
index f51df38c862..111997f12ac 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8805,11 +8805,16 @@ media-typer@0.3.0:
   resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
   integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=
 
-memoize-one@^5.0.0, memoize-one@^5.2.1:
+memoize-one@^5.0.0:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/memoize-one/-/memoize-one-5.2.1.tgz#8337aa3c4335581839ec01c3d594090cebe8f00e"
   integrity sha512-zYiwtZUcYyXKo/np96AGZAckk+FWWsUdJ3cHGGmld7+AhvcWmQyGCYUh1hc4Q/pkOhb65dQR/pqCyK0cOaHz4Q==
 
+memoize-one@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/memoize-one/-/memoize-one-6.0.0.tgz#b2591b871ed82948aee4727dc6abceeeac8c1045"
+  integrity sha512-rkpe71W0N0c0Xz6QD0eJETuWAJGnJ9afsl1srmwPrI+yBCkge5EycXXbYRyvL29zZVUWQCY7InPRCv3GDXuZNw==
+
 meow@^10.1.1:
   version "10.1.1"
   resolved "https://registry.yarnpkg.com/meow/-/meow-10.1.1.tgz#87fa665f18e727024116d456e725f69033ca6d8f"

From df024c700a63d1ddb03f29ad1aafac12ca49a9a7 Mon Sep 17 00:00:00 2001
From: Daniel Cousens <413395+dcousens@users.noreply.github.com>
Date: Wed, 27 Oct 2021 16:15:35 +1100
Subject: [PATCH 16/21] add CHANGESET

---
 .changeset/tall-rocks-juggle.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/tall-rocks-juggle.md

diff --git a/.changeset/tall-rocks-juggle.md b/.changeset/tall-rocks-juggle.md
new file mode 100644
index 00000000000..580865cfe26
--- /dev/null
+++ b/.changeset/tall-rocks-juggle.md
@@ -0,0 +1,5 @@
+---
+"@keystone-next/keystone": patch
+---
+
+- We have bumped `memoize-one` to [`v6.0.0`](https://github.com/alexreardon/`/releases/tag/v6.0.0),  the only breaking changes for the package were related to Typescript (please see the release notes)

From 476451eb2d5f5d1b11849255f07a839946ec007b Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 27 Oct 2021 16:18:20 +1100
Subject: [PATCH 17/21] Lock file maintenance (#6810)

* Lock file maintenance

* resolve type errors

* revert mdx bump to resolve vercel build errors

* conflict resolution

Co-authored-by: Renovate Bot <bot@renovateapp.com>
Co-authored-by: gwyneplaine <cc.lee@live.com.au>
---
 yarn.lock | 346 +++++++++++++++++++++++++++---------------------------
 1 file changed, 173 insertions(+), 173 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 111997f12ac..c554c6da38a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -307,7 +307,7 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.1.0", "@babel/parser@^7.15.4", "@babel/parser@^7.15.8", "@babel/parser@^7.7.2":
+"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.15.4", "@babel/parser@^7.15.8", "@babel/parser@^7.7.2":
   version "7.15.8"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.15.8.tgz#7bacdcbe71bdc3ff936d510c15dcea7cf0b99016"
   integrity sha512-BRYa3wcQnjS/nqI8Ac94pYYpJfojHVvVXJ97+IDCImX4Jc8W8Xv1+47enbruk+q1etOpsQNwnfFcNGw+gtPGxA==
@@ -957,9 +957,9 @@
     semver "^6.3.0"
 
 "@babel/preset-modules@^0.1.4":
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.4.tgz#362f2b68c662842970fdb5e254ffc8fc1c2e415e"
-  integrity sha512-J36NhwnfdzpmH41M1DrnkkgAqhZaqr/NBdPfQ677mLzlaXo+oDiv1deyCDtgAhz8p328otdob0Du7+xgHGZbKg==
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.5.tgz#ef939d6e7f268827e1841638dc6ff95515e115d9"
+  integrity sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-proposal-unicode-property-regex" "^7.4.4"
@@ -1289,7 +1289,7 @@
     source-map "^0.5.7"
     stylis "^4.0.3"
 
-"@emotion/cache@11.4.0", "@emotion/cache@^11.1.3", "@emotion/cache@^11.4.0":
+"@emotion/cache@11.4.0":
   version "11.4.0"
   resolved "https://registry.yarnpkg.com/@emotion/cache/-/cache-11.4.0.tgz#293fc9d9a7a38b9aad8e9337e5014366c3b09ac0"
   integrity sha512-Zx70bjE7LErRO9OaZrhf22Qye1y4F7iDl+ITjet0J+i+B88PrAOBkKvaAWhxsZf72tDLajwCgfCjJ2dvH77C3g==
@@ -1310,6 +1310,17 @@
     "@emotion/utils" "0.11.3"
     "@emotion/weak-memoize" "0.2.5"
 
+"@emotion/cache@^11.4.0", "@emotion/cache@^11.5.0":
+  version "11.5.0"
+  resolved "https://registry.yarnpkg.com/@emotion/cache/-/cache-11.5.0.tgz#a5eb78cbef8163939ee345e3ddf0af217b845e62"
+  integrity sha512-mAZ5QRpLriBtaj/k2qyrXwck6yeoz1V5lMt/jfj6igWU35yYlNKs2LziXVgvH81gnJZ+9QQNGelSsnuoAy6uIw==
+  dependencies:
+    "@emotion/memoize" "^0.7.4"
+    "@emotion/sheet" "^1.0.3"
+    "@emotion/utils" "^1.0.0"
+    "@emotion/weak-memoize" "^0.2.5"
+    stylis "^4.0.10"
+
 "@emotion/core@^10.0.14":
   version "10.1.1"
   resolved "https://registry.yarnpkg.com/@emotion/core/-/core-10.1.1.tgz#c956c1365f2f2481960064bcb8c4732e5fb612c3"
@@ -1332,14 +1343,14 @@
     babel-plugin-emotion "^10.0.27"
 
 "@emotion/css@^11.1.3":
-  version "11.1.3"
-  resolved "https://registry.yarnpkg.com/@emotion/css/-/css-11.1.3.tgz#9ed44478b19e5d281ccbbd46d74d123d59be793f"
-  integrity sha512-RSQP59qtCNTf5NWD6xM08xsQdCZmVYnX/panPYvB6LQAPKQB6GL49Njf0EMbS3CyDtrlWsBcmqBtysFvfWT3rA==
+  version "11.5.0"
+  resolved "https://registry.yarnpkg.com/@emotion/css/-/css-11.5.0.tgz#0a80017080cb44d47994fe576b9923bfc8b0f6ad"
+  integrity sha512-mqjz/3aqR9rp40M+pvwdKYWxlQK4Nj3cnNjo3Tx6SM14dSsEn7q/4W2/I7PlgG+mb27iITHugXuBIHH/QwUBVQ==
   dependencies:
     "@emotion/babel-plugin" "^11.0.0"
-    "@emotion/cache" "^11.1.3"
+    "@emotion/cache" "^11.5.0"
     "@emotion/serialize" "^1.0.0"
-    "@emotion/sheet" "^1.0.0"
+    "@emotion/sheet" "^1.0.3"
     "@emotion/utils" "^1.0.0"
 
 "@emotion/hash@0.8.0", "@emotion/hash@^0.8.0":
@@ -1358,14 +1369,14 @@
   integrity sha512-igX9a37DR2ZPGYtV6suZ6whr8pTFtyHL3K/oLUotxpSVO2ASaprmAe2Dkq7tBo7CRY7MMDrAa9nuQP9/YG8FxQ==
 
 "@emotion/react@^11.1.1", "@emotion/react@^11.4.1":
-  version "11.4.1"
-  resolved "https://registry.yarnpkg.com/@emotion/react/-/react-11.4.1.tgz#a1b0b767b5bad57515ffb0cad9349614d27f4d57"
-  integrity sha512-pRegcsuGYj4FCdZN6j5vqCALkNytdrKw3TZMekTzNXixRg4wkLsU5QEaBG5LC6l01Vppxlp7FE3aTHpIG5phLg==
+  version "11.5.0"
+  resolved "https://registry.yarnpkg.com/@emotion/react/-/react-11.5.0.tgz#19b5771bbfbda5e8517e948a2d9064810f0022bd"
+  integrity sha512-MYq/bzp3rYbee4EMBORCn4duPQfgpiEB5XzrZEBnUZAL80Qdfr7CEv/T80jwaTl/dnZmt9SnTa8NkTrwFNpLlw==
   dependencies:
     "@babel/runtime" "^7.13.10"
-    "@emotion/cache" "^11.4.0"
+    "@emotion/cache" "^11.5.0"
     "@emotion/serialize" "^1.0.2"
-    "@emotion/sheet" "^1.0.2"
+    "@emotion/sheet" "^1.0.3"
     "@emotion/utils" "^1.0.0"
     "@emotion/weak-memoize" "^0.2.5"
     hoist-non-react-statics "^3.3.1"
@@ -1407,10 +1418,10 @@
   resolved "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-0.9.4.tgz#894374bea39ec30f489bbfc3438192b9774d32e5"
   integrity sha512-zM9PFmgVSqBw4zL101Q0HrBVTGmpAxFZH/pYx/cjJT5advXguvcgjHFTCaIO3enL/xr89vK2bh0Mfyj9aa0ANA==
 
-"@emotion/sheet@^1.0.0", "@emotion/sheet@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-1.0.2.tgz#1d9ffde531714ba28e62dac6a996a8b1089719d0"
-  integrity sha512-QQPB1B70JEVUHuNtzjHftMGv6eC3Y9wqavyarj4x4lg47RACkeSfNo5pxIOKizwS9AEFLohsqoaxGQj4p0vSIw==
+"@emotion/sheet@^1.0.0", "@emotion/sheet@^1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-1.0.3.tgz#00c326cd7985c5ccb8fe2c1b592886579dcfab8f"
+  integrity sha512-YoX5GyQ4db7LpbmXHMuc8kebtBGP6nZfRC5Z13OKJMixBEwdZrJ914D6yJv/P+ZH/YY3F5s89NYX2hlZAf3SRQ==
 
 "@emotion/stylis@0.8.5":
   version "0.8.5"
@@ -2212,9 +2223,9 @@
   integrity sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA=
 
 "@rollup/plugin-alias@^3.1.1":
-  version "3.1.5"
-  resolved "https://registry.yarnpkg.com/@rollup/plugin-alias/-/plugin-alias-3.1.5.tgz#73356a3a1eab2e1e2fd952f9f53cd89fc740d952"
-  integrity sha512-yzUaSvCC/LJPbl9rnzX3HN7vy0tq7EzHoEiQl1ofh4n5r2Rd5bj/+zcJgaGA76xbw95/JjWQyvHg9rOJp2y0oQ==
+  version "3.1.8"
+  resolved "https://registry.yarnpkg.com/@rollup/plugin-alias/-/plugin-alias-3.1.8.tgz#645fd84659e08d3d1b059408fcdf69c1dd435a6b"
+  integrity sha512-tf7HeSs/06wO2LPqKNY3Ckbvy0JRe7Jyn98bXnt/gfrxbe+AJucoNJlsEVi9sdgbQtXemjbakCpO/76JVgnHpA==
   dependencies:
     slash "^3.0.0"
 
@@ -2423,21 +2434,7 @@
   dependencies:
     defer-to-connect "^1.0.1"
 
-"@testing-library/dom@^8.0.0":
-  version "8.7.2"
-  resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-8.7.2.tgz#234315c6971be380fc9cbf0b031ada3e9f0bfe09"
-  integrity sha512-2zN0Zv9dMnaMAd4c/1E1ZChu4QrICyvWtkUvHFQBPhS1oG3VYGcM7SLGLYdda7187ILRXzIUOvOsbXQm4EASjA==
-  dependencies:
-    "@babel/code-frame" "^7.10.4"
-    "@babel/runtime" "^7.12.5"
-    "@types/aria-query" "^4.2.0"
-    aria-query "^4.2.2"
-    chalk "^4.1.0"
-    dom-accessibility-api "^0.5.6"
-    lz-string "^1.4.4"
-    pretty-format "^27.0.2"
-
-"@testing-library/dom@^8.10.1":
+"@testing-library/dom@^8.0.0", "@testing-library/dom@^8.10.1":
   version "8.10.1"
   resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-8.10.1.tgz#e24fed92ad51c619cf304c6f1410b4c76b1000c0"
   integrity sha512-rab7vpf1uGig5efWwsCOn9j4/doy+W3VBoUyzX7C4y77u0wAckwc7R8nyH6e2rw0rRzKJR+gWPiAg8zhiFbxWQ==
@@ -2695,9 +2692,9 @@
     "@types/node" "*"
 
 "@types/glob@^7.1.1":
-  version "7.1.4"
-  resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.4.tgz#ea59e21d2ee5c517914cb4bc8e4153b99e566672"
-  integrity sha512-w+LsMxKyYQm347Otw+IfBXOv9UWVjpHpCDdbBMt8Kz/xbvCYNjP+0qPh91Km3iKfSRLBB0P7fAMf0KHrPu+MyA==
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.2.0.tgz#bc1b5bf3aa92f25bd5dd39f35c57361bdce5b2eb"
+  integrity sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==
   dependencies:
     "@types/minimatch" "*"
     "@types/node" "*"
@@ -2815,9 +2812,9 @@
     "@types/lodash" "*"
 
 "@types/lodash@*", "@types/lodash@^4.14.149":
-  version "4.14.175"
-  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.175.tgz#b78dfa959192b01fae0ad90e166478769b215f45"
-  integrity sha512-XmdEOrKQ8a1Y/yxQFOMbC47G/V2VDO1GvMRnl4O75M4GW/abC5tnfzadQYkqEveqRM1dEJGFFegfPNA2vvx2iw==
+  version "4.14.176"
+  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.176.tgz#641150fc1cda36fbfa329de603bbb175d7ee20c0"
+  integrity sha512-xZmuPTa3rlZoIbtDUyJKZQimJV3bxCmzMIO2c9Pz9afyDro6kr7R79GwcB6mRhuoPmV2p1Vb66WOJH7F886WKQ==
 
 "@types/long@^4.0.0":
   version "4.0.1"
@@ -2832,9 +2829,9 @@
     "@types/unist" "*"
 
 "@types/mdx-js__react@^1.5.4":
-  version "1.5.4"
-  resolved "https://registry.yarnpkg.com/@types/mdx-js__react/-/mdx-js__react-1.5.4.tgz#75ed343b5a1f56d9518e902d956e1b611da4a297"
-  integrity sha512-hce+Hymj3cEMOma13eQRhpT3mhQrOkN4CAYEwKWB/qj2BiuUrrTpCkOShEERGmLVgDc3nxF4Dc0k7W999EQxnQ==
+  version "1.5.5"
+  resolved "https://registry.yarnpkg.com/@types/mdx-js__react/-/mdx-js__react-1.5.5.tgz#fa6daa1a28336d77b6cf071aacc7e497600de9ee"
+  integrity sha512-k8pnaP6JXVlQh18HgL5X6sYFNC/qZnzO7R2+HsmwrwUd+JnnsU0d9lyyT0RQrHg1anxDU36S98TI/fsGtmYqqg==
   dependencies:
     "@types/react" "*"
 
@@ -2867,9 +2864,9 @@
     form-data "^3.0.0"
 
 "@types/node@*", "@types/node@>=8.1.0":
-  version "16.10.3"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-16.10.3.tgz#7a8f2838603ea314d1d22bb3171d899e15c57bd5"
-  integrity sha512-ho3Ruq+fFnBrZhUYI46n/bV2GjwzSkwuT4dTf0GkuNFmnb8nq4ny2z9JEVemFi6bdEJanHLlYfy9c6FN9B9McQ==
+  version "16.11.6"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.6.tgz#6bef7a2a0ad684cf6e90fcfe31cecabd9ce0a3ae"
+  integrity sha512-ua7PgUoeQFjmWPcoo9khiPum3Pd60k4/2ZGXt18sm2Slk0W0xZTqt5Y0Ny1NyBiN1EVQ/+FaF9NcY4Qe6rwk5w==
 
 "@types/node@^10.1.0":
   version "10.17.60"
@@ -2877,9 +2874,9 @@
   integrity sha512-F0KIgDJfy2nA3zMLmWGKxcH2ZVEtCZXHHdOQs2gSaQ27+lNeEfGxzkIw90aXswATX7AZ33tahPbzy6KAfUreVw==
 
 "@types/node@^12.7.1":
-  version "12.20.28"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.20.28.tgz#4b20048c6052b5f51a8d5e0d2acbf63d5a17e1e2"
-  integrity sha512-cBw8gzxUPYX+/5lugXIPksioBSbE42k0fZ39p+4yRzfYjN6++eq9kAPdlY9qm+MXyfbk9EmvCYAYRn380sF46w==
+  version "12.20.36"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.20.36.tgz#5bd54d2383e714fc4d2c258107ee70c5bad86d0c"
+  integrity sha512-+5haRZ9uzI7rYqzDznXgkuacqb6LJhAti8mzZKWxIXn/WEtvB+GHVJ7AuMwcN1HMvXOSJcrvA6PPoYHYOYYebA==
 
 "@types/nodemailer@^6.4.4":
   version "6.4.4"
@@ -2941,9 +2938,9 @@
   integrity sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==
 
 "@types/react-dom@^17.0.9":
-  version "17.0.9"
-  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.9.tgz#441a981da9d7be117042e1a6fd3dac4b30f55add"
-  integrity sha512-wIvGxLfgpVDSAMH5utdL9Ngm5Owu0VsGmldro3ORLXV8CShrL8awVj06NuEXFQ5xyaYfdca7Sgbk/50Ri1GdPg==
+  version "17.0.10"
+  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.10.tgz#d6972ec018d23cf22b99597f1289343d99ea9d9d"
+  integrity sha512-8oz3NAUId2z/zQdFI09IMhQPNgIbiP8Lslhv39DIDamr846/0spjZK0vnrMak0iB8EKb9QFTTIdg2Wj2zH5a3g==
   dependencies:
     "@types/react" "*"
 
@@ -2955,16 +2952,16 @@
     react-select "*"
 
 "@types/react-transition-group@^4.4.0":
-  version "4.4.3"
-  resolved "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-4.4.3.tgz#b0994da0a7023d67dbb4a8910a62112bc00d5688"
-  integrity sha512-fUx5muOWSYP8Bw2BUQ9M9RK9+W1XBK/7FLJ8PTQpnpTEkn0ccyMffyEQvan4C3h53gHdx7KE5Qrxi/LnUGQtdg==
+  version "4.4.4"
+  resolved "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-4.4.4.tgz#acd4cceaa2be6b757db61ed7b432e103242d163e"
+  integrity sha512-7gAPz7anVK5xzbeQW9wFBDg7G++aPLAFY0QaSMOou9rJZpbuI58WAuJrgu+qR92l61grlnCUe7AFX8KGahAgug==
   dependencies:
     "@types/react" "*"
 
 "@types/react@*", "@types/react@^17.0.29":
-  version "17.0.29"
-  resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.29.tgz#9535f3fc01a4981ce9cadcf0daa2593c0c2f2251"
-  integrity sha512-HSenIfBEBZ70BLrrVhtEtHpqaP79waauPtA8XKlczTxL3hXrW/ElGNLTpD1TmqkykgGlOAK55+D3SmUHEirpFw==
+  version "17.0.33"
+  resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.33.tgz#e01ae3de7613dac1094569880bb3792732203ad5"
+  integrity sha512-pLWntxXpDPaU+RTAuSGWGSEL2FRTNyRQOjSWDke/rxRg14ncsZvx8AKWMWZqvc1UOaJIAoObdZhAWvRaHFi5rw==
   dependencies:
     "@types/prop-types" "*"
     "@types/scheduler" "*"
@@ -3836,14 +3833,14 @@ babel-plugin-emotion@^10.0.27:
     source-map "^0.5.7"
 
 babel-plugin-istanbul@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-6.0.0.tgz#e159ccdc9af95e0b570c75b4573b7c34d671d765"
-  integrity sha512-AF55rZXpe7trmEylbaE1Gv54wn6rwU03aptvRoVIGP8YykoSxqdVLV1TfwflBCE/QtHmqtP8SWlTENqbK8GCSQ==
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz#fa88ec59232fd9b4e36dbbc540a8ec9a9b47da73"
+  integrity sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     "@istanbuljs/load-nyc-config" "^1.0.0"
     "@istanbuljs/schema" "^0.1.2"
-    istanbul-lib-instrument "^4.0.0"
+    istanbul-lib-instrument "^5.0.4"
     test-exclude "^6.0.0"
 
 babel-plugin-jest-hoist@^27.2.0:
@@ -4165,16 +4162,16 @@ browserslist@4.16.6:
     escalade "^3.1.1"
     node-releases "^1.1.71"
 
-browserslist@^4.16.6, browserslist@^4.17.3:
-  version "4.17.3"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.17.3.tgz#2844cd6eebe14d12384b0122d217550160d2d624"
-  integrity sha512-59IqHJV5VGdcJZ+GZ2hU5n4Kv3YiASzW6Xk5g9tf5a/MAzGeFwgGWU39fVzNIOVcgB3+Gp+kiQu0HEfTVU/3VQ==
+browserslist@^4.16.6, browserslist@^4.17.5:
+  version "4.17.5"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.17.5.tgz#c827bbe172a4c22b123f5e337533ceebadfdd559"
+  integrity sha512-I3ekeB92mmpctWBoLXe0d5wPS2cBuRvvW0JyyJHMrk9/HmP2ZjrTboNAZ8iuGqaEIlKguljbQY32OkOJIRrgoA==
   dependencies:
-    caniuse-lite "^1.0.30001264"
-    electron-to-chromium "^1.3.857"
+    caniuse-lite "^1.0.30001271"
+    electron-to-chromium "^1.3.878"
     escalade "^3.1.1"
-    node-releases "^1.1.77"
-    picocolors "^0.2.1"
+    node-releases "^2.0.1"
+    picocolors "^1.0.0"
 
 bser@2.1.1:
   version "2.1.1"
@@ -4340,10 +4337,10 @@ camelcase@^6.2.0:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.2.0.tgz#924af881c9d525ac9d87f40d964e5cea982a1809"
   integrity sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==
 
-caniuse-lite@^1.0.30001202, caniuse-lite@^1.0.30001219, caniuse-lite@^1.0.30001228, caniuse-lite@^1.0.30001264:
-  version "1.0.30001265"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001265.tgz#0613c9e6c922e422792e6fcefdf9a3afeee4f8c3"
-  integrity sha512-YzBnspggWV5hep1m9Z6sZVLOt7vrju8xWooFAgN6BA5qvy98qPAPb7vNUzypFaoh2pb3vlfzbDO8tB57UPGbtw==
+caniuse-lite@^1.0.30001202, caniuse-lite@^1.0.30001219, caniuse-lite@^1.0.30001228, caniuse-lite@^1.0.30001271:
+  version "1.0.30001271"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001271.tgz#0dda0c9bcae2cf5407cd34cac304186616cc83e8"
+  integrity sha512-BBruZFWmt3HFdVPS8kceTBIguKxu4f99n5JNp06OlPD/luoAMIaIK5ieV5YjnBLH3Nysai9sxj9rpJj4ZisXOA==
 
 ccount@^1.0.0:
   version "1.1.0"
@@ -4801,17 +4798,17 @@ copy-to-clipboard@^3.3.1:
     toggle-selection "^1.0.6"
 
 core-js-compat@^3.16.0, core-js-compat@^3.16.2:
-  version "3.18.2"
-  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.18.2.tgz#e40c266fbd613948dd8d2d2156345da8ac03c142"
-  integrity sha512-25VJYCJtGjZwLguj7d66oiHfmnVw3TMOZ0zV8DyMJp/aeQ3OjR519iOOeck08HMyVVRAqXxafc2Hl+5QstJrsQ==
+  version "3.19.0"
+  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.19.0.tgz#b3b93f93c8721b3ed52b91f12f964cc410967f8b"
+  integrity sha512-R09rKZ56ccGBebjTLZHvzDxhz93YPT37gBm6qUhnwj3Kt7aCjjZWD1injyNbyeFHxNKfeZBSyds6O9n3MKq1sw==
   dependencies:
-    browserslist "^4.17.3"
+    browserslist "^4.17.5"
     semver "7.0.0"
 
 core-js-pure@^3.10.2, core-js-pure@^3.16.0:
-  version "3.18.2"
-  resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.18.2.tgz#d8cc11d4885ea919f3de776d45e720e4c769d406"
-  integrity sha512-4hMMLUlZhKJKOWbbGD1/VDUxGPEhEoN/T01k7bx271WiBKCvCfkgPzy0IeRS4PB50p6/N1q/SZL4B/TRsTE5bA==
+  version "3.19.0"
+  resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.19.0.tgz#db6fdadfdd4dc280ec93b64c3c2e8460e6f10094"
+  integrity sha512-UEQk8AxyCYvNAs6baNoPqDADv7BX0AmBLGxVsrAifPPx/C8EAzV4Q+2ZUJqVzfI2TQQEZITnwUkWcHpgc/IubQ==
 
 core-js@3.6.5:
   version "3.6.5"
@@ -4819,9 +4816,9 @@ core-js@3.6.5:
   integrity sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA==
 
 core-js@^3.1.3:
-  version "3.18.2"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.18.2.tgz#63a551e8a29f305cd4123754846e65896619ba5b"
-  integrity sha512-zNhPOUoSgoizoSQFdX1MeZO16ORRb9FFQLts8gSYbZU5FcgXhp24iMWMxnOQo5uIaIG7/6FA/IqJPwev1o9ZXQ==
+  version "3.19.0"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.19.0.tgz#9e40098a9bc326c7e81b486abbd5e12b9d275176"
+  integrity sha512-L1TpFRWXZ76vH1yLM+z6KssLZrP8Z6GxxW4auoCj+XiViOzNPJCAuTIkn03BGdFe6Z5clX5t64wRIRypsZQrUg==
 
 core-util-is@~1.0.0:
   version "1.0.3"
@@ -5365,12 +5362,7 @@ doctrine@^3.0.0:
   dependencies:
     esutils "^2.0.2"
 
-dom-accessibility-api@^0.5.6:
-  version "0.5.8"
-  resolved "https://registry.yarnpkg.com/dom-accessibility-api/-/dom-accessibility-api-0.5.8.tgz#414813012e065b5dfa8998b990460c0af12a5421"
-  integrity sha512-rAfghuBPeJldxqsmZQtBbna4TqMgFe4xhYs24vPULNslbmXUdcga+CXiKWzZxyWw0FCkGKPgmizIysIvsAEN8w==
-
-dom-accessibility-api@^0.5.9:
+dom-accessibility-api@^0.5.6, dom-accessibility-api@^0.5.9:
   version "0.5.9"
   resolved "https://registry.yarnpkg.com/dom-accessibility-api/-/dom-accessibility-api-0.5.9.tgz#915f8531ba29a50e5c29389dbfb87a9642fef0d6"
   integrity sha512-+KPF4o71fl6NrdnqIrJc6m44NA+Rhf1h7In2MRznejSQasWkjqmHOBUlk+pXJ77cVOSYyZeNHFwn/sjotB6+Sw==
@@ -5470,10 +5462,10 @@ ee-first@1.1.1:
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
   integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
 
-electron-to-chromium@^1.3.723, electron-to-chromium@^1.3.857:
-  version "1.3.864"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.864.tgz#6a993bcc196a2b8b3df84d28d5d4dd912393885f"
-  integrity sha512-v4rbad8GO6/yVI92WOeU9Wgxc4NA0n4f6P1FvZTY+jyY7JHEhw3bduYu60v3Q1h81Cg6eo4ApZrFPuycwd5hGw==
+electron-to-chromium@^1.3.723, electron-to-chromium@^1.3.878:
+  version "1.3.880"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.880.tgz#58d1a298c5267f2faf440683d038c50ab39a6401"
+  integrity sha512-iwIP/6WoeSimzUKJIQtjtpVDsK8Ir8qQCMXsUBwg+rxJR2Uh3wTNSbxoYRfs+3UWx/9MAnPIxVZCyWkm8MT0uw==
 
 elliptic@^6.5.3:
   version "6.5.4"
@@ -5551,7 +5543,7 @@ error-ex@^1.3.1:
   dependencies:
     is-arrayish "^0.2.1"
 
-es-abstract@^1.17.2, es-abstract@^1.18.2, es-abstract@^1.18.5, es-abstract@^1.19.0, es-abstract@^1.19.1:
+es-abstract@^1.17.2, es-abstract@^1.18.5, es-abstract@^1.19.0, es-abstract@^1.19.1:
   version "1.19.1"
   resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.19.1.tgz#d4885796876916959de78edaa0df456627115ec3"
   integrity sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w==
@@ -5637,9 +5629,9 @@ eslint-import-resolver-node@^0.3.6:
     resolve "^1.20.0"
 
 eslint-module-utils@^2.7.0:
-  version "2.7.0"
-  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.7.0.tgz#9e97c12688113401259b39d960e6a1f09f966435"
-  integrity sha512-hqSE88MmHl3ru9SYvDyGrlo0JwROlf9fiEMplEV7j/EAuq9iSlIlyCFbBT6pdULQBSnBYtYKiMLps+hKkyP7Gg==
+  version "2.7.1"
+  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.7.1.tgz#b435001c9f8dd4ab7f6d0efcae4b9696d4c24b7c"
+  integrity sha512-fjoetBXQZq2tSTWZ9yWVl2KuFrTZZH3V+9iD1V1RfpDgxzJR+mPd/KZmMiA8gbPqdBzpNiEHOuT7IYEWxrH0zQ==
   dependencies:
     debug "^3.2.7"
     find-up "^2.1.0"
@@ -5818,9 +5810,9 @@ estraverse@^4.1.1:
   integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
 
 estraverse@^5.1.0, estraverse@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz#307df42547e6cc7324d3cf03c155d5cdb8c53880"
-  integrity sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123"
+  integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==
 
 estree-util-attach-comments@^1.0.0:
   version "1.0.0"
@@ -6343,9 +6335,9 @@ forwarded@0.2.0:
   integrity sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==
 
 fp-ts@^2.11.4:
-  version "2.11.4"
-  resolved "https://registry.yarnpkg.com/fp-ts/-/fp-ts-2.11.4.tgz#ad78a0d8eafb0dcfc835a0fb200f6da6422c27f0"
-  integrity sha512-lhV7tGEbs2qoVw4vmqOovChS7CAoIYU0gdiPEF8Vc4bLZct+PAMMeXrCqRyBNEo33XOvwvAmFDEDIrHPWH2/fg==
+  version "2.11.5"
+  resolved "https://registry.yarnpkg.com/fp-ts/-/fp-ts-2.11.5.tgz#97cceb26655b1452d7088d6fb0864f84cceffbe4"
+  integrity sha512-OqlwJq1BdpB83BZXTqI+dNcA6uYk6qk4u9Cgnt64Y+XS7dwdbp/mobx8S2KXf2AXH+scNmA/UVK3SEFHR3vHZA==
 
 fragment-cache@^0.2.1:
   version "0.2.1"
@@ -7260,7 +7252,7 @@ is-callable@^1.1.4, is-callable@^1.2.4:
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945"
   integrity sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==
 
-is-ci@3.0.0, is-ci@^3.0.0:
+is-ci@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-3.0.0.tgz#c7e7be3c9d8eef7d0fa144390bd1e4b88dc4c994"
   integrity sha512-kDXyttuLeslKAHYL/K28F2YkM3x5jvFPEw3yXbRptXydjD9rpLEz+C5K5iutY9ZiUu6AP41JdvRQwF4Iqs4ZCQ==
@@ -7274,10 +7266,17 @@ is-ci@^2.0.0:
   dependencies:
     ci-info "^2.0.0"
 
+is-ci@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-3.0.1.tgz#db6ecbed1bd659c43dac0f45661e7674103d1867"
+  integrity sha512-ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ==
+  dependencies:
+    ci-info "^3.2.0"
+
 is-core-module@^2.2.0, is-core-module@^2.5.0, is-core-module@^2.7.0:
-  version "2.7.0"
-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.7.0.tgz#3c0ef7d31b4acfc574f80c58409d568a836848e3"
-  integrity sha512-ByY+tjCciCr+9nLryBYcSD50EOGWt95c7tIsKTG1J2ixKKXPvF7Ej3AVd+UfDydAJom3biBGDBALaO79ktwgEQ==
+  version "2.8.0"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.0.tgz#0321336c3d0925e497fd97f5d95cb114a5ccd548"
+  integrity sha512-vd15qHsaqrRL7dtH6QNuy0ndJmRDrS9HAM1CAiSifNUFv4x1a0CCVsj18hJ1mShxIG6T2i1sO78MkP56r0nYRw==
   dependencies:
     has "^1.0.3"
 
@@ -7638,11 +7637,11 @@ isobject@^4.0.0:
   integrity sha512-S/2fF5wH8SJA/kmwr6HYhK/RI/OkhD84k8ntalo0iJjZikgq1XFvR5M8NPT1x5F7fBwCG3qHfnzeP/Vh/ZxCUA==
 
 istanbul-lib-coverage@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz#f5944a37c70b550b02a78a5c3b2055b280cec8ec"
-  integrity sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg==
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz#189e7909d0a39fa5a3dfad5b03f71947770191d3"
+  integrity sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==
 
-istanbul-lib-instrument@^4.0.0, istanbul-lib-instrument@^4.0.3:
+istanbul-lib-instrument@^4.0.3:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz#873c6fff897450118222774696a3f28902d77c1d"
   integrity sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==
@@ -7652,6 +7651,17 @@ istanbul-lib-instrument@^4.0.0, istanbul-lib-instrument@^4.0.3:
     istanbul-lib-coverage "^3.0.0"
     semver "^6.3.0"
 
+istanbul-lib-instrument@^5.0.4:
+  version "5.0.4"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-5.0.4.tgz#e976f2aa66ebc6737f236d3ab05b76e36f885c80"
+  integrity sha512-W6jJF9rLGEISGoCyXRqa/JCGQGmmxPO10TMu7izaUTynxvBvTjqzAIIGCK9USBmIbQAaSWD6XJPrM9Pv5INknw==
+  dependencies:
+    "@babel/core" "^7.12.3"
+    "@babel/parser" "^7.14.7"
+    "@istanbuljs/schema" "^0.1.2"
+    istanbul-lib-coverage "^3.0.0"
+    semver "^6.3.0"
+
 istanbul-lib-report@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz#7518fe52ea44de372f460a76b5ecda9ffb73d8a6"
@@ -7662,18 +7672,18 @@ istanbul-lib-report@^3.0.0:
     supports-color "^7.1.0"
 
 istanbul-lib-source-maps@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.0.tgz#75743ce6d96bb86dc7ee4352cf6366a23f0b1ad9"
-  integrity sha512-c16LpFRkR8vQXyHZ5nLpY35JZtzj1PQY1iZmesUbf1FZHbIupcWfjgOXBY9YHkLEQ6puz1u4Dgj6qmU/DisrZg==
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz#895f3a709fcfba34c6de5a42939022f3e4358551"
+  integrity sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==
   dependencies:
     debug "^4.1.1"
     istanbul-lib-coverage "^3.0.0"
     source-map "^0.6.1"
 
 istanbul-reports@^3.0.2:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.0.3.tgz#974d682037f6d12b15dc55f9a2a5f8f1ea923831"
-  integrity sha512-0i77ZFLsb9U3DHi22WzmIngVzfoyxxbQcZRqlF3KoKmCJGq9nhFHoGi8FqBztN2rE8w6hURnZghetn0xpkVb6A==
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.0.5.tgz#a2580107e71279ea6d661ddede929ffc6d693384"
+  integrity sha512-5+19PlhnGabNWB7kOFnuxT8H3T/iIyQzIbQMxXsURmmvKg86P2sbkrGOT77VnHw0Qr0gc2XzRaRfMZYYbSQCJQ==
   dependencies:
     html-escaper "^2.0.0"
     istanbul-lib-report "^3.0.0"
@@ -7820,12 +7830,7 @@ jest-environment-node@^27.3.1:
     jest-mock "^27.3.0"
     jest-util "^27.3.1"
 
-jest-get-type@^27.0.6:
-  version "27.0.6"
-  resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-27.0.6.tgz#0eb5c7f755854279ce9b68a9f1a4122f69047cfe"
-  integrity sha512-XTkK5exIeUbbveehcSR8w0bhH+c0yloW/Wpl+9vZrjzztCPWrxhHwkIFpZzCt71oRBsgxmuUfxEqOYoZI2macg==
-
-jest-get-type@^27.3.1:
+jest-get-type@^27.0.6, jest-get-type@^27.3.1:
   version "27.3.1"
   resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-27.3.1.tgz#a8a2b0a12b50169773099eee60a0e6dd11423eff"
   integrity sha512-+Ilqi8hgHSAdhlQ3s12CAVNd8H96ZkQBfYoXmArzZnOfAtVAJEiPDBirjByEblvG/4LPJmkL+nBqPO3A1YJAEg==
@@ -8303,9 +8308,9 @@ lazy-ass@1.6.0:
   integrity sha1-eZllXoZGwX8In90YfRUNMyTVRRM=
 
 lazystream@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/lazystream/-/lazystream-1.0.0.tgz#f6995fe0f820392f61396be89462407bb77168e4"
-  integrity sha1-9plf4PggOS9hOWvolGJAe7dxaOQ=
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/lazystream/-/lazystream-1.0.1.tgz#494c831062f1f9408251ec44db1cba29242a2638"
+  integrity sha512-b94GiNHQNy6JNTrt5w6zNyffMrNkXZb3KTkCZJb2V1xaEGCk093vkZ2jk3tpaeP33/OiXC+WvK9AxUebnf5nbw==
   dependencies:
     readable-stream "^2.0.5"
 
@@ -8542,12 +8547,12 @@ make-dir@3.1.0, make-dir@^3.0.0, make-dir@^3.0.2:
   dependencies:
     semver "^6.0.0"
 
-makeerror@1.0.x:
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.11.tgz#e01a5c9109f2af79660e4e8b9587790184f5a96c"
-  integrity sha1-4BpckQnyr3lmDk6LlYd5AYT1qWw=
+makeerror@1.0.12:
+  version "1.0.12"
+  resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.12.tgz#3e5dd2079a82e812e983cc6610c4a2cb0eaa801a"
+  integrity sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==
   dependencies:
-    tmpl "1.0.x"
+    tmpl "1.0.5"
 
 map-cache@^0.2.2:
   version "0.2.2"
@@ -9200,9 +9205,9 @@ nan@^2.12.1:
   integrity sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ==
 
 nanoid@^3.1.23:
-  version "3.1.29"
-  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.29.tgz#214fb2d7a33e1a5bef4757b779dfaeb6a4e5aeb4"
-  integrity sha512-dW2pUSGZ8ZnCFIlBIA31SV8huOGCHb6OwzVCc7A69rb/a+SgPBwfmLvK5TKQ3INPbRkcI8a/Owo0XbiTNH19wg==
+  version "3.1.30"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.30.tgz#63f93cc548d2a113dc5dfbc63bfa09e2b9b64362"
+  integrity sha512-zJpuPDwOv8D2zq2WRoMe1HsfZthVewpel9CAvTfc/2mBD1uUT/agc5f7GHGWXlYkFvi1mVxe4IjvP2HNrop7nQ==
 
 nanomatch@^1.2.9:
   version "1.2.13"
@@ -9249,9 +9254,9 @@ next-compose-plugins@^2.2.1:
   integrity sha512-OjJ+fV15FXO2uQXQagLD4C0abYErBjyjE0I0FHpOEIB8upw0hg1ldFP6cqHTJBH1cZqy96OeR3u1dJ+Ez2D4Bg==
 
 next-sitemap@^1.6.179:
-  version "1.6.179"
-  resolved "https://registry.yarnpkg.com/next-sitemap/-/next-sitemap-1.6.179.tgz#8f5adc4686e4f0242c6908806c0babf7d9728af3"
-  integrity sha512-j8vGSjAE5PFw/BZNzmwoFKU9DmNGMDA1TiyxmO65gUU3Fx0/PKAiRZgAIt9kzyeC3ElgadytXurzCeYpFK+gpg==
+  version "1.6.192"
+  resolved "https://registry.yarnpkg.com/next-sitemap/-/next-sitemap-1.6.192.tgz#2f5c4e4b8ac12e2edcf8d2caffdd3b320b2b47a8"
+  integrity sha512-Pvxi5ttn/pedojrCvhGrvXsXg0bSV/scWCLrivO1xeBd+OVGiFyn60WHfx7I0HfW7nFQmbvwGfYffkUMOj/ptg==
   dependencies:
     "@corex/deepmerge" "^2.6.34"
     matcher "^4.0.0"
@@ -9371,11 +9376,16 @@ node-modules-regexp@^1.0.0:
   resolved "https://registry.yarnpkg.com/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz#8d9dbe28964a4ac5712e9131642107c71e90ec40"
   integrity sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA=
 
-node-releases@^1.1.71, node-releases@^1.1.77:
+node-releases@^1.1.71:
   version "1.1.77"
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.77.tgz#50b0cfede855dd374e7585bf228ff34e57c1c32e"
   integrity sha512-rB1DUFUNAN4Gn9keO2K1efO35IDK7yKHCdCaIMvFO7yUYmmZYeDjnGKle26G4rwj+LKRQpjyUUvMkPglwGCYNQ==
 
+node-releases@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.1.tgz#3d1d395f204f1f2f29a54358b9fb678765ad2fc5"
+  integrity sha512-CqyzN6z7Q6aMeF/ktcMVTzhAHCEpf8SOarwpzpf8pNBY2k5/oM34UHldUwp8VKI7uxct2HxSRdJjBaZeESzcxA==
+
 nodemailer@^6.7.0:
   version "6.7.0"
   resolved "https://registry.yarnpkg.com/nodemailer/-/nodemailer-6.7.0.tgz#86614722c4e0c33d1b5b02aecb90d6d629932b0d"
@@ -9970,10 +9980,10 @@ periscopic@^2.0.0:
     estree-walker "^2.0.2"
     is-reference "^1.1.4"
 
-picocolors@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-0.2.1.tgz#570670f793646851d1ba135996962abad587859f"
-  integrity sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==
+picocolors@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c"
+  integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==
 
 picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.2, picomatch@^2.2.3:
   version "2.3.0"
@@ -10118,17 +10128,7 @@ prettier@^2.1.2, prettier@^2.4.1:
   resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.4.1.tgz#671e11c89c14a4cfc876ce564106c4a6726c9f5c"
   integrity sha512-9fbDAXSBcc6Bs1mZrDYb3XKzDLm4EXXL9sC1LqKP5rZkT6KRr/rf9amVUcODVXgguK/isJz0d0hP72WeaKWsvA==
 
-pretty-format@^27.0.0, pretty-format@^27.0.2, pretty-format@^27.2.5:
-  version "27.2.5"
-  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-27.2.5.tgz#7cfe2a8e8f01a5b5b29296a0b70f4140df0830c5"
-  integrity sha512-+nYn2z9GgicO9JiqmY25Xtq8SYfZ/5VCpEU3pppHHNAhd1y+ZXxmNPd1evmNcAd6Hz4iBV2kf0UpGth5A/VJ7g==
-  dependencies:
-    "@jest/types" "^27.2.5"
-    ansi-regex "^5.0.1"
-    ansi-styles "^5.0.0"
-    react-is "^17.0.1"
-
-pretty-format@^27.3.1:
+pretty-format@^27.0.0, pretty-format@^27.0.2, pretty-format@^27.2.5, pretty-format@^27.3.1:
   version "27.3.1"
   resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-27.3.1.tgz#7e9486365ccdd4a502061fa761d3ab9ca1b78df5"
   integrity sha512-DR/c+pvFc52nLimLROYjnXPtolawm+uWDxr4FjuLDLUn+ktWnSN851KoHwHzzqq6rfCOjkzN8FLgDrSub6UDuA==
@@ -11005,9 +11005,9 @@ ripemd160@^2.0.0, ripemd160@^2.0.1:
     inherits "^2.0.1"
 
 rollup@^2.32.0:
-  version "2.58.0"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.58.0.tgz#a643983365e7bf7f5b7c62a8331b983b7c4c67fb"
-  integrity sha512-NOXpusKnaRpbS7ZVSzcEXqxcLDOagN6iFS8p45RkoiMqPHDLwJm758UF05KlMoCRbLBTZsPOIa887gZJ1AiXvw==
+  version "2.58.3"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.58.3.tgz#71a08138d9515fb65043b6a18618b2ed9ac8d239"
+  integrity sha512-ei27MSw1KhRur4p87Q0/Va2NAYqMXOX++FNEumMBcdreIRLURKy+cE2wcDJKBn0nfmhP2ZGrJkP1XPO+G8FJQw==
   optionalDependencies:
     fsevents "~2.3.2"
 
@@ -11630,13 +11630,13 @@ string-width@^2.0.0, string-width@^2.1.1:
     strip-ansi "^4.0.0"
 
 string.prototype.matchall@^4.0.5:
-  version "4.0.5"
-  resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.5.tgz#59370644e1db7e4c0c045277690cf7b01203c4da"
-  integrity sha512-Z5ZaXO0svs0M2xd/6By3qpeKpLKd9mO4v4q3oMEQrk8Ck4xOD5d5XeBOOjGrmVZZ/AHB1S0CgG4N5r1G9N3E2Q==
+  version "4.0.6"
+  resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.6.tgz#5abb5dabc94c7b0ea2380f65ba610b3a544b15fa"
+  integrity sha512-6WgDX8HmQqvEd7J+G6VtAahhsQIssiZ8zl7zKh1VDMFyL3hRTJP4FTNA3RbIp2TOQ9AYNDcc7e3fH0Qbup+DBg==
   dependencies:
     call-bind "^1.0.2"
     define-properties "^1.1.3"
-    es-abstract "^1.18.2"
+    es-abstract "^1.19.1"
     get-intrinsic "^1.1.1"
     has-symbols "^1.0.2"
     internal-slot "^1.0.3"
@@ -11770,9 +11770,9 @@ strip-outer@^1.0.1:
     escape-string-regexp "^1.0.2"
 
 stripe@^8.181.0:
-  version "8.181.0"
-  resolved "https://registry.yarnpkg.com/stripe/-/stripe-8.181.0.tgz#e49514b10c54d146cc5306204410658c2d689386"
-  integrity sha512-yEKT+/a/5OMYqGPhI/4jy/kiKHKeew1n9BvNtHbOA9lQDM8yVIYDx0nbQMj5rMowivAMqY67mejDJeSBlcPASA==
+  version "8.184.0"
+  resolved "https://registry.yarnpkg.com/stripe/-/stripe-8.184.0.tgz#ea68470ca6045bb47516c4fea3b775fd6ce15a36"
+  integrity sha512-ZUdvyX+sizTxXLEbUjgTShrulSWSkMIt7hIKdAkhnajYrHdzVtdmhBJl8sQbR9chMVox3Ig5ohilyeIrvcCE2g==
   dependencies:
     "@types/node" ">=8.1.0"
     qs "^6.6.0"
@@ -11808,7 +11808,7 @@ stylis@3.5.4:
   resolved "https://registry.yarnpkg.com/stylis/-/stylis-3.5.4.tgz#f665f25f5e299cf3d64654ab949a57c768b73fbe"
   integrity sha512-8/3pSmthWM7lsPBKv7NXkzn2Uc9W7NotcwGNpJaa3k7WMM1XDCA4MgT5k/8BIexd5ydZdboXtU90XH9Ec4Bv/Q==
 
-stylis@^4.0.3:
+stylis@^4.0.10, stylis@^4.0.3:
   version "4.0.10"
   resolved "https://registry.yarnpkg.com/stylis/-/stylis-4.0.10.tgz#446512d1097197ab3f02fb3c258358c3f7a14240"
   integrity sha512-m3k+dk7QeJw660eIKRRn3xPF6uuvHs/FFzjX3HQ5ove0qYsiygoAhwn5a3IYKaZPo5LrYD0rfVmtv1gNY1uYwg==
@@ -12094,7 +12094,7 @@ tmp@^0.0.33:
   dependencies:
     os-tmpdir "~1.0.2"
 
-tmpl@1.0.x:
+tmpl@1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.5.tgz#8683e0b902bb9c20c4f726e3c0b69f36518c07cc"
   integrity sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==
@@ -12958,11 +12958,11 @@ wait-on@6.0.0:
     rxjs "^7.1.0"
 
 walker@^1.0.7:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.7.tgz#2f7f9b8fd10d677262b18a884e28d19618e028fb"
-  integrity sha1-L3+bj9ENZ3JisYqITijRlhjgKPs=
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.8.tgz#bd498db477afe573dc04185f011d3ab8a8d7653f"
+  integrity sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==
   dependencies:
-    makeerror "1.0.x"
+    makeerror "1.0.12"
 
 warning@^4.0.2:
   version "4.0.3"

From d906b835412a4febdb287bf3b62710a531c7560a Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 27 Oct 2021 16:34:02 +1100
Subject: [PATCH 18/21] Update dependency @graphql-tools/schema to ^8.3.0
 (#6815)

Co-authored-by: Renovate Bot <bot@renovateapp.com>
---
 packages/keystone/package.json |  2 +-
 yarn.lock                      | 30 ++++++++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/packages/keystone/package.json b/packages/keystone/package.json
index 5bfb71a43c9..775dd5a9952 100644
--- a/packages/keystone/package.json
+++ b/packages/keystone/package.json
@@ -31,7 +31,7 @@
     "@babel/runtime": "^7.15.4",
     "@emotion/hash": "^0.8.0",
     "@emotion/weak-memoize": "^0.2.5",
-    "@graphql-tools/schema": "^8.2.0",
+    "@graphql-tools/schema": "^8.3.0",
     "@graphql-ts/extend": "0.4.0",
     "@graphql-ts/schema": "0.5.0",
     "@hapi/iron": "^6.0.0",
diff --git a/yarn.lock b/yarn.lock
index c554c6da38a..6c2b3be8afd 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1471,6 +1471,14 @@
     "@graphql-tools/utils" "^8.2.2"
     tslib "~2.3.0"
 
+"@graphql-tools/merge@^8.2.0":
+  version "8.2.0"
+  resolved "https://registry.yarnpkg.com/@graphql-tools/merge/-/merge-8.2.0.tgz#8f6638eeecf19f59fef28598024308e0452dd0a2"
+  integrity sha512-nfMLYF7zczjnIbChZtqbvozRfuRweMD1Fe9HHd4RXd3Tcsj6E17srW0QJfxUoIIWh4pitj+XwZAwhj1PWBDU7g==
+  dependencies:
+    "@graphql-tools/utils" "^8.4.0"
+    tslib "~2.3.0"
+
 "@graphql-tools/mock@^8.1.2":
   version "8.4.0"
   resolved "https://registry.yarnpkg.com/@graphql-tools/mock/-/mock-8.4.0.tgz#c4a5d0c35cc5760b99b3e062145f36ac9cfe9ffb"
@@ -1491,6 +1499,16 @@
     tslib "~2.3.0"
     value-or-promise "1.0.10"
 
+"@graphql-tools/schema@^8.3.0":
+  version "8.3.0"
+  resolved "https://registry.yarnpkg.com/@graphql-tools/schema/-/schema-8.3.0.tgz#ddf4297859c6d7ac1ebbbd91460260ed424115db"
+  integrity sha512-OJD4Q1Xa3sffRiHzy0sskZz9ZWeqaujINfoim4CTk5Y9es1LS+WnKi25wVhmL2SGzzmKuAv7oDn+dpQAlM+Gfw==
+  dependencies:
+    "@graphql-tools/merge" "^8.2.0"
+    "@graphql-tools/utils" "^8.4.0"
+    tslib "~2.3.0"
+    value-or-promise "1.0.11"
+
 "@graphql-tools/utils@^8.0.0", "@graphql-tools/utils@^8.2.0", "@graphql-tools/utils@^8.2.2", "@graphql-tools/utils@^8.2.3":
   version "8.2.5"
   resolved "https://registry.yarnpkg.com/@graphql-tools/utils/-/utils-8.2.5.tgz#695e6d760c1187ad2b159d5d3c4696eff9c08a27"
@@ -1505,6 +1523,13 @@
   dependencies:
     "@babel/runtime" "^7.9.2"
 
+"@graphql-tools/utils@^8.4.0":
+  version "8.5.0"
+  resolved "https://registry.yarnpkg.com/@graphql-tools/utils/-/utils-8.5.0.tgz#439487ac756d9458a33091e5e0435ddf8e794f3e"
+  integrity sha512-jMwLm6YdN+Vbqntg5GHqDvGLpLa/xPSpRs/c40d0rBuel77wo7AaQ8jHeBSpp9y+7kp7HrGSWff1u7yJ7F8ppw==
+  dependencies:
+    tslib "~2.3.0"
+
 "@graphql-ts/schema@0.5.0":
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/@graphql-ts/schema/-/schema-0.5.0.tgz#cc9cbf614ed931aff4c9987e88094a4030ad9e32"
@@ -12852,6 +12877,11 @@ value-or-promise@1.0.10:
   resolved "https://registry.yarnpkg.com/value-or-promise/-/value-or-promise-1.0.10.tgz#5bf041f1e9a8e7043911875547636768a836e446"
   integrity sha512-1OwTzvcfXkAfabk60UVr5NdjtjJ0Fg0T5+B1bhxtrOEwSH2fe8y4DnLgoksfCyd8yZCOQQHB0qLMQnwgCjbXLQ==
 
+value-or-promise@1.0.11:
+  version "1.0.11"
+  resolved "https://registry.yarnpkg.com/value-or-promise/-/value-or-promise-1.0.11.tgz#3e90299af31dd014fe843fe309cefa7c1d94b140"
+  integrity sha512-41BrgH+dIbCFXClcSapVs5M6GkENd3gQOJpEfPDNa71LsUGMXDL0jMWpI/Rh7WhX+Aalfz2TTS3Zt5pUsbnhLg==
+
 vary@^1, vary@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"

From 3a3b2426daba5b47b675efd242a56c888fd87cc0 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 27 Oct 2021 16:51:21 +1100
Subject: [PATCH 19/21] Update dependency @emotion/cache to v11.5.0 (#6827)

Co-authored-by: Renovate Bot <bot@renovateapp.com>
---
 docs/package.json |  2 +-
 yarn.lock         | 25 +++++++------------------
 2 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/docs/package.json b/docs/package.json
index e02494b5858..5e2d13a9bab 100644
--- a/docs/package.json
+++ b/docs/package.json
@@ -11,7 +11,7 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.15.4",
-    "@emotion/cache": "11.4.0",
+    "@emotion/cache": "11.5.0",
     "@emotion/react": "^11.4.1",
     "@emotion/server": "11.4.0",
     "@emotion/weak-memoize": "^0.2.5",
diff --git a/yarn.lock b/yarn.lock
index 6c2b3be8afd..05d02c0ff33 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1289,16 +1289,16 @@
     source-map "^0.5.7"
     stylis "^4.0.3"
 
-"@emotion/cache@11.4.0":
-  version "11.4.0"
-  resolved "https://registry.yarnpkg.com/@emotion/cache/-/cache-11.4.0.tgz#293fc9d9a7a38b9aad8e9337e5014366c3b09ac0"
-  integrity sha512-Zx70bjE7LErRO9OaZrhf22Qye1y4F7iDl+ITjet0J+i+B88PrAOBkKvaAWhxsZf72tDLajwCgfCjJ2dvH77C3g==
+"@emotion/cache@11.5.0", "@emotion/cache@^11.4.0", "@emotion/cache@^11.5.0":
+  version "11.5.0"
+  resolved "https://registry.yarnpkg.com/@emotion/cache/-/cache-11.5.0.tgz#a5eb78cbef8163939ee345e3ddf0af217b845e62"
+  integrity sha512-mAZ5QRpLriBtaj/k2qyrXwck6yeoz1V5lMt/jfj6igWU35yYlNKs2LziXVgvH81gnJZ+9QQNGelSsnuoAy6uIw==
   dependencies:
     "@emotion/memoize" "^0.7.4"
-    "@emotion/sheet" "^1.0.0"
+    "@emotion/sheet" "^1.0.3"
     "@emotion/utils" "^1.0.0"
     "@emotion/weak-memoize" "^0.2.5"
-    stylis "^4.0.3"
+    stylis "^4.0.10"
 
 "@emotion/cache@^10.0.27":
   version "10.0.29"
@@ -1310,17 +1310,6 @@
     "@emotion/utils" "0.11.3"
     "@emotion/weak-memoize" "0.2.5"
 
-"@emotion/cache@^11.4.0", "@emotion/cache@^11.5.0":
-  version "11.5.0"
-  resolved "https://registry.yarnpkg.com/@emotion/cache/-/cache-11.5.0.tgz#a5eb78cbef8163939ee345e3ddf0af217b845e62"
-  integrity sha512-mAZ5QRpLriBtaj/k2qyrXwck6yeoz1V5lMt/jfj6igWU35yYlNKs2LziXVgvH81gnJZ+9QQNGelSsnuoAy6uIw==
-  dependencies:
-    "@emotion/memoize" "^0.7.4"
-    "@emotion/sheet" "^1.0.3"
-    "@emotion/utils" "^1.0.0"
-    "@emotion/weak-memoize" "^0.2.5"
-    stylis "^4.0.10"
-
 "@emotion/core@^10.0.14":
   version "10.1.1"
   resolved "https://registry.yarnpkg.com/@emotion/core/-/core-10.1.1.tgz#c956c1365f2f2481960064bcb8c4732e5fb612c3"
@@ -1418,7 +1407,7 @@
   resolved "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-0.9.4.tgz#894374bea39ec30f489bbfc3438192b9774d32e5"
   integrity sha512-zM9PFmgVSqBw4zL101Q0HrBVTGmpAxFZH/pYx/cjJT5advXguvcgjHFTCaIO3enL/xr89vK2bh0Mfyj9aa0ANA==
 
-"@emotion/sheet@^1.0.0", "@emotion/sheet@^1.0.3":
+"@emotion/sheet@^1.0.3":
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-1.0.3.tgz#00c326cd7985c5ccb8fe2c1b592886579dcfab8f"
   integrity sha512-YoX5GyQ4db7LpbmXHMuc8kebtBGP6nZfRC5Z13OKJMixBEwdZrJ914D6yJv/P+ZH/YY3F5s89NYX2hlZAf3SRQ==

From 4eb6e886c1f48d38ec9950cda51976397cd1afd1 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 27 Oct 2021 17:17:36 +1100
Subject: [PATCH 20/21] Update patch dependencies (round 2) (#6814)

* Update patch dependencies

* resolve type errors

Co-authored-by: Renovate Bot <bot@renovateapp.com>
Co-authored-by: gwyneplaine <cc.lee@live.com.au>
---
 design-system/packages/button/package.json            |  2 +-
 design-system/packages/core/package.json              |  2 +-
 design-system/packages/fields/package.json            |  2 +-
 design-system/packages/icons/package.json             |  2 +-
 design-system/packages/loading/package.json           |  2 +-
 design-system/packages/modals/package.json            |  2 +-
 design-system/packages/notice/package.json            |  2 +-
 design-system/packages/segmented-control/package.json |  2 +-
 design-system/packages/toast/package.json             |  2 +-
 design-system/website/package.json                    |  4 ++--
 docs/package.json                                     |  6 +++---
 examples-staging/basic/package.json                   |  2 +-
 package.json                                          |  2 +-
 packages/cloudinary/package.json                      |  2 +-
 packages/fields-document/package.json                 |  4 ++--
 packages/keystone/package.json                        |  2 +-
 yarn.lock                                             | 10 +++++-----
 17 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/design-system/packages/button/package.json b/design-system/packages/button/package.json
index 61934d80d9d..8d4e6ca2dbf 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.29"
+    "@types/react": "^17.0.33"
   },
   "dependencies": {
     "@babel/runtime": "^7.15.4",
diff --git a/design-system/packages/core/package.json b/design-system/packages/core/package.json
index 46d48825728..5d01227bbae 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.29",
+    "@types/react": "^17.0.33",
     "react": "^17.0.2",
     "react-dom": "^17.0.2"
   },
diff --git a/design-system/packages/fields/package.json b/design-system/packages/fields/package.json
index 26d397c6503..fb788163fbe 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.29"
+    "@types/react": "^17.0.33"
   },
   "dependencies": {
     "@babel/runtime": "^7.15.4",
diff --git a/design-system/packages/icons/package.json b/design-system/packages/icons/package.json
index c795e7f76a8..9a9dcc9310d 100644
--- a/design-system/packages/icons/package.json
+++ b/design-system/packages/icons/package.json
@@ -12,7 +12,7 @@
     "@svgr/plugin-jsx": "^5.5.0",
     "@svgr/plugin-prettier": "^5.5.0",
     "@svgr/plugin-svgo": "^5.5.0",
-    "@types/react": "^17.0.29",
+    "@types/react": "^17.0.33",
     "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 f21786f8492..3680345f199 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.29"
+    "@types/react": "^17.0.33"
   },
   "dependencies": {
     "@babel/runtime": "^7.15.4",
diff --git a/design-system/packages/modals/package.json b/design-system/packages/modals/package.json
index 1796fc686df..95dce9ae061 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.29"
+    "@types/react": "^17.0.33"
   },
   "dependencies": {
     "@babel/runtime": "^7.15.4",
diff --git a/design-system/packages/notice/package.json b/design-system/packages/notice/package.json
index fa5d64f0a59..a9b4e91961c 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.29"
+    "@types/react": "^17.0.33"
   },
   "dependencies": {
     "@babel/runtime": "^7.15.4",
diff --git a/design-system/packages/segmented-control/package.json b/design-system/packages/segmented-control/package.json
index 0ab55193fb4..b361e89c5aa 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.29",
+    "@types/react": "^17.0.33",
     "react": "^17.0.2"
   },
   "dependencies": {
diff --git a/design-system/packages/toast/package.json b/design-system/packages/toast/package.json
index a5e24c16b05..52fc5c678ef 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.29",
+    "@types/react": "^17.0.33",
     "react": "^17.0.2"
   },
   "dependencies": {
diff --git a/design-system/website/package.json b/design-system/website/package.json
index cb32c659ed0..e6c5ee186e2 100644
--- a/design-system/website/package.json
+++ b/design-system/website/package.json
@@ -21,8 +21,8 @@
     "@keystone-ui/toast": "^4.0.4",
     "@keystone-ui/tooltip": "^4.0.3",
     "@preconstruct/next": "^3.0.0",
-    "@types/react": "^17.0.29",
-    "@types/react-dom": "^17.0.9",
+    "@types/react": "^17.0.33",
+    "@types/react-dom": "^17.0.10",
     "@types/tinycolor2": "^1.4.3",
     "next": "^11.1.0",
     "react": "^17.0.2",
diff --git a/docs/package.json b/docs/package.json
index 5e2d13a9bab..5a560c4f881 100644
--- a/docs/package.json
+++ b/docs/package.json
@@ -22,9 +22,9 @@
     "@preconstruct/next": "^3.0.0",
     "@sindresorhus/slugify": "^1.1.2",
     "@types/gtag.js": "^0.0.7",
-    "@types/mdx-js__react": "^1.5.4",
-    "@types/react": "^17.0.29",
-    "@types/react-dom": "^17.0.9",
+    "@types/mdx-js__react": "^1.5.5",
+    "@types/react": "^17.0.33",
+    "@types/react-dom": "^17.0.10",
     "classnames": "^2.3.1",
     "copy-to-clipboard": "^3.3.1",
     "date-fns": "^2.25.0",
diff --git a/examples-staging/basic/package.json b/examples-staging/basic/package.json
index 2f9f50986a8..20e4b597ceb 100644
--- a/examples-staging/basic/package.json
+++ b/examples-staging/basic/package.json
@@ -19,7 +19,7 @@
     "@keystone-ui/icons": "^4.0.2",
     "@keystone-ui/tooltip": "^4.0.3",
     "@preconstruct/next": "^3.0.0",
-    "@types/react": "^17.0.29",
+    "@types/react": "^17.0.33",
     "graphql": "^15.6.1",
     "graphql-tag": "^2.12.5",
     "next": "^11.1.0",
diff --git a/package.json b/package.json
index 96735607e55..418dcd9b877 100644
--- a/package.json
+++ b/package.json
@@ -67,7 +67,7 @@
     "eslint-plugin-jest": "^25.2.2",
     "eslint-plugin-react": "^7.26.1",
     "eslint-plugin-react-hooks": "^4.2.0",
-    "is-ci": "^3.0.0",
+    "is-ci": "^3.0.1",
     "jest": "^27.3.1",
     "prettier": "^2.4.1",
     "react": "^17.0.2",
diff --git a/packages/cloudinary/package.json b/packages/cloudinary/package.json
index 7ddbd2c7aa8..e34172c927b 100644
--- a/packages/cloudinary/package.json
+++ b/packages/cloudinary/package.json
@@ -10,7 +10,7 @@
     "@keystone-ui/core": "^3.2.1",
     "@keystone-ui/fields": "^5.0.1",
     "@keystone-ui/pill": "^5.0.2",
-    "@types/react": "^17.0.29",
+    "@types/react": "^17.0.33",
     "cloudinary": "^1.27.1",
     "cuid": "^2.1.8",
     "graphql-upload": "^12.0.0",
diff --git a/packages/fields-document/package.json b/packages/fields-document/package.json
index 87ea0348c38..815ba9932a0 100644
--- a/packages/fields-document/package.json
+++ b/packages/fields-document/package.json
@@ -32,10 +32,10 @@
     "@keystone-ui/icons": "^4.0.2",
     "@keystone-ui/popover": "^4.0.5",
     "@keystone-ui/tooltip": "^4.0.3",
-    "@types/react": "^17.0.29",
+    "@types/react": "^17.0.33",
     "apollo-server-errors": "^3.2.0",
     "apply-ref": "^1.0.0",
-    "fp-ts": "^2.11.4",
+    "fp-ts": "^2.11.5",
     "graphql": "^15.6.1",
     "io-ts": "^2.2.16",
     "io-ts-excess": "^1.0.1",
diff --git a/packages/keystone/package.json b/packages/keystone/package.json
index 775dd5a9952..ff9f9657b81 100644
--- a/packages/keystone/package.json
+++ b/packages/keystone/package.json
@@ -65,7 +65,7 @@
     "@types/pluralize": "^0.0.29",
     "@types/prettier": "^2.4.1",
     "@types/prompts": "^2.0.14",
-    "@types/react": "^17.0.29",
+    "@types/react": "^17.0.33",
     "@types/source-map-support": "^0.5.4",
     "@types/supertest": "^2.0.11",
     "@types/uid-safe": "^2.1.2",
diff --git a/yarn.lock b/yarn.lock
index 05d02c0ff33..e0fef8e104c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2842,7 +2842,7 @@
   dependencies:
     "@types/unist" "*"
 
-"@types/mdx-js__react@^1.5.4":
+"@types/mdx-js__react@^1.5.5":
   version "1.5.5"
   resolved "https://registry.yarnpkg.com/@types/mdx-js__react/-/mdx-js__react-1.5.5.tgz#fa6daa1a28336d77b6cf071aacc7e497600de9ee"
   integrity sha512-k8pnaP6JXVlQh18HgL5X6sYFNC/qZnzO7R2+HsmwrwUd+JnnsU0d9lyyT0RQrHg1anxDU36S98TI/fsGtmYqqg==
@@ -2951,7 +2951,7 @@
   resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.4.tgz#cd667bcfdd025213aafb7ca5915a932590acdcdc"
   integrity sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==
 
-"@types/react-dom@^17.0.9":
+"@types/react-dom@^17.0.10":
   version "17.0.10"
   resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.10.tgz#d6972ec018d23cf22b99597f1289343d99ea9d9d"
   integrity sha512-8oz3NAUId2z/zQdFI09IMhQPNgIbiP8Lslhv39DIDamr846/0spjZK0vnrMak0iB8EKb9QFTTIdg2Wj2zH5a3g==
@@ -2972,7 +2972,7 @@
   dependencies:
     "@types/react" "*"
 
-"@types/react@*", "@types/react@^17.0.29":
+"@types/react@*", "@types/react@^17.0.33":
   version "17.0.33"
   resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.33.tgz#e01ae3de7613dac1094569880bb3792732203ad5"
   integrity sha512-pLWntxXpDPaU+RTAuSGWGSEL2FRTNyRQOjSWDke/rxRg14ncsZvx8AKWMWZqvc1UOaJIAoObdZhAWvRaHFi5rw==
@@ -6348,7 +6348,7 @@ forwarded@0.2.0:
   resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz#2269936428aad4c15c7ebe9779a84bf0b2a81811"
   integrity sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==
 
-fp-ts@^2.11.4:
+fp-ts@^2.11.5:
   version "2.11.5"
   resolved "https://registry.yarnpkg.com/fp-ts/-/fp-ts-2.11.5.tgz#97cceb26655b1452d7088d6fb0864f84cceffbe4"
   integrity sha512-OqlwJq1BdpB83BZXTqI+dNcA6uYk6qk4u9Cgnt64Y+XS7dwdbp/mobx8S2KXf2AXH+scNmA/UVK3SEFHR3vHZA==
@@ -7280,7 +7280,7 @@ is-ci@^2.0.0:
   dependencies:
     ci-info "^2.0.0"
 
-is-ci@^3.0.0:
+is-ci@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-3.0.1.tgz#db6ecbed1bd659c43dac0f45661e7674103d1867"
   integrity sha512-ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ==

From 00c33ab8cbfcb69439a2e2f975b39bc832963f11 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 29 Oct 2021 10:11:02 +1100
Subject: [PATCH 21/21] Update Node.js to v16 (#6830)

* Update Node.js to v16

* bump workflows to Node 16

Co-authored-by: Renovate Bot <bot@renovateapp.com>
Co-authored-by: Daniel Cousens <413395+dcousens@users.noreply.github.com>
---
 .github/workflows/tests.yml | 24 ++++++++++++------------
 .nvmrc                      |  2 +-
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 04fec4552ca..a6323b9d7f4 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -52,11 +52,11 @@ jobs:
         uses: actions/checkout@v2
         if: needs.should_run_tests.outputs.shouldRunTests == 'true'
 
-      - name: Setup Node.js 14.x
+      - name: Setup Node.js LTS
         uses: actions/setup-node@main
         if: needs.should_run_tests.outputs.shouldRunTests == 'true'
         with:
-          node-version: 14.x
+          node-version: lts/*
 
       - name: Get yarn cache directory path
         if: needs.should_run_tests.outputs.shouldRunTests == 'true'
@@ -111,10 +111,10 @@ jobs:
       - name: Checkout Repo
         uses: actions/checkout@v2
 
-      - name: Setup Node.js 14.x
+      - name: Setup Node.js LTS
         uses: actions/setup-node@main
         with:
-          node-version: 14.x
+          node-version: lts/*
 
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
@@ -150,10 +150,10 @@ jobs:
       - name: Checkout Repo
         uses: actions/checkout@v2
 
-      - name: Setup Node.js 14.x
+      - name: Setup Node.js LTS
         uses: actions/setup-node@main
         with:
-          node-version: 14.x
+          node-version: lts/*
 
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
@@ -210,11 +210,11 @@ jobs:
         if: needs.should_run_tests.outputs.shouldRunTests == 'true'
         uses: actions/checkout@v2
 
-      - name: Setup Node.js 14.x
+      - name: Setup Node.js LTS
         if: needs.should_run_tests.outputs.shouldRunTests == 'true'
         uses: actions/setup-node@main
         with:
-          node-version: 14.x
+          node-version: lts/*
 
       - name: Get yarn cache directory path
         if: needs.should_run_tests.outputs.shouldRunTests == 'true'
@@ -270,11 +270,11 @@ jobs:
         if: needs.should_run_tests.outputs.shouldRunTests == 'true'
         uses: actions/checkout@v2
 
-      - name: Setup Node.js 14.x
+      - name: Setup Node.js LTS
         if: needs.should_run_tests.outputs.shouldRunTests == 'true'
         uses: actions/setup-node@main
         with:
-          node-version: 14.x
+          node-version: lts/*
 
       - name: Get yarn cache directory path
         if: needs.should_run_tests.outputs.shouldRunTests == 'true'
@@ -315,10 +315,10 @@ jobs:
       - name: Checkout Repo
         uses: actions/checkout@v2
 
-      - name: Setup Node.js 14.x
+      - name: Setup Node.js LTS
         uses: actions/setup-node@main
         with:
-          node-version: 14.x
+          node-version: lts/*
 
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
diff --git a/.nvmrc b/.nvmrc
index 8351c19397f..b6a7d89c68e 100644
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-14
+16