Merge branch 'master' into bring-in-latest-website-changes

keystonejs · Oct 5, 2021 · e853505 · e853505
2 parents bb84006 + a7a4029
commit e853505
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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",

diff --git 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
@@ -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;
 };