astro 5.1.2 → 5.1.3

package/dist/content/content-layer.js

@@ -99,15 +99,31 @@ class ContentLayer {
     return this.#queue.add(() => this.#doSync(options));
   }
   async #doSync(options) {
-    const contentConfig = globalContentConfigObserver.get();
+    let contentConfig = globalContentConfigObserver.get();
     const logger = this.#logger.forkIntegrationLogger("content");
+    if (contentConfig?.status === "loading") {
+      contentConfig = await Promise.race([
+        new Promise((resolve) => {
+          const unsub = globalContentConfigObserver.subscribe((ctx) => {
+            unsub();
+            resolve(ctx);
+          });
+        }),
+        new Promise(
+          (resolve) => setTimeout(
+            () => resolve({ status: "error", error: new Error("Content config loading timed out") }),
+            5e3
+          )
+        )
+      ]);
+    }
     if (contentConfig?.status === "error") {
       logger.error(`Error loading content config. Skipping sync.
 ${contentConfig.error.message}`);
       return;
     }
     if (contentConfig?.status !== "loaded") {
-      logger.error("Content config not loaded, skipping sync");
+      logger.error(`Content config not loaded, skipping sync. Status was ${contentConfig?.status}`);
       return;
     }
     logger.info("Syncing content");
@@ -128,11 +144,11 @@ ${contentConfig.error.message}`);
       logger.info("Astro config changed");
       shouldClear = true;
     }
-    if (currentConfigDigest && previousConfigDigest !== currentConfigDigest) {
+    if (previousConfigDigest && previousConfigDigest !== currentConfigDigest) {
       logger.info("Content config changed");
       shouldClear = true;
     }
-    if (previousAstroVersion !== "5.1.2") {
+    if (previousAstroVersion && previousAstroVersion !== "5.1.3") {
       logger.info("Astro version changed");
       shouldClear = true;
     }
@@ -140,8 +156,8 @@ ${contentConfig.error.message}`);
       logger.info("Clearing content store");
       this.#store.clearAll();
     }
