sv 0.15.1 → 0.15.2

package/dist/bin.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { _ as name, a as detectPackageManager, d as program, g as helpConfig, h as forwardExitCode, l as from, n as add, r as create, u as Command, v as version } from "./engine-Cq2kv_P1.mjs";
+import { _ as name, a as detectPackageManager, d as program, g as helpConfig, h as forwardExitCode, l as from, n as add, r as create, u as Command, v as version } from "./engine-DNw7p3EG.mjs";
 import { color, resolveCommandArray } from "@sveltejs/sv-utils";
 import process from "node:process";
 import { execSync } from "node:child_process";

package/dist/{engine-Cq2kv_P1.mjs → engine-DNw7p3EG.mjs}

@@ -1,5 +1,5 @@
 import { createRequire } from "node:module";
-import { AGENTS, COMMANDS, Walker, color, constructCommand, createPrinter, dedent, detect, downloadJson, fileExists, isVersionUnsupportedBelow, js, loadFile, loadPackageJson, parse, pnpm, resolveCommand, resolveCommandArray, sanitizeName, saveFile, splitVersion, svelte, transforms } from "@sveltejs/sv-utils";
+import { AGENTS, COMMANDS, Walker, coerceVersion, color, constructCommand, createPrinter, dedent, detect, downloadJson, fileExists, isVersionUnsupportedBelow, js, loadFile, loadPackageJson, minVersion, parse, pnpm, resolveCommand, resolveCommandArray, sanitizeName, saveFile, svelte, transforms } from "@sveltejs/sv-utils";
 import fs, { existsSync } from "node:fs";
 import path, { delimiter, dirname, isAbsolute, join, normalize, resolve } from "node:path";
 import process$1, { cwd, stdin, stdout } from "node:process";
@@ -1394,7 +1394,7 @@ ${r ? import_picocolors.default.cyan(x$1) : ""}
 //#endregion
 //#region package.json
 var name = "sv";
