From cd61d6bd641585228f5f84f716840901689d5bb8 Mon Sep 17 00:00:00 2001
From: juniortour <juniortour@qq.com>
Date: Sat, 5 Feb 2022 12:36:12 +0800
Subject: [PATCH] fix: add ImageConfigContext to both server and client

fix: renderOpts.image is string

fix: cleanup

fix: parse error
---
 packages/next/client/image.tsx                           | 2 +-
 packages/next/client/index.tsx                           | 3 +--
 packages/next/server/render.tsx                          | 9 +++++----
 ...e-image-config-context.ts => image-config-context.ts} | 0
 4 files changed, 7 insertions(+), 7 deletions(-)
 rename packages/next/shared/lib/{runtime-image-config-context.ts => image-config-context.ts} (100%)

diff --git a/packages/next/client/image.tsx b/packages/next/client/image.tsx
index d30e7d5e8ecea..4c3fd33435fc1 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 { ImageConfigContext } from '../shared/lib/runtime-image-config-context'
+import { ImageConfigContext } from '../shared/lib/image-config-context'
 
 const loadedImageURLs = new Set<string>()
 const allImgs = new Map<
diff --git a/packages/next/client/index.tsx b/packages/next/client/index.tsx
index e5ca8ef6d39e5..4b136f0d6293a 100644
--- a/packages/next/client/index.tsx
+++ b/packages/next/client/index.tsx
@@ -38,8 +38,7 @@ import {
   trackWebVitalMetric,
 } from './streaming/vitals'
 import { RefreshContext } from './streaming/refresh'
-import { ImageConfigContext } from '../shared/lib/runtime-image-config-context'
-import { StyleRegistry } from 'styled-jsx'
+import { ImageConfigContext } from '../shared/lib/image-config-context'
 import { ImageConfigComplete } from '../server/image-config'
 
 /// <reference types="react-dom/experimental" />
diff --git a/packages/next/server/render.tsx b/packages/next/server/render.tsx
index b49e75f2f0ce1..0353f678e14df 100644
--- a/packages/next/server/render.tsx
+++ b/packages/next/server/render.tsx
@@ -61,8 +61,7 @@ import { DomainLocale } from './config'
 import RenderResult from './render-result'
 import isError from '../lib/is-error'
 import { readableStreamTee } from './web/utils'
-import { ImageConfigContext } from '../shared/lib/runtime-image-config-context'
-import { ImageConfigComplete } from './image-config'
+import { ImageConfigContext } from '../shared/lib/image-config-context'
 
 let optimizeAmp: typeof import('./optimize-amp').default
 let getFontDefinitionFromManifest: typeof import('./font-utils').getFontDefinitionFromManifest
@@ -234,7 +233,7 @@ export type RenderOptsPartial = {
   serverComponents?: boolean
   customServer?: boolean
   crossOrigin?: string
-  images: ImageConfigComplete
+  images: string
 }
 
 export type RenderOpts = LoadComponentsReturnType & RenderOptsPartial
@@ -717,7 +716,9 @@ export async function renderToHTML(
             value={(moduleName) => reactLoadableModules.push(moduleName)}
           >
             <StyleRegistry registry={jsxStyleRegistry}>
-              <ImageConfigContext.Provider value={images}>
+              <ImageConfigContext.Provider
+                value={images ? JSON.parse(images) : null}
+              >
                 {children}
               </ImageConfigContext.Provider>
             </StyleRegistry>
diff --git a/packages/next/shared/lib/runtime-image-config-context.ts b/packages/next/shared/lib/image-config-context.ts
similarity index 100%
rename from packages/next/shared/lib/runtime-image-config-context.ts
rename to packages/next/shared/lib/image-config-context.ts