astro 5.0.0-alpha.7 → 5.0.0-beta.1

package/client.d.ts

@@ -116,8 +116,12 @@ declare module 'astro:transitions' {
 	export const fade: TransitionModule['fade'];
 	export const createAnimationScope: TransitionModule['createAnimationScope'];
 
-	type ViewTransitionsModule = typeof import('./components/ViewTransitions.astro');
-	export const ViewTransitions: ViewTransitionsModule['default'];
+	type ClientRouterModule = typeof import('./components/ClientRouter.astro');
+	/**
+	 * @deprecated The ViewTransitions component has been renamed to ClientRouter
+	 */
+	export const ViewTransitions: ClientRouterModule['default'];
+	export const ClientRouter: ClientRouterModule['default'];
 }
 
 declare module 'astro:transitions/client' {

package/dist/cli/info/index.js

@@ -36,6 +36,7 @@ async function printInfo({ flags }) {
   await copyToClipboard(output);
 }
 async function copyToClipboard(text) {
+  text = text.trim();
   const system = platform();
   let command = "";
   if (system === "darwin") {
@@ -43,15 +44,22 @@ async function copyToClipboard(text) {
   } else if (system === "win32") {
     command = "clip";
   } else {
-    try {
-      const output = execSync("which xclip", { encoding: "utf8" });
-      if (output[0] !== "/") {
-        return;
+    const unixCommands = [
+      ["xclip", "-sel clipboard -l 1"],
+      ["wl-copy", '"$0"']
+    ];
+    for (const [unixCommand, args] of unixCommands) {
+      try {
+        const output = execSync(`which ${unixCommand}`, { encoding: "utf8", stdio: "pipe" });
+        if (output[0] !== "/") {
+          continue;
+        }
+        command = `${unixCommand} ${args}`;
+      } catch {
+        continue;
       }
-      command = "xclip -sel clipboard -l 1";
-    } catch {
-      return;
     }
+    if (!command) return;
   }
   console.log();
   const { shouldCopy } = await prompts({
@@ -62,8 +70,9 @@ async function copyToClipboard(text) {
   });
   if (!shouldCopy) return;
   try {
-    execSync(command, {
-      input: text.trim(),
+    execSync(command.replaceAll("$0", text), {
+      stdio: "ignore",
+      input: text,
       encoding: "utf8"
     });
   } catch {

package/dist/config/index.d.ts

@@ -2,6 +2,6 @@ import type { UserConfig as ViteUserConfig } from 'vite';
 import type { AstroInlineConfig, AstroUserConfig } from '../types/public/config.js';
 export declare function defineConfig(config: AstroUserConfig): AstroUserConfig;
 export declare function getViteConfig(userViteConfig: ViteUserConfig, inlineAstroConfig?: AstroInlineConfig): ({ mode, command }: {
-    mode: string;
+    mode: "dev";
     command: "serve" | "build";
 }) => Promise<Record<string, any>>;

package/dist/config/index.js

@@ -1,5 +1,6 @@
 import { Logger } from "../core/logger/core.js";
 import { createRouteManifest } from "../core/routing/index.js";
+import { createDevelopmentManifest } from "../vite-plugin-astro-server/plugin.js";
 function defineConfig(config) {
   return config;
 }
@@ -31,6 +32,7 @@ function getViteConfig(userViteConfig, inlineAstroConfig = {}) {
     let settings = await createSettings(config, userViteConfig.root);
     settings = await runHookConfigSetup({ settings, command: cmd, logger });
     const manifest = await createRouteManifest({ settings }, logger);
+    const devSSRManifest = createDevelopmentManifest(settings);
     const viteConfig = await createVite(
       {
         mode,
@@ -39,7 +41,7 @@ function getViteConfig(userViteConfig, inlineAstroConfig = {}) {
           astroContentListenPlugin({ settings, logger, fs })
         ]
       },
-      { settings, logger, mode, sync: false, manifest }
+      { settings, logger, mode, sync: false, manifest, ssrManifest: devSSRManifest }
     );
     await runHookConfigDone({ settings, logger });
     return mergeConfig(viteConfig, userViteConfig);

package/dist/core/app/index.d.ts

@@ -52,12 +52,7 @@ export declare class App {
     set setManifestData(newManifestData: ManifestData);
     removeBase(pathname: string): string;
     match(request: Request): RouteData | undefined;
-    render(request: Request, options?: RenderOptions): Promise<Response>;
-    /**
-     * @deprecated Instead of passing `RouteData` and locals individually, pass an object with `routeData` and `locals` properties.
-     * See https://github.com/withastro/astro/pull/9199 for more information.
-     */
-    render(request: Request, routeData?: RouteData, locals?: object): Promise<Response>;
+    render(request: Request, renderOptions?: RenderOptions): Promise<Response>;
     setCookieHeaders(response: Response): Generator<string, string[], unknown>;
     /**
      * Reads all the cookies written by `Astro.cookie.set()` onto the passed response.

package/dist/core/app/index.js

@@ -161,31 +161,15 @@ class App {
     }
     return pathname;
   }
-  async render(request, routeDataOrOptions, maybeLocals) {
+  async render(request, renderOptions) {
     let routeData;
     let locals;
     let clientAddress;
     let addCookieHeader;
-    if (routeDataOrOptions && ("addCookieHeader" in routeDataOrOptions || "clientAddress" in routeDataOrOptions || "locals" in routeDataOrOptions || "routeData" in routeDataOrOptions)) {
-      if ("addCookieHeader" in routeDataOrOptions) {
-        addCookieHeader = routeDataOrOptions.addCookieHeader;
-      }
-      if ("clientAddress" in routeDataOrOptions) {
-        clientAddress = routeDataOrOptions.clientAddress;
-      }
-      if ("routeData" in routeDataOrOptions) {
-        routeData = routeDataOrOptions.routeData;
-      }
-      if ("locals" in routeDataOrOptions) {
-        locals = routeDataOrOptions.locals;
-      }
-    } else {
-      routeData = routeDataOrOptions;
-      locals = maybeLocals;
-      if (routeDataOrOptions || locals) {
-        this.#logRenderOptionsDeprecationWarning();
-      }
-    }
+    addCookieHeader = renderOptions?.addCookieHeader;
+    clientAddress = renderOptions?.clientAddress;
+    routeData = renderOptions?.routeData;
+    locals = renderOptions?.locals;
     if (routeData) {
       this.#logger.debug(
         "router",
@@ -254,14 +238,6 @@ class App {
     Reflect.set(response, responseSentSymbol, true);
     return response;
   }
-  #logRenderOptionsDeprecationWarning() {
-    if (this.#renderOptionsDeprecationWarningShown) return;
-    this.#logger.warn(
-      "deprecated",
-      `The adapter ${this.#manifest.adapterName} is using a deprecated signature of the 'app.render()' method. From Astro 4.0, locals and routeData are provided as properties on an optional object to this method. Using the old signature will cause an error in Astro 5.0. See https://github.com/withastro/astro/pull/9199 for more information.`
-    );
-    this.#renderOptionsDeprecationWarningShown = true;
-  }
   setCookieHeaders(response) {
     return getSetCookiesFromResponse(response);
   }

package/dist/core/build/internal.d.ts

@@ -99,16 +99,6 @@ export declare function getPageDatasByClientOnlyID(internals: BuildInternals, vi
  * @param component The component of the page, used to identify the page
  */
 export declare function getPageData(internals: BuildInternals, route: string, component: string): PageBuildData | undefined;
-/**
- * Map internals.pagesByKeys to a new map with the public key instead of the internal key.
- * This function is only used to avoid breaking changes in the Integrations API, after we changed the way
- * we identify pages, from the entrypoint component to an internal key.
- * If the page component is unique -> the public key is the component path. (old behavior)
- * If the page component is shared -> the public key is the internal key. (new behavior)
- * The new behavior on shared entrypoint it's not a breaking change, because it was not supported before.
- * @param pagesByKeys A map of all page data by their internal key
- */
-export declare function getPageDatasWithPublicKey(pagesByKeys: Map<string, PageBuildData>): Map<string, PageBuildData>;
 export declare function getPageDataByViteID(internals: BuildInternals, viteid: ViteID): PageBuildData | undefined;
 export declare function hasPrerenderedPages(internals: BuildInternals): boolean;
 interface OrderInfo {

package/dist/core/build/internal.js

@@ -77,25 +77,6 @@ function getPageData(internals, route, component) {
   }
   return void 0;
 }
-function getPageDatasWithPublicKey(pagesByKeys) {
-  const pagesWithPublicKey = /* @__PURE__ */ new Map();
-  const pagesByComponentsArray = Array.from(pagesByKeys.values()).map((pageData) => {
-    return { component: pageData.component, pageData };
-  });
-  const pagesWithUniqueComponent = pagesByComponentsArray.filter((page) => {
-    return pagesByComponentsArray.filter((p) => p.component === page.component).length === 1;
-  });
-  pagesWithUniqueComponent.forEach((page) => {
-    pagesWithPublicKey.set(page.component, page.pageData);
-  });
-  const pagesWithSharedComponent = pagesByComponentsArray.filter((page) => {
-    return pagesByComponentsArray.filter((p) => p.component === page.component).length > 1;
-  });
-  pagesWithSharedComponent.forEach((page) => {
-    pagesWithPublicKey.set(page.pageData.key, page.pageData);
-  });
-  return pagesWithPublicKey;
-}
 function getPageDataByViteID(internals, viteid) {
   if (internals.pagesByViteID.has(viteid)) {
     return internals.pagesByViteID.get(viteid);
@@ -148,7 +129,6 @@ export {
   getPageData,
   getPageDataByViteID,
   getPageDatasByClientOnlyID,
-  getPageDatasWithPublicKey,
   hasPrerenderedPages,
   mergeInlineCss,
   trackClientOnlyPageDatas,

package/dist/core/build/static-build.js

@@ -11,10 +11,7 @@ import {
   hasAnyContentFlag,
   reverseSymlink
 } from "../../content/utils.js";
-import {
-  createBuildInternals,
-  getPageDatasWithPublicKey
-} from "../../core/build/internal.js";
+import { createBuildInternals } from "../../core/build/internal.js";
 import { emptyDir, removeEmptyDirs } from "../../core/fs/index.js";
 import { appendForwardSlash, prependForwardSlash, removeFileExtension } from "../../core/path.js";
 import { runHookBuildSetup } from "../../integrations/hooks.js";
@@ -221,7 +218,7 @@ async function ssrBuild(opts, internals, input, container, logger) {
   };
   const updatedViteBuildConfig = await runHookBuildSetup({
     config: settings.config,
-    pages: getPageDatasWithPublicKey(internals.pagesByKeys),
+    pages: internals.pagesByKeys,
     vite: viteBuildConfig,
     target: "server",
     logger: opts.logger
@@ -269,7 +266,7 @@ ${bgGreen(black(" building client (vite) "))}`);
   };
   await runHookBuildSetup({
     config: settings.config,
-    pages: getPageDatasWithPublicKey(internals.pagesByKeys),
+    pages: internals.pagesByKeys,
     vite: viteBuildConfig,
     target: "client",
     logger: opts.logger

package/dist/core/config/schema.d.ts

@@ -276,7 +276,7 @@ export declare const AstroConfigSchema: z.ZodObject<{
             themes: z.ZodDefault<z.ZodRecord<z.ZodString, z.ZodUnion<[z.ZodEnum<[import("shiki").BundledTheme, ...import("shiki").BundledTheme[]]>, z.ZodType<ShikiTheme, z.ZodTypeDef, ShikiTheme>]>>>;
             defaultColor: z.ZodOptional<z.ZodUnion<[z.ZodLiteral<"light">, z.ZodLiteral<"dark">, z.ZodString, z.ZodLiteral<false>]>>;
             wrap: z.ZodDefault<z.ZodUnion<[z.ZodBoolean, z.ZodNull]>>;
-            transformers: z.ZodDefault<z.ZodEffects<z.ZodArray<z.ZodType<ShikiTransformer, z.ZodTypeDef, ShikiTransformer>, "many">, ShikiTransformer[], ShikiTransformer[]>>;
+            transformers: z.ZodDefault<z.ZodArray<z.ZodType<ShikiTransformer, z.ZodTypeDef, ShikiTransformer>, "many">>;
         }, "strip", z.ZodTypeAny, {
             langs: ShikiLang[];
             theme: import("shiki").BundledTheme | ShikiTheme;
@@ -1152,7 +1152,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
             themes: z.ZodDefault<z.ZodRecord<z.ZodString, z.ZodUnion<[z.ZodEnum<[import("shiki").BundledTheme, ...import("shiki").BundledTheme[]]>, z.ZodType<ShikiTheme, z.ZodTypeDef, ShikiTheme>]>>>;
             defaultColor: z.ZodOptional<z.ZodUnion<[z.ZodLiteral<"light">, z.ZodLiteral<"dark">, z.ZodString, z.ZodLiteral<false>]>>;
             wrap: z.ZodDefault<z.ZodUnion<[z.ZodBoolean, z.ZodNull]>>;
-            transformers: z.ZodDefault<z.ZodEffects<z.ZodArray<z.ZodType<ShikiTransformer, z.ZodTypeDef, ShikiTransformer>, "many">, ShikiTransformer[], ShikiTransformer[]>>;
+            transformers: z.ZodDefault<z.ZodArray<z.ZodType<ShikiTransformer, z.ZodTypeDef, ShikiTransformer>, "many">>;
         }, "strip", z.ZodTypeAny, {
             langs: ShikiLang[];
             theme: import("shiki").BundledTheme | ShikiTheme;

package/dist/core/config/schema.js

@@ -183,14 +183,7 @@ const AstroConfigSchema = z.object({
       ).default(ASTRO_CONFIG_DEFAULTS.markdown.shikiConfig.themes),
       defaultColor: z.union([z.literal("light"), z.literal("dark"), z.string(), z.literal(false)]).optional(),
       wrap: z.boolean().or(z.null()).default(ASTRO_CONFIG_DEFAULTS.markdown.shikiConfig.wrap),
-      transformers: z.custom().array().transform((transformers) => {
-        for (const transformer of transformers) {
-          if (transformer.token && !("span" in transformer)) {
-            transformer.span = transformer.token;
-          }
-        }
-        return transformers;
-      }).default(ASTRO_CONFIG_DEFAULTS.markdown.shikiConfig.transformers)
+      transformers: z.custom().array().default(ASTRO_CONFIG_DEFAULTS.markdown.shikiConfig.transformers)
     }).default({}),
     remarkPlugins: z.union([
       z.string(),

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "5.0.0-alpha.7";
+const ASTRO_VERSION = "5.0.0-beta.1";
 const REROUTE_DIRECTIVE_HEADER = "X-Astro-Reroute";
 const REWRITE_DIRECTIVE_HEADER_KEY = "X-Astro-Rewrite";
 const REWRITE_DIRECTIVE_HEADER_VALUE = "yes";

package/dist/core/create-vite.d.ts

@@ -3,16 +3,20 @@ import * as vite from 'vite';
 import type { AstroSettings, ManifestData } from '../types/astro.js';
 import type { SSRManifest } from './app/types.js';
 import type { Logger } from './logger/core.js';
-interface CreateViteOptions {
+type CreateViteOptions = {
     settings: AstroSettings;
     logger: Logger;
-    mode: 'dev' | 'build' | string;
     command?: 'dev' | 'build';
     fs?: typeof nodeFs;
     sync: boolean;
     manifest: ManifestData;
+} & ({
+    mode: 'dev';
+    ssrManifest: SSRManifest;
+} | {
+    mode: 'build';
     ssrManifest?: SSRManifest;
-}
+});
 /** Return a base vite config as a common starting point for all Vite commands. */
 export declare function createVite(commandConfig: vite.InlineConfig, { settings, logger, mode, command, fs, sync, manifest, ssrManifest }: CreateViteOptions): Promise<vite.InlineConfig>;
 export {};

package/dist/core/create-vite.js

@@ -101,7 +101,7 @@ async function createVite(commandConfig, { settings, logger, mode, command, fs =
       astroScriptsPlugin({ settings }),
       // The server plugin is for dev only and having it run during the build causes
       // the build to run very slow as the filewatcher is triggered often.
-      mode !== "build" && vitePluginAstroServer({ settings, logger, fs, manifest, ssrManifest }),
+      mode === "dev" && vitePluginAstroServer({ settings, logger, fs, manifest, ssrManifest }),
       // ssrManifest is only required in dev mode, where it gets created before a Vite instance is created, and get passed to this function
       envVitePlugin({ settings }),
       astroEnv({ settings, mode, sync }),

package/dist/core/dev/dev.js

@@ -22,7 +22,7 @@ async function dev(inlineConfig) {
   await telemetry.record([]);
   const restart = await createContainerWithAutomaticRestart({ inlineConfig, fs });
   const logger = restart.container.logger;
-  const currentVersion = "5.0.0-alpha.7";
+  const currentVersion = "5.0.0-beta.1";
   const isPrerelease = currentVersion.includes("-");
   if (!isPrerelease) {
     try {

package/dist/core/errors/errors-data.d.ts

@@ -367,7 +367,7 @@ export declare const AdapterSupportOutputMismatch: {
 /**
  * @docs
  * @see
- * - [Server-side Rendering](https://docs.astro.build/en/guides/server-side-rendering/)
+ * - [On-demand Rendering](https://5-0-0-beta.docs.astro.build/en/guides/on-demand-rendering/)
  * @description
  * To use server islands, the same constraints exist as for sever-side rendering, so an adapter is needed.
  */
@@ -752,6 +752,17 @@ export declare const LocalsNotAnObject: {
     message: string;
     hint: string;
 };
+/**
+ * @docs
+ * @description
+ * Thrown when a value is being set as the `locals` field on the Astro global or context.
+ */
+export declare const LocalsReassigned: {
+    name: string;
+    title: string;
+    message: string;
+    hint: string;
+};
 /**
  * @docs
  * @description
@@ -1424,7 +1435,7 @@ export declare const UnsupportedConfigTransformError: {
 /**
  * @docs
  * @see
- * - [On-demand rendering](https://docs.astro.build/en/basics/rendering-modes/#on-demand-rendered)
+ * - [On-demand rendering](https://5-0-0-beta.docs.astro.build/en/guides/on-demand-rendering/)
  * @description
  * Your project must have a server output to create backend functions with Actions.
  */

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

@@ -117,7 +117,7 @@ const NoAdapterInstalledServerIslands = {
   name: "NoAdapterInstalledServerIslands",
   title: "Cannot use Server Islands without an adapter.",
   message: `Cannot use server islands without an adapter. Please install and configure the appropriate server adapter for your final deployment.`,
-  hint: "See https://docs.astro.build/en/guides/server-side-rendering/ for more information."
+  hint: "See https://5-0-0-beta.docs.astro.build/en/guides/on-demand-rendering/ for more information."
 };
 const NoMatchingImport = {
   name: "NoMatchingImport",
@@ -263,6 +263,12 @@ const LocalsNotAnObject = {
   message: "`locals` can only be assigned to an object. Other values like numbers, strings, etc. are not accepted.",
   hint: "If you tried to remove some information from the `locals` object, try to use `delete` or set the property to `undefined`."
 };
+const LocalsReassigned = {
+  name: "LocalsReassigned",
+  title: "`locals` must not be reassigned.",
+  message: "`locals` can not be assigned directly.",
+  hint: "Set a `locals` property instead."
+};
 const AstroResponseHeadersReassigned = {
   name: "AstroResponseHeadersReassigned",
   title: "`Astro.response.headers` must not be reassigned.",
@@ -543,8 +549,8 @@ Full error: ${parseError}`,
 const ActionsWithoutServerOutputError = {
   name: "ActionsWithoutServerOutputError",
   title: "Actions must be used with server output.",
-  message: "Actions enabled without setting a server build output. A server is required to create callable backend functions. To deploy routes to a server, add a server adapter to your astro config.",
-  hint: "Learn about on-demand rendering: https://docs.astro.build/en/basics/rendering-modes/#on-demand-rendered"
+  message: "A server is required to create callable backend functions. To deploy routes to a server, add an adapter to your Astro config and configure your route for on-demand rendering",
+  hint: "Add an adapter and enable on-demand rendering: https://5-0-0-beta.docs.astro.build/en/guides/on-demand-rendering/"
 };
 const ActionsReturnedInvalidDataError = {
   name: "ActionsReturnedInvalidDataError",
@@ -615,6 +621,7 @@ export {
   InvalidPrerenderExport,
   LocalImageUsedWrongly,
   LocalsNotAnObject,
+  LocalsReassigned,
   MarkdownFrontmatterParseError,
   MdxIntegrationMissingError,
   MiddlewareCantBeLoaded,

package/dist/core/messages.js

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

package/dist/core/middleware/index.js

@@ -69,13 +69,8 @@ function createContext({
       }
       return locals;
     },
-    // We define a custom property, so we can check the value passed to locals
-    set locals(val) {
-      if (typeof val !== "object") {
-        throw new AstroError(AstroErrorData.LocalsNotAnObject);
-      } else {
-        Reflect.set(request, clientLocalsSymbol, val);
-      }
+    set locals(_) {
+      throw new AstroError(AstroErrorData.LocalsReassigned);
     }
   };
   return Object.assign(context, {

package/dist/core/render-context.js

@@ -14,7 +14,6 @@ import {
   REWRITE_DIRECTIVE_HEADER_VALUE,
   ROUTE_TYPE_HEADER,
   clientAddressSymbol,
-  clientLocalsSymbol,
   responseSentSymbol
 } from "./constants.js";
 import { AstroCookies, attachCookiesToResponse } from "./cookies/index.js";
@@ -224,14 +223,8 @@ class RenderContext {
       get locals() {
         return renderContext.locals;
       },
-      // TODO(breaking): disallow replacing the locals object
-      set locals(val) {
-        if (typeof val !== "object") {
-          throw new AstroError(AstroErrorData.LocalsNotAnObject);
-        } else {
-          renderContext.locals = val;
-          Reflect.set(this.request, clientLocalsSymbol, val);
-        }
+      set locals(_) {
+        throw new AstroError(AstroErrorData.LocalsReassigned);
       },
       params,
       get preferredLocale() {

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

@@ -43,18 +43,6 @@ document.addEventListener("DOMContentLoaded", async () => {
   customElements.define("astro-dev-toolbar-icon", DevToolbarIcon);
   customElements.define("astro-dev-toolbar-select", DevToolbarSelect);
   customElements.define("astro-dev-toolbar-radio-checkbox", DevToolbarRadioCheckbox);
-  const deprecated = (Parent) => class extends Parent {
-  };
-  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 notificationLevels = ["error", "warning", "info"];
   const notificationSVGs = {
@@ -96,7 +84,6 @@ document.addEventListener("DOMContentLoaded", async () => {
       await overlay.setAppStatus(app, newState);
     };
     eventTarget.addEventListener("toggle-app", onToggleApp);
-    eventTarget.addEventListener("toggle-plugin", onToggleApp);
     return app;
   };
   const astroMoreApp = {

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

@@ -7,11 +7,6 @@ const settings = getSettings();
 function getSettings() {
   let _settings = { ...defaultSettings };
   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) };
   }

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

@@ -2,7 +2,6 @@ import { serverHelpers } from "./helpers.js";
 import { settings } from "./settings.js";
 import { getIconElement, isDefinedIcon } from "./ui-library/icons.js";
 const WS_EVENT_NAME = "astro-dev-toolbar";
-const WS_EVENT_NAME_DEPRECATED = "astro-dev-overlay";
 const HOVER_DELAY = 2 * 1e3;
 const DEVBAR_HITBOX_ABOVE = 42;
 class AstroDevToolbar extends HTMLElement {
@@ -344,7 +343,6 @@ class AstroDevToolbar extends HTMLElement {
       app.status = "ready";
       if (import.meta.hot) {
         import.meta.hot.send(`${WS_EVENT_NAME}:${app.id}:initialized`);
-        import.meta.hot.send(`${WS_EVENT_NAME_DEPRECATED}:${app.id}:initialized`);
       }
     } catch (e) {
       console.error(`Failed to init app ${app.id}, error: ${e}`);
@@ -421,27 +419,15 @@ class AstroDevToolbar extends HTMLElement {
       appCanvas.style.display = "none";
       appCanvas.removeAttribute("data-active");
     }
-    [
-      "app-toggled",
-      // Deprecated
-      // TODO: Remove in Astro 5.0
-      "plugin-toggled"
-    ].forEach((eventName) => {
-      app.eventTarget.dispatchEvent(
-        new CustomEvent(eventName, {
-          detail: {
-            state: app.active,
-            app
-          }
-        })
-      );
-    });
-    if (import.meta.hot) {
-      import.meta.hot.send(`${WS_EVENT_NAME}:${app.id}:toggled`, { state: app.active });
-      import.meta.hot.send(`${WS_EVENT_NAME_DEPRECATED}:${app.id}:toggled`, {
-        state: app.active
-      });
-    }
+    app.eventTarget.dispatchEvent(
+      new CustomEvent("app-toggled", {
+        detail: {
+          state: app.active,
+          app
+        }
+      })
+    );
+    import.meta.hot?.send(`${WS_EVENT_NAME}:${app.id}:toggled`, { state: app.active });
     return true;
   }
   isHidden() {

package/dist/runtime/client/dev-toolbar/ui-library/button.js

@@ -115,8 +115,6 @@ class DevToolbarButton extends HTMLElement {
 					cursor: pointer;
 				}
 
-				/* TODO: Remove "astro-dev-overlay-icon" in Astro 5.0 */
-				::slotted(astro-dev-overlay-icon),
 				::slotted(astro-dev-toolbar-icon) {
 					display: inline-block;
 					height: 1em;

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

@@ -24,7 +24,10 @@ function astroTransitions({ settings }) {
       if (id === resolvedVirtualModuleId) {
         return `
 				export * from "astro/virtual-modules/transitions.js";
-				export { default as ViewTransitions } from "astro/components/ViewTransitions.astro";
+				export {
+					default as ViewTransitions,
+					default as ClientRouter
+				} from "astro/components/ClientRouter.astro";
 			`;
       }
       if (id === resolvedVirtualClientModuleId) {
@@ -42,7 +45,7 @@ function astroTransitions({ settings }) {
       }
     },
     transform(code, id) {
-      if (id.includes("ViewTransitions.astro") && id.endsWith(".ts")) {
+      if (id.includes("ClientRouter.astro") && id.endsWith(".ts")) {
         const prefetchDisabled = settings.config.prefetch === false;
         return code.replace("__PREFETCH_DISABLED__", JSON.stringify(prefetchDisabled));
       }

package/dist/types/public/config.d.ts

@@ -402,8 +402,8 @@ export interface AstroUserConfig {
     /**
      * @docs
      * @name security
-     * @type {boolean}
-     * @default `{}`
+     * @type {Record<"checkOrigin", boolean> | undefined}
+     * @default `{checkOrigin: true}`
      * @version 4.9.0
      * @description
      *
@@ -411,12 +411,16 @@ export interface AstroUserConfig {
      *
      * These features only exist for pages rendered on demand (SSR) using `server` mode or pages that opt out of prerendering in `static` mode.
      *
+     * By default, Astro will automatically check that the “origin” header
+     * matches the URL sent by each request in on-demand rendered pages. You can
+     * disable this behavior by setting `checkOrigin` to `false`:
+     *
      * ```js
      * // astro.config.mjs
      * export default defineConfig({
      *   output: "server",
      *   security: {
-     *     checkOrigin: true
+     *     checkOrigin: false
      *   }
      * })
      * ```
@@ -786,7 +790,7 @@ export interface AstroUserConfig {
      * @type {boolean | object}
      * @description
      * Enable prefetching for links on your site to provide faster page transitions.
-     * (Enabled by default on pages using the `<ViewTransitions />` router. Set `prefetch: false` to opt out of this behaviour.)
+     * (Enabled by default on pages using the `<ClientRouter />` router. Set `prefetch: false` to opt out of this behaviour.)
      *
      * This configuration automatically adds a prefetch script to every page in the project
      * giving you access to the `data-astro-prefetch` attribute.
@@ -806,7 +810,7 @@ export interface AstroUserConfig {
          * @type {boolean}
          * @description
          * Enable prefetching for all links, including those without the `data-astro-prefetch` attribute.
-         * This value defaults to `true` when using the `<ViewTransitions />` router. Otherwise, the default value is `false`.
+         * This value defaults to `true` when using the `<ClientRouter />` router. Otherwise, the default value is `false`.
          *
          * ```js
          * prefetch: {
@@ -1529,70 +1533,6 @@ export interface AstroUserConfig {
          * See the [Prefetch Guide](https://docs.astro.build/en/guides/prefetch/) for more `prefetch` options and usage.
          */
         clientPrerender?: boolean;
-        /**
-         * @docs
-         * @name experimental.serverIslands
-         * @type {boolean}
-         * @default `false`
-         * @version 4.12.0
-         * @description
-         *
-         * Enables experimental Server Island features.
-         * Server Islands offer the ability to defer a component to render asynchronously after the page has already rendered.
-         *
-         * To enable, configure an [on-demand server rendering `output` mode](https://docs.astro.build/en/basics/rendering-modes/#on-demand-rendered) with an adapter, and add the `serverIslands` flag to the `experimental` object:
-         *
-         * ```js
-         * {
-         *   output: 'hybrid', // or 'server'
-         *   adapter: nodejs({ mode: 'standalone' }),
-         *   experimental: {
-         *     serverIslands: true,
-         *   },
-         * }
-         * ```
-         *
-         * Use the `server:defer` directive on any Astro component to delay initial rendering:
-         *
-         * ```astro "server:defer"
-         * ---
-         * import Avatar from '~/components/Avatar.astro';
-         * ---
-         * <Avatar server:defer />
-         * ```
-         *
-         * The outer page will be rendered, either at build time (`hybrid`) or at runtime (`server`) with the island content omitted and a `<script>` tag included in its place.
-         *
-         * After the page loads in the browser, the script tag will replace itself with the the contents of the island by making a request.
-         *
-         * Any Astro component can be given the `server: defer` attribute to delay its rendering. There is no special API and you can write `.astro` code as normal:
-         *
-         * ```astro
-         * ---
-         * import { getUser } from '../api';
-         *
-         * const user = await getUser(Astro.locals.userId);
-         * ---
-         * <img class="avatar" src={user.imageUrl}>
-         * ```
-         *
-         * #### Server island fallback content
-         *
-         * Since your component will not render with the rest of the page, you may want to add generic content (e.g. a loading message) to temporarily show in its place. This content will be displayed when the page first renders but before the island has loaded.
-         *
-         * Add placeholder content as a child of your Astro component with the `slot="fallback"` attribute. When your island content is available, the fallback content will be replaced.
-         *
-         * The example below displays a generic avatar as fallback content, then animates into a personalized avatar using view transitions:
-         *
-         * ```astro
-         * <Avatar server:defer>
-         *   <svg slot="fallback" class="generic-avatar" transition:name="avatar">...</svg>
-         * </Avatar>
-         * ```
-         *
-         * For a complete overview, and to give feedback on this experimental API, see the [Server Islands RFC](https://github.com/withastro/roadmap/pull/963).
-         */
-        serverIslands?: boolean;
         /**
          * @docs
          * @name experimental.contentIntellisense

package/dist/types/public/integrations.d.ts

@@ -141,7 +141,7 @@ export interface BaseIntegrationHooks {
         injectScript: (stage: InjectedScriptStage, content: string) => void;
         injectRoute: (injectRoute: InjectedRoute) => void;
         addClientDirective: (directive: ClientDirectiveConfig) => void;
-        addDevToolbarApp: (entrypoint: DevToolbarAppEntry | string) => void;
+        addDevToolbarApp: (entrypoint: DevToolbarAppEntry) => void;
         addMiddleware: (mid: AstroIntegrationMiddleware) => void;
         logger: AstroIntegrationLogger;
     }) => void | Promise<void>;

package/dist/types/public/toolbar.d.ts

@@ -27,34 +27,10 @@ export type DevToolbarAppEntry = DevToolbarAppMeta & {
     entrypoint: string;
 };
 export type DevToolbarApp = {
-    /**
-     * @deprecated The `id`, `name`, and `icon` properties should now be defined when using `addDevToolbarApp`.
-     *
-     * Ex: `addDevToolbarApp({ id: 'my-app', name: 'My App', icon: '🚀', entrypoint: '/path/to/app' })`
-     *
-     * In the future, putting these properties directly on the app object will be removed.
-     */
-    id?: string;
-    /**
-     * @deprecated The `id`, `name`, and `icon` properties should now be defined when using `addDevToolbarApp`.
-     *
-     * Ex: `addDevToolbarApp({ id: 'my-app', name: 'My App', icon: '🚀', entrypoint: '/path/to/app' })`
-     *
-     * In the future, putting these properties directly on the app object will be removed.
-     */
-    name?: string;
-    /**
-     * @deprecated The `id`, `name`, and `icon` properties should now be defined when using `addDevToolbarApp`.
-     *
-     * Ex: `addDevToolbarApp({ id: 'my-app', name: 'My App', icon: '🚀', entrypoint: '/path/to/app' })`
-     *
-     * In the future, putting these properties directly on the app object will be removed.
-     */
-    icon?: Icon;
     init?(canvas: ShadowRoot, app: ToolbarAppEventTarget, server: ToolbarServerHelpers): void | Promise<void>;
     beforeTogglingOff?(canvas: ShadowRoot): boolean | Promise<boolean>;
 };
-export type ResolvedDevToolbarApp = DevToolbarAppMeta & Omit<DevToolbarApp, 'id' | 'name' | 'icon'>;
+export type ResolvedDevToolbarApp = DevToolbarAppMeta & DevToolbarApp;
 export type DevToolbarMetadata = Window & typeof globalThis & {
     __astro_dev_toolbar__: {
         root: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "5.0.0-alpha.7",
+  "version": "5.0.0-beta.1",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -147,7 +147,7 @@
     "ora": "^8.1.0",
     "p-limit": "^6.1.0",
     "p-queue": "^8.0.1",
-    "path-to-regexp": "^6.2.2",
+    "path-to-regexp": "6.2.2",
     "preferred-pm": "^4.0.0",
     "prompts": "^2.4.2",
     "rehype": "^13.0.1",
@@ -168,7 +168,7 @@
     "zod-to-json-schema": "^3.23.2",
     "zod-to-ts": "^1.2.0",
     "@astrojs/internal-helpers": "0.4.1",
-    "@astrojs/markdown-remark": "6.0.0-alpha.1",
+    "@astrojs/markdown-remark": "6.0.0-beta.1",
     "@astrojs/telemetry": "3.1.0"
   },
   "optionalDependencies": {
@@ -209,6 +209,7 @@
     "sass": "^1.78.0",
     "undici": "^6.19.8",
     "unified": "^11.0.5",
+    "vitest": "^2.1.1",
     "astro-scripts": "0.0.14"
   },
   "engines": {

package/tsconfigs/base.json

@@ -27,5 +27,7 @@
     "allowJs": true,
     // Allow JSX files (or files that are internally considered JSX, like Astro files) to be imported inside `.js` and `.ts` files.
     "jsx": "preserve"
-  }
+  },
+  "exclude": ["${configDir}/dist"],
+  "include": ["${configDir}/.astro/types.d.ts", "${configDir}/**/*"]
 }