astro 6.0.0-alpha.0 → 6.0.0-alpha.2

package/dist/prerender/routing.js

@@ -1,42 +1,31 @@
-import { RedirectComponentInstance, routeIsRedirect } from "../core/redirects/index.js";
+import { routeIsRedirect } from "../core/routing/index.js";
 import { routeComparator } from "../core/routing/priority.js";
-import { getPrerenderStatus } from "./metadata.js";
 async function getSortedPreloadedMatches({
   pipeline,
   matches,
-  settings
+  manifest
 }) {
   return (await preloadAndSetPrerenderStatus({
     pipeline,
     matches,
-    settings
+    manifest
   })).sort((a, b) => routeComparator(a.route, b.route)).sort((a, b) => prioritizePrerenderedMatchesComparator(a.route, b.route));
 }
 async function preloadAndSetPrerenderStatus({
-  pipeline,
   matches,
-  settings
+  manifest
 }) {
   const preloaded = new Array();
   for (const route of matches) {
-    const filePath = new URL(`./${route.component}`, settings.config.root);
+    const filePath = new URL(`./${route.component}`, manifest.rootDir);
     if (routeIsRedirect(route)) {
       preloaded.push({
-        preloadedComponent: RedirectComponentInstance,
         route,
         filePath
       });
       continue;
     }
-    const preloadedComponent = await pipeline.preload(route, filePath);
-    const prerenderStatus = getPrerenderStatus({
-      filePath,
-      loader: pipeline.loader
-    });
-    if (prerenderStatus !== void 0) {
-      route.prerender = prerenderStatus;
-    }
-    preloaded.push({ preloadedComponent, route, filePath });
+    preloaded.push({ route, filePath });
   }
   return preloaded;
 }

package/dist/runtime/client/dev-toolbar/ui-library/badge.d.ts

