From 37ded210dacc15c73dcb922db9b50a9c50d0dbc8 Mon Sep 17 00:00:00 2001 From: juniortour Date: Sat, 5 Feb 2022 01:08:48 +0800 Subject: [PATCH] fix: rename to ImageConfigContext --- packages/next/client/image.tsx | 4 ++-- packages/next/server/render.tsx | 11 +++++------ .../next/shared/lib/runtime-image-config-context.ts | 4 ++-- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/packages/next/client/image.tsx b/packages/next/client/image.tsx index 5c49f177f63c5..62df847837b19 100644 --- a/packages/next/client/image.tsx +++ b/packages/next/client/image.tsx @@ -7,7 +7,7 @@ import { VALID_LOADERS, } from '../server/image-config' import { useIntersection } from './use-intersection' -import { RuntimeImageConfigContext } from '../shared/lib/runtime-image-config-context' +import { ImageConfigContext } from '../shared/lib/runtime-image-config-context' const loadedImageURLs = new Set() const allImgs = new Map< @@ -401,7 +401,7 @@ export default function Image({ isLazy = false } - setRuntimeImageConfig(useContext(RuntimeImageConfigContext)) + setRuntimeImageConfig(useContext(ImageConfigContext)) if (process.env.NODE_ENV !== 'production') { if (!src) { diff --git a/packages/next/server/render.tsx b/packages/next/server/render.tsx index e4e59c844a7c6..de8364c171563 100644 --- a/packages/next/server/render.tsx +++ b/packages/next/server/render.tsx @@ -63,7 +63,8 @@ import { DomainLocale } from './config' import RenderResult, { NodeWritablePiper } from './render-result' import isError from '../lib/is-error' import { readableStreamTee } from './web/utils' -import { RuntimeImageConfigContext } from '../shared/lib/runtime-image-config-context' +import { ImageConfigContext } from '../shared/lib/runtime-image-config-context' +import { ImageConfigComplete } from './image-config' let Writable: typeof import('stream').Writable let Buffer: typeof import('buffer').Buffer @@ -238,7 +239,7 @@ export type RenderOptsPartial = { serverComponents?: boolean customServer?: boolean crossOrigin?: string - images: string + images: ImageConfigComplete } export type RenderOpts = LoadComponentsReturnType & RenderOptsPartial @@ -721,11 +722,9 @@ export async function renderToHTML( value={(moduleName) => reactLoadableModules.push(moduleName)} > - + {children} - + diff --git a/packages/next/shared/lib/runtime-image-config-context.ts b/packages/next/shared/lib/runtime-image-config-context.ts index f8b578e791018..c880933f44313 100644 --- a/packages/next/shared/lib/runtime-image-config-context.ts +++ b/packages/next/shared/lib/runtime-image-config-context.ts @@ -4,9 +4,9 @@ import { imageConfigDefault, } from '../../server/image-config' -export const RuntimeImageConfigContext = +export const ImageConfigContext = React.createContext(imageConfigDefault) if (process.env.NODE_ENV !== 'production') { - RuntimeImageConfigContext.displayName = 'RuntimeImageConfigContext' + ImageConfigContext.displayName = 'ImageConfigContext' }