Merge branch 'main' into feat/route-manifest-refactor

.changeset/fuzzy-windows-cover.md

@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Fixes an issue where Astro couldn't correctly handle i18n fallback when using the i18n middleware

.changeset/hip-kids-ring.md

@@ -0,0 +1,5 @@
+---
+'@astrojs/db': patch
+---
+
+Fixes the publishing of the package

.changeset/neat-pumas-accept.md

@@ -0,0 +1,5 @@
+---
+"astro": patch
+---
+
+Adds type support for the `closedby` attribute for `<dialog>` elements

.changeset/selfish-paws-play.md

@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Fixes a bug where Astro couldn't correctly parse `params` and `props` when receiving i18n fallback URLs

.changeset/spicy-guests-protect.md

@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Trailing slash support for actions

.changeset/tame-bags-remember.md

@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Fixes a bug that caused errors in dev when editing sites with large numbers of MDX pages

.changeset/twelve-donuts-hide.md

@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+"Added `inert` to htmlBooleanAttributes"

benchmark/index.js

@@ -1,6 +1,6 @@
 import fs from 'node:fs/promises';
 import path from 'node:path';
-import { fileURLToPath, pathToFileURL } from 'node:url';
+import { pathToFileURL } from 'node:url';
 import mri from 'mri';
 import { makeProject } from './bench/_util.js';
 

benchmark/packages/adapter/src/index.ts

@@ -1,4 +1,4 @@
-import type { AstroAdapter, AstroIntegration } from 'astro';
+import type { AstroIntegration } from 'astro';
 
 export default function createIntegration(): AstroIntegration {
 	return {

biome.jsonc

@@ -34,6 +34,7 @@
 			"correctness": {
 				"noUnusedVariables": "info",
 				"noUnusedFunctionParameters": "info",
+				"noUnusedImports": "warn",
 			},
 		},
 	},
