Unverified Commit 4392b6a9 authored by Shu Ding's avatar Shu Ding Committed by GitHub

Refactor base server to get rid of the __server_context hack (#36550)

This PR makes the `Options` type of base server configurable as well as assigning to `this.serverOptions`, so the web server can access it during `constructor()`. This gets rid of the dirty `__server_context` hack.

## Bug

- [ ] Related issues linked using `fixes #number`
- [ ] Integration tests added
- [ ] Errors have helpful link attached, see `contributing.md`

## Feature

- [ ] Implements an existing feature request or RFC. Make sure the feature request has been accepted for implementation before opening a PR.
- [ ] Related issues linked using `fixes #number`
- [ ] Integration tests added
- [ ] Documentation added
- [ ] Telemetry added. In case of a feature if it's used or not.
- [ ] Errors have helpful link attached, see `contributing.md`

## Documentation / Examples

- [ ] Make sure the linting passes by running `yarn lint`
parent cc35859f
...@@ -64,12 +64,6 @@ export default async function middlewareSSRLoader(this: any) { ...@@ -64,12 +64,6 @@ export default async function middlewareSSRLoader(this: any) {
const reactLoadableManifest = self.__REACT_LOADABLE_MANIFEST const reactLoadableManifest = self.__REACT_LOADABLE_MANIFEST
const rscManifest = self.__RSC_MANIFEST const rscManifest = self.__RSC_MANIFEST
// Set server context
self.__server_context = {
page: ${JSON.stringify(page)},
buildId: ${JSON.stringify(buildId)},
}
const render = getRender({ const render = getRender({
dev: ${dev}, dev: ${dev},
page: ${JSON.stringify(page)}, page: ${JSON.stringify(page)},
......
...@@ -57,6 +57,7 @@ export function getRender({ ...@@ -57,6 +57,7 @@ export function getRender({
conf: config, conf: config,
minimalMode: true, minimalMode: true,
webServerConfig: { webServerConfig: {
page,
extendRenderOpts: { extendRenderOpts: {
buildId, buildId,
reactRoot: true, reactRoot: true,
......
...@@ -128,7 +128,7 @@ type RequestContext = { ...@@ -128,7 +128,7 @@ type RequestContext = {
renderOpts: RenderOptsPartial renderOpts: RenderOptsPartial
} }
export default abstract class Server { export default abstract class Server<ServerOptions extends Options = Options> {
protected dir: string protected dir: string
protected quiet: boolean protected quiet: boolean
protected nextConfig: NextConfigComplete protected nextConfig: NextConfigComplete
...@@ -171,6 +171,7 @@ export default abstract class Server { ...@@ -171,6 +171,7 @@ export default abstract class Server {
serverComponentProps?: any serverComponentProps?: any
reactRoot: boolean reactRoot: boolean
} }
protected serverOptions: ServerOptions
private incrementalCache: IncrementalCache private incrementalCache: IncrementalCache
private responseCache: ResponseCache private responseCache: ResponseCache
protected router: Router protected router: Router
...@@ -261,16 +262,19 @@ export default abstract class Server { ...@@ -261,16 +262,19 @@ export default abstract class Server {
protected abstract loadEnvConfig(params: { dev: boolean }): void protected abstract loadEnvConfig(params: { dev: boolean }): void
public constructor({ public constructor(options: ServerOptions) {
dir = '.', const {
quiet = false, dir = '.',
conf, quiet = false,
dev = false, conf,
minimalMode = false, dev = false,
customServer = true, minimalMode = false,
hostname, customServer = true,
port, hostname,
}: Options) { port,
} = options
this.serverOptions = options
this.dir = resolve(dir) this.dir = resolve(dir)
this.quiet = quiet this.quiet = quiet
this.loadEnvConfig({ dev }) this.loadEnvConfig({ dev })
......
...@@ -11,18 +11,22 @@ import BaseServer from './base-server' ...@@ -11,18 +11,22 @@ import BaseServer from './base-server'
import { renderToHTML } from './render' import { renderToHTML } from './render'
import { byteLength, generateETag } from './api-utils/web' import { byteLength, generateETag } from './api-utils/web'
interface WebServerConfig { interface WebServerOptions extends Options {
loadComponent: (pathname: string) => Promise<LoadComponentsReturnType | null> webServerConfig: {
extendRenderOpts?: Partial<BaseServer['renderOpts']> page: string
loadComponent: (
pathname: string
) => Promise<LoadComponentsReturnType | null>
extendRenderOpts: Partial<BaseServer['renderOpts']> &
Pick<BaseServer['renderOpts'], 'buildId'>
}
} }
export default class NextWebServer extends BaseServer { export default class NextWebServer extends BaseServer<WebServerOptions> {
webServerConfig: WebServerConfig constructor(options: WebServerOptions) {
constructor(options: Options & { webServerConfig: WebServerConfig }) {
super(options) super(options)
this.webServerConfig = options.webServerConfig // Extend `renderOpts`.
Object.assign(this.renderOpts, options.webServerConfig.extendRenderOpts) Object.assign(this.renderOpts, options.webServerConfig.extendRenderOpts)
} }
...@@ -58,7 +62,7 @@ export default class NextWebServer extends BaseServer { ...@@ -58,7 +62,7 @@ export default class NextWebServer extends BaseServer {
return '' return ''
} }
protected getBuildId() { protected getBuildId() {
return (globalThis as any).__server_context.buildId return this.serverOptions.webServerConfig.extendRenderOpts.buildId
} }
protected loadEnvConfig() { protected loadEnvConfig() {
// The web server does not need to load the env config. This is done by the // The web server does not need to load the env config. This is done by the
...@@ -96,7 +100,7 @@ export default class NextWebServer extends BaseServer { ...@@ -96,7 +100,7 @@ export default class NextWebServer extends BaseServer {
} }
protected getPagesManifest() { protected getPagesManifest() {
return { return {
[(globalThis as any).__server_context.page]: '', [this.serverOptions.webServerConfig.page]: '',
} }
} }
protected getFilesystemPaths() { protected getFilesystemPaths() {
...@@ -199,7 +203,9 @@ export default class NextWebServer extends BaseServer { ...@@ -199,7 +203,9 @@ export default class NextWebServer extends BaseServer {
query?: NextParsedUrlQuery, query?: NextParsedUrlQuery,
params?: Params | null params?: Params | null
) { ) {
const result = await this.webServerConfig.loadComponent(pathname) const result = await this.serverOptions.webServerConfig.loadComponent(
pathname
)
if (!result) return null if (!result) return null
return { return {
......
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