Unverified Commit ac62406c authored by JJ Kasper's avatar JJ Kasper Committed by GitHub

Revert "Separate routing code from render servers (#52492)" (#53016)

Temporarily reverts these changes to allow patch release first. 

Reverts: https://github.com/vercel/next.js/pull/52149
Reverts: https://github.com/vercel/next.js/pull/52492
parent 1fefb4a8
use std::io::Write;
use anyhow::{bail, Result}; use anyhow::{bail, Result};
use indexmap::indexmap;
use indoc::writedoc;
use next_core::{ use next_core::{
create_page_loader_entry_module, get_asset_path_from_pathname, create_page_loader_entry_module, get_asset_path_from_pathname,
mode::NextMode, mode::NextMode,
...@@ -24,15 +20,10 @@ use next_core::{ ...@@ -24,15 +20,10 @@ use next_core::{
}; };
use turbo_tasks::Vc; use turbo_tasks::Vc;
use turbopack_binding::{ use turbopack_binding::{
turbo::{ turbo::{tasks::Value, tasks_env::ProcessEnv, tasks_fs::FileSystemPath},
tasks::Value,
tasks_env::ProcessEnv,
tasks_fs::{rope::RopeBuilder, File, FileSystemPath},
},
turbopack::{ turbopack::{
build::BuildChunkingContext, build::BuildChunkingContext,
core::{ core::{
asset::AssetContent,
chunk::{ChunkableModule, ChunkingContext, EvaluatableAssets}, chunk::{ChunkableModule, ChunkingContext, EvaluatableAssets},
compile_time_info::CompileTimeInfo, compile_time_info::CompileTimeInfo,
context::AssetContext, context::AssetContext,
...@@ -40,7 +31,6 @@ use turbopack_binding::{ ...@@ -40,7 +31,6 @@ use turbopack_binding::{
output::OutputAsset, output::OutputAsset,
reference_type::{EntryReferenceSubType, ReferenceType}, reference_type::{EntryReferenceSubType, ReferenceType},
source::Source, source::Source,
virtual_source::VirtualSource,
}, },
ecmascript::{ ecmascript::{
chunk::{EcmascriptChunkPlaceable, EcmascriptChunkingContext}, chunk::{EcmascriptChunkPlaceable, EcmascriptChunkingContext},
...@@ -201,8 +191,6 @@ async fn get_page_entries_for_root_directory( ...@@ -201,8 +191,6 @@ async fn get_page_entries_for_root_directory(
Vc::upcast(FileSource::new(app.project_path)), Vc::upcast(FileSource::new(app.project_path)),
next_router_root, next_router_root,
app.next_router_path, app.next_router_path,
app.original_path,
PathType::Page,
)); ));
// This only makes sense on the server. // This only makes sense on the server.
...@@ -213,8 +201,6 @@ async fn get_page_entries_for_root_directory( ...@@ -213,8 +201,6 @@ async fn get_page_entries_for_root_directory(
Vc::upcast(FileSource::new(document.project_path)), Vc::upcast(FileSource::new(document.project_path)),
next_router_root, next_router_root,
document.next_router_path, document.next_router_path,
document.original_path,
PathType::Page,
)); ));
// This only makes sense on both the client and the server, but they should map // This only makes sense on both the client and the server, but they should map
...@@ -226,8 +212,6 @@ async fn get_page_entries_for_root_directory( ...@@ -226,8 +212,6 @@ async fn get_page_entries_for_root_directory(
Vc::upcast(FileSource::new(error.project_path)), Vc::upcast(FileSource::new(error.project_path)),
next_router_root, next_router_root,
error.next_router_path, error.next_router_path,
error.original_path,
PathType::Page,
)); ));
if let Some(api) = api { if let Some(api) = api {
...@@ -237,7 +221,6 @@ async fn get_page_entries_for_root_directory( ...@@ -237,7 +221,6 @@ async fn get_page_entries_for_root_directory(
api, api,
next_router_root, next_router_root,
&mut entries, &mut entries,
PathType::PagesAPI,
) )
.await?; .await?;
} }
...@@ -249,7 +232,6 @@ async fn get_page_entries_for_root_directory( ...@@ -249,7 +232,6 @@ async fn get_page_entries_for_root_directory(
pages, pages,
next_router_root, next_router_root,
&mut entries, &mut entries,
PathType::Page,
) )
.await?; .await?;
} }
...@@ -264,7 +246,6 @@ async fn get_page_entries_for_directory( ...@@ -264,7 +246,6 @@ async fn get_page_entries_for_directory(
pages_structure: Vc<PagesDirectoryStructure>, pages_structure: Vc<PagesDirectoryStructure>,
next_router_root: Vc<FileSystemPath>, next_router_root: Vc<FileSystemPath>,
entries: &mut Vec<Vc<PageEntry>>, entries: &mut Vec<Vc<PageEntry>>,
path_type: PathType,
) -> Result<()> { ) -> Result<()> {
let PagesDirectoryStructure { let PagesDirectoryStructure {
ref items, ref items,
...@@ -276,7 +257,7 @@ async fn get_page_entries_for_directory( ...@@ -276,7 +257,7 @@ async fn get_page_entries_for_directory(
let PagesStructureItem { let PagesStructureItem {
project_path, project_path,
next_router_path, next_router_path,
original_path, original_path: _,
} = *item.await?; } = *item.await?;
entries.push(get_page_entry_for_file( entries.push(get_page_entry_for_file(
ssr_module_context, ssr_module_context,
...@@ -284,8 +265,6 @@ async fn get_page_entries_for_directory( ...@@ -284,8 +265,6 @@ async fn get_page_entries_for_directory(
Vc::upcast(FileSource::new(project_path)), Vc::upcast(FileSource::new(project_path)),
next_router_root, next_router_root,
next_router_path, next_router_path,
original_path,
path_type,
)); ));
} }
...@@ -296,7 +275,6 @@ async fn get_page_entries_for_directory( ...@@ -296,7 +275,6 @@ async fn get_page_entries_for_directory(
*child, *child,
next_router_root, next_router_root,
entries, entries,
path_type,
) )
.await?; .await?;
} }
...@@ -322,129 +300,13 @@ async fn get_page_entry_for_file( ...@@ -322,129 +300,13 @@ async fn get_page_entry_for_file(
source: Vc<Box<dyn Source>>, source: Vc<Box<dyn Source>>,
next_router_root: Vc<FileSystemPath>, next_router_root: Vc<FileSystemPath>,
next_router_path: Vc<FileSystemPath>, next_router_path: Vc<FileSystemPath>,
next_original_path: Vc<FileSystemPath>,
path_type: PathType,
) -> Result<Vc<PageEntry>> { ) -> Result<Vc<PageEntry>> {
let reference_type = Value::new(ReferenceType::Entry(match path_type { let reference_type = Value::new(ReferenceType::Entry(EntryReferenceSubType::Page));
PathType::Page => EntryReferenceSubType::Page,
PathType::PagesAPI => EntryReferenceSubType::PagesApi,
_ => bail!("Invalid path type"),
}));
let pathname = pathname_for_path(next_router_root, next_router_path, path_type);
let definition_page = format!("/{}", next_original_path.await?); let pathname = pathname_for_path(next_router_root, next_router_path, PathType::Page);
let definition_pathname = pathname.await?;
let ssr_module = ssr_module_context.process(source, reference_type.clone()); let ssr_module = ssr_module_context.process(source, reference_type.clone());
let mut result = RopeBuilder::default();
match path_type {
PathType::Page => {
// Sourced from https://github.com/vercel/next.js/blob/2848ce51d1552633119c89ab49ff7fe2e4e91c91/packages/next/src/build/webpack/loaders/next-route-loader/index.ts
writedoc!(
result,
r#"
import RouteModule from "next/dist/server/future/route-modules/pages/module"
import {{ hoist }} from "next/dist/build/webpack/loaders/next-route-loader/helpers"
import Document from "@vercel/turbopack-next/pages/_document"
import App from "@vercel/turbopack-next/pages/_app"
import * as userland from "INNER"
export default hoist(userland, "default")
export const getStaticProps = hoist(userland, "getStaticProps")
export const getStaticPaths = hoist(userland, "getStaticPaths")
export const getServerSideProps = hoist(userland, "getServerSideProps")
export const config = hoist(userland, "config")
export const reportWebVitals = hoist(userland, "reportWebVitals")
export const unstable_getStaticProps = hoist(userland, "unstable_getStaticProps")
export const unstable_getStaticPaths = hoist(userland, "unstable_getStaticPaths")
export const unstable_getStaticParams = hoist(userland, "unstable_getStaticParams")
export const unstable_getServerProps = hoist(userland, "unstable_getServerProps")
export const unstable_getServerSideProps = hoist(userland, "unstable_getServerSideProps")
export const routeModule = new RouteModule({{
definition: {{
kind: "PAGES",
page: "{definition_page}",
pathname: "{definition_pathname}",
// The following aren't used in production, but are
// required for the RouteModule constructor.
bundlePath: "",
filename: "",
}},
components: {{
App,
Document,
}},
userland,
}})
"#
)?;
// When we're building the instrumentation page (only when the
// instrumentation file conflicts with a page also labeled
// /instrumentation) hoist the `register` method.
if definition_page == "/instrumentation" || definition_page == "/src/instrumentation" {
writeln!(
result,
r#"export const register = hoist(userland, "register")"#
)?;
}
}
PathType::PagesAPI => {
// Sourced from https://github.com/vercel/next.js/blob/2848ce51d1552633119c89ab49ff7fe2e4e91c91/packages/next/src/build/webpack/loaders/next-route-loader/index.ts
writedoc!(
result,
r#"
import RouteModule from "next/dist/server/future/route-modules/pages-api/module"
import {{ hoist }} from "next/dist/build/webpack/loaders/next-route-loader/helpers"
import * as userland from "INNER"
export default hoist(userland, "default")
export const config = hoist(userland, "config")
export const routeModule = new RouteModule({{
definition: {{
kind: "PAGES_API",
page: "{definition_page}",
pathname: "{definition_pathname}",
// The following aren't used in production, but are
// required for the RouteModule constructor.
bundlePath: "",
filename: "",
}},
userland,
}})
"#
)?;
}
_ => bail!("Invalid path type"),
};
let file = File::from(result.build());
let asset = VirtualSource::new(
source.ident().path().join(match path_type {
PathType::Page => "pages-entry.tsx".to_string(),
PathType::PagesAPI => "pages-api-entry.tsx".to_string(),
_ => bail!("Invalid path type"),
}),
AssetContent::file(file.into()),
);
let ssr_module = ssr_module_context.process(
Vc::upcast(asset),
Value::new(ReferenceType::Internal(Vc::cell(indexmap! {
"INNER".to_string() => ssr_module,
}))),
);
let client_module = create_page_loader_entry_module(client_module_context, source, pathname); let client_module = create_page_loader_entry_module(client_module_context, source, pathname);
let Some(client_module) = let Some(client_module) =
......
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
// the other imports // the other imports
import startHandler from '../internal/page-server-handler' import startHandler from '../internal/page-server-handler'
import Document from '@vercel/turbopack-next/pages/_document'
import App from '@vercel/turbopack-next/pages/_app' import App from '@vercel/turbopack-next/pages/_app'
import Document from '@vercel/turbopack-next/pages/_document'
import chunkGroup from 'INNER_CLIENT_CHUNK_GROUP' import chunkGroup from 'INNER_CLIENT_CHUNK_GROUP'
......
...@@ -29,7 +29,6 @@ use crate::next_config::{NextConfig, OutputType}; ...@@ -29,7 +29,6 @@ use crate::next_config::{NextConfig, OutputType};
#[derive(Debug, Clone, Copy, PartialEq, Eq, TaskInput)] #[derive(Debug, Clone, Copy, PartialEq, Eq, TaskInput)]
pub enum PathType { pub enum PathType {
Page, Page,
PagesAPI,
Data, Data,
} }
......
...@@ -55,8 +55,6 @@ import { fileExists } from '../lib/file-exists' ...@@ -55,8 +55,6 @@ import { fileExists } from '../lib/file-exists'
import { getRouteLoaderEntry } from './webpack/loaders/next-route-loader' import { getRouteLoaderEntry } from './webpack/loaders/next-route-loader'
import { isInternalComponent } from '../lib/is-internal-component' import { isInternalComponent } from '../lib/is-internal-component'
import { isStaticMetadataRouteFile } from '../lib/metadata/is-metadata-route' import { isStaticMetadataRouteFile } from '../lib/metadata/is-metadata-route'
import { RouteKind } from '../server/future/route-kind'
import { encodeToBase64 } from './webpack/loaders/utils'
export async function getStaticInfoIncludingLayouts({ export async function getStaticInfoIncludingLayouts({
isInsideAppDir, isInsideAppDir,
...@@ -591,7 +589,9 @@ export async function createEntrypoints( ...@@ -591,7 +589,9 @@ export async function createEntrypoints(
assetPrefix: config.assetPrefix, assetPrefix: config.assetPrefix,
nextConfigOutput: config.output, nextConfigOutput: config.output,
preferredRegion: staticInfo.preferredRegion, preferredRegion: staticInfo.preferredRegion,
middlewareConfig: encodeToBase64(staticInfo.middleware || {}), middlewareConfig: Buffer.from(
JSON.stringify(staticInfo.middleware || {})
).toString('base64'),
}) })
} else if (isInstrumentationHookFile(page) && pagesType === 'root') { } else if (isInstrumentationHookFile(page) && pagesType === 'root') {
server[serverBundlePath.replace('src/', '')] = { server[serverBundlePath.replace('src/', '')] = {
...@@ -599,23 +599,13 @@ export async function createEntrypoints( ...@@ -599,23 +599,13 @@ export async function createEntrypoints(
// the '../' is needed to make sure the file is not chunked // the '../' is needed to make sure the file is not chunked
filename: `../${INSTRUMENTATION_HOOK_FILENAME}.js`, filename: `../${INSTRUMENTATION_HOOK_FILENAME}.js`,
} }
} else if (isAPIRoute(page)) {
server[serverBundlePath] = [
getRouteLoaderEntry({
kind: RouteKind.PAGES_API,
page,
absolutePagePath,
preferredRegion: staticInfo.preferredRegion,
middlewareConfig: staticInfo.middleware || {},
}),
]
} else if ( } else if (
!isAPIRoute(page) &&
!isMiddlewareFile(page) && !isMiddlewareFile(page) &&
!isInternalComponent(absolutePagePath) !isInternalComponent(absolutePagePath)
) { ) {
server[serverBundlePath] = [ server[serverBundlePath] = [
getRouteLoaderEntry({ getRouteLoaderEntry({
kind: RouteKind.PAGES,
page, page,
pages, pages,
absolutePagePath, absolutePagePath,
......
...@@ -17,6 +17,7 @@ import os from 'os' ...@@ -17,6 +17,7 @@ import os from 'os'
import { Worker } from '../lib/worker' import { Worker } from '../lib/worker'
import { defaultConfig } from '../server/config-shared' import { defaultConfig } from '../server/config-shared'
import devalue from 'next/dist/compiled/devalue' import devalue from 'next/dist/compiled/devalue'
import { escapeStringRegexp } from '../shared/lib/escape-regexp'
import findUp from 'next/dist/compiled/find-up' import findUp from 'next/dist/compiled/find-up'
import { nanoid } from 'next/dist/compiled/nanoid/index.cjs' import { nanoid } from 'next/dist/compiled/nanoid/index.cjs'
import { pathToRegexp } from 'next/dist/compiled/path-to-regexp' import { pathToRegexp } from 'next/dist/compiled/path-to-regexp'
...@@ -140,12 +141,7 @@ import { createClientRouterFilter } from '../lib/create-client-router-filter' ...@@ -140,12 +141,7 @@ import { createClientRouterFilter } from '../lib/create-client-router-filter'
import { createValidFileMatcher } from '../server/lib/find-page-file' import { createValidFileMatcher } from '../server/lib/find-page-file'
import { startTypeChecking } from './type-check' import { startTypeChecking } from './type-check'
import { generateInterceptionRoutesRewrites } from '../lib/generate-interception-routes-rewrites' import { generateInterceptionRoutesRewrites } from '../lib/generate-interception-routes-rewrites'
import { buildDataRoute } from '../server/lib/router-utils/build-data-route' import { baseOverrides, experimentalOverrides } from '../server/require-hook'
import {
baseOverrides,
defaultOverrides,
experimentalOverrides,
} from '../server/require-hook'
export type SsgRoute = { export type SsgRoute = {
initialRevalidateSeconds: number | false initialRevalidateSeconds: number | false
...@@ -170,66 +166,6 @@ export type PrerenderManifest = { ...@@ -170,66 +166,6 @@ export type PrerenderManifest = {
preview: __ApiPreviewProps preview: __ApiPreviewProps
} }
type CustomRoute = {
regex: string
statusCode?: number | undefined
permanent?: undefined
source: string
locale?: false | undefined
basePath?: false | undefined
destination?: string | undefined
}
export type RoutesManifest = {
version: number
pages404: boolean
basePath: string
redirects: Array<CustomRoute>
rewrites?:
| Array<CustomRoute>
| {
beforeFiles: Array<CustomRoute>
afterFiles: Array<CustomRoute>
fallback: Array<CustomRoute>
}
headers: Array<CustomRoute>
staticRoutes: Array<{
page: string
regex: string
namedRegex?: string
routeKeys?: { [key: string]: string }
}>
dynamicRoutes: Array<{
page: string
regex: string
namedRegex?: string
routeKeys?: { [key: string]: string }
}>
dataRoutes: Array<{
page: string
routeKeys?: { [key: string]: string }
dataRouteRegex: string
namedDataRouteRegex?: string
}>
i18n?: {
domains?: Array<{
http?: true
domain: string
locales?: string[]
defaultLocale: string
}>
locales: string[]
defaultLocale: string
localeDetection?: false
}
rsc: {
header: typeof RSC
varyHeader: typeof RSC_VARY_HEADER
}
skipMiddlewareUrlNormalize?: boolean
caseSensitive?: boolean
}
async function generateClientSsgManifest( async function generateClientSsgManifest(
prerenderManifest: PrerenderManifest, prerenderManifest: PrerenderManifest,
{ {
...@@ -748,45 +684,89 @@ export default async function build( ...@@ -748,45 +684,89 @@ export default async function build(
} }
const routesManifestPath = path.join(distDir, ROUTES_MANIFEST) const routesManifestPath = path.join(distDir, ROUTES_MANIFEST)
const routesManifest: RoutesManifest = nextBuildSpan const routesManifest: {
.traceChild('generate-routes-manifest') version: number
.traceFn(() => { pages404: boolean
const sortedRoutes = getSortedRoutes([ basePath: string
...pageKeys.pages, redirects: Array<ReturnType<typeof buildCustomRoute>>
...(pageKeys.app ?? []), rewrites?:
]) | Array<ReturnType<typeof buildCustomRoute>>
const dynamicRoutes: Array<ReturnType<typeof pageToRoute>> = [] | {
const staticRoutes: typeof dynamicRoutes = [] beforeFiles: Array<ReturnType<typeof buildCustomRoute>>
afterFiles: Array<ReturnType<typeof buildCustomRoute>>
for (const route of sortedRoutes) { fallback: Array<ReturnType<typeof buildCustomRoute>>
if (isDynamicRoute(route)) {
dynamicRoutes.push(pageToRoute(route))
} else if (!isReservedPage(route)) {
staticRoutes.push(pageToRoute(route))
} }
headers: Array<ReturnType<typeof buildCustomRoute>>
staticRoutes: Array<{
page: string
regex: string
namedRegex?: string
routeKeys?: { [key: string]: string }
}>
dynamicRoutes: Array<{
page: string
regex: string
namedRegex?: string
routeKeys?: { [key: string]: string }
}>
dataRoutes: Array<{
page: string
routeKeys?: { [key: string]: string }
dataRouteRegex: string
namedDataRouteRegex?: string
}>
i18n?: {
domains?: Array<{
http?: true
domain: string
locales?: string[]
defaultLocale: string
}>
locales: string[]
defaultLocale: string
localeDetection?: false
}
rsc: {
header: typeof RSC
varyHeader: typeof RSC_VARY_HEADER
}
skipMiddlewareUrlNormalize?: boolean
caseSensitive?: boolean
} = nextBuildSpan.traceChild('generate-routes-manifest').traceFn(() => {
const sortedRoutes = getSortedRoutes([
...pageKeys.pages,
...(pageKeys.app ?? []),
])
const dynamicRoutes: Array<ReturnType<typeof pageToRoute>> = []
const staticRoutes: typeof dynamicRoutes = []
for (const route of sortedRoutes) {
if (isDynamicRoute(route)) {
dynamicRoutes.push(pageToRoute(route))
} else if (!isReservedPage(route)) {
staticRoutes.push(pageToRoute(route))
} }
}
return { return {
version: 3, version: 3,
pages404: true, pages404: true,
caseSensitive: !!config.experimental.caseSensitiveRoutes, caseSensitive: !!config.experimental.caseSensitiveRoutes,
basePath: config.basePath, basePath: config.basePath,
redirects: redirects.map((r: any) => redirects: redirects.map((r: any) => buildCustomRoute(r, 'redirect')),
buildCustomRoute(r, 'redirect') headers: headers.map((r: any) => buildCustomRoute(r, 'header')),
), dynamicRoutes,
headers: headers.map((r: any) => buildCustomRoute(r, 'header')), staticRoutes,
dynamicRoutes, dataRoutes: [],
staticRoutes, i18n: config.i18n || undefined,
dataRoutes: [], rsc: {
i18n: config.i18n || undefined, header: RSC,
rsc: { varyHeader: RSC_VARY_HEADER,
header: RSC, contentTypeHeader: RSC_CONTENT_TYPE_HEADER,
varyHeader: RSC_VARY_HEADER, },
contentTypeHeader: RSC_CONTENT_TYPE_HEADER, skipMiddlewareUrlNormalize: config.skipMiddlewareUrlNormalize,
}, }
skipMiddlewareUrlNormalize: config.skipMiddlewareUrlNormalize, })
}
})
if (rewrites.beforeFiles.length === 0 && rewrites.fallback.length === 0) { if (rewrites.beforeFiles.length === 0 && rewrites.fallback.length === 0) {
routesManifest.rewrites = rewrites.afterFiles.map((r: any) => routesManifest.rewrites = rewrites.afterFiles.map((r: any) =>
...@@ -923,7 +903,6 @@ export default async function build( ...@@ -923,7 +903,6 @@ export default async function build(
] ]
: []), : []),
path.join(SERVER_DIRECTORY, APP_PATHS_MANIFEST), path.join(SERVER_DIRECTORY, APP_PATHS_MANIFEST),
path.join(APP_PATH_ROUTES_MANIFEST),
APP_BUILD_MANIFEST, APP_BUILD_MANIFEST,
path.join( path.join(
SERVER_DIRECTORY, SERVER_DIRECTORY,
...@@ -1983,11 +1962,6 @@ export default async function build( ...@@ -1983,11 +1962,6 @@ export default async function build(
...Object.values(experimentalOverrides).map((override) => ...Object.values(experimentalOverrides).map((override) =>
require.resolve(override) require.resolve(override)
), ),
...(config.experimental.turbotrace
? []
: Object.values(defaultOverrides).map((value) =>
require.resolve(value)
)),
] ]
// ensure we trace any dependencies needed for custom // ensure we trace any dependencies needed for custom
...@@ -2005,7 +1979,9 @@ export default async function build( ...@@ -2005,7 +1979,9 @@ export default async function build(
const vanillaServerEntries = [ const vanillaServerEntries = [
...sharedEntriesSet, ...sharedEntriesSet,
isStandalone isStandalone
? require.resolve('next/dist/server/lib/start-server') ? require.resolve(
'next/dist/server/lib/render-server-standalone'
)
: null, : null,
require.resolve('next/dist/server/next-server'), require.resolve('next/dist/server/next-server'),
].filter(Boolean) as string[] ].filter(Boolean) as string[]
...@@ -2182,7 +2158,49 @@ export default async function build( ...@@ -2182,7 +2158,49 @@ export default async function build(
...serverPropsPages, ...serverPropsPages,
...ssgPages, ...ssgPages,
]).map((page) => { ]).map((page) => {
return buildDataRoute(page, buildId) const pagePath = normalizePagePath(page)
const dataRoute = path.posix.join(
'/_next/data',
buildId,
`${pagePath}.json`
)
let dataRouteRegex: string
let namedDataRouteRegex: string | undefined
let routeKeys: { [named: string]: string } | undefined
if (isDynamicRoute(page)) {
const routeRegex = getNamedRouteRegex(
dataRoute.replace(/\.json$/, ''),
true
)
dataRouteRegex = normalizeRouteRegex(
routeRegex.re.source.replace(/\(\?:\\\/\)\?\$$/, `\\.json$`)
)
namedDataRouteRegex = routeRegex.namedRegex!.replace(
/\(\?:\/\)\?\$$/,
`\\.json$`
)
routeKeys = routeRegex.routeKeys
} else {
dataRouteRegex = normalizeRouteRegex(
new RegExp(
`^${path.posix.join(
'/_next/data',
escapeStringRegexp(buildId),
`${pagePath}.json`
)}$`
).source
)
}
return {
page,
routeKeys,
dataRouteRegex,
namedDataRouteRegex,
}
}) })
await fs.writeFile( await fs.writeFile(
......
...@@ -1928,12 +1928,12 @@ export async function copyTracedFiles( ...@@ -1928,12 +1928,12 @@ export async function copyTracedFiles(
import path from 'path' import path from 'path'
import { fileURLToPath } from 'url' import { fileURLToPath } from 'url'
const __dirname = fileURLToPath(new URL('.', import.meta.url)) const __dirname = fileURLToPath(new URL('.', import.meta.url))
import { startServer } from 'next/dist/server/lib/start-server.js' import { createServerHandler } from 'next/dist/server/lib/render-server-standalone.js'
` `
: ` : `
const http = require('http') const http = require('http')
const path = require('path') const path = require('path')
const { startServer } = require('next/dist/server/lib/start-server')` const { createServerHandler } = require('next/dist/server/lib/render-server-standalone')`
} }
const dir = path.join(__dirname) const dir = path.join(__dirname)
...@@ -1950,7 +1950,11 @@ if (!process.env.NEXT_MANUAL_SIG_HANDLE) { ...@@ -1950,7 +1950,11 @@ if (!process.env.NEXT_MANUAL_SIG_HANDLE) {
const currentPort = parseInt(process.env.PORT, 10) || 3000 const currentPort = parseInt(process.env.PORT, 10) || 3000
const hostname = process.env.HOSTNAME || 'localhost' const hostname = process.env.HOSTNAME || 'localhost'
let keepAliveTimeout = parseInt(process.env.KEEP_ALIVE_TIMEOUT, 10); const keepAliveTimeout = parseInt(process.env.KEEP_ALIVE_TIMEOUT, 10);
const isValidKeepAliveTimeout =
!Number.isNaN(keepAliveTimeout) &&
Number.isFinite(keepAliveTimeout) &&
keepAliveTimeout >= 0;
const nextConfig = ${JSON.stringify({ const nextConfig = ${JSON.stringify({
...serverConfig, ...serverConfig,
distDir: `./${path.relative(dir, distDir)}`, distDir: `./${path.relative(dir, distDir)}`,
...@@ -1958,30 +1962,41 @@ const nextConfig = ${JSON.stringify({ ...@@ -1958,30 +1962,41 @@ const nextConfig = ${JSON.stringify({
process.env.__NEXT_PRIVATE_STANDALONE_CONFIG = JSON.stringify(nextConfig) process.env.__NEXT_PRIVATE_STANDALONE_CONFIG = JSON.stringify(nextConfig)
if ( createServerHandler({
Number.isNaN(keepAliveTimeout) ||
!Number.isFinite(keepAliveTimeout) ||
keepAliveTimeout < 0
) {
keepAliveTimeout = undefined
}
startServer({
dir,
isDev: false,
config: nextConfig,
hostname: hostname === 'localhost' ? '0.0.0.0' : hostname,
port: currentPort, port: currentPort,
allowRetry: false, hostname,
keepAliveTimeout, dir,
useWorkers: !!nextConfig.experimental?.appDir, conf: nextConfig,
}).then(() => { keepAliveTimeout: isValidKeepAliveTimeout ? keepAliveTimeout : undefined,
console.log( }).then((nextHandler) => {
'Listening on port', const server = http.createServer(async (req, res) => {
currentPort, try {
'url: http://' + hostname + ':' + currentPort await nextHandler(req, res)
) } catch (err) {
}).catch((err) => { console.error(err);
res.statusCode = 500
res.end('Internal Server Error')
}
})
if (isValidKeepAliveTimeout) {
server.keepAliveTimeout = keepAliveTimeout
}
server.listen(currentPort, async (err) => {
if (err) {
console.error("Failed to start server", err)
process.exit(1)
}
console.log(
'Listening on port',
currentPort,
'url: http://' + hostname + ':' + currentPort
)
});
}).catch(err => {
console.error(err); console.error(err);
process.exit(1); process.exit(1);
});` });`
......
...@@ -5,25 +5,23 @@ import type { ...@@ -5,25 +5,23 @@ import type {
} from '../../analysis/get-page-static-info' } from '../../analysis/get-page-static-info'
import { webpack } from 'next/dist/compiled/webpack/webpack' import { webpack } from 'next/dist/compiled/webpack/webpack'
export type ModuleBuildInfo = {
nextEdgeMiddleware?: EdgeMiddlewareMeta
nextEdgeApiFunction?: EdgeMiddlewareMeta
nextEdgeSSR?: EdgeSSRMeta
nextWasmMiddlewareBinding?: AssetBinding
nextAssetMiddlewareBinding?: AssetBinding
usingIndirectEval?: boolean | Set<string>
route?: RouteMeta
importLocByPath?: Map<string, any>
rootDir?: string
rsc?: RSCMeta
}
/** /**
* A getter for module build info that casts to the type it should have. * A getter for module build info that casts to the type it should have.
* We also expose here types to make easier to use it. * We also expose here types to make easier to use it.
*/ */
export function getModuleBuildInfo(webpackModule: webpack.Module) { export function getModuleBuildInfo(webpackModule: webpack.Module) {
return webpackModule.buildInfo as ModuleBuildInfo return webpackModule.buildInfo as {
nextEdgeMiddleware?: EdgeMiddlewareMeta
nextEdgeApiFunction?: EdgeMiddlewareMeta
nextEdgeSSR?: EdgeSSRMeta
nextWasmMiddlewareBinding?: AssetBinding
nextAssetMiddlewareBinding?: AssetBinding
usingIndirectEval?: boolean | Set<string>
route?: RouteMeta
importLocByPath?: Map<string, any>
rootDir?: string
rsc?: RSCMeta
}
} }
export interface RSCMeta { export interface RSCMeta {
......
...@@ -35,27 +35,10 @@ function generateClientManifest( ...@@ -35,27 +35,10 @@ function generateClientManifest(
'NextJsBuildManifest-generateClientManifest' 'NextJsBuildManifest-generateClientManifest'
) )
const normalizeRewrite = (item: {
source: string
destination: string
has?: any
}) => {
return {
has: item.has,
source: item.source,
destination: item.destination,
}
}
return genClientManifestSpan?.traceFn(() => { return genClientManifestSpan?.traceFn(() => {
const clientManifest: ClientBuildManifest = { const clientManifest: ClientBuildManifest = {
__rewrites: { // TODO: update manifest type to include rewrites
afterFiles: rewrites.afterFiles?.map((item) => normalizeRewrite(item)), __rewrites: rewrites as any,
beforeFiles: rewrites.beforeFiles?.map((item) =>
normalizeRewrite(item)
),
fallback: rewrites.fallback?.map((item) => normalizeRewrite(item)),
} as any,
} }
const appDependencies = new Set(assetMap.pages['/_app']) const appDependencies = new Set(assetMap.pages['/_app'])
const sortedPageKeys = getSortedRoutes(Object.keys(assetMap.pages)) const sortedPageKeys = getSortedRoutes(Object.keys(assetMap.pages))
......
...@@ -20,15 +20,9 @@ const originModules = [ ...@@ -20,15 +20,9 @@ const originModules = [
const RUNTIME_NAMES = ['webpack-runtime', 'webpack-api-runtime'] const RUNTIME_NAMES = ['webpack-runtime', 'webpack-api-runtime']
const nextDeleteCacheRpc = async (filePaths: string[]) => {
if ((global as any)._nextDeleteCache) {
return (global as any)._nextDeleteCache(filePaths)
}
}
export function deleteAppClientCache() { export function deleteAppClientCache() {
if ((global as any)._nextDeleteAppClientCache) { if ((global as any)._nextDeleteAppClientCache) {
return (global as any)._nextDeleteAppClientCache() ;(global as any)._nextDeleteAppClientCache()
} }
// ensure we reset the cache for rsc components // ensure we reset the cache for rsc components
// loaded via react-server-dom-webpack // loaded via react-server-dom-webpack
...@@ -47,6 +41,10 @@ export function deleteAppClientCache() { ...@@ -47,6 +41,10 @@ export function deleteAppClientCache() {
} }
export function deleteCache(filePath: string) { export function deleteCache(filePath: string) {
if ((global as any)._nextDeleteCache) {
;(global as any)._nextDeleteCache(filePath)
}
// try to clear it from the fs cache // try to clear it from the fs cache
clearManifestCache(filePath) clearManifestCache(filePath)
...@@ -88,7 +86,7 @@ export class NextJsRequireCacheHotReloader implements WebpackPluginInstance { ...@@ -88,7 +86,7 @@ export class NextJsRequireCacheHotReloader implements WebpackPluginInstance {
apply(compiler: Compiler) { apply(compiler: Compiler) {
compiler.hooks.assetEmitted.tap(PLUGIN_NAME, (_file, { targetPath }) => { compiler.hooks.assetEmitted.tap(PLUGIN_NAME, (_file, { targetPath }) => {
nextDeleteCacheRpc([targetPath]) deleteCache(targetPath)
// Clear module context in other processes // Clear module context in other processes
if ((global as any)._nextClearModuleContext) { if ((global as any)._nextClearModuleContext) {
...@@ -98,33 +96,35 @@ export class NextJsRequireCacheHotReloader implements WebpackPluginInstance { ...@@ -98,33 +96,35 @@ export class NextJsRequireCacheHotReloader implements WebpackPluginInstance {
clearModuleContext(targetPath) clearModuleContext(targetPath)
}) })
compiler.hooks.afterEmit.tapPromise(PLUGIN_NAME, async (compilation) => { compiler.hooks.afterEmit.tap(PLUGIN_NAME, (compilation) => {
const cacheEntriesToDelete = [] RUNTIME_NAMES.forEach((name) => {
for (const name of RUNTIME_NAMES) {
const runtimeChunkPath = path.join( const runtimeChunkPath = path.join(
compilation.outputOptions.path!, compilation.outputOptions.path!,
`${name}.js` `${name}.js`
) )
cacheEntriesToDelete.push(runtimeChunkPath) deleteCache(runtimeChunkPath)
} })
let hasAppPath = false
// we need to make sure to clear all server entries from cache // we need to make sure to clear all server entries from cache
// since they can have a stale webpack-runtime cache // since they can have a stale webpack-runtime cache
// which needs to always be in-sync // which needs to always be in-sync
const entries = [...compilation.entries.keys()].filter((entry) => { const entries = [...compilation.entries.keys()].filter((entry) => {
const isAppPath = entry.toString().startsWith('app/') const isAppPath = entry.toString().startsWith('app/')
hasAppPath = hasAppPath || isAppPath
return entry.toString().startsWith('pages/') || isAppPath return entry.toString().startsWith('pages/') || isAppPath
}) })
for (const page of entries) { if (hasAppPath) {
}
entries.forEach((page) => {
const outputPath = path.join( const outputPath = path.join(
compilation.outputOptions.path!, compilation.outputOptions.path!,
page + '.js' page + '.js'
) )
cacheEntriesToDelete.push(outputPath) deleteCache(outputPath)
} })
await nextDeleteCacheRpc(cacheEntriesToDelete)
}) })
} }
} }
...@@ -8,7 +8,11 @@ import isError from '../lib/is-error' ...@@ -8,7 +8,11 @@ import isError from '../lib/is-error'
import { getProjectDir } from '../lib/get-project-dir' import { getProjectDir } from '../lib/get-project-dir'
import { CONFIG_FILES, PHASE_DEVELOPMENT_SERVER } from '../shared/lib/constants' import { CONFIG_FILES, PHASE_DEVELOPMENT_SERVER } from '../shared/lib/constants'
import path from 'path' import path from 'path'
import { defaultConfig, NextConfigComplete } from '../server/config-shared' import {
defaultConfig,
NextConfig,
NextConfigComplete,
} from '../server/config-shared'
import { traceGlobals } from '../trace/shared' import { traceGlobals } from '../trace/shared'
import { Telemetry } from '../telemetry/storage' import { Telemetry } from '../telemetry/storage'
import loadConfig from '../server/config' import loadConfig from '../server/config'
...@@ -22,7 +26,6 @@ import { getPossibleInstrumentationHookFilenames } from '../build/worker' ...@@ -22,7 +26,6 @@ import { getPossibleInstrumentationHookFilenames } from '../build/worker'
import { resetEnv } from '@next/env' import { resetEnv } from '@next/env'
let dir: string let dir: string
let config: NextConfigComplete
let isTurboSession = false let isTurboSession = false
let sessionStopHandled = false let sessionStopHandled = false
let sessionStarted = Date.now() let sessionStarted = Date.now()
...@@ -35,15 +38,13 @@ const handleSessionStop = async () => { ...@@ -35,15 +38,13 @@ const handleSessionStop = async () => {
const { eventCliSession } = const { eventCliSession } =
require('../telemetry/events/session-stopped') as typeof import('../telemetry/events/session-stopped') require('../telemetry/events/session-stopped') as typeof import('../telemetry/events/session-stopped')
config = const config = await loadConfig(
config || PHASE_DEVELOPMENT_SERVER,
(await loadConfig( dir,
PHASE_DEVELOPMENT_SERVER, undefined,
dir, undefined,
undefined, true
undefined, )
true
))
let telemetry = let telemetry =
(traceGlobals.get('telemetry') as InstanceType< (traceGlobals.get('telemetry') as InstanceType<
...@@ -210,14 +211,12 @@ const nextDev: CliCommand = async (argv) => { ...@@ -210,14 +211,12 @@ const nextDev: CliCommand = async (argv) => {
// We do not set a default host value here to prevent breaking // We do not set a default host value here to prevent breaking
// some set-ups that rely on listening on other interfaces // some set-ups that rely on listening on other interfaces
const host = args['--hostname'] const host = args['--hostname']
config = await loadConfig(PHASE_DEVELOPMENT_SERVER, dir)
const devServerOptions: StartServerOptions = { const devServerOptions: StartServerOptions = {
dir, dir,
port, port,
allowRetry, allowRetry,
isDev: true, isDev: true,
nextConfig: config,
hostname: host, hostname: host,
// This is required especially for app dir. // This is required especially for app dir.
useWorkers: true, useWorkers: true,
...@@ -238,6 +237,14 @@ const nextDev: CliCommand = async (argv) => { ...@@ -238,6 +237,14 @@ const nextDev: CliCommand = async (argv) => {
resetEnv() resetEnv()
let bindings = await loadBindings() let bindings = await loadBindings()
const config = await loadConfig(
PHASE_DEVELOPMENT_SERVER,
dir,
undefined,
undefined,
true
)
// Just testing code here: // Just testing code here:
const project = await bindings.turbo.createProject({ const project = await bindings.turbo.createProject({
...@@ -402,6 +409,7 @@ const nextDev: CliCommand = async (argv) => { ...@@ -402,6 +409,7 @@ const nextDev: CliCommand = async (argv) => {
try { try {
let shouldFilter = false let shouldFilter = false
let devServerTeardown: (() => Promise<void>) | undefined let devServerTeardown: (() => Promise<void>) | undefined
let config: NextConfig | undefined
watchConfigFiles(devServerOptions.dir, (filename) => { watchConfigFiles(devServerOptions.dir, (filename) => {
Log.warn( Log.warn(
...@@ -497,6 +505,16 @@ const nextDev: CliCommand = async (argv) => { ...@@ -497,6 +505,16 @@ const nextDev: CliCommand = async (argv) => {
// fallback to noop, if not provided // fallback to noop, if not provided
resolveCleanup(async () => {}) resolveCleanup(async () => {})
} }
if (!config) {
config = await loadConfig(
PHASE_DEVELOPMENT_SERVER,
dir,
undefined,
undefined,
true
)
}
} }
await setupFork() await setupFork()
......
...@@ -84,7 +84,6 @@ const nextStart: CliCommand = async (argv) => { ...@@ -84,7 +84,6 @@ const nextStart: CliCommand = async (argv) => {
await startServer({ await startServer({
dir, dir,
nextConfig: config,
isDev: false, isDev: false,
hostname: host, hostname: host,
port, port,
......
...@@ -36,7 +36,6 @@ const supportedTurbopackNextConfigOptions = [ ...@@ -36,7 +36,6 @@ const supportedTurbopackNextConfigOptions = [
'experimental.isrFlushToDisk', 'experimental.isrFlushToDisk',
'experimental.workerThreads', 'experimental.workerThreads',
'experimenatl.pageEnv', 'experimenatl.pageEnv',
'experimental.caseSensitiveRoutes',
] ]
// The following will need to be supported by `next build --turbo` // The following will need to be supported by `next build --turbo`
......
import type { IncomingMessage } from 'http' import type { IncomingMessage } from 'http'
import type { BaseNextRequest } from '../base-http' import type { BaseNextRequest } from '../base-http'
import type { CookieSerializeOptions } from 'next/dist/compiled/cookie' import type { CookieSerializeOptions } from 'next/dist/compiled/cookie'
import type { NextApiResponse } from '../../shared/lib/utils' import type { NextApiRequest, NextApiResponse } from '../../shared/lib/utils'
import { HeadersAdapter } from '../web/spec-extension/adapters/headers' import { HeadersAdapter } from '../web/spec-extension/adapters/headers'
import { import {
...@@ -186,7 +186,7 @@ export function sendError( ...@@ -186,7 +186,7 @@ export function sendError(
} }
interface LazyProps { interface LazyProps {
req: IncomingMessage req: NextApiRequest
} }
/** /**
......
...@@ -191,17 +191,17 @@ export async function parseBody( ...@@ -191,17 +191,17 @@ export async function parseBody(
} }
} }
type RevalidateFn = (config: {
urlPath: string
revalidateHeaders: { [key: string]: string | string[] }
opts: { unstable_onlyGenerated?: boolean }
}) => Promise<void>
type ApiContext = __ApiPreviewProps & { type ApiContext = __ApiPreviewProps & {
trustHostHeader?: boolean trustHostHeader?: boolean
allowedRevalidateHeaderKeys?: string[] allowedRevalidateHeaderKeys?: string[]
hostname?: string hostname?: string
revalidate?: RevalidateFn revalidate?: (config: {
urlPath: string
revalidateHeaders: { [key: string]: string | string[] }
opts: { unstable_onlyGenerated?: boolean }
}) => Promise<any>
// (_req: IncomingMessage, _res: ServerResponse) => Promise<any>
} }
function getMaxContentLength(responseLimit?: ResponseLimit) { function getMaxContentLength(responseLimit?: ResponseLimit) {
...@@ -475,7 +475,16 @@ async function revalidate( ...@@ -475,7 +475,16 @@ async function revalidate(
headers: {}, headers: {},
} }
) )
const result = await res.json()
const chunks = []
for await (const chunk of res) {
if (chunk) {
chunks.push(chunk)
}
}
const body = Buffer.concat(chunks).toString()
const result = JSON.parse(body)
if (result.err) { if (result.err) {
throw new Error(result.err.message) throw new Error(result.err.message)
......
This diff is collapsed.
...@@ -297,11 +297,6 @@ export interface ExperimentalConfig { ...@@ -297,11 +297,6 @@ export interface ExperimentalConfig {
* Enables source maps generation for the server production bundle. * Enables source maps generation for the server production bundle.
*/ */
serverSourceMaps?: boolean serverSourceMaps?: boolean
/**
* @internal Used by the Next.js internals only.
*/
trustHostHeader?: boolean
} }
export type ExportPathMap = { export type ExportPathMap = {
......
let installed: boolean = false let installed: boolean = false
export function loadWebpackHook() { export function loadWebpackHook({ init }: { init: boolean }) {
const { init: initWebpack } = require('next/dist/compiled/webpack/webpack') if (init) {
if (installed) { const { init: initWebpack } = require('next/dist/compiled/webpack/webpack')
return if (installed) {
return
}
installed = true
initWebpack()
} }
installed = true
initWebpack()
// hook the Node.js require so that webpack requires are // hook the Node.js require so that webpack requires are
// routed to the bundled and now initialized webpack version // routed to the bundled and now initialized webpack version
......
...@@ -711,32 +711,10 @@ export default async function loadConfig( ...@@ -711,32 +711,10 @@ export default async function loadConfig(
rawConfig?: boolean, rawConfig?: boolean,
silent?: boolean silent?: boolean
): Promise<NextConfigComplete> { ): Promise<NextConfigComplete> {
if (!process.env.__NEXT_PRIVATE_RENDER_WORKER) {
try {
loadWebpackHook()
} catch (err) {
// this can fail in standalone mode as the files
// aren't traced/included
if (!process.env.__NEXT_PRIVATE_STANDALONE_CONFIG) {
throw err
}
}
}
if (process.env.__NEXT_PRIVATE_STANDALONE_CONFIG) { if (process.env.__NEXT_PRIVATE_STANDALONE_CONFIG) {
return JSON.parse(process.env.__NEXT_PRIVATE_STANDALONE_CONFIG) return JSON.parse(process.env.__NEXT_PRIVATE_STANDALONE_CONFIG)
} }
// For the render worker, we directly return the serialized config from the
// parent worker (router worker) to avoid loading it again.
// This is because loading the config might be expensive especiall when people
// have Webpack plugins added.
// Because of this change, unserializable fields like `.webpack` won't be
// existing here but the render worker shouldn't use these as well.
if (process.env.__NEXT_PRIVATE_RENDER_WORKER_CONFIG) {
return JSON.parse(process.env.__NEXT_PRIVATE_RENDER_WORKER_CONFIG)
}
const curLog = silent const curLog = silent
? { ? {
warn: () => {}, warn: () => {},
...@@ -747,6 +725,21 @@ export default async function loadConfig( ...@@ -747,6 +725,21 @@ export default async function loadConfig(
loadEnvConfig(dir, phase === PHASE_DEVELOPMENT_SERVER, curLog) loadEnvConfig(dir, phase === PHASE_DEVELOPMENT_SERVER, curLog)
loadWebpackHook({
// For render workers, there's no need to init webpack eagerly
init: !process.env.__NEXT_PRIVATE_RENDER_WORKER,
})
// For the render worker, we directly return the serialized config from the
// parent worker (router worker) to avoid loading it again.
// This is because loading the config might be expensive especiall when people
// have Webpack plugins added.
// Because of this change, unserializable fields like `.webpack` won't be
// existing here but the render worker shouldn't use these as well.
if (process.env.__NEXT_PRIVATE_RENDER_WORKER_CONFIG) {
return JSON.parse(process.env.__NEXT_PRIVATE_RENDER_WORKER_CONFIG)
}
let configFileName = 'next.config.js' let configFileName = 'next.config.js'
if (customConfig) { if (customConfig) {
......
...@@ -62,7 +62,6 @@ import { parseVersionInfo, VersionInfo } from './parse-version-info' ...@@ -62,7 +62,6 @@ import { parseVersionInfo, VersionInfo } from './parse-version-info'
import { isAPIRoute } from '../../lib/is-api-route' import { isAPIRoute } from '../../lib/is-api-route'
import { getRouteLoaderEntry } from '../../build/webpack/loaders/next-route-loader' import { getRouteLoaderEntry } from '../../build/webpack/loaders/next-route-loader'
import { isInternalComponent } from '../../lib/is-internal-component' import { isInternalComponent } from '../../lib/is-internal-component'
import { RouteKind } from '../future/route-kind'
function diff(a: Set<any>, b: Set<any>) { function diff(a: Set<any>, b: Set<any>) {
return new Set([...a].filter((v) => !b.has(v))) return new Set([...a].filter((v) => !b.has(v)))
...@@ -280,7 +279,7 @@ export default class HotReloader { ...@@ -280,7 +279,7 @@ export default class HotReloader {
parsedPageBundleUrl: UrlObject parsedPageBundleUrl: UrlObject
): Promise<{ finished?: true }> => { ): Promise<{ finished?: true }> => {
const { pathname } = parsedPageBundleUrl const { pathname } = parsedPageBundleUrl
const params = matchNextPageBundleRequest(pathname) const params = matchNextPageBundleRequest<{ path: string[] }>(pathname)
if (!params) { if (!params) {
return {} return {}
} }
...@@ -289,7 +288,7 @@ export default class HotReloader { ...@@ -289,7 +288,7 @@ export default class HotReloader {
try { try {
decodedPagePath = `/${params.path decodedPagePath = `/${params.path
.map((param: string) => decodeURIComponent(param)) .map((param) => decodeURIComponent(param))
.join('/')}` .join('/')}`
} catch (_) { } catch (_) {
throw new DecodeError('failed to decode param') throw new DecodeError('failed to decode param')
...@@ -907,20 +906,12 @@ export default class HotReloader { ...@@ -907,20 +906,12 @@ export default class HotReloader {
JSON.stringify(staticInfo.middleware || {}) JSON.stringify(staticInfo.middleware || {})
).toString('base64'), ).toString('base64'),
}) })
} else if (isAPIRoute(page)) {
value = getRouteLoaderEntry({
kind: RouteKind.PAGES_API,
page,
absolutePagePath: relativeRequest,
preferredRegion: staticInfo.preferredRegion,
middlewareConfig: staticInfo.middleware || {},
})
} else if ( } else if (
!isAPIRoute(page) &&
!isMiddlewareFile(page) && !isMiddlewareFile(page) &&
!isInternalComponent(relativeRequest) !isInternalComponent(relativeRequest)
) { ) {
value = getRouteLoaderEntry({ value = getRouteLoaderEntry({
kind: RouteKind.PAGES,
page, page,
pages: this.pagesMapping, pages: this.pagesMapping,
absolutePagePath: relativeRequest, absolutePagePath: relativeRequest,
...@@ -1420,12 +1411,10 @@ export default class HotReloader { ...@@ -1420,12 +1411,10 @@ export default class HotReloader {
clientOnly, clientOnly,
appPaths, appPaths,
match, match,
isApp,
}: { }: {
page: string page: string
clientOnly: boolean clientOnly: boolean
appPaths?: string[] | null appPaths?: string[] | null
isApp?: boolean
match?: RouteMatch match?: RouteMatch
}): Promise<void> { }): Promise<void> {
// Make sure we don't re-build or dispose prebuilt pages // Make sure we don't re-build or dispose prebuilt pages
...@@ -1443,7 +1432,6 @@ export default class HotReloader { ...@@ -1443,7 +1432,6 @@ export default class HotReloader {
clientOnly, clientOnly,
appPaths, appPaths,
match, match,
isApp,
}) as any }) as any
} }
} }
...@@ -689,13 +689,11 @@ export function onDemandEntryHandler({ ...@@ -689,13 +689,11 @@ export function onDemandEntryHandler({
clientOnly, clientOnly,
appPaths = null, appPaths = null,
match, match,
isApp,
}: { }: {
page: string page: string
clientOnly: boolean clientOnly: boolean
appPaths?: ReadonlyArray<string> | null appPaths?: ReadonlyArray<string> | null
match?: RouteMatch match?: RouteMatch
isApp?: boolean
}): Promise<void> { }): Promise<void> {
const stalledTime = 60 const stalledTime = 60
const stalledEnsureTimeout = setTimeout(() => { const stalledEnsureTimeout = setTimeout(() => {
...@@ -724,12 +722,6 @@ export function onDemandEntryHandler({ ...@@ -724,12 +722,6 @@ export function onDemandEntryHandler({
const isInsideAppDir = const isInsideAppDir =
!!appDir && pagePathData.absolutePagePath.startsWith(appDir) !!appDir && pagePathData.absolutePagePath.startsWith(appDir)
if (typeof isApp === 'boolean' && !(isApp === isInsideAppDir)) {
throw new Error(
'Ensure bailed, found path does not match ensure type (pages/app)'
)
}
const pageBundleType = getPageBundleType(pagePathData.bundlePath) const pageBundleType = getPageBundleType(pagePathData.bundlePath)
const addEntry = ( const addEntry = (
compilerType: CompilerNameValues compilerType: CompilerNameValues
...@@ -902,13 +894,11 @@ export function onDemandEntryHandler({ ...@@ -902,13 +894,11 @@ export function onDemandEntryHandler({
clientOnly, clientOnly,
appPaths = null, appPaths = null,
match, match,
isApp,
}: { }: {
page: string page: string
clientOnly: boolean clientOnly: boolean
appPaths?: ReadonlyArray<string> | null appPaths?: ReadonlyArray<string> | null
match?: RouteMatch match?: RouteMatch
isApp?: boolean
}) { }) {
if (curEnsurePage.has(page)) { if (curEnsurePage.has(page)) {
return curEnsurePage.get(page) return curEnsurePage.get(page)
...@@ -918,7 +908,6 @@ export function onDemandEntryHandler({ ...@@ -918,7 +908,6 @@ export function onDemandEntryHandler({
clientOnly, clientOnly,
appPaths, appPaths,
match, match,
isApp,
}).finally(() => { }).finally(() => {
curEnsurePage.delete(page) curEnsurePage.delete(page)
}) })
......
...@@ -12,11 +12,12 @@ export class RouteModuleLoader { ...@@ -12,11 +12,12 @@ export class RouteModuleLoader {
id: string, id: string,
loader: ModuleLoader = new NodeModuleLoader() loader: ModuleLoader = new NodeModuleLoader()
): Promise<M> { ): Promise<M> {
const module: AppLoaderModule<M> = await loader.load(id) if (process.env.NEXT_RUNTIME !== 'edge') {
if ('routeModule' in module) { const { routeModule }: AppLoaderModule<M> = await loader.load(id)
return module.routeModule
return routeModule
} }
throw new Error(`Module "${id}" does not export a routeModule.`) throw new Error('RouteModuleLoader is not supported in edge runtime.')
} }
} }
import type { IncomingMessage, ServerResponse } from 'http'
import type { PagesAPIRouteDefinition } from '../../route-definitions/pages-api-route-definition'
import type { PageConfig } from '../../../../../types'
import type { ParsedUrlQuery } from 'querystring'
import {
RouteModule,
RouteModuleOptions,
type RouteModuleHandleContext,
} from '../route-module'
import { apiResolver } from '../../../api-utils/node'
import { __ApiPreviewProps } from '../../../api-utils'
type PagesAPIHandleFn = (
req: IncomingMessage,
res: ServerResponse
) => Promise<void>
type PagesAPIUserlandModule = {
/**
* The exported handler method.
*/
readonly default: PagesAPIHandleFn
/**
* The exported page config.
*/
readonly config?: PageConfig
}
type PagesAPIRouteHandlerContext = RouteModuleHandleContext & {
/**
* The incoming server request in non-edge runtime.
*/
req?: IncomingMessage
/**
* The outgoing server response in non-edge runtime.
*/
res?: ServerResponse
/**
* The revalidate method used by the `revalidate` API.
*
* @param config the configuration for the revalidation
*/
revalidate: (config: {
urlPath: string
revalidateHeaders: { [key: string]: string | string[] }
opts: { unstable_onlyGenerated?: boolean }
}) => Promise<void>
/**
* The hostname for the request.
*/
hostname?: string
/**
* Keys allowed in the revalidate call.
*/
allowedRevalidateHeaderKeys?: string[]
/**
* Whether to trust the host header.
*/
trustHostHeader?: boolean
/**
* The query for the request.
*/
query: ParsedUrlQuery
/**
* The preview props used by the `preview` API.
*/
previewProps: __ApiPreviewProps
/**
* True if the server is in development mode.
*/
dev: boolean
/**
* True if the server is in minimal mode.
*/
minimalMode: boolean
/**
* The page that's being rendered.
*/
page: string
}
export type PagesAPIRouteModuleOptions = RouteModuleOptions<
PagesAPIRouteDefinition,
PagesAPIUserlandModule
>
export class PagesAPIRouteModule extends RouteModule<
PagesAPIRouteDefinition,
PagesAPIUserlandModule
> {
public handle(): Promise<Response> {
throw new Error('Method not implemented.')
}
/**
*
* @param req the incoming server request
* @param res the outgoing server response
* @param context the context for the render
*/
public async render(
req: IncomingMessage,
res: ServerResponse,
context: PagesAPIRouteHandlerContext
): Promise<void> {
await apiResolver(
req,
res,
context.query,
this.userland,
{
...context.previewProps,
revalidate: context.revalidate,
trustHostHeader: context.trustHostHeader,
allowedRevalidateHeaderKeys: context.allowedRevalidateHeaderKeys,
hostname: context.hostname,
},
context.minimalMode,
context.dev,
context.page
)
}
}
export default PagesAPIRouteModule
import type { IncomingMessage, ServerResponse } from 'http'
import type { ChildProcess } from 'child_process'
import httpProxy from 'next/dist/compiled/http-proxy'
import { Worker } from 'next/dist/compiled/jest-worker'
import { normalizeRepeatedSlashes } from '../../shared/lib/utils'
export const createServerHandler = async ({
port,
hostname,
dir,
dev = false,
minimalMode,
keepAliveTimeout,
}: {
port: number
hostname: string
dir: string
dev?: boolean
minimalMode: boolean
keepAliveTimeout?: number
}) => {
const routerWorker = new Worker(require.resolve('./render-server'), {
numWorkers: 1,
maxRetries: 10,
forkOptions: {
env: {
FORCE_COLOR: '1',
...process.env,
},
},
exposedMethods: ['initialize'],
}) as any as InstanceType<typeof Worker> & {
initialize: typeof import('./render-server').initialize
}
let didInitialize = false
for (const _worker of ((routerWorker as any)._workerPool?._workers || []) as {
_child: ChildProcess
}[]) {
// eslint-disable-next-line no-loop-func
_worker._child.on('exit', (code, signal) => {
// catch failed initializing without retry
if ((code || signal) && !didInitialize) {
routerWorker?.end()
process.exit(1)
}
})
}
const workerStdout = routerWorker.getStdout()
const workerStderr = routerWorker.getStderr()
workerStdout.on('data', (data) => {
process.stdout.write(data)
})
workerStderr.on('data', (data) => {
process.stderr.write(data)
})
const { port: routerPort } = await routerWorker.initialize({
dir,
port,
dev,
hostname,
minimalMode,
workerType: 'router',
isNodeDebugging: false,
keepAliveTimeout,
})
didInitialize = true
const getProxyServer = (pathname: string) => {
const targetUrl = `http://${
hostname === 'localhost' ? '127.0.0.1' : hostname
}:${routerPort}${pathname}`
const proxyServer = httpProxy.createProxy({
target: targetUrl,
changeOrigin: false,
ignorePath: true,
xfwd: true,
ws: true,
followRedirects: false,
})
return proxyServer
}
// proxy to router worker
return async (req: IncomingMessage, res: ServerResponse) => {
const urlParts = (req.url || '').split('?')
const urlNoQuery = urlParts[0]
// this normalizes repeated slashes in the path e.g. hello//world ->
// hello/world or backslashes to forward slashes, this does not
// handle trailing slash as that is handled the same as a next.config.js
// redirect
if (urlNoQuery?.match(/(\\|\/\/)/)) {
const cleanUrl = normalizeRepeatedSlashes(req.url!)
res.statusCode = 308
res.setHeader('Location', cleanUrl)
res.end(cleanUrl)
return
}
const proxyServer = getProxyServer(req.url || '/')
// http-proxy does not properly detect a client disconnect in newer
// versions of Node.js. This is caused because it only listens for the
// `aborted` event on the our request object, but it also fully reads and
// closes the request object. Node **will not** fire `aborted` when the
// request is already closed. Listening for `close` on our response object
// will detect the disconnect, and we can abort the proxy's connection.
proxyServer.on('proxyReq', (proxyReq) => {
res.on('close', () => proxyReq.destroy())
})
proxyServer.on('proxyRes', (proxyRes) => {
res.on('close', () => proxyRes.destroy())
})
proxyServer.web(req, res)
proxyServer.on('error', (err) => {
res.statusCode = 500
res.end('Internal Server Error')
console.error(err)
})
}
}
import type { RequestHandler } from '../next' import type { RequestHandler } from '../next'
// this must come first as it includes require hooks import './cpu-profile'
import { initializeServerWorker } from './setup-server-worker' import v8 from 'v8'
import http from 'http'
import { isIPv6 } from 'net'
// This is required before other imports to ensure the require hook is setup.
import '../require-hook'
import next from '../next' import next from '../next'
import { warn } from '../../build/output/log'
import { getFreePort } from '../lib/worker-utils'
export const WORKER_SELF_EXIT_CODE = 77 export const WORKER_SELF_EXIT_CODE = 77
const MAXIMUM_HEAP_SIZE_ALLOWED =
(v8.getHeapStatistics().heap_size_limit / 1024 / 1024) * 0.9
let result: let result:
| undefined | undefined
| { | {
...@@ -13,8 +24,6 @@ let result: ...@@ -13,8 +24,6 @@ let result:
hostname: string hostname: string
} }
let app: ReturnType<typeof next> | undefined
let sandboxContext: undefined | typeof import('../web/sandbox/context') let sandboxContext: undefined | typeof import('../web/sandbox/context')
let requireCacheHotReloader: let requireCacheHotReloader:
| undefined | undefined
...@@ -26,46 +35,15 @@ if (process.env.NODE_ENV !== 'production') { ...@@ -26,46 +35,15 @@ if (process.env.NODE_ENV !== 'production') {
} }
export function clearModuleContext(target: string) { export function clearModuleContext(target: string) {
return sandboxContext?.clearModuleContext(target) sandboxContext?.clearModuleContext(target)
} }
export function deleteAppClientCache() { export function deleteAppClientCache() {
return requireCacheHotReloader?.deleteAppClientCache() requireCacheHotReloader?.deleteAppClientCache()
}
export function deleteCache(filePaths: string[]) {
for (const filePath of filePaths) {
requireCacheHotReloader?.deleteCache(filePath)
}
} }
export async function propagateServerField(field: string, value: any) { export function deleteCache(filePath: string) {
if (!app) { requireCacheHotReloader?.deleteCache(filePath)
throw new Error('Invariant cant propagate server field, no app initialized')
}
let appField = (app as any).server
if (field.includes('.')) {
const parts = field.split('.')
for (let i = 0; i < parts.length - 1; i++) {
if (appField) {
appField = appField[parts[i]]
}
}
field = parts[parts.length - 1]
}
if (appField) {
if (typeof appField[field] === 'function') {
appField[field].apply(
(app as any).server,
Array.isArray(value) ? value : []
)
} else {
appField[field] = value
}
}
} }
export async function initialize(opts: { export async function initialize(opts: {
...@@ -77,7 +55,6 @@ export async function initialize(opts: { ...@@ -77,7 +55,6 @@ export async function initialize(opts: {
workerType: 'router' | 'render' workerType: 'router' | 'render'
isNodeDebugging: boolean isNodeDebugging: boolean
keepAliveTimeout?: number keepAliveTimeout?: number
serverFields?: any
}): Promise<NonNullable<typeof result>> { }): Promise<NonNullable<typeof result>> {
// if we already setup the server return as we only need to do // if we already setup the server return as we only need to do
// this on first worker boot // this on first worker boot
...@@ -85,40 +62,97 @@ export async function initialize(opts: { ...@@ -85,40 +62,97 @@ export async function initialize(opts: {
return result return result
} }
const type = process.env.__NEXT_PRIVATE_RENDER_WORKER! const isRouterWorker = opts.workerType === 'router'
process.title = 'next-render-worker-' + type const isRenderWorker = opts.workerType === 'render'
if (isRouterWorker) {
process.title = 'next-router-worker'
} else if (isRenderWorker) {
const type = process.env.__NEXT_PRIVATE_RENDER_WORKER!
process.title = 'next-render-worker-' + type
}
let requestHandler: RequestHandler let requestHandler: RequestHandler
let upgradeHandler: any
const { port, server, hostname } = await initializeServerWorker(
(...args) => {
return requestHandler(...args)
},
(...args) => {
return upgradeHandler(...args)
},
opts
)
app = next({
...opts,
_routerWorker: opts.workerType === 'router',
_renderWorker: opts.workerType === 'render',
hostname: hostname === '0.0.0.0' ? 'localhost' : hostname,
customServer: false,
httpServer: server,
port: opts.port,
isNodeDebugging: opts.isNodeDebugging,
})
requestHandler = app.getRequestHandler() const server = http.createServer((req, res) => {
upgradeHandler = app.getUpgradeHandler() return requestHandler(req, res)
await app.prepare(opts.serverFields) .catch((err) => {
res.statusCode = 500
res.end('Internal Server Error')
console.error(err)
})
.finally(() => {
if (
process.memoryUsage().heapUsed / 1024 / 1024 >
MAXIMUM_HEAP_SIZE_ALLOWED
) {
warn(
'The server is running out of memory, restarting to free up memory.'
)
server.close()
process.exit(WORKER_SELF_EXIT_CODE)
}
})
})
result = { if (opts.keepAliveTimeout) {
port, server.keepAliveTimeout = opts.keepAliveTimeout
hostname: hostname === '0.0.0.0' ? '127.0.0.1' : hostname,
} }
return result
return new Promise(async (resolve, reject) => {
server.on('error', (err: NodeJS.ErrnoException) => {
console.error(`Invariant: failed to start render worker`, err)
process.exit(1)
})
let upgradeHandler: any
if (!opts.dev) {
server.on('upgrade', (req, socket, upgrade) => {
upgradeHandler(req, socket, upgrade)
})
}
server.on('listening', async () => {
try {
const addr = server.address()
const port = addr && typeof addr === 'object' ? addr.port : 0
if (!port) {
console.error(`Invariant failed to detect render worker port`, addr)
process.exit(1)
}
let hostname =
!opts.hostname || opts.hostname === '0.0.0.0'
? 'localhost'
: opts.hostname
if (isIPv6(hostname)) {
hostname = hostname === '::' ? '[::1]' : `[${hostname}]`
}
result = {
port,
hostname,
}
const app = next({
...opts,
_routerWorker: isRouterWorker,
_renderWorker: isRenderWorker,
hostname,
customServer: false,
httpServer: server,
port: opts.port,
isNodeDebugging: opts.isNodeDebugging,
})
requestHandler = app.getRequestHandler()
upgradeHandler = app.getUpgradeHandler()
await app.prepare()
resolve(result)
} catch (err) {
return reject(err)
}
})
server.listen(await getFreePort(), '0.0.0.0')
})
} }
This diff is collapsed.
import path from '../../../shared/lib/isomorphic/path'
import { normalizePagePath } from '../../../shared/lib/page-path/normalize-page-path'
import { isDynamicRoute } from '../../../shared/lib/router/utils/is-dynamic'
import { getNamedRouteRegex } from '../../../shared/lib/router/utils/route-regex'
import { normalizeRouteRegex } from '../../../lib/load-custom-routes'
import { escapeStringRegexp } from '../../../shared/lib/escape-regexp'
export function buildDataRoute(page: string, buildId: string) {
const pagePath = normalizePagePath(page)
const dataRoute = path.posix.join('/_next/data', buildId, `${pagePath}.json`)
let dataRouteRegex: string
let namedDataRouteRegex: string | undefined
let routeKeys: { [named: string]: string } | undefined
if (isDynamicRoute(page)) {
const routeRegex = getNamedRouteRegex(
dataRoute.replace(/\.json$/, ''),
true
)
dataRouteRegex = normalizeRouteRegex(
routeRegex.re.source.replace(/\(\?:\\\/\)\?\$$/, `\\.json$`)
)
namedDataRouteRegex = routeRegex.namedRegex!.replace(
/\(\?:\/\)\?\$$/,
`\\.json$`
)
routeKeys = routeRegex.routeKeys
} else {
dataRouteRegex = normalizeRouteRegex(
new RegExp(
`^${path.posix.join(
'/_next/data',
escapeStringRegexp(buildId),
`${pagePath}.json`
)}$`
).source
)
}
return {
page,
routeKeys,
dataRouteRegex,
namedDataRouteRegex,
}
}
import type { IncomingMessage, ServerResponse } from 'http'
import type { NextUrlWithParsedQuery } from '../../request-meta'
import url from 'url'
import { stringifyQuery } from '../../server-route-utils'
export async function proxyRequest(
req: IncomingMessage,
res: ServerResponse,
parsedUrl: NextUrlWithParsedQuery,
upgradeHead?: any,
reqBody?: any,
proxyTimeout?: number | null
) {
const { query } = parsedUrl
delete (parsedUrl as any).query
parsedUrl.search = stringifyQuery(req as any, query)
const target = url.format(parsedUrl)
const HttpProxy =
require('next/dist/compiled/http-proxy') as typeof import('next/dist/compiled/http-proxy')
const proxy = new HttpProxy({
target,
changeOrigin: true,
ignorePath: true,
xfwd: true,
ws: true,
// we limit proxy requests to 30s by default, in development
// we don't time out WebSocket requests to allow proxying
proxyTimeout: proxyTimeout === null ? undefined : proxyTimeout || 30_000,
})
await new Promise((proxyResolve, proxyReject) => {
let finished = false
proxy.on('proxyRes', (proxyRes, innerReq, innerRes) => {
const cleanup = (err: any) => {
// cleanup event listeners to allow clean garbage collection
proxyRes.removeListener('error', cleanup)
proxyRes.removeListener('close', cleanup)
innerRes.removeListener('error', cleanup)
innerRes.removeListener('close', cleanup)
// destroy all source streams to propagate the caught event backward
innerReq.destroy(err)
proxyRes.destroy(err)
}
proxyRes.once('error', cleanup)
proxyRes.once('close', cleanup)
innerRes.once('error', cleanup)
innerRes.once('close', cleanup)
})
proxy.on('error', (err) => {
console.error(`Failed to proxy ${target}`, err)
if (!finished) {
finished = true
proxyReject(err)
if (!res.closed) {
res.statusCode = 500
res.end('Internal Server Error')
}
}
})
// if upgrade head is present treat as WebSocket request
if (upgradeHead) {
proxy.on('proxyReqWs', (proxyReq) => {
proxyReq.on('close', () => {
if (!finished) {
finished = true
proxyResolve(true)
}
})
})
proxy.ws(req as any as IncomingMessage, res, upgradeHead)
proxyResolve(true)
} else {
proxy.on('proxyReq', (proxyReq) => {
proxyReq.on('close', () => {
if (!finished) {
finished = true
proxyResolve(true)
}
})
})
proxy.web(req, res, {
buffer: reqBody,
})
}
})
}
This diff is collapsed.
...@@ -88,14 +88,13 @@ export const createWorker = async ( ...@@ -88,14 +88,13 @@ export const createWorker = async (
nextConfig: NextConfigComplete nextConfig: NextConfigComplete
) => { ) => {
const { initialEnv } = require('@next/env') as typeof import('@next/env') const { initialEnv } = require('@next/env') as typeof import('@next/env')
const { Worker } = require('next/dist/compiled/jest-worker')
const useServerActions = !!nextConfig.experimental.serverActions const useServerActions = !!nextConfig.experimental.serverActions
const { Worker } =
require('next/dist/compiled/jest-worker') as typeof import('next/dist/compiled/jest-worker')
const worker = new Worker(require.resolve('../render-server'), { const worker = new Worker(require.resolve('../render-server'), {
numWorkers: 1, numWorkers: 1,
// TODO: do we want to allow more than 8 OOM restarts? // TODO: do we want to allow more than 10 OOM restarts?
maxRetries: 8, maxRetries: 10,
forkOptions: { forkOptions: {
env: { env: {
FORCE_COLOR: '1', FORCE_COLOR: '1',
...@@ -130,14 +129,11 @@ export const createWorker = async ( ...@@ -130,14 +129,11 @@ export const createWorker = async (
'deleteCache', 'deleteCache',
'deleteAppClientCache', 'deleteAppClientCache',
'clearModuleContext', 'clearModuleContext',
'propagateServerField',
], ],
}) as any as InstanceType<typeof Worker> & { }) as any as InstanceType<typeof Worker> & {
initialize: typeof import('../render-server').initialize initialize: typeof import('../render-server').initialize
deleteCache: typeof import('../render-server').deleteCache deleteCache: typeof import('../render-server').deleteCache
deleteAppClientCache: typeof import('../render-server').deleteAppClientCache deleteAppClientCache: typeof import('../render-server').deleteAppClientCache
clearModuleContext: typeof import('../render-server').clearModuleContext
propagateServerField: typeof import('../render-server').propagateServerField
} }
worker.getStderr().pipe(process.stderr) worker.getStderr().pipe(process.stderr)
......
import '../../node-polyfill-fetch' import { IncomingMessage } from 'http'
import type { IncomingMessage } from 'http'
import type { Writable, Readable } from 'stream'
import { filterReqHeaders } from './utils' import { filterReqHeaders } from './utils'
export const invokeRequest = async ( export const invokeRequest = async (
...@@ -10,62 +7,51 @@ export const invokeRequest = async ( ...@@ -10,62 +7,51 @@ export const invokeRequest = async (
headers: IncomingMessage['headers'] headers: IncomingMessage['headers']
method: IncomingMessage['method'] method: IncomingMessage['method']
}, },
readableBody?: Readable | ReadableStream readableBody?: import('stream').Readable
) => { ) => {
// force to 127.0.0.1 as IPC always runs on this hostname
// to avoid localhost issues
const parsedTargetUrl = new URL(targetUrl)
parsedTargetUrl.hostname = '127.0.0.1'
const invokeHeaders = filterReqHeaders({ const invokeHeaders = filterReqHeaders({
'cache-control': '',
...requestInit.headers, ...requestInit.headers,
}) as IncomingMessage['headers'] }) as IncomingMessage['headers']
const invokeRes = await fetch(parsedTargetUrl.toString(), { const invokeRes = await new Promise<IncomingMessage>(
headers: invokeHeaders as any as Headers, (resolveInvoke, rejectInvoke) => {
method: requestInit.method, const http = require('http') as typeof import('http')
redirect: 'manual',
try {
...(requestInit.method !== 'GET' && // force to 127.0.0.1 as IPC always runs on this hostname
requestInit.method !== 'HEAD' && // to avoid localhost issues
readableBody const parsedTargetUrl = new URL(targetUrl)
? { parsedTargetUrl.hostname = '127.0.0.1'
body: readableBody as BodyInit,
duplex: 'half', const invokeReq = http.request(
parsedTargetUrl.toString(),
{
headers: invokeHeaders,
method: requestInit.method,
},
(res) => {
resolveInvoke(res)
}
)
invokeReq.on('error', (err) => {
rejectInvoke(err)
})
if (requestInit.method !== 'GET' && requestInit.method !== 'HEAD') {
if (readableBody) {
readableBody.pipe(invokeReq)
readableBody.on('close', () => {
invokeReq.end()
})
}
} else {
invokeReq.end()
} }
: {}), } catch (err) {
rejectInvoke(err)
next: {
// @ts-ignore
internal: true,
},
})
return invokeRes
}
export async function pipeReadable(
readable: ReadableStream,
writable: Writable
) {
const reader = readable.getReader()
async function doRead() {
const item = await reader.read()
if (item?.value) {
writable.write(Buffer.from(item?.value))
if ('flush' in writable) {
;(writable as any).flush()
} }
} }
)
if (!item?.done) { return invokeRes
return doRead()
}
}
await doRead()
writable.end()
} }
export const forbiddenHeaders = [ export const forbiddenHeaders = [
'accept-encoding', 'accept-encoding',
'keepalive', 'keepalive',
'keep-alive',
'content-encoding', 'content-encoding',
'transfer-encoding', 'transfer-encoding',
// https://github.com/nodejs/undici/issues/1470 // https://github.com/nodejs/undici/issues/1470
...@@ -9,7 +8,7 @@ export const forbiddenHeaders = [ ...@@ -9,7 +8,7 @@ export const forbiddenHeaders = [
] ]
export const filterReqHeaders = ( export const filterReqHeaders = (
headers: Record<string, undefined | string | number | string[]> headers: Record<string, undefined | string | string[]>
) => { ) => {
for (const [key, value] of Object.entries(headers)) { for (const [key, value] of Object.entries(headers)) {
if ( if (
...@@ -19,5 +18,5 @@ export const filterReqHeaders = ( ...@@ -19,5 +18,5 @@ export const filterReqHeaders = (
delete headers[key] delete headers[key]
} }
} }
return headers as Record<string, undefined | string | string[]> return headers
} }
import './cpu-profile'
import v8 from 'v8'
import http, { IncomingMessage, ServerResponse } from 'http'
// This is required before other imports to ensure the require hook is setup.
import '../require-hook'
import '../node-polyfill-fetch'
import { warn } from '../../build/output/log'
import { Duplex } from 'stream'
process.on('unhandledRejection', (err) => {
console.error(err)
})
process.on('uncaughtException', (err) => {
console.error(err)
})
export const WORKER_SELF_EXIT_CODE = 77
const MAXIMUM_HEAP_SIZE_ALLOWED =
(v8.getHeapStatistics().heap_size_limit / 1024 / 1024) * 0.9
export async function initializeServerWorker(
requestHandler: (req: IncomingMessage, res: ServerResponse) => Promise<any>,
upgradeHandler: (req: IncomingMessage, socket: Duplex, head: Buffer) => any,
opts: {
dir: string
port: number
dev: boolean
minimalMode?: boolean
hostname?: string
workerType: 'router' | 'render'
isNodeDebugging: boolean
keepAliveTimeout?: number
}
): Promise<{
port: number
hostname: string
server: http.Server
}> {
const server = http.createServer((req, res) => {
return requestHandler(req, res)
.catch((err) => {
res.statusCode = 500
res.end('Internal Server Error')
console.error(err)
})
.finally(() => {
if (
process.memoryUsage().heapUsed / 1024 / 1024 >
MAXIMUM_HEAP_SIZE_ALLOWED
) {
warn(
'The server is running out of memory, restarting to free up memory.'
)
server.close()
process.exit(WORKER_SELF_EXIT_CODE)
}
})
})
if (opts.keepAliveTimeout) {
server.keepAliveTimeout = opts.keepAliveTimeout
}
return new Promise(async (resolve, reject) => {
server.on('error', (err: NodeJS.ErrnoException) => {
console.error(`Invariant: failed to start server worker`, err)
process.exit(1)
})
if (upgradeHandler) {
server.on('upgrade', (req, socket, upgrade) => {
upgradeHandler(req, socket, upgrade)
})
}
const hostname =
!opts.hostname || opts.hostname === 'localhost'
? '0.0.0.0'
: opts.hostname
server.on('listening', async () => {
try {
const addr = server.address()
const port = addr && typeof addr === 'object' ? addr.port : 0
if (!port) {
console.error(`Invariant failed to detect render worker port`, addr)
process.exit(1)
}
resolve({
server,
port,
hostname,
})
} catch (err) {
return reject(err)
}
})
server.listen(0, hostname)
})
}
This diff is collapsed.
This diff is collapsed.
...@@ -19,11 +19,6 @@ const resolve = process.env.NEXT_MINIMAL ...@@ -19,11 +19,6 @@ const resolve = process.env.NEXT_MINIMAL
const toResolveMap = (map: Record<string, string>): [string, string][] => const toResolveMap = (map: Record<string, string>): [string, string][] =>
Object.entries(map).map(([key, value]) => [key, resolve(value)]) Object.entries(map).map(([key, value]) => [key, resolve(value)])
export const defaultOverrides = {
'styled-jsx': dirname(resolve('styled-jsx/package.json')),
'styled-jsx/style': resolve('styled-jsx/style'),
}
export const baseOverrides = { export const baseOverrides = {
react: 'next/dist/compiled/react', react: 'next/dist/compiled/react',
'react/package.json': 'next/dist/compiled/react/package.json', 'react/package.json': 'next/dist/compiled/react/package.json',
...@@ -78,7 +73,12 @@ export function addHookAliases(aliases: [string, string][] = []) { ...@@ -78,7 +73,12 @@ export function addHookAliases(aliases: [string, string][] = []) {
} }
// Add default aliases // Add default aliases
addHookAliases(toResolveMap(defaultOverrides)) addHookAliases([
// Use `require.resolve` explicitly to make them statically analyzable
// styled-jsx needs to be resolved as the external dependency.
['styled-jsx', dirname(resolve('styled-jsx/package.json'))],
['styled-jsx/style', resolve('styled-jsx/style')],
])
// Override built-in React packages if necessary // Override built-in React packages if necessary
function overrideReact() { function overrideReact() {
......
This diff is collapsed.
...@@ -10,11 +10,10 @@ send.mime.define({ ...@@ -10,11 +10,10 @@ send.mime.define({
export function serveStatic( export function serveStatic(
req: IncomingMessage, req: IncomingMessage,
res: ServerResponse, res: ServerResponse,
path: string, path: string
opts?: Parameters<typeof send>[2]
): Promise<void> { ): Promise<void> {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
send(req, path, opts) send(req, path)
.on('directory', () => { .on('directory', () => {
// We don't allow directories to be read. // We don't allow directories to be read.
const err: any = new Error('No directory access') const err: any = new Error('No directory access')
......
This diff is collapsed.
...@@ -52,10 +52,10 @@ export function getPathMatch(path: string, options?: Options) { ...@@ -52,10 +52,10 @@ export function getPathMatch(path: string, options?: Options) {
* `false` but if it does it will return an object with the matched params * `false` but if it does it will return an object with the matched params
* merged with the params provided in the second argument. * merged with the params provided in the second argument.
*/ */
return ( return <T extends { [key: string]: any }>(
pathname?: string | null, pathname?: string | null,
params?: any params?: any
): false | { [key: string]: any } => { ): false | T => {
const res = pathname == null ? false : matcher(pathname) const res = pathname == null ? false : matcher(pathname)
if (!res) { if (!res) {
return false return false
......
...@@ -38,21 +38,17 @@ createNextDescribe( ...@@ -38,21 +38,17 @@ createNextDescribe(
}, 'success') }, 'success')
}) })
// TODO: investigate isEdge case it('should render the 404 page when the file is removed, and restore the page when re-added', async () => {
if (!isEdge) { const browser = await next.browser('/')
it('should render the 404 page when the file is removed, and restore the page when re-added', async () => { await check(() => browser.elementByCss('h1').text(), 'My page')
const browser = await next.browser('/') await next.renameFile('./app/page.js', './app/foo.js')
await check(() => browser.elementByCss('h1').text(), 'My page') await check(
await next.renameFile('./app/page.js', './app/foo.js') () => browser.elementByCss('h1').text(),
await check( 'This Is The Not Found Page'
() => browser.elementByCss('h1').text(), )
'This Is The Not Found Page' await next.renameFile('./app/foo.js', './app/page.js')
) await check(() => browser.elementByCss('h1').text(), 'My page')
// TODO: investigate flakey behavior })
// await next.renameFile('./app/foo.js', './app/page.js')
// await check(() => browser.elementByCss('h1').text(), 'My page')
})
}
} }
if (!isNextDev && !isEdge) { if (!isNextDev && !isEdge) {
......
...@@ -6,9 +6,6 @@ createNextDescribe( ...@@ -6,9 +6,6 @@ createNextDescribe(
files: __dirname, files: __dirname,
skipDeployment: true, skipDeployment: true,
startCommand: 'node server.js', startCommand: 'node server.js',
dependencies: {
'get-port': '5.1.1',
},
}, },
({ next }) => { ({ next }) => {
it.each(['/', '/render'])('should render %s', async (page) => { it.each(['/', '/render'])('should render %s', async (page) => {
......
const http = require('http') const http = require('http')
const { parse } = require('url') const { parse } = require('url')
const next = require('next') const next = require('next')
const getPort = require('get-port')
async function main() { async function main() {
const dev = process.env.NEXT_TEST_MODE === 'dev' const dev = process.env.NEXT_TEST_MODE === 'dev'
process.env.NODE_ENV = dev ? 'development' : 'production' process.env.NODE_ENV = dev ? 'development' : 'production'
const port = await getPort() const port = parseInt(process.env.PORT, 10) || 3000
const app = next({ dev, port }) const app = next({ dev, port })
const handle = app.getRequestHandler() const handle = app.getRequestHandler()
...@@ -34,7 +34,7 @@ async function main() { ...@@ -34,7 +34,7 @@ async function main() {
process.exit(1) process.exit(1)
}) })
server.listen(port, '0.0.0.0', () => { server.listen(port, () => {
console.log( console.log(
`> started server on url: http://localhost:${port} as ${ `> started server on url: http://localhost:${port} as ${
dev ? 'development' : process.env.NODE_ENV dev ? 'development' : process.env.NODE_ENV
......
...@@ -178,6 +178,35 @@ describe('Middleware fetches with body', () => { ...@@ -178,6 +178,35 @@ describe('Middleware fetches with body', () => {
}) })
describe('with custom bodyParser sizeLimit (5mb)', () => { describe('with custom bodyParser sizeLimit (5mb)', () => {
it('should return 413 for body equal to 10mb', async () => {
const bodySize = 10 * 1024 * 1024
const body = 't'.repeat(bodySize)
const res = await fetchViaHTTP(
next.url,
'/api/size_limit_5mb',
{},
{
body,
method: 'POST',
}
)
try {
expect(res.status).toBe(413)
if (!(global as any).isNextDeploy) {
expect(res.statusText).toBe('Body exceeded 5mb limit')
}
} catch (err) {
// TODO: investigate occasional EPIPE errors causing
// a 500 status instead of a 413
if (res.status !== 500) {
throw err
}
}
})
it('should return 413 for body greater than 5mb', async () => { it('should return 413 for body greater than 5mb', async () => {
const bodySize = 5 * 1024 * 1024 + 1 const bodySize = 5 * 1024 * 1024 + 1
const body = 'u'.repeat(bodySize) const body = 'u'.repeat(bodySize)
...@@ -279,33 +308,4 @@ describe('Middleware fetches with body', () => { ...@@ -279,33 +308,4 @@ describe('Middleware fetches with body', () => {
).toBe(bodySize / 32 + 1) ).toBe(bodySize / 32 + 1)
}) })
}) })
it('should return 413 for body equal to 10mb', async () => {
const bodySize = 10 * 1024 * 1024
const body = 't'.repeat(bodySize)
const res = await fetchViaHTTP(
next.url,
'/api/size_limit_5mb',
{},
{
body,
method: 'POST',
}
)
try {
expect(res.status).toBe(413)
if (!(global as any).isNextDeploy) {
expect(res.statusText).toBe('Body exceeded 5mb limit')
}
} catch (err) {
// TODO: investigate occasional EPIPE errors causing
// a 500 status instead of a 413
if (res.status !== 500) {
throw err
}
}
})
}) })
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment