Infrastructure/astro
0
Fork 0
mirror of https://github.com/withastro/astro.git synced 2025-02-03 22:29:08 -05:00
Code Issues Activity

Fixes custom 404 pages in astro dev (#3331)

Browse source 
* Fixing pathname matching for custom 404 pages

* fixes custom 404 routes in dev

* refactor: removing node path dependency

* refactor: using core's path utils
This commit is contained in:
Tony Sullivan 2022-05-10 21:05:30 +00:00 • committed by GitHub
parent d04928e8f2
commit e22f7364ce
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 89 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.changeset/healthy-oranges-approve.md Normal file
View file

@ -0,0 +1,5 @@
---
'astro': patch
---
Fixes an issue preventing custom 404 pages in dev

3
packages/astro/src/vite-plugin-astro-server/index.ts
View file

@ -3,6 +3,7 @@ import type http from 'http';
import type { AstroConfig, ManifestData } from '../@types/astro'; import type { AstroConfig, ManifestData } from '../@types/astro';
import type { RenderResponse, SSROptions } from '../core/render/dev/index'; import type { RenderResponse, SSROptions } from '../core/render/dev/index';
import { debug, info, warn, error, LogOptions } from '../core/logger/core.js'; import { debug, info, warn, error, LogOptions } from '../core/logger/core.js';
import { appendForwardSlash } from '../core/path.js';
import { getParamsAndProps, GetParamsAndPropsError } from '../core/render/core.js'; import { getParamsAndProps, GetParamsAndPropsError } from '../core/render/core.js';
import { createRouteManifest, matchRoute } from '../core/routing/index.js'; import { createRouteManifest, matchRoute } from '../core/routing/index.js';
import stripAnsi from 'strip-ansi'; import stripAnsi from 'strip-ansi';
@ -166,7 +167,7 @@ async function handle500Response(
function getCustom404Route(config: AstroConfig, manifest: ManifestData) { function getCustom404Route(config: AstroConfig, manifest: ManifestData) {
const relPages = resolvePages(config).href.replace(config.root.href, ''); const relPages = resolvePages(config).href.replace(config.root.href, '');
return manifest.routes.find((r) => r.component === relPages + '404.astro'); return manifest.routes.find((r) => r.component === appendForwardSlash(relPages) + '404.astro');
} }
function log404(logging: LogOptions, pathname: string) { function log404(logging: LogOptions, pathname: string) {

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

@ -0,0 +1,41 @@
import { expect } from 'chai';
import * as cheerio from 'cheerio';
import { loadFixture } from './test-utils.js';
describe('Custom 404', () => {
let fixture;
before(async () => {
fixture = await loadFixture({
root: './fixtures/custom-404/',
});
});
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/');
})
});
});

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

@ -0,0 +1,4 @@
import { defineConfig } from 'astro/config';
// https://astro.build/config
export default defineConfig({});

8
packages/astro/test/fixtures/custom-404/package.json vendored Normal file
View file

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

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

@ -0,0 +1,12 @@
---
---
<html lang="en">
<head>
<title>Not Found - Custom 404</title>
</head>
<body>
<h1>Page not found</h1>
<p>{Astro.canonicalURL.pathname}</p>
</body>
</html>

11
packages/astro/test/fixtures/custom-404/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 generated
View file

@ -961,6 +961,12 @@ importers:
dependencies: dependencies:
astro: link:../../.. astro: link:../../..
packages/astro/test/fixtures/custom-404:
specifiers:
astro: workspace:*
dependencies:
astro: link:../../..
packages/astro/test/fixtures/custom-elements: packages/astro/test/fixtures/custom-elements:
specifiers: specifiers:
'@test/custom-element-renderer': workspace:* '@test/custom-element-renderer': workspace:*