diff --git a/packages/next/client/image.tsx b/packages/next/client/image.tsx index 493171d13a24..03f5438f9361 100644 --- 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 index ac8b5aa38195..f7d90774551e 100644 --- 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' /// diff --git a/packages/next/server/base-server.ts b/packages/next/server/base-server.ts index 19e62dcc11f2..6daf2ff74739 100644 --- 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 index 4c74d58775c5..a580ee537efb 100644 --- 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 & { images: Required diff --git a/packages/next/server/config.ts b/packages/next/server/config.ts index 2e334084a915..ea2d27db1b24 100644 --- 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 index e4f121fdcd61..014b6c104a12 100644 --- 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 index c880933f4431..a27c0446eda9 100644 --- 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(imageConfigDefault) diff --git a/packages/next/server/image-config.ts b/packages/next/shared/lib/image-config.ts similarity index 100% rename from packages/next/server/image-config.ts rename to packages/next/shared/lib/image-config.ts