Unverified Commit a09dc5f2 authored by Jiachi Liu's avatar Jiachi Liu Committed by GitHub

Add @vercel/og to external server packages (#49944)

`@vercel/og` should also be treated as external package as precompiled one (x-ref: #48844)

As it's ESModule, it could escalate the importee modules to become ESM as well, then `require()` won't be able to load the proper module, we need to switch to await the require result (just like **dynamic import**) for node module loader

[slack thread](https://vercel.slack.com/archives/C03KAR5DCKC/p1683577269970609?thread_ts=1683569728.697039&cid=C03KAR5DCKC)
parent f3ae3953
...@@ -424,7 +424,9 @@ export default async function exportPage({ ...@@ -424,7 +424,9 @@ export default async function exportPage({
const filename = posix.join(distDir, 'server', 'app', page) const filename = posix.join(distDir, 'server', 'app', page)
// Load the module for the route. // Load the module for the route.
const module = RouteModuleLoader.load<AppRouteRouteModule>(filename) const module = await RouteModuleLoader.load<AppRouteRouteModule>(
filename
)
// Call the handler with the request and context from the module. // Call the handler with the request and context from the module.
const response = await module.handle(request, context) const response = await module.handle(request, context)
......
[ [
"@prisma/client", "@prisma/client",
"@vercel/og",
"@sentry/nextjs", "@sentry/nextjs",
"@sentry/node", "@sentry/node",
"@swc/core", "@swc/core",
......
...@@ -2,5 +2,5 @@ ...@@ -2,5 +2,5 @@
* Loads a given module for a given ID. * Loads a given module for a given ID.
*/ */
export interface ModuleLoader { export interface ModuleLoader {
load<M = any>(id: string): M load<M = any>(id: string): Promise<M>
} }
import { ModuleLoader } from './module-loader' import { ModuleLoader } from './module-loader'
/** /**
* Loads a module using `require(id)`. * Loads a module using `await require(id)`.
*/ */
export class NodeModuleLoader implements ModuleLoader { export class NodeModuleLoader implements ModuleLoader {
public load<M>(id: string): M { public async load<M>(id: string): Promise<M> {
if (process.env.NEXT_RUNTIME !== 'edge') { if (process.env.NEXT_RUNTIME !== 'edge') {
return require(id) // Need to `await` to cover the case that route is marked ESM modules by ESM escalation.
return await require(id)
} }
throw new Error('NodeModuleLoader is not supported in edge runtime.') throw new Error('NodeModuleLoader is not supported in edge runtime.')
......
...@@ -8,12 +8,12 @@ export interface AppLoaderModule<M extends RouteModule = RouteModule> { ...@@ -8,12 +8,12 @@ export interface AppLoaderModule<M extends RouteModule = RouteModule> {
} }
export class RouteModuleLoader { export class RouteModuleLoader {
static load<M extends RouteModule>( static async load<M extends RouteModule>(
id: string, id: string,
loader: ModuleLoader = new NodeModuleLoader() loader: ModuleLoader = new NodeModuleLoader()
): M { ): Promise<M> {
if (process.env.NEXT_RUNTIME !== 'edge') { if (process.env.NEXT_RUNTIME !== 'edge') {
const { routeModule }: AppLoaderModule<M> = loader.load(id) const { routeModule }: AppLoaderModule<M> = await loader.load(id)
return routeModule return routeModule
} }
......
...@@ -27,7 +27,7 @@ export class RouteHandlerManager { ...@@ -27,7 +27,7 @@ export class RouteHandlerManager {
context: RouteHandlerManagerContext context: RouteHandlerManagerContext
): Promise<Response | undefined> { ): Promise<Response | undefined> {
// The module supports minimal mode, load the minimal module. // The module supports minimal mode, load the minimal module.
const module = RouteModuleLoader.load<RouteModule>( const module = await RouteModuleLoader.load<RouteModule>(
match.definition.filename, match.definition.filename,
this.moduleLoader this.moduleLoader
) )
......
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