sv 0.9.5 → 0.9.6

package/dist/{addons-CkfbAJXX.js → addons-C1BtYuVp.js}

@@ -436,7 +436,9 @@ __export(imports_exports, {
 	addDefault: () => addDefault,
 	addEmpty: () => addEmpty,
 	addNamed: () => addNamed,
-	addNamespace: () => addNamespace
+	addNamespace: () => addNamespace,
+	find: () => find,
+	remove: () => remove
 });
 function addEmpty(node, options$6) {
 	const expectedImportDeclaration = {
@@ -533,6 +535,42 @@ function addImportIfNecessary(node, expectedImportDeclaration) {
 	const importDeclaration = importDeclarations.find((item) => areNodesEqual(item, expectedImportDeclaration));
 	if (!importDeclaration) node.body.unshift(expectedImportDeclaration);
 }
+function find(ast, options$6) {
+	let alias = options$6.name;
+	let statement;
+	walk(ast, null, { ImportDeclaration(node) {
+		if (node.specifiers && node.source.value === options$6.from) {
+			const specifier = node.specifiers.find((sp) => sp.type === "ImportSpecifier" && sp.imported.type === "Identifier" && sp.imported.name === options$6.name);
+			if (specifier) {
+				statement = node;
+				alias = specifier.local?.name ?? alias;
+				return;
+			}
+		}
+	} });
+	if (statement) return {
+		statement,
+		alias
+	};
+	return {
+		statement: undefined,
+		alias: undefined
+	};
+}
+function remove(ast, options$6) {
+	const statement = options$6.statement ?? find(ast, {
+		name: options$6.name,
+		from: options$6.from
+	}).statement;
+	if (!statement) return;
+	if (statement.specifiers?.length === 1) {
+		const idxToRemove = ast.body.indexOf(statement);
+		ast.body.splice(idxToRemove, 1);
+	} else {
+		const idxToRemove = statement.specifiers?.findIndex((s) => s.type === "ImportSpecifier" && s.imported.type === "Identifier" && s.imported.name === options$6.name);
+		if (idxToRemove !== undefined && idxToRemove !== -1) statement.specifiers?.splice(idxToRemove, 1);
+	}
+}
 var variables_exports = {};
 __export(variables_exports, {
 	createIdentifier: () => createIdentifier,
@@ -596,7 +634,8 @@ function createDefault(node, options$6) {
 		node.body.push(exportNode);
 		return {
 			astNode: exportNode,
-			value: options$6.fallback
+			value: options$6.fallback,
+			isFallback: true
 		};
 	}
 	const exportDefaultDeclaration = existingNode;
@@ -614,13 +653,15 @@ function createDefault(node, options$6) {
 		const value = variableDeclarator.init;
 		return {
 			astNode: exportDefaultDeclaration,
-			value
+			value,
+			isFallback: false
 		};
 	}
 	const declaration$1 = exportDefaultDeclaration.declaration;
 	return {
 		astNode: exportDefaultDeclaration,
-		value: declaration$1
+		value: declaration$1,
+		isFallback: false
 	};
 }
 function createNamed(node, options$6) {
@@ -825,20 +866,35 @@ function isFunctionDeclaration(node, funcName) {
 	return node.type === "FunctionDeclaration" && node.id?.name === funcName;
 }
 var vite_exports = {};
-__export(vite_exports, { addPlugin: () => addPlugin });
-function exportDefaultConfig(ast, options$6 = {}) {
+__export(vite_exports, {
+	addPlugin: () => addPlugin,
+	getConfig: () => getConfig
+});
+function isConfigWrapper(callExpression, knownWrappers) {
+	if (callExpression.callee.type !== "Identifier") return false;
+	const calleeName = callExpression.callee.name;
+	if (knownWrappers.includes(calleeName)) return true;
+	const isObjectCall = callExpression.arguments.length === 1 && callExpression.arguments[0]?.type === "ObjectExpression";
+	return knownWrappers.includes(calleeName) || isObjectCall;
+}
+function exportDefaultConfig(ast, options$6) {
 	const { fallback, ignoreWrapper } = options$6;
 	let fallbackExpression;
-	if (fallback) fallbackExpression = typeof fallback === "string" ? parseExpression(fallback) : fallback;
+	if (fallback) fallbackExpression = typeof fallback.code === "string" ? parseExpression(fallback.code) : fallback.code;
 else fallbackExpression = create({});
-	const { value } = createDefault(ast, { fallback: fallbackExpression });
+	const { value, isFallback } = createDefault(ast, { fallback: fallbackExpression });
+	if (isFallback) options$6.fallback?.additional?.(ast);
 	const rootObject = value.type === "TSSatisfiesExpression" ? value.expression : value;
 	let configObject;
-	if (!ignoreWrapper || !("arguments" in rootObject) || !Array.isArray(rootObject.arguments)) {
+	if (!("arguments" in rootObject) || !Array.isArray(rootObject.arguments)) {
+		configObject = rootObject;
+		return configObject;
+	}
+	if (rootObject.type !== "CallExpression" || rootObject.callee.type !== "Identifier") {
 		configObject = rootObject;
 		return configObject;
 	}
-	if (rootObject.type !== "CallExpression" || rootObject.callee.type !== "Identifier" || rootObject.callee.name !== ignoreWrapper) {
+	if (!isConfigWrapper(rootObject, ignoreWrapper)) {
 		configObject = rootObject;
 		return configObject;
 	}
@@ -880,19 +936,24 @@ function addInArrayOfObject(ast, options$6) {
 else append(targetArray, expression);
 }
 const addPlugin = (ast, options$6) => {
-	addNamed(ast, {
-		from: "vite",
-		imports: { defineConfig: "defineConfig" }
-	});
-	const configObject = exportDefaultConfig(ast, {
-		fallback: "defineConfig()",
-		ignoreWrapper: "defineConfig"
-	});
+	const configObject = getConfig(ast);
 	addInArrayOfObject(configObject, {
 		arrayProperty: "plugins",
 		...options$6
 	});
 };
+const getConfig = (ast) => {
+	return exportDefaultConfig(ast, {
+		fallback: {
+			code: "defineConfig()",
+			additional: (ast$1) => addNamed(ast$1, {
+				imports: ["defineConfig"],
+				from: "vite"
+			})
+		},
+		ignoreWrapper: ["defineConfig"]
+	});
+};
 
 //#endregion
 //#region packages/cli/commands/add/utils.ts
@@ -5679,17 +5740,8 @@ var vitest_addon_default = defineAddon({
 					exclude: ["src/**/*.svelte.{test,spec}.{js,ts}"]
 				}
 			});
-			const defineConfigFallback = function_exports.createCall({
-				name: "defineConfig",
-				args: []
-			});
-			const { value: defineWorkspaceCall } = exports_exports.createDefault(ast, { fallback: defineConfigFallback });
-			if (defineWorkspaceCall.type !== "CallExpression") T$2.warn("Unexpected vite config. Could not update.");
-			const vitestConfig = function_exports.getArgument(defineWorkspaceCall, {
-				index: 0,
-				fallback: object_exports.create({})
-			});
-			const testObject = object_exports.property(vitestConfig, {
+			const viteConfig = vite_exports.getConfig(ast);
+			const testObject = object_exports.property(viteConfig, {
 				name: "test",
 				fallback: object_exports.create({ expect: { requireAssertions: true } })
 			});
@@ -5699,6 +5751,22 @@ var vitest_addon_default = defineAddon({
 			});
 			if (componentTesting) array_exports.append(workspaceArray, clientObjectExpression);
 			if (unitTesting) array_exports.append(workspaceArray, serverObjectExpression);
+			const importName = "defineConfig";
+			const { statement, alias } = imports_exports.find(ast, {
+				name: importName,
+				from: "vite"
+			});
+			if (statement) {
+				imports_exports.addNamed(ast, {
+					imports: { defineConfig: alias },
+					from: "vitest/config"
+				});
+				imports_exports.remove(ast, {
+					name: importName,
+					from: "vite",
+					statement
+				});
+			}
 			return generateCode();
 		});
 	}

package/dist/bin.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import { AGENT_NAMES, Command, De, Fe, Ge, J, Ke, Option, T, Ue, Vu, We, __toESM$1 as __toESM, addPnpmBuildDependencies, create, detect, et, from, getUserAgent, installDependencies, installOption, ke, packageManagerPrompt, program, require_picocolors$1 as require_picocolors, resolveCommand, templates, up, ze } from "./package-manager-DO5R9a6p.js";
-import { applyAddons, communityAddonIds, createWorkspace, formatFiles, getAddonDetails, getCommunityAddon, getHighlighter, isVersionUnsupportedBelow, officialAddons, setupAddons } from "./addons-CkfbAJXX.js";
+import { applyAddons, communityAddonIds, createWorkspace, formatFiles, getAddonDetails, getCommunityAddon, getHighlighter, isVersionUnsupportedBelow, officialAddons, setupAddons } from "./addons-C1BtYuVp.js";
 import { createRequire } from "module";
 import fs, { existsSync } from "node:fs";
 import path, { dirname, join } from "node:path";
@@ -13,7 +13,7 @@ import { pipeline } from "node:stream/promises";
 
 //#region packages/cli/package.json
 var name = "sv";
-var version$1 = "0.9.5";
+var version$1 = "0.9.6";
 var type = "module";
 var description = "A CLI for creating and updating SvelteKit projects";
 var license = "MIT";
@@ -22247,7 +22247,9 @@ __export(imports_exports, {
 	addDefault: () => addDefault,
 	addEmpty: () => addEmpty,
 	addNamed: () => addNamed,
-	addNamespace: () => addNamespace
+	addNamespace: () => addNamespace,
+	find: () => find,
+	remove: () => remove
 });
 function addEmpty(node, options$1) {
 	const expectedImportDeclaration = {
@@ -22344,6 +22346,42 @@ function addImportIfNecessary(node, expectedImportDeclaration) {
 	const importDeclaration = importDeclarations.find((item) => areNodesEqual(item, expectedImportDeclaration));
 	if (!importDeclaration) node.body.unshift(expectedImportDeclaration);
 }
+function find(ast, options$1) {
+	let alias = options$1.name;
+	let statement;
+	walk(ast, null, { ImportDeclaration(node) {
+		if (node.specifiers && node.source.value === options$1.from) {
+			const specifier = node.specifiers.find((sp) => sp.type === "ImportSpecifier" && sp.imported.type === "Identifier" && sp.imported.name === options$1.name);
+			if (specifier) {
+				statement = node;
+				alias = specifier.local?.name ?? alias;
+				return;
+			}
+		}
+	} });
+	if (statement) return {
+		statement,
+		alias
+	};
+	return {
+		statement: undefined,
+		alias: undefined
+	};
+}
+function remove(ast, options$1) {
+	const statement = options$1.statement ?? find(ast, {
+		name: options$1.name,
+		from: options$1.from
+	}).statement;
+	if (!statement) return;
+	if (statement.specifiers?.length === 1) {
+		const idxToRemove = ast.body.indexOf(statement);
+		ast.body.splice(idxToRemove, 1);
+	} else {
+		const idxToRemove = statement.specifiers?.findIndex((s) => s.type === "ImportSpecifier" && s.imported.type === "Identifier" && s.imported.name === options$1.name);
+		if (idxToRemove !== undefined && idxToRemove !== -1) statement.specifiers?.splice(idxToRemove, 1);
+	}
+}
 var variables_exports = {};
 __export(variables_exports, {
 	createIdentifier: () => createIdentifier,
@@ -22407,7 +22445,8 @@ function createDefault(node, options$1) {
 		node.body.push(exportNode);
 		return {
 			astNode: exportNode,
-			value: options$1.fallback
+			value: options$1.fallback,
+			isFallback: true
 		};
 	}
 	const exportDefaultDeclaration = existingNode;
@@ -22425,13 +22464,15 @@ function createDefault(node, options$1) {
 		const value = variableDeclarator.init;
 		return {
 			astNode: exportDefaultDeclaration,
-			value
+			value,
+			isFallback: false
 		};
 	}
 	const declaration$1 = exportDefaultDeclaration.declaration;
 	return {
 		astNode: exportDefaultDeclaration,
-		value: declaration$1
+		value: declaration$1,
+		isFallback: false
 	};
 }
 function createNamed(node, options$1) {
@@ -22636,20 +22677,35 @@ function isFunctionDeclaration(node, funcName) {
 	return node.type === "FunctionDeclaration" && node.id?.name === funcName;
 }
 var vite_exports = {};
-__export(vite_exports, { addPlugin: () => addPlugin });
-function exportDefaultConfig(ast, options$1 = {}) {
+__export(vite_exports, {
+	addPlugin: () => addPlugin,
+	getConfig: () => getConfig
+});
+function isConfigWrapper(callExpression, knownWrappers) {
+	if (callExpression.callee.type !== "Identifier") return false;
+	const calleeName = callExpression.callee.name;
+	if (knownWrappers.includes(calleeName)) return true;
+	const isObjectCall = callExpression.arguments.length === 1 && callExpression.arguments[0]?.type === "ObjectExpression";
+	return knownWrappers.includes(calleeName) || isObjectCall;
+}
+function exportDefaultConfig(ast, options$1) {
 	const { fallback, ignoreWrapper } = options$1;
 	let fallbackExpression;
-	if (fallback) fallbackExpression = typeof fallback === "string" ? parseExpression(fallback) : fallback;
+	if (fallback) fallbackExpression = typeof fallback.code === "string" ? parseExpression(fallback.code) : fallback.code;
 else fallbackExpression = create$2({});
-	const { value } = createDefault(ast, { fallback: fallbackExpression });
+	const { value, isFallback } = createDefault(ast, { fallback: fallbackExpression });
+	if (isFallback) options$1.fallback?.additional?.(ast);
 	const rootObject = value.type === "TSSatisfiesExpression" ? value.expression : value;
 	let configObject;
-	if (!ignoreWrapper || !("arguments" in rootObject) || !Array.isArray(rootObject.arguments)) {
+	if (!("arguments" in rootObject) || !Array.isArray(rootObject.arguments)) {
+		configObject = rootObject;
+		return configObject;
+	}
+	if (rootObject.type !== "CallExpression" || rootObject.callee.type !== "Identifier") {
 		configObject = rootObject;
 		return configObject;
 	}
-	if (rootObject.type !== "CallExpression" || rootObject.callee.type !== "Identifier" || rootObject.callee.name !== ignoreWrapper) {
+	if (!isConfigWrapper(rootObject, ignoreWrapper)) {
 		configObject = rootObject;
 		return configObject;
 	}
@@ -22691,19 +22747,24 @@ function addInArrayOfObject(ast, options$1) {
 else append(targetArray, expression);
 }
 const addPlugin = (ast, options$1) => {
-	addNamed(ast, {
-		from: "vite",
-		imports: { defineConfig: "defineConfig" }
-	});
-	const configObject = exportDefaultConfig(ast, {
-		fallback: "defineConfig()",
-		ignoreWrapper: "defineConfig"
-	});
+	const configObject = getConfig(ast);
 	addInArrayOfObject(configObject, {
 		arrayProperty: "plugins",
 		...options$1
 	});
 };
+const getConfig = (ast) => {
+	return exportDefaultConfig(ast, {
+		fallback: {
+			code: "defineConfig()",
+			additional: (ast$1) => addNamed(ast$1, {
+				imports: ["defineConfig"],
+				from: "vite"
+			})
+		},
+		ignoreWrapper: ["defineConfig"]
+	});
+};
 var BitSet = class BitSet$1 {
 	constructor(arg) {
 		this.bits = arg instanceof BitSet$1 ? arg.bits.slice() : [];

package/dist/index.js

@@ -1,4 +1,4 @@
 import { create } from "./package-manager-DO5R9a6p.js";
-import { installAddon, officialAddons } from "./addons-CkfbAJXX.js";
+import { installAddon, officialAddons } from "./addons-C1BtYuVp.js";
 
 export { create, installAddon, officialAddons };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sv",
-  "version": "0.9.5",
+  "version": "0.9.6",
   "type": "module",
   "description": "A CLI for creating and updating SvelteKit projects",
   "license": "MIT",
@@ -36,9 +36,9 @@
     "ps-tree": "^1.2.0",
     "tinyexec": "^0.3.2",
     "valibot": "^0.41.0",
-    "@sveltejs/addons": "0.0.0",
     "@sveltejs/create": "0.0.0",
-    "@sveltejs/cli-core": "0.0.0"
+    "@sveltejs/cli-core": "0.0.0",
+    "@sveltejs/addons": "0.0.0"
   },
   "keywords": [
     "create",