astro 7.2.9 → 7.2.10

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.2.9";
+  version = "7.2.10";
 }
 export {
   BuildTimeAstroVersionProvider

package/dist/content/content-layer.js

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

package/dist/content/data-store-writer.d.ts

@@ -8,8 +8,17 @@ export type DataStoreManifest = Record<string, string[]>;
  * (build/dev) and are never imported at runtime.
  */
 export interface DataStoreWriter {
-    /** Serialize and persist the given collections. */
-    write(collections: Map<string, Map<string, any>>): Promise<void>;
+    /**
+     * Serialize and persist the given collections.
+     * Resolves to `true` if the data on disk changed, or `false` if the write
+     * was skipped because the persisted data was already identical.
+     */
+    write(collections: Map<string, Map<string, any>>): Promise<boolean>;
+    /**
+     * The file whose write commits a store update: the store file itself, or
+     * the manifest for chunked stores.
+     */
+    readonly target: PathLike;
 }
 /**
  * Serialize collections to a deterministic devalue string.
@@ -35,15 +44,18 @@ export declare function chunkString(str: string, maxBytes: number): string[];
  * partial reads. If the file already contains identical data, the write is
  * skipped. Callers are responsible for serializing concurrent writes to the
  * same file.
+ *
+ * Returns `true` if the file was written, or `false` if the write was skipped.
  */
-export declare function writeFileAtomic(file: PathLike, data: string): Promise<void>;
+export declare function writeFileAtomic(file: PathLike, data: string): Promise<boolean>;
 /**
  * A {@link DataStoreWriter} that serializes the whole store to a single file.
  */
 export declare class FileWriter implements DataStoreWriter {
     #private;
     constructor(file: PathLike);
-    write(collections: Map<string, Map<string, any>>): Promise<void>;
+    get target(): PathLike;
+    write(collections: Map<string, Map<string, any>>): Promise<boolean>;
 }
 /**
  * A {@link DataStoreWriter} that splits the store across many content-addressed
@@ -60,5 +72,6 @@ export declare class FileWriter implements DataStoreWriter {
 export declare class ChunkedWriter implements DataStoreWriter {
     #private;
     constructor(dir: URL, chunkSize: number);
-    write(collections: Map<string, Map<string, any>>): Promise<void>;
+    get target(): PathLike;
+    write(collections: Map<string, Map<string, any>>): Promise<boolean>;
 }

package/dist/content/data-store-writer.js

@@ -47,18 +47,22 @@ async function writeFileAtomic(file, data) {
   const tempFile = file instanceof URL ? new URL(`${file.href}.tmp`) : `${file}.tmp`;
   const oldData = await fs.readFile(file, "utf-8").catch(() => "");
   if (oldData === data) {
-    return;
+    return false;
   }
   await fs.writeFile(tempFile, data);
   await fs.rename(tempFile, file);
+  return true;
 }
 class FileWriter {
   #file;
   constructor(file) {
     this.#file = file;
   }
+  get target() {
+    return this.#file;
+  }
   async write(collections) {
-    await writeFileAtomic(this.#file, serializeDataStore(collections));
+    return await writeFileAtomic(this.#file, serializeDataStore(collections));
   }
 }
 class ChunkedWriter {
@@ -72,6 +76,9 @@ class ChunkedWriter {
     this.#manifestFile = new URL(`./${DATA_STORE_MANIFEST_FILE}`, dir);
     this.#chunkSize = chunkSize;
   }
+  get target() {
+    return this.#manifestFile;
+  }
   async write(collections) {
     if (!this.#hasher) {
       this.#hasher = await xxhash();
@@ -81,9 +88,10 @@ class ChunkedWriter {
     for (const [collectionName, entries] of sortCollections(collections)) {
       manifest[collectionName] = await this.#writeCollection(entries);
     }
-    await writeFileAtomic(this.#manifestFile, JSON.stringify(manifest));
+    const didWrite = await writeFileAtomic(this.#manifestFile, JSON.stringify(manifest));
     this.#writtenFiles.add(DATA_STORE_MANIFEST_FILE);
     emptyDir(this.#dir, this.#writtenFiles);
+    return didWrite;
   }
   async #writeCollection(entries) {
     const parts = [];

package/dist/content/index.d.ts

@@ -3,4 +3,4 @@ export { createContentTypesGenerator } from './types-generator.js';
 export { getContentPaths } from './utils.js';
 export { astroContentAssetPropagationPlugin } from './vite-plugin-content-assets.js';
 export { astroContentImportPlugin } from './vite-plugin-content-imports.js';
-export { astroContentVirtualModPlugin } from './vite-plugin-content-virtual-mod.js';
+export { astroContentVirtualModPlugin, attachDataStoreInvalidation, } from './vite-plugin-content-virtual-mod.js';

package/dist/content/index.js

@@ -3,12 +3,16 @@ import { createContentTypesGenerator } from "./types-generator.js";
 import { getContentPaths } from "./utils.js";
 import { astroContentAssetPropagationPlugin } from "./vite-plugin-content-assets.js";
 import { astroContentImportPlugin } from "./vite-plugin-content-imports.js";
-import { astroContentVirtualModPlugin } from "./vite-plugin-content-virtual-mod.js";
+import {
+  astroContentVirtualModPlugin,
+  attachDataStoreInvalidation
+} from "./vite-plugin-content-virtual-mod.js";
 export {
   astroContentAssetPropagationPlugin,
   astroContentImportPlugin,
   astroContentVirtualModPlugin,
   attachContentServerListeners,
+  attachDataStoreInvalidation,
   createContentTypesGenerator,
   getContentPaths
 };

package/dist/content/mutable-data-store.d.ts

@@ -6,6 +6,17 @@ import { type DataEntry, ImmutableDataStore } from './data-store.js';
  */
 export declare class MutableDataStore extends ImmutableDataStore {
     #private;
+    /**
+     * Registers a listener called with the file path whenever this store writes a
+     * file to disk (the data store itself, or the asset/module import files).
+     * Writes that are skipped because the data on disk is already identical do
+     * not notify. The dev server uses this to invalidate the content virtual
+     * modules deterministically, instead of relying on the file watcher to
+     * observe the write — on some platforms (notably Windows) the watcher can
+     * miss the atomic rename that commits it.
+     * Returns a function that removes the listener.
+     */
+    onFileWritten(listener: (path: string) => void): () => void;
     set(collectionName: string, key: string, value: unknown): void;
     delete(collectionName: string, key: string): void;
     clear(collectionName: string): void;

package/dist/content/mutable-data-store.js

@@ -30,6 +30,32 @@ class MutableDataStore extends ImmutableDataStore {
   #moduleImports = /* @__PURE__ */ new Map();
   #writeInProgress = false;
   #writeQueued = false;
+  #fileWrittenListeners = /* @__PURE__ */ new Set();
+  /**
+   * Registers a listener called with the file path whenever this store writes a
+   * file to disk (the data store itself, or the asset/module import files).
+   * Writes that are skipped because the data on disk is already identical do
+   * not notify. The dev server uses this to invalidate the content virtual
+   * modules deterministically, instead of relying on the file watcher to
+   * observe the write — on some platforms (notably Windows) the watcher can
+   * miss the atomic rename that commits it.
+   * Returns a function that removes the listener.
+   */
+  onFileWritten(listener) {
+    this.#fileWrittenListeners.add(listener);
+    return () => {
+      this.#fileWrittenListeners.delete(listener);
+    };
+  }
+  #notifyFileWritten(path) {
+    if (this.#fileWrittenListeners.size === 0) {
+      return;
+    }
+    const normalized = path instanceof URL ? fileURLToPath(path) : path.toString();
+    for (const listener of this.#fileWrittenListeners) {
+      listener(normalized);
+    }
+  }
   set(collectionName, key, value) {
     const collection = this._collections.get(collectionName) ?? /* @__PURE__ */ new Map();
     collection.set(String(key), value);
@@ -275,6 +301,7 @@ ${lines.join(",\n")}]);
       }
       await fs.writeFile(tempFile, data);
       await fs.rename(tempFile, filePath);
