Merge branch 'master' into use-db-api

docs/components/Navigation.tsx

@@ -59,7 +59,6 @@ export function Navigation() {
       <NavItem href="/">Welcome</NavItem>
       <NavItem href="/whats-new">What's New</NavItem>
       <NavItem href="/roadmap">Roadmap</NavItem>
-      <NavItem href="/faqs">FAQs</NavItem>
       <Section label="Tutorials">
         <NavItem href="/tutorials/getting-started-with-create-keystone-app">
           Getting started

docs/next.config.js

@@ -9,6 +9,19 @@ const withMDX = require('@next/mdx')({
   },
 });
 
+const redirects = {
+  async redirects() {
+    // if this array becomes bigger than 3 entries, please make it a separate file
+    return [
+      {
+        source: '/faqs',
+        destination: '/',
+        permanent: true,
+      },
+    ];
+  },
+};
+
 module.exports = withPlugins([
   withPreconstruct,
   withImages,
@@ -26,4 +39,5 @@ module.exports = withPlugins([
     };
     return nextConfig;
   },
+  redirects,
 ]);

packages-next/fields/src/tests/test-fixtures.ts

@@ -1,4 +1,3 @@
-import { getItems } from '@keystone-next/server-side-graphql-client-legacy';
 import { KeystoneContext } from '@keystone-next/types';
 import { text } from '../types/text';
 
@@ -39,13 +38,7 @@ export const filterTests = (withKeystone: any) => {
     expected: any[]
   ) =>
     expect(
-      await getItems({
-        context,
-        listKey: 'Test',
-        where,
-        returnFields: 'id name',
-        sortBy: ['name_ASC'],
-      })
+      await context.lists.Test.findMany({ where, sortBy: ['name_ASC'], query: 'id name' })
     ).toEqual(expected);
 
   test(

packages-next/fields/src/types/autoIncrement/tests/test-fixtures.ts

@@ -1,4 +1,3 @@
-import { getItems } from '@keystone-next/server-side-graphql-client-legacy';
 import { KeystoneContext } from '@keystone-next/types';
 import { text } from '../../text';
 import { autoIncrement } from '..';
@@ -74,13 +73,7 @@ export const filterTests = (withKeystone: (arg: any) => any, matrixValue: Matrix
   const _f = matrixValue === 'ID' ? (x: any) => x.toString() : (x: any) => x;
   const match = async (context: KeystoneContext, where: Record<string, any>, expected: any[]) =>
     expect(
-      await getItems({
-        context,
-        listKey: 'Test',
-        where,
-        returnFields: 'name orderNumber',
-        sortBy: ['name_ASC'],
-      })
+      await context.lists.Test.findMany({ where, sortBy: ['name_ASC'], query: 'name orderNumber' })
     ).toEqual(expected.map(i => _storedValues[i]));
 
   test(

packages-next/fields/src/types/timestamp/tests/test-fixtures.ts

@@ -1,4 +1,3 @@
-import { getItems } from '@keystone-next/server-side-graphql-client-legacy';
 import { ProviderName } from '@keystone-next/test-utils-legacy';
 import { KeystoneContext } from '@keystone-next/types';
 import { text } from '../../text';
@@ -50,15 +49,9 @@ export const filterTests = (withKeystone: (args: any) => any) => {
     expected: any,
     sortBy = ['name_ASC']
   ) =>
-    expect(
-      await getItems({
-        context,
-        listKey: 'Test',
-        where,
-        returnFields: 'name lastOnline',
-        sortBy,
-      })
-    ).toEqual(expected);
+    expect(await context.lists.Test.findMany({ where, sortBy, query: 'name lastOnline' })).toEqual(
+      expected
+    );
 
   test(
     'Sorting: sortBy: lastOnline_ASC',

packages-next/types/src/context.ts

@@ -12,17 +12,18 @@ export type KeystoneContext = {
   sudo: () => KeystoneContext;
   exitSudo: () => KeystoneContext;
   withSession: (session: any) => KeystoneContext;
+  // TODO: Correctly type this as a prisma client
+  prisma: any;
+  images: ImagesContext | undefined;
   totalResults: number;
   maxTotalResults: number;
   schemaName: 'public' | 'internal';
   /** @deprecated */
   gqlNames: (listKey: string) => Record<string, string>; // TODO: actual keys
   /** @deprecated */
   keystone: BaseKeystone;
-  images: ImagesContext | undefined;
 } & AccessControlContext &
-  Partial<SessionContext<any>> &
-  DatabaseAPIs;
+  Partial<SessionContext<any>>;
 
 // List item API
 
@@ -150,11 +151,7 @@ export type SessionContext<T> = {
   endSession(): Promise<void>;
 };
 
-// DatabaseAPIs is used to provide access to the underlying database abstraction through
-// context and other developer-facing APIs in Keystone, so they can be used easily.
-export type DatabaseAPIs = {
-  prisma?: any;
-};
+// Images API
 
 export type ImageMode = 'local';
 

tests/api-tests/relationships/crud/one-to-one.test.ts

@@ -2,7 +2,6 @@ import { gen, sampleOne } from 'testcheck';
 import { text, relationship } from '@keystone-next/fields';
 import { createSchema, list } from '@keystone-next/keystone/schema';
 import { multiAdapterRunners, setupFromConfig, testConfig } from '@keystone-next/test-utils-legacy';
-import { getItems } from '@keystone-next/server-side-graphql-client-legacy';
 import type { ProviderName } from '@keystone-next/test-utils-legacy';
 import type { KeystoneContext } from '@keystone-next/types';
 
@@ -578,10 +577,8 @@ multiAdapterRunners().map(({ runner, provider }) =>
             });
 
             // Make sure the original Company does not point to the location
-            const result = await getItems({
-              context,
-              listKey: 'Location',
-              returnFields: 'id name company { id }',
+            const result = await context.lists.Location.findMany({
+              query: 'id name company { id }',
             });
             expect(result).toHaveLength(1);
 
@@ -625,11 +622,7 @@ multiAdapterRunners().map(({ runner, provider }) =>
             });
 
             // Make sure the original Company does not point to the location
-            const result = await getItems({
-              context,
-              listKey: 'Company',
-              returnFields: 'id location { id }',
-            });
+            const result = await context.lists.Company.findMany({ query: 'id location { id }' });
             expect(result).toHaveLength(1);
 
             const result1 = await context.lists.Location.findOne({