astro 4.12.2 → 4.12.3

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

@@ -182,7 +182,7 @@ export interface AstroGlobal<Props extends Record<string, any> = Record<string,
      * ```
      */
     getActionResult: AstroSharedContext['getActionResult'];
-    /** Redirect to another page (**SSR Only**)
+    /** Redirect to another page
      *
      * Example usage:
      * ```typescript
@@ -191,7 +191,7 @@ export interface AstroGlobal<Props extends Record<string, any> = Record<string,
      * }
      * ```
      *
-     * [Astro reference](https://docs.astro.build/en/guides/server-side-rendering/)
+     * [Astro reference](https://docs.astro.build/en/reference/api-reference/#astroredirect)
      */
     redirect: AstroSharedContext['redirect'];
     /**
@@ -2482,7 +2482,7 @@ export interface Page<T = any> {
     total: number;
     /** the current page number, starting from 1 */
     currentPage: number;
-    /** number of items per page (default: 25) */
+    /** number of items per page (default: 10) */
     size: number;
     /** number of last page */
     lastPage: number;
@@ -2593,7 +2593,7 @@ interface AstroSharedContext<Props extends Record<string, any> = Record<string,
     /**
      * Get action result on the server when using a form POST.
      */
-    getActionResult: <TAccept extends ActionAccept, TInputSchema extends ActionInputSchema<TAccept>, TAction extends ActionClient<unknown, TAccept, TInputSchema>>(action: TAction) => Awaited<ReturnType<TAction['safe']>> | undefined;
+    getActionResult: <TAccept extends ActionAccept, TInputSchema extends ActionInputSchema<TAccept>, TAction extends ActionClient<unknown, TAccept, TInputSchema>>(action: TAction) => Awaited<ReturnType<TAction>> | undefined;
     /**
      * Route parameters for this request if this is a dynamic route.
      */
@@ -3013,6 +3013,7 @@ export interface SSRResult {
      * Whether the page has failed with a non-recoverable error, or the client disconnected.
      */
     cancelled: boolean;
+    base: string;
     styles: Set<SSRElement>;
     scripts: Set<SSRElement>;
     links: Set<SSRElement>;
@@ -3037,6 +3038,7 @@ export interface SSRResult {
     pathname: string;
     cookies: AstroCookies | undefined;
     serverIslandNameMap: Map<string, string>;
+    trailingSlash: AstroConfig['trailingSlash'];
     _metadata: SSRMetadata;
 }
 /**

package/dist/actions/consts.d.ts

@@ -1,3 +1,6 @@
 export declare const VIRTUAL_MODULE_ID = "astro:actions";
 export declare const RESOLVED_VIRTUAL_MODULE_ID: string;
 export declare const ACTIONS_TYPES_FILE = "actions.d.ts";
+export declare const VIRTUAL_INTERNAL_MODULE_ID = "astro:internal-actions";
+export declare const RESOLVED_VIRTUAL_INTERNAL_MODULE_ID = "\0astro:internal-actions";
+export declare const NOOP_ACTIONS = "\0noop-actions";

package/dist/actions/consts.js

@@ -1,8 +1,14 @@
 const VIRTUAL_MODULE_ID = "astro:actions";
 const RESOLVED_VIRTUAL_MODULE_ID = "\0" + VIRTUAL_MODULE_ID;
 const ACTIONS_TYPES_FILE = "actions.d.ts";
+const VIRTUAL_INTERNAL_MODULE_ID = "astro:internal-actions";
+const RESOLVED_VIRTUAL_INTERNAL_MODULE_ID = "\0astro:internal-actions";
+const NOOP_ACTIONS = "\0noop-actions";
 export {
   ACTIONS_TYPES_FILE,
+  NOOP_ACTIONS,
+  RESOLVED_VIRTUAL_INTERNAL_MODULE_ID,
   RESOLVED_VIRTUAL_MODULE_ID,
+  VIRTUAL_INTERNAL_MODULE_ID,
   VIRTUAL_MODULE_ID
 };

package/dist/actions/index.d.ts

@@ -1,5 +1,15 @@
 import fsMod from 'node:fs';
-import type { AstroIntegration } from '../@types/astro.js';
-export default function astroActions({ fs }: {
+import type { Plugin as VitePlugin } from 'vite';
+import type { AstroIntegration, AstroSettings } from '../@types/astro.js';
+export default function astroActions({ fs, settings, }: {
     fs?: typeof fsMod;
+    settings: AstroSettings;
 }): AstroIntegration;
+/**
+ * This plugin is responsible to load the known file `actions/index.js` / `actions.js`
+ * If the file doesn't exist, it returns an empty object.
+ * @param settings
+ */
+export declare function vitePluginUserActions({ settings }: {
+    settings: AstroSettings;
+}): VitePlugin;

package/dist/actions/index.js

@@ -2,8 +2,18 @@ import fsMod from "node:fs";
 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({ fs = fsMod }) {
+import {
+  ACTIONS_TYPES_FILE,
+  NOOP_ACTIONS,
+  RESOLVED_VIRTUAL_INTERNAL_MODULE_ID,
+  RESOLVED_VIRTUAL_MODULE_ID,
+  VIRTUAL_INTERNAL_MODULE_ID,
+  VIRTUAL_MODULE_ID
+} from "./consts.js";
+function astroActions({
+  fs = fsMod,
+  settings
+}) {
   return {
     name: VIRTUAL_MODULE_ID,
     hooks: {
@@ -18,10 +28,7 @@ function astroActions({ fs = fsMod }) {
         );
         params.updateConfig({
           vite: {
-            define: {
-              "import.meta.env.ACTIONS_PATH": stringifiedActionsImport
-            },
-            plugins: [vitePluginActions(fs)]
+            plugins: [vitePluginUserActions({ settings }), vitePluginActions(fs)]
           }
         });
         params.injectRoute({
@@ -42,6 +49,34 @@ function astroActions({ fs = fsMod }) {
     }
   };
 }
+function vitePluginUserActions({ settings }) {
+  let resolvedActionsId;
+  return {
+    name: "@astro/plugin-actions",
+    async resolveId(id) {
+      if (id === NOOP_ACTIONS) {
+        return NOOP_ACTIONS;
+      }
+      if (id === VIRTUAL_INTERNAL_MODULE_ID) {
+        const resolvedModule = await this.resolve(
+          `${decodeURI(new URL("actions", settings.config.srcDir).pathname)}`
+        );
+        if (!resolvedModule) {
+          return NOOP_ACTIONS;
+        }
+        resolvedActionsId = resolvedModule.id;
+        return RESOLVED_VIRTUAL_INTERNAL_MODULE_ID;
+      }
+    },
+    load(id) {
+      if (id === NOOP_ACTIONS) {
+        return "export const server = {}";
+      } else if (id === RESOLVED_VIRTUAL_INTERNAL_MODULE_ID) {
+        return `export { server } from '${resolvedActionsId}';`;
+      }
+    }
+  };
+}
 const vitePluginActions = (fs) => ({
   name: VIRTUAL_MODULE_ID,
   enforce: "pre",
@@ -81,5 +116,6 @@ async function typegen({
   await fs.promises.writeFile(new URL(ACTIONS_TYPES_FILE, dotAstroDir), content);
 }
 export {
-  astroActions as default
+  astroActions as default,
+  vitePluginUserActions
 };

package/dist/actions/runtime/middleware.js

@@ -1,49 +1,106 @@
 import { yellow } from "kleur/colors";
+import {
+  ActionQueryStringInvalidError,
+  ActionsUsedWithForGetError
+} from "../../core/errors/errors-data.js";
+import { AstroError } from "../../core/errors/errors.js";
 import { defineMiddleware } from "../../core/middleware/index.js";
 import { ApiContextStorage } from "./store.js";
 import { formContentTypes, getAction, hasContentType } from "./utils.js";
-import { callSafely } from "./virtual/shared.js";
+import { getActionQueryString } from "./virtual/shared.js";
 const onRequest = defineMiddleware(async (context, next) => {
   const locals = context.locals;
+  const { request } = context;
   if (locals._actionsInternal) return ApiContextStorage.run(context, () => next());
-  if (context.request.method === "GET") {
-    return nextWithLocalsStub(next, context);
-  }
-  if (context.request.method === "POST" && context.request.body === null) {
+  if (request.method === "POST" && request.body === null) {
     return nextWithStaticStub(next, context);
   }
-  const { request, url } = context;
-  const contentType = request.headers.get("Content-Type");
-  if (url.pathname.startsWith("/_actions")) return nextWithLocalsStub(next, context);
-  if (!contentType || !hasContentType(contentType, formContentTypes)) {
-    return nextWithLocalsStub(next, context);
+  const actionName = context.url.searchParams.get("_astroAction");
+  if (context.request.method === "POST" && actionName) {
+    return handlePost({ context, next, actionName });
+  }
+  if (context.request.method === "GET" && actionName) {
+    throw new AstroError({
+      ...ActionsUsedWithForGetError,
+      message: ActionsUsedWithForGetError.message(actionName)
+    });
   }
-  const formData = await request.clone().formData();
-  const actionPath = formData.get("_astroAction");
-  if (typeof actionPath !== "string") return nextWithLocalsStub(next, context);
-  const action = await getAction(actionPath);
-  if (!action) return nextWithLocalsStub(next, context);
-  const result = await ApiContextStorage.run(context, () => callSafely(() => action(formData)));
+  if (context.request.method === "POST") {
+    return handlePostLegacy({ context, next });
+  }
+  return nextWithLocalsStub(next, context);
+});
+async function handlePost({
+  context,
+  next,
+  actionName
+}) {
+  const { request } = context;
+  const action = await getAction(actionName);
+  if (!action) {
+    throw new AstroError({
+      ...ActionQueryStringInvalidError,
+      message: ActionQueryStringInvalidError.message(actionName)
+    });
+  }
+  const contentType = request.headers.get("content-type");
+  let formData;
+  if (contentType && hasContentType(contentType, formContentTypes)) {
+    formData = await request.clone().formData();
+  }
+  const actionResult = await ApiContextStorage.run(context, () => action(formData));
+  return handleResult({ context, next, actionName, actionResult });
+}
+function handleResult({
+  context,
+  next,
+  actionName,
+  actionResult
+}) {
   const actionsInternal = {
     getActionResult: (actionFn) => {
-      if (actionFn.toString() !== actionPath) return Promise.resolve(void 0);
-      return result;
+      if (actionFn.toString() !== getActionQueryString(actionName)) {
+        return Promise.resolve(void 0);
+      }
+      return actionResult;
     },
-    actionResult: result
+    actionResult
   };
+  const locals = context.locals;
   Object.defineProperty(locals, "_actionsInternal", { writable: false, value: actionsInternal });
   return ApiContextStorage.run(context, async () => {
     const response = await next();
-    if (result.error) {
+    if (actionResult.error) {
       return new Response(response.body, {
-        status: result.error.status,
-        statusText: result.error.name,
+        status: actionResult.error.status,
+        statusText: actionResult.error.type,
         headers: response.headers
       });
     }
     return response;
   });
-});
+}
+async function handlePostLegacy({ context, next }) {
+  const { request } = context;
+  if (context.url.pathname.startsWith("/_actions")) return nextWithLocalsStub(next, context);
+  const contentType = request.headers.get("content-type");
+  let formData;
+  if (contentType && hasContentType(contentType, formContentTypes)) {
+    formData = await request.clone().formData();
+  }
+  if (!formData) return nextWithLocalsStub(next, context);
+  const actionName = formData.get("_astroAction");
+  if (!actionName) return nextWithLocalsStub(next, context);
+  const action = await getAction(actionName);
+  if (!action) {
+    throw new AstroError({
+      ...ActionQueryStringInvalidError,
+      message: ActionQueryStringInvalidError.message(actionName)
+    });
+  }
+  const actionResult = await ApiContextStorage.run(context, () => action(formData));
+  return handleResult({ context, next, actionName, actionResult });
+}
 function nextWithStaticStub(next, context) {
   Object.defineProperty(context.locals, "_actionsInternal", {
     writable: false,

package/dist/actions/runtime/route.js

@@ -1,6 +1,5 @@
 import { ApiContextStorage } from "./store.js";
 import { formContentTypes, getAction, hasContentType } from "./utils.js";
-import { callSafely } from "./virtual/shared.js";
 const POST = async (context) => {
   const { request, url } = context;
   const action = await getAction(url.pathname);
@@ -19,7 +18,7 @@ const POST = async (context) => {
   } else {
     return new Response(null, { status: 415 });
   }
-  const result = await ApiContextStorage.run(context, () => callSafely(() => action(args)));
+  const result = await ApiContextStorage.run(context, () => action(args));
   if (result.error) {
     return new Response(
       JSON.stringify({
@@ -36,7 +35,7 @@ const POST = async (context) => {
     );
   }
   return new Response(JSON.stringify(result.data), {
-    status: result.data ? 200 : 204,
+    status: result.data !== void 0 ? 200 : 204,
     headers: {
       "Content-Type": "application/json"
     }

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

@@ -1,12 +1,14 @@
+import type { ZodType } from 'zod';
+import type { ActionAccept, ActionClient } from './virtual/server.js';
 export declare const formContentTypes: string[];
 export declare function hasContentType(contentType: string, expected: string[]): boolean;
 export type MaybePromise<T> = T | Promise<T>;
 /**
  * Get server-side action based on the route path.
- * Imports from `import.meta.env.ACTIONS_PATH`, which maps to
+ * Imports from the virtual module `astro:internal-actions`, which maps to
  * the user's `src/actions/index.ts` file at build-time.
  */
-export declare function getAction(path: string): Promise<((param: unknown) => MaybePromise<unknown>) | undefined>;
+export declare function getAction(path: string): Promise<ActionClient<unknown, ActionAccept, ZodType> | undefined>;
 /**
  * Used to preserve the input schema type in the error object.
  * This allows for type inference on the `fields` property

package/dist/actions/runtime/utils.js

@@ -5,7 +5,7 @@ function hasContentType(contentType, expected) {
 }
 async function getAction(path) {
   const pathKeys = path.replace("/_actions/", "").split(".");
-  let { server: actionLookup } = await import(import.meta.env.ACTIONS_PATH);
+  let { server: actionLookup } = await import("astro:internal-actions");
   for (const key of pathKeys) {
     if (!(key in actionLookup)) {
       return void 0;

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

@@ -10,15 +10,16 @@ export type ActionAccept = 'form' | 'json';
 export type ActionInputSchema<T extends ActionAccept | undefined> = T extends 'form' ? z.AnyZodObject | z.ZodType<FormData> : z.ZodType;
 export type ActionHandler<TInputSchema, TOutput> = TInputSchema extends z.ZodType ? (input: z.infer<TInputSchema>, context: ActionAPIContext) => MaybePromise<TOutput> : (input: any, context: ActionAPIContext) => MaybePromise<TOutput>;
 export type ActionReturnType<T extends ActionHandler<any, any>> = Awaited<ReturnType<T>>;
-export type ActionClient<TOutput, TAccept extends ActionAccept | undefined, TInputSchema extends ActionInputSchema<TAccept> | undefined> = TInputSchema extends z.ZodType ? ((input: TAccept extends 'form' ? FormData : z.input<TInputSchema>) => Promise<Awaited<TOutput>>) & {
-    safe: (input: TAccept extends 'form' ? FormData : z.input<TInputSchema>) => Promise<SafeResult<z.input<TInputSchema> extends ErrorInferenceObject ? z.input<TInputSchema> : ErrorInferenceObject, Awaited<TOutput>>>;
-} : ((input?: any) => Promise<Awaited<TOutput>>) & {
-    safe: (input?: any) => Promise<SafeResult<never, Awaited<TOutput>>>;
+export type ActionClient<TOutput, TAccept extends ActionAccept | undefined, TInputSchema extends ActionInputSchema<TAccept> | undefined> = TInputSchema extends z.ZodType ? ((input: TAccept extends 'form' ? FormData : z.input<TInputSchema>) => Promise<SafeResult<z.input<TInputSchema> extends ErrorInferenceObject ? z.input<TInputSchema> : ErrorInferenceObject, Awaited<TOutput>>>) & {
+    queryString: string;
+    orThrow: (input: TAccept extends 'form' ? FormData : z.input<TInputSchema>) => Promise<Awaited<TOutput>>;
+} : (input?: any) => Promise<SafeResult<never, Awaited<TOutput>>> & {
+    orThrow: (input?: any) => Promise<Awaited<TOutput>>;
 };
 export declare function defineAction<TOutput, TAccept extends ActionAccept | undefined = undefined, TInputSchema extends ActionInputSchema<ActionAccept> | undefined = TAccept extends 'form' ? z.ZodType<FormData> : undefined>({ accept, input: inputSchema, handler, }: {
     input?: TInputSchema;
     accept?: TAccept;
     handler: ActionHandler<TInputSchema, TOutput>;
-}): ActionClient<TOutput, TAccept, TInputSchema>;
+}): ActionClient<TOutput, TAccept, TInputSchema> & string;
 /** Transform form data to an object based on a Zod schema. */
 export declare function formDataToObject<T extends z.AnyZodObject>(formData: FormData, schema: T): Record<string, unknown>;

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

@@ -10,12 +10,13 @@ function defineAction({
   handler
 }) {
   const serverHandler = accept === "form" ? getFormServerHandler(handler, inputSchema) : getJsonServerHandler(handler, inputSchema);
-  Object.assign(serverHandler, {
-    safe: async (unparsedInput) => {
-      return callSafely(() => serverHandler(unparsedInput));
-    }
+  const safeServerHandler = async (unparsedInput) => {
+    return callSafely(() => serverHandler(unparsedInput));
+  };
+  Object.assign(safeServerHandler, {
+    orThrow: serverHandler
   });
-  return serverHandler;
+  return safeServerHandler;
 }
 function getFormServerHandler(handler, inputSchema) {
   return async (unparsedInput) => {

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

@@ -31,6 +31,13 @@ export declare class ActionInputError<T extends ErrorInferenceObject> extends Ac
     constructor(issues: z.ZodIssue[]);
 }
 export declare function callSafely<TOutput>(handler: () => MaybePromise<TOutput>): Promise<SafeResult<z.ZodType, TOutput>>;
+export declare function getActionQueryString(name: string): string;
+/**
+ * @deprecated You can now pass action functions
+ * directly to the `action` attribute on a form.
+ *
+ * Example: `<form action={actions.like} />`
+ */
 export declare function getActionProps<T extends (args: FormData) => MaybePromise<unknown>>(action: T): {
     readonly type: "hidden";
     readonly name: "_astroAction";

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

@@ -110,11 +110,20 @@ async function callSafely(handler) {
     };
   }
 }
+function getActionQueryString(name) {
+  const searchParams = new URLSearchParams({ _astroAction: name });
+  return `?${searchParams.toString()}`;
+}
 function getActionProps(action) {
+  const params = new URLSearchParams(action.toString());
+  const actionName = params.get("_astroAction");
+  if (!actionName) {
+    throw new Error("Invalid actions function was passed to getActionProps()");
+  }
   return {
     type: "hidden",
     name: "_astroAction",
-    value: action.toString()
+    value: actionName
   };
 }
 export {
@@ -123,5 +132,6 @@ export {
   ActionInputError,
   callSafely,
   getActionProps,
+  getActionQueryString,
   isInputError
 };

package/dist/cli/add/index.js

@@ -569,7 +569,7 @@ async function resolveRangeToInstallSpecifier(name, range) {
   const versions = await fetchPackageVersions(name);
   if (versions instanceof Error) return name;
   const stableVersions = versions.filter((v) => !v.includes("-"));
-  const maxStable = maxSatisfying(stableVersions, range);
+  const maxStable = maxSatisfying(stableVersions.length !== 0 ? stableVersions : versions, range);
   return `${name}@^${maxStable}`;
 }
 const INHERITED_FLAGS = /* @__PURE__ */ new Set([

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

@@ -92,22 +92,9 @@ function astroContentAssetPropagationPlugin({
   };
 }
 function astroConfigBuildPlugin(options, internals) {
-  let ssrPluginContext = void 0;
   return {
     targets: ["server"],
     hooks: {
-      "build:before": ({ target }) => {
-        return {
-          vitePlugin: {
-            name: "astro:content-build-plugin",
-            generateBundle() {
-              if (target === "server") {
-                ssrPluginContext = this;
-              }
-            }
-          }
-        };
-      },
       "build:post": ({ ssrOutputs, clientOutputs, mutate }) => {
         const outputs = ssrOutputs.flatMap((o) => o.output);
         const prependBase = (src) => {
@@ -187,7 +174,6 @@ function astroConfigBuildPlugin(options, internals) {
             mutate(chunk, ["server"], newCode);
           }
         }
-        ssrPluginContext = void 0;
       }
     }
   };

package/dist/core/build/generate.js

@@ -144,7 +144,7 @@ ${bgGreen(black(` ${verb} static routes `))}`);
   await runHookBuildGenerated({ config, logger });
 }
 async function generatePage(pageData, ssrEntry, builtPaths, pipeline) {
-  const { config, internals, logger } = pipeline;
+  const { config, logger } = pipeline;
   const pageModulePromise = ssrEntry.page;
   const styles = pageData.styles.sort(cssOrder).map(({ sheet }) => sheet).reduce(mergeInlineCss, []);
   const linkIds = [];

package/dist/core/build/pipeline.js

@@ -1,6 +1,5 @@
 import { getOutputDirectory } from "../../prerender/utils.js";
 import { BEFORE_HYDRATION_SCRIPT_ID, PAGE_SCRIPT_ID } from "../../vite-plugin-scripts/index.js";
-import { DEFAULT_404_COMPONENT } from "../constants.js";
 import { routeIsFallback, routeIsRedirect } from "../redirects/helpers.js";
 import { RedirectSinglePageBuiltModule } from "../redirects/index.js";
 import { Pipeline } from "../render/index.js";

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

@@ -278,7 +278,7 @@ async function generateContentManifest(opts, lookupMap) {
       promises.push(
         limit(async () => {
           const data = await fsMod.promises.readFile(fileURL, { encoding: "utf8" });
-          manifest.entries.push([key, checksum(data)]);
+          manifest.entries.push([key, checksum(data, fileURL.toString())]);
         })
       );
     }

package/dist/core/constants.js

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

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.12.2";
+  const currentVersion = "4.12.3";
   const isPrerelease = currentVersion.includes("-");
   if (!isPrerelease) {
     try {

package/dist/core/errors/dev/utils.js

@@ -15,7 +15,10 @@ function collectErrorMetadata(e, rootFolder) {
   err.forEach((error) => {
     if (e.stack) {
       const stackInfo = collectInfoFromStacktrace(e);
-      error.stack = stripAnsi(stackInfo.stack);
+      try {
+        error.stack = stripAnsi(stackInfo.stack);
+      } catch {
+      }
       error.loc = stackInfo.loc;
       error.plugin = stackInfo.plugin;
       error.pluginCode = stackInfo.pluginCode;
@@ -40,14 +43,20 @@ function collectErrorMetadata(e, rootFolder) {
     }
     error.hint = generateHint(e);
     if (error.message) {
-      error.message = stripAnsi(error.message);
+      try {
+        error.message = stripAnsi(error.message);
+      } catch {
+      }
     }
   });
   if (!AggregateError.is(e) && Array.isArray(e.errors)) {
     e.errors.forEach((buildError, i) => {
       const { location, pluginName, text } = buildError;
       if (text) {
-        err[i].message = text;
+        try {
+          err[i].message = text;
+        } catch {
+        }
       }
       if (location) {
         err[i].loc = { file: location.file, line: location.line, column: location.column };

package/dist/core/errors/dev/vite.d.ts

@@ -1,3 +1,4 @@
+import type { ShikiTransformer } from 'shiki';
 import type { ErrorPayload } from 'vite';
 import type { ModuleLoader } from '../../module-loader/index.js';
 import { type ErrorWithMetadata } from '../errors.js';
@@ -28,3 +29,15 @@ export interface AstroErrorPayload {
  * Generate a payload for Vite's error overlay
  */
 export declare function getViteErrorPayload(err: ErrorWithMetadata): Promise<AstroErrorPayload>;
+/**
+ * Transformer for `shiki`'s legacy `lineOptions`, allows to add classes to specific lines
+ * FROM: https://github.com/shikijs/shiki/blob/4a58472070a9a359a4deafec23bb576a73e24c6a/packages/transformers/src/transformers/compact-line-options.ts
+ * LICENSE: https://github.com/shikijs/shiki/blob/4a58472070a9a359a4deafec23bb576a73e24c6a/LICENSE
+ */
+export declare function transformerCompactLineOptions(lineOptions?: {
+    /**
+     * 1-based line number.
+     */
+    line: number;
+    classes?: string[];
+}[]): ShikiTransformer;

package/dist/core/errors/dev/vite.js

@@ -86,10 +86,13 @@ async function getViteErrorPayload(err) {
     highlighterLang = "md";
   }
   const highlightedCode = err.fullCode ? await codeToHtml(err.fullCode, {
-    // @ts-expect-error always assume that shiki can accept the lang string
-    lang: highlighterLang,
+    lang: highlighterLang ?? "text",
     theme: cssVariablesTheme(),
-    lineOptions: err.loc?.line ? [{ line: err.loc.line, classes: ["error-line"] }] : void 0
+    transformers: [
+      transformerCompactLineOptions(
+        err.loc?.line ? [{ line: err.loc.line, classes: ["error-line"] }] : void 0
+      )
+    ]
   }) : void 0;
   return {
     type: "error",
@@ -113,7 +116,18 @@ async function getViteErrorPayload(err) {
     }
   };
 }
+function transformerCompactLineOptions(lineOptions = []) {
+  return {
+    name: "@shikijs/transformers:compact-line-options",
+    line(node, line) {
+      const lineOption = lineOptions.find((o) => o.line === line);
+      if (lineOption?.classes) this.addClassToHast(node, lineOption.classes);
+      return node;
+    }
+  };
+}
 export {
   enhanceViteSSRError,
-  getViteErrorPayload
+  getViteErrorPayload,
+  transformerCompactLineOptions
 };

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

@@ -1439,6 +1439,32 @@ export declare const ActionsWithoutServerOutputError: {
     message: string;
     hint: string;
 };
+/**
+ * @docs
+ * @see
+ * - [Actions RFC](https://github.com/withastro/roadmap/blob/actions/proposals/0046-actions.md)
+ * @description
+ * Action was called from a form using a GET request, but only POST requests are supported. This often occurs if `method="POST"` is missing on the form.
+ */
+export declare const ActionsUsedWithForGetError: {
+    name: string;
+    title: string;
+    message: (actionName: string) => string;
+    hint: string;
+};
+/**
+ * @docs
+ * @see
+ * - [Actions RFC](https://github.com/withastro/roadmap/blob/actions/proposals/0046-actions.md)
+ * @description
+ * The server received the query string `?_astroAction=name`, but could not find an action with that name. Use the action function's `.queryString` property to retrieve the form `action` URL.
+ */
+export declare const ActionQueryStringInvalidError: {
+    name: string;
+    title: string;
+    message: (actionName: string) => string;
+    hint: string;
+};
 /**
  * @docs
  * @see

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

@@ -547,6 +547,18 @@ const ActionsWithoutServerOutputError = {
   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 ActionsUsedWithForGetError = {
+  name: "ActionsUsedWithForGetError",
+  title: "An invalid Action query string was passed by a form.",
+  message: (actionName) => `Action ${actionName} was called from a form using a GET request, but only POST requests are supported. This often occurs if \`method="POST"\` is missing on the form.`,
+  hint: "Actions are experimental. Visit the RFC for usage instructions: https://github.com/withastro/roadmap/blob/actions/proposals/0046-actions.md"
+};
+const ActionQueryStringInvalidError = {
+  name: "ActionQueryStringInvalidError",
+  title: "An invalid Action query string was passed by a form.",
+  message: (actionName) => `The server received the query string \`?_astroAction=${actionName}\`, but could not find an action with that name. If you changed an action's name in development, remove this query param from your URL and refresh.`,
+  hint: "Actions are experimental. Visit the RFC for usage instructions: https://github.com/withastro/roadmap/blob/actions/proposals/0046-actions.md"
+};
 const UnsupportedConfigTransformError = {
   name: "UnsupportedConfigTransformError",
   title: "Unsupported transform in content config.",
@@ -556,6 +568,8 @@ Full error: ${parseError}`,
 };
 const UnknownError = { name: "UnknownError", title: "Unknown Error." };
 export {
+  ActionQueryStringInvalidError,
+  ActionsUsedWithForGetError,
   ActionsWithoutServerOutputError,
   AstroGlobNoMatch,
   AstroGlobUsedOutside,

package/dist/core/messages.js

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

package/dist/core/render-context.js

@@ -282,6 +282,7 @@ class RenderContext {
     };
     const actionResult = hasActionsInternal(this.locals) ? this.locals._actionsInternal?.actionResult : void 0;
     const result = {
+      base: manifest.base,
       cancelled: false,
       clientDirectives,
       inlinedScripts,
@@ -302,6 +303,7 @@ class RenderContext {
       styles,
       actionResult,
       serverIslandNameMap: manifest.serverIslandNameMap ?? /* @__PURE__ */ new Map(),
+      trailingSlash: manifest.trailingSlash,
       _metadata: {
         hasHydrationScript: false,
         rendererSpecificHydrationScripts: /* @__PURE__ */ new Set(),

package/dist/env/runtime.d.ts

@@ -2,8 +2,8 @@ import { AstroError } from '../core/errors/index.js';
 import type { ValidationResultInvalid } from './validators.js';
 export { validateEnvVariable, getEnvFieldType } from './validators.js';
 export type GetEnv = (key: string) => string | undefined;
+type OnSetGetEnv = (reset: boolean) => void;
 export declare function setGetEnv(fn: GetEnv, reset?: boolean): void;
-declare let _onSetGetEnv: (reset: boolean) => void;
-export declare function setOnSetGetEnv(fn: typeof _onSetGetEnv): void;
+export declare function setOnSetGetEnv(fn: OnSetGetEnv): void;
 export declare function getEnv(...args: Parameters<GetEnv>): string | undefined;
 export declare function createInvalidVariablesError(key: string, type: string, result: ValidationResultInvalid): AstroError;

package/dist/env/runtime.js

@@ -6,7 +6,7 @@ function setGetEnv(fn, reset = false) {
   _getEnv = fn;
   _onSetGetEnv(reset);
 }
-let _onSetGetEnv = (reset) => {
+let _onSetGetEnv = () => {
 };
 function setOnSetGetEnv(fn) {
   _onSetGetEnv = fn;

package/dist/integrations/hooks.js

@@ -82,7 +82,7 @@ async function runHookConfigSetup({
   }
   if (settings.config.experimental?.actions) {
     const { default: actionsIntegration } = await import("../actions/index.js");
-    settings.config.integrations.push(actionsIntegration({ fs }));
+    settings.config.integrations.push(actionsIntegration({ fs, settings }));
   }
   let updatedConfig = { ...settings.config };
   let updatedSettings = { ...settings, config: updatedConfig };

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

@@ -110,10 +110,6 @@ const a11y_required_content = [
   "h6"
 ];
 const a11y_distracting_elements = ["blink", "marquee"];
-const a11y_nested_implicit_semantics = /* @__PURE__ */ new Map([
-  ["header", "banner"],
-  ["footer", "contentinfo"]
-]);
 const a11y_implicit_semantics = /* @__PURE__ */ new Map([
   ["a", "link"],
   ["area", "link"],
@@ -525,16 +521,6 @@ const a11y = [
     }
   }
 ];
-const a11y_labelable = [
-  "button",
-  "input",
-  "keygen",
-  "meter",
-  "output",
-  "progress",
-  "select",
-  "textarea"
-];
 const a11y_non_interactive_element_to_interactive_role_exceptions = {
   ul: ["listbox", "menu", "menubar", "radiogroup", "tablist", "tree", "treegrid"],
   ol: ["listbox", "menu", "menubar", "radiogroup", "tablist", "tree", "treegrid"],

package/dist/runtime/server/render/astro/instance.d.ts

@@ -1,6 +1,6 @@
 import type { SSRResult } from '../../../../@types/astro.js';
 import type { ComponentSlots } from '../slot.js';
-import type { AstroComponentFactory, AstroFactoryReturnValue } from './factory.js';
+import type { AstroComponentFactory } from './factory.js';
 import type { RenderDestination } from '../common.js';
 type ComponentProps = Record<string | number, any>;
 declare const astroComponentInstanceSym: unique symbol;
@@ -12,7 +12,7 @@ export declare class AstroComponentInstance {
     private readonly factory;
     private returnValue;
     constructor(result: SSRResult, props: ComponentProps, slots: ComponentSlots, factory: AstroComponentFactory);
-    init(result: SSRResult): Promise<AstroFactoryReturnValue>;
+    init(result: SSRResult): Promise<import("./factory.js").AstroFactoryReturnValue>;
     render(destination: RenderDestination): Promise<void>;
 }
 export declare function createAstroComponentInstance(result: SSRResult, displayName: string, factory: AstroComponentFactory, props: ComponentProps, slots?: any): AstroComponentInstance;

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

@@ -37,6 +37,7 @@ function renderServerIsland(result, _displayName, props, slots) {
         }
       }
       const hostId = crypto.randomUUID();
+      const serverIslandUrl = `${result.base}_server-islands/${componentId}${result.trailingSlash === "always" ? "/" : ""}`;
       destination.write(`<script async type="module" data-island-id="${hostId}">
 let componentId = ${safeJsonStringify(componentId)};
 let componentExport = ${safeJsonStringify(componentExport)};
@@ -47,7 +48,7 @@ let data = {
 	slots: ${safeJsonStringify(renderedSlots)},
 };
 
-let response = await fetch('/_server-islands/${componentId}', {
+let response = await fetch('${serverIslandUrl}', {
 	method: 'POST',
 	body: JSON.stringify(data),
 });

package/dist/transitions/router.js

@@ -1,12 +1,4 @@
 import { TRANSITION_AFTER_SWAP, doPreparation, doSwap } from "./events.js";
-import {
-  deselectScripts,
-  restoreFocus,
-  saveFocus,
-  swapBodyElement,
-  swapHeadElements,
-  swapRootAttributes
-} from "./swap-functions.js";
 const inBrowser = import.meta.env.SSR === false;
 const pushState = inBrowser && history.pushState.bind(history);
 const replaceState = inBrowser && history.replaceState.bind(history);

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

@@ -1,7 +1,6 @@
 import { collectErrorMetadata } from "../core/errors/dev/index.js";
-import { AstroErrorData, createSafeError } from "../core/errors/index.js";
+import { createSafeError } from "../core/errors/index.js";
 import { formatErrorMessage } from "../core/messages.js";
-import { eventError, telemetry } from "../events/index.js";
 function recordServerError(loader, config, { logger }, _err) {
   const err = createSafeError(_err);
   try {

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

@@ -1,5 +1,4 @@
 import {
-  DEFAULT_404_COMPONENT,
   REROUTE_DIRECTIVE_HEADER,
   REWRITE_DIRECTIVE_HEADER_KEY,
   clientLocalsSymbol

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

@@ -1,6 +1,7 @@
 import npath from "node:path";
 import { SUPPORTED_MARKDOWN_FILE_EXTENSIONS } from "../core/constants.js";
 import { unwrapId } from "../core/util.js";
+import { hasSpecialQueries } from "../vite-plugin-utils/index.js";
 import { isCSSRequest } from "./util.js";
 const fileExtensionsToSSR = /* @__PURE__ */ new Set([".astro", ".mdoc", ...SUPPORTED_MARKDOWN_FILE_EXTENSIONS]);
 const STRIP_QUERY_PARAMS_REGEX = /\?.*$/;
@@ -27,6 +28,9 @@ async function* crawlGraph(loader, _id, isRootFile, scanned = /* @__PURE__ */ ne
       if (isCSSRequest(id)) {
         continue;
       }
+      if (hasSpecialQueries(id)) {
+        continue;
+      }
       for (const importedModule of entry.importedModules) {
         if (!importedModule.id) continue;
         const importedModulePathname = importedModule.id.replace(STRIP_QUERY_PARAMS_REGEX, "");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "4.12.2",
+  "version": "4.12.3",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -110,7 +110,7 @@
     "vendor"
   ],
   "dependencies": {
-    "@astrojs/compiler": "^2.9.0",
+    "@astrojs/compiler": "^2.9.2",
     "@babel/core": "^7.24.9",
     "@babel/generator": "^7.24.10",
     "@babel/parser": "^7.24.8",
@@ -156,8 +156,8 @@
     "preferred-pm": "^4.0.0",
     "prompts": "^2.4.2",
     "rehype": "^13.0.1",
-    "semver": "^7.6.2",
-    "shiki": "^1.10.3",
+    "semver": "^7.6.3",
+    "shiki": "^1.11.0",
     "string-width": "^7.2.0",
     "strip-ansi": "^7.1.0",
     "tsconfck": "^3.1.1",
@@ -177,7 +177,7 @@
     "sharp": "^0.33.3"
   },
   "devDependencies": {
-    "@astrojs/check": "^0.8.1",
+    "@astrojs/check": "^0.8.2",
     "@playwright/test": "^1.45.2",
     "@types/aria-query": "^5.0.4",
     "@types/babel__generator": "^7.6.8",
@@ -188,7 +188,7 @@
     "@types/debug": "^4.1.12",
     "@types/diff": "^5.2.1",
     "@types/dlv": "^1.1.4",
-    "@types/dom-view-transitions": "^1.0.4",
+    "@types/dom-view-transitions": "^1.0.5",
     "@types/hast": "^3.0.4",
     "@types/html-escaper": "^3.0.2",
     "@types/http-cache-semantics": "^4.0.4",
@@ -211,7 +211,7 @@
     "rehype-slug": "^6.0.0",
     "rehype-toc": "^3.0.2",
     "remark-code-titles": "^0.1.2",
-    "rollup": "^4.18.1",
+    "rollup": "^4.19.0",
     "sass": "^1.77.8",
     "srcset-parse": "^1.1.0",
     "undici": "^6.19.2",

package/templates/actions.mjs

@@ -1,39 +1,36 @@
-import { ActionError, callSafely } from 'astro:actions';
+import { ActionError, callSafely, getActionQueryString } from 'astro:actions';
 
-function toActionProxy(actionCallback = {}, aggregatedPath = '/_actions/') {
+function toActionProxy(actionCallback = {}, aggregatedPath = '') {
 	return new Proxy(actionCallback, {
 		get(target, objKey) {
-			if (objKey in target) {
+			if (objKey in target || typeof objKey === 'symbol') {
 				return target[objKey];
 			}
 			const path = aggregatedPath + objKey.toString();
-			const action = (param) => actionHandler(param, path);
-			action.toString = () => path;
-			action.safe = (input) => {
-				return callSafely(() => action(input));
-			};
-			action.safe.toString = () => path;
+			const action = (param) => callSafely(() => handleActionOrThrow(param, path));
+
+			Object.assign(action, {
+				queryString: getActionQueryString(path),
+				toString: () => action.queryString,
+				// Progressive enhancement info for React.
+				$$FORM_ACTION: function () {
+					return {
+						method: 'POST',
+						// `name` creates a hidden input.
+						// It's unused by Astro, but we can't turn this off.
+						// At least use a name that won't conflict with a user's formData.
+						name: '_astroAction',
+						action: action.toString(),
+					};
+				},
+				// Note: `orThrow` does not have progressive enhancement info.
+				// If you want to throw exceptions,
+				//  you must handle those exceptions with client JS.
+				orThrow: (param) => {
+					return handleActionOrThrow(param, path);
+				},
+			});
 
-			// Add progressive enhancement info for React.
-			action.$$FORM_ACTION = function () {
-				const data = new FormData();
-				data.set('_astroAction', action.toString());
-				return {
-					method: 'POST',
-					name: action.toString(),
-					data,
-				};
-			};
-			action.safe.$$FORM_ACTION = function () {
-				const data = new FormData();
-				data.set('_astroAction', action.toString());
-				data.set('_astroActionSafe', 'true');
-				return {
-					method: 'POST',
-					name: action.toString(),
-					data,
-				};
-			};
 			// recurse to construct queries for nested object paths
 			// ex. actions.user.admins.auth()
 			return toActionProxy(action, path + '.');
@@ -46,14 +43,14 @@ function toActionProxy(actionCallback = {}, aggregatedPath = '/_actions/') {
  * @param {string} path Built path to call action by path name.
  * Usage: `actions.[name](param)`.
  */
-async function actionHandler(param, path) {
+async function handleActionOrThrow(param, path) {
 	// When running server-side, import the action and call it.
 	if (import.meta.env.SSR) {
 		const { getAction } = await import('astro/actions/runtime/utils.js');
 		const action = await getAction(path);
 		if (!action) throw new Error(`Action not found: ${path}`);
 
-		return action(param);
+		return action.orThrow(param);
 	}
 
 	// When running client-side, make a fetch request to the action path.
@@ -72,7 +69,7 @@ async function actionHandler(param, path) {
 		headers.set('Content-Type', 'application/json');
 		headers.set('Content-Length', body?.length.toString() ?? '0');
 	}
-	const res = await fetch(path, {
+	const res = await fetch(`/_actions/${path}`, {
 		method: 'POST',
 		body,
 		headers,

package/templates/env/module.mjs

@@ -25,6 +25,8 @@ const _internalGetSecret = (key) => {
 	throw createInvalidVariablesError(key, type, result);
 };
 
+// used while generating the virtual module
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
 setOnSetGetEnv((reset) => {
 	// @@ON_SET_GET_ENV@@
 });