astro 5.8.0 → 5.8.2

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

@@ -71,7 +71,7 @@ function assets({ fs, settings, sync, logger }) {
   globalThis.astroAsset = {
     referencedImages: /* @__PURE__ */ new Set()
   };
-  const imageComponentPrefix = settings.config.experimental.responsiveImages ? "Responsive" : "";
+  const imageComponentPrefix = settings.config.experimental.responsiveImages && settings.config.image.experimentalDefaultStyles ? "Responsive" : "";
   return [
     // Expose the components and different utilities from `astro:assets`
     {

package/dist/content/content-layer.js

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

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

@@ -41,6 +41,7 @@ export declare const ASTRO_CONFIG_DEFAULTS: {
             entrypoint: "astro/assets/services/sharp";
             config: {};
         };
+        experimentalDefaultStyles: true;
     };
     devToolbar: {
         enabled: true;
@@ -244,7 +245,9 @@ export declare const AstroConfigSchema: z.ZodObject<{
         experimentalObjectFit: z.ZodOptional<z.ZodString>;
         experimentalObjectPosition: z.ZodOptional<z.ZodString>;
         experimentalBreakpoints: z.ZodOptional<z.ZodArray<z.ZodNumber, "many">>;
+        experimentalDefaultStyles: z.ZodDefault<z.ZodBoolean>;
     }, "strip", z.ZodTypeAny, {
+        experimentalDefaultStyles: boolean;
         endpoint: {
             route: string;
             entrypoint?: string | undefined;
@@ -265,6 +268,7 @@ export declare const AstroConfigSchema: z.ZodObject<{
         experimentalObjectPosition?: string | undefined;
         experimentalBreakpoints?: number[] | undefined;
     }, {
+        experimentalDefaultStyles?: boolean | undefined;
         endpoint?: {
             entrypoint?: string | undefined;
             route?: string | undefined;
@@ -1091,6 +1095,7 @@ export declare const AstroConfigSchema: z.ZodObject<{
         };
     }[];
     image: {
+        experimentalDefaultStyles: boolean;
         endpoint: {
             route: string;
             entrypoint?: string | undefined;
@@ -1323,6 +1328,7 @@ export declare const AstroConfigSchema: z.ZodObject<{
         defaultStrategy?: "load" | "tap" | "hover" | "viewport" | undefined;
     } | undefined;
     image?: {
+        experimentalDefaultStyles?: boolean | undefined;
         endpoint?: {
             entrypoint?: string | undefined;
             route?: string | undefined;

package/dist/core/config/schemas/base.js

@@ -23,7 +23,8 @@ const ASTRO_CONFIG_DEFAULTS = {
   },
   image: {
     endpoint: { entrypoint: void 0, route: "/_image" },
-    service: { entrypoint: "astro/assets/services/sharp", config: {} }
+    service: { entrypoint: "astro/assets/services/sharp", config: {} },
+    experimentalDefaultStyles: true
   },
   devToolbar: {
     enabled: true
@@ -149,7 +150,8 @@ const AstroConfigSchema = z.object({
     experimentalLayout: z.enum(["constrained", "fixed", "full-width", "none"]).optional(),
     experimentalObjectFit: z.string().optional(),
     experimentalObjectPosition: z.string().optional(),
-    experimentalBreakpoints: z.array(z.number()).optional()
+    experimentalBreakpoints: z.array(z.number()).optional(),
+    experimentalDefaultStyles: z.boolean().default(ASTRO_CONFIG_DEFAULTS.image.experimentalDefaultStyles)
   }).default(ASTRO_CONFIG_DEFAULTS.image),
   devToolbar: z.object({
     enabled: z.boolean().default(ASTRO_CONFIG_DEFAULTS.devToolbar.enabled)

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

@@ -169,7 +169,9 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         experimentalObjectFit: z.ZodOptional<z.ZodString>;
         experimentalObjectPosition: z.ZodOptional<z.ZodString>;
         experimentalBreakpoints: z.ZodOptional<z.ZodArray<z.ZodNumber, "many">>;
+        experimentalDefaultStyles: z.ZodDefault<z.ZodBoolean>;
     }, "strip", z.ZodTypeAny, {
+        experimentalDefaultStyles: boolean;
         endpoint: {
             route: string;
             entrypoint?: string | undefined;
@@ -190,6 +192,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         experimentalObjectPosition?: string | undefined;
         experimentalBreakpoints?: number[] | undefined;
     }, {
+        experimentalDefaultStyles?: boolean | undefined;
         endpoint?: {
             entrypoint?: string | undefined;
             route?: string | undefined;
@@ -1094,6 +1097,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         };
     }[];
     image: {
+        experimentalDefaultStyles: boolean;
         endpoint: {
             route: string;
             entrypoint?: string | undefined;
@@ -1326,6 +1330,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         defaultStrategy?: "load" | "tap" | "hover" | "viewport" | undefined;
     } | undefined;
     image?: {
+        experimentalDefaultStyles?: boolean | undefined;
         endpoint?: {
             entrypoint?: string | undefined;
             route?: string | undefined;
@@ -1550,6 +1555,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         };
     }[];
     image: {
+        experimentalDefaultStyles: boolean;
         endpoint: {
             route: string;
             entrypoint?: string | undefined;
@@ -1782,6 +1788,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         defaultStrategy?: "load" | "tap" | "hover" | "viewport" | undefined;
     } | undefined;
     image?: {
+        experimentalDefaultStyles?: boolean | undefined;
         endpoint?: {
             entrypoint?: string | undefined;
             route?: string | undefined;

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "5.8.0";
+const ASTRO_VERSION = "5.8.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/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.8.0";
+  const currentVersion = "5.8.2";
   const isPrerelease = currentVersion.includes("-");
   if (!isPrerelease) {
     try {

package/dist/core/messages.js

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

package/dist/core/middleware/sequence.js

@@ -25,11 +25,11 @@ function sequence(...handlers) {
             if (payload instanceof Request) {
               newRequest = payload;
             } else if (payload instanceof URL) {
-              newRequest = new Request(payload, handleContext.request);
+              newRequest = new Request(payload, handleContext.request.clone());
             } else {
               newRequest = new Request(
                 new URL(payload, handleContext.url.origin),
-                handleContext.request
+                handleContext.request.clone()
               );
             }
             const oldPathname = handleContext.url.pathname;

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

@@ -26,42 +26,37 @@ function vitePluginServerIslands({ settings, logger }) {
       }
     },
     transform(_code, id) {
-      if (id.endsWith(".astro")) {
-        const info = this.getModuleInfo(id);
-        if (info?.meta) {
-          const astro = info.meta.astro;
-          if (astro?.serverComponents.length) {
-            for (const comp of astro.serverComponents) {
-              if (!settings.serverIslandNameMap.has(comp.resolvedPath)) {
-                if (!settings.adapter) {
-                  logger.error(
-                    "islands",
-                    "You tried to render a server island without an adapter added to your project. An adapter is required to use the `server:defer` attribute on any component. Your project will fail to build unless you add an adapter or remove the attribute."
-                  );
-                }
-                let name = comp.localName;
-                let idx = 1;
-                while (true) {
-                  if (!settings.serverIslandMap.has(name)) {
-                    break;
-                  }
-                  name += idx++;
-                }
-                settings.serverIslandNameMap.set(comp.resolvedPath, name);
-                settings.serverIslandMap.set(name, () => {
-                  return viteServer?.ssrLoadModule(comp.resolvedPath);
-                });
-                if (command === "build") {
-                  let referenceId = this.emitFile({
-                    type: "chunk",
-                    id: comp.specifier,
-                    importer: id,
-                    name: comp.localName
-                  });
-                  referenceIdMap.set(comp.resolvedPath, referenceId);
-                }
-              }
+      const info = this.getModuleInfo(id);
+      if (!info?.meta?.astro) return;
+      const astro = info.meta.astro;
+      for (const comp of astro.serverComponents) {
+        if (!settings.serverIslandNameMap.has(comp.resolvedPath)) {
+          if (!settings.adapter) {
+            logger.error(
+              "islands",
+              "You tried to render a server island without an adapter added to your project. An adapter is required to use the `server:defer` attribute on any component. Your project will fail to build unless you add an adapter or remove the attribute."
+            );
+          }
+          let name = comp.localName;
+          let idx = 1;
+          while (true) {
+            if (!settings.serverIslandMap.has(name)) {
+              break;
             }
+            name += idx++;
+          }
+          settings.serverIslandNameMap.set(comp.resolvedPath, name);
+          settings.serverIslandMap.set(name, () => {
+            return viteServer?.ssrLoadModule(comp.resolvedPath);
+          });
+          if (command === "build") {
+            let referenceId = this.emitFile({
+              type: "chunk",
+              id: comp.specifier,
+              importer: id,
+              name: comp.localName
+            });
+            referenceIdMap.set(comp.resolvedPath, referenceId);
           }
         }
       }

package/dist/jsx/rehype.js

@@ -11,7 +11,8 @@ const rehypeAnalyzeAstroMetadata = () => {
     visit(tree, (node) => {
       if (node.type !== "mdxJsxFlowElement" && node.type !== "mdxJsxTextElement") return;
       const tagName = node.name;
-      if (!tagName || !isComponent(tagName) || !hasClientDirective(node)) return;
+      if (!tagName || !isComponent(tagName) || !(hasClientDirective(node) || hasServerDeferDirective(node)))
+        return;
       const matchedImport = findMatchingImport(tagName, imports);
       if (!matchedImport) {
         throw new AstroError({
@@ -38,7 +39,7 @@ const rehypeAnalyzeAstroMetadata = () => {
           resolvedPath
         });
         addClientOnlyMetadata(node, matchedImport, resolvedPath);
-      } else {
+      } else if (hasClientDirective(node)) {
         metadata.hydratedComponents.push({
           exportName: "*",
           localName: "",
@@ -46,6 +47,14 @@ const rehypeAnalyzeAstroMetadata = () => {
           resolvedPath
         });
         addClientMetadata(node, matchedImport, resolvedPath);
+      } else if (hasServerDeferDirective(node)) {
+        metadata.serverComponents.push({
+          exportName: matchedImport.name,
+          localName: tagName,
+          specifier: matchedImport.path,
+          resolvedPath
+        });
+        addServerDeferMetadata(node, matchedImport, resolvedPath);
       }
     });
     file.data.__astroMetadata = metadata;
@@ -99,6 +108,11 @@ function hasClientDirective(node) {
     (attr) => attr.type === "mdxJsxAttribute" && attr.name.startsWith("client:")
   );
 }
+function hasServerDeferDirective(node) {
+  return node.attributes.some(
+    (attr) => attr.type === "mdxJsxAttribute" && attr.name === "server:defer"
+  );
+}
 function hasClientOnlyDirective(node) {
   return node.attributes.some(
     (attr) => attr.type === "mdxJsxAttribute" && attr.name === "client:only"
@@ -194,6 +208,33 @@ function addClientOnlyMetadata(node, meta, resolvedPath) {
   }
   node.name = ClientOnlyPlaceholder;
 }
+function addServerDeferMetadata(node, meta, resolvedPath) {
+  const attributeNames = node.attributes.map((attr) => attr.type === "mdxJsxAttribute" ? attr.name : null).filter(Boolean);
+  if (!attributeNames.includes("server:component-directive")) {
+    node.attributes.push({
+      type: "mdxJsxAttribute",
+      name: "server:component-directive",
+      value: "server:defer"
+    });
+  }
+  if (!attributeNames.includes("server:component-path")) {
+    node.attributes.push({
+      type: "mdxJsxAttribute",
+      name: "server:component-path",
+      value: resolvedPath
+    });
+  }
+  if (!attributeNames.includes("server:component-export")) {
+    if (meta.name === "*") {
+      meta.name = node.name.split(".").slice(1).join(".");
+    }
+    node.attributes.push({
+      type: "mdxJsxAttribute",
+      name: "server:component-export",
+      value: meta.name
+    });
+  }
+}
 export {
   getAstroMetadata,
   rehypeAnalyzeAstroMetadata

package/dist/runtime/server/jsx.js

@@ -3,10 +3,10 @@ import {
   HTMLString,
   escapeHTML,
   markHTMLString,
-  renderToString,
   spreadAttributes,
   voidElementNames
 } from "./index.js";
+import { isAstroComponentFactory } from "./render/astro/factory.js";
 import { renderComponentToString } from "./render/component.js";
 const ClientOnlyPlaceholder = "astro-client-only";
 const hasTriedRenderComponentSymbol = Symbol("hasTriedRenderComponent");
@@ -39,7 +39,7 @@ Did you forget to import the component or is it possible there is a typo?`);
       }
       case vnode.type === Symbol.for("astro:fragment"):
         return renderJSX(result, vnode.props.children);
-      case vnode.type.isAstroComponentFactory: {
+      case isAstroComponentFactory(vnode.type): {
         let props = {};
         let slots = {};
         for (const [key, value] of Object.entries(vnode.props ?? {})) {
@@ -49,10 +49,13 @@ Did you forget to import the component or is it possible there is a typo?`);
             props[key] = value;
           }
         }
-        const str = await renderToString(result, vnode.type, props, slots);
-        if (str instanceof Response) {
-          throw str;
-        }
+        const str = await renderComponentToString(
+          result,
+          vnode.type.name,
+          vnode.type,
+          props,
+          slots
+        );
         const html = markHTMLString(str);
         return html;
       }

package/dist/runtime/server/render/astro/instance.js

@@ -55,10 +55,11 @@ class AstroComponentInstance {
     }
   }
 }
-function validateComponentProps(props, displayName) {
+function validateComponentProps(props, clientDirectives, displayName) {
   if (props != null) {
+    const directives = [...clientDirectives.keys()].map((directive) => `client:${directive}`);
     for (const prop of Object.keys(props)) {
-      if (prop.startsWith("client:")) {
+      if (directives.includes(prop)) {
         console.warn(
           `You are attempting to render <${displayName} ${prop} />, but ${displayName} is an Astro component. Astro components do not render in the client and should not have a hydration directive. Please use a framework component for client rendering.`
         );
@@ -67,7 +68,7 @@ function validateComponentProps(props, displayName) {
   }
 }
 function createAstroComponentInstance(result, displayName, factory, props, slots = {}) {
-  validateComponentProps(props, displayName);
+  validateComponentProps(props, result.clientDirectives, displayName);
   const instance = new AstroComponentInstance(result, props, slots, factory);
   if (isAPropagatingComponent(result, factory)) {
     result._metadata.propagators.add(instance);

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

@@ -72,6 +72,12 @@ Make sure to use the static attribute syntax (\`${key}={value}\`) instead of the
   if (value === "") {
     return markHTMLString(` ${key}`);
   }
+  if (key === "popover" && typeof value === "boolean") {
+    return markHTMLString(value ? ` popover` : "");
+  }
+  if (key === "download" && typeof value === "boolean") {
+    return markHTMLString(value ? ` download` : "");
+  }
   return markHTMLString(` ${key}="${toAttributeString(value, shouldEscape)}"`);
 }
 function internalSpreadAttributes(values, shouldEscape = true) {

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

@@ -1282,6 +1282,16 @@ 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.
          */
         experimentalBreakpoints?: number[];
+        /**
+         * @docs
+         * @name image.experimentalDefaultStyles
+         * @type {boolean}
+         * @default `true`
+         * @description
+         * Whether to automatically add global styles to ensure that experimental images resize correctly. This is enabled by default, but can be disabled if you want to manage the styles yourself.
+         * This option is only used when the `experimental.responsiveImages` flag is enabled.
+         */
+        experimentalDefaultStyles?: boolean;
     };
     /**
      * @docs

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

@@ -19,3 +19,4 @@ export type { GetImageResult, ImageInputFormat, ImageMetadata, ImageOutputFormat
 export type { AssetsPrefix, SSRManifest } from '../../core/app/types.js';
 export type { AstroCookieGetOptions, AstroCookieSetOptions, AstroCookies, } from '../../core/cookies/index.js';
 export type { ContainerRenderer } from '../../container/index.js';
+export { AstroSession } from '../../core/session.js';

package/dist/types/public/index.js

@@ -0,0 +1,4 @@
+import { AstroSession } from "../../core/session.js";
+export {
+  AstroSession
+};

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

@@ -5,6 +5,7 @@ import { warnMissingAdapter } from "../core/dev/adapter-validation.js";
 import { getRoutePrerenderOption } from "../core/routing/manifest/prerender.js";
 import { isEndpoint, isPage } from "../core/util.js";
 import { normalizePath, rootRelativePath } from "../core/viteUtils.js";
+import { createDefaultAstroMetadata } from "../vite-plugin-astro/metadata.js";
 const KNOWN_FILE_EXTENSIONS = [".astro", ".js", ".ts"];
 function astroScannerPlugin({
   settings,
@@ -49,7 +50,7 @@ function astroScannerPlugin({
         meta: {
           ...meta,
           astro: {
-            ...meta.astro ?? { hydratedComponents: [], clientOnlyComponents: [], scripts: [] },
+            ...meta.astro ?? createDefaultAstroMetadata(),
             pageOptions: {
               prerender: route.prerender
             }

package/package.json

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