astro 2.4.5 → 2.5.1

package/dist/core/render/result.d.ts

@@ -12,6 +12,7 @@ export interface CreateResultArgs {
     pathname: string;
     props: Props;
     renderers: SSRLoadedRenderer[];
+    clientDirectives: Map<string, string>;
     resolve: (s: string) => Promise<string>;
     site: string | undefined;
     links?: Set<SSRElement>;

package/dist/core/render/result.js

@@ -87,7 +87,7 @@ class Slots {
 }
 let renderMarkdown = null;
 function createResult(args) {
-  const { markdown, params, pathname, renderers, request, resolve, locals } = args;
+  const { markdown, params, pathname, renderers, clientDirectives, request, resolve, locals } = args;
   const url = new URL(request.url);
   const headers = new Headers();
   headers.set("Content-Type", "text/html");
@@ -187,7 +187,8 @@ function createResult(args) {
       hasHydrationScript: false,
       hasRenderedHead: false,
       hasDirectives: /* @__PURE__ */ new Set(),
-      headInTree: false
+      headInTree: false,
+      clientDirectives
     },
     response
   };

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

@@ -3,6 +3,7 @@ import { createRequire } from "module";
 import path from "path";
 import slash from "slash";
 import { fileURLToPath } from "url";
+import { isHybridOutput } from "../../../prerender/utils.js";
 import { SUPPORTED_MARKDOWN_FILE_EXTENSIONS } from "../../constants.js";
 import { warn } from "../../logger/core.js";
 import { removeLeadingForwardSlash } from "../../path.js";
@@ -142,6 +143,8 @@ function createRouteManifest({ settings, cwd, fsMod }, logging) {
   ]);
   const validEndpointExtensions = /* @__PURE__ */ new Set([".js", ".ts"]);
   const localFs = fsMod ?? nodeFs;
+  const isPrenderDefault = isHybridOutput(settings.config);
+  const foundInvalidFileExtensions = /* @__PURE__ */ new Set();
   function walk(fs, dir, parentSegments, parentParams) {
     let items = [];
     fs.readdirSync(dir).forEach((basename) => {
@@ -157,6 +160,10 @@ function createRouteManifest({ settings, cwd, fsMod }, logging) {
         return;
       }
       if (!isDir && !validPageExtensions.has(ext) && !validEndpointExtensions.has(ext)) {
+        if (!foundInvalidFileExtensions.has(ext)) {
+          foundInvalidFileExtensions.add(ext);
+          warn(logging, "astro", `Invalid file extension for Pages: ${ext}`);
+        }
         return;
       }
       const segment = isDir ? basename : name;
@@ -226,7 +233,7 @@ function createRouteManifest({ settings, cwd, fsMod }, logging) {
           component,
           generate,
           pathname: pathname || void 0,
-          prerender: false
+          prerender: isPrenderDefault
         });
       }
     });
