astro 7.1.4 → 7.1.6

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

@@ -3,15 +3,38 @@ 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 STYLE_EXT_REGEX = /\.(?:css|less|sass|scss|styl|stylus|pcss|postcss|sss)$/i;
+const STYLE_COMPONENT_EXT_REGEX = /\.(astro|svelte|vue)$/i;
 const RAW_QUERY_REGEX = /(?:\?|&)raw(?:&|$)/;
 function hasStyleExtension(id) {
   return STYLE_EXT_REGEX.test(id.split("?")[0]);
 }
-function isStyleModule(mod) {
-  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 isComponentStyleModule(id) {
+  const [filename, rawQuery] = id.split("?", 2);
+  const extensionMatch = STYLE_COMPONENT_EXT_REGEX.exec(filename);
+  if (!rawQuery || !extensionMatch) return false;
+  const query = new URLSearchParams(rawQuery);
+  return query.get("type") === "style" && query.has(extensionMatch[1].toLowerCase());
+}
+function getStyleModuleType(mod) {
+  if (mod.id && RAW_QUERY_REGEX.test(mod.id) && hasStyleExtension(mod.id)) return;
+  if (mod.id && isComponentStyleModule(mod.id)) return "component";
+  if (mod.file && hasStyleExtension(mod.file)) return "file";
+  return mod.id && hasStyleExtension(mod.id) ? "file" : void 0;
+}
+function hasClientStyleModuleByFile(moduleGraph, mod, styleType) {
+  if (mod.file == null || moduleGraph.getModulesByFile == null) return false;
+  const fileModules = moduleGraph.getModulesByFile(mod.file);
+  if (fileModules == null) return false;
+  for (const fileMod of fileModules) {
+    if (fileMod.id == null) continue;
+    if (styleType === "component") {
+      if (isComponentStyleModule(fileMod.id)) return true;
+    } else if (!RAW_QUERY_REGEX.test(fileMod.id) && hasStyleExtension(fileMod.id)) {
+      return true;
+    }
+  }
+  return false;
 }
 function hmrReload() {
   return {
@@ -22,19 +45,45 @@ function hmrReload() {
       handler({ modules, server, timestamp, file }) {
         if (!isAstroServerEnvironment(this.environment)) return;
         let hasSsrOnlyModules = false;
+        let hasStyleModules = false;
         let hasSkippedStyleModules = false;
         const invalidatedModules = /* @__PURE__ */ new Set();
         for (const mod of modules) {
           if (mod.id == null) continue;
-          if (isStyleModule(mod)) {
+          const styleType = getStyleModuleType(mod);
+          const clientModule = server.environments.client.moduleGraph.getModuleById(mod.id);
+          if (styleType) {
+            hasStyleModules = true;
+            if (clientModule == null && !hasClientStyleModuleByFile(server.environments.client.moduleGraph, mod, styleType)) {
+              this.environment.moduleGraph.invalidateModule(
+                mod,
+                invalidatedModules,
+                timestamp,
+                true
+              );
+              hasSsrOnlyModules = true;
+              continue;
+            }
             hasSkippedStyleModules = true;
             continue;
           }
-          const clientModule = server.environments.client.moduleGraph.getModuleById(mod.id);
           if (clientModule != null) continue;
           this.environment.moduleGraph.invalidateModule(mod, invalidatedModules, timestamp, true);
           hasSsrOnlyModules = true;
         }
+        const invalidateDevCssModules = () => {
+          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);
+                }
+              }
+            }
+          }
+        };
         for (const invalidatedModule of invalidatedModules) {
           if (invalidatedModule.id?.startsWith(VIRTUAL_PAGE_RESOLVED_MODULE_ID)) {
             const cssMod = this.environment.moduleGraph.getModuleById(
@@ -45,6 +94,9 @@ function hmrReload() {
           }
         }
         if (hasSsrOnlyModules) {
+          if (hasStyleModules) {
+            invalidateDevCssModules();
+          }
           if (isRunnableDevEnvironment(this.environment)) {
             for (const invalidated of invalidatedModules) {
               if (invalidated.id == null) continue;
@@ -67,17 +119,7 @@ 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);
-                }
-              }
-            }
-          }
+          invalidateDevCssModules();
           return [];
         }
         if (modules.length > 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "7.1.4",
+  "version": "7.1.6",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -96,7 +96,7 @@
     "README.md"
   ],
   "dependencies": {
-    "@astrojs/compiler-rs": "^0.3.1",
+    "@astrojs/compiler-rs": "^0.3.2",
     "@capsizecss/unpack": "^4.0.0",
     "@clack/prompts": "^1.1.0",
     "@oslojs/encoding": "^1.1.0",
@@ -119,7 +119,7 @@
     "github-slugger": "^2.0.0",
     "html-escaper": "3.0.3",
     "http-cache-semantics": "^4.2.0",
-    "js-yaml": "^4.1.1",
+    "js-yaml": "^4.3.0",
     "jsonc-parser": "^3.3.1",
     "magic-string": "^1.0.0",
     "magicast": "^0.5.2",
@@ -146,15 +146,15 @@
     "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.4",
+    "@astrojs/internal-helpers": "0.10.2",
+    "@astrojs/markdown-satteri": "0.3.5",
     "@astrojs/telemetry": "3.3.3"
   },
   "optionalDependencies": {
     "sharp": "^0.34.0 || ^0.35.0"
   },
   "peerDependencies": {
-    "@astrojs/markdown-remark": "7.2.1"
+    "@astrojs/markdown-remark": "7.2.2"
   },
   "peerDependenciesMeta": {
     "@astrojs/markdown-remark": {
@@ -187,7 +187,7 @@
     "undici": "^7.22.0",
     "vitest": "^4.1.0",
     "@astrojs/check": "0.9.10",
-    "@astrojs/markdown-remark": "7.2.1",
+    "@astrojs/markdown-remark": "7.2.2",
     "astro-scripts": "0.0.14"
   },
   "engines": {