astro 4.6.4 → 4.7.1

package/dist/core/messages.js

@@ -14,6 +14,7 @@ import {
   underline,
   yellow
 } from "kleur/colors";
+import { getExecCommand } from "../cli/install-package.js";
 import { getDocsForError, renderErrorMarkdown } from "./errors/dev/utils.js";
 import {
   AstroError,
@@ -36,7 +37,7 @@ function serverStart({
   host,
   base
 }) {
-  const version = "4.6.4";
+  const version = "4.7.1";
   const localPrefix = `${dim("\u2503")} Local    `;
   const networkPrefix = `${dim("\u2503")} Network  `;
   const emptyPrefix = " ".repeat(11);
@@ -69,6 +70,13 @@ function serverStart({
 function serverShortcuts({ key, label }) {
   return [dim("  Press"), key, dim("to"), label].join(" ");
 }
+function newVersionAvailable({ latestVersion }) {
+  const badge = bgYellow(black(` update `));
+  const headline = yellow(`\u25B6 New version of Astro available: ${latestVersion}`);
+  const execCommand = getExecCommand();
+  const details = `  Run ${cyan(`${execCommand} @astrojs/upgrade`)} to update`;
+  return ["", `${badge} ${headline}`, details, ""].join("\n");
+}
 function telemetryNotice() {
   const headline = blue(`\u25B6 Astro collects anonymous usage data.`);
   const why = "  This information helps us improve Astro.";
@@ -261,7 +269,7 @@ function printHelp({
     message.push(
       linebreak(),
       `  ${bgGreen(black(` ${commandName} `))} ${green(
-        `v${"4.6.4"}`
+        `v${"4.7.1"}`
       )} ${headline}`
     );
   }
@@ -291,6 +299,7 @@ export {
   formatErrorMessage,
   fsStrictWarning,
   getNetworkLogging,
+  newVersionAvailable,
   preferenceDefault,
   preferenceDefaultIntro,
   preferenceDisabled,

package/dist/core/preview/index.js

@@ -4,7 +4,7 @@ import { fileURLToPath, pathToFileURL } from "node:url";
 import { AstroIntegrationLogger } from "../../core/logger/core.js";
 import { telemetry } from "../../events/index.js";
 import { eventCliSession } from "../../events/session.js";
-import { runHookConfigDone, runHookConfigSetup } from "../../integrations/index.js";
+import { runHookConfigDone, runHookConfigSetup } from "../../integrations/hooks.js";
 import { resolveConfig } from "../config/config.js";
 import { createNodeLogger } from "../config/logging.js";
 import { createSettings } from "../config/settings.js";

package/dist/core/routing/priority.d.ts

@@ -16,7 +16,7 @@ import type { RouteData } from '../../@types/astro.js';
  * - Prerendered routes are sorted before non-prerendered routes.
  * - Endpoints are sorted before pages.
  *   For example, a file `/foo.ts` is sorted before `/bar.astro`.
- * - If both routes are equal regarding all previosu conditions, they are sorted alphabetically.
+ * - If both routes are equal regarding all previous conditions, they are sorted alphabetically.
  *   For example, `/bar` is sorted before `/foo`.
  *   The definition of "alphabetically" is dependent on the default locale of the running system.
  */

package/dist/core/sync/index.js

@@ -8,7 +8,7 @@ import { createContentTypesGenerator } from "../../content/index.js";
 import { globalContentConfigObserver } from "../../content/utils.js";
 import { telemetry } from "../../events/index.js";
 import { eventCliSession } from "../../events/session.js";
-import { runHookConfigSetup } from "../../integrations/index.js";
+import { runHookConfigSetup } from "../../integrations/hooks.js";
 import { setUpEnvTs } from "../../vite-plugin-inject-env-ts/index.js";
 import { getTimeStat } from "../build/util.js";
 import { resolveConfig } from "../config/config.js";

package/dist/integrations/{index.d.ts → hooks.d.ts}

@@ -5,6 +5,34 @@ import type { AstroAdapter, AstroConfig, AstroSettings, RouteData } from '../@ty
 import type { SerializedSSRManifest } from '../core/app/types.js';
 import type { PageBuildData } from '../core/build/types.js';
 import type { Logger } from '../core/logger/core.js';
+export declare function getToolbarServerCommunicationHelpers(server: ViteDevServer): {
+    /**
+     * Send a message to the dev toolbar that an app can listen for. The payload can be any serializable data.
+     * @param event - The event name
+     * @param payload - The payload to send
+     */
+    send: <T>(event: string, payload: T) => void;
+    /**
+     * Receive a message from a dev toolbar app.
+     * @param event
+     * @param callback
+     */
+    on: <T_1>(event: string, callback: (data: T_1) => void) => void;
+    /**
+     * Fired when an app is initialized.
+     * @param appId - The id of the app that was initialized
+     * @param callback - The callback to run when the app is initialized
+     */
+    onAppInitialized: (appId: string, callback: (data: Record<string, never>) => void) => void;
+    /**
+     * Fired when an app is toggled on or off.
+     * @param appId - The id of the app that was toggled
+     * @param callback - The callback to run when the app is toggled
+     */
+    onAppToggled: (appId: string, callback: (data: {
+        state: boolean;
+    }) => void) => void;
+};
 export declare function runHookConfigSetup({ settings, command, logger, isRestart, }: {
     settings: AstroSettings;
     command: 'dev' | 'build' | 'preview';

package/dist/integrations/{index.js → hooks.js}

@@ -4,7 +4,7 @@ import { bold } from "kleur/colors";
 import { buildClientDirectiveEntrypoint } from "../core/client-directive/index.js";
 import { mergeConfig } from "../core/config/index.js";
 import { isServerLikeOutput } from "../prerender/utils.js";
-import { validateSupportedFeatures } from "./astroFeaturesValidation.js";
+import { validateSupportedFeatures } from "./features-validation.js";
 async function withTakingALongTimeMsg({
   name,
   hookName,
@@ -33,6 +33,43 @@ function getLogger(integration, logger) {
   Loggers.set(integration, integrationLogger);
   return integrationLogger;
 }
+const serverEventPrefix = "astro-dev-toolbar";
+function getToolbarServerCommunicationHelpers(server) {
+  return {
+    /**
+     * Send a message to the dev toolbar that an app can listen for. The payload can be any serializable data.
+     * @param event - The event name
+     * @param payload - The payload to send
+     */
+    send: (event, payload) => {
+      server.hot.send(event, payload);
+    },
+    /**
+     * Receive a message from a dev toolbar app.
+     * @param event
+     * @param callback
+     */
+    on: (event, callback) => {
+      server.hot.on(event, callback);
+    },
+    /**
+     * Fired when an app is initialized.
+     * @param appId - The id of the app that was initialized
+     * @param callback - The callback to run when the app is initialized
+     */
+    onAppInitialized: (appId, callback) => {
+      server.hot.on(`${serverEventPrefix}:${appId}:initialized`, callback);
+    },
+    /**
+     * Fired when an app is toggled on or off.
+     * @param appId - The id of the app that was toggled
+     * @param callback - The callback to run when the app is toggled
+     */
+    onAppToggled: (appId, callback) => {
+      server.hot.on(`${serverEventPrefix}:${appId}:toggled`, callback);
+    }
+  };
+}
 async function runHookConfigSetup({
   settings,
   command,
@@ -219,7 +256,8 @@ async function runHookServerSetup({
         hookName: "astro:server:setup",
         hookResult: integration.hooks["astro:server:setup"]({
           server,
-          logger: getLogger(integration, logger)
+          logger: getLogger(integration, logger),
+          toolbar: getToolbarServerCommunicationHelpers(server)
         }),
         logger
       });
@@ -384,6 +422,7 @@ function isFunctionPerRouteEnabled(adapter) {
   }
 }
 export {
+  getToolbarServerCommunicationHelpers,
   isFunctionPerRouteEnabled,
   runHookBuildDone,
   runHookBuildGenerated,

package/dist/preferences/defaults.d.ts

@@ -3,5 +3,14 @@ export declare const DEFAULT_PREFERENCES: {
         /** Specifies whether the user has the Dev Overlay enabled */
         enabled: boolean;
     };
+    checkUpdates: {
+        /** Specifies whether the user has the update check enabled */
+        enabled: boolean;
+    };
+    _variables: {
+        /** Time since last update check */
+        lastUpdateCheck: number;
+    };
 };
 export type Preferences = typeof DEFAULT_PREFERENCES;
+export type PublicPreferences = Omit<Preferences, '_variables'>;

package/dist/preferences/defaults.js

@@ -2,6 +2,15 @@ const DEFAULT_PREFERENCES = {
   devToolbar: {
     /** Specifies whether the user has the Dev Overlay enabled */
     enabled: true
+  },
+  checkUpdates: {
+    /** Specifies whether the user has the update check enabled */
+    enabled: true
+  },
+  // Temporary variables that shouldn't be exposed to the users in the CLI, but are still useful to store in preferences
+  _variables: {
+    /** Time since last update check */
+    lastUpdateCheck: 0
   }
 };
 export {

package/dist/preferences/index.d.ts

@@ -1,5 +1,5 @@
 import type { AstroConfig } from '../@types/astro.js';
-import { type Preferences } from './defaults.js';
+import { type Preferences, type PublicPreferences } from './defaults.js';
 type DotKeys<T> = T extends object ? {
     [K in keyof T]: `${Exclude<K, symbol>}${DotKeys<T[K]> extends never ? '' : `.${DotKeys<T[K]>}`}`;
 }[keyof T] : never;
@@ -7,20 +7,28 @@ export type GetDotKey<T extends Record<string | number, any>, K extends string>
 export type PreferenceLocation = 'global' | 'project';
 export interface PreferenceOptions {
     location?: PreferenceLocation;
+    /**
+     * If `true`, the server will be reloaded after setting the preference.
+     * If `false`, the server will not be reloaded after setting the preference.
+     *
+     * Defaults to `true`.
+     */
+    reloadServer?: boolean;
 }
 type DeepPartial<T> = T extends object ? {
     [P in keyof T]?: DeepPartial<T[P]>;
 } : T;
 export type PreferenceKey = DotKeys<Preferences>;
-export interface PreferenceList extends Record<PreferenceLocation, DeepPartial<Preferences>> {
+export interface PreferenceList extends Record<PreferenceLocation, DeepPartial<PublicPreferences>> {
     fromAstroConfig: DeepPartial<Preferences>;
-    defaults: Preferences;
+    defaults: PublicPreferences;
 }
 export interface AstroPreferences {
     get<Key extends PreferenceKey>(key: Key, opts?: PreferenceOptions): Promise<GetDotKey<Preferences, Key>>;
     set<Key extends PreferenceKey>(key: Key, value: GetDotKey<Preferences, Key>, opts?: PreferenceOptions): Promise<void>;
-    getAll(): Promise<Preferences>;
+    getAll(): Promise<PublicPreferences>;
     list(opts?: PreferenceOptions): Promise<PreferenceList>;
+    ignoreNextPreferenceReload: boolean;
 }
 export declare function isValidKey(key: string): key is PreferenceKey;
 export declare function coerce(key: string, value: unknown): any;

package/dist/preferences/index.js

@@ -37,30 +37,37 @@ function createPreferences(config) {
         return project.get(key) ?? global.get(key) ?? dget(DEFAULT_PREFERENCES, key);
       return stores[location].get(key);
     },
-    async set(key, value, { location = "project" } = {}) {
+    async set(key, value, { location = "project", reloadServer = true } = {}) {
       stores[location].set(key, value);
+      if (!reloadServer) {
+        this.ignoreNextPreferenceReload = true;
+      }
     },
     async getAll() {
-      return Object.assign(
+      const allPrefs = Object.assign(
         {},
         DEFAULT_PREFERENCES,
         stores["global"].getAll(),
         stores["project"].getAll()
       );
+      const { _variables, ...prefs } = allPrefs;
+      return prefs;
     },
     async list() {
+      const { _variables, ...defaultPrefs } = DEFAULT_PREFERENCES;
       return {
         global: stores["global"].getAll(),
         project: stores["project"].getAll(),
         fromAstroConfig: mapFrom(DEFAULT_PREFERENCES, config),
-        defaults: DEFAULT_PREFERENCES
+        defaults: defaultPrefs
       };
       function mapFrom(defaults, astroConfig) {
         return Object.fromEntries(
           Object.entries(defaults).map(([key, _]) => [key, astroConfig[key]])
         );
       }
-    }
+    },
+    ignoreNextPreferenceReload: false
   };
 }
 function getGlobalPreferenceDir() {

package/dist/prerender/utils.d.ts

@@ -2,6 +2,6 @@ import type { AstroConfig } from '../@types/astro.js';
 export declare function isServerLikeOutput(config: AstroConfig): boolean;
 export declare function getPrerenderDefault(config: AstroConfig): boolean;
 /**
- * Returns the correct output directory of hte SSR build based on the configuration
+ * Returns the correct output directory of the SSR build based on the configuration
  */
 export declare function getOutputDirectory(config: AstroConfig): URL;

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

@@ -15,6 +15,6 @@ declare const _default: {
     id: string;
     name: string;
     icon: "astro:logo";
-    init(canvas: ShadowRoot, eventTarget: EventTarget): Promise<void>;
+    init(canvas: ShadowRoot, eventTarget: import("../helpers.js").ToolbarAppEventTarget): Promise<void>;
 };
 export default _default;

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

@@ -59,6 +59,7 @@ var astro_default = {
           link: "https://astro.build/chat"
         }
       ];
+      const hasNewerVersion = window.__astro_dev_toolbar__.latestAstroVersion;
       const windowComponent = createWindowElement(
         `<style>
 				#buttons-container {
@@ -301,6 +302,8 @@ var astro_default = {
 				<section>
 				${astroLogo}
 				<astro-dev-toolbar-badge badge-style="gray" size="large">${window.__astro_dev_toolbar__.version}</astro-dev-toolbar-badge>
+				${hasNewerVersion ? `<astro-dev-toolbar-badge badge-style="green" size="large">${window.__astro_dev_toolbar__.latestAstroVersion} available!</astro-dev-toolbar-badge>
+						` : ""}
 				</section>
 				<astro-dev-toolbar-button id="copy-debug-button">Copy debug info <astro-dev-toolbar-icon icon="copy" /></astro-dev-toolbar-button>
 			</header>

package/dist/runtime/client/dev-toolbar/apps/audit/index.d.ts

@@ -10,6 +10,6 @@ declare const _default: {
     id: string;
     name: string;
     icon: "<svg xmlns=\"http://www.w3.org/2000/svg\" fill=\"none\" viewBox=\"0 1 20 16\"><path fill=\"#fff\" d=\"M.6 2A1.1 1.1 0 0 1 1.7.9h16.6a1.1 1.1 0 1 1 0 2.2H1.6A1.1 1.1 0 0 1 .8 2Zm1.1 7.1h6a1.1 1.1 0 0 0 0-2.2h-6a1.1 1.1 0 0 0 0 2.2ZM9.3 13H1.8a1.1 1.1 0 1 0 0 2.2h7.5a1.1 1.1 0 1 0 0-2.2Zm11.3 1.9a1.1 1.1 0 0 1-1.5 0l-1.7-1.7a4.1 4.1 0 1 1 1.6-1.6l1.6 1.7a1.1 1.1 0 0 1 0 1.6Zm-5.3-3.4a1.9 1.9 0 1 0 0-3.8 1.9 1.9 0 0 0 0 3.8Z\"/></svg>";
-    init(canvas: ShadowRoot, eventTarget: EventTarget): Promise<void>;
+    init(canvas: ShadowRoot, eventTarget: import("../../helpers.js").ToolbarAppEventTarget): Promise<void>;
 };
 export default _default;

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

@@ -2,6 +2,6 @@ declare const _default: {
     id: string;
     name: string;
     icon: "gear";
-    init(canvas: ShadowRoot, eventTarget: EventTarget): void;
+    init(canvas: ShadowRoot, eventTarget: import("../helpers.js").ToolbarAppEventTarget): void;
 };
 export default _default;

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

@@ -2,6 +2,6 @@ declare const _default: {
     id: string;
     name: string;
     icon: "<svg xmlns=\"http://www.w3.org/2000/svg\" fill=\"none\" viewBox=\"0 0 24 24\"><path fill=\"#fff\" d=\"M7.9 1.5v-.4a1.1 1.1 0 0 1 2.2 0v.4a1.1 1.1 0 1 1-2.2 0Zm-6.4 8.6a1.1 1.1 0 1 0 0-2.2h-.4a1.1 1.1 0 0 0 0 2.2h.4ZM12 3.7a1.1 1.1 0 0 0 1.4-.7l.4-1.1a1.1 1.1 0 0 0-2.1-.8l-.4 1.2a1.1 1.1 0 0 0 .7 1.4Zm-9.7 7.6-1.2.4a1.1 1.1 0 1 0 .8 2.1l1-.4a1.1 1.1 0 1 0-.6-2ZM20.8 17a1.9 1.9 0 0 1 0 2.6l-1.2 1.2a1.9 1.9 0 0 1-2.6 0l-4.3-4.2-1.6 3.6a1.9 1.9 0 0 1-1.7 1.2A1.9 1.9 0 0 1 7.5 20L2.7 5a1.9 1.9 0 0 1 2.4-2.4l15 5a1.9 1.9 0 0 1 .2 3.4l-3.7 1.6 4.2 4.3ZM19 18.3 14.6 14a1.9 1.9 0 0 1 .6-3l3.2-1.5L5.1 5.1l4.3 13.3 1.5-3.2a1.9 1.9 0 0 1 3-.6l4.4 4.4.7-.7Z\"/></svg>";
-    init(canvas: ShadowRoot, eventTarget: EventTarget): void;
+    init(canvas: ShadowRoot, eventTarget: import("../helpers.js").ToolbarAppEventTarget): void;
 };
 export default _default;

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

@@ -1,4 +1,5 @@
-import { loadDevToolbarApps } from "astro:dev-toolbar";
+import { loadDevToolbarApps } from "astro:toolbar:internal";
+import { ToolbarAppEventTarget } from "./helpers.js";
 import { settings } from "./settings.js";
 let overlay;
 document.addEventListener("DOMContentLoaded", async () => {
@@ -60,7 +61,7 @@ document.addEventListener("DOMContentLoaded", async () => {
     info: '<svg viewBox="0 0 10 10" style="--fill:var(--fill-default);--fill-default:#3645D9;--fill-hover:#BDC3FF;"><rect width="9" height="9" x=".5" y=".5" fill="var(--fill)" stroke="#13151A" stroke-width="2" rx="1.5"/></svg>'
   };
   const prepareApp = (appDefinition, builtIn) => {
-    const eventTarget = new EventTarget();
+    const eventTarget = new ToolbarAppEventTarget();
     const app = {
       ...appDefinition,
       builtIn,

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

@@ -0,0 +1,61 @@
+type NotificationPayload = {
+    state: true;
+    level?: 'error' | 'warning' | 'info';
+} | {
+    state: false;
+};
+type AppStatePayload = {
+    state: boolean;
+};
+type AppToggledEvent = (opts: {
+    state: boolean;
+}) => void;
+type ToolbarPlacementUpdatedEvent = (opts: {
+    placement: 'bottom-left' | 'bottom-center' | 'bottom-right';
+}) => void;
+export declare class ToolbarAppEventTarget extends EventTarget {
+    constructor();
+    /**
+     * Toggle the notification state of the toolbar
+     * @param options - The notification options
+     * @param options.state - The state of the notification
+     * @param options.level - The level of the notification, optional when state is false
+     */
+    toggleNotification(options: NotificationPayload): void;
+    /**
+     * Toggle the app state on or off
+     * @param options - The app state options
+     * @param options.state - The new state of the app
+     */
+    toggleState(options: AppStatePayload): void;
+    /**
+     * Fired when the app is toggled on or off
+     * @param callback - The callback to run when the event is fired, takes an object with the new state
+     */
+    onToggled(callback: AppToggledEvent): void;
+    /**
+     * Fired when the toolbar placement is updated by the user
+     * @param callback - The callback to run when the event is fired, takes an object with the new placement
+     */
+    onToolbarPlacementUpdated(callback: ToolbarPlacementUpdatedEvent): void;
+}
+export declare const serverHelpers: {
+    /**
+     * Send a message to the server, the payload can be any serializable data.
+     *
+     * The server can listen for this message in the `astro:server:config` hook of an Astro integration, using the `toolbar.on` method.
+     *
+     * @param event - The event name
+     * @param payload - The payload to send
+     */
+    send: <T>(event: string, payload: T) => void;
+    /**
+     * Receive a message from the server.
+     * @param event - The event name
+     * @param callback - The callback to run when the event is received.
+     * The payload's content will be passed to the callback as an argument
+     */
+    on: <T_1>(event: string, callback: (data: T_1) => void) => void;
+};
+export type ToolbarServerHelpers = typeof serverHelpers;
+export {};

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

@@ -0,0 +1,87 @@
+class ToolbarAppEventTarget extends EventTarget {
+  constructor() {
+    super();
+  }
+  /**
+   * Toggle the notification state of the toolbar
+   * @param options - The notification options
+   * @param options.state - The state of the notification
+   * @param options.level - The level of the notification, optional when state is false
+   */
+  toggleNotification(options) {
+    this.dispatchEvent(
+      new CustomEvent("toggle-notification", {
+        detail: {
+          state: options.state,
+          level: options.state === true ? options.level : void 0
+        }
+      })
+    );
+  }
+  /**
+   * Toggle the app state on or off
+   * @param options - The app state options
+   * @param options.state - The new state of the app
+   */
+  toggleState(options) {
+    this.dispatchEvent(
+      new CustomEvent("toggle-app", {
+        detail: {
+          state: options.state
+        }
+      })
+    );
+  }
+  /**
+   * Fired when the app is toggled on or off
+   * @param callback - The callback to run when the event is fired, takes an object with the new state
+   */
+  onToggled(callback) {
+    this.addEventListener("app-toggled", (evt) => {
+      if (!(evt instanceof CustomEvent))
+        return;
+      callback(evt.detail);
+    });
+  }
+  /**
+   * Fired when the toolbar placement is updated by the user
+   * @param callback - The callback to run when the event is fired, takes an object with the new placement
+   */
+  onToolbarPlacementUpdated(callback) {
+    this.addEventListener("placement-updated", (evt) => {
+      if (!(evt instanceof CustomEvent))
+        return;
+      callback(evt.detail);
+    });
+  }
+}
+const serverHelpers = {
+  /**
+   * Send a message to the server, the payload can be any serializable data.
+   *
+   * The server can listen for this message in the `astro:server:config` hook of an Astro integration, using the `toolbar.on` method.
+   *
+   * @param event - The event name
+   * @param payload - The payload to send
+   */
+  send: (event, payload) => {
+    if (import.meta.hot) {
+      import.meta.hot.send(event, payload);
+    }
+  },
+  /**
+   * Receive a message from the server.
+   * @param event - The event name
+   * @param callback - The callback to run when the event is received.
+   * The payload's content will be passed to the callback as an argument
+   */
+  on: (event, callback) => {
+    if (import.meta.hot) {
+      import.meta.hot.on(event, callback);
+    }
+  }
+};
+export {
+  ToolbarAppEventTarget,
+  serverHelpers
+};

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-global.js

@@ -21,7 +21,7 @@ function createAstroGlobFn() {
 }
 function createAstro(site) {
   return {
-    // TODO: this is no longer neccessary for `Astro.site`
+    // TODO: this is no longer necessary for `Astro.site`
     // but it somehow allows working around caching issues in content collections for some tests
     site: site ? new URL(site) : void 0,
     generator: `Astro v${ASTRO_VERSION}`,

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

@@ -31,20 +31,20 @@ class AstroComponentInstance {
     if (this.returnValue !== void 0)
       return this.returnValue;
     this.returnValue = this.factory(result, this.props, this.slotValues);
+    if (isPromise(this.returnValue)) {
+      this.returnValue.then((resolved) => {
+        this.returnValue = resolved;
+      }).catch(() => {
+      });
+    }
     return this.returnValue;
   }
   async render(destination) {
-    if (this.returnValue === void 0) {
-      await this.init(this.result);
-    }
-    let value = this.returnValue;
-    if (isPromise(value)) {
-      value = await value;
-    }
-    if (isHeadAndContent(value)) {
-      await value.content.render(destination);
+    const returnValue = await this.init(this.result);
+    if (isHeadAndContent(returnValue)) {
+      await returnValue.content.render(destination);
     } else {
-      await renderChild(destination, value);
+      await renderChild(destination, returnValue);
     }
   }
 }

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

@@ -4,13 +4,15 @@ const voidElementNames = /^(area|base|br|col|command|embed|hr|img|input|keygen|l
 const htmlBooleanAttributes = /^(?:allowfullscreen|async|autofocus|autoplay|controls|default|defer|disabled|disablepictureinpicture|disableremoteplayback|formnovalidate|hidden|loop|nomodule|novalidate|open|playsinline|readonly|required|reversed|scoped|seamless|itemscope)$/i;
 const htmlEnumAttributes = /^(?:contenteditable|draggable|spellcheck|value)$/i;
 const svgEnumAttributes = /^(?:autoReverse|externalResourcesRequired|focusable|preserveAlpha)$/i;
+const AMPERSAND_REGEX = /&/g;
+const DOUBLE_QUOTE_REGEX = /"/g;
 const STATIC_DIRECTIVES = /* @__PURE__ */ new Set(["set:html", "set:text"]);
 const toIdent = (k) => k.trim().replace(/(?!^)\b\w|\s+|\W+/g, (match, index) => {
   if (/\W/.test(match))
     return "";
   return index === 0 ? match : match.toUpperCase();
 });
-const toAttributeString = (value, shouldEscape = true) => shouldEscape ? String(value).replace(/&/g, "&").replace(/"/g, """) : value;
+const toAttributeString = (value, shouldEscape = true) => shouldEscape ? String(value).replace(AMPERSAND_REGEX, "&").replace(DOUBLE_QUOTE_REGEX, """) : value;
 const kebab = (k) => k.toLowerCase() === k ? k : k.replace(/[A-Z]/g, (match) => `-${match.toLowerCase()}`);
 const toStyleString = (obj) => Object.entries(obj).filter(([_, v]) => typeof v === "string" && v.trim() || typeof v === "number").map(([k, v]) => {
   if (k[0] !== "-" && k[1] !== "-")

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
+};