astro 5.5.6 → 5.6.1

package/dist/manifest/virtual-module.js

@@ -28,7 +28,7 @@ function virtualModulePlugin({
             message: CantUseAstroConfigModuleError.message(VIRTUAL_CLIENT_ID)
           });
         }
-        return `${serializeClientConfig(manifest)};`;
+        return { code: serializeClientConfig(manifest) };
       } else if (id == RESOLVED_VIRTUAL_SERVER_ID) {
         if (!settings.config.experimental.serializeConfig) {
           throw new AstroError({
@@ -42,7 +42,7 @@ function virtualModulePlugin({
             message: AstroErrorData.ServerOnlyModule.message(VIRTUAL_SERVER_ID)
           });
         }
-        return `${serializeServerConfig(manifest)};`;
+        return { code: serializeServerConfig(manifest) };
       }
     }
   };

package/dist/prefetch/index.d.ts

@@ -23,6 +23,14 @@ export interface PrefetchOptions {
      * Should prefetch even on data saver mode or slow connection. (default `false`)
      */
     ignoreSlowConnection?: boolean;
+    /**
+     * A string providing a hint to the browser as to how eagerly it should prefetch/prerender link targets in order to balance performance advantages against resource overheads. (default `immediate`)
+     * Only works if `clientPrerender` is enabled and browser supports Speculation Rules API.
+     * The browser takes this hint into consideration along with its own heuristics, so it may select a link that the author has hinted as less eager than another, if the less eager candidate is considered a better choice.
+     *
+     * https://developer.mozilla.org/en-US/docs/Web/HTML/Element/script/type/speculationrules#eagerness
+     */
+    eagerness?: 'immediate' | 'eager' | 'moderate' | 'conservative';
 }
 /**
  * Prefetch a URL so it's cached when the user navigates to it.

package/dist/prefetch/index.js

@@ -125,7 +125,7 @@ function prefetch(url, opts) {
   prefetchedUrls.add(url);
   if (clientPrerender && HTMLScriptElement.supports?.("speculationrules")) {
     debug?.(`[astro] Prefetching ${url} with <script type="speculationrules">`);
-    appendSpeculationRules(url);
+    appendSpeculationRules(url, opts?.eagerness ?? "immediate");
   } else if (document.createElement("link").relList?.supports?.("prefetch") && opts?.with !== "fetch") {
     debug?.(`[astro] Prefetching ${url} with <link rel="prefetch">`);
     const link = document.createElement("link");
@@ -182,14 +182,15 @@ function onPageLoad(cb) {
     cb();
   });
 }
-function appendSpeculationRules(url) {
+function appendSpeculationRules(url, eagerness) {
   const script = document.createElement("script");
   script.type = "speculationrules";
   script.textContent = JSON.stringify({
     prerender: [
       {
         source: "list",
-        urls: [url]
+        urls: [url],
+        eagerness
       }
     ],
     // Currently, adding `prefetch` is required to fallback if `prerender` fails.
@@ -198,7 +199,8 @@ function appendSpeculationRules(url) {
     prefetch: [
       {
         source: "list",
-        urls: [url]
+        urls: [url],
+        eagerness
       }
     ]
   });

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

@@ -25,7 +25,7 @@ function astroPrefetch({ settings }) {
     load(id) {
       if (id === resolvedVirtualModuleId) {
         if (!prefetch) throwPrefetchNotEnabledError();
-        return `export { prefetch } from "astro/virtual-modules/prefetch.js";`;
+        return { code: `export { prefetch } from "astro/virtual-modules/prefetch.js";` };
       }
     },
     transform(code, id) {

package/dist/toolbar/vite-plugin-dev-toolbar.js

@@ -50,58 +50,60 @@ ${args.error}`
     },
     async load(id) {
       if (id === resolvedPrivateVirtualModuleId) {
-        return `
-					export const loadDevToolbarApps = async () => {
-						return (await Promise.all([${settings.devToolbarApps.map(
-          (plugin) => `safeLoadPlugin(${JSON.stringify(
-            plugin
-          )}, async () => (await import(${JSON.stringify(
-            typeof plugin === "string" ? plugin : plugin.entrypoint.toString()
-          )})).default, ${JSON.stringify(
-            typeof plugin === "string" ? plugin : plugin.entrypoint.toString()
-          )})`
-        ).join(",")}]));
-					};
+        return {
+          code: `
+						export const loadDevToolbarApps = async () => {
+							return (await Promise.all([${settings.devToolbarApps.map(
+            (plugin) => `safeLoadPlugin(${JSON.stringify(
+              plugin
+            )}, async () => (await import(${JSON.stringify(
+              typeof plugin === "string" ? plugin : plugin.entrypoint.toString()
+            )})).default, ${JSON.stringify(
+              typeof plugin === "string" ? plugin : plugin.entrypoint.toString()
+            )})`
+          ).join(",")}]));
+						};
 
-					async function safeLoadPlugin(appDefinition, importEntrypoint, entrypoint) {
-						try {
-							let app;
-							if (typeof appDefinition === 'string') {
-								app = await importEntrypoint();
+						async function safeLoadPlugin(appDefinition, importEntrypoint, entrypoint) {
+							try {
+								let app;
+								if (typeof appDefinition === 'string') {
+									app = await importEntrypoint();
 
-								if (typeof app !== 'object' || !app.id || !app.name) {
-									throw new Error("Apps must default export an object with an id, and a name.");
-								}
-							} else {
-								app = appDefinition;
+									if (typeof app !== 'object' || !app.id || !app.name) {
+										throw new Error("Apps must default export an object with an id, and a name.");
+									}
+								} else {
+									app = appDefinition;
 
-								if (typeof app !== 'object' || !app.id || !app.name || !app.entrypoint) {
-									throw new Error("Apps must be an object with an id, a name and an entrypoint.");
-								}
+									if (typeof app !== 'object' || !app.id || !app.name || !app.entrypoint) {
+										throw new Error("Apps must be an object with an id, a name and an entrypoint.");
+									}
+
+									const loadedApp = await importEntrypoint();
 
-								const loadedApp = await importEntrypoint();
+									if (typeof loadedApp !== 'object') {
+										throw new Error("App entrypoint must default export an object.");
+									}
 
-								if (typeof loadedApp !== 'object') {
-									throw new Error("App entrypoint must default export an object.");
+									app = { ...app, ...loadedApp };
 								}
 
-								app = { ...app, ...loadedApp };
-							}
+								return app;
+							} catch (err) {
+								console.error(\`Failed to load dev toolbar app from \${entrypoint}: \${err.message}\`);
 
-							return app;
-						} catch (err) {
-							console.error(\`Failed to load dev toolbar app from \${entrypoint}: \${err.message}\`);
+								if (import.meta.hot) {
+								import.meta.hot.send('astro:devtoolbar:error:load', { entrypoint: entrypoint, error: err.message })
+								}
 
-							if (import.meta.hot) {
-  							import.meta.hot.send('astro:devtoolbar:error:load', { entrypoint: entrypoint, error: err.message })
+								return undefined;
 							}
 
 							return undefined;
 						}
-
-						return undefined;
-					}
-				`;
+					`
+        };
       }
     }
   };

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

@@ -22,26 +22,30 @@ function astroTransitions({ settings }) {
     },
     load(id) {
       if (id === resolvedVirtualModuleId) {
-        return `
-				export * from "astro/virtual-modules/transitions.js";
-				export {
-					default as ViewTransitions,
-					default as ClientRouter
-				} from "astro/components/ClientRouter.astro";
-			`;
+        return {
+          code: `
+						export * from "astro/virtual-modules/transitions.js";
+						export {
+							default as ViewTransitions,
+							default as ClientRouter
+						} from "astro/components/ClientRouter.astro";
+					`
+        };
       }
       if (id === resolvedVirtualClientModuleId) {
-        return `
-				export { navigate, supportsViewTransitions, transitionEnabledOnThisPage } from "astro/virtual-modules/transitions-router.js";
-				export * from "astro/virtual-modules/transitions-types.js";
-				export {
-					TRANSITION_BEFORE_PREPARATION, isTransitionBeforePreparationEvent, TransitionBeforePreparationEvent,
-					TRANSITION_AFTER_PREPARATION,
-					TRANSITION_BEFORE_SWAP, isTransitionBeforeSwapEvent, TransitionBeforeSwapEvent,
-					TRANSITION_AFTER_SWAP, TRANSITION_PAGE_LOAD
-				} from "astro/virtual-modules/transitions-events.js";
-				export { swapFunctions } from "astro/virtual-modules/transitions-swap-functions.js";
-			`;
+        return {
+          code: `
+						export { navigate, supportsViewTransitions, transitionEnabledOnThisPage } from "astro/virtual-modules/transitions-router.js";
+						export * from "astro/virtual-modules/transitions-types.js";
+						export {
+							TRANSITION_BEFORE_PREPARATION, isTransitionBeforePreparationEvent, TransitionBeforePreparationEvent,
+							TRANSITION_AFTER_PREPARATION,
+							TRANSITION_BEFORE_SWAP, isTransitionBeforeSwapEvent, TransitionBeforeSwapEvent,
+							TRANSITION_AFTER_SWAP, TRANSITION_PAGE_LOAD
+						} from "astro/virtual-modules/transitions-events.js";
+						export { swapFunctions } from "astro/virtual-modules/transitions-swap-functions.js";
+					`
+        };
       }
     },
     transform(code, id) {

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

@@ -4,9 +4,8 @@ import type { RehypePlugins, RemarkPlugins, RemarkRehype, ShikiConfig, SyntaxHig
 import type { BuiltinDriverName, BuiltinDriverOptions, Driver, Storage } from 'unstorage';
 import type { UserConfig as OriginalViteUserConfig, SSROptions as ViteSSROptions } from 'vite';
 import type { ImageFit, ImageLayout } from '../../assets/types.js';
-import type { SvgRenderMode } from '../../assets/utils/svg.js';
 import type { AssetsPrefix } from '../../core/app/types.js';
-import type { AstroConfigType } from '../../core/config/schema.js';
+import type { AstroConfigType } from '../../core/config/schemas/index.js';
 import type { REDIRECT_STATUS_CODES } from '../../core/constants.js';
 import type { AstroCookieSetOptions } from '../../core/cookies/cookies.js';
 import type { LoggerLevel } from '../../core/logger/core.js';
@@ -1978,7 +1977,7 @@ export interface ViteUserConfig extends OriginalViteUserConfig {
         /**
          *
          * @name experimental.svg
-         * @type {boolean|object}
+         * @type {boolean}
          * @default `undefined`
          * @version 5.x
          * @description
@@ -2009,28 +2008,7 @@ export interface ViteUserConfig extends OriginalViteUserConfig {
          * For a complete overview, and to give feedback on this experimental API,
          * see the [Feature RFC](https://github.com/withastro/roadmap/pull/1035).
          */
