Skip to content

Commit

Permalink
Fix 404 handling in dev server (#7693)
Browse files Browse the repository at this point in the history
* fix(#7301): load 404 page in dev server when returning 404 status code

* chore: add changeset

* fix(404): expose exact pathname/URL when rendering 404

* test: add custom-404-server test
  • Loading branch information
natemoo-re authored Jul 18, 2023
1 parent a8cbd7c commit d401866
Show file tree
Hide file tree
Showing 9 changed files with 114 additions and 0 deletions.
5 changes: 5 additions & 0 deletions .changeset/pink-deers-grab.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'astro': patch
---

Fix loading of `/404.astro` page when dynamic route returns 404
15 changes: 15 additions & 0 deletions packages/astro/src/vite-plugin-astro-server/route.ts
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,21 @@ export async function handleRoute({
}
} else {
const result = await renderPage(options);
if (result.status === 404) {
const fourOhFourRoute = await matchRoute('/404', env, manifestData);
return handleRoute({
...options,
matchedRoute: fourOhFourRoute,
url: new URL(pathname, url),
body,
origin,
env,
manifestData,
incomingRequest,
incomingResponse,
manifest,
});
}
throwIfRedirectNotAllowed(result, config);
return await writeSSRResult(request, result, incomingResponse);
}
Expand Down
42 changes: 42 additions & 0 deletions packages/astro/test/custom-404-server.test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
import { expect } from 'chai';
import * as cheerio from 'cheerio';
import { loadFixture } from './test-utils.js';

describe('Custom 404 server', () => {
let fixture;

before(async () => {
fixture = await loadFixture({
root: './fixtures/custom-404-server/',
site: 'http://example.com',
});
});

describe('dev', () => {
let devServer;
let $;

before(async () => {
devServer = await fixture.startDevServer();
});

after(async () => {
await devServer.stop();
});

it('renders /', async () => {
const html = await fixture.fetch('/').then((res) => res.text());
$ = cheerio.load(html);

expect($('h1').text()).to.equal('Home');
});

it('renders 404 for /a', async () => {
const html = await fixture.fetch('/a').then((res) => res.text());
$ = cheerio.load(html);

expect($('h1').text()).to.equal('Page not found');
expect($('p').text()).to.equal('/a');
});
});
});
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import { defineConfig } from 'astro/config';
import testAdapter from '../../test-adapter.js';

// https://astro.build/config
export default defineConfig({
output: 'server',
adapter: testAdapter(),
});
8 changes: 8 additions & 0 deletions packages/astro/test/fixtures/custom-404-server/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"name": "@test/custom-404-server",
"version": "0.0.0",
"private": true,
"dependencies": {
"astro": "workspace:*"
}
}
13 changes: 13 additions & 0 deletions packages/astro/test/fixtures/custom-404-server/src/pages/404.astro
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
---
const canonicalURL = new URL(Astro.url.pathname, Astro.site);
---

<html lang="en">
<head>
<title>Not Found - Custom 404</title>
</head>
<body>
<h1>Page not found</h1>
<p>{canonicalURL.pathname}</p>
</body>
</html>
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
return new Response(null, {
status: 404,
statusText: 'Not Found'
})
---
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
---
---

<html lang="en">
<head>
<title>Custom 404</title>
</head>
<body>
<h1>Home</h1>
</body>
</html>
6 changes: 6 additions & 0 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit d401866

Please sign in to comment.