@@ -7,8 +7,8 @@ export declare class DevToolbarBadge extends HTMLElement {
     _badgeStyle: BadgeStyle;
     get size(): "small" | "large";
     set size(value: "small" | "large");
-    get badgeStyle(): "red" | "blue" | "green" | "yellow" | "purple" | "gray";
-    set badgeStyle(value: "red" | "blue" | "green" | "yellow" | "purple" | "gray");
+    get badgeStyle(): "red" | "green" | "yellow" | "blue" | "gray" | "purple";
+    set badgeStyle(value: "red" | "green" | "yellow" | "blue" | "gray" | "purple");
     shadowRoot: ShadowRoot;
     static observedAttributes: string[];
     constructor();

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

@@ -10,8 +10,8 @@ export declare class DevToolbarButton extends HTMLElement {
     _buttonBorderRadius: ButtonBorderRadius;
     get size(): "small" | "large" | "medium";
     set size(value: "small" | "large" | "medium");
-    get buttonStyle(): "red" | "blue" | "green" | "yellow" | "purple" | "gray" | "ghost" | "outline";
-    set buttonStyle(value: "red" | "blue" | "green" | "yellow" | "purple" | "gray" | "ghost" | "outline");
+    get buttonStyle(): "red" | "green" | "yellow" | "blue" | "gray" | "purple" | "ghost" | "outline";
+    set buttonStyle(value: "red" | "green" | "yellow" | "blue" | "gray" | "purple" | "ghost" | "outline");
     get buttonBorderRadius(): "normal" | "rounded";
     set buttonBorderRadius(value: "normal" | "rounded");
     static observedAttributes: string[];

package/dist/runtime/client/dev-toolbar/ui-library/card.d.ts

@@ -5,8 +5,8 @@ export declare class DevToolbarCard extends HTMLElement {
     clickAction?: () => void | (() => Promise<void>);
     shadowRoot: ShadowRoot;
     _cardStyle: CardStyle;
-    get cardStyle(): "red" | "blue" | "green" | "yellow" | "purple" | "gray";
-    set cardStyle(value: "red" | "blue" | "green" | "yellow" | "purple" | "gray");
+    get cardStyle(): "red" | "green" | "yellow" | "blue" | "gray" | "purple";
+    set cardStyle(value: "red" | "green" | "yellow" | "blue" | "gray" | "purple");
     static observedAttributes: string[];
     constructor();
     attributeChangedCallback(): void;

package/dist/runtime/client/dev-toolbar/ui-library/highlight.d.ts

@@ -4,8 +4,8 @@ type HighlightStyle = (typeof styles)[number];
 export declare class DevToolbarHighlight extends HTMLElement {
     icon?: Icon | undefined | null;
     _highlightStyle: HighlightStyle;
-    get highlightStyle(): "red" | "blue" | "green" | "yellow" | "purple" | "gray";
-    set highlightStyle(value: "red" | "blue" | "green" | "yellow" | "purple" | "gray");
+    get highlightStyle(): "red" | "green" | "yellow" | "blue" | "gray" | "purple";
+    set highlightStyle(value: "red" | "green" | "yellow" | "blue" | "gray" | "purple");
     static observedAttributes: string[];
     shadowRoot: ShadowRoot;
     constructor();

package/dist/runtime/client/dev-toolbar/ui-library/radio-checkbox.d.ts

@@ -2,8 +2,8 @@ export declare class DevToolbarRadioCheckbox extends HTMLElement {
     private _radioStyle;
     input: HTMLInputElement;
     shadowRoot: ShadowRoot;
-    get radioStyle(): "red" | "blue" | "green" | "yellow" | "purple" | "gray";
-    set radioStyle(value: "red" | "blue" | "green" | "yellow" | "purple" | "gray");
+    get radioStyle(): "red" | "green" | "yellow" | "blue" | "gray" | "purple";
+    set radioStyle(value: "red" | "green" | "yellow" | "blue" | "gray" | "purple");
     static observedAttributes: string[];
     constructor();
     connectedCallback(): void;

package/dist/runtime/client/dev-toolbar/ui-library/select.d.ts

@@ -4,8 +4,8 @@ export declare class DevToolbarSelect extends HTMLElement {
     shadowRoot: ShadowRoot;
     element: HTMLSelectElement;
     _selectStyle: SelectStyle;
-    get selectStyle(): "red" | "blue" | "green" | "yellow" | "purple" | "gray";
-    set selectStyle(value: "red" | "blue" | "green" | "yellow" | "purple" | "gray");
+    get selectStyle(): "red" | "green" | "yellow" | "blue" | "gray" | "purple";
+    set selectStyle(value: "red" | "green" | "yellow" | "blue" | "gray" | "purple");
     static observedAttributes: string[];
     constructor();
     connectedCallback(): void;

package/dist/runtime/client/dev-toolbar/ui-library/toggle.d.ts

@@ -4,8 +4,8 @@ export declare class DevToolbarToggle extends HTMLElement {
     shadowRoot: ShadowRoot;
     input: HTMLInputElement;
     _toggleStyle: ToggleStyle;
-    get toggleStyle(): "red" | "blue" | "green" | "yellow" | "purple" | "gray";
-    set toggleStyle(value: "red" | "blue" | "green" | "yellow" | "purple" | "gray");
+    get toggleStyle(): "red" | "green" | "yellow" | "blue" | "gray" | "purple";
+    set toggleStyle(value: "red" | "green" | "yellow" | "blue" | "gray" | "purple");
     static observedAttributes: string[];
     constructor();
     attributeChangedCallback(): void;

package/dist/runtime/server/endpoint.js

@@ -1,4 +1,4 @@
-import colors from "picocolors";
+import colors from "piccolore";
 import { REROUTABLE_STATUS_CODES, REROUTE_DIRECTIVE_HEADER } from "../../core/constants.js";
 import { AstroError } from "../../core/errors/errors.js";
 import { EndpointDidNotReturnAResponse } from "../../core/errors/errors-data.js";

package/dist/runtime/server/render/server-islands.js

@@ -107,9 +107,9 @@ class ServerIslandComponent {
     }
     const componentPath = this.getComponentPath();
     const componentExport = this.getComponentExport();
-    const componentId = this.result.serverIslandNameMap.get(componentPath);
+    let componentId = this.result.serverIslandNameMap.get(componentPath);
     if (!componentId) {
-      throw new Error(`Could not find server component name`);
+      throw new Error(`Could not find server component name ${componentPath}`);
     }
     for (const key2 of Object.keys(this.props)) {
       if (internalProps.has(key2)) {
@@ -125,13 +125,14 @@ class ServerIslandComponent {
     }
     const key = await this.result.key;
     const propsEncrypted = Object.keys(this.props).length === 0 ? "" : await encryptString(key, JSON.stringify(this.props));
+    const slotsEncrypted = Object.keys(renderedSlots).length === 0 ? "" : await encryptString(key, JSON.stringify(renderedSlots));
     const hostId = await this.getHostId();
     const slash = this.result.base.endsWith("/") ? "" : "/";
     let serverIslandUrl = `${this.result.base}${slash}_server-islands/${componentId}${this.result.trailingSlash === "always" ? "/" : ""}`;
     const potentialSearchParams = createSearchParams(
       componentExport,
       propsEncrypted,
-      safeJsonStringify(renderedSlots)
+      slotsEncrypted
     );
     const useGETRequest = isWithinURLLimit(serverIslandUrl, potentialSearchParams);
     if (useGETRequest) {
@@ -153,7 +154,7 @@ let response = await fetch('${serverIslandUrl}', { headers });`
       `let data = {
 	componentExport: ${safeJsonStringify(componentExport)},
 	encryptedProps: ${safeJsonStringify(propsEncrypted)},
-	slots: ${safeJsonStringify(renderedSlots)},
+	encryptedSlots: ${safeJsonStringify(slotsEncrypted)},
 };
 const headers = new Headers({ 'Content-Type': 'application/json', ...${headersJson} });
 let response = await fetch('${serverIslandUrl}', {

package/dist/runtime/server/transition.d.ts

@@ -2,6 +2,7 @@ import type { SSRResult } from '../../types/public/internal.js';
 import type { TransitionAnimationPair, TransitionAnimationValue } from '../../types/public/view-transitions.js';
 export declare function createTransitionScope(result: SSRResult, hash: string): string;
 export declare function renderTransition(result: SSRResult, hash: string, animationName: TransitionAnimationValue | undefined, transitionName: string): string;
+/** @deprecated This will be removed in Astro 7 */
 export declare function createAnimationScope(transitionName: string, animations: Record<string, TransitionAnimationPair>): {
     scope: string;
     styles: string;

package/dist/template/4xx.js

@@ -109,7 +109,9 @@ function subpathNotUsedTemplate(base, pathname) {
   });
 }
 function trailingSlashMismatchTemplate(pathname, trailingSlash) {
-  const corrected = trailingSlash === "always" ? appendForwardSlash(pathname) : removeTrailingForwardSlash(pathname);
+  const corrected = escape(
+    trailingSlash === "always" ? appendForwardSlash(pathname) : removeTrailingForwardSlash(pathname)
+  );
   return template({
     pathname,
     statusCode: 404,

package/dist/toolbar/vite-plugin-dev-toolbar.js

@@ -1,7 +1,7 @@
 import { telemetry } from "../events/index.js";
 import { eventAppToggled } from "../events/toolbar.js";
-const PRIVATE_VIRTUAL_MODULE_ID = "astro:toolbar:internal";
-const resolvedPrivateVirtualModuleId = "\0" + PRIVATE_VIRTUAL_MODULE_ID;
+const VIRTUAL_MODULE_ID = "astro:toolbar:internal";
+const RESOLVED_VIRTUAL_MODULE_ID = "\0" + VIRTUAL_MODULE_ID;
 function astroDevToolbar({ settings, logger }) {
   let telemetryTimeout;
   return {
@@ -14,9 +14,12 @@ function astroDevToolbar({ settings, logger }) {
         }
       };
     },
-    resolveId(id) {
-      if (id === PRIVATE_VIRTUAL_MODULE_ID) {
-        return resolvedPrivateVirtualModuleId;
+    resolveId: {
+      filter: {
+        id: new RegExp(`^${VIRTUAL_MODULE_ID}$`)
+      },
+      handler() {
+        return RESOLVED_VIRTUAL_MODULE_ID;
       }
     },
     configureServer(server) {
@@ -48,8 +51,11 @@ ${args.error}`
         }, 200);
       });
     },
-    async load(id) {
-      if (id === resolvedPrivateVirtualModuleId) {
+    load: {
+      filter: {
+        id: new RegExp(`^${RESOLVED_VIRTUAL_MODULE_ID}$`)
+      },
+      handler() {
         return {
           code: `
 						export const loadDevToolbarApps = async () => {

package/dist/transitions/events.d.ts

@@ -1,8 +1,13 @@
 import type { Direction, NavigationTypeString } from './types.js';
+/** @deprecated This will be removed in Astro 7 */
 export declare const TRANSITION_BEFORE_PREPARATION = "astro:before-preparation";
+/** @deprecated This will be removed in Astro 7 */
 export declare const TRANSITION_AFTER_PREPARATION = "astro:after-preparation";
+/** @deprecated This will be removed in Astro 7 */
 export declare const TRANSITION_BEFORE_SWAP = "astro:before-swap";
+/** @deprecated This will be removed in Astro 7 */
 export declare const TRANSITION_AFTER_SWAP = "astro:after-swap";
+/** @deprecated This will be removed in Astro 7 */
 export declare const TRANSITION_PAGE_LOAD = "astro:page-load";
 type Events = typeof TRANSITION_AFTER_PREPARATION | typeof TRANSITION_AFTER_SWAP | typeof TRANSITION_PAGE_LOAD;
 export declare const triggerEvent: (name: Events) => boolean;
@@ -18,12 +23,14 @@ declare class BeforeEvent extends Event {
     readonly signal: AbortSignal;
     constructor(type: string, eventInitDict: EventInit | undefined, from: URL, to: URL, direction: Direction | string, navigationType: NavigationTypeString, sourceElement: Element | undefined, info: any, newDocument: Document, signal: AbortSignal);
 }
+/** @deprecated This will be removed in Astro 7 */
 export declare const isTransitionBeforePreparationEvent: (value: any) => value is TransitionBeforePreparationEvent;
 export declare class TransitionBeforePreparationEvent extends BeforeEvent {
     formData: FormData | undefined;
     loader: () => Promise<void>;
     constructor(from: URL, to: URL, direction: Direction | string, navigationType: NavigationTypeString, sourceElement: Element | undefined, info: any, newDocument: Document, signal: AbortSignal, formData: FormData | undefined, loader: (event: TransitionBeforePreparationEvent) => Promise<void>);
 }
+/** @deprecated This will be removed in Astro 7 */
 export declare const isTransitionBeforeSwapEvent: (value: any) => value is TransitionBeforeSwapEvent;
 export declare class TransitionBeforeSwapEvent extends BeforeEvent {
     readonly direction: Direction | string;

package/dist/transitions/router.js

@@ -1,5 +1,11 @@
 import { internalFetchHeaders } from "virtual:astro:adapter-config/client";
-import { doPreparation, doSwap, TRANSITION_AFTER_SWAP } from "./events.js";
+import {
+  doPreparation,
+  doSwap,
+  TRANSITION_AFTER_SWAP,
+  onPageLoad,
+  triggerEvent
+} from "./events.js";
 import { detectScriptExecuted } from "./swap-functions.js";
 const inBrowser = import.meta.env.SSR === false;
 const updateScrollPosition = (positions) => {
@@ -14,8 +20,6 @@ const samePage = (thisLocation, otherLocation) => thisLocation.pathname === othe
 let mostRecentNavigation;
 let mostRecentTransition;
 let originalLocation;
-const triggerEvent = (name) => document.dispatchEvent(new Event(name));
-const onPageLoad = () => triggerEvent("astro:page-load");
 const announce = () => {
   let div = document.createElement("div");
   div.setAttribute("aria-live", "assertive");

package/dist/transitions/swap-functions.js

@@ -58,6 +58,10 @@ function attachShadowRoots(root) {
     const mode = template.getAttribute("shadowrootmode");
     const parent = template.parentNode;
     if ((mode === "closed" || mode === "open") && parent instanceof HTMLElement) {
+      if (parent.shadowRoot) {
+        template.remove();
+        return;
+      }
       const shadowRoot = parent.attachShadow({ mode });
       shadowRoot.appendChild(template.content);
       template.remove();

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

@@ -1,7 +1,7 @@
-const virtualModuleId = "astro:transitions";
-const resolvedVirtualModuleId = "\0" + virtualModuleId;
-const virtualClientModuleId = "astro:transitions/client";
-const resolvedVirtualClientModuleId = "\0" + virtualClientModuleId;
+const VIRTUAL_MODULE_ID = "astro:transitions";
+const RESOLVED_VIRTUAL_MODULE_ID = "\0" + VIRTUAL_MODULE_ID;
+const VIRTUAL_CLIENT_MODULE_ID = "astro:transitions/client";
+const RESOLVED_VIRTUAL_CLIENT_MODULE_ID = "\0" + VIRTUAL_CLIENT_MODULE_ID;
 function astroTransitions({ settings }) {
   return {
     name: "astro:transitions",
@@ -12,26 +12,35 @@ function astroTransitions({ settings }) {
         }
       };
     },
-    async resolveId(id) {
-      if (id === virtualModuleId) {
-        return resolvedVirtualModuleId;
-      }
-      if (id === virtualClientModuleId) {
-        return resolvedVirtualClientModuleId;
+    resolveId: {
+      filter: {
+        id: new RegExp(`^(${VIRTUAL_MODULE_ID}|${VIRTUAL_CLIENT_MODULE_ID})$`)
+      },
+      handler(id) {
+        if (id === VIRTUAL_MODULE_ID) {
+          return RESOLVED_VIRTUAL_MODULE_ID;
+        }
+        if (id === VIRTUAL_CLIENT_MODULE_ID) {
+          return RESOLVED_VIRTUAL_CLIENT_MODULE_ID;
+        }
       }
     },
-    load(id) {
-      if (id === resolvedVirtualModuleId) {
-        return {
-          code: `
+    load: {
+      filter: {
+        id: new RegExp(`^(${RESOLVED_VIRTUAL_MODULE_ID}|${RESOLVED_VIRTUAL_CLIENT_MODULE_ID})$`)
+      },
+      handler(id) {
+        if (id === RESOLVED_VIRTUAL_MODULE_ID) {
+          return {
+            code: `
 						export * from "astro/virtual-modules/transitions.js";
 						export { default as ClientRouter } from "astro/components/ClientRouter.astro";
 					`
-        };
-      }
-      if (id === resolvedVirtualClientModuleId) {
-        return {
-          code: `
+          };
+        }
+        if (id === RESOLVED_VIRTUAL_CLIENT_MODULE_ID) {
+          return {
+            code: `
 						export { navigate, supportsViewTransitions, transitionEnabledOnThisPage } from "astro/virtual-modules/transitions-router.js";
 						export * from "astro/virtual-modules/transitions-types.js";
 						export {
@@ -42,11 +51,15 @@ function astroTransitions({ settings }) {
 						} from "astro/virtual-modules/transitions-events.js";
 						export { swapFunctions } from "astro/virtual-modules/transitions-swap-functions.js";
 					`
-        };
+          };
+        }
       }
     },
-    transform(code, id) {
-      if (id.includes("ClientRouter.astro") && id.endsWith(".ts")) {
+    transform: {
+      filter: {
+        id: /ClientRouter\.astro.*\.ts$/
+      },
+      handler(code) {
         const prefetchDisabled = settings.config.prefetch === false;
         return code.replace("__PREFETCH_DISABLED__", JSON.stringify(prefetchDisabled));
       }

package/dist/types/astro.d.ts

@@ -1,7 +1,6 @@
-import type { SSRManifest } from '../core/app/types.js';
 import type { AstroTimer } from '../core/config/timer.js';
 import type { TSConfig } from '../core/config/tsconfig.js';
-import type { Logger } from '../core/logger/core.js';
+import type { Logger, LoggerLevel } from '../core/logger/core.js';
 import type { AstroPreferences } from '../preferences/index.js';
 import type { AstroComponentFactory } from '../runtime/server/index.js';
 import type { GetStaticPaths } from './public/common.js';
@@ -11,7 +10,6 @@ import type { AstroAdapter, AstroRenderer, InjectedScriptStage, InjectedType } f
 import type { InternalInjectedRoute, ResolvedInjectedRoute, RouteData } from './public/internal.js';
 import type { DevToolbarAppEntry } from './public/toolbar.js';
 export type SerializedRouteData = Omit<RouteData, 'generate' | 'pattern' | 'redirectRoute' | 'fallbackRoutes'> & {
-    generate: undefined;
     pattern: string;
     redirectRoute: SerializedRouteData | undefined;
     fallbackRoutes: SerializedRouteData[];
@@ -19,7 +17,7 @@ export type SerializedRouteData = Omit<RouteData, 'generate' | 'pattern' | 'redi
         trailingSlash: AstroConfig['trailingSlash'];
     };
 };
-type CspObject = Required<Exclude<AstroConfig['experimental']['csp'], boolean>>;
+type CspObject = Required<Exclude<AstroConfig['security']['csp'], boolean>>;
 export interface AstroSettings {
     config: AstroConfig;
     adapter: AstroAdapter | undefined;
@@ -56,8 +54,6 @@ export interface AstroSettings {
      * - the user is on the latest version already
      */
     latestAstroVersion: string | undefined;
-    serverIslandMap: NonNullable<SSRManifest['serverIslandMap']>;
-    serverIslandNameMap: NonNullable<SSRManifest['serverIslandNameMap']>;
     injectedTypes: Array<Omit<InjectedType, 'content'> & Partial<Pick<InjectedType, 'content'>>>;
     /**
      * Determine if the build output should be a static, dist folder or a adapter-based server output
@@ -68,6 +64,7 @@ export interface AstroSettings {
         fontResources: Set<string>;
         styleHashes: Required<CspObject['styleDirective']>['hashes'];
     };
+    logLevel: LoggerLevel;
 }
 /** Generic interface for a component (Astro, Svelte, React, etc.) */
 export interface ComponentInstance {
@@ -84,4 +81,9 @@ export interface AstroPluginOptions {
     settings: AstroSettings;
     logger: Logger;
 }
+export interface ImportedDevStyle {
+    id: string;
+    url: string;
+    content: string;
+}
 export {};