astro 4.5.8 → 4.5.9

package/dist/content/vite-plugin-content-assets.js

@@ -1,7 +1,7 @@
 import { extname } from "node:path";
 import { pathToFileURL } from "node:url";
 import { getAssetsPrefix } from "../assets/utils/getAssetsPrefix.js";
-import { moduleIsTopLevelPage, walkParentInfos } from "../core/build/graph.js";
+import { getParentModuleInfos, moduleIsTopLevelPage } from "../core/build/graph.js";
 import { getPageDataByViteID } from "../core/build/internal.js";
 import { createViteLoader } from "../core/module-loader/vite.js";
 import { joinPaths, prependForwardSlash } from "../core/path.js";
@@ -147,7 +147,7 @@ function astroConfigBuildPlugin(options, internals) {
               }
             } else {
               for (const id of Object.keys(chunk.modules)) {
-                for (const [pageInfo] of walkParentInfos(id, ssrPluginContext)) {
+                for (const pageInfo of getParentModuleInfos(id, ssrPluginContext)) {
                   if (moduleIsTopLevelPage(pageInfo)) {
                     const pageViteID = pageInfo.id;
                     const pageData = getPageDataByViteID(internals, pageViteID);

package/dist/core/build/css-asset-name.js

@@ -1,13 +1,13 @@
 import crypto from "node:crypto";
 import npath from "node:path";
 import { viteID } from "../util.js";
-import { getTopLevelPages } from "./graph.js";
+import { getTopLevelPageModuleInfos } from "./graph.js";
 const confusingBaseNames = ["404", "500"];
 function shortHashedName(id, ctx) {
-  const parents = Array.from(getTopLevelPages(id, ctx));
+  const parents = getTopLevelPageModuleInfos(id, ctx);
   return createNameHash(
     getFirstParentId(parents),
-    parents.map(([page]) => page.id)
+    parents.map((page) => page.id)
   );
 }
 function createNameHash(baseId, hashIds) {
@@ -26,8 +26,8 @@ function createSlugger(settings) {
   const map = /* @__PURE__ */ new Map();
   const sep = "-";
   return function(id, ctx) {
-    const parents = Array.from(getTopLevelPages(id, ctx));
-    const allParentsKey = parents.map(([page]) => page.id).sort().join("-");
+    const parents = Array.from(getTopLevelPageModuleInfos(id, ctx));
+    const allParentsKey = parents.map((page) => page.id).sort().join("-");
     const firstParentId = getFirstParentId(parents) || indexPage;
     let dir = firstParentId;
     let key = "";
@@ -62,13 +62,13 @@ function createSlugger(settings) {
 }
 function getFirstParentId(parents) {
   for (const parent of parents) {
-    const id = parent[0].id;
+    const id = parent.id;
     const baseName = npath.parse(id).name;
     if (!confusingBaseNames.includes(baseName)) {
       return id;
     }
   }
-  return parents[0]?.[0].id;
+  return parents[0]?.id;
 }
 const charsToReplaceRe = /[.[\]]/g;
 const underscoresRe = /_+/g;

package/dist/core/build/graph.d.ts

@@ -1,8 +1,17 @@
 import type { GetModuleInfo, ModuleInfo } from 'rollup';
-export declare function walkParentInfos(id: string, ctx: {
+interface ExtendedModuleInfo {
+    info: ModuleInfo;
+    depth: number;
+    order: number;
+}
+export declare function getParentExtendedModuleInfos(id: string, ctx: {
     getModuleInfo: GetModuleInfo;
-}, until?: (importer: string) => boolean, depth?: number, order?: number, seen?: Set<string>, childId?: string): Generator<[ModuleInfo, number, number], void, unknown>;
+}, until?: (importer: string) => boolean, depth?: number, order?: number, childId?: string, seen?: Set<string>, accumulated?: ExtendedModuleInfo[]): ExtendedModuleInfo[];
+export declare function getParentModuleInfos(id: string, ctx: {
+    getModuleInfo: GetModuleInfo;
+}, until?: (importer: string) => boolean, seen?: Set<string>, accumulated?: ModuleInfo[]): ModuleInfo[];
 export declare function moduleIsTopLevelPage(info: ModuleInfo): boolean;
-export declare function getTopLevelPages(id: string, ctx: {
+export declare function getTopLevelPageModuleInfos(id: string, ctx: {
     getModuleInfo: GetModuleInfo;
-}): Generator<[ModuleInfo, number, number], void, unknown>;
+}): ModuleInfo[];
+export {};

package/dist/core/build/graph.js

@@ -1,5 +1,5 @@
 import { ASTRO_PAGE_RESOLVED_MODULE_ID } from "./plugins/plugin-pages.js";
-function* walkParentInfos(id, ctx, until, depth = 0, order = 0, seen = /* @__PURE__ */ new Set(), childId = "") {
+function getParentExtendedModuleInfos(id, ctx, until, depth = 0, order = 0, childId = "", seen = /* @__PURE__ */ new Set(), accumulated = []) {
   seen.add(id);
   const info = ctx.getModuleInfo(id);
   if (info) {
@@ -12,30 +12,43 @@ function* walkParentInfos(id, ctx, until, depth = 0, order = 0, seen = /* @__PUR
         order += idx;
       }
     }
-    yield [info, depth, order];
+    accumulated.push({ info, depth, order });
   }
-  if (until?.(id))
-    return;
-  const importers = (info?.importers || []).concat(info?.dynamicImporters || []);
-  for (const imp of importers) {
-    if (seen.has(imp)) {
-      continue;
+  if (info && !until?.(id)) {
+    const importers = info.importers.concat(info.dynamicImporters);
+    for (const imp of importers) {
+      if (!seen.has(imp)) {
+        getParentExtendedModuleInfos(imp, ctx, until, depth + 1, order, id, seen, accumulated);
+      }
     }
-    yield* walkParentInfos(imp, ctx, until, depth + 1, order, seen, id);
   }
+  return accumulated;
+}
+function getParentModuleInfos(id, ctx, until, seen = /* @__PURE__ */ new Set(), accumulated = []) {
+  seen.add(id);
+  const info = ctx.getModuleInfo(id);
+  if (info) {
+    accumulated.push(info);
+  }
+  if (info && !until?.(id)) {
+    const importers = info.importers.concat(info.dynamicImporters);
+    for (const imp of importers) {
+      if (!seen.has(imp)) {
+        getParentModuleInfos(imp, ctx, until, seen, accumulated);
+      }
+    }
+  }
+  return accumulated;
 }
 function moduleIsTopLevelPage(info) {
   return info.importers[0]?.includes(ASTRO_PAGE_RESOLVED_MODULE_ID) || info.dynamicImporters[0]?.includes(ASTRO_PAGE_RESOLVED_MODULE_ID);
 }
-function* getTopLevelPages(id, ctx) {
-  for (const res of walkParentInfos(id, ctx)) {
-    if (moduleIsTopLevelPage(res[0])) {
-      yield res;
-    }
-  }
+function getTopLevelPageModuleInfos(id, ctx) {
+  return getParentModuleInfos(id, ctx).filter(moduleIsTopLevelPage);
 }
 export {
-  getTopLevelPages,
-  moduleIsTopLevelPage,
-  walkParentInfos
+  getParentExtendedModuleInfos,
+  getParentModuleInfos,
+  getTopLevelPageModuleInfos,
+  moduleIsTopLevelPage
 };

package/dist/core/build/plugins/plugin-analyzer.js

@@ -1,6 +1,10 @@
 import { PROPAGATED_ASSET_FLAG } from "../../../content/consts.js";
 import { prependForwardSlash } from "../../../core/path.js";
-import { getTopLevelPages, moduleIsTopLevelPage, walkParentInfos } from "../graph.js";
+import {
+  getParentModuleInfos,
+  getTopLevelPageModuleInfos,
+  moduleIsTopLevelPage
+} from "../graph.js";
 import { getPageDataByViteID, trackClientOnlyPageDatas } from "../internal.js";
 function isPropagatedAsset(id) {
   try {
@@ -21,11 +25,9 @@ function vitePluginAnalyzer(options, internals) {
           hoistedScripts.add(hid);
         }
         if (hoistedScripts.size) {
-          for (const [parentInfo] of walkParentInfos(from, this, function until(importer) {
-            return isPropagatedAsset(importer);
-          })) {
+          for (const parentInfo of getParentModuleInfos(from, this, isPropagatedAsset)) {
             if (isPropagatedAsset(parentInfo.id)) {
-              for (const [nestedParentInfo] of walkParentInfos(from, this)) {
+              for (const nestedParentInfo of getParentModuleInfos(from, this)) {
                 if (moduleIsTopLevelPage(nestedParentInfo)) {
                   for (const hid of hoistedScripts) {
                     if (!pageScripts.has(nestedParentInfo.id)) {
@@ -131,7 +133,7 @@ function vitePluginAnalyzer(options, internals) {
               clientOnlys.push(resolvedId.id);
             }
           }
-          for (const [pageInfo] of getTopLevelPages(id, this)) {
+          for (const pageInfo of getTopLevelPageModuleInfos(id, this)) {
             const newPageData = getPageDataByViteID(internals, pageInfo.id);
             if (!newPageData)
               continue;

package/dist/core/build/plugins/plugin-css.js

@@ -1,7 +1,11 @@
 import { isBuildableCSSRequest } from "../../../vite-plugin-astro-server/util.js";
 import { PROPAGATED_ASSET_FLAG } from "../../../content/consts.js";
 import * as assetName from "../css-asset-name.js";
-import { moduleIsTopLevelPage, walkParentInfos } from "../graph.js";
+import {
+  getParentExtendedModuleInfos,
+  getParentModuleInfos,
+  moduleIsTopLevelPage
+} from "../graph.js";
 import {
   eachPageData,
   getPageDataByViteID,
@@ -46,9 +50,8 @@ function rollupPluginAstroBuildCSS(options) {
             if (options.target === "client") {
               return internals.cssModuleToChunkIdMap.get(id);
             }
-            for (const [pageInfo] of walkParentInfos(id, {
-              getModuleInfo: meta.getModuleInfo
-            })) {
+            const ctx = { getModuleInfo: meta.getModuleInfo };
+            for (const pageInfo of getParentModuleInfos(id, ctx)) {
               if (new URL(pageInfo.id, "file://").searchParams.has(PROPAGATED_ASSET_FLAG)) {
                 const chunkId2 = assetName.createNameHash(id, [id]);
                 internals.cssModuleToChunkIdMap.set(id, chunkId2);
@@ -87,7 +90,7 @@ function rollupPluginAstroBuildCSS(options) {
           }
         }
         for (const id of Object.keys(chunk.modules)) {
-          for (const [pageInfo, depth, order] of walkParentInfos(
+          for (const { info: pageInfo, depth, order } of getParentExtendedModuleInfos(
             id,
             this,
             function until(importer) {
@@ -95,8 +98,7 @@ function rollupPluginAstroBuildCSS(options) {
             }
           )) {
             if (new URL(pageInfo.id, "file://").searchParams.has(PROPAGATED_ASSET_FLAG)) {
-              for (const parent of walkParentInfos(id, this)) {
-                const parentInfo = parent[0];
+              for (const parentInfo of getParentModuleInfos(id, this)) {
                 if (moduleIsTopLevelPage(parentInfo) === false)
                   continue;
                 const pageViteID = parentInfo.id;
@@ -216,7 +218,7 @@ function rollupPluginAstroBuildCSS(options) {
   return [cssBuildPlugin, cssScopeToPlugin, singleCssPlugin, inlineStylesheetsPlugin];
 }
 function* getParentClientOnlys(id, ctx, internals) {
-  for (const [info] of walkParentInfos(id, ctx)) {
+  for (const info of getParentModuleInfos(id, ctx)) {
     yield* getPageDatasByClientOnlyID(internals, info.id);
   }
 }

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "4.5.8";
+const ASTRO_VERSION = "4.5.9";
 const REROUTE_DIRECTIVE_HEADER = "X-Astro-Reroute";
 const ROUTE_TYPE_HEADER = "X-Astro-Route-Type";
 const DEFAULT_404_COMPONENT = "astro-default-404";

package/dist/core/dev/dev.js

@@ -23,7 +23,7 @@ async function dev(inlineConfig) {
       base: restart.container.settings.config.base
     })
   );
-  const currentVersion = "4.5.8";
+  const currentVersion = "4.5.9";
   if (currentVersion.includes("-")) {
     logger.warn("SKIP_FORMAT", msg.prerelease({ currentVersion }));
   }

package/dist/core/messages.js

@@ -36,7 +36,7 @@ function serverStart({
   host,
   base
 }) {
-  const version = "4.5.8";
+  const version = "4.5.9";
   const localPrefix = `${dim("\u2503")} Local    `;
   const networkPrefix = `${dim("\u2503")} Network  `;
   const emptyPrefix = " ".repeat(11);
@@ -261,7 +261,7 @@ function printHelp({
     message.push(
       linebreak(),
       `  ${bgGreen(black(` ${commandName} `))} ${green(
-        `v${"4.5.8"}`
+        `v${"4.5.9"}`
       )} ${headline}`
     );
   }

package/dist/runtime/server/jsx.js

@@ -9,25 +9,7 @@ import {
 } from "./index.js";
 import { renderComponentToString } from "./render/component.js";
 const ClientOnlyPlaceholder = "astro-client-only";
-class Skip {
-  constructor(vnode) {
-    this.vnode = vnode;
-    this.count = 0;
-  }
-  count;
-  increment() {
-    this.count++;
-  }
-  haveNoTried() {
-    return this.count === 0;
-  }
-  isCompleted() {
-    return this.count > 2;
-  }
-  static symbol = Symbol("astro:jsx:skip");
-}
-let originalConsoleError;
-let consoleFilterRefs = 0;
+const hasTriedRenderComponentSymbol = Symbol("hasTriedRenderComponent");
 async function renderJSX(result, vnode) {
   switch (true) {
     case vnode instanceof HTMLString:
@@ -46,19 +28,9 @@ async function renderJSX(result, vnode) {
         (await Promise.all(vnode.map((v) => renderJSX(result, v)))).join("")
       );
   }
-  let skip;
-  if (vnode.props) {
-    if (vnode.props[Skip.symbol]) {
-      skip = vnode.props[Skip.symbol];
-    } else {
-      skip = new Skip(vnode);
-    }
-  } else {
-    skip = new Skip(vnode);
-  }
-  return renderJSXVNode(result, vnode, skip);
+  return renderJSXVNode(result, vnode);
 }
-async function renderJSXVNode(result, vnode, skip) {
+async function renderJSXVNode(result, vnode) {
   if (isVNode(vnode)) {
     switch (true) {
       case !vnode.type: {
@@ -106,36 +78,20 @@ Did you forget to import the component or is it possible there is a typo?`);
         _slots.default.push(child);
       };
       var extractSlots = extractSlots2;
-      if (typeof vnode.type === "function" && vnode.type["astro:renderer"]) {
-        skip.increment();
-      }
       if (typeof vnode.type === "function" && vnode.props["server:root"]) {
         const output2 = await vnode.type(vnode.props ?? {});
         return await renderJSX(result, output2);
       }
       if (typeof vnode.type === "function") {
-        if (skip.haveNoTried() || skip.isCompleted()) {
-          useConsoleFilter();
-          try {
-            const output2 = await vnode.type(vnode.props ?? {});
-            let renderResult;
-            if (output2?.[AstroJSX]) {
-              renderResult = await renderJSXVNode(result, output2, skip);
-              return renderResult;
-            } else if (!output2) {
-              renderResult = await renderJSXVNode(result, output2, skip);
-              return renderResult;
-            }
-          } catch (e) {
-            if (skip.isCompleted()) {
-              throw e;
-            }
-            skip.increment();
-          } finally {
-            finishUsingConsoleFilter();
+        if (vnode.props[hasTriedRenderComponentSymbol]) {
+          const output2 = await vnode.type(vnode.props ?? {});
+          if (output2?.[AstroJSX] || !output2) {
+            return await renderJSXVNode(result, output2);
+          } else {
+            return;
           }
         } else {
-          skip.increment();
+          vnode.props[hasTriedRenderComponentSymbol] = true;
         }
       }
       const { children = null, ...props } = vnode.props ?? {};
@@ -161,7 +117,6 @@ Did you forget to import the component or is it possible there is a typo?`);
         );
       }
       await Promise.all(slotPromises);
-      props[Skip.symbol] = skip;
       let output;
       if (vnode.type === ClientOnlyPlaceholder && vnode.props["client:only"]) {
         output = await renderComponentToString(
@@ -199,27 +154,6 @@ function prerenderElementChildren(tag, children) {
     return children;
   }
 }
-function useConsoleFilter() {
-  consoleFilterRefs++;
-  if (!originalConsoleError) {
-    originalConsoleError = console.error;
-    try {
-      console.error = filteredConsoleError;
-    } catch (error) {
-    }
-  }
-}
-function finishUsingConsoleFilter() {
-  consoleFilterRefs--;
-}
-function filteredConsoleError(msg, ...rest) {
-  if (consoleFilterRefs > 0 && typeof msg === "string") {
-    const isKnownReactHookError = msg.includes("Warning: Invalid hook call.") && msg.includes("https://reactjs.org/link/invalid-hook-call");
-    if (isKnownReactHookError)
-      return;
-  }
-  originalConsoleError(msg, ...rest);
-}
 export {
   renderJSX
 };

package/dist/runtime/server/render/component.js

@@ -382,17 +382,15 @@ async function renderComponentToString(result, displayName, Component, props, sl
   let str = "";
   let renderedFirstPageChunk = false;
   let head = "";
-  if (nonAstroPageNeedsHeadInjection(Component)) {
-    for (const headChunk of maybeRenderHead()) {
-      head += chunkToString(result, headChunk);
-    }
+  if (isPage && !result.partial && nonAstroPageNeedsHeadInjection(Component)) {
+    head += chunkToString(result, maybeRenderHead());
   }
   try {
     const destination = {
       write(chunk) {
-        if (isPage && !renderedFirstPageChunk) {
+        if (isPage && !result.partial && !renderedFirstPageChunk) {
           renderedFirstPageChunk = true;
-          if (!result.partial && !/<!doctype html/i.test(String(chunk))) {
+          if (!/<!doctype html/i.test(String(chunk))) {
             const doctype = result.compressHTML ? "<!DOCTYPE html>" : "<!DOCTYPE html>\n";
             str += doctype + head;
           }

package/dist/runtime/server/render/head.d.ts

@@ -1,5 +1,5 @@
 import type { SSRResult } from '../../../@types/astro.js';
 import type { MaybeRenderHeadInstruction, RenderHeadInstruction } from './instruction.js';
 export declare function renderAllHeadContent(result: SSRResult): any;
-export declare function renderHead(): Generator<RenderHeadInstruction>;
-export declare function maybeRenderHead(): Generator<MaybeRenderHeadInstruction>;
+export declare function renderHead(): RenderHeadInstruction;
+export declare function maybeRenderHead(): MaybeRenderHeadInstruction;

package/dist/runtime/server/render/head.js

@@ -24,11 +24,11 @@ function renderAllHeadContent(result) {
   }
   return markHTMLString(content);
 }
-function* renderHead() {
-  yield createRenderInstruction({ type: "head" });
+function renderHead() {
+  return createRenderInstruction({ type: "head" });
 }
-function* maybeRenderHead() {
-  yield createRenderInstruction({ type: "maybe-head" });
+function maybeRenderHead() {
+  return createRenderInstruction({ type: "maybe-head" });
 }
 export {
   maybeRenderHead,

package/dist/transitions/router.js

@@ -463,12 +463,11 @@ async function prepareForClientOnlyComponents(newDocument, toLocation) {
     await hydrationDone(nextPage);
     const nextHead = nextPage.contentDocument?.head;
     if (nextHead) {
-      document.head.querySelectorAll(`style[${PERSIST_ATTR}=""]`).forEach((s) => s.removeAttribute(PERSIST_ATTR));
       const viteIds = [...nextHead.querySelectorAll(`style[${VITE_ID}]`)].map(
         (style) => style.getAttribute(VITE_ID)
       );
       viteIds.forEach((id) => {
-        const style = document.head.querySelector(`style[${VITE_ID}="${id}"]`);
+        const style = nextHead.querySelector(`style[${VITE_ID}="${id}"]`);
         if (style && !newDocument.head.querySelector(`style[${VITE_ID}="${id}"]`)) {
           newDocument.head.appendChild(style.cloneNode(true));
         }

package/dist/vite-plugin-head/index.js

@@ -1,4 +1,4 @@
-import { getTopLevelPages, walkParentInfos } from "../core/build/graph.js";
+import { getParentModuleInfos, getTopLevelPageModuleInfos } from "../core/build/graph.js";
 import { getAstroMetadata } from "../vite-plugin-astro/index.js";
 const injectExp = /(?:^\/\/|\/\/!)\s*astro-head-inject/;
 function configHeadVitePlugin() {
@@ -97,13 +97,13 @@ function astroHeadBuildPlugin(internals) {
                   if (modinfo) {
                     const meta = getAstroMetadata(modinfo);
                     if (meta?.containsHead) {
-                      for (const [pageInfo] of getTopLevelPages(id, this)) {
+                      for (const pageInfo of getTopLevelPageModuleInfos(id, this)) {
                         let metadata = getOrCreateMetadata(pageInfo.id);
                         metadata.containsHead = true;
                       }
                     }
                     if (meta?.propagation === "self") {
-                      for (const [info] of walkParentInfos(id, this)) {
+                      for (const info of getParentModuleInfos(id, this)) {
                         let metadata = getOrCreateMetadata(info.id);
                         if (metadata.propagation !== "self") {
                           metadata.propagation = "in-tree";
@@ -112,7 +112,7 @@ function astroHeadBuildPlugin(internals) {
                     }
                   }
                   if (mod.code && injectExp.test(mod.code)) {
-                    for (const [info] of walkParentInfos(id, this)) {
+                    for (const info of getParentModuleInfos(id, this)) {
                       getOrCreateMetadata(info.id).propagation = "in-tree";
                     }
                   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "4.5.8",
+  "version": "4.5.9",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",