+      this.#notifyFileWritten(filePath);
     } finally {
       this.#writing.delete(fileKey);
       if (this.#pending.has(fileKey)) {
@@ -415,7 +442,10 @@ ${lines.join(",\n")}]);
     try {
       this.#dirty = false;
       this.#writeInProgress = true;
-      await this.#writer.write(this._collections);
+      const didWrite = await this.#writer.write(this._collections);
+      if (didWrite) {
+        this.#notifyFileWritten(this.#writer.target);
+      }
     } catch (err) {
       throw new AstroError(AstroErrorData.UnknownFilesystemError, { cause: err });
     } finally {

package/dist/content/runtime.js

@@ -349,7 +349,9 @@ async function updateImageReferencesInBody(html, fileName) {
     return Object.entries({
       ...attributes,
       src: image.src,
-      srcset: image.srcSet.attribute,
+      // An empty `srcset` is invalid HTML, so only emit it when there are
+      // actual candidates. This matches `vite-plugin-markdown/images.ts`.
+      ...image.srcSet.values.length > 0 ? { srcset: image.srcSet.attribute } : {},
       // This attribute is used by the toolbar audit
       ...import.meta.env.DEV ? { "data-image-component": "true" } : {}
     }).filter(([, value]) => value != null).map(([key, value]) => value === "" ? `${key}=""` : `${key}="${escape(String(value))}"`).join(" ");

package/dist/content/vite-plugin-content-virtual-mod.d.ts

@@ -1,9 +1,19 @@
 import nodeFs from 'node:fs';
-import { type Plugin } from 'vite';
+import { type Plugin, type ViteDevServer } from 'vite';
 import type { AstroSettings } from '../types/astro.js';
+import type { MutableDataStore } from './mutable-data-store.js';
 interface AstroContentVirtualModPluginParams {
     settings: AstroSettings;
     fs: typeof nodeFs;
 }
+/**
+ * Invalidates the content virtual modules directly whenever the given store
+ * writes to disk. The watcher listeners in `configureServer` cover writes from
+ * other processes, but the watcher can miss the atomic rename that commits a
+ * write on some platforms (notably Windows, see #17335), leaving dev serving
+ * stale content until a restart. Subscribing to the store's own write
+ * notifications makes invalidation of this process's writes deterministic.
+ */
+export declare function attachDataStoreInvalidation(store: MutableDataStore, server: ViteDevServer, settings: AstroSettings): void;
 export declare function astroContentVirtualModPlugin({ settings, fs, }: AstroContentVirtualModPluginParams): Plugin;
 export {};

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

@@ -70,6 +70,35 @@ function invalidateDataStore(viteServer, { notifyClient = true } = {}) {
     });
   }
 }
