Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Prevent building .html files in hybrid mode #7805

Merged
merged 2 commits into from
Jul 26, 2023
Merged

Prevent building .html files in hybrid mode #7805

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c41e579
Prevent building .html files in hybrid mode
matthewp Jul 25, 2023
b97f857
Adding a changeset
matthewp Jul 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/ninety-kids-fail.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@astrojs/netlify': patch
---

Prevent building .html file redirects in hybrid mode
1 change: 1 addition & 0 deletions packages/integrations/netlify/src/integration-functions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ function netlifyFunctions({
updateConfig({
outDir,
build: {
redirects: false,
client: outDir,
server: new URL('./.netlify/functions-internal/', config.root),
},
Expand Down
9 changes: 9 additions & 0 deletions packages/integrations/netlify/test/functions/fixtures/redirects/src/pages/index.astro
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
export const prerender = false;
---
<html>
<head><title>Testing</title></head>
<body>
<h1>Testing</h1>
</body>
</html>
3 changes: 3 additions & 0 deletions packages/integrations/netlify/test/functions/fixtures/redirects/src/pages/nope.astro
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
return Astro.redirect('/');
---
27 changes: 27 additions & 0 deletions ...rations/netlify/test/functions/fixtures/redirects/src/pages/team/articles/[...slug].astro
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 changes: 12 additions & 3 deletions packages/integrations/netlify/test/functions/redirects.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ describe('SSG - Redirects', () => {

before(async () => {
fixture = await loadFixture({
root: new URL('../static/fixtures/redirects/', import.meta.url).toString(),
output: 'server',
root: new URL('../functions/fixtures/redirects/', import.meta.url).toString(),
output: 'hybrid',
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`,
integrations: [testIntegration()],
Expand Down Expand Up @@ -45,4 +45,13 @@ describe('SSG - Redirects', () => {
]);
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);
}
});
});