sv 0.9.3 → 0.9.4

package/dist/{addons-uHDStNUk.js → addons-DT8tgFSU.js}

@@ -1,4 +1,4 @@
-import { Element, T, Tag, __commonJS, __export, __toESM as __toESM$1, __toESM$1 as __toESM, be, detect, esm_exports, getUserAgent, parseCss$1, parseHtml, parseHtml$1, parseJson$1, parseScript, parseScript$1, parseSvelte, require_picocolors as require_picocolors$1, require_picocolors$1 as require_picocolors, resolveCommand, serializeScript, stripAst, up, walk, walk_exports } from "./package-manager-DO5R9a6p.js";
+import { Element, T, Tag, __commonJS, __export, __toESM, __toESM$1, be, detect, esm_exports, getUserAgent, parseCss$1, parseHtml, parseHtml$1, parseJson$1, parseScript, parseScript$1, parseSvelte, require_picocolors, require_picocolors$1, resolveCommand, serializeScript, stripAst, up, walk, walk_exports } from "./package-manager-DO5R9a6p.js";
 import fs, { existsSync, lstatSync, readdirSync } from "node:fs";
 import path, { dirname, join } from "node:path";
 import process$1, { stdin, stdout } from "node:process";
@@ -889,7 +889,7 @@ const addPlugin = (ast, options$6) => {
 
 //#endregion
 //#region packages/cli/commands/add/utils.ts
-var import_picocolors$5 = __toESM(require_picocolors(), 1);
+var import_picocolors$5 = __toESM$1(require_picocolors$1(), 1);
 function getPackageJson(cwd) {
 	const packageText = readFile(cwd, commonFilePaths.packageJson);
 	if (!packageText) {
@@ -1063,7 +1063,7 @@ function parseKitOptions(cwd) {
 
 //#endregion
 //#region packages/cli/lib/install.ts
-var import_picocolors$4 = __toESM(require_picocolors(), 1);
+var import_picocolors$4 = __toESM$1(require_picocolors$1(), 1);
 async function installAddon({ addons, cwd, options: options$6, packageManager = "npm" }) {
 	const workspace = await createWorkspace({
 		cwd,
@@ -1173,7 +1173,7 @@ async function runAddon({ addon, multiple, workspace }) {
 				dev: true
 			});
 		},
-		pnpmBuildDependendency: (pkg) => {
+		pnpmBuildDependency: (pkg) => {
 			pnpmBuildDependencies.push(pkg);
 		}
 	};
@@ -1202,7 +1202,7 @@ function defineAddon(config) {
 function defineAddonOptions() {
 	return createOptionBuilder({});
 }
-function createOptionBuilder(options$6 = {}) {
+function createOptionBuilder(options$6) {
 	return {
 		add(key, question) {
 			const newOptions = {
@@ -1270,8 +1270,8 @@ else if (y > 0) ret += `${CSI}${y}B`;
 		beep
 	};
 } });
-var import_src$1 = __toESM$1(require_src(), 1);
-var import_picocolors$3 = __toESM$1(require_picocolors$1(), 1);
+var import_src$1 = __toESM(require_src(), 1);
+var import_picocolors$3 = __toESM(require_picocolors(), 1);
 function hu({ onlyFirst: e$1 = !1 } = {}) {
 	const t = ["[\\u001B\\u009B][[\\]()#;?]*(?:(?:(?:(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]+)*|[a-zA-Z\\d]+(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]*)*)?(?:\\u0007|\\u001B\\u005C|\\u009C))", "(?:(?:\\d{1,4}(?:;\\d{0,4})*)?[\\dA-PR-TZcf-nq-uy=><~]))"].join("|");
 	return new RegExp(t, e$1 ? void 0 : "g");
@@ -2006,9 +2006,9 @@ B$1 = new WeakMap(), k$1 = new WeakMap(), I = new WeakMap(), v$1 = new WeakMap()
 		e$1 ? this.filteredOptions = D$1.filter((t) => x$1(this, I).call(this, e$1, t)) : this.filteredOptions = [...D$1], m(this, B$1, FD(this.focusedValue, this.filteredOptions)), this.focusedValue = this.filteredOptions[x$1(this, B$1)]?.value, this.multiple || (this.focusedValue !== void 0 ? this.toggleSelected(this.focusedValue) : this.deselectAll());
 	}
 };
-var import_picocolors$1 = __toESM$1(require_picocolors$1(), 1);
-var import_picocolors$2 = __toESM$1(require_picocolors$1(), 1);
-var import_src = __toESM$1(require_src(), 1);
+var import_picocolors$1 = __toESM(require_picocolors(), 1);
+var import_picocolors$2 = __toESM(require_picocolors(), 1);
+var import_src = __toESM(require_src(), 1);
 function Pe() {
 	return process$1.platform !== "win32" ? process$1.env.TERM !== "linux" : !!process$1.env.CI || !!process$1.env.WT_SESSION || !!process$1.env.TERMINUS_SUBLIME || process$1.env.ConEmuTask === "{cmd::Cmder}" || process$1.env.TERM_PROGRAM === "Terminus-Sublime" || process$1.env.TERM_PROGRAM === "vscode" || process$1.env.TERM === "xterm-256color" || process$1.env.TERM === "alacritty" || process$1.env.TERMINAL_EMULATOR === "JetBrains-JediTerm";
 }
@@ -2708,7 +2708,7 @@ else return true;
 	if (version.patch === below.patch) return false;
 	return undefined;
 }
-var import_picocolors = __toESM$1(require_picocolors$1(), 1);
+var import_picocolors = __toESM(require_picocolors(), 1);
 var colors = import_picocolors.default;
 
 //#endregion
@@ -2886,7 +2886,7 @@ var drizzle_default = defineAddon({
 	},
 	run: ({ sv, typescript, options: options$6, kit, dependencyVersion }) => {
 		const ext = typescript ? "ts" : "js";
-		sv.dependency("drizzle-orm", "^0.40.0");
+		sv.devDependency("drizzle-orm", "^0.40.0");
 		sv.devDependency("drizzle-kit", "^0.30.2");
 		sv.devDependency("@types/node", getNodeTypesVersion());
 		if (options$6.mysql === "mysql2") sv.dependency("mysql2", "^3.12.0");
@@ -2896,9 +2896,9 @@ var drizzle_default = defineAddon({
 		if (options$6.sqlite === "better-sqlite3") {
 			sv.dependency("better-sqlite3", "^11.8.0");
 			sv.devDependency("@types/better-sqlite3", "^7.6.12");
-			sv.pnpmBuildDependendency("better-sqlite3");
+			sv.pnpmBuildDependency("better-sqlite3");
 		}
-		if (options$6.sqlite === "libsql" || options$6.sqlite === "turso") sv.dependency("@libsql/client", "^0.14.0");
+		if (options$6.sqlite === "libsql" || options$6.sqlite === "turso") sv.devDependency("@libsql/client", "^0.14.0");
 		sv.file(".env", (content) => generateEnvFileContent(content, options$6));
 		sv.file(".env.example", (content) => generateEnvFileContent(content, options$6));
 		if (options$6.docker && (options$6.mysql === "mysql2" || options$6.postgresql === "postgres.js")) sv.file("docker-compose.yml", (content) => {
@@ -4368,8 +4368,8 @@ var lucia_default = defineAddon({
 	},
 	run: ({ sv, typescript, options: options$6, kit, dependencyVersion }) => {
 		const ext = typescript ? "ts" : "js";
-		sv.dependency("@oslojs/crypto", "^1.0.1");
-		sv.dependency("@oslojs/encoding", "^1.1.0");
+		sv.devDependency("@oslojs/crypto", "^1.0.1");
+		sv.devDependency("@oslojs/encoding", "^1.1.0");
 		if (options$6.demo) sv.dependency("@node-rs/argon2", "^2.0.2");
 		sv.file(`drizzle.config.${ext}`, (content) => {
 			const { ast, generateCode } = parseScript$1(content);
@@ -5059,7 +5059,7 @@ var paraglide_default = defineAddon({
 		const ext = typescript ? "ts" : "js";
 		if (!kit) throw new Error("SvelteKit is required");
 		const paraglideOutDir = "src/lib/paraglide";
-		sv.dependency("@inlang/paraglide-js", "^2.0.0");
+		sv.devDependency("@inlang/paraglide-js", "^2.0.0");
 		sv.file("project.inlang/settings.json", (content) => {
 			if (content) return content;
 			const { data, generateCode } = parseJson$1(content);
@@ -5398,12 +5398,12 @@ const adapters = [
 const options$2 = defineAddonOptions().add("adapter", {
 	type: "select",
 	question: "Which SvelteKit adapter would you like to use?",
+	default: "auto",
 	options: adapters.map((p$1) => ({
 		value: p$1.id,
 		label: p$1.id,
 		hint: p$1.package
-	})),
-	default: "auto"
+	}))
 }).build();
 var sveltekit_adapter_default = defineAddon({
 	id: "sveltekit-adapter",
@@ -5458,25 +5458,21 @@ var sveltekit_adapter_default = defineAddon({
 
 //#endregion
 //#region packages/addons/tailwindcss/index.ts
-function typedEntries(obj) {
-	return Object.entries(obj);
-}
-const plugins = {
-	typography: {
-		package: "@tailwindcss/typography",
-		version: "^0.5.15"
-	},
-	forms: {
-		package: "@tailwindcss/forms",
-		version: "^0.5.9"
-	}
-};
+const plugins = [{
+	id: "typography",
+	package: "@tailwindcss/typography",
+	version: "^0.5.15"
+}, {
+	id: "forms",
+	package: "@tailwindcss/forms",
+	version: "^0.5.9"
+}];
 const options$1 = defineAddonOptions().add("plugins", {
 	type: "multiselect",
 	question: "Which plugins would you like to add?",
-	options: typedEntries(plugins).map(([id, p$1]) => ({
-		value: id,
-		label: id,
+	options: plugins.map((p$1) => ({
+		value: p$1.id,
+		label: p$1.id,
 		hint: p$1.package
 	})),
 	default: [],
@@ -5493,8 +5489,8 @@ var tailwindcss_default = defineAddon({
 		sv.devDependency("tailwindcss", "^4.0.0");
 		sv.devDependency("@tailwindcss/vite", "^4.0.0");
 		if (prettierInstalled) sv.devDependency("prettier-plugin-tailwindcss", "^0.6.11");
-		for (const [id, plugin] of typedEntries(plugins)) {
-			if (!options$6.plugins.includes(id)) continue;
+		for (const plugin of plugins) {
+			if (!options$6.plugins.includes(plugin.id)) continue;
 			sv.devDependency(plugin.package, plugin.version);
 		}
 		sv.file(viteConfigFile, (content) => {
@@ -5521,8 +5517,8 @@ var tailwindcss_default = defineAddon({
 			}
 			const lastAtRule = atRules.findLast((rule) => ["plugin", "import"].includes(rule.name));
 			const pluginPos = lastAtRule.source.end.offset;
-			for (const [id, plugin] of typedEntries(plugins)) {
-				if (!options$6.plugins.includes(id)) continue;
+			for (const plugin of plugins) {
+				if (!options$6.plugins.includes(plugin.id)) continue;
 				const pluginRule = findAtRule("plugin", plugin.package);
 				if (!pluginRule) {
 					const pluginImport = `\n@plugin '${plugin.package}';`;

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-uHDStNUk.js";
+import { applyAddons, communityAddonIds, createWorkspace, formatFiles, getAddonDetails, getCommunityAddon, getHighlighter, isVersionUnsupportedBelow, officialAddons, setupAddons } from "./addons-DT8tgFSU.js";
 import fs, { existsSync } from "node:fs";
 import path, { dirname, join } from "node:path";
 import { fileURLToPath } from "node:url";
@@ -12,7 +12,7 @@ import { pipeline } from "node:stream/promises";
 
 //#region packages/cli/package.json
 var name = "sv";
-var version = "0.9.3";
+var version = "0.9.4";
 var type = "module";
 var description = "A CLI for creating and updating SvelteKit projects";
 var license = "MIT";
@@ -959,10 +959,9 @@ else if (official[addonId][id] !== undefined) throw new Error(`Incompatible '${a
 		}
 	}
 	let workspace = await createWorkspace({ cwd: options$1.cwd });
-	const setups = selectedAddons.length ? selectedAddons.map(({ addon }) => addon) : officialAddons;
-	const addonSetupResults = setupAddons(setups, workspace);
 	if (selectedAddons.length === 0) {
-		const addonOptions$1 = officialAddons.filter(({ id }) => addonSetupResults[id].unsupported.length === 0).map(({ id, homepage: homepage$1, shortDescription }) => ({
+		const allSetupResults = setupAddons(officialAddons, workspace);
+		const addonOptions$1 = officialAddons.filter(({ id }) => allSetupResults[id].unsupported.length === 0).map(({ id, homepage: homepage$1, shortDescription }) => ({
 			label: id,
 			value: id,
 			hint: `${shortDescription} - ${homepage$1}`
@@ -986,7 +985,8 @@ else if (official[addonId][id] !== undefined) throw new Error(`Incompatible '${a
 	}
 	for (const { addon } of selectedAddons) {
 		workspace = await createWorkspace(workspace);
-		const setupResult = addonSetupResults[addon.id];
+		const setups = selectedAddons.map(({ addon: addon$1 }) => addon$1);
+		const setupResult = setupAddons(setups, workspace)[addon.id];
 		const missingDependencies = setupResult.dependsOn.filter((depId) => !selectedAddons.some((a) => a.addon.id === depId));
 		for (const depId of missingDependencies) {
 			const dependency = officialAddons.find((a) => a.id === depId);
@@ -1003,6 +1003,7 @@ else if (official[addonId][id] !== undefined) throw new Error(`Incompatible '${a
 		}
 	}
 	const addons = selectedAddons.map(({ addon }) => addon);
+	const addonSetupResults = setupAddons(addons, workspace);
 	const verifications = [...verifyCleanWorkingDirectory(options$1.cwd, options$1.gitCheck), ...verifyUnsupportedAddons(addons, addonSetupResults)];
 	const fails = [];
 	for (const verification of verifications) {

package/dist/index.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sv",
-  "version": "0.9.3",
+  "version": "0.9.4",
   "type": "module",
   "description": "A CLI for creating and updating SvelteKit projects",
   "license": "MIT",