@sveltejs/kit 2.60.0 → 2.61.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sveltejs/kit",
-  "version": "2.60.0",
+  "version": "2.61.0",
   "description": "SvelteKit is the fastest way to build Svelte apps",
   "keywords": [
     "framework",
@@ -19,11 +19,11 @@
   "type": "module",
   "dependencies": {
     "@standard-schema/spec": "^1.0.0",
-    "@sveltejs/acorn-typescript": "^1.0.5",
+    "@sveltejs/acorn-typescript": "^1.0.9",
     "@types/cookie": "^0.6.0",
-    "acorn": "^8.14.1",
+    "acorn": "^8.16.0",
     "cookie": "^0.6.0",
-    "devalue": "^5.6.4",
+    "devalue": "^5.8.1",
     "esm-env": "^1.2.2",
     "kleur": "^4.1.5",
     "magic-string": "^0.30.5",
@@ -38,16 +38,17 @@
     "@types/connect": "^3.4.38",
     "@types/node": "^18.19.119",
     "@types/set-cookie-parser": "^2.4.7",
-    "dts-buddy": "^0.7.0",
+    "dts-buddy": "^0.8.0",
+    "jsdom": "^26.1.0",
     "rollup": "^4.59.0",
-    "svelte": "^5.53.12",
+    "svelte": "^5.55.7",
     "typescript": "^5.3.3",
     "vite": "^6.4.2",
-    "vitest": "^4.0.0"
+    "vitest": "^4.1.7"
   },
   "peerDependencies": {
-    "@sveltejs/vite-plugin-svelte": "^3.0.0 || ^4.0.0-next.1 || ^5.0.0 || ^6.0.0-next.0 || ^7.0.0",
     "@opentelemetry/api": "^1.0.0",
+    "@sveltejs/vite-plugin-svelte": "^3.0.0 || ^4.0.0-next.1 || ^5.0.0 || ^6.0.0-next.0 || ^7.0.0",
     "svelte": "^4.0.0 || ^5.0.0-next.0",
     "typescript": "^5.3.3 || ^6.0.0",
     "vite": "^5.0.3 || ^6.0.0 || ^7.0.0-beta.0 || ^8.0.0"
@@ -125,9 +126,7 @@
     "test:server-side-route-resolution:build": "pnpm test:unit && pnpm -r --workspace-concurrency 1 --filter=\"./test/**\" test:server-side-route-resolution:build",
     "test:svelte-async:dev": "pnpm -r --workspace-concurrency 1 --filter=\"./test/**\" test:svelte-async:dev",
     "test:svelte-async:build": "pnpm test:unit && pnpm -r --workspace-concurrency 1 --filter=\"./test/**\" test:svelte-async:build",
-    "test:unit:dev": "vitest --config kit.vitest.config.js run",
-    "test:unit:prod": "NODE_ENV=production vitest --config kit.vitest.config.js run csp.spec.js cookie.spec.js",
-    "test:unit": "pnpm test:unit:dev && pnpm test:unit:prod",
+    "test:unit": "vitest --config kit.vitest.config.js run",
     "generate:version": "node scripts/generate-version.js",
     "generate:types": "node scripts/generate-dts.js"
   }

package/src/core/postbuild/analyse.js

@@ -24,7 +24,6 @@ export default forked(import.meta.url, analyse);
  *   tracked_features: Record<string, string[]>;
  *   env: Record<string, string>;
  *   out: string;
- *   output_config: import('types').RecursiveRequired<import('types').ValidatedConfig['kit']['output']>;
  *   remotes: RemoteChunk[];
  * }} opts
  */
