Hydration bugfix
This commit is contained in:
@@ -0,0 +1,35 @@
|
||||
import { afterEach, describe, expect, mock, test } from "bun:test";
|
||||
import path from "path";
|
||||
|
||||
mock.module("../../../../src/utils/log", () => ({
|
||||
log: {
|
||||
info: mock((msg: string) => {}),
|
||||
error: mock((msg: string) => {}),
|
||||
},
|
||||
}));
|
||||
|
||||
import { log } from "../../../../src/utils/log";
|
||||
import grabPageComponent from "../../../../src/functions/server/web-pages/grab-page-component";
|
||||
|
||||
describe("grabPageComponent", () => {
|
||||
const originalRouter = global.ROUTER;
|
||||
|
||||
afterEach(() => {
|
||||
global.ROUTER = originalRouter;
|
||||
mock.restore();
|
||||
});
|
||||
|
||||
test("does not log an error for expected 404 page lookups", async () => {
|
||||
global.ROUTER = new Bun.FileSystemRouter({
|
||||
style: "nextjs",
|
||||
dir: path.resolve(__dirname, "../../../../test/e2e-fixture/src/pages"),
|
||||
});
|
||||
|
||||
const res = await grabPageComponent({
|
||||
req: new Request("http://localhost:3000/unknown-foo-bar123"),
|
||||
});
|
||||
|
||||
expect(res.serverRes?.responseOptions?.status).toBe(404);
|
||||
expect(log.error).not.toHaveBeenCalled();
|
||||
});
|
||||
});
|
||||
@@ -6,7 +6,14 @@ import { log } from "../../../utils/log";
|
||||
import grabPageModules from "./grab-page-modules";
|
||||
import grabPageCombinedServerRes from "./grab-page-combined-server-res";
|
||||
|
||||
class NotFoundError extends Error {}
|
||||
class NotFoundError extends Error {
|
||||
status = 404;
|
||||
|
||||
constructor(message: string) {
|
||||
super(message);
|
||||
this.name = "NotFoundError";
|
||||
}
|
||||
}
|
||||
|
||||
type Params = {
|
||||
req?: Request;
|
||||
@@ -100,12 +107,19 @@ export default async function grabPageComponent({
|
||||
root_module,
|
||||
};
|
||||
} catch (error: any) {
|
||||
log.error(`Error Grabbing Page Component: ${error.message}`);
|
||||
const is404 =
|
||||
error instanceof NotFoundError ||
|
||||
error?.name === "NotFoundError" ||
|
||||
error?.status === 404;
|
||||
|
||||
if (!is404) {
|
||||
log.error(`Error Grabbing Page Component: ${error.message}`);
|
||||
}
|
||||
|
||||
return await grabPageErrorComponent({
|
||||
error,
|
||||
routeParams,
|
||||
is404: error instanceof NotFoundError,
|
||||
is404,
|
||||
url,
|
||||
});
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user