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

matthewp · web-flow · commit 42a21b5da631 · 2023-07-26T07:58:57.000-04:00
* Prevent building .html files in hybrid mode

* Adding a changeset
diff --git a/.changeset/ninety-kids-fail.md b/.changeset/ninety-kids-fail.md
@@ -0,0 +1,5 @@
+---
+'@astrojs/netlify': patch
+---
+
+Prevent building .html file redirects in hybrid mode
diff --git a/packages/integrations/netlify/src/integration-functions.ts b/packages/integrations/netlify/src/integration-functions.ts
@@ -40,6 +40,7 @@ function netlifyFunctions({
 				updateConfig({
 					outDir,
 					build: {
+						redirects: false,
 						client: outDir,
 						server: new URL('./.netlify/functions-internal/', config.root),
 					},
diff --git a/packages/integrations/netlify/test/functions/fixtures/redirects/src/pages/index.astro b/packages/integrations/netlify/test/functions/fixtures/redirects/src/pages/index.astro
@@ -0,0 +1,9 @@
+---
+export const prerender = false;
+---
+<html>
+<head><title>Testing</title></head>
+<body>
+	<h1>Testing</h1>
+</body>
+</html>
diff --git a/packages/integrations/netlify/test/functions/fixtures/redirects/src/pages/nope.astro b/packages/integrations/netlify/test/functions/fixtures/redirects/src/pages/nope.astro
@@ -0,0 +1,3 @@
+---
+return Astro.redirect('/');
+---
diff --git a/packages/integrations/netlify/test/functions/fixtures/redirects/src/pages/team/articles/[...slug].astro b/packages/integrations/netlify/test/functions/fixtures/redirects/src/pages/team/articles/[...slug].astro
@@ -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>
diff --git a/packages/integrations/netlify/test/functions/redirects.test.js b/packages/integrations/netlify/test/functions/redirects.test.js
@@ -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()],
@@ -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);
+		}
+	});
 });

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +'@astrojs/netlify': patch
 +---
++
 +Prevent building .html file redirects in hybrid mode
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+---`
	`2`	`+return Astro.redirect('/');`
	`3`	`+---`