-    if ("5.1.2") {
-      await this.#store.metaStore().set("astro-version", "5.1.2");
+    if ("5.1.3") {
+      await this.#store.metaStore().set("astro-version", "5.1.3");
     }
     if (currentConfigDigest) {
       await this.#store.metaStore().set("content-config-digest", currentConfigDigest);

package/dist/content/utils.d.ts

@@ -506,7 +506,7 @@ export declare function getContentEntryIdAndSlug({ entry, contentDir, collection
     id: string;
     slug: string;
 };
-export declare function getEntryType(entryPath: string, paths: Pick<ContentPaths, 'config' | 'contentDir'>, contentFileExts: string[], dataFileExts: string[]): 'content' | 'data' | 'config' | 'ignored';
+export declare function getEntryType(entryPath: string, paths: Pick<ContentPaths, 'config' | 'contentDir' | 'root'>, contentFileExts: string[], dataFileExts: string[]): 'content' | 'data' | 'config' | 'ignored';
 export declare function safeParseFrontmatter(source: string, id?: string): import("@astrojs/markdown-remark").ParseFrontmatterResult;
 /**
  * The content config is loaded separately from other `src/` files.
@@ -549,6 +549,7 @@ type Observable<C> = {
 export type ContentObservable = Observable<ContentCtx>;
 export declare function contentObservable(initialCtx: ContentCtx): ContentObservable;
 export type ContentPaths = {
+    root: URL;
     contentDir: URL;
     assetsDir: URL;
     typesTemplate: URL;
@@ -558,7 +559,7 @@ export type ContentPaths = {
         url: URL;
     };
 };
-export declare function getContentPaths({ srcDir, legacy }: Pick<AstroConfig, 'root' | 'srcDir' | 'legacy'>, fs?: typeof fsMod): ContentPaths;
+export declare function getContentPaths({ srcDir, legacy, root }: Pick<AstroConfig, 'root' | 'srcDir' | 'legacy'>, fs?: typeof fsMod): ContentPaths;
 /**
  * Check for slug in content entry frontmatter and validate the type,
  * falling back to the `generatedSlug` if none is found.

package/dist/content/utils.js

@@ -295,13 +295,20 @@ function getRelativeEntryPath(entry, collection, contentDir) {
   const relativeToCollection = path.relative(collection, relativeToContent);
   return relativeToCollection;
 }
+function isParentDirectory(parent, child) {
+  const relative = path.relative(fileURLToPath(parent), fileURLToPath(child));
+  return !relative.startsWith("..") && !path.isAbsolute(relative);
+}
 function getEntryType(entryPath, paths, contentFileExts, dataFileExts) {
   const { ext } = path.parse(entryPath);
   const fileUrl = pathToFileURL(entryPath);
+  const dotAstroDir = new URL("./.astro/", paths.root);
   if (fileUrl.href === paths.config.url.href) {
     return "config";
   } else if (hasUnderscoreBelowContentDirectoryPath(fileUrl, paths.contentDir)) {
     return "ignored";
+  } else if (isParentDirectory(dotAstroDir, fileUrl)) {
+    return "ignored";
   } else if (contentFileExts.includes(ext)) {
     return "content";
   } else if (dataFileExts.includes(ext)) {
@@ -509,10 +516,11 @@ function contentObservable(initialCtx) {
     subscribe
   };
 }
-function getContentPaths({ srcDir, legacy }, fs = fsMod) {
+function getContentPaths({ srcDir, legacy, root }, fs = fsMod) {
   const configStats = search(fs, srcDir, legacy?.collections);
   const pkgBase = new URL("../../", import.meta.url);
   return {
+    root: new URL("./", root),
     contentDir: new URL("./content/", srcDir),
     assetsDir: new URL("./assets/", srcDir),
     typesTemplate: new URL("templates/content/types.d.ts", pkgBase),

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

@@ -41,12 +41,16 @@ function astroContentVirtualModPlugin({
   fs
 }) {
   let dataStoreFile;
+  let devServer;
   return {
     name: "astro-content-virtual-mod-plugin",
     enforce: "pre",
     config(_, env) {
       dataStoreFile = getDataStoreFile(settings, env.command === "serve");
     },
+    buildStart() {
+      devServer?.watcher.add(fileURLToPath(dataStoreFile));
+    },
     async resolveId(id) {
       if (id === VIRTUAL_MODULE_ID) {
         return RESOLVED_VIRTUAL_MODULE_ID;
@@ -137,8 +141,8 @@ function astroContentVirtualModPlugin({
       }
     },
     configureServer(server) {
+      devServer = server;
       const dataStorePath = fileURLToPath(dataStoreFile);
-      server.watcher.add(dataStorePath);
       function invalidateDataStore() {
         const module = server.moduleGraph.getModuleById(RESOLVED_DATA_STORE_VIRTUAL_ID);
         if (module) {

package/dist/core/app/index.js

@@ -207,7 +207,7 @@ class App {
       this.#logger.error(null, err.stack || err.message || String(err));
       return this.#renderError(request, { locals, status: 500, error: err, clientAddress });
     } finally {
-      session?.[PERSIST_SYMBOL]();
+      await session?.[PERSIST_SYMBOL]();
     }
     if (REROUTABLE_STATUS_CODES.includes(response.status) && response.headers.get(REROUTE_DIRECTIVE_HEADER) !== "no") {
       return this.#renderError(request, {
@@ -302,7 +302,7 @@ class App {
           });
         }
       } finally {
-        session?.[PERSIST_SYMBOL]();
+        await session?.[PERSIST_SYMBOL]();
       }
     }
     const response = this.#mergeResponses(new Response(null, { status }), originalResponse);

package/dist/core/build/index.js

@@ -19,6 +19,7 @@ import { AstroError, AstroErrorData } from "../errors/index.js";
 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 } from "../util.js";
 import { collectPagesData } from "./page-data.js";
@@ -157,7 +158,7 @@ class AstroBuilder {
     await runHookBuildDone({
       settings: this.settings,
       pages: pageNames,
-      routes: Object.values(allPages).flat().map((pageData) => pageData.route),
+      routes: Object.values(allPages).flat().map((pageData) => pageData.route).concat(hasServerIslands ? getServerIslandRouteData(this.settings.config) : []),
       logging: this.logger
     });
     if (this.logger.level && levels[this.logger.level()] <= levels["info"]) {

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "5.1.2";
+const ASTRO_VERSION = "5.1.3";
 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.1.2";
+  const currentVersion = "5.1.3";
   const isPrerelease = currentVersion.includes("-");
   if (!isPrerelease) {
     try {
@@ -50,23 +50,6 @@ async function dev(inlineConfig) {
     } catch {
     }
   }
-  const devServerAddressInfo = await startContainer(restart.container);
-  logger.info(
-    "SKIP_FORMAT",
-    msg.serverStart({
-      startupTime: performance.now() - devStart,
-      resolvedUrls: restart.container.viteServer.resolvedUrls || { local: [], network: [] },
-      host: restart.container.settings.config.server.host,
-      base: restart.container.settings.config.base
-    })
-  );
-  if (isPrerelease) {
-    logger.warn("SKIP_FORMAT", msg.prerelease({ currentVersion }));
-  }
-  if (restart.container.viteServer.config.server?.fs?.strict === false) {
-    logger.warn("SKIP_FORMAT", msg.fsStrictWarning());
-  }
-  await attachContentServerListeners(restart.container);
   let store;
   try {
     const dataStoreFile = getDataStoreFile(restart.container.settings, true);
@@ -79,6 +62,7 @@ async function dev(inlineConfig) {
   if (!store) {
     store = new MutableDataStore();
   }
+  await attachContentServerListeners(restart.container);
   const config = globalContentConfigObserver.get();
   if (config.status === "error") {
     logger.error("content", config.error.message);
@@ -92,6 +76,24 @@ async function dev(inlineConfig) {
     });
     contentLayer.watchContentConfig();
     await contentLayer.sync();
+  } else {
+    logger.warn("content", "Content config not loaded");
+  }
+  const devServerAddressInfo = await startContainer(restart.container);
+  logger.info(
+    "SKIP_FORMAT",
+    msg.serverStart({
+      startupTime: performance.now() - devStart,
+      resolvedUrls: restart.container.viteServer.resolvedUrls || { local: [], network: [] },
+      host: restart.container.settings.config.server.host,
+      base: restart.container.settings.config.base
+    })
+  );
+  if (isPrerelease) {
+    logger.warn("SKIP_FORMAT", msg.prerelease({ currentVersion }));
+  }
+  if (restart.container.viteServer.config.server?.fs?.strict === false) {
+    logger.warn("SKIP_FORMAT", msg.fsStrictWarning());
   }
   logger.info(null, green("watching for file changes..."));
   return {

package/dist/core/messages.js

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

package/dist/core/render/params-and-props.js

@@ -19,7 +19,6 @@ async function getProps(opts) {
     ssr: serverLike,
     base
   });
-  if (!staticPaths.length) return {};
   const params = getParams(route, decodeURI(pathname));
   const matchedStaticPath = findPathItemByKey(staticPaths, params, route, logger);
   if (!matchedStaticPath && (serverLike ? route.prerender : true)) {

package/dist/core/routing/manifest/create.js

@@ -111,7 +111,7 @@ function createFileBasedRoutes({ settings, cwd, fsMod }, logger) {
       const segment = isDir ? basename : name;
       validateSegment(segment, file);
       const parts = getParts(segment, file);
-      const isIndex = isDir ? false : basename.startsWith("index.");
+      const isIndex = isDir ? false : basename.substring(0, basename.lastIndexOf(".")) === "index";
       const routeSuffix = basename.slice(basename.indexOf("."), -ext.length);
       const isPage = validPageExtensions.has(ext);
       items.push({

package/dist/core/server-islands/endpoint.js

@@ -101,6 +101,7 @@ function createEndpoint(manifest) {
     for (const prop in data.slots) {
       slots[prop] = createSlotValueFromString(data.slots[prop]);
     }
+    result.response.headers.set("X-Robots-Tag", "noindex");
     if (isAstroComponentFactory(Component)) {
       const ServerIsland = Component;
       Component = function(...args) {

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

@@ -1,3 +1,4 @@
+import MagicString from "magic-string";
 const VIRTUAL_ISLAND_MAP_ID = "@astro-server-islands";
 const RESOLVED_VIRTUAL_ISLAND_MAP_ID = "\0" + VIRTUAL_ISLAND_MAP_ID;
 const serverIslandPlaceholder = "'$$server-islands$$'";
@@ -67,6 +68,12 @@ function vitePluginServerIslands({ settings, logger }) {
     },
     renderChunk(code) {
       if (code.includes(serverIslandPlaceholder)) {
+        if (referenceIdMap.size === 0) {
+          return {
+            code: code.replace(serverIslandPlaceholder, "new Map();"),
+            map: null
+          };
+        }
         let mapSource = "new Map([";
         for (let [resolvedPath, referenceId] of referenceIdMap) {
           const fileName = this.getFileName(referenceId);
@@ -76,7 +83,12 @@ function vitePluginServerIslands({ settings, logger }) {
         }
         mapSource += "\n]);";
         referenceIdMap.clear();
-        return code.replace(serverIslandPlaceholder, mapSource);
+        const ms = new MagicString(code);
+        ms.replace(serverIslandPlaceholder, mapSource);
+        return {
+          code: ms.toString(),
+          map: ms.generateMap({ hires: "boundary" })
+        };
       }
     }
   };

package/dist/core/session.js

@@ -1,4 +1,4 @@
-import { stringify, unflatten } from "devalue";
+import { stringify as rawStringify, unflatten as rawUnflatten } from "devalue";
 import {
   builtinDrivers,
   createStorage
@@ -8,6 +8,17 @@ import { AstroError } from "./errors/index.js";
 const PERSIST_SYMBOL = Symbol();
 const DEFAULT_COOKIE_NAME = "astro-session";
 const VALID_COOKIE_REGEX = /^[\w-]+$/;
+const unflatten = (parsed, _) => {
+  return rawUnflatten(parsed, {
+    URL: (href) => new URL(href)
+  });
+};
+const stringify = (data, _) => {
+  return rawStringify(data, {
+    // Support URL objects
+    URL: (val) => val instanceof URL && val.href
+  });
+};
 class AstroSession {
   // The cookies object.
   #cookies;
@@ -108,8 +119,9 @@ class AstroSession {
         message: "The session key was not provided."
       });
     }
+    let cloned;
     try {
-      stringify(value);
+      cloned = unflatten(JSON.parse(stringify(value)));
     } catch (err) {
       throw new AstroError(
         {
@@ -128,7 +140,7 @@ class AstroSession {
     const lifetime = ttl ?? this.#config.ttl;
     const expires = typeof lifetime === "number" ? Date.now() + lifetime * 1e3 : lifetime;
     this.#data.set(key, {
-      data: value,
+      data: cloned,
       expires
     });
     this.#dirty = true;
@@ -173,10 +185,7 @@ class AstroSession {
       const key = this.#ensureSessionID();
       let serialized;
       try {
-        serialized = stringify(data, {
-          // Support URL objects
-          URL: (val) => val instanceof URL && val.href
-        });
+        serialized = stringify(data);
       } catch (err) {
         throw new AstroError(
           {
@@ -233,10 +242,7 @@ class AstroSession {
       return this.#data;
     }
     try {
-      const storedMap = unflatten(raw, {
-        // Revive URL objects
-        URL: (href) => new URL(href)
-      });
+      const storedMap = unflatten(raw);
       if (!(storedMap instanceof Map)) {
         await this.#destroySafe();
         throw new AstroError({

package/dist/core/sync/index.js

@@ -107,8 +107,7 @@ async function syncInternal({
     if (paths.config.exists || // Legacy collections don't require a config file
     settings.config.legacy?.collections && fs.existsSync(paths.contentDir)) {
       settings.injectedTypes.push({
-        filename: CONTENT_TYPES_FILE,
-        content: ""
+        filename: CONTENT_TYPES_FILE
       });
     }
   }
@@ -125,7 +124,9 @@ function writeInjectedTypes(settings, fs) {
   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");
+    if (content) {
+      fs.writeFileSync(filepath, content, "utf-8");
+    }
     references.push(normalizePath(relative(fileURLToPath(settings.dotAstroDir), filepath)));
   }
   const astroDtsContent = `${CLIENT_TYPES_REFERENCE}

package/dist/types/astro.d.ts

@@ -57,7 +57,7 @@ export interface AstroSettings {
     latestAstroVersion: string | undefined;
     serverIslandMap: NonNullable<SSRManifest['serverIslandMap']>;
     serverIslandNameMap: NonNullable<SSRManifest['serverIslandNameMap']>;
-    injectedTypes: Array<InjectedType>;
+    injectedTypes: Array<Omit<InjectedType, 'content'> & Partial<Pick<InjectedType, 'content'>>>;
     /**
      * Determine if the build output should be a static, dist folder or a adapter-based server output
      * undefined when unknown

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "5.1.2",
+  "version": "5.1.3",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -198,9 +198,9 @@
     "remark-code-titles": "^0.1.2",
     "rollup": "^4.27.4",
     "sass": "^1.81.0",
-    "undici": "^6.21.0",
+    "undici": "^7.2.0",
     "unified": "^11.0.5",
-    "vitest": "^2.1.6",
+    "vitest": "^3.0.0-beta.3",
     "astro-scripts": "0.0.14"
   },
   "engines": {

package/types/content.d.ts

@@ -89,27 +89,29 @@ declare module 'astro:content' {
 		input: CollectionConfig<S>,
 	): CollectionConfig<S>;
 
-	/** Run `astro sync` to generate high fidelity types */
+	/** Run `astro dev` or `astro sync` to generate high fidelity types */
 	export const getEntryBySlug: (...args: any[]) => any;
-	/** Run `astro sync` to generate high fidelity types */
+	/** Run `astro dev` or `astro sync` to generate high fidelity types */
 	export const getDataEntryById: (...args: any[]) => any;
-	/** Run `astro sync` to generate high fidelity types */
+	/** Run `astro dev` or `astro sync` to generate high fidelity types */
 	export const getCollection: (...args: any[]) => any;
-	/** Run `astro sync` to generate high fidelity types */
+	/** Run `astro dev` or `astro sync` to generate high fidelity types */
 	export const getEntry: (...args: any[]) => any;
-	/** Run `astro sync` to generate high fidelity types */
+	/** Run `astro dev` or `astro sync` to generate high fidelity types */
 	export const getEntries: (...args: any[]) => any;
-	/** Run `astro sync` to generate high fidelity types */
+	/** Run `astro dev` or `astro sync` to generate high fidelity types */
 	export const reference: (...args: any[]) => any;
-	/** Run `astro sync` to generate high fidelity types */
+	/** Run `astro dev` or `astro sync` to generate high fidelity types */
 	export type CollectionKey = any;
-	/** Run `astro sync` to generate high fidelity types */
+	/** Run `astro dev` or `astro sync` to generate high fidelity types */
 	// biome-ignore lint/correctness/noUnusedVariables: stub generic type to match generated type
 	export type CollectionEntry<C> = any;
-	/** Run `astro sync` to generate high fidelity types */
+	/** Run `astro dev` or `astro sync` to generate high fidelity types */
 	export type ContentCollectionKey = any;
-	/** Run `astro sync` to generate high fidelity types */
+	/** Run `astro dev` or `astro sync` to generate high fidelity types */
 	export type DataCollectionKey = any;
-	/** Run `astro sync` to generate high fidelity types */
+	/** Run `astro dev` or `astro sync` to generate high fidelity types */
 	export type ContentConfig = any;
+	/** Run `astro dev` or `astro sync` to generate high fidelity types */
+	export const render: (entry: any) => any;
 }