Create separate entrypoint for next/types

Removes a bunch of `@ts-ignore` and is more in line with our existing entrypoints.
Required to entangle the public/internal types plit

Author: eps1lon

packages/next/package.json

@@ -49,8 +49,9 @@
     "amp.d.ts",
     "og.js",
     "og.d.ts",
+    "types.d.ts",
+    "types.js",
     "index.d.ts",
-    "types/index.d.ts",
     "types/global.d.ts",
     "types/compiled.d.ts",
     "image-types/global.d.ts",

packages/next/src/build/analysis/get-page-static-info.ts

@@ -4,7 +4,7 @@ import type { Middleware, RouteHas } from '../../lib/load-custom-routes'
 import { promises as fs } from 'fs'
 import LRUCache from 'next/dist/compiled/lru-cache'
 import picomatch from 'next/dist/compiled/picomatch'
-import type { ServerRuntime } from 'next/types'
+import type { ServerRuntime } from '../../types'
 import {
   extractExportedConstValue,
   UnsupportedValueError,

packages/next/src/build/babel/plugins/next-page-config.ts

@@ -5,7 +5,7 @@ import type {
   Visitor,
   NodePath,
 } from 'next/dist/compiled/babel/core'
-import type { PageConfig } from 'next/types'
+import type { PageConfig } from '../../../types'
 import { STRING_LITERAL_DROP_BUNDLE } from '../../../shared/lib/constants'
 
 const CONFIG_KEY = 'config'

packages/next/src/build/entries.ts

@@ -50,7 +50,7 @@ import {
 import { getPageStaticInfo } from './analysis/get-page-static-info'
 import { normalizePathSep } from '../shared/lib/page-path/normalize-path-sep'
 import { normalizePagePath } from '../shared/lib/page-path/normalize-page-path'
-import type { ServerRuntime } from '../../types'
+import type { ServerRuntime } from '../types'
 import { normalizeAppPath } from '../shared/lib/router/utils/app-paths'
 import { encodeMatchers } from './webpack/loaders/next-middleware-loader'
 import type { EdgeFunctionLoaderOptions } from './webpack/loaders/next-edge-function-loader'

packages/next/src/build/utils.ts

@@ -6,7 +6,7 @@ import type {
   GetStaticPathsResult,
   PageConfig,
   ServerRuntime,
-} from 'next/types'
+} from '../types'
 import type { BuildManifest } from '../server/get-page-files'
 import type {
   Redirect,

packages/next/src/build/webpack/loaders/next-edge-ssr-loader/index.ts

@@ -1,5 +1,5 @@
 import type webpack from 'webpack'
-import type { SizeLimit } from '../../../../../types'
+import type { SizeLimit } from '../../../../types'
 import type { PagesRouteModuleOptions } from '../../../../server/future/route-modules/pages/module'
 import type { MiddlewareConfig } from '../../../analysis/get-page-static-info'
 

packages/next/src/build/webpack/loaders/next-edge-ssr-loader/render.ts

@@ -15,7 +15,7 @@ import {
 import { SERVER_RUNTIME } from '../../../../lib/constants'
 import type { ManifestRewriteRoute, PrerenderManifest } from '../../..'
 import { normalizeAppPath } from '../../../../shared/lib/router/utils/app-paths'
-import type { SizeLimit } from '../../../../../types'
+import type { SizeLimit } from '../../../../types'
 import { internal_getCurrentFunctionWaitUntil } from '../../../../server/web/internal-edge-wait-until'
 import type { PAGE_TYPES } from '../../../../lib/page-types'
 import type { NextRequestHint } from '../../../../server/web/adapter'

packages/next/src/build/webpack/loaders/next-swc-loader.ts

@@ -26,7 +26,7 @@ IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 DEALINGS IN THE SOFTWARE.
 */
 
-import type { NextConfig } from '../../../../types'
+import type { NextConfig } from '../../../types'
 import type { WebpackLayerName } from '../../../lib/constants'
 import { isWasm, transform } from '../../swc'
 import { getLoaderSWCOptions } from '../../swc/options'

packages/next/src/build/webpack/plugins/next-types-plugin/index.ts

@@ -441,8 +441,8 @@ declare namespace __next_route_internal_types__ {
 }
 
 declare module 'next' {
-  export { default } from 'next/types/index.js'
-  export * from 'next/types/index.js'
+  export { default } from 'next/types.js'
+  export * from 'next/types.js'
 
   export type Route<T extends string = string> =
     __next_route_internal_types__.RouteImpl<T>

packages/next/src/lib/constants.ts

@@ -1,4 +1,4 @@
-import type { ServerRuntime } from '../../types'
+import type { ServerRuntime } from '../types'
 
 export const NEXT_QUERY_PARAM_PREFIX = 'nxtP'
 

packages/next/src/lib/is-edge-runtime.ts

@@ -1,4 +1,4 @@
-import type { ServerRuntime } from '../../types'
+import type { ServerRuntime } from '../types'
 import { SERVER_RUNTIME } from './constants'
 
 export function isEdgeRuntime(value?: string): value is ServerRuntime {

packages/next/src/server/api-utils/node/api-resolver.ts

@@ -1,6 +1,6 @@
 import type { IncomingMessage, ServerResponse } from 'http'
 import type { NextApiRequest, NextApiResponse } from '../../../shared/lib/utils'
-import type { PageConfig, ResponseLimit } from 'next/types'
+import type { PageConfig, ResponseLimit } from '../../../types'
 import type { __ApiPreviewProps } from '../.'
 import type { CookieSerializeOptions } from 'next/dist/compiled/cookie'
 

packages/next/src/server/api-utils/node/parse-body.ts

@@ -1,8 +1,8 @@
 import type { IncomingMessage } from 'http'
-import type { SizeLimit } from 'next/types'
 
 import { parse } from 'next/dist/compiled/content-type'
 import isError from '../../../lib/is-error'
+import type { SizeLimit } from '../../../types'
 import { ApiError } from '../index'
 
 /**

packages/next/src/server/api-utils/node/try-get-preview-data.ts

@@ -3,7 +3,7 @@ import type { NextApiResponse } from '../../../shared/lib/utils'
 import { checkIsOnDemandRevalidate } from '../.'
 import type { __ApiPreviewProps } from '../.'
 import type { BaseNextRequest, BaseNextResponse } from '../../base-http'
-import type { PreviewData } from 'next/types'
+import type { PreviewData } from '../../../types'
 
 import {
   clearPreviewData,

packages/next/src/server/app-render/action-handler.ts

@@ -1,5 +1,5 @@
 import type { IncomingHttpHeaders, OutgoingHttpHeaders } from 'http'
-import type { SizeLimit } from '../../../types'
+import type { SizeLimit } from '../../types'
 import type { RequestStore } from '../../client/components/request-async-storage.external'
 import type { AppRenderContext, GenerateFlight } from './app-render'
 import type { AppPageModule } from '../../server/future/route-modules/app-page/module'

packages/next/src/server/app-render/types.ts

@@ -1,5 +1,5 @@
 import type { LoadComponentsReturnType } from '../load-components'
-import type { ServerRuntime, SizeLimit } from '../../../types'
+import type { ServerRuntime, SizeLimit } from '../../types'
 import type { NextConfigComplete } from '../../server/config-shared'
 import type { ClientReferenceManifest } from '../../build/webpack/plugins/flight-manifest-plugin'
 import type { NextFontManifest } from '../../build/webpack/plugins/next-font-manifest-plugin'

packages/next/src/server/base-server.ts

@@ -20,7 +20,7 @@ import {
   normalizeRepeatedSlashes,
   MissingStaticPage,
 } from '../shared/lib/utils'
-import type { PreviewData } from 'next/types'
+import type { PreviewData } from '../types'
 import type { PagesManifest } from '../build/webpack/plugins/pages-manifest-plugin'
 import type { BaseNextRequest, BaseNextResponse } from './base-http'
 import type {

packages/next/src/server/config-schema.ts

@@ -4,7 +4,7 @@ import { VALID_LOADERS } from '../shared/lib/image-config'
 import { z } from 'next/dist/compiled/zod'
 import type zod from 'next/dist/compiled/zod'
 
-import type { SizeLimit } from '../../types'
+import type { SizeLimit } from '../types'
 import type {
   ExportPathMap,
   TurboLoaderItem,

packages/next/src/server/config-shared.ts

@@ -9,7 +9,7 @@ import type {
 import type { SubresourceIntegrityAlgorithm } from '../build/webpack/plugins/subresource-integrity-plugin'
 import type { WEB_VITALS } from '../shared/lib/utils'
 import type { NextParsedUrlQuery } from './request-meta'
-import type { SizeLimit } from '../../types'
+import type { SizeLimit } from '../types'
 import type { SwrDelta } from './lib/revalidate'
 
 export type NextConfigComplete = Required<NextConfig> & {

packages/next/src/server/future/route-modules/pages-api/module.ts

@@ -1,6 +1,6 @@
 import type { IncomingMessage, ServerResponse } from 'http'
 import type { PagesAPIRouteDefinition } from '../../route-definitions/pages-api-route-definition'
-import type { PageConfig } from '../../../../../types'
+import type { PageConfig } from '../../../../types'
 import type { ParsedUrlQuery } from 'querystring'
 import { wrapApiHandler, type __ApiPreviewProps } from '../../../api-utils'
 import type { RouteModuleOptions } from '../route-module'

packages/next/src/server/future/route-modules/pages/module.ts

@@ -5,7 +5,7 @@ import type {
   GetStaticProps,
   NextComponentType,
   PageConfig,
-} from '../../../../../types'
+} from '../../../../types'
 import type { PagesRouteDefinition } from '../../route-definitions/pages-route-definition'
 import type { NextParsedUrlQuery } from '../../../request-meta'
 import type { RenderOpts } from '../../../render'

packages/next/src/server/lib/router-utils/resolve-routes.ts

@@ -3,7 +3,7 @@ import type { IncomingMessage, ServerResponse } from 'http'
 import type { NextConfigComplete } from '../../config-shared'
 import type { RenderServer, initialize } from '../router-server'
 import type { PatchMatcher } from '../../../shared/lib/router/utils/path-match'
-import type { Redirect } from '../../../../types'
+import type { Redirect } from '../../../types'
 import type { Header } from '../../../lib/load-custom-routes'
 import type { UnwrapPromise } from '../../../lib/coalesced-function'
 import type { NextUrlWithParsedQuery } from '../../request-meta'

packages/next/src/server/load-components.ts

@@ -9,7 +9,7 @@ import type {
   GetStaticPaths,
   GetServerSideProps,
   GetStaticProps,
-} from 'next/types'
+} from '../types'
 import type { RouteModule } from './future/route-modules/route-module'
 import type { BuildManifest } from './get-page-files'
 import type { ActionManifest } from '../build/webpack/plugins/flight-client-entry-plugin'

packages/next/src/server/load-default-error-components.ts

@@ -9,7 +9,7 @@ import type {
   GetStaticPaths,
   GetServerSideProps,
   GetStaticProps,
-} from 'next/types'
+} from '../types'
 import type { RouteModule } from './future/route-modules/route-module'
 import type { BuildManifest } from './get-page-files'
 

packages/next/src/server/render.tsx

@@ -29,7 +29,7 @@ import type {
   PreviewData,
   ServerRuntime,
   SizeLimit,
-} from 'next/types'
+} from '../types'
 import type { UnwrapPromise } from '../lib/coalesced-function'
 import type { ReactReadableStream } from './stream-utils/node-web-streams-helper'
 import type { ClientReferenceManifest } from '../build/webpack/plugins/flight-manifest-plugin'

packages/next/src/server/setup-http-agent-env.ts

@@ -1,4 +1,4 @@
-import type { NextConfig } from '../../types'
+import type { NextConfig } from '../types'
 import { Agent as HttpAgent } from 'http'
 import { Agent as HttpsAgent } from 'https'
 

packages/next/src/shared/lib/html-context.shared-runtime.ts

@@ -1,5 +1,5 @@
 import type { BuildManifest } from '../../server/get-page-files'
-import type { ServerRuntime } from 'next/types'
+import type { ServerRuntime } from '../../types'
 import type { NEXT_DATA } from './utils'
 import type { FontConfig } from '../../server/font-utils'
 import type { NextFontManifest } from '../../build/webpack/plugins/next-font-manifest-plugin'

packages/next/src/shared/lib/utils.ts

@@ -5,7 +5,7 @@ import type { Env } from '@next/env'
 import type { IncomingMessage, ServerResponse } from 'http'
 import type { NextRouter } from './router/router'
 import type { ParsedUrlQuery } from 'querystring'
-import type { PreviewData } from 'next/types'
+import type { PreviewData } from '../../types'
 import type { COMPILER_NAMES } from './constants'
 import type fs from 'fs'
 

packages/next/types/index.d.ts renamed to packages/next/src/types.ts

@@ -11,27 +11,22 @@ import type React from 'react'
 import type { ParsedUrlQuery } from 'querystring'
 import type { IncomingMessage, ServerResponse } from 'http'
 
-import {
+import type {
   NextPageContext,
   NextComponentType,
   NextApiResponse,
   NextApiRequest,
   NextApiHandler,
-  // @ts-ignore This path is generated at build time and conflicts otherwise
-} from '../dist/shared/lib/utils'
+} from './shared/lib/utils'
 
-import type {
-  NextApiRequestCookies,
-  // @ts-ignore This path is generated at build time and conflicts otherwise
-} from '../dist/server/api-utils'
+import type { NextApiRequestCookies } from './server/api-utils'
 
-// @ts-ignore This path is generated at build time and conflicts otherwise
-import next from '../dist/server/next'
+import next from './server/next'
 
 export type ServerRuntime = 'nodejs' | 'experimental-edge' | 'edge' | undefined
 
 // @ts-ignore This path is generated at build time and conflicts otherwise
-export { NextConfig } from '../dist/server/config'
+export { NextConfig } from './server/config'
 
 export type {
   Metadata,
@@ -41,8 +36,7 @@ export type {
   Viewport,
   ResolvingViewport,
   ResolvedViewport,
-  // @ts-ignore This path is generated at build time and conflicts otherwise
-} from '../dist/lib/metadata/types/metadata-interface'
+} from './lib/metadata/types/metadata-interface'
 
 /**
  * Stub route type for typedRoutes before `next dev` or `next build` is run
@@ -160,7 +154,7 @@ export type PageConfig = {
   unstable_excludeFiles?: string[]
 }
 
-export {
+export type {
   NextPageContext,
   NextComponentType,
   NextApiResponse,

packages/next/types.d.ts

@@ -0,0 +1 @@
+export * from './dist/types'

packages/next/types.js

@@ -0,0 +1 @@
+// types-only