Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename app-render/index.tsx to app-render/app-render.tsx #47285

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Expand Up @@ -31,7 +31,7 @@ import type { RenderOpts } from "next/dist/server/app-render/types";
import "next/dist/server/node-polyfill-fetch";
import "next/dist/server/node-polyfill-web-streams";
import "@vercel/turbopack-next/polyfill/async-local-storage";
import { renderToHTMLOrFlight } from "next/dist/server/app-render";
import { renderToHTMLOrFlight } from "next/dist/server/app-render/app-render";
import { PassThrough } from "stream";
import { ServerResponseShim } from "@vercel/turbopack-next/internal/http";
import { headersFromEntries } from "@vercel/turbopack-next/internal/headers";
Expand Down
Expand Up @@ -97,7 +97,7 @@ export default async function edgeSSRLoader(this: any) {
${
isAppDir
? `
import { renderToHTMLOrFlight as appRenderToHTML } from 'next/dist/esm/server/app-render'
import { renderToHTMLOrFlight as appRenderToHTML } from 'next/dist/esm/server/app-render/app-render'
import * as pageMod from ${JSON.stringify(pageModPath)}
const Document = null
const pagesRenderToHTML = null
Expand Down
2 changes: 1 addition & 1 deletion packages/next/src/export/worker.ts
Expand Up @@ -460,7 +460,7 @@ export default async function exportPage({
}
} else {
const { renderToHTMLOrFlight } =
require('../server/app-render') as typeof import('../server/app-render')
require('../server/app-render/app-render') as typeof import('../server/app-render/app-render')

try {
curRenderOpts.params ||= {}
Expand Down
@@ -1,6 +1,6 @@
import { LoaderTree } from '../lib/app-dir-module'
import { FlightRouterState, Segment } from './types'
import { GetDynamicParamFromSegment } from './index'
import { GetDynamicParamFromSegment } from './app-render'
import { PAGE_SEGMENT_KEY } from '../../shared/lib/constants'

export function addSearchParamsIfPageSegment(
Expand Down
Expand Up @@ -5,7 +5,7 @@ import {
decodeText,
} from '../node-web-streams-helper'
import { htmlEscapeJsonString } from '../htmlescape'
import { isEdgeRuntime } from './index'
import { isEdgeRuntime } from './app-render'
import { FlightResponseRef } from './flight-response-ref'

/**
Expand Down
2 changes: 1 addition & 1 deletion packages/next/src/server/next-server.ts
Expand Up @@ -85,7 +85,7 @@ import ResponseCache from './response-cache'
import { IncrementalCache } from './lib/incremental-cache'
import { normalizeAppPath } from '../shared/lib/router/utils/app-paths'

import { renderToHTMLOrFlight as appRenderToHTMLOrFlight } from './app-render'
import { renderToHTMLOrFlight as appRenderToHTMLOrFlight } from './app-render/app-render'
import { setHttpClientAndAgentOptions } from './config'
import { RouteKind } from './future/route-kind'

Expand Down
2 changes: 1 addition & 1 deletion packages/next/src/server/web-server.ts
Expand Up @@ -33,7 +33,7 @@ interface WebServerOptions extends Options {
extendRenderOpts: Partial<BaseServer['renderOpts']> &
Pick<BaseServer['renderOpts'], 'buildId'>
pagesRenderToHTML?: typeof import('./render').renderToHTML
appRenderToHTML?: typeof import('./app-render').renderToHTMLOrFlight
appRenderToHTML?: typeof import('./app-render/app-render').renderToHTMLOrFlight
incrementalCacheHandler?: any
}
}
Expand Down