astro 3.0.9 → 3.0.11

package/components/ViewTransitions.astro

@@ -19,7 +19,9 @@ const { fallback = 'animate' } = Astro.props as Props;
 	};
 	type Events = 'astro:page-load' | 'astro:after-swap';
 
-	const persistState = (state: State) => history.replaceState(state, '');
+	// only update history entries that are managed by us
+	// leave other entries alone and do not accidently add state.
+	const persistState = (state: State) => history.state && history.replaceState(state, '');
 	const supportsViewTransitions = !!document.startViewTransition;
 	const transitionEnabledOnThisPage = () =>
 		!!document.querySelector('[name="astro-view-transitions-enabled"]');
@@ -32,11 +34,13 @@ const { fallback = 'animate' } = Astro.props as Props;
 	// can use that to determine popstate if going forward or back.
 	let currentHistoryIndex = 0;
 	if (history.state) {
-		// we reloaded a page with history state (e.g. back button or browser reload)
+		// we reloaded a page with history state
+		// (e.g. history navigation from non-transition page or browser reload)
 		currentHistoryIndex = history.state.index;
 		scrollTo({ left: 0, top: history.state.scrollY });
+	} else if (transitionEnabledOnThisPage()) {
+		history.replaceState({ index: currentHistoryIndex, scrollY }, '');
 	}
-
 	const throttle = (cb: (...args: any[]) => any, delay: number) => {
 		let wait = false;
 		// During the waiting time additional events are lost.
@@ -102,20 +106,14 @@ const { fallback = 'animate' } = Astro.props as Props;
 
 	function isInfinite(animation: Animation) {
 		const effect = animation.effect;
-		if(
-			!effect ||
-			!(effect instanceof KeyframeEffect) ||
-			!effect.target
-		) return false;
-    const style = window.getComputedStyle(effect.target, effect.pseudoElement);
-    return style.animationIterationCount === "infinite";
-}
+		if (!effect || !(effect instanceof KeyframeEffect) || !effect.target) return false;
+		const style = window.getComputedStyle(effect.target, effect.pseudoElement);
+		return style.animationIterationCount === 'infinite';
+	}
 
 	const parser = new DOMParser();
 
