astro 7.0.0-beta.5 → 7.0.0-beta.6

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.5";
+  version = "7.0.0-beta.6";
 }
 export {
   BuildTimeAstroVersionProvider

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.5") {
+    if (previousAstroVersion && previousAstroVersion !== "7.0.0-beta.6") {
       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.5") {
-      this.#store.metaStore().set("astro-version", "7.0.0-beta.5");
+    if ("7.0.0-beta.6") {
+      this.#store.metaStore().set("astro-version", "7.0.0-beta.6");
     }
     if (currentConfigDigest) {
       this.#store.metaStore().set("content-config-digest", currentConfigDigest);

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

@@ -258,10 +258,7 @@ async function buildManifest(opts, internals, staticFiles, encodedKey) {
     allowedDomains: settings.config.security?.allowedDomains,
     key: encodedKey,
     sessionConfig: sessionConfigToManifest(settings.config.session),
-    cacheConfig: cacheConfigToManifest(
-      settings.config.experimental?.cache,
-      settings.config.experimental?.routeRules
-    ),
+    cacheConfig: cacheConfigToManifest(settings.config.cache, settings.config.routeRules),
     csp,
     image: {
       objectFit: settings.config.image.objectFit,

package/dist/core/build/vite-build-config.js

@@ -35,6 +35,12 @@ function createViteBuildConfig(opts) {
         ...viteConfig.build?.rolldownOptions,
         // Setting as `exports-only` allows us to safely delete inputs that are only used during prerendering
         preserveEntrySignatures: "exports-only",
+        checks: {
+          ...viteConfig.build?.rolldownOptions?.checks,
+          // Disable Rolldown's built-in plugin timing warnings. These fire by default
+          // and produce noisy warnings about slow plugins during normal builds.
+          pluginTimings: false
+        },
         ...legacyAdapter && settings.buildOutput === "server" ? { input: LEGACY_SSR_ENTRY_VIRTUAL_MODULE } : {},
         output: {
           hoistTransitiveImports: false,

package/dist/core/cache/config.d.ts

@@ -1,7 +1,7 @@
 import * as z from 'zod/v4';
 /**
- * Cache provider configuration (experimental.cache).
- * Provider only - routes are configured via experimental.routeRules.
+ * Cache provider configuration (`cache`).
+ * Provider only - routes are configured via `routeRules`.
  */
 export declare const CacheSchema: z.ZodObject<{
     provider: z.ZodOptional<z.ZodObject<{
@@ -11,14 +11,15 @@ export declare const CacheSchema: z.ZodObject<{
     }, z.core.$strip>>;
 }, z.core.$strip>;
 /**
- * Route rules configuration (experimental.routeRules).
- * Maps glob patterns to route rules.
+ * Route rules configuration (`routeRules`).
+ * Maps route patterns to route rules. Patterns use the same `[param]` and
+ * `[...rest]` syntax as file-based routing; glob wildcards (`*`) are not supported.
  *
  * Example:
  * ```ts
  * routeRules: {
- *   '/api/*': { swr: 600 },
- *   '/products/*': { maxAge: 3600, tags: ['products'] },
+ *   '/api/[...path]': { swr: 600 },
+ *   '/products/[...slug]': { maxAge: 3600, tags: ['products'] },
  * }
  * ```
  */

package/dist/core/cache/runtime/noop.js

@@ -26,7 +26,7 @@ class DisabledAstroCache {
       hasWarned = true;
       this.#logger?.warn(
         "cache",
-        "`cache.set()` was called but caching is not enabled. Configure a cache provider in your Astro config under `experimental.cache` to enable caching."
+        "`cache.set()` was called but caching is not enabled. Configure a cache provider in your Astro config under `cache` to enable caching."
       );
     }
   }

package/dist/core/cache/utils.d.ts

@@ -10,7 +10,7 @@ export declare function normalizeRouteRuleCacheOptions(rule: {
     tags?: string[];
 } | undefined): CacheOptions | undefined;
 /**
- * Extract cache routes from experimental.routeRules config.
+ * Extract cache routes from the `routeRules` config.
  */
-export declare function extractCacheRoutesFromRouteRules(routeRules: AstroConfig['experimental']['routeRules']): Record<string, CacheOptions> | undefined;
-export declare function cacheConfigToManifest(cacheConfig: AstroConfig['experimental']['cache'], routeRulesConfig: AstroConfig['experimental']['routeRules']): SSRManifestCache | undefined;
+export declare function extractCacheRoutesFromRouteRules(routeRules: AstroConfig['routeRules']): Record<string, CacheOptions> | undefined;
+export declare function cacheConfigToManifest(cacheConfig: AstroConfig['cache'], routeRulesConfig: AstroConfig['routeRules']): SSRManifestCache | undefined;

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

@@ -7,7 +7,7 @@ const RESOLVED_VIRTUAL_CACHE_PROVIDER_ID = "\0" + VIRTUAL_CACHE_PROVIDER_ID;
 function vitePluginCacheProvider({
   settings
 }) {
-  const providerConfig = settings.config.experimental?.cache?.provider;
+  const providerConfig = settings.config.cache?.provider;
   if (!providerConfig) {
     return;
   }

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

@@ -504,6 +504,18 @@ export declare const AstroConfigSchema: z.ZodObject<{
         unicodeRange: z.ZodOptional<z.ZodTuple<[z.ZodString], z.ZodString>>;
         options: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodAny>>;
     }, z.core.$strict>>>;
+    cache: z.ZodOptional<z.ZodObject<{
+        provider: z.ZodOptional<z.ZodObject<{
+            config: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodAny>>;
+            entrypoint: z.ZodUnion<readonly [z.ZodString, z.ZodCustom<URL, URL>]>;
+            name: z.ZodOptional<z.ZodString>;
+        }, z.core.$strip>>;
+    }, z.core.$strip>>;
+    routeRules: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodObject<{
+        maxAge: z.ZodOptional<z.ZodNumber>;
+        swr: z.ZodOptional<z.ZodNumber>;
+        tags: z.ZodOptional<z.ZodArray<z.ZodString>>;
+    }, z.core.$strip>>>;
     experimental: z.ZodPrefault<z.ZodObject<{
         clientPrerender: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
         contentIntellisense: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
@@ -512,18 +524,6 @@ export declare const AstroConfigSchema: z.ZodObject<{
             name: z.ZodString;
             optimize: z.ZodCustom<(contents: string) => string | Promise<string>, (contents: string) => string | Promise<string>>;
         }, z.core.$strip>>;
-        cache: z.ZodOptional<z.ZodObject<{
-            provider: z.ZodOptional<z.ZodObject<{
-                config: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodAny>>;
-                entrypoint: z.ZodUnion<readonly [z.ZodString, z.ZodCustom<URL, URL>]>;
-                name: z.ZodOptional<z.ZodString>;
-            }, z.core.$strip>>;
-        }, z.core.$strip>>;
-        routeRules: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodObject<{
-            maxAge: z.ZodOptional<z.ZodNumber>;
-            swr: z.ZodOptional<z.ZodNumber>;
-            tags: z.ZodOptional<z.ZodArray<z.ZodString>>;
-        }, z.core.$strip>>>;
     }, z.core.$strict>>;
     legacy: z.ZodPrefault<z.ZodObject<{
         collectionsBackwardsCompat: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;

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

@@ -327,13 +327,13 @@ const AstroConfigSchema = z.object({
     config: z.record(z.string(), z.any()).optional()
   }).optional(),
   fonts: z.array(FontFamilySchema).optional(),
+  cache: CacheSchema.optional(),
+  routeRules: RouteRulesSchema.optional(),
   experimental: z.strictObject({
     clientPrerender: z.boolean().optional().default(ASTRO_CONFIG_DEFAULTS.experimental.clientPrerender),
     contentIntellisense: z.boolean().optional().default(ASTRO_CONFIG_DEFAULTS.experimental.contentIntellisense),
     chromeDevtoolsWorkspace: z.boolean().optional().default(ASTRO_CONFIG_DEFAULTS.experimental.chromeDevtoolsWorkspace),
-    svgOptimizer: SvgOptimizerSchema.optional(),
-    cache: CacheSchema.optional(),
-    routeRules: RouteRulesSchema.optional()
+    svgOptimizer: SvgOptimizerSchema.optional()
   }).prefault({}),
   legacy: z.object({
     collectionsBackwardsCompat: z.boolean().optional().default(false)

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

@@ -392,6 +392,18 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         unicodeRange: z.ZodOptional<z.ZodTuple<[z.ZodString], z.ZodString>>;
         options: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodAny>>;
     }, z.core.$strict>>>;
+    cache: z.ZodOptional<z.ZodObject<{
+        provider: z.ZodOptional<z.ZodObject<{
+            config: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodAny>>;
+            entrypoint: z.ZodUnion<readonly [z.ZodString, z.ZodCustom<URL, URL>]>;
+            name: z.ZodOptional<z.ZodString>;
+        }, z.core.$strip>>;
+    }, z.core.$strip>>;
+    routeRules: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodObject<{
+        maxAge: z.ZodOptional<z.ZodNumber>;
+        swr: z.ZodOptional<z.ZodNumber>;
+        tags: z.ZodOptional<z.ZodArray<z.ZodString>>;
+    }, z.core.$strip>>>;
     experimental: z.ZodPrefault<z.ZodObject<{
         clientPrerender: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
         contentIntellisense: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
@@ -400,18 +412,6 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
             name: z.ZodString;
             optimize: z.ZodCustom<(contents: string) => string | Promise<string>, (contents: string) => string | Promise<string>>;
         }, z.core.$strip>>;
-        cache: z.ZodOptional<z.ZodObject<{
-            provider: z.ZodOptional<z.ZodObject<{
-                config: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodAny>>;
-                entrypoint: z.ZodUnion<readonly [z.ZodString, z.ZodCustom<URL, URL>]>;
-                name: z.ZodOptional<z.ZodString>;
-            }, z.core.$strip>>;
-        }, z.core.$strip>>;
-        routeRules: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodObject<{
-            maxAge: z.ZodOptional<z.ZodNumber>;
-            swr: z.ZodOptional<z.ZodNumber>;
-            tags: z.ZodOptional<z.ZodArray<z.ZodString>>;
-        }, z.core.$strip>>>;
     }, z.core.$strict>>;
     legacy: z.ZodPrefault<z.ZodObject<{
         collectionsBackwardsCompat: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
@@ -590,18 +590,6 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
             name: string;
             optimize: (contents: string) => string | Promise<string>;
         } | undefined;
-        cache?: {
-            provider?: {
-                entrypoint: string | URL;
-                config?: Record<string, any> | undefined;
-                name?: string | undefined;
-            } | undefined;
-        } | undefined;
-        routeRules?: Record<string, {
-            maxAge?: number | undefined;
-            swr?: number | undefined;
-            tags?: string[] | undefined;
-        }> | undefined;
     };
     legacy: {
         collectionsBackwardsCompat: boolean;
@@ -696,6 +684,18 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         unicodeRange?: [string, ...string[]] | undefined;
         options?: Record<string, any> | undefined;
     }[] | undefined;
+    cache?: {
+        provider?: {
+            entrypoint: string | URL;
+            config?: Record<string, any> | undefined;
+            name?: string | undefined;
+        } | undefined;
+    } | undefined;
+    routeRules?: Record<string, {
+        maxAge?: number | undefined;
+        swr?: number | undefined;
+        tags?: string[] | undefined;
+    }> | undefined;
 }, {
     base: string;
     trailingSlash: "never" | "ignore" | "always";
@@ -840,18 +840,6 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
             name: string;
             optimize: (contents: string) => string | Promise<string>;
         } | undefined;
-        cache?: {
-            provider?: {
-                entrypoint: string | URL;
-                config?: Record<string, any> | undefined;
-                name?: string | undefined;
-            } | undefined;
-        } | undefined;
-        routeRules?: Record<string, {
-            maxAge?: number | undefined;
-            swr?: number | undefined;
-            tags?: string[] | undefined;
-        }> | undefined;
     };
     legacy: {
         collectionsBackwardsCompat: boolean;
@@ -946,4 +934,16 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         unicodeRange?: [string, ...string[]] | undefined;
         options?: Record<string, any> | undefined;
     }[] | undefined;
+    cache?: {
+        provider?: {
+            entrypoint: string | URL;
+            config?: Record<string, any> | undefined;
+            name?: string | undefined;
+        } | undefined;
+    } | undefined;
+    routeRules?: Record<string, {
+        maxAge?: number | undefined;
+        swr?: number | undefined;
+        tags?: string[] | undefined;
+    }> | undefined;
 }>>;

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "7.0.0-beta.5";
+const ASTRO_VERSION = "7.0.0-beta.6";
 const ASTRO_GENERATOR = `Astro v${ASTRO_VERSION}`;
 const ASTRO_ERROR_HEADER = "X-Astro-Error";
 const DEFAULT_404_COMPONENT = "astro-default-404.astro";

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.5";
+  const currentVersion = "7.0.0-beta.6";
   const isPrerelease = currentVersion.includes("-");
   if (!isPrerelease) {
     try {

package/dist/core/errors/errors-data.js

@@ -793,8 +793,8 @@ const CacheProviderNotFound = {
 const CacheNotEnabled = {
   name: "CacheNotEnabled",
   title: "Cache is not enabled.",
-  message: "`Astro.cache` is not available because the cache feature is not enabled. To use caching, configure a cache provider in your Astro config under `experimental.cache`.",
-  hint: 'Use an adapter that provides a default cache provider, or set one explicitly: `experimental: { cache: { provider: "..." } }`. See https://docs.astro.build/en/reference/experimental-flags/route-caching/.'
+  message: "`Astro.cache` is not available because the cache feature is not enabled. To use caching, configure a cache provider in your Astro config under `cache`.",
+  hint: 'Use an adapter that provides a default cache provider, or set one explicitly: `cache: { provider: "..." }`. See https://docs.astro.build/en/guides/caching/.'
 };
 const CacheQueryConfigConflict = {
   name: "CacheQueryConfigConflict",

package/dist/core/messages/runtime.js

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

package/dist/manifest/serialized.js

@@ -83,7 +83,7 @@ function serializedManifestPlugin({
           const serialized = await createSerializedManifest(settings, await getEncodedKey());
           manifestData = JSON.stringify(serialized);
         }
-        const hasCacheConfig = !!settings.config.experimental?.cache?.provider;
+        const hasCacheConfig = !!settings.config.cache?.provider;
         const cacheProviderLine = hasCacheConfig ? `cacheProvider: () => import('${VIRTUAL_CACHE_PROVIDER_ID}'),` : "";
         const code = `
 					import { deserializeManifest as _deserializeManifest } from 'astro/app';
@@ -181,10 +181,7 @@ async function createSerializedManifest(settings, encodedKey) {
     // 1mb default
     key: encodedKey ?? await encodeKey(hasEnvironmentKey() ? await getEnvironmentKey() : await createKey()),
     sessionConfig: sessionConfigToManifest(settings.config.session),
-    cacheConfig: cacheConfigToManifest(
-      settings.config.experimental?.cache,
-      settings.config.experimental?.routeRules
-    ),
+    cacheConfig: cacheConfigToManifest(settings.config.cache, settings.config.routeRules),
     csp,
     image: {
       objectFit: settings.config.image.objectFit,

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

@@ -2752,6 +2752,85 @@ export interface AstroUserConfig<TLocales extends Locales = never, TDriver exten
     fonts?: [TFontProviders] extends [never] ? Array<FontFamily> : {
         [K in keyof TFontProviders]: FontFamily<TFontProviders[K]>;
     };
+    /**
+     * @docs
+     * @kind heading
+     * @name cache
+     * @type {object}
+     * @default `undefined`
+     * @version 7.0.0
+     * @description
+     *
+     * Enables route caching for SSR responses. Provides a platform-agnostic API
+     * for caching rendered pages and API responses, with pluggable providers
+     * that adapters can configure automatically.
+     *
+     * ```js
+     * // astro.config.mjs
+     * import { memoryCache } from 'astro/config';
+     *
+     * {
+     *   cache: {
+     *     provider: memoryCache(),
+     *   },
+     *   routeRules: {
+     *     '/blog/[...path]': { maxAge: 300, swr: 60 },
+     *   },
+     * }
+     * ```
+     *
+     * Use `Astro.cache.set()` in routes and `context.cache.set()` in middleware
+     * or API routes to control caching per-request.
+     */
+    cache?: {
+        /**
+         * @docs
+         * @name cache.provider
+         * @type {CacheProviderConfig}
+         * @version 7.0.0
+         * @description
+         *
+         * A provider that controls how responses are cached.
+         *
+         * Use the provider's config function to get type-safe configuration:
+         *
+         * ```js
+         * import { defineConfig, memoryCache } from 'astro/config';
+         *
+         * export default defineConfig({
+         *   cache: { provider: memoryCache() },
+         * });
+         * ```
+         */
+        provider?: CacheProviderConfig;
+    };
+    /**
+     * @docs
+     * @kind heading
+     * @name routeRules
+     * @type {Record<string, RouteRule>}
+     * @default `undefined`
+     * @version 7.0.0
+     * @description
+     *
+     * Route patterns mapped to cache rules.
+     * Uses the same `[param]` and `[...rest]` syntax as [file-based routing](/en/guides/routing/#route-priority-order).
+     * Use a `[...rest]` parameter to match a group of routes:
+     *
+     * ```js
+     * // astro.config.mjs
+     * import { memoryCache } from 'astro/config';
+     *
+     * {
+     *   cache: { provider: memoryCache() },
+     *   routeRules: {
+     *     '/api/[...path]': { swr: 600 },
+     *     '/products/[...slug]': { maxAge: 3600, tags: ['products'] },
+     *   },
+     * }
+     * ```
+     */
+    routeRules?: RouteRules;
     /**
      *
      * @kind heading
@@ -2895,83 +2974,6 @@ export interface AstroUserConfig<TLocales extends Locales = never, TDriver exten
          * See the [experimental SVG optimization docs](https://docs.astro.build/en/reference/experimental-flags/svg-optimization/) for more information.
          */
         svgOptimizer?: SvgOptimizer;
-        /**
-         * @name experimental.cache
-         * @type {object}
-         * @default `undefined`
-         * @description
-         *
-         * Enables route caching for SSR responses. Provides a platform-agnostic API
-         * for caching rendered pages and API responses, with pluggable providers
-         * that adapters can configure automatically.
-         *
-         * ```js
-         * // astro.config.mjs
-         * import { memoryCache } from 'astro/config';
-         *
-         * {
-         *   experimental: {
-         *     cache: {
-         *       provider: memoryCache(),
-         *     },
-         *     routeRules: {
-         *       '/blog/[...path]': { maxAge: 300, swr: 60 },
-         *     },
-         *   },
-         * }
-         * ```
-         *
-         * Use `Astro.cache.set()` in routes and `context.cache.set()` in middleware
-         * or API routes to control caching per-request.
-         */
-        cache?: {
-            /**
-             * @name experimental.cache.provider
-             * @type {import('../../core/cache/types.js').CacheProviderConfig}
-             * @description
-             *
-             * The cache provider. Adapters typically set a default, but you can
-             * override it with your own.
-             *
-             * Use the provider's config function to get type-safe configuration:
-             *
-             * ```js
-             * import { memoryCache } from 'astro/config';
-             *
-             * export default defineConfig({
-             *   experimental: {
-             *     cache: { provider: memoryCache() },
-             *   },
-             * });
-             * ```
-             */
-            provider?: CacheProviderConfig;
-        };
-        /**
-         * @name experimental.routeRules
-         * @type {Record<string, RouteRule>}
-         * @default `undefined`
-         * @description
-         *
-         * Route patterns mapped to cache rules.
-         * Uses the same `[param]` and `[...rest]` syntax as file-based routing.
-         *
-         * ```js
-         * // astro.config.mjs
-         * import { memoryCache } from 'astro/config';
-         *
-         * {
-         *   experimental: {
-         *     cache: { provider: memoryCache() },
-         *     routeRules: {
-         *       '/api/*': { swr: 600 },
-         *       '/products/*': { maxAge: 3600, tags: ['products'] },
-         *     },
-         *   },
-         * }
-         * ```
-         */
-        routeRules?: RouteRules;
     };
 }
 /**

package/dist/vite-plugin-config-alias/index.d.ts

@@ -1,6 +1,6 @@
 import { type Plugin as VitePlugin } from 'vite';
 import type { AstroSettings } from '../types/astro.js';
-/** Returns a Vite plugin used to alias paths from tsconfig.json and jsconfig.json. */
+/** Returns Vite plugins used to alias paths from tsconfig.json and jsconfig.json. */
 export default function configAliasVitePlugin({ settings, }: {
     settings: AstroSettings;
-}): VitePlugin | null;
+}): VitePlugin[] | null;

package/dist/vite-plugin-config-alias/index.js

@@ -31,81 +31,86 @@ const getConfigAlias = (settings) => {
   }
   return aliases;
 };
-const getViteResolveAlias = (settings) => {
-  const { tsConfig, tsConfigPath } = settings;
-  if (!tsConfig || !tsConfigPath || !tsConfig.compilerOptions) return [];
-  const { baseUrl, paths } = tsConfig.compilerOptions;
-  const effectiveBaseUrl = baseUrl ?? (paths ? "." : void 0);
-  if (!effectiveBaseUrl) return [];
-  const resolvedBaseUrl = path.resolve(path.dirname(tsConfigPath), effectiveBaseUrl);
-  const aliases = [];
-  if (paths) {
-    for (const [aliasPattern, values] of Object.entries(paths)) {
-      const resolvedValues = values.map((v) => path.resolve(resolvedBaseUrl, v));
-      const customResolver = (id) => {
-        for (const resolvedValue of resolvedValues) {
-          const resolved = resolvedValue.replace("*", id);
-          const stats = fs.statSync(resolved, { throwIfNoEntry: false });
-          if (stats && stats.isFile()) {
-            return normalizePath(resolved);
-          }
-        }
-        return null;
-      };
-      aliases.push({
-        // Build regex from alias pattern (e.g., '@styles/*' -> /^@styles\/(.+)$/)
-        // First, escape special regex chars. Then replace * with a capture group (.+)
-        find: new RegExp(
-          `^${aliasPattern.replace(/[\\^$+?.()|[\]{}]/g, "\\$&").replace(/\*/g, "(.+)")}$`
-        ),
-        replacement: aliasPattern.includes("*") ? "$1" : aliasPattern,
-        customResolver
-      });
+function resolveWithAlias(id, configAlias) {
+  for (const alias of configAlias) {
+    if (alias.find.test(id)) {
+      const updatedId = id.replace(alias.find, alias.replacement);
+      const stats = fs.statSync(updatedId, { throwIfNoEntry: false });
+      if (stats && stats.isFile()) {
+        return normalizePath(updatedId);
+      }
     }
   }
-  return aliases;
-};
+  return null;
+}
+const cssImportRE = /@import\s+(?:url\(\s*)?['"]([^'"]+)['"]\s*\)?/g;
 function configAliasVitePlugin({
   settings
 }) {
   const configAlias = getConfigAlias(settings);
   if (!configAlias) return null;
-  const plugin = {
-    name: "astro:tsconfig-alias",
-    // use post to only resolve ids that all other plugins before it can't
-    enforce: "post",
-    config() {
-      return {
-        resolve: {
-          alias: getViteResolveAlias(settings)
+  return [
+    // Pre-plugin: rewrite CSS @import aliases to absolute paths before Vite's CSS plugin.
+    // Vite's internal CSS @import resolver (postcss-import) uses a mini plugin container
+    // that doesn't include user resolveId hooks, so we must rewrite aliases in a transform
+    // hook that runs before Vite's CSS processing.
+    {
+      name: "astro:tsconfig-alias-css",
+      enforce: "pre",
+      transform: {
+        filter: {
+          id: {
+            include: /\.css$/
+          }
+        },
+        handler(code) {
+          if (!code.includes("@import")) return;
+          let hasReplacement = false;
+          const result = code.replace(cssImportRE, (match, importId) => {
+            if (!importId) return match;
+            const resolved = resolveWithAlias(importId, configAlias);
+            if (resolved) {
+              hasReplacement = true;
+              return match.replace(importId, resolved);
+            }
+            return match;
+          });
+          if (hasReplacement) {
+            return { code: result, map: null };
+          }
         }
-      };
+      }
     },
-    resolveId: {
-      filter: {
-        id: {
-          include: configAlias.map((alias) => alias.find),
-          exclude: /(?:\0|^virtual:|^astro:)/
-        }
-      },
-      async handler(id, importer, options) {
-        for (const alias of configAlias) {
-          if (alias.find.test(id)) {
-            const updatedId = id.replace(alias.find, alias.replacement);
-            if (updatedId.includes("*")) {
-              return updatedId;
+    // Post-plugin: resolve JS/TS imports using tsconfig path aliases via resolveId.
+    {
+      name: "astro:tsconfig-alias",
+      // use post to only resolve ids that all other plugins before it can't
+      enforce: "post",
+      resolveId: {
+        filter: {
+          id: {
+            include: configAlias.map((alias) => alias.find),
+            exclude: /(?:\0|^virtual:|^astro:)/
+          }
+        },
+        async handler(id, importer, options) {
+          for (const alias of configAlias) {
+            if (alias.find.test(id)) {
+              const updatedId = id.replace(alias.find, alias.replacement);
+              if (updatedId.includes("*")) {
+                return updatedId;
+              }
+              const resolved = await this.resolve(updatedId, importer, {
+                skipSelf: true,
+                ...options
+              });
+              if (resolved) return resolved;
             }
-            const resolved = await this.resolve(updatedId, importer, {
-              skipSelf: true,
-              ...options
-            });
-            if (resolved) return resolved;
           }
         }
       }
     }
-  };
-  return plugin;
+  ];
 }
 export {
   configAliasVitePlugin as default

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "7.0.0-beta.5",
+  "version": "7.0.0-beta.6",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -166,7 +166,7 @@
     "yargs-parser": "^22.0.0",
     "zod": "^4.3.6",
     "@astrojs/internal-helpers": "0.10.0",
-    "@astrojs/markdown-satteri": "0.3.1-beta.1",
+    "@astrojs/markdown-satteri": "0.3.1-beta.2",
     "@astrojs/telemetry": "3.3.2"
   },
   "optionalDependencies": {