Merge branch 'main' into feat/expose-remote-form-submitted

Author: hrueger

.changeset/cold-islands-tell.md

@@ -0,0 +1,5 @@
+---
+'@sveltejs/kit': patch
+---
+
+fix: wait for commit promise instead of `settled`

.changeset/eager-experts-roll.md

@@ -1,5 +1,17 @@
 # @sveltejs/kit
 
+## 2.48.0
+### Minor Changes
+
+
+- feat: use experimental `fork` API when available ([#14793](https://github.com/sveltejs/kit/pull/14793))
+
+
+### Patch Changes
+
+
+- fix: await for `settled` instead of `tick` in navigate ([#14800](https://github.com/sveltejs/kit/pull/14800))
+
 ## 2.47.3
 ### Patch Changes
 

packages/kit/CHANGELOG.md

@@ -1,6 +1,6 @@
 {
 	"name": "@sveltejs/kit",
-	"version": "2.47.3",
+	"version": "2.48.0",
 	"description": "SvelteKit is the fastest way to build Svelte apps",
 	"keywords": [
 		"framework",

packages/kit/package.json

@@ -206,9 +206,14 @@ const invalidated = [];
  */
 const components = [];
 
-/** @type {{id: string, token: {}, promise: Promise<import('./types.js').NavigationResult>} | null} */
+/** @type {{id: string, token: {}, promise: Promise<import('./types.js').NavigationResult>, fork: Promise<import('svelte').Fork | null> | null} | null} */
 let load_cache = null;
 
+function discard_load_cache() {
+	void load_cache?.fork?.then((f) => f?.discard());
+	load_cache = null;
+}
+
 /**
  * @type {Map<string, Promise<URL>>}
  * Cache for client-side rerouting, since it could contain async calls which we want to
@@ -382,7 +387,7 @@ async function _invalidate(include_load_functions = true, reset_page_state = tru
 	// Also solves an edge case where a preload is triggered, the navigation for it
 	// was then triggered and is still running while the invalidation kicks in,
 	// at which point the invalidation should take over and "win".
-	load_cache = null;
+	discard_load_cache();
 
 	// Rerun queries
 	if (force_invalidation) {
@@ -461,7 +466,7 @@ export async function _goto(url, options, redirect_count, nav_token) {
 	// Clear preload cache when invalidateAll is true to ensure fresh data
 	// after form submissions or explicit invalidations
 	if (options.invalidateAll) {
-		load_cache = null;
+		discard_load_cache();
 	}
 
 	await navigate({
@@ -518,11 +523,32 @@ async function _preload_data(intent) {
 				preload_tokens.delete(preload);
 				if (result.type === 'loaded' && result.state.error) {
 					// Don't cache errors, because they might be transient
-					load_cache = null;
+					discard_load_cache();
 				}
 				return result;
-			})
+			}),
+			fork: null
 		};
+
+		if (svelte.fork) {
+			const lc = load_cache;
+
+			lc.fork = lc.promise.then((result) => {
+				// if load_cache was discarded before load_cache.promise could
+				// resolve, bail rather than creating an orphan fork
+				if (lc === load_cache && result.type === 'loaded') {
+					try {
+						return svelte.fork(() => {
+							root.$set(result.props);
+						});
+					} catch {
+						// if it errors, it's because the experimental flag isn't enabled
+					}
+				}
+
+				return null;
+			});
+		}
 	}
 
 	return load_cache.promise;
@@ -1658,10 +1684,15 @@ async function navigate({
 	}
 
 	// reset preload synchronously after the history state has been set to avoid race conditions
+	const load_cache_fork = load_cache?.fork;
 	load_cache = null;
 
 	navigation_result.props.page.state = state;
 
+	/**
+	 * @type {Promise<void> | undefined}
+	 */
+	let commit_promise;
 	if (started) {
 		const after_navigate = (
 			await Promise.all(
@@ -1692,7 +1723,14 @@ async function navigate({
 			navigation_result.props.page.url = url;
 		}
 
-		root.$set(navigation_result.props);
+		const fork = load_cache_fork && (await load_cache_fork);
+
+		if (fork) {
+			commit_promise = fork.commit();
+		} else {
+			root.$set(navigation_result.props);
+		}
+
 		update(navigation_result.props.page);
 		has_navigated = true;
 	} else {
@@ -1704,9 +1742,9 @@ async function navigate({
 	const promises = [tick()];
 
 	// need to render the DOM before we can scroll to the rendered elements and do focus management
-	// svelte.settled is only available in Svelte 5
-	if (/** @type {any} */ (svelte).settled) {
-		promises.push(/** @type {any} */ (svelte).settled());
+	// so we wait for the commit if there's one
+	if (commit_promise) {
+		promises.push(commit_promise);
 	}
 	// we still need to await tick everytime because if there's no async work settled resolves immediately
 	await Promise.all(promises);

packages/kit/src/runtime/client/client.js

@@ -1,4 +1,4 @@
 // generated during release, do not modify
 
 /** @type {string} */
-export const VERSION = '2.47.3';
+export const VERSION = '2.48.0';