Skip to content
Open
Show file tree
Hide file tree
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
19 changes: 19 additions & 0 deletions src/presets/_nitro/runtime/nitro-prerenderer.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,28 @@
import "#nitro-internal-pollyfills";
import consola from "consola";
import { getRequestHeader, getRequestURL, H3Error, isEvent } from "h3";
import { useNitroApp } from "nitropack/runtime";
import { trapUnhandledNodeErrors } from "nitropack/runtime/internal";

const nitroApp = useNitroApp();

nitroApp.hooks.hook("error", (error, context) => {
if (
isEvent(context.event) &&
!(error as H3Error).unhandled &&
(error as H3Error).statusCode >= 500 &&
getRequestHeader(context.event, "x-nitro-prerender")
) {
const url = getRequestURL(context.event).href;
consola.error(
`[prerender error]`,
`[${context.event.method}]`,
`[${url}]`,
error
);
}
});

export const localFetch = nitroApp.localFetch;
export const closePrerenderer = () => nitroApp.hooks.callHook("close");

Expand Down
1 change: 1 addition & 0 deletions test/fixture/nitro.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ export default defineNitroConfig({
routeRules: {
"/api/param/prerender4": { prerender: true },
"/api/param/prerender2": { prerender: false },
"/prerender-error": { prerender: true },
"/rules/headers": { headers: { "cache-control": "s-maxage=60" } },
"/rules/cors": {
cors: true,
Expand Down
3 changes: 3 additions & 0 deletions test/fixture/routes/prerender-error.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export default defineEventHandler(() => {
return new Error("Prerender error test");
});
5 changes: 5 additions & 0 deletions test/presets/vercel.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,10 @@ describe("nitro:preset:vercel", async () => {
"dest": "/raw",
"src": "/raw",
},
{
"dest": "/prerender-error",
"src": "/prerender-error",
},
{
"dest": "/prerender-custom.html",
"src": "/prerender-custom.html",
Expand Down Expand Up @@ -562,6 +566,7 @@ describe("nitro:preset:vercel", async () => {
"functions/modules.func (symlink)",
"functions/node-compat.func (symlink)",
"functions/prerender-custom.html.func (symlink)",
"functions/prerender-error.func (symlink)",
"functions/prerender.func (symlink)",
"functions/raw.func (symlink)",
"functions/replace.func (symlink)",
Expand Down
13 changes: 12 additions & 1 deletion test/tests.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@ import { type FetchOptions, fetch } from "ofetch";
import { join, resolve } from "pathe";
import { isWindows, nodeMajorVersion } from "std-env";
import { joinURL } from "ufo";
import { afterAll, beforeAll, describe, expect, it } from "vitest";
import consola from "consola";
import { afterAll, beforeAll, describe, expect, it, vi } from "vitest";
import type { MockInstance } from "vitest";

export interface Context {
preset: string;
Expand All @@ -36,6 +38,7 @@ export interface Context {
env: Record<string, string>;
lambdaV1?: boolean;
// [key: string]: unknown;
consolaError: MockInstance<typeof consola.error>;
}

// https://github.com/nitrojs/nitro/pull/1240
Expand Down Expand Up @@ -109,6 +112,7 @@ export async function setupTest(
redirect: "manual",
...(opts as any),
}),
consolaError: vi.spyOn(consola, "error").mockImplementation(() => {}),
};

// Set environment variables for process compatible presets
Expand Down Expand Up @@ -157,6 +161,7 @@ export async function setupTest(
}

afterAll(async () => {
ctx.consolaError.mockRestore();
if (ctx.server) {
await ctx.server.close();
}
Expand Down Expand Up @@ -459,6 +464,12 @@ export function testNitro(
expect(data).toBe("prerender4");
expect(headers["content-type"]).toBe("text/plain; charset=utf-16");
});

it("show details for 5xx handled errors", async () => {
expect(ctx.consolaError.mock.calls.flat().join(" ")).toContain(
"Prerender error test"
);
});
}

it("shows 404 for /build/non-file", async () => {
Expand Down
Loading