astro 4.6.3 → 4.7.0

package/dist/runtime/client/dev-toolbar/toolbar.d.ts

@@ -1,4 +1,5 @@
-import type { DevToolbarApp as DevToolbarAppDefinition } from '../../../@types/astro.js';
+import type { ResolvedDevToolbarApp as DevToolbarAppDefinition } from '../../../@types/astro.js';
+import { type ToolbarAppEventTarget } from './helpers.js';
 import { type Icon } from './ui-library/icons.js';
 import { type Placement } from './ui-library/window.js';
 export type DevToolbarApp = DevToolbarAppDefinition & {
@@ -9,7 +10,7 @@ export type DevToolbarApp = DevToolbarAppDefinition & {
         state: boolean;
         level?: 'error' | 'warning' | 'info';
     };
-    eventTarget: EventTarget;
+    eventTarget: ToolbarAppEventTarget;
 };
 export declare class AstroDevToolbar extends HTMLElement {
     shadowRoot: ShadowRoot;

package/dist/runtime/client/dev-toolbar/toolbar.js

@@ -1,3 +1,4 @@
+import { serverHelpers } from "./helpers.js";
 import { settings } from "./settings.js";
 import { getIconElement, isDefinedIcon } from "./ui-library/icons.js";
 import {} from "./ui-library/window.js";
@@ -340,7 +341,7 @@ class AstroDevToolbar extends HTMLElement {
     app.status = "loading";
     try {
       settings.logger.verboseLog(`Initializing app ${app.id}`);
-      await app.init?.(shadowRoot, app.eventTarget);
+      await app.init?.(shadowRoot, app.eventTarget, serverHelpers);
       app.status = "ready";
       if (import.meta.hot) {
         import.meta.hot.send(`${WS_EVENT_NAME}:${app.id}:initialized`);

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

@@ -22,146 +22,141 @@
       return raw;
     return Object.fromEntries(Object.entries(raw).map(([key, value]) => [key, reviveTuple(value)]));
   };
-  if (!customElements.get("astro-island")) {
-    customElements.define(
-      "astro-island",
-      class extends HTMLElement {
-        Component;
-        hydrator;
-        static observedAttributes = ["props"];
-        disconnectedCallback() {
-          document.removeEventListener("astro:after-swap", this.unmount);
-          document.addEventListener("astro:after-swap", this.unmount, { once: true });
-        }
-        connectedCallback() {
-          if (!this.hasAttribute("await-children") || document.readyState === "interactive" || document.readyState === "complete") {
-            this.childrenConnectedCallback();
-          } else {
-            const onConnected = () => {
-              document.removeEventListener("DOMContentLoaded", onConnected);
-              mo.disconnect();
-              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() {
-          let beforeHydrationUrl = this.getAttribute("before-hydration-url");
-          if (beforeHydrationUrl) {
-            await import(beforeHydrationUrl);
-          }
-          this.start();
-        }
-        async start() {
-          const opts = JSON.parse(this.getAttribute("opts"));
-          const directive = this.getAttribute("client");
-          if (Astro[directive] === void 0) {
-            window.addEventListener(`astro:${directive}`, () => this.start(), { once: true });
-            return;
-          }
-          try {
-            await Astro[directive](
-              async () => {
-                const rendererUrl = this.getAttribute("renderer-url");
-                const [componentModule, { default: hydrator }] = await Promise.all([
-                  import(this.getAttribute("component-url")),
-                  rendererUrl ? import(rendererUrl) : () => () => {
-                  }
-                ]);
-                const componentExport = this.getAttribute("component-export") || "default";
-                if (!componentExport.includes(".")) {
-                  this.Component = componentModule[componentExport];
-                } else {
-                  this.Component = componentModule;
-                  for (const part of componentExport.split(".")) {
-                    this.Component = this.Component[part];
-                  }
-                }
-                this.hydrator = hydrator;
-                return this.hydrate;
-              },
-              opts,
-              this
-            );
-          } catch (e) {
-            console.error(
-              `[astro-island] Error hydrating ${this.getAttribute("component-url")}`,
-              e
-            );
-          }
-        }
-        hydrate = async () => {
-          if (!this.hydrator)
-            return;
-          if (!this.isConnected)
-            return;
-          const parentSsrIsland = this.parentElement?.closest("astro-island[ssr]");
-          if (parentSsrIsland) {
-            parentSsrIsland.addEventListener("astro:hydrate", this.hydrate, { once: true });
-            return;
-          }
-          const slotted = this.querySelectorAll("astro-slot");
-          const slots = {};
-          const templates = this.querySelectorAll("template[data-astro-template]");
-          for (const template of templates) {
-            const closest = template.closest(this.tagName);
-            if (!closest?.isSameNode(this))
-              continue;
-            slots[template.getAttribute("data-astro-template") || "default"] = template.innerHTML;
-            template.remove();
-          }
-          for (const slot of slotted) {
-            const closest = slot.closest(this.tagName);
-            if (!closest?.isSameNode(this))
-              continue;
-            slots[slot.getAttribute("name") || "default"] = slot.innerHTML;
+  class AstroIsland extends HTMLElement {
+    Component;
+    hydrator;
+    static observedAttributes = ["props"];
+    disconnectedCallback() {
+      document.removeEventListener("astro:after-swap", this.unmount);
+      document.addEventListener("astro:after-swap", this.unmount, { once: true });
+    }
+    connectedCallback() {
+      if (!this.hasAttribute("await-children") || document.readyState === "interactive" || document.readyState === "complete") {
+        this.childrenConnectedCallback();
+      } else {
+        const onConnected = () => {
+          document.removeEventListener("DOMContentLoaded", onConnected);
+          mo.disconnect();
+          this.childrenConnectedCallback();
+        };
+        const mo = new MutationObserver(() => {
+          if (this.lastChild?.nodeType === Node.COMMENT_NODE && this.lastChild.nodeValue === "astro:end") {
+            this.lastChild.remove();
+            onConnected();
           }
-          let props;
-          try {
-            props = this.hasAttribute("props") ? reviveObject(JSON.parse(this.getAttribute("props"))) : {};
-          } catch (e) {
-            let componentName = this.getAttribute("component-url") || "<unknown>";
-            const componentExport = this.getAttribute("component-export");
-            if (componentExport) {
-              componentName += ` (export ${componentExport})`;
+        });
+        mo.observe(this, { childList: true });
+        document.addEventListener("DOMContentLoaded", onConnected);
+      }
+    }
+    async childrenConnectedCallback() {
+      let beforeHydrationUrl = this.getAttribute("before-hydration-url");
+      if (beforeHydrationUrl) {
+        await import(beforeHydrationUrl);
+      }
+      this.start();
+    }
+    async start() {
+      const opts = JSON.parse(this.getAttribute("opts"));
+      const directive = this.getAttribute("client");
+      if (Astro[directive] === void 0) {
+        window.addEventListener(`astro:${directive}`, () => this.start(), { once: true });
+        return;
+      }
+      try {
+        await Astro[directive](
+          async () => {
+            const rendererUrl = this.getAttribute("renderer-url");
+            const [componentModule, { default: hydrator }] = await Promise.all([
+              import(this.getAttribute("component-url")),
+              rendererUrl ? import(rendererUrl) : () => () => {
+              }
+            ]);
+            const componentExport = this.getAttribute("component-export") || "default";
+            if (!componentExport.includes(".")) {
+              this.Component = componentModule[componentExport];
+            } else {
+              this.Component = componentModule;
+              for (const part of componentExport.split(".")) {
+                this.Component = this.Component[part];
+              }
             }
-            console.error(
-              `[hydrate] Error parsing props for component ${componentName}`,
-              this.getAttribute("props"),
-              e
-            );
-            throw e;
-          }
-          let hydrationTimeStart;
-          const hydrator = this.hydrator(this);
-          if (process.env.NODE_ENV === "development")
-            hydrationTimeStart = performance.now();
-          await hydrator(this.Component, props, slots, {
-            client: this.getAttribute("client")
-          });
-          if (process.env.NODE_ENV === "development" && hydrationTimeStart)
-            this.setAttribute(
-              "client-render-time",
-              (performance.now() - hydrationTimeStart).toString()
-            );
-          this.removeAttribute("ssr");
-          this.dispatchEvent(new CustomEvent("astro:hydrate"));
-        };
-        attributeChangedCallback() {
-          this.hydrate();
+            this.hydrator = hydrator;
+            return this.hydrate;
+          },
+          opts,
+          this
+        );
+      } catch (e) {
+        console.error(`[astro-island] Error hydrating ${this.getAttribute("component-url")}`, e);
+      }
+    }
+    hydrate = async () => {
+      if (!this.hydrator)
+        return;
+      if (!this.isConnected)
+        return;
+      const parentSsrIsland = this.parentElement?.closest("astro-island[ssr]");
+      if (parentSsrIsland) {
+        parentSsrIsland.addEventListener("astro:hydrate", this.hydrate, { once: true });
+        return;
+      }
+      const slotted = this.querySelectorAll("astro-slot");
+      const slots = {};
+      const templates = this.querySelectorAll("template[data-astro-template]");
+      for (const template of templates) {
+        const closest = template.closest(this.tagName);
+        if (!closest?.isSameNode(this))
+          continue;
+        slots[template.getAttribute("data-astro-template") || "default"] = template.innerHTML;
+        template.remove();
+      }
+      for (const slot of slotted) {
+        const closest = slot.closest(this.tagName);
+        if (!closest?.isSameNode(this))
+          continue;
+        slots[slot.getAttribute("name") || "default"] = slot.innerHTML;
+      }
+      let props;
+      try {
+        props = this.hasAttribute("props") ? reviveObject(JSON.parse(this.getAttribute("props"))) : {};
+      } catch (e) {
+        let componentName = this.getAttribute("component-url") || "<unknown>";
+        const componentExport = this.getAttribute("component-export");
+        if (componentExport) {
+          componentName += ` (export ${componentExport})`;
         }
-        unmount = () => {
-          if (!this.isConnected)
-            this.dispatchEvent(new CustomEvent("astro:unmount"));
-        };
+        console.error(
+          `[hydrate] Error parsing props for component ${componentName}`,
+          this.getAttribute("props"),
+          e
+        );
+        throw e;
       }
-    );
+      let hydrationTimeStart;
+      const hydrator = this.hydrator(this);
+      if (process.env.NODE_ENV === "development")
+        hydrationTimeStart = performance.now();
+      await hydrator(this.Component, props, slots, {
+        client: this.getAttribute("client")
+      });
+      if (process.env.NODE_ENV === "development" && hydrationTimeStart)
+        this.setAttribute(
+          "client-render-time",
+          (performance.now() - hydrationTimeStart).toString()
+        );
+      this.removeAttribute("ssr");
+      this.dispatchEvent(new CustomEvent("astro:hydrate"));
+    };
+    attributeChangedCallback() {
+      this.hydrate();
+    }
+    unmount = () => {
+      if (!this.isConnected)
+        this.dispatchEvent(new CustomEvent("astro:unmount"));
+    };
+  }
+  if (!customElements.get("astro-island")) {
+    customElements.define("astro-island", AstroIsland);
   }
 }

package/dist/runtime/server/astro-island.prebuilt-dev.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 v=Object.defineProperty;var A=(c,s,a)=>s in c?v(c,s,{enumerable:!0,configurable:!0,writable:!0,value:a}):c[s]=a;var l=(c,s,a)=>(A(c,typeof s!=\"symbol\"?s+\"\":s,a),a);var m;{let c={0:t=>y(t),1:t=>a(t),2:t=>new RegExp(t),3:t=>new Date(t),4:t=>new Map(a(t)),5:t=>new Set(a(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,n]=t;return e in c?c[e](n):void 0},a=t=>t.map(s),y=t=>typeof t!=\"object\"||t===null?t:Object.fromEntries(Object.entries(t).map(([e,n])=>[e,s(n)]));customElements.get(\"astro-island\")||customElements.define(\"astro-island\",(m=class extends HTMLElement{constructor(){super(...arguments);l(this,\"Component\");l(this,\"hydrator\");l(this,\"hydrate\",async()=>{var f;if(!this.hydrator||!this.isConnected)return;let e=(f=this.parentElement)==null?void 0:f.closest(\"astro-island[ssr]\");if(e){e.addEventListener(\"astro:hydrate\",this.hydrate,{once:!0});return}let n=this.querySelectorAll(\"astro-slot\"),r={},h=this.querySelectorAll(\"template[data-astro-template]\");for(let o of h){let i=o.closest(this.tagName);i!=null&&i.isSameNode(this)&&(r[o.getAttribute(\"data-astro-template\")||\"default\"]=o.innerHTML,o.remove())}for(let o of n){let i=o.closest(this.tagName);i!=null&&i.isSameNode(this)&&(r[o.getAttribute(\"name\")||\"default\"]=o.innerHTML)}let p;try{p=this.hasAttribute(\"props\")?y(JSON.parse(this.getAttribute(\"props\"))):{}}catch(o){let i=this.getAttribute(\"component-url\")||\"<unknown>\",b=this.getAttribute(\"component-export\");throw b&&(i+=` (export ${b})`),console.error(`[hydrate] Error parsing props for component ${i}`,this.getAttribute(\"props\"),o),o}let d,u=this.hydrator(this);d=performance.now(),await u(this.Component,p,r,{client:this.getAttribute(\"client\")}),d&&this.setAttribute(\"client-render-time\",(performance.now()-d).toString()),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),n.disconnect(),this.childrenConnectedCallback()},n=new MutationObserver(()=>{var r;((r=this.lastChild)==null?void 0:r.nodeType)===Node.COMMENT_NODE&&this.lastChild.nodeValue===\"astro:end\"&&(this.lastChild.remove(),e())});n.observe(this,{childList:!0}),document.addEventListener(\"DOMContentLoaded\",e)}}async childrenConnectedCallback(){let e=this.getAttribute(\"before-hydration-url\");e&&await import(e),this.start()}async start(){let e=JSON.parse(this.getAttribute(\"opts\")),n=this.getAttribute(\"client\");if(Astro[n]===void 0){window.addEventListener(`astro:${n}`,()=>this.start(),{once:!0});return}try{await Astro[n](async()=>{let r=this.getAttribute(\"renderer-url\"),[h,{default:p}]=await Promise.all([import(this.getAttribute(\"component-url\")),r?import(r):()=>()=>{}]),d=this.getAttribute(\"component-export\")||\"default\";if(!d.includes(\".\"))this.Component=h[d];else{this.Component=h;for(let u of d.split(\".\"))this.Component=this.Component[u]}return this.hydrator=p,this.hydrate},e,this)}catch(r){console.error(`[astro-island] Error hydrating ${this.getAttribute(\"component-url\")}`,r)}}attributeChangedCallback(){this.hydrate()}},l(m,\"observedAttributes\",[\"props\"]),m))}})();";
+declare const _default: "(()=>{var A=Object.defineProperty;var g=(a,o,i)=>o in a?A(a,o,{enumerable:!0,configurable:!0,writable:!0,value:i}):a[o]=i;var l=(a,o,i)=>(g(a,typeof o!=\"symbol\"?o+\"\":o,i),i);{let a={0:t=>y(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[h,e]=t;return h in a?a[h](e):void 0},i=t=>t.map(o),y=t=>typeof t!=\"object\"||t===null?t:Object.fromEntries(Object.entries(t).map(([h,e])=>[h,o(e)]));class f extends HTMLElement{constructor(){super(...arguments);l(this,\"Component\");l(this,\"hydrator\");l(this,\"hydrate\",async()=>{var b;if(!this.hydrator||!this.isConnected)return;let e=(b=this.parentElement)==null?void 0:b.closest(\"astro-island[ssr]\");if(e){e.addEventListener(\"astro:hydrate\",this.hydrate,{once:!0});return}let c=this.querySelectorAll(\"astro-slot\"),n={},p=this.querySelectorAll(\"template[data-astro-template]\");for(let r of p){let s=r.closest(this.tagName);s!=null&&s.isSameNode(this)&&(n[r.getAttribute(\"data-astro-template\")||\"default\"]=r.innerHTML,r.remove())}for(let r of c){let s=r.closest(this.tagName);s!=null&&s.isSameNode(this)&&(n[r.getAttribute(\"name\")||\"default\"]=r.innerHTML)}let u;try{u=this.hasAttribute(\"props\")?y(JSON.parse(this.getAttribute(\"props\"))):{}}catch(r){let s=this.getAttribute(\"component-url\")||\"<unknown>\",v=this.getAttribute(\"component-export\");throw v&&(s+=` (export ${v})`),console.error(`[hydrate] Error parsing props for component ${s}`,this.getAttribute(\"props\"),r),r}let d,m=this.hydrator(this);d=performance.now(),await m(this.Component,u,n,{client:this.getAttribute(\"client\")}),d&&this.setAttribute(\"client-render-time\",(performance.now()-d).toString()),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),c.disconnect(),this.childrenConnectedCallback()},c=new MutationObserver(()=>{var n;((n=this.lastChild)==null?void 0:n.nodeType)===Node.COMMENT_NODE&&this.lastChild.nodeValue===\"astro:end\"&&(this.lastChild.remove(),e())});c.observe(this,{childList:!0}),document.addEventListener(\"DOMContentLoaded\",e)}}async childrenConnectedCallback(){let e=this.getAttribute(\"before-hydration-url\");e&&await import(e),this.start()}async start(){let e=JSON.parse(this.getAttribute(\"opts\")),c=this.getAttribute(\"client\");if(Astro[c]===void 0){window.addEventListener(`astro:${c}`,()=>this.start(),{once:!0});return}try{await Astro[c](async()=>{let n=this.getAttribute(\"renderer-url\"),[p,{default:u}]=await Promise.all([import(this.getAttribute(\"component-url\")),n?import(n):()=>()=>{}]),d=this.getAttribute(\"component-export\")||\"default\";if(!d.includes(\".\"))this.Component=p[d];else{this.Component=p;for(let m of d.split(\".\"))this.Component=this.Component[m]}return this.hydrator=u,this.hydrate},e,this)}catch(n){console.error(`[astro-island] Error hydrating ${this.getAttribute(\"component-url\")}`,n)}}attributeChangedCallback(){this.hydrate()}}l(f,\"observedAttributes\",[\"props\"]),customElements.get(\"astro-island\")||customElements.define(\"astro-island\",f)}})();";
 export default _default;

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

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

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

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

package/dist/toolbar/index.d.ts

@@ -0,0 +1,2 @@
+import type { DevToolbarApp } from '../@types/astro.js';
+export declare function defineToolbarApp(app: DevToolbarApp): DevToolbarApp;

package/dist/toolbar/index.js

@@ -0,0 +1,6 @@
+function defineToolbarApp(app) {
+  return app;
+}
+export {
+  defineToolbarApp
+};

package/dist/{vite-plugin-dev-toolbar → toolbar}/vite-plugin-dev-toolbar.js

@@ -1,7 +1,7 @@
 import { telemetry } from "../events/index.js";
 import { eventAppToggled } from "../events/toolbar.js";
-const VIRTUAL_MODULE_ID = "astro:dev-toolbar";
-const resolvedVirtualModuleId = "\0" + VIRTUAL_MODULE_ID;
+const PRIVATE_VIRTUAL_MODULE_ID = "astro:toolbar:internal";
+const resolvedPrivateVirtualModuleId = "\0" + PRIVATE_VIRTUAL_MODULE_ID;
 function astroDevToolbar({ settings, logger }) {
   let telemetryTimeout;
   return {
@@ -15,8 +15,8 @@ function astroDevToolbar({ settings, logger }) {
       };
     },
     resolveId(id) {
-      if (id === VIRTUAL_MODULE_ID) {
-        return resolvedVirtualModuleId;
+      if (id === PRIVATE_VIRTUAL_MODULE_ID) {
+        return resolvedPrivateVirtualModuleId;
       }
     },
     configureServer(server) {
@@ -49,22 +49,43 @@ ${args.error}`
       });
     },
     async load(id) {
-      if (id === resolvedVirtualModuleId) {
+      if (id === resolvedPrivateVirtualModuleId) {
         return `
 					export const loadDevToolbarApps = async () => {
 						return (await Promise.all([${settings.devToolbarApps.map(
-          (plugin) => `safeLoadPlugin(async () => (await import(${JSON.stringify(
+          (plugin) => `safeLoadPlugin(${JSON.stringify(
             plugin
-          )})).default, ${JSON.stringify(plugin)})`
-        ).join(",")}])).filter(app => app);
+          )}, async () => (await import(${JSON.stringify(
+            typeof plugin === "string" ? plugin : plugin.entrypoint
+          )})).default, ${JSON.stringify(
+            typeof plugin === "string" ? plugin : plugin.entrypoint
+          )})`
+        ).join(",")}]));
 					};
 
-					async function safeLoadPlugin(importEntrypoint, entrypoint) {
+					async function safeLoadPlugin(appDefinition, importEntrypoint, entrypoint) {
 						try {
-							const app = await importEntrypoint();
+							let app;
+							if (typeof appDefinition === 'string') {
+								app = await importEntrypoint();
 
-							if (typeof app !== 'object' || !app.id || !app.name) {
-								throw new Error("Apps must default export an object with an id, and a name.");
+								if (typeof app !== 'object' || !app.id || !app.name) {
+									throw new Error("Apps must default export an object with an id, and a name.");
+								}
+							} else {
+								app = appDefinition;
+
+								if (typeof app !== 'object' || !app.id || !app.name || !app.entrypoint) {
+									throw new Error("Apps must be an object with an id, a name and an entrypoint.");
+								}
+
+								const loadedApp = await importEntrypoint();
+
+								if (typeof loadedApp !== 'object') {
+									throw new Error("App entrypoint must default export an object.");
+								}
+
+								app = { ...app, ...loadedApp };
 							}
 
 							return app;

package/dist/transitions/router.js

@@ -269,7 +269,6 @@ async function updateDOM(preparationEvent, options, historyState, fallback) {
       return style.animationIterationCount === "infinite";
     }
     const currentAnimations = document.getAnimations();
-    await new Promise((r) => setTimeout(r));
     document.documentElement.setAttribute(OLD_NEW_ATTR, phase);
     const nextAnimations = document.getAnimations();
     const newAnimations = nextAnimations.filter(

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

@@ -56,6 +56,7 @@ class DevPipeline extends Pipeline {
         const additionalMetadata = {
           root: url.fileURLToPath(settings.config.root),
           version: ASTRO_VERSION,
+          latestAstroVersion: settings.latestAstroVersion,
           debugInfo: await getInfoOutput({ userConfig: settings.config, print: false })
         };
         const children = `window.__astro_dev_toolbar__ = ${JSON.stringify(additionalMetadata)}`;

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

@@ -1,6 +1,5 @@
 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

@@ -1,10 +1,7 @@
 function getMarkdownCodeForImages(imagePaths, html) {
   return `
 			import { getImage } from "astro:assets";
-			${imagePaths.map((entry) => {
-    const prefix = entry.raw.includes("/") ? "" : "./";
-    return `import Astro__${entry.safeName} from ${JSON.stringify(prefix + entry.raw)};`;
-  }).join("\n")}
+			${imagePaths.map((entry) => `import Astro__${entry.safeName} from ${JSON.stringify(entry.raw)};`).join("\n")}
 
 			const images = async function(html) {
 					const imageSources = {};

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

@@ -1,5 +1,4 @@
 import fs from "node:fs";
-import path from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
 import {
   InvalidAstroDataError,
@@ -29,6 +28,14 @@ function markdown({ settings, logger }) {
     buildEnd() {
       processor = void 0;
     },
+    async resolveId(source, importer, options) {
+      if (importer?.endsWith(".md") && source[0] !== "/") {
+        let resolved = await this.resolve(source, importer, options);
+        if (!resolved)
+          resolved = await this.resolve("./" + source, importer, options);
+        return resolved;
+      }
+    },
     // Why not the "transform" hook instead of "load" + readFile?
     // A: Vite transforms all "import.meta.env" references to their values before
     // passing to the transform hook. This lets us get the truly raw value
@@ -60,7 +67,6 @@ function markdown({ settings, logger }) {
         for (const imagePath of rawImagePaths.values()) {
           imagePaths.push({
             raw: imagePath,
-            resolved: (await this.resolve(imagePath, id))?.id ?? path.join(path.dirname(id), imagePath),
             safeName: shorthash(imagePath)
           });
         }