astro 4.13.2 → 4.13.3

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

@@ -1842,25 +1842,29 @@ export interface AstroUserConfig {
          * @version 4.10.0
          * @description
          *
-         * Enables experimental `astro:env` features .
+         * Enables experimental `astro:env` features.
          *
          * The `astro:env` API lets you configure a type-safe schema for your environment variables, and indicate whether they should be available on the server or the client. Import and use your defined variables from the appropriate `/client` or `/server` module:
          *
          * ```astro
          * ---
-         * import { APP_ID } from "astro:env/client"
-         * import { API_URL, API_TOKEN, getSecret } from "astro:env/server"
-         * const NODE_ENV = getSecret("NODE_ENV")
+         * import { API_URL } from "astro:env/client"
+         * import { API_SECRET_TOKEN } from "astro:env/server"
          *
          * const data = await fetch(`${API_URL}/users`, {
-         * 	method: "POST",
+         * 	method: "GET",
          * 	headers: {
          * 		"Content-Type": "application/json",
-         * 		"Authorization": `Bearer ${API_TOKEN}`
+         * 		"Authorization": `Bearer ${API_SECRET_TOKEN}`
          * 	},
-         * 	body: JSON.stringify({ appId: APP_ID, nodeEnv: NODE_ENV })
          * })
          * ---
+         *
+         * <script>
+         * import { API_URL } from "astro:env/client"
+         *
+         * fetch(`${API_URL}/ping`)
+         * </script>
          * ```
          *
          * To define the data type and properties of your environment variables, declare a schema in your Astro config in `experimental.env.schema`. The `envField` helper allows you define your variable as a string, number, or boolean and pass properties in an object:
@@ -1898,7 +1902,7 @@ export interface AstroUserConfig {
          *     import { PORT } from "astro:env/server"
          *     ```
          *
-         * - **Secret server variables**: These variables are not part of your final bundle and can be accessed on the server through the `astro:env/server` module. The `getSecret()` helper function can be used to retrieve secrets not specified in the schema:
+         * - **Secret server variables**: These variables are not part of your final bundle and can be accessed on the server through the `astro:env/server` module. The `getSecret()` helper function can be used to retrieve secrets not specified in the schema. Its implementation is provided by your adapter and defaults to `process.env`:
          *
          *     ```js
          *     import { API_SECRET, getSecret } from "astro:env/server"

package/dist/actions/consts.d.ts

@@ -4,3 +4,8 @@ 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";
+export declare const ACTION_QUERY_PARAMS: {
+    actionName: string;
+    actionPayload: string;
+    actionRedirect: string;
+};

package/dist/actions/consts.js

@@ -4,8 +4,14 @@ 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";
+const ACTION_QUERY_PARAMS = {
+  actionName: "_astroAction",
+  actionPayload: "_astroActionPayload",
+  actionRedirect: "_astroActionRedirect"
+};
 export {
   ACTIONS_TYPES_FILE,
+  ACTION_QUERY_PARAMS,
   NOOP_ACTIONS,
   RESOLVED_VIRTUAL_INTERNAL_MODULE_ID,
   RESOLVED_VIRTUAL_MODULE_ID,

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

@@ -1,8 +1,9 @@
 import { type SerializedActionResult } from './virtual/shared.js';
+export type ActionPayload = {
+    actionResult: SerializedActionResult;
+    actionName: string;
+};
 export type Locals = {
-    _actionsInternal: {
-        actionResult: SerializedActionResult;
-        actionName: string;
-    };
+    _actionPayload: ActionPayload;
 };
 export declare const onRequest: import("../../@types/astro.js").MiddlewareHandler;

package/dist/actions/runtime/middleware.js

@@ -2,6 +2,7 @@ import { yellow } from "kleur/colors";
 import { ActionQueryStringInvalidError } from "../../core/errors/errors-data.js";
 import { AstroError } from "../../core/errors/errors.js";
 import { defineMiddleware } from "../../core/middleware/index.js";
+import { ACTION_QUERY_PARAMS } from "../consts.js";
 import { formContentTypes, hasContentType } from "./utils.js";
 import { getAction } from "./virtual/get-action.js";
 import {
@@ -10,7 +11,14 @@ import {
 const onRequest = defineMiddleware(async (context, next) => {
   const locals = context.locals;
   const { request } = context;
-  if (locals._actionsInternal) return next();
+  if (locals._actionPayload) return next();
+  const actionPayload = context.cookies.get(ACTION_QUERY_PARAMS.actionPayload)?.json();
+  if (actionPayload) {
+    if (!isActionPayload(actionPayload)) {
+      throw new Error("Internal: Invalid action payload in cookie.");
+    }
+    return renderResult({ context, next, ...actionPayload });
+  }
   if (import.meta.env.DEV && request.method === "POST" && request.body === null) {
     console.warn(
       yellow("[astro:actions]"),
@@ -18,7 +26,7 @@ const onRequest = defineMiddleware(async (context, next) => {
     );
     return next();
   }
-  const actionName = context.url.searchParams.get("_astroAction");
+  const actionName = context.url.searchParams.get(ACTION_QUERY_PARAMS.actionName);
   if (context.request.method === "POST" && actionName) {
     return handlePost({ context, next, actionName });
   }
@@ -27,6 +35,25 @@ const onRequest = defineMiddleware(async (context, next) => {
   }
   return next();
 });
+async function renderResult({
+  context,
+  next,
+  actionResult,
+  actionName
+}) {
+  const locals = context.locals;
+  locals._actionPayload = { actionResult, actionName };
+  const response = await next();
+  context.cookies.delete(ACTION_QUERY_PARAMS.actionPayload);
+  if (actionResult.type === "error") {
+    return new Response(response.body, {
+      status: actionResult.status,
+      statusText: actionResult.type,
+      headers: response.headers
+    });
+  }
+  return response;
+}
 async function handlePost({
   context,
   next,
@@ -47,28 +74,33 @@ async function handlePost({
   }
   const action = baseAction.bind(context);
   const actionResult = await action(formData);
-  return handleResult({ context, next, actionName, actionResult });
+  if (context.url.searchParams.get(ACTION_QUERY_PARAMS.actionRedirect) === "false") {
+    return renderResult({
+      context,
+      next,
+      actionName,
+      actionResult: serializeActionResult(actionResult)
+    });
+  }
+  return redirectWithResult({ context, actionName, actionResult });
 }
-async function handleResult({
+async function redirectWithResult({
   context,
-  next,
   actionName,
   actionResult
 }) {
-  const locals = context.locals;
-  locals._actionsInternal = {
+  context.cookies.set(ACTION_QUERY_PARAMS.actionPayload, {
     actionName,
     actionResult: serializeActionResult(actionResult)
-  };
-  const response = await next();
+  });
   if (actionResult.error) {
-    return new Response(response.body, {
-      status: actionResult.error.status,
-      statusText: actionResult.error.type,
-      headers: response.headers
-    });
+    const referer = context.request.headers.get("Referer");
+    if (!referer) {
+      throw new Error("Internal: Referer unexpectedly missing from Action POST request.");
+    }
+    return context.redirect(referer);
   }
-  return response;
+  return context.redirect(context.url.pathname);
 }
 async function handlePostLegacy({ context, next }) {
   const { request } = context;
@@ -79,7 +111,7 @@ async function handlePostLegacy({ context, next }) {
     formData = await request.clone().formData();
   }
   if (!formData) return next();
-  const actionName = formData.get("_astroAction");
+  const actionName = formData.get(ACTION_QUERY_PARAMS.actionName);
   if (!actionName) return next();
   const baseAction = await getAction(actionName);
   if (!baseAction) {
@@ -90,7 +122,13 @@ async function handlePostLegacy({ context, next }) {
   }
   const action = baseAction.bind(context);
   const actionResult = await action(formData);
-  return handleResult({ context, next, actionName, actionResult });
+  return redirectWithResult({ context, actionName, actionResult });
+}
+function isActionPayload(json) {
+  if (typeof json !== "object" || json == null) return false;
+  if (!("actionResult" in json) || typeof json.actionResult !== "object") return false;
+  if (!("actionName" in json) || typeof json.actionName !== "string") return false;
+  return true;
 }
 export {
   onRequest

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

@@ -10,7 +10,7 @@ export type ActionReturnType<T extends ActionHandler<any, any>> = Awaited<Return
 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>>> & {
+} : ((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, }: {

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

@@ -1,5 +1,10 @@
 import type { z } from 'zod';
 import type { ErrorInferenceObject, MaybePromise } from '../utils.js';
+export declare const ACTION_QUERY_PARAMS: {
+    actionName: string;
+    actionPayload: string;
+    actionRedirect: string;
+};
 export declare const ACTION_ERROR_CODES: readonly ["BAD_REQUEST", "UNAUTHORIZED", "FORBIDDEN", "NOT_FOUND", "TIMEOUT", "CONFLICT", "PRECONDITION_FAILED", "PAYLOAD_TOO_LARGE", "UNSUPPORTED_MEDIA_TYPE", "UNPROCESSABLE_CONTENT", "TOO_MANY_REQUESTS", "CLIENT_CLOSED_REQUEST", "INTERNAL_SERVER_ERROR"];
 export type ActionErrorCode = (typeof ACTION_ERROR_CODES)[number];
 export declare class ActionError<T extends ErrorInferenceObject = ErrorInferenceObject> extends Error {

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

@@ -1,4 +1,6 @@
 import { parse as devalueParse, stringify as devalueStringify } from "devalue";
+import { ACTION_QUERY_PARAMS as _ACTION_QUERY_PARAMS } from "../../consts.js";
+const ACTION_QUERY_PARAMS = _ACTION_QUERY_PARAMS;
 const ACTION_ERROR_CODES = [
   "BAD_REQUEST",
   "UNAUTHORIZED",
@@ -113,7 +115,7 @@ async function callSafely(handler) {
   }
 }
 function getActionQueryString(name) {
-  const searchParams = new URLSearchParams({ _astroAction: name });
+  const searchParams = new URLSearchParams({ [_ACTION_QUERY_PARAMS.actionName]: name });
   return `?${searchParams.toString()}`;
 }
 function getActionProps(action) {
@@ -173,6 +175,7 @@ function deserializeActionResult(res) {
 }
 export {
   ACTION_ERROR_CODES,
+  ACTION_QUERY_PARAMS,
   ActionError,
   ActionInputError,
   callSafely,

package/dist/actions/utils.d.ts

@@ -1,6 +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 hasActionPayload(locals: APIContext['locals']): locals is Locals;
 export declare function createGetActionResult(locals: APIContext['locals']): APIContext['getActionResult'];
 export declare function createCallAction(context: ActionAPIContext): APIContext['callAction'];

package/dist/actions/utils.js

@@ -1,14 +1,14 @@
 import {} from "./runtime/utils.js";
 import { deserializeActionResult, getActionQueryString } from "./runtime/virtual/shared.js";
-function hasActionsInternal(locals) {
-  return "_actionsInternal" in locals;
+function hasActionPayload(locals) {
+  return "_actionPayload" in locals;
 }
 function createGetActionResult(locals) {
   return (actionFn) => {
-    if (!hasActionsInternal(locals) || actionFn.toString() !== getActionQueryString(locals._actionsInternal.actionName)) {
+    if (!hasActionPayload(locals) || actionFn.toString() !== getActionQueryString(locals._actionPayload.actionName)) {
       return void 0;
     }
-    return deserializeActionResult(locals._actionsInternal.actionResult);
+    return deserializeActionResult(locals._actionPayload.actionResult);
   };
 }
 function createCallAction(context) {
@@ -20,5 +20,5 @@ function createCallAction(context) {
 export {
   createCallAction,
   createGetActionResult,
-  hasActionsInternal
+  hasActionPayload
 };

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "4.13.2";
+const ASTRO_VERSION = "4.13.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.13.2";
+  const currentVersion = "4.13.3";
   const isPrerelease = currentVersion.includes("-");
   if (!isPrerelease) {
     try {

package/dist/core/messages.js

@@ -38,7 +38,7 @@ function serverStart({
   host,
   base
 }) {
-  const version = "4.13.2";
+  const version = "4.13.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.13.2"}`
+        `v${"4.13.3"}`
       )} ${headline}`
     );
   }

package/dist/core/render-context.js

@@ -1,5 +1,5 @@
 import { deserializeActionResult } from "../actions/runtime/virtual/shared.js";
-import { createCallAction, createGetActionResult, hasActionsInternal } from "../actions/utils.js";
+import { createCallAction, createGetActionResult, hasActionPayload } from "../actions/utils.js";
 import {
   computeCurrentLocale,
   computePreferredLocale,
@@ -256,7 +256,7 @@ class RenderContext {
         throw new AstroError(AstroErrorData.AstroResponseHeadersReassigned);
       }
     };
-    const actionResult = hasActionsInternal(this.locals) ? deserializeActionResult(this.locals._actionsInternal.actionResult) : void 0;
+    const actionResult = hasActionPayload(this.locals) ? deserializeActionResult(this.locals._actionPayload.actionResult) : void 0;
     const result = {
       base: manifest.base,
       cancelled: false,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "4.13.2",
+  "version": "4.13.3",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -166,8 +166,8 @@
     "zod": "^3.23.8",
     "zod-to-json-schema": "^3.23.2",
     "@astrojs/internal-helpers": "0.4.1",
-    "@astrojs/telemetry": "3.1.0",
-    "@astrojs/markdown-remark": "5.2.0"
+    "@astrojs/markdown-remark": "5.2.0",
+    "@astrojs/telemetry": "3.1.0"
   },
   "optionalDependencies": {
     "sharp": "^0.33.3"

package/templates/actions.mjs

@@ -1,4 +1,9 @@
-import { ActionError, deserializeActionResult, getActionQueryString } from 'astro:actions';
+import {
+	ACTION_QUERY_PARAMS,
+	ActionError,
+	deserializeActionResult,
+	getActionQueryString,
+} from 'astro:actions';
 
 function toActionProxy(actionCallback = {}, aggregatedPath = '') {
 	return new Proxy(actionCallback, {
@@ -16,13 +21,18 @@ function toActionProxy(actionCallback = {}, aggregatedPath = '') {
 				toString: () => action.queryString,
 				// Progressive enhancement info for React.
 				$$FORM_ACTION: function () {
+					const searchParams = new URLSearchParams(action.toString());
+					// Astro will redirect with a GET request by default.
+					// Disable this behavior to preserve form state
+					// for React's progressive enhancement.
+					searchParams.set(ACTION_QUERY_PARAMS.actionRedirect, 'false');
 					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(),
+						action: '?' + searchParams.toString(),
 					};
 				},
 				// Note: `orThrow` does not have progressive enhancement info.