fix(rendering): prevent error when slots is keyed into (#9179)

Co-authored-by: Nate Moore <[email protected]>
withastro · Nov 29, 2023 · 3f28336 · 3f28336
1 parent 8f8a40e
commit 3f28336
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 6 deletions.
diff --git a/.changeset/tall-hotels-argue.md b/.changeset/tall-hotels-argue.md
@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Fixes an issue where the presence of a slot in a page led to an error.
diff --git a/packages/astro/src/core/render/core.ts b/packages/astro/src/core/render/core.ts
@@ -76,7 +76,7 @@ export async function renderPage({ mod, renderContext, env, cookies }: RenderPag
 		result,
 		Component,
 		renderContext.props,
-		null,
+		{},
 		env.streaming,
 		renderContext.route
 	);

diff --git a/packages/astro/src/runtime/server/render/page.ts b/packages/astro/src/runtime/server/render/page.ts
@@ -25,7 +25,7 @@ export async function renderPage(
 			componentFactory.name,
 			componentFactory,
 			pageProps,
-			null,
+			{},
 			true,
 			route
 		);

diff --git a/packages/astro/test/astro-slots.test.js b/packages/astro/test/astro-slots.test.js
@@ -40,13 +40,20 @@ describe('Slots', () => {
 		expect($('#default').text().trim()).to.equal('Default');
 	});
 
-	it('Slots render fallback content by default', async () => {
+	it('Slots of a component render fallback content by default', async () => {
 		const html = await fixture.readFile('/fallback/index.html');
 		const $ = cheerio.load(html);
 
 		expect($('#default')).to.have.lengthOf(1);
 	});
 
+	it('Slots of a page render fallback content', async () => {
+		const html = await fixture.readFile('/fallback-own/index.html');
+		const $ = cheerio.load(html);
+
+		expect($('#default')).to.have.lengthOf(1);
+	});
+
 	it('Slots override fallback content', async () => {
 		const html = await fixture.readFile('/fallback-override/index.html');
 		const $ = cheerio.load(html);

diff --git a/packages/astro/test/fixtures/astro-slots/src/pages/fallback-own.astro b/packages/astro/test/fixtures/astro-slots/src/pages/fallback-own.astro
@@ -0,0 +1,10 @@
+<html>
+  <head>
+    <!-- Head Stuff -->
+  </head>
+  <body>
+    <slot>
+      <div id="default"></div>
+    </slot>
+  </body>
+</html>
diff --git a/packages/astro/test/fixtures/astro-slots/src/pages/fallback.astro b/packages/astro/test/fixtures/astro-slots/src/pages/fallback.astro
@@ -7,8 +7,6 @@ import Fallback from '../components/Fallback.astro';
     <!-- Head Stuff -->
   </head>
   <body>
-    <div id="fallback">
-      <Fallback />
-    </div>
+    <Fallback />
   </body>
 </html>