astro 4.7.0 → 4.7.1

package/dist/@types/astro.d.ts

@@ -14,7 +14,7 @@ import type { AstroTimer } from '../core/config/timer.js';
 import type { TSConfig } from '../core/config/tsconfig.js';
 import type { AstroCookies } from '../core/cookies/index.js';
 import type { AstroIntegrationLogger, Logger, LoggerLevel } from '../core/logger/core.js';
-import type { getToolbarServerCommunicationHelpers } from '../integrations/index.js';
+import type { getToolbarServerCommunicationHelpers } from '../integrations/hooks.js';
 import type { AstroPreferences } from '../preferences/index.js';
 import type { ToolbarAppEventTarget, ToolbarServerHelpers } from '../runtime/client/dev-toolbar/helpers.js';
 import type { AstroDevToolbar, DevToolbarCanvas } from '../runtime/client/dev-toolbar/toolbar.js';

package/dist/config/index.js

@@ -19,7 +19,7 @@ function getViteConfig(inlineConfig) {
       import("../core/logger/node.js"),
       import("../core/config/index.js"),
       import("../core/create-vite.js"),
-      import("../integrations/index.js"),
+      import("../integrations/hooks.js"),
       import("./vite-plugin-content-listen.js")
     ]);
     const logger = new Logger({

package/dist/content/index.d.ts

@@ -1,5 +1,4 @@
 export { CONTENT_FLAG, PROPAGATED_ASSET_FLAG } from './consts.js';
-export { errorMap } from './error-map.js';
 export { attachContentServerListeners } from './server-listeners.js';
 export { createContentTypesGenerator } from './types-generator.js';
 export { contentObservable, getContentPaths, getDotAstroTypeReference, hasAssetPropagationFlag, } from './utils.js';

package/dist/content/index.js

@@ -1,5 +1,4 @@
 import { CONTENT_FLAG, PROPAGATED_ASSET_FLAG } from "./consts.js";
-import { errorMap } from "./error-map.js";
 import { attachContentServerListeners } from "./server-listeners.js";
 import { createContentTypesGenerator } from "./types-generator.js";
 import {
@@ -20,7 +19,6 @@ export {
   attachContentServerListeners,
   contentObservable,
   createContentTypesGenerator,
-  errorMap,
   getContentPaths,
   getDotAstroTypeReference,
   hasAssetPropagationFlag

package/dist/content/utils.js

@@ -5,11 +5,9 @@ import { slug as githubSlug } from "github-slugger";
 import matter from "gray-matter";
 import { normalizePath } from "vite";
 import { z } from "zod";
-import { AstroError, AstroErrorData } from "../core/errors/index.js";
-import { MarkdownError } from "../core/errors/index.js";
+import { AstroError, AstroErrorData, MarkdownError, errorMap } from "../core/errors/index.js";
 import { isYAMLException } from "../core/errors/utils.js";
 import { CONTENT_FLAGS, CONTENT_TYPES_FILE, PROPAGATED_ASSET_FLAG } from "./consts.js";
-import { errorMap } from "./error-map.js";
 import { createImage } from "./runtime-assets.js";
 const collectionConfigParser = z.union([
   z.object({

package/dist/core/build/generate.js

@@ -17,7 +17,7 @@ import {
   removeTrailingForwardSlash
 } from "../../core/path.js";
 import { toRoutingStrategy } from "../../i18n/utils.js";
-import { runHookBuildGenerated } from "../../integrations/index.js";
+import { runHookBuildGenerated } from "../../integrations/hooks.js";
 import { getOutputDirectory, isServerLikeOutput } from "../../prerender/utils.js";
 import { NoPrerenderedRoutesWithDomains } from "../errors/errors-data.js";
 import { AstroError, AstroErrorData } from "../errors/index.js";

package/dist/core/build/index.js

@@ -10,7 +10,7 @@ import {
   runHookBuildStart,
   runHookConfigDone,
   runHookConfigSetup
-} from "../../integrations/index.js";
+} from "../../integrations/hooks.js";
 import { isServerLikeOutput } from "../../prerender/utils.js";
 import { resolveConfig } from "../config/config.js";
 import { createNodeLogger } from "../config/logging.js";

package/dist/core/build/plugins/plugin-manifest.js

@@ -4,7 +4,7 @@ import {} from "vite";
 import { getAssetsPrefix } from "../../../assets/utils/getAssetsPrefix.js";
 import { normalizeTheLocale } from "../../../i18n/index.js";
 import { toRoutingStrategy } from "../../../i18n/utils.js";
-import { runHookBuildSsr } from "../../../integrations/index.js";
+import { runHookBuildSsr } from "../../../integrations/hooks.js";
 import { BEFORE_HYDRATION_SCRIPT_ID, PAGE_SCRIPT_ID } from "../../../vite-plugin-scripts/index.js";
 import { fileExtension, joinPaths, prependForwardSlash } from "../../path.js";
 import { serializeRouteData } from "../../routing/index.js";

package/dist/core/build/plugins/plugin-ssr.js

@@ -1,6 +1,6 @@
 import { join } from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
-import { isFunctionPerRouteEnabled } from "../../../integrations/index.js";
+import { isFunctionPerRouteEnabled } from "../../../integrations/hooks.js";
 import { isServerLikeOutput } from "../../../prerender/utils.js";
 import { routeIsRedirect } from "../../redirects/index.js";
 import { addRollupInput } from "../add-rollup-input.js";

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

@@ -15,7 +15,7 @@ import {
 import { emptyDir, removeEmptyDirs } from "../../core/fs/index.js";
 import { appendForwardSlash, prependForwardSlash, removeFileExtension } from "../../core/path.js";
 import { isModeServerWithNoAdapter } from "../../core/util.js";
-import { runHookBuildSetup } from "../../integrations/index.js";
+import { runHookBuildSetup } from "../../integrations/hooks.js";
 import { getOutputDirectory, isServerLikeOutput } from "../../prerender/utils.js";
 import { PAGE_SCRIPT_ID } from "../../vite-plugin-scripts/index.js";
 import { AstroError, AstroErrorData } from "../errors/index.js";

package/dist/core/compile/compile.js

@@ -22,7 +22,7 @@ async function compile({
       normalizedFilename: normalizeFilename(filename, astroConfig.root),
       sourcemap: "both",
       internalURL: "astro/compiler-runtime",
-      // 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
       astroGlobalArgs: JSON.stringify(astroConfig.site),
       scopedStyleStrategy: astroConfig.scopedStyleStrategy,

package/dist/core/constants.d.ts

@@ -34,7 +34,7 @@ export declare const DEFAULT_404_COMPONENT = "astro-default-404";
 export declare const REROUTABLE_STATUS_CODES: number[];
 /**
  * The symbol which is used as a field on the request object to store the client address.
- * The clientAddresss provided by the adapter (or the dev server) is stored on this field.
+ * The clientAddress provided by the adapter (or the dev server) is stored on this field.
  */
 export declare const clientAddressSymbol: unique symbol;
 /**

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "4.7.0";
+const ASTRO_VERSION = "4.7.1";
 const REROUTE_DIRECTIVE_HEADER = "X-Astro-Reroute";
 const ROUTE_TYPE_HEADER = "X-Astro-Route-Type";
 const DEFAULT_404_COMPONENT = "astro-default-404";

package/dist/core/dev/container.js

@@ -6,7 +6,7 @@ import {
   runHookConfigSetup,
   runHookServerDone,
   runHookServerStart
-} from "../../integrations/index.js";
+} from "../../integrations/hooks.js";
 import { createVite } from "../create-vite.js";
 import { apply as applyPolyfill } from "../polyfill.js";
 async function createContainer({

package/dist/core/dev/dev.js

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

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

@@ -389,7 +389,7 @@ export declare const NoMatchingImport: {
 export declare const InvalidPrerenderExport: {
     name: string;
     title: string;
-    message(prefix: string, suffix: string, isHydridOuput: boolean): string;
+    message(prefix: string, suffix: string, isHydridOutput: boolean): string;
     hint: string;
 };
 /**

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

@@ -125,8 +125,8 @@ const NoMatchingImport = {
 const InvalidPrerenderExport = {
   name: "InvalidPrerenderExport",
   title: "Invalid prerender export.",
-  message(prefix, suffix, isHydridOuput) {
-    const defaultExpectedValue = isHydridOuput ? "false" : "true";
+  message(prefix, suffix, isHydridOutput) {
+    const defaultExpectedValue = isHydridOutput ? "false" : "true";
     let msg = `A \`prerender\` export has been detected, but its value cannot be statically analyzed.`;
     if (prefix !== "const")
       msg += `

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

@@ -3,3 +3,4 @@ export { AggregateError, AstroError, AstroUserError, CSSError, CompilerError, Ma
 export type { ErrorLocation, ErrorWithMetadata } from './errors.js';
 export { codeFrame } from './printer.js';
 export { createSafeError, positionAt } from './utils.js';
+export { errorMap } from './zod-error-map.js';

package/dist/core/errors/index.js

@@ -10,6 +10,7 @@ import {
 } from "./errors.js";
 import { codeFrame } from "./printer.js";
 import { createSafeError, positionAt } from "./utils.js";
+import { errorMap } from "./zod-error-map.js";
 export {
   AggregateError,
   AstroError,
@@ -20,6 +21,7 @@ export {
   MarkdownError,
   codeFrame,
   createSafeError,
+  errorMap,
   isAstroError,
   positionAt
 };

package/dist/core/errors/overlay.js

@@ -62,7 +62,7 @@ const style = (
 
     /* Theme toggle */
     --toggle-ball-color: var(--accent);
-    --toggle-tabel-background: var(--background);
+    --toggle-table-background: var(--background);
     --sun-icon-color: #ffffff;
     --moon-icon-color: #a3acc8;
     --toggle-border-color: #C3CADB;
@@ -150,7 +150,7 @@ const style = (
 }
 
 #theme-toggle-label {
-	background-color: var(--toggle-tabel-background);
+	background-color: var(--toggle-table-background);
 	border-radius: 50px;
 	cursor: pointer;
 	display: flex;

package/dist/core/messages.js

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

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.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,

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/helpers.d.ts

@@ -1,6 +1,6 @@
 type NotificationPayload = {
     state: true;
-    level?: 'error' | 'warn' | 'info';
+    level?: 'error' | 'warning' | 'info';
 } | {
     state: false;
 };

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

@@ -25,7 +25,7 @@ class ToolbarAppEventTarget extends EventTarget {
    */
   toggleState(options) {
     this.dispatchEvent(
-      new CustomEvent("app-toggled", {
+      new CustomEvent("toggle-app", {
         detail: {
           state: options.state
         }

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/transitions/events.d.ts

@@ -16,13 +16,14 @@ declare class BeforeEvent extends Event {
     readonly sourceElement: Element | undefined;
     readonly info: any;
     newDocument: Document;
-    constructor(type: string, eventInitDict: EventInit | undefined, from: URL, to: URL, direction: Direction | string, navigationType: NavigationTypeString, sourceElement: Element | undefined, info: any, newDocument: Document);
+    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);
 }
 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, formData: FormData | undefined, loader: (event: TransitionBeforePreparationEvent) => 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>);
 }
 export declare const isTransitionBeforeSwapEvent: (value: any) => value is TransitionBeforeSwapEvent;
 export declare class TransitionBeforeSwapEvent extends BeforeEvent {
@@ -31,6 +32,6 @@ export declare class TransitionBeforeSwapEvent extends BeforeEvent {
     swap: () => void;
     constructor(afterPreparation: BeforeEvent, viewTransition: ViewTransition, swap: (event: TransitionBeforeSwapEvent) => void);
 }
-export declare function doPreparation(from: URL, to: URL, direction: Direction | string, navigationType: NavigationTypeString, sourceElement: Element | undefined, info: any, formData: FormData | undefined, defaultLoader: (event: TransitionBeforePreparationEvent) => Promise<void>): Promise<TransitionBeforePreparationEvent>;
-export declare function doSwap(afterPreparation: BeforeEvent, viewTransition: ViewTransition, defaultSwap: (event: TransitionBeforeSwapEvent) => void): Promise<TransitionBeforeSwapEvent>;
+export declare function doPreparation(from: URL, to: URL, direction: Direction | string, navigationType: NavigationTypeString, sourceElement: Element | undefined, info: any, signal: AbortSignal, formData: FormData | undefined, defaultLoader: (event: TransitionBeforePreparationEvent) => Promise<void>): Promise<TransitionBeforePreparationEvent>;
+export declare function doSwap(afterPreparation: BeforeEvent, viewTransition: ViewTransition, defaultSwap: (event: TransitionBeforeSwapEvent) => void): TransitionBeforeSwapEvent;
 export {};

package/dist/transitions/events.js

@@ -14,7 +14,8 @@ class BeforeEvent extends Event {
   sourceElement;
   info;
   newDocument;
-  constructor(type, eventInitDict, from, to, direction, navigationType, sourceElement, info, newDocument) {
+  signal;
+  constructor(type, eventInitDict, from, to, direction, navigationType, sourceElement, info, newDocument, signal) {
     super(type, eventInitDict);
     this.from = from;
     this.to = to;
@@ -23,6 +24,7 @@ class BeforeEvent extends Event {
     this.sourceElement = sourceElement;
     this.info = info;
     this.newDocument = newDocument;
+    this.signal = signal;
     Object.defineProperties(this, {
       from: { enumerable: true },
       to: { enumerable: true, writable: true },
@@ -30,7 +32,8 @@ class BeforeEvent extends Event {
       navigationType: { enumerable: true },
       sourceElement: { enumerable: true },
       info: { enumerable: true },
-      newDocument: { enumerable: true, writable: true }
+      newDocument: { enumerable: true, writable: true },
+      signal: { enumerable: true }
     });
   }
 }
@@ -38,7 +41,7 @@ const isTransitionBeforePreparationEvent = (value) => value.type === TRANSITION_
 class TransitionBeforePreparationEvent extends BeforeEvent {
   formData;
   loader;
-  constructor(from, to, direction, navigationType, sourceElement, info, newDocument, formData, loader) {
+  constructor(from, to, direction, navigationType, sourceElement, info, newDocument, signal, formData, loader) {
     super(
       TRANSITION_BEFORE_PREPARATION,
       { cancelable: true },
@@ -48,7 +51,8 @@ class TransitionBeforePreparationEvent extends BeforeEvent {
       navigationType,
       sourceElement,
       info,
-      newDocument
+      newDocument,
+      signal
     );
     this.formData = formData;
     this.loader = loader.bind(this, this);
@@ -73,7 +77,8 @@ class TransitionBeforeSwapEvent extends BeforeEvent {
       afterPreparation.navigationType,
       afterPreparation.sourceElement,
       afterPreparation.info,
-      afterPreparation.newDocument
+      afterPreparation.newDocument,
+      afterPreparation.signal
     );
     this.direction = afterPreparation.direction;
     this.viewTransition = viewTransition;
@@ -85,7 +90,7 @@ class TransitionBeforeSwapEvent extends BeforeEvent {
     });
   }
 }
-async function doPreparation(from, to, direction, navigationType, sourceElement, info, formData, defaultLoader) {
+async function doPreparation(from, to, direction, navigationType, sourceElement, info, signal, formData, defaultLoader) {
   const event = new TransitionBeforePreparationEvent(
     from,
     to,
@@ -94,6 +99,7 @@ async function doPreparation(from, to, direction, navigationType, sourceElement,
     sourceElement,
     info,
     window.document,
+    signal,
     formData,
     defaultLoader
   );
@@ -108,7 +114,7 @@ async function doPreparation(from, to, direction, navigationType, sourceElement,
   }
   return event;
 }
-async function doSwap(afterPreparation, viewTransition, defaultSwap) {
+function doSwap(afterPreparation, viewTransition, defaultSwap) {
   const event = new TransitionBeforeSwapEvent(afterPreparation, viewTransition, defaultSwap);
   document.dispatchEvent(event);
   event.swap();

package/dist/transitions/router.js

@@ -11,10 +11,9 @@ const updateScrollPosition = (positions) => {
 const supportsViewTransitions = inBrowser && !!document.startViewTransition;
 const transitionEnabledOnThisPage = () => inBrowser && !!document.querySelector('[name="astro-view-transitions-enabled"]');
 const samePage = (thisLocation, otherLocation) => thisLocation.pathname === otherLocation.pathname && thisLocation.search === otherLocation.search;
+let mostRecentNavigation;
+let mostRecentTransition;
 let originalLocation;
-let viewTransition;
-let skipTransition = false;
-let viewTransitionFinished;
 const triggerEvent = (name) => document.dispatchEvent(new Event(name));
 const onPageLoad = () => triggerEvent("astro:page-load");
 const announce = () => {
@@ -173,7 +172,7 @@ function preloadStyleLinks(newDocument) {
   }
   return links;
 }
-async function updateDOM(preparationEvent, options, historyState, fallback) {
+async function updateDOM(preparationEvent, options, currentTransition, historyState, fallback) {
   const persistedHeadElement = (el, newDoc) => {
     const id = el.getAttribute(PERSIST_ATTR);
     const newEl = id && newDoc.head.querySelector(`[${PERSIST_ATTR}="${id}"]`);
@@ -274,26 +273,37 @@ async function updateDOM(preparationEvent, options, historyState, fallback) {
     const newAnimations = nextAnimations.filter(
       (a) => !currentAnimations.includes(a) && !isInfinite(a)
     );
-    return Promise.all(newAnimations.map((a) => a.finished));
+    return Promise.allSettled(newAnimations.map((a) => a.finished));
   }
-  if (!skipTransition) {
-    document.documentElement.setAttribute(DIRECTION_ATTR, preparationEvent.direction);
-    if (fallback === "animate") {
+  if (fallback === "animate" && !currentTransition.transitionSkipped && !preparationEvent.signal.aborted) {
+    try {
       await animate("old");
+    } catch (err) {
     }
-  } else {
-    throw new DOMException("Transition was skipped");
   }
   const pageTitleForBrowserHistory = document.title;
-  const swapEvent = await doSwap(preparationEvent, viewTransition, defaultSwap);
+  const swapEvent = doSwap(preparationEvent, currentTransition.viewTransition, defaultSwap);
   moveToLocation(swapEvent.to, swapEvent.from, options, pageTitleForBrowserHistory, historyState);
   triggerEvent(TRANSITION_AFTER_SWAP);
-  if (fallback === "animate" && !skipTransition) {
-    animate("new").then(() => viewTransitionFinished());
+  if (fallback === "animate") {
+    if (!currentTransition.transitionSkipped && !swapEvent.signal.aborted) {
+      animate("new").finally(() => currentTransition.viewTransitionFinished());
+    } else {
+      currentTransition.viewTransitionFinished();
+    }
   }
 }
+function abortAndRecreateMostRecentNavigation() {
+  mostRecentNavigation?.controller.abort();
+  return mostRecentNavigation = {
+    controller: new AbortController()
+  };
+}
 async function transition(direction, from, to, options, historyState) {
+  const currentNavigation = abortAndRecreateMostRecentNavigation();
   if (!transitionEnabledOnThisPage() || location.origin !== to.origin) {
+    if (currentNavigation === mostRecentNavigation)
+      mostRecentNavigation = void 0;
     location.href = to.href;
     return;
   }
@@ -304,6 +314,8 @@ async function transition(direction, from, to, options, historyState) {
   if (samePage(from, to)) {
     if (direction !== "back" && to.hash || direction === "back" && from.hash) {
       moveToLocation(to, from, options, document.title, historyState);
+      if (currentNavigation === mostRecentNavigation)
+        mostRecentNavigation = void 0;
       return;
     }
   }
@@ -314,16 +326,21 @@ async function transition(direction, from, to, options, historyState) {
     navigationType,
     options.sourceElement,
     options.info,
+    currentNavigation.controller.signal,
     options.formData,
     defaultLoader
   );
-  if (prepEvent.defaultPrevented) {
-    location.href = to.href;
+  if (prepEvent.defaultPrevented || prepEvent.signal.aborted) {
+    if (currentNavigation === mostRecentNavigation)
+      mostRecentNavigation = void 0;
+    if (!prepEvent.signal.aborted) {
+      location.href = to.href;
+    }
     return;
   }
   async function defaultLoader(preparationEvent) {
     const href = preparationEvent.to.href;
-    const init = {};
+    const init = { signal: preparationEvent.signal };
     if (preparationEvent.formData) {
       init.method = "POST";
       const form = preparationEvent.sourceElement instanceof HTMLFormElement ? preparationEvent.sourceElement : preparationEvent.sourceElement instanceof HTMLElement && "form" in preparationEvent.sourceElement ? preparationEvent.sourceElement.form : preparationEvent.sourceElement?.closest("form");
@@ -345,42 +362,80 @@ async function transition(direction, from, to, options, historyState) {
       return;
     }
     const links = preloadStyleLinks(preparationEvent.newDocument);
-    links.length && await Promise.all(links);
-    if (import.meta.env.DEV)
-      await prepareForClientOnlyComponents(preparationEvent.newDocument, preparationEvent.to);
+    links.length && !preparationEvent.signal.aborted && await Promise.all(links);
+    if (import.meta.env.DEV && !preparationEvent.signal.aborted)
+      await prepareForClientOnlyComponents(
+        preparationEvent.newDocument,
+        preparationEvent.to,
+        preparationEvent.signal
+      );
   }
-  skipTransition = false;
+  async function abortAndRecreateMostRecentTransition() {
+    if (mostRecentTransition) {
+      if (mostRecentTransition.viewTransition) {
+        try {
+          mostRecentTransition.viewTransition.skipTransition();
+        } catch {
+        }
+        try {
+          await mostRecentTransition.viewTransition.updateCallbackDone;
+        } catch {
+        }
+      }
+    }
+    return mostRecentTransition = { transitionSkipped: false };
+  }
+  const currentTransition = await abortAndRecreateMostRecentTransition();
+  if (prepEvent.signal.aborted) {
+    if (currentNavigation === mostRecentNavigation)
+      mostRecentNavigation = void 0;
+    return;
+  }
+  document.documentElement.setAttribute(DIRECTION_ATTR, prepEvent.direction);
   if (supportsViewTransitions) {
-    viewTransition = document.startViewTransition(
-      async () => await updateDOM(prepEvent, options, historyState)
+    currentTransition.viewTransition = document.startViewTransition(
+      async () => await updateDOM(prepEvent, options, currentTransition, historyState)
     );
   } else {
     const updateDone = (async () => {
-      await new Promise((r) => setTimeout(r));
-      await updateDOM(prepEvent, options, historyState, getFallback());
+      await Promise.resolve();
+      await updateDOM(prepEvent, options, currentTransition, historyState, getFallback());
     })();
-    viewTransition = {
+    currentTransition.viewTransition = {
       updateCallbackDone: updateDone,
       // this is about correct
       ready: updateDone,
       // good enough
-      finished: new Promise((r) => viewTransitionFinished = r),
+      // Finished promise could have been done better: finished rejects iff updateDone does.
+      // Our simulation always resolves, never rejects.
+      finished: new Promise((r) => currentTransition.viewTransitionFinished = r),
       // see end of updateDOM
       skipTransition: () => {
-        skipTransition = true;
+        currentTransition.transitionSkipped = true;
+        document.documentElement.removeAttribute(OLD_NEW_ATTR);
       }
     };
   }
-  viewTransition.ready.then(async () => {
+  currentTransition.viewTransition.updateCallbackDone.finally(async () => {
     await runScripts();
     onPageLoad();
     announce();
   });
-  viewTransition.finished.then(() => {
+  currentTransition.viewTransition.finished.finally(() => {
+    currentTransition.viewTransition = void 0;
+    if (currentTransition === mostRecentTransition)
+      mostRecentTransition = void 0;
+    if (currentNavigation === mostRecentNavigation)
+      mostRecentNavigation = void 0;
     document.documentElement.removeAttribute(DIRECTION_ATTR);
     document.documentElement.removeAttribute(OLD_NEW_ATTR);
   });
-  await viewTransition.ready;
+  try {
+    await currentTransition.viewTransition.updateCallbackDone;
+  } catch (e) {
+    const err = e;
+    console.log("[astro]", err.name, err.message, err.stack);
+  }
 }
 let navigateOnServerWarned = false;
 async function navigate(href, options) {
@@ -456,7 +511,7 @@ if (inBrowser) {
     script.dataset.astroExec = "";
   }
 }
-async function prepareForClientOnlyComponents(newDocument, toLocation) {
+async function prepareForClientOnlyComponents(newDocument, toLocation, signal) {
   if (newDocument.body.querySelector(`astro-island[client='only']`)) {
     const nextPage = document.createElement("iframe");
     nextPage.src = toLocation.href;
@@ -481,11 +536,15 @@ async function prepareForClientOnlyComponents(newDocument, toLocation) {
       });
     }
     async function hydrationDone(loadingPage) {
-      await new Promise(
-        (r) => loadingPage.contentWindow?.addEventListener("load", r, { once: true })
-      );
+      if (!signal.aborted) {
+        await new Promise(
+          (r) => loadingPage.contentWindow?.addEventListener("load", r, { once: true })
+        );
+      }
       return new Promise(async (r) => {
         for (let count = 0; count <= 20; ++count) {
+          if (signal.aborted)
+            break;
           if (!loadingPage.contentDocument.body.querySelector("astro-island[ssr]"))
             break;
           await new Promise((r2) => setTimeout(r2, 50));

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

@@ -15,7 +15,7 @@ async function* crawlGraph(loader, _id, isRootFile, scanned = /* @__PURE__ */ ne
     loader.getModulesByFile(id) ?? /* @__PURE__ */ new Set()
   ) : (
     // For non-root files, we're safe to pull from "getModuleById" based on testing.
-    // TODO: Find better invalidation strat to use "getModuleById" in all cases!
+    // TODO: Find better invalidation strategy to use "getModuleById" in all cases!
     /* @__PURE__ */ new Set([loader.getModuleById(id)])
   );
   for (const entry of moduleEntriesForId) {
@@ -24,14 +24,13 @@ async function* crawlGraph(loader, _id, isRootFile, scanned = /* @__PURE__ */ ne
     }
     if (id === entry.id) {
       scanned.add(id);
-      const entryIsStyle = isCSSRequest(id);
+      if (isCSSRequest(id)) {
+        continue;
+      }
       for (const importedModule of entry.importedModules) {
         if (!importedModule.id)
           continue;
         const importedModulePathname = importedModule.id.replace(STRIP_QUERY_PARAMS_REGEX, "");
-        if (entryIsStyle && !isCSSRequest(importedModulePathname)) {
-          continue;
-        }
         const isFileTypeNeedingSSR = fileExtensionsToSSR.has(npath.extname(importedModulePathname));
         const isPropagationStoppingPoint = ASTRO_PROPAGATED_ASSET_REGEX.test(importedModule.id);
         if (isFileTypeNeedingSSR && // Should not SSR a module with ?astroPropagatedAssets

package/dist/vite-plugin-integrations-container/index.js

@@ -1,5 +1,5 @@
 import { normalizePath } from "vite";
-import { runHookServerSetup } from "../integrations/index.js";
+import { runHookServerSetup } from "../integrations/hooks.js";
 function astroIntegrationsContainerPlugin({
   settings,
   logger

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "4.7.0",
+  "version": "4.7.1",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -104,12 +104,12 @@
   ],
   "dependencies": {
     "@astrojs/compiler": "^2.7.1",
-    "@babel/core": "^7.24.4",
-    "@babel/generator": "^7.24.4",
-    "@babel/parser": "^7.24.4",
+    "@babel/core": "^7.24.5",
+    "@babel/generator": "^7.24.5",
+    "@babel/parser": "^7.24.5",
     "@babel/plugin-transform-react-jsx": "^7.23.4",
-    "@babel/traverse": "^7.24.1",
-    "@babel/types": "^7.24.0",
+    "@babel/traverse": "^7.24.5",
+    "@babel/types": "^7.24.5",
     "@types/babel__core": "^7.20.5",
     "@types/cookie": "^0.6.0",
     "acorn": "^8.11.3",
@@ -118,7 +118,7 @@
     "boxen": "^7.1.1",
     "chokidar": "^3.6.0",
     "ci-info": "^4.0.0",
-    "clsx": "^2.1.0",
+    "clsx": "^2.1.1",
     "common-ancestor-path": "^1.0.1",
     "cookie": "^0.6.0",
     "cssesc": "^3.0.0",
@@ -128,7 +128,7 @@
     "diff": "^5.2.0",
     "dlv": "^1.1.3",
     "dset": "^3.1.3",
-    "es-module-lexer": "^1.5.0",
+    "es-module-lexer": "^1.5.2",
     "esbuild": "^0.20.2",
     "estree-walker": "^3.0.3",
     "execa": "^8.0.1",
@@ -161,8 +161,8 @@
     "vitefu": "^0.2.5",
     "which-pm": "^2.1.1",
     "yargs-parser": "^21.1.1",
-    "zod": "^3.23.0",
-    "zod-to-json-schema": "^3.22.5",
+    "zod": "^3.23.5",
+    "zod-to-json-schema": "^3.23.0",
     "@astrojs/internal-helpers": "0.4.0",
     "@astrojs/markdown-remark": "5.1.0",
     "@astrojs/telemetry": "3.1.0"
@@ -196,14 +196,14 @@
     "@types/yargs-parser": "^21.0.3",
     "cheerio": "1.0.0-rc.12",
     "eol": "^0.9.1",
-    "memfs": "^4.8.2",
+    "memfs": "^4.9.1",
     "node-mocks-http": "^1.14.1",
     "parse-srcset": "^1.0.2",
     "rehype-autolink-headings": "^7.1.0",
     "rehype-slug": "^6.0.0",
     "rehype-toc": "^3.0.2",
     "remark-code-titles": "^0.1.2",
-    "rollup": "^4.16.1",
+    "rollup": "^4.17.1",
     "sass": "^1.75.0",
     "srcset-parse": "^1.1.0",
     "unified": "^11.0.4",