astro 4.13.1 → 4.13.2

package/astro-jsx.d.ts

@@ -14,7 +14,6 @@ declare namespace astroHTML.JSX {
 	export type Children = Child | Child[];
 
 	interface ElementChildrenAttribute {
-		// eslint-disable-next-line @typescript-eslint/ban-types
 		children: {};
 	}
 

package/astro.js

@@ -52,6 +52,7 @@ async function errorNodeUnsupported() {
 Node.js v${process.versions.node} is not supported by Astro!
 Please upgrade Node.js to a supported version: "${engines}"\n`);
 
+	// eslint-disable-next-line @typescript-eslint/no-require-imports
 	const ci = typeof require !== 'undefined' ? require('ci-info') : await import('ci-info');
 
 	// Special instructions for CI environments, which may have special steps needed.
@@ -65,7 +66,7 @@ Please upgrade Node.js to a supported version: "${engines}"\n`);
 			}
 		}
 		console.log(
-			`${ci.name} CI Environment Detected!\nAdditional steps may be needed to set your Node.js version:`
+			`${ci.name} CI Environment Detected!\nAdditional steps may be needed to set your Node.js version:`,
 		);
 		console.log(`Documentation: https://docs.astro.build/en/guides/deploy/`);
 		if (CI_INSTRUCTIONS[platform]) {

package/client.d.ts

@@ -50,7 +50,7 @@ declare module 'astro:assets' {
 		 * This is functionally equivalent to using the `<Image />` component, as the component calls this function internally.
 		 */
 		getImage: (
-			options: import('./dist/assets/types.js').UnresolvedImageTransform
+			options: import('./dist/assets/types.js').UnresolvedImageTransform,
 		) => Promise<import('./dist/assets/types.js').GetImageResult>;
 		imageConfig: import('./dist/@types/astro.js').AstroConfig['image'];
 		getConfiguredImageService: typeof import('./dist/assets/index.js').getConfiguredImageService;

package/components/Picture.astro

@@ -53,8 +53,8 @@ const optimizedImages: GetImageResult[] = await Promise.all(
 				format: format,
 				widths: props.widths,
 				densities: props.densities,
-			})
-	)
+			}),
+	),
 );
 
 let resultFallbackFormat = fallbackFormat ?? defaultFallbackFormat;

package/components/ViewTransitions.astro

