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

Correct handle directory finds when using base in the Node adapter (#7076)

Browse source
This commit is contained in:
Matthew Phillips 2023-05-12 10:01:05 -04:00 committed by GitHub
parent 0fc026f63c
commit 781f558c40
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 24 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.changeset/afraid-suits-talk.md Normal file
View file

@ -0,0 +1,5 @@
---
'@astrojs/node': patch
---
Fix redirects on directories when using base option

8
packages/integrations/node/src/http-server.ts
View file

@ -55,7 +55,13 @@ export function createServer(
// File not found, forward to the SSR handler // File not found, forward to the SSR handler
handler(req, res); handler(req, res);
}); });
stream.on('directory', () => {
// On directory find, redirect to the trailing slash
const location = req.url + '/';
res.statusCode = 301
res.setHeader('Location', location);
res.end(location);
});
stream.on('file', () => { stream.on('file', () => {
forwardError = true; forwardError = true;
}); });

15
packages/integrations/node/test/prerender.test.js
View file

@ -12,6 +12,7 @@ describe('Prerendering', () => {
before(async () => { before(async () => {
process.env.ASTRO_NODE_AUTOSTART = 'disabled'; process.env.ASTRO_NODE_AUTOSTART = 'disabled';
fixture = await loadFixture({ fixture = await loadFixture({
base: '/some-base',
root: './fixtures/prerender/', root: './fixtures/prerender/',
output: 'server', output: 'server',
adapter: nodejs({ mode: 'standalone' }), adapter: nodejs({ mode: 'standalone' }),
@ -32,7 +33,7 @@ describe('Prerendering', () => {
} }
it('Can render SSR route', async () => { it('Can render SSR route', async () => {
const res = await fetch(`http://${server.host}:${server.port}/one`); const res = await fetch(`http://${server.host}:${server.port}/some-base/one`);
const html = await res.text(); const html = await res.text();
const $ = cheerio.load(html); const $ = cheerio.load(html);
@ -41,7 +42,7 @@ describe('Prerendering', () => {
}); });
it('Can render prerendered route', async () => { it('Can render prerendered route', async () => {
const res = await fetch(`http://${server.host}:${server.port}/two`); const res = await fetch(`http://${server.host}:${server.port}/some-base/two`);
const html = await res.text(); const html = await res.text();
const $ = cheerio.load(html); const $ = cheerio.load(html);
@ -50,11 +51,19 @@ describe('Prerendering', () => {
}); });
it('Can render prerendered route with query params', async () => { it('Can render prerendered route with query params', async () => {
const res = await fetch(`http://${server.host}:${server.port}/two?foo=bar`); const res = await fetch(`http://${server.host}:${server.port}/some-base/two/?foo=bar`);
const html = await res.text(); const html = await res.text();
const $ = cheerio.load(html); const $ = cheerio.load(html);
expect(res.status).to.equal(200); expect(res.status).to.equal(200);
expect($('h1').text()).to.equal('Two'); expect($('h1').text()).to.equal('Two');
}); });
it('Omitting the trailing slash results in a redirect that includes the base', async () => {
const res = await fetch(`http://${server.host}:${server.port}/some-base/two`, {
redirect: 'manual'
});
expect(res.status).to.equal(301);
expect(res.headers.get('location')).to.equal('/some-base/two/');
});
}); });