astro 5.1.4 → 5.1.6

package/astro-jsx.d.ts

@@ -837,10 +837,12 @@ declare namespace astroHTML.JSX {
 
 	interface LinkHTMLAttributes extends HTMLAttributes {
 		as?: string | undefined | null;
+		blocking?: 'render' | undefined | null;
 		crossorigin?: boolean | string | undefined | null;
+		disabled?: boolean | undefined | null;
+		fetchpriority?: 'auto' | 'high' | 'low' | undefined | null;
 		href?: string | URL | undefined | null;
 		hreflang?: string | undefined | null;
-		fetchpriority?: 'auto' | 'high' | 'low' | undefined | null;
 		integrity?: string | undefined | null;
 		media?: string | undefined | null;
 		imagesrcset?: string | undefined | null;

package/client.d.ts

@@ -110,7 +110,7 @@ declare module '*.avif' {
 declare module '*.svg' {
 	type Props = {
 		/**
-		 * Accesible, short-text description
+		 * Accessible, short-text description
 		 *
 		 *  {@link https://developer.mozilla.org/en-US/docs/Web/SVG/Element/title|MDN Reference}
 		 */

package/dist/actions/runtime/virtual/server.d.ts

@@ -26,7 +26,7 @@ export type ActionMiddlewareContext = {
         calledFrom: 'rpc' | 'form';
         /** The name of the action. Useful to track the source of an action result during a redirect. */
         name: string;
-        /** Programatically call the action to get the result. */
+        /** Programmatically call the action to get the result. */
         handler: () => Promise<SafeResult<any, any>>;
     };
     /**

package/dist/assets/build/generate.d.ts

@@ -1,4 +1,3 @@
-import type PQueue from 'p-queue';
 import type { BuildPipeline } from '../../core/build/pipeline.js';
 import type { Logger } from '../../core/logger/core.js';
 import type { MapValue } from '../../type-utils.js';
@@ -19,6 +18,6 @@ type AssetEnv = {
     assetsFolder: AstroConfig['build']['assets'];
 };
 export declare function prepareAssetsGenerationEnv(pipeline: BuildPipeline, totalCount: number): Promise<AssetEnv>;
-export declare function generateImagesForPath(originalFilePath: string, transformsAndPath: MapValue<AssetsGlobalStaticImagesList>, env: AssetEnv, queue: PQueue): Promise<void>;
+export declare function generateImagesForPath(originalFilePath: string, transformsAndPath: MapValue<AssetsGlobalStaticImagesList>, env: AssetEnv): Promise<void>;
 export declare function getStaticImageList(): AssetsGlobalStaticImagesList;
 export {};

package/dist/assets/build/generate.js

@@ -47,12 +47,10 @@ async function prepareAssetsGenerationEnv(pipeline, totalCount) {
 function getFullImagePath(originalFilePath, env) {
   return new URL(removeLeadingForwardSlash(originalFilePath), env.serverRoot);
 }
-async function generateImagesForPath(originalFilePath, transformsAndPath, env, queue) {
+async function generateImagesForPath(originalFilePath, transformsAndPath, env) {
   let originalImage;
   for (const [_, transform] of transformsAndPath.transforms) {
-    await queue.add(async () => generateImage(transform.finalPath, transform.transform)).catch((e) => {
-      throw e;
-    });
+    await generateImage(transform.finalPath, transform.transform);
   }
   if (!env.isSSR && transformsAndPath.originalSrcPath && !globalThis.astroAsset.referencedImages?.has(transformsAndPath.originalSrcPath)) {
     try {

package/dist/assets/build/remote.js

@@ -37,7 +37,7 @@ async function revalidateRemoteImage(src, revalidationData) {
     webToCachePolicyResponse(
       res.ok ? res : new Response(null, { status: 200, headers: res.headers })
     )
-    // 304 responses themselves are not cachable, so just pretend to get the refreshed TTL
+    // 304 responses themselves are not cacheable, so just pretend to get the refreshed TTL
   );
   const expires = policy.storable() ? policy.timeToLive() : 0;
   return {

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

@@ -1,6 +1,5 @@
 import { extname } from "node:path";
 import MagicString from "magic-string";
-import { normalizePath } from "vite";
 import { AstroError, AstroErrorData } from "../core/errors/index.js";
 import {
   appendForwardSlash,
@@ -9,6 +8,7 @@ import {
   removeBase,
   removeQueryString
 } from "../core/path.js";
+import { normalizePath } from "../core/viteUtils.js";
 import { VALID_INPUT_FORMATS, VIRTUAL_MODULE_ID, VIRTUAL_SERVICE_ID } from "./consts.js";
 import { getAssetsPrefix } from "./utils/getAssetsPrefix.js";
 import { isESMImportedImage } from "./utils/imageKind.js";

package/dist/container/index.js

@@ -9,8 +9,9 @@ import { nodeLogDestination } from "../core/logger/node.js";
 import { NOOP_MIDDLEWARE_FN } from "../core/middleware/noop-middleware.js";
 import { removeLeadingForwardSlash } from "../core/path.js";
 import { RenderContext } from "../core/render-context.js";
-import { getParts, validateSegment } from "../core/routing/manifest/create.js";
+import { getParts } from "../core/routing/manifest/parts.js";
 import { getPattern } from "../core/routing/manifest/pattern.js";
+import { validateSegment } from "../core/routing/manifest/segment.js";
 import { ContainerPipeline } from "./pipeline.js";
 function createManifest(manifest, renderers, middleware) {
   function middlewareInstance() {

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

@@ -40,7 +40,7 @@ export declare function simpleLoader<TData extends {
  * 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 function getDataStoreFile(settings: AstroSettings, isDev: boolean): URL;
 export declare const globalContentLayer: {
     init: (options: ContentLayerOptions) => ContentLayer;
     get: () => ContentLayer | null;

package/dist/content/content-layer.js

@@ -148,7 +148,7 @@ ${contentConfig.error.message}`);
       logger.info("Content config changed");
       shouldClear = true;
     }
-    if (previousAstroVersion && previousAstroVersion !== "5.1.4") {
+    if (previousAstroVersion && previousAstroVersion !== "5.1.6") {
       logger.info("Astro version changed");
       shouldClear = true;
     }
@@ -156,8 +156,8 @@ ${contentConfig.error.message}`);
       logger.info("Clearing content store");
       this.#store.clearAll();
     }
-    if ("5.1.4") {
-      await this.#store.metaStore().set("astro-version", "5.1.4");
+    if ("5.1.6") {
+      await this.#store.metaStore().set("astro-version", "5.1.6");
     }
     if (currentConfigDigest) {
       await this.#store.metaStore().set("content-config-digest", currentConfigDigest);
@@ -215,8 +215,7 @@ ${contentConfig.error.message}`);
     );
     await fs.mkdir(this.#settings.config.cacheDir, { recursive: true });
     await fs.mkdir(this.#settings.dotAstroDir, { recursive: true });
-    const cacheFile = getDataStoreFile(this.#settings);
-    await this.#store.writeToDisk(cacheFile);
+    await this.#store.writeToDisk();
     const assetImportsFile = new URL(ASSET_IMPORTS_FILE, this.#settings.dotAstroDir);
     await this.#store.writeAssetImports(assetImportsFile);
     const modulesImportsFile = new URL(MODULES_IMPORTS_FILE, this.#settings.dotAstroDir);
@@ -303,7 +302,6 @@ ${JSON.stringify({ ...raw, id: void 0 }, null, 2)}`
   });
 }
 function getDataStoreFile(settings, isDev) {
-  isDev ??= process?.env.NODE_ENV === "development";
   return new URL(DATA_STORE_FILE, isDev ? settings.dotAstroDir : settings.config.cacheDir);
 }
 function contentLayerSingleton() {

package/dist/content/loaders/glob.js

@@ -44,7 +44,7 @@ function glob(globOptions) {
       const untouchedEntries = new Set(store.keys());
       const isLegacy = globOptions._legacy;
       const emulateLegacyCollections = !config.legacy.collections;
-      async function syncData(entry, base, entryType) {
+      async function syncData(entry, base, entryType, oldId) {
         if (!entryType) {
           logger.warn(`No entry type found for ${entry}`);
           return;
@@ -63,6 +63,9 @@ function glob(globOptions) {
           fileUrl
         });
         const id = generateId({ entry, base, data });
+        if (oldId && oldId !== id) {
+          store.delete(oldId);
+        }
         let legacyId;
         if (isLegacy) {
           const entryURL = new URL(encodeURI(entry), base);
@@ -225,7 +228,8 @@ function glob(globOptions) {
         }
         const entryType = configForFile(changedPath);
         const baseUrl = pathToFileURL(basePath);
-        await syncData(entry, baseUrl, entryType);
+        const oldId = fileToIdMap.get(changedPath);
+        await syncData(entry, baseUrl, entryType, oldId);
         logger.info(`Reloaded data from ${green(entry)}`);
       }
       watcher.on("change", onChange);

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

@@ -21,7 +21,7 @@ export declare class MutableDataStore extends ImmutableDataStore {
      */
     metaStore(collectionName?: string): MetaStore;
     toString(): string;
-    writeToDisk(filePath: PathLike): Promise<void>;
+    writeToDisk(): Promise<void>;
     /**
      * Attempts to load a MutableDataStore from the virtual module.
      * This only works in Vite.

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

@@ -144,15 +144,15 @@ ${lines.join(",\n")}]);
   }
   #saveToDiskDebounced() {
     this.#dirty = true;
-    if (this.#file) {
-      if (this.#saveTimeout) {
-        clearTimeout(this.#saveTimeout);
-      }
-      this.#saveTimeout = setTimeout(() => {
-        this.#saveTimeout = void 0;
-        this.writeToDisk(this.#file);
-      }, SAVE_DEBOUNCE_MS);
+    if (this.#saveTimeout) {
+      clearTimeout(this.#saveTimeout);
     }
+    this.#saveTimeout = setTimeout(() => {
+      this.#saveTimeout = void 0;
+      if (this.#file) {
+        this.writeToDisk();
+      }
+    }, SAVE_DEBOUNCE_MS);
   }
   #writing = /* @__PURE__ */ new Set();
   #pending = /* @__PURE__ */ new Set();
@@ -168,6 +168,10 @@ ${lines.join(",\n")}]);
     this.#writing.add(fileKey);
     const tempFile = filePath instanceof URL ? new URL(`${filePath.href}.tmp`) : `${filePath}.tmp`;
     try {
+      const oldData = await fs.readFile(filePath, "utf-8").catch(() => "");
+      if (oldData === data) {
+        return;
+      }
       await fs.writeFile(tempFile, data);
       await fs.rename(tempFile, filePath);
     } finally {
@@ -270,13 +274,15 @@ ${lines.join(",\n")}]);
   toString() {
     return devalue.stringify(this._collections);
   }
-  async writeToDisk(filePath) {
+  async writeToDisk() {
     if (!this.#dirty) {
       return;
     }
+    if (!this.#file) {
+      throw new AstroError(AstroErrorData.UnknownFilesystemError);
+    }
     try {
-      await this.#writeFileAtomic(filePath, this.toString());
-      this.#file = filePath;
+      await this.#writeFileAtomic(this.#file, this.toString());
       this.#dirty = false;
     } catch (err) {
       throw new AstroError(AstroErrorData.UnknownFilesystemError, { cause: err });
@@ -308,11 +314,17 @@ ${lines.join(",\n")}]);
     try {
       if (existsSync(filePath)) {
         const data = await fs.readFile(filePath, "utf-8");
-        return MutableDataStore.fromString(data);
+        const store2 = await MutableDataStore.fromString(data);
+        store2.#file = filePath;
+        return store2;
+      } else {
+        await fs.mkdir(new URL("./", filePath), { recursive: true });
       }
     } catch {
     }
-    return new MutableDataStore();
+    const store = new MutableDataStore();
+    store.#file = filePath;
+    return store;
   }
 }
 export {

package/dist/core/build/css-asset-name.js

@@ -1,8 +1,8 @@
 import crypto from "node:crypto";
 import npath from "node:path";
 import { fileURLToPath } from "node:url";
-import { normalizePath } from "vite";
 import { viteID } from "../util.js";
+import { normalizePath } from "../viteUtils.js";
 import { getTopLevelPageModuleInfos } from "./graph.js";
 const confusingBaseNames = ["404", "500"];
 function shortHashedName(settings) {

package/dist/core/build/generate.js

@@ -96,7 +96,9 @@ ${bgGreen(black(` ${verb} static routes `))}`);
     const queue = new PQueue({ concurrency: Math.max(cpuCount, 1) });
     const assetsTimer = performance.now();
     for (const [originalPath, transforms] of staticImageList) {
-      await generateImagesForPath(originalPath, transforms, assetsCreationPipeline, queue);
+      queue.add(() => generateImagesForPath(originalPath, transforms, assetsCreationPipeline)).catch((e) => {
+        throw e;
+      });
     }
     await queue.onIdle();
     const assetsTimeEnd = performance.now();

package/dist/core/build/index.js

@@ -33,7 +33,7 @@ async function build(inlineConfig, options = {}) {
   telemetry.record(eventCliSession("build", userConfig));
   const settings = await createSettings(astroConfig, fileURLToPath(astroConfig.root));
   if (inlineConfig.force) {
-    await clearContentLayerCache({ settings, logger, fs });
+    await clearContentLayerCache({ settings, logger, fs, isDev: false });
   }
   const builder = new AstroBuilder(settings, {
     ...options,
@@ -99,7 +99,8 @@ class AstroBuilder {
       settings: this.settings,
       logger,
       fs,
-      manifest: this.manifest
+      manifest: this.manifest,
+      command: "build"
     });
     return { viteConfig };
   }

package/dist/core/compile/compile.js

@@ -1,9 +1,8 @@
 import { fileURLToPath } from "node:url";
 import { transform } from "@astrojs/compiler";
-import { normalizePath } from "vite";
 import { AggregateError, CompilerError } from "../errors/errors.js";
 import { AstroErrorData } from "../errors/index.js";
-import { resolvePath } from "../viteUtils.js";
+import { normalizePath, resolvePath } from "../viteUtils.js";
 import { createStylePreprocessor } from "./style.js";
 async function compile({
   astroConfig,

package/dist/core/compile/style.js

@@ -1,6 +1,7 @@
 import fs from "node:fs";
-import { normalizePath, preprocessCSS } from "vite";
+import { preprocessCSS } from "vite";
 import { AstroErrorData, CSSError, positionAt } from "../errors/index.js";
+import { normalizePath } from "../viteUtils.js";
 function createStylePreprocessor({
   filename,
   viteConfig,

package/dist/core/constants.js

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

@@ -14,6 +14,7 @@ import {
 } from "../content/index.js";
 import { createEnvLoader } from "../env/env-loader.js";
 import { astroEnv } from "../env/vite-plugin-env.js";
+import { importMetaEnv } from "../env/vite-plugin-import-meta-env.js";
 import astroInternationalization from "../i18n/vite-plugin-i18n.js";
 import astroPrefetch from "../prefetch/vite-plugin-prefetch.js";
 import astroDevToolbar from "../toolbar/vite-plugin-dev-toolbar.js";
@@ -22,7 +23,6 @@ import astroPostprocessVitePlugin from "../vite-plugin-astro-postprocess/index.j
 import { vitePluginAstroServer } from "../vite-plugin-astro-server/index.js";
 import astroVitePlugin from "../vite-plugin-astro/index.js";
 import configAliasVitePlugin from "../vite-plugin-config-alias/index.js";
-import envVitePlugin from "../vite-plugin-env/index.js";
 import vitePluginFileURL from "../vite-plugin-fileurl/index.js";
 import astroHeadPlugin from "../vite-plugin-head/index.js";
 import astroHmrReloadPlugin from "../vite-plugin-hmr-reload/index.js";
@@ -84,7 +84,7 @@ async function createVite(commandConfig, { settings, logger, mode, command, fs =
     }
   });
   const srcDirPattern = glob.convertPathToPattern(fileURLToPath(settings.config.srcDir));
-  const envLoader = createEnvLoader();
+  const envLoader = createEnvLoader(mode, settings.config);
   const commonConfig = {
     // Tell Vite not to combine config from vite.config.js with our provided inline config
     configFile: false,
@@ -109,8 +109,8 @@ async function createVite(commandConfig, { settings, logger, mode, command, fs =
       // the build to run very slow as the filewatcher is triggered often.
       command === "dev" && vitePluginAstroServer({ settings, logger, fs, manifest, ssrManifest }),
       // ssrManifest is only required in dev mode, where it gets created before a Vite instance is created, and get passed to this function
-      envVitePlugin({ envLoader }),
-      astroEnv({ settings, mode, sync, envLoader }),
+      importMetaEnv({ envLoader }),
+      astroEnv({ settings, sync, envLoader }),
       markdownVitePlugin({ settings, logger }),
       htmlVitePlugin(),
       astroPostprocessVitePlugin(),

package/dist/core/dev/container.js

@@ -66,7 +66,8 @@ async function createContainer({
       cleanup: true
     },
     force: inlineConfig?.force,
-    manifest
+    manifest,
+    command: "dev"
   });
   const viteServer = await vite.createServer(viteConfig);
   const container = {

package/dist/core/dev/dev.js

@@ -1,4 +1,4 @@
-import fs, { existsSync } from "node:fs";
+import fs from "node:fs";
 import { performance } from "node:perf_hooks";
 import { green } from "kleur/colors";
 import { gt, major, minor, patch } from "semver";
@@ -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.4";
+  const currentVersion = "5.1.6";
   const isPrerelease = currentVersion.includes("-");
   if (!isPrerelease) {
     try {
@@ -53,21 +53,19 @@ async function dev(inlineConfig) {
   let store;
   try {
     const dataStoreFile = getDataStoreFile(restart.container.settings, true);
-    if (existsSync(dataStoreFile)) {
-      store = await MutableDataStore.fromFile(dataStoreFile);
-    }
+    store = await MutableDataStore.fromFile(dataStoreFile);
   } catch (err) {
     logger.error("content", err.message);
   }
   if (!store) {
-    store = new MutableDataStore();
+    logger.error("content", "Failed to create data store");
   }
   await attachContentServerListeners(restart.container);
   const config = globalContentConfigObserver.get();
   if (config.status === "error") {
     logger.error("content", config.error.message);
   }
-  if (config.status === "loaded") {
+  if (config.status === "loaded" && store) {
     const contentLayer = globalContentLayer.init({
       settings: restart.container.settings,
       logger,

package/dist/core/errors/dev/utils.js

@@ -4,8 +4,8 @@ import { fileURLToPath } from "node:url";
 import { stripVTControlCharacters } from "node:util";
 import { escape } from "html-escaper";
 import { bold, underline } from "kleur/colors";
-import { normalizePath } from "vite";
 import { removeLeadingForwardSlashWindows } from "../../path.js";
+import { normalizePath } from "../../viteUtils.js";
 import { AggregateError } from "../errors.js";
 import { AstroErrorData } from "../index.js";
 import { codeFrame } from "../printer.js";

package/dist/core/errors/errors-data.d.ts

@@ -776,6 +776,7 @@ export declare const AstroResponseHeadersReassigned: {
 };
 /**
  * @docs
+ * @message Error when initializing session storage with driver `DRIVER`. `ERROR`
  * @see
  * 	- [experimental.session](https://docs.astro.build/en/reference/experimental-flags/sessions/)
  * @description
@@ -789,6 +790,7 @@ export declare const SessionStorageInitError: {
 };
 /**
  * @docs
+ * @message Error when saving session data with driver `DRIVER`. `ERROR`
  * @see
  * 	- [experimental.session](https://docs.astro.build/en/reference/experimental-flags/sessions/)
  * @description

package/dist/core/errors/errors-data.js

@@ -278,13 +278,13 @@ const AstroResponseHeadersReassigned = {
 const SessionStorageInitError = {
   name: "SessionStorageInitError",
   title: "Session storage could not be initialized.",
-  message: (error, driver) => `Error when initializing session storage${driver ? ` with driver ${driver}` : ""}. ${error ?? ""}`,
+  message: (error, driver) => `Error when initializing session storage${driver ? ` with driver \`${driver}\`` : ""}. \`${error ?? ""}\``,
   hint: "For more information, see https://docs.astro.build/en/reference/experimental-flags/sessions/"
 };
 const SessionStorageSaveError = {
   name: "SessionStorageSaveError",
   title: "Session data could not be saved.",
-  message: (error, driver) => `Error when saving session data${driver ? ` with driver ${driver}` : ""}. ${error ?? ""}`,
+  message: (error, driver) => `Error when saving session data${driver ? ` with driver \`${driver}\`` : ""}. \`${error ?? ""}\``,
   hint: "For more information, see https://docs.astro.build/en/reference/experimental-flags/sessions/"
 };
 const MiddlewareCantBeLoaded = {

package/dist/core/messages.js

@@ -38,7 +38,7 @@ function serverStart({
   host,
   base
 }) {
-  const version = "5.1.4";
+  const version = "5.1.6";
   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.4"}`
+        `v${"5.1.6"}`
       )} ${headline}`
     );
   }

package/dist/core/middleware/vite-plugin.js

@@ -1,9 +1,9 @@
-import { normalizePath } from "vite";
 import { getOutputDirectory } from "../../prerender/utils.js";
 import { addRollupInput } from "../build/add-rollup-input.js";
 import { MIDDLEWARE_PATH_SEGMENT_NAME } from "../constants.js";
 import { MissingMiddlewareForInternationalization } from "../errors/errors-data.js";
 import { AstroError } from "../errors/index.js";
+import { normalizePath } from "../viteUtils.js";
 const MIDDLEWARE_MODULE_ID = "\0astro-internal:middleware";
 const NOOP_MIDDLEWARE = "\0noop-middleware";
 function vitePluginMiddleware({ settings }) {

package/dist/core/render-context.js

@@ -488,7 +488,16 @@ class RenderContext {
         computedLocale = computeCurrentLocale(referer, locales, defaultLocale);
       }
     } else {
-      const pathname = routeData.pathname && !isRoute404or500(routeData) ? routeData.pathname : url.pathname;
+      let pathname = routeData.pathname;
+      if (!routeData.pattern.test(url.pathname)) {
+        for (const fallbackRoute of routeData.fallbackRoutes) {
+          if (fallbackRoute.pattern.test(url.pathname)) {
+            pathname = fallbackRoute.pathname;
+            break;
+          }
+        }
+      }
+      pathname = pathname && !isRoute404or500(routeData) ? pathname : url.pathname;
       computedLocale = computeCurrentLocale(pathname, locales, defaultLocale);
     }
     this.#currentLocale = computedLocale ?? fallbackTo;

package/dist/core/request.d.ts

@@ -1,13 +1,12 @@
 import type { IncomingHttpHeaders } from 'node:http';
 import type { Logger } from './logger/core.js';
 type HeaderType = Headers | Record<string, any> | IncomingHttpHeaders;
-type RequestBody = ArrayBuffer | Blob | ReadableStream | URLSearchParams | FormData | ReadableStream<Uint8Array>;
 export interface CreateRequestOptions {
     url: URL | string;
     clientAddress?: string | undefined;
     headers: HeaderType;
     method?: string;
-    body?: RequestBody | undefined | null;
+    body?: RequestInit['body'];
     logger: Logger;
     locals?: object | undefined;
     /**

package/dist/core/routing/manifest/create.d.ts

@@ -3,7 +3,6 @@ import type { Logger } from '../../logger/core.js';
 import nodeFs from 'node:fs';
 import type { RoutePart } from '../../../types/public/internal.js';
 export declare function getParts(part: string, file: string): RoutePart[];
-export declare function validateSegment(segment: string, file?: string): void;
 export interface CreateRouteManifestParams {
     /** Astro Settings object */
     settings: AstroSettings;

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

@@ -19,14 +19,8 @@ import { routeComparator } from "../priority.js";
 import { getRouteGenerator } from "./generator.js";
 import { getPattern } from "./pattern.js";
 import { getRoutePrerenderOption } from "./prerender.js";
+import { validateSegment } from "./segment.js";
 const require2 = createRequire(import.meta.url);
-function countOccurrences(needle, haystack) {
-  let count = 0;
-  for (const hay of haystack) {
-    if (hay === needle) count += 1;
-  }
-  return count;
-}
 const ROUTE_DYNAMIC_SPLIT = /\[(.+?\(.+?\)|.+?)\]/;
 const ROUTE_SPREAD = /^\.{3}.+$/;
 function getParts(part, file) {
@@ -46,18 +40,6 @@ function getParts(part, file) {
   });
   return result;
 }
-function validateSegment(segment, file = "") {
-  if (!file) file = segment;
-  if (segment.includes("][")) {
-    throw new Error(`Invalid route ${file} \u2014 parameters must be separated`);
-  }
-  if (countOccurrences("[", segment) !== countOccurrences("]", segment)) {
-    throw new Error(`Invalid route ${file} \u2014 brackets are unbalanced`);
-  }
-  if ((/.+\[\.\.\.[^\]]+\]/.test(segment) || /\[\.\.\.[^\]]+\].+/.test(segment)) && file.endsWith(".astro")) {
-    throw new Error(`Invalid route ${file} \u2014 rest parameter must be a standalone segment`);
-  }
-}
 function isSemanticallyEqualSegment(segmentA, segmentB) {
   if (segmentA.length !== segmentB.length) {
     return false;
@@ -529,6 +511,5 @@ function joinSegments(segments) {
 export {
   createRouteManifest,
   getParts,
-  resolveInjectedRoute,
-  validateSegment
+  resolveInjectedRoute
 };

package/dist/core/routing/manifest/parts.d.ts

@@ -0,0 +1,2 @@
+import type { RoutePart } from '../../../types/public/index.js';
+export declare function getParts(part: string, file: string): RoutePart[];

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

@@ -0,0 +1,22 @@
+const ROUTE_DYNAMIC_SPLIT = /\[(.+?\(.+?\)|.+?)\]/;
+const ROUTE_SPREAD = /^\.{3}.+$/;
+function getParts(part, file) {
+  const result = [];
+  part.split(ROUTE_DYNAMIC_SPLIT).map((str, i) => {
+    if (!str) return;
+    const dynamic = i % 2 === 1;
+    const [, content] = dynamic ? /([^(]+)$/.exec(str) || [null, null] : [null, str];
+    if (!content || dynamic && !/^(?:\.\.\.)?[\w$]+$/.test(content)) {
+      throw new Error(`Invalid route ${file} \u2014 parameter name must match /^[a-zA-Z0-9_$]+$/`);
+    }
+    result.push({
+      content,
+      dynamic,
+      spread: dynamic && ROUTE_SPREAD.test(content)
+    });
+  });
+  return result;
+}
+export {
+  getParts
+};

package/dist/core/routing/manifest/segment.d.ts

@@ -0,0 +1 @@
+export declare function validateSegment(segment: string, file?: string): void;

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

@@ -0,0 +1,22 @@
+function validateSegment(segment, file = "") {
+  if (!file) file = segment;
+  if (segment.includes("][")) {
+    throw new Error(`Invalid route ${file} \u2014 parameters must be separated`);
+  }
+  if (countOccurrences("[", segment) !== countOccurrences("]", segment)) {
+    throw new Error(`Invalid route ${file} \u2014 brackets are unbalanced`);
+  }
+  if ((/.+\[\.\.\.[^\]]+\]/.test(segment) || /\[\.\.\.[^\]]+\].+/.test(segment)) && file.endsWith(".astro")) {
+    throw new Error(`Invalid route ${file} \u2014 rest parameter must be a standalone segment`);
+  }
+}
+function countOccurrences(needle, haystack) {
+  let count = 0;
+  for (const hay of haystack) {
+    if (hay === needle) count += 1;
+  }
+  return count;
+}
+export {
+  validateSegment
+};

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

@@ -93,7 +93,7 @@ function createEndpoint(manifest) {
     }
     const key = await manifest.key;
     const encryptedProps = data.encryptedProps;
-    const propString = await decryptString(key, encryptedProps);
+    const propString = encryptedProps === "" ? "{}" : await decryptString(key, encryptedProps);
     const props = JSON.parse(propString);
     const componentModule = await imp();
     let Component = componentModule[data.componentExport];

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

@@ -12,6 +12,7 @@ export type SyncOptions = {
         cleanup?: boolean;
     };
     manifest: ManifestData;
+    command: 'build' | 'dev' | 'sync';
 };
 export default function sync(inlineConfig: AstroInlineConfig, { fs, telemetry: _telemetry }?: {
     fs?: typeof fsMod;
@@ -20,10 +21,11 @@ export default function sync(inlineConfig: AstroInlineConfig, { fs, telemetry: _
 /**
  * Clears the content layer and content collection cache, forcing a full rebuild.
  */
-export declare function clearContentLayerCache({ settings, logger, fs, }: {
+export declare function clearContentLayerCache({ settings, logger, fs, isDev, }: {
     settings: AstroSettings;
     logger: Logger;
     fs?: typeof fsMod;
+    isDev: boolean;
 }): Promise<void>;
 /**
  * Generates TypeScript types for all Astro modules. This sets up a `src/env.d.ts` file for type inferencing,
@@ -31,4 +33,4 @@ export declare function clearContentLayerCache({ settings, logger, fs, }: {
  *
  * @experimental The JavaScript API is experimental
  */
-export declare function syncInternal({ mode, logger, fs, settings, skip, force, manifest, }: SyncOptions): Promise<void>;
+export declare function syncInternal({ mode, logger, fs, settings, skip, force, manifest, command, }: SyncOptions): Promise<void>;

package/dist/core/sync/index.js

@@ -1,10 +1,9 @@
-import fsMod, { existsSync } from "node:fs";
+import fsMod 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";
@@ -28,6 +27,7 @@ import {
 } from "../errors/index.js";
 import { createRouteManifest } from "../routing/index.js";
 import { ensureProcessNodeEnv } from "../util.js";
+import { normalizePath } from "../viteUtils.js";
 async function sync(inlineConfig, { fs, telemetry: _telemetry = false } = {}) {
   ensureProcessNodeEnv("production");
   const logger = createNodeLogger(inlineConfig);
@@ -49,15 +49,17 @@ async function sync(inlineConfig, { fs, telemetry: _telemetry = false } = {}) {
     mode: "production",
     fs,
     force: inlineConfig.force,
-    manifest
+    manifest,
+    command: "sync"
   });
 }
 async function clearContentLayerCache({
   settings,
   logger,
-  fs = fsMod
+  fs = fsMod,
+  isDev
 }) {
-  const dataStore = getDataStoreFile(settings);
+  const dataStore = getDataStoreFile(settings, isDev);
   if (fs.existsSync(dataStore)) {
     logger.debug("content", "clearing data store");
     await fs.promises.rm(dataStore, { force: true });
@@ -71,10 +73,12 @@ async function syncInternal({
   settings,
   skip,
   force,
-  manifest
+  manifest,
+  command
 }) {
+  const isDev = command === "dev";
   if (force) {
-    await clearContentLayerCache({ settings, logger, fs });
+    await clearContentLayerCache({ settings, logger, fs, isDev });
   }
   const timerStart = performance.now();
   if (!skip?.content) {
@@ -82,15 +86,14 @@ async function syncInternal({
     settings.timer.start("Sync content layer");
     let store;
     try {
-      const dataStoreFile = getDataStoreFile(settings);
-      if (existsSync(dataStoreFile)) {
-        store = await MutableDataStore.fromFile(dataStoreFile);
-      }
+      const dataStoreFile = getDataStoreFile(settings, isDev);
+      store = await MutableDataStore.fromFile(dataStoreFile);
     } catch (err) {
       logger.error("content", err.message);
     }
     if (!store) {
-      store = new MutableDataStore();
+      logger.error("content", "Failed to load content store");
+      return;
     }
     const contentLayer = globalContentLayer.init({
       settings,

package/dist/env/env-loader.d.ts

@@ -1,6 +1,6 @@
 import type { AstroConfig } from '../types/public/index.js';
-export declare const createEnvLoader: () => {
-    load: (mode: string, config: AstroConfig) => Record<string, string>;
+export declare const createEnvLoader: (mode: string, config: AstroConfig) => {
+    get: () => Record<string, string>;
     getPrivateEnv: () => Record<string, string>;
 };
 export type EnvLoader = ReturnType<typeof createEnvLoader>;

package/dist/env/env-loader.js

@@ -27,17 +27,12 @@ function getPrivateEnv(fullEnv, astroConfig) {
   }
   return privateEnv;
 }
-const createEnvLoader = () => {
-  let privateEnv = {};
+const createEnvLoader = (mode, config) => {
+  const loaded = loadEnv(mode, config.vite.envDir ?? fileURLToPath(config.root), "");
+  const privateEnv = getPrivateEnv(loaded, config);
   return {
-    load: (mode, config) => {
-      const loaded = loadEnv(mode, config.vite.envDir ?? fileURLToPath(config.root), "");
-      privateEnv = getPrivateEnv(loaded, config);
-      return loaded;
-    },
-    getPrivateEnv: () => {
-      return privateEnv;
-    }
+    get: () => loaded,
+    getPrivateEnv: () => privateEnv
   };
 };
 export {

package/dist/env/vite-plugin-env.d.ts

@@ -3,9 +3,8 @@ import type { AstroSettings } from '../types/astro.js';
 import type { EnvLoader } from './env-loader.js';
 interface AstroEnvPluginParams {
     settings: AstroSettings;
-    mode: string;
     sync: boolean;
     envLoader: EnvLoader;
 }
-export declare function astroEnv({ settings, mode, sync, envLoader }: AstroEnvPluginParams): Plugin;
+export declare function astroEnv({ settings, sync, envLoader }: AstroEnvPluginParams): Plugin;
 export {};

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

@@ -7,10 +7,33 @@ import {
 } from "./constants.js";
 import { invalidVariablesToError } from "./errors.js";
 import { getEnvFieldType, validateEnvVariable } from "./validators.js";
-function astroEnv({ settings, mode, sync, envLoader }) {
+function astroEnv({ settings, sync, envLoader }) {
   const { schema, validateSecrets } = settings.config.env;
   let isDev;
   let templates = null;
+  function ensureTemplateAreLoaded() {
+    if (templates !== null) {
+      return;
+    }
+    const loadedEnv = envLoader.get();
+    if (!isDev) {
+      for (const [key, value] of Object.entries(loadedEnv)) {
+        if (value !== void 0) {
+          process.env[key] = value;
+        }
+      }
+    }
+    const validatedVariables = validatePublicVariables({
+      schema,
+      loadedEnv,
+      validateSecrets,
+      sync
+    });
+    templates = {
+      ...getTemplates(schema, validatedVariables, isDev ? loadedEnv : null),
+      internal: `export const schema = ${JSON.stringify(schema)};`
+    };
+  }
   return {
     name: "astro-env-plugin",
     enforce: "pre",
@@ -18,24 +41,7 @@ function astroEnv({ settings, mode, sync, envLoader }) {
       isDev = command !== "build";
     },
     buildStart() {
-      const loadedEnv = envLoader.load(mode, settings.config);
-      if (!isDev) {
-        for (const [key, value] of Object.entries(loadedEnv)) {
-          if (value !== void 0) {
-            process.env[key] = value;
-          }
-        }
-      }
-      const validatedVariables = validatePublicVariables({
-        schema,
-        loadedEnv,
-        validateSecrets,
-        sync
-      });
-      templates = {
-        ...getTemplates(schema, validatedVariables, isDev ? loadedEnv : null),
-        internal: `export const schema = ${JSON.stringify(schema)};`
-      };
+      ensureTemplateAreLoaded();
     },
     buildEnd() {
       templates = null;
@@ -47,10 +53,12 @@ function astroEnv({ settings, mode, sync, envLoader }) {
     },
     load(id, options) {
       if (id === resolveVirtualModuleId(VIRTUAL_MODULES_IDS.client)) {
+        ensureTemplateAreLoaded();
         return templates.client;
       }
       if (id === resolveVirtualModuleId(VIRTUAL_MODULES_IDS.server)) {
         if (options?.ssr) {
+          ensureTemplateAreLoaded();
           return templates.server;
         }
         throw new AstroError({
@@ -59,6 +67,7 @@ function astroEnv({ settings, mode, sync, envLoader }) {
         });
       }
       if (id === resolveVirtualModuleId(VIRTUAL_MODULES_IDS.internal)) {
+        ensureTemplateAreLoaded();
         return templates.internal;
       }
     }

package/dist/{vite-plugin-env/index.d.ts → env/vite-plugin-import-meta-env.d.ts}

@@ -1,7 +1,7 @@
 import type * as vite from 'vite';
-import type { EnvLoader } from '../env/env-loader.js';
+import type { EnvLoader } from './env-loader.js';
 interface EnvPluginOptions {
     envLoader: EnvLoader;
 }
-export default function envVitePlugin({ envLoader }: EnvPluginOptions): vite.Plugin;
+export declare function importMetaEnv({ envLoader }: EnvPluginOptions): vite.Plugin;
 export {};

package/dist/{vite-plugin-env/index.js → env/vite-plugin-import-meta-env.js}

@@ -37,7 +37,7 @@ async function replaceDefine(code, id, define, config) {
     map: result.map || null
   };
 }
-function envVitePlugin({ envLoader }) {
+function importMetaEnv({ envLoader }) {
   let privateEnv;
   let defaultDefines;
   let isDev;
@@ -108,5 +108,5 @@ function envVitePlugin({ envLoader }) {
   };
 }
 export {
-  envVitePlugin as default
+  importMetaEnv
 };

package/dist/runtime/server/render/server-islands.js

@@ -50,7 +50,7 @@ function renderServerIsland(result, _displayName, props, slots) {
         }
       }
       const key = await result.key;
-      const propsEncrypted = await encryptString(key, JSON.stringify(props));
+      const propsEncrypted = Object.keys(props).length === 0 ? "" : await encryptString(key, JSON.stringify(props));
       const hostId = crypto.randomUUID();
       const slash = result.base.endsWith("/") ? "" : "/";
       let serverIslandUrl = `${result.base}${slash}_server-islands/${componentId}${result.trailingSlash === "always" ? "/" : ""}`;

package/dist/vite-plugin-markdown/index.js

@@ -4,10 +4,10 @@ import {
   createMarkdownProcessor,
   isFrontmatterValid
 } from "@astrojs/markdown-remark";
-import { normalizePath } from "vite";
 import { safeParseFrontmatter } from "../content/utils.js";
 import { AstroError, AstroErrorData } from "../core/errors/index.js";
 import { isMarkdownFile, isPage } from "../core/util.js";
+import { normalizePath } from "../core/viteUtils.js";
 import { shorthash } from "../runtime/server/shorthash.js";
 import { createDefaultAstroMetadata } from "../vite-plugin-astro/metadata.js";
 import { getFileInfo } from "../vite-plugin-utils/index.js";

package/dist/vite-plugin-scanner/index.js

@@ -1,11 +1,10 @@
 import { extname } from "node:path";
 import { fileURLToPath } from "node:url";
 import { bold } from "kleur/colors";
-import { normalizePath } from "vite";
 import { warnMissingAdapter } from "../core/dev/adapter-validation.js";
 import { getRoutePrerenderOption } from "../core/routing/manifest/prerender.js";
 import { isEndpoint, isPage } from "../core/util.js";
-import { rootRelativePath } from "../core/viteUtils.js";
+import { normalizePath, rootRelativePath } from "../core/viteUtils.js";
 const KNOWN_FILE_EXTENSIONS = [".astro", ".js", ".ts"];
 function astroScannerPlugin({
   settings,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "5.1.4",
+  "version": "5.1.6",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -211,6 +211,10 @@
   "publishConfig": {
     "provenance": true
   },
+  "funding": {
+    "type": "opencollective",
+    "url": "https://opencollective.com/astrodotbuild"
+  },
   "scripts": {
     "prebuild": "astro-scripts prebuild --to-string \"src/runtime/server/astro-island.ts\" \"src/runtime/client/{idle,load,media,only,visible}.ts\"",
     "build": "pnpm run prebuild && astro-scripts build \"src/**/*.{ts,js}\" --copy-wasm && tsc",