astro 7.0.0-beta.3 → 7.0.0-beta.4

package/dist/assets/build/generate.js

@@ -1,11 +1,11 @@
 import fs, { readFileSync } from "node:fs";
 import { basename } from "node:path/posix";
 import colors from "piccolore";
-import { getOutDirWithinCwd } from "../../core/build/common.js";
 import { getTimeStat } from "../../core/build/util.js";
 import { AstroError } from "../../core/errors/errors.js";
 import { AstroErrorData } from "../../core/errors/index.js";
 import { isRemotePath, removeLeadingForwardSlash } from "../../core/path.js";
+import { getClientOutputDirectory } from "../../prerender/utils.js";
 import { getConfiguredImageService } from "../internal.js";
 import { isESMImportedImage } from "../utils/imageKind.js";
 import { loadRemoteImage, revalidateRemoteImage } from "./remote.js";
@@ -29,8 +29,9 @@ async function prepareAssetsGenerationEnv(options, totalCount) {
     serverRoot = new URL(".prerender/", settings.config.build.server);
     clientRoot = settings.config.build.client;
   } else {
-    serverRoot = getOutDirWithinCwd(settings.config.outDir);
-    clientRoot = settings.config.outDir;
+    const clientOutputDir = getClientOutputDirectory(settings);
+    serverRoot = clientOutputDir;
+    clientRoot = clientOutputDir;
   }
   return {
     logger,

package/dist/cli/add/index.js

@@ -48,6 +48,7 @@ export default {
 public-hoist-pattern[]=*lit*
 `,
   CLOUDFLARE_WRANGLER_CONFIG: (name, compatibilityDate) => `{
+	"$schema": "./node_modules/wrangler/config-schema.json",
 	"compatibility_date": ${JSON.stringify(compatibilityDate)},
 	"compatibility_flags": ["global_fetch_strictly_public"],
 	"name": ${JSON.stringify(name)},

package/dist/cli/infra/build-time-astro-version-provider.js

@@ -1,6 +1,6 @@
 class BuildTimeAstroVersionProvider {
   // Injected during the build through esbuild define
-  version = "7.0.0-beta.3";
+  version = "7.0.0-beta.4";
 }
 export {
   BuildTimeAstroVersionProvider

package/dist/container/index.d.ts

@@ -67,7 +67,7 @@ export type ContainerRenderOptions = {
      */
     routeType?: RouteType;
     /**
-     * Allows to pass `Astro.props` to an Astro component:
+     * Allows passing `Astro.props` to an Astro component:
      *
      * ```js
      * container.renderToString(Endpoint, { props: { "lorem": "ipsum" } });
@@ -75,9 +75,9 @@ export type ContainerRenderOptions = {
      */
     props?: Props;
     /**
-     * When `false`, it forces to render the component as it was a full-fledged page.
+     * When `false`, it forces the component to render as if it were a full-fledged page.
      *
-     * By default, the container API render components as [partials](https://docs.astro.build/en/basics/astro-pages/#page-partials).
+     * By default, the container API renders components as [partials](https://docs.astro.build/en/basics/astro-pages/#page-partials).
      *
      */
     partial?: boolean;

package/dist/content/content-layer.js

@@ -197,7 +197,7 @@ ${contentConfig.error.message}`
       logger.info("Content config changed");
       shouldClear = true;
     }
-    if (previousAstroVersion && previousAstroVersion !== "7.0.0-beta.3") {
+    if (previousAstroVersion && previousAstroVersion !== "7.0.0-beta.4") {
       logger.info("Astro version changed");
       shouldClear = true;
     }
@@ -205,8 +205,8 @@ ${contentConfig.error.message}`
       logger.info("Clearing content store");
       this.#store.clearAll();
     }
-    if ("7.0.0-beta.3") {
-      this.#store.metaStore().set("astro-version", "7.0.0-beta.3");
+    if ("7.0.0-beta.4") {
+      this.#store.metaStore().set("astro-version", "7.0.0-beta.4");
     }
     if (currentConfigDigest) {
       this.#store.metaStore().set("content-config-digest", currentConfigDigest);

package/dist/content/runtime.d.ts

@@ -70,7 +70,7 @@ type RenderResult = {
 };
 export declare function updateImageReferencesInData<T extends Record<string, unknown>>(data: T, fileName?: string, imageAssetMap?: Map<string, ImageMetadata>): T;
 export declare function renderEntry(entry: DataEntry): Promise<RenderResult>;
-export declare function createReference(): (collection: string) => z.ZodPipe<z.ZodUnion<readonly [z.ZodString, z.ZodObject<{
+export declare function createReference(): (collection: string) => z.ZodPipe<z.ZodUnion<readonly [z.ZodPipe<z.ZodNumber, z.ZodTransform<string, number>>, z.ZodString, z.ZodObject<{
     id: z.ZodString;
     collection: z.ZodString;
 }, z.core.$strip>, z.ZodObject<{

package/dist/content/runtime.js

@@ -484,6 +484,7 @@ async function render({
 function createReference() {
   return function reference(collection) {
     return z.union([
+      z.number().transform((num) => num.toString(10)),
       z.string(),
       z.object({
         id: z.string(),

package/dist/content/vite-plugin-content-virtual-mod.js

@@ -23,6 +23,25 @@ import {
 } from "./consts.js";
 import { getDataStoreFile } from "./content-layer.js";
 import { getContentPaths, isDeferredModule } from "./utils.js";
+function invalidateAssetImports(viteServer, filePath) {
+  const timestamp = Date.now();
+  for (const environment of Object.values(viteServer.environments)) {
+    const modules = environment.moduleGraph.getModulesByFile(filePath);
+    if (modules) {
+      for (const module of modules) {
+        environment.moduleGraph.invalidateModule(module, void 0, timestamp, true);
+      }
+    }
+    if (isRunnableDevEnvironment(environment)) {
+      const runnerModules = environment.runner.evaluatedModules.getModulesByFile(filePath);
+      if (runnerModules) {
+        for (const runnerModule of runnerModules) {
+          environment.runner.evaluatedModules.invalidateModule(runnerModule);
+        }
+      }
+    }
+  }
+}
 function invalidateDataStore(viteServer) {
   const environment = viteServer.environments[ASTRO_VITE_ENVIRONMENT_NAMES.ssr];
   const module = environment.moduleGraph.getModuleById(RESOLVED_DATA_STORE_VIRTUAL_ID);
@@ -67,8 +86,11 @@ function astroContentVirtualModPlugin({
     },
     buildStart() {
       if (devServer) {
+        const assetImportsPath = fileURLToPath(new URL(ASSET_IMPORTS_FILE, settings.dotAstroDir));
         devServer.watcher.add(fileURLToPath(dataStoreFile));
+        devServer.watcher.add(assetImportsPath);
         invalidateDataStore(devServer);
+        invalidateAssetImports(devServer, assetImportsPath);
       }
     },
     resolveId: {
@@ -175,14 +197,19 @@ function astroContentVirtualModPlugin({
     configureServer(server) {
       devServer = server;
       const dataStorePath = fileURLToPath(dataStoreFile);
+      const assetImportsPath = fileURLToPath(new URL(ASSET_IMPORTS_FILE, settings.dotAstroDir));
       server.watcher.on("add", (addedPath) => {
         if (addedPath === dataStorePath) {
           invalidateDataStore(server);
+          invalidateAssetImports(server, assetImportsPath);
         }
       });
       server.watcher.on("change", (changedPath) => {
         if (changedPath === dataStorePath) {
           invalidateDataStore(server);
+          invalidateAssetImports(server, assetImportsPath);
+        } else if (changedPath === assetImportsPath) {
+          invalidateAssetImports(server, assetImportsPath);
         }
       });
     }

package/dist/core/app/base.js

@@ -14,7 +14,6 @@ import { DefaultFetchHandler } from "../fetch/default-handler.js";
 import { appSymbol } from "../constants.js";
 import { DefaultErrorHandler } from "../errors/default-handler.js";
 import { setRenderOptions } from "./render-options.js";
-import { MultiLevelEncodingError } from "../util/pathname.js";
 class BaseApp {
   manifest;
   manifestData;
@@ -237,20 +236,13 @@ class BaseApp {
       waitUntil
     };
     let response;
-    try {
-      if (this.#fetchHandler instanceof DefaultFetchHandler) {
-        Reflect.set(request, appSymbol, this);
-        response = await this.#fetchHandler.renderWithOptions(request, resolvedOptions);
-      } else {
-        setRenderOptions(request, resolvedOptions);
-        Reflect.set(request, appSymbol, this);
-        response = await this.#fetchHandler.fetch(request);
-      }
-    } catch (err) {
-      if (err instanceof MultiLevelEncodingError) {
-        return new Response("Bad Request", { status: 400 });
-      }
-      throw err;
+    if (this.#fetchHandler instanceof DefaultFetchHandler) {
+      Reflect.set(request, appSymbol, this);
+      response = await this.#fetchHandler.renderWithOptions(request, resolvedOptions);
+    } else {
+      setRenderOptions(request, resolvedOptions);
+      Reflect.set(request, appSymbol, this);
+      response = await this.#fetchHandler.fetch(request);
     }
     this.#warnMissingFeatures();
     if (response.headers.get(ASTRO_ERROR_HEADER)) {

package/dist/core/build/plugins/plugin-css.js

@@ -107,6 +107,7 @@ function rollupPluginAstroBuildCSS(options) {
         if (meta.importedCss.size < 1) continue;
         if (this.environment?.name === ASTRO_VITE_ENVIRONMENT_NAMES.client) {
           for (const id of Object.keys(chunk.modules)) {
+            if (!isCSSRequest(id)) continue;
             for (const pageData of getParentClientOnlys(id, this, internals)) {
               for (const importedCssImport of meta.importedCss) {
                 const cssToInfoRecord = pagesToCss[pageData.moduleSpecifier] ??= {};

package/dist/core/config/schemas/base.d.ts

@@ -57,7 +57,7 @@ export declare const ASTRO_CONFIG_DEFAULTS: {
         allowedHosts: never[];
     };
     integrations: never[];
-    markdown: Required<Omit<import("@astrojs/markdown-remark").AstroMarkdownOptions, "image">>;
+    markdown: Required<Omit<import("@astrojs/internal-helpers/markdown").AstroMarkdownOptions, "image">>;
     vite: {};
     legacy: {
         collectionsBackwardsCompat: false;
@@ -329,8 +329,8 @@ export declare const AstroConfigSchema: z.ZodObject<{
         processor: z.ZodDefault<z.ZodObject<{
             name: z.ZodString;
             options: z.ZodDefault<z.ZodCustom<object, object>>;
-            createRenderer: z.ZodCustom<(shared: import("@astrojs/markdown-remark").AstroMarkdownOptions) => Promise<import("@astrojs/markdown-remark").MarkdownRenderer>, (shared: import("@astrojs/markdown-remark").AstroMarkdownOptions) => Promise<import("@astrojs/markdown-remark").MarkdownRenderer>>;
-            createMdxRenderer: z.ZodOptional<z.ZodCustom<((shared: import("@astrojs/markdown-remark").AstroMarkdownOptions, mdx: import("@astrojs/internal-helpers/markdown").MdxRendererOptions) => Promise<import("@astrojs/internal-helpers/markdown").MdxRenderer>) | undefined, ((shared: import("@astrojs/markdown-remark").AstroMarkdownOptions, mdx: import("@astrojs/internal-helpers/markdown").MdxRendererOptions) => Promise<import("@astrojs/internal-helpers/markdown").MdxRenderer>) | undefined>>;
+            createRenderer: z.ZodCustom<(shared: import("@astrojs/internal-helpers/markdown").AstroMarkdownOptions) => Promise<import("@astrojs/internal-helpers/markdown").MarkdownRenderer>, (shared: import("@astrojs/internal-helpers/markdown").AstroMarkdownOptions) => Promise<import("@astrojs/internal-helpers/markdown").MarkdownRenderer>>;
+            createMdxRenderer: z.ZodOptional<z.ZodCustom<((shared: import("@astrojs/internal-helpers/markdown").AstroMarkdownOptions, mdx: import("@astrojs/internal-helpers/markdown").MdxRendererOptions) => Promise<import("@astrojs/internal-helpers/markdown").MdxRenderer>) | undefined, ((shared: import("@astrojs/internal-helpers/markdown").AstroMarkdownOptions, mdx: import("@astrojs/internal-helpers/markdown").MdxRendererOptions) => Promise<import("@astrojs/internal-helpers/markdown").MdxRenderer>) | undefined>>;
         }, z.core.$strip>>;
     }, z.core.$strip>>;
     vite: z.ZodDefault<z.ZodCustom<ViteUserConfig, ViteUserConfig>>;

package/dist/core/config/schemas/base.js

@@ -2,7 +2,7 @@ import {
   markdownConfigDefaults,
   syntaxHighlightDefaults
 } from "@astrojs/internal-helpers/markdown";
-import { unified } from "@astrojs/markdown-remark";
+import { satteri } from "@astrojs/markdown-satteri";
 import { bundledThemes } from "shiki";
 import * as z from "zod/v4";
 import { FontFamilySchema } from "../../../assets/fonts/config.js";
@@ -238,7 +238,7 @@ const AstroConfigSchema = z.object({
     remarkRehype: z.custom((data) => data instanceof Object && !Array.isArray(data)).default(ASTRO_CONFIG_DEFAULTS.markdown.remarkRehype),
     // Deprecated: left undefined unless the user explicitly sets them, so the
     // deprecation warning only fires when actually used. The active processor
-    // (`unified()`) supplies the real default (`gfm`/smart punctuation on) when
+    // (`satteri()`) supplies the real default (`gfm`/smart punctuation on) when
     // these are absent.
     gfm: z.boolean().optional(),
     smartypants: z.union([z.boolean(), smartypantsOptionsSchema]).transform((val) => {
@@ -256,7 +256,7 @@ const AstroConfigSchema = z.object({
       createMdxRenderer: z.custom(
         (v) => v === void 0 || typeof v === "function"
       ).optional()
-    }).default(() => unified())
+    }).default(() => satteri())
   }).prefault({}),
   vite: z.custom((data) => data instanceof Object && !Array.isArray(data)).default(ASTRO_CONFIG_DEFAULTS.vite),
   i18n: z.optional(

package/dist/core/config/validate.js

@@ -30,7 +30,7 @@ function warnDeprecatedMarkdownOptions(config) {
   const names = deprecated.map((key) => `\`markdown.${key}\``).join(" and ");
   const isPlural = deprecated.length > 1;
   console.warn(
-    `[astro] ${names} ${isPlural ? "are" : "is"} deprecated. Move ${isPlural ? "them" : "it"} onto your processor instead (e.g. \`unified({ gfm: false, smartypants: false })\`). Will be removed in a future major.`
+    `[astro] ${names} ${isPlural ? "are" : "is"} deprecated. Move ${isPlural ? "them" : "it"} onto your processor instead (e.g. \`satteri({ features: { gfm: false, smartPunctuation: false } })\`, or \`unified({ gfm: false, smartypants: false })\` from \`@astrojs/markdown-remark\`). Will be removed in a future major.`
   );
 }
 let didWarnAboutLegacyMarkdownPlugins = false;
@@ -45,7 +45,15 @@ async function coerceLegacyMarkdownPlugins(config) {
   if (remarkPlugins.length === 0 && rehypePlugins.length === 0 && Object.keys(remarkRehype).length === 0) {
     return;
   }
-  const { unified, isUnifiedProcessor } = await import("@astrojs/markdown-remark");
+  let unified;
+  let isUnifiedProcessor;
+  try {
+    ({ unified, isUnifiedProcessor } = await import("@astrojs/markdown-remark"));
+  } catch {
+    throw new Error(
+      "`markdown.remarkPlugins`, `markdown.rehypePlugins`, and `markdown.remarkRehype` run on the `unified` processor from `@astrojs/markdown-remark`, which is no longer installed by default now that S\xE4tteri is the default Markdown processor. Install it with:\n  npm install @astrojs/markdown-remark"
+    );
+  }
   const current = md.processor;
   if (!current || isUnifiedProcessor(current)) {
     const target = current ?? (md.processor = unified());

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "7.0.0-beta.3";
+const ASTRO_VERSION = "7.0.0-beta.4";
 const ASTRO_GENERATOR = `Astro v${ASTRO_VERSION}`;
 const REROUTE_DIRECTIVE_HEADER = "X-Astro-Reroute";
 const REWRITE_DIRECTIVE_HEADER_KEY = "X-Astro-Rewrite";

package/dist/core/dev/dev.js

@@ -26,7 +26,7 @@ async function dev(inlineConfig) {
   await telemetry.record([]);
   const restart = await createContainerWithAutomaticRestart({ inlineConfig, fs });
   const logger = restart.container.logger;
-  const currentVersion = "7.0.0-beta.3";
+  const currentVersion = "7.0.0-beta.4";
   const isPrerelease = currentVersion.includes("-");
   if (!isPrerelease) {
     try {

package/dist/core/errors/default-handler.js

@@ -6,6 +6,7 @@ import { AstroMiddleware } from "../middleware/astro-middleware.js";
 import { PagesHandler } from "../pages/handler.js";
 import { matchRoute } from "../routing/match.js";
 import { provideSession } from "../session/handler.js";
+import { validateHost } from "../app/validate-headers.js";
 class DefaultErrorHandler {
   #app;
   #astroMiddleware;
@@ -31,15 +32,27 @@ class DefaultErrorHandler {
     if (errorRouteData) {
       if (errorRouteData.prerender) {
         const maybeDotHtml = errorRouteData.route.endsWith(`/${status}`) ? ".html" : "";
-        const statusURL = new URL(`${app.baseWithoutTrailingSlash}/${status}${maybeDotHtml}`, url);
+        const allowedDomains = app.manifest.allowedDomains;
+        const validatedHost = validateHost(url.host, url.protocol.replace(":", ""), allowedDomains);
+        const safeOrigin = validatedHost ? url.origin : `${url.protocol}//localhost`;
+        const statusURL = new URL(
+          `${app.baseWithoutTrailingSlash}/${status}${maybeDotHtml}`,
+          safeOrigin
+        );
         if (statusURL.toString() !== request.url && resolvedRenderOptions.prerenderedErrorPageFetch) {
-          const response2 = await resolvedRenderOptions.prerenderedErrorPageFetch(
-            statusURL.toString()
-          );
-          const override = { status, removeContentEncodingHeaders: true };
-          const newResponse = mergeResponses(response2, originalResponse, override);
-          prepareResponse(newResponse, resolvedRenderOptions);
-          return newResponse;
+          try {
+            const response2 = await resolvedRenderOptions.prerenderedErrorPageFetch(
+              statusURL.toString()
+            );
+            const override = { status, removeContentEncodingHeaders: true };
+            const newResponse = mergeResponses(response2, originalResponse, override);
+            prepareResponse(newResponse, resolvedRenderOptions);
+            return newResponse;
+          } catch {
+            const response2 = mergeResponses(new Response(null, { status }), originalResponse);
+            prepareResponse(response2, resolvedRenderOptions);
+            return response2;
+          }
         }
       }
       const mod = await app.pipeline.getComponentByRoute(errorRouteData);

package/dist/core/fetch/fetch-state.js

@@ -29,6 +29,7 @@ import { getParams, getProps } from "../render/index.js";
 import { Rewrites } from "../rewrites/handler.js";
 import { isRoute404or500, isRouteServerIsland } from "../routing/match.js";
 import { normalizeUrl } from "../util/normalized-url.js";
+import { validateAndDecodePathname } from "../util/pathname.js";
 import { getOriginPathname, setOriginPathname } from "../routing/rewrite.js";
 import { computePathnameFromDomain } from "../i18n/domain.js";
 import { getCustom404Route, routeHasHtmlExtension } from "../routing/helpers.js";
@@ -190,7 +191,7 @@ class FetchState {
     this.locals = options?.locals ?? {};
     this.url = normalizeUrl(url);
     this.cookies = new AstroCookies(request);
-    if (pipeline.manifest.allowedDomains && pipeline.manifest.allowedDomains.length > 0) {
+    if (pipeline.manifest.allowedDomains && pipeline.manifest.allowedDomains.length > 0 && !this.routeData?.prerender) {
       this.#applyForwardedHeaders();
     }
     if (!Reflect.get(this.request, originPathnameSymbol)) {
@@ -694,7 +695,7 @@ class FetchState {
     }
     pathname = prependForwardSlash(pathname);
     try {
-      return decodeURI(pathname);
+      return validateAndDecodePathname(pathname);
     } catch (e) {
       this.pipeline.logger.error(null, e.toString());
       return pathname;

package/dist/core/messages/runtime.js

@@ -269,7 +269,7 @@ function printHelp({
     message.push(
       linebreak(),
       `  ${bgGreen(black(` ${commandName} `))} ${green(
-        `v${"7.0.0-beta.3"}`
+        `v${"7.0.0-beta.4"}`
       )} ${headline}`
     );
   }

package/dist/core/middleware/vite-plugin.d.ts

@@ -3,6 +3,7 @@ import type { AstroSettings } from '../../types/astro.js';
 import type { BuildInternals } from '../build/internal.js';
 import type { StaticBuildOptions } from '../build/types.js';
 export declare const MIDDLEWARE_MODULE_ID = "virtual:astro:middleware";
+export declare function isMiddlewarePath(relativePath: string): boolean;
 export declare function vitePluginMiddleware({ settings }: {
     settings: AstroSettings;
 }): VitePlugin;

package/dist/core/middleware/vite-plugin.js

@@ -11,6 +11,9 @@ import { normalizePath } from "../viteUtils.js";
 const MIDDLEWARE_MODULE_ID = "virtual:astro:middleware";
 const MIDDLEWARE_RESOLVED_MODULE_ID = "\0" + MIDDLEWARE_MODULE_ID;
 const NOOP_MIDDLEWARE = "\0noop-middleware";
+function isMiddlewarePath(relativePath) {
+  return relativePath.startsWith(`${MIDDLEWARE_PATH_SEGMENT_NAME}.`) || relativePath.startsWith(`${MIDDLEWARE_PATH_SEGMENT_NAME}/`);
+}
 function vitePluginMiddleware({ settings }) {
   let resolvedMiddlewareId = void 0;
   const hasIntegrationMiddleware = settings.middlewares.pre.length > 0 || settings.middlewares.post.length > 0;
@@ -26,7 +29,7 @@ function vitePluginMiddleware({ settings }) {
         const normalizedPath = viteNormalizePath(path);
         if (!normalizedPath.startsWith(normalizedSrcDir)) return;
         const relativePath = normalizedPath.slice(normalizedSrcDir.length);
-        if (!relativePath.startsWith(`${MIDDLEWARE_PATH_SEGMENT_NAME}.`)) return;
+        if (!isMiddlewarePath(relativePath)) return;
         for (const name of [
           ASTRO_VITE_ENVIRONMENT_NAMES.ssr,
           ASTRO_VITE_ENVIRONMENT_NAMES.astro
@@ -135,6 +138,7 @@ function vitePluginMiddlewareBuild(opts, internals) {
 }
 export {
   MIDDLEWARE_MODULE_ID,
+  isMiddlewarePath,
   vitePluginMiddleware,
   vitePluginMiddlewareBuild
 };

package/dist/core/util/normalized-url.js

@@ -1,15 +1,12 @@
 import { collapseDuplicateSlashes } from "@astrojs/internal-helpers/path";
-import { MultiLevelEncodingError, validateAndDecodePathname } from "./pathname.js";
+import { validateAndDecodePathname } from "./pathname.js";
 function createNormalizedUrl(requestUrl) {
   return normalizeUrl(new URL(requestUrl));
 }
 function normalizeUrl(url) {
   try {
     url.pathname = validateAndDecodePathname(url.pathname);
-  } catch (e) {
-    if (e instanceof MultiLevelEncodingError) {
-      throw e;
-    }
+  } catch {
     try {
       url.pathname = decodeURI(url.pathname);
     } catch {

package/dist/core/util/pathname.d.ts

@@ -2,18 +2,24 @@
  * Error thrown when multi-level URL encoding is detected in a pathname.
  * This is a distinct error type so callers can handle it specifically
  * (e.g., returning a 400 response) rather than falling back to partial decoding.
+ *
+ * @deprecated No longer thrown internally — multi-level encoding is now
+ * decoded iteratively instead of rejected. Kept for backwards compatibility
+ * in case third-party code references the class.
  */
 export declare class MultiLevelEncodingError extends Error {
     constructor();
 }
 /**
- * Validates that a pathname is not multi-level encoded.
- * Detects if a pathname contains encoding that was encoded again (e.g., %2561dmin where %25 decodes to %).
- * This prevents double/triple encoding bypasses of security checks.
+ * Decodes a pathname iteratively until stable, collapsing all levels of
+ * percent-encoding into a single canonical form. This prevents
+ * double/triple encoding from bypassing middleware authorization checks
+ * (CVE-2025-66202) — instead of rejecting multi-level encoding, we
+ * fully resolve it so middleware always sees the true decoded path.
  *
- * @param pathname - The pathname to validate
- * @returns The decoded pathname if valid
- * @throws MultiLevelEncodingError if multi-level encoding is detected
- * @throws Error if the pathname contains invalid URL encoding
+ * @param pathname - The pathname to decode
+ * @returns The fully decoded pathname
+ * @throws Error if the pathname contains invalid URL encoding that
+ *   cannot be decoded at all (e.g., a bare `%` not followed by hex digits)
  */
 export declare function validateAndDecodePathname(pathname: string): string;

package/dist/core/util/pathname.js

@@ -4,19 +4,22 @@ class MultiLevelEncodingError extends Error {
     this.name = "MultiLevelEncodingError";
   }
 }
-const ENCODING_REGEX = /%25[0-9a-fA-F]{2}/;
 function validateAndDecodePathname(pathname) {
-  if (ENCODING_REGEX.test(pathname)) {
-    throw new MultiLevelEncodingError();
-  }
   let decoded;
   try {
     decoded = decodeURI(pathname);
   } catch (_e) {
     throw new Error("Invalid URL encoding");
   }
-  if (ENCODING_REGEX.test(decoded)) {
-    throw new MultiLevelEncodingError();
+  let iterations = 0;
+  while (decoded !== pathname && iterations < 10) {
+    pathname = decoded;
+    try {
+      decoded = decodeURI(pathname);
+    } catch {
+      break;
+    }
+    iterations++;
   }
   return decoded;
 }

package/dist/i18n/index.js

@@ -1,4 +1,8 @@
-import { appendForwardSlash, joinPaths } from "@astrojs/internal-helpers/path";
+import {
+  appendForwardSlash,
+  joinPaths,
+  removeTrailingForwardSlash
+} from "@astrojs/internal-helpers/path";
 import { shouldAppendForwardSlash } from "../core/build/util.js";
 import { REROUTE_DIRECTIVE_HEADER } from "../core/constants.js";
 import { i18nNoLocaleFoundInPath, MissingLocale } from "../core/errors/errors-data.js";
@@ -55,7 +59,7 @@ function getLocaleRelativeUrl({
   if (shouldAppendForwardSlash(trailingSlash, format)) {
     relativePath = appendForwardSlash(joinPaths(...pathsToJoin));
   } else {
-    relativePath = joinPaths(...pathsToJoin);
+    relativePath = removeTrailingForwardSlash(joinPaths(...pathsToJoin));
   }
   if (relativePath === "") {
     return "/";

package/dist/runtime/server/jsx.js

@@ -87,7 +87,7 @@ Did you forget to import the component or is it possible there is a typo?`);
           _slots.default.push(child);
           return;
         }
-        if ("slot" in child.props) {
+        if ("slot" in child.props && !isCustomElement) {
           _slots[child.props.slot] = [..._slots[child.props.slot] ?? [], child];
           delete child.props.slot;
           return;
@@ -116,6 +116,7 @@ Did you forget to import the component or is it possible there is a typo?`);
       const _slots = {
         default: []
       };
+      const isCustomElement = typeof vnode.type === "string" && vnode.type.includes("-");
       extractSlots2(children);
       for (const [key, value] of Object.entries(props)) {
         if (value?.["$$slot"]) {

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

@@ -51,7 +51,8 @@ function renderAllHeadContent(result) {
   const links = deduplicateElements(Array.from(result.links)).map(
     (link) => renderElement("link", link, false)
   );
-  content += styles.join("\n") + links.join("\n") + scripts.join("\n");
+  const sep = result.compressHTML === true || result.compressHTML === "jsx" ? "" : "\n";
+  content += styles.join(sep) + links.join(sep) + scripts.join(sep);
   content += result._metadata.extraHead.join("");
   return markHTMLString(content);
 }

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

@@ -6,6 +6,7 @@ const htmlBooleanAttributes = /^(?:allowfullscreen|async|autofocus|autoplay|chec
 const AMPERSAND_REGEX = /&/g;
 const DOUBLE_QUOTE_REGEX = /"/g;
 const STATIC_DIRECTIVES = /* @__PURE__ */ new Set(["set:html", "set:text"]);
+const INVALID_ATTR_NAME_CHAR = /[\s"'>/=]/;
 const toIdent = (k) => k.trim().replace(/(?!^)\b\w|\s+|\W+/g, (match, index) => {
   if (/\W/.test(match)) return "";
   return index === 0 ? match : match.toUpperCase();
@@ -43,6 +44,9 @@ function addAttribute(value, key, shouldEscape = true, tagName = "") {
   if (value == null) {
     return "";
   }
+  if (INVALID_ATTR_NAME_CHAR.test(key)) {
+    return "";
+  }
   if (STATIC_DIRECTIVES.has(key)) {
     console.warn(`[astro] The "${key}" directive cannot be applied dynamically at runtime. It will not be rendered as an attribute.
 

package/dist/types/public/config.d.ts

@@ -1348,7 +1348,7 @@ export interface AstroUserConfig<TLocales extends Locales = never, TDriver exten
      * });
      * ```
      *
-     * Learn more about customizing the request pipeline in the [advanced routing guide](https://docs.astro.build/en/guides/routing/#advanced-routing).
+     * Learn more about customizing the request pipeline in the [advanced routing guide](https://v7.docs.astro.build/en/guides/routing/#advanced-routing).
      */
     fetchFile?: string | null;
     /**
@@ -1360,10 +1360,52 @@ export interface AstroUserConfig<TLocales extends Locales = never, TDriver exten
      * @version 7.0.0
      * @description
      *
-     * Configures a custom logger by defining its entrypoint and, optionally, providing a serializable configuration:
+     * Configures how Astro logs messages during development and production.
+     *
+     * By default, Astro uses a built-in logger that outputs human-friendly logs to the console. You can customize this behavior by providing [your own logger handler](https://v7.docs.astro.build/en/reference/logger-reference/#custom-loggers) or by using one of the [built-in log handlers](https://v7.docs.astro.build/en/reference/logger-reference/#built-in-loggers):
      *
      * ```js
      * // astro.config.mjs
+     * import { defineConfig, logHandlers } from 'astro/config';
+     *
+     * export default defineConfig({
+     *   logger: logHandlers.json({ level: 'info' })
+     * });
+     * ```
+     *
+     * See [the logger API reference](https://v7.docs.astro.build/en/reference/logger-reference/) for more information.
+     */
+    logger?: LoggerHandlerConfig;
+    /**
+     * @docs
+     * @name logger.entrypoint
+     * @type {string}
+     * @version 7.0.0
+     * @description
+     *
+     * The entrypoint of the log handler. This can be a path to a file in your project or an npm package:
+     *
+     * ```js title="astro.config.mjs"
+     * import { defineConfig } from 'astro/config';
+     *
+     * export default defineConfig({
+     *   logger: {
+     *     entrypoint: "@org/astro-logger",
+     *   }
+     * });
+     * ```
+     */
+    /**
+     * @docs
+     * @name logger.config
+     * @type {Record<string, unknown> | undefined}
+     * @version 7.0.0
+     * @default `{}`
+     * @description
+     *
+     * The configuration object for the log handler. The options depend on the configured logger.
+     *
+     * ```js title="astro.config.mjs"
      * import { defineConfig } from 'astro/config';
      *
      * export default defineConfig({
@@ -1375,10 +1417,7 @@ export interface AstroUserConfig<TLocales extends Locales = never, TDriver exten
      *   }
      * });
      * ```
-     *
-     * See [the logger API reference](https://docs.astro.build/en/reference/logger-reference/) for more information.
      */
-    logger?: LoggerHandlerConfig;
     /**
      * @docs
      * @kind heading
@@ -2129,8 +2168,24 @@ export interface AstroUserConfig<TLocales extends Locales = never, TDriver exten
          * @type {MarkdownProcessor}
          * @version 6.4.0
          * @description
-         * Configures the Markdown processor used to render `.md` files. Defaults to `unified()` from
-         * `@astrojs/markdown-remark` (the remark/rehype pipeline).
+         * Configures the Markdown processor used to render `.md` files. Defaults to `satteri()` from
+         * `@astrojs/markdown-satteri`, Astro's native Markdown pipeline.
+         *
+         * ```js
+         * // astro.config.mjs
+         * import { defineConfig } from 'astro/config';
+         * import { satteri } from '@astrojs/markdown-satteri';
+         *
+         * export default defineConfig({
+         *   markdown: {
+         *     processor: satteri({
+         *       features: { gfm: false },
+         *     }),
+         *   },
+         * });
+         * ```
+         *
+         * To keep the remark/rehype pipeline, install `@astrojs/markdown-remark` and pass `unified()`:
          *
          * ```js
          * // astro.config.mjs

package/dist/vite-plugin-hmr-reload/index.js

@@ -1,15 +1,17 @@
 import { isRunnableDevEnvironment } from "vite";
 import { VIRTUAL_PAGE_RESOLVED_MODULE_ID } from "../vite-plugin-pages/const.js";
+import { RESOLVED_MODULE_DEV_CSS_PREFIX } from "../vite-plugin-css/const.js";
 import { getDevCssModuleNameFromPageVirtualModuleName } from "../vite-plugin-css/util.js";
 import { isAstroServerEnvironment } from "../environments.js";
 const STYLE_EXT_REGEX = /\.(?:css|scss|sass|less|styl|pcss)$/i;
+const RAW_QUERY_REGEX = /(?:\?|&)raw(?:&|$)/;
+function hasStyleExtension(id) {
+  return STYLE_EXT_REGEX.test(id.split("?")[0]);
+}
 function isStyleModule(mod) {
-  if (mod.file && STYLE_EXT_REGEX.test(mod.file)) return true;
-  if (mod.id) {
-    const idPath = mod.id.split("?")[0];
-    if (STYLE_EXT_REGEX.test(idPath)) return true;
-  }
-  return false;
+  if (mod.id && RAW_QUERY_REGEX.test(mod.id) && hasStyleExtension(mod.id)) return false;
+  if (mod.file && hasStyleExtension(mod.file)) return true;
+  return mod.id ? hasStyleExtension(mod.id) : false;
 }
 function hmrReload() {
   return {
@@ -65,6 +67,17 @@ function hmrReload() {
           return [];
         }
         if (hasSkippedStyleModules) {
+          for (const [id, mod] of this.environment.moduleGraph.idToModuleMap) {
+            if (id.startsWith(RESOLVED_MODULE_DEV_CSS_PREFIX)) {
+              this.environment.moduleGraph.invalidateModule(mod, void 0, timestamp, true);
+              if (isRunnableDevEnvironment(this.environment)) {
+                const runnerMod = this.environment.runner.evaluatedModules.getModuleById(id);
+                if (runnerMod) {
+                  this.environment.runner.evaluatedModules.invalidateModule(runnerMod);
+                }
+              }
+            }
+          }
           return [];
         }
         if (modules.length > 0) {

package/dist/vite-plugin-html/transform/slots.js

@@ -10,7 +10,10 @@ const rehypeSlots = ({ s }) => {
         const end = node.position?.end.offset ?? 0;
         const first = node.children.at(0) ?? node;
         const last = node.children.at(-1) ?? node;
-        const text = file.value.slice(first.position?.start.offset ?? 0, last.position?.end.offset ?? 0).toString();
+        const text = file.value.slice(
+          first.position?.start.offset ?? 0,
+          last.position?.end.offset ?? 0
+        ).toString();
         s.overwrite(
           start,
           end,

package/dist/vite-plugin-pages/pages.d.ts

@@ -1,8 +1,19 @@
 import type { Plugin as VitePlugin } from 'vite';
 import type { RoutesList } from '../types/astro.js';
+import type { RouteData } from '../types/public/internal.js';
 export declare const VIRTUAL_PAGES_MODULE_ID = "virtual:astro:pages";
 interface PagesPluginOptions {
     routesList: RoutesList;
 }
+/**
+ * Filters routes for a specific build environment.
+ *
+ * Redirect target routes do not need special handling here: they already
+ * appear in the routes list with their own `prerender` flag and are
+ * included when it matches `isPrerender`. At SSR runtime, redirect
+ * responses are generated from route metadata alone (no component is
+ * loaded), so the target's component is never needed in the SSR page map.
+ */
+export declare function getRoutesForEnvironment(routes: RouteData[], isPrerender: boolean): Set<RouteData>;
 export declare function pluginPages({ routesList }: PagesPluginOptions): VitePlugin;
 export {};

package/dist/vite-plugin-pages/pages.js

@@ -11,9 +11,6 @@ function getRoutesForEnvironment(routes, isPrerender) {
     if (route.prerender === isPrerender) {
       result.add(route);
     }
-    if (route.redirectRoute) {
-      result.add(route.redirectRoute);
-    }
   }
   return result;
 }
@@ -75,5 +72,6 @@ export { pageMap };`;
 }
 export {
   VIRTUAL_PAGES_MODULE_ID,
+  getRoutesForEnvironment,
   pluginPages
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "7.0.0-beta.3",
+  "version": "7.0.0-beta.4",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -39,7 +39,6 @@
     "./astro-jsx": "./astro-jsx.d.ts",
     "./tsconfigs/*.json": "./tsconfigs/*",
     "./tsconfigs/*": "./tsconfigs/*.json",
-    "./jsx/rehype.js": "./dist/jsx/rehype.js",
     "./jsx-runtime": {
       "types": "./jsx-runtime.d.ts",
       "default": "./dist/jsx-runtime/index.js"
@@ -167,12 +166,20 @@
     "yargs-parser": "^22.0.0",
     "zod": "^4.3.6",
     "@astrojs/internal-helpers": "0.10.0",
-    "@astrojs/markdown-remark": "7.2.0",
-    "@astrojs/telemetry": "3.3.2"
+    "@astrojs/telemetry": "3.3.2",
+    "@astrojs/markdown-satteri": "0.3.1-beta.1"
   },
   "optionalDependencies": {
     "sharp": "^0.34.0"
   },
+  "peerDependencies": {
+    "@astrojs/markdown-remark": "7.2.0"
+  },
+  "peerDependenciesMeta": {
+    "@astrojs/markdown-remark": {
+      "optional": true
+    }
+  },
   "devDependencies": {
     "@playwright/test": "1.58.2",
     "@types/aria-query": "^5.0.4",
@@ -189,8 +196,6 @@
     "expect-type": "^1.3.0",
     "fs-fixture": "^2.13.0",
     "hono": "^4.12.14",
-    "mdast-util-mdx": "^3.0.0",
-    "mdast-util-mdx-jsx": "^3.2.0",
     "node-mocks-http": "^1.17.2",
     "parse-srcset": "^1.0.2",
     "rehype-autolink-headings": "^7.1.0",
@@ -203,7 +208,8 @@
     "unified": "^11.0.5",
     "vitest": "^4.1.0",
     "@astrojs/check": "0.9.9",
-    "astro-scripts": "0.0.14"
+    "astro-scripts": "0.0.14",
+    "@astrojs/markdown-remark": "7.2.0"
   },
   "engines": {
     "node": ">=22.12.0",

package/dist/jsx/rehype.d.ts

@@ -1,5 +0,0 @@
-import type { RehypePlugin } from '@astrojs/internal-helpers/markdown';
-import type { VFile } from 'vfile';
-import type { PluginMetadata } from '../vite-plugin-astro/types.js';
-export declare const rehypeAnalyzeAstroMetadata: RehypePlugin;
-export declare function getAstroMetadata(file: VFile): PluginMetadata["astro"] | undefined;

package/dist/jsx/rehype.js

@@ -1,241 +0,0 @@
-import { visit } from "unist-util-visit";
-import { AstroError } from "../core/errors/errors.js";
-import { AstroErrorData } from "../core/errors/index.js";
-import { resolvePath } from "../core/viteUtils.js";
-import { createDefaultAstroMetadata } from "../vite-plugin-astro/metadata.js";
-const ClientOnlyPlaceholder = "astro-client-only";
-const rehypeAnalyzeAstroMetadata = () => {
-  return (tree, file) => {
-    const metadata = createDefaultAstroMetadata();
-    const imports = parseImports(tree.children);
-    visit(tree, (node) => {
-      if (node.type !== "mdxJsxFlowElement" && node.type !== "mdxJsxTextElement") return;
-      const tagName = node.name;
-      if (!tagName || !isComponent(tagName) || !(hasClientDirective(node) || hasServerDeferDirective(node)))
-        return;
-      const matchedImport = findMatchingImport(tagName, imports);
-      if (!matchedImport) {
-        throw new AstroError({
-          ...AstroErrorData.NoMatchingImport,
-          message: AstroErrorData.NoMatchingImport.message(node.name)
-        });
-      }
-      if (matchedImport.path.endsWith(".astro")) {
-        const clientAttribute = node.attributes.find(
-          (attr) => attr.type === "mdxJsxAttribute" && attr.name.startsWith("client:")
-        );
-        if (clientAttribute) {
-          console.warn(
-            `You are attempting to render <${node.name} ${clientAttribute.name} />, but ${node.name} is an Astro component. Astro components do not render in the client and should not have a hydration directive. Please use a framework component for client rendering.`
-          );
-        }
-      }
-      const resolvedPath = resolvePath(matchedImport.path, file.path);
-      if (hasClientOnlyDirective(node)) {
-        metadata.clientOnlyComponents.push({
-          exportName: matchedImport.name,
-          localName: "",
-          specifier: tagName,
-          resolvedPath
-        });
-        addClientOnlyMetadata(node, matchedImport, resolvedPath);
-      } else if (hasClientDirective(node)) {
-        metadata.hydratedComponents.push({
-          exportName: "*",
-          localName: "",
-          specifier: tagName,
-          resolvedPath
-        });
-        addClientMetadata(node, matchedImport, resolvedPath);
-      } else if (hasServerDeferDirective(node)) {
-        metadata.serverComponents.push({
-          exportName: matchedImport.name,
-          localName: tagName,
-          specifier: matchedImport.path,
-          resolvedPath
-        });
-        addServerDeferMetadata(node, matchedImport, resolvedPath);
-      }
-    });
-    file.data.__astroMetadata = metadata;
-  };
-};
-function getAstroMetadata(file) {
-  return file.data.__astroMetadata;
-}
-function parseImports(children) {
-  const imports = /* @__PURE__ */ new Map();
-  for (const child of children) {
-    if (child.type !== "mdxjsEsm") continue;
-    const body = child.data?.estree?.body;
-    if (!body) continue;
-    for (const ast of body) {
-      if (ast.type !== "ImportDeclaration") continue;
-      const source = ast.source.value;
-      const specs = ast.specifiers.map((spec) => {
-        switch (spec.type) {
-          case "ImportDefaultSpecifier":
-            return { local: spec.local.name, imported: "default" };
-          case "ImportNamespaceSpecifier":
-            return { local: spec.local.name, imported: "*" };
-          case "ImportSpecifier": {
-            return {
-              local: spec.local.name,
-              imported: spec.imported.type === "Identifier" ? spec.imported.name : String(spec.imported.value)
-            };
-          }
-          default:
-            throw new Error("Unknown import declaration specifier: " + spec);
-        }
-      });
-      let specSet = imports.get(source);
-      if (!specSet) {
-        specSet = /* @__PURE__ */ new Set();
-        imports.set(source, specSet);
-      }
-      for (const spec of specs) {
-        specSet.add(spec);
-      }
-    }
-  }
-  return imports;
-}
-function isComponent(tagName) {
-  return tagName[0] && tagName[0].toLowerCase() !== tagName[0] || tagName.includes(".") || /[^a-zA-Z]/.test(tagName[0]);
-}
-function hasClientDirective(node) {
-  return node.attributes.some(
-    (attr) => attr.type === "mdxJsxAttribute" && attr.name.startsWith("client:")
-  );
-}
-function hasServerDeferDirective(node) {
-  return node.attributes.some(
-    (attr) => attr.type === "mdxJsxAttribute" && attr.name === "server:defer"
-  );
-}
-function hasClientOnlyDirective(node) {
-  return node.attributes.some(
-    (attr) => attr.type === "mdxJsxAttribute" && attr.name === "client:only"
-  );
-}
-function findMatchingImport(tagName, imports) {
-  const tagSpecifier = tagName.split(".")[0];
-  for (const [source, specs] of imports) {
-    for (const { imported, local } of specs) {
-      if (local === tagSpecifier) {
-        if (tagSpecifier !== tagName) {
-          switch (imported) {
-            // Namespace import: "<buttons.Foo.Bar />" => name: "Foo.Bar"
-            case "*": {
-              const accessPath = tagName.slice(tagSpecifier.length + 1);
-              return { name: accessPath, path: source };
-            }
-            // Default import: "<buttons.Foo.Bar />" => name: "default.Foo.Bar"
-            case "default": {
-              const accessPath = tagName.slice(tagSpecifier.length + 1);
-              return { name: `default.${accessPath}`, path: source };
-            }
-            // Named import: "<buttons.Foo.Bar />" => name: "buttons.Foo.Bar"
-            default: {
-              return { name: tagName, path: source };
-            }
-          }
-        }
-        return { name: imported, path: source };
-      }
-    }
-  }
-}
-function addClientMetadata(node, meta, resolvedPath) {
-  const attributeNames = node.attributes.map((attr) => attr.type === "mdxJsxAttribute" ? attr.name : null).filter(Boolean);
-  if (!attributeNames.includes("client:component-path")) {
-    node.attributes.push({
-      type: "mdxJsxAttribute",
-      name: "client:component-path",
-      value: resolvedPath
-    });
-  }
-  if (!attributeNames.includes("client:component-export")) {
-    if (meta.name === "*") {
-      meta.name = node.name.split(".").slice(1).join(".");
-    }
-    node.attributes.push({
-      type: "mdxJsxAttribute",
-      name: "client:component-export",
-      value: meta.name
-    });
-  }
-  if (!attributeNames.includes("client:component-hydration")) {
-    node.attributes.push({
-      type: "mdxJsxAttribute",
-      name: "client:component-hydration",
-      value: null
-    });
-  }
-}
-function addClientOnlyMetadata(node, meta, resolvedPath) {
-  const attributeNames = node.attributes.map((attr) => attr.type === "mdxJsxAttribute" ? attr.name : null).filter(Boolean);
-  if (!attributeNames.includes("client:display-name")) {
-    node.attributes.push({
-      type: "mdxJsxAttribute",
-      name: "client:display-name",
-      value: node.name
-    });
-  }
-  if (!attributeNames.includes("client:component-path")) {
-    node.attributes.push({
-      type: "mdxJsxAttribute",
-      name: "client:component-path",
-      value: resolvedPath
-    });
-  }
-  if (!attributeNames.includes("client:component-export")) {
-    if (meta.name === "*") {
-      meta.name = node.name.split(".").slice(1).join(".");
-    }
-    node.attributes.push({
-      type: "mdxJsxAttribute",
-      name: "client:component-export",
-      value: meta.name
-    });
-  }
-  if (!attributeNames.includes("client:component-hydration")) {
-    node.attributes.push({
-      type: "mdxJsxAttribute",
-      name: "client:component-hydration",
-      value: null
-    });
-  }
-  node.name = ClientOnlyPlaceholder;
-}
-function addServerDeferMetadata(node, meta, resolvedPath) {
-  const attributeNames = node.attributes.map((attr) => attr.type === "mdxJsxAttribute" ? attr.name : null).filter(Boolean);
-  if (!attributeNames.includes("server:component-directive")) {
-    node.attributes.push({
-      type: "mdxJsxAttribute",
-      name: "server:component-directive",
-      value: "server:defer"
-    });
-  }
-  if (!attributeNames.includes("server:component-path")) {
-    node.attributes.push({
-      type: "mdxJsxAttribute",
-      name: "server:component-path",
-      value: resolvedPath
-    });
-  }
-  if (!attributeNames.includes("server:component-export")) {
-    if (meta.name === "*") {
-      meta.name = node.name.split(".").slice(1).join(".");
-    }
-    node.attributes.push({
-      type: "mdxJsxAttribute",
-      name: "server:component-export",
-      value: meta.name
-    });
-  }
-}
-export {
-  getAstroMetadata,
-  rehypeAnalyzeAstroMetadata
-};