-var version = "0.15.1";
+var version = "0.15.2";
 //#endregion
 //#region src/core/errors.ts
 var UnsupportedError = class extends Error {
@@ -6097,6 +6097,7 @@ function createOptionBuilder(options) {
 }
 //#endregion
 //#region src/addons/common.ts
+const ESLINT_VERSION = "^10.2.0";
 const addEslintConfigPrettier = transforms.script(({ ast, js }) => {
 	const sveltePluginImport = ast.body.filter((n) => n.type === "ImportDeclaration").find((n) => n.type === "ImportDeclaration" && n.source.value === "eslint-plugin-svelte" && n.specifiers?.some((n) => n.type === "ImportDefaultSpecifier"));
 	let svelteImportName;
@@ -6191,7 +6192,8 @@ var better_auth_default = defineAddon({
 		runsAfter("tailwindcss");
 	},
 	run: ({ sv, language, options, directory, dependencyVersion, file }) => {
-		const svelte5 = !!dependencyVersion("svelte")?.startsWith("5");
+		const svelteVersion = dependencyVersion("svelte");
+		const svelte5 = !!svelteVersion && coerceVersion(svelteVersion).major === 5;
 		const [ts, s5] = createPrinter(language === "ts", svelte5);
 		const demoPassword = options.demo.includes("password");
 		const demoGithub = options.demo.includes("github");
@@ -6679,7 +6681,6 @@ var drizzle_default = defineAddon({
 		if (!isKit) return unsupported("Requires SvelteKit");
 	},
 	run: ({ sv, language, options, directory, dependencyVersion, cwd, cancel, file, packageManager }) => {
-		if (options.database === "d1" && !dependencyVersion("@sveltejs/adapter-cloudflare")) return cancel("Cloudflare D1 requires @sveltejs/adapter-cloudflare - add the adapter first");
 		const [ts] = createPrinter(language === "ts");
 		const baseDBPath = path.resolve(cwd, directory.lib, "server", "db");
 		const paths = {
@@ -6698,7 +6699,7 @@ var drizzle_default = defineAddon({
 		if (options.sqlite === "better-sqlite3") {
 			sv.dependency("better-sqlite3", "^12.8.0");
 			sv.devDependency("@types/better-sqlite3", "^7.6.13");
-			if (packageManager === "pnpm") sv.file(file.findUp("pnpm-workspace.yaml"), pnpm.onlyBuiltDependencies("better-sqlite3"));
+			if (packageManager === "pnpm") sv.file(file.findUp("pnpm-workspace.yaml"), pnpm.allowBuilds("better-sqlite3"));
 		}
 		if (options.sqlite === "libsql" || options.sqlite === "turso") sv.devDependency("@libsql/client", "^0.17.2");
 		sv.file(".env", generateEnv(options, false));
@@ -6974,9 +6975,14 @@ var drizzle_default = defineAddon({
 			});
 		}));
 	},
-	nextSteps: ({ options, packageManager, cwd }) => {
+	nextSteps: ({ options, packageManager, cwd, dependencyVersion }) => {
 		const steps = [];
 		if (options.database === "d1") {
+			if (!dependencyVersion("@sveltejs/adapter-cloudflare")) steps.push(`Cloudflare D1 requires ${color.addon("@sveltejs/adapter-cloudflare")}. Run ${color.command(resolveCommandArray(packageManager, "execute", [
+				"sv",
+				"add",
+				"sveltekit-adapter=adapter:cloudflare"
+			]))} to add it`);
 			const ext = fileExists(cwd, "wrangler.toml") ? "toml" : "jsonc";
 			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", [
@@ -7046,7 +7052,7 @@ var eslint_default = defineAddon({
 	run: ({ sv, language, dependencyVersion, file }) => {
 		const typescript = language === "ts";
 		const prettierInstalled = Boolean(dependencyVersion("prettier"));
-		sv.devDependency("eslint", "^10.2.0");
+		sv.devDependency("eslint", ESLINT_VERSION);
 		sv.devDependency("@eslint/compat", "^2.0.4");
 		sv.devDependency("eslint-plugin-svelte", "^3.17.0");
 		sv.devDependency("globals", "^17.4.0");
@@ -7552,8 +7558,8 @@ var playwright_default = defineAddon({
 	run: ({ sv, language, file, isKit, directory }) => {
 		sv.devDependency("@playwright/test", "^1.59.1");
 		sv.file(file.package, transforms.json(({ data, json }) => {
-			json.packageScriptsUpsert(data, "prepare", "playwright install", { mode: "prepend" });
 			json.packageScriptsUpsert(data, "test:e2e", "playwright test");
+			json.packageScriptsUpsert(data, "test:e2e", "playwright install", { mode: "prepend" });
 			json.packageScriptsUpsert(data, "test", "npm run test:e2e");
 		}));
 		sv.file(file.gitignore, transforms.text(({ content, text }) => {
@@ -7657,8 +7663,7 @@ var prettier_default = defineAddon({
 		}, { onError: () => {
 			R$1.warn(`A ${color.warning(".prettierrc")} config already exists and cannot be parsed as JSON. Skipping initialization.`);
 		} }));
-		const eslintVersion = dependencyVersion("eslint");
-		const eslintInstalled = hasEslint(eslintVersion);
+		const eslintInfo = checkEslint(dependencyVersion("eslint"));
 		sv.file(file.package, transforms.json(({ data, json }) => {
 			json.packageScriptsUpsert(data, "lint", "prettier --check .", { mode: "prepend" });
 			json.packageScriptsUpsert(data, "format", "prettier --write .");
@@ -7666,16 +7671,23 @@ var prettier_default = defineAddon({
 		sv.file(".vscode/extensions.json", transforms.json(({ data, json }) => {
 			json.arrayUpsert(data, "recommendations", "esbenp.prettier-vscode");
 		}));
-		if (eslintVersion?.startsWith(SUPPORTED_ESLINT_VERSION) === false) R$1.warn(`An older major version of ${color.warning("eslint")} was detected. Skipping ${color.warning("eslint-config-prettier")} installation.`);
-		if (eslintInstalled) {
+		if (eslintInfo.installed && !eslintInfo.supported) R$1.warn(`An unsupported major version of ${color.warning("eslint")} was detected. Skipping ${color.warning("eslint-config-prettier")} installation.`);
+		if (eslintInfo.supported) {
 			sv.devDependency("eslint-config-prettier", "^10.1.8");
 			sv.file("eslint.config.js", addEslintConfigPrettier);
 		}
 	}
 });
-const SUPPORTED_ESLINT_VERSION = "9";
-function hasEslint(version) {
-	return !!version && version.startsWith(SUPPORTED_ESLINT_VERSION);
+function checkEslint(version) {
+	if (!version) return {
+		installed: false,
+		supported: false
+	};
+	const supportedMajor = coerceVersion(ESLINT_VERSION).major;
+	return {
+		installed: true,
+		supported: coerceVersion(version).major === supportedMajor
+	};
 }
 //#endregion
 //#region src/addons/storybook.ts
@@ -7882,7 +7894,7 @@ var tailwindcss_default = defineAddon({
 		const prettierInstalled = Boolean(dependencyVersion("prettier"));
 		sv.devDependency("tailwindcss", "^4.2.2");
 		sv.devDependency("@tailwindcss/vite", "^4.2.2");
-		if (packageManager === "pnpm") sv.file(file.findUp("pnpm-workspace.yaml"), pnpm.onlyBuiltDependencies("@tailwindcss/oxide"));
+		if (packageManager === "pnpm") sv.file(file.findUp("pnpm-workspace.yaml"), pnpm.allowBuilds("@tailwindcss/oxide"));
 		if (prettierInstalled) sv.devDependency("prettier-plugin-tailwindcss", "^0.7.2");
 		for (const plugin of plugins) {
 			if (!options.plugins.includes(plugin.id)) continue;
@@ -7981,7 +7993,8 @@ const officialAddons$1 = {
 		run: ({ sv, file, language, directory, options, dependencyVersion }) => {
 			const unitTesting = options.usages.includes("unit");
 			const componentTesting = options.usages.includes("component");
-			vitestV3Installed = (dependencyVersion("vitest") ?? "").replaceAll("^", "").replaceAll("~", "")?.startsWith("3.");
+			const vitestVersion = dependencyVersion("vitest");
+			if (vitestVersion) vitestV3Installed = coerceVersion(vitestVersion).major === 3;
 			sv.devDependency("vitest", "^4.1.3");
 			if (componentTesting) {
 				sv.devDependency("@vitest/browser-playwright", "^4.1.3");
@@ -10795,9 +10808,8 @@ function verifyPackage(addonPkg, specifier) {
 	const addonSvVersion = peerDeps["sv"];
 	if (!addonSvVersion) throw new Error(`Invalid add-on package specified: '${specifier}' is missing 'sv' in its 'peerDependencies'`);
 	if (Object.keys(deps).length > 0) throw new Error(`Invalid add-on package detected: '${specifier}'\nCommunity add-ons should not have any 'dependencies'. Use 'peerDependencies' for 'sv' and bundle everything else`);
-	const cleanedAddonVersion = addonSvVersion.replace(/^[\^~>=<]+/, "");
-	const addon_major = splitVersion(cleanedAddonVersion).major;
-	if (splitVersion(version).major !== addon_major) return `${color.addon(specifier)} was built for ${color.warning(`sv@${cleanedAddonVersion}`)} but you're running ${color.addon(`sv@${version}`)}.\nThis may cause compatibility issues. ${color.optional("Run it with the same sv version to avoid issues.")}`;
+	const addon = coerceVersion(addonSvVersion);
+	if (coerceVersion(version).major !== addon.major) return `${color.addon(specifier)} was built for ${color.warning(`sv@${addon.version ?? addonSvVersion}`)} but you're running ${color.addon(`sv@${version}`)}.\nThis may cause compatibility issues. ${color.optional("Run it with the same sv version to avoid issues.")}`;
 }
 /**
 * Recursively copies a directory from source to destination
@@ -10978,12 +10990,12 @@ function getUserAgent() {
 	const name = pmSpec.substring(0, separatorPos);
 	return AGENTS.includes(name) ? name : void 0;
 }
-function addPnpmOnlyBuiltDependencies(cwd, packageManager, ...packages) {
+function addPnpmAllowBuilds(cwd, packageManager, ...packages) {
 	if (packageManager !== "pnpm" || packages.length === 0) return;
 	const found = up$1("pnpm-workspace.yaml", { cwd });
 	const filePath = found ?? path.join(cwd, "pnpm-workspace.yaml");
 	const content = found ? fs.readFileSync(found, "utf-8") : "";
-	const newContent = pnpm.onlyBuiltDependencies(...packages)(content);
+	const newContent = pnpm.allowBuilds(...packages)(content);
 	if (newContent !== content) fs.writeFileSync(filePath, newContent, "utf-8");
 }
 //#endregion
@@ -11081,7 +11093,9 @@ async function createWorkspace({ cwd, packageManager, override }) {
 			directory = path.dirname(directory);
 		}
 	}
-	for (const [key, value] of Object.entries(dependencies)) dependencies[key] = value.replaceAll(/[^\d|.]/g, "");
+	for (const [key, value] of Object.entries(dependencies)) try {
+		dependencies[key] = minVersion(value);
+	} catch {}
 	const isKit = override?.isKit ?? !!dependencies["@sveltejs/kit"];
 	const directory = override?.directory ? override.directory : isKit ? {
 		src: "src",
@@ -11585,7 +11599,7 @@ async function createProject(cwd, options) {
 	updateAgent(directory, language, packageManager ?? "npm", loadedAddons);
 	if (packageManager) workspace.packageManager = packageManager;
 	const addOnNextSteps = getNextSteps(addOnSuccessfulAddons, workspace, answers, addonSetupResults);
-	addPnpmOnlyBuiltDependencies(projectPath, packageManager, "esbuild");
+	addPnpmAllowBuilds(projectPath, packageManager, "esbuild");
 	if (packageManager) {
 		await installDependencies(packageManager, projectPath);
 		await formatFiles({
@@ -12049,12 +12063,14 @@ async function runAddonsApply({ answers, options, loadedAddons, setupResults, wo
 		canceledAddonIds.push(addonId);
 	}
 	const successfulAddons = loadedAddons.filter((a) => !canceledAddonIds.includes(a.addon.id));
-	if (addonSuccess.length === 0) {
+	if (addonSuccess.length === 0) if (fromCommand === "create") R$1.warn("All selected add-ons were canceled.");
+	else {
 		Pt("All selected add-ons were canceled.");
 		process$1.exit(1);
-	} else R$1.success(`Successfully setup add-ons: ${addonSuccess.map((c) => color.addon(c)).join(", ")}`);
+	}
+	else R$1.success(`Successfully setup add-ons: ${addonSuccess.map((c) => color.addon(c)).join(", ")}`);
 	const packageManager = options.install === false ? null : options.install === true ? await packageManagerPrompt(options.cwd) : options.install;
-	addPnpmOnlyBuiltDependencies(workspace.cwd, packageManager, "esbuild");
+	addPnpmAllowBuilds(workspace.cwd, packageManager, "esbuild");
 	const argsFormattedAddons = [];
 	for (const loaded of successfulAddons) {
 		const addonId = loaded.addon.id;
@@ -12313,9 +12329,16 @@ async function add({ addons, cwd, options, packageManager = "npm" }) {
 async function applyAddons({ loadedAddons, workspace, setupResults, options }) {
 	const filesToFormat = /* @__PURE__ */ new Set();
 	const status = {};
+	const canceledAddons = /* @__PURE__ */ new Set();
 	const ordered = orderAddons(loadedAddons.map((l) => l.addon), setupResults);
 	let hasFormatter = false;
 	for (const addon of ordered) {
+		const canceledDeps = (setupResults[addon.id]?.dependsOn ?? []).filter((dep) => canceledAddons.has(dep));
+		if (canceledDeps.length > 0) {
+			canceledAddons.add(addon.id);
+			status[addon.id] = canceledDeps.map((dep) => `Because dependency '${dep}' was canceled`);
+			continue;
+		}
 		const loaded = loadedAddons.find((l) => l.addon.id === addon.id);
 		const workspaceOptions = options[addon.id] || {};
 		const addonWorkspace = await createWorkspace({
@@ -12332,7 +12355,10 @@ async function applyAddons({ loadedAddons, workspace, setupResults, options }) {
 		});
 		files.forEach((f) => filesToFormat.add(f));
 		if (cancels.length === 0) status[addon.id] = "success";
-		else status[addon.id] = cancels;
+		else {
+			canceledAddons.add(addon.id);
+			status[addon.id] = cancels;
+		}
 	}
 	return {
 		filesToFormat: hasFormatter ? Array.from(filesToFormat) : [],
@@ -12421,8 +12447,8 @@ async function runAddon({ addon, loaded, multiple, workspace, workspaceOptions }
 			});
 		},
 		pnpmBuildDependency: (pkg) => {
-			svDeprecated("use `pnpm.onlyBuiltDependencies` from `@sveltejs/sv-utils` instead of `sv.pnpmBuildDependency`");
-			addPnpmOnlyBuiltDependencies(workspace.cwd, workspace.packageManager, pkg);
+			svDeprecated("use `pnpm.allowBuilds` from `@sveltejs/sv-utils` instead of `sv.pnpmBuildDependency`");
+			addPnpmAllowBuilds(workspace.cwd, workspace.packageManager, pkg);
 		}
 	};
 	const cancels = [];
@@ -12454,4 +12480,4 @@ function orderAddons(addons, setupResults) {
 	});
 }
 //#endregion
-export { __toESM as S, name as _, detectPackageManager as a, __commonJSMin as b, defineAddonOptions as c, program as d, R as f, helpConfig as g, forwardExitCode as h, addPnpmOnlyBuiltDependencies as i, from as l, create$1 as m, add$1 as n, officialAddons$1 as o, z as p, create as r, defineAddon as s, add as t, Command as u, version as v, __require as x, svDeprecated as y };
+export { __toESM as S, name as _, detectPackageManager as a, __commonJSMin as b, defineAddonOptions as c, program as d, R as f, helpConfig as g, forwardExitCode as h, addPnpmAllowBuilds as i, from as l, create$1 as m, add$1 as n, officialAddons$1 as o, z as p, create as r, defineAddon as s, add as t, Command as u, version as v, __require as x, svDeprecated as y };

package/dist/{engine-3mrtB4nw.d.mts → engine-DcLtEbd7.d.mts}

@@ -117,7 +117,7 @@ type Workspace = {
 //#region src/core/config.d.ts
 type ConditionDefinition = (Workspace: Workspace) => boolean;
 type SvApi = {
-  /** @deprecated use `pnpm.onlyBuiltDependencies` from `@sveltejs/sv-utils` instead */pnpmBuildDependency: (pkg: string) => void; /** Add a package to the dependencies. */
+  /** @deprecated use `pnpm.allowBuilds` from `@sveltejs/sv-utils` instead */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>;

package/dist/src/index.d.mts

@@ -1,4 +1,4 @@
-import { A as StringQuestion, C as BooleanQuestion, D as OptionValues, E as OptionDefinition, O as Question, S as BaseQuestion, T as NumberQuestion, _ as SvApi, a as Addon, b as Workspace, c as AddonReference, d as ConditionDefinition, f as ConfiguredAddon, g as SetupResult, h as PreparedAddon, i as add, j as officialAddons, k as SelectQuestion, 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 defineAddon, w as MultiSelectQuestion, x as WorkspaceOptions, y as defineAddonOptions } from "../engine-3mrtB4nw.mjs";
+import { A as StringQuestion, C as BooleanQuestion, D as OptionValues, E as OptionDefinition, O as Question, S as BaseQuestion, T as NumberQuestion, _ as SvApi, a as Addon, b as Workspace, c as AddonReference, d as ConditionDefinition, f as ConfiguredAddon, g as SetupResult, h as PreparedAddon, i as add, j as officialAddons, k as SelectQuestion, 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 defineAddon, w as MultiSelectQuestion, x as WorkspaceOptions, y as defineAddonOptions } from "../engine-DcLtEbd7.mjs";
 
 //#region src/create/index.d.ts
 type TemplateType = (typeof templateTypes)[number];
@@ -23,8 +23,8 @@ type FileType = {
 };
 //#endregion
 //#region src/index.d.ts
+declare function create(options: Options): void;
 /** @deprecated use `create({ cwd, ...options })` instead. */
 declare function create(cwd: string, options: Omit<Options, "cwd">): void;
-declare function create(options: Options): void;
 //#endregion
 export { type Addon, type AddonDefinition, type AddonInput, type AddonMap, type AddonReference, type AddonResult, type AddonSource, type BaseQuestion, type BooleanQuestion, type ConfiguredAddon, type FileEditor, type FileType, type InstallOptions, type LanguageType, type LoadedAddon, type MultiSelectQuestion, type NumberQuestion, type OptionBuilder, type OptionDefinition, type OptionMap, type OptionValues, type PreparedAddon, type Question, type SelectQuestion, type SetupResult, type StringQuestion, type SvApi, type TemplateType, type Workspace, type WorkspaceOptions, add, create, defineAddon, defineAddonOptions, officialAddons };

package/dist/src/index.mjs

@@ -1,4 +1,4 @@
-import { c as defineAddonOptions, m as create$1, o as officialAddons, s as defineAddon, t as add, y as svDeprecated } from "../engine-Cq2kv_P1.mjs";
+import { c as defineAddonOptions, m as create$1, o as officialAddons, s as defineAddon, t as add, y as svDeprecated } from "../engine-DNw7p3EG.mjs";
 //#region src/index.ts
 function create(cwdOrOptions, legacyOptions) {
 	if (typeof cwdOrOptions === "string") {

package/dist/src/testing.d.mts

@@ -1,4 +1,4 @@
-import { r as OptionMap, t as AddonMap } from "../engine-3mrtB4nw.mjs";
+import { r as OptionMap, t as AddonMap } from "../engine-DcLtEbd7.mjs";
 import * as _$_playwright_test0 from "@playwright/test";
 import { Page } from "@playwright/test";
 import * as _$vitest from "vitest";

package/dist/src/testing.mjs

@@ -1,4 +1,4 @@
-import { S as __toESM, b as __commonJSMin, f as R, i as addPnpmOnlyBuiltDependencies, m as create, p as z, t as add, x as __require } from "../engine-Cq2kv_P1.mjs";
+import { S as __toESM, b as __commonJSMin, f as R, i as addPnpmAllowBuilds, m as create, p as z, t as add, x as __require } from "../engine-DNw7p3EG.mjs";
 import fs from "node:fs";
 import path from "node:path";
 import process$1 from "node:process";
@@ -822,7 +822,7 @@ function createSetupTest(vitest, playwright) {
 					options: kind.options,
 					packageManager: "pnpm"
 				});
-				addPnpmOnlyBuiltDependencies(cwd, "pnpm", "esbuild");
+				addPnpmAllowBuilds(cwd, "pnpm", "esbuild");
 			}
 			execSync("pnpm install", {
 				cwd: path.resolve(cwd, testName),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sv",
-  "version": "0.15.1",
+  "version": "0.15.2",
   "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.2.0"
+    "@sveltejs/sv-utils": "0.2.1"
   },
   "devDependencies": {
     "@clack/prompts": "1.0.0",