fix: use Vite root config setting instead of current working directory

.changeset/nasty-impalas-wear.md

@@ -0,0 +1,5 @@
+---
+'@sveltejs/kit': minor
+---
+
+feat: resolve paths using the Vite config `root` option instead of `process.cwd()` to better support monorepo configurations such as Vitest workspaces

package.json

@@ -30,7 +30,8 @@
 		"@svitejs/changesets-changelog-github-compact": "catalog:",
 		"eslint": "catalog:",
 		"prettier": "catalog:",
-		"prettier-plugin-svelte": "catalog:"
+		"prettier-plugin-svelte": "catalog:",
+		"vitest": "catalog:"
 	},
 	"packageManager": "pnpm@10.30.3+sha512.c961d1e0a2d8e354ecaa5166b822516668b7f44cb5bd95122d590dd81922f606f5473b6d23ec4a5be05e7fcd18e8488d47d978bbe981872f1145d06e9a740017",
 	"engines": {

packages/adapter-auto/vitest.config.js

@@ -0,0 +1,5 @@
+// we need this file to prevent Vitest from resolving a Vitest config from another directory
+
+import { defineConfig } from 'vitest/config';
+
+export default defineConfig({});

packages/adapter-cloudflare/tsconfig.json

@@ -20,6 +20,7 @@
 		"utils.js",
 		"utils.spec.js",
 		"rolldown.config.js",
+		"vitest.config.js",
 		"test/utils.js",
 		"internal.d.ts",
 		"src/worker.js"

packages/adapter-cloudflare/vitest.config.js

@@ -0,0 +1,5 @@
+// we need this file to prevent Vitest from resolving a Vitest config from another directory
+
+import { defineConfig } from 'vitest/config';
+
+export default defineConfig({});

packages/adapter-netlify/vitest.config.js

@@ -0,0 +1,5 @@
+// we need this file to prevent Vitest from resolving a Vitest config from another directory
+
+import { defineConfig } from 'vitest/config';
+
+export default defineConfig({});

packages/adapter-node/tsconfig.json

@@ -17,6 +17,7 @@
 	"include": [
 		"index.js",
 		"rolldown.config.js",
+		"vitest.config.js",
 		"src/**/*.js",
 		"tests/**/*.js",
 		"tests/**/*.ts",

packages/adapter-node/vitest.config.js

@@ -0,0 +1,5 @@
+// we need this file to prevent Vitest from resolving a Vitest config from another directory
+
+import { defineConfig } from 'vitest/config';
+
+export default defineConfig({});

packages/adapter-vercel/vitest.config.js

@@ -0,0 +1,5 @@
+// we need this file to prevent Vitest from resolving a Vitest config from another directory
+
+import { defineConfig } from 'vitest/config';
+
+export default defineConfig({});

packages/enhanced-img/tsconfig.json

@@ -15,5 +15,5 @@
 		"noUnusedLocals": true,
 		"noUnusedParameters": true
 	},
-	"include": ["src/**/*", "types/**/*", "test/**/*"]
+	"include": ["src/**/*", "types/**/*", "test/**/*", "vitest.config.js"]
 }

packages/enhanced-img/vitest.config.js

@@ -0,0 +1,5 @@
+// we need this file to prevent Vitest from resolving a Vitest config from another directory
+
+import { defineConfig } from 'vitest/config';
+
+export default defineConfig({});

packages/kit/scripts/generate-version.js

@@ -1,8 +1,11 @@
 import fs from 'node:fs';
+import path from 'node:path';
 
-const pkg = JSON.parse(fs.readFileSync('package.json', 'utf-8'));
+const pkg = JSON.parse(
+	fs.readFileSync(path.join(import.meta.dirname, '..', 'package.json'), 'utf-8')
+);
 
 fs.writeFileSync(
-	'./src/version.js',
+	path.join(import.meta.dirname, '..', 'src', 'version.js'),
 	`// generated during release, do not modify\n\n/** @type {string} */\nexport const VERSION = '${pkg.version}';\n`
 );

packages/kit/src/cli.js

@@ -81,7 +81,7 @@ if (command === 'sync') {
 	}
 
 	try {
-		const config = await load_config();
+		const config = await load_config({ cwd: process.cwd() });
 		const sync = await import('./core/sync/sync.js');
 		sync.all_types(config, values.mode);
 	} catch (error) {

packages/kit/src/core/adapt/builder.js

@@ -147,7 +147,8 @@ export function create_builder({
 								prerendered: [],
 								relative_path: relativePath,
 								routes: Array.from(filtered),
-								remotes
+								remotes,
+								root: vite_config.root
 							})
 					});
 				}
