astro 7.0.6 → 7.0.7

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

package/dist/content/vite-plugin-content-assets.d.ts

@@ -3,8 +3,12 @@ import { type Plugin } from 'vite';
 import type { BuildInternals } from '../core/build/internal.js';
 import type { ExtractedChunk } from '../core/build/static-build.js';
 import type { AstroSettings } from '../types/astro.js';
-export declare function astroContentAssetPropagationPlugin({ settings, }: {
+export declare function astroContentAssetPropagationPlugin({ settings, cssContentCache, }: {
     settings: AstroSettings;
+    /** Shared cache of CSS content populated by the dev-css plugin's transform hook.
+     *  Used to retrieve already-processed CSS for CSS modules without re-importing
+     *  via `?inline`, which would produce different scoped-name hashes with Lightning CSS. */
+    cssContentCache?: Map<string, string>;
 }): Plugin;
 /**
  * Post-build hook that injects propagated styles into content collection chunks.

package/dist/content/vite-plugin-content-assets.js

@@ -19,7 +19,8 @@ import { joinPaths, prependForwardSlash, slash } from "@astrojs/internal-helpers
 import { ASTRO_VITE_ENVIRONMENT_NAMES } from "../core/constants.js";
 import { isAstroServerEnvironment } from "../environments.js";
 function astroContentAssetPropagationPlugin({
-  settings
+  settings,
+  cssContentCache
 }) {
   let environment = void 0;
   return {
@@ -84,7 +85,7 @@ function astroContentAssetPropagationPlugin({
               styles,
               urls,
               crawledFiles: styleCrawledFiles
-            } = await getStylesForURL(basePath, environment);
+            } = await getStylesForURL(basePath, environment, cssContentCache);
             for (const file of styleCrawledFiles) {
               if (!file.includes("node_modules")) {
                 this.addWatchFile(file);
@@ -113,7 +114,7 @@ function astroContentAssetPropagationPlugin({
   };
 }
 const INLINE_QUERY_REGEX = /(?:\?|&)inline(?:$|&)/;
-async function getStylesForURL(filePath, environment) {
+async function getStylesForURL(filePath, environment, cssContentCache) {
   const importedCssUrls = /* @__PURE__ */ new Set();
   const importedStylesMap = /* @__PURE__ */ new Map();
   const crawledFiles = /* @__PURE__ */ new Set();
@@ -125,6 +126,8 @@ async function getStylesForURL(filePath, environment) {
       let css = "";
       if (typeof importedModule.ssrModule?.default === "string") {
         css = importedModule.ssrModule.default;
+      } else if (importedModule.id && cssContentCache?.has(importedModule.id)) {
+        css = cssContentCache.get(importedModule.id);
       } else {
         let modId = importedModule.url;
         if (!INLINE_QUERY_REGEX.test(importedModule.url)) {

package/dist/core/build/plugins/plugin-scripts.d.ts

@@ -1,6 +1,16 @@
-import type { Plugin as VitePlugin } from 'vite';
+import type { BuildOptions, Plugin as VitePlugin, Rollup } from 'vite';
 import type { BuildInternals } from '../internal.js';
+type GetModuleInfo = (moduleId: string) => Rollup.ModuleInfo | null;
+export type ScriptChunkInfo = Pick<Rollup.OutputChunk, 'code' | 'facadeModuleId' | 'fileName' | 'imports' | 'dynamicImports' | 'moduleIds'>;
+export declare function chunkHasDynamicImports(output: Pick<ScriptChunkInfo, 'dynamicImports' | 'moduleIds'>, getModuleInfo: GetModuleInfo): boolean;
+export declare function shouldInlineScriptChunk(output: ScriptChunkInfo, { discoveredScripts, importedIds, assetInlineLimit, getModuleInfo, }: {
+    discoveredScripts: Set<string>;
+    importedIds: Set<string>;
+    assetInlineLimit: NonNullable<BuildOptions['assetsInlineLimit']>;
+    getModuleInfo: GetModuleInfo;
+}): boolean;
 /**
  * Inline scripts from Astro files directly into the HTML.
  */
 export declare function pluginScripts(internals: BuildInternals): VitePlugin;
+export {};

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

@@ -1,5 +1,18 @@
 import { shouldInlineAsset } from "./util.js";
 import { ASTRO_VITE_ENVIRONMENT_NAMES } from "../../constants.js";
+function chunkHasDynamicImports(output, getModuleInfo) {
+  return output.dynamicImports.length > 0 || output.moduleIds.some((id) => (getModuleInfo(id)?.dynamicallyImportedIds.length ?? 0) > 0);
+}
+function shouldInlineScriptChunk(output, {
+  discoveredScripts,
+  importedIds,
+  assetInlineLimit,
+  getModuleInfo
+}) {
+  const facadeModuleId = output.facadeModuleId;
+  if (facadeModuleId === null) return false;
+  return discoveredScripts.has(facadeModuleId) && !importedIds.has(output.fileName) && output.imports.length === 0 && !chunkHasDynamicImports(output, getModuleInfo) && shouldInlineAsset(output.code, output.fileName, assetInlineLimit);
+}
 function pluginScripts(internals) {
   let assetInlineLimit;
   return {
@@ -20,8 +33,14 @@ function pluginScripts(internals) {
           }
         }
       }
+      const getModuleInfo = this.getModuleInfo.bind(this);
       for (const output of outputs) {
-        if (output.type === "chunk" && output.facadeModuleId && internals.discoveredScripts.has(output.facadeModuleId) && !importedIds.has(output.fileName) && output.imports.length === 0 && output.dynamicImports.length === 0 && shouldInlineAsset(output.code, output.fileName, assetInlineLimit)) {
+        if (output.type === "chunk" && shouldInlineScriptChunk(output, {
+          discoveredScripts: internals.discoveredScripts,
+          importedIds,
+          assetInlineLimit,
+          getModuleInfo
+        })) {
           internals.inlinedScripts.set(output.facadeModuleId, output.code.trim());
           delete bundle[output.fileName];
         }
@@ -30,5 +49,7 @@ function pluginScripts(internals) {
   };
 }
 export {
-  pluginScripts
+  chunkHasDynamicImports,
+  pluginScripts,
+  shouldInlineScriptChunk
 };

package/dist/core/build/runtime.d.ts

@@ -21,6 +21,11 @@ export declare function cssOrder(a: OrderInfo, b: OrderInfo): 1 | -1;
 /**
  * Merges inline CSS into as few stylesheets as possible,
  * preserving ordering when there are non-inlined in between.
+ *
+ * CSS chunks containing `@import` are never merged with other chunks.
+ * Per CSS spec, `@import` rules must appear at the top of a stylesheet
+ * or browsers silently ignore them. Keeping these chunks as separate
+ * `<style>` tags ensures the `@import` stays at the top of its own stylesheet.
  */
 export declare function mergeInlineCss(acc: Array<StylesheetAsset>, current: StylesheetAsset): Array<StylesheetAsset>;
 export {};

package/dist/core/build/runtime.js

@@ -31,9 +31,13 @@ function mergeInlineCss(acc, current) {
   const lastWasInline = lastAdded?.type === "inline";
   const currentIsInline = current?.type === "inline";
   if (lastWasInline && currentIsInline) {
-    const merged = { type: "inline", content: lastAdded.content + current.content };
-    acc[acc.length - 1] = merged;
-    return acc;
+    const currentHasImport = current.content.includes("@import");
+    const lastHasImport = lastAdded.content.includes("@import");
+    if (!currentHasImport && !lastHasImport) {
+      const merged = { type: "inline", content: lastAdded.content + current.content };
+      acc[acc.length - 1] = merged;
+      return acc;
+    }
   }
   acc.push(current);
   return acc;

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "7.0.6";
+const ASTRO_VERSION = "7.0.7";
 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/create-vite.js

@@ -108,6 +108,7 @@ async function createVite(commandConfig, { settings, logger, mode, command, fs =
     config: settings.config
   });
   const serverIslandsState = new ServerIslandsState();
+  const cssContentCache = /* @__PURE__ */ new Map();
   validateEnvPrefixAgainstSchema(settings.config);
   const commonConfig = {
     // Tell Vite not to combine config from vite.config.js with our provided inline config
@@ -156,7 +157,7 @@ async function createVite(commandConfig, { settings, logger, mode, command, fs =
       vitePluginFetchable({ settings }),
       command === "dev" && vitePluginAstroServer({ settings, logger }),
       command === "dev" && vitePluginAstroServerClient(),
-      astroDevCssPlugin({ routesList, command }),
+      astroDevCssPlugin({ routesList, command, cssContentCache }),
       importMetaEnv({ envLoader }),
       astroEnv({ settings, sync, envLoader }),
       vitePluginAdapterConfig(settings),
@@ -167,7 +168,7 @@ async function createVite(commandConfig, { settings, logger, mode, command, fs =
       astroHeadPlugin(),
       astroContentVirtualModPlugin({ fs, settings }),
       astroContentImportPlugin({ fs, settings, logger }),
-      astroContentAssetPropagationPlugin({ settings }),
+      astroContentAssetPropagationPlugin({ settings, cssContentCache }),
       vitePluginMiddleware({ settings }),
       astroAssetsPlugin({ fs, settings, sync, logger }),
       astroPrefetch({ settings }),

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

package/dist/core/messages/runtime.js

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

package/dist/core/render/params-and-props.js

@@ -44,9 +44,14 @@ async function getProps(opts) {
 }
 function getParams(route, pathname) {
   if (!route.params.length) return {};
-  const path = pathname.endsWith(".html") && route.type === "page" && !routeHasHtmlExtension(route) ? pathname.slice(0, -5) : pathname;
+  const hasHtmlSuffix = pathname.endsWith(".html") && !routeHasHtmlExtension(route);
+  const path = hasHtmlSuffix && route.type === "page" ? pathname.slice(0, -".html".length) : pathname;
   const allPatterns = [route, ...route.fallbackRoutes].map((r) => r.pattern);
-  const paramsMatch = allPatterns.map((pattern) => pattern.exec(path)).find((x) => x);
+  let paramsMatch = allPatterns.map((pattern) => pattern.exec(path)).find((x) => x);
+  if (!paramsMatch && hasHtmlSuffix && route.type !== "page") {
+    const strippedPath = pathname.endsWith("/index.html") ? pathname.slice(0, -"/index.html".length) || "/" : pathname.slice(0, -".html".length);
+    paramsMatch = allPatterns.map((pattern) => pattern.exec(strippedPath)).find((x) => x);
+  }
   if (!paramsMatch) return {};
   const params = {};
   route.params.forEach((key, i) => {

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

@@ -167,27 +167,31 @@ class AstroServerApp extends BaseApp {
         } else {
           socket.on("close", onSocketClose);
         }
-        const request = createRequest({
-          url,
-          headers: incomingRequest.headers,
-          method: incomingRequest.method,
-          body,
-          logger: self.logger,
-          isPrerendered: matchedRoute.routeData.prerender,
-          routePattern: matchedRoute.routeData.component,
-          init: { signal: abortController.signal }
-        });
-        const locals = Reflect.get(incomingRequest, clientLocalsSymbol);
-        for (const [name, value] of Object.entries(self.settings.config.server.headers ?? {})) {
-          if (value) incomingResponse.setHeader(name, value);
+        try {
+          const request = createRequest({
+            url,
+            headers: incomingRequest.headers,
+            method: incomingRequest.method,
+            body,
+            logger: self.logger,
+            isPrerendered: matchedRoute.routeData.prerender,
+            routePattern: matchedRoute.routeData.component,
+            init: { signal: abortController.signal }
+          });
+          const locals = Reflect.get(incomingRequest, clientLocalsSymbol);
+          for (const [name, value] of Object.entries(self.settings.config.server.headers ?? {})) {
+            if (value) incomingResponse.setHeader(name, value);
+          }
+          const clientAddress = incomingRequest.socket.remoteAddress;
+          const response = await self.render(request, {
+            locals,
+            routeData: matchedRoute.routeData,
+            clientAddress
+          });
+          await writeSSRResult(request, response, incomingResponse);
+        } finally {
+          socket.off("close", onSocketClose);
         }
-        const clientAddress = incomingRequest.socket.remoteAddress;
-        const response = await self.render(request, {
-          locals,
-          routeData: matchedRoute.routeData,
-          clientAddress
-        });
-        await writeSSRResult(request, response, incomingResponse);
       },
       onError(_err) {
         const error = createSafeError(_err);

package/dist/vite-plugin-css/index.d.ts

@@ -3,6 +3,11 @@ import type { RoutesList } from '../types/astro.js';
 interface AstroVitePluginOptions {
     routesList: RoutesList;
     command: 'dev' | 'build';
+    /** Shared cache of CSS content by module ID. Populated by the transform hook and
+     *  consumed by the content asset propagation plugin to avoid re-processing CSS
+     *  modules with `?inline` (which can produce different scoped-name hashes with
+     *  Lightning CSS). */
+    cssContentCache: Map<string, string>;
 }
 /**
  * This plugin tracks the CSS that should be applied by route.
@@ -14,5 +19,5 @@ interface AstroVitePluginOptions {
  *
  * @param routesList
  */
-export declare function astroDevCssPlugin({ routesList, command }: AstroVitePluginOptions): Plugin[];
+export declare function astroDevCssPlugin({ routesList, command, cssContentCache, }: AstroVitePluginOptions): Plugin[];
 export {};

package/dist/vite-plugin-css/index.js

@@ -60,9 +60,12 @@ function* collectCSSWithOrder(id, mod, seen = /* @__PURE__ */ new Set()) {
     }
   }
 }
-function astroDevCssPlugin({ routesList, command }) {
+function astroDevCssPlugin({
+  routesList,
+  command,
+  cssContentCache
+}) {
   let server;
-  const cssContentCache = /* @__PURE__ */ new Map();
   function getCurrentEnvironment(pluginEnv) {
     return pluginEnv ?? server?.environments[ASTRO_VITE_ENVIRONMENT_NAMES.ssr];
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "7.0.6",
+  "version": "7.0.7",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -146,9 +146,9 @@
     "xxhash-wasm": "^1.1.0",
     "yargs-parser": "^22.0.0",
     "zod": "^4.3.6",
-    "@astrojs/internal-helpers": "0.10.1",
     "@astrojs/markdown-satteri": "0.3.3",
-    "@astrojs/telemetry": "3.3.2"
+    "@astrojs/internal-helpers": "0.10.1",
+    "@astrojs/telemetry": "3.3.3"
   },
   "optionalDependencies": {
     "sharp": "^0.34.0 || ^0.35.0"
@@ -186,8 +186,8 @@
     "typescript": "^6.0.3",
     "undici": "^7.22.0",
     "vitest": "^4.1.0",
-    "@astrojs/check": "0.9.9",
     "@astrojs/markdown-remark": "7.2.1",
+    "@astrojs/check": "0.9.9",
     "astro-scripts": "0.0.14"
   },
   "engines": {