astro 6.0.4 → 6.0.5

package/dist/actions/integration.js

@@ -1,5 +1,6 @@
 import { AstroError } from "../core/errors/errors.js";
 import { ActionsWithoutServerOutputError } from "../core/errors/errors-data.js";
+import { hasNonPrerenderedProjectRoute } from "../core/routing/helpers.js";
 import { viteID } from "../core/util.js";
 import { ACTION_RPC_ROUTE_PATTERN, ACTIONS_TYPES_FILE, VIRTUAL_MODULE_ID } from "./consts.js";
 function astroIntegrationActionsRouteHandler({
@@ -18,20 +19,22 @@ function astroIntegrationActionsRouteHandler({
         });
       },
       "astro:config:done": async (params) => {
-        if (params.buildOutput === "static") {
-          const error = new AstroError(ActionsWithoutServerOutputError);
-          error.stack = void 0;
-          throw error;
-        }
         const stringifiedActionsImport = JSON.stringify(
           viteID(new URL(`./${filename}`, params.config.srcDir))
         );
         settings.injectedTypes.push({
           filename: ACTIONS_TYPES_FILE,
           content: `declare module "astro:actions" {
-	export const actions: typeof import(${stringifiedActionsImport})["server"];
+		export const actions: typeof import(${stringifiedActionsImport})["server"];
 }`
         });
+      },
+      "astro:routes:resolved": ({ routes }) => {
+        if (!hasNonPrerenderedProjectRoute(routes)) {
+          const error = new AstroError(ActionsWithoutServerOutputError);
+          error.stack = void 0;
+          throw error;
+        }
       }
     }
   };

package/dist/assets/runtime.d.ts

@@ -3,8 +3,9 @@ export interface SvgComponentProps {
     meta: ImageMetadata;
     attributes: Record<string, string>;
     children: string;
+    styles: string[];
 }
-export declare function createSvgComponent({ meta, attributes, children }: SvgComponentProps): import("../runtime/server/index.js").AstroComponentFactory & ImageMetadata;
+export declare function createSvgComponent({ meta, attributes, children, styles }: SvgComponentProps): import("../runtime/server/index.js").AstroComponentFactory & ImageMetadata;
 type SvgAttributes = Record<string, any>;
 export declare function dropAttributes(attributes: SvgAttributes): SvgAttributes;
 export {};

package/dist/assets/runtime.js

@@ -1,13 +1,24 @@
+import { generateCspDigest } from "../core/encryption.js";
 import {
   createComponent,
   render,
   spreadAttributes,
   unescapeHTML
 } from "../runtime/server/index.js";
