astro 4.8.3 → 4.8.5

package/astro-jsx.d.ts

@@ -605,6 +605,7 @@ declare namespace astroHTML.JSX {
 		href?: string | URL | undefined | null;
 		hreflang?: string | undefined | null;
 		media?: string | undefined | null;
+		name?: string | undefined | null;
 		ping?: string | undefined | null;
 		rel?: string | undefined | null;
 		target?: HTMLAttributeAnchorTarget | undefined | null;
@@ -649,6 +650,7 @@ declare namespace astroHTML.JSX {
 		type?: 'submit' | 'reset' | 'button' | undefined | null;
 		value?: string | string[] | number | undefined | null;
 		popovertarget?: string | undefined | null;
+		popovertargetaction?: 'hide' | 'show' | 'toggle' | undefined | null;
 	}
 
 	interface CanvasHTMLAttributes extends HTMLAttributes {
@@ -815,6 +817,7 @@ declare namespace astroHTML.JSX {
 		value?: string | string[] | number | undefined | null;
 		width?: number | string | undefined | null;
 		popovertarget?: string | undefined | null;
+		popovertargetaction?: 'hide' | 'show' | 'toggle' | undefined | null;
 	}
 
 	interface KeygenHTMLAttributes extends HTMLAttributes {

package/client.d.ts

@@ -12,7 +12,7 @@ interface ImportMetaEnv {
 	/**
 	 * The prefix for Astro-generated asset links if the build.assetsPrefix config option is set. This can be used to create asset links not handled by Astro.
 	 */
-	readonly ASSETS_PREFIX: string;
+	readonly ASSETS_PREFIX: string | Record<string, string>;
 	/**
 	 * This is set to the site option specified in your project’s Astro config file.
 	 */

package/config.d.ts

@@ -1,6 +1,7 @@
 type ViteUserConfig = import('vite').UserConfig;
 type ViteUserConfigFn = import('vite').UserConfigFn;
 type AstroUserConfig = import('./dist/@types/astro.js').AstroUserConfig;
+type AstroInlineConfig = import('./dist/@types/astro.js').AstroInlineConfig;
 type ImageServiceConfig = import('./dist/@types/astro.js').ImageServiceConfig;
 type SharpImageServiceConfig = import('./dist/assets/services/sharp.js').SharpImageServiceConfig;
 
@@ -13,7 +14,10 @@ export function defineConfig(config: AstroUserConfig): AstroUserConfig;
 /**
  * Use Astro to generate a fully resolved Vite config
  */
-export function getViteConfig(config: ViteUserConfig): ViteUserConfigFn;
+export function getViteConfig(
+	config: ViteUserConfig,
+	inlineAstroConfig?: AstroInlineConfig
+): ViteUserConfigFn;
 
 /**
  * Return the configuration needed to use the Sharp-based image service

package/dist/@types/astro.d.ts

@@ -1612,7 +1612,7 @@ export interface AstroUserConfig {
          *
          * Declare all your actions in `src/actions/index.ts`. This file is the global actions handler.
          *
-         * Define an action using the `defineAction()` utility from the `astro:actions` module. These accept the `handler` property to define your server-side request handler. If your action accepts arguments, apply the `input` property to validate parameters with Zod.
+         * Define an action using the `defineAction()` utility from the `astro:actions` module. An action accepts the `handler` property to define your server-side request handler. If your action accepts arguments, apply the `input` property to validate parameters with Zod.
          *
          * This example defines two actions: `like` and `comment`. The `like` action accepts a JSON object with a `postId` string, while the `comment` action accepts [FormData](https://developer.mozilla.org/en-US/docs/Web/API/XMLHttpRequest_API/Using_FormData_Objects) with `postId`, `author`, and `body` strings. Each `handler` updates your database and return a type-safe response.
          *
@@ -1645,12 +1645,14 @@ export interface AstroUserConfig {
          * };
          * ```
          *
-         * Then, call an action from your client components using the `actions` object from `astro:actions`. You can pass a type-safe object when using JSON, or a [FormData](https://developer.mozilla.org/en-US/docs/Web/API/XMLHttpRequest_API/Using_FormData_Objects) object when using `accept: 'form'` in your action definition:
+         * Then, call an action from your client components using the `actions` object from `astro:actions`. You can pass a type-safe object when using JSON, or a [FormData](https://developer.mozilla.org/en-US/docs/Web/API/XMLHttpRequest_API/Using_FormData_Objects) object when using `accept: 'form'` in your action definition.
+         *
+         * This example calls the `like` and `comment` actions from a React component:
          *
          * ```tsx "actions"
          * // src/components/blog.tsx
          * import { actions } from "astro:actions";
-         * import { useState } from "preact/hooks";
+         * import { useState } from "react";
          *
          * export function Like({ postId }: { postId: string }) {
          *   const [likes, setLikes] = useState(0);
@@ -1671,13 +1673,13 @@ export interface AstroUserConfig {
          *     <form
          *       onSubmit={async (e) => {
          *         e.preventDefault();
-         *         const formData = new FormData(e.target);
+         *         const formData = new FormData(e.target as HTMLFormElement);
          *         const result = await actions.blog.comment(formData);
          *         // handle result
          *       }}
          *     >
          *       <input type="hidden" name="postId" value={postId} />
-         *       <label for="author">Author</label>
+         *       <label htmlFor="author">Author</label>
          *       <input id="author" type="text" name="author" />
          *       <textarea rows={10} name="body"></textarea>
          *       <button type="submit">Post</button>

package/dist/actions/index.js

@@ -1,11 +1,18 @@
 import { mkdir, readFile, writeFile } from "node:fs/promises";
-import { viteID } from "../core/util.js";
+import { ActionsWithoutServerOutputError } from "../core/errors/errors-data.js";
+import { AstroError } from "../core/errors/errors.js";
+import { isServerLikeOutput, viteID } from "../core/util.js";
 import { ACTIONS_TYPES_FILE, RESOLVED_VIRTUAL_MODULE_ID, VIRTUAL_MODULE_ID } from "./consts.js";
 function astroActions() {
   return {
     name: VIRTUAL_MODULE_ID,
     hooks: {
       async "astro:config:setup"(params) {
+        if (!isServerLikeOutput(params.config)) {
+          const error = new AstroError(ActionsWithoutServerOutputError);
+          error.stack = void 0;
+          throw error;
+        }
         const stringifiedActionsImport = JSON.stringify(
           viteID(new URL("./actions", params.config.srcDir))
         );

package/dist/actions/runtime/middleware.js

@@ -4,16 +4,19 @@ import { formContentTypes, getAction, hasContentType } from "./utils.js";
 import { callSafely } from "./virtual/shared.js";
 const onRequest = defineMiddleware(async (context, next) => {
   const locals = context.locals;
+  if (locals._actionsInternal) return next();
   const { request, url } = context;
   const contentType = request.headers.get("Content-Type");
   if (url.pathname.startsWith("/_actions")) return nextWithLocalsStub(next, locals);
-  if (!contentType || !hasContentType(contentType, formContentTypes))
+  if (!contentType || !hasContentType(contentType, formContentTypes)) {
     return nextWithLocalsStub(next, locals);
+  }
   const formData = await request.clone().formData();
   const actionPath = formData.get("_astroAction");
   if (typeof actionPath !== "string") return nextWithLocalsStub(next, locals);
   const actionPathKeys = actionPath.replace("/_actions/", "").split(".");
   const action = await getAction(actionPathKeys);
+  if (!action) return nextWithLocalsStub(next, locals);
   const result = await ApiContextStorage.run(context, () => callSafely(() => action(formData)));
   const actionsInternal = {
     getActionResult: (actionFn) => {

package/dist/actions/runtime/route.js

@@ -5,9 +5,15 @@ const POST = async (context) => {
   const { request, url } = context;
   const actionPathKeys = url.pathname.replace("/_actions/", "").split(".");
   const action = await getAction(actionPathKeys);
+  if (!action) {
+    return new Response(null, { status: 404 });
+  }
   const contentType = request.headers.get("Content-Type");
+  const contentLength = request.headers.get("Content-Length");
   let args;
-  if (contentType && hasContentType(contentType, formContentTypes)) {
+  if (contentLength === "0") {
+    args = void 0;
+  } else if (contentType && hasContentType(contentType, formContentTypes)) {
     args = await request.clone().formData();
   } else if (contentType && hasContentType(contentType, ["application/json"])) {
     args = await request.clone().json();
@@ -16,17 +22,22 @@ const POST = async (context) => {
   }
   const result = await ApiContextStorage.run(context, () => callSafely(() => action(args)));
   if (result.error) {
-    if (import.meta.env.PROD) {
-      result.error.stack = void 0;
-    }
-    return new Response(JSON.stringify(result.error), {
-      status: result.error.status,
-      headers: {
-        "Content-Type": "application/json"
+    return new Response(
+      JSON.stringify({
+        ...result.error,
+        message: result.error.message,
+        stack: import.meta.env.PROD ? void 0 : result.error.stack
+      }),
+      {
+        status: result.error.status,
+        headers: {
+          "Content-Type": "application/json"
+        }
       }
-    });
+    );
   }
   return new Response(JSON.stringify(result.data), {
+    status: result.data ? 200 : 204,
     headers: {
       "Content-Type": "application/json"
     }

package/dist/actions/runtime/utils.d.ts

@@ -1,4 +1,4 @@
 export declare const formContentTypes: string[];
 export declare function hasContentType(contentType: string, expected: string[]): boolean;
 export type MaybePromise<T> = T | Promise<T>;
-export declare function getAction(pathKeys: string[]): Promise<(param: unknown) => MaybePromise<unknown>>;
+export declare function getAction(pathKeys: string[]): Promise<((param: unknown) => MaybePromise<unknown>) | undefined>;

package/dist/actions/runtime/utils.js

@@ -7,12 +7,12 @@ async function getAction(pathKeys) {
   let { server: actionLookup } = await import(import.meta.env.ACTIONS_PATH);
   for (const key of pathKeys) {
     if (!(key in actionLookup)) {
-      throw new Error("Action not found");
+      return void 0;
     }
     actionLookup = actionLookup[key];
   }
   if (typeof actionLookup !== "function") {
-    throw new Error("Action not found");
+    return void 0;
   }
   return actionLookup;
 }

package/dist/actions/runtime/virtual/shared.d.ts

@@ -9,6 +9,7 @@ export declare class ActionError<T extends ErrorInferenceObject = ErrorInference
     constructor(params: {
         message?: string;
         code: ActionErrorCode;
+        stack?: string;
     });
     static codeToStatus(code: ActionErrorCode): number;
     static statusToCode(status: number): ActionErrorCode;

package/dist/actions/runtime/virtual/shared.js

@@ -28,6 +28,9 @@ class ActionError extends Error {
     super(params.message);
     this.code = params.code;
     this.status = ActionError.codeToStatus(params.code);
+    if (params.stack) {
+      this.stack = params.stack;
+    }
   }
   static codeToStatus(code) {
     return codeToStatusMap[code];
@@ -36,15 +39,16 @@ class ActionError extends Error {
     return statusToCodeMap[status] ?? "INTERNAL_SERVER_ERROR";
   }
   static async fromResponse(res) {
-    if (res.status === 400 && res.headers.get("Content-Type")?.toLowerCase().startsWith("application/json")) {
-      const body = await res.json();
-      if (typeof body === "object" && body?.type === "AstroActionInputError" && Array.isArray(body.issues)) {
-        return new ActionInputError(body.issues);
-      }
+    const body = await res.clone().json();
+    if (typeof body === "object" && body?.type === "AstroActionInputError" && Array.isArray(body.issues)) {
+      return new ActionInputError(body.issues);
+    }
+    if (typeof body === "object" && body?.type === "AstroActionError") {
+      return new ActionError(body);
     }
     return new ActionError({
       message: res.statusText,
-      code: this.statusToCode(res.status)
+      code: ActionError.statusToCode(res.status)
     });
   }
 }
@@ -59,7 +63,10 @@ class ActionInputError extends ActionError {
   issues;
   fields;
   constructor(issues) {
-    super({ message: "Failed to validate", code: "BAD_REQUEST" });
+    super({
+      message: `Failed to validate: ${JSON.stringify(issues, null, 2)}`,
+      code: "BAD_REQUEST"
+    });
     this.issues = issues;
     this.fields = {};
     for (const issue of issues) {

package/dist/assets/utils/metadata.js

@@ -1,21 +1,28 @@
 import { AstroError, AstroErrorData } from "../../core/errors/index.js";
 import { lookup as probe } from "../utils/vendor/image-size/lookup.js";
 async function imageMetadata(data, src) {
-  const result = probe(data);
-  if (!result.height || !result.width || !result.type) {
+  try {
+    const result = probe(data);
+    if (!result.height || !result.width || !result.type) {
+      throw new AstroError({
+        ...AstroErrorData.NoImageMetadata,
+        message: AstroErrorData.NoImageMetadata.message(src)
+      });
+    }
+    const { width, height, type, orientation } = result;
+    const isPortrait = (orientation || 0) >= 5;
+    return {
+      width: isPortrait ? height : width,
+      height: isPortrait ? width : height,
+      format: type,
+      orientation
+    };
+  } catch (e) {
     throw new AstroError({
       ...AstroErrorData.NoImageMetadata,
       message: AstroErrorData.NoImageMetadata.message(src)
     });
   }
-  const { width, height, type, orientation } = result;
-  const isPortrait = (orientation || 0) >= 5;
-  return {
-    width: isPortrait ? height : width,
-    height: isPortrait ? width : height,
-    format: type,
-    orientation
-  };
 }
 export {
   imageMetadata

package/dist/core/app/index.js

@@ -186,6 +186,14 @@ class App {
         this.#logRenderOptionsDeprecationWarning();
       }
     }
+    if (routeData) {
+      this.#logger.debug(
+        "router",
+        "The adapter " + this.#manifest.adapterName + " provided a custom RouteData for ",
+        request.url
+      );
+      this.#logger.debug("router", "RouteData:\n" + routeData);
+    }
     if (locals) {
       if (typeof locals !== "object") {
         this.#logger.error(null, new AstroError(AstroErrorData.LocalsNotAnObject).stack);
@@ -201,8 +209,12 @@ class App {
     }
     if (!routeData) {
       routeData = this.match(request);
+      this.#logger.debug("router", "Astro matched the following route for " + request.url);
+      this.#logger.debug("router", "RouteData:\n" + routeData);
     }
     if (!routeData) {
+      this.#logger.debug("router", "Astro hasn't found routes that match " + request.url);
+      this.#logger.debug("router", "Here's the available routes:\n", this.#manifestData);
       return this.#renderError(request, { locals, status: 404 });
     }
     const pathname = this.#getPathnameFromRequest(request);

package/dist/core/app/pipeline.d.ts

@@ -7,6 +7,6 @@ export declare class AppPipeline extends Pipeline {
     headElements(routeData: RouteData): Pick<SSRResult, 'scripts' | 'styles' | 'links'>;
     componentMetadata(): void;
     getComponentByRoute(routeData: RouteData): Promise<ComponentInstance>;
-    tryRewrite(payload: RewritePayload): Promise<[RouteData, ComponentInstance]>;
+    tryRewrite(payload: RewritePayload, request: Request): Promise<[RouteData, ComponentInstance]>;
     getModuleForRoute(route: RouteData): Promise<SinglePageBuiltModule>;
 }

package/dist/core/app/pipeline.js

@@ -50,7 +50,7 @@ class AppPipeline extends Pipeline {
     const module = await this.getModuleForRoute(routeData);
     return module.page();
   }
-  async tryRewrite(payload) {
+  async tryRewrite(payload, request) {
     let foundRoute;
     for (const route of this.#manifestData.routes) {
       if (payload instanceof URL) {
@@ -64,9 +64,12 @@ class AppPipeline extends Pipeline {
           foundRoute = route;
           break;
         }
-      } else if (route.pattern.test(decodeURI(payload))) {
-        foundRoute = route;
-        break;
+      } else {
+        const newUrl = new URL(payload, new URL(request.url).origin);
+        if (route.pattern.test(decodeURI(newUrl.pathname))) {
+          foundRoute = route;
+          break;
+        }
       }
     }
     if (foundRoute) {

package/dist/core/base-pipeline.d.ts

@@ -64,7 +64,7 @@ export declare abstract class Pipeline {
      *
      * @param {RewritePayload} rewritePayload
      */
-    abstract tryRewrite(rewritePayload: RewritePayload): Promise<[RouteData, ComponentInstance]>;
+    abstract tryRewrite(rewritePayload: RewritePayload, request: Request): Promise<[RouteData, ComponentInstance]>;
     /**
      * Tells the pipeline how to retrieve a component give a `RouteData`
      * @param routeData

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

@@ -40,6 +40,10 @@ export interface BuildInternals {
      * A map for page-specific information by a client:only component
      */
     pagesByClientOnly: Map<string, Set<PageBuildData>>;
+    /**
+     * A map for page-specific information by a script in an Astro file
+     */
+    pagesByScriptId: Map<string, Set<PageBuildData>>;
     /**
      * A map of hydrated components to export names that are discovered during the SSR build.
      * These will be used as the top-level entrypoints for the client build.
@@ -96,6 +100,10 @@ export declare function trackPageData(internals: BuildInternals, component: stri
  * Tracks client-only components to the pages they are associated with.
  */
 export declare function trackClientOnlyPageDatas(internals: BuildInternals, pageData: PageBuildData, clientOnlys: string[]): void;
+/**
+ * Tracks scripts to the pages they are associated with. (experimental.directRenderScript)
+ */
+export declare function trackScriptPageDatas(internals: BuildInternals, pageData: PageBuildData, scriptIds: string[]): void;
 export declare function getPageDatasByChunk(internals: BuildInternals, chunk: Rollup.RenderedChunk): Generator<PageBuildData, void, unknown>;
 export declare function getPageDatasByClientOnlyID(internals: BuildInternals, viteid: ViteID): Generator<PageBuildData, void, unknown>;
 /**

package/dist/core/build/internal.js

@@ -16,6 +16,7 @@ function createBuildInternals() {
     pageOptionsByPage: /* @__PURE__ */ new Map(),
     pagesByViteID: /* @__PURE__ */ new Map(),
     pagesByClientOnly: /* @__PURE__ */ new Map(),
+    pagesByScriptId: /* @__PURE__ */ new Map(),
     propagatedStylesMap: /* @__PURE__ */ new Map(),
     propagatedScriptsMap: /* @__PURE__ */ new Map(),
     discoveredHydratedComponents: /* @__PURE__ */ new Map(),
@@ -45,6 +46,18 @@ function trackClientOnlyPageDatas(internals, pageData, clientOnlys) {
     pageDataSet.add(pageData);
   }
 }
+function trackScriptPageDatas(internals, pageData, scriptIds) {
+  for (const scriptId of scriptIds) {
+    let pageDataSet;
+    if (internals.pagesByScriptId.has(scriptId)) {
+      pageDataSet = internals.pagesByScriptId.get(scriptId);
+    } else {
+      pageDataSet = /* @__PURE__ */ new Set();
+      internals.pagesByScriptId.set(scriptId, pageDataSet);
+    }
+    pageDataSet.add(pageData);
+  }
+}
 function* getPageDatasByChunk(internals, chunk) {
   const pagesByViteID = internals.pagesByViteID;
   for (const [modulePath] of Object.entries(chunk.modules)) {
@@ -180,5 +193,6 @@ export {
   hasPrerenderedPages,
   mergeInlineCss,
   trackClientOnlyPageDatas,
-  trackPageData
+  trackPageData,
+  trackScriptPageDatas
 };

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

@@ -38,6 +38,6 @@ export declare class BuildPipeline extends Pipeline {
      */
     retrieveRoutesToGenerate(): Map<PageBuildData, string>;
     getComponentByRoute(routeData: RouteData): Promise<ComponentInstance>;
-    tryRewrite(payload: RewritePayload): Promise<[RouteData, ComponentInstance]>;
+    tryRewrite(payload: RewritePayload, request: Request): Promise<[RouteData, ComponentInstance]>;
     retrieveSsrEntry(route: RouteData, filePath: string): Promise<SinglePageBuiltModule>;
 }

package/dist/core/build/pipeline.js

@@ -206,7 +206,7 @@ class BuildPipeline extends Pipeline {
       return module.page();
     }
   }
-  async tryRewrite(payload) {
+  async tryRewrite(payload, request) {
     let foundRoute;
     for (const route of this.options.manifest.routes) {
       if (payload instanceof URL) {
@@ -220,9 +220,12 @@ class BuildPipeline extends Pipeline {
           foundRoute = route;
           break;
         }
-      } else if (route.pattern.test(decodeURI(payload))) {
-        foundRoute = route;
-        break;
+      } else {
+        const newUrl = new URL(payload, new URL(request.url).origin);
+        if (route.pattern.test(decodeURI(newUrl.pathname))) {
+          foundRoute = route;
+          break;
+        }
       }
     }
     if (foundRoute) {

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

@@ -5,7 +5,11 @@ import {
   getTopLevelPageModuleInfos,
   moduleIsTopLevelPage
 } from "../graph.js";
-import { getPageDataByViteID, trackClientOnlyPageDatas } from "../internal.js";
+import {
+  getPageDataByViteID,
+  trackClientOnlyPageDatas,
+  trackScriptPageDatas
+} from "../internal.js";
 function isPropagatedAsset(id) {
   try {
     return new URL("file://" + id).searchParams.has(PROPAGATED_ASSET_FLAG);
@@ -120,9 +124,16 @@ function vitePluginAnalyzer(options, internals) {
           }
         }
         if (options.settings.config.experimental.directRenderScript && astro.scripts.length) {
-          for (let i = 0; i < astro.scripts.length; i++) {
-            const hid = `${id.replace("/@fs", "")}?astro&type=script&index=${i}&lang.ts`;
-            internals.discoveredScripts.add(hid);
+          const scriptIds = astro.scripts.map(
+            (_, i) => `${id.replace("/@fs", "")}?astro&type=script&index=${i}&lang.ts`
+          );
+          for (const scriptId of scriptIds) {
+            internals.discoveredScripts.add(scriptId);
+          }
+          for (const pageInfo of getTopLevelPageModuleInfos(id, this)) {
+            const newPageData = getPageDataByViteID(internals, pageInfo.id);
+            if (!newPageData) continue;
+            trackScriptPageDatas(internals, newPageData, scriptIds);
           }
         }
       }

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

@@ -92,9 +92,20 @@ function rollupPluginAstroBuildCSS(options) {
               if (pageData) {
                 appendCSSToPage(pageData, meta, pagesToCss, depth, order);
               }
-            } else if (options.target === "client" && internals.hoistedScriptIdToPagesMap.has(pageInfo.id)) {
-              for (const pageData of getPageDatasByHoistedScriptId(internals, pageInfo.id)) {
-                appendCSSToPage(pageData, meta, pagesToCss, -1, order);
+            } else if (options.target === "client") {
+              if (buildOptions.settings.config.experimental.directRenderScript) {
+                const pageDatas = internals.pagesByScriptId.get(pageInfo.id);
+                if (pageDatas) {
+                  for (const pageData of pageDatas) {
+                    appendCSSToPage(pageData, meta, pagesToCss, -1, order);
+                  }
+                }
+              } else {
+                if (internals.hoistedScriptIdToPagesMap.has(pageInfo.id)) {
+                  for (const pageData of getPageDatasByHoistedScriptId(internals, pageInfo.id)) {
+                    appendCSSToPage(pageData, meta, pagesToCss, -1, order);
+                  }
+                }
               }
             }
           }

package/dist/core/constants.js

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

package/dist/core/dev/dev.js

@@ -19,7 +19,7 @@ async function dev(inlineConfig) {
   await telemetry.record([]);
   const restart = await createContainerWithAutomaticRestart({ inlineConfig, fs });
   const logger = restart.container.logger;
-  const currentVersion = "4.8.3";
+  const currentVersion = "4.8.5";
   const isPrerelease = currentVersion.includes("-");
   if (!isPrerelease) {
     try {
@@ -42,6 +42,7 @@ async function dev(inlineConfig) {
             );
           }
         }
+      }).catch(() => {
       });
     } catch (e) {
     }

package/dist/core/errors/errors-data.d.ts

@@ -1334,6 +1334,19 @@ export declare const DuplicateContentEntrySlugError: {
     title: string;
     message(collection: string, slug: string, preExisting: string, alsoFound: string): string;
 };
+/**
+ * @docs
+ * @see
+ * - [On-demand rendering](https://docs.astro.build/en/basics/rendering-modes/#on-demand-rendered)
+ * @description
+ * Your project must have a server output to create backend functions with Actions.
+ */
+export declare const ActionsWithoutServerOutputError: {
+    name: string;
+    title: string;
+    message: string;
+    hint: string;
+};
 /**
  * @docs
  * @see

package/dist/core/errors/errors-data.js

@@ -502,6 +502,12 @@ Entries:
 - ${alsoFound}`;
   }
 };
+const ActionsWithoutServerOutputError = {
+  name: "ActionsWithoutServerOutputError",
+  title: "Actions must be used with server output.",
+  message: "Actions enabled without setting a server build output. A server is required to create callable backend functions. To deploy routes to a server, add a server adapter to your astro config.",
+  hint: "Learn about on-demand rendering: https://docs.astro.build/en/basics/rendering-modes/#on-demand-rendered"
+};
 const UnsupportedConfigTransformError = {
   name: "UnsupportedConfigTransformError",
   title: "Unsupported transform in content config.",
@@ -511,6 +517,7 @@ Full error: ${parseError}`,
 };
 const UnknownError = { name: "UnknownError", title: "Unknown Error." };
 export {
+  ActionsWithoutServerOutputError,
   AstroGlobNoMatch,
   AstroGlobUsedOutside,
   AstroResponseHeadersReassigned,

package/dist/core/messages.js

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

package/dist/core/render-context.js

@@ -95,7 +95,7 @@ class RenderContext {
       if (payload) {
         if (this.pipeline.manifest.rewritingEnabled) {
           try {
-            const [routeData, component] = await pipeline.tryRewrite(payload);
+            const [routeData, component] = await pipeline.tryRewrite(payload, this.request);
             this.routeData = routeData;
             componentInstance = component;
           } catch (e) {
@@ -173,7 +173,7 @@ class RenderContext {
     const rewrite = async (reroutePayload) => {
       pipeline.logger.debug("router", "Called rewriting to:", reroutePayload);
       try {
-        const [routeData, component] = await pipeline.tryRewrite(reroutePayload);
+        const [routeData, component] = await pipeline.tryRewrite(reroutePayload, this.request);
         this.routeData = routeData;
         if (reroutePayload instanceof Request) {
           this.request = reroutePayload;
@@ -328,7 +328,7 @@ class RenderContext {
     const rewrite = async (reroutePayload) => {
       try {
         pipeline.logger.debug("router", "Calling rewrite: ", reroutePayload);
-        const [routeData, component] = await pipeline.tryRewrite(reroutePayload);
+        const [routeData, component] = await pipeline.tryRewrite(reroutePayload, this.request);
         this.routeData = routeData;
         if (reroutePayload instanceof Request) {
           this.request = reroutePayload;

package/dist/core/routing/manifest/generator.d.ts

@@ -1,2 +1,2 @@
 import type { AstroConfig, RoutePart } from '../../../@types/astro.js';
-export declare function getRouteGenerator(segments: RoutePart[][], addTrailingSlash: AstroConfig['trailingSlash']): (params: object) => string;
+export declare function getRouteGenerator(segments: RoutePart[][], addTrailingSlash: AstroConfig['trailingSlash']): (params: Record<string, string | number | undefined>) => string;

package/dist/core/routing/manifest/generator.js

@@ -1,4 +1,14 @@
 import { compile } from "path-to-regexp";
+function sanitizeParams(params) {
+  return Object.fromEntries(
+    Object.entries(params).map(([key, value]) => {
+      if (typeof value === "string") {
+        return [key, value.normalize().replace(/#/g, "%23").replace(/\?/g, "%3F")];
+      }
+      return [key, value];
+    })
+  );
+}
 function getRouteGenerator(segments, addTrailingSlash) {
   const template = segments.map((segment) => {
     return "/" + segment.map((part) => {
@@ -17,7 +27,8 @@ function getRouteGenerator(segments, addTrailingSlash) {
   }
   const toPath = compile(template + trailing);
   return (params) => {
-    const path = toPath(params);
+    const sanitizedParams = sanitizeParams(params);
+    const path = toPath(sanitizedParams);
     return path || "/";
   };
 }

package/dist/i18n/index.d.ts

@@ -1,6 +1,7 @@
 import type { APIContext, AstroConfig, Locales, SSRManifest, ValidRedirectStatus } from '../@types/astro.js';
 import type { RoutingStrategies } from './utils.js';
 export declare function requestHasLocale(locales: Locales): (context: APIContext) => boolean;
+export declare function requestIs404Or500(request: Request, base?: string): boolean;
 export declare function pathHasLocale(path: string, locales: Locales): boolean;
 type GetLocaleRelativeUrl = GetLocaleOptions & {
     locale: string;

package/dist/i18n/index.js

@@ -9,6 +9,10 @@ function requestHasLocale(locales) {
     return pathHasLocale(context.url.pathname, locales);
   };
 }
+function requestIs404Or500(request, base = "") {
+  const url = new URL(request.url);
+  return url.pathname.startsWith(`${base}/404`) || url.pathname.startsWith(`${base}/500`);
+}
 function pathHasLocale(path, locales) {
   const segments = path.split("/");
   for (const segment of segments) {
@@ -188,7 +192,7 @@ function notFound({ base, locales }) {
     if (!(isRoot || pathHasLocale(url.pathname, locales))) {
       if (response) {
         response.headers.set(REROUTE_DIRECTIVE_HEADER, "no");
-        return new Response(null, {
+        return new Response(response.body, {
           status: 404,
           headers: response.headers
         });
@@ -263,6 +267,7 @@ export {
   redirectToDefaultLocale,
   redirectToFallback,
   requestHasLocale,
+  requestIs404Or500,
   toCodes,
   toPaths
 };

package/dist/i18n/middleware.js

@@ -4,7 +4,8 @@ import {
   notFound,
   redirectToDefaultLocale,
   redirectToFallback,
-  requestHasLocale
+  requestHasLocale,
+  requestIs404Or500
 } from "./index.js";
 function createI18nMiddleware(i18n, base, trailingSlash, format) {
   if (!i18n) return (_, next) => next();
@@ -50,6 +51,9 @@ function createI18nMiddleware(i18n, base, trailingSlash, format) {
     if (type !== "page" && type !== "fallback") {
       return response;
     }
+    if (requestIs404Or500(context.request, base)) {
+      return response;
+    }
     const { currentLocale } = context;
     switch (i18n.strategy) {
       case "manual": {

package/dist/prefetch/index.d.ts

@@ -11,8 +11,12 @@ export declare function init(defaultOpts?: InitOptions): void;
 export interface PrefetchOptions {
     /**
      * How the prefetch should prioritize the URL. (default `'link'`)
-     * - `'link'`: use `<link rel="prefetch">`, has lower loading priority.
-     * - `'fetch'`: use `fetch()`, has higher loading priority.
+     * - `'link'`: use `<link rel="prefetch">`.
+     * - `'fetch'`: use `fetch()`.
+     *
+     * @deprecated It is recommended to not use this option, and let prefetch use `'link'` whenever it's supported,
+     * or otherwise fall back to `'fetch'`. `'link'` works better if the URL doesn't set an appropriate cache header,
+     * as the browser will continue to cache it as long as it's used subsequently.
      */
     with?: 'link' | 'fetch';
     /**

package/dist/prefetch/index.js

@@ -24,7 +24,7 @@ function initTapStrategy() {
       event,
       (e) => {
         if (elMatchesStrategy(e.target, "tap")) {
-          prefetch(e.target.href, { with: "fetch", ignoreSlowConnection: true });
+          prefetch(e.target.href, { ignoreSlowConnection: true });
         }
       },
       { passive: true }
@@ -59,7 +59,7 @@ function initHoverStrategy() {
       clearTimeout(timeout);
     }
     timeout = setTimeout(() => {
-      prefetch(href, { with: "fetch" });
+      prefetch(href);
     }, 80);
   }
   function handleHoverOut() {
@@ -97,7 +97,7 @@ function createViewportIntersectionObserver() {
           setTimeout(() => {
             observer.unobserve(anchor);
             timeouts.delete(anchor);
-            prefetch(anchor.href, { with: "link" });
+            prefetch(anchor.href);
           }, 300)
         );
       } else {
@@ -113,7 +113,7 @@ function initLoadStrategy() {
   onPageLoad(() => {
     for (const anchor of document.getElementsByTagName("a")) {
       if (elMatchesStrategy(anchor, "load")) {
-        prefetch(anchor.href, { with: "link" });
+        prefetch(anchor.href);
       }
     }
   });
@@ -122,20 +122,18 @@ function prefetch(url, opts) {
   const ignoreSlowConnection = opts?.ignoreSlowConnection ?? false;
   if (!canPrefetchUrl(url, ignoreSlowConnection)) return;
   prefetchedUrls.add(url);
-  const priority = opts?.with ?? "link";
-  debug?.(`[astro] Prefetching ${url} with ${priority}`);
-  if (clientPrerender && HTMLScriptElement.supports && HTMLScriptElement.supports("speculationrules")) {
+  if (clientPrerender && HTMLScriptElement.supports?.("speculationrules")) {
+    debug?.(`[astro] Prefetching ${url} with <script type="speculationrules">`);
     appendSpeculationRules(url);
-  } else if (priority === "link") {
+  } else if (document.createElement("link").relList?.supports?.("prefetch") && opts?.with !== "fetch") {
+    debug?.(`[astro] Prefetching ${url} with <link rel="prefetch">`);
     const link = document.createElement("link");
     link.rel = "prefetch";
     link.setAttribute("href", url);
     document.head.append(link);
   } else {
-    fetch(url).catch((e) => {
-      console.log(`[astro] Failed to prefetch ${url}`);
-      console.error(e);
-    });
+    debug?.(`[astro] Prefetching ${url} with fetch`);
+    fetch(url, { priority: "low" });
   }
 }
 function canPrefetchUrl(url, ignoreSlowConnection) {

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

@@ -128,12 +128,18 @@ async function renderToAsyncIterable(result, componentFactory, props, children,
     await bufferHeadContent(result);
   }
   let error = null;
-  let next = promiseWithResolvers();
+  let next = null;
   const buffer = [];
+  let renderingComplete = false;
   const iterator = {
     async next() {
       if (result.cancelled) return { done: true, value: void 0 };
-      await next.promise;
+      if (next !== null) {
+        await next.promise;
+      }
+      if (!renderingComplete) {
+        next = promiseWithResolvers();
+      }
       if (error) {
         throw error;
       }
@@ -176,17 +182,18 @@ async function renderToAsyncIterable(result, componentFactory, props, children,
       const bytes = chunkToByteArray(result, chunk);
       if (bytes.length > 0) {
         buffer.push(bytes);
-        next.resolve();
-        next = promiseWithResolvers();
+        next?.resolve();
       }
     }
   };
   const renderPromise = templateResult.render(destination);
   renderPromise.then(() => {
-    next.resolve();
+    renderingComplete = true;
+    next?.resolve();
   }).catch((err) => {
     error = err;
-    next.resolve();
+    renderingComplete = true;
+    next?.resolve();
   });
   return {
     [Symbol.asyncIterator]() {

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

@@ -3,8 +3,12 @@ async function renderScript(result, id) {
   if (result._metadata.renderedScripts.has(id)) return;
   result._metadata.renderedScripts.add(id);
   const inlined = result.inlinedScripts.get(id);
-  if (inlined) {
-    return markHTMLString(`<script type="module">${inlined}</script>`);
+  if (inlined != null) {
+    if (inlined) {
+      return markHTMLString(`<script type="module">${inlined}</script>`);
+    } else {
+      return "";
+    }
   }
   const resolved = await result.resolve(id);
   return markHTMLString(`<script type="module" src="${resolved}"></script>`);

package/dist/vite-plugin-astro-server/pipeline.d.ts

@@ -19,6 +19,6 @@ export declare class DevPipeline extends Pipeline {
     preload(routeData: RouteData, filePath: URL): Promise<ComponentInstance>;
     clearRouteCache(): void;
     getComponentByRoute(routeData: RouteData): Promise<ComponentInstance>;
-    tryRewrite(payload: RewritePayload): Promise<[RouteData, ComponentInstance]>;
+    tryRewrite(payload: RewritePayload, request: Request): Promise<[RouteData, ComponentInstance]>;
     setManifestData(manifestData: ManifestData): void;
 }

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

@@ -132,7 +132,7 @@ class DevPipeline extends Pipeline {
       return await this.preload(routeData, filePath);
     }
   }
-  async tryRewrite(payload) {
+  async tryRewrite(payload, request) {
     let foundRoute;
     if (!this.manifestData) {
       throw new Error("Missing manifest data. This is an internal error, please file an issue.");
@@ -149,9 +149,12 @@ class DevPipeline extends Pipeline {
           foundRoute = route;
           break;
         }
-      } else if (route.pattern.test(decodeURI(payload))) {
-        foundRoute = route;
-        break;
+      } else {
+        const newUrl = new URL(payload, new URL(request.url).origin);
+        if (route.pattern.test(decodeURI(newUrl.pathname))) {
+          foundRoute = route;
+          break;
+        }
       }
     }
     if (foundRoute) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "4.8.3",
+  "version": "4.8.5",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -229,8 +229,10 @@
     "postbuild": "astro-scripts copy \"src/**/*.astro\" && astro-scripts copy \"src/**/*.wasm\"",
     "test": "pnpm run test:node",
     "test:match": "pnpm run test:node --match",
-    "test:e2e": "playwright test",
+    "test:e2e": "pnpm test:e2e:chrome && pnpm test:e2e:firefox",
     "test:e2e:match": "playwright test -g",
+    "test:e2e:chrome": "playwright test",
+    "test:e2e:firefox": "playwright test --config playwright.firefox.config.js",
     "test:node": "astro-scripts test \"test/**/*.test.js\""
   }
 }

package/templates/actions.mjs

@@ -45,6 +45,7 @@ async function actionHandler(clientParam, path) {
 			});
 		}
 		headers.set('Content-Type', 'application/json');
+		headers.set('Content-Length', body?.length.toString() ?? '0');
 	}
 	const res = await fetch(path, {
 		method: 'POST',
@@ -54,6 +55,9 @@ async function actionHandler(clientParam, path) {
 	if (!res.ok) {
 		throw await ActionError.fromResponse(res);
 	}
+	// Check if response body is empty before parsing.
+	if (res.status === 204) return;
+
 	const json = await res.json();
 	return json;
 }