@@ -157,7 +158,8 @@ export function create_builder({
 		findServerAssets(route_data) {
 			return find_server_assets(
 				build_data,
-				route_data.map((route) => /** @type {import('types').RouteData} */ (lookup.get(route)))
+				route_data.map((route) => /** @type {import('types').RouteData} */ (lookup.get(route))),
+				vite_config.root
 			);
 		},
 
@@ -167,7 +169,8 @@ export function create_builder({
 
 			const fallback = await generate_fallback({
 				manifest_path,
-				env: { ...env.private, ...env.public }
+				env: { ...env.private, ...env.public },
+				root: vite_config.root
 			});
 
 			if (existsSync(dest)) {
@@ -197,7 +200,8 @@ export function create_builder({
 				routes: subset
 					? subset.map((route) => /** @type {import('types').RouteData} */ (lookup.get(route)))
 					: route_data.filter((route) => prerender_map.get(route.id) !== true),
-				remotes
+				remotes,
+				root: vite_config.root
 			});
 		},
 

packages/kit/src/core/config/index.js

@@ -1,6 +1,5 @@
 import fs from 'node:fs';
 import path from 'node:path';
-import process from 'node:process';
 import * as url from 'node:url';
 import options from './options.js';
 
@@ -58,10 +57,10 @@ export function load_error_page(config) {
 
 /**
  * Loads and validates Svelte config file
- * @param {{ cwd?: string }} options
+ * @param {{ cwd: string }} options
  * @returns {Promise<import('types').ValidatedConfig>}
  */
-export async function load_config({ cwd = process.cwd() } = {}) {
+export async function load_config({ cwd }) {
 	const config_files = ['js', 'ts']
 		.map((ext) => path.join(cwd, `svelte.config.${ext}`))
 		.filter((f) => fs.existsSync(f));
@@ -93,11 +92,13 @@ export async function load_config({ cwd = process.cwd() } = {}) {
 
 /**
  * @param {import('@sveltejs/kit').Config} config
+ * @param {{ cwd: string }} options
  * @returns {import('types').ValidatedConfig}
  */
-function process_config(config, { cwd = process.cwd() } = {}) {
+export function process_config(config, { cwd }) {
 	const validated = validate_config(config);
 
+	validated.kit.env.dir = path.resolve(cwd, validated.kit.env.dir);
 	validated.kit.outDir = path.resolve(cwd, validated.kit.outDir);
 
 	for (const key in validated.kit.files) {

packages/kit/src/core/env.js

@@ -1,6 +1,6 @@
 import { GENERATED_COMMENT } from '../constants.js';
 import { dedent } from './sync/utils.js';
-import { runtime_base } from './utils.js';
+import { get_runtime_base } from './utils.js';
 
 /**
  * @typedef {'public' | 'private'} EnvType
@@ -32,15 +32,16 @@ export function create_static_module(id, env) {
 /**
  * @param {EnvType} type
  * @param {Record<string, string> | undefined} dev_values If in a development mode, values to pre-populate the module with.
+ * @param {string} root
  */
-export function create_dynamic_module(type, dev_values) {
+export function create_dynamic_module(type, dev_values, root) {
 	if (dev_values) {
 		const keys = Object.entries(dev_values).map(
 			([k, v]) => `${JSON.stringify(k)}: ${JSON.stringify(v)}`
 		);
 		return `export const env = {\n${keys.join(',\n')}\n}`;
 	}
-	return `export { ${type}_env as env } from '${runtime_base}/shared-server.js';`;
+	return `export { ${type}_env as env } from '${get_runtime_base(root)}/shared-server.js';`;
 }
 
 /**

packages/kit/src/core/generate_manifest/find_server_assets.js

@@ -4,8 +4,9 @@ import { find_deps } from '../../exports/vite/build/utils.js';
  * Finds all the assets that are imported by server files associated with `routes`
  * @param {import('types').BuildData} build_data
  * @param {import('types').RouteData[]} routes
+ * @param {string} root
  */
-export function find_server_assets(build_data, routes) {
+export function find_server_assets(build_data, routes, root) {
 	/**
 	 * All nodes actually used in the routes definition (prerendered routes are omitted).
 	 * Root layout/error is always included as they are needed for 404 and root errors.
@@ -19,7 +20,7 @@ export function find_server_assets(build_data, routes) {
 	/** @param {string} id */
 	function add_assets(id) {
 		if (id in build_data.server_manifest) {
-			const deps = find_deps(build_data.server_manifest, id, false);
+			const deps = find_deps(build_data.server_manifest, id, false, root);
 			for (const asset of deps.assets) {
 				server_assets.add(asset);
 			}

packages/kit/src/core/generate_manifest/index.js

@@ -20,9 +20,17 @@ import { uneval } from 'devalue';
  *   relative_path: string;
  *   routes: import('types').RouteData[];
  *   remotes: RemoteChunk[];
+ *   root: string;
  * }} opts
  */
-export function generate_manifest({ build_data, prerendered, relative_path, routes, remotes }) {
+export function generate_manifest({
+	build_data,
+	prerendered,
+	relative_path,
+	routes,
+	remotes,
+	root
+}) {
 	/**
 	 * @type {Map<any, number>} The new index of each node in the filtered nodes array
 	 */
@@ -34,7 +42,7 @@ export function generate_manifest({ build_data, prerendered, relative_path, rout
 	 */
 	const used_nodes = new Set([0, 1]);
 
-	const server_assets = find_server_assets(build_data, routes);
+	const server_assets = find_server_assets(build_data, routes, root);
 
 	for (const route of routes) {
 		if (route.page) {
@@ -119,7 +127,7 @@ export function generate_manifest({ build_data, prerendered, relative_path, rout
 								pattern: ${route.pattern},
 								params: ${s(route.params)},
 								page: ${route.page ? `{ layouts: ${get_nodes(route.page.layouts)}, errors: ${get_nodes(route.page.errors)}, leaf: ${reindexed.get(route.page.leaf)} }` : 'null'},
-								endpoint: ${route.endpoint ? loader(join_relative(relative_path, resolve_symlinks(build_data.server_manifest, route.endpoint.file).chunk.file)) : 'null'}
+								endpoint: ${route.endpoint ? loader(join_relative(relative_path, resolve_symlinks(build_data.server_manifest, route.endpoint.file, root).chunk.file)) : 'null'}
 							}
 						`;
 					}).filter(Boolean).join(',\n')}

packages/kit/src/core/postbuild/analyse.js

@@ -25,6 +25,7 @@ export default forked(import.meta.url, analyse);
  *   out: string;
  *   output_config: import('types').RecursiveRequired<import('types').ValidatedConfig['kit']['output']>;
  *   remotes: RemoteChunk[];
+ *   root: string;
  * }} opts
  */
 async function analyse({
@@ -36,13 +37,14 @@ async function analyse({
 	env,
 	out,
 	output_config,
-	remotes
+	remotes,
+	root
 }) {
 	/** @type {import('@sveltejs/kit').SSRManifest} */
 	const manifest = (await import(pathToFileURL(manifest_path).href)).manifest;
 
 	/** @type {import('types').ValidatedKitConfig} */
-	const config = (await load_config()).kit;
+	const config = (await load_config({ cwd: root })).kit;
 
 	const server_root = join(config.outDir, 'output');
 
@@ -63,7 +65,17 @@ 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,
+		output_config,
+		root
+	);
 
 	/** @type {import('types').ServerMetadata} */
 	const metadata = {

packages/kit/src/core/postbuild/fallback.js

@@ -9,12 +9,13 @@ export default forked(import.meta.url, generate_fallback);
 /**
  * @param {{
  *   manifest_path: string;
- *   env: Record<string, string>
+ *   env: Record<string, string>;
+ *   root: string;
  * }} opts
  */
-async function generate_fallback({ manifest_path, env }) {
+async function generate_fallback({ manifest_path, env, root }) {
 	/** @type {import('types').ValidatedKitConfig} */
-	const config = (await load_config()).kit;
+	const config = (await load_config({ cwd: root })).kit;
 
 	const server_root = join(config.outDir, 'output');
 

packages/kit/src/core/postbuild/prerender.js

@@ -31,10 +31,11 @@ const SPECIAL_HASHLINKS = new Set(['', 'top']);
  *   manifest_path: string;
  *   metadata: import('types').ServerMetadata;
  *   verbose: boolean;
- *   env: Record<string, string>
+ *   env: Record<string, string>;
+ *   root: string;
  * }} opts
  */
-async function prerender({ hash, out, manifest_path, metadata, verbose, env }) {
+async function prerender({ hash, out, manifest_path, metadata, verbose, env, root }) {
 	/** @type {import('@sveltejs/kit').SSRManifest} */
 	const manifest = (await import(pathToFileURL(manifest_path).href)).manifest;
 
@@ -99,12 +100,13 @@ async function prerender({ hash, out, manifest_path, metadata, verbose, env }) {
 	const prerendered_routes = new Set();
 
 	/** @type {import('types').ValidatedKitConfig} */
-	const config = (await load_config()).kit;
+	const config = (await load_config({ cwd: root })).kit;
 
 	if (hash) {
 		const fallback = await generate_fallback({
 			manifest_path,
-			env
+			env,
+			root
 		});
 
 		const file = output_filename('/', true);