From 1567e8cc9153f4e8089b2d942ffb73c14cca8031 Mon Sep 17 00:00:00 2001
From: Matthew Phillips <matthewphillips@cloudflare.com>
Date: Thu, 5 Mar 2026 10:19:20 -0500
Subject: [PATCH 1/9] Normalize static file paths before evaluating dotfile
 access rules (#15763)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 .changeset/normalize-dotfile-pathname.md      |  5 +++
 .../integrations/node/src/serve-static.ts     |  7 ++--
 .../well-known-locations/public/.hidden-file  |  1 +
 .../node/test/well-known-locations.test.js    | 40 ++++++++++++++++++-
 4 files changed, 49 insertions(+), 4 deletions(-)
 create mode 100644 .changeset/normalize-dotfile-pathname.md
 create mode 100644 packages/integrations/node/test/fixtures/well-known-locations/public/.hidden-file

diff --git a/.changeset/normalize-dotfile-pathname.md b/.changeset/normalize-dotfile-pathname.md
new file mode 100644
index 000000000000..57f29faee108
--- /dev/null
+++ b/.changeset/normalize-dotfile-pathname.md
@@ -0,0 +1,5 @@
+---
+'@astrojs/node': patch
+---
+
+Normalizes static file paths before evaluating dotfile access rules for improved consistency
diff --git a/packages/integrations/node/src/serve-static.ts b/packages/integrations/node/src/serve-static.ts
index 33c5ef9cc258..2050c6236e71 100644
--- a/packages/integrations/node/src/serve-static.ts
+++ b/packages/integrations/node/src/serve-static.ts
@@ -120,9 +120,10 @@ export function createStaticHandler(
 			// app.removeBase sometimes returns a path without a leading slash
 			pathname = prependForwardSlash(app.removeBase(pathname));
 
-			const stream = send(req, pathname, {
+			const normalizedPathname = path.posix.normalize(pathname);
+			const stream = send(req, normalizedPathname, {
 				root: client,
-				dotfiles: pathname.startsWith('/.well-known/') ? 'allow' : 'deny',
+				dotfiles: normalizedPathname.startsWith('/.well-known/') ? 'allow' : 'deny',
 			});
 
 			let forwardError = false;
@@ -139,7 +140,7 @@ export function createStaticHandler(
 			});
 			stream.on('headers', (_res: ServerResponse) => {
 				// assets in dist/_astro are hashed and should get the immutable header
-				if (pathname.startsWith(`/${app.manifest.assetsDir}/`)) {
+				if (normalizedPathname.startsWith(`/${app.manifest.assetsDir}/`)) {
 					// This is the "far future" cache header, used for static files whose name includes their digest hash.
 					// 1 year (31,536,000 seconds) is convention.
 					// Taken from https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Cache-Control#immutable
diff --git a/packages/integrations/node/test/fixtures/well-known-locations/public/.hidden-file b/packages/integrations/node/test/fixtures/well-known-locations/public/.hidden-file
new file mode 100644
index 000000000000..1170b6e1930f
--- /dev/null
+++ b/packages/integrations/node/test/fixtures/well-known-locations/public/.hidden-file
@@ -0,0 +1 @@
+should-not-serve
diff --git a/packages/integrations/node/test/well-known-locations.test.js b/packages/integrations/node/test/well-known-locations.test.js
index 0951d6c27cc9..57082f28ad6e 100644
--- a/packages/integrations/node/test/well-known-locations.test.js
+++ b/packages/integrations/node/test/well-known-locations.test.js
@@ -1,7 +1,7 @@
 import * as assert from 'node:assert/strict';
 import { after, before, describe, it } from 'node:test';
 import nodejs from '../dist/index.js';
-import { loadFixture } from './test-utils.js';
+import { createRequestAndResponse, loadFixture } from './test-utils.js';
 
 describe('test URIs beginning with a dot', () => {
 	/** @type {import('./test-utils').Fixture} */
@@ -43,4 +43,42 @@ describe('test URIs beginning with a dot', () => {
 			assert.equal(res.status, 404);
 		});
 	});
+
+	describe('dotfile access via unnormalized paths', async () => {
+		it('denies dotfile access when path contains .well-known/../ traversal', async () => {
+			const { handler } = await import('./fixtures/well-known-locations/dist/server/entry.mjs');
+			const { req, res, done } = createRequestAndResponse({
+				method: 'GET',
+				url: '/.well-known/../.hidden-file',
+			});
+
+			handler(req, res);
+			req.send();
+
+			await done;
+			assert.notEqual(
+				res.statusCode,
+				200,
+				'dotfile should not be served via .well-known path traversal',
+			);
+		});
+
+		it('denies dotfolder file access when path contains .well-known/../ traversal', async () => {
+			const { handler } = await import('./fixtures/well-known-locations/dist/server/entry.mjs');
+			const { req, res, done } = createRequestAndResponse({
+				method: 'GET',
+				url: '/.well-known/../.hidden/file.json',
+			});
+
+			handler(req, res);
+			req.send();
+
+			await done;
+			assert.notEqual(
+				res.statusCode,
+				200,
+				'dotfolder file should not be served via .well-known path traversal',
+			);
+		});
+	});
 });

From 44daecfc722cd5763a2afc4b1697169a9a0bb74e Mon Sep 17 00:00:00 2001
From: Matthew Phillips <matthewphillips@cloudflare.com>
Date: Thu, 5 Mar 2026 10:40:32 -0500
Subject: [PATCH 2/9] Improve form action handling consistency during error
 page rendering (#15764)

* Improve form action handling consistency during error page rendering

* Update changeset with more detailed description

---------

Co-authored-by: bugbot <bugbot@astro.build>
---
 .changeset/warm-pens-glow.md                  |   5 +
 packages/astro/src/core/render-context.ts     |   5 +-
 .../test/units/render/render-context.test.js  | 130 ++++++++++++++++++
 3 files changed, 139 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/warm-pens-glow.md
 create mode 100644 packages/astro/test/units/render/render-context.test.js

diff --git a/.changeset/warm-pens-glow.md b/.changeset/warm-pens-glow.md
new file mode 100644
index 000000000000..0c40ed0af75a
--- /dev/null
+++ b/.changeset/warm-pens-glow.md
@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Fixes form actions incorrectly auto-executing during error page rendering. When an error page (e.g. 404) is rendered, form actions from the original request are no longer executed, since the full request handling pipeline is not active.
diff --git a/packages/astro/src/core/render-context.ts b/packages/astro/src/core/render-context.ts
index 8e40ea12a761..d0a518bc0358 100644
--- a/packages/astro/src/core/render-context.ts
+++ b/packages/astro/src/core/render-context.ts
@@ -303,7 +303,10 @@ export class RenderContext {
 			}
 			let response: Response;
 
-			if (!ctx.isPrerendered) {
+			// Only auto-execute form actions when middleware is part of the pipeline.
+			// When middleware is skipped (e.g. during error page recovery), form actions
+			// should not run since the full request handling pipeline is not active.
+			if (!ctx.isPrerendered && !this.skipMiddleware) {
 				const { action, setActionResult, serializeActionResult } = getActionContext(ctx);
 
 				if (action?.calledFrom === 'form') {
diff --git a/packages/astro/test/units/render/render-context.test.js b/packages/astro/test/units/render/render-context.test.js
new file mode 100644
index 000000000000..aa4068cda721
--- /dev/null
+++ b/packages/astro/test/units/render/render-context.test.js
@@ -0,0 +1,130 @@
+import * as assert from 'node:assert/strict';
+import { describe, it } from 'node:test';
+import { RenderContext } from '../../../dist/core/render-context.js';
+import { createComponent, maybeRenderHead, render } from '../../../dist/runtime/server/index.js';
+import { createBasicPipeline } from '../test-utils.js';
+
+const createAstroModule = (AstroComponent) => ({ default: AstroComponent });
+
+describe('RenderContext', () => {
+	describe('skipMiddleware and form action handling', () => {
+		it('does not auto-execute form actions when skipMiddleware is true', async () => {
+			let actionWasCalled = false;
+
+			const pipeline = createBasicPipeline({
+				manifest: {
+					rootDir: import.meta.url,
+					serverLike: true,
+					experimentalQueuedRendering: { enabled: true },
+				},
+			});
+
+			// Set up a mock action on the pipeline
+			pipeline.resolvedActions = {
+				server: {
+					testAction: async function () {
+						actionWasCalled = true;
+						return { data: 'should not be called', error: undefined };
+					},
+				},
+			};
+
+			const SimplePage = createComponent((result) => {
+				return render`<html><head>${maybeRenderHead(result)}</head><body><p>Error page</p></body></html>`;
+			});
+			const PageModule = createAstroModule(SimplePage);
+
+			// POST request with _action param (simulates form action submission)
+			const request = new Request('http://example.com/404?_action=testAction', {
+				method: 'POST',
+				body: new FormData(),
+			});
+
+			const routeData = {
+				type: 'page',
+				pathname: '/404',
+				component: 'src/pages/404.astro',
+				params: {},
+				route: '/404',
+				prerender: false,
+			};
+
+			// Create context with skipMiddleware=true (as happens during error recovery)
+			const renderContext = await RenderContext.create({
+				pipeline,
+				request,
+				routeData,
+				status: 404,
+				skipMiddleware: true,
+			});
+
+			const response = await renderContext.render(PageModule);
+
+			assert.equal(response.status, 404);
+			assert.equal(
+				actionWasCalled,
+				false,
+				'Form action should not be auto-executed when skipMiddleware is true',
+			);
+		});
+
+		it('auto-executes form actions when skipMiddleware is false', async () => {
+			let actionWasCalled = false;
+
+			const pipeline = createBasicPipeline({
+				manifest: {
+					rootDir: import.meta.url,
+					serverLike: true,
+					experimentalQueuedRendering: { enabled: true },
+				},
+			});
+
+			// Set up a mock action on the pipeline
+			pipeline.resolvedActions = {
+				server: {
+					testAction: async function () {
+						actionWasCalled = true;
+						return { data: 'action result', error: undefined };
+					},
+				},
+			};
+
+			const SimplePage = createComponent((result) => {
+				return render`<html><head>${maybeRenderHead(result)}</head><body><p>Page</p></body></html>`;
+			});
+			const PageModule = createAstroModule(SimplePage);
+
+			// POST request with _action param (simulates form action submission)
+			const request = new Request('http://example.com/page?_action=testAction', {
+				method: 'POST',
+				body: new FormData(),
+			});
+
+			const routeData = {
+				type: 'page',
+				pathname: '/page',
+				component: 'src/pages/page.astro',
+				params: {},
+				route: '/page',
+				prerender: false,
+			};
+
+			// Create context with skipMiddleware=false (normal flow)
+			const renderContext = await RenderContext.create({
+				pipeline,
+				request,
+				routeData,
+				skipMiddleware: false,
+			});
+
+			const response = await renderContext.render(PageModule);
+
+			assert.equal(response.status, 200);
+			assert.equal(
+				actionWasCalled,
+				true,
+				'Form action should be auto-executed when skipMiddleware is false',
+			);
+		});
+	});
+});

From e0ac1250bb6db87f4c2ac79b6521b0fee0092d7a Mon Sep 17 00:00:00 2001
From: Emanuele Stoppa <estoppa@cloudflare.com>
Date: Thu, 5 Mar 2026 15:56:11 +0000
Subject: [PATCH 3/9] fix(env): add validation against vite.envPrefix (#15780)

---
 .changeset/fix-envprefix-secret-leak.md       |  24 ++++
 packages/astro/src/core/create-vite.ts        |   4 +
 packages/astro/src/core/errors/errors-data.ts |  17 +++
 packages/astro/src/env/env-loader.ts          |  43 +++++-
 packages/astro/src/env/validators.ts          |  36 +++++
 .../astro/test/env-secret-envprefix.test.js   |  36 +++++
 .../astro.config.mjs                          |  13 ++
 .../astro-env-secret-envprefix/package.json   |   8 ++
 .../src/pages/index.astro                     |  18 +++
 .../test/units/env/env-validators.test.js     | 132 +++++++++++++++++-
 pnpm-lock.yaml                                |   6 +
 11 files changed, 333 insertions(+), 4 deletions(-)
 create mode 100644 .changeset/fix-envprefix-secret-leak.md
 create mode 100644 packages/astro/test/env-secret-envprefix.test.js
 create mode 100644 packages/astro/test/fixtures/astro-env-secret-envprefix/astro.config.mjs
 create mode 100644 packages/astro/test/fixtures/astro-env-secret-envprefix/package.json
 create mode 100644 packages/astro/test/fixtures/astro-env-secret-envprefix/src/pages/index.astro

diff --git a/.changeset/fix-envprefix-secret-leak.md b/.changeset/fix-envprefix-secret-leak.md
new file mode 100644
index 000000000000..68a9f3324984
--- /dev/null
+++ b/.changeset/fix-envprefix-secret-leak.md
@@ -0,0 +1,24 @@
+---
+'astro': patch
+---
+
+Prevents `vite.envPrefix` misconfiguration from exposing `access: "secret"` environment variables in client-side bundles. Astro now throws a clear error at startup if any `vite.envPrefix` entry matches a variable declared with `access: "secret"` in `env.schema`.
+
+For example, the following configuration will throw an error for `API_SECRET` because it's defined as `secret` its name matches `['PUBLIC_', 'API_']` defined in `env.schema`:
+
+```js
+// astro.config.mjs
+import { defineConfig } from "astro/config";
+
+export default defineConfig({
+  env: {
+    schema: {
+      API_SECRET: envField.string({ context: 'server', access: 'secret', optional: true }),
+      API_URL: envField.string({ context: 'server', access: 'public', optional: true }),
+    }
+  },
+  vite: {
+    envPrefix: ['PUBLIC_', 'API_'],
+  },
+})
+```
diff --git a/packages/astro/src/core/create-vite.ts b/packages/astro/src/core/create-vite.ts
index 323a384e89d0..41f5ef06a6e4 100644
--- a/packages/astro/src/core/create-vite.ts
+++ b/packages/astro/src/core/create-vite.ts
@@ -12,6 +12,7 @@ import {
 	astroContentVirtualModPlugin,
 } from '../content/index.js';
 import { createEnvLoader } from '../env/env-loader.js';
+import { validateEnvPrefixAgainstSchema } from '../env/validators.js';
 import { astroEnv } from '../env/vite-plugin-env.js';
 import { importMetaEnv } from '../env/vite-plugin-import-meta-env.js';
 import astroInternationalization from '../i18n/vite-plugin-i18n.js';
@@ -111,6 +112,9 @@ export async function createVite(
 		config: settings.config,
 	});
 
+	// Validate that envPrefix doesn't conflict with secret env schema variables
+	validateEnvPrefixAgainstSchema(settings.config);
+
 	// Start with the Vite configuration that Astro core needs
 	const commonConfig: vite.InlineConfig = {
 		// Tell Vite not to combine config from vite.config.js with our provided inline config
diff --git a/packages/astro/src/core/errors/errors-data.ts b/packages/astro/src/core/errors/errors-data.ts
index 0dfeb19a31a4..53ed86e74a7b 100644
--- a/packages/astro/src/core/errors/errors-data.ts
+++ b/packages/astro/src/core/errors/errors-data.ts
@@ -1308,6 +1308,23 @@ export const EnvInvalidVariables = {
 		`The following environment variables defined in \`env.schema\` are invalid:\n\n${errors.map((err) => `- ${err}`).join('\n')}\n`,
 } satisfies ErrorData;
 
+/**
+ * @docs
+ * @description
+ * The configured `vite.envPrefix` includes prefixes that match environment variables declared with `access: "secret"` in `env.schema`.
+ * This would cause Vite to expose those secret values in client-side JavaScript bundles, bypassing the `access: "secret"` protection.
+ *
+ * To fix this, either:
+ * - Remove the conflicting prefixes from `vite.envPrefix`, or
+ * - Rename your secret environment variables to use a prefix that is not in `vite.envPrefix`.
+ */
+export const EnvPrefixConflictsWithSecret = {
+	name: 'EnvPrefixConflictsWithSecret',
+	title: 'envPrefix conflicts with secret environment variables',
+	message: (conflicts: Array<string>) =>
+		`The following environment variables are declared with \`access: "secret"\` in \`env.schema\`, but their names match a prefix in \`vite.envPrefix\`, which would expose them in client-side bundles:\n\n${conflicts.map((c) => `- ${c}`).join('\n')}\n\nEither remove the conflicting prefixes from \`vite.envPrefix\`, or rename these variables to use a prefix not in \`vite.envPrefix\`.`,
+} satisfies ErrorData;
+
 /**
  * @docs
  * @description
diff --git a/packages/astro/src/env/env-loader.ts b/packages/astro/src/env/env-loader.ts
index 114a717e1fe1..be8b08a2c111 100644
--- a/packages/astro/src/env/env-loader.ts
+++ b/packages/astro/src/env/env-loader.ts
@@ -1,21 +1,41 @@
 import { fileURLToPath } from 'node:url';
 import { loadEnv } from 'vite';
 import type { AstroConfig } from '../types/public/index.js';
+import type { EnvSchema } from './schema.js';
 
 // Match valid JS variable names (identifiers), which accepts most alphanumeric characters,
 // except that the first character cannot be a number.
 const isValidIdentifierRe = /^[_$a-zA-Z][\w$]*$/;
 
+/**
+ * Collects the set of env variable names declared with `access: "secret"` in the env schema.
+ */
+function getSecretKeys(envSchema: EnvSchema): Set<string> {
+	const secrets = new Set<string>();
+	for (const [key, options] of Object.entries(envSchema)) {
+		if (options.access === 'secret') {
+			secrets.add(key);
+		}
+	}
+	return secrets;
+}
+
 /**
  * From public env, returns private env. Each value may be stringified, transformed as `process.env`
  * or coerced depending on options.
+ *
+ * Variables declared with `access: "secret"` in the env schema are always treated as private,
+ * even if their name matches a configured `envPrefix`. This prevents envPrefix misconfiguration
+ * from leaking secrets to client bundles.
  */
 function getPrivateEnv({
 	fullEnv,
 	viteConfig,
+	envSchema,
 }: {
 	fullEnv: Record<string, string>;
 	viteConfig: AstroConfig['vite'];
+	envSchema: EnvSchema;
 }): Record<string, string> {
 	let envPrefixes: string[] = ['PUBLIC_'];
 	if (viteConfig.envPrefix) {
@@ -24,12 +44,25 @@ function getPrivateEnv({
 			: [viteConfig.envPrefix];
 	}
 
+	const secretKeys = getSecretKeys(envSchema);
 	const privateEnv: Record<string, string> = {};
 	for (const key in fullEnv) {
-		// Ignore public env var
-		if (!isValidIdentifierRe.test(key) || envPrefixes.some((prefix) => key.startsWith(prefix))) {
+		if (!isValidIdentifierRe.test(key)) {
 			continue;
 		}
+
+		// Variables declared as secret in the env schema are always private,
+		// regardless of whether they match an envPrefix.
+		if (secretKeys.has(key)) {
+			privateEnv[key] = JSON.stringify(fullEnv[key]);
+			continue;
+		}
+
+		// Skip variables matching envPrefix — these are public (handled by Vite)
+		if (envPrefixes.some((prefix) => key.startsWith(prefix))) {
+			continue;
+		}
+
 		privateEnv[key] = JSON.stringify(fullEnv[key]);
 	}
 	return privateEnv;
@@ -42,7 +75,11 @@ interface EnvLoaderOptions {
 
 function getEnv({ mode, config }: EnvLoaderOptions) {
 	const loaded = loadEnv(mode, config.vite.envDir ?? fileURLToPath(config.root), '');
-	const privateEnv = getPrivateEnv({ fullEnv: loaded, viteConfig: config.vite });
+	const privateEnv = getPrivateEnv({
+		fullEnv: loaded,
+		viteConfig: config.vite,
+		envSchema: config.env.schema,
+	});
 
 	return { loaded, privateEnv };
 }
diff --git a/packages/astro/src/env/validators.ts b/packages/astro/src/env/validators.ts
index c0d4f4bd8a87..82c7e76e5a46 100644
--- a/packages/astro/src/env/validators.ts
+++ b/packages/astro/src/env/validators.ts
@@ -1,3 +1,5 @@
+import { AstroError, AstroErrorData } from '../core/errors/index.js';
+import type { AstroConfig } from '../types/public/index.js';
 import type { EnumSchema, EnvFieldType, NumberSchema, StringSchema } from './schema.js';
 
 export type ValidationResultValue = EnvFieldType['default'];
@@ -177,3 +179,37 @@ export function validateEnvVariable(
 
 	return selectValidator(options)(value);
 }
+
+/**
+ * Validates that `vite.envPrefix` doesn't match any environment variables declared
+ * with `access: "secret"` in `env.schema`. If it does, those secrets would be exposed
+ * by Vite in client-side bundles via `import.meta.env`, completely bypassing the
+ * `access: "secret"` protection.
+ *
+ * Throws an `AstroError` if conflicts are found.
+ */
+export function validateEnvPrefixAgainstSchema(config: AstroConfig): void {
+	const schema = config.env.schema;
+	const envPrefix = config.vite?.envPrefix;
+
+	// No schema or using default prefix — nothing to validate
+	if (Object.keys(schema).length === 0 || !envPrefix) {
+		return;
+	}
+
+	const prefixes = Array.isArray(envPrefix) ? envPrefix : [envPrefix];
+	const conflicts: string[] = [];
+
+	for (const [key, options] of Object.entries(schema)) {
+		if (options.access === 'secret' && prefixes.some((prefix) => key.startsWith(prefix))) {
+			conflicts.push(key);
+		}
+	}
+
+	if (conflicts.length > 0) {
+		throw new AstroError({
+			...AstroErrorData.EnvPrefixConflictsWithSecret,
+			message: AstroErrorData.EnvPrefixConflictsWithSecret.message(conflicts),
+		});
+	}
+}
diff --git a/packages/astro/test/env-secret-envprefix.test.js b/packages/astro/test/env-secret-envprefix.test.js
new file mode 100644
index 000000000000..d959cbd02107
--- /dev/null
+++ b/packages/astro/test/env-secret-envprefix.test.js
@@ -0,0 +1,36 @@
+import assert from 'node:assert/strict';
+import { describe, it } from 'node:test';
+import { loadFixture } from './test-utils.js';
+
+describe('astro:env secret variables with envPrefix conflict', () => {
+	it('throws an error when envPrefix matches a secret env schema variable', async () => {
+		const fixture = await loadFixture({
+			root: './fixtures/astro-env-secret-envprefix/',
+		});
+
+		try {
+			await fixture.build();
+			assert.fail('expected build to throw');
+		} catch (error) {
+			assert.equal(error instanceof Error, true);
+			assert.equal(error.name, 'EnvPrefixConflictsWithSecret');
+			assert.equal(error.message.includes('API_SECRET'), true);
+		}
+	});
+
+	it('does not throw when envPrefix does not match any secret env schema variable', async () => {
+		// Use the server-secret fixture which has secrets but default envPrefix (PUBLIC_)
+		const fixture = await loadFixture({
+			root: './fixtures/astro-env-server-secret/',
+			output: 'server',
+			adapter: (await import('./test-adapter.js')).default({
+				env: {
+					KNOWN_SECRET: '123456',
+					UNKNOWN_SECRET: 'abc',
+				},
+			}),
+		});
+		await fixture.build();
+		assert.equal(true, true);
+	});
+});
diff --git a/packages/astro/test/fixtures/astro-env-secret-envprefix/astro.config.mjs b/packages/astro/test/fixtures/astro-env-secret-envprefix/astro.config.mjs
new file mode 100644
index 000000000000..269943e3d774
--- /dev/null
+++ b/packages/astro/test/fixtures/astro-env-secret-envprefix/astro.config.mjs
@@ -0,0 +1,13 @@
+import { defineConfig, envField } from 'astro/config';
+
+export default defineConfig({
+	env: {
+		schema: {
+			API_SECRET: envField.string({ context: 'server', access: 'secret', optional: true }),
+			API_URL: envField.string({ context: 'server', access: 'public', optional: true }),
+		},
+	},
+	vite: {
+		envPrefix: ['PUBLIC_', 'API_'],
+	},
+});
diff --git a/packages/astro/test/fixtures/astro-env-secret-envprefix/package.json b/packages/astro/test/fixtures/astro-env-secret-envprefix/package.json
new file mode 100644
index 000000000000..799e1e64070b
--- /dev/null
+++ b/packages/astro/test/fixtures/astro-env-secret-envprefix/package.json
@@ -0,0 +1,8 @@
+{
+  "name": "@test/astro-env-secret-envprefix",
+  "version": "0.0.0",
+  "private": true,
+  "dependencies": {
+    "astro": "workspace:*"
+  }
+}
diff --git a/packages/astro/test/fixtures/astro-env-secret-envprefix/src/pages/index.astro b/packages/astro/test/fixtures/astro-env-secret-envprefix/src/pages/index.astro
new file mode 100644
index 000000000000..a5089b944d52
--- /dev/null
+++ b/packages/astro/test/fixtures/astro-env-secret-envprefix/src/pages/index.astro
@@ -0,0 +1,18 @@
+---
+import { API_SECRET, getSecret } from "astro:env/server"
+---
+
+<html lang="en">
+<body>
+<pre id="data">{JSON.stringify({ API_SECRET })}</pre>
+<script>
+	const el = document.createElement('pre');
+	el.id = 'client-env';
+	el.textContent = JSON.stringify({
+		API_SECRET: import.meta.env.API_SECRET,
+		PUBLIC_APP_NAME: import.meta.env.PUBLIC_APP_NAME,
+	});
+	document.body.appendChild(el);
+</script>
+</body>
+</html>
diff --git a/packages/astro/test/units/env/env-validators.test.js b/packages/astro/test/units/env/env-validators.test.js
index 02c2b5a56c4e..1668408a9726 100644
--- a/packages/astro/test/units/env/env-validators.test.js
+++ b/packages/astro/test/units/env/env-validators.test.js
@@ -1,6 +1,10 @@
 import assert from 'node:assert/strict';
 import { before, describe, it } from 'node:test';
-import { getEnvFieldType, validateEnvVariable } from '../../../dist/env/validators.js';
+import {
+	getEnvFieldType,
+	validateEnvVariable,
+	validateEnvPrefixAgainstSchema,
+} from '../../../dist/env/validators.js';
 
 /**
  * @typedef {Parameters<typeof validateEnvVariable>} Params
@@ -550,3 +554,129 @@ describe('astro:env validators', () => {
 		});
 	});
 });
+
+describe('validateEnvPrefixAgainstSchema', () => {
+	/**
+	 * Helper to build a minimal config object matching the shape
+	 * validateEnvPrefixAgainstSchema expects.
+	 *
+	 * @param {Record<string, any>} schema
+	 * @param {string | string[] | undefined} envPrefix
+	 */
+	function makeConfig(schema, envPrefix) {
+		return /** @type {any} */ ({
+			env: { schema },
+			vite: envPrefix !== undefined ? { envPrefix } : {},
+		});
+	}
+
+	it('should not throw when schema is empty', () => {
+		assert.doesNotThrow(() => {
+			validateEnvPrefixAgainstSchema(makeConfig({}, ['PUBLIC_', 'API_']));
+		});
+	});
+
+	it('should not throw when envPrefix is not set', () => {
+		assert.doesNotThrow(() => {
+			validateEnvPrefixAgainstSchema(
+				makeConfig(
+					{ API_SECRET: { context: 'server', access: 'secret', type: 'string' } },
+					undefined,
+				),
+			);
+		});
+	});
+
+	it('should not throw when envPrefix does not match any secret variable', () => {
+		assert.doesNotThrow(() => {
+			validateEnvPrefixAgainstSchema(
+				makeConfig({ DB_PASSWORD: { context: 'server', access: 'secret', type: 'string' } }, [
+					'PUBLIC_',
+					'API_',
+				]),
+			);
+		});
+	});
+
+	it('should not throw when envPrefix matches a public variable', () => {
+		assert.doesNotThrow(() => {
+			validateEnvPrefixAgainstSchema(
+				makeConfig({ API_URL: { context: 'server', access: 'public', type: 'string' } }, [
+					'PUBLIC_',
+					'API_',
+				]),
+			);
+		});
+	});
+
+	it('should throw when envPrefix matches a secret variable (array prefix)', () => {
+		assert.throws(
+			() => {
+				validateEnvPrefixAgainstSchema(
+					makeConfig({ API_SECRET: { context: 'server', access: 'secret', type: 'string' } }, [
+						'PUBLIC_',
+						'API_',
+					]),
+				);
+			},
+			(err) => {
+				assert.equal(err.name, 'EnvPrefixConflictsWithSecret');
+				assert.equal(err.message.includes('API_SECRET'), true);
+				return true;
+			},
+		);
+	});
+
+	it('should throw when envPrefix matches a secret variable (string prefix)', () => {
+		assert.throws(
+			() => {
+				validateEnvPrefixAgainstSchema(
+					makeConfig(
+						{ SECRET_KEY: { context: 'server', access: 'secret', type: 'string' } },
+						'SECRET_',
+					),
+				);
+			},
+			(err) => {
+				assert.equal(err.name, 'EnvPrefixConflictsWithSecret');
+				assert.equal(err.message.includes('SECRET_KEY'), true);
+				return true;
+			},
+		);
+	});
+
+	it('should list all conflicting secret variables in the error', () => {
+		assert.throws(
+			() => {
+				validateEnvPrefixAgainstSchema(
+					makeConfig(
+						{
+							API_SECRET: { context: 'server', access: 'secret', type: 'string' },
+							API_KEY: { context: 'server', access: 'secret', type: 'string' },
+							API_URL: { context: 'server', access: 'public', type: 'string' },
+						},
+						['PUBLIC_', 'API_'],
+					),
+				);
+			},
+			(err) => {
+				assert.equal(err.name, 'EnvPrefixConflictsWithSecret');
+				assert.equal(err.message.includes('API_SECRET'), true);
+				assert.equal(err.message.includes('API_KEY'), true);
+				assert.equal(err.message.includes('API_URL'), false);
+				return true;
+			},
+		);
+	});
+
+	it('should not throw when only the default PUBLIC_ prefix is used', () => {
+		assert.doesNotThrow(() => {
+			validateEnvPrefixAgainstSchema(
+				makeConfig(
+					{ DB_PASSWORD: { context: 'server', access: 'secret', type: 'string' } },
+					'PUBLIC_',
+				),
+			);
+		});
+	});
+});
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index c63ea01bbc24..a2f468ffbf0a 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -2192,6 +2192,12 @@ importers:
         specifier: workspace:*
         version: link:../../..
 
+  packages/astro/test/fixtures/astro-env-secret-envprefix:
+    dependencies:
+      astro:
+        specifier: workspace:*
+        version: link:../../..
+
   packages/astro/test/fixtures/astro-env-server-fail:
     dependencies:
       astro:

From e9a9cc6002e35325447856e9a3e0866f285c0638 Mon Sep 17 00:00:00 2001
From: Matthew Phillips <matthewphillips@cloudflare.com>
Date: Thu, 5 Mar 2026 10:57:06 -0500
Subject: [PATCH 4/9] Harden error page response merging to strip framing
 headers (#15776)

Co-authored-by: astro-security-bot <astro-security-bot@users.noreply.github.com>
---
 .changeset/harden-merge-responses-framing.md  |   5 +
 packages/astro/src/core/app/base.ts           |  12 +-
 .../units/middleware/middleware-app.test.js   | 126 ++++++++++++++++++
 3 files changed, 141 insertions(+), 2 deletions(-)
 create mode 100644 .changeset/harden-merge-responses-framing.md

diff --git a/.changeset/harden-merge-responses-framing.md b/.changeset/harden-merge-responses-framing.md
new file mode 100644
index 000000000000..f3f30e1ad1b2
--- /dev/null
+++ b/.changeset/harden-merge-responses-framing.md
@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Hardens error page response merging to ensure framing headers from the original response are not carried over to the rendered error page
diff --git a/packages/astro/src/core/app/base.ts b/packages/astro/src/core/app/base.ts
index 9c8300b07218..fa07d5427bf4 100644
--- a/packages/astro/src/core/app/base.ts
+++ b/packages/astro/src/core/app/base.ts
@@ -728,9 +728,17 @@ export abstract class BaseApp<P extends Pipeline = AppPipeline> {
 				: originalResponse.status;
 
 		try {
-			// this function could throw an error...
+			// this function could throw an error if the headers are immutable...
 			originalResponse.headers.delete('Content-type');
-		} catch {}
+			// Framing headers describe the original response's body encoding/size and must
+			// not carry over to the error page response which has a different body.
+			originalResponse.headers.delete('Content-Length');
+			originalResponse.headers.delete('Transfer-Encoding');
+		} catch {
+			// Headers may be immutable (e.g. when the Response was constructed by a fetch).
+			// In that case, the loop below still copies from originalResponse.headers,
+			// so we need to filter out framing headers there instead.
+		}
 		// Build merged headers using append() to preserve multi-value headers (e.g. Set-Cookie).
 		// Headers from the original response take priority over new response headers for
 		// single-value headers, but we use append to avoid collapsing multi-value entries.
diff --git a/packages/astro/test/units/middleware/middleware-app.test.js b/packages/astro/test/units/middleware/middleware-app.test.js
index 284edbc88281..f8de122ab568 100644
--- a/packages/astro/test/units/middleware/middleware-app.test.js
+++ b/packages/astro/test/units/middleware/middleware-app.test.js
@@ -761,6 +761,132 @@ describe('Middleware via App.render()', () => {
 		});
 	});
 
+	describe('framing headers on error pages', () => {
+		it('should not preserve Content-Length from middleware when rendering 404 error page', async () => {
+			// Middleware calls next(), then decides to return 404 with a stale Content-Length header.
+			// On re-render for the error page, middleware passes the response through unchanged.
+			let callCount = 0;
+			const onRequest = async (ctx, next) => {
+				callCount++;
+				const response = await next();
+				if (callCount === 1 && ctx.url.pathname.startsWith('/api/guarded')) {
+					return new Response(null, {
+						status: 404,
+						headers: { 'Content-Length': '999', 'X-Custom': 'keep-me' },
+					});
+				}
+				return response;
+			};
+
+			const guardedRouteData = createRouteData({
+				route: '/api/guarded/[...path]',
+				pathname: undefined,
+				segments: undefined,
+			});
+			guardedRouteData.params = ['...path'];
+			guardedRouteData.pattern = /^\/api\/guarded(?:\/(.*))?$/;
+			guardedRouteData.pathname = undefined;
+			guardedRouteData.segments = [
+				[{ content: 'api', dynamic: false, spread: false }],
+				[{ content: 'guarded', dynamic: false, spread: false }],
+				[{ content: '...path', dynamic: true, spread: true }],
+			];
+
+			const pageMap = new Map([
+				[
+					guardedRouteData.component,
+					async () => ({
+						page: async () => ({
+							default: simplePage(),
+						}),
+					}),
+				],
+				[
+					notFoundRouteData.component,
+					async () => ({ page: async () => ({ default: notFoundPage }) }),
+				],
+			]);
+			const app = createAppWithMiddleware({
+				onRequest,
+				routes: [{ routeData: guardedRouteData }, { routeData: notFoundRouteData }],
+				pageMap,
+			});
+
+			const response = await app.render(new Request('http://localhost/api/guarded/secret'));
+
+			assert.equal(response.status, 404);
+			// Content-Length from middleware's original response must not leak into the error page response
+			assert.equal(
+				response.headers.get('Content-Length'),
+				null,
+				'Content-Length from middleware should be stripped during error page merge',
+			);
+			// Non-framing custom headers should still be preserved
+			assert.equal(response.headers.get('X-Custom'), 'keep-me');
+		});
+
+		it('should not preserve Transfer-Encoding from middleware when rendering 500 error page', async () => {
+			let callCount = 0;
+			const onRequest = async (ctx, next) => {
+				callCount++;
+				const response = await next();
+				if (callCount === 1 && ctx.url.pathname.startsWith('/api/error')) {
+					return new Response(null, {
+						status: 500,
+						headers: { 'Transfer-Encoding': 'chunked', 'X-Error-Source': 'middleware' },
+					});
+				}
+				return response;
+			};
+
+			const errorRouteData = createRouteData({
+				route: '/api/error/[...path]',
+				pathname: undefined,
+				segments: undefined,
+			});
+			errorRouteData.params = ['...path'];
+			errorRouteData.pattern = /^\/api\/error(?:\/(.*))?$/;
+			errorRouteData.pathname = undefined;
+			errorRouteData.segments = [
+				[{ content: 'api', dynamic: false, spread: false }],
+				[{ content: 'error', dynamic: false, spread: false }],
+				[{ content: '...path', dynamic: true, spread: true }],
+			];
+
+			const pageMap = new Map([
+				[
+					errorRouteData.component,
+					async () => ({
+						page: async () => ({
+							default: simplePage(),
+						}),
+					}),
+				],
+				[
+					serverErrorRouteData.component,
+					async () => ({ page: async () => ({ default: serverErrorPage }) }),
+				],
+			]);
+			const app = createAppWithMiddleware({
+				onRequest,
+				routes: [{ routeData: errorRouteData }, { routeData: serverErrorRouteData }],
+				pageMap,
+			});
+
+			const response = await app.render(new Request('http://localhost/api/error/test'));
+
+			assert.equal(response.status, 500);
+			// Transfer-Encoding from middleware's original response must not leak into the error page response
+			assert.equal(
+				response.headers.get('Transfer-Encoding'),
+				null,
+				'Transfer-Encoding from middleware should be stripped during error page merge',
+			);
+			// Non-framing custom headers should still be preserved
+			assert.equal(response.headers.get('X-Error-Source'), 'middleware');
+		});
+	});
+
 	describe('middleware with custom headers', () => {
 		it('should correctly set custom headers in middleware', async () => {
 			const onRequest = async (_ctx, next) => {

From 6414732a12a4dff3da224dfda56f0e26db0c98c4 Mon Sep 17 00:00:00 2001
From: Josh Soref <2119212+jsoref@users.noreply.github.com>
Date: Thu, 5 Mar 2026 11:24:33 -0500
Subject: [PATCH 5/9] Spelling (#15601)

* spelling: ; otherwise,

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: "..."

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: a new

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: a special

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: a

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: accessed

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: adapter

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: all bugs

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: also need to

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: an

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: and

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: astro

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: attributes

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: audited

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: available

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: baked

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: best-effort

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: build,

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: caches

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: can

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: cannot

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: case-insensitive

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: case.

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: cause

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: centauri

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: chevron

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: cloudflare

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: committed

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: components

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: condition to

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: config

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: consistently

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: convoluted

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: could not

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: desperately

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: devtoolbar

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: ensure

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: entrypoint

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: equals

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: example -- use rfc6761 domain

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: exist

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: external

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: failure

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: fall back

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: flexible

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: frontmatter

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: has no

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: highlighting

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: image

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: implicitly

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: import,

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: impractical

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: include

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: incorrect

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: infrastructure

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: initialization

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: issue

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: its

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: javascript

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: labelable

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: loaded

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: long and short

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: lorem

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: lowercase

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: maintenance

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: malformed

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: markdown

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: middleware

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: mistaken

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: necessary

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: neither-nor

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: nonexistent

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: occurred

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: occurrences

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: of

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: open graph

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: optimized

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: otherwise,

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: out-of-date

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: overridden

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: packages

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: parsed

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: past,

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: performance

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: plugin

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: pre-text

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: preexisting

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: prerendered

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: project

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: punctuation

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: re-export

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: redirects

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: registries

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: rehype

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: replacements

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: resolved

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: safeguard

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: serverless

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: set up

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: significantly

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: solely

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: some

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: stylesheet

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: surname

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: that is

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: that

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: the github

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: to be

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: to take effect

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: transitions

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: typescript

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: unnecessary

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: uppercase

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: use case

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: user's requested...to

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: whether or not

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: with

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: work around

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: workaround

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: your

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

---------

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
Co-authored-by: Armand Philippot <59021693+ArmandPhilippot@users.noreply.github.com>
---
 .changeset/clean-planets-flow.md              |  2 +-
 .changeset/full-poems-divide.md               |  2 +-
 .changeset/moody-owls-refuse.md               |  2 +-
 .changeset/social-kings-swim.md               |  2 +-
 CONTRIBUTING.md                               | 20 +++---
 STYLE_GUIDE.md                                |  2 +-
 examples/blog/README.md                       |  2 +-
 examples/ssr/src/components/AddToCart.svelte  |  4 +-
 examples/starlog/src/components/Header.astro  |  2 +-
 examples/starlog/src/components/SEO.astro     |  2 +-
 packages/astro-rss/CHANGELOG.md               |  2 +-
 packages/astro-rss/README.md                  |  4 +-
 packages/astro-rss/test/rss.test.js           |  2 +-
 packages/astro/CHANGELOG-v1.md                |  2 +-
 packages/astro/CHANGELOG-v2.md                | 16 ++---
 packages/astro/CHANGELOG-v3.md                |  8 +--
 packages/astro/CHANGELOG-v4.md                | 24 +++----
 packages/astro/CHANGELOG.md                   | 62 +++++++++----------
 packages/astro/components/ClientRouter.astro  |  6 +-
 packages/astro/e2e/astro-envs.test.js         |  4 +-
 packages/astro/e2e/dev-toolbar.test.js        |  2 +-
 .../fixtures/cloudflare/src/pages/index.astro |  4 +-
 .../fixtures/server-islands/src/pages/mdx.mdx |  2 +-
 .../src/pages/form-seven.astro                |  2 +-
 .../src/pages/transition-name.astro           |  4 +-
 packages/astro/e2e/view-transitions.test.js   |  6 +-
 packages/astro/src/assets/endpoint/dev.ts     |  2 +-
 .../core/filter-and-transform-font-faces.ts   |  2 +-
 .../astro/src/assets/fonts/providers/local.ts |  2 +-
 packages/astro/src/assets/services/service.ts |  2 +-
 packages/astro/src/assets/utils/etag.ts       |  2 +-
 packages/astro/src/assets/utils/imageKind.ts  |  4 +-
 .../astro/src/assets/utils/resolveImports.ts  |  4 +-
 packages/astro/src/container/index.ts         |  2 +-
 packages/astro/src/content/data-store.ts      |  2 +-
 packages/astro/src/content/types-generator.ts |  2 +-
 packages/astro/src/content/utils.ts           |  2 +-
 packages/astro/src/core/app/base.ts           |  2 +-
 .../src/core/app/createOutgoingHttpHeaders.ts |  2 +-
 packages/astro/src/core/app/pipeline.ts       |  2 +-
 .../astro/src/core/app/validate-headers.ts    |  2 +-
 packages/astro/src/core/build/common.ts       |  2 +-
 packages/astro/src/core/build/generate.ts     |  2 +-
 packages/astro/src/core/build/pipeline.ts     |  2 +-
 .../build/plugins/plugin-component-entry.ts   |  2 +-
 packages/astro/src/core/build/plugins/util.ts |  2 +-
 packages/astro/src/core/build/static-build.ts |  4 +-
 .../astro/src/core/config/schemas/base.ts     |  4 +-
 .../astro/src/core/config/schemas/refined.ts  |  2 +-
 .../astro/src/core/config/schemas/relative.ts |  2 +-
 packages/astro/src/core/create-vite.ts        |  2 +-
 packages/astro/src/core/errors/README.md      |  2 +-
 packages/astro/src/core/errors/errors-data.ts | 16 ++---
 packages/astro/src/core/errors/errors.ts      |  2 +-
 packages/astro/src/core/logger/core.ts        |  2 +-
 .../src/core/middleware/callMiddleware.ts     |  2 +-
 .../astro/src/core/middleware/vite-plugin.ts  |  2 +-
 packages/astro/src/core/render-context.ts     |  4 +-
 packages/astro/src/core/render/slots.ts       |  2 +-
 .../astro/src/core/routing/create-manifest.ts |  4 +-
 packages/astro/src/core/routing/match.ts      |  6 +-
 packages/astro/src/core/sync/index.ts         |  2 +-
 .../src/env/vite-plugin-import-meta-env.ts    |  2 +-
 packages/astro/src/i18n/index.ts              |  4 +-
 .../dev-toolbar/apps/audit/rules/a11y.ts      |  6 +-
 .../apps/audit/ui/audit-list-window.ts        |  2 +-
 .../dev-toolbar/apps/utils/highlight.ts       |  2 +-
 .../src/runtime/client/dev-toolbar/toolbar.ts |  2 +-
 packages/astro/src/runtime/client/visible.ts  |  2 +-
 packages/astro/src/runtime/server/endpoint.ts |  2 +-
 .../src/runtime/server/render/astro/render.ts |  2 +-
 .../astro/src/runtime/server/render/page.ts   |  2 +-
 .../astro/src/runtime/server/transition.ts    |  2 +-
 packages/astro/src/transitions/router.ts      |  8 +--
 .../astro/src/transitions/swap-functions.ts   |  2 +-
 packages/astro/src/types/astro.ts             |  2 +-
 packages/astro/src/types/public/config.ts     |  2 +-
 packages/astro/src/types/public/context.ts    |  6 +-
 .../astro/src/types/public/integrations.ts    |  2 +-
 packages/astro/src/types/public/internal.ts   |  2 +-
 packages/astro/src/types/public/manifest.ts   |  2 +-
 packages/astro/src/vite-plugin-astro/index.ts |  2 +-
 packages/astro/test/0-css.test.js             |  2 +-
 packages/astro/test/actions.test.js           |  4 +-
 packages/astro/test/astro-doctype.test.js     |  2 +-
 .../astro/test/astro-external-files.test.js   |  2 +-
 packages/astro/test/astro-sync.test.js        |  6 +-
 packages/astro/test/config-mode.test.js       |  2 +-
 packages/astro/test/core-image.test.js        |  4 +-
 .../src/layouts/WithDoctype.astro             |  2 +-
 .../src/layouts/WithoutDoctype.astro          |  2 +-
 .../core-image-svg/src/pages/index.astro      |  4 +-
 .../core-image/src/custom-endpoint.ts         |  2 +-
 .../src/pages/test.mjs                        |  2 +-
 .../fixtures/markdown/src/pages/realworld.md  |  4 +-
 .../server-islands/ssr/src/pages/test.mdx     |  2 +-
 .../src/components/async-components.jsx       |  2 +-
 .../src/pages/ssr-client-load.astro           |  2 +-
 .../src/pages/ssr-client-none.astro           |  2 +-
 packages/astro/test/hmr-new-page.test.js      |  2 +-
 .../astro/test/i18n-double-prefix.test.js     |  2 +-
 packages/astro/test/rewrite.test.js           |  2 +-
 packages/astro/test/route-guard.test.js       |  2 +-
 .../test/underscore-in-folder-name.test.js    |  2 +-
 packages/astro/test/units/app/node.test.js    |  4 +-
 .../test/units/assets/fonts/core.test.js      |  4 +-
 .../test/units/config/config-tsconfig.test.js |  2 +-
 .../test/units/config/config-validate.test.js |  2 +-
 packages/astro/test/units/dev/dev.test.js     |  2 +-
 .../astro/test/units/routing/manifest.test.js |  4 +-
 .../units/vite-plugin-astro/compile.test.js   |  2 +-
 packages/create-astro/CHANGELOG.md            |  6 +-
 packages/create-astro/create-astro.mjs        |  2 +-
 packages/create-astro/src/actions/context.ts  |  2 +-
 packages/create-astro/src/actions/template.ts |  4 +-
 .../test/template-processing.test.js          |  2 +-
 packages/db/CHANGELOG.md                      |  2 +-
 packages/db/test/basics.test.js               |  4 +-
 packages/integrations/cloudflare/CHANGELOG.md | 30 ++++-----
 packages/integrations/cloudflare/README.md    |  2 +-
 .../vite-plugin/src/pages/index.astro         |  4 +-
 .../markdoc/src/content-entry-type.ts         |  2 +-
 packages/integrations/markdoc/src/utils.ts    |  2 +-
 .../src/content/blog/components.mdoc          | 10 +--
 .../markdoc/test/render-html.test.js          | 10 +--
 packages/integrations/mdx/CHANGELOG.md        |  6 +-
 packages/integrations/mdx/src/README.md       |  2 +-
 .../src/pages/index.mdx                       |  0
 .../mdx/test/mdx-plus-react.test.js           |  2 +-
 .../mdx/test/mdx-script-style-raw.test.js     |  4 +-
 .../mdx/test/mdx-syntax-highlighting.test.js  |  2 +-
 packages/integrations/netlify/CHANGELOG.md    |  6 +-
 packages/integrations/netlify/src/index.ts    |  4 +-
 packages/integrations/node/CHANGELOG.md       | 12 ++--
 packages/integrations/partytown/src/sirv.ts   |  2 +-
 packages/integrations/preact/src/client.ts    |  2 +-
 packages/integrations/react/CHANGELOG.md      |  2 +-
 packages/integrations/sitemap/CHANGELOG.md    |  4 +-
 packages/integrations/vercel/CHANGELOG.md     |  6 +-
 .../vercel/src/image/build-service.ts         |  2 +-
 .../vercel/src/image/dev-service.ts           |  2 +-
 .../integrations/vercel/src/image/shared.ts   | 10 +--
 .../integrations/vercel/test/static.test.js   |  2 +-
 .../language-server/CHANGELOG.md              |  8 +--
 .../language-server/src/core/parseHTML.ts     |  2 +-
 .../src/languageServerPlugin.ts               |  4 +-
 .../src/plugins/typescript-addons/snippets.ts |  2 +-
 .../src/plugins/typescript/utils.ts           |  2 +-
 .../language-server/src/plugins/yaml.ts       |  4 +-
 packages/language-tools/vscode/CHANGELOG.md   |  2 +-
 packages/language-tools/vscode/package.json   |  2 +-
 packages/markdown/remark/CHANGELOG.md         |  6 +-
 packages/markdown/remark/src/shiki.ts         |  2 +-
 packages/upgrade/src/actions/verify.ts        |  2 +-
 packages/upgrade/upgrade.mjs                  |  2 +-
 scripts/cmd/test.js                           |  2 +-
 156 files changed, 308 insertions(+), 308 deletions(-)
 rename packages/integrations/mdx/test/fixtures/{mdx-syntax-hightlighting => mdx-syntax-highlighting}/src/pages/index.mdx (100%)

diff --git a/.changeset/clean-planets-flow.md b/.changeset/clean-planets-flow.md
index 395589d4f9a8..40804e46970e 100644
--- a/.changeset/clean-planets-flow.md
+++ b/.changeset/clean-planets-flow.md
@@ -2,4 +2,4 @@
 'astro': patch
 ---
 
-Improves rendering by preserving `hidden="until-found"` value in attribues
+Improves rendering by preserving `hidden="until-found"` value in attributes
diff --git a/.changeset/full-poems-divide.md b/.changeset/full-poems-divide.md
index 8abe7fb50c0d..a778d93c242b 100644
--- a/.changeset/full-poems-divide.md
+++ b/.changeset/full-poems-divide.md
@@ -3,4 +3,4 @@
 'astro': patch
 ---
 
-Fixes a bug where the Astro, with the Cloudlfare integration, couldn't correctly serve certain routes in the development server.
+Fixes a bug where the Astro, with the Cloudflare integration, couldn't correctly serve certain routes in the development server.
diff --git a/.changeset/moody-owls-refuse.md b/.changeset/moody-owls-refuse.md
index f3fcdf20bb43..4c08f1fd04b3 100644
--- a/.changeset/moody-owls-refuse.md
+++ b/.changeset/moody-owls-refuse.md
@@ -2,4 +2,4 @@
 '@astrojs/cloudflare': patch
 ---
 
-Removes unneccessary warning about sharp from being printed at start of dev server and build
+Removes unnecessary warning about sharp from being printed at start of dev server and build
diff --git a/.changeset/social-kings-swim.md b/.changeset/social-kings-swim.md
index 778e12f63253..47db520798a3 100644
--- a/.changeset/social-kings-swim.md
+++ b/.changeset/social-kings-swim.md
@@ -2,4 +2,4 @@
 'astro': patch
 ---
 
-Fixes an issue where the internal perfomance timers weren't correctly updated to reflect new build pipeline.
+Fixes an issue where the internal performance timers weren't correctly updated to reflect new build pipeline.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 984929a52f32..a6c860cd0ac6 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -116,7 +116,7 @@ pnpm run test
 pnpm run test:match "$STRING_MATCH"
 # run tests on another package
 # (example - `pnpm --filter @astrojs/rss run test` runs `packages/astro-rss/test/rss.test.js`)
-pnpm --filter $STRING_MATCH run test
+pnpm --filter "$STRING_MATCH" run test
 ```
 
 Most tests use [`mocha`](https://mochajs.org) as the test runner. We're slowly migrating to use [`node:test`](https://nodejs.org/api/test.html) instead through the custom [`astro-scripts test`](./scripts/cmd/test.js) command. For packages that use `node:test`, you can run these commands in their directories:
@@ -165,7 +165,7 @@ node --test --test-only test/astro-basic.test.js
 
 #### Debugging tests in CI
 
-There might be occasions where some tests fail in certain CI runs due to some timeout issue. If this happens, it will be very difficult to understand which file cause the timeout. That's caused by come quirks of the Node.js test runner combined with our architecture.
+There might be occasions where some tests fail in certain CI runs due to some timeout issue. If this happens, it will be very difficult to understand which file cause the timeout. That's caused by some quirks of the Node.js test runner combined with our architecture.
 
 To understand which file causes the issue, you can modify the `test` script inside the `package.json` by adding the `--parallel` option:
 
@@ -176,7 +176,7 @@ To understand which file causes the issue, you can modify the `test` script insi
 }
 ```
 
-Save the change and **push it** to your PR. This change will make the test CI slower, but it will allow to see which files causes the timeout. Once you fixed the issue **revert the change and push it**.
+Save the change and **push it** to your PR. This change will make the test CI slower, but it will allow to see which files cause the timeout. Once you fixed the issue **revert the change and push it**.
 
 #### E2E tests
 
@@ -194,7 +194,7 @@ pnpm run test:e2e:match "$STRING_MATCH"
 
 Any tests for `astro build` output should use the main `mocha` tests rather than E2E - these tests will run faster than having Playwright start the `astro preview` server.
 
-If a test needs to validate what happens on the page after it's loading in the browser, that's a perfect use for E2E dev server tests, i.e. to verify that hot-module reloading works in `astro dev` or that components were client hydrated and are interactive.
+If a test needs to validate what happens on the page after it's loaded in the browser, that's a perfect use for E2E dev server tests, i.e. to verify that hot-module reloading works in `astro dev` or that components were client hydrated and are interactive.
 
 #### Creating tests
 
@@ -203,8 +203,8 @@ When creating new tests, it's best to reference other existing test files and re
 - When re-using a fixture multiple times with different configurations, you should also configure unique `outDir`, `build.client`, and `build.server` values so the build output runtime isn't cached and shared by ESM between test runs.
 
 > [!IMPORTANT]
-> If tests start to fail for no apparent reason, the first thing to look at the `outDir` configuration. As build cache artifacts between runs, different tests might end up sharing some of the emitted modules.
-> To avoid this possible overlap, **make sure to add a custom `outDir` to your test case**
+> If tests start to fail for no apparent reason, the first thing to look at the `outDir` configuration. As build caches artifacts between runs, different tests might end up sharing some of the emitted modules.
+> To avoid this possible overlap, **make sure to add a custom `outDir` to your test case**.
 >
 > ```js
 > await loadFixture({
@@ -259,7 +259,7 @@ To run only a specific benchmark on CI, add its name after the command in your c
 
 ## For maintainers
 
-This paragraph provides some guidance to the maintainers of the monorepo. The guidelines explained here aren't necessarily followed by other repositories of the same GitHub organisation.
+This paragraph provides some guidance to the maintainers of the monorepo. The guidelines explained here aren't necessarily followed by other repositories of the GitHub organisation.
 
 ### Issue triaging workflow
 
@@ -301,7 +301,7 @@ The Astro project has five levels of priority to issues, where `p5` is the highe
 - `p4`: the bug impacts _many_ Astro projects, it doesn't have a workaround but Astro is still stable/usable.
 - `p3`: any bug that doesn't fall in the `p4` or `p5` category. If the documentation doesn't cover
   the case reported by the user, it's useful to initiate a discussion via the `"needs discussion"` label. Seek opinions from OP and other maintainers.
-- `p2`: all the bugs that have workarounds.
+- `p2`: all bugs that have workarounds.
 - `p1`: very minor bug, that impacts a small amount of users. Sometimes it's an edge case and it's easy to fix. Very useful if you want to assign the fix to a first-time contributor.
 
 > [!IMPORTANT]
@@ -312,7 +312,7 @@ Assigning labels isn't always easy and many times the distinction between the di
 - When assigning a `p2`, **always** add a comment that explains the workaround. If a workaround isn't provided, ping the person that assigned the label and ask them to provide one.
 - Astro has **many** features, but there are some that have a larger impact than others: development server, build command, HMR (TBD, we don't have a page that explains expectations of HMR in Astro), **evident** regressions in performance.
 - In case the number of reactions of an issue grows, the number of users affected grows, or a discussion uncovers some insights that weren't clear before, it's OK to change the priority of the issue. The maintainer **should** provide an explanation when assigning a different label.
-  As with any other contribution, triaging is voluntary and best-efforts. We welcome and appreciate all the help you're happy to give (including reading this!) and nothing more. If you are not confident about an issue, you are welcome to leave an issue untriaged for someone who would have more context, or to bring it to their attention.
+  As with any other contribution, triaging is voluntary and best-effort. We welcome and appreciate all the help you're happy to give (including reading this!) and nothing more. If you are not confident about an issue, you are welcome to leave an issue untriaged for someone who would have more context, or to bring it to their attention.
 
 ### Preview releases
 
@@ -348,7 +348,7 @@ Understanding in which environment code runs, and at which stage in the process,
 
 To make it easier to test code, try decoupling **business logic** from **infrastructure**:
 
-- **Infrastucture** is code that depends on external systems and/or requires aspecial environment to run. For example: DB calls, file system, randomness etc...
+- **Infrastructure** is code that depends on external systems and/or requires a special environment to run. For example: DB calls, file system, randomness etc...
 - **Business logic** (or _core logic_ or _domain_) is the rest. It's pure logic that's easy to run from anywhere.
 
 That means avoiding side-effects by making external dependencies explicit. This often means passing more things as arguments.
diff --git a/STYLE_GUIDE.md b/STYLE_GUIDE.md
index 6d0cc9e26a8f..69b69660481c 100644
--- a/STYLE_GUIDE.md
+++ b/STYLE_GUIDE.md
@@ -45,7 +45,7 @@ For example: "This is clean code" is a subjective point and should have limited
 
 In contrast: "Tabs are more accessible than spaces" is an objective point and should be strongly considered in a theoretical style discussion on tabs vs. spaces. (Fred: Believe me, I write this as someone who personally prefers spaces over tabs in my own code!)
 
-Sometimes, not everyone will agree on style changes and 100% consensus is impossible. This is a condition commonly referred to as bike-shedding. If consensus can not be reached, a simple majority vote among core contributors (L3) will suffice.
+Sometimes, not everyone will agree on style changes and 100% consensus is impossible. This is a condition commonly referred to as bike-shedding. If consensus cannot be reached, a simple majority vote among core contributors (L3) will suffice.
 
 _Note: This process is new, we are still figuring it out! This process will be moved into GOVERNANCE.md when finalized._
 
diff --git a/examples/blog/README.md b/examples/blog/README.md
index 1e88fbf226fc..4307d60ba3c9 100644
--- a/examples/blog/README.md
+++ b/examples/blog/README.md
@@ -24,7 +24,7 @@ Features:
 
 - ✅ Minimal styling (make it your own!)
 - ✅ 100/100 Lighthouse performance
-- ✅ SEO-friendly with canonical URLs and OpenGraph data
+- ✅ SEO-friendly with canonical URLs and Open Graph data
 - ✅ Sitemap support
 - ✅ RSS Feed support
 - ✅ Markdown & MDX support
diff --git a/examples/ssr/src/components/AddToCart.svelte b/examples/ssr/src/components/AddToCart.svelte
index 9e6c8ba866e8..47136c1dcaa8 100644
--- a/examples/ssr/src/components/AddToCart.svelte
+++ b/examples/ssr/src/components/AddToCart.svelte
@@ -34,7 +34,7 @@ button:hover {
   transform:scale(1.1);
 }
 
-.pretext {
+.pre-text {
   color:#fff;
   background:#0652DD;
   position:absolute;
@@ -50,5 +50,5 @@ button:hover {
 }
 </style>
 <button click={addToCart}>
-	<span class="pretext">Add to cart</span>
+	<span class="pre-text">Add to cart</span>
 </button>
diff --git a/examples/starlog/src/components/Header.astro b/examples/starlog/src/components/Header.astro
index bbdaf1e70c10..e74f30f2aff8 100644
--- a/examples/starlog/src/components/Header.astro
+++ b/examples/starlog/src/components/Header.astro
@@ -42,7 +42,7 @@ import { SiteTitle } from '../consts';
 			</a>
 		</h2>
 		<div class="links">
-			<a href="mailto:contactus@yourwebsite.com">Contact</a>
+			<a href="mailto:contactus@yourwebsite.example">Contact</a>
 		</div>
 	</nav>
 </header>
diff --git a/examples/starlog/src/components/SEO.astro b/examples/starlog/src/components/SEO.astro
index 8816bd7bee27..2ceebb4c9d6d 100644
--- a/examples/starlog/src/components/SEO.astro
+++ b/examples/starlog/src/components/SEO.astro
@@ -69,7 +69,7 @@ function normalizeImageUrl(image: string | ImageMetadata) {
 <link rel="canonical" href={canonicalURL} />
 <meta name="description" content={description} />
 
-<!-- OpenGraph Tags -->
+<!-- Open Graph Tags -->
 <meta property="og:title" content={og.title} />
 <meta property="og:type" content={og.type} />
 <meta property="og:url" content={canonicalURL} />
diff --git a/packages/astro-rss/CHANGELOG.md b/packages/astro-rss/CHANGELOG.md
index ae1e8cd21725..2cc092daad9c 100644
--- a/packages/astro-rss/CHANGELOG.md
+++ b/packages/astro-rss/CHANGELOG.md
@@ -250,7 +250,7 @@
 
 ### Patch Changes
 
-- [#6614](https://github.com/withastro/astro/pull/6614) [`b1b9b1390`](https://github.com/withastro/astro/commit/b1b9b1390f95c6ae91389eba55f7563b911bccc7) Thanks [@aivarsliepa](https://github.com/aivarsliepa)! - Fixes `RSSOptions` type error when using `strictest` Typescript tsconfig
+- [#6614](https://github.com/withastro/astro/pull/6614) [`b1b9b1390`](https://github.com/withastro/astro/commit/b1b9b1390f95c6ae91389eba55f7563b911bccc7) Thanks [@aivarsliepa](https://github.com/aivarsliepa)! - Fixes `RSSOptions` type error when using `strictest` TypeScript tsconfig
 
 ## 2.3.1
 
diff --git a/packages/astro-rss/README.md b/packages/astro-rss/README.md
index de897d476029..7a660f46e3d1 100644
--- a/packages/astro-rss/README.md
+++ b/packages/astro-rss/README.md
@@ -49,7 +49,7 @@ An `RSSFeedItem` is a single item in the list of items in your feed. An example
 ```js
 const item = {
   title: 'Alpha Centauri: so close you can touch it',
-  link: '/blog/alpha-centuari',
+  link: '/blog/alpha-centauri',
   pubDate: new Date('2023-06-04'),
   description:
     'Alpha Centauri is a triple star system, containing Proxima Centauri, the closest star to our sun at only 4.24 light-years away.',
@@ -116,7 +116,7 @@ An object that defines the `title` and `url` of the original feed for items that
 ```js
 const item = {
   title: 'Alpha Centauri: so close you can touch it',
-  link: '/blog/alpha-centuari',
+  link: '/blog/alpha-centauri',
   pubDate: new Date('2023-06-04'),
   description:
     'Alpha Centauri is a triple star system, containing Proxima Centauri, the closest star to our sun at only 4.24 light-years away.',
diff --git a/packages/astro-rss/test/rss.test.js b/packages/astro-rss/test/rss.test.js
index 63c91887d283..a52caf45c361 100644
--- a/packages/astro-rss/test/rss.test.js
+++ b/packages/astro-rss/test/rss.test.js
@@ -105,7 +105,7 @@ describe('getRssString', () => {
 		assertXmlDeepEqual(str, validXmlWithContentResult);
 	});
 
-	it('should generate on valid RSSFeedItem array with missing date', async () => {
+	it('should generate on valid RSSFeedItem array that is missing date', async () => {
 		const str = await getRssString({
 			title,
 			description,
diff --git a/packages/astro/CHANGELOG-v1.md b/packages/astro/CHANGELOG-v1.md
index 1ebd4a598179..57c7c7a7bb5b 100644
--- a/packages/astro/CHANGELOG-v1.md
+++ b/packages/astro/CHANGELOG-v1.md
@@ -815,7 +815,7 @@
 
 ### Patch Changes
 
-- [#4768](https://github.com/withastro/astro/pull/4768) [`9a59e24e0`](https://github.com/withastro/astro/commit/9a59e24e0250617333c1a0fd89b7d52fd1c829de) Thanks [@matthewp](https://github.com/matthewp)! - nsure before-hydration is only loaded when used
+- [#4768](https://github.com/withastro/astro/pull/4768) [`9a59e24e0`](https://github.com/withastro/astro/commit/9a59e24e0250617333c1a0fd89b7d52fd1c829de) Thanks [@matthewp](https://github.com/matthewp)! - Ensure before-hydration is only loaded when used
 
 - [#4759](https://github.com/withastro/astro/pull/4759) [`fc885eaea`](https://github.com/withastro/astro/commit/fc885eaea1f08429599c0ab4697ab6382f3d7fa4) Thanks [@matthewp](https://github.com/matthewp)! - Read jsxImportSource from tsconfig
 
diff --git a/packages/astro/CHANGELOG-v2.md b/packages/astro/CHANGELOG-v2.md
index d24276f25e8c..c3dd4e4519dd 100644
--- a/packages/astro/CHANGELOG-v2.md
+++ b/packages/astro/CHANGELOG-v2.md
@@ -268,7 +268,7 @@
 
 - [#7786](https://github.com/withastro/astro/pull/7786) [`188eeddd4`](https://github.com/withastro/astro/commit/188eeddd47a61e04639670496924c37866180749) Thanks [@matthewp](https://github.com/matthewp)! - Execute scripts when navigating to a new page.
 
-  When navigating to an new page with client-side navigation, scripts are executed (and re-executed) so that any new scripts on the incoming page are run and the DOM can be updated.
+  When navigating to a new page with client-side navigation, scripts are executed (and re-executed) so that any new scripts on the incoming page are run and the DOM can be updated.
 
   However, `type=module` scripts never re-execute in Astro, and will not do so in client-side routing. To support cases where you want to modify the DOM, a new `astro:load` event listener been added:
 
@@ -550,7 +550,7 @@
 
 ### Patch Changes
 
-- [#7527](https://github.com/withastro/astro/pull/7527) [`9e2426f75`](https://github.com/withastro/astro/commit/9e2426f75637a6318961f483de90b635f3fdadeb) Thanks [@natemoo-re](https://github.com/natemoo-re)! - Default registry logic to fallback to NPM if registry command fails (sorry, Bun users!)
+- [#7527](https://github.com/withastro/astro/pull/7527) [`9e2426f75`](https://github.com/withastro/astro/commit/9e2426f75637a6318961f483de90b635f3fdadeb) Thanks [@natemoo-re](https://github.com/natemoo-re)! - Default registry logic to fall back to NPM if registry command fails (sorry, Bun users!)
 
 - [#7542](https://github.com/withastro/astro/pull/7542) [`cdc28326c`](https://github.com/withastro/astro/commit/cdc28326cf21f305924363e9c8c02ce54b6ff895) Thanks [@natemoo-re](https://github.com/natemoo-re)! - Fix bug when using `define:vars` with a `style` object
 
@@ -1087,7 +1087,7 @@
 
 ### Patch Changes
 
-- [#7009](https://github.com/withastro/astro/pull/7009) [`1d4db68e6`](https://github.com/withastro/astro/commit/1d4db68e64b7c3faf8863bf67f8332aa28e2f34b) Thanks [@Princesseuh](https://github.com/Princesseuh)! - Fix types from `astro/client` not working properly due to `client-base.d.ts` being an non-ambient declaration file
+- [#7009](https://github.com/withastro/astro/pull/7009) [`1d4db68e6`](https://github.com/withastro/astro/commit/1d4db68e64b7c3faf8863bf67f8332aa28e2f34b) Thanks [@Princesseuh](https://github.com/Princesseuh)! - Fix types from `astro/client` not working properly due to `client-base.d.ts` being a non-ambient declaration file
 
 - [#7010](https://github.com/withastro/astro/pull/7010) [`e9f0dd9b4`](https://github.com/withastro/astro/commit/e9f0dd9b473c4793c958a6c81e743fd9b02b4f64) Thanks [@ematipico](https://github.com/ematipico)! - Call `next()` without return anything should work, with a warning
 
@@ -1361,7 +1361,7 @@
 
 - [#6675](https://github.com/withastro/astro/pull/6675) [`1f783e320`](https://github.com/withastro/astro/commit/1f783e32075c20b13063599696644f5d47b75d8d) Thanks [@matthewp](https://github.com/matthewp)! - Prevent frontmatter errors from crashing the dev server
 
-- [#6688](https://github.com/withastro/astro/pull/6688) [`2e92e9aa9`](https://github.com/withastro/astro/commit/2e92e9aa976735c3ddb647152bb9c4850136e386) Thanks [@JohannesKlauss](https://github.com/JohannesKlauss)! - Add a additional check for `null` on the `req.body` check in `NodeApp.render`.
+- [#6688](https://github.com/withastro/astro/pull/6688) [`2e92e9aa9`](https://github.com/withastro/astro/commit/2e92e9aa976735c3ddb647152bb9c4850136e386) Thanks [@JohannesKlauss](https://github.com/JohannesKlauss)! - Add an additional check for `null` on the `req.body` check in `NodeApp.render`.
 
 - [#6578](https://github.com/withastro/astro/pull/6578) [`adecda7d6`](https://github.com/withastro/astro/commit/adecda7d6009793c5d20519a997e3b7afb08ad57) Thanks [@wulinsheng123](https://github.com/wulinsheng123)! - add new flag with open for dev and preview
 
@@ -1755,8 +1755,8 @@
 
 - [#6052](https://github.com/withastro/astro/pull/6052) [`9793f19ec`](https://github.com/withastro/astro/commit/9793f19ecd4e64cbf3140454fe52aeee2c22c8c9) Thanks [@mayank99](https://github.com/mayank99)! - Error overlay will now show the error's `cause` if available.
 
-- [#6070](https://github.com/withastro/astro/pull/6070) [`f91615f5c`](https://github.com/withastro/astro/commit/f91615f5c04fde36f115dad9110dd75254efd61d) Thanks [@AirBorne04](https://github.com/AirBorne04)! - \* safe guard against TextEncode.encode(HTMLString) [errors on vercel edge]
-  - safe guard against html.replace when html is undefined
+- [#6070](https://github.com/withastro/astro/pull/6070) [`f91615f5c`](https://github.com/withastro/astro/commit/f91615f5c04fde36f115dad9110dd75254efd61d) Thanks [@AirBorne04](https://github.com/AirBorne04)! - \* safeguard against TextEncode.encode(HTMLString) [errors on vercel edge]
+  - safeguard against html.replace when html is undefined
 
 - [#6064](https://github.com/withastro/astro/pull/6064) [`2fb72c887`](https://github.com/withastro/astro/commit/2fb72c887f71c0a69ab512870d65b8c867774766) Thanks [@bholmesdev](https://github.com/bholmesdev)! - Apply MDX `components` export when rendering as a content collection entry
 
@@ -1853,7 +1853,7 @@
   }
   ```
 
-  This differs from previous behavior, where a Markdown file's frontmatter would _always_ override frontmatter injected via remark or reype.
+  This differs from previous behavior, where a Markdown file's frontmatter would _always_ override frontmatter injected via remark or rehype.
 
 - [#5891](https://github.com/withastro/astro/pull/5891) [`05caf445d`](https://github.com/withastro/astro/commit/05caf445d4d2728f1010aeb2179a9e756c2fd17d) Thanks [@bholmesdev](https://github.com/bholmesdev)! - Remove deprecated Markdown APIs from Astro v0.X. This includes `getHeaders()`, the `.astro` property for layouts, and the `rawContent()` and `compiledContent()` error messages for MDX.
 
@@ -2481,7 +2481,7 @@
   }
   ```
 
-  This differs from previous behavior, where a Markdown file's frontmatter would _always_ override frontmatter injected via remark or reype.
+  This differs from previous behavior, where a Markdown file's frontmatter would _always_ override frontmatter injected via remark or rehype.
 
 - [#5728](https://github.com/withastro/astro/pull/5728) [`8fb28648f`](https://github.com/withastro/astro/commit/8fb28648f66629741cb976bfe34ccd9d8f55661e) Thanks [@natemoo-re](https://github.com/natemoo-re)! - The previously experimental features `--experimental-error-overlay` and `--experimental-prerender`, both added in v1.7.0, are now the default.
 
diff --git a/packages/astro/CHANGELOG-v3.md b/packages/astro/CHANGELOG-v3.md
index 06133bd50189..8c4e914fe0f5 100644
--- a/packages/astro/CHANGELOG-v3.md
+++ b/packages/astro/CHANGELOG-v3.md
@@ -146,7 +146,7 @@
 
 - [#9121](https://github.com/withastro/astro/pull/9121) [`f4efd1c80`](https://github.com/withastro/astro/commit/f4efd1c808476c7e60fe00fcfb86276cf14fee79) Thanks [@peng](https://github.com/peng)! - Adds a warning if `astro add` fetches a package but returns a non-404 status
 
-- [#9142](https://github.com/withastro/astro/pull/9142) [`7d55cf68d`](https://github.com/withastro/astro/commit/7d55cf68d89cb46bfb89a109b09af61be8431c89) Thanks [@ematipico](https://github.com/ematipico)! - Consistely emit fallback routes in the correct folders.
+- [#9142](https://github.com/withastro/astro/pull/9142) [`7d55cf68d`](https://github.com/withastro/astro/commit/7d55cf68d89cb46bfb89a109b09af61be8431c89) Thanks [@ematipico](https://github.com/ematipico)! - Consistently emit fallback routes in the correct folders.
 
 - [#9119](https://github.com/withastro/astro/pull/9119) [`306781795`](https://github.com/withastro/astro/commit/306781795d5f4b755bbdf650a937f1f3c00030bd) Thanks [@ematipico](https://github.com/ematipico)! - Fix a flaw in the i18n fallback logic, where the routes didn't preserve their metadata, such as hoisted scripts
 
@@ -166,7 +166,7 @@
 
 ### Patch Changes
 
-- [#9085](https://github.com/withastro/astro/pull/9085) [`fc66ecff1`](https://github.com/withastro/astro/commit/fc66ecff18a20dd436026cb8e75bcc8b5ab0e681) Thanks [@ematipico](https://github.com/ematipico)! - When redirecting to the default root locale, Astro middleare should take into consideration the value of `trailingSlash`
+- [#9085](https://github.com/withastro/astro/pull/9085) [`fc66ecff1`](https://github.com/withastro/astro/commit/fc66ecff18a20dd436026cb8e75bcc8b5ab0e681) Thanks [@ematipico](https://github.com/ematipico)! - When redirecting to the default root locale, Astro middleware should take into consideration the value of `trailingSlash`
 
 - [#9067](https://github.com/withastro/astro/pull/9067) [`c6e449c5b`](https://github.com/withastro/astro/commit/c6e449c5b3e6e994b362b9ce441c8a1a81129f23) Thanks [@danielhajduk](https://github.com/danielhajduk)! - Fixes display of debug messages when using the `--verbose` flag
 
@@ -403,7 +403,7 @@
 
 ### Patch Changes
 
-- [#9016](https://github.com/withastro/astro/pull/9016) [`1ecc9aa32`](https://github.com/withastro/astro/commit/1ecc9aa3240b79a3879b1329aa4f671d80e87649) Thanks [@Princesseuh](https://github.com/Princesseuh)! - Add ability to "Click to go editor" on auditted elements in the dev overlay
+- [#9016](https://github.com/withastro/astro/pull/9016) [`1ecc9aa32`](https://github.com/withastro/astro/commit/1ecc9aa3240b79a3879b1329aa4f671d80e87649) Thanks [@Princesseuh](https://github.com/Princesseuh)! - Add ability to "Click to go editor" on audited elements in the dev overlay
 
 - [#9029](https://github.com/withastro/astro/pull/9029) [`29b83e9e4`](https://github.com/withastro/astro/commit/29b83e9e4b906cc0b5d92fae854fb350fc2be7c8) Thanks [@Princesseuh](https://github.com/Princesseuh)! - Use UInt8Array instead of Buffer for both the input and return values of the `transform()` hook of the Image Service API to ensure compatibility with non-Node runtimes.
 
@@ -873,7 +873,7 @@
 
 - [#8484](https://github.com/withastro/astro/pull/8484) [`78b82bb39`](https://github.com/withastro/astro/commit/78b82bb3929bee5d8d9bd32d65374956ddb05859) Thanks [@bb010g](https://github.com/bb010g)! - fix(astro): add support for `src/content/config.mts` files
 
-- [#8504](https://github.com/withastro/astro/pull/8504) [`5e1099f68`](https://github.com/withastro/astro/commit/5e1099f686abcc7026bd4fa74727f3b311c6d6d6) Thanks [@ematipico](https://github.com/ematipico)! - Minify the HTML of the redicts emitted during the build.
+- [#8504](https://github.com/withastro/astro/pull/8504) [`5e1099f68`](https://github.com/withastro/astro/commit/5e1099f686abcc7026bd4fa74727f3b311c6d6d6) Thanks [@ematipico](https://github.com/ematipico)! - Minify the HTML of the redirects emitted during the build.
 
 - [#8480](https://github.com/withastro/astro/pull/8480) [`644825845`](https://github.com/withastro/astro/commit/644825845c11c8d100a9b0d16b69a23c165c529e) Thanks [@yamanoku](https://github.com/yamanoku)! - Do not add type="text/css" to inline style tag
 
diff --git a/packages/astro/CHANGELOG-v4.md b/packages/astro/CHANGELOG-v4.md
index 447c8b3d0ed5..32abbf44eba1 100644
--- a/packages/astro/CHANGELOG-v4.md
+++ b/packages/astro/CHANGELOG-v4.md
@@ -4,7 +4,7 @@
 
 - [#12542](https://github.com/withastro/astro/pull/12542) [`65e50eb`](https://github.com/withastro/astro/commit/65e50eb7b6d7b10a193bba7d292804ac0e55be18) Thanks [@kadykov](https://github.com/kadykov)! - Fix JPEG image size determination
 
-- [#12525](https://github.com/withastro/astro/pull/12525) [`cf0d8b0`](https://github.com/withastro/astro/commit/cf0d8b08a0f16bba7310d1a92c82b5a276682e8c) Thanks [@ematipico](https://github.com/ematipico)! - Fixes an issue where with `i18n` enabled, Astro couldn't render the `404.astro` component for non-existent routes.
+- [#12525](https://github.com/withastro/astro/pull/12525) [`cf0d8b0`](https://github.com/withastro/astro/commit/cf0d8b08a0f16bba7310d1a92c82b5a276682e8c) Thanks [@ematipico](https://github.com/ematipico)! - Fixes an issue where with `i18n` enabled, Astro couldn't render the `404.astro` component for nonexistent routes.
 
 ## 4.16.15
 
@@ -770,7 +770,7 @@
 
 - [#11360](https://github.com/withastro/astro/pull/11360) [`a79a8b0`](https://github.com/withastro/astro/commit/a79a8b0230b06ed32ce1802f2a5f84a6cf92dbe7) Thanks [@ascorbic](https://github.com/ascorbic)! - Adds a new [`injectTypes()` utility](https://docs.astro.build/en/reference/integrations-reference/#injecttypes-options) to the Integration API and refactors how type generation works
 
-  Use `injectTypes()` in the `astro:config:done` hook to inject types into your user's project by adding a new a `*.d.ts` file.
+  Use `injectTypes()` in the `astro:config:done` hook to inject types into your user's project by adding a new `*.d.ts` file.
 
   The `filename` property will be used to generate a file at `/.astro/integrations/<normalized_integration_name>/<normalized_filename>.d.ts` and must end with `".d.ts"`.
 
@@ -1236,7 +1236,7 @@
   </form>
   ```
 
-  You may also construct form action URLs using string concatenation, or by using the `URL()` constructor, with the an action's `.queryString` property:
+  You may also construct form action URLs using string concatenation, or by using the `URL()` constructor, with an action's `.queryString` property:
 
   ```astro
   ---
@@ -1589,7 +1589,7 @@
 
 - [#11352](https://github.com/withastro/astro/pull/11352) [`a55ee02`](https://github.com/withastro/astro/commit/a55ee0268e1ca22597e9b5e6d1f24b4f28ad978b) Thanks [@ematipico](https://github.com/ematipico)! - Fixes an issue where the rewrites didn't update the status code when using manual i18n routing.
 
-- [#11388](https://github.com/withastro/astro/pull/11388) [`3a223b4`](https://github.com/withastro/astro/commit/3a223b4811708cc93ebb27706118c1723e1fc013) Thanks [@mingjunlu](https://github.com/mingjunlu)! - Adjusts the color of punctuations in error overlay.
+- [#11388](https://github.com/withastro/astro/pull/11388) [`3a223b4`](https://github.com/withastro/astro/commit/3a223b4811708cc93ebb27706118c1723e1fc013) Thanks [@mingjunlu](https://github.com/mingjunlu)! - Adjusts the color of punctuation in error overlay.
 
 - [#11369](https://github.com/withastro/astro/pull/11369) [`e6de11f`](https://github.com/withastro/astro/commit/e6de11f4a941e29123da3714e5b8f17d25744f0f) Thanks [@bluwy](https://github.com/bluwy)! - Fixes attribute rendering for non-boolean attributes with boolean values
 
@@ -2571,7 +2571,7 @@
   }
   ```
 
-  This is a backwards compatible change and your your existing dev toolbar apps will continue to function. However, we encourage you to build your apps with the new helpers, following the [updated Dev Toolbar API documentation](https://docs.astro.build/en/reference/dev-toolbar-app-reference/).
+  This is a backwards compatible change and your existing dev toolbar apps will continue to function. However, we encourage you to build your apps with the new helpers, following the [updated Dev Toolbar API documentation](https://docs.astro.build/en/reference/dev-toolbar-app-reference/).
 
 - [#10734](https://github.com/withastro/astro/pull/10734) [`6fc4c0e`](https://github.com/withastro/astro/commit/6fc4c0e420da7629b4cfc28ee7efce1d614447be) Thanks [@Princesseuh](https://github.com/Princesseuh)! - Astro will now automatically check for updates when you run the dev server. If a new version is available, a message will appear in the terminal with instructions on how to update. Updates will be checked once per 10 days, and the message will only appear if the project is multiple versions behind the latest release.
 
@@ -2898,7 +2898,7 @@
 
 - [#10438](https://github.com/withastro/astro/pull/10438) [`5b48cc0fc8383b0659a595afd3a6ee28b28779c3`](https://github.com/withastro/astro/commit/5b48cc0fc8383b0659a595afd3a6ee28b28779c3) Thanks [@bholmesdev](https://github.com/bholmesdev)! - Generate Astro DB types when running `astro sync`.
 
-- [#10456](https://github.com/withastro/astro/pull/10456) [`1900a8f9bc337f3a882178d1770e10ab67fab0ce`](https://github.com/withastro/astro/commit/1900a8f9bc337f3a882178d1770e10ab67fab0ce) Thanks [@martrapp](https://github.com/martrapp)! - Fixes an error when using `astro:transtions/client` without `<ViewTransitions/>`
+- [#10456](https://github.com/withastro/astro/pull/10456) [`1900a8f9bc337f3a882178d1770e10ab67fab0ce`](https://github.com/withastro/astro/commit/1900a8f9bc337f3a882178d1770e10ab67fab0ce) Thanks [@martrapp](https://github.com/martrapp)! - Fixes an error when using `astro:transitions/client` without `<ViewTransitions/>`
 
 ## 4.5.4
 
@@ -3107,7 +3107,7 @@
 
 - [#10343](https://github.com/withastro/astro/pull/10343) [`f973aa9110592fa9017bbe84387f22c24a6d7159`](https://github.com/withastro/astro/commit/f973aa9110592fa9017bbe84387f22c24a6d7159) Thanks [@ematipico](https://github.com/ematipico)! - Fixes some false positive in the dev toolbar a11y audits, by adding the `a` element to the list of interactive elements.
 
-- [#10295](https://github.com/withastro/astro/pull/10295) [`fdd5bf277e5c1cfa30c1bd2ca123f4e90e8d09d9`](https://github.com/withastro/astro/commit/fdd5bf277e5c1cfa30c1bd2ca123f4e90e8d09d9) Thanks [@rossrobino](https://github.com/rossrobino)! - Adds a prefetch fallback when using the `experimental.clientPrerender` option. If prerendering fails, which can happen if [Chrome extensions block prerendering](https://developer.chrome.com/blog/speculation-rules-improvements#chrome-limits), it will fallback to prefetching the URL. This works by adding a `prefetch` field to the `speculationrules` script, but does not create an extra request.
+- [#10295](https://github.com/withastro/astro/pull/10295) [`fdd5bf277e5c1cfa30c1bd2ca123f4e90e8d09d9`](https://github.com/withastro/astro/commit/fdd5bf277e5c1cfa30c1bd2ca123f4e90e8d09d9) Thanks [@rossrobino](https://github.com/rossrobino)! - Adds a prefetch fallback when using the `experimental.clientPrerender` option. If prerendering fails, which can happen if [Chrome extensions block prerendering](https://developer.chrome.com/blog/speculation-rules-improvements#chrome-limits), it will fall back to prefetching the URL. This works by adding a `prefetch` field to the `speculationrules` script, but does not create an extra request.
 
 ## 4.4.13
 
@@ -3307,15 +3307,15 @@
   Although the incorrect first comparison is not a problem by itself, it could cause the algorithm to make the wrong decision.
   Depending on the other routes in the project, the sorting could perform just the last two comparisons and by transitivity infer the inverse of the third (`/blog/[...slug` > `/` > `/blog`), which is incorrect.
 
-  Now the algorithm doesn't have a special case for index pages and instead does the comparison soleley for rest parameter segments and their immediate parents, which is consistent with the transitivity property.
+  Now the algorithm doesn't have a special case for index pages and instead does the comparison solely for rest parameter segments and their immediate parents, which is consistent with the transitivity property.
 
 - [#10120](https://github.com/withastro/astro/pull/10120) [`787e6f52470cf07fb50c865948b2bc8fe45a6d31`](https://github.com/withastro/astro/commit/787e6f52470cf07fb50c865948b2bc8fe45a6d31) Thanks [@bluwy](https://github.com/bluwy)! - Updates and supports Vite 5.1
 
 - [#10096](https://github.com/withastro/astro/pull/10096) [`227cd83a51bbd451dc223fd16f4cf1b87b8e44f8`](https://github.com/withastro/astro/commit/227cd83a51bbd451dc223fd16f4cf1b87b8e44f8) Thanks [@Fryuni](https://github.com/Fryuni)! - Fixes edge case on i18n fallback routes
 
-  Previously index routes deeply nested in the default locale, like `/some/nested/index.astro` could be mistaked as the root index for the default locale, resulting in an incorrect redirect on `/`.
+  Previously index routes deeply nested in the default locale, like `/some/nested/index.astro` could be mistaken as the root index for the default locale, resulting in an incorrect redirect on `/`.
 
-- [#10112](https://github.com/withastro/astro/pull/10112) [`476b79a61165d0aac5e98459a4ec90762050a14b`](https://github.com/withastro/astro/commit/476b79a61165d0aac5e98459a4ec90762050a14b) Thanks [@Princesseuh](https://github.com/Princesseuh)! - Renames the home Astro Devoolbar App to `astro:home`
+- [#10112](https://github.com/withastro/astro/pull/10112) [`476b79a61165d0aac5e98459a4ec90762050a14b`](https://github.com/withastro/astro/commit/476b79a61165d0aac5e98459a4ec90762050a14b) Thanks [@Princesseuh](https://github.com/Princesseuh)! - Renames the home Astro Devtoolbar App to `astro:home`
 
 - [#10117](https://github.com/withastro/astro/pull/10117) [`51b6ff7403c1223b1c399e88373075972c82c24c`](https://github.com/withastro/astro/commit/51b6ff7403c1223b1c399e88373075972c82c24c) Thanks [@hippotastic](https://github.com/hippotastic)! - Fixes an issue where `create astro`, `astro add` and `@astrojs/upgrade` would fail due to unexpected package manager CLI output.
 
@@ -3379,7 +3379,7 @@
 
 - [#9932](https://github.com/withastro/astro/pull/9932) [`9f0d89fa7e9e7c08c8600b0c49c2cce7489a7582`](https://github.com/withastro/astro/commit/9f0d89fa7e9e7c08c8600b0c49c2cce7489a7582) Thanks [@ematipico](https://github.com/ematipico)! - Fixes a case where a warning was logged even when the feature `i18nDomains` wasn't enabled
 
-- [#9907](https://github.com/withastro/astro/pull/9907) [`6c894af5ab79f290f4ff7feb68617a66e91febc1`](https://github.com/withastro/astro/commit/6c894af5ab79f290f4ff7feb68617a66e91febc1) Thanks [@ktym4a](https://github.com/ktym4a)! - Load 404.html on all non-existent paths on astro preview.
+- [#9907](https://github.com/withastro/astro/pull/9907) [`6c894af5ab79f290f4ff7feb68617a66e91febc1`](https://github.com/withastro/astro/commit/6c894af5ab79f290f4ff7feb68617a66e91febc1) Thanks [@ktym4a](https://github.com/ktym4a)! - Load 404.html on all nonexistent paths on astro preview.
 
 ## 4.3.1
 
@@ -3733,7 +3733,7 @@
 
   Enabling this feature overrides the default `prefetch` behavior globally to prerender links on the client according to your `prefetch` configuration. Instead of appending a `<link>` tag to the head of the document or fetching the page with JavaScript, a `<script>` tag will be appended with the corresponding speculation rules.
 
-  Client side prerendering requires browser support. If the Speculation Rules API is not supported, `prefetch` will fallback to the supported strategy.
+  Client side prerendering requires browser support. If the Speculation Rules API is not supported, `prefetch` will fall back to the supported strategy.
 
   See the [Prefetch Guide](https://docs.astro.build/en/guides/prefetch/) for more `prefetch` options and usage.
 
diff --git a/packages/astro/CHANGELOG.md b/packages/astro/CHANGELOG.md
index 98d1bebdbdec..8557b23f2224 100644
--- a/packages/astro/CHANGELOG.md
+++ b/packages/astro/CHANGELOG.md
@@ -496,7 +496,7 @@
 
 ### Patch Changes
 
-- [#15542](https://github.com/withastro/astro/pull/15542) [`9760404`](https://github.com/withastro/astro/commit/97604040b73ec1d029f5d5a489aa744aaecfd173) Thanks [@rururux](https://github.com/rururux)! - Improves rendering by preserving `hidden="until-found"` value in attribues
+- [#15542](https://github.com/withastro/astro/pull/15542) [`9760404`](https://github.com/withastro/astro/commit/97604040b73ec1d029f5d5a489aa744aaecfd173) Thanks [@rururux](https://github.com/rururux)! - Improves rendering by preserving `hidden="until-found"` value in attributes
 
 - [#15550](https://github.com/withastro/astro/pull/15550) [`58df907`](https://github.com/withastro/astro/commit/58df9072391fbfcd703e8d791ca51b7bedefb730) Thanks [@florian-lefebvre](https://github.com/florian-lefebvre)! - Improves the JSDoc annotations for the `AstroAdapter` type
 
@@ -1000,7 +1000,7 @@
 
 - [#15260](https://github.com/withastro/astro/pull/15260) [`abca1eb`](https://github.com/withastro/astro/commit/abca1ebc0ed4b89b1904c58b7969f8386250f8de) Thanks [@ematipico](https://github.com/ematipico)! - Fixes an issue where adding new pages weren't correctly shown when using the development server.
 
-- [#15214](https://github.com/withastro/astro/pull/15214) [`6bab8c9`](https://github.com/withastro/astro/commit/6bab8c992add3ecad7581b26f6bc28a74e5d3485) Thanks [@ematipico](https://github.com/ematipico)! - Fixes an issue where the internal perfomance timers weren't correctly updated to reflect new build pipeline.
+- [#15214](https://github.com/withastro/astro/pull/15214) [`6bab8c9`](https://github.com/withastro/astro/commit/6bab8c992add3ecad7581b26f6bc28a74e5d3485) Thanks [@ematipico](https://github.com/ematipico)! - Fixes an issue where the internal performance timers weren't correctly updated to reflect new build pipeline.
 
 - [#15259](https://github.com/withastro/astro/pull/15259) [`8670a69`](https://github.com/withastro/astro/commit/8670a699e96fcc972d441c75e503b20e8961a71f) Thanks [@ematipico](https://github.com/ematipico)! - Fixes an issue where styles weren't correctly reloaded when using the `@astrojs/cloudflare` adapter.
 
@@ -1027,7 +1027,7 @@
 
 - [#15125](https://github.com/withastro/astro/pull/15125) [`6feb0d7`](https://github.com/withastro/astro/commit/6feb0d7bec1e333eb795ae0fc51516182a73eb2b) Thanks [@florian-lefebvre](https://github.com/florian-lefebvre)! - Fixes remote images `Etag` header handling by disabling internal cache
 
-- [#15121](https://github.com/withastro/astro/pull/15121) [`06261e0`](https://github.com/withastro/astro/commit/06261e03d55a571c6affbd7321f7e28c997d6d5d) Thanks [@ematipico](https://github.com/ematipico)! - Fixes a bug where the Astro, with the Cloudlfare integration, couldn't correctly serve certain routes in the development server.
+- [#15121](https://github.com/withastro/astro/pull/15121) [`06261e0`](https://github.com/withastro/astro/commit/06261e03d55a571c6affbd7321f7e28c997d6d5d) Thanks [@ematipico](https://github.com/ematipico)! - Fixes a bug where the Astro, with the Cloudflare integration, couldn't correctly serve certain routes in the development server.
 
 - [#15125](https://github.com/withastro/astro/pull/15125) [`6feb0d7`](https://github.com/withastro/astro/commit/6feb0d7bec1e333eb795ae0fc51516182a73eb2b) Thanks [@florian-lefebvre](https://github.com/florian-lefebvre)! - Fixes images not working in development when using setups with port forwarding
 
@@ -1551,9 +1551,9 @@
 
   The `getFontData()` helper function from `astro:assets` was introduced in 5.14.0 to provide access to font family data for use outside of Astro. One of the goals of this API was to be able to retrieve buffers using URLs.
 
-  However, it turned out to be impactical and even impossible during prerendering.
+  However, it turned out to be impractical and even impossible during prerendering.
 
-  Astro now exports a new `getFontBuffer()` helper function from `astro:assets` to retrieve font file buffers from URL returned by `getFontData()`. For example, when using [satori](https://github.com/vercel/satori) to generate OpenGraph images:
+  Astro now exports a new `getFontBuffer()` helper function from `astro:assets` to retrieve font file buffers from URL returned by `getFontData()`. For example, when using [satori](https://github.com/vercel/satori) to generate Open Graph images:
 
   ```diff
   // src/pages/og.png.ts
@@ -1790,7 +1790,7 @@
 
   Previously, an Astro `FontProvider` was made of a config and a runtime part. It relied directly on `unifont` types, which allowed a simple configuration for third-party unifont providers, but also coupled Astro's implementation to unifont, which was limiting.
 
-  Astro's font provider implementation is now only made of a config part with dedicated hooks. This allows for the separation of config and runtime, but requires you to create a font provider object in order to use custom font providers (e.g. third-party unifont providers, or private font registeries).
+  Astro's font provider implementation is now only made of a config part with dedicated hooks. This allows for the separation of config and runtime, but requires you to create a font provider object in order to use custom font providers (e.g. third-party unifont providers, or private font registries).
 
   #### What should I do?
 
@@ -1841,7 +1841,7 @@
 
 - [#15124](https://github.com/withastro/astro/pull/15124) [`81db3c0`](https://github.com/withastro/astro/commit/81db3c06e8f75bf1ec6f3d4d31a42d16dcf0e969) Thanks [@leonace924](https://github.com/leonace924)! - Fixes an issue where requests with query parameters to the `base` path would return a 404 if trailingSlash was not `'ignore'` in development
 
-- [#15152](https://github.com/withastro/astro/pull/15152) [`39ee41f`](https://github.com/withastro/astro/commit/39ee41fa56b362942162dc17b0b4252d2f881e7e) Thanks [@rururux](https://github.com/rururux)! - Fixes a case where `context.cookies.set()` would be overriden when setting cookies via response headers in development
+- [#15152](https://github.com/withastro/astro/pull/15152) [`39ee41f`](https://github.com/withastro/astro/commit/39ee41fa56b362942162dc17b0b4252d2f881e7e) Thanks [@rururux](https://github.com/rururux)! - Fixes a case where `context.cookies.set()` would be overridden when setting cookies via response headers in development
 
 - [#15140](https://github.com/withastro/astro/pull/15140) [`6f6f8f8`](https://github.com/withastro/astro/commit/6f6f8f8c0c3ccf346d741a8625bbfbe1329e472e) Thanks [@cameronraysmith](https://github.com/cameronraysmith)! - Fixes esbuild warning due to dead code in assets virtual module
 
@@ -2291,7 +2291,7 @@
 
 - [#14582](https://github.com/withastro/astro/pull/14582) [`7958c6b`](https://github.com/withastro/astro/commit/7958c6b44c4bcdaa827d33f71ae7c2def26dc1b4) Thanks [@florian-lefebvre](https://github.com/florian-lefebvre)! - Fixes a regression that caused Actions to throw errors while loading
 
-- [#14567](https://github.com/withastro/astro/pull/14567) [`94500bb`](https://github.com/withastro/astro/commit/94500bb22236b77c842d88407b9a73bfc7fde488) Thanks [@matthewp](https://github.com/matthewp)! - Fixes the actions endpoint to return 404 for non-existent actions instead of throwing an unhandled error
+- [#14567](https://github.com/withastro/astro/pull/14567) [`94500bb`](https://github.com/withastro/astro/commit/94500bb22236b77c842d88407b9a73bfc7fde488) Thanks [@matthewp](https://github.com/matthewp)! - Fixes the actions endpoint to return 404 for nonexistent actions instead of throwing an unhandled error
 
 - [#14566](https://github.com/withastro/astro/pull/14566) [`946fe68`](https://github.com/withastro/astro/commit/946fe68c973c966a4f589ae43858bf486cc70eb5) Thanks [@matthewp](https://github.com/matthewp)! - Fixes handling malformed cookies gracefully by returning the unparsed value instead of throwing
 
@@ -2354,7 +2354,7 @@
 
   This update ensures that configured redirects are always handled as HTTP redirects regardless of output mode, and the default HTML files for the redirects are no longer generated in `static` output. It makes the Node.js adapter more consistent with the other official adapters.
 
-  No change to your project is required to take advantage of this new adapter functionality. It is not expected to cause any breaking changes. However, if you relied on the previous redirecting behavior, you may need to handle your redirects differently now. Otherwise you should notice smoother redirects, with more accurate HTTP status codes, and may potentially see some SEO gains.
+  No change to your project is required to take advantage of this new adapter functionality. It is not expected to cause any breaking changes. However, if you relied on the previous redirecting behavior, you may need to handle your redirects differently now. Otherwise, you should notice smoother redirects, with more accurate HTTP status codes, and may potentially see some SEO gains.
 
 - [#14506](https://github.com/withastro/astro/pull/14506) [`ec3cbe1`](https://github.com/withastro/astro/commit/ec3cbe178094e94fcb49cccdcc15c6ffee3104ba) Thanks [@abdo-spices](https://github.com/abdo-spices)! - Updates the `<Font />` component so that preload links are generated after the style tag, as recommended by capo.js
 
@@ -2508,7 +2508,7 @@
   const data = getFontData('--font-roboto');
   ```
 
-  For example, `getFontData()` can get the font buffer from the URL when using [satori](https://github.com/vercel/satori) to generate OpenGraph images:
+  For example, `getFontData()` can get the font buffer from the URL when using [satori](https://github.com/vercel/satori) to generate Open Graph images:
 
   ```tsx
   // src/pages/og.png.ts
@@ -3258,7 +3258,7 @@
 
 ### Patch Changes
 
-- [#13951](https://github.com/withastro/astro/pull/13951) [`7eb88f1`](https://github.com/withastro/astro/commit/7eb88f1e9113943b47e35e9f0033ab516f0a4f40) Thanks [@ascorbic](https://github.com/ascorbic)! - Fixes a issue that caused errors when using an adapter-provided session driver with custom options
+- [#13951](https://github.com/withastro/astro/pull/13951) [`7eb88f1`](https://github.com/withastro/astro/commit/7eb88f1e9113943b47e35e9f0033ab516f0a4f40) Thanks [@ascorbic](https://github.com/ascorbic)! - Fixes an issue that caused errors when using an adapter-provided session driver with custom options
 
 - [#13953](https://github.com/withastro/astro/pull/13953) [`448bddc`](https://github.com/withastro/astro/commit/448bddc49492c6a92a23735cd29a93baec0dda48) Thanks [@zaitovalisher](https://github.com/zaitovalisher)! - Fixes a bug where quotes were not added to the 'strict-dynamic' CSP directive
 
@@ -3456,7 +3456,7 @@
 
   For more information, see the [Content Loader API docs](https://docs.astro.build/en/reference/content-loader-reference/#rendermarkdown).
 
-- [#13887](https://github.com/withastro/astro/pull/13887) [`62f0668`](https://github.com/withastro/astro/commit/62f0668aa1e066c1c07ee0e774192def4cac43c4) Thanks [@yanthomasdev](https://github.com/yanthomasdev)! - Adds an option for integration authors to suppress adapter warning/errors in `supportedAstroFeatures`. This is useful when either an warning/error isn't applicable in a specific context or the default one might conflict and confuse users.
+- [#13887](https://github.com/withastro/astro/pull/13887) [`62f0668`](https://github.com/withastro/astro/commit/62f0668aa1e066c1c07ee0e774192def4cac43c4) Thanks [@yanthomasdev](https://github.com/yanthomasdev)! - Adds an option for integration authors to suppress adapter warning/errors in `supportedAstroFeatures`. This is useful when either a warning/error isn't applicable in a specific context or the default one might conflict and confuse users.
 
   To do so, you can add `suppress: "all"` (to suppress both the default and custom message) or `suppress: "default"` (to only suppress the default one):
 
@@ -3670,7 +3670,7 @@
 
   #### Upgrading
 
-  If you set a default `image.experimentalLayout` in your `astro.config.mjs`, or set it on a per-image basis using the `layout` prop, you will need to change all occurences to `constrained`:
+  If you set a default `image.experimentalLayout` in your `astro.config.mjs`, or set it on a per-image basis using the `layout` prop, you will need to change all occurrences to `constrained`:
 
   ```diff lang="ts"
   // astro.config.mjs
@@ -3988,7 +3988,7 @@
 
 - [#13547](https://github.com/withastro/astro/pull/13547) [`360cb91`](https://github.com/withastro/astro/commit/360cb9199a4314f90825c5639ff4396760e9cfcc) Thanks [@jsparkdev](https://github.com/jsparkdev)! - Updates vite to the latest version
 
-- [#13548](https://github.com/withastro/astro/pull/13548) [`e588527`](https://github.com/withastro/astro/commit/e588527b4c3de7759ef7d10d3004405d0b197f48) Thanks [@ryuapp](https://github.com/ryuapp)! - Support for Deno to install npm pacakges.
+- [#13548](https://github.com/withastro/astro/pull/13548) [`e588527`](https://github.com/withastro/astro/commit/e588527b4c3de7759ef7d10d3004405d0b197f48) Thanks [@ryuapp](https://github.com/ryuapp)! - Support for Deno to install npm packages.
 
   Deno requires npm prefix to install packages on npm. For example, to install react, we need to run `deno add npm:react`. But currently the command executed is `deno add react`, which doesn't work. So, we change the package names to have an npm prefix if you are using Deno.
 
@@ -4032,7 +4032,7 @@
   });
   ```
 
-  If no value is provided, Astro will fallback to its default behavior for fetching error pages.
+  If no value is provided, Astro will fall back to its default behavior for fetching error pages.
 
   Read more about this feature in the [Adapter API reference](https://docs.astro.build/en/reference/adapter-reference/#prerenderederrorpagefetch).
 
@@ -4551,7 +4551,7 @@
 
   Previously, any rewrites performed through `Astro.rewrite`/`ctx.rewrite` failed to append the base path to `Astro.url`/`ctx.rewrite`, which could lead to incorrect URL handling in downstream logic. By fixing this, we ensure that all routes remain consistent and predictable after a rewrite.
 
-  If you were relying on the work around of including the base path in astro.rewrite you can now remove it from the path.
+  If you were relying on the workaround of including the base path in astro.rewrite you can now remove it from the path.
 
 ## 5.3.0
 
@@ -4616,7 +4616,7 @@
 
 ### Patch Changes
 
-- [#13188](https://github.com/withastro/astro/pull/13188) [`7bc8256`](https://github.com/withastro/astro/commit/7bc825649bfb790a0206abd31df1676513a03b22) Thanks [@ematipico](https://github.com/ematipico)! - Fixes the wording of the an error message
+- [#13188](https://github.com/withastro/astro/pull/13188) [`7bc8256`](https://github.com/withastro/astro/commit/7bc825649bfb790a0206abd31df1676513a03b22) Thanks [@ematipico](https://github.com/ematipico)! - Fixes the wording of an error message
 
 - [#13205](https://github.com/withastro/astro/pull/13205) [`9d56602`](https://github.com/withastro/astro/commit/9d5660223b46e024b4e8c8eafead8a4e20e28ec5) Thanks [@ematipico](https://github.com/ematipico)! - Fixes and issue where a server island component returns 404 when `base` is configured in i18n project.
 
@@ -5183,7 +5183,7 @@
 
 - [#11987](https://github.com/withastro/astro/pull/11987) [`bf90a53`](https://github.com/withastro/astro/commit/bf90a5343f9cd1bb46f30e4b331e7ae675f5e720) Thanks [@florian-lefebvre](https://github.com/florian-lefebvre)! - The `locals` object can no longer be overridden
 
-  Middleware, API endpoints, and pages can no longer override the `locals` object in its entirety. You can still append values onto the object, but you can not replace the entire object and delete its existing values.
+  Middleware, API endpoints, and pages can no longer override the `locals` object in its entirety. You can still append values onto the object, but you cannot replace the entire object and delete its existing values.
 
   If you were previously overwriting like so:
 
@@ -5656,7 +5656,7 @@
 - [#12226](https://github.com/withastro/astro/pull/12226) [`51d13e2`](https://github.com/withastro/astro/commit/51d13e2f6ce3a9e03c33d80af6716847f6a78061) Thanks [@ematipico](https://github.com/ematipico)! - The following renderer fields and integration fields now accept `URL` as a type:
 
   **Renderers**:
-  - `AstroRenderer.clientEntrpoint`
+  - `AstroRenderer.clientEntrypoint`
   - `AstroRenderer.serverEntrypoint`
 
   **Integrations**:
@@ -5930,7 +5930,7 @@
 
   export const GET = (ctx) => {
     console.log(ctx.routePattern); // it will log src/pages/index.js
-    return new Response.json({ loreum: 'ipsum' });
+    return new Response.json({ lorem: 'ipsum' });
   };
   ```
 
@@ -6005,7 +6005,7 @@
   - `layout`: The layout type for the image. Can be `responsive`, `fixed`, `full-width` or `none`. Defaults to value of `image.experimentalLayout`.
   - `fit`: Defines how the image should be cropped if the aspect ratio is changed. Values match those of CSS `object-fit`. Defaults to `cover`, or the value of `image.experimentalObjectFit` if set.
   - `position`: Defines the position of the image crop if the aspect ratio is changed. Values match those of CSS `object-position`. Defaults to `center`, or the value of `image.experimentalObjectPosition` if set.
-  - `priority`: If set, eagerly loads the image. Otherwise images will be lazy-loaded. Use this for your largest above-the-fold image. Defaults to `false`.
+  - `priority`: If set, eagerly loads the image. Otherwise, images will be lazy-loaded. Use this for your largest above-the-fold image. Defaults to `false`.
 
   #### Default responsive image settings
 
@@ -6049,7 +6049,7 @@
   - In `astro build`, Astro will transform code with the most optimized output and removes debug information.
   - In `astro build --devOutput` (new flag), Astro will transform code with debug information like in `astro dev`.
 
-  This enables various usecases like:
+  This enables various use cases like:
 
   ```bash
   # Run the dev server connected to a "staging" API
@@ -6241,7 +6241,7 @@
   The signature for `app.render()` has changed, and the second argument is now an options object called `renderOptions` with more options for customizing rendering.
 
   The `renderOptions` are:
-  - `addCookieHeader`: Determines whether Astro will set the `Set-Cookie` header, otherwise the adapter is expected to do so itself.
+  - `addCookieHeader`: Determines whether Astro will set the `Set-Cookie` header; otherwise, the adapter is expected to do so itself.
   - `clientAddress`: The client IP address used to set `Astro.clientAddress`.
   - `locals`: An object of locals that's set to `Astro.locals`.
   - `routeData`: An object specifying the route to use.
@@ -6319,7 +6319,7 @@
 
 - [#12168](https://github.com/withastro/astro/pull/12168) [`1cd3085`](https://github.com/withastro/astro/commit/1cd30852a3bdae1847ad4e835e503598ca5fdf5c) Thanks [@ascorbic](https://github.com/ascorbic)! - Allows "slug" as a field in content layer data
 
-- [#12302](https://github.com/withastro/astro/pull/12302) [`7196c24`](https://github.com/withastro/astro/commit/7196c244ea75d2f2aafbec332d91cb681f0a4cb7) Thanks [@ematipico](https://github.com/ematipico)! - Fixes an issue where the origin check middleware run for prendered pages
+- [#12302](https://github.com/withastro/astro/pull/12302) [`7196c24`](https://github.com/withastro/astro/commit/7196c244ea75d2f2aafbec332d91cb681f0a4cb7) Thanks [@ematipico](https://github.com/ematipico)! - Fixes an issue where the origin check middleware run for prerendered pages
 
 - [#12341](https://github.com/withastro/astro/pull/12341) [`c1786d6`](https://github.com/withastro/astro/commit/c1786d64c4d8b25ed28f5e178531952466158e04) Thanks [@ematipico](https://github.com/ematipico)! - Fixes and issue where `Astro.currentLocale` always returned the default locale when consumed inside a server island.
 
@@ -6585,7 +6585,7 @@
   - `layout`: The layout type for the image. Can be `responsive`, `fixed`, `full-width` or `none`. Defaults to value of `image.experimentalLayout`.
   - `fit`: Defines how the image should be cropped if the aspect ratio is changed. Values match those of CSS `object-fit`. Defaults to `cover`, or the value of `image.experimentalObjectFit` if set.
   - `position`: Defines the position of the image crop if the aspect ratio is changed. Values match those of CSS `object-position`. Defaults to `center`, or the value of `image.experimentalObjectPosition` if set.
-  - `priority`: If set, eagerly loads the image. Otherwise images will be lazy-loaded. Use this for your largest above-the-fold image. Defaults to `false`.
+  - `priority`: If set, eagerly loads the image. Otherwise, images will be lazy-loaded. Use this for your largest above-the-fold image. Defaults to `false`.
 
   #### Default responsive image settings
 
@@ -6736,7 +6736,7 @@
   - In `astro build`, Astro will transform code with the most optimized output and removes debug information.
   - In `astro build --devOutput` (new flag), Astro will transform code with debug information like in `astro dev`.
 
-  This enables various usecases like:
+  This enables various use cases like:
 
   ```bash
   # Run the dev server connected to a "staging" API
@@ -6756,7 +6756,7 @@
 
 ### Patch Changes
 
-- [#12302](https://github.com/withastro/astro/pull/12302) [`7196c24`](https://github.com/withastro/astro/commit/7196c244ea75d2f2aafbec332d91cb681f0a4cb7) Thanks [@ematipico](https://github.com/ematipico)! - Fixes an issue where the origin check middleware run for prendered pages
+- [#12302](https://github.com/withastro/astro/pull/12302) [`7196c24`](https://github.com/withastro/astro/commit/7196c244ea75d2f2aafbec332d91cb681f0a4cb7) Thanks [@ematipico](https://github.com/ematipico)! - Fixes an issue where the origin check middleware run for prerendered pages
 
 - [#12341](https://github.com/withastro/astro/pull/12341) [`c1786d6`](https://github.com/withastro/astro/commit/c1786d64c4d8b25ed28f5e178531952466158e04) Thanks [@ematipico](https://github.com/ematipico)! - Fixes and issue where `Astro.currentLocale` always returned the default locale when consumed inside a server island.
 
@@ -6769,7 +6769,7 @@
 - [#12226](https://github.com/withastro/astro/pull/12226) [`51d13e2`](https://github.com/withastro/astro/commit/51d13e2f6ce3a9e03c33d80af6716847f6a78061) Thanks [@ematipico](https://github.com/ematipico)! - The following renderer fields and integration fields now accept `URL` as a type:
 
   **Renderers**:
-  - `AstroRenderer.clientEntrpoint`
+  - `AstroRenderer.clientEntrypoint`
   - `AstroRenderer.serverEntrypoint`
 
   **Integrations**:
@@ -7049,7 +7049,7 @@
 
 - [#11987](https://github.com/withastro/astro/pull/11987) [`bf90a53`](https://github.com/withastro/astro/commit/bf90a5343f9cd1bb46f30e4b331e7ae675f5e720) Thanks [@florian-lefebvre](https://github.com/florian-lefebvre)! - The `locals` object can no longer be overridden
 
-  Middleware, API endpoints, and pages can no longer override the `locals` object in its entirety. You can still append values onto the object, but you can not replace the entire object and delete its existing values.
+  Middleware, API endpoints, and pages can no longer override the `locals` object in its entirety. You can still append values onto the object, but you cannot replace the entire object and delete its existing values.
 
   If you were previously overwriting like so:
 
@@ -7086,7 +7086,7 @@
   The signature for `app.render()` has changed, and the second argument is now an options object called `renderOptions` with more options for customizing rendering.
 
   The `renderOptions` are:
-  - `addCookieHeader`: Determines whether Astro will set the `Set-Cookie` header, otherwise the adapter is expected to do so itself.
+  - `addCookieHeader`: Determines whether Astro will set the `Set-Cookie` header; otherwise, the adapter is expected to do so itself.
   - `clientAddress`: The client IP address used to set `Astro.clientAddress`.
   - `locals`: An object of locals that's set to `Astro.locals`.
   - `routeData`: An object specifying the route to use.
@@ -7604,7 +7604,7 @@
 - [#11698](https://github.com/withastro/astro/pull/11698) [`05139ef`](https://github.com/withastro/astro/commit/05139ef8b46de96539cc1d08148489eaf3cfd837) Thanks [@ematipico](https://github.com/ematipico)! - Adds a new property to the globals `Astro` and `APIContext` called `routePattern`. The `routePattern` represents the current route (component)
   that is being rendered by Astro. It's usually a path pattern will look like this: `blog/[slug]`:
 
-  ```asto
+  ```astro
   ---
   // src/pages/blog/[slug].astro
   const route = Astro.routePattern;
diff --git a/packages/astro/components/ClientRouter.astro b/packages/astro/components/ClientRouter.astro
index 87d3892da2a2..57685589c4d6 100644
--- a/packages/astro/components/ClientRouter.astro
+++ b/packages/astro/components/ClientRouter.astro
@@ -115,14 +115,14 @@ const { fallback = 'animate' } = Astro.props;
 			const form = el as HTMLFormElement;
 			const formData = new FormData(form, submitter);
 			// form.action and form.method can point to an <input name="action"> or <input name="method">
-			// in which case should fallback to the form attribute
+			// in which case should fall back to the form attribute
 			const formAction =
 				typeof form.action === 'string' ? form.action : form.getAttribute('action');
 			const formMethod =
 				typeof form.method === 'string' ? form.method : form.getAttribute('method');
-			// Use the form action, if defined, otherwise fallback to current path.
+			// Use the form action, if defined; otherwise, fall back to current path.
 			let action = submitter?.getAttribute('formaction') ?? formAction ?? location.pathname;
-			// Use the form method, if defined, otherwise fallback to "get"
+			// Use the form method, if defined; otherwise, fall back to "get"
 			const method = submitter?.getAttribute('formmethod') ?? formMethod ?? 'get';
 
 			// the "dialog" method is a special keyword used within <dialog> elements
diff --git a/packages/astro/e2e/astro-envs.test.js b/packages/astro/e2e/astro-envs.test.js
index 60baa65a0087..6e7b6fdc3d99 100644
--- a/packages/astro/e2e/astro-envs.test.js
+++ b/packages/astro/e2e/astro-envs.test.js
@@ -31,10 +31,10 @@ test.describe('Astro Environment BASE_URL', () => {
 		await page.goto(astro.resolveUrl('/blog/'));
 
 		const astroBaseUrl = page.locator('id=astro-base-url');
-		await expect(astroBaseUrl, 'astroBaseUrl equals to /blog').toHaveText('/blog');
+		await expect(astroBaseUrl, 'astroBaseUrl equals /blog').toHaveText('/blog');
 
 		const clientComponentBaseUrl = page.locator('id=client-component-base-url');
-		await expect(clientComponentBaseUrl, 'clientComponentBaseUrl equals to /blog').toHaveText(
+		await expect(clientComponentBaseUrl, 'clientComponentBaseUrl equals /blog').toHaveText(
 			'/blog',
 		);
 	});
diff --git a/packages/astro/e2e/dev-toolbar.test.js b/packages/astro/e2e/dev-toolbar.test.js
index 9dafe1d75a1d..99f63bab051d 100644
--- a/packages/astro/e2e/dev-toolbar.test.js
+++ b/packages/astro/e2e/dev-toolbar.test.js
@@ -293,7 +293,7 @@ test.describe('Dev Toolbar', () => {
 		await expect(settingsWindow).not.toBeVisible();
 	});
 
-	test('Opening a app closes the currently opened app', async ({ page, astro }) => {
+	test('Opening an app closes the currently opened app', async ({ page, astro }) => {
 		await page.goto(astro.resolveUrl('/'));
 
 		const toolbar = page.locator('astro-dev-toolbar');
diff --git a/packages/astro/e2e/fixtures/cloudflare/src/pages/index.astro b/packages/astro/e2e/fixtures/cloudflare/src/pages/index.astro
index 517c5487efd5..959c3e6a6451 100644
--- a/packages/astro/e2e/fixtures/cloudflare/src/pages/index.astro
+++ b/packages/astro/e2e/fixtures/cloudflare/src/pages/index.astro
@@ -17,7 +17,7 @@ const dogs = await getCollection('dogs');
 const increment = await getEntry('increment', 'value');
 const { Content } = await render(increment);
 
-const surnamne = Astro.url.searchParams.get('surname');
+const surname = Astro.url.searchParams.get('surname');
 ---
 
 <html>
@@ -54,7 +54,7 @@ const surnamne = Astro.url.searchParams.get('surname');
 		<Island server:defer/>
 	</div>
 	<div id="island-props">
-		<IslandProps server:defer name="Aria" surname={surnamne}/>
+		<IslandProps server:defer name="Aria" surname={surname}/>
 	</div>
 	<ul id="dogs-list">
 		{dogs.map(dog => (
diff --git a/packages/astro/e2e/fixtures/server-islands/src/pages/mdx.mdx b/packages/astro/e2e/fixtures/server-islands/src/pages/mdx.mdx
index 0d6cfb437ad2..430947205b8f 100644
--- a/packages/astro/e2e/fixtures/server-islands/src/pages/mdx.mdx
+++ b/packages/astro/e2e/fixtures/server-islands/src/pages/mdx.mdx
@@ -1,5 +1,5 @@
 import Island from '../components/Island.astro';
 
-{/* empty div is needed, otherwise island script is injected in the head */}
+{/* empty div is needed; otherwise, island script is injected in the head */}
 <div></div>
 <Island server:defer />
diff --git a/packages/astro/e2e/fixtures/view-transitions/src/pages/form-seven.astro b/packages/astro/e2e/fixtures/view-transitions/src/pages/form-seven.astro
index 71befd924782..aef76145d9d5 100644
--- a/packages/astro/e2e/fixtures/view-transitions/src/pages/form-seven.astro
+++ b/packages/astro/e2e/fixtures/view-transitions/src/pages/form-seven.astro
@@ -4,7 +4,7 @@ import Layout from '../components/Layout.astro';
 ---
 <Layout>
 	<form>
-		<p>This form has an no method defined, but input with `name=method`</p>
+		<p>This form has no method defined, but input with `name=method`</p>
 		<input type="text" name="method" value="POST" />
 		<button id="submit">Submit</button>
 	</form>
diff --git a/packages/astro/e2e/fixtures/view-transitions/src/pages/transition-name.astro b/packages/astro/e2e/fixtures/view-transitions/src/pages/transition-name.astro
index 5940a0d730a7..6b36ad4cbf28 100644
--- a/packages/astro/e2e/fixtures/view-transitions/src/pages/transition-name.astro
+++ b/packages/astro/e2e/fixtures/view-transitions/src/pages/transition-name.astro
@@ -17,8 +17,8 @@ import Layout from '../components/Layout.astro';
 	<div id="thirteen" transition:name="_01__02___">_01__02___</div>
 	<div id="batch0" transition:name="\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f">control chars</div>
 	<div id="batch1" transition:name="\x20\x21\x22\x23\x24\x25\x26\x27\x28\x29\x2a\x2b\x2c\x2d\x2e\x2f\x30\x31\x32\x33\x34\x35\x36\x37\x38\x39\x3a\x3b\x3c\x3d\x3e\x3f">punctuation &amp; numbers</div>
-	<div id="batch2" transition:name="\x40\x41\x42\x43\x44\x45\x46\x47\x48\x49\x4a\x4b\x4c\x4d\x4e\x4f\x50\x51\x52\x53\x54\x55\x56\x57\x58\x59\x5a\x5b\x5c\x5d\x5e\x5f">upper case chars</div>
-	<div id="batch3" transition:name="\x60\x61\x62\x63\x64\x65\x66\x67\x68\x69\x6a\x6b\x6c\x6d\x6e\x6f\x70\x71\x72\x73\x74\x75\x76\x77\x78\x79\x7a\x7b\x7c\x7d\x7e\x7f">lower case chars</div>
+	<div id="batch2" transition:name="\x40\x41\x42\x43\x44\x45\x46\x47\x48\x49\x4a\x4b\x4c\x4d\x4e\x4f\x50\x51\x52\x53\x54\x55\x56\x57\x58\x59\x5a\x5b\x5c\x5d\x5e\x5f">uppercase chars</div>
+	<div id="batch3" transition:name="\x60\x61\x62\x63\x64\x65\x66\x67\x68\x69\x6a\x6b\x6c\x6d\x6e\x6f\x70\x71\x72\x73\x74\x75\x76\x77\x78\x79\x7a\x7b\x7c\x7d\x7e\x7f">lowercase chars</div>
 	<div id="batch4" transition:name="\x80\x81\x82\x83\x84\x85\x86\x87\x88\x89\x8a\x8b\x8c\x8d\x8e\x8f\x90\x91\x92\x93\x94\x95\x96\x97\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f">80-9f</div>
 	<div id="batch5" transition:name="\xa0\xa1\xa2\xa3\xa4\xa5\xa6\xa7\xa8\xa9\xaa\xab\xac\xad\xae\xaf\xb0\xb1\xb2\xb3\xb4\xb5\xb6\xb7\xb8\xb9\xba\xbb\xbc\xbd\xbe\xbf">a0-bf</div>
 	<div id="batch6" transition:name="\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf\xd0\xd1\xd2\xd3\xd4\xd5\xd6\xd7\xd8\xd9\xda\xdb\xdc\xdd\xde\xdf">c0-df</div>
diff --git a/packages/astro/e2e/view-transitions.test.js b/packages/astro/e2e/view-transitions.test.js
index 9b135e9325f1..089a90d3e6b3 100644
--- a/packages/astro/e2e/view-transitions.test.js
+++ b/packages/astro/e2e/view-transitions.test.js
@@ -538,7 +538,7 @@ test.describe('View Transitions', () => {
 		await page.goto(astro.resolveUrl('/video-one'));
 		const vid = page.locator('video');
 		await expect(vid).toBeVisible();
-		// Mute the video before playing, otherwise there's actually sounds when testing
+		// Mute the video before playing; otherwise, there's actually sounds when testing
 		await vid.evaluate((el) => (el.muted = true));
 		// Browser blocks autoplay, so we manually play it here. For some reason,
 		// you need to click and play it manually for it to actually work.
@@ -723,7 +723,7 @@ test.describe('View Transitions', () => {
 	}) => {
 		const loads = collectLoads(page);
 
-		// Go to the half bakeed page
+		// Go to the half baked page
 		await page.goto(astro.resolveUrl('/half-baked'));
 		let p = page.locator('#half-baked');
 		await expect(p, 'should have content').toHaveText('Half Baked');
@@ -1710,7 +1710,7 @@ test.describe('View Transitions', () => {
 		await page.goto(astro.resolveUrl('/abort2'));
 		// implemented in /abort2:
 		// Navigate to self with a 10 second animation
-		// shortly after starting that, change your mind an navigate to /one
+		// shortly after starting that, change your mind and navigate to /one
 		// check that animations got canceled
 		let p = page.locator('#one');
 		await expect(p, 'should have content').toHaveText('Page 1');
diff --git a/packages/astro/src/assets/endpoint/dev.ts b/packages/astro/src/assets/endpoint/dev.ts
index bbc466ee3514..21dd9d351c3f 100644
--- a/packages/astro/src/assets/endpoint/dev.ts
+++ b/packages/astro/src/assets/endpoint/dev.ts
@@ -51,7 +51,7 @@ async function loadLocalImage(src: string, url: URL) {
 			}
 		}
 	} else {
-		// Otherwise we'll assume it's a local URL and try to load it via fetch
+		// Otherwise, we'll assume it's a local URL and try to load it via fetch
 		const sourceUrl = new URL(src, url.origin);
 		// This is only allowed if this is the same origin
 		if (sourceUrl.origin !== url.origin) {
diff --git a/packages/astro/src/assets/fonts/core/filter-and-transform-font-faces.ts b/packages/astro/src/assets/fonts/core/filter-and-transform-font-faces.ts
index 6bd915de9f91..9e60934516eb 100644
--- a/packages/astro/src/assets/fonts/core/filter-and-transform-font-faces.ts
+++ b/packages/astro/src/assets/fonts/core/filter-and-transform-font-faces.ts
@@ -27,7 +27,7 @@ export function filterAndTransformFontFaces({
 					if ('name' in source) {
 						return source;
 					}
-					// We handle protocol relative URLs here, otherwise they're considered absolute by the font
+					// We handle protocol relative URLs here; otherwise, they're considered absolute by the font
 					// fetcher which will try to read them from the file system
 					const originalUrl = source.url.startsWith('//') ? `https:${source.url}` : source.url;
 					let format = FONT_FORMATS.find((e) => e.format === source.format);
diff --git a/packages/astro/src/assets/fonts/providers/local.ts b/packages/astro/src/assets/fonts/providers/local.ts
index a3e145c9bc3a..02b80e621c0a 100644
--- a/packages/astro/src/assets/fonts/providers/local.ts
+++ b/packages/astro/src/assets/fonts/providers/local.ts
@@ -26,7 +26,7 @@ type RawSource =
 
 interface Variant extends FamilyProperties {
 	/**
-	 * Font [sources](https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/src). It can be a path relative to the root, a package import or a URL. URLs are particularly useful if you inject local fonts through an integration.
+	 * Font [sources](https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/src). It can be a path relative to the root, a package import, or a URL. URLs are particularly useful if you inject local fonts through an integration.
 	 *
 	 * We recommend not putting your font files in [the `public/` directory](/en/reference/configuration-reference/#publicdir). Since Astro will copy these files into that folder at build time, this will result in duplicated files
 	 * in your build output. Instead, store them somewhere else in your project, such as in `src/`.
diff --git a/packages/astro/src/assets/services/service.ts b/packages/astro/src/assets/services/service.ts
index 9c9fc478bc48..00733dd603d0 100644
--- a/packages/astro/src/assets/services/service.ts
+++ b/packages/astro/src/assets/services/service.ts
@@ -304,7 +304,7 @@ export const baseService: Omit<LocalImageService, 'transform'> = {
 		transformedWidths = Array.from(new Set(transformedWidths));
 
 		// Since `widths` and `densities` ultimately control the width and height of the image,
-		// we don't want the dimensions the user specified, we'll create those ourselves.
+		// we don't want the dimensions to be user specified, we'll create those ourselves.
 		const {
 			width: transformWidth,
 			height: transformHeight,
diff --git a/packages/astro/src/assets/utils/etag.ts b/packages/astro/src/assets/utils/etag.ts
index d1650b8c011e..506b1912c647 100644
--- a/packages/astro/src/assets/utils/etag.ts
+++ b/packages/astro/src/assets/utils/etag.ts
@@ -6,7 +6,7 @@
  * License https://github.com/tjwebb/fnv-plus#license
  *
  * Simplified, optimized and add modified for 52 bit, which provides a larger hash space
- * and still making use of Javascript's 53-bit integer space.
+ * and still making use of JavaScript's 53-bit integer space.
  */
 const fnv1a52 = (str: string) => {
 	const len = str.length;
diff --git a/packages/astro/src/assets/utils/imageKind.ts b/packages/astro/src/assets/utils/imageKind.ts
index f34f4574982a..d67351178a9f 100644
--- a/packages/astro/src/assets/utils/imageKind.ts
+++ b/packages/astro/src/assets/utils/imageKind.ts
@@ -4,7 +4,7 @@ import type { ImageMetadata, UnresolvedImageTransform } from '../types.js';
  * Determines if the given source is an ECMAScript Module (ESM) imported image.
  *
  * @param {ImageMetadata | string} src - The source to check. It can be an `ImageMetadata` object or a string.
- * @return {boolean} Returns `true` if the source is an `ImageMetadata` object, otherwise `false`.
+ * @return {boolean} Returns `true` if the source is an `ImageMetadata` object; otherwise, `false`.
  */
 export function isESMImportedImage(src: ImageMetadata | string): src is ImageMetadata {
 	return typeof src === 'object' || (typeof src === 'function' && 'src' in src);
@@ -14,7 +14,7 @@ export function isESMImportedImage(src: ImageMetadata | string): src is ImageMet
  * Determines if the provided source is a remote image URL in the form of a string.
  *
  * @param {ImageMetadata | string} src - The source to check, which can either be an `ImageMetadata` object or a string.
- * @return {boolean} Returns `true` if the source is a string, otherwise `false`.
+ * @return {boolean} Returns `true` if the source is a string; otherwise, `false`.
  */
 export function isRemoteImage(src: ImageMetadata | string): src is string {
 	return typeof src === 'string';
diff --git a/packages/astro/src/assets/utils/resolveImports.ts b/packages/astro/src/assets/utils/resolveImports.ts
index 93e312487e71..b6b0d1858fd0 100644
--- a/packages/astro/src/assets/utils/resolveImports.ts
+++ b/packages/astro/src/assets/utils/resolveImports.ts
@@ -7,8 +7,8 @@ import { VALID_INPUT_FORMATS } from '../consts.js';
  * Resolves an image src from a content file (such as markdown) to a module ID or import that can be resolved by Vite.
  *
  * @param imageSrc The src attribute of an image tag
- * @param filePath The path to the file that contains the imagem relative to the site root
- * @returns A module id of the image that can be rsolved by Vite, or undefined if it is not a local image
+ * @param filePath The path to the file that contains the image relative to the site root
+ * @returns A module id of the image that can be resolved by Vite, or undefined if it is not a local image
  */
 export function imageSrcToImportId(imageSrc: string, filePath?: string): string | undefined {
 	// If the import is coming from the data store it will have a special prefix to identify it
diff --git a/packages/astro/src/container/index.ts b/packages/astro/src/container/index.ts
index 4612a1365d27..23c95fe85dfb 100644
--- a/packages/astro/src/container/index.ts
+++ b/packages/astro/src/container/index.ts
@@ -79,7 +79,7 @@ export type ContainerRenderOptions = {
 	 */
 	params?: Record<string, string | undefined>;
 	/**
-	 * Useful if your component needs to access some locals without the use a middleware.
+	 * Useful if your component needs to access some locals without the use of middleware.
 	 * ```js
 	 * container.renderToString(Component, { locals: { getSomeValue() {} } });
 	 * ```
diff --git a/packages/astro/src/content/data-store.ts b/packages/astro/src/content/data-store.ts
index 57df3d521596..1e89919feacb 100644
--- a/packages/astro/src/content/data-store.ts
+++ b/packages/astro/src/content/data-store.ts
@@ -9,7 +9,7 @@ export interface RenderedContent {
 		imagePaths?: Array<string>;
 		/** Any headings that are present in this file. */
 		headings?: MarkdownHeading[];
-		/** Raw frontmatter, parsed parsed from the file. This may include data from remark plugins. */
+		/** Raw frontmatter, parsed from the file. This may include data from remark plugins. */
 		frontmatter?: Record<string, any>;
 		/** Any other metadata that is present in this file. */
 		[key: string]: unknown;
diff --git a/packages/astro/src/content/types-generator.ts b/packages/astro/src/content/types-generator.ts
index a77b52c703f2..4671fea75438 100644
--- a/packages/astro/src/content/types-generator.ts
+++ b/packages/astro/src/content/types-generator.ts
@@ -550,7 +550,7 @@ async function writeContentFiles({
 					contentPaths.contentDir + `${key}/`,
 				).toString();
 
-				// Save entry path in lower case to avoid case sensitivity issues between Windows and Unix
+				// Save entry path in lowercase to avoid case sensitivity issues between Windows and Unix
 				contentCollectionManifest.entries[entryPath.toLowerCase()] = key;
 			});
 		});
diff --git a/packages/astro/src/content/utils.ts b/packages/astro/src/content/utils.ts
index 3bfa6646af3a..eeffd34b083b 100644
--- a/packages/astro/src/content/utils.ts
+++ b/packages/astro/src/content/utils.ts
@@ -194,7 +194,7 @@ export async function getEntryData<
 							const resolvedPath = path.resolve(entryDir, val);
 
 							// If the file exists, normalize to relative path
-							// Otherwise keep as-is (likely a Vite alias)
+							// Otherwise, keep as-is (likely a Vite alias)
 							if (fsMod.existsSync(resolvedPath)) {
 								normalizedPath = `./${val}`;
 							}
diff --git a/packages/astro/src/core/app/base.ts b/packages/astro/src/core/app/base.ts
index fa07d5427bf4..7f04e14f7cef 100644
--- a/packages/astro/src/core/app/base.ts
+++ b/packages/astro/src/core/app/base.ts
@@ -74,7 +74,7 @@ export interface RenderOptions {
 	/**
 	 * A custom fetch function for retrieving prerendered pages - 404 or 500.
 	 *
-	 * If not provided, Astro will fallback to its default behavior for fetching error pages.
+	 * If not provided, Astro will fall back to its default behavior for fetching error pages.
 	 *
 	 * When a dynamic route is matched but ultimately results in a 404, this function will be used
 	 * to fetch the prerendered 404 page if available. Similarly, it may be used to fetch a
diff --git a/packages/astro/src/core/app/createOutgoingHttpHeaders.ts b/packages/astro/src/core/app/createOutgoingHttpHeaders.ts
index 64d2d51351e5..8fa5cc81b1b2 100644
--- a/packages/astro/src/core/app/createOutgoingHttpHeaders.ts
+++ b/packages/astro/src/core/app/createOutgoingHttpHeaders.ts
@@ -25,7 +25,7 @@ export const createOutgoingHttpHeaders = (
 	if (headers.has('set-cookie')) {
 		const cookieHeaders = headers.getSetCookie();
 		if (cookieHeaders.length > 1) {
-			// the Headers.entries() API already normalized all header names to lower case so we can safely index this as 'set-cookie'
+			// the Headers.entries() API already normalized all header names to lowercase so we can safely index this as 'set-cookie'
 			nodeHeaders['set-cookie'] = cookieHeaders;
 		}
 	}
diff --git a/packages/astro/src/core/app/pipeline.ts b/packages/astro/src/core/app/pipeline.ts
index 860a23c9749b..459a96e409c6 100644
--- a/packages/astro/src/core/app/pipeline.ts
+++ b/packages/astro/src/core/app/pipeline.ts
@@ -99,7 +99,7 @@ export class AppPipeline extends Pipeline {
 				return RedirectSinglePageBuiltModule;
 			}
 		} else if (routeIsFallback(route)) {
-			// This is a i18n fallback route
+			// This is an i18n fallback route
 			routeToProcess = getFallbackRoute(route, this.manifest.routes);
 		}
 
diff --git a/packages/astro/src/core/app/validate-headers.ts b/packages/astro/src/core/app/validate-headers.ts
index f6e495f15a4d..c73bcb2d3132 100644
--- a/packages/astro/src/core/app/validate-headers.ts
+++ b/packages/astro/src/core/app/validate-headers.ts
@@ -50,7 +50,7 @@ function matchesAllowedDomains(
 
 /**
  * Validate a host against allowedDomains.
- * Returns the host only if it matches an allowed pattern, otherwise undefined.
+ * Returns the host only if it matches an allowed pattern; otherwise, undefined.
  * This prevents SSRF attacks by ensuring the Host header is trusted.
  */
 export function validateHost(
diff --git a/packages/astro/src/core/build/common.ts b/packages/astro/src/core/build/common.ts
index 18a3041e6229..4ead4bcd4af0 100644
--- a/packages/astro/src/core/build/common.ts
+++ b/packages/astro/src/core/build/common.ts
@@ -98,7 +98,7 @@ export function getOutFile(
 }
 
 /**
- * Ensures the `outDir` is within `process.cwd()`. If not it will fallback to `<cwd>/.astro`.
+ * Ensures the `outDir` is within `process.cwd()`. If not it will fall back to `<cwd>/.astro`.
  * This is used for static `ssrBuild` so the output can access node_modules when we import
  * the output files. A hardcoded fallback dir is fine as it would be cleaned up after build.
  */
diff --git a/packages/astro/src/core/build/generate.ts b/packages/astro/src/core/build/generate.ts
index 4a8253a63668..85921a553e00 100644
--- a/packages/astro/src/core/build/generate.ts
+++ b/packages/astro/src/core/build/generate.ts
@@ -80,7 +80,7 @@ export async function generatePages(
 		prerenderer = settingsPrerenderer;
 	}
 
-	// Setup the prerenderer
+	// Set up the prerenderer
 	await prerenderer.setup?.();
 
 	const verb = ssr ? 'prerendering' : 'generating';
diff --git a/packages/astro/src/core/build/pipeline.ts b/packages/astro/src/core/build/pipeline.ts
index 4091c74c9a24..c94cc31e69cb 100644
--- a/packages/astro/src/core/build/pipeline.ts
+++ b/packages/astro/src/core/build/pipeline.ts
@@ -226,7 +226,7 @@ export class BuildPipeline extends Pipeline {
 				return RedirectSinglePageBuiltModule;
 			}
 		} else if (routeIsFallback(route)) {
-			// This is a i18n fallback route
+			// This is an i18n fallback route
 			routeToProcess = getFallbackRoute(route, this.manifest.routes);
 		}
 
diff --git a/packages/astro/src/core/build/plugins/plugin-component-entry.ts b/packages/astro/src/core/build/plugins/plugin-component-entry.ts
index f992404ad7d8..2dda51066c6b 100644
--- a/packages/astro/src/core/build/plugins/plugin-component-entry.ts
+++ b/packages/astro/src/core/build/plugins/plugin-component-entry.ts
@@ -7,7 +7,7 @@ const astroEntryPrefix = '\0astro-entry:';
 /**
  * When adding hydrated or client:only components as Rollup inputs, sometimes we're not using all
  * of the export names, e.g. `import { Counter } from './ManyComponents.jsx'`. This plugin proxies
- * entries to re-export only the names the user is using.
+ * entries to re-export only the names that the user is using.
  */
 export function pluginComponentEntry(internals: BuildInternals): VitePlugin {
 	const componentToExportNames = new Map<string, string[]>();
diff --git a/packages/astro/src/core/build/plugins/util.ts b/packages/astro/src/core/build/plugins/util.ts
index 6d753f58a90e..b4840cf7ee2a 100644
--- a/packages/astro/src/core/build/plugins/util.ts
+++ b/packages/astro/src/core/build/plugins/util.ts
@@ -3,7 +3,7 @@ import type { BuildOptions } from 'vite';
 // This is an arbitrary string that we use to replace the dot of the extension.
 export const ASTRO_PAGE_EXTENSION_POST_PATTERN = '@_@';
 // This is an arbitrary string that we use to make a pageData key
-// Has to be a invalid character for a route, to avoid conflicts.
+// Has to be an invalid character for a route, to avoid conflicts.
 const ASTRO_PAGE_KEY_SEPARATOR = '&';
 
 /**
diff --git a/packages/astro/src/core/build/static-build.ts b/packages/astro/src/core/build/static-build.ts
index 97627be4f953..2e70352fd791 100644
--- a/packages/astro/src/core/build/static-build.ts
+++ b/packages/astro/src/core/build/static-build.ts
@@ -341,7 +341,7 @@ async function buildEnvironments(opts: StaticBuildOptions, internals: BuildInter
 				// and this is the only way to update the input after instantiation.
 				internals.clientInput = getClientInput(internals, settings);
 				if (!internals.clientInput.size) {
-					// At least 1 input is required to do a build, otherwise Vite throws.
+					// At least 1 input is required to do a build; otherwise, Vite throws.
 					// We need the client build to happen in order to copy over the `public/` folder
 					// So using the noop plugin here which will give us an input that just gets thrown away.
 					internals.clientInput.add(NOOP_MODULE_ID);
@@ -609,7 +609,7 @@ function getClientInput(
  * Output: `pages/injected.mjs`
  *
  * 1. We clean the `facadeModuleId` by removing the `ASTRO_PAGE_MODULE_ID` prefix and `ASTRO_PAGE_EXTENSION_POST_PATTERN`.
- * 2. We find the matching route pattern in the manifest (or fallback to the cleaned module id)
+ * 2. We find the matching route pattern in the manifest (or fall back to the cleaned module id)
  * 3. We replace square brackets with underscore (`[slug]` => `_slug_`) and `...` with `` (`[...slug]` => `_---slug_`).
  * 4. We append the `.mjs` extension, so the file will always be an ESM module
  *
diff --git a/packages/astro/src/core/config/schemas/base.ts b/packages/astro/src/core/config/schemas/base.ts
index 24ba309f311d..041860ce08b6 100644
--- a/packages/astro/src/core/config/schemas/base.ts
+++ b/packages/astro/src/core/config/schemas/base.ts
@@ -16,7 +16,7 @@ import { allowedDirectivesSchema, cspAlgorithmSchema, cspHashSchema } from '../.
 import { CacheSchema, RouteRulesSchema } from '../../cache/config.js';
 import { SessionSchema } from '../../session/config.js';
 
-// The below types are required boilerplate to workaround a Zod issue since v3.21.2. Since that version,
+// The below types are required boilerplate to work around a Zod issue since v3.21.2. Since that version,
 // Zod's compiled TypeScript would "simplify" certain values to their base representation, causing references
 // to transitive dependencies that Astro don't depend on (e.g. `mdast-util-to-hast` or `remark-rehype`). For example:
 //
@@ -30,7 +30,7 @@ import { SessionSchema } from '../../session/config.js';
 // ```
 //
 // The types below will "complexify" the types so that TypeScript would not simplify them. This way it will
-// reference the complex type directly, instead of referencing non-existent transitive dependencies.
+// reference the complex type directly, instead of referencing nonexistent transitive dependencies.
 //
 // Also, make sure to not index the complexified type, as it would return a simplified value type, which goes
 // back to the issue again. The complexified type should be the base representation that we want to expose.
diff --git a/packages/astro/src/core/config/schemas/refined.ts b/packages/astro/src/core/config/schemas/refined.ts
index 9362f0c404f0..6280fdd7d92f 100644
--- a/packages/astro/src/core/config/schemas/refined.ts
+++ b/packages/astro/src/core/config/schemas/refined.ts
@@ -51,7 +51,7 @@ export const AstroConfigRefinedSchema = z.custom<AstroConfig>().superRefine((con
 		ctx.addIssue({
 			code: z.ZodIssueCode.custom,
 			message:
-				'The option `i18n.routing.redirectToDefaultLocale` can be used only when `i18n.routing.prefixDefaultLocale` is set to `true`, otherwise redirects might cause infinite loops. Remove the option `i18n.routing.redirectToDefaultLocale`, or change its value to `false`.',
+				'The option `i18n.routing.redirectToDefaultLocale` can be used only when `i18n.routing.prefixDefaultLocale` is set to `true`; otherwise, redirects might cause infinite loops. Remove the option `i18n.routing.redirectToDefaultLocale`, or change its value to `false`.',
 			path: ['i18n', 'routing', 'redirectToDefaultLocale'],
 		});
 	}
diff --git a/packages/astro/src/core/config/schemas/relative.ts b/packages/astro/src/core/config/schemas/relative.ts
index 4fab1cb06d3a..39c66d9a1320 100644
--- a/packages/astro/src/core/config/schemas/relative.ts
+++ b/packages/astro/src/core/config/schemas/relative.ts
@@ -117,7 +117,7 @@ export function createRelativeSchema(cmd: string, fileProtocolRoot: string) {
 				.prefault({}),
 		),
 	}).transform((config) => {
-		// If the user changed `outDir`, we need to also update `build.client` and `build.server`
+		// If the user changed `outDir`, we also need to update `build.client` and `build.server`
 		// the be based on the correct `outDir`
 		if (
 			config.outDir.toString() !==
diff --git a/packages/astro/src/core/create-vite.ts b/packages/astro/src/core/create-vite.ts
index 41f5ef06a6e4..6744f347c436 100644
--- a/packages/astro/src/core/create-vite.ts
+++ b/packages/astro/src/core/create-vite.ts
@@ -229,7 +229,7 @@ export async function createVite(
 	};
 
 	// If the user provides a custom assets prefix, make sure assets handled by Vite
-	// are prefixed with it too. This uses one of it's experimental features, but it
+	// are prefixed with it too. This uses one of its experimental features, but it
 	// has been stable for a long time now.
 	const assetsPrefix = settings.config.build.assetsPrefix;
 	if (assetsPrefix) {
diff --git a/packages/astro/src/core/errors/README.md b/packages/astro/src/core/errors/README.md
index bf0753927da8..6636f649f436 100644
--- a/packages/astro/src/core/errors/README.md
+++ b/packages/astro/src/core/errors/README.md
@@ -20,7 +20,7 @@ Title:
 Message:
 
 - Begin with **what happened** and **why**. (ex: `Could not use {feature} because Server-side Rendering is not enabled.`)
-- Then, **describe the action the user should take**. (ex: `Update your Astro config with `output: 'server'` to enable Server-side Rendering.`)
+- Then, **describe the action that the user should take**. (ex: `Update your Astro config with `output: 'server'` to enable Server-side Rendering.`)
 - Although this does not need to be as brief as the `title`, try to keep sentences short, clear and direct to give the reader all the necessary information quickly as possible. Users should be able to skim the message and understand the problem and solution.
 - If your message is too long, or the solution is not guaranteed to work, use the `hint` property to provide more information.
 
diff --git a/packages/astro/src/core/errors/errors-data.ts b/packages/astro/src/core/errors/errors-data.ts
index 53ed86e74a7b..b4f17bdff160 100644
--- a/packages/astro/src/core/errors/errors-data.ts
+++ b/packages/astro/src/core/errors/errors-data.ts
@@ -900,7 +900,7 @@ export const LocalsNotAnObject = {
 export const LocalsReassigned = {
 	name: 'LocalsReassigned',
 	title: '`locals` must not be reassigned.',
-	message: '`locals` can not be assigned directly.',
+	message: '`locals` cannot be assigned directly.',
 	hint: 'Set a `locals` property instead.',
 } satisfies ErrorData;
 
@@ -1215,7 +1215,7 @@ export const InvalidI18nMiddlewareConfiguration = {
 	name: 'InvalidI18nMiddlewareConfiguration',
 	title: 'Invalid internationalization middleware configuration',
 	message:
-		'The option `redirectToDefaultLocale` can be enabled only when `prefixDefaultLocale` is also set to `true`, otherwise redirects might cause infinite loops. Enable the option `prefixDefaultLocale` to continue to use `redirectToDefaultLocale`, or ensure both are set to `false`.',
+		'The option `redirectToDefaultLocale` can be enabled only when `prefixDefaultLocale` is also set to `true`; otherwise, redirects might cause infinite loops. Enable the option `prefixDefaultLocale` to continue to use `redirectToDefaultLocale`, or ensure both are set to `false`.',
 } satisfies ErrorData;
 
 /**
@@ -1247,7 +1247,7 @@ export const UnhandledRejection = {
 /**
  * @docs
  * @description
- * The `astro:i18n` module can not be used without enabling i18n in your Astro config. To enable i18n, add a default locale and a list of supported locales to your Astro config:
+ * The `astro:i18n` module cannot be used without enabling i18n in your Astro config. To enable i18n, add a default locale and a list of supported locales to your Astro config:
  * ```js
  * import { defineConfig } from 'astro'
  * export default defineConfig({
@@ -1266,7 +1266,7 @@ export const UnhandledRejection = {
 export const i18nNotEnabled = {
 	name: 'i18nNotEnabled',
 	title: 'i18n Not Enabled',
-	message: 'The `astro:i18n` module can not be used without enabling i18n in your Astro config.',
+	message: 'The `astro:i18n` module cannot be used without enabling i18n in your Astro config.',
 	hint: 'See https://docs.astro.build/en/guides/internationalization for a guide on setting up i18n.',
 } satisfies ErrorData;
 
@@ -1370,7 +1370,7 @@ export const ForbiddenRewrite = {
 	title: 'Forbidden rewrite to a static route.',
 	message: (from: string, to: string, component: string) =>
 		`You tried to rewrite the on-demand route '${from}' with the static route '${to}', when using the 'server' output. \n\nThe static route '${to}' is rendered by the component
-'${component}', which is marked as prerendered. This is a forbidden operation because during the build the component '${component}' is compiled to an
+'${component}', which is marked as prerendered. This is a forbidden operation because during the build, the component '${component}' is compiled to an
 HTML file, which can't be retrieved at runtime by Astro.`,
 	hint: (component: string) =>
 		`Add \`export const prerender = false\` to the component '${component}', or use a Astro.redirect().`,
@@ -1508,9 +1508,9 @@ export const UnknownMarkdownError = {
  * @docs
  * @message
  * **Example error messages:**<br/>
- * can not read an implicit mapping pair; a colon is missed<br/>
+ * cannot read an implicit mapping pair; a colon is missed<br/>
  * unexpected end of the stream within a double quoted scalar<br/>
- * can not read a block mapping entry; a multiline key may not be an implicit key
+ * cannot read a block mapping entry; a multiline key may not be an implicit key
  * @description
  * Astro encountered an error while parsing the frontmatter of your Markdown file.
  * This is often caused by a mistake in the syntax, such as a missing colon or a missing end quote.
@@ -2175,6 +2175,6 @@ export const CacheQueryConfigConflict = {
  * 		- If your message is fully dynamic (ex: lots of conditional logic), make `message` a proper function, like such: `message(parameters) { logic }`.
  * 			Make sure to add a `@message` tag with a static example of the error message, the docs won't be able to parse it otherwise.
  *  	- If your message is static, you can just use a string, `message: "my message"`.
- * 5. Make sure to add a JSdoc comment with the `@docs` tag so that it shows up in the docs, otherwise the error overlay will point to a 404!
+ * 5. Make sure to add a JSdoc comment with the `@docs` tag so that it shows up in the docs; otherwise, the error overlay will point to a 404!
  * For more information, see the README in this folder!
  */
diff --git a/packages/astro/src/core/errors/errors.ts b/packages/astro/src/core/errors/errors.ts
index 548594430ab7..693d1a1a898c 100644
--- a/packages/astro/src/core/errors/errors.ts
+++ b/packages/astro/src/core/errors/errors.ts
@@ -46,7 +46,7 @@ export class AstroError extends Error {
 		this.name = name;
 
 		if (message) this.message = message;
-		// Only set this if we actually have a stack passed, otherwise uses Error's
+		// Only set this if we actually have a stack passed; otherwise, uses Error's
 		this.stack = stack ? stack : this.stack;
 		this.loc = location;
 		this.hint = hint;
diff --git a/packages/astro/src/core/logger/core.ts b/packages/astro/src/core/logger/core.ts
index dc164acdaab7..d79c6b2c31e3 100644
--- a/packages/astro/src/core/logger/core.ts
+++ b/packages/astro/src/core/logger/core.ts
@@ -117,7 +117,7 @@ function warn(opts: LogOptions, label: string | null, message: string, newLine =
 	return log(opts, 'warn', label, message, newLine);
 }
 
-/** Emit a error message, Useful when Astro can't recover from some error. */
+/** Emit an error message, Useful when Astro can't recover from some error. */
 function error(opts: LogOptions, label: string | null, message: string, newLine = true) {
 	return log(opts, 'error', label, message, newLine);
 }
diff --git a/packages/astro/src/core/middleware/callMiddleware.ts b/packages/astro/src/core/middleware/callMiddleware.ts
index be19529de92d..98e731b619f9 100644
--- a/packages/astro/src/core/middleware/callMiddleware.ts
+++ b/packages/astro/src/core/middleware/callMiddleware.ts
@@ -20,7 +20,7 @@ import { AstroError, AstroErrorData } from '../errors/index.js';
  * - call `next`;
  *
  * Failing doing so will result an error. A middleware can call `next` and do not return a
- * response. A middleware can not call `next` and return a new `Response` from scratch (maybe with a redirect).
+ * response. A middleware cannot call `next` and return a new `Response` from scratch (maybe with a redirect).
  *
  * ```js
  * const onRequest = async (context, next) => {
diff --git a/packages/astro/src/core/middleware/vite-plugin.ts b/packages/astro/src/core/middleware/vite-plugin.ts
index efb588803074..c19ef310cd8c 100644
--- a/packages/astro/src/core/middleware/vite-plugin.ts
+++ b/packages/astro/src/core/middleware/vite-plugin.ts
@@ -9,7 +9,7 @@ import { MissingMiddlewareForInternationalization } from '../errors/errors-data.
 import { AstroError } from '../errors/index.js';
 import { normalizePath } from '../viteUtils.js';
 
-// This module name is used in Cloudflare's optmizedDeps configuration,
+// This module name is used in Cloudflare's optimizedDeps configuration,
 // if th name changes that needs to be updated as well.
 export const MIDDLEWARE_MODULE_ID = 'virtual:astro:middleware';
 const MIDDLEWARE_RESOLVED_MODULE_ID = '\0' + MIDDLEWARE_MODULE_ID;
diff --git a/packages/astro/src/core/render-context.ts b/packages/astro/src/core/render-context.ts
index d0a518bc0358..1f80c74c47fa 100644
--- a/packages/astro/src/core/render-context.ts
+++ b/packages/astro/src/core/render-context.ts
@@ -369,7 +369,7 @@ export class RenderContext {
 			return response;
 		};
 
-		// If we are rendering an extrnal redirect, we don't need go through the middleware,
+		// If we are rendering an external redirect, we don't need go through the middleware,
 		// otherwise Astro will attempt to render the external website
 		if (isRouteExternalRedirect(this.routeData)) {
 			return renderRedirect(this);
@@ -650,7 +650,7 @@ export class RenderContext {
 			cspDestination: manifest.csp?.cspDestination ?? (routeData.prerender ? 'meta' : 'header'),
 			shouldInjectCspMetaTags,
 			cspAlgorithm,
-			// The following arrays must be cloned, otherwise they become mutable across routes.
+			// The following arrays must be cloned; otherwise, they become mutable across routes.
 			scriptHashes: manifest.csp?.scriptHashes ? [...manifest.csp.scriptHashes] : [],
 			scriptResources: manifest.csp?.scriptResources ? [...manifest.csp.scriptResources] : [],
 			styleHashes: manifest.csp?.styleHashes ? [...manifest.csp.styleHashes] : [],
diff --git a/packages/astro/src/core/render/slots.ts b/packages/astro/src/core/render/slots.ts
index 1c767083da71..01dde33e19bc 100644
--- a/packages/astro/src/core/render/slots.ts
+++ b/packages/astro/src/core/render/slots.ts
@@ -53,7 +53,7 @@ export class Slots {
 		if (!Array.isArray(args)) {
 			this.#logger.warn(
 				null,
-				`Expected second parameter to be an array, received a ${typeof args}. If you're trying to pass an array as a single argument and getting unexpected results, make sure you're passing your array as a item of an array. Ex: Astro.slots.render('default', [["Hello", "World"]])`,
+				`Expected second parameter to be an array, received a ${typeof args}. If you're trying to pass an array as a single argument and getting unexpected results, make sure you're passing your array as an item of an array. Ex: Astro.slots.render('default', [["Hello", "World"]])`,
 			);
 		} else if (args.length > 0) {
 			const slotValue = this.#slots[name];
diff --git a/packages/astro/src/core/routing/create-manifest.ts b/packages/astro/src/core/routing/create-manifest.ts
index c0b614d47c71..504f917c5434 100644
--- a/packages/astro/src/core/routing/create-manifest.ts
+++ b/packages/astro/src/core/routing/create-manifest.ts
@@ -611,7 +611,7 @@ function detectRouteCollision(a: RouteData, b: RouteData, _config: AstroConfig,
 		);
 		logger.warn(
 			'router',
-			'A collision will result in an hard error in following versions of Astro.',
+			'A collision will result in a hard error in following versions of Astro.',
 		);
 		return;
 	}
@@ -647,7 +647,7 @@ function detectRouteCollision(a: RouteData, b: RouteData, _config: AstroConfig,
 		'router',
 		`The route "${a.route}" is defined in both "${a.component}" and "${b.component}" using SSR mode. A dynamic SSR route cannot be defined more than once.`,
 	);
-	logger.warn('router', 'A collision will result in an hard error in following versions of Astro.');
+	logger.warn('router', 'A collision will result in a hard error in following versions of Astro.');
 }
 
 /**
diff --git a/packages/astro/src/core/routing/match.ts b/packages/astro/src/core/routing/match.ts
index cccfdbdae438..5341912816c7 100644
--- a/packages/astro/src/core/routing/match.ts
+++ b/packages/astro/src/core/routing/match.ts
@@ -23,7 +23,7 @@ export function matchAllRoutes(pathname: string, manifest: RoutesList): RouteDat
  * Determines if the given route matches a 404 or 500 error page.
  *
  * @param {RouteData} route - The route data to check.
- * @returns {boolean} `true` if the route matches a 404 or 500 error page, otherwise `false`.
+ * @returns {boolean} `true` if the route matches a 404 or 500 error page; otherwise, `false`.
  */
 export function isRoute404or500(route: RouteData): boolean {
 	return isRoute404(route.route) || isRoute500(route.route);
@@ -33,7 +33,7 @@ export function isRoute404or500(route: RouteData): boolean {
  * Determines if a given route is associated with the server island component.
  *
  * @param {RouteData} route - The route data object to evaluate.
- * @return {boolean} Returns true if the route's component is the server island component, otherwise false.
+ * @return {boolean} Returns true if the route's component is the server island component; otherwise, false.
  */
 export function isRouteServerIsland(route: RouteData): boolean {
 	return route.component === SERVER_ISLAND_COMPONENT;
@@ -43,7 +43,7 @@ export function isRouteServerIsland(route: RouteData): boolean {
  * Determines whether a given route is an external redirect.
  *
  * @param {RouteData} route - The route object to check.
- * @return {boolean} Returns true if the route is an external redirect, otherwise false.
+ * @return {boolean} Returns true if the route is an external redirect; otherwise, false.
  */
 export function isRouteExternalRedirect(route: RouteData): boolean {
 	return !!(route.type === 'redirect' && route.redirect && redirectIsExternal(route.redirect));
diff --git a/packages/astro/src/core/sync/index.ts b/packages/astro/src/core/sync/index.ts
index 248a2e5bd0ba..629eb0c9bac5 100644
--- a/packages/astro/src/core/sync/index.ts
+++ b/packages/astro/src/core/sync/index.ts
@@ -281,7 +281,7 @@ async function createTempViteServer(
  *
  * A non-zero process signal is emitted in case there's an error while generating content collection types.
  *
- * This should only be used when the callee already has an `AstroSetting`, otherwise use `sync()` instead.
+ * This should only be used when the callee already has an `AstroSetting`; otherwise, use `sync()` instead.
  * @internal
  *
  * @param {SyncOptions} options
diff --git a/packages/astro/src/env/vite-plugin-import-meta-env.ts b/packages/astro/src/env/vite-plugin-import-meta-env.ts
index d92d3f20bfda..51f4a367f38d 100644
--- a/packages/astro/src/env/vite-plugin-import-meta-env.ts
+++ b/packages/astro/src/env/vite-plugin-import-meta-env.ts
@@ -23,7 +23,7 @@ function getReferencedPrivateKeys(source: string, privateEnv: Record<string, any
 }
 
 /**
- * Use esbuild to perform replacememts like Vite
+ * Use esbuild to perform replacements like Vite
  * https://github.com/vitejs/vite/blob/5ea9edbc9ceb991e85f893fe62d68ed028677451/packages/vite/src/node/plugins/define.ts#L130
  */
 async function replaceDefine(
diff --git a/packages/astro/src/i18n/index.ts b/packages/astro/src/i18n/index.ts
index 3db8fb1420d0..8e963eb4dc33 100644
--- a/packages/astro/src/i18n/index.ts
+++ b/packages/astro/src/i18n/index.ts
@@ -51,7 +51,7 @@ type GetLocaleRelativeUrl = GetLocaleOptions & {
 
 export type GetLocaleOptions = {
 	/**
-	 * Makes the locale URL-friendly by replacing underscores with dashes, and converting the locale to lower case.
+	 * Makes the locale URL-friendly by replacing underscores with dashes, and converting the locale to lowercase.
 	 * @default true
 	 */
 	normalizeLocale?: boolean;
@@ -223,7 +223,7 @@ export function getLocaleByPath(path: string, locales: Locales): string {
  *
  * Given a locale, this function:
  * - replaces the `_` with a `-`;
- * - transforms all letters to be lower case;
+ * - transforms all letters to be lowercase;
  */
 export function normalizeTheLocale(locale: string): string {
 	return locale.replaceAll('_', '-').toLowerCase();
diff --git a/packages/astro/src/runtime/client/dev-toolbar/apps/audit/rules/a11y.ts b/packages/astro/src/runtime/client/dev-toolbar/apps/audit/rules/a11y.ts
index a8dd54555788..10c0070c2e95 100644
--- a/packages/astro/src/runtime/client/dev-toolbar/apps/audit/rules/a11y.ts
+++ b/packages/astro/src/runtime/client/dev-toolbar/apps/audit/rules/a11y.ts
@@ -62,7 +62,7 @@ const interactiveElements = [
 	...MAYBE_INTERACTIVE.keys(),
 ];
 
-const labellableElements = ['button', 'input', 'meter', 'output', 'progress', 'select', 'textarea'];
+const labelableElements = ['button', 'input', 'meter', 'output', 'progress', 'select', 'textarea'];
 
 const aria_non_interactive_roles = [
 	'alert',
@@ -298,8 +298,8 @@ export const a11y: AuditRuleWithSelector[] = [
 		match(element: HTMLLabelElement) {
 			// Label must be associated with a control, either using `for` or having a nested valid element
 			const hasFor = element.hasAttribute('for');
-			const nestedLabellableElement = element.querySelector(`${labellableElements.join(', ')}`);
-			if (!hasFor && !nestedLabellableElement) return true;
+			const nestedLabelableElement = element.querySelector(`${labelableElements.join(', ')}`);
+			if (!hasFor && !nestedLabelableElement) return true;
 
 			// Label must have text content, using innerText to ignore hidden text
 			const innerText = element.innerText.trim();
diff --git a/packages/astro/src/runtime/client/dev-toolbar/apps/audit/ui/audit-list-window.ts b/packages/astro/src/runtime/client/dev-toolbar/apps/audit/ui/audit-list-window.ts
index a87cad395cd3..2c259336850d 100644
--- a/packages/astro/src/runtime/client/dev-toolbar/apps/audit/ui/audit-list-window.ts
+++ b/packages/astro/src/runtime/client/dev-toolbar/apps/audit/ui/audit-list-window.ts
@@ -386,7 +386,7 @@ export class DevToolbarAuditListWindow extends HTMLElement {
 						<h1></astro-dev-toolbar-icon>No accessibility or performance issues detected.</h1>
 					</header>
 					<p>
-						Nice work! This app scans the page and highlights common accessibility and performance issues for you, like a missing "alt" attribute on an image, or a image not using performant attributes.
+						Nice work! This app scans the page and highlights common accessibility and performance issues for you, like a missing "alt" attribute on an image, or an image not using performant attributes.
 					</p>
 					<astro-dev-toolbar-icon icon="houston-detective"></astro-dev-toolbar-icon>
 					`;
diff --git a/packages/astro/src/runtime/client/dev-toolbar/apps/utils/highlight.ts b/packages/astro/src/runtime/client/dev-toolbar/apps/utils/highlight.ts
index 50be27b0ea76..33f5143bcfd8 100644
--- a/packages/astro/src/runtime/client/dev-toolbar/apps/utils/highlight.ts
+++ b/packages/astro/src/runtime/client/dev-toolbar/apps/utils/highlight.ts
@@ -47,7 +47,7 @@ export function positionHighlight(highlight: DevToolbarHighlight, rect: DOMRect)
 	highlight.style.display = 'block';
 	// If the highlight is fixed, don't position based on scroll
 	const scrollY = highlight.style.position === 'fixed' ? 0 : window.scrollY;
-	// Make an highlight that is 10px bigger than the element on all sides
+	// Make a highlight that is 10px bigger than the element on all sides
 	highlight.style.top = `${Math.max(rect.top + scrollY - 10, 0)}px`;
 	highlight.style.left = `${Math.max(rect.left + window.scrollX - 10, 0)}px`;
 	highlight.style.width = `${rect.width + 15}px`;
diff --git a/packages/astro/src/runtime/client/dev-toolbar/toolbar.ts b/packages/astro/src/runtime/client/dev-toolbar/toolbar.ts
index 77ad9d8ea4a9..896f72575fac 100644
--- a/packages/astro/src/runtime/client/dev-toolbar/toolbar.ts
+++ b/packages/astro/src/runtime/client/dev-toolbar/toolbar.ts
@@ -445,7 +445,7 @@ export class AstroDevToolbar extends HTMLElement {
 			if (!closeApp) return;
 		}
 
-		// TODO(fks): Handle a app that hasn't loaded yet.
+		// TODO(fks): Handle an app that hasn't loaded yet.
 		// Currently, this will just do nothing.
 		if (app.status !== 'ready') return;
 
diff --git a/packages/astro/src/runtime/client/visible.ts b/packages/astro/src/runtime/client/visible.ts
index c7d858ffb0b4..7f647c2f9904 100644
--- a/packages/astro/src/runtime/client/visible.ts
+++ b/packages/astro/src/runtime/client/visible.ts
@@ -2,7 +2,7 @@ import type { ClientVisibleOptions } from '../../types/public/elements.js';
 import type { ClientDirective } from '../../types/public/integrations.js';
 
 /**
- * Hydrate this component when one of it's children becomes visible
+ * Hydrate this component when one of its children becomes visible
  * We target the children because `astro-island` is set to `display: contents`
  * which doesn't work with IntersectionObserver
  */
diff --git a/packages/astro/src/runtime/server/endpoint.ts b/packages/astro/src/runtime/server/endpoint.ts
index 7108e014e183..a54d218361e8 100644
--- a/packages/astro/src/runtime/server/endpoint.ts
+++ b/packages/astro/src/runtime/server/endpoint.ts
@@ -18,7 +18,7 @@ export async function renderEndpoint(
 	const { request, url } = context;
 
 	const method = request.method.toUpperCase();
-	// use the exact match on `method`, fallback to ALL
+	// use the exact match on `method`, fall back to ALL
 	let handler = mod[method] ?? mod['ALL'];
 	// use GET handler for HEAD requests
 	if (!handler && method === 'HEAD' && mod['GET']) {
diff --git a/packages/astro/src/runtime/server/render/astro/render.ts b/packages/astro/src/runtime/server/render/astro/render.ts
index e2ce59a0b0b8..101d64303953 100644
--- a/packages/astro/src/runtime/server/render/astro/render.ts
+++ b/packages/astro/src/runtime/server/render/astro/render.ts
@@ -281,7 +281,7 @@ export async function renderToAsyncIterable(
 				await next.promise;
 			}
 
-			// Only create a new promise if rendering is still ongoing. Otherwise
+			// Only create a new promise if rendering is still ongoing. Otherwise,
 			// there will be a dangling promises that breaks tests (probably not an actual app)
 			if (!renderingComplete) {
 				next = promiseWithResolvers();
diff --git a/packages/astro/src/runtime/server/render/page.ts b/packages/astro/src/runtime/server/render/page.ts
index 3e791851b1b3..f7ccd333f81b 100644
--- a/packages/astro/src/runtime/server/render/page.ts
+++ b/packages/astro/src/runtime/server/render/page.ts
@@ -102,7 +102,7 @@ export async function renderPage(
 	let body: BodyInit | Response;
 	if (streaming) {
 		// isNode is true in Deno node-compat mode but response construction from
-		// async iterables is not supported, so we fallback to ReadableStream if isDeno is true.
+		// async iterables is not supported, so we fall back to ReadableStream if isDeno is true.
 		if (isNode && !isDeno) {
 			const nodeBody = await renderToAsyncIterable(
 				result,
diff --git a/packages/astro/src/runtime/server/transition.ts b/packages/astro/src/runtime/server/transition.ts
index b494910447fa..fd2b13d5631e 100644
--- a/packages/astro/src/runtime/server/transition.ts
+++ b/packages/astro/src/runtime/server/transition.ts
@@ -69,7 +69,7 @@ function reEncode(s: string) {
 
 			// If we find a character in the range \x00 - \x7f that is not one of the reEncodeValidChars,
 			// we replace it with its hex value escaped by an underscore for decodability (and better readability,
-			// because most of them are punctuations like ,'"":;_..., and '_' might be a better choice than '-')
+			// because most of them are punctuation like ,'"":;_..., and '_' might be a better choice than '-')
 			// The underscore itself (code 95) is also escaped and encoded as two underscores to avoid
 			// collisions between original and encoded strings.
 			// All other values are just copied over
diff --git a/packages/astro/src/transitions/router.ts b/packages/astro/src/transitions/router.ts
index 4e8686558e7e..06a127e73c5f 100644
--- a/packages/astro/src/transitions/router.ts
+++ b/packages/astro/src/transitions/router.ts
@@ -134,7 +134,7 @@ function runScripts() {
 	let needsWaitForInlineModuleScript = false;
 	// The original code made the assumption that all inline scripts are directly executed when inserted into the DOM.
 	// This is not true for inline module scripts, which are deferred but still executed in order.
-	// inline module scripts can not be awaited for with onload.
+	// inline module scripts cannot be awaited for with onload.
 	// Thus to be able to wait for the execution of all scripts, we make sure that the last inline module script
 	// is always followed by an external module script
 	for (const script of document.getElementsByTagName('script')) {
@@ -221,7 +221,7 @@ const moveToLocation = (
 	} else {
 		if (to.hash) {
 			// because we are already on the target page ...
-			// ... what comes next is a intra-page navigation
+			// ... what comes next is an intra-page navigation
 			// that won't reload the page but instead scroll to the fragment
 			history.scrollRestoration = 'auto';
 			const savedState = history.state;
@@ -347,7 +347,7 @@ async function transition(
 	// The most recent navigation always has precedence
 	// Yes, there can be several navigation instances as the user can click links
 	// while we fetch content or simulate view transitions. Even synchronous creations are possible
-	// e.g. by calling navigate() from an transition event.
+	// e.g. by calling navigate() from a transition event.
 	// Invariant: all but the most recent navigation are already aborted.
 
 	const currentNavigation = abortAndRecreateMostRecentNavigation();
@@ -512,7 +512,7 @@ async function transition(
 	} else {
 		// Simulation mode requires a bit more manual work
 		const updateDone = (async () => {
-			// Immediately paused to setup the ViewTransition object for Fallback mode
+			// Immediately paused to set up the ViewTransition object for Fallback mode
 			await Promise.resolve(); // hop through the micro task queue
 			await updateDOM(prepEvent, options, currentTransition, historyState, getFallback());
 			return undefined;
diff --git a/packages/astro/src/transitions/swap-functions.ts b/packages/astro/src/transitions/swap-functions.ts
index 5b73ce5e7084..61901649ecf4 100644
--- a/packages/astro/src/transitions/swap-functions.ts
+++ b/packages/astro/src/transitions/swap-functions.ts
@@ -61,7 +61,7 @@ export function swapHeadElements(doc: Document) {
 		if (newEl) {
 			newEl.remove();
 		} else {
-			// Otherwise remove the element in the head. It doesn't exist in the new page.
+			// Otherwise, remove the element in the head. It doesn't exist in the new page.
 			el.remove();
 		}
 	}
diff --git a/packages/astro/src/types/astro.ts b/packages/astro/src/types/astro.ts
index 63000dc417b3..9b52b340ef82 100644
--- a/packages/astro/src/types/astro.ts
+++ b/packages/astro/src/types/astro.ts
@@ -70,7 +70,7 @@ export interface AstroSettings {
 	// This makes content optional. Internal only so it's not optional on InjectedType
 	injectedTypes: Array<Omit<InjectedType, 'content'> & Partial<Pick<InjectedType, 'content'>>>;
 	/**
-	 * Determine if the build output should be a static, dist folder or a adapter-based server output
+	 * Determine if the build output should be a static, dist folder or an adapter-based server output
 	 * undefined when unknown
 	 */
 	buildOutput: undefined | 'static' | 'server';
diff --git a/packages/astro/src/types/public/config.ts b/packages/astro/src/types/public/config.ts
index 8d1e99607437..3a768752d3e1 100644
--- a/packages/astro/src/types/public/config.ts
+++ b/packages/astro/src/types/public/config.ts
@@ -2705,7 +2705,7 @@ export interface AstroUserConfig<
 		 * Continue to use the `data-astro-prefetch` attribute on any `<a />` link on your site to opt in to prefetching.
 		 * Instead of appending a `<link>` tag to the head of the document or fetching the page with JavaScript, a `<script>` tag will be appended with the corresponding speculation rules.
 		 *
-		 * Client side prerendering requires browser support. If the Speculation Rules API is not supported, `prefetch` will fallback to the supported strategy.
+		 * Client side prerendering requires browser support. If the Speculation Rules API is not supported, `prefetch` will fall back to the supported strategy.
 		 *
 		 * See the [Prefetch Guide](https://docs.astro.build/en/guides/prefetch/) for more `prefetch` options and usage.
 		 */
diff --git a/packages/astro/src/types/public/context.ts b/packages/astro/src/types/public/context.ts
index ae3ece78a6ae..b40b59d6ea21 100644
--- a/packages/astro/src/types/public/context.ts
+++ b/packages/astro/src/types/public/context.ts
@@ -449,7 +449,7 @@ export interface APIContext<
 	 *
 	 * ## Example
 	 *
-	 * Given `i18n.locales` equals to `['fr', 'de']`, and the `Accept-Language` value equals to `en, de;q=0.2, fr;q=0.6`, the
+	 * Given `i18n.locales` equals `['fr', 'de']`, and the `Accept-Language` value equals `en, de;q=0.2, fr;q=0.6`, the
 	 * `Astro.preferredLanguage` will be `fr` because `en` is not supported, its [quality value](https://developer.mozilla.org/en-US/docs/Glossary/Quality_values) is the highest.
 	 *
 	 * [Astro reference](https://docs.astro.build/en/reference/api-reference/#preferredlocale)
@@ -468,8 +468,8 @@ export interface APIContext<
 	 *
 	 * ## Example
 	 *
-	 * Given `i18n.locales` equals to `['fr', 'pt', 'de']`, and the
-	 * `Accept-Language` value equals to `en, de;q=0.2, fr;q=0.6`, the
+	 * Given `i18n.locales` equals `['fr', 'pt', 'de']`, and the
+	 * `Accept-Language` value equals `en, de;q=0.2, fr;q=0.6`, the
 	 * `Astro.preferredLocaleList` will be equal to `['fs', 'de']` because `en`
 	 * isn't supported, and `pt` isn't part of the locales contained in the
 	 * header.
diff --git a/packages/astro/src/types/public/integrations.ts b/packages/astro/src/types/public/integrations.ts
index ae5c2392db3e..419f4c6799f4 100644
--- a/packages/astro/src/types/public/integrations.ts
+++ b/packages/astro/src/types/public/integrations.ts
@@ -21,7 +21,7 @@ export interface RouteOptions {
 	readonly component: string;
 	/**
 	 * Whether this route should be prerendered. If the route has an explicit `prerender` export,
-	 * the value will be passed here. Otherwise, it's undefined and will fallback to a prerender
+	 * the value will be passed here. Otherwise, it's undefined and will fall back to a prerender
 	 * default depending on the `output` option.
 	 */
 	prerender?: boolean;
diff --git a/packages/astro/src/types/public/internal.ts b/packages/astro/src/types/public/internal.ts
index cc22dd40bae8..54ccdbfaf8f7 100644
--- a/packages/astro/src/types/public/internal.ts
+++ b/packages/astro/src/types/public/internal.ts
@@ -113,7 +113,7 @@ export interface RouteData {
 	 */
 	redirectRoute?: RouteData;
 	/**
-	 * A list of {@link RouteData} to fallback to. They are present when `i18n.fallback` has a list of locales.
+	 * A list of {@link RouteData} to fall back to. They are present when `i18n.fallback` has a list of locales.
 	 */
 	fallbackRoutes: RouteData[];
 
diff --git a/packages/astro/src/types/public/manifest.ts b/packages/astro/src/types/public/manifest.ts
index 5e5172b70bc5..5e8558950002 100644
--- a/packages/astro/src/types/public/manifest.ts
+++ b/packages/astro/src/types/public/manifest.ts
@@ -2,7 +2,7 @@
  * **IMPORTANT**: use the `Pick` interface to select only the properties that we want to expose
  * to the users. Using blanket types could expose properties that we don't want. So if we decide to expose
  * properties, we need to be good at justifying them. For example: why you need this config? can't you use an integration?
- * why do you need access to the shiki config? (very low-level confiig)
+ * why do you need access to the shiki config? (very low-level config)
  */
 
 import type { SSRManifest } from '../../core/app/types.js';
diff --git a/packages/astro/src/vite-plugin-astro/index.ts b/packages/astro/src/vite-plugin-astro/index.ts
index cf529e2e143b..11f8819c1472 100644
--- a/packages/astro/src/vite-plugin-astro/index.ts
+++ b/packages/astro/src/vite-plugin-astro/index.ts
@@ -59,7 +59,7 @@ export default function astro({ settings, logger }: AstroPluginOptions): vite.Pl
 				},
 				async handler(_source, id) {
 					const parsedId = parseAstroRequest(id);
-					// Special edge case handling for Vite 6 beta, the style dependencies need to be registered here take affect
+					// Special edge case handling for Vite 6 beta, the style dependencies need to be registered here to take effect
 					// TODO: Remove this when Vite fixes it (https://github.com/vitejs/vite/pull/18103)
 					const astroFilename = normalizePath(normalizeFilename(parsedId.filename, config.root));
 					const compileMetadata = astroFileToCompileMetadata.get(astroFilename);
diff --git a/packages/astro/test/0-css.test.js b/packages/astro/test/0-css.test.js
index aa6da30112f0..35ca255f06cc 100644
--- a/packages/astro/test/0-css.test.js
+++ b/packages/astro/test/0-css.test.js
@@ -50,7 +50,7 @@ describe('CSS', function () {
 				for (const [key] of Object.entries(classes[0].attribs)) {
 					if (/^data-astro-cid-[A-Za-z\d-]+/.test(key)) {
 						// Ema: this is ugly, but for reasons that I don't want to explore, cheerio
-						// lower case the hash of the attribute
+						// lowercase the hash of the attribute
 						scopedAttribute = key;
 					}
 				}
diff --git a/packages/astro/test/actions.test.js b/packages/astro/test/actions.test.js
index 4d20540afe1c..129ecf6cbadb 100644
--- a/packages/astro/test/actions.test.js
+++ b/packages/astro/test/actions.test.js
@@ -153,7 +153,7 @@ describe('Astro Actions', () => {
 			}
 		});
 
-		it('Returns 404 for non-existent action', async () => {
+		it('Returns 404 for nonexistent action', async () => {
 			const res = await fixture.fetch('/_actions/nonExistent', {
 				method: 'POST',
 				body: JSON.stringify({}),
@@ -606,7 +606,7 @@ describe('Astro Actions', () => {
 			}
 		});
 
-		it('Returns 404 for non-existent action', async () => {
+		it('Returns 404 for nonexistent action', async () => {
 			const req = new Request('http://example.com/_actions/nonExistent', {
 				method: 'POST',
 				headers: {
diff --git a/packages/astro/test/astro-doctype.test.js b/packages/astro/test/astro-doctype.test.js
index 63e3eb9f8720..e2e5e525b12c 100644
--- a/packages/astro/test/astro-doctype.test.js
+++ b/packages/astro/test/astro-doctype.test.js
@@ -35,7 +35,7 @@ describe('Doctype', () => {
 		);
 	});
 
-	it('User provided doctype is case insensitive', async () => {
+	it('User provided doctype is case-insensitive', async () => {
 		const html = await fixture.readFile('/capital/index.html');
 
 		// test 1: Doctype left alone
diff --git a/packages/astro/test/astro-external-files.test.js b/packages/astro/test/astro-external-files.test.js
index ecd92a912d53..80adb5986d45 100644
--- a/packages/astro/test/astro-external-files.test.js
+++ b/packages/astro/test/astro-external-files.test.js
@@ -10,7 +10,7 @@ describe('External file references', () => {
 		await fixture.build();
 	});
 
-	it('Build with externeal reference', async () => {
+	it('Build with external reference', async () => {
 		const html = await fixture.readFile('/index.html');
 		assert.equal(html.includes('<script src="/external-file.js"'), true);
 	});
diff --git a/packages/astro/test/astro-sync.test.js b/packages/astro/test/astro-sync.test.js
index 127d15d0cbc5..162a3ba612cd 100644
--- a/packages/astro/test/astro-sync.test.js
+++ b/packages/astro/test/astro-sync.test.js
@@ -98,7 +98,7 @@ const createFixture = () => {
 		/**
 		 * @param {string} path
 		 */
-		thenFileShouldBeValidTypescript(path) {
+		thenFileShouldBeValidTypeScript(path) {
 			try {
 				const content = writtenFiles[getExpectedPath(path)];
 				const result = ts.transpileModule(content, {
@@ -162,7 +162,7 @@ describe('astro sync', () => {
 				`declare module 'astro:content' {`,
 				'Types file does not include `astro:content` module declaration',
 			);
-			fixture.thenFileShouldBeValidTypescript('.astro/content.d.ts');
+			fixture.thenFileShouldBeValidTypeScript('.astro/content.d.ts');
 		});
 
 		it('Writes types for empty collections', async () => {
@@ -263,7 +263,7 @@ describe('astro sync', () => {
 				`declare module "astro:actions" {`,
 				'Types file does not include `astro:actions` module declaration',
 			);
-			fixture.thenFileShouldBeValidTypescript('.astro/actions.d.ts');
+			fixture.thenFileShouldBeValidTypeScript('.astro/actions.d.ts');
 		});
 	});
 
diff --git a/packages/astro/test/config-mode.test.js b/packages/astro/test/config-mode.test.js
index 16baf95d525e..83555d65105c 100644
--- a/packages/astro/test/config-mode.test.js
+++ b/packages/astro/test/config-mode.test.js
@@ -76,7 +76,7 @@ describe('AstroConfig - config.output', () => {
 				try {
 					html = await fixture.readFile('/index.html');
 				} catch {
-					assert.equal(false, true, 'Couldnt find the file, which mean it did not build.');
+					assert.equal(false, true, 'Could not find the file, which mean it did not build.');
 				}
 				assert.equal(html.length > 0, true);
 			});
diff --git a/packages/astro/test/core-image.test.js b/packages/astro/test/core-image.test.js
index 042e722a9a37..01aa68b9434b 100644
--- a/packages/astro/test/core-image.test.js
+++ b/packages/astro/test/core-image.test.js
@@ -774,7 +774,7 @@ describe('astro:image', () => {
 				assert.equal(res.status, 200);
 				assert.equal(
 					await res.text(),
-					"You fool! I'm not a image endpoint at all, I just return this!",
+					"You fool! I'm not an image endpoint at all, I just return this!",
 				);
 			});
 
@@ -946,7 +946,7 @@ describe('astro:image', () => {
 			assert.equal(img.status, 200);
 		});
 
-		it('returns 403 when loading a relative pattern iamge', async () => {
+		it('returns 403 when loading a relative pattern image', async () => {
 			const fixtureWithBase = await loadFixture({
 				root: './fixtures/core-image-ssr/',
 				output: 'server',
diff --git a/packages/astro/test/fixtures/astro-doctype/src/layouts/WithDoctype.astro b/packages/astro/test/fixtures/astro-doctype/src/layouts/WithDoctype.astro
index c6befb64747c..d46fc35c3cae 100644
--- a/packages/astro/test/fixtures/astro-doctype/src/layouts/WithDoctype.astro
+++ b/packages/astro/test/fixtures/astro-doctype/src/layouts/WithDoctype.astro
@@ -5,7 +5,7 @@ import Meta from '../components/Meta.astro';
 <html lang="en">
   <head>
     <title>My App</title>
-    <link rel="styleshseet" href="/styles/global.css">
+    <link rel="stylesheet" href="/styles/global.css">
     <Meta />
   </head>
   <body>
diff --git a/packages/astro/test/fixtures/astro-doctype/src/layouts/WithoutDoctype.astro b/packages/astro/test/fixtures/astro-doctype/src/layouts/WithoutDoctype.astro
index d589cbeac7e4..3a4c4c020ee8 100644
--- a/packages/astro/test/fixtures/astro-doctype/src/layouts/WithoutDoctype.astro
+++ b/packages/astro/test/fixtures/astro-doctype/src/layouts/WithoutDoctype.astro
@@ -1,7 +1,7 @@
 <html lang="en">
   <head>
     <title>My App</title>
-    <link rel="styleshseet" href="/styles/global.css">
+    <link rel="stylesheet" href="/styles/global.css">
   </head>
   <body>
 
diff --git a/packages/astro/test/fixtures/core-image-svg/src/pages/index.astro b/packages/astro/test/fixtures/core-image-svg/src/pages/index.astro
index bff83cb9d5a4..7f341f4d934f 100644
--- a/packages/astro/test/fixtures/core-image-svg/src/pages/index.astro
+++ b/packages/astro/test/fixtures/core-image-svg/src/pages/index.astro
@@ -1,5 +1,5 @@
 ---
-import ChrevronRight from '~/assets/chevron-right.svg'
+import ChevronRight from '~/assets/chevron-right.svg'
 ---
 <html>
 <head>
@@ -7,7 +7,7 @@ import ChrevronRight from '~/assets/chevron-right.svg'
 </head>
 <body>
 	<div id="default">
-		<ChrevronRight />
+		<ChevronRight />
 	</div>
 </body>
 </html>
diff --git a/packages/astro/test/fixtures/core-image/src/custom-endpoint.ts b/packages/astro/test/fixtures/core-image/src/custom-endpoint.ts
index 22c32497b009..b94136d10289 100644
--- a/packages/astro/test/fixtures/core-image/src/custom-endpoint.ts
+++ b/packages/astro/test/fixtures/core-image/src/custom-endpoint.ts
@@ -1,3 +1,3 @@
 export const GET = async () => {
-		return new Response("You fool! I'm not a image endpoint at all, I just return this!", { status: 200 });
+		return new Response("You fool! I'm not an image endpoint at all, I just return this!", { status: 200 });
 };
diff --git a/packages/astro/test/fixtures/integration-add-page-extension/src/pages/test.mjs b/packages/astro/test/fixtures/integration-add-page-extension/src/pages/test.mjs
index b6bed7c564f3..2dd1a2cb0550 100644
--- a/packages/astro/test/fixtures/integration-add-page-extension/src/pages/test.mjs
+++ b/packages/astro/test/fixtures/integration-add-page-extension/src/pages/test.mjs
@@ -1,3 +1,3 @@
-// Convulted test case, rexport astro file from new `.mjs` page
+// Convoluted test case, re-export astro file from new `.mjs` page
 import Test from '../components/test.astro';
 export default Test;
diff --git a/packages/astro/test/fixtures/markdown/src/pages/realworld.md b/packages/astro/test/fixtures/markdown/src/pages/realworld.md
index 8ba6ea2d58f1..dde567ef60e4 100644
--- a/packages/astro/test/fixtures/markdown/src/pages/realworld.md
+++ b/packages/astro/test/fixtures/markdown/src/pages/realworld.md
@@ -76,7 +76,7 @@ The PHP above displays the tabs. The code below, very similarly, displays the ta
 <?php endif; // (have_rows('tab_panes') ): ?>
 ```
 
-By looping through the same repeater, we can get all the tabs out of the database, no problem. But we still have two problems: 1) linking the tab to the pane 2) Assigning the class of "active" so the Javascript is able to add and remove the CSS to reveal / hide the appropriate pane.
+By looping through the same repeater, we can get all the tabs out of the database, no problem. But we still have two problems: 1) linking the tab to the pane 2) Assigning the class of "active" so the JavaScript is able to add and remove the CSS to reveal / hide the appropriate pane.
 
 ### 1) Linking to the Pane
 
@@ -90,7 +90,7 @@ On the other hand, WordPress has a very useful function called Sanitize HTML, wh
 
 ### 2) Assigning the 'Active' Class
 
-So now we need to get a class of 'active' _only on_ the first tab. The Bootstrap Javascript will do the rest for us. How do we do that?
+So now we need to get a class of 'active' _only on_ the first tab. The Bootstrap JavaScript will do the rest for us. How do we do that?
 
 I added this code just inside the `while` loop, inside the `ul` tag:
 
diff --git a/packages/astro/test/fixtures/server-islands/ssr/src/pages/test.mdx b/packages/astro/test/fixtures/server-islands/ssr/src/pages/test.mdx
index 0d6cfb437ad2..430947205b8f 100644
--- a/packages/astro/test/fixtures/server-islands/ssr/src/pages/test.mdx
+++ b/packages/astro/test/fixtures/server-islands/ssr/src/pages/test.mdx
@@ -1,5 +1,5 @@
 import Island from '../components/Island.astro';
 
-{/* empty div is needed, otherwise island script is injected in the head */}
+{/* empty div is needed; otherwise, island script is injected in the head */}
 <div></div>
 <Island server:defer />
diff --git a/packages/astro/test/fixtures/solid-component/src/components/async-components.jsx b/packages/astro/test/fixtures/solid-component/src/components/async-components.jsx
index c292f1da2031..4fe6906327f1 100644
--- a/packages/astro/test/fixtures/solid-component/src/components/async-components.jsx
+++ b/packages/astro/test/fixtures/solid-component/src/components/async-components.jsx
@@ -1,6 +1,6 @@
 import { ErrorBoundary, Show, createResource, createSignal, createUniqueId } from 'solid-js';
 
-// It may be good to try short and long sleep times.
+// It may be good to try long and short sleep times.
 // But short is faster for testing.
 const SLEEP_MS = 10;
 
diff --git a/packages/astro/test/fixtures/solid-component/src/pages/ssr-client-load.astro b/packages/astro/test/fixtures/solid-component/src/pages/ssr-client-load.astro
index 0b43ca972373..2afb926ae450 100644
--- a/packages/astro/test/fixtures/solid-component/src/pages/ssr-client-load.astro
+++ b/packages/astro/test/fixtures/solid-component/src/pages/ssr-client-load.astro
@@ -10,7 +10,7 @@ import { AsyncComponent } from '../components/async-components.jsx';
 			<!-- client:load should generate exactly one hydration script per page -->
 			<AsyncComponent client:load />
 			<AsyncComponent client:load />
-			<!-- Lazy copmonents should render consistently, even on first render. -->
+			<!-- Lazy components should render consistently, even on first render. -->
 			<LazyCounter client:load />
 		</div>
 	</body>
diff --git a/packages/astro/test/fixtures/solid-component/src/pages/ssr-client-none.astro b/packages/astro/test/fixtures/solid-component/src/pages/ssr-client-none.astro
index bf968b5aca2c..efae0c146dc6 100644
--- a/packages/astro/test/fixtures/solid-component/src/pages/ssr-client-none.astro
+++ b/packages/astro/test/fixtures/solid-component/src/pages/ssr-client-none.astro
@@ -9,7 +9,7 @@ import { AsyncComponent } from '../components/async-components.jsx';
 		<div>
 			<!-- Static component should not create any hydration scripts -->
 			<AsyncComponent />
-			<!-- Lazy copmonents should render consistently, even on first render. -->
+			<!-- Lazy components should render consistently, even on first render. -->
 			<LazyCounter />
 		</div>
 	</body>
diff --git a/packages/astro/test/hmr-new-page.test.js b/packages/astro/test/hmr-new-page.test.js
index 2065f6346d73..8f0b04a5be25 100644
--- a/packages/astro/test/hmr-new-page.test.js
+++ b/packages/astro/test/hmr-new-page.test.js
@@ -45,7 +45,7 @@ describe('HMR: New page detection', () => {
 		assert.equal(response.status, 200);
 	});
 
-	it('should return 404 for non-existent page', async () => {
+	it('should return 404 for nonexistent page', async () => {
 		const response = await fixture.fetch('/new-page');
 		assert.equal(response.status, 404);
 	});
diff --git a/packages/astro/test/i18n-double-prefix.test.js b/packages/astro/test/i18n-double-prefix.test.js
index 193932df844f..fafae8845344 100644
--- a/packages/astro/test/i18n-double-prefix.test.js
+++ b/packages/astro/test/i18n-double-prefix.test.js
@@ -37,7 +37,7 @@ describe('i18n double-prefix prevention', () => {
 	});
 
 	it('should generate correct fallback redirects for missing Spanish pages', async () => {
-		// item2 only exists in English, so Spanish should fallback to English
+		// item2 only exists in English, so Spanish should fall back to English
 		let spanishRedirect = false;
 		try {
 			await fixture.readFile('/es/test/item2/index.html');
diff --git a/packages/astro/test/rewrite.test.js b/packages/astro/test/rewrite.test.js
index bf1d81797231..169e5c8a62a3 100644
--- a/packages/astro/test/rewrite.test.js
+++ b/packages/astro/test/rewrite.test.js
@@ -119,7 +119,7 @@ describe('Dev rewrite, trailing slash -> never, with base', () => {
 		assert.equal($('p').text(), '/base');
 	});
 
-	it('should rewrite and always inlcude base', async () => {
+	it('should rewrite and always include base', async () => {
 		//rewrite('/') will rewrite to '/base'
 		const html = await fixture.fetch('/base/bar').then((res) => res.text());
 		const $ = cheerioLoad(html);
diff --git a/packages/astro/test/route-guard.test.js b/packages/astro/test/route-guard.test.js
index dbc8cd902714..7f6303fb60d2 100644
--- a/packages/astro/test/route-guard.test.js
+++ b/packages/astro/test/route-guard.test.js
@@ -63,7 +63,7 @@ describe('Route Guard - Dev Server', () => {
 		});
 	});
 
-	describe('Non-existent files should 404 normally', () => {
+	describe('Nonexistent files should 404 normally', () => {
 		it('404 when loading /nonexistent.md (file does not exist)', async () => {
 			const response = await fixture.fetch('/nonexistent.md');
 			assert.equal(response.status, 404);
diff --git a/packages/astro/test/underscore-in-folder-name.test.js b/packages/astro/test/underscore-in-folder-name.test.js
index b804a715cd8b..502f2b9310bc 100644
--- a/packages/astro/test/underscore-in-folder-name.test.js
+++ b/packages/astro/test/underscore-in-folder-name.test.js
@@ -3,7 +3,7 @@ import { before, describe, it } from 'node:test';
 import testAdapter from './test-adapter.js';
 import { loadFixture } from './test-utils.js';
 
-describe('Projects with a underscore in the folder name', () => {
+describe('Projects with an underscore in the folder name', () => {
 	let fixture;
 
 	before(async () => {
diff --git a/packages/astro/test/units/app/node.test.js b/packages/astro/test/units/app/node.test.js
index 1f3305e4dc1f..c688d2ae709c 100644
--- a/packages/astro/test/units/app/node.test.js
+++ b/packages/astro/test/units/app/node.test.js
@@ -243,7 +243,7 @@ describe('node', () => {
 				assert.equal(result.url, 'https://example.com/');
 			});
 
-			it('bad values are ignored and fallback to host header', () => {
+			it('bad values are ignored and fall back to host header', () => {
 				const result = createRequest(
 					{
 						...mockNodeRequest,
@@ -282,7 +282,7 @@ describe('node', () => {
 					},
 					{ allowedDomains: [{ hostname: '*.victim.com' }] },
 				);
-				// localhost should not match *.victim.com, fallback to host header which does match
+				// localhost should not match *.victim.com, fall back to host header which does match
 				assert.equal(result.url, 'https://sub.victim.com/');
 			});
 
diff --git a/packages/astro/test/units/assets/fonts/core.test.js b/packages/astro/test/units/assets/fonts/core.test.js
index 3c91e392e8fd..2ce75a1aceac 100644
--- a/packages/astro/test/units/assets/fonts/core.test.js
+++ b/packages/astro/test/units/assets/fonts/core.test.js
@@ -194,7 +194,7 @@ describe('fonts core', () => {
 				},
 				filterAndTransformFontFaces: () => [
 					{
-						src: [{ url: 'overriden' }],
+						src: [{ url: 'overridden' }],
 					},
 				],
 				collectFontAssetsFromFaces: () => {
@@ -211,7 +211,7 @@ describe('fonts core', () => {
 					family: families[0],
 					fonts: [
 						{
-							src: [{ url: 'overriden' }],
+							src: [{ url: 'overridden' }],
 						},
 					],
 					preloads: [],
diff --git a/packages/astro/test/units/config/config-tsconfig.test.js b/packages/astro/test/units/config/config-tsconfig.test.js
index a82ef8b25d7f..94e9438982fd 100644
--- a/packages/astro/test/units/config/config-tsconfig.test.js
+++ b/packages/astro/test/units/config/config-tsconfig.test.js
@@ -24,7 +24,7 @@ describe('TSConfig handling', () => {
 			assert.deepEqual(config.tsconfig.files, ['im-a-test']);
 		});
 
-		it('can fallback to jsconfig.json if tsconfig.json does not exists', async () => {
+		it('can fall back to jsconfig.json if tsconfig.json does not exist', async () => {
 			const config = await loadTSConfig(path.join(cwd, 'jsconfig'));
 
 			assert.equal(config !== undefined, true);
diff --git a/packages/astro/test/units/config/config-validate.test.js b/packages/astro/test/units/config/config-validate.test.js
index d3755dcf5f68..8938c14e166d 100644
--- a/packages/astro/test/units/config/config-validate.test.js
+++ b/packages/astro/test/units/config/config-validate.test.js
@@ -226,7 +226,7 @@ describe('Config Validation', () => {
 				assert.equal(configError instanceof z.ZodError, true);
 				assert.equal(
 					configError.issues[0].message,
-					'The option `i18n.routing.redirectToDefaultLocale` can be used only when `i18n.routing.prefixDefaultLocale` is set to `true`, otherwise redirects might cause infinite loops. Remove the option `i18n.routing.redirectToDefaultLocale`, or change its value to `false`.',
+					'The option `i18n.routing.redirectToDefaultLocale` can be used only when `i18n.routing.prefixDefaultLocale` is set to `true`; otherwise, redirects might cause infinite loops. Remove the option `i18n.routing.redirectToDefaultLocale`, or change its value to `false`.',
 				);
 			},
 		);
diff --git a/packages/astro/test/units/dev/dev.test.js b/packages/astro/test/units/dev/dev.test.js
index 74f1d1e92e0d..8867976feba8 100644
--- a/packages/astro/test/units/dev/dev.test.js
+++ b/packages/astro/test/units/dev/dev.test.js
@@ -125,7 +125,7 @@ describe('dev container', () => {
 					assert.equal(r.res.statusCode, 404);
 				}
 				{
-					// A non-existent page also serves the custom 404 page.
+					// A nonexistent page also serves the custom 404 page.
 					const r = createRequestAndResponse({ method: 'GET', url: '/other-page' });
 					container.handle(r.req, r.res);
 					await r.done;
diff --git a/packages/astro/test/units/routing/manifest.test.js b/packages/astro/test/units/routing/manifest.test.js
index de096e6f29e4..d26a6dec3f12 100644
--- a/packages/astro/test/units/routing/manifest.test.js
+++ b/packages/astro/test/units/routing/manifest.test.js
@@ -373,7 +373,7 @@ describe('routing - createRoutesList', () => {
 			{
 				label: 'router',
 				level: 'warn',
-				message: 'A collision will result in an hard error in following versions of Astro.',
+				message: 'A collision will result in a hard error in following versions of Astro.',
 				newLine: true,
 			},
 		]);
@@ -412,7 +412,7 @@ describe('routing - createRoutesList', () => {
 			{
 				label: 'router',
 				level: 'warn',
-				message: 'A collision will result in an hard error in following versions of Astro.',
+				message: 'A collision will result in a hard error in following versions of Astro.',
 				newLine: true,
 			},
 		]);
diff --git a/packages/astro/test/units/vite-plugin-astro/compile.test.js b/packages/astro/test/units/vite-plugin-astro/compile.test.js
index b25fcdf90d51..6f0daed3b5ef 100644
--- a/packages/astro/test/units/vite-plugin-astro/compile.test.js
+++ b/packages/astro/test/units/vite-plugin-astro/compile.test.js
@@ -59,7 +59,7 @@ const name = 'world
 		assert.equal(result, undefined);
 	});
 
-	it('has file and url exports for markdwon compat', async () => {
+	it('has file and url exports for markdown compat', async () => {
 		const result = await compile(`<h1>Hello World</h1>`, '/src/components/index.astro');
 		await init;
 		const [, exports] = parse(result.code);
diff --git a/packages/create-astro/CHANGELOG.md b/packages/create-astro/CHANGELOG.md
index b34dccee514b..5863374dd3dd 100644
--- a/packages/create-astro/CHANGELOG.md
+++ b/packages/create-astro/CHANGELOG.md
@@ -164,7 +164,7 @@
 
 ### Minor Changes
 
-- [#11924](https://github.com/withastro/astro/pull/11924) [`7d70ba3`](https://github.com/withastro/astro/commit/7d70ba317889b9281c7891038779a68fcb8f0778) Thanks [@florian-lefebvre](https://github.com/florian-lefebvre)! - Updates the default Astro config with `// @ts-check` if the Typescript preset is `strict` or `strictest`
+- [#11924](https://github.com/withastro/astro/pull/11924) [`7d70ba3`](https://github.com/withastro/astro/commit/7d70ba317889b9281c7891038779a68fcb8f0778) Thanks [@florian-lefebvre](https://github.com/florian-lefebvre)! - Updates the default Astro config with `// @ts-check` if the TypeScript preset is `strict` or `strictest`
 
 ## 4.8.4
 
@@ -398,7 +398,7 @@
 
 ### Patch Changes
 
-- [#7527](https://github.com/withastro/astro/pull/7527) [`9e2426f75`](https://github.com/withastro/astro/commit/9e2426f75637a6318961f483de90b635f3fdadeb) Thanks [@natemoo-re](https://github.com/natemoo-re)! - Default registry logic to fallback to NPM if registry command fails (sorry, Bun users!)
+- [#7527](https://github.com/withastro/astro/pull/7527) [`9e2426f75`](https://github.com/withastro/astro/commit/9e2426f75637a6318961f483de90b635f3fdadeb) Thanks [@natemoo-re](https://github.com/natemoo-re)! - Default registry logic to fall back to NPM if registry command fails (sorry, Bun users!)
 
 - [#7539](https://github.com/withastro/astro/pull/7539) [`1170877b5`](https://github.com/withastro/astro/commit/1170877b51aaa13203e8c488dcf4e39d1b5553ee) Thanks [@jc1144096387](https://github.com/jc1144096387)! - Update registry logic, improving edge cases (http support, redirects, registries ending with '/')
 
@@ -498,7 +498,7 @@
 
 ### Patch Changes
 
-- [#5953](https://github.com/withastro/astro/pull/5953) [`5c64324c0`](https://github.com/withastro/astro/commit/5c64324c0a1b06e836c3d53668940faca4cb517d) Thanks [@ZermattChris](https://github.com/ZermattChris)! - Check for a pre-existing .git directory and if found, skip trying to create a new one.
+- [#5953](https://github.com/withastro/astro/pull/5953) [`5c64324c0`](https://github.com/withastro/astro/commit/5c64324c0a1b06e836c3d53668940faca4cb517d) Thanks [@ZermattChris](https://github.com/ZermattChris)! - Check for a preexisting .git directory and if found, skip trying to create a new one.
 
 ## 2.0.1
 
diff --git a/packages/create-astro/create-astro.mjs b/packages/create-astro/create-astro.mjs
index 271abafcd20f..f72274e157fa 100755
--- a/packages/create-astro/create-astro.mjs
+++ b/packages/create-astro/create-astro.mjs
@@ -9,7 +9,7 @@ const IS_STACKBLITZ = !!process.versions.webcontainer;
 const minimumMajorVersion = IS_STACKBLITZ ? 20 : 22;
 
 if (requiredMajorVersion < minimumMajorVersion) {
-	console.error(`Node.js v${currentVersion} is out of date and unsupported!`);
+	console.error(`Node.js v${currentVersion} is out-of-date and unsupported!`);
 	console.error(`Please use Node.js v${minimumMajorVersion} or higher.`);
 	process.exit(1);
 }
diff --git a/packages/create-astro/src/actions/context.ts b/packages/create-astro/src/actions/context.ts
index 44a6fbd27e7b..7848d478f010 100644
--- a/packages/create-astro/src/actions/context.ts
+++ b/packages/create-astro/src/actions/context.ts
@@ -39,7 +39,7 @@ function getPackageTag(packageSpecifier: string | undefined): string | undefined
 		case 'beta':
 		case 'rc':
 			return packageSpecifier;
-		// Will fallback to latest
+		// Will fall back to latest
 		case undefined:
 		default:
 			return undefined;
diff --git a/packages/create-astro/src/actions/template.ts b/packages/create-astro/src/actions/template.ts
index 058cb2c33954..3cd447cea3cd 100644
--- a/packages/create-astro/src/actions/template.ts
+++ b/packages/create-astro/src/actions/template.ts
@@ -96,7 +96,7 @@ const FILES_TO_REMOVE = ['CHANGELOG.md', '.codesandbox'];
 const FILES_TO_UPDATE = {
 	'package.json': (file: string, overrides: { name: string }) =>
 		fs.promises.readFile(file, 'utf-8').then((value) => {
-			// Match first indent in the file or fallback to `\t`
+			// Match first indent in the file or fall back to `\t`
 			const indent = /(^\s+)/m.exec(value)?.[1] ?? '\t';
 			return fs.promises.writeFile(
 				file,
@@ -124,7 +124,7 @@ export function getTemplateTarget(tmpl: string, ref = 'latest') {
 	// Handle Astro templates
 	if (ref === 'latest') {
 		// `latest` ref is specially handled to route to a branch specifically
-		// to allow faster downloads. Otherwise giget has to download the entire
+		// to allow faster downloads. Otherwise, giget has to download the entire
 		// repo and only copy a sub directory
 		return `github:withastro/astro#examples/${tmpl}`;
 	} else {
diff --git a/packages/create-astro/test/template-processing.test.js b/packages/create-astro/test/template-processing.test.js
index d85b4fc7e6ab..a14a979e7e34 100644
--- a/packages/create-astro/test/template-processing.test.js
+++ b/packages/create-astro/test/template-processing.test.js
@@ -67,7 +67,7 @@ Keep this.`;
 		assert.equal(result.trim(), expected.trim());
 	});
 
-	it('is case insensitive', async () => {
+	it('is case-insensitive', async () => {
 		const content = `# Title
 
 <!-- astro:remove:start -->
diff --git a/packages/db/CHANGELOG.md b/packages/db/CHANGELOG.md
index ebb7b3ea2fc5..099326dfa548 100644
--- a/packages/db/CHANGELOG.md
+++ b/packages/db/CHANGELOG.md
@@ -402,7 +402,7 @@
 
 - [#11304](https://github.com/withastro/astro/pull/11304) [`2e70741`](https://github.com/withastro/astro/commit/2e70741362afc1e7d03c8b2a9d8edb8466dfe9c3) Thanks [@Fryuni](https://github.com/Fryuni)! - Removes the `AstroDbIntegration` type
 
-  Astro integration hooks can now be extended and as such `@astrojs/db` no longer needs to declare it's own integration type. Using `AstroIntegration` will have the same type.
+  Astro integration hooks can now be extended and as such `@astrojs/db` no longer needs to declare its own integration type. Using `AstroIntegration` will have the same type.
 
   If you were using the `AstroDbIntegration` type, apply this change to your integration code:
 
diff --git a/packages/db/test/basics.test.js b/packages/db/test/basics.test.js
index c2d6aaea0df9..6186af174703 100644
--- a/packages/db/test/basics.test.js
+++ b/packages/db/test/basics.test.js
@@ -69,7 +69,7 @@ describe('astro:db', () => {
 			assert.match(themeDark, /dark mode/);
 		});
 
-		it('text fields an be used as references', async () => {
+		it('text fields can be used as references', async () => {
 			const html = await fixture.fetch('/login').then((res) => res.text());
 			const $ = cheerioLoad(html);
 
@@ -151,7 +151,7 @@ describe('astro:db', () => {
 			assert.match(themeDark, /dark mode/);
 		});
 
-		it('text fields an be used as references', async () => {
+		it('text fields can be used as references', async () => {
 			const html = await fixture.fetch('/login').then((res) => res.text());
 			const $ = cheerioLoad(html);
 
diff --git a/packages/integrations/cloudflare/CHANGELOG.md b/packages/integrations/cloudflare/CHANGELOG.md
index 1458e7363684..b3095dd8fe0f 100644
--- a/packages/integrations/cloudflare/CHANGELOG.md
+++ b/packages/integrations/cloudflare/CHANGELOG.md
@@ -161,7 +161,7 @@
 
 ### Patch Changes
 
-- [#15432](https://github.com/withastro/astro/pull/15432) [`e2ad69e`](https://github.com/withastro/astro/commit/e2ad69ebdef907c5365bd1047772a3e86736c9d2) Thanks [@OliverSpeir](https://github.com/OliverSpeir)! - Removes unneccessary warning about sharp from being printed at start of dev server and build
+- [#15432](https://github.com/withastro/astro/pull/15432) [`e2ad69e`](https://github.com/withastro/astro/commit/e2ad69ebdef907c5365bd1047772a3e86736c9d2) Thanks [@OliverSpeir](https://github.com/OliverSpeir)! - Removes unnecessary warning about sharp from being printed at start of dev server and build
 
 - Updated dependencies [[`a164c77`](https://github.com/withastro/astro/commit/a164c77336059f2dc3e7f7fe992aa754ed145ef3), [`a18d727`](https://github.com/withastro/astro/commit/a18d727fc717054df85177c8e0c3d38a5252f2da)]:
   - @astrojs/internal-helpers@0.8.0-beta.1
@@ -229,7 +229,7 @@
 
 - [#15080](https://github.com/withastro/astro/pull/15080) [`f67b738`](https://github.com/withastro/astro/commit/f67b7389dad9a3a258ba5d941d478f20b0dc6767) Thanks [@gameroman](https://github.com/gameroman)! - Updates `wrangler` dependency to be a `peerDependency` over a `dependency`
 
-- [#15121](https://github.com/withastro/astro/pull/15121) [`06261e0`](https://github.com/withastro/astro/commit/06261e03d55a571c6affbd7321f7e28c997d6d5d) Thanks [@ematipico](https://github.com/ematipico)! - Fixes a bug where the Astro, with the Cloudlfare integration, couldn't correctly serve certain routes in the development server.
+- [#15121](https://github.com/withastro/astro/pull/15121) [`06261e0`](https://github.com/withastro/astro/commit/06261e03d55a571c6affbd7321f7e28c997d6d5d) Thanks [@ematipico](https://github.com/ematipico)! - Fixes a bug where the Astro, with the Cloudflare integration, couldn't correctly serve certain routes in the development server.
 
 - Updated dependencies []:
   - @astrojs/underscore-redirects@1.0.0
@@ -561,7 +561,7 @@
 
 - [#14066](https://github.com/withastro/astro/pull/14066) [`7abde79`](https://github.com/withastro/astro/commit/7abde7921fb21058d99180d6a0c897c5fa23ff14) Thanks [@alexanderniebuhr](https://github.com/alexanderniebuhr)! - Refactors the internal solution which powers Astro Sessions when running local development with ˋastro devˋ.
 
-  The adapter now utilizes Cloudflare's local support for Cloudflare KV. This internal change is a drop-in replacement and does not require any change to your projectct code.
+  The adapter now utilizes Cloudflare's local support for Cloudflare KV. This internal change is a drop-in replacement and does not require any change to your project code.
 
   However, you now have the ability to connect to the remote Cloudflare KV Namespace if desired and use production data during local development.
 
@@ -940,7 +940,7 @@
 
 ### Patch Changes
 
-- [#476](https://github.com/withastro/adapters/pull/476) [`a8a8ab1`](https://github.com/withastro/adapters/commit/a8a8ab12d9cfb5157e6a350b93a505010367b8e4) Thanks [@bluwy](https://github.com/bluwy)! - Removes resolving with "node" conditionto fix Vue imports
+- [#476](https://github.com/withastro/adapters/pull/476) [`a8a8ab1`](https://github.com/withastro/adapters/commit/a8a8ab12d9cfb5157e6a350b93a505010367b8e4) Thanks [@bluwy](https://github.com/bluwy)! - Removes resolving with "node" condition to fix Vue imports
 
 ## 12.0.1
 
@@ -1088,7 +1088,7 @@
 
 ### Patch Changes
 
-- [#341](https://github.com/withastro/adapters/pull/341) [`a430ab1`](https://github.com/withastro/adapters/commit/a430ab17e525492db2ff9ecc4d00eb710dd92874) Thanks [@alexanderniebuhr](https://github.com/alexanderniebuhr)! - Fixes an issue if environment variables where used inside the middleware and a prerendering occured.
+- [#341](https://github.com/withastro/adapters/pull/341) [`a430ab1`](https://github.com/withastro/adapters/commit/a430ab17e525492db2ff9ecc4d00eb710dd92874) Thanks [@alexanderniebuhr](https://github.com/alexanderniebuhr)! - Fixes an issue if environment variables where used inside the middleware and a prerendering occurred.
 
 - [#335](https://github.com/withastro/adapters/pull/335) [`237f332`](https://github.com/withastro/adapters/commit/237f332a819a92cdc2128d1564f5b8558318ad2b) Thanks [@alexanderniebuhr](https://github.com/alexanderniebuhr)! - Fixes an issue displaying images which are optimized during `astro build`
 
@@ -1096,7 +1096,7 @@
 
 ### Patch Changes
 
-- [#340](https://github.com/withastro/adapters/pull/340) [`45d0abb`](https://github.com/withastro/adapters/commit/45d0abb52b8e940a7c702a148be779428836396c) Thanks [@alexanderniebuhr](https://github.com/alexanderniebuhr)! - Fixes an issue if environment variables where used inside the middleware and a prerendering occured.
+- [#340](https://github.com/withastro/adapters/pull/340) [`45d0abb`](https://github.com/withastro/adapters/commit/45d0abb52b8e940a7c702a148be779428836396c) Thanks [@alexanderniebuhr](https://github.com/alexanderniebuhr)! - Fixes an issue if environment variables where used inside the middleware and a prerendering occurred.
 
 ## 11.0.1
 
@@ -1217,7 +1217,7 @@
 
   ### BREAKING: `imageService`
 
-  This release changes the default behavior of `imageService`. In the past the default behavior was falling back to a `noop` service, which disabled image optimization for your project, because Cloudflare doesn's support it. The new default is `compile`, which enables image optimization for prerendered pages during build, but disallows the usage of any `astro:assets` feature inside of on-demand pages.
+  This release changes the default behavior of `imageService`. In the past, the default behavior was falling back to a `noop` service, which disabled image optimization for your project, because Cloudflare doesn's support it. The new default is `compile`, which enables image optimization for prerendered pages during build, but disallows the usage of any `astro:assets` feature inside of on-demand pages.
 
   #### What should I do?
 
@@ -1379,13 +1379,13 @@
 
 ### Major Changes
 
-- [#159](https://github.com/withastro/adapters/pull/159) [`adb8bf2a4caeead9a1a255740c7abe8666a6f852`](https://github.com/withastro/adapters/commit/adb8bf2a4caeead9a1a255740c7abe8666a6f852) Thanks [@alexanderniebuhr](https://github.com/alexanderniebuhr)! - Updates and prepares the adapter to be more flexibile, stable and composable for the future. Includes several breaking changes.
+- [#159](https://github.com/withastro/adapters/pull/159) [`adb8bf2a4caeead9a1a255740c7abe8666a6f852`](https://github.com/withastro/adapters/commit/adb8bf2a4caeead9a1a255740c7abe8666a6f852) Thanks [@alexanderniebuhr](https://github.com/alexanderniebuhr)! - Updates and prepares the adapter to be more flexible, stable and composable for the future. Includes several breaking changes.
 
   ## Upgrade Guide
 
-  We are commited to provide a smooth upgrade path for our users. This guide will describe what has changed from v9.x to v10 to help you to migrate your existing projects to the latest version of the adapter. For complete documentation of all v10 configuration settings and usage, please see [the current, updated Cloudflare adapter documentation](https://docs.astro.build/en/guides/integrations-guide/cloudflare/).
+  We are committed to provide a smooth upgrade path for our users. This guide will describe what has changed from v9.x to v10 to help you to migrate your existing projects to the latest version of the adapter. For complete documentation of all v10 configuration settings and usage, please see [the current, updated Cloudflare adapter documentation](https://docs.astro.build/en/guides/integrations-guide/cloudflare/).
 
-  We will provide at least 4 weeks of limited maintanance support for the previous version 9 of the adapter. Please plan to upgrade your project within this time frame, using the instructions below.
+  We will provide at least 4 weeks of limited maintenance support for the previous version 9 of the adapter. Please plan to upgrade your project within this time frame, using the instructions below.
 
   ### Adapter's `mode` option & Cloudflare Functions
 
@@ -1505,7 +1505,7 @@
 
   ### Routes
 
-  The `routes.strategy` option has been removed as you will no longer have the option to choose a strategy in v10 of this adpater.
+  The `routes.strategy` option has been removed as you will no longer have the option to choose a strategy in v10 of this adapter.
 
   If you are using `routes.strategy`, you can remove it. You might observe a different `dist/_routes.json` file, but it should not affect your project's behavior.
 
@@ -1729,7 +1729,7 @@
 
 ### Patch Changes
 
-- [#8782](https://github.com/withastro/astro/pull/8782) [`75781643a`](https://github.com/withastro/astro/commit/75781643a2f53656fc3fde3a7f28cb62db40b015) Thanks [@helloimalastair](https://github.com/helloimalastair)! - fixes `AdvancedRuntime` & `DirectoryRuntime` types to work woth Cloudflare caches
+- [#8782](https://github.com/withastro/astro/pull/8782) [`75781643a`](https://github.com/withastro/astro/commit/75781643a2f53656fc3fde3a7f28cb62db40b015) Thanks [@helloimalastair](https://github.com/helloimalastair)! - fixes `AdvancedRuntime` & `DirectoryRuntime` types to work with Cloudflare caches
 
 - Updated dependencies [[`2993055be`](https://github.com/withastro/astro/commit/2993055bed2764c31ff4b4f55b81ab6b1ae6b401), [`c4270e476`](https://github.com/withastro/astro/commit/c4270e47681ee2453f3fea07fed7b238645fd6ea), [`bd5aa1cd3`](https://github.com/withastro/astro/commit/bd5aa1cd35ecbd2784f30dd836ff814684fee02b), [`f369fa250`](https://github.com/withastro/astro/commit/f369fa25055a3497ebaf61c88fb0e8af56c73212), [`391729686`](https://github.com/withastro/astro/commit/391729686bcc8404a7dd48c5987ee380daf3200f), [`f999365b8`](https://github.com/withastro/astro/commit/f999365b8248b8b14f3743e68a42d450d06acff3), [`b2ae9ee0c`](https://github.com/withastro/astro/commit/b2ae9ee0c42b11ffc1d3f070d1d5ac881aef84ed), [`0abff97fe`](https://github.com/withastro/astro/commit/0abff97fed3db14be3c75ff9ece3aab67c4ba783), [`3bef32f81`](https://github.com/withastro/astro/commit/3bef32f81c56bc600ca307f1bd40787e23e625a5)]:
   - astro@3.3.0
@@ -1819,7 +1819,7 @@
 
 ### Minor Changes
 
-- [#8595](https://github.com/withastro/astro/pull/8595) [`5b0b3c9a8`](https://github.com/withastro/astro/commit/5b0b3c9a8e0c0e6b6c7472b82008ab57985f2a04) Thanks [@alexanderniebuhr](https://github.com/alexanderniebuhr)! - Add support for the following Node.js Runtime APIs, which are availabe in [Cloudflare](https://developers.cloudflare.com/workers/runtime-apis/nodejs) using the `node:` syntax.
+- [#8595](https://github.com/withastro/astro/pull/8595) [`5b0b3c9a8`](https://github.com/withastro/astro/commit/5b0b3c9a8e0c0e6b6c7472b82008ab57985f2a04) Thanks [@alexanderniebuhr](https://github.com/alexanderniebuhr)! - Add support for the following Node.js Runtime APIs, which are available in [Cloudflare](https://developers.cloudflare.com/workers/runtime-apis/nodejs) using the `node:` syntax.
   - assert
   - AsyncLocalStorage
   - Buffer
@@ -2375,7 +2375,7 @@
 
 ### Patch Changes
 
-- [#5301](https://github.com/withastro/astro/pull/5301) [`a79a37cad`](https://github.com/withastro/astro/commit/a79a37cad549b21f91599ff86899e456d9dcc7df) Thanks [@bluwy](https://github.com/bluwy)! - Fix environment variables usage in worker output and warn if environment variables are accessedd too early
+- [#5301](https://github.com/withastro/astro/pull/5301) [`a79a37cad`](https://github.com/withastro/astro/commit/a79a37cad549b21f91599ff86899e456d9dcc7df) Thanks [@bluwy](https://github.com/bluwy)! - Fix environment variables usage in worker output and warn if environment variables are accessed too early
 
 - Updated dependencies [[`88c1bbe3a`](https://github.com/withastro/astro/commit/88c1bbe3a71f85e92f42f13d0f310c6b2a264ade), [`a79a37cad`](https://github.com/withastro/astro/commit/a79a37cad549b21f91599ff86899e456d9dcc7df)]:
   - astro@1.6.5
@@ -2564,7 +2564,7 @@
 
   When using the `"server"` output target, you must also include a runtime adapter via the `adapter` configuration. An adapter will _adapt_ your final build to run on the deployed platform of your choice (Netlify, Vercel, Node.js, Deno, etc).
 
-  To migrate: No action is required for most users. If you currently define an `adapter`, you will need to also add `output: 'server'` to your config file to make it explicit that you are building a server. Here is an example of what that change would look like for someone deploying to Netlify:
+  To migrate: No action is required for most users. If you currently define an `adapter`, you will also need to add `output: 'server'` to your config file to make it explicit that you are building a server. Here is an example of what that change would look like for someone deploying to Netlify:
 
   ```diff
   import { defineConfig } from 'astro/config';
diff --git a/packages/integrations/cloudflare/README.md b/packages/integrations/cloudflare/README.md
index 7190ec946354..f1c41bb34ef3 100644
--- a/packages/integrations/cloudflare/README.md
+++ b/packages/integrations/cloudflare/README.md
@@ -1,6 +1,6 @@
 # @astrojs/cloudflare
 
-An SSR adapter for use with Cloudflare Pages Functions targets. Write your code in Astro/Javascript and deploy to Cloudflare Pages.
+An SSR adapter for use with Cloudflare Pages Functions targets. Write your code in Astro/JavaScript and deploy to Cloudflare Pages.
 
 ## Documentation
 
diff --git a/packages/integrations/cloudflare/test/fixtures/vite-plugin/src/pages/index.astro b/packages/integrations/cloudflare/test/fixtures/vite-plugin/src/pages/index.astro
index 132b7ec66607..e16ac3d497ec 100644
--- a/packages/integrations/cloudflare/test/fixtures/vite-plugin/src/pages/index.astro
+++ b/packages/integrations/cloudflare/test/fixtures/vite-plugin/src/pages/index.astro
@@ -17,7 +17,7 @@ const dogs = await getCollection('dogs');
 const increment = await getEntry('increment', 'value');
 const { Content } = await render(increment);
 
-const surnamne = Astro.url.searchParams.get('surname');
+const surname = Astro.url.searchParams.get('surname');
 ---
 
 <html>
@@ -51,7 +51,7 @@ const surnamne = Astro.url.searchParams.get('surname');
 		<HelloSvelte client:load />
 	</div>
 	<Island server:defer/>
-	<IslandProps server:defer name="Aria" surname={surnamne}/>
+	<IslandProps server:defer name="Aria" surname={surname}/>
 	<ul>
 		{dogs.map(dog => (
 			<li><a href={`/dogs/${dog.id}`}>{ dog.data?.breed }</a></li>
diff --git a/packages/integrations/markdoc/src/content-entry-type.ts b/packages/integrations/markdoc/src/content-entry-type.ts
index 76e10e6bc9d3..3f0c9b9181e8 100644
--- a/packages/integrations/markdoc/src/content-entry-type.ts
+++ b/packages/integrations/markdoc/src/content-entry-type.ts
@@ -342,7 +342,7 @@ async function emitOptimizedImages(
 				}
 			} else if (isComponent) {
 				// If the user is using the {% image %} tag, always pass the `src` attribute as `__optimizedSrc`, even if it's an external URL or absolute path.
-				// That way, the component can decide whether to optimize it or not.
+				// That way, the component can decide whether or not to optimize it.
 				node.attributes[attributeName] = node.attributes.src;
 			}
 		}
diff --git a/packages/integrations/markdoc/src/utils.ts b/packages/integrations/markdoc/src/utils.ts
index dc9c9023ff46..6185e6c268b7 100644
--- a/packages/integrations/markdoc/src/utils.ts
+++ b/packages/integrations/markdoc/src/utils.ts
@@ -19,7 +19,7 @@ export class MarkdocError extends Error {
 
 		this.title = title;
 		if (message) this.message = message;
-		// Only set this if we actually have a stack passed, otherwise uses Error's
+		// Only set this if we actually have a stack passed; otherwise, uses Error's
 		this.stack = stack ? stack : this.stack;
 		this.loc = location;
 		this.hint = hint;
diff --git a/packages/integrations/markdoc/test/fixtures/render-html/src/content/blog/components.mdoc b/packages/integrations/markdoc/test/fixtures/render-html/src/content/blog/components.mdoc
index 55890ce0933a..53de30ad2a7f 100644
--- a/packages/integrations/markdoc/test/fixtures/render-html/src/content/blog/components.mdoc
+++ b/packages/integrations/markdoc/test/fixtures/render-html/src/content/blog/components.mdoc
@@ -2,18 +2,18 @@
 title: Welcome to Markdoc 👋
 ---
 
-This is a {% mark color="hotpink" %}inline mark{% /mark %} in regular Markdown markup.
+This is an {% mark color="hotpink" %}inline mark{% /mark %} in regular Markdown markup.
 
-<p id="p1">This is a {% mark color="hotpink" %}inline mark{% /mark %} under some HTML</p>
+<p id="p1">This is an {% mark color="hotpink" %}inline mark{% /mark %} under some HTML</p>
 
 <div id="div1">
-  <p id="div1-p1">This is a {% mark color="hotpink" %}inline mark{% /mark %} under some HTML</p>
-  <p id="div1-p2">This is a <span id="div1-p2-span1">{% mark color="hotpink" %}inline mark{% /mark %}</span> under some HTML</p>
+  <p id="div1-p1">This is an {% mark color="hotpink" %}inline mark{% /mark %} under some HTML</p>
+  <p id="div1-p2">This is an <span id="div1-p2-span1">{% mark color="hotpink" %}inline mark{% /mark %}</span> under some HTML</p>
 </div> 
 
 {% aside title="Aside One" type="tip" %}
 
-I'm a Markdown paragraph inside an top-level aside tag
+I'm a Markdown paragraph inside a top-level aside tag
 
 ## I'm an H2 via Markdown markup
 
diff --git a/packages/integrations/markdoc/test/render-html.test.js b/packages/integrations/markdoc/test/render-html.test.js
index 5bf7fe5cef8c..bb5135cccb12 100644
--- a/packages/integrations/markdoc/test/render-html.test.js
+++ b/packages/integrations/markdoc/test/render-html.test.js
@@ -222,24 +222,24 @@ function renderComponentsHTMLChecks(html) {
 	const { document } = parseHTML(html);
 
 	const naturalP1 = document.querySelector('article > p:nth-of-type(1)');
-	assert.equal(naturalP1.textContent, 'This is a inline mark in regular Markdown markup.');
+	assert.equal(naturalP1.textContent, 'This is an inline mark in regular Markdown markup.');
 	assert.equal(naturalP1.children.length, 1);
 
 	const p1 = document.querySelector('article > p:nth-of-type(2)');
 	assert.equal(p1.id, 'p1');
-	assert.equal(p1.textContent, 'This is a inline mark under some HTML');
+	assert.equal(p1.textContent, 'This is an inline mark under some HTML');
 	assert.equal(p1.children.length, 1);
 	assertInlineMark(p1.children[0]);
 
 	const div1p1 = document.querySelector('article > #div1 > p:nth-of-type(1)');
 	assert.equal(div1p1.id, 'div1-p1');
-	assert.equal(div1p1.textContent, 'This is a inline mark under some HTML');
+	assert.equal(div1p1.textContent, 'This is an inline mark under some HTML');
 	assert.equal(div1p1.children.length, 1);
 	assertInlineMark(div1p1.children[0]);
 
 	const div1p2 = document.querySelector('article > #div1 > p:nth-of-type(2)');
 	assert.equal(div1p2.id, 'div1-p2');
-	assert.equal(div1p2.textContent, 'This is a inline mark under some HTML');
+	assert.equal(div1p2.textContent, 'This is an inline mark under some HTML');
 	assert.equal(div1p2.children.length, 1);
 
 	const div1p2span1 = div1p2.querySelector('span');
@@ -255,7 +255,7 @@ function renderComponentsHTMLChecks(html) {
 	const aside1SectionP1 = aside1Section.querySelector('p:nth-of-type(1)');
 	assert.equal(
 		aside1SectionP1.textContent,
-		"I'm a Markdown paragraph inside an top-level aside tag",
+		"I'm a Markdown paragraph inside a top-level aside tag",
 	);
 	const aside1H2_1 = aside1Section.querySelector('h2:nth-of-type(1)');
 	assert.equal(aside1H2_1.id, 'im-an-h2-via-markdown-markup'); // automatic slug
diff --git a/packages/integrations/mdx/CHANGELOG.md b/packages/integrations/mdx/CHANGELOG.md
index c5a6842d8a43..cbeb2ab74eca 100644
--- a/packages/integrations/mdx/CHANGELOG.md
+++ b/packages/integrations/mdx/CHANGELOG.md
@@ -555,7 +555,7 @@
 
   If your integration relies on Astro's previous behavior that prevents integrations from adding remark/rehype plugins for MDX, you will now need to configure `@astrojs/mdx` with `extendMarkdownConfig: false` and explicitly specify any `remarkPlugins` and `rehypePlugins` options instead.
 
-- [#10935](https://github.com/withastro/astro/pull/10935) [`ddd8e49`](https://github.com/withastro/astro/commit/ddd8e49d1a179bec82310fb471f822a1567a6610) Thanks [@bluwy](https://github.com/bluwy)! - Renames the `optimize.customComponentNames` option to `optimize.ignoreElementNames` to better reflect its usecase. Its behaviour is not changed and should continue to work as before.
+- [#10935](https://github.com/withastro/astro/pull/10935) [`ddd8e49`](https://github.com/withastro/astro/commit/ddd8e49d1a179bec82310fb471f822a1567a6610) Thanks [@bluwy](https://github.com/bluwy)! - Renames the `optimize.customComponentNames` option to `optimize.ignoreElementNames` to better reflect its use case. Its behaviour is not changed and should continue to work as before.
 
 - [#10935](https://github.com/withastro/astro/pull/10935) [`ddd8e49`](https://github.com/withastro/astro/commit/ddd8e49d1a179bec82310fb471f822a1567a6610) Thanks [@bluwy](https://github.com/bluwy)! - Replaces the internal `remark-images-to-component` plugin with `rehype-images-to-component` to let users use additional rehype plugins for images
 
@@ -1198,7 +1198,7 @@
   }
   ```
 
-  This differs from previous behavior, where a Markdown file's frontmatter would _always_ override frontmatter injected via remark or reype.
+  This differs from previous behavior, where a Markdown file's frontmatter would _always_ override frontmatter injected via remark or rehype.
 
 - [#5891](https://github.com/withastro/astro/pull/5891) [`05caf445d`](https://github.com/withastro/astro/commit/05caf445d4d2728f1010aeb2179a9e756c2fd17d) Thanks [@bholmesdev](https://github.com/bholmesdev)! - Remove deprecated Markdown APIs from Astro v0.X. This includes `getHeaders()`, the `.astro` property for layouts, and the `rawContent()` and `compiledContent()` error messages for MDX.
 
@@ -1343,7 +1343,7 @@
   }
   ```
 
-  This differs from previous behavior, where a Markdown file's frontmatter would _always_ override frontmatter injected via remark or reype.
+  This differs from previous behavior, where a Markdown file's frontmatter would _always_ override frontmatter injected via remark or rehype.
 
 - [#5684](https://github.com/withastro/astro/pull/5684) [`a9c292026`](https://github.com/withastro/astro/commit/a9c2920264e36cc5dc05f4adc1912187979edb0d) Thanks [@bholmesdev](https://github.com/bholmesdev)! - Refine Markdown and MDX configuration options for ease-of-use.
 
diff --git a/packages/integrations/mdx/src/README.md b/packages/integrations/mdx/src/README.md
index 42e1d688d91b..2a7aeb2a5897 100644
--- a/packages/integrations/mdx/src/README.md
+++ b/packages/integrations/mdx/src/README.md
@@ -64,7 +64,7 @@ Flow:
      A: No, but we'll clear that up later in step 3.
 3. For each `node` we leave, pop from `elementStack`. If the `node`'s parent is in `allPossibleElements`, we also remove the `node` from `allPossibleElements`.
    - Q: Why do we check for the node's parent? <br>
-     A: Checking for the node's parent allows us to identify a subtree root. When we enter a subtree like `C -> D -> E`, we leave in reverse: `E -> D -> C`. When we leave `E`, we see that it's parent `D` exists, so we remove `E`. When we leave `D`, we see `C` exists, so we remove `D`. When we leave `C`, we see that its parent doesn't exist, so we keep `C`, a subtree root.
+     A: Checking for the node's parent allows us to identify a subtree root. When we enter a subtree like `C -> D -> E`, we leave in reverse: `E -> D -> C`. When we leave `E`, we see that its parent `D` exists, so we remove `E`. When we leave `D`, we see `C` exists, so we remove `D`. When we leave `C`, we see that its parent doesn't exist, so we keep `C`, a subtree root.
 4. _(Returning to the code written for step 2's `node` enter handling)_ We also need to handle the case where we find non-static elements. If found, we remove all the elements in `elementStack` from `allPossibleElements`. This happens before the code in step 2.
    - Q: Why? <br>
      A: Because if the `node` isn't static, that means all its ancestors (`elementStack`) have non-static children. So, the ancestors couldn't be a subtree root to be optimized anymore.
diff --git a/packages/integrations/mdx/test/fixtures/mdx-syntax-hightlighting/src/pages/index.mdx b/packages/integrations/mdx/test/fixtures/mdx-syntax-highlighting/src/pages/index.mdx
similarity index 100%
rename from packages/integrations/mdx/test/fixtures/mdx-syntax-hightlighting/src/pages/index.mdx
rename to packages/integrations/mdx/test/fixtures/mdx-syntax-highlighting/src/pages/index.mdx
diff --git a/packages/integrations/mdx/test/mdx-plus-react.test.js b/packages/integrations/mdx/test/mdx-plus-react.test.js
index ced632466e2f..87f420fc06ef 100644
--- a/packages/integrations/mdx/test/mdx-plus-react.test.js
+++ b/packages/integrations/mdx/test/mdx-plus-react.test.js
@@ -43,7 +43,7 @@ describe('MDX and React', () => {
 		assert.equal(h.textContent, 'Testing');
 	});
 
-	it('does not get a invalid hook call warning', () => {
+	it('does not get an invalid hook call warning', () => {
 		const errors = unhook();
 		assert.equal(errors.length === 0, true);
 	});
diff --git a/packages/integrations/mdx/test/mdx-script-style-raw.test.js b/packages/integrations/mdx/test/mdx-script-style-raw.test.js
index dc4f337bf9ec..3b0acefe04b3 100644
--- a/packages/integrations/mdx/test/mdx-script-style-raw.test.js
+++ b/packages/integrations/mdx/test/mdx-script-style-raw.test.js
@@ -23,7 +23,7 @@ describe('MDX script style raw', () => {
 			await devServer.stop();
 		});
 
-		it('works with with raw script and style strings', async () => {
+		it('works with raw script and style strings', async () => {
 			const res = await fixture.fetch('/index.html');
 			assert.equal(res.status, 200);
 
@@ -47,7 +47,7 @@ describe('MDX script style raw', () => {
 	});
 
 	describe('build', () => {
-		it('works with with raw script and style strings', async () => {
+		it('works with raw script and style strings', async () => {
 			const fixture = await loadFixture({
 				root: FIXTURE_ROOT,
 				integrations: [mdx()],
diff --git a/packages/integrations/mdx/test/mdx-syntax-highlighting.test.js b/packages/integrations/mdx/test/mdx-syntax-highlighting.test.js
index d0e6a91d0aae..2f72d4eb2866 100644
--- a/packages/integrations/mdx/test/mdx-syntax-highlighting.test.js
+++ b/packages/integrations/mdx/test/mdx-syntax-highlighting.test.js
@@ -7,7 +7,7 @@ import { parseHTML } from 'linkedom';
 import rehypePrettyCode from 'rehype-pretty-code';
 import { loadFixture } from '../../../astro/test/test-utils.js';
 
-const FIXTURE_ROOT = new URL('./fixtures/mdx-syntax-hightlighting/', import.meta.url);
+const FIXTURE_ROOT = new URL('./fixtures/mdx-syntax-highlighting/', import.meta.url);
 
 describe('MDX syntax highlighting', () => {
 	describe('shiki', () => {
diff --git a/packages/integrations/netlify/CHANGELOG.md b/packages/integrations/netlify/CHANGELOG.md
index f0d82f9f8799..2c1d5367a0f7 100644
--- a/packages/integrations/netlify/CHANGELOG.md
+++ b/packages/integrations/netlify/CHANGELOG.md
@@ -1076,7 +1076,7 @@ While not required for fully static, prerendered web sites, you may still wish t
   });
   ```
 
-  This adapter had several known limitations and compatibility issues that prevented many people from using it in production. To reduce maintenance costs and because we have a better story with Serveless + Edge Middleware, we are removing the Edge adapter.
+  This adapter had several known limitations and compatibility issues that prevented many people from using it in production. To reduce maintenance costs and because we have a better story with Serverless + Edge Middleware, we are removing the Edge adapter.
 
 ### Minor Changes
 
@@ -1178,7 +1178,7 @@ While not required for fully static, prerendered web sites, you may still wish t
   });
   ```
 
-  This adapter had several known limitations and compatibility issues that prevented many people from using it in production. To reduce maintenance costs and because we have a better story with Serveless + Edge Middleware, we are removing the Edge adapter.
+  This adapter had several known limitations and compatibility issues that prevented many people from using it in production. To reduce maintenance costs and because we have a better story with Serverless + Edge Middleware, we are removing the Edge adapter.
 
 ### Patch Changes
 
@@ -1721,7 +1721,7 @@ While not required for fully static, prerendered web sites, you may still wish t
 
   When using the `"server"` output target, you must also include a runtime adapter via the `adapter` configuration. An adapter will _adapt_ your final build to run on the deployed platform of your choice (Netlify, Vercel, Node.js, Deno, etc).
 
-  To migrate: No action is required for most users. If you currently define an `adapter`, you will need to also add `output: 'server'` to your config file to make it explicit that you are building a server. Here is an example of what that change would look like for someone deploying to Netlify:
+  To migrate: No action is required for most users. If you currently define an `adapter`, you will also need to add `output: 'server'` to your config file to make it explicit that you are building a server. Here is an example of what that change would look like for someone deploying to Netlify:
 
   ```diff
   import { defineConfig } from 'astro/config';
diff --git a/packages/integrations/netlify/src/index.ts b/packages/integrations/netlify/src/index.ts
index 8e1a458a7a12..652d45fc4107 100644
--- a/packages/integrations/netlify/src/index.ts
+++ b/packages/integrations/netlify/src/index.ts
@@ -502,8 +502,8 @@ export default function netlifyIntegration(
 			plugins: [
 				{
 					name: 'allowNodePrefixedImports',
-					setup(puglinBuild) {
-						puglinBuild.onResolve({ filter: /^node:.*$/ }, (args) => ({
+					setup(pluginBuild) {
+						pluginBuild.onResolve({ filter: /^node:.*$/ }, (args) => ({
 							path: args.path,
 							external: true,
 						}));
diff --git a/packages/integrations/node/CHANGELOG.md b/packages/integrations/node/CHANGELOG.md
index 091745d317e1..e26dc2593c58 100644
--- a/packages/integrations/node/CHANGELOG.md
+++ b/packages/integrations/node/CHANGELOG.md
@@ -169,7 +169,7 @@
 
 ### Patch Changes
 
-- [#15196](https://github.com/withastro/astro/pull/15196) [`a8317c1`](https://github.com/withastro/astro/commit/a8317c1e1fe72ff3b86890801f5e898a5244c1b0) Thanks [@ematipico](https://github.com/ematipico)! - Fixes an issue where some prendered pages weren't correctly rendered when using the Node.js adapter in middleware mode.
+- [#15196](https://github.com/withastro/astro/pull/15196) [`a8317c1`](https://github.com/withastro/astro/commit/a8317c1e1fe72ff3b86890801f5e898a5244c1b0) Thanks [@ematipico](https://github.com/ematipico)! - Fixes an issue where some prerendered pages weren't correctly rendered when using the Node.js adapter in middleware mode.
 
 - [#15169](https://github.com/withastro/astro/pull/15169) [`b803d8b`](https://github.com/withastro/astro/commit/b803d8b4b4e5e71ef4b28b23186e2786dc80a308) Thanks [@rururux](https://github.com/rururux)! - fix: fix image 500 error when moving dist directory in standalone Node
 
@@ -190,7 +190,7 @@
 
   This update ensures that configured redirects are always handled as HTTP redirects regardless of output mode, and the default HTML files for the redirects are no longer generated in `static` output. It makes the Node.js adapter more consistent with the other official adapters.
 
-  No change to your project is required to take advantage of this new adapter functionality. It is not expected to cause any breaking changes. However, if you relied on the previous redirecting behavior, you may need to handle your redirects differently now. Otherwise you should notice smoother redirects, with more accurate HTTP status codes, and may potentially see some SEO gains.
+  No change to your project is required to take advantage of this new adapter functionality. It is not expected to cause any breaking changes. However, if you relied on the previous redirecting behavior, you may need to handle your redirects differently now. Otherwise, you should notice smoother redirects, with more accurate HTTP status codes, and may potentially see some SEO gains.
 
 ## 9.4.6
 
@@ -630,7 +630,7 @@
 
 ### Major Changes
 
-- [#9661](https://github.com/withastro/astro/pull/9661) [`d6edc7540864cf5d294d7b881eb886a3804f6d05`](https://github.com/withastro/astro/commit/d6edc7540864cf5d294d7b881eb886a3804f6d05) Thanks [@ematipico](https://github.com/ematipico)! - If host is unset in standalone mode, the server host will now fallback to `localhost` instead of `127.0.0.1`. When `localhost` is used, the operating system can decide to use either `::1` (ipv6) or `127.0.0.1` (ipv4) itself. This aligns with how the Astro dev and preview server works by default.
+- [#9661](https://github.com/withastro/astro/pull/9661) [`d6edc7540864cf5d294d7b881eb886a3804f6d05`](https://github.com/withastro/astro/commit/d6edc7540864cf5d294d7b881eb886a3804f6d05) Thanks [@ematipico](https://github.com/ematipico)! - If host is unset in standalone mode, the server host will now fall back to `localhost` instead of `127.0.0.1`. When `localhost` is used, the operating system can decide to use either `::1` (ipv6) or `127.0.0.1` (ipv4) itself. This aligns with how the Astro dev and preview server works by default.
 
   If you relied on `127.0.0.1` (ipv4) before, you can set the `HOST` environment variable to `127.0.0.1` to explicitly use ipv4. For example, `HOST=127.0.0.1 node ./dist/server/entry.mjs`.
 
@@ -862,7 +862,7 @@
 
 ### Patch Changes
 
-- [#7708](https://github.com/withastro/astro/pull/7708) [`4dd6c7900`](https://github.com/withastro/astro/commit/4dd6c7900ca40db1b2cebed9bd02a9eb00874d8d) Thanks [@DixCouleur](https://github.com/DixCouleur)! - fix issuse #7590 "res.writeHead is not a function" in Express/Node middleware
+- [#7708](https://github.com/withastro/astro/pull/7708) [`4dd6c7900`](https://github.com/withastro/astro/commit/4dd6c7900ca40db1b2cebed9bd02a9eb00874d8d) Thanks [@DixCouleur](https://github.com/DixCouleur)! - fix issue #7590 "res.writeHead is not a function" in Express/Node middleware
 
 - Updated dependencies [[`41afb8405`](https://github.com/withastro/astro/commit/41afb84057f606b0e7f9a73c1e40487068e43948), [`c00b6f0c4`](https://github.com/withastro/astro/commit/c00b6f0c49027125ea3026e89b21fef84380d187), [`1f0ee494a`](https://github.com/withastro/astro/commit/1f0ee494a5190356d130282f1f51ba2a5e6ea63f), [`00cb28f49`](https://github.com/withastro/astro/commit/00cb28f4964a60bc609770108d491acc277997b9), [`c264be349`](https://github.com/withastro/astro/commit/c264be3497db4aa8b3bcce0d2f79a26e35b8e91e), [`e1e958a75`](https://github.com/withastro/astro/commit/e1e958a75860292688569e82b4617fc141056202)]:
   - astro@2.10.0
@@ -1001,7 +1001,7 @@
 
 ### Patch Changes
 
-- [#6088](https://github.com/withastro/astro/pull/6088) [`6a03649f0`](https://github.com/withastro/astro/commit/6a03649f0084f0df6738236d4a86c9936325cee7) Thanks [@QingXia-Ela](https://github.com/QingXia-Ela)! - fix incorrent encoded when path has other language characters
+- [#6088](https://github.com/withastro/astro/pull/6088) [`6a03649f0`](https://github.com/withastro/astro/commit/6a03649f0084f0df6738236d4a86c9936325cee7) Thanks [@QingXia-Ela](https://github.com/QingXia-Ela)! - fix incorrect encoded when path has other language characters
 
 ## 5.0.1
 
@@ -1349,7 +1349,7 @@
 
   When using the `"server"` output target, you must also include a runtime adapter via the `adapter` configuration. An adapter will _adapt_ your final build to run on the deployed platform of your choice (Netlify, Vercel, Node.js, Deno, etc).
 
-  To migrate: No action is required for most users. If you currently define an `adapter`, you will need to also add `output: 'server'` to your config file to make it explicit that you are building a server. Here is an example of what that change would look like for someone deploying to Netlify:
+  To migrate: No action is required for most users. If you currently define an `adapter`, you will also need to add `output: 'server'` to your config file to make it explicit that you are building a server. Here is an example of what that change would look like for someone deploying to Netlify:
 
   ```diff
   import { defineConfig } from 'astro/config';
diff --git a/packages/integrations/partytown/src/sirv.ts b/packages/integrations/partytown/src/sirv.ts
index bf5268f2c644..c1e394441be4 100644
--- a/packages/integrations/partytown/src/sirv.ts
+++ b/packages/integrations/partytown/src/sirv.ts
@@ -221,7 +221,7 @@ export default function (dir, opts = {}) {
 			try {
 				pathname = decodeURIComponent(pathname);
 			} catch {
-				/* malform uri */
+				/* malformed uri */
 			}
 		}
 
diff --git a/packages/integrations/preact/src/client.ts b/packages/integrations/preact/src/client.ts
index 40475acc8c01..2eae30d28b47 100644
--- a/packages/integrations/preact/src/client.ts
+++ b/packages/integrations/preact/src/client.ts
@@ -27,7 +27,7 @@ export default (element: HTMLElement) =>
 						const mapValue = props[propName][indexOrKeyInProps];
 						let valueOfSignal = mapValue;
 
-						// not an property key
+						// not a property key
 						if (typeof indexOrKeyInProps !== 'string') {
 							valueOfSignal = mapValue[0];
 							indexOrKeyInProps = mapValue[1];
diff --git a/packages/integrations/react/CHANGELOG.md b/packages/integrations/react/CHANGELOG.md
index 968b19561063..929242e2490b 100644
--- a/packages/integrations/react/CHANGELOG.md
+++ b/packages/integrations/react/CHANGELOG.md
@@ -318,7 +318,7 @@
   </form>
   ```
 
-  You may also construct form action URLs using string concatenation, or by using the `URL()` constructor, with the an action's `.queryString` property:
+  You may also construct form action URLs using string concatenation, or by using the `URL()` constructor, with an action's `.queryString` property:
 
   ```astro
   ---
diff --git a/packages/integrations/sitemap/CHANGELOG.md b/packages/integrations/sitemap/CHANGELOG.md
index 32322466591d..07f5967f4bc5 100644
--- a/packages/integrations/sitemap/CHANGELOG.md
+++ b/packages/integrations/sitemap/CHANGELOG.md
@@ -242,7 +242,7 @@
 
 - [#10179](https://github.com/withastro/astro/pull/10179) [`6343f6a438d790fa16a0dd268f4a51def4fa0f33`](https://github.com/withastro/astro/commit/6343f6a438d790fa16a0dd268f4a51def4fa0f33) Thanks [@ematipico](https://github.com/ematipico)! - Revert https://github.com/withastro/astro/pull/9846
 
-  The feature to customize the file name of the sitemap was reverted due to some internal issues with one of the dependencies. With an non-deterministic behaviour, the sitemap file was sometime emitted with incorrect syntax.
+  The feature to customize the file name of the sitemap was reverted due to some internal issues with one of the dependencies. With a non-deterministic behaviour, the sitemap file was sometime emitted with incorrect syntax.
 
 - [#9975](https://github.com/withastro/astro/pull/9975) [`ec7d2ebbd96b8c2dfdadaf076bbf7953007536ed`](https://github.com/withastro/astro/commit/ec7d2ebbd96b8c2dfdadaf076bbf7953007536ed) Thanks [@moose96](https://github.com/moose96)! - Fixes URL generation for routes that rest parameters and start with `/`
 
@@ -425,7 +425,7 @@
 
   When using the `"server"` output target, you must also include a runtime adapter via the `adapter` configuration. An adapter will _adapt_ your final build to run on the deployed platform of your choice (Netlify, Vercel, Node.js, Deno, etc).
 
-  To migrate: No action is required for most users. If you currently define an `adapter`, you will need to also add `output: 'server'` to your config file to make it explicit that you are building a server. Here is an example of what that change would look like for someone deploying to Netlify:
+  To migrate: No action is required for most users. If you currently define an `adapter`, you will also need to add `output: 'server'` to your config file to make it explicit that you are building a server. Here is an example of what that change would look like for someone deploying to Netlify:
 
   ```diff
   import { defineConfig } from 'astro/config';
diff --git a/packages/integrations/vercel/CHANGELOG.md b/packages/integrations/vercel/CHANGELOG.md
index 0886df9ce586..d21d5fa2ad93 100644
--- a/packages/integrations/vercel/CHANGELOG.md
+++ b/packages/integrations/vercel/CHANGELOG.md
@@ -1106,7 +1106,7 @@
   });
   ```
 
-  This adapter had several known limitations and compatibility issues that prevented many people from using it in production. To reduce maintenance costs and because we have a better story with Serveless + Edge Middleware, we are removing the Edge adapter.
+  This adapter had several known limitations and compatibility issues that prevented many people from using it in production. To reduce maintenance costs and because we have a better story with Serverless + Edge Middleware, we are removing the Edge adapter.
 
 - [#8239](https://github.com/withastro/astro/pull/8239) [`52f0837bd`](https://github.com/withastro/astro/commit/52f0837bdeca0b54e07cbf76a7570bd042b98922) Thanks [@matthewp](https://github.com/matthewp)! - Vercel adapter now defaults to `functionPerRoute`.
 
@@ -1248,7 +1248,7 @@
   });
   ```
 
-  This adapter had several known limitations and compatibility issues that prevented many people from using it in production. To reduce maintenance costs and because we have a better story with Serveless + Edge Middleware, we are removing the Edge adapter.
+  This adapter had several known limitations and compatibility issues that prevented many people from using it in production. To reduce maintenance costs and because we have a better story with Serverless + Edge Middleware, we are removing the Edge adapter.
 
 ### Patch Changes
 
@@ -1917,7 +1917,7 @@
 
   When using the `"server"` output target, you must also include a runtime adapter via the `adapter` configuration. An adapter will _adapt_ your final build to run on the deployed platform of your choice (Netlify, Vercel, Node.js, Deno, etc).
 
-  To migrate: No action is required for most users. If you currently define an `adapter`, you will need to also add `output: 'server'` to your config file to make it explicit that you are building a server. Here is an example of what that change would look like for someone deploying to Netlify:
+  To migrate: No action is required for most users. If you currently define an `adapter`, you will also need to add `output: 'server'` to your config file to make it explicit that you are building a server. Here is an example of what that change would look like for someone deploying to Netlify:
 
   ```diff
   import { defineConfig } from 'astro/config';
diff --git a/packages/integrations/vercel/src/image/build-service.ts b/packages/integrations/vercel/src/image/build-service.ts
index 88f6a2d0aae8..48bf80fecf27 100644
--- a/packages/integrations/vercel/src/image/build-service.ts
+++ b/packages/integrations/vercel/src/image/build-service.ts
@@ -90,7 +90,7 @@ const service: ExternalImageService = {
 		}
 
 		// Since `widths` and `densities` ultimately control the width and height of the image,
-		// we don't want the dimensions the user specified, we'll create those ourselves.
+		// we don't want the dimensions to be user specified, we'll create those ourselves.
 		const {
 			width: transformWidth,
 			height: transformHeight,
diff --git a/packages/integrations/vercel/src/image/dev-service.ts b/packages/integrations/vercel/src/image/dev-service.ts
index c9702cff9754..c80c8d585051 100644
--- a/packages/integrations/vercel/src/image/dev-service.ts
+++ b/packages/integrations/vercel/src/image/dev-service.ts
@@ -18,7 +18,7 @@ const service: LocalImageService = {
 	},
 	transform(inputBuffer, transform, serviceOptions) {
 		// NOTE: Hardcoding webp here isn't accurate to how the Vercel Image Optimization API works, normally what we should
-		// do is setup a custom endpoint that sniff the user's accept-content header and serve the proper format based on the
+		// do is set up a custom endpoint that sniff the user's accept-content header and serve the proper format based on the
 		// user's Vercel config. However, that's: a lot of work for: not much. The dev service is inaccurate to the prod service
 		// in many more ways, this is one of the less offending cases and is, imo, okay, erika - 2023-04-27
 		transform.format = transform.src.endsWith('svg') ? 'svg' : 'webp';
diff --git a/packages/integrations/vercel/src/image/shared.ts b/packages/integrations/vercel/src/image/shared.ts
index c3f135fe5bb3..2e39699924b1 100644
--- a/packages/integrations/vercel/src/image/shared.ts
+++ b/packages/integrations/vercel/src/image/shared.ts
@@ -116,15 +116,15 @@ export function sharedValidateOptions(
 
 	// The logic for finding the perfect width is a bit confusing, here it goes:
 	// For images where no width has been specified:
-	// - For local, imported images, fallback to nearest width we can find in our configured
+	// - For local, imported images, fall back to nearest width we can find in our configured
 	// - For remote images, that's an error, width is always required.
 	// For images where a width has been specified:
-	// - If the width that the user asked for isn't in `sizes`, then fallback to the nearest one, but save the width
+	// - If the width that the user asked for isn't in `sizes`, then fall back to the nearest one, but save the width
 	// 	the user asked for so we can put it on the `img` tag later.
 	// - Otherwise, just use as-is.
 	// The end goal is:
-	// - The size on the page is always the one the user asked for or the base image's size
-	// - The actual size of the image file is always one of `sizes`, either the one the user asked for or the nearest to it
+	// - The size on the page is always the one that the user asked for or the base image's size
+	// - The actual size of the image file is always one of `sizes`, either the one that the user asked for or the nearest to it
 	if (!options.width) {
 		const src = options.src;
 		if (isESMImportedImage(src)) {
@@ -144,7 +144,7 @@ export function sharedValidateOptions(
 				return Math.abs(curr - options.width!) < Math.abs(prev - options.width!) ? curr : prev;
 			});
 
-			// Save the width the user asked for to inform the `width` and `height` on the `img` tag
+			// Save the user's requested width to inform the `width` and `height` on the `img` tag
 			options.inputtedWidth = options.width;
 			options.width = nearestWidth;
 		}
diff --git a/packages/integrations/vercel/test/static.test.js b/packages/integrations/vercel/test/static.test.js
index 20507f864211..8702cf52d8db 100644
--- a/packages/integrations/vercel/test/static.test.js
+++ b/packages/integrations/vercel/test/static.test.js
@@ -15,7 +15,7 @@ describe('static routing', () => {
 
 	it('falls back to 404.html', async () => {
 		const deploymentConfig = JSON.parse(await fixture.readFile('../.vercel/output/config.json'));
-		// change the index if necesseary
+		// change the index if necessary
 		assert.deepEqual(deploymentConfig.routes[2], {
 			src: '^/.*$',
 			dest: '/404.html',
diff --git a/packages/language-tools/language-server/CHANGELOG.md b/packages/language-tools/language-server/CHANGELOG.md
index ca19702a76e9..62b8ee938609 100644
--- a/packages/language-tools/language-server/CHANGELOG.md
+++ b/packages/language-tools/language-server/CHANGELOG.md
@@ -655,7 +655,7 @@ In the background, this update means that we now have to maintain a lot less cod
 
 ### Patch Changes
 
-- c4f7a36: Trying desesperately to figure deployment out
+- c4f7a36: Trying desperately to figure deployment out
 
 ## 0.26.0
 
@@ -717,7 +717,7 @@ In the background, this update means that we now have to maintain a lot less cod
 ### Patch Changes
 
 - 61620f1: Add support for Go To Type Definition
-- 9337f00: Fix language server not working when no initlizationOptions were passed
+- 9337f00: Fix language server not working when no initializationOptions were passed
 
 ## 0.21.1
 
@@ -748,7 +748,7 @@ In the background, this update means that we now have to maintain a lot less cod
 ### Patch Changes
 
 - e6996f5: Fixed many situations where the language server would warn abusively about not being able to find Astro
-- 4589c2b: Fix the language server not warning properly when a package is implicitely any due to missing types
+- 4589c2b: Fix the language server not warning properly when a package is implicitly any due to missing types
 
 ## 0.20.0
 
@@ -772,7 +772,7 @@ In the background, this update means that we now have to maintain a lot less cod
 
 - 421ab52: Added a new setting (`astro.typescript.allowArbitraryAttributes`) to enable support for arbitrary attributes
 - 06e3c95: Updated behaviour when no settings are provided. All features are now considered enabled by default
-- 301dcfb: Remove Lodash from the code base, significally reducing the file count of the package
+- 301dcfb: Remove Lodash from the code base, significantly reducing the file count of the package
 - dd1283b: Updated Component detection so completions now work for namespaced components (for example, typing `<myMarkdown.` will now give you a completion for the Content component)
 
 ## 0.19.4
diff --git a/packages/language-tools/language-server/src/core/parseHTML.ts b/packages/language-tools/language-server/src/core/parseHTML.ts
index d92bbe63e9ee..87da391d181a 100644
--- a/packages/language-tools/language-server/src/core/parseHTML.ts
+++ b/packages/language-tools/language-server/src/core/parseHTML.ts
@@ -71,7 +71,7 @@ export function preprocessHTML(text: string, frontmatterEnd?: number) {
 	return content;
 
 	function shouldBlankStartOrEndTagLike(offset: number) {
-		// not null rather than falsy, otherwise it won't work on first tag(0)
+		// not null rather than falsy; otherwise, it won't work on first tag(0)
 		return (
 			currentStartTagStart !== null && isInsideExpression(content, currentStartTagStart, offset)
 		);
diff --git a/packages/language-tools/language-server/src/languageServerPlugin.ts b/packages/language-tools/language-server/src/languageServerPlugin.ts
index 82322afaa00e..37fb76a48c99 100644
--- a/packages/language-tools/language-server/src/languageServerPlugin.ts
+++ b/packages/language-tools/language-server/src/languageServerPlugin.ts
@@ -19,7 +19,7 @@ import { getPrettierPluginPath, importPrettier } from './importPackage.js';
 import { create as createAstroService } from './plugins/astro.js';
 import { create as createHtmlService } from './plugins/html.js';
 import { create as createTypeScriptServices } from './plugins/typescript/index.js';
-import { create as createTypescriptAddonsService } from './plugins/typescript-addons/index.js';
+import { create as createTypeScriptAddonsService } from './plugins/typescript-addons/index.js';
 import { create as createYAMLService } from './plugins/yaml.js';
 
 export function getLanguagePlugins(collectionConfig: CollectionConfig) {
@@ -47,7 +47,7 @@ export function getLanguageServicePlugins(
 			disableAutoImportCache: initializeParams?.initializationOptions?.disableAutoImportCache,
 		}),
 		createTypeScriptTwoSlashService(ts),
-		createTypescriptAddonsService(),
+		createTypeScriptAddonsService(),
 		createAstroService(),
 		getPrettierService(),
 		createYAMLService(collectionConfig),
diff --git a/packages/language-tools/language-server/src/plugins/typescript-addons/snippets.ts b/packages/language-tools/language-server/src/plugins/typescript-addons/snippets.ts
index 66b664969a9b..e40f0e091690 100644
--- a/packages/language-tools/language-server/src/plugins/typescript-addons/snippets.ts
+++ b/packages/language-tools/language-server/src/plugins/typescript-addons/snippets.ts
@@ -53,7 +53,7 @@ export function getSnippetCompletions(frontmatter: FrontmatterStatus): Completio
 			documentation: {
 				kind: 'markdown',
 				value: [
-					'Add prerender export. When [using server-side rendering](https://docs.astro.build/en/guides/on-demand-rendering/#enabling-on-demand-rendering), this value will be used to determine whether to prerender the page or not.',
+					'Add prerender export. When [using server-side rendering](https://docs.astro.build/en/guides/on-demand-rendering/#enabling-on-demand-rendering), this value will be used to determine whether or not to prerender the page.',
 					'\n',
 					'[Astro reference](https://docs.astro.build/en/reference/routing-reference/#prerender)',
 				].join('\n'),
diff --git a/packages/language-tools/language-server/src/plugins/typescript/utils.ts b/packages/language-tools/language-server/src/plugins/typescript/utils.ts
index 48d44699ba64..f113d90e4580 100644
--- a/packages/language-tools/language-server/src/plugins/typescript/utils.ts
+++ b/packages/language-tools/language-server/src/plugins/typescript/utils.ts
@@ -9,7 +9,7 @@ export function mapEdit(edit: TextEdit, code: AstroVirtualCode, languageId: stri
 			edit = ensureProperEditForFrontmatter(edit, code.astroMeta, '\n');
 		}
 	} else {
-		// If the edit is at the start of the file, add a newline before it, otherwise we'll get `<script>text`
+		// If the edit is at the start of the file, add a newline before it; otherwise, we'll get `<script>text`
 		if (edit.range.start.line === 0 && edit.range.start.character === 0) {
 			edit.newText = '\n' + edit.newText;
 		}
diff --git a/packages/language-tools/language-server/src/plugins/yaml.ts b/packages/language-tools/language-server/src/plugins/yaml.ts
index 7c9064816045..4ef6f5f8fc5a 100644
--- a/packages/language-tools/language-server/src/plugins/yaml.ts
+++ b/packages/language-tools/language-server/src/plugins/yaml.ts
@@ -67,7 +67,7 @@ export const create = (collectionConfig: CollectionConfig): LanguageServicePlugi
 
 					if (changedConfig) {
 						collectionConfig.reload(
-							// For some reason, context.env.workspaceFolders is not an array of WorkspaceFolders nor the older format, strange
+							// For some reason, context.env.workspaceFolders is neither an array of WorkspaceFolders nor the older format, strange
 							context.env.workspaceFolders.map((folder) => ({ uri: folder.toString() })),
 						);
 						languageService.configure(getSettings(collectionConfig));
@@ -114,7 +114,7 @@ export const create = (collectionConfig: CollectionConfig): LanguageServicePlugi
 							// In Astro, schema errors are always fatal
 							diagnostic.severity = DiagnosticSeverity.Error;
 
-							// Map missing properties to the entire frontmatte
+							// Map missing properties to the entire frontmatter
 							if (diagnostic.message.startsWith('Missing property')) {
 								diagnostic.range = Range.create(
 									{ line: 0, character: 0 },
diff --git a/packages/language-tools/vscode/CHANGELOG.md b/packages/language-tools/vscode/CHANGELOG.md
index 1407932745e2..f9479faf898f 100644
--- a/packages/language-tools/vscode/CHANGELOG.md
+++ b/packages/language-tools/vscode/CHANGELOG.md
@@ -831,7 +831,7 @@ In the background, this update means that we now have to maintain a lot less cod
 
 ### Patch Changes
 
-- c4f7a36: Trying desesperately to figure deployment out
+- c4f7a36: Trying desperately to figure deployment out
 
 ## 0.26.0
 
diff --git a/packages/language-tools/vscode/package.json b/packages/language-tools/vscode/package.json
index 5e816e0c1593..1f33dd17affc 100644
--- a/packages/language-tools/vscode/package.json
+++ b/packages/language-tools/vscode/package.json
@@ -65,7 +65,7 @@
       },
       {
         "command": "astro.selectTypescriptVersion",
-        "title": "Astro: Select Typescript Version..."
+        "title": "Astro: Select TypeScript Version..."
       },
       {
         "command": "astro.openTsConfig",
diff --git a/packages/markdown/remark/CHANGELOG.md b/packages/markdown/remark/CHANGELOG.md
index 53e8ddfddfeb..581d3593ed82 100644
--- a/packages/markdown/remark/CHANGELOG.md
+++ b/packages/markdown/remark/CHANGELOG.md
@@ -872,7 +872,7 @@
   }
   ```
 
-  This differs from previous behavior, where a Markdown file's frontmatter would _always_ override frontmatter injected via remark or reype.
+  This differs from previous behavior, where a Markdown file's frontmatter would _always_ override frontmatter injected via remark or rehype.
 
 - [#5785](https://github.com/withastro/astro/pull/5785) [`16107b6a1`](https://github.com/withastro/astro/commit/16107b6a10514ef1b563e585ec9add4b14f42b94) Thanks [@delucis](https://github.com/delucis)! - Drop support for legacy Astro-flavored Markdown
 
@@ -1052,7 +1052,7 @@
   }
   ```
 
-  This differs from previous behavior, where a Markdown file's frontmatter would _always_ override frontmatter injected via remark or reype.
+  This differs from previous behavior, where a Markdown file's frontmatter would _always_ override frontmatter injected via remark or rehype.
 
 - [#5684](https://github.com/withastro/astro/pull/5684) [`a9c292026`](https://github.com/withastro/astro/commit/a9c2920264e36cc5dc05f4adc1912187979edb0d) Thanks [@bholmesdev](https://github.com/bholmesdev)! - Refine Markdown and MDX configuration options for ease-of-use.
 
@@ -1313,7 +1313,7 @@
 
 ### Minor Changes
 
-- [#3410](https://github.com/withastro/astro/pull/3410) [`cfae9760`](https://github.com/withastro/astro/commit/cfae9760b252052b6189e96398b819a4337634a8) Thanks [@natemoo-re](https://github.com/natemoo-re)! - Significantally more stable behavior for "Markdown + Components" usage, which now handles component serialization much more similarly to MDX. Also supports switching between Components and Markdown without extra newlines, removes wrapping `<p>` tags from standalone components, and improves JSX expression handling.
+- [#3410](https://github.com/withastro/astro/pull/3410) [`cfae9760`](https://github.com/withastro/astro/commit/cfae9760b252052b6189e96398b819a4337634a8) Thanks [@natemoo-re](https://github.com/natemoo-re)! - Significantly more stable behavior for "Markdown + Components" usage, which now handles component serialization much more similarly to MDX. Also supports switching between Components and Markdown without extra newlines, removes wrapping `<p>` tags from standalone components, and improves JSX expression handling.
 
 ## 0.9.4
 
diff --git a/packages/markdown/remark/src/shiki.ts b/packages/markdown/remark/src/shiki.ts
index f997cf457166..28d7124381b5 100644
--- a/packages/markdown/remark/src/shiki.ts
+++ b/packages/markdown/remark/src/shiki.ts
@@ -207,7 +207,7 @@ async function createShikiHighlighterInternal({
 			lang,
 			// NOTE: while we can spread `options.attributes` here so that Shiki can auto-serialize this as rendered
 			// attributes on the top-level tag, it's not clear whether it is fine to pass all attributes as meta, as
-			// they're technically not meta, nor parsed from Shiki's `parseMetaString` API.
+			// they're technically neither meta nor parsed from Shiki's `parseMetaString` API.
 			meta: options?.meta ? { __raw: options?.meta } : undefined,
 			transformers: [
 				{
diff --git a/packages/upgrade/src/actions/verify.ts b/packages/upgrade/src/actions/verify.ts
index d1313a878eb5..1e823f782201 100644
--- a/packages/upgrade/src/actions/verify.ts
+++ b/packages/upgrade/src/actions/verify.ts
@@ -165,7 +165,7 @@ async function resolveTargetVersion(packageInfo: PackageInfo, registry: string):
 			const upgradeGuide = `https://docs.astro.build/en/guides/upgrade-to/v${toVersion.major}/`;
 			const docsRes = await fetch(upgradeGuide);
 			// OK if this request fails, it's probably a prerelease without a public migration guide.
-			// In that case, we should fallback to the CHANGELOG check below.
+			// In that case, we should fall back to the CHANGELOG check below.
 			if (docsRes.status === 200) {
 				packageInfo.changelogURL = upgradeGuide;
 				packageInfo.changelogTitle = `Upgrade to Astro v${toVersion.major}`;
diff --git a/packages/upgrade/upgrade.mjs b/packages/upgrade/upgrade.mjs
index 271abafcd20f..f72274e157fa 100755
--- a/packages/upgrade/upgrade.mjs
+++ b/packages/upgrade/upgrade.mjs
@@ -9,7 +9,7 @@ const IS_STACKBLITZ = !!process.versions.webcontainer;
 const minimumMajorVersion = IS_STACKBLITZ ? 20 : 22;
 
 if (requiredMajorVersion < minimumMajorVersion) {
-	console.error(`Node.js v${currentVersion} is out of date and unsupported!`);
+	console.error(`Node.js v${currentVersion} is out-of-date and unsupported!`);
 	console.error(`Please use Node.js v${minimumMajorVersion} or higher.`);
 	process.exit(1);
 }
diff --git a/scripts/cmd/test.js b/scripts/cmd/test.js
index f682df5df7cb..d88c42054278 100644
--- a/scripts/cmd/test.js
+++ b/scripts/cmd/test.js
@@ -101,7 +101,7 @@ export default async function test() {
 		forceExit: args.values['force-exit'],
 	})
 		.on('test:fail', () => {
-			// For some reason, a test fail using the JS API does not set an exit code of 1,
+			// For some reason, a test failure using the JS API does not set an exit code of 1,
 			// so we set it here manually
 			process.exitCode = 1;
 		})

From 4ebc1e328ac40e892078031ed9dfecf60691fd56 Mon Sep 17 00:00:00 2001
From: Emanuele Stoppa <estoppa@cloudflare.com>
Date: Thu, 5 Mar 2026 16:38:43 +0000
Subject: [PATCH 6/9] fix: calculate the correct value for clientAddress
 (#15778)

* fix: calculate the correct value for clientAddress

* address feedback
---
 .changeset/chubby-plums-rule.md               |   9 +
 .changeset/green-clowns-change.md             |   7 +
 packages/astro/src/core/middleware/index.ts   |   2 +-
 packages/astro/src/core/routing/request.ts    |  20 --
 .../cloudflare/src/utils/handler.ts           |   3 +-
 .../cloudflare/test/client-address.test.js    | 107 +++++++++
 .../fixtures/client-address/astro.config.mjs  |   7 +
 .../test/fixtures/client-address/package.json |   9 +
 .../client-address/src/pages/api/address.ts   |   5 +
 .../client-address/src/pages/index.astro      |  11 +
 .../fixtures/client-address/wrangler.jsonc    |   5 +
 .../vercel/src/serverless/entrypoint.ts       |   3 +-
 packages/internal-helpers/package.json        |   3 +-
 packages/internal-helpers/src/request.ts      |  62 +++++
 .../internal-helpers/test/request.test.js     | 223 ++++++++++++++++++
 pnpm-lock.yaml                                |   9 +
 16 files changed, 461 insertions(+), 24 deletions(-)
 create mode 100644 .changeset/chubby-plums-rule.md
 create mode 100644 .changeset/green-clowns-change.md
 delete mode 100644 packages/astro/src/core/routing/request.ts
 create mode 100644 packages/integrations/cloudflare/test/client-address.test.js
 create mode 100644 packages/integrations/cloudflare/test/fixtures/client-address/astro.config.mjs
 create mode 100644 packages/integrations/cloudflare/test/fixtures/client-address/package.json
 create mode 100644 packages/integrations/cloudflare/test/fixtures/client-address/src/pages/api/address.ts
 create mode 100644 packages/integrations/cloudflare/test/fixtures/client-address/src/pages/index.astro
 create mode 100644 packages/integrations/cloudflare/test/fixtures/client-address/wrangler.jsonc
 create mode 100644 packages/internal-helpers/src/request.ts
 create mode 100644 packages/internal-helpers/test/request.test.js

diff --git a/.changeset/chubby-plums-rule.md b/.changeset/chubby-plums-rule.md
new file mode 100644
index 000000000000..88a5a0bf297b
--- /dev/null
+++ b/.changeset/chubby-plums-rule.md
@@ -0,0 +1,9 @@
+---
+'@astrojs/internal-helpers': minor
+---
+
+Added a new entry point called `/request`, which exposes utilities to work with the `Request` type: 
+- `getFirstForwardedValue`: retrieves the first value of a multi-value header.
+- `isValidIpAddress`: checks whether a string contains only characters valid in IPv4/IPv6 addresses.
+- `getValidatedIpFromHeader`: extracts the first value from a header and validates it as an IP address.
+- `getClientIpAddress`: retrieves and validates the first IP from the `x-forwarded-for` header.
diff --git a/.changeset/green-clowns-change.md b/.changeset/green-clowns-change.md
new file mode 100644
index 000000000000..e43019f38765
--- /dev/null
+++ b/.changeset/green-clowns-change.md
@@ -0,0 +1,7 @@
+---
+'@astrojs/cloudflare': patch
+'@astrojs/vercel': patch
+'astro': patch
+---
+
+Fixes an issue where the computed `clientAddress` was incorrect in cases of a Request header with multiple values. The `clientAddress` is now also validated to contain only characters valid in IP addresses, rejecting injection payloads.
diff --git a/packages/astro/src/core/middleware/index.ts b/packages/astro/src/core/middleware/index.ts
index 859db0bf8ace..e882ce58cb89 100644
--- a/packages/astro/src/core/middleware/index.ts
+++ b/packages/astro/src/core/middleware/index.ts
@@ -10,7 +10,7 @@ import { DisabledAstroCache } from '../cache/runtime/noop.js';
 import { ASTRO_GENERATOR } from '../constants.js';
 import { AstroCookies } from '../cookies/index.js';
 import { AstroError, AstroErrorData } from '../errors/index.js';
-import { getClientIpAddress } from '../routing/request.js';
+import { getClientIpAddress } from '@astrojs/internal-helpers/request';
 import { getOriginPathname } from '../routing/rewrite.js';
 import { sequence } from './sequence.js';
 
diff --git a/packages/astro/src/core/routing/request.ts b/packages/astro/src/core/routing/request.ts
deleted file mode 100644
index 0a801b233731..000000000000
--- a/packages/astro/src/core/routing/request.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * Utilities for extracting information from `Request`
- */
-
-// Parses multiple header and returns first value if available.
-function getFirstForwardedValue(multiValueHeader?: string | string[] | null) {
-	return multiValueHeader
-		?.toString()
-		?.split(',')
-		.map((e) => e.trim())?.[0];
-}
-
-/**
- * Returns the first value associated to the `x-forwarded-for` header.
- *
- * @param {Request} request
- */
-export function getClientIpAddress(request: Request): string | undefined {
-	return getFirstForwardedValue(request.headers.get('x-forwarded-for'));
-}
diff --git a/packages/integrations/cloudflare/src/utils/handler.ts b/packages/integrations/cloudflare/src/utils/handler.ts
index 7ac16f9cf924..b25efc5e0b22 100644
--- a/packages/integrations/cloudflare/src/utils/handler.ts
+++ b/packages/integrations/cloudflare/src/utils/handler.ts
@@ -16,6 +16,7 @@ import {
 	isStaticImagesRequest,
 	handleStaticImagesRequest,
 } from './prerender.js';
+import { getValidatedIpFromHeader } from '@astrojs/internal-helpers/request';
 
 setGetEnv(createGetEnv(globalEnv));
 
@@ -125,7 +126,7 @@ export async function handle(
 			// NOTE this ASSETS binding path is needed for users who are using `run_worker_first` routing
 			return env.ASSETS.fetch(url.replace(/\.html$/, ''));
 		},
-		clientAddress: request.headers.get('cf-connecting-ip') ?? undefined,
+		clientAddress: getValidatedIpFromHeader(request.headers.get('cf-connecting-ip')),
 	});
 
 	if (app.setCookieHeaders) {
diff --git a/packages/integrations/cloudflare/test/client-address.test.js b/packages/integrations/cloudflare/test/client-address.test.js
new file mode 100644
index 000000000000..e905afd61c07
--- /dev/null
+++ b/packages/integrations/cloudflare/test/client-address.test.js
@@ -0,0 +1,107 @@
+import * as assert from 'node:assert/strict';
+import { after, before, describe, it } from 'node:test';
+import * as cheerio from 'cheerio';
+import { loadFixture } from './_test-utils.js';
+
+/**
+ * Tests that the Cloudflare adapter correctly extracts and validates
+ * clientAddress from the cf-connecting-ip header, ensuring:
+ * - Only the first value is returned from multi-value headers
+ * - The value is validated as a syntactically valid IP address
+ * - Injection payloads are rejected
+ *
+ * Regression test for: https://github.com/withastro/astro-security/issues/69
+ */
+describe('Cloudflare clientAddress', () => {
+	let fixture;
+	let previewServer;
+
+	before(async () => {
+		fixture = await loadFixture({
+			root: './fixtures/client-address/',
+		});
+		await fixture.build();
+		previewServer = await fixture.preview();
+	});
+
+	after(async () => {
+		previewServer.stop();
+	});
+
+	it('returns the client IP from cf-connecting-ip header', async () => {
+		const res = await fixture.fetch('/api/address', {
+			headers: { 'cf-connecting-ip': '203.0.113.50' },
+		});
+		assert.equal(res.status, 200);
+		const data = await res.json();
+		assert.equal(data.clientAddress, '203.0.113.50');
+	});
+
+	it('returns only the first IP when cf-connecting-ip contains multiple values', async () => {
+		const res = await fixture.fetch('/api/address', {
+			headers: { 'cf-connecting-ip': '203.0.113.50, 70.41.3.18, 150.172.238.178' },
+		});
+		assert.equal(res.status, 200);
+		const data = await res.json();
+		assert.equal(data.clientAddress, '203.0.113.50');
+	});
+
+	it('trims whitespace around the IP address', async () => {
+		const res = await fixture.fetch('/api/address', {
+			headers: { 'cf-connecting-ip': '  203.0.113.50  ' },
+		});
+		assert.equal(res.status, 200);
+		const data = await res.json();
+		assert.equal(data.clientAddress, '203.0.113.50');
+	});
+
+	it('handles IPv6 addresses', async () => {
+		const res = await fixture.fetch('/api/address', {
+			headers: { 'cf-connecting-ip': '2001:db8::1' },
+		});
+		assert.equal(res.status, 200);
+		const data = await res.json();
+		assert.equal(data.clientAddress, '2001:db8::1');
+	});
+
+	it('renders the client address in an Astro page', async () => {
+		const res = await fixture.fetch('/', {
+			headers: { 'cf-connecting-ip': '198.51.100.42' },
+		});
+		assert.equal(res.status, 200);
+		const html = await res.text();
+		const $ = cheerio.load(html);
+		assert.equal($('#address').text(), '198.51.100.42');
+	});
+
+	it('renders only the first IP in an Astro page when header has multiple values', async () => {
+		const res = await fixture.fetch('/', {
+			headers: { 'cf-connecting-ip': '198.51.100.42, 10.0.0.1' },
+		});
+		assert.equal(res.status, 200);
+		const html = await res.text();
+		const $ = cheerio.load(html);
+		assert.equal($('#address').text(), '198.51.100.42');
+	});
+
+	it('rejects HTML injection in cf-connecting-ip', async () => {
+		const res = await fixture.fetch('/api/address', {
+			headers: { 'cf-connecting-ip': '<script>alert(1)</script>' },
+		});
+		assert.equal(res.status, 500);
+	});
+
+	it('rejects SQL injection in cf-connecting-ip', async () => {
+		const res = await fixture.fetch('/api/address', {
+			headers: { 'cf-connecting-ip': "'; DROP TABLE users; --" },
+		});
+		assert.equal(res.status, 500);
+	});
+
+	it('rejects path traversal in cf-connecting-ip', async () => {
+		const res = await fixture.fetch('/api/address', {
+			headers: { 'cf-connecting-ip': '../../etc/passwd' },
+		});
+		assert.equal(res.status, 500);
+	});
+});
diff --git a/packages/integrations/cloudflare/test/fixtures/client-address/astro.config.mjs b/packages/integrations/cloudflare/test/fixtures/client-address/astro.config.mjs
new file mode 100644
index 000000000000..339f0e2a49c0
--- /dev/null
+++ b/packages/integrations/cloudflare/test/fixtures/client-address/astro.config.mjs
@@ -0,0 +1,7 @@
+import cloudflare from '@astrojs/cloudflare';
+import { defineConfig } from 'astro/config';
+
+export default defineConfig({
+	adapter: cloudflare(),
+	output: 'server',
+});
diff --git a/packages/integrations/cloudflare/test/fixtures/client-address/package.json b/packages/integrations/cloudflare/test/fixtures/client-address/package.json
new file mode 100644
index 000000000000..4ecd2d2bcfb2
--- /dev/null
+++ b/packages/integrations/cloudflare/test/fixtures/client-address/package.json
@@ -0,0 +1,9 @@
+{
+  "name": "@test/astro-cloudflare-client-address",
+  "version": "0.0.0",
+  "private": true,
+  "dependencies": {
+    "@astrojs/cloudflare": "workspace:*",
+    "astro": "workspace:*"
+  }
+}
diff --git a/packages/integrations/cloudflare/test/fixtures/client-address/src/pages/api/address.ts b/packages/integrations/cloudflare/test/fixtures/client-address/src/pages/api/address.ts
new file mode 100644
index 000000000000..4d765c569ac6
--- /dev/null
+++ b/packages/integrations/cloudflare/test/fixtures/client-address/src/pages/api/address.ts
@@ -0,0 +1,5 @@
+import type { APIRoute } from 'astro';
+
+export const GET: APIRoute = (ctx) => {
+	return Response.json({ clientAddress: ctx.clientAddress });
+};
diff --git a/packages/integrations/cloudflare/test/fixtures/client-address/src/pages/index.astro b/packages/integrations/cloudflare/test/fixtures/client-address/src/pages/index.astro
new file mode 100644
index 000000000000..9fb9db9f4b3b
--- /dev/null
+++ b/packages/integrations/cloudflare/test/fixtures/client-address/src/pages/index.astro
@@ -0,0 +1,11 @@
+---
+const address = Astro.clientAddress;
+---
+<html>
+	<head>
+		<title>Client Address</title>
+	</head>
+	<body>
+		<div id="address">{address}</div>
+	</body>
+</html>
diff --git a/packages/integrations/cloudflare/test/fixtures/client-address/wrangler.jsonc b/packages/integrations/cloudflare/test/fixtures/client-address/wrangler.jsonc
new file mode 100644
index 000000000000..b0f325b609e6
--- /dev/null
+++ b/packages/integrations/cloudflare/test/fixtures/client-address/wrangler.jsonc
@@ -0,0 +1,5 @@
+{
+  "name": "test-client-address",
+  "main": "@astrojs/cloudflare/entrypoints/server",
+  "compatibility_date": "2026-01-28"
+}
diff --git a/packages/integrations/vercel/src/serverless/entrypoint.ts b/packages/integrations/vercel/src/serverless/entrypoint.ts
index afec811faec7..e0ce65cc5551 100644
--- a/packages/integrations/vercel/src/serverless/entrypoint.ts
+++ b/packages/integrations/vercel/src/serverless/entrypoint.ts
@@ -7,6 +7,7 @@ import {
 } from '../index.js';
 import { middlewareSecret, skewProtection } from 'virtual:astro-vercel:config';
 import { createApp } from 'astro/app/entrypoint';
+import { getClientIpAddress } from '@astrojs/internal-helpers/request';
 
 setGetEnv((key) => process.env[key]);
 
@@ -48,7 +49,7 @@ export default {
 
 		const response = await app.render(request, {
 			routeData,
-			clientAddress: request.headers.get('x-forwarded-for') ?? undefined,
+			clientAddress: getClientIpAddress(request),
 			locals,
 		});
 
diff --git a/packages/internal-helpers/package.json b/packages/internal-helpers/package.json
index 89afb6abef92..8951d5e53d0d 100644
--- a/packages/internal-helpers/package.json
+++ b/packages/internal-helpers/package.json
@@ -16,7 +16,8 @@
     "./remote": "./dist/remote.js",
     "./fs": "./dist/fs.js",
     "./cli": "./dist/cli.js",
-    "./create-filter": "./dist/create-filter.js"
+    "./create-filter": "./dist/create-filter.js",
+    "./request": "./dist/request.js"
   },
   "typesVersions": {
     "*": {
diff --git a/packages/internal-helpers/src/request.ts b/packages/internal-helpers/src/request.ts
new file mode 100644
index 000000000000..45082b82b24b
--- /dev/null
+++ b/packages/internal-helpers/src/request.ts
@@ -0,0 +1,62 @@
+/**
+ * Utilities for extracting information from `Request`
+ */
+
+// Parses multiple header and returns first value if available.
+export function getFirstForwardedValue(multiValueHeader?: string | string[] | null) {
+	return multiValueHeader
+		?.toString()
+		?.split(',')
+		.map((e) => e.trim())?.[0];
+}
+
+// Character-allowlist for IP addresses. Rejects injection payloads (HTML, SQL,
+// path traversal, etc.) while accepting any well-formed IPv4/IPv6 string.
+//
+// Allowed characters:
+//   0-9    digits (IPv4 octets, IPv6 groups)
+//   a-fA-F hex digits (IPv6)
+//   .      dot separator (IPv4, IPv4-mapped IPv6)
+//   :      colon separator (IPv6)
+//
+// Max length 45 covers the longest valid representation
+// (full IPv6 with IPv4-mapped suffix is 45 chars).
+const IP_RE = /^[0-9a-fA-F.:]{1,45}$/;
+
+/**
+ * Checks whether a string looks like an IP address (contains only characters
+ * that can appear in IPv4/IPv6 addresses and is within a reasonable length).
+ *
+ * This is a permissive allowlist — it won't catch every malformed IP, but it
+ * reliably rejects injection payloads. Does NOT use Node.js APIs so it works
+ * in all runtimes (Workers, Deno, etc.).
+ */
+export function isValidIpAddress(value: string): boolean {
+	return IP_RE.test(value);
+}
+
+/**
+ * Extracts the first value from a potentially multi-value header and validates
+ * that it is a syntactically valid IP address.
+ *
+ * Useful for adapters that read client IP from a platform-specific header
+ */
+export function getValidatedIpFromHeader(
+	headerValue: string | string[] | null | undefined,
+): string | undefined {
+	const raw = getFirstForwardedValue(headerValue);
+	if (raw && isValidIpAddress(raw)) {
+		return raw;
+	}
+	return undefined;
+}
+
+/**
+ * Returns the first value associated to the `x-forwarded-for` header,
+ * but only if it is a valid IP address. Returns `undefined` otherwise.
+ *
+ * @param {Request} request
+ */
+export function getClientIpAddress(request: Request): string | undefined {
+	return getValidatedIpFromHeader(request.headers.get('x-forwarded-for'));
+}
diff --git a/packages/internal-helpers/test/request.test.js b/packages/internal-helpers/test/request.test.js
new file mode 100644
index 000000000000..8741dbdddb62
--- /dev/null
+++ b/packages/internal-helpers/test/request.test.js
@@ -0,0 +1,223 @@
+import assert from 'node:assert/strict';
+import { describe, it } from 'node:test';
+import {
+	getClientIpAddress,
+	getFirstForwardedValue,
+	getValidatedIpFromHeader,
+	isValidIpAddress,
+} from '../dist/request.js';
+
+describe('getFirstForwardedValue', () => {
+	it('should return the first value from a comma-separated string', () => {
+		assert.equal(getFirstForwardedValue('a, b, c'), 'a');
+	});
+
+	it('should return the only value when there is a single value', () => {
+		assert.equal(getFirstForwardedValue('203.0.113.50'), '203.0.113.50');
+	});
+
+	it('should trim whitespace from the returned value', () => {
+		assert.equal(getFirstForwardedValue('  203.0.113.50  ,  10.0.0.1  '), '203.0.113.50');
+	});
+
+	it('should return undefined for undefined input', () => {
+		assert.equal(getFirstForwardedValue(undefined), undefined);
+	});
+
+	it('should return undefined for null input', () => {
+		assert.equal(getFirstForwardedValue(null), undefined);
+	});
+
+	it('should handle an empty string', () => {
+		assert.equal(getFirstForwardedValue(''), '');
+	});
+
+	it('should handle a string array by joining and splitting', () => {
+		// .toString() on a string array produces "a,b", then split(',') works
+		assert.equal(getFirstForwardedValue(['203.0.113.50', '10.0.0.1']), '203.0.113.50');
+	});
+
+	it('should handle an IPv6 address', () => {
+		assert.equal(getFirstForwardedValue('2001:db8::1'), '2001:db8::1');
+	});
+});
+
+describe('isValidIpAddress', () => {
+	const validAddresses = [
+		// IPv4
+		'127.0.0.1',
+		'0.0.0.0',
+		'255.255.255.255',
+		'192.168.1.1',
+		'10.0.0.1',
+		'203.0.113.50',
+
+		// IPv6
+		'::1',
+		'::',
+		'2001:db8::1',
+		'fe80::1',
+		'::ffff:192.0.2.1',
+		'2001:0db8:0000:0000:0000:0000:0000:0001',
+		'fd12:3456:789a::1',
+	];
+
+	const invalidAddresses = [
+		// Injection payloads
+		'<script>alert(1)</script>',
+		"'; DROP TABLE users; --",
+		'../../etc/passwd',
+		'<img src=x onerror=alert(1)>',
+
+		// Arbitrary strings
+		'not-an-ip',
+		'hello world',
+		'localhost',
+		'example.com',
+
+		// Empty / whitespace
+		'',
+		' ',
+
+		// Oversized
+		'1'.repeat(46),
+
+		// Path-like
+		'/home/user',
+		'C:\\Windows',
+
+		// URL-like
+		'http://evil.com',
+	];
+
+	it('should accept valid IP addresses', () => {
+		for (const addr of validAddresses) {
+			assert.equal(isValidIpAddress(addr), true, `Expected "${addr}" to be valid`);
+		}
+	});
+
+	it('should reject non-IP strings', () => {
+		for (const addr of invalidAddresses) {
+			assert.equal(isValidIpAddress(addr), false, `Expected "${addr}" to be invalid`);
+		}
+	});
+});
+
+describe('getValidatedIpFromHeader', () => {
+	it('should return a valid IP from a single-value header', () => {
+		assert.equal(getValidatedIpFromHeader('203.0.113.50'), '203.0.113.50');
+	});
+
+	it('should return the first valid IP from a multi-value header', () => {
+		assert.equal(getValidatedIpFromHeader('203.0.113.50, 10.0.0.1'), '203.0.113.50');
+	});
+
+	it('should return undefined for non-IP header values', () => {
+		assert.equal(getValidatedIpFromHeader('<script>alert(1)</script>'), undefined);
+	});
+
+	it('should return undefined for null', () => {
+		assert.equal(getValidatedIpFromHeader(null), undefined);
+	});
+
+	it('should return undefined for undefined', () => {
+		assert.equal(getValidatedIpFromHeader(undefined), undefined);
+	});
+
+	it('should return undefined for empty string', () => {
+		assert.equal(getValidatedIpFromHeader(''), undefined);
+	});
+
+	it('should handle IPv6 addresses', () => {
+		assert.equal(getValidatedIpFromHeader('2001:db8::1'), '2001:db8::1');
+	});
+});
+
+describe('getClientIpAddress', () => {
+	/**
+	 * Helper to create a minimal Request with given headers.
+	 */
+	function makeRequest(headers = {}) {
+		return new Request('https://example.com', { headers });
+	}
+
+	it('should return the IP when x-forwarded-for contains a single address', () => {
+		const request = makeRequest({ 'x-forwarded-for': '203.0.113.50' });
+		assert.equal(getClientIpAddress(request), '203.0.113.50');
+	});
+
+	it('should return the first IP when x-forwarded-for contains multiple addresses', () => {
+		const request = makeRequest({
+			'x-forwarded-for': '203.0.113.50, 70.41.3.18, 150.172.238.178',
+		});
+		assert.equal(getClientIpAddress(request), '203.0.113.50');
+	});
+
+	it('should trim whitespace around addresses', () => {
+		const request = makeRequest({ 'x-forwarded-for': '  203.0.113.50  ,  70.41.3.18  ' });
+		assert.equal(getClientIpAddress(request), '203.0.113.50');
+	});
+
+	it('should return undefined when x-forwarded-for header is absent', () => {
+		const request = makeRequest();
+		assert.equal(getClientIpAddress(request), undefined);
+	});
+
+	it('should return undefined when x-forwarded-for header is empty', () => {
+		const request = makeRequest({ 'x-forwarded-for': '' });
+		assert.equal(getClientIpAddress(request), undefined);
+	});
+
+	it('should handle an IPv6 address', () => {
+		const request = makeRequest({ 'x-forwarded-for': '2001:db8::1' });
+		assert.equal(getClientIpAddress(request), '2001:db8::1');
+	});
+
+	it('should return the first IPv6 address from a mixed list', () => {
+		const request = makeRequest({ 'x-forwarded-for': '2001:db8::1, 203.0.113.50' });
+		assert.equal(getClientIpAddress(request), '2001:db8::1');
+	});
+
+	it('should handle IPv4-mapped IPv6 address', () => {
+		const request = makeRequest({ 'x-forwarded-for': '::ffff:192.0.2.1' });
+		assert.equal(getClientIpAddress(request), '::ffff:192.0.2.1');
+	});
+
+	it('should handle the loopback address', () => {
+		const request = makeRequest({ 'x-forwarded-for': '127.0.0.1' });
+		assert.equal(getClientIpAddress(request), '127.0.0.1');
+	});
+
+	it('should return undefined for whitespace-only values', () => {
+		const request = makeRequest({ 'x-forwarded-for': ' , ' });
+		assert.equal(getClientIpAddress(request), undefined);
+	});
+
+	it('should not be affected by other headers', () => {
+		const request = makeRequest({
+			'x-real-ip': '10.0.0.1',
+			forwarded: 'for=10.0.0.2',
+		});
+		assert.equal(getClientIpAddress(request), undefined);
+	});
+
+	it('should reject HTML injection in x-forwarded-for', () => {
+		const request = makeRequest({ 'x-forwarded-for': '<script>alert(1)</script>' });
+		assert.equal(getClientIpAddress(request), undefined);
+	});
+
+	it('should reject SQL injection in x-forwarded-for', () => {
+		const request = makeRequest({ 'x-forwarded-for': "'; DROP TABLE users; --" });
+		assert.equal(getClientIpAddress(request), undefined);
+	});
+
+	it('should reject path traversal in x-forwarded-for', () => {
+		const request = makeRequest({ 'x-forwarded-for': '../../etc/passwd' });
+		assert.equal(getClientIpAddress(request), undefined);
+	});
+
+	it('should reject oversized x-forwarded-for values', () => {
+		const request = makeRequest({ 'x-forwarded-for': '1'.repeat(100) });
+		assert.equal(getClientIpAddress(request), undefined);
+	});
+});
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index a2f468ffbf0a..7987840bc87b 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -4956,6 +4956,15 @@ importers:
         specifier: workspace:*
         version: link:../../../../../astro
 
+  packages/integrations/cloudflare/test/fixtures/client-address:
+    dependencies:
+      '@astrojs/cloudflare':
+        specifier: workspace:*
+        version: link:../../..
+      astro:
+        specifier: workspace:*
+        version: link:../../../../../astro
+
   packages/integrations/cloudflare/test/fixtures/compile-image-service:
     dependencies:
       '@astrojs/cloudflare':

From 631aaedce99a2233d69fc2aa369164d286f34dbc Mon Sep 17 00:00:00 2001
From: Matthew Phillips <matthewphillips@cloudflare.com>
Date: Thu, 5 Mar 2026 13:44:47 -0500
Subject: [PATCH 7/9] Normalize backslash characters in URL pathname after
 decoding (#15757)

* Normalize backslash characters in URL pathname after decoding

* Update ssr-request test to expect normalized pathname in middleware

Duplicate slashes are now collapsed before middleware runs, so the
middleware and test need to check for the normalized path instead of
the raw path with duplicate slashes.

* Simplify slash normalization with collapseDuplicateSlashes helper

* Address PR review feedback: clarify comment ordering, simplify test fixtures

---------

Co-authored-by: astro-security[bot] <houston@astro.build>
---
 .changeset/normalize-backslash-pathname.md    |   5 +
 packages/astro/src/core/render-context.ts     |  10 +-
 .../fixtures/ssr-request/src/middleware.ts    |   4 +-
 packages/astro/test/ssr-request.test.js       |   2 +-
 .../app/encoded-backslash-bypass.test.js      | 112 ++++++++++++++++++
 packages/internal-helpers/src/path.ts         |   9 ++
 6 files changed, 134 insertions(+), 8 deletions(-)
 create mode 100644 .changeset/normalize-backslash-pathname.md
 create mode 100644 packages/astro/test/units/app/encoded-backslash-bypass.test.js

diff --git a/.changeset/normalize-backslash-pathname.md b/.changeset/normalize-backslash-pathname.md
new file mode 100644
index 000000000000..8484143ed228
--- /dev/null
+++ b/.changeset/normalize-backslash-pathname.md
@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Hardens URL pathname normalization to consistently handle backslash characters after decoding, ensuring middleware and router see the same canonical pathname
diff --git a/packages/astro/src/core/render-context.ts b/packages/astro/src/core/render-context.ts
index 1f80c74c47fa..491c0ec2bc46 100644
--- a/packages/astro/src/core/render-context.ts
+++ b/packages/astro/src/core/render-context.ts
@@ -40,7 +40,7 @@ import { AstroCache, type CacheLike } from './cache/runtime/cache.js';
 import { NoopAstroCache, DisabledAstroCache } from './cache/runtime/noop.js';
 import { compileCacheRoutes, matchCacheRoute } from './cache/runtime/route-matching.js';
 import { AstroSession } from './session/runtime.js';
-import { collapseDuplicateLeadingSlashes } from '@astrojs/internal-helpers/path';
+import { collapseDuplicateSlashes } from '@astrojs/internal-helpers/path';
 import { validateAndDecodePathname } from './util/pathname.js';
 
 /**
@@ -91,10 +91,6 @@ export class RenderContext {
 
 	static #createNormalizedUrl(requestUrl: string): URL {
 		const url = new URL(requestUrl);
-		// Collapse multiple leading slashes so middleware sees the canonical pathname.
-		// Without this, a request to `//admin` would preserve `//admin` in context.url.pathname,
-		// bypassing middleware checks like `pathname.startsWith('/admin')`.
-		url.pathname = collapseDuplicateLeadingSlashes(url.pathname);
 		try {
 			// Decode and validate pathname to prevent multi-level encoding bypass attacks
 			url.pathname = validateAndDecodePathname(url.pathname);
@@ -108,6 +104,10 @@ export class RenderContext {
 				// If even basic decoding fails, return URL as-is
 			}
 		}
+		// This must run after decoding so it catches slashes introduced by decoding (e.g., `%5C` → `\` → `/`).
+		// Collapse duplicate slashes so middleware sees the canonical pathname
+		// and bypass attacks like `//admin` evading `/admin` checks are prevented.
+		url.pathname = collapseDuplicateSlashes(url.pathname);
 		return url;
 	}
 
diff --git a/packages/astro/test/fixtures/ssr-request/src/middleware.ts b/packages/astro/test/fixtures/ssr-request/src/middleware.ts
index 6e7a20d7a676..6f202913f4c3 100644
--- a/packages/astro/test/fixtures/ssr-request/src/middleware.ts
+++ b/packages/astro/test/fixtures/ssr-request/src/middleware.ts
@@ -1,8 +1,8 @@
 import { defineMiddleware } from 'astro:middleware';
 
 export const onRequest = defineMiddleware(({ url }, next) => {
-	// Redirect when there are extra slashes
-	if(url.pathname === '/this//is/my/////directory') {
+	// Redirect when the path matches (duplicate slashes are normalized before middleware runs)
+	if(url.pathname === '/this/is/my/directory') {
 		return new Response(null, {
 			status: 301,
 			headers: {
diff --git a/packages/astro/test/ssr-request.test.js b/packages/astro/test/ssr-request.test.js
index a520b350cceb..537592f3a7d0 100644
--- a/packages/astro/test/ssr-request.test.js
+++ b/packages/astro/test/ssr-request.test.js
@@ -96,7 +96,7 @@ describe('Using Astro.request in SSR', () => {
 		assert.equal(data instanceof Array, true);
 	});
 
-	it('middleware gets the actual path sent in the request', async () => {
+	it('middleware gets the normalized path sent in the request', async () => {
 		const app = await fixture.loadTestAdapterApp();
 		const request = new Request('http://example.com/this//is/my/////directory');
 		const response = await app.render(request);
diff --git a/packages/astro/test/units/app/encoded-backslash-bypass.test.js b/packages/astro/test/units/app/encoded-backslash-bypass.test.js
new file mode 100644
index 000000000000..fcf6c3e56d82
--- /dev/null
+++ b/packages/astro/test/units/app/encoded-backslash-bypass.test.js
@@ -0,0 +1,112 @@
+// @ts-check
+import assert from 'node:assert/strict';
+import { describe, it } from 'node:test';
+import { App } from '../../../dist/core/app/app.js';
+import { parseRoute } from '../../../dist/core/routing/parse-route.js';
+import { createComponent, render } from '../../../dist/runtime/server/index.js';
+import { createManifest } from './test-helpers.js';
+
+/**
+ * Tests that encoded backslash characters (%5C) in URL paths do not cause
+ * a mismatch between what middleware sees and what the router matches.
+ *
+ * When %5C is decoded to \, the URL spec's pathname setter normalizes \ to /,
+ * which can create unexpected double slashes in context.url.pathname.
+ * The middleware then sees a different path than what the router matched.
+ */
+
+const routeOptions = /** @type {Parameters<typeof parseRoute>[1]} */ (
+	/** @type {any} */ ({
+		config: { base: '/', trailingSlash: 'ignore' },
+		pageExtensions: [],
+	})
+);
+
+// Dynamic route: /users/[slug]
+const userSlugRouteData = parseRoute('users/[slug]', routeOptions, {
+	component: 'src/pages/users/[slug].astro',
+});
+
+const publicRouteData = parseRoute('index.astro', routeOptions, {
+	component: 'src/pages/index.astro',
+});
+
+const page = createComponent(() => {
+	return render`<h1>Page</h1>`;
+});
+
+const pageModule = async () => ({
+	page: async () => ({
+		default: page,
+	}),
+});
+
+const pageMap = new Map([
+	[userSlugRouteData.component, pageModule],
+	[publicRouteData.component, pageModule],
+]);
+
+/**
+ * Middleware that blocks access to /users/admin path,
+ * simulating authorization checks on dynamic routes.
+ */
+const middleware =
+	/** @type {() => Promise<{onRequest: import('../../../dist/types/public/common.js').MiddlewareHandler}>} */ (
+		async () => ({
+			onRequest: async (context, next) => {
+				const pathname = context.url.pathname;
+				if (pathname === '/users/admin' || pathname.startsWith('/users/admin/')) {
+					return new Response('Forbidden', { status: 403 });
+				}
+				return next();
+			},
+		})
+	);
+
+const app = new App(
+	createManifest({
+		routes: [{ routeData: userSlugRouteData }, { routeData: publicRouteData }],
+		pageMap,
+		middleware,
+	}),
+);
+
+describe('URL normalization: encoded backslash handling in pathname', () => {
+	it('middleware blocks /users/admin with normal request', async () => {
+		const request = new Request('http://example.com/users/admin');
+		const response = await app.render(request);
+		assert.equal(response.status, 403, '/users/admin should be blocked by middleware');
+	});
+
+	it('middleware blocks /users/%5Cadmin (encoded backslash)', async () => {
+		const request = new Request('http://example.com/users/%5Cadmin');
+		const response = await app.render(request);
+		// After decoding %5C to \, and URL normalization of \ to /,
+		// this should become /users/admin which the middleware should block
+		assert.equal(response.status, 403, '/users/%5Cadmin should be blocked by middleware');
+	});
+
+	it('middleware blocks /users/%5cadmin (lowercase hex encoded backslash)', async () => {
+		const request = new Request('http://example.com/users/%5cadmin');
+		const response = await app.render(request);
+		assert.equal(response.status, 403, '/users/%5cadmin should be blocked by middleware');
+	});
+
+	it('middleware blocks /users/%5C%5Cadmin (double encoded backslash)', async () => {
+		const request = new Request('http://example.com/users/%5C%5Cadmin');
+		const response = await app.render(request);
+		assert.equal(response.status, 403, '/users/%5C%5Cadmin should be blocked by middleware');
+	});
+
+	it('public route is still accessible', async () => {
+		const request = new Request('http://example.com/');
+		const response = await app.render(request);
+		assert.equal(response.status, 200, '/ should be accessible');
+	});
+
+	it('non-protected dynamic route is still accessible', async () => {
+		const request = new Request('http://example.com/users/john');
+		const response = await app.render(request);
+		assert.equal(response.status, 200, '/users/john should be accessible');
+	});
+});
diff --git a/packages/internal-helpers/src/path.ts b/packages/internal-helpers/src/path.ts
index 060c8ca4e4d5..11b4c843bf21 100644
--- a/packages/internal-helpers/src/path.ts
+++ b/packages/internal-helpers/src/path.ts
@@ -24,6 +24,15 @@ export function collapseDuplicateLeadingSlashes(path: string) {
 	return path.replace(MANY_LEADING_SLASHES, '/');
 }
 
+const MANY_SLASHES = /\/{2,}/g;
+
+export function collapseDuplicateSlashes(path: string) {
+	if (!path) {
+		return path;
+	}
+	return path.replace(MANY_SLASHES, '/');
+}
+
 export const MANY_TRAILING_SLASHES = /\/{2,}$/g;
 
 export function collapseDuplicateTrailingSlashes(path: string, trailingSlash: boolean) {

From 2ff96f44d9fd5254b468f21e4ef66ccaf84bf2b0 Mon Sep 17 00:00:00 2001
From: Matthew Phillips <matthewp@users.noreply.github.com>
Date: Thu, 5 Mar 2026 18:45:59 +0000
Subject: [PATCH 8/9] [ci] format

---
 packages/astro/e2e/astro-envs.test.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/astro/e2e/astro-envs.test.js b/packages/astro/e2e/astro-envs.test.js
index 6e7b6fdc3d99..fc629dcc667c 100644
--- a/packages/astro/e2e/astro-envs.test.js
+++ b/packages/astro/e2e/astro-envs.test.js
@@ -34,8 +34,6 @@ test.describe('Astro Environment BASE_URL', () => {
 		await expect(astroBaseUrl, 'astroBaseUrl equals /blog').toHaveText('/blog');
 
 		const clientComponentBaseUrl = page.locator('id=client-component-base-url');
-		await expect(clientComponentBaseUrl, 'clientComponentBaseUrl equals /blog').toHaveText(
-			'/blog',
-		);
+		await expect(clientComponentBaseUrl, 'clientComponentBaseUrl equals /blog').toHaveText('/blog');
 	});
 });

From 39ff2a565614250acae83d35bf196e0463857d9e Mon Sep 17 00:00:00 2001
From: Matthew Phillips <matthewphillips@cloudflare.com>
Date: Thu, 5 Mar 2026 14:24:31 -0500
Subject: [PATCH 9/9] Harden Node adapter HTTP server defaults and request body
 handling (#15759)

* Harden Node adapter HTTP server defaults and add global body size limit

* Make bodySizeLimit a user-configurable option in the Node adapter

* Update changeset: bump @astrojs/node to minor for new bodySizeLimit option

* Update .changeset/harden-node-server-defaults.md

Co-authored-by: Sarah Rainsberger <5098874+sarah11918@users.noreply.github.com>

* Remove timeout defaults

* Remove timeout hardening tests

---------

Co-authored-by: astro-actions[bot] <houston@astro.build>
Co-authored-by: Sarah Rainsberger <5098874+sarah11918@users.noreply.github.com>
---
 .changeset/harden-node-server-defaults.md   |  20 ++++
 packages/astro/src/core/app/node.ts         |  48 ++++++++--
 packages/astro/test/units/app/node.test.js  | 101 ++++++++++++++++++++
 packages/integrations/node/src/index.ts     |   1 +
 packages/integrations/node/src/serve-app.ts |   7 ++
 packages/integrations/node/src/types.ts     |  11 +++
 6 files changed, 181 insertions(+), 7 deletions(-)
 create mode 100644 .changeset/harden-node-server-defaults.md

diff --git a/.changeset/harden-node-server-defaults.md b/.changeset/harden-node-server-defaults.md
new file mode 100644
index 000000000000..3a227f9c8ddf
--- /dev/null
+++ b/.changeset/harden-node-server-defaults.md
@@ -0,0 +1,20 @@
+---
+'astro': patch
+'@astrojs/node': minor
+---
+
+Adds a new `bodySizeLimit` option to the `@astrojs/node` adapter
+
+You can now configure a maximum allowed request body size for your Node.js standalone server. The default limit is 1 GB. Set the value in bytes, or pass `0` to disable the limit entirely:
+
+```js
+import node from '@astrojs/node';
+import { defineConfig } from 'astro/config';
+
+export default defineConfig({
+  adapter: node({
+    mode: 'standalone',
+    bodySizeLimit: 1024 * 1024 * 100, // 100 MB
+  }),
+});
+```
diff --git a/packages/astro/src/core/app/node.ts b/packages/astro/src/core/app/node.ts
index 2127327d5cf1..06e30e6bef1d 100644
--- a/packages/astro/src/core/app/node.ts
+++ b/packages/astro/src/core/app/node.ts
@@ -39,8 +39,14 @@ export function createRequest(
 	{
 		skipBody = false,
 		allowedDomains = [],
+		bodySizeLimit,
 		port: serverPort,
-	}: { skipBody?: boolean; allowedDomains?: Partial<RemotePattern>[]; port?: number } = {},
+	}: {
+		skipBody?: boolean;
+		allowedDomains?: Partial<RemotePattern>[];
+		bodySizeLimit?: number;
+		port?: number;
+	} = {},
 ): Request {
 	const controller = new AbortController();
 
@@ -103,7 +109,7 @@ export function createRequest(
 	};
 	const bodyAllowed = options.method !== 'HEAD' && options.method !== 'GET' && skipBody === false;
 	if (bodyAllowed) {
-		Object.assign(options, makeRequestBody(req));
+		Object.assign(options, makeRequestBody(req, bodySizeLimit));
 	}
 
 	const request = new Request(url, options);
@@ -322,7 +328,7 @@ function makeRequestHeaders(req: NodeRequest): Headers {
 	return headers;
 }
 
-function makeRequestBody(req: NodeRequest): RequestInit {
+function makeRequestBody(req: NodeRequest, bodySizeLimit?: number): RequestInit {
 	if (req.body !== undefined) {
 		if (typeof req.body === 'string' && req.body.length > 0) {
 			return { body: Buffer.from(req.body) };
@@ -338,20 +344,24 @@ function makeRequestBody(req: NodeRequest): RequestInit {
 			req.body !== null &&
 			typeof (req.body as any)[Symbol.asyncIterator] !== 'undefined'
 		) {
-			return asyncIterableToBodyProps(req.body as AsyncIterable<any>);
+			return asyncIterableToBodyProps(req.body as AsyncIterable<any>, bodySizeLimit);
 		}
 	}
 
 	// Return default body.
-	return asyncIterableToBodyProps(req);
+	return asyncIterableToBodyProps(req, bodySizeLimit);
 }
 
-function asyncIterableToBodyProps(iterable: AsyncIterable<any>): RequestInit {
+function asyncIterableToBodyProps(
+	iterable: AsyncIterable<any>,
+	bodySizeLimit?: number,
+): RequestInit {
+	const source = bodySizeLimit != null ? limitAsyncIterable(iterable, bodySizeLimit) : iterable;
 	return {
 		// Node uses undici for the Request implementation. Undici accepts
 		// a non-standard async iterable for the body.
 		// @ts-expect-error
-		body: iterable,
+		body: source,
 		// The duplex property is required when using a ReadableStream or async
 		// iterable for the body. The type definitions do not include the duplex
 		// property because they are not up-to-date.
@@ -359,6 +369,30 @@ function asyncIterableToBodyProps(iterable: AsyncIterable<any>): RequestInit {
 	};
 }
 
+/**
+ * Wraps an async iterable with a size limit. If the total bytes received
+ * exceed the limit, an error is thrown.
+ */
+async function* limitAsyncIterable(
+	iterable: AsyncIterable<any>,
+	limit: number,
+): AsyncGenerator<any> {
+	let received = 0;
+	for await (const chunk of iterable) {
+		const byteLength =
+			chunk instanceof Uint8Array
+				? chunk.byteLength
+				: typeof chunk === 'string'
+					? Buffer.byteLength(chunk)
+					: 0;
+		received += byteLength;
+		if (received > limit) {
+			throw new Error(`Body size limit exceeded: received more than ${limit} bytes`);
+		}
+		yield chunk;
+	}
+}
+
 function getAbortControllerCleanup(req?: NodeRequest): (() => void) | undefined {
 	if (!req) return undefined;
 	const cleanup = Reflect.get(req, nodeRequestAbortControllerCleanupSymbol);
diff --git a/packages/astro/test/units/app/node.test.js b/packages/astro/test/units/app/node.test.js
index c688d2ae709c..e820cd8e84a7 100644
--- a/packages/astro/test/units/app/node.test.js
+++ b/packages/astro/test/units/app/node.test.js
@@ -855,6 +855,107 @@ describe('node', () => {
 		});
 	});
 
+	describe('body size limit', () => {
+		it('rejects request body that exceeds the configured bodySizeLimit', async () => {
+			const { Readable } = await import('node:stream');
+			// Create a stream that produces data exceeding the limit
+			const limit = 1024; // 1KB limit
+			const chunks = [];
+			// Create 2KB of data (exceeds 1KB limit)
+			for (let i = 0; i < 4; i++) {
+				chunks.push(Buffer.alloc(512, 0x41));
+			}
+			const stream = Readable.from(chunks);
+			const req = {
+				...mockNodeRequest,
+				method: 'POST',
+				headers: {
+					...mockNodeRequest.headers,
+					'content-type': 'application/octet-stream',
+				},
+				socket: mockNodeRequest.socket,
+				[Symbol.asyncIterator]: stream[Symbol.asyncIterator].bind(stream),
+			};
+
+			const request = createRequest(req, { bodySizeLimit: limit });
+
+			// The request should be created, but reading the body should fail
+			await assert.rejects(
+				async () => {
+					const reader = request.body.getReader();
+					while (true) {
+						const { done } = await reader.read();
+						if (done) break;
+					}
+				},
+				(err) => {
+					assert.ok(err.message.includes('Body size limit exceeded'));
+					return true;
+				},
+			);
+		});
+
+		it('allows request body within the configured bodySizeLimit', async () => {
+			const { Readable } = await import('node:stream');
+			const limit = 2048; // 2KB limit
+			const data = Buffer.alloc(1024, 0x42); // 1KB of data (within limit)
+			const stream = Readable.from([data]);
+			const req = {
+				...mockNodeRequest,
+				method: 'POST',
+				headers: {
+					...mockNodeRequest.headers,
+					'content-type': 'application/octet-stream',
+				},
+				socket: mockNodeRequest.socket,
+				[Symbol.asyncIterator]: stream[Symbol.asyncIterator].bind(stream),
+			};
+
+			const request = createRequest(req, { bodySizeLimit: limit });
+
+			// Reading the body should succeed
+			const reader = request.body.getReader();
+			const chunks = [];
+			while (true) {
+				const { done, value } = await reader.read();
+				if (done) break;
+				chunks.push(value);
+			}
+			const totalSize = chunks.reduce((sum, chunk) => sum + chunk.byteLength, 0);
+			assert.equal(totalSize, 1024);
+		});
+
+		it('does not enforce body size limit when bodySizeLimit is not set', async () => {
+			const { Readable } = await import('node:stream');
+			// Create 2KB of data with no limit configured
+			const data = Buffer.alloc(2048, 0x43);
+			const stream = Readable.from([data]);
+			const req = {
+				...mockNodeRequest,
+				method: 'POST',
+				headers: {
+					...mockNodeRequest.headers,
+					'content-type': 'application/octet-stream',
+				},
+				socket: mockNodeRequest.socket,
+				[Symbol.asyncIterator]: stream[Symbol.asyncIterator].bind(stream),
+			};
+
+			const request = createRequest(req);
+
+			// Reading the body should succeed without limit
+			const reader = request.body.getReader();
+			const chunks = [];
+			while (true) {
+				const { done, value } = await reader.read();
+				if (done) break;
+				chunks.push(value);
+			}
+			const totalSize = chunks.reduce((sum, chunk) => sum + chunk.byteLength, 0);
+			assert.equal(totalSize, 2048);
+		});
+	});
+
 	describe('abort signal', () => {
 		it('aborts the request.signal when the underlying socket closes', () => {
 			const socket = new EventEmitter();
diff --git a/packages/integrations/node/src/index.ts b/packages/integrations/node/src/index.ts
index 31547844098c..7a2e4c767afd 100644
--- a/packages/integrations/node/src/index.ts
+++ b/packages/integrations/node/src/index.ts
@@ -78,6 +78,7 @@ export default function createIntegration(userOptions: UserOptions): AstroIntegr
 								host: _config.server.host,
 								port: _config.server.port,
 								staticHeaders: userOptions.staticHeaders ?? false,
+								bodySizeLimit: userOptions.bodySizeLimit ?? 1024 * 1024 * 1024,
 							}),
 						],
 					},
diff --git a/packages/integrations/node/src/serve-app.ts b/packages/integrations/node/src/serve-app.ts
index 3f646e9d7845..94dc29940e7a 100644
--- a/packages/integrations/node/src/serve-app.ts
+++ b/packages/integrations/node/src/serve-app.ts
@@ -75,11 +75,18 @@ export function createAppHandler(app: BaseApp, options: Options): RequestHandler
 		return new Response(null, { status: 404 });
 	};
 
+	// Use the configured body size limit. A value of 0 or Infinity disables the limit.
+	const effectiveBodySizeLimit =
+		options.bodySizeLimit === 0 || options.bodySizeLimit === Number.POSITIVE_INFINITY
+			? undefined
+			: options.bodySizeLimit;
+
 	return async (req, res, next, locals) => {
 		let request: Request;
 		try {
 			request = createRequest(req, {
 				allowedDomains: app.getAllowedDomains?.() ?? [],
+				bodySizeLimit: effectiveBodySizeLimit,
 				port: options.port,
 			});
 		} catch (err) {
diff --git a/packages/integrations/node/src/types.ts b/packages/integrations/node/src/types.ts
index 9bb7fd5cdec8..4d853c9ebbc3 100644
--- a/packages/integrations/node/src/types.ts
+++ b/packages/integrations/node/src/types.ts
@@ -20,6 +20,16 @@ export interface UserOptions {
 	 * - The CSP header of the static pages is added when CSP support is enabled.
 	 */
 	staticHeaders?: boolean;
+
+	/**
+	 * Maximum allowed request body size in bytes. Requests with bodies larger than
+	 * this limit will throw an error when the body is consumed.
+	 *
+	 * Set to `Infinity` or `0` to disable the limit.
+	 *
+	 * @default {1073741824} 1GB
+	 */
+	bodySizeLimit?: number;
 }
 
 export interface Options extends UserOptions {
@@ -28,6 +38,7 @@ export interface Options extends UserOptions {
 	server: string;
 	client: string;
 	staticHeaders: boolean;
+	bodySizeLimit: number;
 }
 
 export type RequestHandler = (...args: RequestHandlerParams) => void | Promise<void>;