From 50c82aa15f635598da14ed61ac3be7f4088632bb Mon Sep 17 00:00:00 2001
From: Tim Leslie <timl@thinkmill.com.au>
Date: Fri, 23 Apr 2021 12:09:38 +1000
Subject: [PATCH] Move createImagesContext inside makeCreateContext

---
 .changeset/famous-avocados-happen.md            | 5 +++++
 packages-next/keystone/src/lib/createContext.ts | 8 +++++---
 packages-next/keystone/src/lib/createSystem.ts  | 3 +--
 3 files changed, 11 insertions(+), 5 deletions(-)
 create mode 100644 .changeset/famous-avocados-happen.md

diff --git a/.changeset/famous-avocados-happen.md b/.changeset/famous-avocados-happen.md
new file mode 100644
index 00000000000..c33231db16c
--- /dev/null
+++ b/.changeset/famous-avocados-happen.md
@@ -0,0 +1,5 @@
+---
+'@keystone-next/keystone': patch
+---
+
+Moved the call to `createImagesContext` into `makeCreateContext()`.
diff --git a/packages-next/keystone/src/lib/createContext.ts b/packages-next/keystone/src/lib/createContext.ts
index 48ffd1ef594..11a3d64b851 100644
--- a/packages-next/keystone/src/lib/createContext.ts
+++ b/packages-next/keystone/src/lib/createContext.ts
@@ -5,23 +5,25 @@ import type {
   KeystoneContext,
   KeystoneGraphQLAPI,
   BaseKeystone,
-  ImagesContext,
+  ImagesConfig,
 } from '@keystone-next/types';
 
 import { itemDbAPIForList, itemAPIForList, getArgsFactory } from './itemAPI';
 import { accessControlContext, skipAccessControlContext } from './createAccessControlContext';
+import { createImagesContext } from './createImagesContext';
 
 export function makeCreateContext({
   graphQLSchema,
   internalSchema,
   keystone,
-  images,
+  imagesConfig,
 }: {
   graphQLSchema: GraphQLSchema;
   internalSchema: GraphQLSchema;
   keystone: BaseKeystone;
-  images: ImagesContext | undefined;
+  imagesConfig?: ImagesConfig;
 }) {
+  const images = createImagesContext(imagesConfig);
   // We precompute these helpers here rather than every time createContext is called
   // because they require parsing the entire schema, which is potentially expensive.
   const publicGetArgsByList: Record<string, ReturnType<typeof getArgsFactory>> = {};
diff --git a/packages-next/keystone/src/lib/createSystem.ts b/packages-next/keystone/src/lib/createSystem.ts
index 6b9a3244012..b4821f97d43 100644
--- a/packages-next/keystone/src/lib/createSystem.ts
+++ b/packages-next/keystone/src/lib/createSystem.ts
@@ -3,7 +3,6 @@ import type { KeystoneConfig } from '@keystone-next/types';
 import { createGraphQLSchema } from './createGraphQLSchema';
 import { makeCreateContext } from './createContext';
 import { createKeystone } from './createKeystone';
-import { createImagesContext } from './createImagesContext';
 
 export function createSystem(config: KeystoneConfig, prismaClient?: any) {
   const keystone = createKeystone(config, prismaClient);
@@ -16,7 +15,7 @@ export function createSystem(config: KeystoneConfig, prismaClient?: any) {
     keystone,
     graphQLSchema,
     internalSchema,
-    images: createImagesContext(config.images),
+    imagesConfig: config.images,
   });
 
   return { keystone, graphQLSchema, createContext };