sv 1.0.1 → 1.1.1

package/dist/bin.mjs

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
-import { $ as pipe, A as filePaths, B as updateAgent, C as templates, D as buildAndLogArgs, E as PackageJSONSchema, F as isNodeError, G as version, H as updateReadme, I as normalizePosix, J as literal, K as array, L as parseAddonOptions, M as getHelpSections, N as getPadding, O as cliOptions, P as helpConfig, Q as picklist, R as runAndValidateVerifications, S as create$1, T as getSharedFiles, U as UnsupportedError, V as updateLibraryBuild, W as name, X as optional, Y as nonEmpty, Z as parse$1, _t as we, a as setupAddons, at as union, b as exec, c as AGENT_NAMES, ct as Option, d as installDependencies, dt as R, et as record, f as installOption, ft as Re, g as createLoadedAddon, gt as vt, h as from, ht as pe, i as prepareSvApi, it as transform, j as forwardExitCode, k as errorAndExit, l as addAllowBuildsIfPnpm, lt as Ce, m as up$1, mt as le, n as applyAddons, nt as strictObject, o as createWorkspace, ot as program, p as packageManagerPrompt, pt as ge, q as boolean, r as orderAddons, rt as string, s as findWorkspaceRoot, st as Command, tt as safeParse, u as detectPackageManager, ut as Ee, vt as R$1, w as dist, x as execSync, y as getErrorHint, z as runCommand } from "./engine-LhRAh1ZA.mjs";
-import { n as officialAddons$1, t as getAddonDetails } from "./addons-BvT-iII-.mjs";
+import { $ as parse$1, A as cliOptions, B as runAndValidateVerifications, C as execSync, D as getSharedFiles, E as dist, F as getPadding, G as UnsupportedError, H as updateAgent, I as helpConfig, J as array, K as name, L as isNodeError, M as filePaths, N as forwardExitCode, O as PackageJSONSchema, P as getHelpSections, Q as optional, R as normalizePosix, S as exec, T as templates, U as updateLibraryBuild, V as runCommand, W as updateReadme, X as literal, Y as boolean, Z as nonEmpty, _ as createLoadedAddon, _t as pe, a as setupAddons, at as string, b as getErrorHint, bt as R$1, c as AGENT_NAMES, ct as program, d as installDependencies, dt as Ce, et as picklist, f as installOption, ft as Ee, g as from, gt as le, h as up$2, ht as ge, i as prepareSvApi, it as strictObject, j as errorAndExit, k as buildAndLogArgs, l as addAllowBuildsIfPnpm, lt as Command, m as up$1, mt as Re, n as applyAddons, nt as record, o as createWorkspace, ot as transform, p as packageManagerPrompt, pt as R, q as version, r as orderAddons, rt as safeParse, s as findWorkspaceRoot, st as union, tt as pipe, u as detectPackageManager, ut as Option, vt, w as create$1, x as NonZeroExitError, yt as we, z as parseAddonOptions } from "./engine-CpcTzL2R.mjs";
+import { n as officialAddons$1, t as getAddonDetails } from "./addons-DaktRhvH.mjs";
 import * as fs$1 from "node:fs";
 import fs from "node:fs";
 import * as path$1 from "node:path";
@@ -1218,22 +1218,16 @@ function isPrettierInstalled(cwd) {
 /** Nearest dir from `cwd` up to the workspace root with a `format` or `fmt` package.json script. */
 function findFormatScript(cwd) {
 	const workspaceRoot = findWorkspaceRoot(cwd);
-	let directory = path.resolve(cwd);
-	const { root } = path.parse(directory);
-	while (directory && directory.length >= workspaceRoot.length) {
-		if (fs.existsSync(path.join(directory, "package.json"))) {
-			const { data } = loadPackageJson(directory);
-			if (data.scripts?.format) return {
-				dir: directory,
-				name: "format"
-			};
-			if (data.scripts?.fmt) return {
-				dir: directory,
-				name: "fmt"
-			};
-		}
-		if (directory === root) break;
-		directory = path.dirname(directory);
+	for (const directory of up$2(path.resolve(cwd), { last: workspaceRoot })) if (fs.existsSync(path.join(directory, "package.json"))) {
+		const { data } = loadPackageJson(directory);
+		if (data.scripts?.format) return {
+			dir: directory,
+			name: "format"
+		};
+		if (data.scripts?.fmt) return {
+			dir: directory,
+			name: "fmt"
+		};
 	}
 }
 async function withSpinner(startMsg, task) {
@@ -1258,12 +1252,16 @@ async function run(command, args, cwd) {
 		});
 		return {};
 	} catch (e) {
-		if (e?.code === "ENOENT") return {
+		if (e instanceof NonZeroExitError) {
+			const { stdout, stderr } = e.output ?? {};
+			return { error: [stderr, stdout].filter(Boolean).join("\n").trim() };
+		}
+		if (!isNodeError(e)) return { error: "unknown error" };
+		if (e.code === "ENOENT") return {
 			notFound: true,
 			error: `${command} not found`
 		};
-		const output = e?.output;
-		return { error: [output?.stderr, output?.stdout].filter(Boolean).join("\n").trim() || (e instanceof Error ? e.message : "unknown error") };
+		return { error: e.message };
 	}
 }
 //#endregion
@@ -1519,6 +1517,32 @@ async function resolveNonOfficialAddons(refs, downloadCheck) {
 	}
 	return selectedAddons;
 }
