astro 4.13.4 → 4.14.1

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

@@ -1,6 +1,7 @@
 import nodeFs from "node:fs";
 import { extname } from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
+import { dataToEsm } from "@rollup/pluginutils";
 import glob from "fast-glob";
 import pLimit from "p-limit";
 import { encodeName } from "../core/build/util.js";
@@ -10,9 +11,18 @@ import { isServerLikeOutput } from "../core/util.js";
 import { rootRelativePath } from "../core/viteUtils.js";
 import { createDefaultAstroMetadata } from "../vite-plugin-astro/metadata.js";
 import {
+  ASSET_IMPORTS_FILE,
+  ASSET_IMPORTS_RESOLVED_STUB_ID,
+  ASSET_IMPORTS_VIRTUAL_ID,
   CONTENT_FLAG,
   CONTENT_RENDER_FLAG,
   DATA_FLAG,
+  DATA_STORE_FILE,
+  DATA_STORE_VIRTUAL_ID,
+  MODULES_IMPORTS_FILE,
+  MODULES_MJS_ID,
+  MODULES_MJS_VIRTUAL_ID,
+  RESOLVED_DATA_STORE_VIRTUAL_ID,
   RESOLVED_VIRTUAL_MODULE_ID,
   VIRTUAL_MODULE_ID
 } from "./consts.js";
