astro 5.0.0-alpha.3 → 5.0.0-alpha.4

package/dist/content/content-layer.d.ts

@@ -35,7 +35,12 @@ export declare class ContentLayer {
 export declare function simpleLoader<TData extends {
     id: string;
 }>(handler: () => Array<TData> | Promise<Array<TData>>, context: LoaderContext): Promise<void>;
-export declare function getDataStoreFile(settings: AstroSettings): URL;
+/**
+ * Get the path to the data store file.
+ * During development, this is in the `.astro` directory so that the Vite watcher can see it.
+ * In production, it's in the cache directory so that it's preserved between builds.
+ */
+export declare function getDataStoreFile(settings: AstroSettings, isDev?: boolean): URL;
 export declare const globalContentLayer: {
     init: (options: ContentLayerOptions) => ContentLayer;
     get: () => ContentLayer | null;

package/dist/content/content-layer.js

@@ -1,7 +1,6 @@
 import { promises as fs, existsSync } from "node:fs";
 import * as fastq from "fastq";
 import xxhash from "xxhash-wasm";
-import { AstroUserError } from "../core/errors/errors.js";
 import {
   ASSET_IMPORTS_FILE,
   CONTENT_LAYER_TYPE,
@@ -103,18 +102,6 @@ class ContentLayer {
       logger.debug("Content config not loaded, skipping sync");
       return;
     }
-    if (!this.#settings.config.experimental.contentLayer) {
-      const contentLayerCollections = Object.entries(contentConfig.config.collections).filter(
-        ([_, collection]) => collection.type === CONTENT_LAYER_TYPE
-      );
-      if (contentLayerCollections.length > 0) {
-        throw new AstroUserError(
-          `The following collections have a loader defined, but the content layer is not enabled: ${contentLayerCollections.map(([title]) => title).join(", ")}.`,
-          "To enable the Content Layer API, set `experimental: { contentLayer: true }` in your Astro config file."
-        );
-      }
-      return;
-    }
     logger.info("Syncing content");
     const { digest: currentConfigDigest } = contentConfig.config;
     this.#lastConfigDigest = currentConfigDigest;
@@ -228,11 +215,9 @@ async function simpleLoader(handler, context) {
     context.store.set({ id: raw.id, data: item });
   }
 }
-function getDataStoreFile(settings) {
-  return new URL(
-    DATA_STORE_FILE,
-    process?.env.NODE_ENV === "development" ? settings.dotAstroDir : settings.config.cacheDir
-  );
+function getDataStoreFile(settings, isDev) {
+  isDev ??= process?.env.NODE_ENV === "development";
+  return new URL(DATA_STORE_FILE, isDev ? settings.dotAstroDir : settings.config.cacheDir);
 }
 function contentLayerSingleton() {
   let instance = null;

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

@@ -36,7 +36,7 @@ export interface DataEntry<TData extends Record<string, unknown> = Record<string
  * A read-only data store for content collections. This is used to retrieve data from the content layer at runtime.
  * To add or modify data, use {@link MutableDataStore} instead.
  */
-export declare class DataStore {
+export declare class ImmutableDataStore {
     protected _collections: Map<string, Map<string, any>>;
     constructor();
     get<T = DataEntry>(collectionName: string, key: string): T | undefined;
@@ -50,6 +50,6 @@ export declare class DataStore {
      * Attempts to load a DataStore from the virtual module.
      * This only works in Vite.
      */
-    static fromModule(): Promise<DataStore>;
-    static fromMap(data: Map<string, Map<string, any>>): Promise<DataStore>;
+    static fromModule(): Promise<ImmutableDataStore>;
+    static fromMap(data: Map<string, Map<string, any>>): Promise<ImmutableDataStore>;
 }

package/dist/content/data-store.js

@@ -1,5 +1,5 @@
 import * as devalue from "devalue";
-class DataStore {
+class ImmutableDataStore {
   _collections = /* @__PURE__ */ new Map();
   constructor() {
     this._collections = /* @__PURE__ */ new Map();
@@ -40,16 +40,16 @@ class DataStore {
     try {
       const data = await import("astro:data-layer-content");
       if (data.default instanceof Map) {
-        return DataStore.fromMap(data.default);
+        return ImmutableDataStore.fromMap(data.default);
       }
       const map = devalue.unflatten(data.default);
-      return DataStore.fromMap(map);
+      return ImmutableDataStore.fromMap(map);
     } catch {
     }
-    return new DataStore();
+    return new ImmutableDataStore();
   }
   static async fromMap(data) {
-    const store = new DataStore();
+    const store = new ImmutableDataStore();
     store._collections = data;
     return store;
   }
@@ -59,7 +59,7 @@ function dataStoreSingleton() {
   return {
     get: async () => {
       if (!instance) {
-        instance = DataStore.fromModule();
+        instance = ImmutableDataStore.fromModule();
       }
       return instance;
     },
@@ -70,6 +70,6 @@ function dataStoreSingleton() {
 }
 const globalDataStore = dataStoreSingleton();
 export {
-  DataStore,
+  ImmutableDataStore,
   globalDataStore
 };

package/dist/content/loaders/types.d.ts

@@ -2,8 +2,8 @@ import type { FSWatcher } from 'vite';
 import type { ZodSchema } from 'zod';
 import type { AstroIntegrationLogger } from '../../core/logger/core.js';
 import type { AstroConfig } from '../../types/public/config.js';
-import type { ContentEntryType } from '../../types/public/content.js';
-import type { MetaStore, ScopedDataStore } from '../mutable-data-store.js';
+import type { DataStore, MetaStore } from '../mutable-data-store.js';
+export type { DataStore, MetaStore };
 export interface ParseDataOptions<TData extends Record<string, unknown>> {
     /** The ID of the entry. Unique per collection */
     id: string;
@@ -15,8 +15,8 @@ export interface ParseDataOptions<TData extends Record<string, unknown>> {
 export interface LoaderContext {
     /** The unique name of the collection */
     collection: string;
-    /** A database abstraction to store the actual data */
-    store: ScopedDataStore;
+    /** A database to store the actual data */
+    store: DataStore;
     /**  A simple KV store, designed for things like sync tokens */
     meta: MetaStore;
     logger: AstroIntegrationLogger;
@@ -30,7 +30,6 @@ export interface LoaderContext {
     watcher?: FSWatcher;
     /** If the loader has been triggered by an integration, this may optionally contain extra data set by that integration */
     refreshContextData?: Record<string, unknown>;
-    entryTypes: Map<string, ContentEntryType>;
 }
 export interface Loader {
     /** Unique name of the loader, e.g. the npm package name */

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

@@ -1,10 +1,10 @@
 import { type PathLike } from 'node:fs';
-import { type DataEntry, DataStore, type RenderedContent } from './data-store.js';
+import { type DataEntry, ImmutableDataStore, type RenderedContent } from './data-store.js';
 /**
  * Extends the DataStore with the ability to change entries and write them to disk.
  * This is kept as a separate class to avoid needing node builtins at runtime, when read-only access is all that is needed.
  */
-export declare class MutableDataStore extends DataStore {
+export declare class MutableDataStore extends ImmutableDataStore {
     #private;
     set(collectionName: string, key: string, value: unknown): void;
     delete(collectionName: string, key: string): void;
@@ -15,7 +15,7 @@ export declare class MutableDataStore extends DataStore {
     addModuleImport(fileName: string): void;
     writeAssetImports(filePath: PathLike): Promise<void>;
     writeModuleImports(filePath: PathLike): Promise<void>;
-    scopedStore(collectionName: string): ScopedDataStore;
+    scopedStore(collectionName: string): DataStore;
     /**
      * Returns a MetaStore for a given collection, or if no collection is provided, the default meta collection.
      */
@@ -31,7 +31,7 @@ export declare class MutableDataStore extends DataStore {
     static fromString(data: string): Promise<MutableDataStore>;
     static fromFile(filePath: string | URL): Promise<MutableDataStore>;
 }
-export interface ScopedDataStore {
+export interface DataStore {
     get: <TData extends Record<string, unknown> = Record<string, unknown>>(key: string) => DataEntry<TData> | undefined;
     entries: () => Array<[id: string, DataEntry]>;
     set: <TData extends Record<string, unknown>>(opts: {

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

@@ -4,10 +4,10 @@ import { Traverse } from "neotraverse/modern";
 import { imageSrcToImportId, importIdToSymbolName } from "../assets/utils/resolveImports.js";
 import { AstroError, AstroErrorData } from "../core/errors/index.js";
 import { IMAGE_IMPORT_PREFIX } from "./consts.js";
-import { DataStore } from "./data-store.js";
+import { ImmutableDataStore } from "./data-store.js";
 import { contentModuleToId } from "./utils.js";
 const SAVE_DEBOUNCE_MS = 500;
-class MutableDataStore extends DataStore {
+class MutableDataStore extends ImmutableDataStore {
   #file;
   #assetsFile;
   #modulesFile;

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

@@ -17,7 +17,6 @@ import {
   CONTENT_FLAG,
   CONTENT_RENDER_FLAG,
   DATA_FLAG,
-  DATA_STORE_FILE,
   DATA_STORE_VIRTUAL_ID,
   MODULES_IMPORTS_FILE,
   MODULES_MJS_ID,
@@ -26,6 +25,7 @@ import {
   RESOLVED_VIRTUAL_MODULE_ID,
   VIRTUAL_MODULE_ID
 } from "./consts.js";
+import { getDataStoreFile } from "./content-layer.js";
 import {
   getContentEntryIdAndSlug,
   getContentPaths,
@@ -50,10 +50,7 @@ function astroContentVirtualModPlugin({
     enforce: "pre",
     configResolved(config) {
       IS_DEV = config.mode === "development";
-      dataStoreFile = new URL(
-        DATA_STORE_FILE,
-        IS_DEV ? settings.dotAstroDir : settings.config.cacheDir
-      );
+      dataStoreFile = getDataStoreFile(settings, IS_DEV);
     },
     async resolveId(id) {
       if (id === VIRTUAL_MODULE_ID) {

package/dist/core/config/schema.d.ts

@@ -61,7 +61,6 @@ export declare const ASTRO_CONFIG_DEFAULTS: {
         clientPrerender: false;
         serverIslands: false;
         contentIntellisense: false;
-        contentLayer: false;
     };
 };
 export declare const AstroConfigSchema: z.ZodObject<{
@@ -622,19 +621,16 @@ export declare const AstroConfigSchema: z.ZodObject<{
         clientPrerender: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
         serverIslands: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
         contentIntellisense: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
-        contentLayer: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
     }, "strict", z.ZodTypeAny, {
         contentCollectionCache: boolean;
         clientPrerender: boolean;
         serverIslands: boolean;
         contentIntellisense: boolean;
-        contentLayer: boolean;
     }, {
         contentCollectionCache?: boolean | undefined;
         clientPrerender?: boolean | undefined;
         serverIslands?: boolean | undefined;
         contentIntellisense?: boolean | undefined;
-        contentLayer?: boolean | undefined;
     }>>;
     legacy: z.ZodDefault<z.ZodObject<{}, "strip", z.ZodTypeAny, {}, {}>>;
 }, "strip", z.ZodTypeAny, {
@@ -760,7 +756,6 @@ export declare const AstroConfigSchema: z.ZodObject<{
         clientPrerender: boolean;
         serverIslands: boolean;
         contentIntellisense: boolean;
-        contentLayer: boolean;
     };
     legacy: {};
     site?: string | undefined;
@@ -924,7 +919,6 @@ export declare const AstroConfigSchema: z.ZodObject<{
         clientPrerender?: boolean | undefined;
         serverIslands?: boolean | undefined;
         contentIntellisense?: boolean | undefined;
-        contentLayer?: boolean | undefined;
     } | undefined;
     legacy?: {} | undefined;
 }>;
@@ -1487,19 +1481,16 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         clientPrerender: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
         serverIslands: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
         contentIntellisense: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
-        contentLayer: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
     }, "strict", z.ZodTypeAny, {
         contentCollectionCache: boolean;
         clientPrerender: boolean;
         serverIslands: boolean;
         contentIntellisense: boolean;
-        contentLayer: boolean;
     }, {
         contentCollectionCache?: boolean | undefined;
         clientPrerender?: boolean | undefined;
         serverIslands?: boolean | undefined;
         contentIntellisense?: boolean | undefined;
-        contentLayer?: boolean | undefined;
     }>>;
     legacy: z.ZodDefault<z.ZodObject<{}, "strip", z.ZodTypeAny, {}, {}>>;
 }, {
@@ -1700,7 +1691,6 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         clientPrerender: boolean;
         serverIslands: boolean;
         contentIntellisense: boolean;
-        contentLayer: boolean;
     };
     legacy: {};
     site?: string | undefined;
@@ -1864,7 +1854,6 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         clientPrerender?: boolean | undefined;
         serverIslands?: boolean | undefined;
         contentIntellisense?: boolean | undefined;
-        contentLayer?: boolean | undefined;
     } | undefined;
     legacy?: {} | undefined;
 }>, {
@@ -1991,7 +1980,6 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         clientPrerender: boolean;
         serverIslands: boolean;
         contentIntellisense: boolean;
-        contentLayer: boolean;
     };
     legacy: {};
     site?: string | undefined;
@@ -2155,7 +2143,6 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         clientPrerender?: boolean | undefined;
         serverIslands?: boolean | undefined;
         contentIntellisense?: boolean | undefined;
-        contentLayer?: boolean | undefined;
     } | undefined;
     legacy?: {} | undefined;
 }>, {
@@ -2282,7 +2269,6 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         clientPrerender: boolean;
         serverIslands: boolean;
         contentIntellisense: boolean;
-        contentLayer: boolean;
     };
     legacy: {};
     site?: string | undefined;
@@ -2446,7 +2432,6 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         clientPrerender?: boolean | undefined;
         serverIslands?: boolean | undefined;
         contentIntellisense?: boolean | undefined;
-        contentLayer?: boolean | undefined;
     } | undefined;
     legacy?: {} | undefined;
 }>, {
@@ -2573,7 +2558,6 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         clientPrerender: boolean;
         serverIslands: boolean;
         contentIntellisense: boolean;
-        contentLayer: boolean;
     };
     legacy: {};
     site?: string | undefined;
@@ -2737,7 +2721,6 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         clientPrerender?: boolean | undefined;
         serverIslands?: boolean | undefined;
         contentIntellisense?: boolean | undefined;
-        contentLayer?: boolean | undefined;
     } | undefined;
     legacy?: {} | undefined;
 }>;

package/dist/core/config/schema.js

@@ -50,8 +50,7 @@ const ASTRO_CONFIG_DEFAULTS = {
     contentCollectionCache: false,
     clientPrerender: false,
     serverIslands: false,
-    contentIntellisense: false,
-    contentLayer: false
+    contentIntellisense: false
   }
 };
 const AstroConfigSchema = z.object({
@@ -329,8 +328,7 @@ const AstroConfigSchema = z.object({
     contentCollectionCache: z.boolean().optional().default(ASTRO_CONFIG_DEFAULTS.experimental.contentCollectionCache),
     clientPrerender: z.boolean().optional().default(ASTRO_CONFIG_DEFAULTS.experimental.clientPrerender),
     serverIslands: z.boolean().optional().default(ASTRO_CONFIG_DEFAULTS.experimental.serverIslands),
-    contentIntellisense: z.boolean().optional().default(ASTRO_CONFIG_DEFAULTS.experimental.contentIntellisense),
-    contentLayer: z.boolean().optional().default(ASTRO_CONFIG_DEFAULTS.experimental.contentLayer)
+    contentIntellisense: z.boolean().optional().default(ASTRO_CONFIG_DEFAULTS.experimental.contentIntellisense)
   }).strict(
     `Invalid or outdated experimental feature.
 Check for incorrect spelling or outdated Astro version.

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "5.0.0-alpha.3";
+const ASTRO_VERSION = "5.0.0-alpha.4";
 const REROUTE_DIRECTIVE_HEADER = "X-Astro-Reroute";
 const REWRITE_DIRECTIVE_HEADER_KEY = "X-Astro-Rewrite";
 const REWRITE_DIRECTIVE_HEADER_VALUE = "yes";

package/dist/core/dev/dev.js

@@ -22,7 +22,7 @@ async function dev(inlineConfig) {
   await telemetry.record([]);
   const restart = await createContainerWithAutomaticRestart({ inlineConfig, fs });
   const logger = restart.container.logger;
-  const currentVersion = "5.0.0-alpha.3";
+  const currentVersion = "5.0.0-alpha.4";
   const isPrerelease = currentVersion.includes("-");
   if (!isPrerelease) {
     try {

package/dist/core/dev/restart.js

@@ -125,15 +125,13 @@ async function createContainerWithAutomaticRestart({
       { key: "u", description: "" },
       { key: "c", description: "" }
     ];
-    if (restart.container.settings.config.experimental.contentLayer) {
-      customShortcuts.push({
-        key: "s",
-        description: "sync content layer",
-        action: () => {
-          globalContentLayer.get()?.sync();
-        }
-      });
-    }
+    customShortcuts.push({
+      key: "s",
+      description: "sync content layer",
+      action: () => {
+        globalContentLayer.get()?.sync();
+      }
+    });
     restart.container.viteServer.bindCLIShortcuts({
       customShortcuts
     });

package/dist/core/messages.js

@@ -38,7 +38,7 @@ function serverStart({
   host,
   base
 }) {
-  const version = "5.0.0-alpha.3";
+  const version = "5.0.0-alpha.4";
   const localPrefix = `${dim("\u2503")} Local    `;
   const networkPrefix = `${dim("\u2503")} Network  `;
   const emptyPrefix = " ".repeat(11);
@@ -270,7 +270,7 @@ function printHelp({
     message.push(
       linebreak(),
       `  ${bgGreen(black(` ${commandName} `))} ${green(
-        `v${"5.0.0-alpha.3"}`
+        `v${"5.0.0-alpha.4"}`
       )} ${headline}`
     );
   }

package/dist/core/sync/index.js

@@ -1,8 +1,10 @@
 import fsMod, { existsSync } from "node:fs";
+import { dirname, relative } from "node:path";
 import { performance } from "node:perf_hooks";
 import { fileURLToPath } from "node:url";
 import { dim } from "kleur/colors";
 import { createServer } from "vite";
+import { normalizePath } from "vite";
 import { CONTENT_TYPES_FILE } from "../../content/consts.js";
 import { getDataStoreFile, globalContentLayer } from "../../content/content-layer.js";
 import { createContentTypesGenerator } from "../../content/index.js";
@@ -27,7 +29,6 @@ import {
 } from "../errors/index.js";
 import { formatErrorMessage } from "../messages.js";
 import { ensureProcessNodeEnv } from "../util.js";
-import { writeFiles } from "./write-files.js";
 async function sync(inlineConfig, { fs, telemetry: _telemetry = false } = {}) {
   ensureProcessNodeEnv("production");
   const logger = createNodeLogger(inlineConfig);
@@ -97,7 +98,7 @@ async function syncInternal({
       });
     }
     syncAstroEnv(settings);
-    await writeFiles(settings, fs, logger);
+    writeInjectedTypes(settings, fs);
     logger.info("types", `Generated ${dim(getTimeStat(timerStart, performance.now()))}`);
   } catch (err) {
     const error = createSafeError(err);
@@ -108,6 +109,29 @@ async function syncInternal({
     throw error;
   }
 }
+function getTsReference(type, value) {
+  return `/// <reference ${type}=${JSON.stringify(value)} />`;
+}
+const CLIENT_TYPES_REFERENCE = getTsReference("types", "astro/client");
+function writeInjectedTypes(settings, fs) {
+  const references = [];
+  for (const { filename, content } of settings.injectedTypes) {
+    const filepath = fileURLToPath(new URL(filename, settings.dotAstroDir));
+    fs.mkdirSync(dirname(filepath), { recursive: true });
+    fs.writeFileSync(filepath, content, "utf-8");
+    references.push(normalizePath(relative(fileURLToPath(settings.dotAstroDir), filepath)));
+  }
+  const astroDtsContent = `${CLIENT_TYPES_REFERENCE}
+${references.map((reference) => getTsReference("path", reference)).join("\n")}`;
+  if (references.length === 0) {
+    fs.mkdirSync(settings.dotAstroDir, { recursive: true });
+  }
+  fs.writeFileSync(
+    fileURLToPath(new URL("./types.d.ts", settings.dotAstroDir)),
+    astroDtsContent,
+    "utf-8"
+  );
+}
 async function syncContentCollections(settings, { logger, fs }) {
   const tempViteServer = await createServer(
     await createVite(

package/dist/integrations/hooks.js

@@ -276,18 +276,16 @@ async function runHookServerSetup({
   logger
 }) {
   let refreshContent;
-  if (config.experimental?.contentLayer) {
-    refreshContent = async (options) => {
-      const contentConfig = globalContentConfigObserver.get();
-      if (contentConfig.status !== "loaded" || !Object.values(contentConfig.config.collections).some(
-        (collection) => collection.type === CONTENT_LAYER_TYPE
-      )) {
-        return;
-      }
-      const contentLayer = await globalContentLayer.get();
-      await contentLayer?.sync(options);
-    };
-  }
+  refreshContent = async (options) => {
+    const contentConfig = globalContentConfigObserver.get();
+    if (contentConfig.status !== "loaded" || !Object.values(contentConfig.config.collections).some(
+      (collection) => collection.type === CONTENT_LAYER_TYPE
+    )) {
+      return;
+    }
+    const contentLayer = await globalContentLayer.get();
+    await contentLayer?.sync(options);
+  };
   for (const integration of config.integrations) {
     if (integration?.hooks?.["astro:server:setup"]) {
       await withTakingALongTimeMsg({

package/dist/types/public/config.d.ts

@@ -1573,204 +1573,6 @@ export interface AstroUserConfig {
          * To use this feature with the Astro VS Code extension, you must also enable the `astro.content-intellisense` option in your VS Code settings. For editors using the Astro language server directly, pass the `contentIntellisense: true` initialization parameter to enable this feature.
          */
         contentIntellisense?: boolean;
-        /**
-         * @docs
-         * @name experimental.contentLayer
-         * @type {boolean}
-         * @default `false`
-         * @version 4.14.0
-         * @description
-         *
-         * The Content Layer API is a new way to handle content and data in Astro. It is similar to and builds upon [content collections](/en/guides/content-collections/), taking them beyond local files in `src/content/` and allowing you to fetch content from anywhere, including remote APIs, by adding a `loader` to your collection.
-         *
-         * Your existing content collections can be [migrated to the Content Layer API](#migrating-an-existing-content-collection-to-use-the-content-layer-api) with a few small changes. However, it is not necessary to update all your collections at once to add a new collection powered by the Content Layer API. You may have collections using both the existing and new APIs defined in `src/content/config.ts` at the same time.
-         *
-         * The Content Layer API is designed to be more powerful and more performant, helping sites scale to thousands of pages. Data is cached between builds and updated incrementally. Markdown parsing is also 5-10 times faster, with similar scale reductions in memory, and MDX is 2-3 times faster.
-         *
-         * To enable, add the `contentLayer` flag to the `experimental` object in your Astro config:
-         *
-         * ```js
-         * // astro.config.mjs
-         * {
-         * 	experimental: {
-         * 		contentLayer: true,
-         * 	}
-         * }
-         * ```
-         *
-         * #### Fetching data with a `loader`
-         *
-         * The Content Layer API allows you to fetch your content from outside of the `src/content/` folder (whether stored locally in your project or remotely) and uses a `loader` property to retrieve your data.
-         *
-         * The `loader` is defined in the collection's schema and returns an array of entries. Astro provides two built-in loader functions (`glob()` and `file()`) for fetching your local content, as well as access to the API to [construct your own loader and fetch remote data](#creating-a-loader).
-         *
-         * The `glob()` loader creates entries from directories of Markdown, MDX, Markdoc, or JSON files from anywhere on the filesystem. It accepts a `pattern` of entry files to match, and a `base` file path of where your files are located. Use this when you have one file per entry.
-         *
-         * The `file()` loader creates multiple entries from a single local file. Use this when all your entries are stored in an array of objects.
-         *
-         * ```ts  {3,8,19}
-         * // src/content/config.ts
-         * import { defineCollection, z } from 'astro:content';
-         * import { glob, file } from 'astro/loaders';
-         *
-         * const blog = defineCollection({
-         *   // By default the ID is a slug generated from
-         *   // the path of the file relative to `base`
-         *   loader: glob({ pattern: "**\/*.md", base: "./src/data/blog" }),
-         *   schema: z.object({
-         *     title: z.string(),
-         *     description: z.string(),
-         *     pubDate: z.coerce.date(),
-         *     updatedDate: z.coerce.date().optional(),
-         *   })
-         * });
-         *
-         * const dogs = defineCollection({
-         *   // The path is relative to the project root, or an absolute path.
-         *   loader: file("src/data/dogs.json"),
-         *   schema: z.object({
-         *     id: z.string(),
-         *     breed: z.string(),
-         *     temperament: z.array(z.string()),
-         *   }),
-         * });
-         *
-         * export const collections = { blog, dogs };
-         * ```
-         *
-         * :::note
-         * Loaders will not automatically [exclude files prefaced with an `_`](/en/guides/routing/#excluding-pages). Use a regular expression such as `pattern: '**\/[^_]*.md'` in your loader to ignore these files.
-         * :::
-         *
-         * #### Querying and rendering with the Content Layer API
-         *
-         * The collection can be [queried in the same way as content collections](/en/guides/content-collections/#querying-collections):
-         *
-         * ```ts
-         * // src/pages/index.astro
-         * import { getCollection, getEntry } from 'astro:content';
-         *
-         * // Get all entries from a collection.
-         * // Requires the name of the collection as an argument.
-         * const allBlogPosts = await getCollection('blog');
-         *
-         * // Get a single entry from a collection.
-         * // Requires the name of the collection and ID
-         * const labradorData = await getEntry('dogs', 'labrador-retriever');
-         * ```
-         *
-         * Entries generated from Markdown, MDX, or Markdoc can be rendered directly to a page using the `render()` function.
-         *
-         * :::note
-         * The syntax for rendering collection entries is different from the current content collections syntax.
-         * :::
-         *
-         * ```astro title="src/pages/[slug].astro"
-         * ---
-         * import { getEntry, render } from 'astro:content';
-         *
-         * const post = await getEntry('blog', Astro.params.slug);
-         *
-         * const { Content, headings } = await render(post);
-         * ---
-         *
-         * <Content />
-         * ```
-         *
-         * #### Creating a loader
-         *
-         * With the Content Layer API, you can build loaders to load or generate content from anywhere.
-         *
-         * For example, you can create a loader that fetches collection entries from a remote API.
-         *
-         * ```ts
-         * // src/content/config.ts
-         * const countries = defineCollection({
-         *   loader: async () => {
-         *     const response = await fetch("https://restcountries.com/v3.1/all");
-         *     const data = await response.json();
-         *     // Must return an array of entries with an id property,
-         *     // or an object with IDs as keys and entries as values
-         *     return data.map((country) => ({
-         *       id: country.cca3,
-         *       ...country,
-         *     }));
-         *   },
-         *   // optionally add a schema
-         *   // schema: z.object...
-         * });
-         *
-         * export const collections = { countries };
-         * ```
-         *
-         * For more advanced loading logic, you can define an object loader. This allows incremental updates and conditional loading while also giving full access to the data store. See the API in [the Content Layer API RFC](https://github.com/withastro/roadmap/blob/content-layer/proposals/0047-content-layer.md#loaders).
-         *
-         * #### Migrating an existing content collection to use the Content Layer API
-         *
-         * You can convert an existing content collection with Markdown, MDX, Markdoc, or JSON entries to use the Content Layer API.
-         *
-         * 1. **Move the collection folder out of `src/content/`** (e.g. to `src/data/`). All collections located in the `src/content/` folder will use the existing Content Collections API.
-         *
-         *     **Do not move the existing `src/content/config.ts` file**. This file will define all collections, using either API.
-         *
-         * 2. **Edit the collection definition**. Your updated collection requires a `loader`, and the option to select a collection `type` is no longer available.
-         *
-         *     ```ts ins={3,8} del={7}
-         *     // src/content/config.ts
-         *     import { defineCollection, z } from 'astro:content';
-         *     import { glob } from 'astro/loaders';
-         *
-         *     const blog = defineCollection({
-         *       // For content layer you no longer define a `type`
-         *       type: 'content',
-         *       loader: glob({ pattern: '**\/[^_]*.md', base: "./src/data/blog" }),
-         *       schema: z.object({
-         *         title: z.string(),
-         *         description: z.string(),
-         *         pubDate: z.coerce.date(),
-         *         updatedDate: z.coerce.date().optional(),
-         *       }),
-         *     });
-         *     ```
-         *
-         * 3. **Change references from `slug` to `id`**. Content layer collections do not have a `slug` field. Instead, all updated collections will have an `id`.
-         *
-         *     ```astro ins={7} del={6}
-         *     // src/pages/index.astro
-         *     ---
-         *     export async function getStaticPaths() {
-         *       const posts = await getCollection('blog');
-         *       return posts.map((post) => ({
-         *         params: { slug: post.slug },
-         *         params: { slug: post.id },
-         *         props: post,
-         *       }));
-         *     }
-         *     ---
-         *     ```
-         *
-         * 4. **Switch to the new `render()` function**. Entries no longer have a `render()` method, as they are now serializable plain objects. Instead, import the `render()` function from `astro:content`.
-         *
-         *     ```astro ins={4,9} del={3,8}
-         *     // src/pages/index.astro
-         *     ---
-         *     import { getEntry } from 'astro:content';
-         *     import { getEntry, render } from 'astro:content';
-         *
-         *     const post = await getEntry('blog', params.slug);
-         *
-         *     const { Content, headings } = await post.render();
-         *     const { Content, headings } = await render(post);
-         *     ---
-         *
-         *     <Content />
-         *     ```
-         *
-         * #### Learn more
-         *
-         * For a complete overview and the full API reference, see [the Content Layer API RFC](https://github.com/withastro/roadmap/blob/content-layer/proposals/0047-content-layer.md) and [share your feedback](https://github.com/withastro/roadmap/pull/982).
-         */
-        contentLayer?: boolean;
     };
 }
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "5.0.0-alpha.3",
+  "version": "5.0.0-alpha.4",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -168,8 +168,8 @@
     "zod-to-json-schema": "^3.23.2",
     "zod-to-ts": "^1.2.0",
     "@astrojs/internal-helpers": "0.4.1",
-    "@astrojs/markdown-remark": "6.0.0-alpha.1",
-    "@astrojs/telemetry": "3.1.0"
+    "@astrojs/telemetry": "3.1.0",
+    "@astrojs/markdown-remark": "6.0.0-alpha.1"
   },
   "optionalDependencies": {
     "sharp": "^0.33.3"

package/dist/core/sync/constants.d.ts

@@ -1 +0,0 @@
-export declare const REFERENCE_FILE = "./types.d.ts";

package/dist/core/sync/constants.js

@@ -1,4 +0,0 @@
-const REFERENCE_FILE = "./types.d.ts";
-export {
-  REFERENCE_FILE
-};

package/dist/core/sync/write-files.d.ts

@@ -1,4 +0,0 @@
-import type fsMod from 'node:fs';
-import type { AstroSettings } from '../../types/astro.js';
-import type { Logger } from '../logger/core.js';
-export declare function writeFiles(settings: AstroSettings, fs: typeof fsMod, logger: Logger): Promise<void>;

package/dist/core/sync/write-files.js

@@ -1,67 +0,0 @@
-import { dirname, relative } from "node:path";
-import { fileURLToPath } from "node:url";
-import { bold } from "kleur/colors";
-import { normalizePath } from "vite";
-import { AstroError, AstroErrorData } from "../errors/index.js";
-import { REFERENCE_FILE } from "./constants.js";
-async function writeFiles(settings, fs, logger) {
-  try {
-    writeInjectedTypes(settings, fs);
-    await setUpEnvTs(settings, fs, logger);
-  } catch (e) {
-    throw new AstroError(AstroErrorData.UnknownFilesystemError, { cause: e });
-  }
-}
-function getTsReference(type, value) {
-  return `/// <reference ${type}=${JSON.stringify(value)} />`;
-}
-const CLIENT_TYPES_REFERENCE = getTsReference("types", "astro/client");
-function writeInjectedTypes(settings, fs) {
-  const references = [];
-  for (const { filename, content } of settings.injectedTypes) {
-    const filepath = fileURLToPath(new URL(filename, settings.dotAstroDir));
-    fs.mkdirSync(dirname(filepath), { recursive: true });
-    fs.writeFileSync(filepath, content, "utf-8");
-    references.push(normalizePath(relative(fileURLToPath(settings.dotAstroDir), filepath)));
-  }
-  const astroDtsContent = `${CLIENT_TYPES_REFERENCE}
-${references.map((reference) => getTsReference("path", reference)).join("\n")}`;
-  if (references.length === 0) {
-    fs.mkdirSync(settings.dotAstroDir, { recursive: true });
-  }
-  fs.writeFileSync(
-    fileURLToPath(new URL(REFERENCE_FILE, settings.dotAstroDir)),
-    astroDtsContent,
-    "utf-8"
-  );
-}
-async function setUpEnvTs(settings, fs, logger) {
-  const envTsPath = fileURLToPath(new URL("env.d.ts", settings.config.srcDir));
-  const envTsPathRelativetoRoot = relative(fileURLToPath(settings.config.root), envTsPath);
-  const relativePath = normalizePath(
-    relative(
-      fileURLToPath(settings.config.srcDir),
-      fileURLToPath(new URL(REFERENCE_FILE, settings.dotAstroDir))
-    )
-  );
-  const expectedTypeReference = getTsReference("path", relativePath);
-  if (fs.existsSync(envTsPath)) {
-    const initialEnvContents = await fs.promises.readFile(envTsPath, "utf-8");
-    let typesEnvContents = initialEnvContents;
-    if (!typesEnvContents.includes(expectedTypeReference)) {
-      typesEnvContents = `${expectedTypeReference}
-${typesEnvContents}`;
-    }
-    if (initialEnvContents !== typesEnvContents) {
-      logger.info("types", `Updated ${bold(envTsPathRelativetoRoot)} type declarations.`);
-      await fs.promises.writeFile(envTsPath, typesEnvContents, "utf-8");
-    }
-  } else {
-    await fs.promises.mkdir(settings.config.srcDir, { recursive: true });
-    await fs.promises.writeFile(envTsPath, expectedTypeReference, "utf-8");
-    logger.info("types", `Added ${bold(envTsPathRelativetoRoot)} type declarations`);
-  }
-}
-export {
-  writeFiles
-};