+/**
+* Walks the `dependsOn` graph and returns the first cycle found as a path
+* (e.g. `['a', 'b', 'a']`), or `undefined` when the graph is acyclic.
+*/
+function findDependencyCycle(addonIds, setupResults) {
+	const known = new Set(addonIds);
+	const settled = /* @__PURE__ */ new Set();
+	const path = [];
+	const visit = (id) => {
+		if (settled.has(id)) return;
+		const cycleStart = path.indexOf(id);
+		if (cycleStart !== -1) return [...path.slice(cycleStart), id];
+		path.push(id);
+		for (const depId of setupResults[id]?.dependsOn ?? []) {
+			if (!known.has(depId)) continue;
+			const cycle = visit(depId);
+			if (cycle) return cycle;
+		}
+		path.pop();
+		settled.add(id);
+	};
+	for (const id of addonIds) {
+		const cycle = visit(id);
+		if (cycle) return cycle;
+	}
+}
 async function promptAddonQuestions({ options, loadedAddons, workspace }) {
 	const addons = [...loadedAddons];
 	const emptyAnswersReducer = (acc, id) => {
@@ -1612,7 +1636,6 @@ async function promptAddonQuestions({ options, loadedAddons, workspace }) {
 		const additionalSetupResults = await setupAddons(missingSetupResults, workspace);
 		Object.assign(setupResults, additionalSetupResults);
 	}
-	const dependencyChains = /* @__PURE__ */ new Map();
 	let hasNewDependencies = true;
 	while (hasNewDependencies) {
 		hasNewDependencies = false;
@@ -1623,30 +1646,9 @@ async function promptAddonQuestions({ options, loadedAddons, workspace }) {
 			if (!setupResult) errorAndExit(`Setup result missing for addon: ${addonId}`);
 			const missingDependencies = setupResult.dependsOn.filter((depId) => !addons.some((a) => a.addon.id === depId));
 			for (const depId of missingDependencies) {
-				const addonChain = dependencyChains.get(addonId) ?? /* @__PURE__ */ new Set();
-				if (addonChain.has(depId)) {
-					const cyclePath = [
-						...addonChain,
-						addonId,
-						depId
-					].join(" → ");
-					errorAndExit(`Circular dependency detected: ${cyclePath}\nAdd-ons cannot have circular dependencies.`);
-				}
-				const depChain = new Set(addonChain);
-				depChain.add(addonId);
-				dependencyChains.set(depId, depChain);
+				if (!officialAddons.some((a) => a.id === depId)) errorAndExit(`'${color.addon(addonId)}' depends on '${color.addon(depId)}', which is not an official add-on.\nAdd it to the command explicitly.`);
 				hasNewDependencies = true;
-				if (!addons.find((a) => a.addon.id === depId)) {
-					if (!officialAddons.find((a) => a.id === depId)) throw new Error(`'${addonId}' depends on an invalid add-on: '${depId}'`);
-					const officialAddonDetails = getAddonDetails(depId);
-					addons.push(createLoadedAddon(officialAddonDetails));
-					answers[depId] = {};
-					continue;
-				}
-				if (await le({ message: `The ${color.addon(addonId)} add-on requires ${color.addon(depId)} to also be setup. ${color.success("Include it?")}` }) !== true) {
-					ge("Operation cancelled.");
-					V.exit(1);
-				}
+				addons.push(createLoadedAddon(getAddonDetails(depId)));
 				answers[depId] = {};
 			}
 		}
@@ -1656,6 +1658,8 @@ async function promptAddonQuestions({ options, loadedAddons, workspace }) {
 			Object.assign(setupResults, newSetupResults);
 		}
 	}
+	const cycle = findDependencyCycle(addons.map((a) => a.addon.id), setupResults);
+	if (cycle) errorAndExit(`Circular dependency detected: ${cycle.map((id) => color.addon(id)).join(" → ")}\nAdd-ons cannot have circular dependencies.`);
 	const addonDefinitions = addons.map((a) => a.addon);
 	const verifications = [...verifyCleanWorkingDirectory(options.cwd, options.gitCheck), ...verifyUnsupportedAddons(addonDefinitions, setupResults)];
 	await runAndValidateVerifications(verifications);
@@ -3003,21 +3007,9 @@ const migrationTasks = [
 	},
 	{
 		title: "Move adapter-node `ORIGIN` to `paths.origin`",
-		checks: [{
-			include: [
-				"Dockerfile*",
-				"**/Dockerfile*",
-				"**/*.{js,ts,mjs,mts,json,jsonc,yml,yaml,toml}"
-			],
-			patterns: [
-				/\bprocess\.env\.ORIGIN\b/,
-				/\benv\s*\[\s*['"]ORIGIN['"]\s*\]/,
-				/^\s*(?:ENV|ARG)\s+ORIGIN\b/m,
-				/^\s*ORIGIN\s*[:=]/m
-			]
-		}],
+		dependency: "@sveltejs/adapter-node",
 		summary: "The adapter-node `ORIGIN` environment variable is removed.",
-		instructions: "If this value configures adapter-node, move the public-facing origin to `paths.origin` in `sveltekit(...)`. Remove the environment variable only after confirming it has no unrelated use.",
+		instructions: "Find where `ORIGIN` is set (`.env` files, scripts, hosting dashboard, ...) and move the public-facing origin to `paths.origin` in `sveltekit(...)`. Do not delete `ORIGIN`: it is ignored by adapter-node now and may have other uses.",
 		links: guideLink("Adapters-adapter-node")
 	},
 	{
@@ -3098,9 +3090,10 @@ const migrationTasks = [
 var collect_migration_instructions_default = defineMigrationTask({
 	id: "collect-migration-instructions",
 	description: `Collect instructions for non-automated migration tasks; creates ${REPORT_PATH} whose instructions you should follow to complete the migration`,
-	run: ({ sv }) => {
+	run: ({ sv, dependencyVersion }) => {
 		const findings = [];
 		for (const task of migrationTasks) {
+			if (task.dependency && !dependencyVersion(task.dependency)) continue;
 			const files = /* @__PURE__ */ new Set();
 			if (!task.checks) findings.push({
 				task,
@@ -3853,7 +3846,7 @@ var lib_alias_default = defineMigrationTask({
 			};
 		}));
 		sv.files({
-			include: `${directory.src}/**/*.{svelte,svelte.ts,svelte.js,ts,js,svx,md}`,
+			include: `**/*.{svelte,svelte.ts,svelte.js,ts,js,svx,md}`,
 			where: (content) => content.includes("$lib")
 		}, (content, file) => {
 			let styleLibPath = path.posix.relative(path.posix.dirname(file.replaceAll("\\", "/")), directory.lib.replaceAll("\\", "/"));
@@ -3866,7 +3859,7 @@ var lib_alias_default = defineMigrationTask({
 						".ts",
 						"/index.js",
 						"/index.ts"
-					]) if (fs.existsSync(`${cwd}/${directory.lib}/${import_path}${ending}`)) return match.slice(0, -1) + ending.replace(".ts", ".js") + match.slice(-1);
+					]) if (fs.existsSync(path.join(cwd, directory.lib, import_path + ending))) return match.slice(0, -1) + ending.replace(".ts", ".js") + match.slice(-1);
 				}
 				return match;
 			});
@@ -3879,8 +3872,8 @@ var lib_alias_default = defineMigrationTask({
 const KIT3_MIN_VERSIONS = {
 	vite: "^8.0.12",
 	"@sveltejs/vite-plugin-svelte": "^7.0.0",
-	svelte: "^5.56.4",
-	"@sveltejs/package": "^2.5.8",
+	svelte: "^5.57.1",
+	"@sveltejs/package": "^3.0.0",
 	"svelte-check": "^4.7.5",
 	typescript: "^6.0.0"
 };
@@ -3962,6 +3955,7 @@ function migrateMatcher(cwd, file, target, context) {
 	const importDeclarations = [];
 	const body = [];
 	const paramMatcherTypes = /* @__PURE__ */ new Set(["ParamMatcher"]);
+	const typescript = target.endsWith(".ts");
 	let declaresMatch = false;
 	let exportsMatch = false;
 	for (const statement of parsed.ast.body) {
@@ -3984,7 +3978,7 @@ function migrateMatcher(cwd, file, target, context) {
 		if (statement.type === "ExportAllDeclaration") throw new Error(`Cannot migrate '${file}' because it re-exports another module`);
 		if (statement.type === "ExportNamedDeclaration") {
 			if (statement.declaration) {
-				stripParamMatcherType(statement.declaration, paramMatcherTypes);
+				stripParamMatcherType(statement.declaration, paramMatcherTypes, typescript);
 				if (declares(statement.declaration, "match")) {
 					declaresMatch = true;
 					exportsMatch = true;
@@ -3993,7 +3987,7 @@ function migrateMatcher(cwd, file, target, context) {
 			} else exportsMatch ||= statement.specifiers.some((specifier) => specifier.exported.type === "Identifier" && specifier.exported.name === "match");
 			continue;
 		}
-		stripParamMatcherType(statement, paramMatcherTypes);
+		stripParamMatcherType(statement, paramMatcherTypes, typescript);
 		declaresMatch ||= declares(statement, "match");
 		body.push(statement);
 	}
@@ -4092,13 +4086,27 @@ function generateImportCode(context) {
 	for (const source of context.sideEffectImports) lines.push(`import ${quoteString(source)};`);
 	return lines;
 }
-function stripParamMatcherType(node, paramMatcherTypes) {
+function stripParamMatcherType(node, paramMatcherTypes, typescript) {
+	if (node.type === "FunctionDeclaration") {
+		if (typescript && node.id?.name === "match") annotateParam(node);
+		return;
+	}
 	if (node.type !== "VariableDeclaration") return;
 	const declaration = node.declarations.find((declaration) => declaration.id.type === "Identifier" && declaration.id.name === "match");
 	if (!declaration || declaration.id.type !== "Identifier") return;
 	const annotation = declaration.id.typeAnnotation?.typeAnnotation;
 	if (annotation?.type === "TSTypeReference" && annotation.typeName.type === "Identifier" && paramMatcherTypes.has(annotation.typeName.name)) delete declaration.id.typeAnnotation;
 	if ((declaration.init?.type === "TSSatisfiesExpression" || declaration.init?.type === "TSAsExpression") && declaration.init.typeAnnotation.type === "TSTypeReference" && declaration.init.typeAnnotation.typeName.type === "Identifier" && paramMatcherTypes.has(declaration.init.typeAnnotation.typeName.name)) declaration.init = declaration.init.expression;
+	if (typescript) annotateParam(declaration.init);
+}
+function annotateParam(init) {
+	if (init?.type !== "ArrowFunctionExpression" && init?.type !== "FunctionExpression" && init?.type !== "FunctionDeclaration") return;
+	const [param] = init.params;
+	if (param?.type !== "Identifier" || param.typeAnnotation) return;
+	param.typeAnnotation = {
+		type: "TSTypeAnnotation",
+		typeAnnotation: { type: "TSStringKeyword" }
+	};
 }
 function stripParamMatcherComments(content) {
 	return content.replace(/\/\*\*[\s\S]*?\*\//g, (comment) => {
@@ -4479,18 +4487,29 @@ function gotoOptions(replace, state) {
 function migrateNavigationHook(call) {
 	const callback = call.arguments[0];
 	if (callback?.type !== "ArrowFunctionExpression" && callback?.type !== "FunctionExpression") return false;
-	const shallow = shallowTest(callback);
-	if (!shallow) return false;
+	const properties = navigationHookProperties(callback);
+	if (!properties) return false;
+	const [shallow, type] = properties;
 	const guard = {
 		type: "IfStatement",
-		test: shallow,
+		test: {
+			type: "LogicalExpression",
+			operator: "&&",
+			left: shallow,
+			right: {
+				type: "BinaryExpression",
+				operator: "===",
+				left: type,
+				right: js.common.createLiteral("goto")
+			}
+		},
 		consequent: {
 			type: "ReturnStatement",
 			argument: null
 		}
 	};
 	if (callback.body.type === "BlockStatement") {
-		if (startsWithShallowGuard(callback.body, shallow)) return false;
+		if (startsWithNavigationGuard(callback.body, shallow, type)) return false;
 		callback.body.body.unshift(guard);
 	} else callback.body = {
 		type: "BlockStatement",
@@ -4501,35 +4520,43 @@ function migrateNavigationHook(call) {
 	};
 	return true;
 }
-function shallowTest(callback) {
+function navigationHookProperties(callback) {
 	const parameter = callback.params[0];
 	if (!parameter) {
 		callback.params.push({
 			type: "ObjectPattern",
-			properties: [patternProperty("shallow")]
+			properties: [patternProperty("shallow"), patternProperty("type")]
 		});
-		return js.variables.createIdentifier("shallow");
+		return [js.variables.createIdentifier("shallow"), js.variables.createIdentifier("type")];
 	}
-	if (parameter.type === "Identifier") return member(parameter.name, "shallow");
-	if (parameter.type === "AssignmentPattern" && parameter.left.type === "Identifier") return member(parameter.left.name, "shallow");
+	if (parameter.type === "Identifier") return [member(parameter.name, "shallow"), member(parameter.name, "type")];
+	if (parameter.type === "AssignmentPattern" && parameter.left.type === "Identifier") return [member(parameter.left.name, "shallow"), member(parameter.left.name, "type")];
 	if (parameter.type !== "ObjectPattern") return void 0;
+	const shallow = patternIdentifier(parameter, "shallow");
+	const type = patternIdentifier(parameter, "type");
+	if (shallow === null || type === null) return void 0;
+	for (const name of [shallow ? void 0 : "shallow", type ? void 0 : "type"]) {
+		if (!name) continue;
+		const restIndex = parameter.properties.findIndex((entry) => entry.type === "RestElement");
+		const property = patternProperty(name);
+		if (restIndex === -1) parameter.properties.push(property);
+		else parameter.properties.splice(restIndex, 0, property);
+	}
+	return [shallow ?? js.variables.createIdentifier("shallow"), type ?? js.variables.createIdentifier("type")];
+}
+function patternIdentifier(parameter, name) {
 	for (const entry of parameter.properties) {
 		if (entry.type !== "Property") continue;
 		const key = entry.key;
-		if ((key.type !== "Identifier" || key.name !== "shallow") && (key.type !== "Literal" || key.value !== "shallow")) continue;
+		if ((key.type !== "Identifier" || key.name !== name) && (key.type !== "Literal" || key.value !== name)) continue;
 		if (entry.value.type === "Identifier") return js.variables.createIdentifier(entry.value.name);
 		if (entry.value.type === "AssignmentPattern" && entry.value.left.type === "Identifier") return js.variables.createIdentifier(entry.value.left.name);
-		return;
+		return null;
 	}
-	const restIndex = parameter.properties.findIndex((entry) => entry.type === "RestElement");
-	const shallowProperty = patternProperty("shallow");
-	if (restIndex === -1) parameter.properties.push(shallowProperty);
-	else parameter.properties.splice(restIndex, 0, shallowProperty);
-	return js.variables.createIdentifier("shallow");
 }
-function startsWithShallowGuard(body, shallow) {
+function startsWithNavigationGuard(body, shallow, type) {
 	const first = body.body[0];
-	return first?.type === "IfStatement" && first.consequent.type === "ReturnStatement" && first.consequent.argument === null && sameExpression(first.test, shallow);
+	return first?.type === "IfStatement" && first.consequent.type === "ReturnStatement" && first.consequent.argument === null && first.test.type === "LogicalExpression" && first.test.operator === "&&" && sameExpression(first.test.left, shallow) && first.test.right.type === "BinaryExpression" && first.test.right.operator === "===" && first.test.right.left.type !== "PrivateIdentifier" && sameExpression(first.test.right.left, type) && first.test.right.right.type === "Literal" && first.test.right.right.value === "goto";
 }
 function sameExpression(left, right) {
 	if (left.type === "Identifier" && right.type === "Identifier") return left.name === right.name;
@@ -4565,7 +4592,15 @@ var svelte_config_default = defineMigrationTask({
 	run: ({ sv, cwd }) => {
 		const configSource = svelteConfig.find(cwd);
 		if (!configSource) return;
-		if (configSource.kind === "vite") return;
+		if (configSource.kind === "vite") {
+			svelteConfig.edit({
+				sv,
+				cwd
+			}, ({ config }) => {
+				if (!removeFilesLib(config)) return false;
+			});
+			return;
+		}
 		const originalConfigObject = svelteConfig.read(cwd);
 		if (!originalConfigObject) return;
 		sv.removeFile(configSource.path);
@@ -4580,6 +4615,16 @@ var svelte_config_default = defineMigrationTask({
 			const originalStatements = [];
 			for (const node of originalConfigObject.ast.body) if (node.type === "ImportDeclaration") originalImports.push(node);
 			else if (node.type !== "ExportDefaultDeclaration" && node !== configDeclaration) originalStatements.push(node);
+			const existingBindings = js.scope.topLevelBindings([ast]);
+			const movedProgram = {
+				...originalConfigObject.ast,
+				body: [...originalImports, ...originalStatements]
+			};
+			const movedBindings = js.scope.topLevelBindings([movedProgram]);
+			const usedBindings = /* @__PURE__ */ new Set([...existingBindings, ...movedBindings]);
+			const renames = /* @__PURE__ */ new Map();
+			for (const name of movedBindings) if (existingBindings.has(name)) renames.set(name, js.identifiers.uniqueName(name, usedBindings));
+			js.identifiers.renameReferences([originalConfigObject.ast], renames);
 			ast.body.unshift(...originalImports);
 			const exportIndex = ast.body.findIndex((node) => node.type === "ExportDefaultDeclaration");
 			ast.body.splice(exportIndex, 0, ...originalStatements);
@@ -4590,24 +4635,24 @@ var svelte_config_default = defineMigrationTask({
 			let trustsAllOrigins = false;
 			for (const prop of newConfigProperties) {
 				if (prop.type !== "Property") continue;
-				if (prop.key.type !== "Identifier") continue;
-				if (prop.key.name === "kit") continue;
+				const key = js.object.propertyName(prop);
+				if (!key || key === "kit") continue;
 				const propAttachment = attachments.get(prop);
-				keyedConfig[prop.key.name] = prop.value;
-				if (propAttachment) propComments.set(prop.key.name, propAttachment);
+				keyedConfig[key] = prop.value;
+				if (propAttachment) propComments.set(key, propAttachment);
 			}
 			for (const [key, value] of Object.entries(keyedConfig)) {
 				if (key === "experimental" && value.type === "ObjectExpression") {
-					removeProperty(value, "handleRenderingErrors");
-					removeProperty(value, "instrumentation");
-					const index = value.properties.findIndex((prop) => prop.type === "Property" && prop.key.type === "Identifier" && prop.key.name === "tracing");
-					if (index !== -1) {
-						keyedConfig.tracing = value.properties[index].value;
-						value.properties.splice(index, 1);
+					js.object.removeProperty(value, { name: "handleRenderingErrors" });
+					js.object.removeProperty(value, { name: "instrumentation" });
+					const tracing = js.object.findProperty(value, { name: "tracing" });
+					if (tracing) {
+						keyedConfig.tracing = tracing.value;
+						js.object.removeProperty(value, { name: "tracing" });
 					}
 				}
 				if (key === "prerender" && value.type === "ObjectExpression") {
-					const originProp = value.properties.find((prop) => prop.type === "Property" && prop.key.type === "Identifier" && prop.key.name === "origin");
+					const originProp = js.object.findProperty(value, { name: "origin" });
 					if (originProp) {
 						keyedConfig.paths ??= {
 							type: "ObjectExpression",
@@ -4625,14 +4670,22 @@ var svelte_config_default = defineMigrationTask({
 							shorthand: false,
 							computed: false
 						});
-						removeProperty(value, "origin");
+						js.object.removeProperty(value, { name: "origin" });
 						if (value.properties.length === 0) delete keyedConfig.prerender;
 					}
 				}
+				if (key === "files" && value.type === "ObjectExpression") {
+					js.object.removeProperty(value, { name: "lib" });
+					if (value.properties.length === 0) delete keyedConfig.files;
+				}
 				if (key === "csrf" && value.type === "ObjectExpression") {
 					const checkOrigin = findDisabledCheckOrigin(value);
 					if (checkOrigin) {
-						checkOrigin.key.name = "trustedOrigins";
+						checkOrigin.key = {
+							type: "Identifier",
+							name: "trustedOrigins"
+						};
+						checkOrigin.computed = false;
 						checkOrigin.value = {
 							type: "ArrayExpression",
 							elements: [{
@@ -4663,7 +4716,10 @@ var svelte_config_default = defineMigrationTask({
 				apply(node, attachments.get(node));
 				if (node.type === "CallExpression" && node.callee.type === "Identifier" && node.callee.name === "sveltekit" && node.arguments[0]?.type === "ObjectExpression") rootConfig = node.arguments[0];
 			});
-			for (const prop of rootConfig?.properties ?? []) if (prop.type === "Property" && prop.key.type === "Identifier") apply(prop, propComments.get(prop.key.name));
+			for (const prop of rootConfig?.properties ?? []) if (prop.type === "Property") {
+				const key = js.object.propertyName(prop);
+				if (key) apply(prop, propComments.get(key));
+			}
 		});
 		let addedConfigLoader = false;
 		sv.files({
@@ -4713,10 +4769,19 @@ function forEachNode(root, visit) {
 		forEachNode(node[key], visit);
 	}
 }
-/** Removes a statically named property from an object literal. */
-function removeProperty(value, name) {
-	const index = value.properties.findIndex((prop) => prop.type === "Property" && prop.key.type === "Identifier" && prop.key.name === name);
-	if (index !== -1) value.properties.splice(index, 1);
+/**
+* Drops the `files.lib` option from a kit config object, deleting `files` itself when it only
+* contained `lib`.
+* Returns whether anything was removed.
+*/
+function removeFilesLib(config) {
+	const filesProp = js.object.findProperty(config, { name: "files" });
+	if (!filesProp) return false;
+	const files = filesProp.value;
+	if (files.type !== "ObjectExpression") return false;
+	if (!js.object.removeProperty(files, { name: "lib" })) return false;
+	if (files.properties.length === 0) js.object.removeProperty(config, { name: "files" });
+	return true;
 }
 /**
 * Maps each source comment to the node it documents, returned keyed by node identity. A comment is
@@ -4772,7 +4837,8 @@ function collectComments(ast, source) {
 }
 /** Returns the `checkOrigin: false` property of a `csrf` object, if present. */
 function findDisabledCheckOrigin(value) {
-	return value.properties.find((p) => p.type === "Property" && p.key.type === "Identifier" && p.key.name === "checkOrigin" && p.value.type === "Literal" && p.value.value === false);
+	const property = js.object.findProperty(value, { name: "checkOrigin" });
+	return property?.value.type === "Literal" && property.value.value === false ? property : void 0;
 }
 //#endregion
 //#region src/migrate/migrations/sveltekit-3/tasks/tsconfig.ts
@@ -4800,6 +4866,20 @@ const INHERITED_OPTIONS = {
 	target: "esnext",
 	verbatimModuleSyntax: true
 };
+/**
+* Root entries type-checked by the Kit 2 generated config (vite config, `test`, `tests`), plus the
+* configs `sv create` adds to `include`. Only the ones present in the project are kept.
+*/
+const ROOT_INCLUDES = [
+	"vite.config.ts",
+	"vite.config.js",
+	"drizzle.config.ts",
+	"drizzle.config.js",
+	"playwright.config.ts",
+	"playwright.config.js",
+	"test",
+	"tests"
+];
 var tsconfig_default = defineMigrationTask({
 	id: "tsconfig",
 	description: "Extend the generated $app/tsconfig instead of .svelte-kit/tsconfig.json",
@@ -4814,11 +4894,11 @@ var tsconfig_default = defineMigrationTask({
 				extended[index] = PARENT_CONFIG;
 				data.extends = Array.isArray(data.extends) ? extended : PARENT_CONFIG;
 			}
-			const include = data.include ??= ["src"];
+			const include = data.include ??= ["src", ...ROOT_INCLUDES.filter((entry) => fs.existsSync(path.join(cwd, entry)))];
 			include.push(...moved.filter((entry) => !include.includes(entry)));
 			if (data.compilerOptions?.types) {
 				const types = data.compilerOptions.types;
-				if (!types.includes("$app/types")) types.push("$app/types");
+				if (!types.includes("$app/types")) types.unshift("$app/types");
 			}
 			for (const [key, value] of Object.entries(data.compilerOptions ?? {})) if (INHERITED_OPTIONS[key] === value) delete data.compilerOptions[key];
 		}));