From 1a0614351808d4cb024840308fcc8288860e1de5 Mon Sep 17 00:00:00 2001
From: Mitchell Hamilton <mitchell@hamil.town>
Date: Tue, 5 Oct 2021 16:47:10 +1000
Subject: [PATCH 1/2] Fix `KeystoneContext` type exported from
 `.keystone/types` (#6711)

---
 .changeset/loud-gifts-accept.md                             | 5 +++++
 packages/keystone/src/lib/schema-type-printer.tsx           | 6 +++---
 .../src/scripts/tests/__snapshots__/artifacts.test.ts.snap  | 6 +++---
 3 files changed, 11 insertions(+), 6 deletions(-)
 create mode 100644 .changeset/loud-gifts-accept.md

diff --git a/.changeset/loud-gifts-accept.md b/.changeset/loud-gifts-accept.md
new file mode 100644
index 00000000000..89fd945a1d7
--- /dev/null
+++ b/.changeset/loud-gifts-accept.md
@@ -0,0 +1,5 @@
+---
+'@keystone-next/keystone': patch
+---
+
+Fix `KeystoneContext` type exported from `.keystone/types`
diff --git a/packages/keystone/src/lib/schema-type-printer.tsx b/packages/keystone/src/lib/schema-type-printer.tsx
index 3f614474f6b..18943f5dab9 100644
--- a/packages/keystone/src/lib/schema-type-printer.tsx
+++ b/packages/keystone/src/lib/schema-type-printer.tsx
@@ -169,9 +169,9 @@ export type ${listKey}ListFn = (
 export type KeystoneListsAPI = GenericKeystoneListsAPI<KeystoneListsTypeInfo>;
 export type KeystoneDbAPI = GenericKeystoneDbAPI<KeystoneListsTypeInfo>;
 
-export type KeystoneContext = Omit<GenericKeystoneContext, 'db' | 'lists' | 'prisma'> & {
-  db: { lists: KeystoneDbAPI };
-  lists: KeystoneListsAPI;
+export type KeystoneContext = Omit<GenericKeystoneContext, 'db' | 'query' | 'prisma'> & {
+  db: KeystoneDbAPI;
+  query: KeystoneListsAPI;
   prisma: import('.prisma/client').PrismaClient;
 };
 `;
diff --git a/packages/keystone/src/scripts/tests/__snapshots__/artifacts.test.ts.snap b/packages/keystone/src/scripts/tests/__snapshots__/artifacts.test.ts.snap
index 7e06404dc21..82aa78043b6 100644
--- a/packages/keystone/src/scripts/tests/__snapshots__/artifacts.test.ts.snap
+++ b/packages/keystone/src/scripts/tests/__snapshots__/artifacts.test.ts.snap
@@ -139,10 +139,10 @@ export type KeystoneDbAPI = GenericKeystoneDbAPI<KeystoneListsTypeInfo>;
 
 export type KeystoneContext = Omit<
   GenericKeystoneContext,
-  'db' | 'lists' | 'prisma'
+  'db' | 'query' | 'prisma'
 > & {
-  db: { lists: KeystoneDbAPI };
-  lists: KeystoneListsAPI;
+  db: KeystoneDbAPI;
+  query: KeystoneListsAPI;
   prisma: import('.prisma/client').PrismaClient;
 };
 

From a7a4029e5119590a9d97ce212262a68f8652cb90 Mon Sep 17 00:00:00 2001
From: Thomas Walker <bladey@me.com>
Date: Tue, 5 Oct 2021 18:08:16 +1100
Subject: [PATCH 2/2] Release #6711 (#6713)

---
 .changeset/loud-gifts-accept.md       | 5 -----
 packages/fields-document/package.json | 2 +-
 packages/keystone/CHANGELOG.md        | 6 ++++++
 packages/keystone/package.json        | 2 +-
 4 files changed, 8 insertions(+), 7 deletions(-)
 delete mode 100644 .changeset/loud-gifts-accept.md

diff --git a/.changeset/loud-gifts-accept.md b/.changeset/loud-gifts-accept.md
deleted file mode 100644
index 89fd945a1d7..00000000000
--- a/.changeset/loud-gifts-accept.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@keystone-next/keystone': patch
----
-
-Fix `KeystoneContext` type exported from `.keystone/types`
diff --git a/packages/fields-document/package.json b/packages/fields-document/package.json
index 8c5090ed5cd..a7d7164fa27 100644
--- a/packages/fields-document/package.json
+++ b/packages/fields-document/package.json
@@ -19,7 +19,7 @@
     ]
   },
   "peerDependencies": {
-    "@keystone-next/keystone": "^26.0.0"
+    "@keystone-next/keystone": "^26.0.1"
   },
   "dependencies": {
     "@babel/runtime": "^7.15.4",
diff --git a/packages/keystone/CHANGELOG.md b/packages/keystone/CHANGELOG.md
index 07b51ac62ce..d28b840ee9d 100644
--- a/packages/keystone/CHANGELOG.md
+++ b/packages/keystone/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @keystone-next/keystone
 
+## 26.0.1
+
+### Patch Changes
+
+- [#6711](https://github.com/keystonejs/keystone/pull/6711) [`1a0614351`](https://github.com/keystonejs/keystone/commit/1a0614351808d4cb024840308fcc8288860e1de5) Thanks [@mitchellhamilton](https://github.com/mitchellhamilton)! - Fix `KeystoneContext` type exported from `.keystone/types`
+
 ## 26.0.0
 
 ### Major Changes
diff --git a/packages/keystone/package.json b/packages/keystone/package.json
index 70d3db29741..96aa884f996 100644
--- a/packages/keystone/package.json
+++ b/packages/keystone/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@keystone-next/keystone",
-  "version": "26.0.0",
+  "version": "26.0.1",
   "license": "MIT",
   "main": "dist/keystone.cjs.js",
   "module": "dist/keystone.esm.js",