astro 5.6.1 → 5.6.2

package/dist/assets/utils/index.d.ts

@@ -4,7 +4,11 @@
  *
  * If some functions don't need to be exposed, just import the file that contains the functions.
  */
-export { emitESMImage } from './node/emitAsset.js';
+export { 
+/**
+ * @deprecated
+ */
+emitESMImage, emitImageMetadata, } from './node/emitAsset.js';
 export { isESMImportedImage, isRemoteImage } from './imageKind.js';
 export { imageMetadata } from './metadata.js';
 export { getOrigQueryParams } from './queryParams.js';

package/dist/assets/utils/index.js

@@ -1,4 +1,7 @@
-import { emitESMImage } from "./node/emitAsset.js";
+import {
+  emitESMImage,
+  emitImageMetadata
+} from "./node/emitAsset.js";
 import { isESMImportedImage, isRemoteImage } from "./imageKind.js";
 import { imageMetadata } from "./metadata.js";
 import { getOrigQueryParams } from "./queryParams.js";
@@ -14,6 +17,7 @@ import {
 } from "./remotePattern.js";
 export {
   emitESMImage,
+  emitImageMetadata,
   getOrigQueryParams,
   hashTransform,
   imageMetadata,

package/dist/assets/utils/node/emitAsset.d.ts

@@ -16,4 +16,12 @@ type ImageMetadataWithContents = ImageMetadata & {
 export declare function emitESMImage(id: string | undefined, 
 /** @deprecated */
 _watchMode: boolean, experimentalSvgEnabled: boolean, fileEmitter?: FileEmitter): Promise<ImageMetadataWithContents | undefined>;
+/**
+ * Processes an image file and emits its metadata and optionally its contents. This function supports both build and development modes.
+ *
+ * @param {string | undefined} id - The identifier or path of the image file to process. If undefined, the function returns immediately.
+ * @param {FileEmitter | undefined} [fileEmitter] - Function for emitting files during the build process. May throw in certain scenarios.
+ * @return {Promise<ImageMetadataWithContents | undefined>} Resolves to metadata with optional image contents or `undefined` if processing fails.
+ */
+export declare function emitImageMetadata(id: string | undefined, fileEmitter?: FileEmitter): Promise<ImageMetadataWithContents | undefined>;
 export {};

package/dist/assets/utils/node/emitAsset.js

@@ -24,9 +24,50 @@ async function emitESMImage(id, _watchMode, experimentalSvgEnabled, fileEmitter)
     writable: false,
     value: id
   });
