Merge branch 'main' into bump-db

.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/spicy-guests-protect.md

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

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/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/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/build/plugins/plugin-ssr.ts

@@ -1,5 +1,4 @@
 import type { Plugin as VitePlugin } from 'vite';
-import type { AstroSettings } from '../../../types/astro.js';
 import type { AstroAdapter } from '../../../types/public/integrations.js';
 import { routeIsRedirect } from '../../redirects/index.js';
 import { VIRTUAL_ISLAND_MAP_ID } from '../../server-islands/vite-plugin-server-islands.js';

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/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,

packages/astro/test/actions.test.js

@@ -564,6 +564,30 @@ it('Base path should be used', async () => {
 	await devServer.stop();
 });
 
+it('Should support trailing slash', async () => {
+	const fixture = await loadFixture({
+		root: './fixtures/actions/',
+		adapter: testAdapter(),
+		trailingSlash: 'always',
+	});
+	const devServer = await fixture.startDevServer();
+	const formData = new FormData();
+	formData.append('channel', 'bholmesdev');
+	formData.append('comment', 'Hello, World!');
+	const res = await fixture.fetch('/_actions/comment/', {
+		method: 'POST',
+		body: formData,
+	});
+
+	assert.equal(res.ok, true);
+	assert.equal(res.headers.get('Content-Type'), 'application/json+devalue');
+
+	const data = devalue.parse(await res.text());
+	assert.equal(data.channel, 'bholmesdev');
+	assert.equal(data.comment, 'Hello, World!');
+	await devServer.stop();
+});
+
 /**
  * Follow an expected redirect response.
  *

packages/astro/test/fixtures/i18n-routing-manual-with-default-middleware/astro.config.mjs

@@ -9,6 +9,9 @@ export default defineConfig({
 				codes: ["es", "es-ar"]
 			}
 		],
-		routing: "manual"
+		routing: "manual",
+		fallback: {
+			it: 'en'
+		}
 	}
 })

packages/astro/test/fixtures/i18n-routing-manual-with-default-middleware/src/middleware.js

@@ -18,5 +18,6 @@ export const onRequest = sequence(
 	customLogic,
 	middleware({
 		prefixDefaultLocale: true,
+		fallbackType: "rewrite"
 	})
 );

packages/astro/test/i18n-routing-manual-with-default-middleware.test.js

@@ -117,4 +117,13 @@ describe('SSR manual routing', () => {
 		const $ = cheerio.load(html);
 		assert.equal($('p').text(), '/en/blog/title/');
 	});
+
+	it('should use the fallback', async () => {
+		let request = new Request('http://example.com/it/start');
+		let response = await app.render(request);
+		assert.equal(response.status, 200);
+		const html = await response.text();
+		const $ = cheerio.load(html);
+		assert.equal($('p').text(), '/en/blog/title/');
+	});
 });

packages/astro/test/units/routing/route-matching.test.js

@@ -1,6 +1,5 @@
 import * as assert from 'node:assert/strict';
 import { after, before, describe, it } from 'node:test';
-import { fileURLToPath } from 'node:url';
 import * as cheerio from 'cheerio';
 import { createContainer } from '../../../dist/core/dev/container.js';
 import { createViteLoader } from '../../../dist/core/module-loader/vite.js';

packages/db/src/core/integration/index.ts

@@ -26,7 +26,6 @@ import {
 	type LateSeedFiles,
 	type LateTables,
 	type SeedHandler,
-	resolved,
 	vitePluginDb,
 } from './vite-plugin-db.js';
 

packages/db/src/runtime/virtual.ts

@@ -1,4 +1,3 @@
-import { LibsqlError } from '@libsql/client';
 import { sql as _sql } from 'drizzle-orm';
 import type {
 	BooleanColumnInput,

packages/integrations/markdoc/src/html/transform/html-token-transform.ts

@@ -1,6 +1,7 @@
 import type { Tokenizer } from '@markdoc/markdoc';
 import { Parser } from 'htmlparser2';
 // @ts-expect-error This type isn't exported
+// biome-ignore lint/correctness/noUnusedImports: not correctly detected because type isn't exported
 import type * as Token from 'markdown-it/lib/token';
 
 export function htmlTokenTransform(tokenizer: Tokenizer, tokens: Token[]): Token[] {

scripts/cmd/build.js

@@ -1,6 +1,5 @@
 import fs from 'node:fs/promises';
 import esbuild from 'esbuild';
-import { copy } from 'esbuild-plugin-copy';
 import glob from 'fast-glob';
 import { dim, green, red, yellow } from 'kleur/colors';
 import prebuild from './prebuild.js';