Skip to content
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions src/server/helpers/route.ts
Original file line number Diff line number Diff line change
Expand Up @@ -96,10 +96,23 @@ export async function importRouteModule(
);
}
} catch {}

// @ts-expect-error - getPageModule is protected
const buildPagePath = nextServer.getPagePath(filePath);
return importModule<RouteModule>(buildPagePath);
const module = await importModule<RouteModule>(buildPagePath);

// Resolve any Promise in the default export. This is needed for Next.js App
// Router where the default export is often a Promise. Without this, attempts
// to access handlers on the unresolved Promise will fail.
if (module?.default instanceof Promise) {
const resolvedDefault = await module.default;
return {
...module,
default: resolvedDefault
};
}

return module;
}

/**
Expand Down
Loading