astro 4.13.1 → 4.13.2

package/dist/core/middleware/index.js

@@ -78,7 +78,7 @@ function createContext({
   };
   return Object.assign(context, {
     getActionResult: createGetActionResult(context.locals),
-    callAction: createCallAction(context.locals)
+    callAction: createCallAction(context)
   });
 }
 function isLocalsSerializable(value) {

package/dist/core/render-context.js

@@ -1,3 +1,4 @@
+import { deserializeActionResult } from "../actions/runtime/virtual/shared.js";
 import { createCallAction, createGetActionResult, hasActionsInternal } from "../actions/utils.js";
 import {
   computeCurrentLocale,
@@ -170,7 +171,7 @@ class RenderContext {
     return Object.assign(context, {
       props,
       getActionResult: createGetActionResult(context.locals),
-      callAction: createCallAction(context.locals)
+      callAction: createCallAction(context)
     });
   }
   async #executeRewrite(reroutePayload) {
@@ -255,7 +256,7 @@ class RenderContext {
         throw new AstroError(AstroErrorData.AstroResponseHeadersReassigned);
       }
     };
-    const actionResult = hasActionsInternal(this.locals) ? this.locals._actionsInternal?.actionResult : void 0;
+    const actionResult = hasActionsInternal(this.locals) ? deserializeActionResult(this.locals._actionsInternal.actionResult) : void 0;
     const result = {
       base: manifest.base,
       cancelled: false,
@@ -370,10 +371,12 @@ class RenderContext {
       redirect,
       rewrite,
       request: this.request,
-      getActionResult: createGetActionResult(locals),
-      callAction: createCallAction(locals),
       response,
       site: pipeline.site,
+      getActionResult: createGetActionResult(locals),
+      get callAction() {
+        return createCallAction(this);
+      },
       url
     };
   }

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

@@ -42,7 +42,7 @@ function getParts(part, file) {
 }
 function validateSegment(segment, file = "") {
   if (!file) file = segment;
-  if (/\]\[/.test(segment)) {
+  if (segment.includes("][")) {
     throw new Error(`Invalid route ${file} \u2014 parameters must be separated`);
   }
   if (countOccurrences("[", segment) !== countOccurrences("]", segment)) {
@@ -198,7 +198,7 @@ function createInjectedRoutes({ settings, cwd }) {
     let resolved;
     try {
       resolved = require2.resolve(entrypoint, { paths: [cwd || fileURLToPath(config.root)] });
-    } catch (e) {
+    } catch {
       resolved = fileURLToPath(new URL(entrypoint, config.root));
     }
     const component = slash(path.relative(cwd || fileURLToPath(config.root), resolved));

package/dist/events/error.js

@@ -2,7 +2,7 @@ import { AstroError, AstroErrorData } from "../core/errors/index.js";
 const EVENT_ERROR = "ASTRO_CLI_ERROR";
 const ANONYMIZE_MESSAGE_REGEX = /^(?:\w| )+/;
 function anonymizeErrorMessage(msg) {
-  const matchedMessage = msg.match(ANONYMIZE_MESSAGE_REGEX);
+  const matchedMessage = ANONYMIZE_MESSAGE_REGEX.exec(msg);
   if (!matchedMessage?.[0]) {
     return void 0;
   }

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

@@ -9,7 +9,7 @@ const icon = '<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 1 2
 try {
   customElements.define("astro-dev-toolbar-audit-window", DevToolbarAuditListWindow);
   customElements.define("astro-dev-toolbar-audit-list-item", DevToolbarAuditListItem);
-} catch (e) {
+} catch {
 }
 let showState = false;
 var audit_default = {

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

@@ -23,7 +23,8 @@ const perf = [
     selector: 'img:not([loading]), img[loading="eager"], iframe:not([loading]), iframe[loading="eager"]',
     match(element) {
       const htmlElement = element;
-      if (htmlElement.offsetTop < window.innerHeight) return false;
+      const elementYPosition = htmlElement.getBoundingClientRect().y + window.scrollY;
+      if (elementYPosition < window.innerHeight) return false;
       if (htmlElement.src.startsWith("data:")) return false;
       return true;
     }
@@ -35,7 +36,8 @@ const perf = [
     selector: 'img[loading="lazy"], iframe[loading="lazy"]',
     match(element) {
       const htmlElement = element;
-      if (htmlElement.offsetTop > window.innerHeight) return false;
+      const elementYPosition = htmlElement.getBoundingClientRect().y + window.scrollY;
+      if (elementYPosition > window.innerHeight) return false;
       if (htmlElement.src.startsWith("data:")) return false;
       return true;
     }

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

@@ -136,9 +136,7 @@ Did you forget to import the component or is it possible there is a typo?`
     }
     if (!renderer) {
       const extname = metadata.componentUrl?.split(".").pop();
-      renderer = renderers.filter(
-        ({ name }) => name === `@astrojs/${extname}` || name === extname
-      )[0];
+      renderer = renderers.find(({ name }) => name === `@astrojs/${extname}` || name === extname);
     }
   }
   let componentServerRenderEndTime;

package/dist/transitions/router.js

@@ -62,7 +62,7 @@ async function fetchHTML(href, init) {
       redirected: res.redirected ? res.url : void 0,
       mediaType
     };
-  } catch (err) {
+  } catch {
     return null;
   }
 }
@@ -189,7 +189,7 @@ async function updateDOM(preparationEvent, options, currentTransition, historySt
   if (fallback === "animate" && !currentTransition.transitionSkipped && !preparationEvent.signal.aborted) {
     try {
       await animate("old");
-    } catch (err) {
+    } catch {
     }
   }
   const pageTitleForBrowserHistory = document.title;

package/dist/type-utils.d.ts

@@ -5,7 +5,7 @@ export type WithRequired<T, K extends keyof T> = T & {
     [P in K]-?: T[P];
 };
 export type OmitIndexSignature<ObjectType> = {
-    [KeyType in keyof ObjectType as {} extends Record<KeyType, unknown> ? never : KeyType]: ObjectType[KeyType];
+    [KeyType in keyof ObjectType as object extends Record<KeyType, unknown> ? never : KeyType]: ObjectType[KeyType];
 };
 export type Kebab<T extends string, A extends string = ''> = T extends `${infer F}${infer R}` ? Kebab<R, `${A}${F extends Lowercase<F> ? '' : '-'}${Lowercase<F>}`> : A;
 export type KebabKeys<T> = {

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

@@ -5,7 +5,6 @@ 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 = /\?.*$/;
-const ASTRO_PROPAGATED_ASSET_REGEX = /\?astroPropagatedAssets/;
 async function* crawlGraph(loader, _id, isRootFile, scanned = /* @__PURE__ */ new Set()) {
   const id = unwrapId(_id);
   const importedModules = /* @__PURE__ */ new Set();
@@ -35,7 +34,7 @@ async function* crawlGraph(loader, _id, isRootFile, scanned = /* @__PURE__ */ ne
         if (!importedModule.id) continue;
         const importedModulePathname = importedModule.id.replace(STRIP_QUERY_PARAMS_REGEX, "");
         const isFileTypeNeedingSSR = fileExtensionsToSSR.has(npath.extname(importedModulePathname));
-        const isPropagationStoppingPoint = ASTRO_PROPAGATED_ASSET_REGEX.test(importedModule.id);
+        const isPropagationStoppingPoint = importedModule.id.includes("?astroPropagatedAssets");
         if (isFileTypeNeedingSSR && // Should not SSR a module with ?astroPropagatedAssets
         !isPropagationStoppingPoint) {
           const mod = loader.getModuleById(importedModule.id);

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

@@ -50,7 +50,6 @@ async function replaceDefine(code, id, define, config) {
   if (env) {
     const marker = `__astro_import_meta_env${"_".repeat(
       env.length - 23
-      /* length of preceding string */
     )}`;
     replacementMarkers[marker] = env;
     define = { ...define, "import.meta.env": marker };

package/dist/vite-plugin-load-fallback/index.js

@@ -12,14 +12,14 @@ function loadFallbackPlugin({
   const tryLoadModule = async (id) => {
     try {
       return await fs.promises.readFile(cleanUrl(id), "utf-8");
-    } catch (e) {
+    } catch {
       try {
         return await fs.promises.readFile(id, "utf-8");
-      } catch (e2) {
+      } catch {
         try {
           const fullpath = new URL("." + id, root);
           return await fs.promises.readFile(fullpath, "utf-8");
-        } catch (e3) {
+        } catch {
         }
       }
     }

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.2",
   "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",
@@ -169,14 +166,14 @@
     "zod": "^3.23.8",
     "zod-to-json-schema": "^3.23.2",
     "@astrojs/internal-helpers": "0.4.1",
-    "@astrojs/markdown-remark": "5.2.0",
-    "@astrojs/telemetry": "3.1.0"
+    "@astrojs/telemetry": "3.1.0",
+    "@astrojs/markdown-remark": "5.2.0"
   },
   "optionalDependencies": {
     "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,4 @@
-import { ActionError, callSafely, getActionQueryString } from 'astro:actions';
+import { ActionError, deserializeActionResult, getActionQueryString } from 'astro:actions';
 
 function toActionProxy(actionCallback = {}, aggregatedPath = '') {
 	return new Proxy(actionCallback, {
@@ -8,7 +8,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, {
@@ -28,8 +28,10 @@ function toActionProxy(actionCallback = {}, aggregatedPath = '') {
 				// 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 +45,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 +65,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 */