@sveltejs/kit 2.43.3 → 2.43.5

package/package.json

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

package/src/runtime/app/paths/server.js

@@ -1,6 +1,6 @@
 import { base, assets, relative } from './internal/server.js';
 import { resolve_route } from '../../../utils/routing.js';
-import { get_request_store } from '@sveltejs/kit/internal/server';
+import { try_get_request_store } from '@sveltejs/kit/internal/server';
 
 /** @type {import('./client.js').asset} */
 export function asset(file) {
@@ -13,19 +13,17 @@ export function resolve(id, params) {
 	const resolved = resolve_route(id, /** @type {Record<string, string>} */ (params));
 
 	if (relative) {
-		const { event, state } = get_request_store();
+		const store = try_get_request_store();
 
-		if (state.prerendering?.fallback) {
-			return resolved;
-		}
-
-		const segments = event.url.pathname.slice(base.length).split('/').slice(2);
-		const prefix = segments.map(() => '..').join('/') || '.';
+		if (store && !store.state.prerendering?.fallback) {
+			const segments = store.event.url.pathname.slice(base.length).split('/').slice(2);
+			const prefix = segments.map(() => '..').join('/') || '.';
 
-		return prefix + resolved;
+			return prefix + resolved;
+		}
 	}
 
-	return resolved;
+	return base + resolved;
 }
 
 export { base, assets, resolve as resolveRoute };

package/src/runtime/server/index.js

@@ -13,6 +13,9 @@ import { set_app } from './app.js';
 /** @type {Promise<any>} */
 let init_promise;
 
+/** @type {Promise<void> | null} */
+let current = null;
+
 export class Server {
 	/** @type {import('types').SSROptions} */
 	#options;
@@ -31,9 +34,6 @@ export class Server {
 		if (IN_WEBCONTAINER) {
 			const respond = this.respond.bind(this);
 
-			/** @type {Promise<void> | null} */
-			let current = null;
-
 			/** @type {typeof respond} */
 			this.respond = async (...args) => {
 				const { promise, resolve } = /** @type {PromiseWithResolvers<void>} */ (with_resolvers());

package/src/version.js

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