-  if (fileMetadata.format === "svg" && experimentalSvgEnabled) {
-    emittedImage.contents = fileData;
+  let isBuild = typeof fileEmitter === "function";
+  if (isBuild) {
+    const pathname = decodeURI(url.pathname);
+    const filename = path.basename(pathname, path.extname(pathname) + `.${fileMetadata.format}`);
+    try {
+      const handle = fileEmitter({
+        name: filename,
+        source: await fs.readFile(url),
+        type: "asset"
+      });
+      emittedImage.src = `__ASTRO_ASSET_IMAGE__${handle}__`;
+    } catch {
+      isBuild = false;
+    }
+  }
+  if (!isBuild) {
+    url.searchParams.append("origWidth", fileMetadata.width.toString());
+    url.searchParams.append("origHeight", fileMetadata.height.toString());
+    url.searchParams.append("origFormat", fileMetadata.format);
+    emittedImage.src = `/@fs` + prependForwardSlash(fileURLToNormalizedPath(url));
+  }
+  return emittedImage;
+}
+async function emitImageMetadata(id, fileEmitter) {
+  if (!id) {
+    return void 0;
+  }
+  const url = pathToFileURL(id);
+  let fileData;
+  try {
+    fileData = await fs.readFile(url);
+  } catch {
+    return void 0;
   }
+  const fileMetadata = await imageMetadata(fileData, id);
+  const emittedImage = {
+    src: "",
+    ...fileMetadata
+  };
+  Object.defineProperty(emittedImage, "fsPath", {
+    enumerable: false,
+    writable: false,
+    value: id
+  });
   let isBuild = typeof fileEmitter === "function";
   if (isBuild) {
     const pathname = decodeURI(url.pathname);
@@ -54,5 +95,6 @@ function fileURLToNormalizedPath(filePath) {
   return slash(fileURLToPath(filePath) + filePath.search).replace(/\\/g, "/");
 }
 export {
-  emitESMImage
+  emitESMImage,
+  emitImageMetadata
 };

package/dist/assets/vite-plugin-assets.d.ts

@@ -1,5 +1,7 @@
+import type * as fsMod from 'node:fs';
 import type * as vite from 'vite';
 import type { AstroSettings } from '../types/astro.js';
-export default function assets({ settings }: {
+export default function assets({ fs, settings, }: {
+    fs: typeof fsMod;
     settings: AstroSettings;
 }): vite.Plugin[];

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

@@ -63,7 +63,10 @@ const addStaticImageFactory = (settings) => {
     }
   };
 };
-function assets({ settings }) {
+function assets({
+  fs,
+  settings
+}) {
   let resolvedConfig;
   let shouldEmitFile = false;
   let isBuild = false;
@@ -180,8 +183,8 @@ function assets({ settings }) {
             });
           }
           if (settings.config.experimental.svg && /\.svg$/.test(id)) {
-            const { contents, ...metadata } = imageMetadata;
-            return { code: makeSvgComponent(metadata, contents) };
+            const contents = await fs.promises.readFile(imageMetadata.fsPath, { encoding: "utf8" });
+            return { code: makeSvgComponent(imageMetadata, contents) };
           }
           if (options?.ssr) {
             return {

package/dist/cli/add/index.js

@@ -545,7 +545,9 @@ async function tryToInstallIntegrations({
   }).filter(Boolean).flat();
   const installCommand = resolveCommand(packageManager?.agent ?? "npm", "add", inheritedFlags);
   if (!installCommand) return 0 /* none */;
-  const installSpecifiers = await convertIntegrationsToInstallSpecifiers(integrations);
+  const installSpecifiers = await convertIntegrationsToInstallSpecifiers(integrations).then(
+    (specifiers) => installCommand.command === "deno" ? specifiers.map((specifier) => `npm:${specifier}`) : specifiers
+  );
   const coloredOutput = `${bold(installCommand.command)} ${installCommand.args.join(" ")} ${cyan(installSpecifiers.join(" "))}`;
   const message = `
 ${boxen(coloredOutput, {

package/dist/cli/install-package.js

@@ -43,6 +43,9 @@ async function installPackage(packageNames, options, logger) {
   });
   const installCommand = resolveCommand(packageManager?.agent ?? "npm", "add", []);
   if (!installCommand) return false;
+  if (installCommand.command === "deno") {
+    packageNames = packageNames.map((name) => `npm:${name}`);
+  }
   const coloredOutput = `${bold(installCommand.command)} ${installCommand.args.join(" ")} ${cyan(packageNames.join(" "))}`;
   const message = `
 ${boxen(coloredOutput, {

package/dist/content/content-layer.js

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

package/dist/content/utils.d.ts

@@ -106,8 +106,8 @@ declare const collectionConfigParser: z.ZodUnion<[z.ZodObject<{
             refreshContextData?: Record<string, unknown> | undefined;
         }) => unknown;
         name: string;
-        render?: ((args_0: any) => unknown) | undefined;
         schema?: any;
+        render?: ((args_0: any) => unknown) | undefined;
     }, {
         load: (args_0: {
             collection: string;
@@ -122,8 +122,8 @@ declare const collectionConfigParser: z.ZodUnion<[z.ZodObject<{
             refreshContextData?: Record<string, unknown> | undefined;
         }) => unknown;
         name: string;
-        render?: ((args_0: any) => unknown) | undefined;
         schema?: any;
+        render?: ((args_0: any) => unknown) | undefined;
     }>]>;
     /** deprecated */
     _legacy: z.ZodOptional<z.ZodBoolean>;
@@ -143,8 +143,8 @@ declare const collectionConfigParser: z.ZodUnion<[z.ZodObject<{
             refreshContextData?: Record<string, unknown> | undefined;
         }) => unknown;
         name: string;
-        render?: ((args_0: any) => unknown) | undefined;
         schema?: any;
+        render?: ((args_0: any) => unknown) | undefined;
     };
     schema?: any;
     _legacy?: boolean | undefined;
@@ -164,8 +164,8 @@ declare const collectionConfigParser: z.ZodUnion<[z.ZodObject<{
             refreshContextData?: Record<string, unknown> | undefined;
         }) => unknown;
         name: string;
-        render?: ((args_0: any) => unknown) | undefined;
         schema?: any;
+        render?: ((args_0: any) => unknown) | undefined;
     };
     schema?: any;
     _legacy?: boolean | undefined;
@@ -244,8 +244,8 @@ declare const contentConfigParser: z.ZodObject<{
                 refreshContextData?: Record<string, unknown> | undefined;
             }) => unknown;
             name: string;
-            render?: ((args_0: any) => unknown) | undefined;
             schema?: any;
+            render?: ((args_0: any) => unknown) | undefined;
         }, {
             load: (args_0: {
                 collection: string;
@@ -260,8 +260,8 @@ declare const contentConfigParser: z.ZodObject<{
                 refreshContextData?: Record<string, unknown> | undefined;
             }) => unknown;
             name: string;
-            render?: ((args_0: any) => unknown) | undefined;
             schema?: any;
+            render?: ((args_0: any) => unknown) | undefined;
         }>]>;
         /** deprecated */
         _legacy: z.ZodOptional<z.ZodBoolean>;
@@ -281,8 +281,8 @@ declare const contentConfigParser: z.ZodObject<{
                 refreshContextData?: Record<string, unknown> | undefined;
             }) => unknown;
             name: string;
-            render?: ((args_0: any) => unknown) | undefined;
             schema?: any;
+            render?: ((args_0: any) => unknown) | undefined;
         };
         schema?: any;
         _legacy?: boolean | undefined;
@@ -302,8 +302,8 @@ declare const contentConfigParser: z.ZodObject<{
                 refreshContextData?: Record<string, unknown> | undefined;
             }) => unknown;
             name: string;