@@ -53,7 +53,7 @@ const { fallback = 'animate' } = Astro.props;
 	if (supportsViewTransitions || getFallback() !== 'none') {
 		if (import.meta.env.DEV && window.matchMedia('(prefers-reduced-motion)').matches) {
 			console.warn(
-				`[transitions]: all view transition animations, including fallback animation, are disabled as this device has the prefer-reduced-motion setting enabled.`
+				`[transitions]: all view transition animations, including fallback animation, are disabled as this device has the prefer-reduced-motion setting enabled.`,
 			);
 		}
 		document.addEventListener('click', (ev) => {

package/config.d.ts

@@ -17,7 +17,7 @@ export function defineConfig(config: AstroUserConfig): AstroUserConfig;
  */
 export function getViteConfig(
 	config: ViteUserConfig,
-	inlineAstroConfig?: AstroInlineConfig
+	inlineAstroConfig?: AstroInlineConfig,
 ): ViteUserConfigFn;
 
 /**

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

@@ -1,9 +1,8 @@
-import type { APIContext } from '../../@types/astro.js';
+import { type SerializedActionResult } from './virtual/shared.js';
 export type Locals = {
     _actionsInternal: {
-        getActionResult: APIContext['getActionResult'];
-        callAction: APIContext['callAction'];
-        actionResult?: ReturnType<APIContext['getActionResult']>;
+        actionResult: SerializedActionResult;
+        actionName: string;
     };
 };
 export declare const onRequest: import("../../@types/astro.js").MiddlewareHandler;

package/dist/actions/runtime/middleware.js

@@ -1,36 +1,31 @@
 import { yellow } from "kleur/colors";
-import {
-  ActionQueryStringInvalidError,
-  ActionsUsedWithForGetError
-} from "../../core/errors/errors-data.js";
+import { ActionQueryStringInvalidError } from "../../core/errors/errors-data.js";
 import { AstroError } from "../../core/errors/errors.js";
 import { defineMiddleware } from "../../core/middleware/index.js";
-import { formContentTypes, getAction, hasContentType } from "./utils.js";
-import { getActionQueryString } from "./virtual/shared.js";
+import { formContentTypes, hasContentType } from "./utils.js";
+import { getAction } from "./virtual/get-action.js";
+import {
+  serializeActionResult
+} from "./virtual/shared.js";
 const onRequest = defineMiddleware(async (context, next) => {
   const locals = context.locals;
   const { request } = context;
-  if (locals._actionsInternal) {
-    locals._actionsInternal.callAction = createCallAction(context);
+  if (locals._actionsInternal) return next();
+  if (import.meta.env.DEV && request.method === "POST" && request.body === null) {
+    console.warn(
+      yellow("[astro:actions]"),
+      'POST requests should not be sent to prerendered pages. If you\'re using Actions, disable prerendering with `export const prerender = "false".'
+    );
     return next();
   }
-  if (request.method === "POST" && request.body === null) {
-    return nextWithStaticStub(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)
-    });
-  }
   if (context.request.method === "POST") {
     return handlePostLegacy({ context, next });
   }
-  return nextWithLocalsStub(next, context);
+  return next();
 });
 async function handlePost({
   context,
@@ -60,18 +55,11 @@ async function handleResult({
   actionName,
   actionResult
 }) {
-  const actionsInternal = {
-    getActionResult: (actionFn) => {
-      if (actionFn.toString() !== getActionQueryString(actionName)) {
-        return Promise.resolve(void 0);
-      }
-      return actionResult;
-    },
-    callAction: createCallAction(context),
-    actionResult
-  };
   const locals = context.locals;
-  Object.defineProperty(locals, "_actionsInternal", { writable: false, value: actionsInternal });
+  locals._actionsInternal = {
+    actionName,
+    actionResult: serializeActionResult(actionResult)
+  };
   const response = await next();
   if (actionResult.error) {
     return new Response(response.body, {
@@ -84,15 +72,15 @@ async function handleResult({
 }
 async function handlePostLegacy({ context, next }) {
   const { request } = context;
-  if (context.url.pathname.startsWith("/_actions")) return nextWithLocalsStub(next, context);
+  if (context.url.pathname.startsWith("/_actions")) return next();
   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);
+  if (!formData) return next();
   const actionName = formData.get("_astroAction");
-  if (!actionName) return nextWithLocalsStub(next, context);
+  if (!actionName) return next();
   const baseAction = await getAction(actionName);
   if (!baseAction) {
     throw new AstroError({
@@ -104,38 +92,6 @@ async function handlePostLegacy({ context, next }) {
   const actionResult = await action(formData);
   return handleResult({ context, next, actionName, actionResult });
 }
-function nextWithStaticStub(next, context) {
-  Object.defineProperty(context.locals, "_actionsInternal", {
-    writable: false,
-    value: {
-      getActionResult: () => {
-        console.warn(
-          yellow("[astro:actions]"),
-          "`getActionResult()` should not be called on prerendered pages. Astro can only handle actions for pages rendered on-demand."
-        );
-        return void 0;
-      },
-      callAction: createCallAction(context)
-    }
-  });
-  return next();
-}
-function nextWithLocalsStub(next, context) {
-  Object.defineProperty(context.locals, "_actionsInternal", {
-    writable: false,
-    value: {
-      getActionResult: () => void 0,
-      callAction: createCallAction(context)
-    }
-  });
-  return next();
-}
-function createCallAction(context) {
-  return (baseAction, input) => {
-    const action = baseAction.bind(context);
-    return action(input);
-  };
-}
 export {
   onRequest
 };

package/dist/actions/runtime/route.js

@@ -1,4 +1,6 @@
-import { formContentTypes, getAction, hasContentType } from "./utils.js";
+import { formContentTypes, hasContentType } from "./utils.js";
+import { getAction } from "./virtual/get-action.js";
+import { serializeActionResult } from "./virtual/shared.js";
 const POST = async (context) => {
   const { request, url } = context;
   const baseAction = await getAction(url.pathname);
@@ -8,7 +10,7 @@ const POST = async (context) => {
   const contentType = request.headers.get("Content-Type");
   const contentLength = request.headers.get("Content-Length");
   let args;
-  if (contentLength === "0") {
+  if (!contentType || contentLength === "0") {
     args = void 0;
   } else if (contentType && hasContentType(contentType, formContentTypes)) {
     args = await request.clone().formData();
@@ -19,25 +21,16 @@ const POST = async (context) => {
   }
   const action = baseAction.bind(context);
   const result = await action(args);
-  if (result.error) {
-    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"
-        }
-      }
-    );
+  const serialized = serializeActionResult(result);
+  if (serialized.type === "empty") {
+    return new Response(null, {
+      status: serialized.status
+    });
   }
-  return new Response(JSON.stringify(result.data), {
-    status: result.data !== void 0 ? 200 : 204,
+  return new Response(serialized.body, {
+    status: serialized.status,
     headers: {
-      "Content-Type": "application/json"
+      "Content-Type": serialized.contentType
     }
   });
 };

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

@@ -1,16 +1,8 @@
-import type { ZodType } from 'zod';
 import type { APIContext } from '../../@types/astro.js';
-import type { ActionAccept, ActionClient } from './virtual/server.js';
 export declare const formContentTypes: string[];
 export declare function hasContentType(contentType: string, expected: string[]): boolean;
 export type ActionAPIContext = Omit<APIContext, 'getActionResult' | 'callAction' | 'props'>;
 export type MaybePromise<T> = T | Promise<T>;
-/**
- * Get server-side action based on the route path.
- * 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<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

@@ -3,22 +3,7 @@ function hasContentType(contentType, expected) {
   const type = contentType.split(";")[0].toLowerCase();
   return expected.some((t) => type === t);
 }
-async function getAction(path) {
-  const pathKeys = path.replace("/_actions/", "").split(".");
-  let { server: actionLookup } = await import("astro:internal-actions");
-  for (const key of pathKeys) {
-    if (!(key in actionLookup)) {
-      return void 0;
-    }
-    actionLookup = actionLookup[key];
-  }
-  if (typeof actionLookup !== "function") {
-    return void 0;
-  }
-  return actionLookup;
-}
 export {
   formContentTypes,
-  getAction,
   hasContentType
 };

package/dist/actions/runtime/virtual/get-action.d.ts

@@ -0,0 +1,8 @@
+import type { ZodType } from 'zod';
+import type { ActionAccept, ActionClient } from './server.js';
+/**
+ * Get server-side action based on the route path.
+ * 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<ActionClient<unknown, ActionAccept, ZodType> | undefined>;

package/dist/actions/runtime/virtual/get-action.js

@@ -0,0 +1,17 @@
+async function getAction(path) {
+  const pathKeys = path.replace("/_actions/", "").split(".");
+  let { server: actionLookup } = await import("astro:internal-actions");
+  for (const key of pathKeys) {
+    if (!(key in actionLookup)) {
+      return void 0;
+    }
+    actionLookup = actionLookup[key];
+  }
+  if (typeof actionLookup !== "function") {
+    return void 0;
+  }
+  return actionLookup;
+}
+export {
+  getAction
+};

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

@@ -13,8 +13,9 @@ export declare class ActionError<T extends ErrorInferenceObject = ErrorInference
     });
     static codeToStatus(code: ActionErrorCode): number;
     static statusToCode(status: number): ActionErrorCode;
-    static fromResponse(res: Response): Promise<ActionError<ErrorInferenceObject>>;
+    static fromJson(body: any): ActionError<ErrorInferenceObject>;
 }
+export declare function isActionError(error?: unknown): error is ActionError;
 export declare function isInputError<T extends ErrorInferenceObject>(error?: ActionError<T>): error is ActionInputError<T>;
 export declare function isInputError(error?: unknown): error is ActionInputError<ErrorInferenceObject>;
 export type SafeResult<TInput extends ErrorInferenceObject, TOutput> = {
@@ -43,3 +44,19 @@ export declare function getActionProps<T extends (args: FormData) => MaybePromis
     readonly name: "_astroAction";
     readonly value: string;
 };
+export type SerializedActionResult = {
+    type: 'data';
+    contentType: 'application/json+devalue';
+    status: 200;
+    body: string;
+} | {
+    type: 'error';
+    contentType: 'application/json';
+    status: number;
+    body: string;
+} | {
+    type: 'empty';
+    status: 204;
+};
+export declare function serializeActionResult(res: SafeResult<any, any>): SerializedActionResult;
+export declare function deserializeActionResult(res: SerializedActionResult): SafeResult<any, any>;

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

@@ -1,3 +1,4 @@
+import { parse as devalueParse, stringify as devalueStringify } from "devalue";
 const ACTION_ERROR_CODES = [
   "BAD_REQUEST",
   "UNAUTHORIZED",
@@ -53,22 +54,23 @@ class ActionError extends Error {
   static statusToCode(status) {
     return statusToCodeMap[status] ?? "INTERNAL_SERVER_ERROR";
   }
-  static async fromResponse(res) {
-    const body = await res.clone().json();
-    if (typeof body === "object" && body?.type === "AstroActionInputError" && Array.isArray(body.issues)) {
+  static fromJson(body) {
+    if (isInputError(body)) {
       return new ActionInputError(body.issues);
     }
-    if (typeof body === "object" && body?.type === "AstroActionError") {
+    if (isActionError(body)) {
       return new ActionError(body);
     }
     return new ActionError({
-      message: res.statusText,
-      code: ActionError.statusToCode(res.status)
+      code: "INTERNAL_SERVER_ERROR"
     });
   }
 }
+function isActionError(error) {
+  return typeof error === "object" && error != null && "type" in error && error.type === "AstroActionError";
+}
 function isInputError(error) {
-  return error instanceof ActionInputError;
+  return typeof error === "object" && error != null && "type" in error && error.type === "AstroActionInputError" && "issues" in error && Array.isArray(error.issues);
 }
 class ActionInputError extends ActionError {
   type = "AstroActionInputError";
@@ -126,12 +128,58 @@ function getActionProps(action) {
     value: actionName
   };
 }
+function serializeActionResult(res) {
+  if (res.error) {
+    return {
+      type: "error",
+      status: res.error.status,
+      contentType: "application/json",
+      body: JSON.stringify({
+        ...res.error,
+        message: res.error.message,
+        stack: import.meta.env.PROD ? void 0 : res.error.stack
+      })
+    };
+  }
+  if (res.data === void 0) {
+    return {
+      type: "empty",
+      status: 204
+    };
+  }
+  return {
+    type: "data",
+    status: 200,
+    contentType: "application/json+devalue",
+    body: devalueStringify(res.data, {
+      // Add support for URL objects
+      URL: (value) => value instanceof URL && value.href
+    })
+  };
+}
+function deserializeActionResult(res) {
+  if (res.type === "error") {
+    return { error: ActionError.fromJson(JSON.parse(res.body)), data: void 0 };
+  }
+  if (res.type === "empty") {
+    return { data: void 0, error: void 0 };
+  }
+  return {
+    data: devalueParse(res.body, {
+      URL: (href) => new URL(href)
+    }),
+    error: void 0
+  };
+}
 export {
   ACTION_ERROR_CODES,
   ActionError,
   ActionInputError,
   callSafely,
+  deserializeActionResult,
   getActionProps,
   getActionQueryString,
-  isInputError
+  isActionError,
+  isInputError,
+  serializeActionResult
 };

package/dist/actions/utils.d.ts

@@ -1,5 +1,6 @@
 import type { APIContext } from '../@types/astro.js';
 import type { Locals } from './runtime/middleware.js';
+import { type ActionAPIContext } from './runtime/utils.js';
 export declare function hasActionsInternal(locals: APIContext['locals']): locals is Locals;
 export declare function createGetActionResult(locals: APIContext['locals']): APIContext['getActionResult'];
-export declare function createCallAction(locals: APIContext['locals']): APIContext['callAction'];
+export declare function createCallAction(context: ActionAPIContext): APIContext['callAction'];

package/dist/actions/utils.js

@@ -1,27 +1,20 @@
-import { AstroError } from "../core/errors/errors.js";
+import {} from "./runtime/utils.js";
+import { deserializeActionResult, getActionQueryString } from "./runtime/virtual/shared.js";
 function hasActionsInternal(locals) {
   return "_actionsInternal" in locals;
 }
 function createGetActionResult(locals) {
   return (actionFn) => {
-    if (!hasActionsInternal(locals))
-      throw new AstroError({
-        name: "AstroActionError",
-        message: "Experimental actions are not enabled in your project.",
-        hint: "See https://docs.astro.build/en/reference/configuration-reference/#experimental-flags"
-      });
-    return locals._actionsInternal.getActionResult(actionFn);
+    if (!hasActionsInternal(locals) || actionFn.toString() !== getActionQueryString(locals._actionsInternal.actionName)) {
+      return void 0;
+    }
+    return deserializeActionResult(locals._actionsInternal.actionResult);
   };
 }
-function createCallAction(locals) {
-  return (actionFn, input) => {
-    if (!hasActionsInternal(locals))
-      throw new AstroError({
-        name: "AstroActionError",
-        message: "Experimental actions are not enabled in your project.",
-        hint: "See https://docs.astro.build/en/reference/configuration-reference/#experimental-flags"
-      });
-    return locals._actionsInternal.callAction(actionFn, input);
+function createCallAction(context) {
+  return (baseAction, input) => {
+    const action = baseAction.bind(context);
+    return action(input);
   };
 }
 export {

package/dist/assets/build/generate.js

@@ -63,7 +63,7 @@ async function generateImagesForPath(originalFilePath, transformsAndPath, env, q
         );
         await fs.promises.unlink(getFullImagePath(originalFilePath, env));
       }
-    } catch (e) {
+    } catch {
     }
   }
   async function generateImage(originalImage, filepath, options) {

package/dist/assets/endpoint/generic.js

@@ -14,7 +14,7 @@ async function loadRemoteImage(src, headers) {
       return void 0;
     }
     return await res.arrayBuffer();
-  } catch (err) {
+  } catch {
     return void 0;
   }
 }

package/dist/assets/endpoint/node.js

@@ -23,14 +23,14 @@ async function loadLocalImage(src, url) {
       if (!isAbsolute(filePath) || !filePath.startsWith(assetsDirPath)) {
         return void 0;
       }
-    } catch (err) {
+    } catch {
       return void 0;
     }
   }
   let buffer = void 0;
   try {
     buffer = await readFile(fileUrl);
-  } catch (e) {
+  } catch {
     try {
       const sourceUrl = new URL(src, url.origin);
       buffer = await loadRemoteImage(sourceUrl);
@@ -48,7 +48,7 @@ async function loadRemoteImage(src) {
       return void 0;
     }
     return Buffer.from(await res.arrayBuffer());
-  } catch (err) {
+  } catch {
     return void 0;
   }
 }

package/dist/assets/services/sharp.js

@@ -14,7 +14,7 @@ async function loadSharp() {
   let sharpImport;
   try {
     sharpImport = (await import("sharp")).default;
-  } catch (e) {
+  } catch {
     throw new AstroError(AstroErrorData.MissingSharp);
   }
   sharpImport.cache(false);

package/dist/assets/services/vendor/squoosh/avif/avif_node_dec.js

@@ -1332,7 +1332,7 @@ var Module = /* @__PURE__ */ function() {
         wasmMemory.grow(size - buffer.byteLength + 65535 >>> 16);
         updateGlobalBufferAndViews(wasmMemory.buffer);
         return 1;
-      } catch (e) {
+      } catch {
       }
     }
     function _emscripten_resize_heap(requestedSize) {

package/dist/assets/services/vendor/squoosh/avif/avif_node_enc.js

@@ -1473,7 +1473,7 @@ var Module = /* @__PURE__ */ function() {
         wasmMemory.grow(size - buffer.byteLength + 65535 >>> 16);
         updateGlobalBufferAndViews(wasmMemory.buffer);
         return 1;
-      } catch (e) {
+      } catch {
       }
     }
     function _emscripten_resize_heap(requestedSize) {

package/dist/assets/services/vendor/squoosh/mozjpeg/mozjpeg_node_dec.js

@@ -1336,7 +1336,7 @@ var Module = /* @__PURE__ */ function() {
         wasmMemory.grow(size - buffer.byteLength + 65535 >>> 16);
         updateGlobalBufferAndViews(wasmMemory.buffer);
         return 1;
-      } catch (e) {
+      } catch {
       }
     }
     function _emscripten_resize_heap(requestedSize) {

package/dist/assets/services/vendor/squoosh/mozjpeg/mozjpeg_node_enc.js

@@ -1439,7 +1439,7 @@ var Module = /* @__PURE__ */ function() {
         wasmMemory.grow(size - buffer.byteLength + 65535 >>> 16);
         updateGlobalBufferAndViews(wasmMemory.buffer);
         return 1;
-      } catch (e) {
+      } catch {
       }
     }
     function _emscripten_resize_heap(requestedSize) {

package/dist/assets/services/vendor/squoosh/webp/webp_node_dec.js

@@ -1310,7 +1310,7 @@ var Module = /* @__PURE__ */ function() {
         wasmMemory.grow(size - buffer.byteLength + 65535 >>> 16);
         updateGlobalBufferAndViews(wasmMemory.buffer);
         return 1;
-      } catch (e) {
+      } catch {
       }
     }
     function _emscripten_resize_heap(requestedSize) {

package/dist/assets/services/vendor/squoosh/webp/webp_node_enc.js

@@ -1472,7 +1472,7 @@ var Module = /* @__PURE__ */ function() {
         wasmMemory.grow(size - buffer.byteLength + 65535 >>> 16);
         updateGlobalBufferAndViews(wasmMemory.buffer);
         return 1;
-      } catch (e) {
+      } catch {
       }
     }
     function _emscripten_resize_heap(requestedSize) {

package/dist/assets/utils/metadata.js

@@ -17,7 +17,7 @@ async function imageMetadata(data, src) {
       format: type,
       orientation
     };
-  } catch (e) {
+  } catch {
     throw new AstroError({
       ...AstroErrorData.NoImageMetadata,
       message: AstroErrorData.NoImageMetadata.message(src)

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

@@ -11,7 +11,7 @@ async function emitESMImage(id, _watchMode, fileEmitter) {
   let fileData;
   try {
     fileData = await fs.readFile(url);
-  } catch (err) {
+  } catch {
     return void 0;
   }
   const fileMetadata = await imageMetadata(fileData, id);

package/dist/assets/utils/remoteProbe.js

@@ -27,7 +27,7 @@ async function inferRemoteSize(url) {
           await reader.cancel();
           return dimensions;
         }
-      } catch (error) {
+      } catch {
       }
     }
   }