Self review stuff

withastro · Dec 5, 2022 · d93a668 · d93a668
1 parent d839c59
commit d93a668
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 14 deletions.
diff --git a/packages/astro/src/core/render/dev/head.ts b/packages/astro/src/core/render/dev/head.ts
@@ -27,8 +27,8 @@ export async function getPropagationMap(
 function addInjection(map: SSRResult['propagation'], modInfo: ModuleInfo | null) {
 	if(modInfo) {
 		const astro = getAstroMetadata(modInfo);
-		if(astro && astro.headInjection) {
-			map.set(modInfo.id, astro.headInjection)
+		if(astro && astro.propagation) {
+			map.set(modInfo.id, astro.propagation)
 		}
 	}
 }
diff --git a/packages/astro/src/jsx/babel.ts b/packages/astro/src/jsx/babel.ts
@@ -145,7 +145,7 @@ export default function astroJSX(): PluginObj {
 							clientOnlyComponents: [],
 							hydratedComponents: [],
 							scripts: [],
-							headInjection: 'none',
+							propagation: 'none',
 						};
 					}
 					path.node.body.splice(

diff --git a/packages/astro/src/runtime/server/index.ts b/packages/astro/src/runtime/server/index.ts
@@ -90,8 +90,3 @@ export function defineStyleVars(defs: Record<any, any> | Record<any, any>[]) {
 	}
 	return markHTMLString(output);
 }
-
-
-
-
-//////////////////////// new stuff
diff --git a/packages/astro/src/runtime/server/render/page.ts b/packages/astro/src/runtime/server/render/page.ts
@@ -51,8 +51,9 @@ async function iterableToHTMLBytes(
 	return parts.toArrayBuffer();
 }
 
+// Recursively calls component instances that might have head content
+// to be propagated up.
 async function bufferHeadContent(result: SSRResult) {
-	debugger;
 	const iterator = result.propagators.values();
 	while(true) {
 		const { value, done } = iterator.next();

diff --git a/packages/astro/src/vite-plugin-astro/index.ts b/packages/astro/src/vite-plugin-astro/index.ts
@@ -219,7 +219,7 @@ export default function astro({ settings, logging }: AstroPluginOptions): vite.P
 				clientOnlyComponents: transformResult.clientOnlyComponents,
 				hydratedComponents: transformResult.hydratedComponents,
 				scripts: transformResult.scripts,
-				headInjection: 'none',
+				propagation: 'none',
 			};
 
 			return {

diff --git a/packages/astro/src/vite-plugin-astro/types.ts b/packages/astro/src/vite-plugin-astro/types.ts
@@ -6,6 +6,6 @@ export interface PluginMetadata {
 		hydratedComponents: TransformResult['hydratedComponents'];
 		clientOnlyComponents: TransformResult['clientOnlyComponents'];
 		scripts: TransformResult['scripts'];
-		headInjection: PropagationHint;
+		propagation: PropagationHint;
 	};
 }
diff --git a/packages/astro/src/vite-plugin-head-propagation/index.ts b/packages/astro/src/vite-plugin-head-propagation/index.ts
@@ -27,7 +27,7 @@ export default function configAliasVitePlugin({
 				const info = getInfo(parent.id);
 				if(info?.meta.astro) {
 					const astroMetadata = info.meta.astro as AstroPluginMetadata['astro'];
-					astroMetadata.headInjection = 'in-tree';
+					astroMetadata.propagation = 'in-tree';
 				}
 				addHeadInjectionInTree(graph, parent.id, getInfo, seen);
 			}

diff --git a/packages/astro/src/vite-plugin-markdown-legacy/index.ts b/packages/astro/src/vite-plugin-markdown-legacy/index.ts
@@ -235,7 +235,7 @@ ${tsResult}`;
 					clientOnlyComponents: transformResult.clientOnlyComponents,
 					hydratedComponents: transformResult.hydratedComponents,
 					scripts: transformResult.scripts,
-					headInjection: 'none'
+					propagation: 'none'
 				};
 
 				return {

diff --git a/packages/astro/src/vite-plugin-markdown/index.ts b/packages/astro/src/vite-plugin-markdown/index.ts
@@ -157,7 +157,7 @@ export default function markdown({ settings, logging }: AstroPluginOptions): Plu
 							hydratedComponents: [],
 							clientOnlyComponents: [],
 							scripts: [],
-							headInjection: 'none',
+							propagation: 'none',
 						} as PluginMetadata['astro'],
 						vite: {
 							lang: 'ts',