-            render?: ((args_0: any) => unknown) | undefined;
             schema?: any;
+            render?: ((args_0: any) => unknown) | undefined;
         };
         schema?: any;
         _legacy?: boolean | undefined;
@@ -331,8 +331,8 @@ declare const contentConfigParser: z.ZodObject<{
                 refreshContextData?: Record<string, unknown> | undefined;
             }) => unknown;
             name: string;
-            render?: ((args_0: any) => unknown) | undefined;
             schema?: any;
+            render?: ((args_0: any) => unknown) | undefined;
         };
         schema?: any;
         _legacy?: boolean | undefined;
@@ -360,8 +360,8 @@ declare const contentConfigParser: z.ZodObject<{
                 refreshContextData?: Record<string, unknown> | undefined;
             }) => unknown;
             name: string;
-            render?: ((args_0: any) => unknown) | undefined;
             schema?: any;
+            render?: ((args_0: any) => unknown) | undefined;
         };
         schema?: any;
         _legacy?: boolean | undefined;

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

@@ -41,9 +41,6 @@ function getNonPrerenderOnlyChunks(bundle, internals) {
       }
       nonPrerenderOnlyEntryChunks.add(chunk);
     }
-    if (chunk.type === "chunk" && chunk.isDynamicEntry) {
-      nonPrerenderOnlyEntryChunks.add(chunk);
-    }
   }
   const nonPrerenderOnlyChunks = new Set(nonPrerenderOnlyEntryChunks);
   for (const chunk of nonPrerenderOnlyChunks) {

package/dist/core/config/schemas/base.d.ts

@@ -171,10 +171,10 @@ export declare const AstroConfigSchema: z.ZodObject<{
         open: string | boolean;
         headers?: OutgoingHttpHeaders | undefined;
     }, {
-        headers?: OutgoingHttpHeaders | undefined;
         host?: string | boolean | undefined;
         port?: number | undefined;
         allowedHosts?: true | string[] | undefined;
+        headers?: OutgoingHttpHeaders | undefined;
         open?: string | boolean | undefined;
     }>>, {
         host: string | boolean;
@@ -211,8 +211,8 @@ export declare const AstroConfigSchema: z.ZodObject<{
             route: string;
             entrypoint?: string | undefined;
         }, {
-            route?: string | undefined;
             entrypoint?: string | undefined;
+            route?: string | undefined;
         }>>;
         service: z.ZodDefault<z.ZodObject<{
             entrypoint: z.ZodDefault<z.ZodUnion<[z.ZodLiteral<"astro/assets/services/sharp">, z.ZodString]>>;
@@ -267,8 +267,8 @@ export declare const AstroConfigSchema: z.ZodObject<{
         experimentalBreakpoints?: number[] | undefined;
     }, {
         endpoint?: {
-            route?: string | undefined;
             entrypoint?: string | undefined;
+            route?: string | undefined;
         } | undefined;
         service?: {
             entrypoint?: string | undefined;
@@ -490,10 +490,10 @@ export declare const AstroConfigSchema: z.ZodObject<{
             endsWith?: string | undefined;
             startsWith?: string | undefined;
             default?: string | undefined;
-            url?: boolean | undefined;
             optional?: boolean | undefined;
             max?: number | undefined;
             min?: number | undefined;
+            url?: boolean | undefined;
         }, {
             type: "string";
             length?: number | undefined;
@@ -501,10 +501,10 @@ export declare const AstroConfigSchema: z.ZodObject<{
             endsWith?: string | undefined;
             startsWith?: string | undefined;
             default?: string | undefined;
-            url?: boolean | undefined;
             optional?: boolean | undefined;
             max?: number | undefined;
             min?: number | undefined;
+            url?: boolean | undefined;
         }>, z.ZodObject<{
             type: z.ZodLiteral<"number">;
             optional: z.ZodOptional<z.ZodBoolean>;
@@ -589,10 +589,10 @@ export declare const AstroConfigSchema: z.ZodObject<{
             endsWith?: string | undefined;
             startsWith?: string | undefined;
             default?: string | undefined;
-            url?: boolean | undefined;
             optional?: boolean | undefined;
             max?: number | undefined;
             min?: number | undefined;
+            url?: boolean | undefined;
         } | {
             type: "number";
             default?: number | undefined;
@@ -630,10 +630,10 @@ export declare const AstroConfigSchema: z.ZodObject<{
             endsWith?: string | undefined;
             startsWith?: string | undefined;
             default?: string | undefined;
-            url?: boolean | undefined;
             optional?: boolean | undefined;
             max?: number | undefined;
             min?: number | undefined;
+            url?: boolean | undefined;
         } | {
             type: "number";
             default?: number | undefined;
@@ -861,10 +861,10 @@ export declare const AstroConfigSchema: z.ZodObject<{
             endsWith?: string | undefined;
             startsWith?: string | undefined;
             default?: string | undefined;
-            url?: boolean | undefined;
             optional?: boolean | undefined;
             max?: number | undefined;
             min?: number | undefined;
+            url?: boolean | undefined;
         } | {
             type: "number";
             default?: number | undefined;
@@ -990,8 +990,8 @@ export declare const AstroConfigSchema: z.ZodObject<{
     } | undefined;
     image?: {
         endpoint?: {
-            route?: string | undefined;
             entrypoint?: string | undefined;
+            route?: string | undefined;
         } | undefined;
         service?: {
             entrypoint?: string | undefined;
@@ -1068,10 +1068,10 @@ export declare const AstroConfigSchema: z.ZodObject<{
             endsWith?: string | undefined;
             startsWith?: string | undefined;
             default?: string | undefined;
-            url?: boolean | undefined;
             optional?: boolean | undefined;
             max?: number | undefined;
             min?: number | undefined;
+            url?: boolean | undefined;
         } | {
             type: "number";
             default?: number | undefined;

package/dist/core/config/schemas/relative.d.ts

@@ -95,10 +95,10 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         open: string | boolean;
         headers?: OutgoingHttpHeaders | undefined;
     }, {
-        headers?: OutgoingHttpHeaders | undefined;
         host?: string | boolean | undefined;
         port?: number | undefined;
         allowedHosts?: true | string[] | undefined;
+        headers?: OutgoingHttpHeaders | undefined;
         open?: string | boolean | undefined;
     }>>, {
         host: string | boolean;
@@ -135,8 +135,8 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
             route: string;
             entrypoint?: string | undefined;
         }, {
-            route?: string | undefined;
             entrypoint?: string | undefined;
+            route?: string | undefined;
         }>>;
         service: z.ZodDefault<z.ZodObject<{
             entrypoint: z.ZodDefault<z.ZodUnion<[z.ZodLiteral<"astro/assets/services/sharp">, z.ZodString]>>;
@@ -191,8 +191,8 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         experimentalBreakpoints?: number[] | undefined;
     }, {
         endpoint?: {
-            route?: string | undefined;
             entrypoint?: string | undefined;
+            route?: string | undefined;
         } | undefined;
         service?: {
             entrypoint?: string | undefined;
@@ -414,10 +414,10 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
             endsWith?: string | undefined;
             startsWith?: string | undefined;
             default?: string | undefined;
-            url?: boolean | undefined;
             optional?: boolean | undefined;
             max?: number | undefined;
             min?: number | undefined;
+            url?: boolean | undefined;
         }, {
             type: "string";
             length?: number | undefined;
@@ -425,10 +425,10 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
             endsWith?: string | undefined;
             startsWith?: string | undefined;
             default?: string | undefined;
-            url?: boolean | undefined;
             optional?: boolean | undefined;
             max?: number | undefined;
             min?: number | undefined;
+            url?: boolean | undefined;
         }>, z.ZodObject<{
             type: z.ZodLiteral<"number">;
             optional: z.ZodOptional<z.ZodBoolean>;
@@ -513,10 +513,10 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
             endsWith?: string | undefined;
             startsWith?: string | undefined;
             default?: string | undefined;
-            url?: boolean | undefined;
             optional?: boolean | undefined;
             max?: number | undefined;
             min?: number | undefined;
+            url?: boolean | undefined;
         } | {
             type: "number";
             default?: number | undefined;
@@ -554,10 +554,10 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
             endsWith?: string | undefined;
             startsWith?: string | undefined;
             default?: string | undefined;
-            url?: boolean | undefined;
             optional?: boolean | undefined;
             max?: number | undefined;
             min?: number | undefined;
+            url?: boolean | undefined;
         } | {
             type: "number";
             default?: number | undefined;
@@ -741,10 +741,10 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         streaming: boolean;
         headers?: OutgoingHttpHeaders | undefined;
     }, {
-        headers?: OutgoingHttpHeaders | undefined;
         host?: string | boolean | undefined;
         port?: number | undefined;
         allowedHosts?: true | string[] | undefined;
+        headers?: OutgoingHttpHeaders | undefined;
         open?: string | boolean | undefined;
         streaming?: boolean | undefined;
     }>>>, {
@@ -863,10 +863,10 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
             endsWith?: string | undefined;
             startsWith?: string | undefined;
             default?: string | undefined;
-            url?: boolean | undefined;
             optional?: boolean | undefined;
             max?: number | undefined;
             min?: number | undefined;
+            url?: boolean | undefined;
         } | {
             type: "number";
             default?: number | undefined;
@@ -992,8 +992,8 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
     } | undefined;
     image?: {
         endpoint?: {
-            route?: string | undefined;
             entrypoint?: string | undefined;
+            route?: string | undefined;
         } | undefined;
         service?: {
             entrypoint?: string | undefined;
@@ -1070,10 +1070,10 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
             endsWith?: string | undefined;
             startsWith?: string | undefined;
             default?: string | undefined;
-            url?: boolean | undefined;
             optional?: boolean | undefined;
             max?: number | undefined;
             min?: number | undefined;
+            url?: boolean | undefined;
         } | {
             type: "number";
             default?: number | undefined;
@@ -1215,10 +1215,10 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
             endsWith?: string | undefined;
             startsWith?: string | undefined;
             default?: string | undefined;
-            url?: boolean | undefined;
             optional?: boolean | undefined;
             max?: number | undefined;
             min?: number | undefined;
+            url?: boolean | undefined;
         } | {
             type: "number";
             default?: number | undefined;
@@ -1344,8 +1344,8 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
     } | undefined;
     image?: {
         endpoint?: {
-            route?: string | undefined;
             entrypoint?: string | undefined;
+            route?: string | undefined;
         } | undefined;
         service?: {
             entrypoint?: string | undefined;
@@ -1422,10 +1422,10 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
             endsWith?: string | undefined;
             startsWith?: string | undefined;
             default?: string | undefined;
-            url?: boolean | undefined;
             optional?: boolean | undefined;
             max?: number | undefined;
             min?: number | undefined;
+            url?: boolean | undefined;
         } | {
             type: "number";
             default?: number | undefined;

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "5.6.1";
+const ASTRO_VERSION = "5.6.2";
 const REROUTE_DIRECTIVE_HEADER = "X-Astro-Reroute";
 const REWRITE_DIRECTIVE_HEADER_KEY = "X-Astro-Rewrite";
 const REWRITE_DIRECTIVE_HEADER_VALUE = "yes";

package/dist/core/create-vite.js

@@ -125,7 +125,7 @@ async function createVite(commandConfig, { settings, logger, mode, command, fs =
       astroContentAssetPropagationPlugin({ settings }),
       vitePluginMiddleware({ settings }),
       vitePluginSSRManifest(),
-      astroAssetsPlugin({ settings }),
+      astroAssetsPlugin({ fs, settings }),
       astroPrefetch({ settings }),
       astroTransitions({ settings }),
       astroDevToolbar({ settings, logger }),

package/dist/core/dev/dev.js

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

package/dist/core/messages.js

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

package/dist/core/render-context.js

@@ -357,6 +357,7 @@ class RenderContext {
         hasRenderedHead: false,
         renderedScripts: /* @__PURE__ */ new Set(),
         hasDirectives: /* @__PURE__ */ new Set(),
+        hasRenderedServerIslandRuntime: false,
         headInTree: false,
         extraHead: [],
         propagators: /* @__PURE__ */ new Set()

package/dist/env/schema.d.ts

@@ -17,10 +17,10 @@ declare const StringSchema: z.ZodObject<{
     endsWith?: string | undefined;
     startsWith?: string | undefined;
     default?: string | undefined;
-    url?: boolean | undefined;
     optional?: boolean | undefined;
     max?: number | undefined;
     min?: number | undefined;
+    url?: boolean | undefined;
 }, {
     type: "string";
     length?: number | undefined;
@@ -28,10 +28,10 @@ declare const StringSchema: z.ZodObject<{
     endsWith?: string | undefined;
     startsWith?: string | undefined;
     default?: string | undefined;
-    url?: boolean | undefined;
     optional?: boolean | undefined;
     max?: number | undefined;
     min?: number | undefined;
+    url?: boolean | undefined;
 }>;
 export type StringSchema = z.infer<typeof StringSchema>;
 declare const NumberSchema: z.ZodObject<{
@@ -111,10 +111,10 @@ declare const EnvFieldType: z.ZodUnion<[z.ZodObject<{
     endsWith?: string | undefined;
     startsWith?: string | undefined;
     default?: string | undefined;
-    url?: boolean | undefined;
     optional?: boolean | undefined;
     max?: number | undefined;
     min?: number | undefined;
+    url?: boolean | undefined;
 }, {
     type: "string";
     length?: number | undefined;
@@ -122,10 +122,10 @@ declare const EnvFieldType: z.ZodUnion<[z.ZodObject<{
     endsWith?: string | undefined;
     startsWith?: string | undefined;
     default?: string | undefined;
-    url?: boolean | undefined;
     optional?: boolean | undefined;
     max?: number | undefined;
     min?: number | undefined;
+    url?: boolean | undefined;
 }>, z.ZodObject<{
     type: z.ZodLiteral<"number">;
     optional: z.ZodOptional<z.ZodBoolean>;
@@ -283,10 +283,10 @@ export declare const EnvSchema: z.ZodRecord<z.ZodEffects<z.ZodEffects<z.ZodStrin
     endsWith?: string | undefined;
     startsWith?: string | undefined;
     default?: string | undefined;
-    url?: boolean | undefined;
     optional?: boolean | undefined;
     max?: number | undefined;
     min?: number | undefined;
+    url?: boolean | undefined;
 }, {
     type: "string";
     length?: number | undefined;
@@ -294,10 +294,10 @@ export declare const EnvSchema: z.ZodRecord<z.ZodEffects<z.ZodEffects<z.ZodStrin
     endsWith?: string | undefined;
     startsWith?: string | undefined;
     default?: string | undefined;
-    url?: boolean | undefined;
     optional?: boolean | undefined;
     max?: number | undefined;
     min?: number | undefined;
+    url?: boolean | undefined;
 }>, z.ZodObject<{
     type: z.ZodLiteral<"number">;
     optional: z.ZodOptional<z.ZodBoolean>;

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

@@ -6,6 +6,7 @@ import {
 } from "../scripts.js";
 import { renderAllHeadContent } from "./head.js";
 import { isRenderInstruction } from "./instruction.js";
+import { renderServerIslandRuntime } from "./server-islands.js";
 import { isSlotString } from "./slot.js";
 const Fragment = Symbol.for("astro:fragment");
 const Renderer = Symbol.for("astro:renderer");
@@ -48,6 +49,13 @@ function stringifyChunk(result, chunk) {
         }
         return "";
       }
+      case "server-island-runtime": {
+        if (result._metadata.hasRenderedServerIslandRuntime) {
+          return "";
+        }
+        result._metadata.hasRenderedServerIslandRuntime = true;
+        return renderServerIslandRuntime();
+      }
       default: {
         throw new Error(`Unknown chunk type: ${chunk.type}`);
       }

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

@@ -18,9 +18,9 @@ export type RendererHydrationScriptInstruction = {
 export type MaybeRenderHeadInstruction = {
     type: 'maybe-head';
 };
-export type RenderInstruction = RenderDirectiveInstruction | RenderHeadInstruction | MaybeRenderHeadInstruction | RendererHydrationScriptInstruction;
-export declare function createRenderInstruction(instruction: RenderDirectiveInstruction): RenderDirectiveInstruction;
-export declare function createRenderInstruction(instruction: RendererHydrationScriptInstruction): RendererHydrationScriptInstruction;
-export declare function createRenderInstruction(instruction: RenderHeadInstruction): RenderHeadInstruction;
-export declare function createRenderInstruction(instruction: MaybeRenderHeadInstruction): MaybeRenderHeadInstruction;
+export type ServerIslandRuntimeInstruction = {
+    type: 'server-island-runtime';
+};
+export type RenderInstruction = RenderDirectiveInstruction | RenderHeadInstruction | MaybeRenderHeadInstruction | RendererHydrationScriptInstruction | ServerIslandRuntimeInstruction;
+export declare function createRenderInstruction<T extends RenderInstruction>(instruction: T): T;
 export declare function isRenderInstruction(chunk: any): chunk is RenderInstruction;

package/dist/runtime/server/render/server-islands.d.ts

@@ -3,3 +3,4 @@ import type { RenderInstance } from './common.js';
 import { type ComponentSlots } from './slot.js';
 export declare function containsServerDirective(props: Record<string | number, any>): boolean;
 export declare function renderServerIsland(result: SSRResult, _displayName: string, props: Record<string | number, any>, slots: ComponentSlots): RenderInstance;
+export declare const renderServerIslandRuntime: () => any;

package/dist/runtime/server/render/server-islands.js

@@ -1,5 +1,7 @@
 import { encryptString } from "../../../core/encryption.js";
+import { markHTMLString } from "../escape.js";
 import { renderChild } from "./any.js";
+import { createRenderInstruction } from "./instruction.js";
 import { renderSlotToString } from "./slot.js";
 const internalProps = /* @__PURE__ */ new Set([
   "server:component-path",
@@ -43,6 +45,7 @@ function renderServerIsland(result, _displayName, props, slots) {
           delete props[key2];
         }
       }
+      destination.write(createRenderInstruction({ type: "server-island-runtime" }));
       destination.write("<!--[if astro]>server-island-start<![endif]-->");
       const renderedSlots = {};
       for (const name in slots) {
@@ -70,13 +73,9 @@ function renderServerIsland(result, _displayName, props, slots) {
           `<link rel="preload" as="fetch" href="${serverIslandUrl}" crossorigin="anonymous">`
         );
       }
-      destination.write(`<script async type="module" data-astro-rerun data-island-id="${hostId}">
-let script = document.querySelector('script[data-island-id="${hostId}"]');
-
-${useGETRequest ? (
+      destination.write(`<script type="module" data-astro-rerun data-island-id="${hostId}">${useGETRequest ? (
         // GET request
-        `let response = await fetch('${serverIslandUrl}');
-`
+        `let response = await fetch('${serverIslandUrl}');`
       ) : (
         // POST request
         `let data = {
@@ -84,38 +83,37 @@ ${useGETRequest ? (
 	encryptedProps: ${safeJsonStringify(propsEncrypted)},
 	slots: ${safeJsonStringify(renderedSlots)},
 };
-
 let response = await fetch('${serverIslandUrl}', {
 	method: 'POST',
 	body: JSON.stringify(data),
-});
-`
+});`
       )}
-if (script) {
-	if(
-		response.status === 200
-		&& response.headers.has('content-type')
-		&& response.headers.get('content-type').split(";")[0].trim() === 'text/html') {
-		let html = await response.text();
-
-		// Swap!
-		while(script.previousSibling &&
-			script.previousSibling.nodeType !== 8 &&
-			script.previousSibling.data !== '[if astro]>server-island-start<![endif]') {
-			script.previousSibling.remove();
-		}
-		script.previousSibling?.remove();
-
-		let frag = document.createRange().createContextualFragment(html);
-		script.before(frag);
-	}
-	script.remove(); // Prior to v5.4.2, this was the trick to force rerun of scripts.  Keeping it to minimize change to the existing behavior.
-}
-</script>`);
+replaceServerIsland('${hostId}', response);</script>`);
     }
   };
 }
+const renderServerIslandRuntime = () => markHTMLString(
+  `
+	<script>
+		async function replaceServerIsland(id, r) {
+			let s = document.querySelector(\`script[data-island-id="\${id}"]\`);
+			// If there's no matching script, or the request fails then return
+			if (!s || r.status !== 200 || r.headers.get('content-type')?.split(';')[0].trim() !== 'text/html') return;
+			// Load the HTML before modifying the DOM in case of errors
+			let html = await r.text();
+			// Remove any placeholder content before the island script
+			while (s.previousSibling && s.previousSibling.nodeType !== 8 && s.previousSibling.data !== '[if astro]>server-island-start<![endif]')
+				s.previousSibling.remove();
+			s.previousSibling?.remove();
+			// Insert the new HTML
+			s.before(document.createRange().createContextualFragment(html));
+			// Remove the script. Prior to v5.4.2, this was the trick to force rerun of scripts.  Keeping it to minimize change to the existing behavior.
+			s.remove();
+		}
+	</script>`.split("\n").map((line) => line.trim()).filter((line) => line && !line.startsWith("//")).join(" ")
+);
 export {
   containsServerDirective,
-  renderServerIsland
+  renderServerIsland,
+  renderServerIslandRuntime
 };

package/dist/transitions/swap-functions.d.ts

@@ -5,7 +5,7 @@ export type SavedFocus = {
 };
 export declare function detectScriptExecuted(script: HTMLScriptElement): boolean;
 export declare function deselectScripts(doc: Document): void;
-export declare function swapRootAttributes(doc: Document): void;
+export declare function swapRootAttributes(newDoc: Document): void;
 export declare function swapHeadElements(doc: Document): void;
 export declare function swapBodyElement(newElement: Element, oldElement: Element): void;
 export declare const saveFocus: () => (() => void);

package/dist/transitions/swap-functions.js

@@ -1,4 +1,5 @@
 const PERSIST_ATTR = "data-astro-transition-persist";
+const NON_OVERRIDABLE_ASTRO_ATTRS = ["data-astro-transition", "data-astro-transition-fallback"];
 const scriptsAlreadyRan = /* @__PURE__ */ new Set();
 function detectScriptExecuted(script) {
   const key = script.src ? new URL(script.src, location.href).href : script.textContent;
@@ -17,13 +18,13 @@ function deselectScripts(doc) {
     }
   }
 }
-function swapRootAttributes(doc) {
-  const html = document.documentElement;
-  const astroAttributes = [...html.attributes].filter(
-    ({ name }) => (html.removeAttribute(name), name.startsWith("data-astro-"))
+function swapRootAttributes(newDoc) {
+  const currentRoot = document.documentElement;
+  const nonOverridableAstroAttributes = [...currentRoot.attributes].filter(
+    ({ name }) => (currentRoot.removeAttribute(name), NON_OVERRIDABLE_ASTRO_ATTRS.includes(name))
   );
-  [...doc.documentElement.attributes, ...astroAttributes].forEach(
-    ({ name, value }) => html.setAttribute(name, value)
+  [...newDoc.documentElement.attributes, ...nonOverridableAstroAttributes].forEach(
+    ({ name, value }) => currentRoot.setAttribute(name, value)
   );
 }
 function swapHeadElements(doc) {

package/dist/types/public/internal.d.ts

@@ -258,6 +258,7 @@ export interface SSRMetadata {
     renderedScripts: Set<string>;
     hasDirectives: Set<string>;
     hasRenderedHead: boolean;
+    hasRenderedServerIslandRuntime: boolean;
     headInTree: boolean;
     extraHead: string[];
     propagators: Set<AstroComponentInstance>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "5.6.1",
+  "version": "5.6.2",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -149,7 +149,7 @@
     "unist-util-visit": "^5.0.0",
     "unstorage": "^1.15.0",
     "vfile": "^6.0.3",
-    "vite": "^6.2.4",
+    "vite": "^6.2.6",
     "vitefu": "^1.0.6",
     "xxhash-wasm": "^1.1.0",
     "yargs-parser": "^21.1.1",
@@ -157,9 +157,9 @@
     "zod": "^3.24.2",
     "zod-to-json-schema": "^3.24.5",
     "zod-to-ts": "^1.2.0",
+    "@astrojs/internal-helpers": "0.6.1",
     "@astrojs/markdown-remark": "6.3.1",
-    "@astrojs/telemetry": "3.2.0",
-    "@astrojs/internal-helpers": "0.6.1"
+    "@astrojs/telemetry": "3.2.0"
   },
   "optionalDependencies": {
     "sharp": "^0.33.3"