astro 5.12.0 → 5.12.2

package/client.d.ts

@@ -536,6 +536,11 @@ declare module '*?inline' {
 	export default src;
 }
 
+declare module '*?no-inline' {
+	const src: string;
+	export default src;
+}
+
 declare module '*?url&inline' {
 	const src: string;
 	export default src;

package/components/Code.astro

@@ -1,15 +1,9 @@
 ---
 import type { ThemePresets } from '@astrojs/markdown-remark';
-import type {
-	BuiltinLanguage,
-	LanguageRegistration,
-	ShikiTransformer,
-	SpecialLanguage,
-	ThemeRegistration,
-	ThemeRegistrationRaw,
-} from 'shiki';
+import type { ShikiTransformer, ThemeRegistration, ThemeRegistrationRaw } from 'shiki';
 import { bundledLanguages } from 'shiki/langs';
 import { getCachedHighlighter } from '../dist/core/shiki.js';
+import type { CodeLanguage } from '../dist/types/public';
 import type { HTMLAttributes } from '../types';
 
 interface Props extends Omit<HTMLAttributes<'pre'>, 'lang'> {
@@ -22,7 +16,7 @@ interface Props extends Omit<HTMLAttributes<'pre'>, 'lang'> {
 	 *
 	 * @default "plaintext"
 	 */
-	lang?: BuiltinLanguage | SpecialLanguage | LanguageRegistration;
+	lang?: CodeLanguage;
 	/**
 	 * A metastring to pass to the highlighter.
 	 * Allows passing information to transformers: https://shiki.style/guide/transformers#meta

package/dist/assets/runtime.js

@@ -15,6 +15,10 @@ function createSvgComponent({ meta, attributes, children }) {
       value: (_, opts, inspect) => inspect(meta, opts)
     });
   }
+  Object.defineProperty(Component, "toJSON", {
+    value: () => meta,
+    enumerable: false
+  });
   return Object.assign(Component, meta);
 }
 const ATTRS_TO_DROP = ["xmlns", "xmlns:xlink", "version"];

package/dist/assets/types.d.ts

@@ -136,6 +136,15 @@ type ImageSharedProps<T> = T & {
      * ```
      */
     quality?: ImageQuality;
+    /**
+     * If true, the image will be loaded with a higher priority. This can be useful for images that are visible above the fold. There should usually be only one image with `priority` set to `true` per page.
+     * All other images will be lazy-loaded according to when they are in the viewport.
+     * **Example**:
+     * ```astro
+     * <Image src={...} priority alt="..." />
+     * ```
+     */
+    priority?: boolean;
 } & ({
     /**
      * The layout type for responsive images.
@@ -174,15 +183,6 @@ type ImageSharedProps<T> = T & {
      * ```
      */
     position?: string;
-    /**
-     * If true, the image will be loaded with a higher priority. This can be useful for images that are visible above the fold. There should usually be only one image with `priority` set to `true` per page.
-     * All other images will be lazy-loaded according to when they are in the viewport.
-     * **Example**:
-     * ```astro
-     * <Image src={...} priority alt="..." />
-     * ```
-     */
-    priority?: boolean;
     /**
      * A list of widths to generate images for. The value of this property will be used to assign the `srcset` property on the final `img` element.
      *

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

@@ -79,9 +79,12 @@ function assets({ fs, settings, sync, logger }) {
       config(_, env) {
         isBuild = env.command === "build";
       },
-      async resolveId(id) {
+      async resolveId(id, _importer, options) {
         if (id === VIRTUAL_SERVICE_ID) {
-          return await this.resolve(settings.config.image.service.entrypoint);
+          if (options?.ssr) {
+            return await this.resolve(settings.config.image.service.entrypoint);
+          }
+          return await this.resolve("astro/assets/services/noop");
         }
         if (id === VIRTUAL_MODULE_ID) {
           return resolvedVirtualModuleId;

package/dist/cli/throw-and-exit.js

@@ -5,7 +5,9 @@ import { debug } from "../core/logger/core.js";
 import { formatErrorMessage } from "../core/messages.js";
 import { eventError, telemetry } from "../events/index.js";
 async function throwAndExit(cmd, err) {
-  if (isAstroConfigZodError(err)) return;
+  if (isAstroConfigZodError(err)) {
+    process.exit(1);
+  }
   let telemetryPromise;
   let errorMessage;
   function exitWithErrorMessage() {

package/dist/content/content-layer.js

@@ -164,7 +164,7 @@ ${contentConfig.error.message}`);
       logger.info("Content config changed");
       shouldClear = true;
     }
-    if (previousAstroVersion && previousAstroVersion !== "5.12.0") {
+    if (previousAstroVersion && previousAstroVersion !== "5.12.2") {
       logger.info("Astro version changed");
       shouldClear = true;
     }
@@ -172,8 +172,8 @@ ${contentConfig.error.message}`);
       logger.info("Clearing content store");
       this.#store.clearAll();
     }
-    if ("5.12.0") {
-      await this.#store.metaStore().set("astro-version", "5.12.0");
+    if ("5.12.2") {
+      await this.#store.metaStore().set("astro-version", "5.12.2");
     }
     if (currentConfigDigest) {
       await this.#store.metaStore().set("content-config-digest", currentConfigDigest);

package/dist/content/loaders/errors.js

@@ -5,6 +5,9 @@ class LiveCollectionError extends Error {
     this.message = message;
     this.cause = cause;
     this.name = "LiveCollectionError";
+    if (cause?.stack) {
+      this.stack = cause.stack;
+    }
   }
   static is(error) {
     return error instanceof LiveCollectionError;

package/dist/content/loaders/file.js

@@ -44,12 +44,19 @@ function file(fileName, options) {
       }
       logger.debug(`Found ${data.length} item array in ${fileName}`);
       store.clear();
+      const idList = /* @__PURE__ */ new Set();
       for (const rawItem of data) {
         const id = (rawItem.id ?? rawItem.slug)?.toString();
         if (!id) {
           logger.error(`Item in ${fileName} is missing an id or slug field.`);
           continue;
         }
+        if (idList.has(id)) {
+          logger.warn(
+            `Duplicate id "${id}" found in ${fileName}. Later items with the same id will overwrite earlier ones.`
+          );
+        }
+        idList.add(id);
         const parsedData = await parseData({ id, data: rawItem, filePath });
         store.set({ id, data: parsedData, filePath: normalizedFilePath });
       }

package/dist/content/runtime.d.ts

@@ -139,3 +139,4 @@ export declare function createReference({ lookupMap }: {
     collection: string;
 }>;
 export declare function defineCollection(config: any): import("./config.js").CollectionConfig<import("./config.js").BaseSchema>;
+export declare function defineLiveCollection(): void;

package/dist/content/runtime.js

@@ -424,7 +424,7 @@ function createGetLiveCollection({
       return {
         error: new LiveCollectionError(
           collection,
-          `Unexpected error loading collection ${collection}`,
+          `Unexpected error loading collection ${collection}${error instanceof Error ? `: ${error.message}` : ""}`,
           error
         )
       };
@@ -700,6 +700,14 @@ function defineCollection(config) {
   }
   return defineCollectionOrig(config);
 }
+function defineLiveCollection() {
+  throw new AstroError({
+    ...AstroErrorData.LiveContentConfigError,
+    message: AstroErrorData.LiveContentConfigError.message(
+      "Live collections must be defined in a `src/live.config.ts` file."
+    )
+  });
+}
 export {
   LiveCollectionCacheHintError,
   LiveCollectionError,
@@ -715,5 +723,6 @@ export {
   createGetLiveEntry,
   createReference,
   defineCollection,
+  defineLiveCollection,
   renderEntry
 };

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

@@ -73,7 +73,7 @@ function astroContentVirtualModPlugin({
     async resolveId(id, importer) {
       if (id === VIRTUAL_MODULE_ID) {
         if (liveConfig && importer && liveConfig === normalizePath(importer)) {
-          return this.resolve("astro/content/config", importer, {
+          return this.resolve("astro/virtual-modules/live-config", importer, {
             skipSelf: true
           });
         }

package/dist/core/constants.js

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

@@ -85,8 +85,7 @@ async function createVite(commandConfig, { settings, logger, mode, command, fs =
     }
   });
   const srcDirPattern = convertPathToPattern(fileURLToPath(settings.config.srcDir));
-  const astroEnvLoader = createEnvLoader(mode, settings.config, false);
-  const importMetaEnvLoader = createEnvLoader(
+  const envLoader = createEnvLoader(
     mode,
     settings.config,
     settings.config.experimental.rawEnvValues
@@ -116,8 +115,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, routesList, manifest }),
       // manifest is only required in dev mode, where it gets created before a Vite instance is created, and get passed to this function
-      importMetaEnv({ envLoader: importMetaEnvLoader }),
-      astroEnv({ settings, sync, envLoader: astroEnvLoader }),
+      importMetaEnv({ envLoader }),
+      astroEnv({ settings, sync, envLoader }),
       markdownVitePlugin({ settings, logger }),
       htmlVitePlugin(),
       astroPostprocessVitePlugin(),

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.12.0";
+  const currentVersion = "5.12.2";
   const isPrerelease = currentVersion.includes("-");
   if (!isPrerelease) {
     try {

package/dist/core/messages.js

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

package/dist/core/routing/astro-designed-error-pages.js

@@ -4,7 +4,7 @@ const DEFAULT_404_ROUTE = {
   component: DEFAULT_404_COMPONENT,
   generate: () => "",
   params: [],
-  pattern: /\/404/,
+  pattern: /^\/404\/?$/,
   prerender: false,
   pathname: "/404",
   segments: [[{ content: "404", dynamic: false, spread: false }]],

package/dist/env/env-loader.js

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

package/dist/jsx-runtime/index.d.ts

@@ -8,5 +8,5 @@ export interface AstroVNode {
 }
 export declare function isVNode(vnode: any): vnode is AstroVNode;
 export declare function transformSlots(vnode: AstroVNode): AstroVNode | undefined;
-declare function createVNode(type: any, props: Record<string, any>): AstroVNode;
+declare function createVNode(type: any, props?: Record<string, any>, key?: string | number): AstroVNode;
 export { AstroJSX, Fragment, createVNode as jsx, createVNode as jsxDEV, createVNode as jsxs };

package/dist/jsx-runtime/index.js

@@ -54,12 +54,15 @@ function transformSetDirectives(vnode) {
     return;
   }
 }
-function createVNode(type, props) {
+function createVNode(type, props = {}, key) {
+  if (key) {
+    props.key = key;
+  }
   const vnode = {
     [Renderer]: "astro:jsx",
     [AstroJSX]: true,
     type,
-    props: props ?? {}
+    props
   };
   transformSetDirectives(vnode);
   transformSlots(vnode);

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

@@ -1,3 +1,4 @@
+import type { BundledLanguage, LanguageRegistration, SpecialLanguage } from 'shiki';
 import type { OmitIndexSignature, Simplify } from '../../type-utils.js';
 import type { APIContext } from './context.js';
 /**
@@ -136,3 +137,4 @@ export type InferGetStaticPropsType<T> = T extends (opts: GetStaticPathsOptions)
 } ? P : never : never : never;
 export type Params = Record<string, string | undefined>;
 export type Props = Record<string, unknown>;
+export type CodeLanguage = BundledLanguage | LanguageRegistration | SpecialLanguage;

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

@@ -132,7 +132,9 @@ interface TestSessionConfig extends CommonSessionConfig {
         mockStorage: Storage;
     };
 }
-export type SessionConfig<TDriver extends SessionDriverName> = TDriver extends keyof BuiltinDriverOptions ? BuiltinSessionConfig<TDriver> : TDriver extends 'test' ? TestSessionConfig : CustomSessionConfig;
+export type SessionConfig<TDriver extends SessionDriverName> = [
+    TDriver
+] extends [never] ? CustomSessionConfig : TDriver extends keyof BuiltinDriverOptions ? BuiltinSessionConfig<TDriver> : TDriver extends 'test' ? TestSessionConfig : CustomSessionConfig;
 export type ResolvedSessionConfig<TDriver extends SessionDriverName> = SessionConfig<TDriver> & {
     driverModule?: () => Promise<{
         default: () => Driver;

package/dist/virtual-modules/live-config.d.ts

@@ -0,0 +1,12 @@
+export * as z from 'zod';
+export { defineLiveCollection } from '../content/config.js';
+export declare const getCollection: () => never;
+export declare const render: () => never;
+export declare const getEntry: () => never;
+export declare const getEntryBySlug: () => never;
+export declare const getDataEntryById: () => never;
+export declare const getEntries: () => never;
+export declare const reference: () => never;
+export declare const getLiveCollection: () => never;
+export declare const getLiveEntry: () => never;
+export declare const defineCollection: () => never;

package/dist/virtual-modules/live-config.js

@@ -0,0 +1,37 @@
+import * as z from "zod";
+import { defineLiveCollection } from "../content/config.js";
+function createErrorFunction(message) {
+  return () => {
+    const error = new Error(`The ${message}() function is not available in live config files.`);
+    const stackLines = error.stack?.split("\n");
+    if (stackLines && stackLines.length > 1) {
+      stackLines.splice(1, 1);
+      error.stack = stackLines.join("\n");
+    }
+    throw error;
+  };
+}
+const getCollection = createErrorFunction("getCollection");
+const render = createErrorFunction("render");
+const getEntry = createErrorFunction("getEntry");
+const getEntryBySlug = createErrorFunction("getEntryBySlug");
+const getDataEntryById = createErrorFunction("getDataEntryById");
+const getEntries = createErrorFunction("getEntries");
+const reference = createErrorFunction("reference");
+const getLiveCollection = createErrorFunction("getLiveCollection");
+const getLiveEntry = createErrorFunction("getLiveEntry");
+const defineCollection = createErrorFunction("defineCollection");
+export {
+  defineCollection,
+  defineLiveCollection,
+  getCollection,
+  getDataEntryById,
+  getEntries,
+  getEntry,
+  getEntryBySlug,
+  getLiveCollection,
+  getLiveEntry,
+  reference,
+  render,
+  z
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "5.12.0",
+  "version": "5.12.2",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -158,9 +158,9 @@
     "zod": "^3.24.2",
     "zod-to-json-schema": "^3.24.5",
     "zod-to-ts": "^1.2.0",
-    "@astrojs/markdown-remark": "6.3.3",
+    "@astrojs/internal-helpers": "0.6.1",
     "@astrojs/telemetry": "3.3.0",
-    "@astrojs/internal-helpers": "0.6.1"
+    "@astrojs/markdown-remark": "6.3.3"
   },
   "optionalDependencies": {
     "sharp": "^0.33.3"

package/templates/content/module.mjs

@@ -11,7 +11,11 @@ import {
 	createReference,
 } from 'astro/content/runtime';
 
-export { defineCollection, renderEntry as render } from 'astro/content/runtime';
+export {
+	defineCollection,
+	defineLiveCollection,
+	renderEntry as render,
+} from 'astro/content/runtime';
 export { z } from 'astro/zod';
 
 /* @@LIVE_CONTENT_CONFIG@@ */