@@ -25,7 +35,8 @@ import {
   getEntryConfigByExtMap,
   getEntrySlug,
   getEntryType,
-  getExtGlob
+  getExtGlob,
+  isDeferredModule
 } from "./utils.js";
 function astroContentVirtualModPlugin({
   settings,
@@ -33,13 +44,14 @@ function astroContentVirtualModPlugin({
 }) {
   let IS_DEV = false;
   const IS_SERVER = isServerLikeOutput(settings.config);
+  const dataStoreFile = new URL(DATA_STORE_FILE, settings.config.cacheDir);
   return {
     name: "astro-content-virtual-mod-plugin",
     enforce: "pre",
     configResolved(config) {
       IS_DEV = config.mode === "development";
     },
-    resolveId(id) {
+    async resolveId(id) {
       if (id === VIRTUAL_MODULE_ID) {
         if (!settings.config.experimental.contentCollectionCache) {
           return RESOLVED_VIRTUAL_MODULE_ID;
@@ -50,6 +62,35 @@ function astroContentVirtualModPlugin({
           return { id: RESOLVED_VIRTUAL_MODULE_ID, external: true };
         }
       }
+      if (id === DATA_STORE_VIRTUAL_ID) {
+        return RESOLVED_DATA_STORE_VIRTUAL_ID;
+      }
+      if (isDeferredModule(id)) {
+        const [, query] = id.split("?");
+        const params = new URLSearchParams(query);
+        const fileName = params.get("fileName");
+        let importerPath = void 0;
+        if (fileName && URL.canParse(fileName, settings.config.root.toString())) {
+          importerPath = fileURLToPath(new URL(fileName, settings.config.root));
+        }
+        if (importerPath) {
+          return await this.resolve(importerPath);
+        }
+      }
+      if (id === MODULES_MJS_ID) {
+        const modules = new URL(MODULES_IMPORTS_FILE, settings.dotAstroDir);
+        if (fs.existsSync(modules)) {
+          return fileURLToPath(modules);
+        }
+        return MODULES_MJS_VIRTUAL_ID;
+      }
+      if (id === ASSET_IMPORTS_VIRTUAL_ID) {
+        const assetImportsFile = new URL(ASSET_IMPORTS_FILE, settings.dotAstroDir);
+        if (fs.existsSync(assetImportsFile)) {
+          return fileURLToPath(assetImportsFile);
+        }
+        return ASSET_IMPORTS_RESOLVED_STUB_ID;
+      }
     },
     async load(id, args) {
       if (id === RESOLVED_VIRTUAL_MODULE_ID) {
@@ -75,6 +116,38 @@ function astroContentVirtualModPlugin({
           }
         };
       }
+      if (id === RESOLVED_DATA_STORE_VIRTUAL_ID) {
+        if (!fs.existsSync(dataStoreFile)) {
+          return "export default new Map()";
+        }
+        const jsonData = await fs.promises.readFile(dataStoreFile, "utf-8");
+        try {
+          const parsed = JSON.parse(jsonData);
+          return {
+            code: dataToEsm(parsed, {
+              compact: true
+            }),
+            map: { mappings: "" }
+          };
+        } catch (err) {
+          const message = "Could not parse JSON file";
+          this.error({ message, id, cause: err });
+        }
+      }
+      if (id === ASSET_IMPORTS_RESOLVED_STUB_ID) {
+        const assetImportsFile = new URL(ASSET_IMPORTS_FILE, settings.dotAstroDir);
+        if (!fs.existsSync(assetImportsFile)) {
+          return "export default new Map()";
+        }
+        return fs.readFileSync(assetImportsFile, "utf-8");
+      }
+      if (id === MODULES_MJS_VIRTUAL_ID) {
+        const modules = new URL(MODULES_IMPORTS_FILE, settings.dotAstroDir);
+        if (!fs.existsSync(modules)) {
+          return "export default new Map()";
+        }
+        return fs.readFileSync(modules, "utf-8");
+      }
     },
     renderChunk(code, chunk) {
       if (!settings.config.experimental.contentCollectionCache) {
@@ -85,6 +158,25 @@ function astroContentVirtualModPlugin({
         const prefix = depth > 0 ? "../".repeat(depth) : "./";
         return code.replaceAll(RESOLVED_VIRTUAL_MODULE_ID, `${prefix}content/entry.mjs`);
       }
+    },
+    configureServer(server) {
+      const dataStorePath = fileURLToPath(dataStoreFile);
+      if (Array.isArray(server.watcher.options.ignored)) {
+        server.watcher.options.ignored.push(`!${dataStorePath}`);
+      }
+      server.watcher.add(dataStorePath);
+      server.watcher.on("change", (changedPath) => {
+        if (changedPath === dataStorePath) {
+          const module = server.moduleGraph.getModuleById(RESOLVED_DATA_STORE_VIRTUAL_ID);
+          if (module) {
+            server.moduleGraph.invalidateModule(module);
+          }
+          server.ws.send({
+            type: "full-reload",
+            path: "*"
+          });
+        }
+      });
     }
   };
 }

package/dist/core/build/index.js

@@ -20,6 +20,7 @@ import { levels, timerMessage } from "../logger/core.js";
 import { apply as applyPolyfill } from "../polyfill.js";
 import { createRouteManifest } from "../routing/index.js";
 import { getServerIslandRouteData } from "../server-islands/endpoint.js";
+import { clearContentLayerCache } from "../sync/index.js";
 import { ensureProcessNodeEnv, isServerLikeOutput } from "../util.js";
 import { collectPagesData } from "./page-data.js";
 import { staticBuild, viteBuild } from "./static-build.js";
@@ -30,13 +31,16 @@ async function build(inlineConfig, options = {}) {
   const logger = createNodeLogger(inlineConfig);
   const { userConfig, astroConfig } = await resolveConfig(inlineConfig, "build");
   telemetry.record(eventCliSession("build", userConfig));
-  if (astroConfig.experimental.contentCollectionCache && options.force) {
-    const contentCacheDir = new URL("./content/", astroConfig.cacheDir);
-    if (fs.existsSync(contentCacheDir)) {
-      logger.debug("content", "clearing content cache");
-      await fs.promises.rm(contentCacheDir, { force: true, recursive: true });
-      logger.warn("content", "content cache cleared (force)");
+  if (inlineConfig.force) {
+    if (astroConfig.experimental.contentCollectionCache) {
+      const contentCacheDir = new URL("./content/", astroConfig.cacheDir);
+      if (fs.existsSync(contentCacheDir)) {
+        logger.debug("content", "clearing content cache");
+        await fs.promises.rm(contentCacheDir, { force: true, recursive: true });
+        logger.warn("content", "content cache cleared (force)");
+      }
     }
+    await clearContentLayerCache({ astroConfig, logger, fs });
   }
   const settings = await createSettings(astroConfig, fileURLToPath(astroConfig.root));
   const builder = new AstroBuilder(settings, {
@@ -167,15 +171,18 @@ class AstroBuilder {
         buildMode: this.settings.config.output
       });
     }
-    this.settings.timer.writeStats();
   }
   /** Build the given Astro project.  */
   async run() {
+    this.settings.timer.start("Total build");
     const setupData = await this.setup();
     try {
       await this.build(setupData);
     } catch (_err) {
       throw _err;
+    } finally {
+      this.settings.timer.end("Total build");
+      this.settings.timer.writeStats();
     }
   }
   validateConfig() {

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

@@ -12,6 +12,24 @@ import { RENDERERS_MODULE_ID } from "./plugin-renderers.js";
 import { getComponentFromVirtualModulePageName, getVirtualModulePageName } from "./util.js";
 const SSR_VIRTUAL_MODULE_ID = "@astrojs-ssr-virtual-entry";
 const RESOLVED_SSR_VIRTUAL_MODULE_ID = "\0" + SSR_VIRTUAL_MODULE_ID;
+const ADAPTER_VIRTUAL_MODULE_ID = "@astrojs-ssr-adapter";
+const RESOLVED_ADAPTER_VIRTUAL_MODULE_ID = "\0" + ADAPTER_VIRTUAL_MODULE_ID;
+function vitePluginAdapter(adapter) {
+  return {
+    name: "@astrojs/vite-plugin-astro-adapter",
+    enforce: "post",
+    resolveId(id) {
+      if (id === ADAPTER_VIRTUAL_MODULE_ID) {
+        return RESOLVED_ADAPTER_VIRTUAL_MODULE_ID;
+      }
+    },
+    async load(id) {
+      if (id === RESOLVED_ADAPTER_VIRTUAL_MODULE_ID) {
+        return `export * from '${adapter.serverEntrypoint}';`;
+      }
+    }
+  };
+}
 function vitePluginSSR(internals, adapter, options) {
   return {
     name: "@astrojs/vite-plugin-astro-ssr-server",
@@ -26,7 +44,7 @@ function vitePluginSSR(internals, adapter, options) {
       }
       const adapterServerEntrypoint = options.settings.adapter?.serverEntrypoint;
       if (adapterServerEntrypoint) {
-        inputs.add(adapterServerEntrypoint);
+        inputs.add(ADAPTER_VIRTUAL_MODULE_ID);
       }
       inputs.add(SSR_VIRTUAL_MODULE_ID);
       return addRollupInput(opts, Array.from(inputs));
@@ -98,7 +116,12 @@ function pluginSSR(options, internals) {
     targets: ["server"],
     hooks: {
       "build:before": () => {
-        let vitePlugin = ssr && functionPerRouteEnabled === false ? vitePluginSSR(internals, options.settings.adapter, options) : void 0;
+        const adapter = options.settings.adapter;
+        let ssrPlugin = ssr && functionPerRouteEnabled === false ? vitePluginSSR(internals, adapter, options) : void 0;
+        const vitePlugin = [vitePluginAdapter(adapter)];
+        if (ssrPlugin) {
+          vitePlugin.unshift(ssrPlugin);
+        }
         return {
           enforce: "after-user-plugins",
           vitePlugin
@@ -185,7 +208,12 @@ function pluginSSRSplit(options, internals) {
     targets: ["server"],
     hooks: {
       "build:before": () => {
-        let vitePlugin = ssr && functionPerRouteEnabled ? vitePluginSSRSplit(internals, options.settings.adapter, options) : void 0;
+        const adapter = options.settings.adapter;
+        let ssrPlugin = ssr && functionPerRouteEnabled ? vitePluginSSRSplit(internals, adapter, options) : void 0;
+        const vitePlugin = [vitePluginAdapter(adapter)];
+        if (ssrPlugin) {
+          vitePlugin.unshift(ssrPlugin);
+        }
         return {
           enforce: "after-user-plugins",
           vitePlugin
@@ -199,7 +227,7 @@ function generateSSRCode(settings, adapter, middlewareId) {
   const pageMap = isFunctionPerRouteEnabled(adapter) ? "pageModule" : "pageMap";
   const imports = [
     `import { renderers } from '${RENDERERS_MODULE_ID}';`,
-    `import * as serverEntrypointModule from '${adapter.serverEntrypoint}';`,
+    `import * as serverEntrypointModule from '${ADAPTER_VIRTUAL_MODULE_ID}';`,
     `import { manifest as defaultManifest } from '${SSR_MANIFEST_VIRTUAL_MODULE_ID}';`,
     edgeMiddleware ? `` : `import { onRequest as middleware } from '${middlewareId}';`,
     settings.config.experimental.serverIslands ? `import { serverIslandMap } from '${VIRTUAL_ISLAND_MAP_ID}';` : ""

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

@@ -1,13 +1,10 @@
 import fs from 'node:fs';
-import type { Arguments as Flags } from 'yargs-parser';
-import type { AstroConfig, AstroInlineConfig, AstroUserConfig, CLIFlags } from '../../@types/astro.js';
-/** Convert the generic "yargs" flag object into our own, custom TypeScript object. */
-export declare function resolveFlags(flags: Partial<Flags>): CLIFlags;
+import type { AstroConfig, AstroInlineConfig, AstroUserConfig } from '../../@types/astro.js';
 export declare function resolveRoot(cwd?: string | URL): string;
 export declare const configPaths: readonly string[];
 interface ResolveConfigPathOptions {
     root: string;
-    configFile?: string;
+    configFile?: string | false;
     fs: typeof fs;
 }
 /**

package/dist/core/config/config.js

@@ -10,17 +10,6 @@ import { formatConfigErrorMessage } from "../messages.js";
 import { mergeConfig } from "./merge.js";
 import { validateConfig } from "./validate.js";
 import { loadConfigWithVite } from "./vite-load.js";
-function resolveFlags(flags) {
-  return {
-    root: typeof flags.root === "string" ? flags.root : void 0,
-    site: typeof flags.site === "string" ? flags.site : void 0,
-    base: typeof flags.base === "string" ? flags.base : void 0,
-    port: typeof flags.port === "number" ? flags.port : void 0,
-    config: typeof flags.config === "string" ? flags.config : void 0,
-    host: typeof flags.host === "string" || typeof flags.host === "boolean" ? flags.host : void 0,
-    open: typeof flags.open === "string" || typeof flags.open === "boolean" ? flags.open : void 0
-  };
-}
 function resolveRoot(cwd) {
   if (cwd instanceof URL) {
     cwd = fileURLToPath(cwd);
@@ -115,6 +104,5 @@ export {
   configPaths,
   resolveConfig,
   resolveConfigPath,
-  resolveFlags,
   resolveRoot
 };

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

@@ -1,4 +1,4 @@
-export { configPaths, resolveConfig, resolveConfigPath, resolveFlags, resolveRoot, } from './config.js';
+export { configPaths, resolveConfig, resolveConfigPath, resolveRoot, } from './config.js';
 export { createNodeLogger } from './logging.js';
 export { mergeConfig } from './merge.js';
 export type { AstroConfigType } from './schema.js';

package/dist/core/config/index.js

@@ -2,7 +2,6 @@ import {
   configPaths,
   resolveConfig,
   resolveConfigPath,
-  resolveFlags,
   resolveRoot
 } from "./config.js";
 import { createNodeLogger } from "./logging.js";
@@ -17,7 +16,6 @@ export {
   mergeConfig,
   resolveConfig,
   resolveConfigPath,
-  resolveFlags,
   resolveRoot,
   updateTSConfigForFramework
 };

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

@@ -57,9 +57,11 @@ export declare const ASTRO_CONFIG_DEFAULTS: {
         clientPrerender: false;
         globalRoutePriority: false;
         serverIslands: false;
+        contentIntellisense: false;
         env: {
             validateSecrets: false;
         };
+        contentLayer: false;
     };
 };
 export declare const AstroConfigSchema: z.ZodObject<{
@@ -613,6 +615,8 @@ export declare const AstroConfigSchema: z.ZodObject<{
             })> | undefined;
         }>>;
         serverIslands: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
+        contentIntellisense: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
+        contentLayer: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
     }, "strict", z.ZodTypeAny, {
         actions: boolean;
         directRenderScript: boolean;
@@ -620,6 +624,8 @@ export declare const AstroConfigSchema: z.ZodObject<{
         clientPrerender: boolean;
         globalRoutePriority: boolean;
         serverIslands: boolean;
+        contentIntellisense: boolean;
+        contentLayer: boolean;
         env?: {
             validateSecrets: boolean;
             schema?: Record<string, ({
@@ -669,6 +675,8 @@ export declare const AstroConfigSchema: z.ZodObject<{
         clientPrerender?: boolean | undefined;
         globalRoutePriority?: boolean | undefined;
         serverIslands?: boolean | undefined;
+        contentIntellisense?: boolean | undefined;
+        contentLayer?: boolean | undefined;
         env?: {
             validateSecrets?: boolean | undefined;
             schema?: Record<string, ({
@@ -796,6 +804,8 @@ export declare const AstroConfigSchema: z.ZodObject<{
         clientPrerender: boolean;
         globalRoutePriority: boolean;
         serverIslands: boolean;
+        contentIntellisense: boolean;
+        contentLayer: boolean;
         env?: {
             validateSecrets: boolean;
             schema?: Record<string, ({
@@ -959,6 +969,8 @@ export declare const AstroConfigSchema: z.ZodObject<{
         clientPrerender?: boolean | undefined;
         globalRoutePriority?: boolean | undefined;
         serverIslands?: boolean | undefined;
+        contentIntellisense?: boolean | undefined;
+        contentLayer?: boolean | undefined;
         env?: {
             validateSecrets?: boolean | undefined;
             schema?: Record<string, ({
@@ -1556,6 +1568,8 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
             })> | undefined;
         }>>;
         serverIslands: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
+        contentIntellisense: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
+        contentLayer: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
     }, "strict", z.ZodTypeAny, {
         actions: boolean;
         directRenderScript: boolean;
@@ -1563,6 +1577,8 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         clientPrerender: boolean;
         globalRoutePriority: boolean;
         serverIslands: boolean;
+        contentIntellisense: boolean;
+        contentLayer: boolean;
         env?: {
             validateSecrets: boolean;
             schema?: Record<string, ({
@@ -1612,6 +1628,8 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         clientPrerender?: boolean | undefined;
         globalRoutePriority?: boolean | undefined;
         serverIslands?: boolean | undefined;
+        contentIntellisense?: boolean | undefined;
+        contentLayer?: boolean | undefined;
         env?: {
             validateSecrets?: boolean | undefined;
             schema?: Record<string, ({
@@ -1814,6 +1832,8 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         clientPrerender: boolean;
         globalRoutePriority: boolean;
         serverIslands: boolean;
+        contentIntellisense: boolean;
+        contentLayer: boolean;
         env?: {
             validateSecrets: boolean;
             schema?: Record<string, ({
@@ -1977,6 +1997,8 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         clientPrerender?: boolean | undefined;
         globalRoutePriority?: boolean | undefined;
         serverIslands?: boolean | undefined;
+        contentIntellisense?: boolean | undefined;
+        contentLayer?: boolean | undefined;
         env?: {
             validateSecrets?: boolean | undefined;
             schema?: Record<string, ({
@@ -2105,6 +2127,8 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         clientPrerender: boolean;
         globalRoutePriority: boolean;
         serverIslands: boolean;
+        contentIntellisense: boolean;
+        contentLayer: boolean;
         env?: {
             validateSecrets: boolean;
             schema?: Record<string, ({
@@ -2268,6 +2292,8 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         clientPrerender?: boolean | undefined;
         globalRoutePriority?: boolean | undefined;
         serverIslands?: boolean | undefined;
+        contentIntellisense?: boolean | undefined;
+        contentLayer?: boolean | undefined;
         env?: {
             validateSecrets?: boolean | undefined;
             schema?: Record<string, ({
@@ -2396,6 +2422,8 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         clientPrerender: boolean;
         globalRoutePriority: boolean;
         serverIslands: boolean;
+        contentIntellisense: boolean;
+        contentLayer: boolean;
         env?: {
             validateSecrets: boolean;
             schema?: Record<string, ({
@@ -2559,6 +2587,8 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         clientPrerender?: boolean | undefined;
         globalRoutePriority?: boolean | undefined;
         serverIslands?: boolean | undefined;
+        contentIntellisense?: boolean | undefined;
+        contentLayer?: boolean | undefined;
         env?: {
             validateSecrets?: boolean | undefined;
             schema?: Record<string, ({
@@ -2687,6 +2717,8 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         clientPrerender: boolean;
         globalRoutePriority: boolean;
         serverIslands: boolean;
+        contentIntellisense: boolean;
+        contentLayer: boolean;
         env?: {
             validateSecrets: boolean;
             schema?: Record<string, ({
@@ -2850,6 +2882,8 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         clientPrerender?: boolean | undefined;
         globalRoutePriority?: boolean | undefined;
         serverIslands?: boolean | undefined;
+        contentIntellisense?: boolean | undefined;
+        contentLayer?: boolean | undefined;
         env?: {
             validateSecrets?: boolean | undefined;
             schema?: Record<string, ({

package/dist/core/config/schema.js

@@ -47,9 +47,11 @@ const ASTRO_CONFIG_DEFAULTS = {
     clientPrerender: false,
     globalRoutePriority: false,
     serverIslands: false,
+    contentIntellisense: false,
     env: {
       validateSecrets: false
-    }
+    },
+    contentLayer: false
   }
 };
 const AstroConfigSchema = z.object({
@@ -332,7 +334,9 @@ const AstroConfigSchema = z.object({
       schema: EnvSchema.optional(),
       validateSecrets: z.boolean().optional().default(ASTRO_CONFIG_DEFAULTS.experimental.env.validateSecrets)
     }).strict().optional(),
-    serverIslands: z.boolean().optional().default(ASTRO_CONFIG_DEFAULTS.experimental.serverIslands)
+    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)
   }).strict(
     `Invalid or outdated experimental feature.
 Check for incorrect spelling or outdated Astro version.

package/dist/core/config/settings.js

@@ -12,7 +12,8 @@ import { AstroTimer } from "./timer.js";
 import { loadTSConfig } from "./tsconfig.js";
 function createBaseSettings(config) {
   const { contentDir } = getContentPaths(config);
-  const preferences = createPreferences(config);
+  const dotAstroDir = new URL(".astro/", config.root);
+  const preferences = createPreferences(config, dotAstroDir);
   return {
     config,
     preferences,
@@ -94,9 +95,10 @@ function createBaseSettings(config) {
     watchFiles: [],
     devToolbarApps: [],
     timer: new AstroTimer(),
-    dotAstroDir: new URL(".astro/", config.root),
-    latestAstroVersion: void 0
+    dotAstroDir,
+    latestAstroVersion: void 0,
     // Will be set later if applicable when the dev server starts
+    injectedTypes: []
   };
 }
 async function createSettings(config, cwd) {

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "4.13.4";
+const ASTRO_VERSION = "4.14.1";
 const REROUTE_DIRECTIVE_HEADER = "X-Astro-Reroute";
 const REWRITE_DIRECTIVE_HEADER_KEY = "X-Astro-Rewrite";
 const REWRITE_DIRECTIVE_HEADER_VALUE = "yes";

package/dist/core/create-vite.js

@@ -102,7 +102,7 @@ async function createVite(commandConfig, { settings, logger, mode, command, fs =
       // The server plugin is for dev only and having it run during the build causes
       // the build to run very slow as the filewatcher is triggered often.
       mode !== "build" && vitePluginAstroServer({ settings, logger, fs }),
-      envVitePlugin({ settings }),
+      envVitePlugin({ settings, logger }),
       astroEnv({ settings, mode, fs, sync }),
       markdownVitePlugin({ settings, logger }),
       htmlVitePlugin(),

package/dist/core/dev/container.js

@@ -49,7 +49,8 @@ async function createContainer({
     logger,
     skip: {
       content: true
-    }
+    },
+    force: inlineConfig?.force
   });
   const viteServer = await vite.createServer(viteConfig);
   const container = {

package/dist/core/dev/dev.js

@@ -1,8 +1,12 @@
-import fs from "node:fs";
+import fs, { existsSync } from "node:fs";
+import { performance } from "node:perf_hooks";
 import { green } from "kleur/colors";
-import { performance } from "perf_hooks";
 import { gt, major, minor, patch } from "semver";
+import { DATA_STORE_FILE } from "../../content/consts.js";
+import { globalContentLayer } from "../../content/content-layer.js";
 import { attachContentServerListeners } from "../../content/index.js";
+import { MutableDataStore } from "../../content/mutable-data-store.js";
+import { globalContentConfigObserver } from "../../content/utils.js";
 import { telemetry } from "../../events/index.js";
 import * as msg from "../messages.js";
 import { ensureProcessNodeEnv } from "../util.js";
@@ -19,7 +23,7 @@ async function dev(inlineConfig) {
   await telemetry.record([]);
   const restart = await createContainerWithAutomaticRestart({ inlineConfig, fs });
   const logger = restart.container.logger;
-  const currentVersion = "4.13.4";
+  const currentVersion = "4.14.1";
   const isPrerelease = currentVersion.includes("-");
   if (!isPrerelease) {
     try {
@@ -64,6 +68,32 @@ async function dev(inlineConfig) {
     logger.warn("SKIP_FORMAT", msg.fsStrictWarning());
   }
   await attachContentServerListeners(restart.container);
+  let store;
+  try {
+    const dataStoreFile = new URL(DATA_STORE_FILE, restart.container.settings.config.cacheDir);
+    if (existsSync(dataStoreFile)) {
+      store = await MutableDataStore.fromFile(dataStoreFile);
+    }
+  } catch (err) {
+    logger.error("content", err.message);
+  }
+  if (!store) {
+    store = new MutableDataStore();
+  }
+  const config = globalContentConfigObserver.get();
+  if (config.status === "error") {
+    logger.error("content", config.error.message);
+  }
+  if (config.status === "loaded") {
+    const contentLayer = globalContentLayer.init({
+      settings: restart.container.settings,
+      logger,
+      watcher: restart.container.viteServer.watcher,
+      store
+    });
+    contentLayer.watchContentConfig();
+    await contentLayer.sync();
+  }
   logger.info(null, green("watching for file changes..."));
   return {
     address: devServerAddressInfo,