summaryrefslogtreecommitdiff
path: root/packages/integrations/node/src/nodeMiddleware.ts
diff options
context:
space:
mode:
authorGravatar Nate Moore <natemoo-re@users.noreply.github.com> 2023-08-01 09:52:16 -0500
committerGravatar GitHub <noreply@github.com> 2023-08-01 09:52:16 -0500
commit298dbb89f2963a547370b6e65cafd2650fdb1b27 (patch)
tree6650c12dc5985f5d700319b3fc4a3826fbc40070 /packages/integrations/node/src/nodeMiddleware.ts
parent0b8375fe82a15bfff3f517f98de6454adb2779f1 (diff)
downloadastro-298dbb89f2963a547370b6e65cafd2650fdb1b27.tar.gz
astro-298dbb89f2963a547370b6e65cafd2650fdb1b27.tar.zst
astro-298dbb89f2963a547370b6e65cafd2650fdb1b27.zip
Refactor 404 and 500 approach (#7754)
* fix(app): refactor 404 and 500 approach * chore: refactor logic * fix: always treat error as page * test: migrate ssr-prerender-404 to node adapter * feat: merge original response metadata with error response * chore: update lockfile * chore: trigger ci * chore(lint): fix lint issue * fix: ensure merged request has proper status * fix(node): prerender test * chore: update test label * fix(node): improve 404 behavior in middleware mode * fix(vercel): improve 404 behavior * fix(netlify): improve 404 behavior * chore: update test labels * chore: force ci * chore: fix lint * fix: avoid infinite loops * test: fix failing test in Node 18 * chore: remove volta
Diffstat (limited to 'packages/integrations/node/src/nodeMiddleware.ts')
-rw-r--r--packages/integrations/node/src/nodeMiddleware.ts11
1 files changed, 6 insertions, 5 deletions
diff --git a/packages/integrations/node/src/nodeMiddleware.ts b/packages/integrations/node/src/nodeMiddleware.ts
index 4963afc9f..8d31b6806 100644
--- a/packages/integrations/node/src/nodeMiddleware.ts
+++ b/packages/integrations/node/src/nodeMiddleware.ts
@@ -5,7 +5,9 @@ import { createOutgoingHttpHeaders } from './createOutgoingHttpHeaders';
import { responseIterator } from './response-iterator';
import type { Options } from './types';
-export default function (app: NodeApp, mode: Options['mode']) {
+// Disable no-unused-vars to avoid breaking signature change
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+export default function (app: NodeApp, _mode: Options['mode']) {
return async function (
req: IncomingMessage,
res: ServerResponse,
@@ -13,8 +15,7 @@ export default function (app: NodeApp, mode: Options['mode']) {
locals?: object
) {
try {
- const route =
- mode === 'standalone' ? app.match(req, { matchNotFound: true }) : app.match(req);
+ const route = app.match(req);
if (route) {
try {
const response = await app.render(req, route, locals);
@@ -29,8 +30,8 @@ export default function (app: NodeApp, mode: Options['mode']) {
} else if (next) {
return next();
} else {
- res.writeHead(404);
- res.end('Not found');
+ const response = await app.render(req);
+ await writeWebResponse(app, res, response);
}
} catch (err: unknown) {
if (!res.headersSent) {