Unverified Commit 86fc1697 authored by Tim Neutkens's avatar Tim Neutkens Committed by GitHub

Remove unused array in router-server (#54278)

Noticed these arrays don't actually do anything specific, removed them.

Update: After the multi-zone test failed it seems this was added to ensure you can run multiple Next.js instances in the same process, this simplifies it a bit and adds a comment explaining why it's called.
parent d2a8d4fa
// useLayoutSegments() // Only the segments for the current place. ['children', 'dashboard', 'children', 'integrations'] -> /dashboard/integrations (/dashboard/layout.js would get ['children', 'dashboard', 'children', 'integrations'])
import { useContext, useMemo } from 'react' import { useContext, useMemo } from 'react'
import type { FlightRouterState } from '../../server/app-render/types' import type { FlightRouterState } from '../../server/app-render/types'
import { import {
......
...@@ -189,6 +189,8 @@ export type RequestContext = { ...@@ -189,6 +189,8 @@ export type RequestContext = {
renderOpts: RenderOptsPartial renderOpts: RenderOptsPartial
} }
export type FallbackMode = false | undefined | 'blocking' | 'static'
export class NoFallbackError extends Error {} export class NoFallbackError extends Error {}
// Internal wrapper around build errors at development // Internal wrapper around build errors at development
...@@ -1439,7 +1441,8 @@ export default abstract class Server<ServerOptions extends Options = Options> { ...@@ -1439,7 +1441,8 @@ export default abstract class Server<ServerOptions extends Options = Options> {
getRequestMeta(req, '_nextRewroteUrl') || urlPathname getRequestMeta(req, '_nextRewroteUrl') || urlPathname
let staticPaths: string[] | undefined let staticPaths: string[] | undefined
let fallbackMode: false | undefined | 'blocking' | 'static'
let fallbackMode: FallbackMode
if (isAppPath) { if (isAppPath) {
const pathsResult = await this.getStaticPaths({ const pathsResult = await this.getStaticPaths({
......
...@@ -7,7 +7,7 @@ import type { ParsedUrl } from '../../shared/lib/router/utils/parse-url' ...@@ -7,7 +7,7 @@ import type { ParsedUrl } from '../../shared/lib/router/utils/parse-url'
import type { ParsedUrlQuery } from 'querystring' import type { ParsedUrlQuery } from 'querystring'
import type { UrlWithParsedQuery } from 'url' import type { UrlWithParsedQuery } from 'url'
import type { BaseNextRequest, BaseNextResponse } from '../base-http' import type { BaseNextRequest, BaseNextResponse } from '../base-http'
import type { MiddlewareRoutingItem } from '../base-server' import type { FallbackMode, MiddlewareRoutingItem } from '../base-server'
import type { FunctionComponent } from 'react' import type { FunctionComponent } from 'react'
import type { RouteMatch } from '../future/route-matches/route-match' import type { RouteMatch } from '../future/route-matches/route-match'
...@@ -694,7 +694,7 @@ export default class DevServer extends Server { ...@@ -694,7 +694,7 @@ export default class DevServer extends Server {
} }
const value: { const value: {
staticPaths: string[] staticPaths: string[]
fallbackMode: 'blocking' | 'static' | false | undefined fallbackMode: FallbackMode
} = { } = {
staticPaths, staticPaths,
fallbackMode: fallbackMode:
......
...@@ -48,12 +48,10 @@ export type RenderWorker = InstanceType< ...@@ -48,12 +48,10 @@ export type RenderWorker = InstanceType<
propagateServerField: typeof import('./render-server').propagateServerField propagateServerField: typeof import('./render-server').propagateServerField
} }
const nextDeleteCacheCallbacks: Array<(filePaths: string[]) => Promise<any>> = export interface RenderWorkers {
[] app?: Awaited<ReturnType<typeof createWorker>>
const nextDeleteAppClientCacheCallbacks: Array<() => Promise<any>> = [] pages?: Awaited<ReturnType<typeof createWorker>>
const nextClearModuleContextCallbacks: Array< }
(targetPath: string) => Promise<any>
> = []
export async function initialize(opts: { export async function initialize(opts: {
dir: string dir: string
...@@ -95,6 +93,8 @@ export async function initialize(opts: { ...@@ -95,6 +93,8 @@ export async function initialize(opts: {
minimalMode: opts.minimalMode, minimalMode: opts.minimalMode,
}) })
const renderWorkers: RenderWorkers = {}
let devInstance: let devInstance:
| UnwrapPromise< | UnwrapPromise<
ReturnType<typeof import('./router-utils/setup-dev').setupDev> ReturnType<typeof import('./router-utils/setup-dev').setupDev>
...@@ -110,8 +110,11 @@ export async function initialize(opts: { ...@@ -110,8 +110,11 @@ export async function initialize(opts: {
!!config.experimental.appDir !!config.experimental.appDir
) )
const { setupDev } = await require('./router-utils/setup-dev') const { setupDev } =
(await require('./router-utils/setup-dev')) as typeof import('./router-utils/setup-dev')
devInstance = await setupDev({ devInstance = await setupDev({
// Passed here but the initialization of this object happens below, doing the initialization before the setupDev call breaks.
renderWorkers,
appDir, appDir,
pagesDir, pagesDir,
telemetry, telemetry,
...@@ -123,22 +126,6 @@ export async function initialize(opts: { ...@@ -123,22 +126,6 @@ export async function initialize(opts: {
}) })
} }
const renderWorkerOpts: Parameters<RenderWorker['initialize']>[0] = {
port: opts.port,
dir: opts.dir,
workerType: 'render',
hostname: opts.hostname,
minimalMode: opts.minimalMode,
dev: !!opts.dev,
isNodeDebugging: !!opts.isNodeDebugging,
serverFields: devInstance?.serverFields || {},
experimentalTestProxy: !!opts.experimentalTestProxy,
}
const renderWorkers: {
app?: RenderWorker
pages?: RenderWorker
} = {}
const { ipcPort, ipcValidationKey } = await createIpcServer({ const { ipcPort, ipcValidationKey } = await createIpcServer({
async ensurePage( async ensurePage(
match: Parameters< match: Parameters<
...@@ -200,16 +187,14 @@ export async function initialize(opts: { ...@@ -200,16 +187,14 @@ export async function initialize(opts: {
const { initialEnv } = require('@next/env') as typeof import('@next/env') const { initialEnv } = require('@next/env') as typeof import('@next/env')
if (!!config.experimental.appDir) { renderWorkers.app = await createWorker(
renderWorkers.app = await createWorker( ipcPort,
ipcPort, ipcValidationKey,
ipcValidationKey, opts.isNodeDebugging,
opts.isNodeDebugging, 'app',
'app', config,
config, initialEnv
initialEnv )
)
}
renderWorkers.pages = await createWorker( renderWorkers.pages = await createWorker(
ipcPort, ipcPort,
ipcValidationKey, ipcValidationKey,
...@@ -219,6 +204,18 @@ export async function initialize(opts: { ...@@ -219,6 +204,18 @@ export async function initialize(opts: {
initialEnv initialEnv
) )
const renderWorkerOpts: Parameters<RenderWorker['initialize']>[0] = {
port: opts.port,
dir: opts.dir,
workerType: 'render',
hostname: opts.hostname,
minimalMode: opts.minimalMode,
dev: !!opts.dev,
isNodeDebugging: !!opts.isNodeDebugging,
serverFields: devInstance?.serverFields || {},
experimentalTestProxy: !!opts.experimentalTestProxy,
}
// pre-initialize workers // pre-initialize workers
const initialized = { const initialized = {
app: await renderWorkers.app?.initialize(renderWorkerOpts), app: await renderWorkers.app?.initialize(renderWorkerOpts),
...@@ -226,51 +223,51 @@ export async function initialize(opts: { ...@@ -226,51 +223,51 @@ export async function initialize(opts: {
} }
if (devInstance) { if (devInstance) {
Object.assign(devInstance.renderWorkers, renderWorkers) const originalNextDeleteCache = (global as any)._nextDeleteCache
nextDeleteCacheCallbacks.push((filePaths: string[]) =>
Promise.all([
renderWorkers.pages?.deleteCache(filePaths),
renderWorkers.app?.deleteCache(filePaths),
])
)
nextDeleteAppClientCacheCallbacks.push(() =>
Promise.all([
renderWorkers.pages?.deleteAppClientCache(),
renderWorkers.app?.deleteAppClientCache(),
])
)
nextClearModuleContextCallbacks.push((targetPath: string) =>
Promise.all([
renderWorkers.pages?.clearModuleContext(targetPath),
renderWorkers.app?.clearModuleContext(targetPath),
])
)
;(global as any)._nextDeleteCache = async (filePaths: string[]) => { ;(global as any)._nextDeleteCache = async (filePaths: string[]) => {
for (const cb of nextDeleteCacheCallbacks) { // Multiple instances of Next.js can be instantiated, since this is a global we have to call the original if it exists.
try { if (originalNextDeleteCache) {
await cb(filePaths) await originalNextDeleteCache(filePaths)
} catch (err) { }
console.error(err) try {
} await Promise.all([
renderWorkers.pages?.deleteCache(filePaths),
renderWorkers.app?.deleteCache(filePaths),
])
} catch (err) {
console.error(err)
} }
} }
const originalNextDeleteAppClientCache = (global as any)
._nextDeleteAppClientCache
;(global as any)._nextDeleteAppClientCache = async () => { ;(global as any)._nextDeleteAppClientCache = async () => {
for (const cb of nextDeleteAppClientCacheCallbacks) { // Multiple instances of Next.js can be instantiated, since this is a global we have to call the original if it exists.
try { if (originalNextDeleteAppClientCache) {
await cb() await originalNextDeleteAppClientCache()
} catch (err) { }
console.error(err) try {
} await Promise.all([
renderWorkers.pages?.deleteAppClientCache(),
renderWorkers.app?.deleteAppClientCache(),
])
} catch (err) {
console.error(err)
} }
} }
const originalNextClearModuleContext = (global as any)
._nextClearModuleContext
;(global as any)._nextClearModuleContext = async (targetPath: string) => { ;(global as any)._nextClearModuleContext = async (targetPath: string) => {
for (const cb of nextClearModuleContextCallbacks) { // Multiple instances of Next.js can be instantiated, since this is a global we have to call the original if it exists.
try { if (originalNextClearModuleContext) {
await cb(targetPath) await originalNextClearModuleContext()
} catch (err) { }
console.error(err) try {
} await Promise.all([
renderWorkers.pages?.clearModuleContext(targetPath),
renderWorkers.app?.clearModuleContext(targetPath),
])
} catch (err) {
console.error(err)
} }
} }
} }
......
...@@ -85,8 +85,10 @@ import { srcEmptySsgManifest } from '../../../build/webpack/plugins/build-manife ...@@ -85,8 +85,10 @@ import { srcEmptySsgManifest } from '../../../build/webpack/plugins/build-manife
import { PropagateToWorkersField } from './types' import { PropagateToWorkersField } from './types'
import { MiddlewareManifest } from '../../../build/webpack/plugins/middleware-plugin' import { MiddlewareManifest } from '../../../build/webpack/plugins/middleware-plugin'
import { devPageFiles } from '../../../build/webpack/plugins/next-types-plugin/shared' import { devPageFiles } from '../../../build/webpack/plugins/next-types-plugin/shared'
import type { RenderWorkers } from '../router-server'
type SetupOpts = { type SetupOpts = {
renderWorkers: RenderWorkers
dir: string dir: string
turbo?: boolean turbo?: boolean
appDir?: string appDir?: string
...@@ -133,14 +135,9 @@ async function startWatcher(opts: SetupOpts) { ...@@ -133,14 +135,9 @@ async function startWatcher(opts: SetupOpts) {
appDir appDir
) )
const renderWorkers: {
app?: import('../router-server').RenderWorker
pages?: import('../router-server').RenderWorker
} = {}
async function propagateToWorkers(field: PropagateToWorkersField, args: any) { async function propagateToWorkers(field: PropagateToWorkersField, args: any) {
await renderWorkers.app?.propagateServerField(field, args) await opts.renderWorkers.app?.propagateServerField(field, args)
await renderWorkers.pages?.propagateServerField(field, args) await opts.renderWorkers.pages?.propagateServerField(field, args)
} }
let hotReloader: InstanceType<typeof HotReloader> let hotReloader: InstanceType<typeof HotReloader>
...@@ -1437,9 +1434,7 @@ async function startWatcher(opts: SetupOpts) { ...@@ -1437,9 +1434,7 @@ async function startWatcher(opts: SetupOpts) {
return { return {
serverFields, serverFields,
hotReloader, hotReloader,
renderWorkers,
requestHandler, requestHandler,
logErrorWithOriginalStack, logErrorWithOriginalStack,
......
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