Only apply head propagation in trees that need it (#6363)

withastro · Feb 24, 2023 · d94aae7 · d94aae7
1 parent c87c16c
commit d94aae7
Show file tree

Hide file tree

Showing 6 changed files with 51 additions and 4 deletions.
diff --git a/.changeset/orange-cheetahs-hide.md b/.changeset/orange-cheetahs-hide.md
@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Fixes cases where head is injected in body when using Astro.slots.render()
diff --git a/packages/astro/src/vite-plugin-head-propagation/index.ts b/packages/astro/src/vite-plugin-head-propagation/index.ts
@@ -92,11 +92,11 @@ export function astroHeadPropagationBuildPlugin(
 										for (const [info] of walkParentInfos(id, this)) {
 											appendPropagation(info);
 										}
-									}
 
-									const info = this.getModuleInfo(id);
-									if (info) {
-										appendPropagation(info);
+										const info = this.getModuleInfo(id);
+										if (info) {
+											appendPropagation(info);
+										}
 									}
 								}
 							}

diff --git a/packages/astro/test/fixtures/head-injection/src/components/with-slot-render2/inner.astro b/packages/astro/test/fixtures/head-injection/src/components/with-slot-render2/inner.astro
@@ -0,0 +1,10 @@
+---
+---
+
+<p>View link tag position</p>
+
+<style>
+  p {
+    background: red;
+  }
+</style>
diff --git a/...ro/test/fixtures/head-injection/src/components/with-slot-render2/slots-render-outer.astro b/...ro/test/fixtures/head-injection/src/components/with-slot-render2/slots-render-outer.astro
@@ -0,0 +1,5 @@
+---
+const content = await Astro.slots.render('default')
+---
+
+<Fragment set:html={content} />
diff --git a/packages/astro/test/fixtures/head-injection/src/pages/with-slot-render2.astro b/packages/astro/test/fixtures/head-injection/src/pages/with-slot-render2.astro
@@ -0,0 +1,19 @@
+---
+import Inner from '../components/with-slot-render2/inner.astro'
+import SlotsRenderOuter from '../components/with-slot-render2/slots-render-outer.astro'
+---
+
+<html lang='en'>
+  <head>
+    <meta charset='utf-8' />
+    <link rel='icon' type='image/svg+xml' href='/favicon.svg' />
+    <meta name='viewport' content='width=device-width' />
+    <meta name='generator' content={Astro.generator} />
+    <title>Astro</title>
+  </head>
+  <body>
+    <SlotsRenderOuter>
+      <Inner />
+    </SlotsRenderOuter>
+  </body>
+</html>
diff --git a/packages/astro/test/head-injection.test.js b/packages/astro/test/head-injection.test.js
@@ -58,6 +58,14 @@ describe('Head injection', () => {
 				expect($('head link[rel=stylesheet]')).to.have.a.lengthOf(2);
 				expect($('body link[rel=stylesheet]')).to.have.a.lengthOf(0);
 			});
+
+			it('Using slots with Astro.slots.render() (layout)', async () => {
+				const html = await fixture.readFile('/with-slot-render2/index.html');
+				const $ = cheerio.load(html);
+
+				expect($('head link[rel=stylesheet]')).to.have.a.lengthOf(1);
+				expect($('body link[rel=stylesheet]')).to.have.a.lengthOf(0);
+			});
 		});
 	});
 });