astro 2.5.5 → 2.5.6

package/dist/@types/astro.d.ts

@@ -1166,8 +1166,9 @@ export interface ContentEntryType {
         contents: string;
     }): GetContentEntryInfoReturnType | Promise<GetContentEntryInfoReturnType>;
     getRenderModule?(this: rollup.PluginContext, params: {
+        contents: string;
+        fileUrl: URL;
         viteId: string;
-        entry: ContentEntryModule;
     }): rollup.LoadResult | Promise<rollup.LoadResult>;
     contentModuleTypes?: string;
 }
@@ -1528,7 +1529,7 @@ export interface APIContext<Props extends Record<string, any> = Record<string, a
      *
      * export const onRequest = defineMiddleware((context, next) => {
      *   context.locals.greeting = "Hello!";
-     *   next();
+     *   return next();
      * });
      * ```
      * Inside a `.astro` file:

package/dist/assets/services/service.js

@@ -24,6 +24,12 @@ const baseService = {
       });
     }
     if (!isESMImportedImage(options.src)) {
+      if (options.src.startsWith("/@fs/")) {
+        throw new AstroError({
+          ...AstroErrorData.LocalImageUsedWrongly,
+          message: AstroErrorData.LocalImageUsedWrongly.message(options.src)
+        });
+      }
       let missingDimension;
       if (!options.width && !options.height) {
         missingDimension = "both";

package/dist/assets/utils/emitAsset.d.ts

@@ -1,4 +1,2 @@
-import type { AstroSettings } from '../../@types/astro';
 import { type Metadata } from './metadata.js';
-export declare function emitESMImage(id: string | undefined, watchMode: boolean, fileEmitter: any, settings: Pick<AstroSettings, 'config'>): Promise<Metadata | undefined>;
-export declare function emoji(char: string, fallback: string): string;
+export declare function emitESMImage(id: string | undefined, watchMode: boolean, fileEmitter: any): Promise<Metadata | undefined>;

package/dist/assets/utils/emitAsset.js

@@ -2,8 +2,9 @@ import fs from "node:fs";
 import path from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
 import slash from "slash";
+import { prependForwardSlash } from "../../core/path.js";
 import { imageMetadata } from "./metadata.js";
-async function emitESMImage(id, watchMode, fileEmitter, settings) {
+async function emitESMImage(id, watchMode, fileEmitter) {
   if (!id) {
     return void 0;
   }
@@ -25,25 +26,13 @@ async function emitESMImage(id, watchMode, fileEmitter, settings) {
     url.searchParams.append("origWidth", meta.width.toString());
     url.searchParams.append("origHeight", meta.height.toString());
     url.searchParams.append("origFormat", meta.format);
-    meta.src = rootRelativePath(settings.config, url);
+    meta.src = `/@fs` + prependForwardSlash(fileURLToNormalizedPath(url));
   }
   return meta;
 }
-function rootRelativePath(config, url) {
-  const basePath = fileURLToNormalizedPath(url);
-  const rootPath = fileURLToNormalizedPath(config.root);
-  return prependForwardSlash(basePath.slice(rootPath.length));
-}
-function prependForwardSlash(filePath) {
-  return filePath[0] === "/" ? filePath : "/" + filePath;
-}
 function fileURLToNormalizedPath(filePath) {
   return slash(fileURLToPath(filePath) + filePath.search).replace(/\\/g, "/");
 }
-function emoji(char, fallback) {
-  return process.platform !== "win32" ? char : fallback;
-}
 export {
-  emitESMImage,
-  emoji
+  emitESMImage
 };

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

@@ -87,17 +87,17 @@ function assets({
       // Handle serving images during development
       configureServer(server) {
         server.middlewares.use(async (req, res, next) => {
-          var _a2;
+          var _a2, _b;
           if ((_a2 = req.url) == null ? void 0 : _a2.startsWith("/_image")) {
             if (!isLocalService(globalThis.astroAsset.imageService)) {
               return next();
             }
             const url = new URL(req.url, "file:");
-            const filePath = url.searchParams.get("href");
-            if (!filePath) {
+            if (!url.searchParams.has("href")) {
               return next();
             }
-            const filePathURL = new URL("." + filePath, settings.config.root);
+            const filePath = (_b = url.searchParams.get("href")) == null ? void 0 : _b.slice("/@fs".length);
+            const filePathURL = new URL("." + filePath, "file:");
             const file = await fs.readFile(filePathURL);
             let meta = getOrigQueryParams(filePathURL.searchParams);
             if (!meta) {
@@ -196,7 +196,7 @@ function assets({
         }
         const cleanedUrl = removeQueryString(id);
         if (/\.(jpeg|jpg|png|tiff|webp|gif|svg)$/.test(cleanedUrl)) {
-          const meta = await emitESMImage(id, this.meta.watchMode, this.emitFile, settings);
+          const meta = await emitESMImage(id, this.meta.watchMode, this.emitFile);
           return `export default ${JSON.stringify(meta)}`;
         }
       }

package/dist/content/runtime-assets.d.ts

@@ -1,4 +1,3 @@
 import type { PluginContext } from 'rollup';
 import { z } from 'zod';
-import type { AstroSettings } from '../@types/astro.js';
-export declare function createImage(settings: Pick<AstroSettings, 'config'>, pluginContext: PluginContext, entryFilePath: string): () => z.ZodEffects<z.ZodString, import("../assets/utils/metadata.js").Metadata | z.ZodNever, string>;
+export declare function createImage(pluginContext: PluginContext, entryFilePath: string): () => z.ZodEffects<z.ZodString, import("../assets/utils/metadata.js").Metadata | z.ZodNever, string>;

package/dist/content/runtime-assets.js

@@ -1,6 +1,6 @@
 import { z } from "zod";
 import { emitESMImage } from "../assets/index.js";
-function createImage(settings, pluginContext, entryFilePath) {
+function createImage(pluginContext, entryFilePath) {
   return () => {
     return z.string().transform(async (imagePath, ctx) => {
       var _a;
@@ -8,8 +8,7 @@ function createImage(settings, pluginContext, entryFilePath) {
       const metadata = await emitESMImage(
         resolvedFilePath,
         pluginContext.meta.watchMode,
-        pluginContext.emitFile,
-        settings
+        pluginContext.emitFile
       );
       if (!metadata) {
         ctx.addIssue({

package/dist/content/runtime.js

@@ -223,7 +223,7 @@ async function render({
         scripts = collectedScripts.map((script) => renderScriptElement(script)).join("");
       }
       let props = baseProps;
-      if (id.endsWith("mdx")) {
+      if (id.endsWith(".mdx")) {
         props = {
           components: mod.components ?? {},
           ...baseProps

package/dist/content/types-generator.js

@@ -9,12 +9,12 @@ import { info, warn } from "../core/logger/core.js";
 import { isRelativePath } from "../core/path.js";
 import { CONTENT_TYPES_FILE, VIRTUAL_MODULE_ID } from "./consts.js";
 import {
-  getContentEntryConfigByExtMap,
   getContentEntryIdAndSlug,
   getContentPaths,
   getDataEntryExts,
   getDataEntryId,
   getEntryCollectionName,
+  getEntryConfigByExtMap,
   getEntrySlug,
   getEntryType,
   reloadContentConfigObserver
@@ -30,7 +30,7 @@ async function createContentTypesGenerator({
 }) {
   const collectionEntryMap = {};
   const contentPaths = getContentPaths(settings.config, fs);
-  const contentEntryConfigByExt = getContentEntryConfigByExtMap(settings);
+  const contentEntryConfigByExt = getEntryConfigByExtMap(settings.contentEntryTypes);
   const contentEntryExts = [...contentEntryConfigByExt.keys()];
   const dataEntryExts = getDataEntryExts(settings);
   let events = [];
@@ -327,7 +327,7 @@ async function writeContentFiles({
   for (const collectionKey of Object.keys(collectionEntryMap).sort()) {
     const collectionConfig = contentConfig == null ? void 0 : contentConfig.collections[JSON.parse(collectionKey)];
     const collection = collectionEntryMap[collectionKey];
-    if ((collectionConfig == null ? void 0 : collectionConfig.type) && collection.type !== collectionConfig.type) {
+    if ((collectionConfig == null ? void 0 : collectionConfig.type) && collection.type !== "unknown" && collection.type !== collectionConfig.type) {
       viteServer.ws.send({
         type: "error",
         err: new AstroError({
@@ -346,7 +346,12 @@ async function writeContentFiles({
       });
       return;
     }
-    switch (collection.type) {
+    const resolvedType = collection.type === "unknown" ? (
+      // Add empty / unknown collections to the data type map by default
+      // This ensures `getCollection('empty-collection')` doesn't raise a type error
+      (collectionConfig == null ? void 0 : collectionConfig.type) ?? "data"
+    ) : collection.type;
+    switch (resolvedType) {
       case "content":
         contentTypesStr += `${collectionKey}: {
 `;
@@ -370,7 +375,6 @@ async function writeContentFiles({
 `;
         break;
       case "data":
-      case "unknown":
         dataTypesStr += `${collectionKey}: {
 `;
         for (const entryKey of Object.keys(collection.entries).sort()) {

package/dist/content/utils.d.ts

@@ -4,7 +4,7 @@ import fsMod from 'node:fs';
 import type { PluginContext } from 'rollup';
 import { type ViteDevServer } from 'vite';
 import { z } from 'zod';
-import type { AstroConfig, AstroSettings, ContentEntryType } from '../@types/astro.js';
+import type { AstroConfig, AstroSettings, ContentEntryType, DataEntryType } from '../@types/astro.js';
 import { CONTENT_FLAGS } from './consts.js';
 /**
  * Amap from a collection + slug to the local file path.
@@ -102,7 +102,7 @@ export declare function getEntryData(entry: {
 }, collectionConfig: CollectionConfig, pluginContext: PluginContext, config: AstroConfig): Promise<any>;
 export declare function getContentEntryExts(settings: Pick<AstroSettings, 'contentEntryTypes'>): string[];
 export declare function getDataEntryExts(settings: Pick<AstroSettings, 'dataEntryTypes'>): string[];
-export declare function getContentEntryConfigByExtMap(settings: Pick<AstroSettings, 'contentEntryTypes'>): Map<string, ContentEntryType>;
+export declare function getEntryConfigByExtMap<TEntryType extends ContentEntryType | DataEntryType>(entryTypes: TEntryType[]): Map<string, TEntryType>;
 export declare function getEntryCollectionName({ contentDir, entry, }: Pick<ContentPaths, 'contentDir'> & {
     entry: string | URL;
 }): string | undefined;

package/dist/content/utils.js

@@ -65,7 +65,7 @@ async function getEntryData(entry, collectionConfig, pluginContext, config) {
       );
     }
     schema = schema({
-      image: createImage({ config }, pluginContext, entry._internal.filePath)
+      image: createImage(pluginContext, entry._internal.filePath)
     });
   }
   if (schema) {
@@ -114,9 +114,9 @@ function getContentEntryExts(settings) {
 function getDataEntryExts(settings) {
   return settings.dataEntryTypes.map((t) => t.extensions).flat();
 }
-function getContentEntryConfigByExtMap(settings) {
+function getEntryConfigByExtMap(entryTypes) {
   const map = /* @__PURE__ */ new Map();
-  for (const entryType of settings.contentEntryTypes) {
+  for (const entryType of entryTypes) {
     for (const ext of entryType.extensions) {
       map.set(ext, entryType);
     }
@@ -340,7 +340,6 @@ export {
   collectionConfigParser,
   contentConfigParser,
   contentObservable,
-  getContentEntryConfigByExtMap,
   getContentEntryExts,
   getContentEntryIdAndSlug,
   getContentPaths,
@@ -348,6 +347,7 @@ export {
   getDataEntryId,
   getDotAstroTypeReference,
   getEntryCollectionName,
+  getEntryConfigByExtMap,
   getEntryData,
   getEntrySlug,
   getEntryType,

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

@@ -3,16 +3,16 @@ import { extname } from "node:path";
 import { pathToFileURL } from "url";
 import { AstroErrorData } from "../core/errors/errors-data.js";
 import { AstroError } from "../core/errors/errors.js";
-import { escapeViteEnvReferences, getFileInfo } from "../vite-plugin-utils/index.js";
+import { escapeViteEnvReferences } from "../vite-plugin-utils/index.js";
 import { CONTENT_FLAG, DATA_FLAG } from "./consts.js";
 import {
-  getContentEntryConfigByExtMap,
   getContentEntryExts,
   getContentEntryIdAndSlug,
   getContentPaths,
   getDataEntryExts,
   getDataEntryId,
   getEntryCollectionName,
+  getEntryConfigByExtMap,
   getEntryData,
   getEntryType,
   globalContentConfigObserver,
@@ -40,13 +40,9 @@ function astroContentImportPlugin({
   const contentPaths = getContentPaths(settings.config, fs);
   const contentEntryExts = getContentEntryExts(settings);
   const dataEntryExts = getDataEntryExts(settings);
-  const contentEntryConfigByExt = getContentEntryConfigByExtMap(settings);
-  const dataEntryExtToParser = /* @__PURE__ */ new Map();
-  for (const entryType of settings.dataEntryTypes) {
-    for (const ext of entryType.extensions) {
-      dataEntryExtToParser.set(ext, entryType.getEntryInfo);
-    }
-  }
+  const contentEntryConfigByExt = getEntryConfigByExtMap(settings.contentEntryTypes);
+  const dataEntryConfigByExt = getEntryConfigByExtMap(settings.dataEntryTypes);
+  const { contentDir } = contentPaths;
   const plugins = [
     {
       name: "astro:content-imports",
@@ -55,9 +51,9 @@ function astroContentImportPlugin({
           const fileId = viteId.split("?")[0] ?? viteId;
           const { id, data, collection, _internal } = await getDataEntryModule({
             fileId,
-            dataEntryExtToParser,
-            contentPaths,
-            settings,
+            entryConfigByExt: dataEntryConfigByExt,
+            contentDir,
+            config: settings.config,
             fs,
             pluginContext: this
           });
@@ -74,8 +70,12 @@ export const _internal = {
           return code;
         } else if (hasContentFlag(viteId, CONTENT_FLAG)) {
           const fileId = viteId.split("?")[0];
-          const { id, slug, collection, body, data, _internal } = await setContentEntryModuleCache({
+          const { id, slug, collection, body, data, _internal } = await getContentEntryModule({
             fileId,
+            entryConfigByExt: contentEntryConfigByExt,
+            contentDir,
+            config: settings.config,
+            fs,
             pluginContext: this
           });
           const code = escapeViteEnvReferences(`
@@ -123,103 +123,115 @@ export const _internal = {
   if (settings.contentEntryTypes.some((t) => t.getRenderModule)) {
     plugins.push({
       name: "astro:content-render-imports",
-      async transform(_, viteId) {
+      async transform(contents, viteId) {
         const contentRenderer = getContentRendererByViteId(viteId, settings);
         if (!contentRenderer)
           return;
-        const { fileId } = getFileInfo(viteId, settings.config);
-        const entry = await getContentEntryModuleFromCache(fileId);
-        if (!entry) {
-          throw new AstroError({
-            ...AstroErrorData.UnknownContentCollectionError,
-            message: `Unable to render ${JSON.stringify(
-              fileId
-            )}. Did you import this module directly without using a content collection query?`
-          });
-        }
-        return contentRenderer.bind(this)({ entry, viteId });
+        const fileId = viteId.split("?")[0];
+        return contentRenderer.bind(this)({ viteId, contents, fileUrl: pathToFileURL(fileId) });
       }
     });
   }
-  const contentEntryModuleByIdCache = /* @__PURE__ */ new Map();
-  function isAwaitingQueue(cacheEntry) {
-    return typeof cacheEntry === "object" && cacheEntry != null && "awaitingQueue" in cacheEntry;
-  }
-  function getContentEntryModuleFromCache(id) {
-    const cacheEntry = contentEntryModuleByIdCache.get(id);
-    if (isAwaitingQueue(cacheEntry)) {
-      return new Promise((resolve, reject) => {
-        cacheEntry.awaitingQueue.push(resolve);
-      });
-    } else if (cacheEntry) {
-      return Promise.resolve(cacheEntry);
-    }
-    return Promise.resolve(void 0);
-  }
-  async function setContentEntryModuleCache({
-    fileId,
-    pluginContext
-  }) {
-    contentEntryModuleByIdCache.set(fileId, { awaitingQueue: [] });
-    const contentConfig = await getContentConfigFromGlobal();
-    const rawContents = await fs.promises.readFile(fileId, "utf-8");
-    const fileExt = extname(fileId);
-    if (!contentEntryConfigByExt.has(fileExt)) {
-      throw new AstroError({
-        ...AstroErrorData.UnknownContentCollectionError,
-        message: `No parser found for content entry ${JSON.stringify(
-          fileId
-        )}. Did you apply an integration for this file type?`
-      });
-    }
-    const contentEntryConfig = contentEntryConfigByExt.get(fileExt);
-    const {
-      rawData,
-      body,
-      slug: frontmatterSlug,
-      data: unvalidatedData
-    } = await contentEntryConfig.getEntryInfo({
-      fileUrl: pathToFileURL(fileId),
-      contents: rawContents
+  return plugins;
+}
+async function getContentEntryModule(params) {
+  const { fileId, contentDir, pluginContext, config } = params;
+  const { collectionConfig, entryConfig, entry, rawContents, collection } = await getEntryModuleBaseInfo(params);
+  const {
+    rawData,
+    data: unvalidatedData,
+    body,
+    slug: frontmatterSlug
+  } = await entryConfig.getEntryInfo({
+    fileUrl: pathToFileURL(fileId),
+    contents: rawContents
+  });
+  const _internal = { filePath: fileId, rawData };
+  const { id, slug: generatedSlug } = getContentEntryIdAndSlug({ entry, contentDir, collection });
+  const slug = parseEntrySlug({
+    id,
+    collection,
+    generatedSlug,
+    frontmatterSlug
+  });
+  const data = collectionConfig ? await getEntryData(
+    { id, collection, _internal, unvalidatedData },
+    collectionConfig,
+    pluginContext,
+    config
+  ) : unvalidatedData;
+  const contentEntryModule = {
+    id,
+    slug,
+    collection,
+    data,
+    body,
+    _internal
+  };
+  return contentEntryModule;
+}
+async function getDataEntryModule(params) {
+  const { fileId, contentDir, pluginContext, config } = params;
+  const { collectionConfig, entryConfig, entry, rawContents, collection } = await getEntryModuleBaseInfo(params);
+  const { rawData = "", data: unvalidatedData } = await entryConfig.getEntryInfo({
+    fileUrl: pathToFileURL(fileId),
+    contents: rawContents
+  });
+  const _internal = { filePath: fileId, rawData };
+  const id = getDataEntryId({ entry, contentDir, collection });
+  const data = collectionConfig ? await getEntryData(
+    { id, collection, _internal, unvalidatedData },
+    collectionConfig,
+    pluginContext,
+    config
+  ) : unvalidatedData;
+  const dataEntryModule = {
+    id,
+    collection,
+    data,
+    _internal
+  };
+  return dataEntryModule;
+}
+async function getEntryModuleBaseInfo({
+  fileId,
+  entryConfigByExt,
+  contentDir,
+  fs
+}) {
+  const contentConfig = await getContentConfigFromGlobal();
+  let rawContents;
+  try {
+    rawContents = await fs.promises.readFile(fileId, "utf-8");
+  } catch (e) {
+    throw new AstroError({
+      ...AstroErrorData.UnknownContentCollectionError,
+      message: `Unexpected error reading entry ${JSON.stringify(fileId)}.`,
+      stack: e instanceof Error ? e.stack : void 0
     });
-    const entry = pathToFileURL(fileId);
-    const { contentDir } = contentPaths;
-    const collection = getEntryCollectionName({ entry, contentDir });
-    if (collection === void 0)
-      throw new AstroError(AstroErrorData.UnknownContentCollectionError);
-    const { id, slug: generatedSlug } = getContentEntryIdAndSlug({ entry, contentDir, collection });
-    const _internal = { filePath: fileId, rawData };
-    const slug = parseEntrySlug({
-      id,
-      collection,
-      generatedSlug,
-      frontmatterSlug
+  }
+  const fileExt = extname(fileId);
+  const entryConfig = entryConfigByExt.get(fileExt);
+  if (!entryConfig) {
+    throw new AstroError({
+      ...AstroErrorData.UnknownContentCollectionError,
+      message: `No parser found for data entry ${JSON.stringify(
+        fileId
+      )}. Did you apply an integration for this file type?`
     });
-    const collectionConfig = contentConfig == null ? void 0 : contentConfig.collections[collection];
-    let data = collectionConfig ? await getEntryData(
-      { id, collection, _internal, unvalidatedData },
-      collectionConfig,
-      pluginContext,
-      settings.config
-    ) : unvalidatedData;
-    const contentEntryModule = {
-      id,
-      slug,
-      collection,
-      data,
-      body,
-      _internal
-    };
-    const cacheEntry = contentEntryModuleByIdCache.get(fileId);
-    if (isAwaitingQueue(cacheEntry)) {
-      for (const resolve of cacheEntry.awaitingQueue) {
-        resolve(contentEntryModule);
-      }
-    }
-    contentEntryModuleByIdCache.set(fileId, contentEntryModule);
-    return contentEntryModule;
   }
-  return plugins;
+  const entry = pathToFileURL(fileId);
+  const collection = getEntryCollectionName({ entry, contentDir });
+  if (collection === void 0)
+    throw new AstroError(AstroErrorData.UnknownContentCollectionError);
+  const collectionConfig = contentConfig == null ? void 0 : contentConfig.collections[collection];
+  return {
+    collectionConfig,
+    entry,
+    entryConfig,
+    collection,
+    rawContents
+  };
 }
 async function getContentConfigFromGlobal() {
   const observable = globalContentConfigObserver.get();
@@ -249,55 +261,6 @@ async function getContentConfigFromGlobal() {
   }
   return contentConfig;
 }
-async function getDataEntryModule({
-  fileId,
-  dataEntryExtToParser,
-  contentPaths,
-  fs,
-  pluginContext,
-  settings
-}) {
-  const contentConfig = await getContentConfigFromGlobal();
-  let rawContents;
-  try {
-    rawContents = await fs.promises.readFile(fileId, "utf-8");
-  } catch (e) {
-    throw new AstroError({
-      ...AstroErrorData.UnknownContentCollectionError,
-      message: `Unexpected error reading entry ${JSON.stringify(fileId)}.`,
-      stack: e instanceof Error ? e.stack : void 0
-    });
-  }
-  const fileExt = extname(fileId);
-  const dataEntryParser = dataEntryExtToParser.get(fileExt);
-  if (!dataEntryParser) {
-    throw new AstroError({
-      ...AstroErrorData.UnknownContentCollectionError,
-      message: `No parser found for data entry ${JSON.stringify(
-        fileId
-      )}. Did you apply an integration for this file type?`
-    });
-  }
-  const { data: unvalidatedData, rawData = "" } = await dataEntryParser({
-    fileUrl: pathToFileURL(fileId),
-    contents: rawContents
-  });
-  const entry = pathToFileURL(fileId);
-  const { contentDir } = contentPaths;
-  const collection = getEntryCollectionName({ entry, contentDir });
-  if (collection === void 0)
-    throw new AstroError(AstroErrorData.UnknownContentCollectionError);
-  const id = getDataEntryId({ entry, contentDir, collection });
-  const _internal = { filePath: fileId, rawData };
-  const collectionConfig = contentConfig == null ? void 0 : contentConfig.collections[collection];
-  const data = collectionConfig ? await getEntryData(
-    { id, collection, _internal, unvalidatedData },
-    collectionConfig,
-    pluginContext,
-    settings.config
-  ) : unvalidatedData;
-  return { id, collection, data, _internal };
-}
 export {
   astroContentImportPlugin
 };

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

@@ -1,8 +1,8 @@
 /// <reference types="node" />
 import fsMod from 'node:fs';
 import type { Plugin } from 'vite';
-import type { AstroSettings } from '../@types/astro.js';
-import { getContentEntryConfigByExtMap, type ContentPaths } from './utils.js';
+import type { AstroSettings, ContentEntryType } from '../@types/astro.js';
+import { type ContentPaths } from './utils.js';
 interface AstroContentVirtualModPluginParams {
     settings: AstroSettings;
 }
@@ -13,7 +13,7 @@ export declare function astroContentVirtualModPlugin({ settings, }: AstroContent
  * @see `src/content/virtual-mod.mjs`
  */
 export declare function getStringifiedLookupMap({ contentPaths, contentEntryConfigByExt, dataEntryExts, root, fs, }: {
-    contentEntryConfigByExt: ReturnType<typeof getContentEntryConfigByExtMap>;
+    contentEntryConfigByExt: Map<string, ContentEntryType>;
     dataEntryExts: string[];
     contentPaths: Pick<ContentPaths, 'contentDir' | 'config'>;
     root: URL;

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

@@ -7,12 +7,12 @@ import { AstroError, AstroErrorData } from "../core/errors/index.js";
 import { rootRelativePath } from "../core/util.js";
 import { VIRTUAL_MODULE_ID } from "./consts.js";
 import {
-  getContentEntryConfigByExtMap,
   getContentEntryIdAndSlug,
   getContentPaths,
   getDataEntryExts,
   getDataEntryId,
   getEntryCollectionName,
+  getEntryConfigByExtMap,
   getEntrySlug,
   getEntryType,
   getExtGlob
@@ -22,13 +22,17 @@ function astroContentVirtualModPlugin({
 }) {
   const contentPaths = getContentPaths(settings.config);
   const relContentDir = rootRelativePath(settings.config.root, contentPaths.contentDir);
-  const contentEntryConfigByExt = getContentEntryConfigByExtMap(settings);
+  const contentEntryConfigByExt = getEntryConfigByExtMap(settings.contentEntryTypes);
   const contentEntryExts = [...contentEntryConfigByExt.keys()];
   const dataEntryExts = getDataEntryExts(settings);
   const virtualModContents = fsMod.readFileSync(contentPaths.virtualModTemplate, "utf-8").replace(
     "@@COLLECTION_NAME_BY_REFERENCE_KEY@@",
     new URL("reference-map.json", contentPaths.cacheDir).pathname
-  ).replace("@@CONTENT_DIR@@", relContentDir).replace("@@CONTENT_ENTRY_GLOB_PATH@@", `${relContentDir}**/*${getExtGlob(contentEntryExts)}`).replace("@@DATA_ENTRY_GLOB_PATH@@", `${relContentDir}**/*${getExtGlob(dataEntryExts)}`).replace(
+  ).replace("@@CONTENT_DIR@@", relContentDir).replace(
+    "@@CONTENT_ENTRY_GLOB_PATH@@",
+    // [!_] = ignore files starting with "_"
+    `${relContentDir}**/[!_]*${getExtGlob(contentEntryExts)}`
+  ).replace("@@DATA_ENTRY_GLOB_PATH@@", `${relContentDir}**/[!_]*${getExtGlob(dataEntryExts)}`).replace(
     "@@RENDER_ENTRY_GLOB_PATH@@",
     `${relContentDir}**/*${getExtGlob(
       /** Note: data collections excluded */

package/dist/core/app/index.d.ts

@@ -1,8 +1,6 @@
 import type { RouteData } from '../../@types/astro';
 import type { SSRManifest as Manifest } from './types';
 export { deserializeManifest } from './common.js';
-export declare const pagesVirtualModuleId = "@astrojs-pages-virtual-entry";
-export declare const resolvedPagesVirtualModuleId: string;
 export interface MatchOptions {
     matchNotFound?: boolean | undefined;
 }