astro 4.1.1 → 4.1.3

package/dist/core/errors/errors-data.js

@@ -125,7 +125,7 @@ const NoMatchingImport = {
 const InvalidPrerenderExport = {
   name: "InvalidPrerenderExport",
   title: "Invalid prerender export.",
-  message: (prefix, suffix, isHydridOuput) => {
+  message(prefix, suffix, isHydridOuput) {
     const defaultExpectedValue = isHydridOuput ? "false" : "true";
     let msg = `A \`prerender\` export has been detected, but its value cannot be statically analyzed.`;
     if (prefix !== "const")
@@ -308,6 +308,30 @@ const FailedToFindPageMapSSR = {
   title: "Astro couldn't find the correct page to render",
   message: "Astro couldn't find the correct page to render, probably because it wasn't correctly mapped for SSR usage. This is an internal error. Please file an issue."
 };
+const MissingLocale = {
+  name: "MissingLocaleError",
+  title: "The provided locale does not exist.",
+  message: (locale) => `The locale/path \`${locale}\` does not exist in the configured \`i18n.locales\`.`
+};
+const MissingIndexForInternationalization = {
+  name: "MissingIndexForInternationalizationError",
+  title: "Index page not found.",
+  message: (src) => `Astro couldn't find the index URL. This index page is required to create a redirect from the index URL to the index URL of the default locale. 
+Create an index page in \`${src}\``
+};
+const CantRenderPage = {
+  name: "CantRenderPage",
+  title: "Astro can't render the route.",
+  message: "Astro cannot find any content to render for this route. There is no file or redirect associated with this route.",
+  hint: "If you expect to find a route here, this may be an Astro bug. Please file an issue/restart the dev server"
+};
+const UnhandledRejection = {
+  name: "UnhandledRejection",
+  title: "Unhandled rejection",
+  message: (stack) => `Astro detected an unhandled rejection. Here's the stack trace:
+${stack}`,
+  hint: "Make sure your promises all have an `await` or a `.catch()` handler."
+};
 const UnknownCSSError = {
   name: "UnknownCSSError",
   title: "Unknown CSS Error."
@@ -368,7 +392,7 @@ const UnknownContentCollectionError = {
 const InvalidContentEntryFrontmatterError = {
   name: "InvalidContentEntryFrontmatterError",
   title: "Content entry frontmatter does not match schema.",
-  message: (collection, entryId, error) => {
+  message(collection, entryId, error) {
     return [
       `**${String(collection)} \u2192 ${String(
         entryId
@@ -381,7 +405,7 @@ const InvalidContentEntryFrontmatterError = {
 const InvalidContentEntrySlugError = {
   name: "InvalidContentEntrySlugError",
   title: "Invalid content entry slug.",
-  message: (collection, entryId) => {
+  message(collection, entryId) {
     return `${String(collection)} \u2192 ${String(
       entryId
     )} has an invalid slug. \`slug\` must be a string.`;
@@ -403,22 +427,18 @@ const CollectionDoesNotExistError = {
 const MixedContentDataCollectionError = {
   name: "MixedContentDataCollectionError",
   title: "Content and data cannot be in same collection.",
-  message: (collection) => {
-    return `**${collection}** contains a mix of content and data entries. All entries must be of the same type.`;
-  },
+  message: (collectionName) => `**${collectionName}** contains a mix of content and data entries. All entries must be of the same type.`,
   hint: "Store data entries in a new collection separate from your content collection."
 };
 const ContentCollectionTypeMismatchError = {
   name: "ContentCollectionTypeMismatchError",
   title: "Collection contains entries of a different type.",
-  message: (collection, expectedType, actualType) => {
-    return `${collection} contains ${expectedType} entries, but is configured as a ${actualType} collection.`;
-  }
+  message: (collection, expectedType, actualType) => `${collection} contains ${expectedType} entries, but is configured as a ${actualType} collection.`
 };
 const DataCollectionEntryParseError = {
   name: "DataCollectionEntryParseError",
   title: "Data collection entry failed to parse.",
-  message: (entryId, errorMessage) => {
+  message(entryId, errorMessage) {
     return `**${entryId}** failed to parse: ${errorMessage}`;
   },
   hint: "Ensure your data entry is an object with valid JSON (for `.json` entries) or YAML (for `.yaml` entries)."
@@ -426,7 +446,7 @@ const DataCollectionEntryParseError = {
 const DuplicateContentEntrySlugError = {
   name: "DuplicateContentEntrySlugError",
   title: "Duplicate content entry slug.",
-  message: (collection, slug, preExisting, alsoFound) => {
+  message(collection, slug, preExisting, alsoFound) {
     return `**${collection}** contains multiple entries with the same slug: \`${slug}\`. Slugs must be unique.
 
 Entries: 
@@ -441,29 +461,7 @@ const UnsupportedConfigTransformError = {
 Full error: ${parseError}`,
   hint: "See the devalue library for all supported types: https://github.com/rich-harris/devalue"
 };
-const MissingLocale = {
-  name: "MissingLocaleError",
-  title: "The provided locale does not exist.",
-  message: (locale) => {
-    return `The locale/path \`${locale}\` does not exist in the configured \`i18n.locales\`.`;
-  }
-};
-const CantRenderPage = {
-  name: "CantRenderPage",
-  title: "Astro can't render the route.",
-  message: "Astro cannot find any content to render for this route. There is no file or redirect associated with this route.",
-  hint: "If you expect to find a route here, this may be an Astro bug. Please file an issue/restart the dev server"
-};
 const UnknownError = { name: "UnknownError", title: "Unknown Error." };
-const UnhandledRejection = {
-  name: "UnhandledRejection",
-  title: "Unhandled rejection",
-  message: (stack) => {
-    return `Astro detected an unhandled rejection. Here's the stack trace:
-${stack}`;
-  },
-  hint: "Make sure your promises all have an `await` or a `.catch()` handler."
-};
 export {
   AstroGlobNoMatch,
   AstroGlobUsedOutside,
@@ -510,6 +508,7 @@ export {
   MiddlewareNoDataOrNextCalled,
   MiddlewareNotAResponse,
   MissingImageDimension,
+  MissingIndexForInternationalization,
   MissingLocale,
   MissingMediaQueryDirective,
   MissingSharp,

package/dist/core/messages.js

@@ -36,7 +36,7 @@ function serverStart({
   host,
   base
 }) {
-  const version = "4.1.1";
+  const version = "4.1.3";
   const localPrefix = `${dim("\u2503")} Local    `;
   const networkPrefix = `${dim("\u2503")} Network  `;
   const emptyPrefix = " ".repeat(11);
@@ -258,7 +258,7 @@ function printHelp({
     message.push(
       linebreak(),
       `  ${bgGreen(black(` ${commandName} `))} ${green(
-        `v${"4.1.1"}`
+        `v${"4.1.3"}`
       )} ${headline}`
     );
   }

package/dist/core/redirects/helpers.js

@@ -24,8 +24,8 @@ function redirectRouteGenerate(redirectRoute, data) {
 }
 function redirectRouteStatus(redirectRoute, method = "GET") {
   const routeData = redirectRoute.redirectRoute;
-  if (typeof routeData?.redirect === "object") {
-    return routeData.redirect.status;
+  if (routeData && typeof redirectRoute.redirect === "object") {
+    return redirectRoute.redirect.status;
   } else if (method !== "GET") {
     return 308;
   }

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

@@ -8,6 +8,8 @@ import { SUPPORTED_MARKDOWN_FILE_EXTENSIONS } from "../../constants.js";
 import { removeLeadingForwardSlash, slash } from "../../path.js";
 import { resolvePages } from "../../util.js";
 import { getRouteGenerator } from "./generator.js";
+import { AstroError } from "../../errors/index.js";
+import { MissingIndexForInternationalization } from "../../errors/errors-data.js";
 const require2 = createRequire(import.meta.url);
 function countOccurrences(needle, haystack) {
   let count = 0;
@@ -333,7 +335,13 @@ This route collides with: "${collision.component}".`
       pathname: pathname || void 0,
       prerender: false,
       redirect: to,
-      redirectRoute: routes.find((r) => r.route === to),
+      redirectRoute: routes.find((r) => {
+        if (typeof to === "object") {
+          return r.route === to.destination;
+        } else {
+          return r.route === to;
+        }
+      }),
       fallbackRoutes: []
     };
     const lastSegmentIsDynamic = (r) => !!r.segments.at(-1)?.at(-1)?.dynamic;
@@ -356,6 +364,19 @@ This route collides with: "${collision.component}".`
   });
   const i18n = settings.config.i18n;
   if (i18n) {
+    if (i18n.routing === "prefix-always") {
+      let index = routes.find((route) => route.route === "/");
+      if (!index) {
+        let relativePath = path.relative(
+          fileURLToPath(settings.config.root),
+          fileURLToPath(new URL("pages", settings.config.srcDir))
+        );
+        throw new AstroError({
+          ...MissingIndexForInternationalization,
+          message: MissingIndexForInternationalization.message(relativePath)
+        });
+      }
+    }
     const routesByLocale = /* @__PURE__ */ new Map();
     const setRoutes = new Set(routes.filter((route) => route.type === "page"));
     const filteredLocales = i18n.locales.filter((loc) => {

package/dist/core/sync/index.js

@@ -34,7 +34,7 @@ async function syncInternal(settings, { logger, fs }) {
   const tempViteServer = await createServer(
     await createVite(
       {
-        server: { middlewareMode: true, hmr: false, watch: { ignored: ["**"] } },
+        server: { middlewareMode: true, hmr: false, watch: null },
         optimizeDeps: { disabled: true },
         ssr: { external: [] },
         logLevel: "silent"

package/dist/runtime/client/{dev-overlay/plugins → dev-toolbar/apps}/astro.js

@@ -10,7 +10,7 @@ var astro_default = {
   async init(canvas, eventTarget) {
     createCanvas();
     document.addEventListener("astro:after-swap", createCanvas);
-    eventTarget.addEventListener("plugin-toggled", async (event) => {
+    eventTarget.addEventListener("app-toggled", async (event) => {
       resetDebugButton();
       if (!(event instanceof CustomEvent))
         return;
@@ -291,7 +291,7 @@ var astro_default = {
 			<header>
 				<section>
 				${astroLogo}
-				<astro-dev-toolbar-badge badge-style="gray" size="large">${window.__astro_dev_overlay__.version}</astro-dev-toolbar-badge>
+				<astro-dev-toolbar-badge badge-style="gray" size="large">${window.__astro_dev_toolbar__.version}</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>
@@ -321,7 +321,7 @@ var astro_default = {
       const copyDebugButton = windowComponent.querySelector("#copy-debug-button");
       copyDebugButton?.addEventListener("click", () => {
         navigator.clipboard.writeText(
-          "```\n" + window.__astro_dev_overlay__.debugInfo + "\n```"
+          "```\n" + window.__astro_dev_toolbar__.debugInfo + "\n```"
         );
         copyDebugButton.textContent = "Copied to clipboard!";
         setTimeout(() => {

package/dist/runtime/client/{dev-overlay/plugins → dev-toolbar/apps}/audit/index.js

@@ -37,14 +37,14 @@ var audit_default = {
       if (target.closest("astro-dev-toolbar"))
         return;
       eventTarget.dispatchEvent(
-        new CustomEvent("toggle-plugin", {
+        new CustomEvent("toggle-app", {
           detail: {
             state: false
           }
         })
       );
     }
-    eventTarget.addEventListener("plugin-toggled", (event) => {
+    eventTarget.addEventListener("app-toggled", (event) => {
       if (event.detail.state === true) {
         document.addEventListener("click", onPageClick, true);
       } else {
@@ -132,7 +132,7 @@ var audit_default = {
     function refreshLintPositions() {
       const noAuditBlock = canvas.getElementById("no-audit");
       if (noAuditBlock) {
-        const devOverlayRect = document.querySelector("astro-dev-toolbar")?.shadowRoot.querySelector("#dev-overlay")?.getBoundingClientRect();
+        const devOverlayRect = document.querySelector("astro-dev-toolbar")?.shadowRoot.querySelector("#dev-toolbar-root")?.getBoundingClientRect();
         noAuditBlock.style.top = `${(devOverlayRect?.top ?? 0) - (devOverlayRect?.height ?? 0) - 16}px`;
       }
       audits.forEach(({ highlightElement, auditedElement }) => {
@@ -178,7 +178,7 @@ var audit_default = {
         const elementFileWithPosition = elementFile + (elementPosition ? ":" + elementPosition : "");
         tooltip.sections.push({
           content: elementFileWithPosition.slice(
-            window.__astro_dev_overlay__.root.length - 1
+            window.__astro_dev_toolbar__.root.length - 1
             // We want to keep the final slash, so minus one.
           ),
           clickDescription: "Click to go to file",

package/dist/runtime/client/{dev-overlay/plugins → dev-toolbar/apps}/settings.js

@@ -5,22 +5,22 @@ const settingsRows = [
     name: "Disable notifications",
     description: "Hide notification badges in the toolbar.",
     input: "checkbox",
-    settingKey: "disablePluginNotification",
+    settingKey: "disableAppNotification",
     changeEvent: (evt) => {
       if (evt.currentTarget instanceof HTMLInputElement) {
-        const devOverlay = document.querySelector("astro-dev-toolbar");
-        if (devOverlay) {
-          devOverlay.setNotificationVisible(!evt.currentTarget.checked);
+        const devToolbar = document.querySelector("astro-dev-toolbar");
+        if (devToolbar) {
+          devToolbar.setNotificationVisible(!evt.currentTarget.checked);
         }
-        settings.updateSetting("disablePluginNotification", evt.currentTarget.checked);
+        settings.updateSetting("disableAppNotification", evt.currentTarget.checked);
         const action = evt.currentTarget.checked ? "disabled" : "enabled";
-        settings.log(`Plugin notification badges ${action}`);
+        settings.log(`App notification badges ${action}`);
       }
     }
   },
   {
     name: "Verbose logging",
-    description: "Logs dev overlay events in the browser console.",
+    description: "Logs dev toolbar events in the browser console.",
     input: "checkbox",
     settingKey: "verbose",
     changeEvent: (evt) => {

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

@@ -0,0 +1,8 @@
+import type { DevToolbarHighlight } from '../../ui-library/highlight.js';
+import type { Icon } from '../../ui-library/icons.js';
+export declare function createHighlight(rect: DOMRect, icon?: Icon): DevToolbarHighlight;
+export declare function getElementsPositionInDocument(el: Element): {
+    isFixed: boolean;
+};
+export declare function positionHighlight(highlight: DevToolbarHighlight, rect: DOMRect): void;
+export declare function attachTooltipToHighlight(highlight: DevToolbarHighlight, tooltip: HTMLElement, originalElement: Element): void;

package/dist/runtime/client/{dev-overlay/plugins → dev-toolbar/apps}/utils/window.d.ts

@@ -1 +1 @@
-export declare function createWindowElement(content: string): import("../../ui-library/window.js").DevOverlayWindow;
+export declare function createWindowElement(content: string): import("../../ui-library/window.js").DevToolbarWindow;

package/dist/runtime/client/{dev-overlay/plugins → dev-toolbar/apps}/xray.js

@@ -26,14 +26,14 @@ var xray_default = {
       event.preventDefault();
       event.stopPropagation();
       eventTarget.dispatchEvent(
-        new CustomEvent("toggle-plugin", {
+        new CustomEvent("toggle-app", {
           detail: {
             state: false
           }
         })
       );
     }
-    eventTarget.addEventListener("plugin-toggled", (event) => {
+    eventTarget.addEventListener("app-toggled", (event) => {
       if (event.detail.state === true) {
         document.addEventListener("click", onPageClick, true);
       } else {
@@ -52,7 +52,7 @@ var xray_default = {
 						header {
 							display: flex;
 						}
-	
+
 						h1 {
 							display: flex;
 							align-items: center;
@@ -62,7 +62,7 @@ var xray_default = {
 							margin: 0;
 							font-size: 22px;
 						}
-	
+
 						astro-dev-toolbar-icon {
 							width: 1em;
 						   height: 1em;
@@ -142,7 +142,7 @@ var xray_default = {
           async clickAction() {
             await fetch(
               "/__open-in-editor?file=" + encodeURIComponent(
-                window.__astro_dev_overlay__.root + islandComponentPath.slice(1)
+                window.__astro_dev_toolbar__.root + islandComponentPath.slice(1)
               )
             );
           }

package/dist/runtime/client/{dev-overlay → dev-toolbar}/entrypoint.js

@@ -1,60 +1,60 @@
 import { settings } from "./settings.js";
-import { loadDevOverlayPlugins } from "astro:dev-overlay";
+import { loadDevToolbarApps } from "astro:dev-toolbar";
 let overlay;
 document.addEventListener("DOMContentLoaded", async () => {
   const [
-    customPluginsDefinitions,
-    { default: astroDevToolPlugin },
-    { default: astroAuditPlugin },
-    { default: astroXrayPlugin },
-    { default: astroSettingsPlugin },
-    { AstroDevOverlay, DevOverlayCanvas, getPluginIcon },
+    customAppsDefinitions,
+    { default: astroDevToolApp },
+    { default: astroAuditApp },
+    { default: astroXrayApp },
+    { default: astroSettingsApp },
+    { AstroDevToolbar, DevToolbarCanvas, getAppIcon },
     {
-      DevOverlayCard,
-      DevOverlayHighlight,
-      DevOverlayTooltip,
-      DevOverlayWindow,
-      DevOverlayToggle,
-      DevOverlayButton,
-      DevOverlayBadge,
-      DevOverlayIcon
+      DevToolbarCard,
+      DevToolbarHighlight,
+      DevToolbarTooltip,
+      DevToolbarWindow,
+      DevToolbarToggle,
+      DevToolbarButton,
+      DevToolbarBadge,
+      DevToolbarIcon
     }
   ] = await Promise.all([
-    loadDevOverlayPlugins(),
-    import("./plugins/astro.js"),
-    import("./plugins/audit/index.js"),
-    import("./plugins/xray.js"),
-    import("./plugins/settings.js"),
-    import("./overlay.js"),
+    loadDevToolbarApps(),
+    import("./apps/astro.js"),
+    import("./apps/audit/index.js"),
+    import("./apps/xray.js"),
+    import("./apps/settings.js"),
+    import("./toolbar.js"),
     import("./ui-library/index.js")
   ]);
-  customElements.define("astro-dev-toolbar", AstroDevOverlay);
-  customElements.define("astro-dev-toolbar-window", DevOverlayWindow);
-  customElements.define("astro-dev-toolbar-plugin-canvas", DevOverlayCanvas);
-  customElements.define("astro-dev-toolbar-tooltip", DevOverlayTooltip);
-  customElements.define("astro-dev-toolbar-highlight", DevOverlayHighlight);
-  customElements.define("astro-dev-toolbar-card", DevOverlayCard);
-  customElements.define("astro-dev-toolbar-toggle", DevOverlayToggle);
-  customElements.define("astro-dev-toolbar-button", DevOverlayButton);
-  customElements.define("astro-dev-toolbar-badge", DevOverlayBadge);
-  customElements.define("astro-dev-toolbar-icon", DevOverlayIcon);
+  customElements.define("astro-dev-toolbar", AstroDevToolbar);
+  customElements.define("astro-dev-toolbar-window", DevToolbarWindow);
+  customElements.define("astro-dev-toolbar-app-canvas", DevToolbarCanvas);
+  customElements.define("astro-dev-toolbar-tooltip", DevToolbarTooltip);
+  customElements.define("astro-dev-toolbar-highlight", DevToolbarHighlight);
+  customElements.define("astro-dev-toolbar-card", DevToolbarCard);
+  customElements.define("astro-dev-toolbar-toggle", DevToolbarToggle);
+  customElements.define("astro-dev-toolbar-button", DevToolbarButton);
+  customElements.define("astro-dev-toolbar-badge", DevToolbarBadge);
+  customElements.define("astro-dev-toolbar-icon", DevToolbarIcon);
   const deprecated = (Parent) => class extends Parent {
   };
-  customElements.define("astro-dev-overlay", deprecated(AstroDevOverlay));
-  customElements.define("astro-dev-overlay-window", deprecated(DevOverlayWindow));
-  customElements.define("astro-dev-overlay-plugin-canvas", deprecated(DevOverlayCanvas));
-  customElements.define("astro-dev-overlay-tooltip", deprecated(DevOverlayTooltip));
-  customElements.define("astro-dev-overlay-highlight", deprecated(DevOverlayHighlight));
-  customElements.define("astro-dev-overlay-card", deprecated(DevOverlayCard));
-  customElements.define("astro-dev-overlay-toggle", deprecated(DevOverlayToggle));
-  customElements.define("astro-dev-overlay-button", deprecated(DevOverlayButton));
-  customElements.define("astro-dev-overlay-badge", deprecated(DevOverlayBadge));
-  customElements.define("astro-dev-overlay-icon", deprecated(DevOverlayIcon));
+  customElements.define("astro-dev-overlay", deprecated(AstroDevToolbar));
+  customElements.define("astro-dev-overlay-window", deprecated(DevToolbarWindow));
+  customElements.define("astro-dev-overlay-plugin-canvas", deprecated(DevToolbarCanvas));
+  customElements.define("astro-dev-overlay-tooltip", deprecated(DevToolbarTooltip));
+  customElements.define("astro-dev-overlay-highlight", deprecated(DevToolbarHighlight));
+  customElements.define("astro-dev-overlay-card", deprecated(DevToolbarCard));
+  customElements.define("astro-dev-overlay-toggle", deprecated(DevToolbarToggle));
+  customElements.define("astro-dev-overlay-button", deprecated(DevToolbarButton));
+  customElements.define("astro-dev-overlay-badge", deprecated(DevToolbarBadge));
+  customElements.define("astro-dev-overlay-icon", deprecated(DevToolbarIcon));
   overlay = document.createElement("astro-dev-toolbar");
-  const preparePlugin = (pluginDefinition, builtIn) => {
+  const prepareApp = (appDefinition, builtIn) => {
     const eventTarget = new EventTarget();
-    const plugin = {
-      ...pluginDefinition,
+    const app = {
+      ...appDefinition,
       builtIn,
       active: false,
       status: "loading",
@@ -62,14 +62,14 @@ document.addEventListener("DOMContentLoaded", async () => {
       eventTarget
     };
     eventTarget.addEventListener("toggle-notification", (evt) => {
-      const target = overlay.shadowRoot?.querySelector(`[data-plugin-id="${plugin.id}"]`);
+      const target = overlay.shadowRoot?.querySelector(`[data-app-id="${app.id}"]`);
       if (!target)
         return;
       let newState = true;
       if (evt instanceof CustomEvent) {
         newState = evt.detail.state ?? true;
       }
-      plugin.notification.state = newState;
+      app.notification.state = newState;
       target.querySelector(".notification")?.toggleAttribute("data-active", newState);
     });
     const onToggleApp = async (evt) => {
@@ -77,18 +77,18 @@ document.addEventListener("DOMContentLoaded", async () => {
       if (evt instanceof CustomEvent) {
         newState = evt.detail.state ?? true;
       }
-      await overlay.setPluginStatus(plugin, newState);
+      await overlay.setAppStatus(app, newState);
     };
     eventTarget.addEventListener("toggle-app", onToggleApp);
     eventTarget.addEventListener("toggle-plugin", onToggleApp);
-    return plugin;
+    return app;
   };
-  const astromorePlugin = {
+  const astroMoreApp = {
     id: "astro:more",
     name: "More",
     icon: "dots-three",
     init(canvas, eventTarget) {
-      const hiddenPlugins = plugins.filter((p) => !p.builtIn).slice(overlay.customPluginsToShow);
+      const hiddenApps = apps.filter((p) => !p.builtIn).slice(overlay.customAppsToShow);
       createDropdown();
       document.addEventListener("astro:after-swap", createDropdown);
       function createDropdown() {
@@ -165,35 +165,35 @@ document.addEventListener("DOMContentLoaded", async () => {
         canvas.append(style);
         const dropdown = document.createElement("div");
         dropdown.id = "dropdown";
-        dropdown.toggleAttribute("data-no-notification", settings.config.disablePluginNotification);
-        for (const plugin of hiddenPlugins) {
+        dropdown.toggleAttribute("data-no-notification", settings.config.disableAppNotification);
+        for (const app of hiddenApps) {
           const buttonContainer = document.createElement("div");
           buttonContainer.classList.add("item");
           const button = document.createElement("button");
-          button.setAttribute("data-plugin-id", plugin.id);
+          button.setAttribute("data-app-id", app.id);
           const iconContainer = document.createElement("div");
           const iconElement = document.createElement("template");
-          iconElement.innerHTML = getPluginIcon(plugin.icon);
+          iconElement.innerHTML = getAppIcon(app.icon);
           iconContainer.append(iconElement.content.cloneNode(true));
           const notification = document.createElement("div");
           notification.classList.add("notification");
           iconContainer.append(notification);
           iconContainer.classList.add("icon");
           button.append(iconContainer);
-          button.append(document.createTextNode(plugin.name));
+          button.append(document.createTextNode(app.name));
           button.addEventListener("click", () => {
-            overlay.togglePluginStatus(plugin);
+            overlay.toggleAppStatus(app);
           });
           buttonContainer.append(button);
           dropdown.append(buttonContainer);
-          plugin.eventTarget.addEventListener("toggle-notification", (evt) => {
+          app.eventTarget.addEventListener("toggle-notification", (evt) => {
             if (!(evt instanceof CustomEvent))
               return;
             notification.toggleAttribute("data-active", evt.detail.state ?? true);
             eventTarget.dispatchEvent(
               new CustomEvent("toggle-notification", {
                 detail: {
-                  state: hiddenPlugins.some((p) => p.notification.state === true)
+                  state: hiddenApps.some((p) => p.notification.state === true)
                 }
               })
             );
@@ -203,17 +203,13 @@ document.addEventListener("DOMContentLoaded", async () => {
       }
     }
   };
-  const plugins = [
-    ...[
-      astroDevToolPlugin,
-      astroXrayPlugin,
-      astroAuditPlugin,
-      astroSettingsPlugin,
-      astromorePlugin
-    ].map((pluginDef) => preparePlugin(pluginDef, true)),
-    ...customPluginsDefinitions.map((pluginDef) => preparePlugin(pluginDef, false))
+  const apps = [
+    ...[astroDevToolApp, astroXrayApp, astroAuditApp, astroSettingsApp, astroMoreApp].map(
+      (appDef) => prepareApp(appDef, true)
+    ),
+    ...customAppsDefinitions.map((appDef) => prepareApp(appDef, false))
   ];
-  overlay.plugins = plugins;
+  overlay.apps = apps;
   document.body.append(overlay);
   document.addEventListener("astro:after-swap", () => {
     document.body.append(overlay);

package/dist/runtime/client/{dev-overlay → dev-toolbar}/settings.d.ts

@@ -1,9 +1,9 @@
 export interface Settings {
-    disablePluginNotification: boolean;
+    disableAppNotification: boolean;
     verbose: boolean;
 }
 export declare const defaultSettings: {
-    disablePluginNotification: false;
+    disableAppNotification: false;
     verbose: false;
 };
 export declare const settings: {

package/dist/runtime/client/{dev-overlay → dev-toolbar}/settings.js

@@ -1,17 +1,22 @@
 const defaultSettings = {
-  disablePluginNotification: false,
+  disableAppNotification: false,
   verbose: false
 };
 const settings = getSettings();
 function getSettings() {
   let _settings = { ...defaultSettings };
-  const overlaySettings = localStorage.getItem("astro:dev-overlay:settings");
-  if (overlaySettings) {
-    _settings = { ..._settings, ...JSON.parse(overlaySettings) };
+  const toolbarSettings = localStorage.getItem("astro:dev-toolbar:settings");
+  const oldSettings = localStorage.getItem("astro:dev-overlay:settings");
+  if (oldSettings && !toolbarSettings) {
+    localStorage.setItem("astro:dev-toolbar:settings", oldSettings);
+    localStorage.removeItem("astro:dev-overlay:settings");
+  }
+  if (toolbarSettings) {
+    _settings = { ..._settings, ...JSON.parse(toolbarSettings) };
   }
   function updateSetting(key, value) {
     _settings[key] = value;
-    localStorage.setItem("astro:dev-overlay:settings", JSON.stringify(_settings));
+    localStorage.setItem("astro:dev-toolbar:settings", JSON.stringify(_settings));
   }
   function log(message) {
     console.log(