@@ -87,11 +88,12 @@
 			},
 		},
 		{
-			"include": ["*.astro", "client.d.ts"],
+			"include": ["*.astro", "client.d.ts", "jsx-runtime.d.ts"],
 			"linter": {
 				"rules": {
 					"correctness": {
 						"noUnusedVariables": "off",
+						"noUnusedImports": "off",
 					},
 				},
 			},

packages/astro/astro-jsx.d.ts

@@ -679,6 +679,7 @@ declare namespace astroHTML.JSX {
 
 	interface DialogHTMLAttributes extends HTMLAttributes {
 		open?: boolean | string | undefined | null;
+		closedby?: 'none' | 'closerequest' | 'any' | undefined | null;
 	}
 
 	interface EmbedHTMLAttributes extends HTMLAttributes {

packages/astro/src/actions/plugins.ts

@@ -1,5 +1,6 @@
 import type fsMod from 'node:fs';
 import type { Plugin as VitePlugin } from 'vite';
+import { shouldAppendForwardSlash } from '../core/build/util.js';
 import type { AstroSettings } from '../types/astro.js';
 import {
 	NOOP_ACTIONS,
@@ -84,6 +85,12 @@ export function vitePluginActions({
 				code += `\nexport * from 'astro/actions/runtime/virtual/server.js';`;
 			} else {
 				code += `\nexport * from 'astro/actions/runtime/virtual/client.js';`;
+				code = code.replace(
+					"'/** @TRAILING_SLASH@ **/'",
+					JSON.stringify(
+						shouldAppendForwardSlash(settings.config.trailingSlash, settings.config.build.format),
+					),
+				);
 			}
 			return code;
 		},

packages/astro/src/actions/runtime/virtual/server.ts

@@ -1,6 +1,10 @@
 import { z } from 'zod';
+import type { Pipeline } from '../../../core/base-pipeline.js';
+import { shouldAppendForwardSlash } from '../../../core/build/util.js';
 import { ActionCalledFromServerError } from '../../../core/errors/errors-data.js';
 import { AstroError } from '../../../core/errors/errors.js';
+import { removeTrailingForwardSlash } from '../../../core/path.js';
+import { apiContextRoutesSymbol } from '../../../core/render-context.js';
 import type { APIContext } from '../../../types/public/index.js';
 import { ACTION_RPC_ROUTE_PATTERN } from '../../consts.js';
 import {
@@ -279,7 +283,15 @@ export function getActionContext(context: APIContext): ActionMiddlewareContext {
 			calledFrom: callerInfo.from,
 			name: callerInfo.name,
 			handler: async () => {
-				const baseAction = await getAction(callerInfo.name);
+				const pipeline: Pipeline = Reflect.get(context, apiContextRoutesSymbol);
+				const callerInfoName = shouldAppendForwardSlash(
+					pipeline.manifest.trailingSlash,
+					pipeline.manifest.buildFormat,
+				)
+					? removeTrailingForwardSlash(callerInfo.name)
+					: callerInfo.name;
+
+				const baseAction = await getAction(callerInfoName);
 				let input;
 				try {
 					input = await parseRequestBody(context.request);

packages/astro/src/actions/runtime/virtual/shared.ts

@@ -3,6 +3,7 @@ import type { z } from 'zod';
 import { REDIRECT_STATUS_CODES } from '../../../core/constants.js';
 import { ActionsReturnedInvalidDataError } from '../../../core/errors/errors-data.js';
 import { AstroError } from '../../../core/errors/errors.js';
+import { appendForwardSlash as _appendForwardSlash } from '../../../core/path.js';
 import { ACTION_QUERY_PARAMS as _ACTION_QUERY_PARAMS } from '../../consts.js';
 import type {
 	ErrorInferenceObject,
@@ -13,6 +14,8 @@ import type {
 export type ActionAPIContext = _ActionAPIContext;
 export const ACTION_QUERY_PARAMS = _ACTION_QUERY_PARAMS;
 
+export const appendForwardSlash = _appendForwardSlash;
+
 export const ACTION_ERROR_CODES = [
 	'BAD_REQUEST',
 	'UNAUTHORIZED',

packages/astro/src/assets/utils/imageAttributes.ts

@@ -1,5 +1,4 @@
 import { toStyleString } from '../../runtime/server/render/util.js';
-import type { AstroConfig } from '../../types/public/config.js';
 import type { GetImageResult, ImageLayout, LocalImageProps, RemoteImageProps } from '../types.js';
 
 export function addCSSVarsToStyle(

packages/astro/src/content/mutable-data-store.ts

@@ -9,6 +9,8 @@ import { contentModuleToId } from './utils.js';
 
 const SAVE_DEBOUNCE_MS = 500;
 
+const MAX_DEPTH = 10;
+
 /**
  * Extends the DataStore with the ability to change entries and write them to disk.
  * This is kept as a separate class to avoid needing node builtins at runtime, when read-only access is all that is needed.
@@ -86,7 +88,7 @@ export class MutableDataStore extends ImmutableDataStore {
 
 		if (this.#assetImports.size === 0) {
 			try {
-				await fs.writeFile(filePath, 'export default new Map();');
+				await this.#writeFileAtomic(filePath, 'export default new Map();');
 			} catch (err) {
 				throw new AstroError(AstroErrorData.UnknownFilesystemError, { cause: err });
 			}
@@ -110,7 +112,7 @@ ${imports.join('\n')}
 export default new Map([${exports.join(', ')}]);
 		`;
 		try {
-			await fs.writeFile(filePath, code);
+			await this.#writeFileAtomic(filePath, code);
 		} catch (err) {
 			throw new AstroError(AstroErrorData.UnknownFilesystemError, { cause: err });
 		}
@@ -122,7 +124,7 @@ export default new Map([${exports.join(', ')}]);
 
 		if (this.#moduleImports.size === 0) {
 			try {
-				await fs.writeFile(filePath, 'export default new Map();');
+				await this.#writeFileAtomic(filePath, 'export default new Map();');
 			} catch (err) {
 				throw new AstroError(AstroErrorData.UnknownFilesystemError, { cause: err });
 			}
@@ -143,7 +145,7 @@ export default new Map([${exports.join(', ')}]);
 export default new Map([\n${lines.join(',\n')}]);
 		`;
 		try {
-			await fs.writeFile(filePath, code);
+			await this.#writeFileAtomic(filePath, code);
 		} catch (err) {
 			throw new AstroError(AstroErrorData.UnknownFilesystemError, { cause: err });
 		}
@@ -190,6 +192,42 @@ export default new Map([\n${lines.join(',\n')}]);
 		}
 	}
 
+	#writing = new Set<string>();
+	#pending = new Set<string>();
+
+	async #writeFileAtomic(filePath: PathLike, data: string, depth = 0) {
+		if (depth > MAX_DEPTH) {
+			// If we hit the max depth, we skip a write to prevent the stack from growing too large
+			// In theory this means we may miss the latest data, but in practice this will only happen when the file is being written to very frequently
+			// so it will be saved on the next write. This is unlikely to ever happen in practice, as the writes are debounced. It requires lots of writes to very large files.
+			return;
+		}
+		const fileKey = filePath.toString();
+		// If we are already writing this file, instead of writing now, flag it as pending and write it when we're done.
+		if (this.#writing.has(fileKey)) {
+			this.#pending.add(fileKey);
+			return;
+		}
+		// Prevent concurrent writes to this file by flagging it as being written
+		this.#writing.add(fileKey);
+
+		const tempFile = filePath instanceof URL ? new URL(`${filePath.href}.tmp`) : `${filePath}.tmp`;
+		try {
+			// Write it to a temporary file first and then move it to prevent partial reads.
+			await fs.writeFile(tempFile, data);
+			await fs.rename(tempFile, filePath);
+		} finally {
+			// We're done writing. Unflag the file and check if there are any pending writes for this file.
+			this.#writing.delete(fileKey);
+			// If there are pending writes, we need to write again to ensure we flush the latest data.
+			if (this.#pending.has(fileKey)) {
+				this.#pending.delete(fileKey);
+				// Call ourself recursively to write the file again
+				await this.#writeFileAtomic(filePath, data, depth + 1);
+			}
+		}
+	}
+
 	scopedStore(collectionName: string): DataStore {
 		return {
 			get: <TData extends Record<string, unknown> = Record<string, unknown>>(key: string) =>
@@ -298,7 +336,7 @@ export default new Map([\n${lines.join(',\n')}]);
 			return;
 		}
 		try {
-			await fs.writeFile(filePath, this.toString());
+			await this.#writeFileAtomic(filePath, this.toString());
 			this.#file = filePath;
 			this.#dirty = false;
 		} catch (err) {

packages/astro/src/core/app/index.ts

@@ -5,7 +5,6 @@ import {
 	REROUTABLE_STATUS_CODES,
 	REROUTE_DIRECTIVE_HEADER,
 	clientAddressSymbol,
-	clientLocalsSymbol,
 	responseSentSymbol,
 } from '../constants.js';
 import { getSetCookiesFromResponse } from '../cookies/index.js';

packages/astro/src/core/build/plugins/plugin-manifest.ts

@@ -5,7 +5,6 @@ import type { Plugin as VitePlugin } from 'vite';
 import { getAssetsPrefix } from '../../../assets/utils/getAssetsPrefix.js';
 import { normalizeTheLocale } from '../../../i18n/index.js';
 import { toFallbackType, toRoutingStrategy } from '../../../i18n/utils.js';
-import { unwrapSupportKind } from '../../../integrations/features-validation.js';
 import { runHookBuildSsr } from '../../../integrations/hooks.js';
 import { BEFORE_HYDRATION_SCRIPT_ID, PAGE_SCRIPT_ID } from '../../../vite-plugin-scripts/index.js';
 import type {

packages/astro/src/core/render/params-and-props.ts

@@ -47,7 +47,8 @@ export async function getProps(opts: GetParamsAndPropsOptions): Promise<Props> {
 		base,
 	});
 
-	// The pathname used here comes from the server, which already encored.
+	if (!staticPaths.length) return {};
+	// The pathname used here comes from the server, which already encoded.
 	// Since we decided to not mess up with encoding anymore, we need to decode them back so the parameters can match
 	// the ones expected from the users
 	const params = getParams(route, decodeURI(pathname));
@@ -77,7 +78,11 @@ export function getParams(route: RouteData, pathname: string): Params {
 	if (!route.params.length) return {};
 	// The RegExp pattern expects a decoded string, but the pathname is encoded
 	// when the URL contains non-English characters.
-	const paramsMatch = route.pattern.exec(pathname);
+	const paramsMatch =
+		route.pattern.exec(pathname) ||
+		route.fallbackRoutes
+			.map((fallbackRoute) => fallbackRoute.pattern.exec(pathname))
+			.find((x) => x);
 	if (!paramsMatch) return {};
 	const params: Params = {};
 	route.params.forEach((key, i) => {

packages/astro/src/i18n/index.ts

@@ -298,9 +298,14 @@ export function redirectToDefaultLocale({
 }
 
 // NOTE: public function exported to the users via `astro:i18n` module
-export function notFound({ base, locales }: MiddlewarePayload) {
+export function notFound({ base, locales, fallback }: MiddlewarePayload) {
 	return function (context: APIContext, response?: Response): Response | undefined {
-		if (response?.headers.get(REROUTE_DIRECTIVE_HEADER) === 'no') return response;
+		if (
+			response?.headers.get(REROUTE_DIRECTIVE_HEADER) === 'no' &&
+			typeof fallback === 'undefined'
+		) {
+			return response;
+		}
 
 		const url = context.url;
 		// We return a 404 if:

packages/astro/src/i18n/middleware.ts

@@ -83,7 +83,6 @@ export function createI18nMiddleware(
 		}
 
 		const { currentLocale } = context;
-
 		switch (i18n.strategy) {
 			// NOTE: theoretically, we should never hit this code path
 			case 'manual': {

packages/astro/src/runtime/server/render/util.ts

@@ -7,7 +7,7 @@ import { HTMLString, markHTMLString } from '../escape.js';
 export const voidElementNames =
 	/^(area|base|br|col|command|embed|hr|img|input|keygen|link|meta|param|source|track|wbr)$/i;
 const htmlBooleanAttributes =
-	/^(?:allowfullscreen|async|autofocus|autoplay|checked|controls|default|defer|disabled|disablepictureinpicture|disableremoteplayback|formnovalidate|hidden|loop|nomodule|novalidate|open|playsinline|readonly|required|reversed|scoped|seamless|selected|itemscope)$/i;
+	/^(?:allowfullscreen|async|autofocus|autoplay|checked|controls|default|defer|disabled|disablepictureinpicture|disableremoteplayback|formnovalidate|hidden|inert|loop|nomodule|novalidate|open|playsinline|readonly|required|reversed|scoped|seamless|selected|itemscope)$/i;
 
 const AMPERSAND_REGEX = /&/g;
 const DOUBLE_QUOTE_REGEX = /"/g;

packages/astro/src/virtual-modules/i18n.ts

@@ -378,10 +378,10 @@ if (i18n?.routing === 'manual') {
 		fallbackType = toFallbackType(customOptions);
 		const manifest: SSRManifest['i18n'] = {
 			...i18n,
-			fallback: undefined,
 			strategy,
 			domainLookupTable: {},
 			fallbackType,
+			fallback: i18n.fallback,
 		};
 		return I18nInternals.createMiddleware(manifest, base, trailingSlash, format);
 	};

packages/astro/src/vite-plugin-astro-server/route.ts

@@ -11,7 +11,7 @@ import { req } from '../core/messages.js';
 import { loadMiddleware } from '../core/middleware/loadMiddleware.js';
 import { routeIsRedirect } from '../core/redirects/index.js';
 import { RenderContext } from '../core/render-context.js';
-import { type SSROptions, getProps } from '../core/render/index.js';
+import { getProps } from '../core/render/index.js';
 import { createRequest } from '../core/request.js';
 import { redirectTemplate } from '../core/routing/3xx.js';
 import { matchAllRoutes } from '../core/routing/index.js';

packages/astro/templates/actions.mjs

@@ -1,4 +1,9 @@
-import { ActionError, deserializeActionResult, getActionQueryString } from 'astro:actions';
+import {
+	ActionError,
+	appendForwardSlash,
+	deserializeActionResult,
+	getActionQueryString,
+} from 'astro:actions';
 
 const ENCODED_DOT = '%2E';
 
@@ -83,7 +88,15 @@ async function handleAction(param, path, context) {
 			headers.set('Content-Length', '0');
 		}
 	}
-	const rawResult = await fetch(`${import.meta.env.BASE_URL.replace(/\/$/, '')}/_actions/${path}`, {
+
+	const shouldAppendTrailingSlash = '/** @TRAILING_SLASH@ **/';
+	let actionPath = import.meta.env.BASE_URL.replace(/\/$/, '') + '/_actions/' + path;
+
+	if (shouldAppendTrailingSlash) {
+		actionPath = appendForwardSlash(actionPath);
+	}
+
+	const rawResult = await fetch(actionPath, {
 		method: 'POST',
 		body,
 		headers,

packages/astro/templates/env.mjs

@@ -1,6 +1,7 @@
 // @ts-check
 import { schema } from 'virtual:astro:env/internal';
 import {
+	// biome-ignore lint/correctness/noUnusedImports: `_getEnv` is used by the generated code
 	getEnv as _getEnv,
 	createInvalidVariablesError,
 	getEnvFieldType,