@@ -36,7 +35,6 @@ async function analyse({
 	tracked_features,
 	env,
 	out,
-	output_config,
 	remotes
 }) {
 	/** @type {import('@sveltejs/kit').SSRManifest} */
@@ -66,7 +64,7 @@ async function analyse({
 	internal.set_read_implementation((file) => createReadableStream(`${server_root}/server/${file}`));
 
 	// first, build server nodes without the client manifest so we can analyse it
-	build_server_nodes(out, config, manifest_data, server_manifest, null, null, null, output_config);
+	build_server_nodes(out, config, manifest_data, server_manifest, null, null, null);
 
 	/** @type {import('types').ServerMetadata} */
 	const metadata = {

package/src/core/sync/create_manifest_data/conflict.js

@@ -0,0 +1,72 @@
+/** @param {import('types').RouteData[]} routes */
+export function prevent_conflicts(routes) {
+	/** @type {Map<string, string>} */
+	const lookup = new Map();
+
+	for (const route of routes) {
+		if (!route.leaf && !route.endpoint) continue;
+
+		/** @type {string[]} */
+		let permutations;
+
+		const normalized = normalize_route_id(route.id);
+
+		const ends_with_optional = /<\?.+?>$/.test(normalized);
+		if (!ends_with_optional && Array.from(normalized.matchAll(/<\?.+?>/g)).length) {
+			// find all permutations created by optional parameters
+			const split = normalized.split(/<\?(.+?)>/g);
+
+			permutations = [/** @type {string} */ (split[0])];
+
+			// turn `x/[[optional]]/y` into `x/y` and `x/[required]/y`
+			for (let i = 1; i < split.length; i += 2) {
+				const matcher = split[i];
+				const next = split[i + 1];
+
+				permutations = permutations.reduce((a, b) => {
+					a.push(b + next);
+					if (!(matcher === '*' && b.endsWith('//'))) a.push(b + `<${matcher}>${next}`);
+					return a;
+				}, /** @type {string[]} */ ([]));
+			}
+		} else {
+			permutations = [normalized];
+		}
+
+		for (const permutation of permutations) {
+			// remove leading/trailing/duplicated slashes caused by prior
+			// manipulation of optional parameters and (groups)
+			const key = permutation
+				.replace(/\/{2,}/, '/')
+				.replace(/^\//, '')
+				.replace(/\/$/, '');
+
+			if (lookup.has(key)) {
+				throw new Error(
+					`The "${lookup.get(key)}" and "${route.id}" routes conflict with each other`
+				);
+			}
+
+			lookup.set(key, route.id);
+		}
+	}
+}
+
+/** @param {string} id */
+function normalize_route_id(id) {
+	return (
+		id
+			// remove groups
+			.replace(/(?<=^|\/)\(.+?\)(?=$|\/)/g, '')
+
+			.replace(/\[[ux]\+([0-9a-f]+)\]/g, (_, x) =>
+				String.fromCharCode(parseInt(x, 16)).replace(/\//g, '%2f')
+			)
+
+			// replace `[param]` with `<*>`, `[param=x]` with `<x>`, and `[[param]]` with `<?*>`
+			.replace(
+				/\[(?:(\[)|(\.\.\.))?.+?(=.+?)?\]\]?/g,
+				(_, optional, rest, matcher) => `<${optional ? '?' : ''}${rest ?? ''}${matcher ?? '*'}>`
+			)
+	);
+}

package/src/core/sync/create_manifest_data/index.js

@@ -6,6 +6,7 @@ import { lookup } from 'mrmime';
 import { list_files, runtime_directory } from '../../utils.js';
 import { posixify, resolve_entry } from '../../../utils/filesystem.js';
 import { parse_route_id } from '../../../utils/routing.js';
+import { prevent_conflicts } from './conflict.js';
 import { sort_routes } from './sort.js';
 import { isSvelte5Plus } from '../utils.js';
 import {
@@ -546,68 +547,3 @@ function count_occurrences(needle, haystack) {
 	}
 	return count;
 }
-
-/** @param {import('types').RouteData[]} routes */
-function prevent_conflicts(routes) {
-	/** @type {Map<string, string>} */
-	const lookup = new Map();
-
-	for (const route of routes) {
-		if (!route.leaf && !route.endpoint) continue;
-
-		const normalized = normalize_route_id(route.id);
-
-		// find all permutations created by optional parameters
-		const split = normalized.split(/<\?(.+?)>/g);
-
-		let permutations = [/** @type {string} */ (split[0])];
-
-		// turn `x/[[optional]]/y` into `x/y` and `x/[required]/y`
-		for (let i = 1; i < split.length; i += 2) {
-			const matcher = split[i];
-			const next = split[i + 1];
-
-			permutations = permutations.reduce((a, b) => {
-				a.push(b + next);
-				if (!(matcher === '*' && b.endsWith('//'))) a.push(b + `<${matcher}>${next}`);
-				return a;
-			}, /** @type {string[]} */ ([]));
-		}
-
-		for (const permutation of permutations) {
-			// remove leading/trailing/duplicated slashes caused by prior
-			// manipulation of optional parameters and (groups)
-			const key = permutation
-				.replace(/\/{2,}/, '/')
-				.replace(/^\//, '')
-				.replace(/\/$/, '');
-
-			if (lookup.has(key)) {
-				throw new Error(
-					`The "${lookup.get(key)}" and "${route.id}" routes conflict with each other`
-				);
-			}
-
-			lookup.set(key, route.id);
-		}
-	}
-}
-
-/** @param {string} id */
-function normalize_route_id(id) {
-	return (
-		id
-			// remove groups
-			.replace(/(?<=^|\/)\(.+?\)(?=$|\/)/g, '')
-
-			.replace(/\[[ux]\+([0-9a-f]+)\]/g, (_, x) =>
-				String.fromCharCode(parseInt(x, 16)).replace(/\//g, '%2f')
-			)
-
-			// replace `[param]` with `<*>`, `[param=x]` with `<x>`, and `[[param]]` with `<?*>`
-			.replace(
-				/\[(?:(\[)|(\.\.\.))?.+?(=.+?)?\]\]?/g,
-				(_, optional, rest, matcher) => `<${optional ? '?' : ''}${rest ?? ''}${matcher ?? '*'}>`
-			)
-	);
-}

package/src/core/sync/write_non_ambient.js

@@ -204,7 +204,7 @@ function generate_app_types(manifest_data, config) {
 		if (route.params.length > 0) {
 			const params = route.params.map((p) => {
 				const type = get_matcher_type(p.matcher);
-				return `${p.name}${p.optional ? '?:' : ':'} ${type}`;
+				return `${p.name}${p.optional ? '?:' : ':'} ${type}${p.optional ? ' | undefined' : ''}`;
 			});
 			const route_type = `${s(route.id)}: { ${params.join('; ')} }`;
 
@@ -225,7 +225,7 @@ function generate_app_types(manifest_data, config) {
 			const params = Array.from(layout_params)
 				.map(([name, { optional, matchers }]) => {
 					const type = get_matchers_type(matchers);
-					return `${name}${optional ? '?:' : ':'} ${type}`;
+					return `${name}${optional ? '?:' : ':'} ${type}${optional ? ' | undefined' : ''}`;
 				})
 				.join('; ');
 

package/src/core/sync/write_types/index.js

@@ -609,7 +609,7 @@ function generate_params_type(params, outdir, config) {
 					param.matcher
 						? `MatcherParam<typeof import('${path_to_matcher(param.matcher)}').match>`
 						: 'string'
-				}`
+				}${param.optional ? ' | undefined' : ''}`
 		)
 		.join('; ')} }`;
 }

package/src/exports/public.d.ts

@@ -2145,15 +2145,19 @@ export type RemoteForm<Input extends RemoteFormInput | void, Output> = {
 	method: 'POST';
 	/** The URL to send the form to. */
 	action: string;
+	/** The `<form>` element this instance is currently attached to, if any. */
+	get element(): HTMLFormElement | null;
+	/** Submit the currently attached form programmatically. */
+	submit(): Promise<boolean> & {
+		updates: (...updates: RemoteQueryUpdate[]) => Promise<boolean>;
+	};
 	/** Use the `enhance` method to influence what happens when the form is submitted. */
 	enhance(
-		callback: (opts: {
-			form: HTMLFormElement;
-			data: Input;
-			submit: () => Promise<boolean> & {
-				updates: (...updates: RemoteQueryUpdate[]) => Promise<boolean>;
-			};
-		}) => MaybePromise<void>
+		callback: (
+			form: Omit<RemoteForm<Input, Output>, 'enhance' | 'element'> & {
+				readonly element: HTMLFormElement;
+			}
+		) => MaybePromise<void>
 	): {
 		method: 'POST';
 		action: string;
@@ -2228,12 +2232,6 @@ export type RemoteResource<T> = Promise<T> & {
 	);
 
 export type RemoteQuery<T> = RemoteResource<T> & {
-	/**
-	 * Returns a plain promise with the result.
-	 * Unlike awaiting the resource directly, this can only be used _outside_ render
-	 * (i.e. in load functions, event handlers and so on)
-	 */
-	run(): Promise<T>;
 	/**
 	 * On the client, this function will update the value of the query without re-fetching it.
 	 *
@@ -2257,9 +2255,9 @@ export type RemoteQuery<T> = RemoteResource<T> & {
 	 *   const todos = getTodos();
 	 * </script>
 	 *
-	 * <form {...addTodo.enhance(async ({ data, submit }) => {
-	 *   await submit().updates(
-	 *     todos.withOverride((todos) => [...todos, { text: data.get('text') }])
+	 * <form {...addTodo.enhance(async (form) => {
+	 *   await form.submit().updates(
+	 *     todos.withOverride((todos) => [...todos, { text: form.fields.text.value() }])
 	 *   );
 	 * })}>
 	 *   <input type="text" name="text" />
@@ -2270,20 +2268,15 @@ export type RemoteQuery<T> = RemoteResource<T> & {
 	withOverride(update: (current: T) => T): RemoteQueryOverride;
 };
 
-export type RemoteLiveQuery<T> = RemoteResource<T> & {
-	/**
-	 * Returns an async iterator with live updates.
-	 * Unlike awaiting the resource directly, this can only be used _outside_ render
-	 * (i.e. in load functions, event handlers and so on)
-	 */
-	run(): AsyncGenerator<T>;
-	/** `true` if the live stream is currently connected. */
-	readonly connected: boolean;
-	/** `true` once the current live stream iterator is done. */
-	readonly done: boolean;
-	/** Reconnects the live stream immediately. */
-	reconnect(): Promise<void>;
-};
+export type RemoteLiveQuery<T> = RemoteResource<T> &
+	AsyncIterable<T> & {
+		/** `true` if the live stream is currently connected. */
+		readonly connected: boolean;
+		/** `true` once the current live stream iterator is done. */
+		readonly done: boolean;
+		/** Reconnects the live stream immediately. */
+		reconnect(): Promise<void>;
+	};
 
 export type RemoteQueryOverride = () => void;
 

package/src/exports/vite/build/build_server.js

@@ -1,3 +1,5 @@
+/** @import { AssetDependencies, ManifestData, SSRNode, ValidatedKitConfig } from 'types' */
+/** @import { Manifest, Rollup } from 'vite' */
 import fs from 'node:fs';
 import { mkdirp } from '../../../utils/filesystem.js';
 import {
@@ -14,14 +16,36 @@ import { fix_css_urls } from '../../../utils/css.js';
 import { escape_for_interpolation } from '../../../utils/escape.js';
 
 /**
+ * @overload Build without the client manifest so we can analyse the nodes.
  * @param {string} out
- * @param {import('types').ValidatedKitConfig} kit
- * @param {import('types').ManifestData} manifest_data
- * @param {import('vite').Manifest} server_manifest
- * @param {import('vite').Manifest | null} client_manifest
+ * @param {ValidatedKitConfig} kit
+ * @param {ManifestData} manifest_data
+ * @param {Manifest} server_manifest
+ * @param {null} client_manifest
+ * @param {null} assets_path
+ * @param {null} client_chunks
+ * @returns {void}
+ */
+/**
+ * @overload Or build with the client manifest
+ * @param {string} out
+ * @param {ValidatedKitConfig} kit
+ * @param {ManifestData} manifest_data
+ * @param {Manifest} server_manifest
+ * @param {Manifest} client_manifest
+ * @param {string} assets_path
+ * @param {Rollup.RollupOutput['output']} client_chunks
+ * @returns {void}
+ */
+/**
+ * @param {string} out
+ * @param {ValidatedKitConfig} kit
+ * @param {ManifestData} manifest_data
+ * @param {Manifest} server_manifest
+ * @param {Manifest | null} client_manifest
  * @param {string | null} assets_path
- * @param {import('vite').Rollup.RollupOutput['output'] | null} client_chunks
- * @param {import('types').RecursiveRequired<import('types').ValidatedConfig['kit']['output']>} output_config
+ * @param {Rollup.RollupOutput['output'] | null} client_chunks
+ * @returns {void}
  */
 export function build_server_nodes(
 	out,
@@ -30,8 +54,7 @@ export function build_server_nodes(
 	server_manifest,
 	client_manifest,
 	assets_path,
-	client_chunks,
-	output_config
+	client_chunks
 ) {
 	mkdirp(`${out}/server/nodes`);
 	mkdirp(`${out}/server/stylesheets`);
@@ -49,7 +72,7 @@ export function build_server_nodes(
 	 */
 	let prepare_css_for_inlining = (css) => s(css);
 
-	if (client_chunks && kit.inlineStyleThreshold > 0 && output_config.bundleStrategy === 'split') {
+	if (client_chunks && kit.inlineStyleThreshold > 0 && kit.output.bundleStrategy === 'split') {
 		for (const chunk of client_chunks) {
 			if (chunk.type !== 'asset' || !chunk.fileName.endsWith('.css')) {
 				continue;
@@ -113,7 +136,7 @@ export function build_server_nodes(
 		const imports = [];
 
 		// String representation of
-		/** @type {import('types').SSRNode} */
+		/** @type {SSRNode} */
 		/** @type {string[]} */
 		const exports = [`export const index = ${i};`];
 
@@ -162,7 +185,7 @@ export function build_server_nodes(
 		if (
 			client_manifest &&
 			(node.universal || node.component) &&
-			output_config.bundleStrategy === 'split'
+			kit.output.bundleStrategy === 'split'
 		) {
 			const entry_path = `${normalizePath(kit.outDir)}/generated/client-optimized/nodes/${i}.js`;
 			const entry = find_deps(client_manifest, entry_path, true);
@@ -171,13 +194,13 @@ export function build_server_nodes(
 			// However, if it is not used during SSR (not present in the server manifest),
 			// then it can be lazily loaded in the browser.
 
-			/** @type {import('types').AssetDependencies | undefined} */
+			/** @type {AssetDependencies | undefined} */
 			let component;
 			if (node.component) {
 				component = find_deps(server_manifest, node.component, true);
 			}
 
-			/** @type {import('types').AssetDependencies | undefined} */
+			/** @type {AssetDependencies | undefined} */
 			let universal;
 			if (node.universal) {
 				universal = find_deps(server_manifest, node.universal, true);

package/src/exports/vite/dev/index.js

@@ -568,8 +568,10 @@ export async function dev(vite, vite_config, svelte_config, get_remotes) {
 
 						return fs.readFileSync(path.join(svelte_config.kit.files.assets, file));
 					},
-					before_handle: (event, config, prerender) => {
-						async_local_storage.enterWith({ event, config, prerender });
+					before_handle: async (event, config, prerender, handle) => {
+						// we need to use .run because .enterWith() is not supported in Cloudflare Workers
+						// see https://blog.cloudflare.com/workers-node-js-asynclocalstorage/
+						return await async_local_storage.run({ event, config, prerender }, handle);
 					},
 					emulator
 				});

package/src/exports/vite/index.js

@@ -198,7 +198,10 @@ async function kit({ svelte_config }) {
 	const is_rolldown = !!vite.rolldownVersion;
 
 	const { kit } = svelte_config;
-	const out = `${kit.outDir}/output`;
+	/** `kit.outDir` but posix-ified */
+	const out_dir = posixify(kit.outDir);
+	/** The base directory for the Vite builds */
+	const out = `${out_dir}/output`;
 
 	const version_hash = hash(kit.version.name);
 
@@ -268,7 +271,7 @@ async function kit({ svelte_config }) {
 				const client_hooks = resolve_entry(kit.files.hooks.client);
 				if (client_hooks) allow.add(path.dirname(client_hooks));
 
-				const generated = path.posix.join(kit.outDir, 'generated');
+				const generated = path.posix.join(out_dir, 'generated');
 
 				// dev and preview config can be shared
 				/** @type {UserConfig} */
@@ -290,7 +293,7 @@ async function kit({ svelte_config }) {
 						watch: {
 							ignored: [
 								// Ignore all siblings of config.kit.outDir/generated
-								`${posixify(kit.outDir)}/!(generated)`
+								`${out_dir}/!(generated)`
 							]
 						}
 					},
@@ -373,7 +376,8 @@ async function kit({ svelte_config }) {
 					__SVELTEKIT_CLIENT_ROUTING__: s(kit.router.resolution === 'client'),
 					__SVELTEKIT_HASH_ROUTING__: s(kit.router.type === 'hash'),
 					__SVELTEKIT_SERVER_TRACING_ENABLED__: s(kit.experimental.tracing.server),
-					__SVELTEKIT_EXPERIMENTAL_USE_TRANSFORM_ERROR__: s(kit.experimental.handleRenderingErrors)
+					__SVELTEKIT_EXPERIMENTAL_USE_TRANSFORM_ERROR__: s(kit.experimental.handleRenderingErrors),
+					__SVELTEKIT_DEV__: s(!is_build)
 				};
 
 				if (is_build) {
@@ -447,7 +451,7 @@ async function kit({ svelte_config }) {
 
 		resolveId(id, importer) {
 			if (id === '__sveltekit/manifest') {
-				return `${kit.outDir}/generated/client-optimized/app.js`;
+				return `${out_dir}/generated/client-optimized/app.js`;
 			}
 
 			// If importing from a service-worker, only allow $service-worker & $env/static/public, but none of the other virtual modules.
@@ -839,7 +843,7 @@ async function kit({ svelte_config }) {
 
 					if (ssr) {
 						input.index = `${runtime_directory}/server/index.js`;
-						input.internal = `${kit.outDir}/generated/server/internal.js`;
+						input.internal = `${out_dir}/generated/server/internal.js`;
 						input['remote-entry'] = `${runtime_directory}/app/server/remote/index.js`;
 
 						// add entry points for every endpoint...
@@ -905,10 +909,10 @@ async function kit({ svelte_config }) {
 						input['bundle'] = `${runtime_directory}/client/bundle.js`;
 					} else {
 						input['entry/start'] = `${runtime_directory}/client/entry.js`;
-						input['entry/app'] = `${kit.outDir}/generated/client-optimized/app.js`;
+						input['entry/app'] = `${out_dir}/generated/client-optimized/app.js`;
 						manifest_data.nodes.forEach((node, i) => {
 							if (node.component || node.universal) {
-								input[`nodes/${i}`] = `${kit.outDir}/generated/client-optimized/nodes/${i}.js`;
+								input[`nodes/${i}`] = `${out_dir}/generated/client-optimized/nodes/${i}.js`;
 							}
 						});
 					}
@@ -953,7 +957,7 @@ async function kit({ svelte_config }) {
 										(is_rolldown
 											? warning.code === 'IMPORT_IS_UNDEFINED'
 											: warning.code === 'MISSING_EXPORT') &&
-										warning.id === `${kit.outDir}/generated/client-optimized/app.js`
+										warning.id === `${out_dir}/generated/client-optimized/app.js`
 									) {
 										// ignore e.g. undefined `handleError` hook when
 										// referencing `client_hooks.handleError`
@@ -1109,7 +1113,6 @@ async function kit({ svelte_config }) {
 					tracked_features,
 					env: { ...env.private, ...env.public },
 					out,
-					output_config: svelte_config.output,
 					remotes
 				});
 
@@ -1121,7 +1124,7 @@ async function kit({ svelte_config }) {
 				write_client_manifest(
 					kit,
 					manifest_data,
-					`${kit.outDir}/generated/client-optimized`,
+					`${out_dir}/generated/client-optimized`,
 					metadata.nodes
 				);
 
@@ -1209,7 +1212,7 @@ async function kit({ svelte_config }) {
 
 				if (svelte_config.kit.output.bundleStrategy === 'split') {
 					const start = deps_of(`${runtime_directory}/client/entry.js`);
-					const app = deps_of(`${kit.outDir}/generated/client-optimized/app.js`);
+					const app = deps_of(`${out_dir}/generated/client-optimized/app.js`);
 
 					build_data.client = {
 						start: start.file,
@@ -1228,11 +1231,11 @@ async function kit({ svelte_config }) {
 					if (svelte_config.kit.router.resolution === 'server') {
 						const nodes = manifest_data.nodes.map((node, i) => {
 							if (node.component || node.universal) {
-								const entry = `${kit.outDir}/generated/client-optimized/nodes/${i}.js`;
+								const entry = `${out_dir}/generated/client-optimized/nodes/${i}.js`;
 								const deps = deps_of(entry, true);
 								const file = resolve_symlinks(
 									client_manifest,
-									`${kit.outDir}/generated/client-optimized/nodes/${i}.js`
+									`${out_dir}/generated/client-optimized/nodes/${i}.js`
 								).chunk.file;
 
 								return { file, css: deps.stylesheets };
@@ -1308,8 +1311,7 @@ async function kit({ svelte_config }) {
 					server_manifest,
 					client_manifest,
 					assets_path,
-					client_chunks,
-					svelte_config.kit.output
+					client_chunks
 				);
 
 				// ...and prerender

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

@@ -1,6 +1,5 @@
 import { read_implementation, manifest } from '__sveltekit/server';
 import { base } from '$app/paths';
-import { DEV } from 'esm-env';
 import { base64_decode } from '../../utils.js';
 
 /**
@@ -55,7 +54,7 @@ export function read(asset) {
 	}
 
 	const file = decodeURIComponent(
-		DEV && asset.startsWith('/@fs') ? asset : asset.slice(base.length + 1)
+		__SVELTEKIT_DEV__ && asset.startsWith('/@fs') ? asset : asset.slice(base.length + 1)
 	);
 
 	if (file in manifest._.server_assets) {

package/src/runtime/app/server/remote/form.js

@@ -243,6 +243,16 @@ export function form(validate_or_fn, maybe_fn) {
 			}
 		});
 
+		Object.defineProperty(instance, 'submit', {
+			value: () => {
+				throw new Error('Cannot call submit() on the server');
+			}
+		});
+
+		Object.defineProperty(instance, 'element', {
+			get: () => null
+		});
+
 		if (key == undefined) {
 			Object.defineProperty(instance, 'for', {
 				/** @type {RemoteForm<any, any>['for']} */