astro 4.13.1 → 4.13.3

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

@@ -20,7 +20,7 @@ function astroScannerPlugin({
       let fileURL;
       try {
         fileURL = new URL(`file://${filename}`);
-      } catch (e) {
+      } catch {
         return;
       }
       const fileIsPage = isPage(fileURL, settings);

package/dist/vite-plugin-scripts/page-ssr.js

@@ -16,7 +16,7 @@ function astroScriptsPostPlugin({
       let fileURL;
       try {
         fileURL = new URL(`file://${filename}`);
-      } catch (e) {
+      } catch {
         return;
       }
       const fileIsPage = isPage(fileURL, settings);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "4.13.1",
+  "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",
@@ -83,9 +83,6 @@
     },
     "./virtual-modules/*": "./dist/virtual-modules/*"
   },
-  "imports": {
-    "#astro/*": "./dist/*.js"
-  },
   "bin": {
     "astro": "astro.js"
   },
@@ -110,7 +107,7 @@
     "vendor"
   ],
   "dependencies": {
-    "@astrojs/compiler": "^2.10.0",
+    "@astrojs/compiler": "^2.10.1",
     "@babel/core": "^7.25.2",
     "@babel/generator": "^7.25.0",
     "@babel/parser": "^7.25.3",
@@ -156,7 +153,7 @@
     "prompts": "^2.4.2",
     "rehype": "^13.0.1",
     "semver": "^7.6.3",
-    "shiki": "^1.12.0",
+    "shiki": "^1.12.1",
     "string-width": "^7.2.0",
     "strip-ansi": "^7.1.0",
     "tsconfck": "^3.1.1",
@@ -176,7 +173,7 @@
     "sharp": "^0.33.3"
   },
   "devDependencies": {
-    "@astrojs/check": "^0.9.0",
+    "@astrojs/check": "^0.9.1",
     "@playwright/test": "^1.45.3",
     "@types/aria-query": "^5.0.4",
     "@types/babel__generator": "^7.6.8",
@@ -199,14 +196,14 @@
     "expect-type": "^0.19.0",
     "mdast-util-mdx": "^3.0.0",
     "mdast-util-mdx-jsx": "^3.1.2",
-    "memfs": "^4.11.0",
+    "memfs": "^4.11.1",
     "node-mocks-http": "^1.15.1",
     "parse-srcset": "^1.0.2",
     "rehype-autolink-headings": "^7.1.0",
     "rehype-slug": "^6.0.0",
     "rehype-toc": "^3.0.2",
     "remark-code-titles": "^0.1.2",
-    "rollup": "^4.19.1",
+    "rollup": "^4.20.0",
     "sass": "^1.77.8",
     "undici": "^6.19.5",
     "unified": "^11.0.5",

package/templates/actions.mjs

@@ -1,4 +1,9 @@
-import { ActionError, callSafely, getActionQueryString } from 'astro:actions';
+import {
+	ACTION_QUERY_PARAMS,
+	ActionError,
+	deserializeActionResult,
+	getActionQueryString,
+} from 'astro:actions';
 
 function toActionProxy(actionCallback = {}, aggregatedPath = '') {
 	return new Proxy(actionCallback, {
@@ -8,7 +13,7 @@ function toActionProxy(actionCallback = {}, aggregatedPath = '') {
 			}
 			const path = aggregatedPath + objKey.toString();
 			function action(param) {
-				return callSafely(() => handleActionOrThrow(param, path, this));
+				return handleAction(param, path, this);
 			}
 
 			Object.assign(action, {
@@ -16,20 +21,27 @@ 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.
 				// If you want to throw exceptions,
 				//  you must handle those exceptions with client JS.
-				orThrow(param) {
-					return handleActionOrThrow(param, path, this);
+				async orThrow(param) {
+					const { data, error } = await handleAction(param, path, this);
+					if (error) throw error;
+					return data;
 				},
 			});
 
@@ -43,17 +55,18 @@ function toActionProxy(actionCallback = {}, aggregatedPath = '') {
 /**
  * @param {*} param argument passed to the action when called server or client-side.
  * @param {string} path Built path to call action by path name.
- * @param {import('../src/@types/astro.d.ts').APIContext | undefined} context Injected API context when calling actions from the server.
+ * @param {import('../dist/@types/astro.d.ts').APIContext | undefined} context Injected API context when calling actions from the server.
  * Usage: `actions.[name](param)`.
+ * @returns {Promise<import('../dist/actions/runtime/virtual/shared.js').SafeResult<any, any>>}
  */
-async function handleActionOrThrow(param, path, context) {
+async function handleAction(param, path, context) {
 	// 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 { getAction } = await import('astro/actions/runtime/virtual/get-action.js');
 		const action = await getAction(path);
 		if (!action) throw new Error(`Action not found: ${path}`);
 
-		return action.orThrow.bind(context)(param);
+		return action.bind(context)(param);
 	}
 
 	// When running client-side, make a fetch request to the action path.
@@ -62,29 +75,30 @@ async function handleActionOrThrow(param, path, context) {
 	let body = param;
 	if (!(body instanceof FormData)) {
 		try {
-			body = param ? JSON.stringify(param) : undefined;
+			body = JSON.stringify(param);
 		} catch (e) {
 			throw new ActionError({
 				code: 'BAD_REQUEST',
 				message: `Failed to serialize request body to JSON. Full error: ${e.message}`,
 			});
 		}
-		headers.set('Content-Type', 'application/json');
-		headers.set('Content-Length', body?.length.toString() ?? '0');
+		if (body) {
+			headers.set('Content-Type', 'application/json');
+		} else {
+			headers.set('Content-Length', '0');
+		}
 	}
-	const res = await fetch(`/_actions/${path}`, {
+	const rawResult = await fetch(`/_actions/${path}`, {
 		method: 'POST',
 		body,
 		headers,
 	});
-	if (!res.ok) {
-		throw await ActionError.fromResponse(res);
-	}
-	// Check if response body is empty before parsing.
-	if (res.status === 204) return;
+	if (rawResult.status === 204) return;
 
-	const json = await res.json();
-	return json;
+	return deserializeActionResult({
+		type: rawResult.ok ? 'data' : 'error',
+		body: await rawResult.text(),
+	});
 }
 
 export const actions = toActionProxy();

package/templates/content/types.d.ts

@@ -22,29 +22,31 @@ declare module 'astro:content' {
 		ContentEntryMap[C]
 	>['slug'];
 
+	/** @deprecated Use `getEntry` instead. */
 	export function getEntryBySlug<
 		C extends keyof ContentEntryMap,
 		E extends ValidContentEntrySlug<C> | (string & {}),
 	>(
 		collection: C,
 		// Note that this has to accept a regular string too, for SSR
-		entrySlug: E
+		entrySlug: E,
 	): E extends ValidContentEntrySlug<C>
 		? Promise<CollectionEntry<C>>
 		: Promise<CollectionEntry<C> | undefined>;
 
+	/** @deprecated Use `getEntry` instead. */
 	export function getDataEntryById<C extends keyof DataEntryMap, E extends keyof DataEntryMap[C]>(
 		collection: C,
-		entryId: E
+		entryId: E,
 	): Promise<CollectionEntry<C>>;
 
 	export function getCollection<C extends keyof AnyEntryMap, E extends CollectionEntry<C>>(
 		collection: C,
-		filter?: (entry: CollectionEntry<C>) => entry is E
+		filter?: (entry: CollectionEntry<C>) => entry is E,
 	): Promise<E[]>;
 	export function getCollection<C extends keyof AnyEntryMap>(
 		collection: C,
-		filter?: (entry: CollectionEntry<C>) => unknown
+		filter?: (entry: CollectionEntry<C>) => unknown,
 	): Promise<CollectionEntry<C>[]>;
 
 	export function getEntry<
@@ -70,7 +72,7 @@ declare module 'astro:content' {
 		E extends ValidContentEntrySlug<C> | (string & {}),
 	>(
 		collection: C,
-		slug: E
+		slug: E,
 	): E extends ValidContentEntrySlug<C>
 		? Promise<CollectionEntry<C>>
 		: Promise<CollectionEntry<C> | undefined>;
@@ -79,7 +81,7 @@ declare module 'astro:content' {
 		E extends keyof DataEntryMap[C] | (string & {}),
 	>(
 		collection: C,
-		id: E
+		id: E,
 	): E extends keyof DataEntryMap[C]
 		? Promise<DataEntryMap[C][E]>
 		: Promise<CollectionEntry<C> | undefined>;
@@ -89,17 +91,17 @@ declare module 'astro:content' {
 		entries: {
 			collection: C;
 			slug: ValidContentEntrySlug<C>;
-		}[]
+		}[],
 	): Promise<CollectionEntry<C>[]>;
 	export function getEntries<C extends keyof DataEntryMap>(
 		entries: {
 			collection: C;
 			id: keyof DataEntryMap[C];
-		}[]
+		}[],
 	): Promise<CollectionEntry<C>[]>;
 
 	export function reference<C extends keyof AnyEntryMap>(
-		collection: C
+		collection: C,
 	): import('astro/zod').ZodEffects<
 		import('astro/zod').ZodString,
 		C extends keyof ContentEntryMap
@@ -116,7 +118,7 @@ declare module 'astro:content' {
 	// if `dev` is not running to update as you edit.
 	// Invalid collection names will be caught at build time.
 	export function reference<C extends string>(
-		collection: C
+		collection: C,
 	): import('astro/zod').ZodEffects<import('astro/zod').ZodString, never>;
 
 	type ReturnTypeOrOriginal<T> = T extends (...args: any[]) => infer R ? R : T;

package/types/content.d.ts

@@ -47,7 +47,7 @@ declare module 'astro:content' {
 		| DataCollectionConfig<S>;
 
 	export function defineCollection<S extends BaseSchema>(
-		input: CollectionConfig<S>
+		input: CollectionConfig<S>,
 	): CollectionConfig<S>;
 
 	/** Run `astro sync` to generate high fidelity types */