-	async function updateDOM(html: string, state?: State, fallback?: Fallback) {
-		const doc = parser.parseFromString(html, 'text/html');
-
+	async function updateDOM(doc: Document, loc: URL, state?: State, fallback?: Fallback) {
 		// Check for a head element that should persist, either because it has the data
 		// attribute or is a link el.
 		const persistedHeadElement = (el: Element): Element | null => {
@@ -193,19 +191,17 @@ const { fallback = 'animate' } = Astro.props as Props;
 			// Chromium based browsers (Chrome, Edge, Opera, ...)
 			scrollTo({ left: 0, top: 0, behavior: 'instant' });
 
-			if (state?.scrollY === 0 && location.hash) {
-				const id = decodeURIComponent(location.hash.slice(1));
+			let initialScrollY = 0;
+			if (!state && loc.hash) {
+				const id = decodeURIComponent(loc.hash.slice(1));
 				const elem = document.getElementById(id);
 				// prefer scrollIntoView() over scrollTo() because it takes scroll-padding into account
-				if (elem) {
-					state.scrollY = elem.offsetTop;
-					persistState(state); // first guess, later updated by scroll handler
-					elem.scrollIntoView(); // for Firefox, this should better be {behavior: 'instant'}
-				}
+				elem && (initialScrollY = elem.offsetTop) && elem.scrollIntoView();
 			} else if (state && state.scrollY !== 0) {
 				scrollTo(0, state.scrollY); // usings default scrollBehavior
 			}
-
+			!state &&
+				history.pushState({ index: ++currentHistoryIndex, scrollY: initialScrollY }, '', loc.href);
 			triggerEvent('astro:after-swap');
 		};
 
@@ -236,8 +232,10 @@ const { fallback = 'animate' } = Astro.props as Props;
 			// Trigger the animations
 			const currentAnimations = document.getAnimations();
 			document.documentElement.dataset.astroTransitionFallback = 'old';
-			const newAnimations = document.getAnimations().filter(a => !currentAnimations.includes(a) && !isInfinite(a));
-			const finished = Promise.all(newAnimations.map(a => a.finished));
+			const newAnimations = document
+				.getAnimations()
+				.filter((a) => !currentAnimations.includes(a) && !isInfinite(a));
+			const finished = Promise.all(newAnimations.map((a) => a.finished));
 			const fallbackSwap = () => {
 				swap();
 				document.documentElement.dataset.astroTransitionFallback = 'new';
@@ -249,19 +247,26 @@ const { fallback = 'animate' } = Astro.props as Props;
 		}
 	}
 
-	async function navigate(dir: Direction, href: string, state?: State) {
+	async function navigate(dir: Direction, loc: URL, state?: State) {
 		let finished: Promise<void>;
+		const href = loc.href;
 		const { html, ok } = await getHTML(href);
 		// If there is a problem fetching the new page, just do an MPA navigation to it.
 		if (!ok) {
 			location.href = href;
 			return;
 		}
+		const doc = parser.parseFromString(html, 'text/html');
+		if (!doc.querySelector('[name="astro-view-transitions-enabled"]')) {
+			location.href = href;
+			return;
+		}
+
 		document.documentElement.dataset.astroTransition = dir;
 		if (supportsViewTransitions) {
-			finished = document.startViewTransition(() => updateDOM(html, state)).finished;
+			finished = document.startViewTransition(() => updateDOM(doc, loc, state)).finished;
 		} else {
-			finished = updateDOM(html, state, getFallback());
+			finished = updateDOM(doc, loc, state, getFallback());
 		}
 		try {
 			await finished;
@@ -313,11 +318,11 @@ const { fallback = 'animate' } = Astro.props as Props;
 				ev.shiftKey || // new window
 				ev.defaultPrevented ||
 				!transitionEnabledOnThisPage()
-			)
+			) {
 				// No page transitions in these cases,
 				// Let the browser standard action handle this
 				return;
-
+			}
 			// We do not need to handle same page links because there are no page transitions
 			// Same page means same path and same query params (but different hash)
 			if (location.pathname === link.pathname && location.search === link.search) {
@@ -343,10 +348,8 @@ const { fallback = 'animate' } = Astro.props as Props;
 
 			// these are the cases we will handle: same origin, different page
 			ev.preventDefault();
-			navigate('forward', link.href, { index: ++currentHistoryIndex, scrollY: 0 });
-			const newState: State = { index: currentHistoryIndex, scrollY };
-			persistState({ index: currentHistoryIndex - 1, scrollY });
-			history.pushState(newState, '', link.href);
+			persistState({ index: currentHistoryIndex, scrollY });
+			navigate('forward', new URL(link.href));
 		});
 
 		addEventListener('popstate', (ev) => {
@@ -354,7 +357,7 @@ const { fallback = 'animate' } = Astro.props as Props;
 				// The current page doesn't haven't View Transitions,
 				// respect that with a full page reload
 				// -- but only for transition managed by us (ev.state is set)
-				history.scrollRestoration && (history.scrollRestoration = "manual")
+				history.scrollRestoration && (history.scrollRestoration = 'manual');
 				location.reload();
 				return;
 			}
@@ -365,7 +368,7 @@ const { fallback = 'animate' } = Astro.props as Props;
 			// The browser will handle navigation fine without our help
 			if (ev.state === null) {
 				if (history.scrollRestoration) {
-					history.scrollRestoration = "auto";
+					history.scrollRestoration = 'auto';
 				}
 				return;
 			}
@@ -373,14 +376,14 @@ const { fallback = 'animate' } = Astro.props as Props;
 			// With the default "auto", the browser will jump to the old scroll position
 			// before the ViewTransition is complete.
 			if (history.scrollRestoration) {
-				history.scrollRestoration = "manual";
+				history.scrollRestoration = 'manual';
 			}
 
-			const state: State | undefined = history.state;
-			const nextIndex = state?.index ?? currentHistoryIndex + 1;
+			const state: State = history.state;
+			const nextIndex = state.index;
 			const direction: Direction = nextIndex > currentHistoryIndex ? 'forward' : 'back';
-			navigate(direction, location.href, state);
 			currentHistoryIndex = nextIndex;
+			navigate(direction, new URL(location.href), state);
 		});
 
 		['mouseenter', 'touchstart', 'focus'].forEach((evName) => {
@@ -404,13 +407,10 @@ const { fallback = 'animate' } = Astro.props as Props;
 		addEventListener('load', onPageLoad);
 		// There's not a good way to record scroll position before a back button.
 		// So the way we do it is by listening to scrollend if supported, and if not continuously record the scroll position.
-    const updateState = () => {
-			// only update history entries that are managed by us
-			// leave other entries alone and do not accidently add state.
-			if (history.state) {
-				persistState({ ...history.state, scrollY });
-			}
-		}
+		const updateState = () => {
+			persistState({ ...history.state, scrollY });
+		};
+
 		if ('onscrollend' in window) addEventListener('scrollend', updateState);
 		else addEventListener('scroll', throttle(updateState, 300));
 	}

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

@@ -6,10 +6,11 @@ import {
   prependForwardSlash,
   removeQueryString
 } from "../core/path.js";
-import { VIRTUAL_MODULE_ID, VIRTUAL_SERVICE_ID } from "./consts.js";
+import { VALID_INPUT_FORMATS, VIRTUAL_MODULE_ID, VIRTUAL_SERVICE_ID } from "./consts.js";
 import { emitESMImage } from "./utils/emitAsset.js";
 import { hashTransform, propsToFilename } from "./utils/transformToPath.js";
 const resolvedVirtualModuleId = "\0" + VIRTUAL_MODULE_ID;
+const assetRegex = new RegExp(`.(${VALID_INPUT_FORMATS.join("|")})$`, "i");
 function assets({
   settings,
   mode
@@ -99,7 +100,7 @@ function assets({
         if (id !== removeQueryString(id)) {
           return;
         }
-        if (/\.(jpeg|jpg|png|tiff|webp|gif|svg)$/.test(id)) {
+        if (assetRegex.test(id)) {
           const meta = await emitESMImage(id, this.meta.watchMode, this.emitFile);
           return `export default ${JSON.stringify(meta)}`;
         }

package/dist/cli/telemetry/index.js

@@ -2,7 +2,7 @@ import whichPm from "which-pm";
 import * as msg from "../../core/messages.js";
 import { telemetry } from "../../events/index.js";
 async function notify() {
-  const packageManager = (await whichPm(process.cwd())).name ?? "npm";
+  const packageManager = (await whichPm(process.cwd()))?.name ?? "npm";
   await telemetry.notify(() => {
     console.log(msg.telemetryNotice(packageManager) + "\n");
     return true;

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "3.0.9";
+const ASTRO_VERSION = "3.0.11";
 const SUPPORTED_MARKDOWN_FILE_EXTENSIONS = [
   ".markdown",
   ".mdown",

package/dist/core/dev/dev.js

@@ -20,7 +20,7 @@ async function dev(inlineConfig) {
       base: restart.container.settings.config.base
     })
   );
-  const currentVersion = "3.0.9";
+  const currentVersion = "3.0.11";
   if (currentVersion.includes("-")) {
     logger.warn(null, msg.prerelease({ currentVersion }));
   }

package/dist/core/messages.js

@@ -50,7 +50,7 @@ function serverStart({
   base,
   isRestart = false
 }) {
-  const version = "3.0.9";
+  const version = "3.0.11";
   const localPrefix = `${dim("\u2503")} Local    `;
   const networkPrefix = `${dim("\u2503")} Network  `;
   const emptyPrefix = " ".repeat(11);
@@ -235,7 +235,7 @@ function printHelp({
     message.push(
       linebreak(),
       `  ${bgGreen(black(` ${commandName} `))} ${green(
-        `v${"3.0.9"}`
+        `v${"3.0.11"}`
       )} ${headline}`
     );
   }

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

@@ -16,6 +16,8 @@ async function renderChild(destination, child) {
       });
     });
     for (const childRender of childRenders) {
+      if (!childRender)
+        continue;
       await childRender.renderToFinalDestination(destination);
     }
   } else if (typeof child === "function") {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "3.0.9",
+  "version": "3.0.11",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -159,7 +159,7 @@
     "yargs-parser": "^21.1.1",
     "zod": "3.21.1",
     "@astrojs/internal-helpers": "0.2.0",
-    "@astrojs/markdown-remark": "3.0.0",
+    "@astrojs/markdown-remark": "3.1.0",
     "@astrojs/telemetry": "3.0.1"
   },
   "optionalDependencies": {