fix: make sure image-config gets transpiled (#34677)

vercel · Feb 22, 2022 · 6178e7c · 6178e7c
1 parent 8f65c38
commit 6178e7c
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 10 deletions.
diff --git a/packages/next/client/image.tsx b/packages/next/client/image.tsx
@@ -5,7 +5,7 @@ import {
   imageConfigDefault,
   LoaderValue,
   VALID_LOADERS,
-} from '../server/image-config'
+} from '../shared/lib/image-config'
 import { useIntersection } from './use-intersection'
 import { ImageConfigContext } from '../shared/lib/image-config-context'
 

diff --git a/packages/next/client/index.tsx b/packages/next/client/index.tsx
@@ -39,7 +39,7 @@ import {
 } from './streaming/vitals'
 import { RefreshContext } from './streaming/refresh'
 import { ImageConfigContext } from '../shared/lib/image-config-context'
-import { ImageConfigComplete } from '../server/image-config'
+import { ImageConfigComplete } from '../shared/lib/image-config'
 
 /// <reference types="react-dom/experimental" />
 

diff --git a/packages/next/server/base-server.ts b/packages/next/server/base-server.ts
@@ -62,7 +62,7 @@ import { MIDDLEWARE_ROUTE } from '../lib/constants'
 import { addRequestMeta, getRequestMeta } from './request-meta'
 import { createHeaderRoute, createRedirectRoute } from './server-route-utils'
 import { PrerenderManifest } from '../build'
-import { ImageConfigComplete } from './image-config'
+import { ImageConfigComplete } from '../shared/lib/image-config'
 
 export type FindComponentsResult = {
   components: LoadComponentsReturnType

diff --git a/packages/next/server/config-shared.ts b/packages/next/server/config-shared.ts
@@ -5,7 +5,7 @@ import {
   ImageConfig,
   ImageConfigComplete,
   imageConfigDefault,
-} from './image-config'
+} from '../shared/lib/image-config'
 
 export type NextConfigComplete = Required<NextConfig> & {
   images: Required<ImageConfigComplete>

diff --git a/packages/next/server/config.ts b/packages/next/server/config.ts
@@ -14,7 +14,11 @@ import {
   normalizeConfig,
 } from './config-shared'
 import { loadWebpackHook } from './config-utils'
-import { ImageConfig, imageConfigDefault, VALID_LOADERS } from './image-config'
+import {
+  ImageConfig,
+  imageConfigDefault,
+  VALID_LOADERS,
+} from '../shared/lib/image-config'
 import { loadEnvConfig } from '@next/env'
 import { hasNextSupport } from '../telemetry/ci-info'
 

diff --git a/packages/next/server/render.tsx b/packages/next/server/render.tsx
@@ -11,7 +11,7 @@ import type {
   RenderPage,
   RenderPageResult,
 } from '../shared/lib/utils'
-import type { ImageConfigComplete } from './image-config'
+import type { ImageConfigComplete } from '../shared/lib/image-config'
 import type { Redirect } from '../lib/load-custom-routes'
 import type { NextApiRequestCookies, __ApiPreviewProps } from './api-utils'
 import type { FontManifest } from './font-utils'

diff --git a/packages/next/shared/lib/image-config-context.ts b/packages/next/shared/lib/image-config-context.ts
@@ -1,8 +1,5 @@
 import React from 'react'
-import {
-  ImageConfigComplete,
-  imageConfigDefault,
-} from '../../server/image-config'
+import { ImageConfigComplete, imageConfigDefault } from './image-config'
 
 export const ImageConfigContext =
   React.createContext<ImageConfigComplete>(imageConfigDefault)

diff --git a/packages/next/server/image-config.ts → packages/next/shared/lib/image-config.ts b/packages/next/server/image-config.ts → packages/next/shared/lib/image-config.ts