-function createSvgComponent({ meta, attributes, children }) {
-  const Component = createComponent((_, props) => {
-    const normalizedProps = normalizeProps(attributes, props);
-    return render`<svg${spreadAttributes(normalizedProps)}>${unescapeHTML(children)}</svg>`;
+function createSvgComponent({ meta, attributes, children, styles }) {
+  const hasStyles = styles.length > 0;
+  const Component = createComponent({
+    async factory(result, props) {
+      const normalizedProps = normalizeProps(attributes, props);
+      if (hasStyles && result.cspDestination) {
+        for (const style of styles) {
+          const hash = await generateCspDigest(style, result.cspAlgorithm);
+          result._metadata.extraStyleHashes.push(hash);
+        }
+      }
+      return render`<svg${spreadAttributes(normalizedProps)}>${unescapeHTML(children)}</svg>`;
+    },
+    propagation: hasStyles ? "self" : "none"
   });
   if (import.meta.env.DEV) {
     makeNonEnumerable(Component);

package/dist/assets/utils/svg.js

@@ -1,5 +1,5 @@
 import { optimize } from "svgo";
-import { parse, renderSync } from "ultrahtml";
+import { ELEMENT_NODE, TEXT_NODE, parse, renderSync } from "ultrahtml";
 import { AstroError, AstroErrorData } from "../../core/errors/index.js";
 import { dropAttributes } from "../runtime.js";
 function parseSvg({
@@ -25,18 +25,31 @@ function parseSvg({
   }
   const root = parse(processedContents);
   const svgNode = root.children.find(
-    ({ name, type }) => type === 1 && name === "svg"
+    ({ name, type }) => type === ELEMENT_NODE && name === "svg"
   );
   if (!svgNode) {
     throw new Error("SVG file does not contain an <svg> element");
   }
   const { attributes, children } = svgNode;
   const body = renderSync({ ...root, children });
-  return { attributes, body };
+  const styles = [];
+  for (const child of children) {
+    if (child.type === ELEMENT_NODE && child.name === "style") {
+      const textContent = child.children?.filter((c) => c.type === TEXT_NODE).map((c) => c.value).join("");
+      if (textContent) {
+        styles.push(textContent);
+      }
+    }
+  }
+  return { attributes, body, styles };
 }
 function makeSvgComponent(meta, contents, svgoConfig) {
   const file = typeof contents === "string" ? contents : contents.toString("utf-8");
-  const { attributes, body: children } = parseSvg({
+  const {
+    attributes,
+    body: children,
+    styles
+  } = parseSvg({
     path: meta.fsPath,
     contents: file,
     svgoConfig
@@ -44,19 +57,24 @@ function makeSvgComponent(meta, contents, svgoConfig) {
   const props = {
     meta,
     attributes: dropAttributes(attributes),
-    children
+    children,
+    styles
   };
   return `import { createSvgComponent } from 'astro/assets/runtime';
 export default createSvgComponent(${JSON.stringify(props)})`;
 }
 function parseSvgComponentData(meta, contents, svgoConfig) {
   const file = typeof contents === "string" ? contents : contents.toString("utf-8");
-  const { attributes, body: children } = parseSvg({
+  const {
+    attributes,
+    body: children,
+    styles
+  } = parseSvg({
     path: meta.fsPath,
     contents: file,
     svgoConfig
   });
-  return { attributes: dropAttributes(attributes), children };
+  return { attributes: dropAttributes(attributes), children, styles };
 }
 export {
   makeSvgComponent,

package/dist/cli/infra/build-time-astro-version-provider.js

@@ -1,6 +1,6 @@
 class BuildTimeAstroVersionProvider {
   // Injected during the build through esbuild define
-  version = "6.0.4";
+  version = "6.0.5";
 }
 export {
   BuildTimeAstroVersionProvider

package/dist/content/content-layer.js

@@ -189,7 +189,7 @@ ${contentConfig.error.message}`
       logger.info("Content config changed");
       shouldClear = true;
     }
-    if (previousAstroVersion && previousAstroVersion !== "6.0.4") {
+    if (previousAstroVersion && previousAstroVersion !== "6.0.5") {
       logger.info("Astro version changed");
       shouldClear = true;
     }
@@ -197,8 +197,8 @@ ${contentConfig.error.message}`
       logger.info("Clearing content store");
       this.#store.clearAll();
     }
-    if ("6.0.4") {
-      this.#store.metaStore().set("astro-version", "6.0.4");
+    if ("6.0.5") {
+      this.#store.metaStore().set("astro-version", "6.0.5");
     }
     if (currentConfigDigest) {
       this.#store.metaStore().set("content-config-digest", currentConfigDigest);

package/dist/content/server-listeners.js

@@ -6,6 +6,10 @@ async function attachContentServerListeners({
   logger,
   settings
 }) {
+  const maxListeners = viteServer.watcher.getMaxListeners();
+  if (maxListeners !== 0 && maxListeners < 50) {
+    viteServer.watcher.setMaxListeners(50);
+  }
   const contentGenerator = await createContentTypesGenerator({
     fs,
     settings,

package/dist/content/types-generator.js

@@ -463,7 +463,10 @@ async function generateJSONSchema(fsMod, collectionConfig, collectionKey, collec
           ctx.jsonSchema.type = "string";
           ctx.jsonSchema.format = "date-time";
         }
-      }
+      },
+      // Collection schemas are used for parsing collection input, so we need to tell Zod to use the
+      // input shape when generating a JSON schema.
+      io: "input"
     });
     const schemaStr = JSON.stringify(schema, null, 2);
     const schemaJsonPath = new URL(

package/dist/core/build/generate.js

@@ -61,102 +61,106 @@ async function generatePages(options, internals, prerenderOutputDir) {
   const verb = ssr ? "prerendering" : "generating";
   logger.info("SKIP_FORMAT", `
 ${colors.bgGreen(colors.black(` ${verb} static routes `))}`);
-  const pathsWithRoutes = await prerenderer.getStaticPaths();
   const routeToHeaders = /* @__PURE__ */ new Map();
-  const hasI18nDomains = ssr && options.settings.config.i18n?.domains && Object.keys(options.settings.config.i18n.domains).length > 0;
-  const { config } = options.settings;
-  const builtPaths = /* @__PURE__ */ new Set();
-  const filteredPaths = pathsWithRoutes.filter(({ pathname, route }) => {
-    if (hasI18nDomains && route.prerender) {
-      throw new AstroError({
-        ...AstroErrorData.NoPrerenderedRoutesWithDomains,
-        message: AstroErrorData.NoPrerenderedRoutesWithDomains.message(route.component)
-      });
-    }
-    const normalized = removeTrailingForwardSlash(pathname);
-    if (!builtPaths.has(normalized)) {
-      builtPaths.add(normalized);
-      return true;
-    }
-    const matchedRoute = matchRoute(decodeURI(pathname), options.routesList);
-    if (!matchedRoute) {
-      return false;
-    }
-    if (matchedRoute === route) {
-      return true;
-    }
-    if (config.prerenderConflictBehavior === "error") {
-      throw new AstroError({
-        ...AstroErrorData.PrerenderRouteConflict,
-        message: AstroErrorData.PrerenderRouteConflict.message(
+  let staticImageList = getStaticImageList();
+  try {
+    const pathsWithRoutes = await prerenderer.getStaticPaths();
+    const hasI18nDomains = ssr && options.settings.config.i18n?.domains && Object.keys(options.settings.config.i18n.domains).length > 0;
+    const { config } = options.settings;
+    const builtPaths = /* @__PURE__ */ new Set();
+    const filteredPaths = pathsWithRoutes.filter(({ pathname, route }) => {
+      if (hasI18nDomains && route.prerender) {
+        throw new AstroError({
+          ...AstroErrorData.NoPrerenderedRoutesWithDomains,
+          message: AstroErrorData.NoPrerenderedRoutesWithDomains.message(route.component)
+        });
+      }
+      const normalized = removeTrailingForwardSlash(pathname);
+      if (!builtPaths.has(normalized)) {
+        builtPaths.add(normalized);
+        return true;
+      }
+      const matchedRoute = matchRoute(decodeURI(pathname), options.routesList);
+      if (!matchedRoute) {
+        return false;
+      }
+      if (matchedRoute === route) {
+        return true;
+      }
+      if (config.prerenderConflictBehavior === "error") {
+        throw new AstroError({
+          ...AstroErrorData.PrerenderRouteConflict,
+          message: AstroErrorData.PrerenderRouteConflict.message(
+            matchedRoute.route,
+            route.route,
+            normalized
+          ),
+          hint: AstroErrorData.PrerenderRouteConflict.hint(matchedRoute.route, route.route)
+        });
+      } else if (config.prerenderConflictBehavior === "warn") {
+        const msg = AstroErrorData.PrerenderRouteConflict.message(
           matchedRoute.route,
           route.route,
           normalized
-        ),
-        hint: AstroErrorData.PrerenderRouteConflict.hint(matchedRoute.route, route.route)
-      });
-    } else if (config.prerenderConflictBehavior === "warn") {
-      const msg = AstroErrorData.PrerenderRouteConflict.message(
-        matchedRoute.route,
-        route.route,
-        normalized
-      );
-      logger.warn("build", msg);
-    }
-    return false;
-  });
-  if (config.build.concurrency > 1) {
-    const limit = PLimit(config.build.concurrency);
-    const BATCH_SIZE = 1e5;
-    for (let i = 0; i < filteredPaths.length; i += BATCH_SIZE) {
-      const batch = filteredPaths.slice(i, i + BATCH_SIZE);
-      const promises = [];
-      for (const { pathname, route } of batch) {
-        promises.push(
-          limit(
-            () => generatePathWithPrerenderer(
-              prerenderer,
-              pathname,
-              route,
-              options,
-              routeToHeaders,
-              logger
+        );
+        logger.warn("build", msg);
+      }
+      return false;
+    });
+    if (config.build.concurrency > 1) {
+      const limit = PLimit(config.build.concurrency);
+      const BATCH_SIZE = 1e5;
+      for (let i = 0; i < filteredPaths.length; i += BATCH_SIZE) {
+        const batch = filteredPaths.slice(i, i + BATCH_SIZE);
+        const promises = [];
+        for (const { pathname, route } of batch) {
+          promises.push(
+            limit(
+              () => generatePathWithPrerenderer(
+                prerenderer,
+                pathname,
+                route,
+                options,
+                routeToHeaders,
+                logger
+              )
             )
-          )
+          );
+        }
+        await Promise.all(promises);
+      }
+    } else {
+      for (const { pathname, route } of filteredPaths) {
+        await generatePathWithPrerenderer(
+          prerenderer,
+          pathname,
+          route,
+          options,
+          routeToHeaders,
+          logger
         );
       }
-      await Promise.all(promises);
-    }
-  } else {
-    for (const { pathname, route } of filteredPaths) {
-      await generatePathWithPrerenderer(
-        prerenderer,
-        pathname,
-        route,
-        options,
-        routeToHeaders,
-        logger
-      );
     }
-  }
-  for (const { route: generatedRoute } of filteredPaths) {
-    if (generatedRoute.distURL && generatedRoute.distURL.length > 0) {
-      for (const pageData of Object.values(options.allPages)) {
-        if (pageData.route.route === generatedRoute.route && pageData.route.component === generatedRoute.component) {
-          pageData.route.distURL = generatedRoute.distURL;
-          break;
+    for (const { route: generatedRoute } of filteredPaths) {
+      if (generatedRoute.distURL && generatedRoute.distURL.length > 0) {
+        for (const pageData of Object.values(options.allPages)) {
+          if (pageData.route.route === generatedRoute.route && pageData.route.component === generatedRoute.component) {
+            pageData.route.distURL = generatedRoute.distURL;
+            break;
+          }
         }
       }
     }
-  }
-  const staticImageList = getStaticImageList();
-  if (prerenderer.collectStaticImages) {
-    const adapterImages = await prerenderer.collectStaticImages();
-    for (const [path, entry] of adapterImages) {
-      staticImageList.set(path, entry);
+    staticImageList = getStaticImageList();
+    if (prerenderer.collectStaticImages) {
+      const adapterImages = await prerenderer.collectStaticImages();
+      for (const [path, entry] of adapterImages) {
+        staticImageList.set(path, entry);
+      }
     }
+  } finally {
+    await prerenderer.teardown?.();
   }
-  await prerenderer.teardown?.();
   logger.info(
     null,
     colors.green(`\u2713 Completed in ${getTimeStat(generatePagesTimer, performance.now())}.
@@ -328,7 +332,11 @@ function getUrlForPath(pathname, base, origin, format, trailingSlash, routeType)
   }
   let buildPathname;
   if (pathname === "/" || pathname === "") {
-    buildPathname = collapseDuplicateTrailingSlashes(base + ending, trailingSlash !== "never");
+    if (format === "file") {
+      buildPathname = joinPaths(base, "index.html");
+    } else {
+      buildPathname = collapseDuplicateTrailingSlashes(base + ending, trailingSlash !== "never");
+    }
   } else if (routeType === "endpoint") {
     const buildPathRelative = removeLeadingForwardSlash(pathname);
     buildPathname = joinPaths(base, buildPathRelative);

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

@@ -1,7 +1,17 @@
 import { normalizeEntryId } from "./plugin-component-entry.js";
 import { ASTRO_VITE_ENVIRONMENT_NAMES } from "../../constants.js";
+function getRollupInputAsSet(rollupInput) {
+  if (Array.isArray(rollupInput)) {
+    return new Set(rollupInput);
+  } else if (typeof rollupInput === "string") {
+    return /* @__PURE__ */ new Set([rollupInput]);
+  } else if (rollupInput && typeof rollupInput === "object") {
+    return new Set(Object.values(rollupInput));
+  } else {
+    return /* @__PURE__ */ new Set();
+  }
+}
 function pluginInternals(options, internals) {
-  let input;
   return {
     name: "@astro/plugin-build-internals",
     applyToEnvironment(environment) {
@@ -27,19 +37,8 @@ function pluginInternals(options, internals) {
         };
       }
     },
-    configResolved(config) {
-      const rollupInput = config.build?.rollupOptions?.input;
-      if (Array.isArray(rollupInput)) {
-        input = new Set(rollupInput);
-      } else if (typeof rollupInput === "string") {
-        input = /* @__PURE__ */ new Set([rollupInput]);
-      } else if (rollupInput && typeof rollupInput === "object") {
-        input = new Set(Object.values(rollupInput));
-      } else {
-        input = /* @__PURE__ */ new Set();
-      }
-    },
     async generateBundle(_options, bundle) {
+      const input = getRollupInputAsSet(this.environment?.config.build.rollupOptions.input);
       const promises = [];
       const mapping = /* @__PURE__ */ new Map();
       const allInput = /* @__PURE__ */ new Set([...input, ...internals.clientInput]);

package/dist/core/build/static-build.js

@@ -34,7 +34,7 @@ import { encodeName, getTimeStat, viteBuildReturnToRollupOutputs } from "./util.
 import { NOOP_MODULE_ID } from "./plugins/plugin-noop.js";
 import { ASTRO_VITE_ENVIRONMENT_NAMES } from "../constants.js";
 import { getSSRAssets } from "./internal.js";
-import { serverIslandPlaceholderMap } from "../server-islands/vite-plugin-server-islands.js";
+import { SERVER_ISLAND_MAP_MARKER } from "../server-islands/vite-plugin-server-islands.js";
 const PRERENDER_ENTRY_FILENAME_PREFIX = "prerender-entry";
 function extractRelevantChunks(outputs, prerender) {
   const extracted = [];
@@ -43,7 +43,7 @@ function extractRelevantChunks(outputs, prerender) {
       if (chunk.type === "asset") continue;
       const needsContentInjection = chunk.code.includes(LINKS_PLACEHOLDER);
       const needsManifestInjection = chunk.moduleIds.includes(SERIALIZED_MANIFEST_RESOLVED_ID);
-      const needsServerIslandInjection = chunk.code.includes(serverIslandPlaceholderMap);
+      const needsServerIslandInjection = chunk.code.includes(SERVER_ISLAND_MAP_MARKER);
       if (needsContentInjection || needsManifestInjection || needsServerIslandInjection) {
         extracted.push({
           fileName: chunk.fileName,
@@ -218,6 +218,13 @@ async function buildEnvironments(opts, internals) {
     // This takes precedence over platform plugin fallbacks (e.g., Cloudflare)
     builder: {
       async buildApp(builder2) {
+        settings.timer.start("Prerender build");
+        let prerenderOutput = await builder2.build(builder2.environments.prerender);
+        settings.timer.end("Prerender build");
+        extractPrerenderEntryFileName(internals, prerenderOutput);
+        const prerenderOutputs = viteBuildReturnToRollupOutputs(prerenderOutput);
+        const prerenderChunks = extractRelevantChunks(prerenderOutputs, true);
+        prerenderOutput = void 0;
         let ssrChunks = [];
         if (settings.buildOutput !== "static") {
           settings.timer.start("SSR build");
@@ -229,13 +236,6 @@ async function buildEnvironments(opts, internals) {
           ssrChunks = extractRelevantChunks(ssrOutputs, false);
           ssrOutput = void 0;
         }
-        settings.timer.start("Prerender build");
-        let prerenderOutput = await builder2.build(builder2.environments.prerender);
-        settings.timer.end("Prerender build");
-        extractPrerenderEntryFileName(internals, prerenderOutput);
-        const prerenderOutputs = viteBuildReturnToRollupOutputs(prerenderOutput);
-        const prerenderChunks = extractRelevantChunks(prerenderOutputs, true);
-        prerenderOutput = void 0;
         const ssrPlugins = builder2.environments[ASTRO_VITE_ENVIRONMENT_NAMES.ssr]?.config.plugins ?? [];
         buildPostHooks = ssrPlugins.map(
           (plugin) => typeof plugin.api?.buildPostHook === "function" ? plugin.api.buildPostHook : void 0

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "6.0.4";
+const ASTRO_VERSION = "6.0.5";
 const ASTRO_GENERATOR = `Astro v${ASTRO_VERSION}`;
 const REROUTE_DIRECTIVE_HEADER = "X-Astro-Reroute";
 const REWRITE_DIRECTIVE_HEADER_KEY = "X-Astro-Rewrite";

package/dist/core/dev/dev.js

@@ -26,7 +26,7 @@ async function dev(inlineConfig) {
   await telemetry.record([]);
   const restart = await createContainerWithAutomaticRestart({ inlineConfig, fs });
   const logger = restart.container.logger;
-  const currentVersion = "6.0.4";
+  const currentVersion = "6.0.5";
   const isPrerelease = currentVersion.includes("-");
   if (!isPrerelease) {
     try {

package/dist/core/messages/runtime.js

@@ -269,7 +269,7 @@ function printHelp({
     message.push(
       linebreak(),
       `  ${bgGreen(black(` ${commandName} `))} ${green(
-        `v${"6.0.4"}`
+        `v${"6.0.5"}`
       )} ${headline}`
     );
   }

package/dist/core/routing/helpers.d.ts

@@ -1,4 +1,5 @@
 import type { RouteData } from '../../types/public/internal.js';
+import type { IntegrationResolvedRoute } from '../../types/public/integrations.js';
 import type { RouteInfo } from '../app/types.js';
 import type { RoutesList } from '../../types/astro.js';
 type RedirectRouteData = RouteData & {
@@ -31,4 +32,10 @@ export declare function getCustom404Route(manifestData: RoutesList): RouteData |
  * Return a user-provided 500 route if one exists.
  */
 export declare function getCustom500Route(manifestData: RoutesList): RouteData | undefined;
+export declare function hasNonPrerenderedProjectRoute(routes: Array<Pick<RouteData, 'type' | 'origin' | 'prerender'>>, options?: {
+    includeEndpoints?: boolean;
+}): boolean;
+export declare function hasNonPrerenderedProjectRoute(routes: Array<Pick<IntegrationResolvedRoute, 'type' | 'origin' | 'isPrerendered'>>, options?: {
+    includeEndpoints?: boolean;
+}): boolean;
 export {};

package/dist/core/routing/helpers.js

@@ -25,10 +25,19 @@ function getCustom404Route(manifestData) {
 function getCustom500Route(manifestData) {
   return manifestData.routes.find((r) => isRoute500(r.route));
 }
+function hasNonPrerenderedProjectRoute(routes, options) {
+  const includeEndpoints = options?.includeEndpoints ?? true;
+  const routeTypes = includeEndpoints ? ["page", "endpoint"] : ["page"];
+  return routes.some((route) => {
+    const isPrerendered = "isPrerendered" in route ? route.isPrerendered : route.prerender;
+    return routeTypes.includes(route.type) && route.origin === "project" && !isPrerendered;
+  });
+}
 export {
   getCustom404Route,
   getCustom500Route,
   getFallbackRoute,
+  hasNonPrerenderedProjectRoute,
   routeIsFallback,
   routeIsRedirect
 };

package/dist/core/server-islands/vite-plugin-server-islands.d.ts

@@ -1,5 +1,5 @@
 import type { Plugin as VitePlugin } from 'vite';
 import type { AstroPluginOptions } from '../../types/astro.js';
 export declare const SERVER_ISLAND_MANIFEST = "virtual:astro:server-island-manifest";
-export declare const serverIslandPlaceholderMap = "'$$server-islands-map$$'";
+export declare const SERVER_ISLAND_MAP_MARKER = "$$server-islands-map$$";
 export declare function vitePluginServerIslands({ settings }: AstroPluginOptions): VitePlugin;

package/dist/core/server-islands/vite-plugin-server-islands.js

@@ -1,12 +1,12 @@
-import fs from "node:fs";
-import { getPrerenderOutputDirectory, getServerOutputDirectory } from "../../prerender/utils.js";
-import { AstroError, AstroErrorData } from "../errors/index.js";
-import { appendForwardSlash } from "../path.js";
 import { ASTRO_VITE_ENVIRONMENT_NAMES } from "../constants.js";
+import { AstroError, AstroErrorData } from "../errors/index.js";
 const SERVER_ISLAND_MANIFEST = "virtual:astro:server-island-manifest";
 const RESOLVED_SERVER_ISLAND_MANIFEST = "\0" + SERVER_ISLAND_MANIFEST;
 const serverIslandPlaceholderMap = "'$$server-islands-map$$'";
 const serverIslandPlaceholderNameMap = "'$$server-islands-name-map$$'";
+const SERVER_ISLAND_MAP_MARKER = "$$server-islands-map$$";
+const serverIslandMapReplaceExp = /['"]\$\$server-islands-map\$\$['"]/g;
+const serverIslandNameMapReplaceExp = /['"]\$\$server-islands-name-map\$\$['"]/g;
 function createServerIslandImportMapSource(entries, toImportPath) {
   const mappings = Array.from(entries, ([islandName, fileName]) => {
     const importPath = toImportPath(fileName);
@@ -22,17 +22,35 @@ function createNameMapSource(entries) {
 function vitePluginServerIslands({ settings }) {
   let command = "serve";
   let ssrEnvironment = null;
-  const referenceIdMap = /* @__PURE__ */ new Map();
   const serverIslandMap = /* @__PURE__ */ new Map();
   const serverIslandNameMap = /* @__PURE__ */ new Map();
-  const resolvedIslandImports = /* @__PURE__ */ new Map();
-  let ssrManifestChunk = null;
+  const serverIslandSourceMap = /* @__PURE__ */ new Map();
+  const referenceIdMap = /* @__PURE__ */ new Map();
+  function ensureServerIslandReferenceIds(ctx) {
+    for (const [resolvedPath, islandName] of serverIslandNameMap) {
+      if (referenceIdMap.has(resolvedPath)) continue;
+      const source = serverIslandSourceMap.get(resolvedPath);
+      const referenceId = ctx.emitFile({
+        type: "chunk",
+        id: source?.id ?? resolvedPath,
+        importer: source?.importer,
+        name: islandName
+      });
+      referenceIdMap.set(resolvedPath, referenceId);
+    }
+  }
   return {
     name: "astro:server-islands",
     enforce: "post",
     config(_config, { command: _command }) {
       command = _command;
     },
+    buildStart() {
+      if (command !== "build" || this.environment?.name !== ASTRO_VITE_ENVIRONMENT_NAMES.ssr) {
+        return;
+      }
+      ensureServerIslandReferenceIds(this);
+    },
     configureServer(server) {
       ssrEnvironment = server.environments[ASTRO_VITE_ENVIRONMENT_NAMES.ssr];
     },
@@ -59,16 +77,13 @@ export const serverIslandNameMap = ${serverIslandPlaceholderNameMap};`
     transform: {
       filter: {
         id: {
-          include: [
-            // Allows server islands in astro and mdx files
-            /\.(astro|mdx)$/,
-            new RegExp(`^${RESOLVED_SERVER_ISLAND_MANIFEST}$`)
-          ]
+          include: [/\.(astro|mdx)$/, new RegExp(`^${RESOLVED_SERVER_ISLAND_MANIFEST}$`)]
         }
       },
       async handler(_code, id) {
         const info = this.getModuleInfo(id);
         const astro = info ? info.meta.astro : void 0;
+        const isBuildSsr = command === "build" && this.environment?.name === ASTRO_VITE_ENVIRONMENT_NAMES.ssr;
         if (astro) {
           for (const comp of astro.serverComponents) {
             if (!serverIslandNameMap.has(comp.resolvedPath)) {
@@ -77,23 +92,23 @@ export const serverIslandNameMap = ${serverIslandPlaceholderNameMap};`
               }
               let name = comp.localName;
               let idx = 1;
-              while (true) {
-                if (!serverIslandMap.has(name)) {
-                  break;
-                }
+              while (serverIslandMap.has(name)) {
                 name += idx++;
               }
               serverIslandNameMap.set(comp.resolvedPath, name);
               serverIslandMap.set(name, comp.resolvedPath);
-              if (command === "build") {
-                const referenceId = this.emitFile({
-                  type: "chunk",
-                  id: comp.specifier,
-                  importer: id,
-                  name: comp.localName
-                });
-                referenceIdMap.set(comp.resolvedPath, referenceId);
-              }
+              serverIslandSourceMap.set(comp.resolvedPath, { id: comp.specifier, importer: id });
+            }
+            if (isBuildSsr && !referenceIdMap.has(comp.resolvedPath)) {
+              const islandName = serverIslandNameMap.get(comp.resolvedPath);
+              const source = serverIslandSourceMap.get(comp.resolvedPath);
+              const referenceId = this.emitFile({
+                type: "chunk",
+                id: source?.id ?? comp.resolvedPath,
+                importer: source?.importer,
+                name: islandName
+              });
+              referenceIdMap.set(comp.resolvedPath, referenceId);
             }
           }
         }
@@ -110,7 +125,7 @@ export const serverIslandNameMap = ${serverIslandPlaceholderNameMap};`
               throw new AstroError(AstroErrorData.NoAdapterInstalledServerIslands);
             }
           }
-          if (serverIslandNameMap.size > 0 && serverIslandMap.size > 0) {
+          if (command !== "build" && serverIslandNameMap.size > 0 && serverIslandMap.size > 0) {
             const mapSource = createServerIslandImportMapSource(
               serverIslandMap,
               (fileName) => fileName
@@ -118,22 +133,21 @@ export const serverIslandNameMap = ${serverIslandPlaceholderNameMap};`
             const nameMapSource = createNameMapSource(serverIslandNameMap);
             return {
               code: `
-					export const serverIslandMap = ${mapSource};
-					
+						export const serverIslandMap = ${mapSource};
 
-export const serverIslandNameMap = ${nameMapSource};
-					`
+						export const serverIslandNameMap = ${nameMapSource};
+						`
             };
           }
         }
       }
     },
     renderChunk(code, chunk) {
-      if (code.includes(serverIslandPlaceholderMap)) {
-        if (command === "build") {
-          if (referenceIdMap.size === 0) {
-            return;
-          }
+      if (!code.includes(SERVER_ISLAND_MAP_MARKER)) return;
+      if (command === "build") {
+        const envName = this.environment?.name;
+        let mapSource;
+        if (envName === ASTRO_VITE_ENVIRONMENT_NAMES.ssr) {
           const isRelativeChunk = !chunk.isEntry;
           const dots = isRelativeChunk ? ".." : ".";
           const mapEntries = [];
@@ -141,105 +155,30 @@ export const serverIslandNameMap = ${nameMapSource};
             const fileName = this.getFileName(referenceId);
             const islandName = serverIslandNameMap.get(resolvedPath);
             if (!islandName) continue;
-            if (!resolvedIslandImports.has(islandName)) {
-              resolvedIslandImports.set(islandName, fileName);
-            }
             mapEntries.push([islandName, fileName]);
           }
-          const mapSource = createServerIslandImportMapSource(
+          mapSource = createServerIslandImportMapSource(
             mapEntries,
             (fileName) => `${dots}/${fileName}`
           );
-          const nameMapSource = createNameMapSource(serverIslandNameMap);
-          return {
-            code: code.replace(serverIslandPlaceholderMap, mapSource).replace(serverIslandPlaceholderNameMap, nameMapSource),
-            map: null
-          };
+        } else {
+          mapSource = createServerIslandImportMapSource(serverIslandMap, (fileName) => fileName);
         }
+        const nameMapSource = createNameMapSource(serverIslandNameMap);
         return {
-          code: code.replace(serverIslandPlaceholderMap, "new Map();").replace(serverIslandPlaceholderNameMap, "new Map()"),
+          code: code.replace(serverIslandMapReplaceExp, mapSource).replace(serverIslandNameMapReplaceExp, nameMapSource),
           map: null
         };
       }
-    },
-    generateBundle(_options, bundle) {
-      const envName = this.environment?.name;
-      if (envName === ASTRO_VITE_ENVIRONMENT_NAMES.ssr) {
-        for (const chunk of Object.values(bundle)) {
-          if (chunk.type === "chunk" && chunk.code.includes(serverIslandPlaceholderMap)) {
-            ssrManifestChunk = chunk;
-            break;
-          }
-        }
-      }
-      if (envName === ASTRO_VITE_ENVIRONMENT_NAMES.prerender && ssrManifestChunk) {
-        if (resolvedIslandImports.size > 0) {
-          const isRelativeChunk = ssrManifestChunk.fileName.includes("/");
-          const dots = isRelativeChunk ? ".." : ".";
-          const mapSource = createServerIslandImportMapSource(
-            resolvedIslandImports,
-            (fileName) => `${dots}/${fileName}`
-          );
-          const nameMapSource = createNameMapSource(serverIslandNameMap);
-          ssrManifestChunk.code = ssrManifestChunk.code.replace(serverIslandPlaceholderMap, mapSource).replace(serverIslandPlaceholderNameMap, nameMapSource);
-        } else {
-          ssrManifestChunk.code = ssrManifestChunk.code.replace(serverIslandPlaceholderMap, "new Map()").replace(serverIslandPlaceholderNameMap, "new Map()");
-        }
-      }
-    },
-    api: {
-      /**
-       * Post-build hook that patches SSR chunks containing server island placeholders.
-       *
-       * During build, SSR can run before all server islands are discovered (e.g. islands
-       * only used in prerendered pages). This hook runs after SSR + prerender builds and:
-       * 1) replaces placeholders with the complete map of discovered islands
-       * 2) copies island chunks emitted in prerender into the SSR output directory
-       *
-       * Two cases:
-       * 1. Islands were discovered: Replace placeholders with real import maps.
-       * 2. No islands found: Replace placeholders with empty maps.
-       */
-      async buildPostHook({
-        chunks,
-        mutate
-      }) {
-        const ssrChunkWithPlaceholder = chunks.find(
-          (c) => !c.prerender && c.code.includes(serverIslandPlaceholderMap)
-        );
-        if (!ssrChunkWithPlaceholder) {
-          return;
-        }
-        if (resolvedIslandImports.size > 0) {
-          const isRelativeChunk = ssrChunkWithPlaceholder.fileName.includes("/");
-          const dots = isRelativeChunk ? ".." : ".";
-          const mapSource = createServerIslandImportMapSource(
-            resolvedIslandImports,
-            (fileName) => `${dots}/${fileName}`
-          );
-          const nameMapSource = createNameMapSource(serverIslandNameMap);
-          const newCode = ssrChunkWithPlaceholder.code.replace(serverIslandPlaceholderMap, mapSource).replace(serverIslandPlaceholderNameMap, nameMapSource);
-          mutate(ssrChunkWithPlaceholder.fileName, newCode, false);
-          const serverOutputDir = getServerOutputDirectory(settings);
-          const prerenderOutputDir = getPrerenderOutputDirectory(settings);
-          for (const [, fileName] of resolvedIslandImports) {
-            const srcPath = new URL(fileName, appendForwardSlash(prerenderOutputDir.toString()));
-            const destPath = new URL(fileName, appendForwardSlash(serverOutputDir.toString()));
-            if (!fs.existsSync(srcPath)) continue;
-            const destDir = new URL("./", destPath);
-            await fs.promises.mkdir(destDir, { recursive: true });
-            await fs.promises.copyFile(srcPath, destPath);
-          }
-        } else {
-          const newCode = ssrChunkWithPlaceholder.code.replace(serverIslandPlaceholderMap, "new Map()").replace(serverIslandPlaceholderNameMap, "new Map()");
-          mutate(ssrChunkWithPlaceholder.fileName, newCode, false);
-        }
-      }
+      return {
+        code: code.replace(serverIslandMapReplaceExp, "new Map();").replace(serverIslandNameMapReplaceExp, "new Map()"),
+        map: null
+      };
     }
   };
 }
 export {
   SERVER_ISLAND_MANIFEST,
-  serverIslandPlaceholderMap,
+  SERVER_ISLAND_MAP_MARKER,
   vitePluginServerIslands
 };

package/dist/vite-plugin-astro-server/plugin.js

@@ -19,7 +19,7 @@ import { getViteErrorPayload } from "../core/errors/dev/index.js";
 import { AstroError, AstroErrorData } from "../core/errors/index.js";
 import { NOOP_MIDDLEWARE_FN } from "../core/middleware/noop-middleware.js";
 import { createViteLoader } from "../core/module-loader/index.js";
-import { matchAllRoutes } from "../core/routing/match.js";
+import { isRouteServerIsland, matchAllRoutes } from "../core/routing/match.js";
 import { resolveMiddlewareMode } from "../integrations/adapter-utils.js";
 import { SERIALIZED_MANIFEST_ID } from "../manifest/serialized.js";
 import { ASTRO_DEV_SERVER_APP_ID } from "../vite-plugin-app/index.js";
@@ -130,7 +130,7 @@ function createVitePluginAstroServer({
                 const { routes } = await prerenderHandler.environment.runner.import("virtual:astro:routes");
                 const routesList = { routes: routes.map((r) => r.routeData) };
                 const matches = matchAllRoutes(pathname, routesList);
-                if (!matches.some((route) => route.prerender)) {
+                if (!matches.some((route) => route.prerender || isRouteServerIsland(route))) {
                   return next();
                 }
                 localStorage.run(request, () => {

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

@@ -1,11 +1,7 @@
 import { ASTRO_VITE_ENVIRONMENT_NAMES } from "../core/constants.js";
+import { hasNonPrerenderedProjectRoute } from "../core/routing/helpers.js";
 const ASTRO_RENDERERS_MODULE_ID = "virtual:astro:renderers";
 const RESOLVED_ASTRO_RENDERERS_MODULE_ID = `\0${ASTRO_RENDERERS_MODULE_ID}`;
-function ssrBuildNeedsRenderers(routesList) {
-  return routesList.routes.some(
-    (route) => route.type === "page" && !route.prerender && route.origin !== "internal"
-  );
-}
 function vitePluginRenderers(options) {
   const renderers = options.settings.renderers;
   return {
@@ -24,7 +20,9 @@ function vitePluginRenderers(options) {
         id: new RegExp(`^${RESOLVED_ASTRO_RENDERERS_MODULE_ID}$`)
       },
       handler() {
-        if (options.command === "build" && this.environment.name === ASTRO_VITE_ENVIRONMENT_NAMES.ssr && renderers.length > 0 && !ssrBuildNeedsRenderers(options.routesList)) {
+        if (options.command === "build" && this.environment.name === ASTRO_VITE_ENVIRONMENT_NAMES.ssr && renderers.length > 0 && !hasNonPrerenderedProjectRoute(options.routesList.routes, {
+          includeEndpoints: false
+        })) {
           return { code: `export const renderers = [];` };
         }
         if (renderers.length > 0) {

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

@@ -38,7 +38,7 @@ function astroScriptsPlugin({ settings }) {
     },
     buildStart() {
       const hasHydrationScripts = settings.scripts.some((s) => s.stage === "before-hydration");
-      if (hasHydrationScripts && (this.environment.name === ASTRO_VITE_ENVIRONMENT_NAMES.prerender || this.environment.name === ASTRO_VITE_ENVIRONMENT_NAMES.ssr)) {
+      if (hasHydrationScripts && (this.environment.name === ASTRO_VITE_ENVIRONMENT_NAMES.client || this.environment.name === ASTRO_VITE_ENVIRONMENT_NAMES.prerender || this.environment.name === ASTRO_VITE_ENVIRONMENT_NAMES.ssr)) {
         this.emitFile({
           type: "chunk",
           id: BEFORE_HYDRATION_SCRIPT_ID,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "6.0.4",
+  "version": "6.0.5",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -153,8 +153,8 @@
     "xxhash-wasm": "^1.1.0",
     "yargs-parser": "^22.0.0",
     "zod": "^4.3.6",
-    "@astrojs/internal-helpers": "0.8.0",
     "@astrojs/markdown-remark": "7.0.0",
+    "@astrojs/internal-helpers": "0.8.0",
     "@astrojs/telemetry": "3.3.0"
   },
   "optionalDependencies": {
@@ -190,7 +190,7 @@
     "undici": "^7.22.0",
     "unified": "^11.0.5",
     "vitest": "^3.2.4",
-    "@astrojs/check": "0.9.7",
+    "@astrojs/check": "0.9.8",
     "astro-scripts": "0.0.14"
   },
   "engines": {