astro 5.6.1 → 5.7.0

package/dist/integrations/hooks.js

@@ -11,7 +11,7 @@ import { buildClientDirectiveEntrypoint } from "../core/client-directive/index.j
 import { mergeConfig } from "../core/config/index.js";
 import { validateConfigRefined } from "../core/config/validate.js";
 import { validateSetAdapter } from "../core/dev/adapter-validation.js";
-import { validateSessionConfig } from "../core/session.js";
+import { getClientOutputDirectory } from "../prerender/utils.js";
 import { validateSupportedFeatures } from "./features-validation.js";
 async function withTakingALongTimeMsg({
   name,
@@ -310,7 +310,6 @@ async function runHookConfigDone({
       })
     });
   }
-  validateSessionConfig(settings);
 }
 async function runHookServerSetup({
   config,
@@ -446,7 +445,7 @@ async function runHookBuildGenerated({
   }
 }
 async function runHookBuildDone({ settings, pages, routes, logger }) {
-  const dir = settings.buildOutput === "server" ? settings.config.build.client : settings.config.outDir;
+  const dir = getClientOutputDirectory(settings);
   await fsMod.promises.mkdir(dir, { recursive: true });
   const integrationRoutes = routes.map(toIntegrationRouteData);
   for (const integration of settings.config.integrations) {

package/dist/manifest/virtual-module.d.ts

@@ -1,9 +1,5 @@
 import type { Plugin } from 'vite';
-import type { Logger } from '../core/logger/core.js';
-import type { AstroSettings } from '../types/astro.js';
 import type { SSRManifest } from '../types/public/index.js';
-export default function virtualModulePlugin({ settings, manifest, logger: _logger, }: {
-    settings: AstroSettings;
+export default function virtualModulePlugin({ manifest }: {
     manifest: SSRManifest;
-    logger: Logger;
 }): Plugin;

package/dist/manifest/virtual-module.js

@@ -1,15 +1,10 @@
-import { CantUseAstroConfigModuleError } from "../core/errors/errors-data.js";
 import { AstroError, AstroErrorData } from "../core/errors/index.js";
 import { fromRoutingStrategy } from "../i18n/utils.js";
 const VIRTUAL_SERVER_ID = "astro:config/server";
 const RESOLVED_VIRTUAL_SERVER_ID = "\0" + VIRTUAL_SERVER_ID;
 const VIRTUAL_CLIENT_ID = "astro:config/client";
 const RESOLVED_VIRTUAL_CLIENT_ID = "\0" + VIRTUAL_CLIENT_ID;
-function virtualModulePlugin({
-  settings,
-  manifest,
-  logger: _logger
-}) {
+function virtualModulePlugin({ manifest }) {
   return {
     enforce: "pre",
     name: "astro-manifest-plugin",
@@ -22,20 +17,8 @@ function virtualModulePlugin({
     },
     load(id, opts) {
       if (id === RESOLVED_VIRTUAL_CLIENT_ID) {
-        if (!settings.config.experimental.serializeConfig) {
-          throw new AstroError({
-            ...CantUseAstroConfigModuleError,
-            message: CantUseAstroConfigModuleError.message(VIRTUAL_CLIENT_ID)
-          });
-        }
         return { code: serializeClientConfig(manifest) };
       } else if (id == RESOLVED_VIRTUAL_SERVER_ID) {
-        if (!settings.config.experimental.serializeConfig) {
-          throw new AstroError({
-            ...CantUseAstroConfigModuleError,
-            message: CantUseAstroConfigModuleError.message(VIRTUAL_SERVER_ID)
-          });
-        }
         if (!opts?.ssr) {
           throw new AstroError({
             ...AstroErrorData.ServerOnlyModule,

package/dist/prerender/utils.d.ts

@@ -4,4 +4,8 @@ export declare function getPrerenderDefault(config: AstroConfig): boolean;
 /**
  * Returns the correct output directory of the SSR build based on the configuration
  */
-export declare function getOutputDirectory(settings: AstroSettings): URL;
+export declare function getServerOutputDirectory(settings: AstroSettings): URL;
+/**
+ * Returns the correct output directory of the client build based on the configuration
+ */
+export declare function getClientOutputDirectory(settings: AstroSettings): URL;

package/dist/prerender/utils.js

@@ -2,14 +2,14 @@ import { getOutDirWithinCwd } from "../core/build/common.js";
 function getPrerenderDefault(config) {
   return config.output !== "server";
 }
-function getOutputDirectory(settings) {
-  if (settings.buildOutput === "server") {
-    return settings.config.build.server;
-  } else {
-    return getOutDirWithinCwd(settings.config.outDir);
-  }
+function getServerOutputDirectory(settings) {
+  return settings.buildOutput === "server" ? settings.config.build.server : getOutDirWithinCwd(settings.config.outDir);
+}
+function getClientOutputDirectory(settings) {
+  return settings.buildOutput === "server" ? settings.config.build.client : settings.config.outDir;
 }
 export {
-  getOutputDirectory,
-  getPrerenderDefault
+  getClientOutputDirectory,
+  getPrerenderDefault,
+  getServerOutputDirectory
 };

package/dist/runtime/client/dev-toolbar/apps/audit/annotations.d.ts

@@ -0,0 +1,6 @@
+export interface Annotation {
+    file: string;
+    location: string;
+}
+export declare function getAnnotationsForElement(element: Element): Annotation | undefined;
+export declare function processAnnotations(): void;

package/dist/runtime/client/dev-toolbar/apps/audit/annotations.js

@@ -0,0 +1,27 @@
+const ELEMENT_ANNOTATIONS = /* @__PURE__ */ new WeakMap();
+function getAnnotationsForElement(element) {
+  return ELEMENT_ANNOTATIONS.get(element);
+}
+const ANNOTATION_MAP = {
+  "data-astro-source-file": "file",
+  "data-astro-source-loc": "location"
+};
+function extractAnnotations(element) {
+  const annotations = {};
+  for (const [attr, key] of Object.entries(ANNOTATION_MAP)) {
+    annotations[key] = element.getAttribute(attr);
+  }
+  for (const attr of Object.keys(ANNOTATION_MAP)) {
+    element.removeAttribute(attr);
+  }
+  return annotations;
+}
+function processAnnotations() {
+  for (const element of document.querySelectorAll(`[data-astro-source-file]`)) {
+    ELEMENT_ANNOTATIONS.set(element, extractAnnotations(element));
+  }
+}
+export {
+  getAnnotationsForElement,
+  processAnnotations
+};

package/dist/runtime/client/dev-toolbar/apps/audit/index.js

@@ -1,6 +1,7 @@
 import { settings } from "../../settings.js";
 import { positionHighlight } from "../utils/highlight.js";
 import { closeOnOutsideClick } from "../utils/window.js";
+import { processAnnotations } from "./annotations.js";
 import { rulesCategories } from "./rules/index.js";
 import { DevToolbarAuditListItem } from "./ui/audit-list-item.js";
 import { DevToolbarAuditListWindow } from "./ui/audit-list-window.js";
@@ -22,8 +23,9 @@ var audit_default = {
       "astro-dev-toolbar-audit-window"
     );
     let hasCreatedUI = false;
+    auditWindow.popover = "";
     canvas.appendChild(auditWindow);
-    await lint();
+    await run();
     let mutationDebounce;
     const observer = new MutationObserver(() => {
       if (mutationDebounce) {
@@ -34,7 +36,7 @@ var audit_default = {
         if ("requestIdleCallback" in window) {
           window.requestIdleCallback(
             async () => {
-              lint().then(() => {
+              run().then(() => {
                 if (showState) createAuditsUI();
               });
             },
@@ -42,7 +44,7 @@ var audit_default = {
           );
         } else {
           setTimeout(async () => {
-            lint().then(() => {
+            run().then(() => {
               if (showState) createAuditsUI();
             });
           }, 150);
@@ -54,7 +56,7 @@ var audit_default = {
       observer.disconnect();
     });
     document.addEventListener("astro:after-swap", async () => {
-      lint();
+      run();
     });
     document.addEventListener("astro:page-load", async () => {
       refreshLintPositions();
@@ -93,6 +95,10 @@ var audit_default = {
       canvas.appendChild(fragment);
       hasCreatedUI = true;
     }
+    async function run() {
+      processAnnotations();
+      await lint();
+    }
     async function lint() {
       if (audits.length > 0) {
         audits.forEach((audit) => {

package/dist/runtime/client/dev-toolbar/apps/audit/ui/audit-ui.js

@@ -4,6 +4,7 @@ import {
   createHighlight,
   getElementsPositionInDocument
 } from "../../utils/highlight.js";
+import { getAnnotationsForElement } from "../annotations.js";
 import { resolveAuditRule } from "../rules/index.js";
 function truncate(val, maxLength) {
   return val.length > maxLength ? val.slice(0, maxLength - 1) + "…" : val;
@@ -50,8 +51,7 @@ function buildAuditTooltip(rule, element) {
       content: escapeHTML(message)
     }
   ];
-  const elementFile = element.getAttribute("data-astro-source-file");
-  const elementPosition = element.getAttribute("data-astro-source-loc");
+  const { file: elementFile, location: elementPosition } = getAnnotationsForElement(element) ?? {};
   if (elementFile) {
     const elementFileWithPosition = elementFile + (elementPosition ? ":" + elementPosition : "");
     tooltip.sections.push({

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) {