sv 0.13.1 → 0.14.0

package/dist/bin.mjs

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
-import { a as detectPackageManager, c as name, h as program, l as version, m as Command, n as add, o as forwardExitCode, p as from, r as create, s as helpConfig } from "./engine-lCnxwqd0.mjs";
-import { color, resolveCommand } from "@sveltejs/sv-utils";
+import { a as detectPackageManager, c as name, h as program, l as version, m as Command, n as add, o as forwardExitCode, p as from, r as create, s as helpConfig } from "./engine-BaqBUQsx.mjs";
+import { color, resolveCommandArray } from "@sveltejs/sv-utils";
 import process from "node:process";
 import { execSync } from "node:child_process";
 //#region src/cli/check.ts
@@ -12,8 +12,7 @@ const check = new Command("check").description("a CLI for checking your Svelte c
 async function runCheck(cwd, args) {
 	const pm = await detectPackageManager(cwd);
 	if (!from(cwd, "svelte-check", true)) {
-		const cmd = resolveCommand(pm, "add", ["-D", "svelte-check"]);
-		console.error(`'svelte-check' is not installed locally. Install it with: ${color.command(`${cmd.command} ${cmd.args.join(" ")}`)}`);
+		console.error(`'svelte-check' is not installed locally. Install it with: ${color.command(resolveCommandArray(pm, "add", ["-D", "svelte-check"]))}`);
 		process.exit(1);
 	}
 	if (args.includes("--help")) {
@@ -21,8 +20,7 @@ async function runCheck(cwd, args) {
 		console.log("Find here all options for both tools");
 	}
 	try {
-		const cmd = resolveCommand(pm, "execute-local", ["svelte-check", ...args]);
-		execSync(`${cmd.command} ${cmd.args.join(" ")}`, {
+		execSync(resolveCommandArray(pm, "execute-local", ["svelte-check", ...args]).join(" "), {
 			stdio: "inherit",
 			cwd
 		});
@@ -42,8 +40,7 @@ async function runMigrate(cwd, args) {
 	try {
 		const cmdArgs = ["svelte-migrate@latest", ...args];
 		if (pm === "npm") cmdArgs.unshift("--yes");
-		const cmd = resolveCommand(pm, "execute", cmdArgs);
-		execSync(`${cmd.command} ${cmd.args.join(" ")}`, {
+		execSync(resolveCommandArray(pm, "execute", cmdArgs).join(" "), {
 			stdio: "inherit",
 			cwd
 		});

package/dist/{engine-lCnxwqd0.mjs → engine-BaqBUQsx.mjs}

@@ -1,5 +1,5 @@
 import { createRequire } from "node:module";
-import { AGENTS, COMMANDS, Walker, color, commonFilePaths, constructCommand, createPrinter, dedent, detect, downloadJson, fileExists, getPackageJson, installPackages, isVersionUnsupportedBelow, js, parse, readFile, resolveCommand, sanitizeName, splitVersion, svelte, text, transforms, writeFile } from "@sveltejs/sv-utils";
+import { AGENTS, COMMANDS, Walker, color, commonFilePaths, constructCommand, createPrinter, dedent, detect, downloadJson, fileExists, getPackageJson, installPackages, isVersionUnsupportedBelow, js, parse, readFile, resolveCommand, resolveCommandArray, sanitizeName, splitVersion, svelte, text, transforms, writeFile } from "@sveltejs/sv-utils";
 import fs, { existsSync } from "node:fs";
 import path, { delimiter, dirname, isAbsolute, join, normalize, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
@@ -5882,14 +5882,21 @@ const addEslintConfigPrettier = transforms.script(({ ast, js }) => {
 	});
 	const fallbackConfig = js.common.parseExpression("[]");
 	const eslintConfig = js.exports.createDefault(ast, { fallback: fallbackConfig }).value;
-	if (eslintConfig.type !== "ArrayExpression" && eslintConfig.type !== "CallExpression") return false;
+	let elements = [];
+	if (eslintConfig.type === "ArrayExpression") elements = eslintConfig.elements;
+	else if (eslintConfig.type === "CallExpression") if (eslintConfig.arguments.length === 1 && eslintConfig.arguments[0].type === "ArrayExpression") elements = eslintConfig.arguments[0].elements;
+	else elements = eslintConfig.arguments;
+	else return false;
 	const prettier = js.common.parseExpression("prettier");
 	const sveltePrettierConfig = js.common.parseExpression(`${svelteImportName}.configs.prettier`);
 	const nodesToInsert = [];
 	if (!js.common.contains(eslintConfig, prettier)) nodesToInsert.push(prettier);
 	if (!js.common.contains(eslintConfig, sveltePrettierConfig)) nodesToInsert.push(sveltePrettierConfig);
-	const elements = eslintConfig.type === "ArrayExpression" ? eslintConfig.elements : eslintConfig.arguments;
-	const idx = elements.findIndex((el) => el?.type === "MemberExpression" && el.object.type === "MemberExpression" && el.object.property.type === "Identifier" && el.object.property.name === "configs" && el.object.object.type === "Identifier" && el.object.object.name === svelteImportName);
+	const isSvelteConfig = (maybeSpread) => {
+		const el = maybeSpread?.type === "SpreadElement" ? maybeSpread?.argument : maybeSpread;
+		return el?.type === "MemberExpression" && el.object.type === "MemberExpression" && el.object.object.type === "Identifier" && el.object.object.name === svelteImportName && el.object.property.type === "Identifier" && el.object.property.name === "configs";
+	};
+	const idx = elements.findIndex(isSvelteConfig);
 	if (idx !== -1) elements.splice(idx + 1, 0, ...nodesToInsert);
 	else elements.push(...nodesToInsert);
 });
@@ -6209,7 +6216,7 @@ var better_auth_default = defineAddon({
 					${!d1 ? "import { auth } from '$lib/server/auth';" : ""}
 					${needsAPIError ? "import { APIError } from 'better-auth/api';" : ""}
 
-					export const load${ts(": PageServerLoad")} = async (event) => {
+					export const load${ts(": PageServerLoad")} = (event) => {
 						if (event.locals.user) {
 							return redirect(302, '/demo/better-auth');
 						}
@@ -6277,7 +6284,7 @@ var better_auth_default = defineAddon({
 					${ts("import type { PageServerLoad } from './$types';")}
 					${!d1 ? "import { auth } from '$lib/server/auth';" : ""}
 
-					export const load${ts(": PageServerLoad")} = async (event) => {
+					export const load${ts(": PageServerLoad")} = (event) => {
 						if (!event.locals.user) {
 							return redirect(302, '/demo/better-auth/login');
 						}
@@ -6312,11 +6319,9 @@ var better_auth_default = defineAddon({
 		}
 	},
 	nextSteps: ({ options, packageManager }) => {
-		const { command: authCmd, args: authArgs } = resolveCommand(packageManager, "run", ["auth:schema"]);
-		const { command: dbCmd, args: dbArgs } = resolveCommand(packageManager, "run", ["db:push"]);
 		const steps = [
-			`Run ${color.command(`${authCmd} ${authArgs.join(" ")}`)} to generate the auth schema`,
-			`Run ${color.command(`${dbCmd} ${dbArgs.join(" ")}`)} to update your database`,
+			`Run ${color.command(resolveCommandArray(packageManager, "run", ["auth:schema"]))} to generate the auth schema`,
+			`Run ${color.command(resolveCommandArray(packageManager, "run", ["db:push"]))} to update your database`,
 			`Check ${color.env("ORIGIN")} & ${color.env("BETTER_AUTH_SECRET")} in ${color.path(".env")} and adjust it to your needs`
 		];
 		if (options.demo.includes("github")) steps.push(`Set your ${color.env("GITHUB_CLIENT_ID")} and ${color.env("GITHUB_CLIENT_SECRET")} in ${color.path(".env")}`);
@@ -6650,7 +6655,7 @@ var drizzle_default = defineAddon({
 					from: "drizzle-orm/d1",
 					imports: ["drizzle"]
 				});
-				const getDbFn = js.common.parseStatement(`export const getDb = (d1${ts(": D1Database")} => drizzle(d1, { schema });`);
+				const getDbFn = js.common.parseStatement(`export const getDb = (d1${ts(": D1Database")}) => drizzle(d1, { schema });`);
 				ast.body.push(getDbFn);
 				return;
 			}
@@ -6758,21 +6763,17 @@ var drizzle_default = defineAddon({
 		const steps = [];
 		if (options.database === "d1") {
 			const ext = fileExists(cwd, "wrangler.toml") ? "toml" : "jsonc";
-			const { command, args } = resolveCommand(packageManager, "run", [
+			steps.push(`Add your ${color.env("CLOUDFLARE_ACCOUNT_ID")}, ${color.env("CLOUDFLARE_DATABASE_ID")}, and ${color.env("CLOUDFLARE_D1_TOKEN")} to ${color.path(".env")}`);
+			steps.push(`Run ${color.command(resolveCommandArray(packageManager, "run", [
 				"wrangler",
 				"d1",
 				"create",
-				`<DATABASE_NAME>`
-			]);
-			steps.push(`Add your ${color.env("CLOUDFLARE_ACCOUNT_ID")}, ${color.env("CLOUDFLARE_DATABASE_ID")}, and ${color.env("CLOUDFLARE_D1_TOKEN")} to ${color.path(".env")}`);
-			steps.push(`Run ${color.command(`${command} ${args.join(" ")}`)} to generate a D1 database ID for your ${color.path(`wrangler.${ext}`)}`);
-		}
-		if (options.docker) {
-			const { command, args } = resolveCommand(packageManager, "run", ["db:start"]);
-			steps.push(`Run ${color.command(`${command} ${args.join(" ")}`)} to start the docker container`);
-		} else if (options.database !== "d1") steps.push(`Check ${color.env("DATABASE_URL")} in ${color.path(".env")} and adjust it to your needs`);
-		const { command, args } = resolveCommand(packageManager, "run", ["db:push"]);
-		steps.push(`Run ${color.command(`${command} ${args.join(" ")}`)} to update your database schema`);
+				"<DATABASE_NAME>"
+			]))} to generate a D1 database ID for your ${color.path(`wrangler.${ext}`)}`);
+		}
+		if (options.docker) steps.push(`Run ${color.command(resolveCommandArray(packageManager, "run", ["db:start"]))} to start the docker container`);
+		else if (options.database !== "d1") steps.push(`Check ${color.env("DATABASE_URL")} in ${color.path(".env")} and adjust it to your needs`);
+		steps.push(`Run ${color.command(resolveCommandArray(packageManager, "run", ["db:push"]))} to update your database schema`);
 		return steps;
 	}
 });
@@ -6900,6 +6901,17 @@ var eslint_default = defineAddon({
 				});
 				eslintConfigs.push(svelteTSParserConfig);
 			}
+			const rulesOverride = js.object.create({ rules: {} });
+			eslintConfigs.push(rulesOverride);
+			if (rulesOverride.properties[0].type !== "Property") throw new Error("rulesOverride.properties[0].type !== \"Property\"");
+			comments.add(rulesOverride.properties[0].key, {
+				type: "Line",
+				value: " Override or add rule settings here, such as:"
+			});
+			comments.add(rulesOverride.properties[0].key, {
+				type: "Line",
+				value: " 'svelte/button-has-type': 'error'"
+			});
 			const exportExpression = js.functions.createCall({
 				name: "defineConfig",
 				args: []
@@ -7610,10 +7622,7 @@ var sveltekit_adapter_default = defineAddon({
 	},
 	nextSteps({ options, packageManager }) {
 		const steps = [];
-		if (options.adapter === "cloudflare") {
-			const { command, args } = resolveCommand(packageManager, "run", ["gen"]);
-			steps.push(`Run ${color.command(`${command} ${args.join(" ")}`)} to update ${color.addon("cloudflare")} types`);
-		}
+		if (options.adapter === "cloudflare") steps.push(`Run ${color.command(resolveCommandArray(packageManager, "run", ["gen"]))} to update ${color.addon("cloudflare")} types`);
 		return steps;
 	}
 });
@@ -7899,7 +7908,7 @@ function getAddonDetails(id) {
 //#endregion
 //#region package.json
 var name = "sv";
-var version = "0.13.1";
+var version = "0.14.0";
 //#endregion
 //#region src/core/errors.ts
 var UnsupportedError = class extends Error {
@@ -8046,8 +8055,7 @@ function buildAndLogArgs(agent, command, args, lastArgs = []) {
 	];
 	if (agent === null || agent === void 0) allArgs.push("--no-install");
 	else allArgs.push("--install", agent);
-	const res = resolveCommand(agent ?? "npm", "execute", [...allArgs, ...lastArgs]);
-	const message = [res.command, ...res.args].join(" ");
+	const message = resolveCommandArray(agent ?? "npm", "execute", [...allArgs, ...lastArgs]).join(" ");
 	R$1.message(color.optional(color.dim(`To skip prompts next time, run:`)));
 	R$1.info(color.optional(message), { spacing: -1 });
 	return message;
@@ -10810,7 +10818,7 @@ async function downloadPackage(options) {
 			if (platform() === "win32" && (error.code === "EPERM" || error.code === "EACCES")) copyDirectorySync(options.path, dest);
 			else throw error;
 		}
-		return await importAddonCode(pkg.name);
+		return await importAddonCode(pkg.name, pkg.version);
 	}
 	const tarballUrl = pkg.dist.tarball;
 	const data = await fetch(tarballUrl);
@@ -10819,14 +10827,22 @@ async function downloadPackage(options) {
 		header.name = header.name.replace("package", pkg.name);
 		return header;
 	} }));
-	return await importAddonCode(pkg.name);
+	return await importAddonCode(pkg.name, pkg.version);
 }
-async function importAddonCode(pkgName) {
+async function importAddonCode(pkgName, pkgVersion) {
+	const issues = [];
+	let details;
 	try {
-		const { default: details } = await import(`${pkgName}/sv`);
-		return details;
-	} catch {}
-	const { default: details } = await import(pkgName);
+		({default: details} = await import(`${pkgName}/sv`));
+	} catch {
+		issues.push(`'/sv' export not found`);
+	}
+	if (!details) try {
+		({default: details} = await import(pkgName));
+	} catch {
+		issues.push(`default export not found`);
+	}
+	if (!details && issues.length > 0) throw new Error(`Failed to load add-on '${pkgName}@${pkgVersion}':\n- ${issues.join("\n- ")}\n\nPlease report this to the add-on author.`);
 	return details;
 }
 async function getPackageJSON(ref) {
@@ -11391,15 +11407,10 @@ const create = new Command("create").description("Scaffold a new project (--add
 			const pathHasSpaces = relative.includes(" ");
 			initialSteps.push(`  ${i++}: ${color.command(`cd ${pathHasSpaces ? `"${relative}"` : relative}`)}`);
 		}
-		if (!packageManager) {
-			const { args, command } = resolveCommand(pm, "install", []);
-			initialSteps.push(`  ${i++}: ${color.command(`${command} ${args.join(" ")}`)}`);
-		}
-		const { args, command } = resolveCommand(pm, "run", ["dev", "--open"]);
-		const pmRunCmd = `${command} ${args.join(" ")}`;
+		if (!packageManager) initialSteps.push(`  ${i++}: ${color.command(resolveCommandArray(pm, "install", []))}`);
 		const steps = [
 			...initialSteps,
-			`  ${i++}: ${color.command(pmRunCmd)}`,
+			`  ${i++}: ${color.command(resolveCommandArray(pm, "run", ["dev", "--open"]))}`,
 			"",
 			`To close the dev server, hit ${color.command("Ctrl-C")}`
 		];
@@ -11483,8 +11494,23 @@ async function createProject(cwd, options) {
 	const projectPath = path.resolve(directory);
 	const basename = path.basename(projectPath);
 	const parentDirName = path.basename(path.dirname(projectPath));
-	const projectName = parentDirName.startsWith("@") ? `${parentDirName}/${basename}` : basename;
-	if (template === "addon" && !projectName.startsWith("@")) errorAndExit(`Community add-ons must be published under an npm org (e.g. ${color.command("@my-org/sv")}). Unscoped package names are not supported at this stage.`);
+	let projectName = parentDirName.startsWith("@") ? `${parentDirName}/${basename}` : basename;
+	if (template === "addon" && !projectName.startsWith("@")) {
+		const org = await Qt({
+			message: `Community add-ons must be published under an npm org. Enter the name of your npm org:`,
+			placeholder: "  @my-org",
+			validate: (value) => {
+				if (!value) return "Organization name is required";
+				if (!value.startsWith("@")) return "Must start with @";
+				if (value.includes("/")) return "Just the org, not the full package name";
+			}
+		});
+		if (Ct$1(org)) {
+			Pt("Operation cancelled.");
+			process$1.exit(0);
+		}
+		projectName = `${org}/${basename}`;
+	}
 	if (template === "addon" && options.add.length > 0) errorAndExit(`The ${color.command("--add")} flag cannot be used with the ${color.command("addon")} template.`);
 	let loadedAddons = [];
 	let answers = {};
@@ -11522,8 +11548,9 @@ async function createProject(cwd, options) {
 	let argsFormattedAddons = [];
 	let addOnFilesToFormat = [];
 	let addOnSuccessfulAddons = [];
+	let addonSetupResults = {};
 	if (template !== "addon" && (options.addOns || options.add.length > 0)) {
-		const { argsFormattedAddons: argsFormatted, filesToFormat, successfulAddons } = await runAddonsApply({
+		const { argsFormattedAddons: argsFormatted, filesToFormat, successfulAddons, setupResults } = await runAddonsApply({
 			answers,
 			options: {
 				cwd: projectPath,
@@ -11540,6 +11567,7 @@ async function createProject(cwd, options) {
 		argsFormattedAddons = argsFormatted;
 		addOnFilesToFormat = filesToFormat;
 		addOnSuccessfulAddons = successfulAddons;
+		addonSetupResults = setupResults;
 	}
 	const packageManager = options.install === false ? null : options.install === true ? await packageManagerPrompt(projectPath) : options.install;
 	const argsFormatted = [];
@@ -11551,7 +11579,7 @@ async function createProject(cwd, options) {
 	updateReadme(directory, buildAndLogArgs(packageManager, "create", argsFormatted, [directory]));
 	updateAgent(directory, language, packageManager ?? "npm", loadedAddons);
 	if (packageManager) workspace.packageManager = packageManager;
-	const addOnNextSteps = getNextSteps(addOnSuccessfulAddons, workspace, answers);
+	const addOnNextSteps = getNextSteps(addOnSuccessfulAddons, workspace, answers, addonSetupResults);
 	await addPnpmBuildDependencies(projectPath, packageManager, ["esbuild"]);
 	if (packageManager) {
 		await installDependencies(packageManager, projectPath);
@@ -11731,6 +11759,8 @@ const add$1 = new Command("add").description("applies specified add-ons into a p
 			"  sv add prettier eslint",
 			"  sv add vitest=\"usages:unit\" tailwindcss=\"plugins:none\"",
 			"  sv add drizzle=\"database:postgresql+client:postgres.js+docker:yes\"",
+			"  sv add prettier @supacool",
+			"  sv add @supacool/sv@0.1.2",
 			""
 		].join("\n");
 	}
@@ -11997,7 +12027,8 @@ async function runAddonsApply({ answers, options, loadedAddons, setupResults, wo
 		nextSteps: [],
 		argsFormattedAddons: [],
 		filesToFormat: [],
-		successfulAddons: []
+		successfulAddons: [],
+		setupResults: {}
 	};
 	const { filesToFormat, pnpmBuildDependencies, status } = await applyAddons({
 		loadedAddons,
@@ -12058,15 +12089,16 @@ async function runAddonsApply({ answers, options, loadedAddons, setupResults, wo
 		});
 	}
 	return {
-		nextSteps: getNextSteps(successfulAddons, workspace, answers),
+		nextSteps: getNextSteps(successfulAddons, workspace, answers, setupResults),
 		argsFormattedAddons,
 		filesToFormat,
-		successfulAddons
+		successfulAddons,
+		setupResults
 	};
 }
-function getNextSteps(loadedAddons, workspace, answers) {
-	return loadedAddons.map((loaded) => {
-		const addon = loaded.addon;
+function getNextSteps(loadedAddons, workspace, answers, setupResults) {
+	return orderAddons(loadedAddons.map((l) => l.addon), setupResults).map((loaded) => {
+		const { addon } = loadedAddons.find((l) => l.addon.id === loaded.id);
 		if (!addon.nextSteps) return;
 		const addonOptions = answers[addon.id];
 		const addonNextSteps = addon.nextSteps({
@@ -12134,7 +12166,8 @@ function formatAddonHelpSection(opts) {
 		if (!option) return formatItem(id, "(no options)");
 		return formatItem(id, option.choices);
 	});
-	if (addonList.length > 0) output.push(styleTitle("Add-Ons:"), ...addonList, "");
+	if (addonList.length > 0) output.push(styleTitle("Official Add-Ons:"), ...addonList, "");
+	output.push(styleTitle("Community Add-Ons:"), "  Find on: https://www.npmjs.com/search?q=keywords:sv-add", "");
 	output.push(styleTitle("Add-On Syntax:"), "  <addon>                               add with defaults (may still prompt)", "  <addon>=<opt>:<val>                   set a single option", "  <addon>=<opt1>:<val1>+<opt2>:<val2>   set multiple options", "  <addon>=<opt>:none                    explicitly set no value (for multiselect)", "  To skip prompts, explicitly set ALL options (use defaults shown above).", "");
 	return output;
 }
@@ -12337,7 +12370,7 @@ async function runAddon({ addon, loaded, multiple, workspace, workspaceOptions }
 		execute: async (commandArgs, stdio) => {
 			const { command, args } = resolveCommand(workspace.packageManager, "execute", commandArgs);
 			const addonPrefix = multiple ? `${addon.id}: ` : "";
-			const executedCommand = `${command} ${args.join(" ")}`;
+			const executedCommand = [command, ...args].join(" ");
 			if (!TESTING) R$1.step(`${addonPrefix}Running external command ${color.optional(`(${executedCommand})`)}`);
 			if (workspace.packageManager === "npm") args.unshift("--yes");
 			try {

package/dist/{engine-fG9K-byo.d.mts → engine-BdGJvT03.d.mts}

@@ -139,7 +139,7 @@ type Scripts = {
   condition?: ConditionDefinition;
 };
 type SvApi = {
-  /** Add a package to the pnpm build dependencies. */pnpmBuildDependency: (pkg: string) => void; /** Add a package to the dependencies. */
+  /** Add a package to the pnpm onlyBuiltDependencies. */pnpmBuildDependency: (pkg: string) => void; /** Add a package to the dependencies. */
   dependency: (pkg: string, version: string) => void; /** Add a package to the dev dependencies. */
   devDependency: (pkg: string, version: string) => void; /** Execute a command in the workspace. */
   execute: (args: string[], stdio: "inherit" | "pipe") => Promise<void>;
@@ -152,15 +152,15 @@ type SvApi = {
 };
 type Addon<Args extends OptionDefinition, Id extends string = string> = {
   id: Id;
-  alias?: string;
-  shortDescription?: string;
+  alias?: string; /** one-liner shown in prompts  */
+  shortDescription?: string; /** link to docs/repo */
   homepage?: string; /** If true, this addon won't appear in the interactive prompt but can still be used via CLI */
   hidden?: boolean;
   options: Args; /** Setup the addon. Will be called before the addon is run. */
   setup?: (workspace: Workspace & {
     /** On what official addons does this addon depend on? */dependsOn: (name: keyof typeof officialAddons) => void;
-    /** Why is this addon not supported?
-    *
+    /**
+    * Why is this addon not supported?
     * @example
     * if (!isKit) unsupported('Requires SvelteKit');
     */
@@ -176,7 +176,7 @@ type Addon<Args extends OptionDefinition, Id extends string = string> = {
     */
     cancel: (reason: string) => void;
   }) => MaybePromise<void>; /** Next steps to display after the addon is run. */
-  nextSteps?: (data: Workspace & {
+  nextSteps?: (workspace: Workspace & {
     options: WorkspaceOptions<Args>;
   }) => string[];
 };

package/dist/src/index.d.mts

@@ -1,4 +1,4 @@
-import { A as BooleanQuestion, C as defineAddon, D as WorkspaceOptions, E as Workspace, F as Question, I as SelectQuestion, L as StringQuestion, M as NumberQuestion, N as OptionDefinition, O as createWorkspace, P as OptionValues, R as officialAddons, S as Verification, T as getErrorHint, _ as Scripts, a as Addon, b as TestDefinition, c as AddonReference, d as ConditionDefinition, f as ConfiguredAddon, g as PreparedAddon, h as PackageDefinition, i as add, j as MultiSelectQuestion, k as BaseQuestion, l as AddonResult, m as OptionBuilder, n as InstallOptions, o as AddonDefinition, p as LoadedAddon, r as OptionMap, s as AddonInput, t as AddonMap, u as AddonSource, v as SetupResult, w as defineAddonOptions, x as Tests, y as SvApi } from "../engine-fG9K-byo.mjs";
+import { A as BooleanQuestion, C as defineAddon, D as WorkspaceOptions, E as Workspace, F as Question, I as SelectQuestion, L as StringQuestion, M as NumberQuestion, N as OptionDefinition, O as createWorkspace, P as OptionValues, R as officialAddons, S as Verification, T as getErrorHint, _ as Scripts, a as Addon, b as TestDefinition, c as AddonReference, d as ConditionDefinition, f as ConfiguredAddon, g as PreparedAddon, h as PackageDefinition, i as add, j as MultiSelectQuestion, k as BaseQuestion, l as AddonResult, m as OptionBuilder, n as InstallOptions, o as AddonDefinition, p as LoadedAddon, r as OptionMap, s as AddonInput, t as AddonMap, u as AddonSource, v as SetupResult, w as defineAddonOptions, x as Tests, y as SvApi } from "../engine-BdGJvT03.mjs";
 
 //#region src/create/index.d.ts
 type TemplateType = (typeof templateTypes)[number];

package/dist/src/index.mjs

@@ -1,2 +1,2 @@
-import { d as defineAddon, f as defineAddonOptions, t as add, u as officialAddons, v as create } from "../engine-lCnxwqd0.mjs";
+import { d as defineAddon, f as defineAddonOptions, t as add, u as officialAddons, v as create } from "../engine-BaqBUQsx.mjs";
 export { add, create, defineAddon, defineAddonOptions, officialAddons };

package/dist/src/testing.d.mts

@@ -1,5 +1,6 @@
-import { r as OptionMap, t as AddonMap } from "../engine-fG9K-byo.mjs";
+import { r as OptionMap, t as AddonMap } from "../engine-BdGJvT03.mjs";
 import { AgentName } from "@sveltejs/sv-utils";
+import * as _playwright_test0 from "@playwright/test";
 import { Page } from "@playwright/test";
 import * as vitest from "vitest";
 import { TestProject } from "vitest/node";
@@ -102,11 +103,12 @@ declare function prepareServer({
   buildCommand,
   previewCommand
 }: PrepareServerOptions): Promise<PrepareServerReturn>;
+type PlaywrightContext = Pick<typeof _playwright_test0, "chromium">;
 type VitestContext = Pick<typeof vitest, "inject" | "test" | "beforeAll" | "beforeEach">;
-declare function createSetupTest(vitest: VitestContext): <Addons extends AddonMap>(addons: Addons, options?: SetupTestOptions<Addons>) => {
+declare function createSetupTest(vitest: VitestContext, playwright?: PlaywrightContext): <Addons extends AddonMap>(addons: Addons, options?: SetupTestOptions<Addons>) => {
   test: vitest.TestAPI<Fixtures>;
   testCases: Array<AddonTestCase<AddonMap>>;
   prepareServer: typeof prepareServer;
 };
 //#endregion
-export { AddonTestCase, CreateProject, Fixtures, PrepareServerOptions, PrepareServerReturn, ProjectVariant, SetupTestOptions, VitestContext, addPnpmBuildDependencies, createProject, createSetupTest, prepareServer, setup, setupGlobal, startPreview, variants };
+export { AddonTestCase, CreateProject, Fixtures, PlaywrightContext, PrepareServerOptions, PrepareServerReturn, ProjectVariant, SetupTestOptions, VitestContext, addPnpmBuildDependencies, createProject, createSetupTest, prepareServer, setup, setupGlobal, startPreview, variants };

package/dist/src/testing.mjs

@@ -1,4 +1,4 @@
-import { _ as z, b as __require, g as R, i as addPnpmBuildDependencies, t as add, v as create, x as __toESM, y as __commonJSMin } from "../engine-lCnxwqd0.mjs";
+import { _ as z, b as __require, g as R, i as addPnpmBuildDependencies, t as add, v as create, x as __toESM, y as __commonJSMin } from "../engine-BaqBUQsx.mjs";
 import fs from "node:fs";
 import path from "node:path";
 import process$1 from "node:process";
@@ -753,7 +753,7 @@ async function prepareServer({ cwd, page, buildCommand = "pnpm build", previewCo
 		close
 	};
 }
-function createSetupTest(vitest) {
+function createSetupTest(vitest, playwright) {
 	return function setupTest(addons, options) {
 		const { inject, test: vitestTest, beforeAll, beforeEach } = vitest;
 		const test = vitestTest.extend({});
@@ -765,7 +765,8 @@ function createSetupTest(vitest) {
 		let browser;
 		if (withBrowser) beforeAll(async () => {
 			let chromium;
-			try {
+			if (playwright) chromium = playwright.chromium;
+			else try {
 				({chromium} = await import("@playwright/test"));
 			} catch {
 				throw new Error("Browser testing requires @playwright/test. Install it with: pnpm add -D @playwright/test");

package/dist/templates/addon/assets/tests/addon.test.js

@@ -10,7 +10,7 @@ const browser = false;
 const { test, prepareServer, testCases } = setupTest(
 	{ addon },
 	{
-		kinds: [{ type: 'default', options: { addon: { who: 'you' } } }],
+		kinds: [{ type: 'default', options: { [addon.id]: { who: 'you' } } }],
 		filter: (testCase) => testCase.variant.includes('kit'),
 		browser
 	}
@@ -21,15 +21,18 @@ test.concurrent.for(testCases)(
 	async (testCase, { page, ...ctx }) => {
 		const cwd = ctx.cwd(testCase);
 
-		const msg =
-			"This is a text file made by the Community Addon Template demo for the add-on: '~SV-NAME-TODO~'!";
+		const msg = "Community Addon Template demo for the add-on: '~SV-NAME-TODO~'!";
 
 		const contentPath = path.resolve(cwd, `src/lib/~SV-NAME-TODO~/content.txt`);
 		const contentContent = fs.readFileSync(contentPath, 'utf8');
-
 		// Check if we have the imports
 		expect(contentContent).toContain(msg);
 
+		const helloPath = path.resolve(cwd, `src/lib/~SV-NAME-TODO~/HelloComponent.svelte`);
+		const helloContent = fs.readFileSync(helloPath, 'utf8');
+		// Check if we have the imports
+		expect(helloContent).toContain('you');
+
 		// For browser testing
 		if (browser) {
 			const { close } = await prepareServer({ cwd, page });

package/dist/templates/addon/package.json

@@ -6,8 +6,8 @@
 	"license": "MIT",
 	"scripts": {
 		"demo-create": "sv create demo --types ts --template minimal --no-add-ons --no-install",
-		"demo-add": "sv add file:../ --cwd demo --no-git-check --no-install",
-		"demo-add:ci": "sv add file:../=who:you --cwd demo --no-git-check --no-download-check --no-install",
+		"demo-add": "pnpm build && sv add file:../ --cwd demo --no-git-check --no-install",
+		"demo-add:ci": "pnpm build && sv add file:../=who:you --cwd demo --no-git-check --no-download-check --no-install",
 		"build": "tsdown",
 		"prepublishOnly": "npm run build",
 		"test": "vitest run"
@@ -15,16 +15,11 @@
 	"files": ["dist"],
 	"exports": {
 		".": {
-			"default": "./src/index.js"
+			"default": "./dist/index.mjs"
 		}
 	},
 	"publishConfig": {
-		"access": "public",
-		"exports": {
-			".": {
-				"default": "./dist/index.js"
-			}
-		}
+		"access": "public"
 	},
 	"peerDependencies": {
 		"sv": "latest"
@@ -37,5 +32,5 @@
 		"tsdown": "^0.21.4",
 		"vitest": "^4.1.0"
 	},
-	"keywords": ["sv-add"]
+	"keywords": ["sv-add", "svelte", "sveltekit"]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sv",
-  "version": "0.13.1",
+  "version": "0.14.0",
   "type": "module",
   "description": "A command line interface (CLI) for creating and maintaining Svelte applications",
   "license": "MIT",
@@ -25,7 +25,7 @@
     }
   },
   "dependencies": {
-    "@sveltejs/sv-utils": "0.0.4"
+    "@sveltejs/sv-utils": "0.1.0"
   },
   "devDependencies": {
     "@clack/prompts": "1.0.0",