@@ -280,7 +287,7 @@ This route collides with: "${collision.component}".`
       component,
       generate,
       pathname: pathname || void 0,
-      prerender: false
+      prerender: isPrenderDefault
     });
   });
   return {

package/dist/core/routing/validation.js

@@ -1,3 +1,4 @@
+import { bold } from "kleur/colors";
 import { AstroError, AstroErrorData } from "../errors/index.js";
 import { warn } from "../logger/core.js";
 const VALID_PARAM_TYPES = ["string", "number", "undefined"];
@@ -18,7 +19,11 @@ function validateDynamicRouteModule(mod, {
   route
 }) {
   if (ssr && mod.getStaticPaths && !mod.prerender) {
-    warn(logging, "getStaticPaths", 'getStaticPaths() is ignored when "output: server" is set.');
+    warn(
+      logging,
+      "getStaticPaths",
+      `getStaticPaths() in ${bold(route.component)} is ignored when "output: server" is set.`
+    );
   }
   if ((!ssr || mod.prerender) && !mod.getStaticPaths) {
     throw new AstroError({

package/dist/core/sync/index.js

@@ -7,7 +7,7 @@ import { runHookConfigSetup } from "../../integrations/index.js";
 import { setUpEnvTs } from "../../vite-plugin-inject-env-ts/index.js";
 import { getTimeStat } from "../build/util.js";
 import { createVite } from "../create-vite.js";
-import { AstroError, AstroErrorData, createSafeError } from "../errors/index.js";
+import { AstroError, AstroErrorData, createSafeError, isAstroError } from "../errors/index.js";
 import { info } from "../logger/core.js";
 import { printHelp } from "../messages.js";
 async function syncCli(settings, { logging, fs, flags }) {
@@ -42,6 +42,13 @@ async function sync(settings, { logging, fs }) {
       { settings, logging, mode: "build", command: "build", fs }
     )
   );
+  const wsSend = tempViteServer.ws.send;
+  tempViteServer.ws.send = (payload) => {
+    if (payload.type === "error") {
+      throw payload.err;
+    }
+    return wsSend(payload);
+  };
   try {
     const contentTypesGenerator = await createContentTypesGenerator({
       contentConfigObserver: globalContentConfigObserver,
@@ -65,6 +72,9 @@ async function sync(settings, { logging, fs }) {
     }
   } catch (e) {
     const safeError = createSafeError(e);
+    if (isAstroError(e)) {
+      throw e;
+    }
     throw new AstroError(
       {
         ...AstroErrorData.GenerateContentTypesError,

package/dist/core/util.js

@@ -3,6 +3,7 @@ import path from "path";
 import slash from "slash";
 import { fileURLToPath } from "url";
 import { normalizePath } from "vite";
+import { isHybridOutput } from "../prerender/utils.js";
 import { SUPPORTED_MARKDOWN_FILE_EXTENSIONS } from "./constants.js";
 import { prependForwardSlash, removeTrailingForwardSlash } from "./path.js";
 function isObject(value) {
@@ -103,7 +104,7 @@ function isEndpoint(file, settings) {
   return !endsWithPageExt(file, settings);
 }
 function isModeServerWithNoAdapter(settings) {
-  return settings.config.output === "server" && !settings.adapter;
+  return (settings.config.output === "server" || isHybridOutput(settings.config)) && !settings.adapter;
 }
 function relativeToSrcDir(config, idOrUrl) {
   let id;

package/dist/integrations/index.js

@@ -1,8 +1,10 @@
 import { bold } from "kleur/colors";
 import fs from "node:fs";
 import { fileURLToPath } from "node:url";
+import { buildClientDirectiveEntrypoint } from "../core/client-directive/index.js";
 import { mergeConfig } from "../core/config/config.js";
 import { info } from "../core/logger/core.js";
+import { isHybridOutput } from "../prerender/utils.js";
 import { mdxContentEntryType } from "../vite-plugin-markdown/content-entry-type.js";
 async function withTakingALongTimeMsg({
   name,
@@ -29,6 +31,7 @@ async function runHookConfigSetup({
   }
   let updatedConfig = { ...settings.config };
   let updatedSettings = { ...settings, config: updatedConfig };
+  let addedClientDirectives = /* @__PURE__ */ new Map();
   for (const integration of settings.config.integrations) {
     if ((_a = integration.hooks) == null ? void 0 : _a["astro:config:setup"]) {
       let addPageExtension2 = function(...input) {
@@ -36,8 +39,10 @@ async function runHookConfigSetup({
         updatedSettings.pageExtensions.push(...exts);
       }, addContentEntryType2 = function(contentEntryType) {
         updatedSettings.contentEntryTypes.push(contentEntryType);
+      }, addDataEntryType2 = function(dataEntryType) {
+        updatedSettings.dataEntryTypes.push(dataEntryType);
       };
-      var addPageExtension = addPageExtension2, addContentEntryType = addContentEntryType2;
+      var addPageExtension = addPageExtension2, addContentEntryType = addContentEntryType2, addDataEntryType = addDataEntryType2;
       const hooks = {
         config: updatedConfig,
         command,
@@ -62,6 +67,19 @@ async function runHookConfigSetup({
         },
         addWatchFile: (path) => {
           updatedSettings.watchFiles.push(path instanceof URL ? fileURLToPath(path) : path);
+        },
+        addClientDirective: ({ name, entrypoint }) => {
+          if (!settings.config.experimental.customClientDirectives) {
+            throw new Error(
+              `The "${integration.name}" integration is trying to add the "${name}" client directive, but the \`experimental.customClientDirectives\` config is not enabled.`
+            );
+          }
+          if (updatedSettings.clientDirectives.has(name) || addedClientDirectives.has(name)) {
+            throw new Error(
+              `The "${integration.name}" integration is trying to add the "${name}" client directive, but it already exists.`
+            );
+          }
+          addedClientDirectives.set(name, buildClientDirectiveEntrypoint(name, entrypoint));
         }
       };
       Object.defineProperty(hooks, "addPageExtension", {
@@ -74,6 +92,11 @@ async function runHookConfigSetup({
         writable: false,
         enumerable: false
       });
+      Object.defineProperty(hooks, "addDataEntryType", {
+        value: addDataEntryType2,
+        writable: false,
+        enumerable: false
+      });
       await withTakingALongTimeMsg({
         name: integration.name,
         hookResult: integration.hooks["astro:config:setup"](hooks),
@@ -82,6 +105,9 @@ async function runHookConfigSetup({
       if (integration.name === "@astrojs/mdx" && !updatedSettings.contentEntryTypes.find((c) => c.extensions.includes(".mdx"))) {
         addContentEntryType2(mdxContentEntryType);
       }
+      for (const [name, compiled] of addedClientDirectives) {
+        updatedSettings.clientDirectives.set(name, await compiled);
+      }
     }
   }
   updatedSettings.config = updatedConfig;
@@ -221,7 +247,7 @@ async function runHookBuildGenerated({
   logging
 }) {
   var _a;
-  const dir = config.output === "server" ? buildConfig.client : config.outDir;
+  const dir = config.output === "server" || isHybridOutput(config) ? buildConfig.client : config.outDir;
   for (const integration of config.integrations) {
     if ((_a = integration == null ? void 0 : integration.hooks) == null ? void 0 : _a["astro:build:generated"]) {
       await withTakingALongTimeMsg({
@@ -240,7 +266,7 @@ async function runHookBuildDone({
   logging
 }) {
   var _a;
-  const dir = config.output === "server" ? buildConfig.client : config.outDir;
+  const dir = config.output === "server" || isHybridOutput(config) ? buildConfig.client : config.outDir;
   await fs.promises.mkdir(dir, { recursive: true });
   for (const integration of config.integrations) {
     if ((_a = integration == null ? void 0 : integration.hooks) == null ? void 0 : _a["astro:build:done"]) {

package/dist/jsx/babel.js

@@ -2,7 +2,6 @@ import * as t from "@babel/types";
 import { AstroErrorData } from "../core/errors/errors-data.js";
 import { AstroError } from "../core/errors/errors.js";
 import { resolvePath } from "../core/util.js";
-import { HydrationDirectiveProps } from "../runtime/server/hydration.js";
 const ClientOnlyPlaceholder = "astro-client-only";
 function isComponent(tagName) {
   return tagName[0] && tagName[0].toLowerCase() !== tagName[0] || tagName.includes(".") || /[^a-zA-Z]/.test(tagName[0]);
@@ -259,7 +258,7 @@ function astroJSX() {
             for (const attr of parentNode.openingElement.attributes) {
               if (t.isJSXAttribute(attr)) {
                 const name = jsxAttributeToString(attr);
-                if (HydrationDirectiveProps.has(name)) {
+                if (name.startsWith("client:")) {
                   console.warn(
                     `You are attempting to render <${displayName} ${name} />, 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.`
                   );

package/dist/prerender/utils.d.ts

@@ -0,0 +1,3 @@
+import type { AstroConfig } from '../@types/astro';
+export declare function isHybridMalconfigured(config: AstroConfig): boolean;
+export declare function isHybridOutput(config: AstroConfig): boolean;

package/dist/prerender/utils.js

@@ -0,0 +1,10 @@
+function isHybridMalconfigured(config) {
+  return config.experimental.hybridOutput ? config.output !== "hybrid" : config.output === "hybrid";
+}
+function isHybridOutput(config) {
+  return config.experimental.hybridOutput && config.output === "hybrid";
+}
+export {
+  isHybridMalconfigured,
+  isHybridOutput
+};

package/dist/runtime/client/idle.d.ts

@@ -0,0 +1,3 @@
+import type { ClientDirective } from '../../@types/astro';
+declare const idleDirective: ClientDirective;
+export default idleDirective;

package/dist/runtime/client/idle.js

@@ -1,6 +1,6 @@
-(self.Astro = self.Astro || {}).idle = (getHydrateCallback) => {
+const idleDirective = (load) => {
   const cb = async () => {
-    let hydrate = await getHydrateCallback();
+    const hydrate = await load();
     await hydrate();
   };
   if ("requestIdleCallback" in window) {
@@ -9,4 +9,7 @@
     setTimeout(cb, 200);
   }
 };
-window.dispatchEvent(new Event("astro:idle"));
+var idle_default = idleDirective;
+export {
+  idle_default as default
+};

package/dist/runtime/client/idle.prebuilt.d.ts

@@ -3,5 +3,5 @@
  * Do not edit this directly, but instead edit that file and rerun the prebuild
  * to generate this file.
  */
-declare const _default: "(self.Astro=self.Astro||{}).idle=t=>{const e=async()=>{await(await t())()};\"requestIdleCallback\"in window?window.requestIdleCallback(e):setTimeout(e,200)},window.dispatchEvent(new Event(\"astro:idle\"));";
+declare const _default: "(()=>{var i=t=>{let e=async()=>{await(await t())()};\"requestIdleCallback\"in window?window.requestIdleCallback(e):setTimeout(e,200)};(self.Astro||(self.Astro={})).idle=i;window.dispatchEvent(new Event(\"astro:idle\"));})();";
 export default _default;

package/dist/runtime/client/idle.prebuilt.js

@@ -1,4 +1,4 @@
-var idle_prebuilt_default = `(self.Astro=self.Astro||{}).idle=t=>{const e=async()=>{await(await t())()};"requestIdleCallback"in window?window.requestIdleCallback(e):setTimeout(e,200)},window.dispatchEvent(new Event("astro:idle"));`;
+var idle_prebuilt_default = `(()=>{var i=t=>{let e=async()=>{await(await t())()};"requestIdleCallback"in window?window.requestIdleCallback(e):setTimeout(e,200)};(self.Astro||(self.Astro={})).idle=i;window.dispatchEvent(new Event("astro:idle"));})();`;
 export {
   idle_prebuilt_default as default
 };

package/dist/runtime/client/load.d.ts

@@ -0,0 +1,3 @@
+import type { ClientDirective } from '../../@types/astro';
+declare const loadDirective: ClientDirective;
+export default loadDirective;

package/dist/runtime/client/load.js

@@ -1,7 +1,8 @@
-(self.Astro = self.Astro || {}).load = (getHydrateCallback) => {
-  (async () => {
-    let hydrate = await getHydrateCallback();
-    await hydrate();
-  })();
+const loadDirective = async (load) => {
+  const hydrate = await load();
+  await hydrate();
+};
+var load_default = loadDirective;
+export {
+  load_default as default
 };
-window.dispatchEvent(new Event("astro:load"));

package/dist/runtime/client/load.prebuilt.d.ts

@@ -3,5 +3,5 @@
  * Do not edit this directly, but instead edit that file and rerun the prebuild
  * to generate this file.
  */
-declare const _default: "(self.Astro=self.Astro||{}).load=a=>{(async()=>await(await a())())()},window.dispatchEvent(new Event(\"astro:load\"));";
+declare const _default: "(()=>{var e=async t=>{await(await t())()};(self.Astro||(self.Astro={})).load=e;window.dispatchEvent(new Event(\"astro:load\"));})();";
 export default _default;

package/dist/runtime/client/load.prebuilt.js

@@ -1,4 +1,4 @@
-var load_prebuilt_default = `(self.Astro=self.Astro||{}).load=a=>{(async()=>await(await a())())()},window.dispatchEvent(new Event("astro:load"));`;
+var load_prebuilt_default = `(()=>{var e=async t=>{await(await t())()};(self.Astro||(self.Astro={})).load=e;window.dispatchEvent(new Event("astro:load"));})();`;
 export {
   load_prebuilt_default as default
 };

package/dist/runtime/client/media.d.ts

@@ -0,0 +1,6 @@
+import type { ClientDirective } from '../../@types/astro';
+/**
+ * Hydrate this component when a matching media query is found
+ */
+declare const mediaDirective: ClientDirective;
+export default mediaDirective;

package/dist/runtime/client/media.js

@@ -1,6 +1,6 @@
-(self.Astro = self.Astro || {}).media = (getHydrateCallback, options) => {
+const mediaDirective = (load, options) => {
   const cb = async () => {
-    let hydrate = await getHydrateCallback();
+    const hydrate = await load();
     await hydrate();
   };
   if (options.value) {
@@ -12,4 +12,7 @@
     }
   }
 };
-window.dispatchEvent(new Event("astro:media"));
+var media_default = mediaDirective;
+export {
+  media_default as default
+};

package/dist/runtime/client/media.prebuilt.d.ts

@@ -3,5 +3,5 @@
  * Do not edit this directly, but instead edit that file and rerun the prebuild
  * to generate this file.
  */
-declare const _default: "(self.Astro=self.Astro||{}).media=(s,a)=>{const t=async()=>{await(await s())()};if(a.value){const e=matchMedia(a.value);e.matches?t():e.addEventListener(\"change\",t,{once:!0})}},window.dispatchEvent(new Event(\"astro:media\"));";
+declare const _default: "(()=>{var s=(i,t)=>{let a=async()=>{await(await i())()};if(t.value){let e=matchMedia(t.value);e.matches?a():e.addEventListener(\"change\",a,{once:!0})}};(self.Astro||(self.Astro={})).media=s;window.dispatchEvent(new Event(\"astro:media\"));})();";
 export default _default;

package/dist/runtime/client/media.prebuilt.js

@@ -1,4 +1,4 @@
-var media_prebuilt_default = `(self.Astro=self.Astro||{}).media=(s,a)=>{const t=async()=>{await(await s())()};if(a.value){const e=matchMedia(a.value);e.matches?t():e.addEventListener("change",t,{once:!0})}},window.dispatchEvent(new Event("astro:media"));`;
+var media_prebuilt_default = `(()=>{var s=(i,t)=>{let a=async()=>{await(await i())()};if(t.value){let e=matchMedia(t.value);e.matches?a():e.addEventListener("change",a,{once:!0})}};(self.Astro||(self.Astro={})).media=s;window.dispatchEvent(new Event("astro:media"));})();`;
 export {
   media_prebuilt_default as default
 };

package/dist/runtime/client/only.d.ts

@@ -0,0 +1,6 @@
+import type { ClientDirective } from '../../@types/astro';
+/**
+ * Hydrate this component only on the client
+ */
+declare const onlyDirective: ClientDirective;
+export default onlyDirective;

package/dist/runtime/client/only.js

@@ -1,7 +1,8 @@
-(self.Astro = self.Astro || {}).only = (getHydrateCallback) => {
-  (async () => {
-    let hydrate = await getHydrateCallback();
-    await hydrate();
-  })();
+const onlyDirective = async (load) => {
+  const hydrate = await load();
+  await hydrate();
+};
+var only_default = onlyDirective;
+export {
+  only_default as default
 };
-window.dispatchEvent(new Event("astro:only"));

package/dist/runtime/client/only.prebuilt.d.ts

@@ -3,5 +3,5 @@
  * Do not edit this directly, but instead edit that file and rerun the prebuild
  * to generate this file.
  */
-declare const _default: "(self.Astro=self.Astro||{}).only=t=>{(async()=>await(await t())())()},window.dispatchEvent(new Event(\"astro:only\"));";
+declare const _default: "(()=>{var e=async t=>{await(await t())()};(self.Astro||(self.Astro={})).only=e;window.dispatchEvent(new Event(\"astro:only\"));})();";
 export default _default;

package/dist/runtime/client/only.prebuilt.js

@@ -1,4 +1,4 @@
-var only_prebuilt_default = `(self.Astro=self.Astro||{}).only=t=>{(async()=>await(await t())())()},window.dispatchEvent(new Event("astro:only"));`;
+var only_prebuilt_default = `(()=>{var e=async t=>{await(await t())()};(self.Astro||(self.Astro={})).only=e;window.dispatchEvent(new Event("astro:only"));})();`;
 export {
   only_prebuilt_default as default
 };

package/dist/runtime/client/visible.d.ts

@@ -0,0 +1,8 @@
+import type { ClientDirective } from '../../@types/astro';
+/**
+ * Hydrate this component when one of it's children becomes visible
+ * We target the children because `astro-island` is set to `display: contents`
+ * which doesn't work with IntersectionObserver
+ */
+declare const visibleDirective: ClientDirective;
+export default visibleDirective;

package/dist/runtime/client/visible.js

@@ -1,9 +1,9 @@
-(self.Astro = self.Astro || {}).visible = (getHydrateCallback, _opts, root) => {
+const visibleDirective = (load, _options, el) => {
   const cb = async () => {
-    let hydrate = await getHydrateCallback();
+    const hydrate = await load();
     await hydrate();
   };
-  let io = new IntersectionObserver((entries) => {
+  const io = new IntersectionObserver((entries) => {
     for (const entry of entries) {
       if (!entry.isIntersecting)
         continue;
@@ -12,9 +12,12 @@
       break;
     }
   });
-  for (let i = 0; i < root.children.length; i++) {
-    const child = root.children[i];
+  for (let i = 0; i < el.children.length; i++) {
+    const child = el.children[i];
     io.observe(child);
   }
 };
-window.dispatchEvent(new Event("astro:visible"));
+var visible_default = visibleDirective;
+export {
+  visible_default as default
+};

package/dist/runtime/client/visible.prebuilt.d.ts

@@ -3,5 +3,5 @@
  * Do not edit this directly, but instead edit that file and rerun the prebuild
  * to generate this file.
  */
-declare const _default: "(self.Astro=self.Astro||{}).visible=(s,c,n)=>{const r=async()=>{await(await s())()};let i=new IntersectionObserver(e=>{for(const t of e)if(t.isIntersecting){i.disconnect(),r();break}});for(let e=0;e<n.children.length;e++){const t=n.children[e];i.observe(t)}},window.dispatchEvent(new Event(\"astro:visible\"));";
+declare const _default: "(()=>{var r=(s,c,i)=>{let o=async()=>{await(await s())()},n=new IntersectionObserver(e=>{for(let t of e)if(t.isIntersecting){n.disconnect(),o();break}});for(let e=0;e<i.children.length;e++){let t=i.children[e];n.observe(t)}};(self.Astro||(self.Astro={})).visible=r;window.dispatchEvent(new Event(\"astro:visible\"));})();";
 export default _default;

package/dist/runtime/client/visible.prebuilt.js

@@ -1,4 +1,4 @@
-var visible_prebuilt_default = `(self.Astro=self.Astro||{}).visible=(s,c,n)=>{const r=async()=>{await(await s())()};let i=new IntersectionObserver(e=>{for(const t of e)if(t.isIntersecting){i.disconnect(),r();break}});for(let e=0;e<n.children.length;e++){const t=n.children[e];i.observe(t)}},window.dispatchEvent(new Event("astro:visible"));`;
+var visible_prebuilt_default = `(()=>{var r=(s,c,i)=>{let o=async()=>{await(await s())()},n=new IntersectionObserver(e=>{for(let t of e)if(t.isIntersecting){n.disconnect(),o();break}});for(let e=0;e<i.children.length;e++){let t=i.children[e];n.observe(t)}};(self.Astro||(self.Astro={})).visible=r;window.dispatchEvent(new Event("astro:visible"));})();`;
 export {
   visible_prebuilt_default as default
 };

package/dist/runtime/server/astro-island.prebuilt.d.ts

@@ -3,5 +3,5 @@
  * Do not edit this directly, but instead edit that file and rerun the prebuild
  * to generate this file.
  */
-declare const _default: "var l;{const c={0:t=>t,1:t=>JSON.parse(t,o),2:t=>new RegExp(t),3:t=>new Date(t),4:t=>new Map(JSON.parse(t,o)),5:t=>new Set(JSON.parse(t,o)),6:t=>BigInt(t),7:t=>new URL(t),8:t=>new Uint8Array(JSON.parse(t)),9:t=>new Uint16Array(JSON.parse(t)),10:t=>new Uint32Array(JSON.parse(t))},o=(t,s)=>{if(t===\"\"||!Array.isArray(s))return s;const[e,n]=s;return e in c?c[e](n):void 0};customElements.get(\"astro-island\")||customElements.define(\"astro-island\",(l=class extends HTMLElement{constructor(){super(...arguments);this.hydrate=()=>{if(!this.hydrator||this.parentElement&&this.parentElement.closest(\"astro-island[ssr]\"))return;const s=this.querySelectorAll(\"astro-slot\"),e={},n=this.querySelectorAll(\"template[data-astro-template]\");for(const r of n){const i=r.closest(this.tagName);!i||!i.isSameNode(this)||(e[r.getAttribute(\"data-astro-template\")||\"default\"]=r.innerHTML,r.remove())}for(const r of s){const i=r.closest(this.tagName);!i||!i.isSameNode(this)||(e[r.getAttribute(\"name\")||\"default\"]=r.innerHTML)}const a=this.hasAttribute(\"props\")?JSON.parse(this.getAttribute(\"props\"),o):{};this.hydrator(this)(this.Component,a,e,{client:this.getAttribute(\"client\")}),this.removeAttribute(\"ssr\"),window.removeEventListener(\"astro:hydrate\",this.hydrate),window.dispatchEvent(new CustomEvent(\"astro:hydrate\"))}}connectedCallback(){!this.hasAttribute(\"await-children\")||this.firstChild?this.childrenConnectedCallback():new MutationObserver((s,e)=>{e.disconnect(),this.childrenConnectedCallback()}).observe(this,{childList:!0})}async childrenConnectedCallback(){window.addEventListener(\"astro:hydrate\",this.hydrate);let s=this.getAttribute(\"before-hydration-url\");s&&await import(s),this.start()}start(){const s=JSON.parse(this.getAttribute(\"opts\")),e=this.getAttribute(\"client\");if(Astro[e]===void 0){window.addEventListener(`astro:${e}`,()=>this.start(),{once:!0});return}Astro[e](async()=>{const n=this.getAttribute(\"renderer-url\"),[a,{default:r}]=await Promise.all([import(this.getAttribute(\"component-url\")),n?import(n):()=>()=>{}]),i=this.getAttribute(\"component-export\")||\"default\";if(!i.includes(\".\"))this.Component=a[i];else{this.Component=a;for(const d of i.split(\".\"))this.Component=this.Component[d]}return this.hydrator=r,this.hydrate},s,this)}attributeChangedCallback(){this.hydrator&&this.hydrate()}},l.observedAttributes=[\"props\"],l))}";
+declare const _default: "(()=>{var l;{let c={0:t=>t,1:t=>JSON.parse(t,o),2:t=>new RegExp(t),3:t=>new Date(t),4:t=>new Map(JSON.parse(t,o)),5:t=>new Set(JSON.parse(t,o)),6:t=>BigInt(t),7:t=>new URL(t),8:t=>new Uint8Array(JSON.parse(t)),9:t=>new Uint16Array(JSON.parse(t)),10:t=>new Uint32Array(JSON.parse(t))},o=(t,s)=>{if(t===\"\"||!Array.isArray(s))return s;let[e,n]=s;return e in c?c[e](n):void 0};customElements.get(\"astro-island\")||customElements.define(\"astro-island\",(l=class extends HTMLElement{constructor(){super(...arguments);this.hydrate=()=>{if(!this.hydrator||this.parentElement&&this.parentElement.closest(\"astro-island[ssr]\"))return;let s=this.querySelectorAll(\"astro-slot\"),e={},n=this.querySelectorAll(\"template[data-astro-template]\");for(let r of n){let i=r.closest(this.tagName);!i||!i.isSameNode(this)||(e[r.getAttribute(\"data-astro-template\")||\"default\"]=r.innerHTML,r.remove())}for(let r of s){let i=r.closest(this.tagName);!i||!i.isSameNode(this)||(e[r.getAttribute(\"name\")||\"default\"]=r.innerHTML)}let a=this.hasAttribute(\"props\")?JSON.parse(this.getAttribute(\"props\"),o):{};this.hydrator(this)(this.Component,a,e,{client:this.getAttribute(\"client\")}),this.removeAttribute(\"ssr\"),window.removeEventListener(\"astro:hydrate\",this.hydrate),window.dispatchEvent(new CustomEvent(\"astro:hydrate\"))}}connectedCallback(){!this.hasAttribute(\"await-children\")||this.firstChild?this.childrenConnectedCallback():new MutationObserver((s,e)=>{e.disconnect(),this.childrenConnectedCallback()}).observe(this,{childList:!0})}async childrenConnectedCallback(){window.addEventListener(\"astro:hydrate\",this.hydrate);let s=this.getAttribute(\"before-hydration-url\");s&&await import(s),this.start()}start(){let s=JSON.parse(this.getAttribute(\"opts\")),e=this.getAttribute(\"client\");if(Astro[e]===void 0){window.addEventListener(`astro:${e}`,()=>this.start(),{once:!0});return}Astro[e](async()=>{let n=this.getAttribute(\"renderer-url\"),[a,{default:r}]=await Promise.all([import(this.getAttribute(\"component-url\")),n?import(n):()=>()=>{}]),i=this.getAttribute(\"component-export\")||\"default\";if(!i.includes(\".\"))this.Component=a[i];else{this.Component=a;for(let d of i.split(\".\"))this.Component=this.Component[d]}return this.hydrator=r,this.hydrate},s,this)}attributeChangedCallback(){this.hydrator&&this.hydrate()}},l.observedAttributes=[\"props\"],l))}})();";
 export default _default;

package/dist/runtime/server/astro-island.prebuilt.js

@@ -1,4 +1,4 @@
-var astro_island_prebuilt_default = `var l;{const c={0:t=>t,1:t=>JSON.parse(t,o),2:t=>new RegExp(t),3:t=>new Date(t),4:t=>new Map(JSON.parse(t,o)),5:t=>new Set(JSON.parse(t,o)),6:t=>BigInt(t),7:t=>new URL(t),8:t=>new Uint8Array(JSON.parse(t)),9:t=>new Uint16Array(JSON.parse(t)),10:t=>new Uint32Array(JSON.parse(t))},o=(t,s)=>{if(t===""||!Array.isArray(s))return s;const[e,n]=s;return e in c?c[e](n):void 0};customElements.get("astro-island")||customElements.define("astro-island",(l=class extends HTMLElement{constructor(){super(...arguments);this.hydrate=()=>{if(!this.hydrator||this.parentElement&&this.parentElement.closest("astro-island[ssr]"))return;const s=this.querySelectorAll("astro-slot"),e={},n=this.querySelectorAll("template[data-astro-template]");for(const r of n){const i=r.closest(this.tagName);!i||!i.isSameNode(this)||(e[r.getAttribute("data-astro-template")||"default"]=r.innerHTML,r.remove())}for(const r of s){const i=r.closest(this.tagName);!i||!i.isSameNode(this)||(e[r.getAttribute("name")||"default"]=r.innerHTML)}const a=this.hasAttribute("props")?JSON.parse(this.getAttribute("props"),o):{};this.hydrator(this)(this.Component,a,e,{client:this.getAttribute("client")}),this.removeAttribute("ssr"),window.removeEventListener("astro:hydrate",this.hydrate),window.dispatchEvent(new CustomEvent("astro:hydrate"))}}connectedCallback(){!this.hasAttribute("await-children")||this.firstChild?this.childrenConnectedCallback():new MutationObserver((s,e)=>{e.disconnect(),this.childrenConnectedCallback()}).observe(this,{childList:!0})}async childrenConnectedCallback(){window.addEventListener("astro:hydrate",this.hydrate);let s=this.getAttribute("before-hydration-url");s&&await import(s),this.start()}start(){const s=JSON.parse(this.getAttribute("opts")),e=this.getAttribute("client");if(Astro[e]===void 0){window.addEventListener(\`astro:\${e}\`,()=>this.start(),{once:!0});return}Astro[e](async()=>{const n=this.getAttribute("renderer-url"),[a,{default:r}]=await Promise.all([import(this.getAttribute("component-url")),n?import(n):()=>()=>{}]),i=this.getAttribute("component-export")||"default";if(!i.includes("."))this.Component=a[i];else{this.Component=a;for(const d of i.split("."))this.Component=this.Component[d]}return this.hydrator=r,this.hydrate},s,this)}attributeChangedCallback(){this.hydrator&&this.hydrate()}},l.observedAttributes=["props"],l))}`;
+var astro_island_prebuilt_default = `(()=>{var l;{let c={0:t=>t,1:t=>JSON.parse(t,o),2:t=>new RegExp(t),3:t=>new Date(t),4:t=>new Map(JSON.parse(t,o)),5:t=>new Set(JSON.parse(t,o)),6:t=>BigInt(t),7:t=>new URL(t),8:t=>new Uint8Array(JSON.parse(t)),9:t=>new Uint16Array(JSON.parse(t)),10:t=>new Uint32Array(JSON.parse(t))},o=(t,s)=>{if(t===""||!Array.isArray(s))return s;let[e,n]=s;return e in c?c[e](n):void 0};customElements.get("astro-island")||customElements.define("astro-island",(l=class extends HTMLElement{constructor(){super(...arguments);this.hydrate=()=>{if(!this.hydrator||this.parentElement&&this.parentElement.closest("astro-island[ssr]"))return;let s=this.querySelectorAll("astro-slot"),e={},n=this.querySelectorAll("template[data-astro-template]");for(let r of n){let i=r.closest(this.tagName);!i||!i.isSameNode(this)||(e[r.getAttribute("data-astro-template")||"default"]=r.innerHTML,r.remove())}for(let r of s){let i=r.closest(this.tagName);!i||!i.isSameNode(this)||(e[r.getAttribute("name")||"default"]=r.innerHTML)}let a=this.hasAttribute("props")?JSON.parse(this.getAttribute("props"),o):{};this.hydrator(this)(this.Component,a,e,{client:this.getAttribute("client")}),this.removeAttribute("ssr"),window.removeEventListener("astro:hydrate",this.hydrate),window.dispatchEvent(new CustomEvent("astro:hydrate"))}}connectedCallback(){!this.hasAttribute("await-children")||this.firstChild?this.childrenConnectedCallback():new MutationObserver((s,e)=>{e.disconnect(),this.childrenConnectedCallback()}).observe(this,{childList:!0})}async childrenConnectedCallback(){window.addEventListener("astro:hydrate",this.hydrate);let s=this.getAttribute("before-hydration-url");s&&await import(s),this.start()}start(){let s=JSON.parse(this.getAttribute("opts")),e=this.getAttribute("client");if(Astro[e]===void 0){window.addEventListener(\`astro:\${e}\`,()=>this.start(),{once:!0});return}Astro[e](async()=>{let n=this.getAttribute("renderer-url"),[a,{default:r}]=await Promise.all([import(this.getAttribute("component-url")),n?import(n):()=>()=>{}]),i=this.getAttribute("component-export")||"default";if(!i.includes("."))this.Component=a[i];else{this.Component=a;for(let d of i.split("."))this.Component=this.Component[d]}return this.hydrator=r,this.hydrate},s,this)}attributeChangedCallback(){this.hydrator&&this.hydrate()}},l.observedAttributes=["props"],l))}})();`;
 export {
   astro_island_prebuilt_default as default
 };

package/dist/runtime/server/endpoint.js

@@ -17,7 +17,7 @@ async function renderEndpoint(mod, context, ssr) {
   const handler = getHandlerFromModule(mod, chosenMethod);
   if (!ssr && ssr === false && chosenMethod && chosenMethod !== "get") {
     console.warn(`
-${chosenMethod} requests are not available when building a static site. Update your config to output: 'server' to handle ${chosenMethod} requests.`);
+${chosenMethod} requests are not available when building a static site. Update your config to \`output: 'server'\` or \`output: 'hybrid'\` with an \`export const prerender = false\` to handle ${chosenMethod} requests.`);
   }
   if (!handler || typeof handler !== "function") {
     let response = new Response(null, {

package/dist/runtime/server/hydration.d.ts

@@ -1,5 +1,4 @@
 import type { AstroComponentMetadata, SSRElement, SSRLoadedRenderer, SSRResult } from '../../@types/astro';
-export declare const HydrationDirectiveProps: Set<string>;
 export interface HydrationMetadata {
     directive: string;
     value: string;
@@ -13,7 +12,7 @@ interface ExtractedProps {
     hydration: HydrationMetadata | null;
     props: Record<string | number | symbol, any>;
 }
-export declare function extractDirectives(displayName: string, inputProps: Record<string | number | symbol, any>): ExtractedProps;
+export declare function extractDirectives(inputProps: Record<string | number | symbol, any>, clientDirectives: SSRResult['_metadata']['clientDirectives']): ExtractedProps;
 interface HydrateScriptOptions {
     renderer: SSRLoadedRenderer;
     result: SSRResult;

package/dist/runtime/server/hydration.js

@@ -2,10 +2,7 @@ import { AstroError, AstroErrorData } from "../../core/errors/index.js";
 import { escapeHTML } from "./escape.js";
 import { serializeProps } from "./serialize.js";
 import { serializeListValue } from "./util.js";
-const HydrationDirectivesRaw = ["load", "idle", "media", "visible", "only"];
-const HydrationDirectives = new Set(HydrationDirectivesRaw);
-const HydrationDirectiveProps = new Set(HydrationDirectivesRaw.map((n) => `client:${n}`));
-function extractDirectives(displayName, inputProps) {
+function extractDirectives(inputProps, clientDirectives) {
   let extracted = {
     isPage: false,
     hydration: null,
@@ -44,11 +41,10 @@ function extractDirectives(displayName, inputProps) {
         default: {
           extracted.hydration.directive = key.split(":")[1];
           extracted.hydration.value = value;
-          if (!HydrationDirectives.has(extracted.hydration.directive)) {
+          if (!clientDirectives.has(extracted.hydration.directive)) {
+            const hydrationMethods = Array.from(clientDirectives.keys()).map((d) => `client:${d}`).join(", ");
             throw new Error(
-              `Error: invalid hydration directive "${key}". Supported hydration methods: ${Array.from(
-                HydrationDirectiveProps
-              ).join(", ")}`
+              `Error: invalid hydration directive "${key}". Supported hydration methods: ${hydrationMethods}`
             );
           }
           if (extracted.hydration.directive === "media" && typeof extracted.hydration.value !== "string") {
@@ -111,7 +107,6 @@ async function generateHydrateScript(scriptOptions, metadata) {
   return island;
 }
 export {
-  HydrationDirectiveProps,
   extractDirectives,
   generateHydrateScript
 };

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

@@ -1,5 +1,4 @@
 var _a;
-import { HydrationDirectiveProps } from "../../hydration.js";
 import { isPromise } from "../../util.js";
 import { renderChild } from "../any.js";
 import { isAPropagatingComponent } from "./factory.js";
@@ -40,7 +39,7 @@ _a = astroComponentInstanceSym;
 function validateComponentProps(props, displayName) {
   if (props != null) {
     for (const prop of Object.keys(props)) {
-      if (HydrationDirectiveProps.has(prop)) {
+      if (prop.startsWith("client:")) {
         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.`
         );

package/dist/runtime/server/render/astro/render-template.d.ts

@@ -7,7 +7,7 @@ export declare class RenderTemplateResult {
     private expressions;
     private error;
     constructor(htmlParts: TemplateStringsArray, expressions: unknown[]);
-    [Symbol.asyncIterator](): AsyncGenerator<any, void, undefined>;
+    [Symbol.asyncIterator](): AsyncGenerator<any, void, unknown>;
 }
 export declare function isRenderTemplateResult(obj: unknown): obj is RenderTemplateResult;
 export declare function renderAstroTemplateResult(component: RenderTemplateResult): AsyncIterable<string | HTMLBytes | RenderInstruction>;