astro 7.0.0-beta.4 → 7.0.0-beta.6

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/dist/vite-plugin-head/index.js

@@ -1,9 +1,9 @@
-import { hasHeadPropagationCall } from "../core/head-propagation/hint.js";
 import {
   buildImporterGraphFromModuleInfo,
   computeInTreeAncestors
 } from "../core/head-propagation/graph.js";
 import { getTopLevelPageModuleInfos } from "../core/build/graph.js";
+import { PROPAGATED_ASSET_FLAG } from "../content/consts.js";
 import { getAstroMetadata } from "../vite-plugin-astro/index.js";
 import { ASTRO_VITE_ENVIRONMENT_NAMES } from "../core/constants.js";
 const VIRTUAL_COMPONENT_METADATA = "virtual:astro:component-metadata";
@@ -127,12 +127,12 @@ function configHeadVitePlugin() {
         });
       }
     },
-    transform(source, id) {
+    transform(_source, id) {
       let info = this.getModuleInfo(id);
       if (info && getAstroMetadata(info)?.containsHead) {
         propagateMetadata.call(this, id, "containsHead", true);
       }
-      if (hasHeadPropagationCall(source)) {
+      if (id.includes(PROPAGATED_ASSET_FLAG)) {
         propagateMetadata.call(this, id, "propagation", "in-tree");
       }
       invalidateComponentMetadataModule();
@@ -140,17 +140,11 @@ function configHeadVitePlugin() {
   };
 }
 function astroHeadBuildPlugin(internals) {
-  const headPropagationModuleIds = /* @__PURE__ */ new Set();
   return {
     name: "astro:head-metadata-build",
     applyToEnvironment(environment) {
       return environment.name === ASTRO_VITE_ENVIRONMENT_NAMES.ssr || environment.name === ASTRO_VITE_ENVIRONMENT_NAMES.prerender;
     },
-    transform(source, id) {
-      if (hasHeadPropagationCall(source)) {
-        headPropagationModuleIds.add(id);
-      }
-    },
     generateBundle(_opts, bundle) {
       const map = internals.componentMetadata;
       const moduleIds = /* @__PURE__ */ new Set();
@@ -167,7 +161,7 @@ function astroHeadBuildPlugin(internals) {
       }
       for (const [, output] of Object.entries(bundle)) {
         if (output.type !== "chunk") continue;
-        for (const [id, mod] of Object.entries(output.modules)) {
+        for (const [id] of Object.entries(output.modules)) {
           moduleIds.add(id);
           const modinfo = this.getModuleInfo(id);
           if (modinfo) {
@@ -182,7 +176,7 @@ function astroHeadBuildPlugin(internals) {
               selfPropagationSeeds.add(id);
             }
           }
-          if (mod.code && hasHeadPropagationCall(mod.code) || headPropagationModuleIds.has(id)) {
+          if (id.includes(PROPAGATED_ASSET_FLAG)) {
             commentPropagationSeeds.add(id);
           }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "7.0.0-beta.4",
+  "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",
@@ -112,7 +112,7 @@
     "README.md"
   ],
   "dependencies": {
-    "@astrojs/compiler-rs": "^0.1.10",
+    "@astrojs/compiler-rs": "^0.2.2",
     "@capsizecss/unpack": "^4.0.0",
     "@clack/prompts": "^1.1.0",
     "@oslojs/encoding": "^1.1.0",
@@ -166,8 +166,8 @@
     "yargs-parser": "^22.0.0",
     "zod": "^4.3.6",
     "@astrojs/internal-helpers": "0.10.0",
-    "@astrojs/telemetry": "3.3.2",
-    "@astrojs/markdown-satteri": "0.3.1-beta.1"
+    "@astrojs/markdown-satteri": "0.3.1-beta.2",
+    "@astrojs/telemetry": "3.3.2"
   },
   "optionalDependencies": {
     "sharp": "^0.34.0"
@@ -208,8 +208,8 @@
     "unified": "^11.0.5",
     "vitest": "^4.1.0",
     "@astrojs/check": "0.9.9",
-    "astro-scripts": "0.0.14",
-    "@astrojs/markdown-remark": "7.2.0"
+    "@astrojs/markdown-remark": "7.2.0",
+    "astro-scripts": "0.0.14"
   },
   "engines": {
     "node": ">=22.12.0",

package/templates/content/module.mjs

@@ -1,4 +1,3 @@
-'use astro:head-inject';
 import {
 	createDeprecatedFunction,
 	createGetCollection,

package/dist/core/head-propagation/hint.d.ts

@@ -1,4 +0,0 @@
-/**
- * Returns true when source contains the `"use astro:head-inject"` directive.
- */
-export declare function hasHeadPropagationCall(source: string): boolean;

package/dist/core/head-propagation/hint.js

@@ -1,7 +0,0 @@
-const HEAD_PROPAGATION_HINT = '"use astro:head-inject"';
-function hasHeadPropagationCall(source) {
-  return source.includes(HEAD_PROPAGATION_HINT);
-}
-export {
-  hasHeadPropagationCall
-};