Lock file maintenance (#6890)

* Lock file maintenance

* explicitly declare return type of createExpressServer

* Fix things

* Update createExpressServer.ts

* add runtime classic to problematic docs pages

* fix prisma clientVersion in tests

* Create happy-flies-do.md

* more docs runtime fixes

* more docs runtime fixes

Co-authored-by: Renovate Bot <bot@renovateapp.com>
Co-authored-by: gwyneplaine <cc.lee@live.com.au>
Co-authored-by: mitchellhamilton <mitchell@hamil.town>

.changeset/happy-flies-do.md

@@ -0,0 +1,5 @@
+---
+"@keystone-next/keystone": patch
+---
+
+Explicitly declare return type on createExpressServer 

docs/components/Header.tsx

@@ -1,3 +1,4 @@
+/** @jsxRuntime classic */
 /** @jsx jsx  */
 import {
   createContext,

docs/components/Markdown.tsx

@@ -1,7 +1,8 @@
+/** @jsxRuntime classic */
 /** @jsx jsx  */
 import { MDXProvider } from '@mdx-js/react';
 import { jsx } from '@emotion/react';
-import { ReactNode } from 'react';
+import { ReactElement, ReactNode } from 'react';
 
 import { H1, H2, H3, H4, H5, H6 } from '../components/docs/Heading';
 import { Code, InlineCode } from '../components/primitives/Code';
@@ -27,7 +28,7 @@ export function Markdown({
   children: ReactNode;
   description: string;
 }) {
-  const headings = getHeadings(children);
+  const headings = getHeadings((children as ReactElement).props.children);
   const firstHeading = headings[0]?.label;
 
   if (!firstHeading) {

docs/components/Page.tsx

@@ -1,3 +1,4 @@
+/** @jsxRuntime classic */
 /** @jsx jsx  */
 import { useRef, Fragment, ReactNode } from 'react';
 import { useRouter } from 'next/router';

docs/components/docs/Sidebar.tsx

@@ -1,3 +1,4 @@
+/** @jsxRuntime classic */
 /** @jsx jsx  */
 import { jsx } from '@emotion/react';
 

docs/components/icons/Bulb.tsx

@@ -1,3 +1,4 @@
+/** @jsxRuntime classic */
 /** @jsx jsx */
 import { jsx } from '@emotion/react';
 

docs/components/icons/Video.tsx

@@ -1,3 +1,4 @@
+/** @jsxRuntime classic */
 /** @jsx jsx */
 import { jsx } from '@emotion/react';
 

docs/components/primitives/EditButton.tsx

@@ -1,3 +1,4 @@
+/** @jsxRuntime classic */
 /** @jsx jsx */
 import { jsx } from '@emotion/react';
 

docs/lib/getHeadings.ts

@@ -10,14 +10,13 @@ export type Heading = {
 export function getHeadings(children: ReactNode): Heading[] {
   return Children.toArray(children)
     .filter((child: any) => {
-      return child.props?.mdxType && ['h1', 'h2', 'h3'].includes(child.props.mdxType);
+      return child.type && ['h1', 'h2', 'h3'].includes(child.type);
     })
     .map((child: any) => {
       const childrenText = Array.isArray(child.props.children)
         ? child.props.children.join('').replace('[object Object]', '')
         : child.props.children;
-      const depth =
-        (child.props?.mdxType && parseInt(child.props.mdxType.replace('h', ''), 0)) ?? 0;
+      const depth = (child.type && parseInt(child.type.replace('h', ''), 0)) ?? 0;
       return {
         id: depth > 0 ? `${slugify(childrenText)}` : '',
         depth,

docs/pages/404.tsx

@@ -1,3 +1,4 @@
+/** @jsxRuntime classic */
 /** @jsx jsx  */
 import { jsx } from '@emotion/react';
 import { useRouter } from 'next/router';

docs/pages/for-content-management.tsx

@@ -1,3 +1,4 @@
+/** @jsxRuntime classic */
 /** @jsx jsx  */
 import { jsx } from '@emotion/react';
 import Image from 'next/image';

docs/pages/for-developers.tsx

@@ -1,3 +1,4 @@
+/** @jsxRuntime classic */
 /** @jsx jsx  */
 import { jsx } from '@emotion/react';
 import Image from 'next/image';

docs/pages/for-organisations.tsx

@@ -1,3 +1,4 @@
+/** @jsxRuntime classic */
 /** @jsx jsx  */
 import { jsx } from '@emotion/react';
 import Image from 'next/image';

docs/pages/index.tsx

@@ -1,3 +1,4 @@
+/** @jsxRuntime classic */
 /** @jsx jsx  */
 import { jsx } from '@emotion/react';
 import Image from 'next/image';

docs/pages/updates/index.tsx

@@ -1,3 +1,4 @@
+/** @jsxRuntime classic */
 /** @jsx jsx  */
 import { HTMLAttributes, ReactNode } from 'react';
 import { jsx } from '@emotion/react';

docs/pages/updates/roadmap.tsx

@@ -1,3 +1,4 @@
+/** @jsxRuntime classic */
 /** @jsx jsx  */
 import { ComponentProps, Fragment, ReactNode } from 'react';
 import { jsx } from '@emotion/react';

docs/pages/why-keystone.tsx

@@ -1,3 +1,4 @@
+/** @jsxRuntime classic */
 /** @jsx jsx  */
 import { jsx } from '@emotion/react';
 import Image from 'next/image';

packages/keystone/src/lib/server/createExpressServer.ts

@@ -3,6 +3,7 @@ import cors, { CorsOptions } from 'cors';
 import express from 'express';
 import { GraphQLSchema } from 'graphql';
 import { graphqlUploadExpress } from 'graphql-upload';
+import { ApolloServer } from 'apollo-server-express';
 import type { KeystoneConfig, CreateContext, SessionStrategy, GraphQLConfig } from '../../types';
 import { createSessionContext } from '../../session';
 import { DEFAULT_FILES_STORAGE_PATH } from '../context/createFilesContext';
@@ -57,7 +58,13 @@ export const createExpressServer = async (
   config: KeystoneConfig,
   graphQLSchema: GraphQLSchema,
   createContext: CreateContext
-) => {
+): Promise<{
+  expressServer: express.Express;
+  apolloServer: ApolloServer<{
+    req: IncomingMessage;
+    res: ServerResponse;
+  }>;
+}> => {
   const expressServer = express();
 
   if (config.server?.cors) {

tests/api-tests/utils.ts

@@ -136,7 +136,7 @@ export const expectPrismaError = (
     args.map(({ path, message, code, target }) => ({
       extensions: {
         code: 'KS_PRISMA_ERROR',
-        prisma: { clientVersion: '3.4.0', code, meta: { target } },
+        prisma: { clientVersion: '3.4.2', code, meta: { target } },
       },
       path,
       message,