-        svg?: boolean | {
-            /**
-             *
-             * @name experimental.svg.mode
-             * @type {string}
-             * @default 'inline'
-             *
-             * The default technique for handling imported SVG files. Astro will inline the SVG content into your HTML output if not specified.
-             *
-             * - `inline`: Astro will inline the SVG content into your HTML output.
-             * - `sprite`: Astro will generate a sprite sheet with all imported SVG files.
-             *
-             * ```astro
-             * ---
-             * import Logo from './path/to/svg/file.svg';
-             * ---
-             *
-             * <Logo size={24} mode="sprite" />
-             * ```
-             */
-            mode: SvgRenderMode;
-        };
+        svg?: boolean;
         /**
          * @name experimental.serializeConfig
          * @type {boolean}

package/dist/vite-plugin-load-fallback/index.js

@@ -41,8 +41,10 @@ function loadFallbackPlugin({
         }
       },
       async load(id) {
-        const source = await tryLoadModule(id);
-        return source;
+        const code = await tryLoadModule(id);
+        if (code) {
+          return { code };
+        }
       }
     },
     {

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

@@ -17,13 +17,19 @@ function astroScriptsPlugin({ settings }) {
     },
     async load(id) {
       if (id === BEFORE_HYDRATION_SCRIPT_ID) {
-        return settings.scripts.filter((s) => s.stage === "before-hydration").map((s) => s.content).join("\n");
+        return {
+          code: settings.scripts.filter((s) => s.stage === "before-hydration").map((s) => s.content).join("\n")
+        };
       }
       if (id === PAGE_SCRIPT_ID) {
-        return settings.scripts.filter((s) => s.stage === "page").map((s) => s.content).join("\n");
+        return {
+          code: settings.scripts.filter((s) => s.stage === "page").map((s) => s.content).join("\n")
+        };
       }
       if (id === PAGE_SSR_SCRIPT_ID) {
-        return settings.scripts.filter((s) => s.stage === "page-ssr").map((s) => s.content).join("\n");
+        return {
+          code: settings.scripts.filter((s) => s.stage === "page-ssr").map((s) => s.content).join("\n")
+        };
       }
       return null;
     },

package/dist/vite-plugin-ssr-manifest/index.js

@@ -11,12 +11,13 @@ function vitePluginSSRManifest() {
     },
     load(id) {
       if (id === resolvedManifestVirtualModuleId) {
-        return `export let manifest = {};
+        return {
+          code: `export let manifest = {};
 export function _privateSetManifestDontUseThis(ssrManifest) {
   manifest = ssrManifest;
-}`;
+}`
+        };
       }
-      return void 0;
     }
   };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "5.5.6",
+  "version": "5.6.1",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -145,7 +145,7 @@
     "tinyexec": "^0.3.2",
     "tinyglobby": "^0.2.12",
     "tsconfck": "^3.1.5",
-    "ultrahtml": "^1.5.3",
+    "ultrahtml": "^1.6.0",
     "unist-util-visit": "^5.0.0",
     "unstorage": "^1.15.0",
     "vfile": "^6.0.3",
@@ -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/telemetry": "3.2.0",
+    "@astrojs/internal-helpers": "0.6.1"
   },
   "optionalDependencies": {
     "sharp": "^0.33.3"