astro 5.10.0 → 5.10.1

package/dist/content/config.js

@@ -2,7 +2,7 @@ import { AstroError, AstroErrorData, AstroUserError } from "../core/errors/index
 import { CONTENT_LAYER_TYPE, LIVE_CONTENT_TYPE } from "./consts.js";
 function getImporterFilename() {
   const stackLine = new Error().stack?.split("\n").find(
-    (line) => !line.includes("defineCollection") && !line.includes("defineLiveCollection") && !line.includes("getImporterFilename") && line !== "Error"
+    (line) => !line.includes("defineCollection") && !line.includes("defineLiveCollection") && !line.includes("getImporterFilename") && !line.startsWith("Error")
   );
   if (!stackLine) {
     return void 0;
@@ -12,7 +12,7 @@ function getImporterFilename() {
 }
 function defineLiveCollection(config) {
   const importerFilename = getImporterFilename();
-  if (!importerFilename?.includes("live.config")) {
+  if (importerFilename && !importerFilename.includes("live.config")) {
     throw new AstroError({
       ...AstroErrorData.LiveContentConfigError,
       message: AstroErrorData.LiveContentConfigError.message(

package/dist/content/content-layer.js

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

package/dist/content/runtime.js

@@ -41,7 +41,8 @@ function createCollectionToGlobResultMap({
 }
 const cacheHintSchema = z.object({
   tags: z.array(z.string()).optional(),
-  maxAge: z.number().optional()
+  maxAge: z.number().optional(),
+  lastModified: z.date().optional()
 });
 async function parseLiveEntry(entry, schema, collection) {
   try {
@@ -381,24 +382,37 @@ function createGetLiveCollection({
       if (processedEntries.length > 0) {
         const entryTags = /* @__PURE__ */ new Set();
         let minMaxAge;
+        let latestModified;
         for (const entry of processedEntries) {
           if (entry.cacheHint) {
             if (entry.cacheHint.tags) {
               entry.cacheHint.tags.forEach((tag) => entryTags.add(tag));
             }
             if (typeof entry.cacheHint.maxAge === "number") {
-              minMaxAge = minMaxAge === void 0 ? entry.cacheHint.maxAge : Math.min(minMaxAge, entry.cacheHint.maxAge);
+              if (minMaxAge === void 0 || entry.cacheHint.maxAge < minMaxAge) {
+                minMaxAge = entry.cacheHint.maxAge;
+              }
+            }
+            if (entry.cacheHint.lastModified instanceof Date) {
+              if (latestModified === void 0 || entry.cacheHint.lastModified > latestModified) {
+                latestModified = entry.cacheHint.lastModified;
+              }
             }
           }
         }
-        if (entryTags.size > 0 || minMaxAge !== void 0 || cacheHint) {
+        if (entryTags.size > 0 || minMaxAge !== void 0 || latestModified || cacheHint) {
           const mergedCacheHint = {};
           if (cacheHint?.tags || entryTags.size > 0) {
-            mergedCacheHint.tags = [...cacheHint?.tags || [], ...entryTags];
+            mergedCacheHint.tags = [.../* @__PURE__ */ new Set([...cacheHint?.tags || [], ...entryTags])];
           }
           if (cacheHint?.maxAge !== void 0 || minMaxAge !== void 0) {
             mergedCacheHint.maxAge = cacheHint?.maxAge !== void 0 && minMaxAge !== void 0 ? Math.min(cacheHint.maxAge, minMaxAge) : cacheHint?.maxAge ?? minMaxAge;
           }
+          if (cacheHint?.lastModified && latestModified) {
+            mergedCacheHint.lastModified = cacheHint.lastModified > latestModified ? cacheHint.lastModified : latestModified;
+          } else if (cacheHint?.lastModified || latestModified) {
+            mergedCacheHint.lastModified = cacheHint?.lastModified ?? latestModified;
+          }
           cacheHint = mergedCacheHint;
         }
       }
@@ -498,7 +512,9 @@ async function updateImageReferencesInBody(html, fileName) {
     return Object.entries({
       ...attributes,
       src: image.src,
-      srcset: image.srcSet.attribute
+      srcset: image.srcSet.attribute,
+      // This attribute is used by the toolbar audit
+      ...import.meta.env.DEV ? { "data-image-component": "true" } : {}
     }).map(([key, value]) => value ? `${key}="${escape(value)}"` : "").join(" ");
   });
 }

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "5.10.0";
+const ASTRO_VERSION = "5.10.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/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.10.0";
+  const currentVersion = "5.10.1";
   const isPrerelease = currentVersion.includes("-");
   if (!isPrerelease) {
     try {

package/dist/core/dev/restart.js

@@ -51,6 +51,12 @@ async function restartContainer(container) {
   container.restartInFlight = true;
   try {
     const { astroConfig } = await resolveConfig(container.inlineConfig, "dev", container.fs);
+    if (astroConfig.experimental.csp) {
+      logger.warn(
+        "config",
+        "Astro's Content Security Policy (CSP) does not work in development mode. To verify your CSP implementation, build the project and run the preview server."
+      );
+    }
     const settings = await createSettings(astroConfig, fileURLToPath(existingSettings.config.root));
     await close();
     return await createRestartedContainer(container, settings);
@@ -80,9 +86,20 @@ async function createContainerWithAutomaticRestart({
 }) {
   const logger = createNodeLogger(inlineConfig ?? {});
   const { userConfig, astroConfig } = await resolveConfig(inlineConfig ?? {}, "dev", fs);
+  if (astroConfig.experimental.csp) {
+    logger.warn(
+      "config",
+      "Astro's Content Security Policy (CSP) does not work in development mode. To verify your CSP implementation, build the project and run the preview server."
+    );
+  }
   telemetry.record(eventCliSession("dev", userConfig));
   const settings = await createSettings(astroConfig, fileURLToPath(astroConfig.root));
-  const initialContainer = await createContainer({ settings, logger, inlineConfig, fs });
+  const initialContainer = await createContainer({
+    settings,
+    logger,
+    inlineConfig,
+    fs
+  });
   let resolveRestart;
   let restartComplete = new Promise((resolve) => {
     resolveRestart = resolve;

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

@@ -1517,7 +1517,7 @@ export declare const ContentEntryDataError: {
  * @description
  * Error in live content config.
  * @see
- * - [Experimental live content](https://astro.build/en/reference/experimental-flags/live-content-collections/)
+ * - [Experimental live content](https://docs.astro.build/en/reference/experimental-flags/live-content-collections/)
  */
 export declare const LiveContentConfigError: {
     name: string;

package/dist/core/messages.js

@@ -37,7 +37,7 @@ function serverStart({
   host,
   base
 }) {
-  const version = "5.10.0";
+  const version = "5.10.1";
   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.10.0"}`
+        `v${"5.10.1"}`
       )} ${headline}`
     );
   }

package/dist/core/render-context.js

@@ -20,6 +20,7 @@ import {
 } from "./constants.js";
 import { AstroCookies, attachCookiesToResponse } from "./cookies/index.js";
 import { getCookiesFromResponse } from "./cookies/response.js";
+import { generateCspDigest } from "./encryption.js";
 import { CspNotEnabled, ForbiddenRewrite } from "./errors/errors-data.js";
 import { AstroError, AstroErrorData } from "./errors/index.js";
 import { callMiddleware } from "./middleware/callMiddleware.js";
@@ -362,6 +363,18 @@ class RenderContext {
     const { cookies, pathname, pipeline, routeData, status } = this;
     const { clientDirectives, inlinedScripts, compressHTML, manifest, renderers, resolve } = pipeline;
     const { links, scripts, styles } = await pipeline.headElements(routeData);
+    const extraStyleHashes = [];
+    const extraScriptHashes = [];
+    const shouldInjectCspMetaTags = !!manifest.csp;
+    const cspAlgorithm = manifest.csp?.algorithm ?? "SHA-256";
+    if (shouldInjectCspMetaTags) {
+      for (const style of styles) {
+        extraStyleHashes.push(await generateCspDigest(style.children, cspAlgorithm));
+      }
+      for (const script of scripts) {
+        extraScriptHashes.push(await generateCspDigest(script.children, cspAlgorithm));
+      }
+    }
     const componentMetadata = await pipeline.componentMetadata(routeData) ?? manifest.componentMetadata;
     const headers = new Headers({ "Content-Type": "text/html" });
     const partial = typeof this.partial === "boolean" ? this.partial : Boolean(mod.partial);
@@ -411,13 +424,13 @@ class RenderContext {
         hasRenderedServerIslandRuntime: false,
         headInTree: false,
         extraHead: [],
-        extraStyleHashes: [],
-        extraScriptHashes: [],
+        extraStyleHashes,
+        extraScriptHashes,
         propagators: /* @__PURE__ */ new Set()
       },
       cspDestination: manifest.csp?.cspDestination ?? (routeData.prerender ? "meta" : "header"),
-      shouldInjectCspMetaTags: !!manifest.csp,
-      cspAlgorithm: manifest.csp?.algorithm ?? "SHA-256",
+      shouldInjectCspMetaTags,
+      cspAlgorithm,
       // The following arrays must be cloned, otherwise they become mutable across routes.
       scriptHashes: manifest.csp?.scriptHashes ? [...manifest.csp.scriptHashes] : [],
       scriptResources: manifest.csp?.scriptResources ? [...manifest.csp.scriptResources] : [],

package/dist/runtime/server/index.js

@@ -67,7 +67,7 @@ function spreadAttributes(values = {}, _name, { class: scopedClassName } = {}) {
     }
   }
   for (const [key, value] of Object.entries(values)) {
-    output += addAttribute2(value, key, true);
+    output += addAttribute2(value, key, true, _name);
   }
   return markHTMLString2(output);
 }

package/dist/runtime/server/render/component.js

@@ -228,7 +228,9 @@ If you're still stuck, please open an issue on GitHub or join us at https://astr
     const Tag = sanitizeElementName(Component);
     const childSlots = Object.values(children).join("");
     const renderTemplateResult = renderTemplate`<${Tag}${internalSpreadAttributes(
-      props
+      props,
+      true,
+      Tag
     )}${markHTMLString(
       childSlots === "" && voidElementNames.test(Tag) ? `/>` : `>${childSlots}</${Tag}>`
     )}`;

package/dist/runtime/server/render/util.d.ts

@@ -5,8 +5,8 @@ export declare const toAttributeString: (value: any, shouldEscape?: boolean) =>
 export declare const toStyleString: (obj: Record<string, any>) => string;
 export declare function defineScriptVars(vars: Record<any, any>): any;
 export declare function formatList(values: string[]): string;
-export declare function addAttribute(value: any, key: string, shouldEscape?: boolean): any;
-export declare function internalSpreadAttributes(values: Record<any, any>, shouldEscape?: boolean): any;
+export declare function addAttribute(value: any, key: string, shouldEscape?: boolean, tagName?: string): any;
+export declare function internalSpreadAttributes(values: Record<any, any>, shouldEscape: boolean | undefined, tagName: string): any;
 export declare function renderElement(name: string, { props: _props, children }: SSRElement, shouldEscape?: boolean): string;
 /**
  * Executes the `bufferRenderFunction` to prerender it into a buffer destination, and return a promise

package/dist/runtime/server/render/util.js

@@ -33,7 +33,16 @@ function formatList(values) {
   }
   return `${values.slice(0, -1).join(", ")} or ${values[values.length - 1]}`;
 }
-function addAttribute(value, key, shouldEscape = true) {
+function isCustomElement(tagName) {
+  return tagName.includes("-");
+}
+function handleBooleanAttribute(key, value, shouldEscape, tagName) {
+  if (tagName && isCustomElement(tagName)) {
+    return markHTMLString(` ${key}="${toAttributeString(value, shouldEscape)}"`);
+  }
+  return markHTMLString(value ? ` ${key}` : "");
+}
+function addAttribute(value, key, shouldEscape = true, tagName = "") {
   if (value == null) {
     return "";
   }
@@ -67,23 +76,23 @@ Make sure to use the static attribute syntax (\`${key}={value}\`) instead of the
     return markHTMLString(` ${key}="${toAttributeString(value, false)}"`);
   }
   if (htmlBooleanAttributes.test(key)) {
-    return markHTMLString(value ? ` ${key}` : "");
+    return handleBooleanAttribute(key, value, shouldEscape, tagName);
   }
   if (value === "") {
     return markHTMLString(` ${key}`);
   }
   if (key === "popover" && typeof value === "boolean") {
-    return markHTMLString(value ? ` popover` : "");
+    return handleBooleanAttribute(key, value, shouldEscape, tagName);
   }
   if (key === "download" && typeof value === "boolean") {
-    return markHTMLString(value ? ` download` : "");
+    return handleBooleanAttribute(key, value, shouldEscape, tagName);
   }
   return markHTMLString(` ${key}="${toAttributeString(value, shouldEscape)}"`);
 }
-function internalSpreadAttributes(values, shouldEscape = true) {
+function internalSpreadAttributes(values, shouldEscape = true, tagName) {
   let output = "";
   for (const [key, value] of Object.entries(values)) {
-    output += addAttribute(value, key, shouldEscape);
+    output += addAttribute(value, key, shouldEscape, tagName);
   }
   return markHTMLString(output);
 }
@@ -100,9 +109,9 @@ function renderElement(name, { props: _props, children = "" }, shouldEscape = tr
     }
   }
   if ((children == null || children == "") && voidElementNames.test(name)) {
-    return `<${name}${internalSpreadAttributes(props, shouldEscape)}>`;
+    return `<${name}${internalSpreadAttributes(props, shouldEscape, name)}>`;
   }
-  return `<${name}${internalSpreadAttributes(props, shouldEscape)}>${children}</${name}>`;
+  return `<${name}${internalSpreadAttributes(props, shouldEscape, name)}>${children}</${name}>`;
 }
 const noop = () => {
 };

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

@@ -1240,6 +1240,20 @@ export interface ViteUserConfig extends OriginalViteUserConfig {
 
          */
         remotePatterns?: Partial<RemotePattern>[];
+        /**
+         * @docs
+         * @name image.responsiveStyles
+         * @type {boolean}
+         * @default `false`
+         * @version 5.10.0
+         * @description
+         * Whether to automatically add global styles for responsive images. You should enable this option unless you are styling the images yourself.
+         *
+         * This option is only used when `layout` is set to `constrained`, `full-width`, or `fixed` using the configuration or the `layout` prop on the image component.
+         *
+         * See [the images docs](https://docs.astro.build/en/guides/images/#responsive-image-styles) for more information.
+         */
+        responsiveStyles?: boolean;
         /**
          * @docs
          * @name image.layout
@@ -1262,7 +1276,7 @@ export interface ViteUserConfig extends OriginalViteUserConfig {
          * @default `"cover"`
          * @version 5.10.0
          * @description
-         * The default object-fit value for responsive images. Can be overridden by the `fit` prop on the image component.
+         * The [`object-fit` CSS property value](https://developer.mozilla.org/en-US/docs/Web/CSS/object-fit) for responsive images. Can be overridden by the `fit` prop on the image component.
          * Requires a value for `layout` to be set.
          *
          * See [the `fit` component property](https://docs.astro.build/en/reference/modules/astro-assets/#fit) for more details.
@@ -1275,7 +1289,7 @@ export interface ViteUserConfig extends OriginalViteUserConfig {
          * @default `"center"`
          * @version 5.10.0
          * @description
-         * The default object-position value for responsive images. Can be overridden by the `position` prop on the image component.
+         * The default [`object-position` CSS property value](https://developer.mozilla.org/en-US/docs/Web/CSS/object-position) for responsive images. Can be overridden by the `position` prop on the image component.
          * Requires a value for `layout` to be set.
          *
          * See [the `position` component property](https://docs.astro.build/en/reference/modules/astro-assets/#position) for more details.
@@ -1293,19 +1307,6 @@ export interface ViteUserConfig extends OriginalViteUserConfig {
          * the more comprehensive list is used, because only the required sizes are generated. For local services, the list is shorter to reduce the number of images generated.
          */
         breakpoints?: number[];
-        /**
-         * @docs
-         * @name image.responsiveStyles
-         * @type {boolean}
-         * @default `false`
-         * @version 5.10.0
-         * @description
-         * Whether to automatically add global styles for responsive images. You should enable this option unless you are styling the images yourself.
-         * This option is only used when `layout` is set to `constrained`, `full-width`, or `fixed` using the configuration or the `layout` prop on the image component.
-         *
-         * See [the images docs](https://docs.astro.build/en/guides/images/#responsive-image-styles) for more information.
-         */
-        responsiveStyles?: boolean;
     };
     /**
      * @docs

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

@@ -114,6 +114,8 @@ export interface CacheHint {
     tags?: Array<string>;
     /** Maximum age of the response in seconds */
     maxAge?: number;
+    /** Last modified time of the content */
+    lastModified?: Date;
 }
 export interface LiveDataEntry<TData extends Record<string, any> = Record<string, unknown>> {
     /** The ID of the entry. Unique per collection. */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "5.10.0",
+  "version": "5.10.1",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",