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

Prevent building .html files in hybrid mode (#7805)

Browse source 
* Prevent building .html files in hybrid mode

* Adding a changeset
This commit is contained in:
Matthew Phillips 2023-07-26 07:58:57 -04:00 committed by GitHub
parent db8c04002f
commit 42a21b5da6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 57 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.changeset/ninety-kids-fail.md Normal file
View file

@ -0,0 +1,5 @@
---
'@astrojs/netlify': patch
---
Prevent building .html file redirects in hybrid mode

1
packages/integrations/netlify/src/integration-functions.ts
View file

@ -40,6 +40,7 @@ function netlifyFunctions({
updateConfig({ updateConfig({
outDir, outDir,
build: { build: {
redirects: false,
client: outDir, client: outDir,
server: new URL('./.netlify/functions-internal/', config.root), server: new URL('./.netlify/functions-internal/', config.root),
}, },

9
packages/integrations/netlify/test/functions/fixtures/redirects/src/pages/index.astro Normal file
View file

@ -0,0 +1,9 @@
---
export const prerender = false;
---
<html>
<head><title>Testing</title></head>
<body>
<h1>Testing</h1>
</body>
</html>

3
packages/integrations/netlify/test/functions/fixtures/redirects/src/pages/nope.astro Normal file
View file

@ -0,0 +1,3 @@
---
return Astro.redirect('/');
---

27
packages/integrations/netlify/test/functions/fixtures/redirects/src/pages/team/articles/[...slug].astro Normal file
View file

@ -0,0 +1,27 @@
---
export const prerender = false;
export const getStaticPaths = (async () => {
const posts = [
{ slug: 'one', data: {draft: false, title: 'One'} },
{ slug: 'two', data: {draft: false, title: 'Two'} }
];
return posts.map((post) => {
return {
params: { slug: post.slug },
props: { draft: post.data.draft, title: post.data.title },
};
});
})
const { slug } = Astro.params;
const { title } = Astro.props;
---
<html>
<head>
<title>{ title }</title>
</head>
<body>
<h1>{ title }</h1>
</body>
</html>

15
packages/integrations/netlify/test/functions/redirects.test.js
View file

@ -8,10 +8,10 @@ describe('SSG - Redirects', () => {
before(async () => { before(async () => {
fixture = await loadFixture({ fixture = await loadFixture({
root: new URL('../static/fixtures/redirects/', import.meta.url).toString(), root: new URL('../functions/fixtures/redirects/', import.meta.url).toString(),
output: 'server', output: 'hybrid',
adapter: netlifyAdapter({ adapter: netlifyAdapter({
dist: new URL('../static/fixtures/redirects/dist/', import.meta.url), dist: new URL('../functions/fixtures/redirects/dist/', import.meta.url),
}), }),
site: `http://example.com`, site: `http://example.com`,
integrations: [testIntegration()], integrations: [testIntegration()],
@ -45,4 +45,13 @@ describe('SSG - Redirects', () => {
]); ]);
expect(redirects).to.matchSnapshot(); expect(redirects).to.matchSnapshot();
}); });
it('Does not create .html files', async () => {
try {
await fixture.readFile('/other/index.html');
expect(false).to.equal(true, 'this file should not exist');
} catch {
expect(true).to.equal(true);
}
});
}); });