fix: add ImageConfigContext to both server and client

fix: renderOpts.image is string fix: cleanup fix: parse error
vercel · Feb 5, 2022 · cd61d6b · cd61d6b
1 parent ffeda9c
commit cd61d6b
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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/...hared/lib/runtime-image-config-context.ts → ...s/next/shared/lib/image-config-context.ts b/...hared/lib/runtime-image-config-context.ts → ...s/next/shared/lib/image-config-context.ts