+const directInvalidations = /* @__PURE__ */ new Map();
+const DIRECT_INVALIDATION_ECHO_MS = 1e3;
+function markDirectInvalidation(path) {
+  directInvalidations.set(path, Date.now());
+}
+function isDirectInvalidationEcho(path) {
+  const time = directInvalidations.get(path);
+  return time !== void 0 && Date.now() - time < DIRECT_INVALIDATION_ECHO_MS;
+}
+function getDevDataStoreFile(settings) {
+  if (getDataStoreChunkSize(settings) !== void 0) {
+    return new URL(DATA_STORE_MANIFEST_FILE, getDataStoreDir(settings, true));
+  }
+  return getDataStoreFile(settings, true);
+}
+function attachDataStoreInvalidation(store, server, settings) {
+  const dataStorePath = fileURLToPath(getDevDataStoreFile(settings));
+  const assetImportsPath = fileURLToPath(new URL(ASSET_IMPORTS_FILE, settings.dotAstroDir));
+  store.onFileWritten((path) => {
+    if (path === dataStorePath) {
+      markDirectInvalidation(dataStorePath);
+      invalidateDataStore(server);
+      invalidateAssetImports(server, assetImportsPath);
+    } else if (path === assetImportsPath) {
+      markDirectInvalidation(assetImportsPath);
+      invalidateAssetImports(server, assetImportsPath);
+    }
+  });
+}
 function astroContentVirtualModPlugin({
   settings,
   fs
@@ -270,16 +299,19 @@ function astroContentVirtualModPlugin({
       const dataStorePath = fileURLToPath(dataStoreFile);
       const assetImportsPath = fileURLToPath(new URL(ASSET_IMPORTS_FILE, settings.dotAstroDir));
       server.watcher.on("add", (addedPath) => {
-        if (addedPath === dataStorePath) {
+        if (addedPath === dataStorePath && !isDirectInvalidationEcho(dataStorePath)) {
           invalidateDataStore(server);
           invalidateAssetImports(server, assetImportsPath);
         }
       });
       server.watcher.on("change", (changedPath) => {
         if (changedPath === dataStorePath) {
+          if (isDirectInvalidationEcho(dataStorePath)) {
+            return;
+          }
           invalidateDataStore(server);
           invalidateAssetImports(server, assetImportsPath);
-        } else if (changedPath === assetImportsPath) {
+        } else if (changedPath === assetImportsPath && !isDirectInvalidationEcho(assetImportsPath)) {
           invalidateAssetImports(server, assetImportsPath);
         }
       });
@@ -314,5 +346,6 @@ async function generateContentEntryFile({
   return virtualModContents;
 }
 export {
-  astroContentVirtualModPlugin
+  astroContentVirtualModPlugin,
+  attachDataStoreInvalidation
 };

package/dist/core/app/entrypoints/virtual/dev.js

@@ -11,7 +11,7 @@ import { updateRouteTable } from "../../../routing/route-table.js";
 import { DevFacadeApp } from "../../dev-facade.js";
 let hmrWired = false;
 const createApp = ({ streaming } = {}) => {
-  setLogger(manifest, createConsoleLogger(manifest.logLevel));
+  setLogger(manifest, createConsoleLogger({ level: manifest.logLevel }));
   setEnvironment(manifest, createNonRunnableEnvironment());
   const app = new DevFacadeApp(manifest, streaming);
   app.setFetchHandler(fetchable);
@@ -22,7 +22,7 @@ const createApp = ({ streaming } = {}) => {
         const { routes: newRoutes } = await import("virtual:astro:routes");
         updateRouteTable(
           manifest,
-          newRoutes.map((r) => r.routeData)
+          newRoutes.map((route) => route.routeData)
         );
       } catch (e) {
         getLogger(manifest).error("router", `Failed to update routes via HMR:

package/dist/core/build/generate.js

@@ -26,7 +26,6 @@ import { getRedirectLocationOrThrow } from "../redirects/index.js";
 import { createRequest } from "../request.js";
 import { redirectTemplate } from "../routing/3xx.js";
 import { routeIsRedirect } from "../routing/helpers.js";
-import { matchRoute } from "../routing/match.js";
 import { getOutputFilename } from "../output-filename.js";
 import { getOutFile, getOutFolder } from "./common.js";
 import { createDefaultPrerenderer } from "./default-prerenderer.js";
@@ -102,7 +101,7 @@ ${colors.bgGreen(colors.black(` ${verb} static routes `))}`);
     const pathsWithRoutes = await prerenderer.getStaticPaths();
     const hasI18nDomains = ssr && options.settings.config.i18n?.domains && Object.keys(options.settings.config.i18n.domains).length > 0;
     const { config } = options.settings;
-    const builtPaths = /* @__PURE__ */ new Set();
+    const builtPaths = /* @__PURE__ */ new Map();
     const filteredPaths = [];
     const fallbackPaths = [];
     for (const pathWithRoute of pathsWithRoutes) {
@@ -115,33 +114,28 @@ ${colors.bgGreen(colors.black(` ${verb} static routes `))}`);
       }
       const normalized = removeTrailingForwardSlash(pathname);
       if (!builtPaths.has(normalized)) {
-        builtPaths.add(normalized);
+        builtPaths.set(normalized, route);
       } else {
-        const matchedRoute = matchRoute(decodeURI(pathname), options.routesList);
-        if (!matchedRoute) {
-          continue;
-        }
-        if (matchedRoute !== route) {
-          if (config.prerenderConflictBehavior === "error") {
-            throw new AstroError({
-              ...AstroErrorData.PrerenderRouteConflict,
-              message: AstroErrorData.PrerenderRouteConflict.message(
-                matchedRoute.route,
-                route.route,
-                normalized
-              ),
-              hint: AstroErrorData.PrerenderRouteConflict.hint(matchedRoute.route, route.route)
-            });
-          } else if (config.prerenderConflictBehavior === "warn") {
-            const msg = AstroErrorData.PrerenderRouteConflict.message(
-              matchedRoute.route,
+        const winningRoute = builtPaths.get(normalized);
+        if (config.prerenderConflictBehavior === "error") {
+          throw new AstroError({
+            ...AstroErrorData.PrerenderRouteConflict,
+            message: AstroErrorData.PrerenderRouteConflict.message(
+              winningRoute.route,
               route.route,
               normalized
-            );
-            logger.warn("build", msg);
-          }
-          continue;
+            ),
+            hint: AstroErrorData.PrerenderRouteConflict.hint(winningRoute.route, route.route)
+          });
+        } else if (config.prerenderConflictBehavior === "warn") {
+          const msg = AstroErrorData.PrerenderRouteConflict.message(
+            winningRoute.route,
+            route.route,
+            normalized
+          );
+          logger.warn("build", msg);
         }
+        continue;
       }
       const paths = route.type === "fallback" ? fallbackPaths : filteredPaths;
       paths.push(pathWithRoute);

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

@@ -31,7 +31,7 @@ import { makePageDataKey } from "./util.js";
 import { cacheConfigToManifest } from "../../cache/utils.js";
 import { sessionConfigToManifest } from "../../session/utils.js";
 const MANIFEST_REPLACE = "@@ASTRO_MANIFEST_REPLACE@@";
-const replaceExp = new RegExp(`['"]${MANIFEST_REPLACE}['"]`, "g");
+const replaceExp = new RegExp(`['"\`]${MANIFEST_REPLACE}['"\`]`, "g");
 async function manifestBuildPostHook(options, internals, {
   chunks,
   mutate

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

@@ -75,6 +75,9 @@ class AstroCache {
     for (const [key, value] of headers) {
       response.headers.set(key, value);
     }
+    if (!response.headers.has("Cache-Control") && !response.headers.has("Expires") && (response.headers.has("Last-Modified") || response.headers.has("ETag"))) {
+      response.headers.set("Cache-Control", "no-cache");
+    }
   }
   /** @internal */
   get [IS_ACTIVE]() {

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "7.2.9";
+const ASTRO_VERSION = "7.2.10";
 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

@@ -4,7 +4,7 @@ import colors from "piccolore";
 import { gt, major, minor, patch } from "semver";
 import { getDataStoreChunkSize, getDataStoreDir, getDataStoreFile } from "../../content/paths.js";
 import { globalContentLayer } from "../../content/instance.js";
-import { attachContentServerListeners } from "../../content/index.js";
+import { attachContentServerListeners, attachDataStoreInvalidation } from "../../content/index.js";
 import { MutableDataStore } from "../../content/mutable-data-store.js";
 import { globalContentConfigObserver } from "../../content/utils.js";
 import { telemetry } from "../../events/index.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.2.9";
+  const currentVersion = "7.2.10";
   const isPrerelease = currentVersion.includes("-");
   if (!isPrerelease) {
     try {
@@ -69,6 +69,8 @@ async function dev(inlineConfig) {
   }
   if (!store) {
     logger.error("content", "Failed to create data store");
+  } else {
+    attachDataStoreInvalidation(store, restart.container.viteServer, restart.container.settings);
   }
   await attachContentServerListeners(restart.container);
   const config = globalContentConfigObserver.get();

package/dist/core/messages/runtime.js

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

package/dist/core/server-islands/vite-plugin-server-islands.js

@@ -5,8 +5,8 @@ const RESOLVED_SERVER_ISLAND_MANIFEST = "\0" + SERVER_ISLAND_MANIFEST;
 const serverIslandPlaceholderMap = "'$$server-islands-map$$'";
 const serverIslandPlaceholderNameMap = "'$$server-islands-name-map$$'";
 const SERVER_ISLAND_MAP_MARKER = "$$server-islands-map$$";
-const serverIslandMapReplaceExp = /['"]\$\$server-islands-map\$\$['"]/g;
-const serverIslandNameMapReplaceExp = /['"]\$\$server-islands-name-map\$\$['"]/g;
+const serverIslandMapReplaceExp = /['"`]\$\$server-islands-map\$\$['"`]/g;
+const serverIslandNameMapReplaceExp = /['"`]\$\$server-islands-name-map\$\$['"`]/g;
 function vitePluginServerIslands({
   settings,
   serverIslandsState

package/dist/core/util.d.ts

@@ -23,15 +23,6 @@ export declare function wrapId(id: string): string;
 export declare function resolvePages(config: AstroConfig): URL;
 export declare function isPage(file: URL, settings: AstroSettings): boolean;
 export declare function isEndpoint(file: URL, settings: AstroSettings): boolean;
-export declare function resolveJsToTs(filePath: string): string;
-/**
- * Resolve a path that doesn't name a file on disk (e.g. produced by an
- * extensionless import like `import { Counter } from './Counter'`) to the file
- * Vite would load, by probing Vite's default extension order and directory
- * `index` files. Returns the path unchanged when it already exists as a file
- * or when no candidate is found.
- */
-export declare function resolveExtensionlessPath(filePath: string): string;
 /**
  * Set a default NODE_ENV so Vite doesn't set an incorrect default when loading the Astro config
  */

package/dist/core/util.js

@@ -1,4 +1,3 @@
-import fs from "node:fs";
 import { fileURLToPath } from "node:url";
 import { hasSpecialQueries } from "../vite-plugin-utils/index.js";
 import { SUPPORTED_MARKDOWN_FILE_EXTENSIONS } from "./constants.js";
@@ -85,37 +84,6 @@ function isEndpoint(file, settings) {
   if (!isPublicRoute(file, settings.config)) return false;
   return !endsWithPageExt(file, settings) && !file.toString().includes("?astro");
 }
-function resolveJsToTs(filePath) {
-  if (filePath.endsWith(".jsx") && !fs.existsSync(filePath)) {
-    const tryPath = filePath.slice(0, -4) + ".tsx";
-    if (fs.existsSync(tryPath)) {
-      return tryPath;
-    }
-  }
-  return filePath;
-}
-const VITE_DEFAULT_RESOLVE_EXTENSIONS = [".mjs", ".js", ".mts", ".ts", ".jsx", ".tsx", ".json"];
-function resolveExtensionlessPath(filePath) {
-  const stat = fs.statSync(filePath, { throwIfNoEntry: false });
-  if (stat?.isFile()) {
-    return filePath;
-  }
-  for (const ext of VITE_DEFAULT_RESOLVE_EXTENSIONS) {
-    const tryPath = filePath + ext;
-    if (fs.existsSync(tryPath)) {
-      return tryPath;
-    }
-  }
-  if (stat?.isDirectory()) {
-    for (const ext of VITE_DEFAULT_RESOLVE_EXTENSIONS) {
-      const tryPath = `${filePath}/index${ext}`;
-      if (fs.existsSync(tryPath)) {
-        return tryPath;
-      }
-    }
-  }
-  return filePath;
-}
 function ensureProcessNodeEnv(defaultNodeEnv) {
   if (!process.env.NODE_ENV) {
     process.env.NODE_ENV = defaultNodeEnv;
@@ -128,8 +96,6 @@ export {
   isMarkdownFile,
   isPage,
   parseNpmName,
-  resolveExtensionlessPath,
-  resolveJsToTs,
   resolvePages,
   unwrapId,
   viteID,

package/dist/core/viteUtils.d.ts

@@ -1,21 +1,9 @@
 import type { ModuleLoader } from './module-loader/index.js';
+export { resolvePath } from '@astrojs/internal-helpers/mdx';
 /**
  * Re-implementation of Vite's normalizePath that can be used without Vite
  */
 export declare function normalizePath(id: string): string;
-/**
- * Resolve island component specifiers to stable paths for hydration metadata.
- *
- * Examples:
- * - `./components/Button.jsx` from `/app/src/pages/index.astro`
- *   -> `/app/src/pages/components/Button.tsx` (when `.tsx` exists)
- * - `../components/Counter` from `/app/src/pages/index.astro`
- *   -> `/app/src/components/Counter.tsx` (extensionless imports probe Vite's
- *   default extension order, then directory `index` files)
- * - `#components/react/Counter.tsx`
- *   -> `/app/src/components/react/Counter.tsx` via package `imports`
- */
-export declare function resolvePath(specifier: string, importer: string): string;
 export declare function rootRelativePath(root: URL, idOrUrl: URL | string, shouldPrependForwardSlash?: boolean): string;
 /**
  * Simulate Vite's resolve and import analysis so we can import the id as an URL

package/dist/core/viteUtils.js

@@ -1,42 +1,12 @@
-import { createRequire } from "node:module";
 import path from "node:path";
-import { fileURLToPath, pathToFileURL } from "node:url";
+import { fileURLToPath } from "node:url";
 import { prependForwardSlash, slash } from "../core/path.js";
-import {
-  resolveExtensionlessPath,
-  resolveJsToTs,
-  unwrapId,
-  VALID_ID_PREFIX,
-  viteID
-} from "./util.js";
+import { unwrapId, VALID_ID_PREFIX, viteID } from "./util.js";
+import { resolvePath } from "@astrojs/internal-helpers/mdx";
 const isWindows = typeof process !== "undefined" && process.platform === "win32";
 function normalizePath(id) {
   return path.posix.normalize(isWindows ? slash(id) : id);
 }
-function resolvePath(specifier, importer) {
-  if (specifier.startsWith(".")) {
-    const absoluteSpecifier = path.resolve(path.dirname(importer), specifier);
-    return resolveExtensionlessPath(resolveJsToTs(normalizePath(absoluteSpecifier)));
-  } else if (specifier.startsWith("#")) {
-    try {
-      const resolved = createRequire(pathToFileURL(importer)).resolve(specifier);
-      return resolveJsToTs(normalizePath(resolved));
-    } catch {
-      try {
-        const importerURL = pathToFileURL(importer).toString();
-        const resolved = import.meta.resolve(specifier, importerURL);
-        const resolvedUrl = new URL(resolved);
-        if (resolvedUrl.protocol === "file:") {
-          return resolveJsToTs(normalizePath(fileURLToPath(resolvedUrl)));
-        }
-      } catch {
-      }
-    }
-    return specifier;
-  } else {
-    return specifier;
-  }
-}
 function rootRelativePath(root, idOrUrl, shouldPrependForwardSlash = true) {
   let id;
   if (typeof idOrUrl !== "string") {

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

@@ -47,7 +47,7 @@ async function createAstroServerApp(controller, settings, loader, logger) {
         const { routes: newRoutes } = await import("virtual:astro:routes");
         updateRouteTable(
           manifest,
-          newRoutes.map((r) => r.routeData)
+          newRoutes.map((route) => route.routeData)
         );
         actualLogger.debug("router", "Routes updated via HMR");
       } catch (e) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "7.2.9",
+  "version": "7.2.10",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -153,15 +153,15 @@
     "xxhash-wasm": "^1.1.0",
     "yargs-parser": "^22.0.0",
     "zod": "^4.3.6",
-    "@astrojs/markdown-satteri": "0.3.8",
-    "@astrojs/internal-helpers": "0.10.4",
+    "@astrojs/internal-helpers": "0.11.0",
+    "@astrojs/markdown-satteri": "0.4.0",
     "@astrojs/telemetry": "3.3.3"
   },
   "optionalDependencies": {
     "sharp": "^0.35.4"
   },
   "peerDependencies": {
-    "@astrojs/markdown-remark": "7.2.4"
+    "@astrojs/markdown-remark": "^7.3.0"
   },
   "peerDependenciesMeta": {
     "@astrojs/markdown-remark": {
@@ -193,8 +193,8 @@
     "typescript": "^6.0.3",
     "undici": "^7.22.0",
     "vitest": "^4.1.0",
-    "@astrojs/markdown-remark": "7.2.4",
     "@astrojs/check": "0.9.10",
+    "@astrojs/markdown-remark": "7.3.0",
     "astro-scripts": "0.0.14"
   },
   "engines": {