Merge branch 'website_live' into getting-started-edits

docs/components/Announce.tsx

@@ -14,7 +14,11 @@ export function Announce({ children, ...props }: AnnounceProps) {
     <div
       css={{
         '--focus': '#fff',
+        // standard styling (blue)
         background: 'var(--brand-bg)',
+        // special styling (orange gradient)
+        // backgroundColor: 'var(--grad4-2)',
+        // backgroundImage: `linear-gradient(116.01deg, var(--grad4-2), var(--grad4-1))`,
         color: 'var(--brand-text)',
         padding: '1rem',
         textAlign: 'center',

docs/components/Page.tsx

@@ -11,13 +11,38 @@ import { Announce } from '../components/Announce';
 import { TableOfContents } from './docs/TableOfContents';
 import { Wrapper } from './primitives/Wrapper';
 import { EditButton } from './primitives/EditButton';
+// import { Emoji } from './primitives/Emoji';
 import { Breadcrumbs } from './Breadcrumbs';
 import { Sidebar } from './docs/Sidebar';
 import { Stack } from './primitives/Stack';
 import { Header } from './Header';
 import { Footer } from './Footer';
 
 function Announcement() {
+  // special announcement
+  // return (
+  //   <Announce>
+  //     <Emoji symbol="🎤" alt="Microphone" />{' '}
+  //     <a
+  //       href="https://306ucv95ugh.typeform.com/to/TbFERbep"
+  //       rel="noopener noreferrer"
+  //       target="_blank"
+  //     >
+  //       Join us
+  //     </a>{' '}
+  //     for our first <strong>Community Q&A</strong> next{' '}
+  //     <strong>Tuesday Sep 21st @ 3–4pm AEST</strong> –{' '}
+  //     <a
+  //       href="https://306ucv95ugh.typeform.com/to/TbFERbep"
+  //       rel="noopener noreferrer"
+  //       target="_blank"
+  //     >
+  //       Register now
+  //     </a>
+  //     !
+  //   </Announce>
+  // );
+  // standard announcement
   return (
     <Announce>
       Keystone 6 is in <Link href="/updates/roadmap">Community Preview</Link>! For Keystone 5 docs

docs/components/docs/Keystone5DocsCTA.tsx

@@ -0,0 +1,23 @@
+/** @jsxRuntime classic */
+/** @jsx jsx */
+import { jsx } from '@emotion/react';
+
+import { Alert } from '../primitives/Alert';
+
+export function Keystone5DocsCTA() {
+  return (
+    <Alert css={{ margin: '2rem 0' }}>
+      <span
+        css={{
+          display: 'inline-block',
+          margin: '0 1rem 0rem 0',
+        }}
+      >
+        Using <strong>Keystone 5</strong>? Find the docs at{' '}
+        <a href="https://v5.keystonejs.com/documentation" target="_blank">
+          v5.keystonejs.com
+        </a>
+      </span>
+    </Alert>
+  );
+}

docs/pages/_document.tsx

@@ -72,6 +72,7 @@ class MyDocument extends Document {
             async
             src="https://cdn.jsdelivr.net/npm/docsearch.js@2/dist/cdn/docsearch.min.js"
           />
+          <script async data-api="/_sb" src="/sb.js" />
           <script async src={`https://www.googletagmanager.com/gtag/js?id=${GA_TRACKING_ID}`} />
           <script
             dangerouslySetInnerHTML={{

docs/pages/docs/apis/fields.mdx

@@ -577,7 +577,7 @@ export default config({
 
 ### virtual
 
-A `virtual` field represents a value which is computed a read time, rather than stored in the database.
+A `virtual` field represents a value which is computed at read time, rather than stored in the database.
 See the [virtual fields guide](../guides/virtual-fields) for details on how to use virtual fields.
 
 Options:

docs/pages/docs/apis/schema.mdx

@@ -158,7 +158,7 @@ Options:
 
 - `description` (default: `undefined`): Sets the description of the associated GraphQL type in the generated GraphQL API documentation.
   Overrides the list-level `description` config option.
-- `plural`: (default: Pluralised list key, e.g. `'Users'`): Overrides the name used in multiple mutations and queries (e.g. `allUsers`, `updateUsers`, etc).
+- `plural`: (default: Pluralised list key, e.g. `'Users'`): Overrides the name used in multiple mutations and queries (e.g. `users()`, `updateUsers()`, etc).
 - `queryLimits` (default: `undefined`): Allows you to limit the number of results returned from a query to this list in the GraphQL API.
   See also the global `graphql.queryLimits` option in the [System Configuration API](./config).
 - `cacheHint` (default: `undefined`): Allows you to specific the [dynamic cache control hints](https://www.apollographql.com/docs/apollo-server/performance/caching/#in-your-resolvers-dynamic) used for queries to this this list.

docs/pages/docs/index.tsx

@@ -4,6 +4,7 @@ import { jsx } from '@emotion/react';
 import Link from 'next/link';
 
 import { CommunitySlackCTA } from '../../components/docs/CommunitySlackCTA';
+import { Keystone5DocsCTA } from '../../components/docs/Keystone5DocsCTA';
 import { Examples } from '../../components/docs/ExamplesList';
 import { Walkthroughs } from '../../components/docs/WalkthroughsList';
 import { Type } from '../../components/primitives/Type';
@@ -32,6 +33,7 @@ export default function Docs() {
         Developer Docs
       </Type>
 
+      <Keystone5DocsCTA />
       <CommunitySlackCTA />
 
       <Type as="h2" look="heading30" margin="0 0 1rem 0">

docs/redirects.js

@@ -124,4 +124,18 @@ const CURRENT = [
   },
 ];
 
-module.exports = [...CURRENT, ...ORIGINAL_NEXT, ...KEYSTONE_5, ...KEYSTONE_4];
+/* Splitbee Proxy */
+const SPLITBEE = [
+  {
+    source: '/sb.js',
+    destination: 'https://cdn.splitbee.io/sb.js',
+    permanent: false,
+  },
+  {
+    source: '/_sb/:slug',
+    destination: 'https://hive.splitbee.io/:slug',
+    permanent: false,
+  },
+];
+
+module.exports = [...SPLITBEE, ...CURRENT, ...ORIGINAL_NEXT, ...KEYSTONE_5, ...KEYSTONE_4];