Merge branch 'next' into hd/fix-astrojs-check-version-0-9-7-beta

HiDeoo · web-flow · commit 8d3aa2879930 · 2026-01-15T11:02:40.000+01:00
diff --git a/.changeset/drop-cjs-config-support.md b/.changeset/drop-cjs-config-support.md
@@ -2,6 +2,4 @@
 'astro': major
 ---
 
-Dropped support for `astro.config.cjs` and `astro.config.cts`.
-
-Rename your configuration file using the extensions `.mjs`, `.js`, `.ts` or `mts`.
+Removes support for CommonJS config files - ([v6 upgrade guidance](https://v6.docs.astro.build/en/guides/upgrade-to/v6/#removed-support-for-commonjs-config-files))
diff --git a/.changeset/tangy-years-grin.md b/.changeset/tangy-years-grin.md
@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Fixes an issue where the `astro:page-load` event did not fire on initial page loads.
diff --git a/packages/astro/src/transitions/events.ts b/packages/astro/src/transitions/events.ts
@@ -1,4 +1,3 @@
-import { updateScrollPosition } from './router.js';
 import { swap } from './swap-functions.js';
 import type { Direction, NavigationTypeString } from './types.js';
 
@@ -184,6 +183,15 @@ export async function doPreparation(
 	return event;
 }
 
+// only update history entries that are managed by us
+// leave other entries alone and do not accidentally add state.
+export const updateScrollPosition = (positions: { scrollX: number; scrollY: number }) => {
+	if (history.state) {
+		history.scrollRestoration = 'manual';
+		history.replaceState({ ...history.state, ...positions }, '');
+	}
+};
+
 export async function doSwap(
 	afterPreparation: BeforeEvent,
 	viewTransition: ViewTransition,
diff --git a/packages/astro/src/transitions/router.ts b/packages/astro/src/transitions/router.ts
@@ -6,6 +6,7 @@ import {
 	TRANSITION_AFTER_SWAP,
 	onPageLoad,
 	triggerEvent,
+	updateScrollPosition,
 } from './events.js';
 import { detectScriptExecuted } from './swap-functions.js';
 import type { Direction, Fallback, Options } from './types.js';
@@ -27,15 +28,6 @@ type Transition = {
 
 const inBrowser = import.meta.env.SSR === false;
 
-// only update history entries that are managed by us
-// leave other entries alone and do not accidentally add state.
-export const updateScrollPosition = (positions: { scrollX: number; scrollY: number }) => {
-	if (history.state) {
-		history.scrollRestoration = 'manual';
-		history.replaceState({ ...history.state, ...positions }, '');
-	}
-};
-
 export const supportsViewTransitions = inBrowser && !!document.startViewTransition;
 
 export const transitionEnabledOnThisPage = () =>

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +'astro': patch
 +---
++
 +Fixes an issue where the `astro:page-load` event did not fire on initial page loads.