astro 3.2.0 → 3.2.2

package/dist/@types/astro.d.ts

@@ -1967,7 +1967,7 @@ export interface SSRMetadata {
     hasRenderedHead: boolean;
     headInTree: boolean;
     extraHead: string[];
-    propagators: Map<AstroComponentFactory, AstroComponentInstance>;
+    propagators: Set<AstroComponentInstance>;
 }
 export interface PreviewServer {
     host?: string;

package/dist/assets/{image-endpoint.d.ts → endpoint/generic.d.ts}

@@ -1,4 +1,4 @@
-import type { APIRoute } from '../@types/astro.js';
+import type { APIRoute } from '../../@types/astro.js';
 /**
  * Endpoint used in dev and SSR to serve optimized images by the base image services
  */

package/dist/assets/{image-endpoint.js → endpoint/generic.js}

@@ -1,7 +1,7 @@
 import { isRemotePath } from "@astrojs/internal-helpers/path";
 import mime from "mime/lite.js";
-import { getConfiguredImageService, isRemoteAllowed } from "./internal.js";
-import { etag } from "./utils/etag.js";
+import { getConfiguredImageService, isRemoteAllowed } from "../internal.js";
+import { etag } from "../utils/etag.js";
 import { imageConfig } from "astro:assets";
 async function loadRemoteImage(src) {
   try {

package/dist/assets/endpoint/node.d.ts

@@ -0,0 +1,5 @@
+import type { APIRoute } from '../../@types/astro.js';
+/**
+ * Endpoint used in dev and SSR to serve optimized images by the base image services
+ */
+export declare const GET: APIRoute;

package/dist/assets/endpoint/node.js

@@ -0,0 +1,68 @@
+import { isRemotePath, removeQueryString } from "@astrojs/internal-helpers/path";
+import { readFile } from "fs/promises";
+import mime from "mime/lite.js";
+import { getConfiguredImageService, isRemoteAllowed } from "../internal.js";
+import { etag } from "../utils/etag.js";
+import { assetsDir, imageConfig } from "astro:assets";
+async function loadLocalImage(src, url) {
+  const filePath = import.meta.env.DEV ? removeQueryString(src.slice("/@fs".length)) : new URL("." + src, assetsDir);
+  let buffer = void 0;
+  try {
+    buffer = await readFile(filePath);
+  } catch (e) {
+    const sourceUrl = new URL(src, url.origin);
+    buffer = await loadRemoteImage(sourceUrl);
+  }
+  return buffer;
+}
+async function loadRemoteImage(src) {
+  try {
+    const res = await fetch(src);
+    if (!res.ok) {
+      return void 0;
+    }
+    return Buffer.from(await res.arrayBuffer());
+  } catch (err) {
+    return void 0;
+  }
+}
+const GET = async ({ request }) => {
+  try {
+    const imageService = await getConfiguredImageService();
+    if (!("transform" in imageService)) {
+      throw new Error("Configured image service is not a local service");
+    }
+    const url = new URL(request.url);
+    const transform = await imageService.parseURL(url, imageConfig);
+    if (!transform?.src) {
+      throw new Error("Incorrect transform returned by `parseURL`");
+    }
+    let inputBuffer = void 0;
+    if (isRemotePath(transform.src)) {
+      if (isRemoteAllowed(transform.src, imageConfig) === false) {
+        return new Response("Forbidden", { status: 403 });
+      }
+      inputBuffer = await loadRemoteImage(new URL(transform.src));
+    } else {
+      inputBuffer = await loadLocalImage(transform.src, url);
+    }
+    if (!inputBuffer) {
+      return new Response("Not Found", { status: 404 });
+    }
+    const { data, format } = await imageService.transform(inputBuffer, transform, imageConfig);
+    return new Response(data, {
+      status: 200,
+      headers: {
+        "Content-Type": mime.getType(format) ?? `image/${format}`,
+        "Cache-Control": "public, max-age=31536000",
+        ETag: etag(data.toString()),
+        Date: (/* @__PURE__ */ new Date()).toUTCString()
+      }
+    });
+  } catch (err) {
+    return new Response(`Server Error: ${err}`, { status: 500 });
+  }
+};
+export {
+  GET
+};

package/dist/assets/internal.d.ts

@@ -1,7 +1,7 @@
 import type { AstroConfig, AstroSettings } from '../@types/astro.js';
 import { type ImageService } from './services/service.js';
 import type { GetImageResult, ImageMetadata, UnresolvedImageTransform } from './types.js';
-export declare function injectImageEndpoint(settings: AstroSettings): AstroSettings;
+export declare function injectImageEndpoint(settings: AstroSettings, mode: 'dev' | 'build'): AstroSettings;
 export declare function isESMImportedImage(src: ImageMetadata | string): src is ImageMetadata;
 export declare function isRemoteImage(src: ImageMetadata | string): src is string;
 export declare function isRemoteAllowed(src: string, { domains, remotePatterns, }: Partial<Pick<AstroConfig['image'], 'domains' | 'remotePatterns'>>): boolean;

package/dist/assets/internal.js

@@ -2,8 +2,8 @@ import { isRemotePath } from "@astrojs/internal-helpers/path";
 import { AstroError, AstroErrorData } from "../core/errors/index.js";
 import { isLocalService } from "./services/service.js";
 import { matchHostname, matchPattern } from "./utils/remotePattern.js";
-function injectImageEndpoint(settings) {
-  const endpointEntrypoint = settings.config.image.endpoint ?? "astro/assets/image-endpoint";
+function injectImageEndpoint(settings, mode) {
+  const endpointEntrypoint = settings.config.image.endpoint ?? (mode === "dev" ? "astro/assets/endpoint/node" : "astro/assets/endpoint/generic");
   settings.injectedRoutes.push({
     pattern: "/_image",
     entryPoint: endpointEntrypoint,

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

@@ -8,6 +8,7 @@ import {
   prependForwardSlash,
   removeQueryString
 } from "../core/path.js";
+import { isServerLikeOutput } from "../prerender/utils.js";
 import { VALID_INPUT_FORMATS, VIRTUAL_MODULE_ID, VIRTUAL_SERVICE_ID } from "./consts.js";
 import { emitESMImage } from "./utils/emitAsset.js";
 import { hashTransform, propsToFilename } from "./utils/transformToPath.js";
@@ -48,6 +49,11 @@ function assets({
 					export { default as Image } from "astro/components/Image.astro";
 
 					export const imageConfig = ${JSON.stringify(settings.config.image)};
+					export const assetsDir = new URL(${JSON.stringify(
+            new URL(
+              isServerLikeOutput(settings.config) ? settings.config.build.client : settings.config.outDir
+            )
+          )});
 					export const getImage = async (options) => await getImageInternal(options, imageConfig);
 				`;
         }

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

@@ -49,7 +49,7 @@ function astroContentAssetPropagationPlugin({
           if (!devModuleLoader.getModuleById(basePath)?.ssrModule) {
             await devModuleLoader.import(basePath);
           }
-          const { stylesMap, urls } = await getStylesForURL(
+          const { styles, urls } = await getStylesForURL(
             pathToFileURL(basePath),
             devModuleLoader,
             "development"
@@ -60,7 +60,7 @@ function astroContentAssetPropagationPlugin({
             devModuleLoader
           );
           stringifiedLinks = JSON.stringify([...urls]);
-          stringifiedStyles = JSON.stringify([...stylesMap.values()]);
+          stringifiedStyles = JSON.stringify(styles.map((s) => s.content));
           stringifiedScripts = JSON.stringify([...hoistedScripts]);
         } else {
           stringifiedLinks = JSON.stringify(LINKS_PLACEHOLDER);

package/dist/core/build/index.js

@@ -68,7 +68,7 @@ class AstroBuilder {
       logger
     });
     if (isServerLikeOutput(this.settings.config)) {
-      this.settings = injectImageEndpoint(this.settings);
+      this.settings = injectImageEndpoint(this.settings, "build");
     }
     this.manifest = createRouteManifest({ settings: this.settings }, this.logger);
     const viteConfig = await createVite(

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "3.2.0";
+const ASTRO_VERSION = "3.2.2";
 const SUPPORTED_MARKDOWN_FILE_EXTENSIONS = [
   ".markdown",
   ".mdown",

package/dist/core/dev/container.js

@@ -23,7 +23,7 @@ async function createContainer({
     logger,
     isRestart
   });
-  settings = injectImageEndpoint(settings);
+  settings = injectImageEndpoint(settings, "dev");
   const {
     base,
     server: { host, headers, open: shouldOpen }

package/dist/core/dev/dev.js

@@ -20,7 +20,7 @@ async function dev(inlineConfig) {
       base: restart.container.settings.config.base
     })
   );
-  const currentVersion = "3.2.0";
+  const currentVersion = "3.2.2";
   if (currentVersion.includes("-")) {
     logger.warn(null, msg.prerelease({ currentVersion }));
   }

package/dist/core/messages.js

@@ -50,7 +50,7 @@ function serverStart({
   base,
   isRestart = false
 }) {
-  const version = "3.2.0";
+  const version = "3.2.2";
   const localPrefix = `${dim("\u2503")} Local    `;
   const networkPrefix = `${dim("\u2503")} Network  `;
   const emptyPrefix = " ".repeat(11);
@@ -235,7 +235,7 @@ function printHelp({
     message.push(
       linebreak(),
       `  ${bgGreen(black(` ${commandName} `))} ${green(
-        `v${"3.2.0"}`
+        `v${"3.2.2"}`
       )} ${headline}`
     );
   }

package/dist/core/render/result.js

@@ -156,7 +156,7 @@ function createResult(args) {
       hasDirectives: /* @__PURE__ */ new Set(),
       headInTree: false,
       extraHead: [],
-      propagators: /* @__PURE__ */ new Map()
+      propagators: /* @__PURE__ */ new Set()
     }
   };
   return result;

package/dist/runtime/client/hmr.js

@@ -1,36 +1,2 @@
 if (import.meta.hot) {
-  const injectedStyles = getInjectedStyles();
-  const mo = new MutationObserver((records) => {
-    for (const record of records) {
-      for (const node of record.addedNodes) {
-        if (isViteInjectedStyle(node)) {
-          injectedStyles.get(node.getAttribute("data-vite-dev-id"))?.remove();
-        }
-      }
-    }
-  });
-  mo.observe(document.documentElement, { subtree: true, childList: true });
-  import.meta.hot.on("vite:beforeUpdate", async (payload) => {
-    for (const file of payload.updates) {
-      if (file.acceptedPath.includes("vue&type=style")) {
-        const link = document.querySelector(`link[href="${file.acceptedPath}"]`);
-        if (link) {
-          link.replaceWith(link.cloneNode(true));
-        }
-      }
-    }
-  });
-}
-function getInjectedStyles() {
-  const injectedStyles = /* @__PURE__ */ new Map();
-  document.querySelectorAll("style[data-astro-dev-id]").forEach((el) => {
-    injectedStyles.set(el.getAttribute("data-astro-dev-id"), el);
-  });
-  return injectedStyles;
-}
-function isStyle(node) {
-  return node.nodeType === node.ELEMENT_NODE && node.tagName.toLowerCase() === "style";
-}
-function isViteInjectedStyle(node) {
-  return isStyle(node) && !!node.getAttribute("data-vite-dev-id");
 }

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

@@ -34,13 +34,22 @@
           document.addEventListener("astro:after-swap", this.unmount, { once: true });
         }
         connectedCallback() {
-          if (!this.hasAttribute("await-children") || this.firstChild) {
+          if (!this.hasAttribute("await-children") || document.readyState === "interactive" || document.readyState === "complete") {
             this.childrenConnectedCallback();
           } else {
-            new MutationObserver((_, mo) => {
+            const onConnected = () => {
+              document.removeEventListener("DOMContentLoaded", onConnected);
               mo.disconnect();
-              setTimeout(() => this.childrenConnectedCallback(), 0);
-            }).observe(this, { childList: true });
+              this.childrenConnectedCallback();
+            };
+            const mo = new MutationObserver(() => {
+              if (this.lastChild?.nodeType === Node.COMMENT_NODE && this.lastChild.nodeValue === "astro:end") {
+                this.lastChild.remove();
+                onConnected();
+              }
+            });
+            mo.observe(this, { childList: true });
+            document.addEventListener("DOMContentLoaded", onConnected);
           }
         }
         async childrenConnectedCallback() {

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 b=Object.defineProperty;var f=(a,s,i)=>s in a?b(a,s,{enumerable:!0,configurable:!0,writable:!0,value:i}):a[s]=i;var d=(a,s,i)=>(f(a,typeof s!=\"symbol\"?s+\"\":s,i),i);var u;{let a={0:t=>m(t),1:t=>i(t),2:t=>new RegExp(t),3:t=>new Date(t),4:t=>new Map(i(t)),5:t=>new Set(i(t)),6:t=>BigInt(t),7:t=>new URL(t),8:t=>new Uint8Array(t),9:t=>new Uint16Array(t),10:t=>new Uint32Array(t)},s=t=>{let[e,r]=t;return e in a?a[e](r):void 0},i=t=>t.map(s),m=t=>typeof t!=\"object\"||t===null?t:Object.fromEntries(Object.entries(t).map(([e,r])=>[e,s(r)]));customElements.get(\"astro-island\")||customElements.define(\"astro-island\",(u=class extends HTMLElement{constructor(){super(...arguments);d(this,\"Component\");d(this,\"hydrator\");d(this,\"hydrate\",async()=>{var l;if(!this.hydrator||!this.isConnected)return;let e=(l=this.parentElement)==null?void 0:l.closest(\"astro-island[ssr]\");if(e){e.addEventListener(\"astro:hydrate\",this.hydrate,{once:!0});return}let r=this.querySelectorAll(\"astro-slot\"),c={},h=this.querySelectorAll(\"template[data-astro-template]\");for(let n of h){let o=n.closest(this.tagName);o!=null&&o.isSameNode(this)&&(c[n.getAttribute(\"data-astro-template\")||\"default\"]=n.innerHTML,n.remove())}for(let n of r){let o=n.closest(this.tagName);o!=null&&o.isSameNode(this)&&(c[n.getAttribute(\"name\")||\"default\"]=n.innerHTML)}let p;try{p=this.hasAttribute(\"props\")?m(JSON.parse(this.getAttribute(\"props\"))):{}}catch(n){let o=this.getAttribute(\"component-url\")||\"<unknown>\",y=this.getAttribute(\"component-export\");throw y&&(o+=` (export ${y})`),console.error(`[hydrate] Error parsing props for component ${o}`,this.getAttribute(\"props\"),n),n}await this.hydrator(this)(this.Component,p,c,{client:this.getAttribute(\"client\")}),this.removeAttribute(\"ssr\"),this.dispatchEvent(new CustomEvent(\"astro:hydrate\"))});d(this,\"unmount\",()=>{this.isConnected||this.dispatchEvent(new CustomEvent(\"astro:unmount\"))})}disconnectedCallback(){document.removeEventListener(\"astro:after-swap\",this.unmount),document.addEventListener(\"astro:after-swap\",this.unmount,{once:!0})}connectedCallback(){!this.hasAttribute(\"await-children\")||this.firstChild?this.childrenConnectedCallback():new MutationObserver((e,r)=>{r.disconnect(),setTimeout(()=>this.childrenConnectedCallback(),0)}).observe(this,{childList:!0})}async childrenConnectedCallback(){let e=this.getAttribute(\"before-hydration-url\");e&&await import(e),this.start()}start(){let e=JSON.parse(this.getAttribute(\"opts\")),r=this.getAttribute(\"client\");if(Astro[r]===void 0){window.addEventListener(`astro:${r}`,()=>this.start(),{once:!0});return}Astro[r](async()=>{let c=this.getAttribute(\"renderer-url\"),[h,{default:p}]=await Promise.all([import(this.getAttribute(\"component-url\")),c?import(c):()=>()=>{}]),l=this.getAttribute(\"component-export\")||\"default\";if(!l.includes(\".\"))this.Component=h[l];else{this.Component=h;for(let n of l.split(\".\"))this.Component=this.Component[n]}return this.hydrator=p,this.hydrate},e,this)}attributeChangedCallback(){this.hydrate()}},d(u,\"observedAttributes\",[\"props\"]),u))}})();";
+declare const _default: "(()=>{var b=Object.defineProperty;var f=(c,o,i)=>o in c?b(c,o,{enumerable:!0,configurable:!0,writable:!0,value:i}):c[o]=i;var l=(c,o,i)=>(f(c,typeof o!=\"symbol\"?o+\"\":o,i),i);var p;{let c={0:t=>m(t),1:t=>i(t),2:t=>new RegExp(t),3:t=>new Date(t),4:t=>new Map(i(t)),5:t=>new Set(i(t)),6:t=>BigInt(t),7:t=>new URL(t),8:t=>new Uint8Array(t),9:t=>new Uint16Array(t),10:t=>new Uint32Array(t)},o=t=>{let[e,r]=t;return e in c?c[e](r):void 0},i=t=>t.map(o),m=t=>typeof t!=\"object\"||t===null?t:Object.fromEntries(Object.entries(t).map(([e,r])=>[e,o(r)]));customElements.get(\"astro-island\")||customElements.define(\"astro-island\",(p=class extends HTMLElement{constructor(){super(...arguments);l(this,\"Component\");l(this,\"hydrator\");l(this,\"hydrate\",async()=>{var d;if(!this.hydrator||!this.isConnected)return;let e=(d=this.parentElement)==null?void 0:d.closest(\"astro-island[ssr]\");if(e){e.addEventListener(\"astro:hydrate\",this.hydrate,{once:!0});return}let r=this.querySelectorAll(\"astro-slot\"),a={},h=this.querySelectorAll(\"template[data-astro-template]\");for(let n of h){let s=n.closest(this.tagName);s!=null&&s.isSameNode(this)&&(a[n.getAttribute(\"data-astro-template\")||\"default\"]=n.innerHTML,n.remove())}for(let n of r){let s=n.closest(this.tagName);s!=null&&s.isSameNode(this)&&(a[n.getAttribute(\"name\")||\"default\"]=n.innerHTML)}let u;try{u=this.hasAttribute(\"props\")?m(JSON.parse(this.getAttribute(\"props\"))):{}}catch(n){let s=this.getAttribute(\"component-url\")||\"<unknown>\",y=this.getAttribute(\"component-export\");throw y&&(s+=` (export ${y})`),console.error(`[hydrate] Error parsing props for component ${s}`,this.getAttribute(\"props\"),n),n}await this.hydrator(this)(this.Component,u,a,{client:this.getAttribute(\"client\")}),this.removeAttribute(\"ssr\"),this.dispatchEvent(new CustomEvent(\"astro:hydrate\"))});l(this,\"unmount\",()=>{this.isConnected||this.dispatchEvent(new CustomEvent(\"astro:unmount\"))})}disconnectedCallback(){document.removeEventListener(\"astro:after-swap\",this.unmount),document.addEventListener(\"astro:after-swap\",this.unmount,{once:!0})}connectedCallback(){if(!this.hasAttribute(\"await-children\")||document.readyState===\"interactive\"||document.readyState===\"complete\")this.childrenConnectedCallback();else{let e=()=>{document.removeEventListener(\"DOMContentLoaded\",e),r.disconnect(),this.childrenConnectedCallback()},r=new MutationObserver(()=>{var a;((a=this.lastChild)==null?void 0:a.nodeType)===Node.COMMENT_NODE&&this.lastChild.nodeValue===\"astro:end\"&&(this.lastChild.remove(),e())});r.observe(this,{childList:!0}),document.addEventListener(\"DOMContentLoaded\",e)}}async childrenConnectedCallback(){let e=this.getAttribute(\"before-hydration-url\");e&&await import(e),this.start()}start(){let e=JSON.parse(this.getAttribute(\"opts\")),r=this.getAttribute(\"client\");if(Astro[r]===void 0){window.addEventListener(`astro:${r}`,()=>this.start(),{once:!0});return}Astro[r](async()=>{let a=this.getAttribute(\"renderer-url\"),[h,{default:u}]=await Promise.all([import(this.getAttribute(\"component-url\")),a?import(a):()=>()=>{}]),d=this.getAttribute(\"component-export\")||\"default\";if(!d.includes(\".\"))this.Component=h[d];else{this.Component=h;for(let n of d.split(\".\"))this.Component=this.Component[n]}return this.hydrator=u,this.hydrate},e,this)}attributeChangedCallback(){this.hydrate()}},l(p,\"observedAttributes\",[\"props\"]),p))}})();";
 export default _default;

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

@@ -1,4 +1,4 @@
-var astro_island_prebuilt_default = `(()=>{var b=Object.defineProperty;var f=(a,s,i)=>s in a?b(a,s,{enumerable:!0,configurable:!0,writable:!0,value:i}):a[s]=i;var d=(a,s,i)=>(f(a,typeof s!="symbol"?s+"":s,i),i);var u;{let a={0:t=>m(t),1:t=>i(t),2:t=>new RegExp(t),3:t=>new Date(t),4:t=>new Map(i(t)),5:t=>new Set(i(t)),6:t=>BigInt(t),7:t=>new URL(t),8:t=>new Uint8Array(t),9:t=>new Uint16Array(t),10:t=>new Uint32Array(t)},s=t=>{let[e,r]=t;return e in a?a[e](r):void 0},i=t=>t.map(s),m=t=>typeof t!="object"||t===null?t:Object.fromEntries(Object.entries(t).map(([e,r])=>[e,s(r)]));customElements.get("astro-island")||customElements.define("astro-island",(u=class extends HTMLElement{constructor(){super(...arguments);d(this,"Component");d(this,"hydrator");d(this,"hydrate",async()=>{var l;if(!this.hydrator||!this.isConnected)return;let e=(l=this.parentElement)==null?void 0:l.closest("astro-island[ssr]");if(e){e.addEventListener("astro:hydrate",this.hydrate,{once:!0});return}let r=this.querySelectorAll("astro-slot"),c={},h=this.querySelectorAll("template[data-astro-template]");for(let n of h){let o=n.closest(this.tagName);o!=null&&o.isSameNode(this)&&(c[n.getAttribute("data-astro-template")||"default"]=n.innerHTML,n.remove())}for(let n of r){let o=n.closest(this.tagName);o!=null&&o.isSameNode(this)&&(c[n.getAttribute("name")||"default"]=n.innerHTML)}let p;try{p=this.hasAttribute("props")?m(JSON.parse(this.getAttribute("props"))):{}}catch(n){let o=this.getAttribute("component-url")||"<unknown>",y=this.getAttribute("component-export");throw y&&(o+=\` (export \${y})\`),console.error(\`[hydrate] Error parsing props for component \${o}\`,this.getAttribute("props"),n),n}await this.hydrator(this)(this.Component,p,c,{client:this.getAttribute("client")}),this.removeAttribute("ssr"),this.dispatchEvent(new CustomEvent("astro:hydrate"))});d(this,"unmount",()=>{this.isConnected||this.dispatchEvent(new CustomEvent("astro:unmount"))})}disconnectedCallback(){document.removeEventListener("astro:after-swap",this.unmount),document.addEventListener("astro:after-swap",this.unmount,{once:!0})}connectedCallback(){!this.hasAttribute("await-children")||this.firstChild?this.childrenConnectedCallback():new MutationObserver((e,r)=>{r.disconnect(),setTimeout(()=>this.childrenConnectedCallback(),0)}).observe(this,{childList:!0})}async childrenConnectedCallback(){let e=this.getAttribute("before-hydration-url");e&&await import(e),this.start()}start(){let e=JSON.parse(this.getAttribute("opts")),r=this.getAttribute("client");if(Astro[r]===void 0){window.addEventListener(\`astro:\${r}\`,()=>this.start(),{once:!0});return}Astro[r](async()=>{let c=this.getAttribute("renderer-url"),[h,{default:p}]=await Promise.all([import(this.getAttribute("component-url")),c?import(c):()=>()=>{}]),l=this.getAttribute("component-export")||"default";if(!l.includes("."))this.Component=h[l];else{this.Component=h;for(let n of l.split("."))this.Component=this.Component[n]}return this.hydrator=p,this.hydrate},e,this)}attributeChangedCallback(){this.hydrate()}},d(u,"observedAttributes",["props"]),u))}})();`;
+var astro_island_prebuilt_default = `(()=>{var b=Object.defineProperty;var f=(c,o,i)=>o in c?b(c,o,{enumerable:!0,configurable:!0,writable:!0,value:i}):c[o]=i;var l=(c,o,i)=>(f(c,typeof o!="symbol"?o+"":o,i),i);var p;{let c={0:t=>m(t),1:t=>i(t),2:t=>new RegExp(t),3:t=>new Date(t),4:t=>new Map(i(t)),5:t=>new Set(i(t)),6:t=>BigInt(t),7:t=>new URL(t),8:t=>new Uint8Array(t),9:t=>new Uint16Array(t),10:t=>new Uint32Array(t)},o=t=>{let[e,r]=t;return e in c?c[e](r):void 0},i=t=>t.map(o),m=t=>typeof t!="object"||t===null?t:Object.fromEntries(Object.entries(t).map(([e,r])=>[e,o(r)]));customElements.get("astro-island")||customElements.define("astro-island",(p=class extends HTMLElement{constructor(){super(...arguments);l(this,"Component");l(this,"hydrator");l(this,"hydrate",async()=>{var d;if(!this.hydrator||!this.isConnected)return;let e=(d=this.parentElement)==null?void 0:d.closest("astro-island[ssr]");if(e){e.addEventListener("astro:hydrate",this.hydrate,{once:!0});return}let r=this.querySelectorAll("astro-slot"),a={},h=this.querySelectorAll("template[data-astro-template]");for(let n of h){let s=n.closest(this.tagName);s!=null&&s.isSameNode(this)&&(a[n.getAttribute("data-astro-template")||"default"]=n.innerHTML,n.remove())}for(let n of r){let s=n.closest(this.tagName);s!=null&&s.isSameNode(this)&&(a[n.getAttribute("name")||"default"]=n.innerHTML)}let u;try{u=this.hasAttribute("props")?m(JSON.parse(this.getAttribute("props"))):{}}catch(n){let s=this.getAttribute("component-url")||"<unknown>",y=this.getAttribute("component-export");throw y&&(s+=\` (export \${y})\`),console.error(\`[hydrate] Error parsing props for component \${s}\`,this.getAttribute("props"),n),n}await this.hydrator(this)(this.Component,u,a,{client:this.getAttribute("client")}),this.removeAttribute("ssr"),this.dispatchEvent(new CustomEvent("astro:hydrate"))});l(this,"unmount",()=>{this.isConnected||this.dispatchEvent(new CustomEvent("astro:unmount"))})}disconnectedCallback(){document.removeEventListener("astro:after-swap",this.unmount),document.addEventListener("astro:after-swap",this.unmount,{once:!0})}connectedCallback(){if(!this.hasAttribute("await-children")||document.readyState==="interactive"||document.readyState==="complete")this.childrenConnectedCallback();else{let e=()=>{document.removeEventListener("DOMContentLoaded",e),r.disconnect(),this.childrenConnectedCallback()},r=new MutationObserver(()=>{var a;((a=this.lastChild)==null?void 0:a.nodeType)===Node.COMMENT_NODE&&this.lastChild.nodeValue==="astro:end"&&(this.lastChild.remove(),e())});r.observe(this,{childList:!0}),document.addEventListener("DOMContentLoaded",e)}}async childrenConnectedCallback(){let e=this.getAttribute("before-hydration-url");e&&await import(e),this.start()}start(){let e=JSON.parse(this.getAttribute("opts")),r=this.getAttribute("client");if(Astro[r]===void 0){window.addEventListener(\`astro:\${r}\`,()=>this.start(),{once:!0});return}Astro[r](async()=>{let a=this.getAttribute("renderer-url"),[h,{default:u}]=await Promise.all([import(this.getAttribute("component-url")),a?import(a):()=>()=>{}]),d=this.getAttribute("component-export")||"default";if(!d.includes("."))this.Component=h[d];else{this.Component=h;for(let n of d.split("."))this.Component=this.Component[n]}return this.hydrator=u,this.hydrate},e,this)}attributeChangedCallback(){this.hydrate()}},l(p,"observedAttributes",["props"]),p))}})();`;
 export {
   astro_island_prebuilt_default as default
 };

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

@@ -55,8 +55,8 @@ function validateComponentProps(props, displayName) {
 function createAstroComponentInstance(result, displayName, factory, props, slots = {}) {
   validateComponentProps(props, displayName);
   const instance = new AstroComponentInstance(result, props, slots, factory);
-  if (isAPropagatingComponent(result, factory) && !result._metadata.propagators.has(factory)) {
-    result._metadata.propagators.set(factory, instance);
+  if (isAPropagatingComponent(result, factory)) {
+    result._metadata.propagators.add(instance);
   }
   return instance;
 }

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

@@ -280,6 +280,7 @@ ${serializeProps(
   island.children = `${html ?? ""}${template}`;
   if (island.children) {
     island.props["await-children"] = "";
+    island.children += `<!--astro:end-->`;
   }
   return {
     render(destination) {

package/dist/transitions/router.js

@@ -146,7 +146,7 @@ async function updateDOM(newDocument, toLocation, options, popState, fallback) {
     if (import.meta.env.DEV) {
       if (el.tagName === "STYLE" && el.dataset.viteDevId) {
         const devId = el.dataset.viteDevId;
-        return newDocument.querySelector(`style[data-astro-dev-id="${devId}"]`) || // Otherwise, keep it anyways. This is client:only styles.
+        return newDocument.querySelector(`style[data-vite-dev-id="${devId}"]`) || // Otherwise, keep it anyways. This is client:only styles.
         noopEl;
       }
     }
@@ -200,7 +200,9 @@ async function updateDOM(newDocument, toLocation, options, popState, fallback) {
   const links = [];
   for (const el of newDocument.querySelectorAll("head link[rel=stylesheet]")) {
     if (!document.querySelector(
-      `[${PERSIST_ATTR}="${el.getAttribute(PERSIST_ATTR)}"], link[rel=stylesheet]`
+      `[${PERSIST_ATTR}="${el.getAttribute(
+        PERSIST_ATTR
+      )}"], link[rel=stylesheet][href="${el.getAttribute("href")}"]`
     )) {
       const c = document.createElement("link");
       c.setAttribute("rel", "preload");

package/dist/vite-plugin-astro-server/css.d.ts

@@ -1,7 +1,13 @@
 import type { RuntimeMode } from '../@types/astro.js';
 import type { ModuleLoader } from '../core/module-loader/index.js';
+interface ImportedStyle {
+    id: string;
+    url: string;
+    content: string;
+}
 /** Given a filePath URL, crawl Vite’s module graph to find all style imports. */
 export declare function getStylesForURL(filePath: URL, loader: ModuleLoader, mode: RuntimeMode): Promise<{
     urls: Set<string>;
-    stylesMap: Map<string, string>;
+    styles: ImportedStyle[];
 }>;
+export {};

package/dist/vite-plugin-astro-server/css.js

@@ -14,7 +14,11 @@ async function getStylesForURL(filePath, loader, mode) {
       }
       if (mode === "development" && // only inline in development
       typeof ssrModule?.default === "string") {
-        importedStylesMap.set(importedModule.url, ssrModule.default);
+        importedStylesMap.set(importedModule.url, {
+          id: importedModule.id ?? importedModule.url,
+          url: importedModule.url,
+          content: ssrModule.default
+        });
       } else {
         importedCssUrls.add(importedModule.url);
       }
@@ -22,7 +26,7 @@ async function getStylesForURL(filePath, loader, mode) {
   }
   return {
     urls: importedCssUrls,
-    stylesMap: importedStylesMap
+    styles: [...importedStylesMap.values()]
   };
 }
 export {

package/dist/vite-plugin-astro-server/route.js

@@ -3,7 +3,7 @@ import { loadMiddleware } from "../core/middleware/loadMiddleware.js";
 import { createRenderContext, getParamsAndProps } from "../core/render/index.js";
 import { createRequest } from "../core/request.js";
 import { matchAllRoutes } from "../core/routing/index.js";
-import { isPage, resolveIdToUrl, viteID } from "../core/util.js";
+import { isPage } from "../core/util.js";
 import { getSortedPreloadedMatches } from "../prerender/routing.js";
 import { isServerLikeOutput } from "../prerender/utils.js";
 import { PAGE_SCRIPT_ID } from "../vite-plugin-scripts/index.js";
@@ -199,13 +199,6 @@ async function getScriptsAndStyles({ pipeline, filePath }) {
       props: { type: "module", src: "/@vite/client" },
       children: ""
     });
-    scripts.add({
-      props: {
-        type: "module",
-        src: await resolveIdToUrl(moduleLoader, "astro/runtime/client/hmr.js")
-      },
-      children: ""
-    });
   }
   for (const script of settings.scripts) {
     if (script.stage === "head-inline") {
@@ -220,7 +213,11 @@ async function getScriptsAndStyles({ pipeline, filePath }) {
       });
     }
   }
-  const { urls: styleUrls, stylesMap } = await getStylesForURL(filePath, moduleLoader, mode);
+  const { urls: styleUrls, styles: importedStyles } = await getStylesForURL(
+    filePath,
+    moduleLoader,
+    mode
+  );
   let links = /* @__PURE__ */ new Set();
   [...styleUrls].forEach((href) => {
     links.add({
@@ -232,7 +229,7 @@ async function getScriptsAndStyles({ pipeline, filePath }) {
     });
   });
   let styles = /* @__PURE__ */ new Set();
-  [...stylesMap].forEach(([url, content]) => {
+  importedStyles.forEach(({ id, url, content }) => {
     scripts.add({
       props: {
         type: "module",
@@ -242,8 +239,7 @@ async function getScriptsAndStyles({ pipeline, filePath }) {
     });
     styles.add({
       props: {
-        // Track the ID so we can match it to Vite's injected style later
-        "data-astro-dev-id": viteID(new URL(`.${url}`, settings.config.root))
+        "data-vite-dev-id": id
       },
       children: content
     });

package/dist/vite-plugin-markdown/images.d.ts

@@ -0,0 +1,6 @@
+export type MarkdownImagePath = {
+    raw: string;
+    resolved: string;
+    safeName: string;
+};
+export declare function getMarkdownCodeForImages(imagePaths: MarkdownImagePath[], html: string): string;

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

@@ -0,0 +1,31 @@
+function getMarkdownCodeForImages(imagePaths, html) {
+  return `
+		import { getImage } from "astro:assets";
+		${imagePaths.map((entry) => `import Astro__${entry.safeName} from ${JSON.stringify(entry.raw)};`).join("\n")}
+
+		const images = async function() {
+			return {
+				${imagePaths.map((entry) => `"${entry.raw}": await getImage({src: Astro__${entry.safeName}})`).join(",\n")}
+				}
+			}
+
+			async function updateImageReferences(html) {
+				return images().then((images) => {
+					return html.replaceAll(/__ASTRO_IMAGE_="([^"]+)"/gm, (full, imagePath) =>
+					spreadAttributes({
+						src: images[imagePath].src,
+						...images[imagePath].attributes,
+					})
+					);
+				});
+			}
+
+			// NOTE: This causes a top-level await to appear in the user's code, which can break very easily due to a Rollup
+			// bug and certain adapters not supporting it correctly. See: https://github.com/rollup/rollup/issues/4708
+			// Tread carefully!
+			const html = await updateImageReferences(${JSON.stringify(html)});
+		`;
+}
+export {
+  getMarkdownCodeForImages
+};

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

@@ -11,6 +11,7 @@ import { AstroError, AstroErrorData, MarkdownError } from "../core/errors/index.
 import { isMarkdownFile } from "../core/util.js";
 import { shorthash } from "../runtime/server/shorthash.js";
 import { escapeViteEnvReferences, getFileInfo } from "../vite-plugin-utils/index.js";
+import { getMarkdownCodeForImages } from "./images.js";
 function safeMatter(source, id) {
   try {
     return matter(source);
@@ -89,29 +90,10 @@ function markdown({ settings, logger }) {
           astroServerRuntimeModulePath
         )};
 				import { AstroError, AstroErrorData } from ${JSON.stringify(astroErrorModulePath)};
-
 				${layout ? `import Layout from ${JSON.stringify(layout)};` : ""}
-				import { getImage } from "astro:assets";
-				${imagePaths.map((entry) => `import Astro__${entry.safeName} from ${JSON.stringify(entry.raw)};`).join("\n")}
-
-				const images = async function() {
-					return {
-						${imagePaths.map((entry) => `"${entry.raw}": await getImage({src: Astro__${entry.safeName}})`).join(",\n")}
-					}
-				}
-
-				async function updateImageReferences(html) {
-					return images().then((images) => {
-						return html.replaceAll(/__ASTRO_IMAGE_="([^"]+)"/gm, (full, imagePath) =>
-							spreadAttributes({
-								src: images[imagePath].src,
-								...images[imagePath].attributes,
-							})
-						);
-					});
-				}
 
-				const html = await updateImageReferences(${JSON.stringify(html)});
+				${// Only include the code relevant to `astro:assets` if there's images in the file
+        imagePaths.length > 0 ? getMarkdownCodeForImages(imagePaths, html) : `const html = ${JSON.stringify(html)};`}
 
 				export const frontmatter = ${JSON.stringify(frontmatter)};
 				export const file = ${JSON.stringify(fileId)};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "3.2.0",
+  "version": "3.2.2",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -56,7 +56,7 @@
     "./components/*": "./components/*",
     "./assets": "./dist/assets/index.js",
     "./assets/utils": "./dist/assets/utils/index.js",
-    "./assets/image-endpoint": "./dist/assets/image-endpoint.js",
+    "./assets/endpoint/*": "./dist/assets/endpoint/*.js",
     "./assets/services/sharp": "./dist/assets/services/sharp.js",
     "./assets/services/squoosh": "./dist/assets/services/squoosh.js",
     "./assets/services/noop": "./dist/assets/services/noop.js",