astro 3.0.10 → 3.0.12

package/client.d.ts

@@ -57,17 +57,15 @@ declare module 'astro:assets' {
 		Image: typeof import('./components/Image.astro').default;
 	};
 
-	type WithRequired<T, K extends keyof T> = T & { [P in K]-?: T[P] };
-	type Simplify<T> = { [KeyType in keyof T]: T[KeyType] } & {};
-	type ImgAttributes = WithRequired<
+	type ImgAttributes = import('./dist/type-utils.js').WithRequired<
 		Omit<import('./types').HTMLAttributes<'img'>, 'src' | 'width' | 'height'>,
 		'alt'
 	>;
 
-	export type LocalImageProps = Simplify<
+	export type LocalImageProps = import('./dist/type-utils.js').Simplify<
 		import('./dist/assets/types.js').LocalImageProps<ImgAttributes>
 	>;
-	export type RemoteImageProps = Simplify<
+	export type RemoteImageProps = import('./dist/type-utils.js').Simplify<
 		import('./dist/assets/types.js').RemoteImageProps<ImgAttributes>
 	>;
 	export const { getImage, getConfiguredImageService, imageConfig, Image }: AstroAssets;

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.
@@ -109,9 +113,7 @@ const { fallback = 'animate' } = Astro.props as Props;
 
 	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 => {
@@ -189,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');
 		};
 
@@ -247,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;
@@ -311,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) {
@@ -341,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) => {
@@ -374,11 +379,11 @@ const { fallback = 'animate' } = Astro.props as Props;
 				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) => {
@@ -403,12 +408,9 @@ const { fallback = 'animate' } = Astro.props as Props;
 		// 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 });
-			}
+			persistState({ ...history.state, scrollY });
 		};
+
 		if ('onscrollend' in window) addEventListener('scrollend', updateState);
 		else addEventListener('scroll', throttle(updateState, 300));
 	}

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

@@ -17,6 +17,7 @@ import type { AstroCookies } from '../core/cookies';
 import type { ResponseWithEncoding } from '../core/endpoint/index.js';
 import type { AstroIntegrationLogger, Logger, LoggerLevel } from '../core/logger/core';
 import type { AstroComponentFactory, AstroComponentInstance } from '../runtime/server';
+import type { OmitIndexSignature, Simplify } from '../type-utils';
 import type { SUPPORTED_MARKDOWN_FILE_EXTENSIONS } from './../core/constants.js';
 export { type AstroIntegrationLogger };
 export type { MarkdownHeading, MarkdownMetadata, MarkdownRenderingResult, RehypePlugins, RemarkPlugins, ShikiConfig, } from '@astrojs/markdown-remark';
@@ -1556,12 +1557,6 @@ export interface Page<T = any> {
         next: string | undefined;
     };
 }
-type OmitIndexSignature<ObjectType> = {
-    [KeyType in keyof ObjectType as {} extends Record<KeyType, unknown> ? never : KeyType]: ObjectType[KeyType];
-};
-type Simplify<T> = {
-    [KeyType in keyof T]: T[KeyType];
-} & {};
 export type PaginateFunction = <PaginateData, AdditionalPaginateProps extends Props, AdditionalPaginateParams extends Params>(data: PaginateData[], args?: PaginateOptions<AdditionalPaginateProps, AdditionalPaginateParams>) => {
     params: Simplify<{
         page: string | undefined;

package/dist/assets/types.d.ts

@@ -1,3 +1,4 @@
+import type { WithRequired } from '../type-utils.js';
 import type { VALID_INPUT_FORMATS, VALID_OUTPUT_FORMATS } from './consts.js';
 import type { ImageService } from './services/service.js';
 export type ImageQualityPreset = 'low' | 'mid' | 'high' | 'max' | (string & {});
@@ -46,9 +47,6 @@ export interface GetImageResult {
     src: string;
     attributes: Record<string, any>;
 }
-type WithRequired<T, K extends keyof T> = T & {
-    [P in K]-?: T[P];
-};
 type ImageSharedProps<T> = T & {
     /**
      * Width of the image, the value of this property will be used to assign the `width` property on the final `img` element.

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.10";
+const ASTRO_VERSION = "3.0.12";
 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.10";
+  const currentVersion = "3.0.12";
   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.10";
+  const version = "3.0.12";
   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.10"}`
+        `v${"3.0.12"}`
       )} ${headline}`
     );
   }

package/dist/type-utils.d.ts

@@ -0,0 +1,10 @@
+export type Simplify<T> = {
+    [KeyType in keyof T]: T[KeyType];
+} & {};
+export type WithRequired<T, K extends keyof T> = T & {
+    [P in K]-?: T[P];
+};
+export type OmitIndexSignature<ObjectType> = {
+    [KeyType in keyof ObjectType as {} extends Record<KeyType, unknown> ? never : KeyType]: ObjectType[KeyType];
+};
+export type ValueOf<T> = T[keyof T];

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

@@ -125,7 +125,7 @@ File: ${id}`
         hydratedComponents: transformResult.hydratedComponents,
         scripts: transformResult.scripts,
         containsHead: transformResult.containsHead,
-        propagation: "none",
+        propagation: transformResult.propagation ? "self" : "none",
         pageOptions: {}
       };
       return {

package/dist/vite-plugin-head/index.js

@@ -34,6 +34,14 @@ function configHeadVitePlugin() {
       if (info && getAstroMetadata(info)?.containsHead) {
         propagateMetadata.call(this, id, "containsHead", true);
       }
+      if (info && getAstroMetadata(info)?.propagation === "self") {
+        const mod = server.moduleGraph.getModuleById(id);
+        for (const parent of mod?.importers ?? []) {
+          if (parent.id) {
+            propagateMetadata.call(this, parent.id, "propagation", "in-tree");
+          }
+        }
+      }
       if (injectExp.test(source)) {
         propagateMetadata.call(this, id, "propagation", "in-tree");
       }
@@ -65,10 +73,21 @@ function astroHeadBuildPlugin(internals) {
                   continue;
                 for (const [id, mod] of Object.entries(output.modules)) {
                   const modinfo = this.getModuleInfo(id);
-                  if (modinfo && getAstroMetadata(modinfo)?.containsHead) {
-                    for (const [pageInfo] of getTopLevelPages(id, this)) {
-                      let metadata = getOrCreateMetadata(pageInfo.id);
-                      metadata.containsHead = true;
+                  if (modinfo) {
+                    const meta = getAstroMetadata(modinfo);
+                    if (meta?.containsHead) {
+                      for (const [pageInfo] of getTopLevelPages(id, this)) {
+                        let metadata = getOrCreateMetadata(pageInfo.id);
+                        metadata.containsHead = true;
+                      }
+                    }
+                    if (meta?.propagation === "self") {
+                      for (const [info] of walkParentInfos(id, this)) {
+                        let metadata = getOrCreateMetadata(info.id);
+                        if (metadata.propagation !== "self") {
+                          metadata.propagation = "in-tree";
+                        }
+                      }
                     }
                   }
                   if (mod.code && injectExp.test(mod.code)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "3.0.10",
+  "version": "3.0.12",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -106,7 +106,7 @@
     "vendor"
   ],
   "dependencies": {
-    "@astrojs/compiler": "^2.0.1",
+    "@astrojs/compiler": "^2.1.0",
     "@babel/core": "^7.22.10",
     "@babel/generator": "^7.22.10",
     "@babel/parser": "^7.22.10",
@@ -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": {