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

Fix prerendered 404 page handling in SSR (#6558)

Browse source
This commit is contained in:
Bjorn Lu 2023-03-16 23:03:17 +08:00 committed by GitHub
parent 392ba3e4d5
commit 6c465e958e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 86 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.changeset/yellow-grapes-design.md Normal file
View file

@ -0,0 +1,5 @@
---
'astro': patch
---
Fix prerendered 404 page handling in SSR

4
packages/astro/src/core/app/index.ts
View file

@ -102,7 +102,9 @@ export class App {
if (routeData.prerender) return undefined;
return routeData;
} else if (matchNotFound) {
return matchRoute('/404', this.#manifestData);
const notFoundRouteData = matchRoute('/404', this.#manifestData);
if (notFoundRouteData?.prerender) return undefined;
return notFoundRouteData;
} else {
return undefined;
}

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

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

5
packages/astro/test/fixtures/ssr-prerender-404/src/pages/404.astro vendored Normal file
View file

@ -0,0 +1,5 @@
---
export const prerender = true
---
Page does not exist

18
packages/astro/test/fixtures/ssr-prerender-404/src/pages/static.astro vendored Normal file
View file

@ -0,0 +1,18 @@
---
export const prerender = true;
const { searchParams } = Astro.url;
---
<html>
<head>
<title>Static Page</title>
<script>
console.log('hello world');
</script>
</head>
<body>
<h1 id="greeting">Hello world!</h1>
<div id="searchparams">{searchParams.get('q')}</div>
</body>
</html>

33
packages/astro/test/ssr-prerender-404.test.js Normal file
View file

@ -0,0 +1,33 @@
import { expect } from 'chai';
import { loadFixture } from './test-utils.js';
import testAdapter from './test-adapter.js';
describe('SSR: prerender 404', () => {
/** @type {import('./test-utils').Fixture} */
let fixture;
before(async () => {
fixture = await loadFixture({
root: './fixtures/ssr-prerender-404/',
output: 'server',
adapter: testAdapter(),
experimental: {
prerender: true,
},
});
await fixture.build();
});
describe('Prerendering', () => {
it('Prerendered 404.astro page is not rendered', async () => {
const app = await fixture.loadTestAdapterApp();
const request = new Request('http://example.com/non-existent-page');
const response = await app.render(request);
expect(response.status).to.equal(404);
expect(response.statusText).to.equal(
'Not found',
'should be actual 404 response, not 404 page'
);
});
});
});

21
pnpm-lock.yaml
View file

@ -2540,6 +2540,12 @@ importers:
dependencies:
astro: link:../../..
packages/astro/test/fixtures/ssr-prerender-404:
specifiers:
astro: workspace:*
dependencies:
astro: link:../../..
packages/astro/test/fixtures/ssr-prerender-get-static-paths:
specifiers:
astro: workspace:*
@ -4190,14 +4196,15 @@ packages:
- react
dev: false
/@astrojs/markdown-remark/2.0.1_astro@packages+astro:
resolution: {integrity: sha512-xQF1rXGJN18m+zZucwRRtmNehuhPMMhZhi6HWKrtpEAKnHSPk8lqf1GXgKH7/Sypglu8ivdECZ+EGs6kOYVasQ==}
/@astrojs/markdown-remark/2.1.0_astro@packages+astro:
resolution: {integrity: sha512-w9T5o3UWQIfMcCkM2nLWrlfVQazh/7mw+2N/85QGcSUkZy6oNJoyy8Xz/ZkDhHLx8HPO0RT9fABR0B/H+aDaEw==}
peerDependencies:
astro: '*'
dependencies:
'@astrojs/prism': 2.0.0
'@astrojs/prism': 2.1.1
astro: link:packages/astro
github-slugger: 1.5.0
image-size: 1.0.2
import-meta-resolve: 2.2.1
rehype-raw: 6.1.1
rehype-stringify: 9.0.3
@ -4217,8 +4224,8 @@ packages:
resolution: {integrity: sha512-mol57cw1jJMcQgKMRGn7p6cewajq6JTNtqj5aAZgROWam/phVDSOCbXj/WU3O9+3qFnyKtpczoufQKwJTQltAw==}
engines: {node: '>=16.12.0'}
dependencies:
'@astrojs/markdown-remark': 2.0.1_astro@packages+astro
'@astrojs/prism': 2.0.0
'@astrojs/markdown-remark': 2.1.0_astro@packages+astro
'@astrojs/prism': 2.1.1
'@mdx-js/mdx': 2.3.0
'@mdx-js/rollup': 2.3.0
acorn: 8.8.2
@ -4262,8 +4269,8 @@ packages:
- supports-color
dev: false
/@astrojs/prism/2.0.0:
resolution: {integrity: sha512-YgeoeEPqsxaEpg0rwe/bUq3653LqSQnMjrLlpYwrbQQMQQqz6Y5yXN+RX3SfLJ6ppNb4+Fu2+Z49EXjk48Ihjw==}
/@astrojs/prism/2.1.1:
resolution: {integrity: sha512-Gnwnlb1lGJzCQEg89r4/WqgfCGPNFC7Kuh2D/k289Cbdi/2PD7Lrdstz86y1itDvcb2ijiRqjqWnJ5rsfu/QOA==}
engines: {node: '>=16.12.0'}
dependencies:
prismjs: 1.29.0