michael/astro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix 404 handling in dev server (#7693)

Browse source 
* 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
This commit is contained in:
Nate Moore 2023-07-18 12:09:18 -05:00 committed by GitHub
parent a8cbd7c71a
commit d401866f93
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 114 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.changeset/pink-deers-grab.md Normal file
View file

@ -0,0 +1,5 @@
---
'astro': patch
---
Fix loading of `/404.astro` page when dynamic route returns 404

15
packages/astro/src/vite-plugin-astro-server/route.ts
View file

@ -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);
}

42
packages/astro/test/custom-404-server.test.js Normal file
View file

@ -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');
});
});
});

8
packages/astro/test/fixtures/custom-404-server/astro.config.mjs vendored Normal file
View file

@ -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
packages/astro/test/fixtures/custom-404-server/package.json vendored Normal file
View file

@ -0,0 +1,8 @@
{
"name": "@test/custom-404-server",
"version": "0.0.0",
"private": true,
"dependencies": {
"astro": "workspace:*"
}
}

13
packages/astro/test/fixtures/custom-404-server/src/pages/404.astro vendored Normal file
View file

@ -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>

6
packages/astro/test/fixtures/custom-404-server/src/pages/[slug].astro vendored Normal file
View file

@ -0,0 +1,6 @@
---
return new Response(null, {
status: 404,
statusText: 'Not Found'
})
---

11
packages/astro/test/fixtures/custom-404-server/src/pages/index.astro vendored Normal file
View file

@ -0,0 +1,11 @@
---
---
<html lang="en">
<head>
<title>Custom 404</title>
</head>
<body>
<h1>Home</h1>
</body>
</html>

6
pnpm-lock.yaml
View file

@ -2520,6 +2520,12 @@ importers:
specifier: workspace:*
version: link:../../..
packages/astro/test/fixtures/custom-404-server:
dependencies:
astro:
specifier: workspace:*
version: link:../../..
packages/astro/test/fixtures/custom-assets-name:
dependencies:
'@astrojs/node':