sv 0.10.4 → 0.10.6

package/dist/bin.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
-import { $ as et, A as parseSvelte, B as isVersionUnsupportedBelow, C as dist, G as De, J, K as Fe, O as parseJson, Q as We, T as resolveCommand, X as T, Y as Ke, Z as Ue, a as getUserAgent, at as Option, b as detect, c as packageManagerPrompt, d as from, et as ke, f as commonFilePaths, g as getPackageJson, h as getHighlighter, i as addPnpmBuildDependencies, it as Command, k as parseScript, lt as __toESM, m as formatFiles, n as templates, nt as Vu, o as installDependencies, ot as program, q as Ge, r as AGENT_NAMES, rt as require_picocolors, s as installOption, t as create$1, tt as ze, u as up$1, w as getSharedFiles } from "./create-DJeT6Cfe.js";
-import { a as communityAddonIds, c as officialAddons, d as create$2, f as overrideProperties, i as createWorkspace, l as createDefault, o as getCommunityAddon, r as setupAddons, s as getAddonDetails, t as applyAddons, u as addDefault } from "./install-6J55LDIW.js";
+import { $ as et, A as parseSvelte, B as isVersionUnsupportedBelow, C as dist, G as De, J, K as Fe, O as parseJson, Q as We, T as resolveCommand, X as T, Y as Ke, Z as Ue, a as getUserAgent, at as Option, b as detect, c as packageManagerPrompt, d as from, et as ke, f as commonFilePaths, g as getPackageJson, h as getHighlighter, i as addPnpmBuildDependencies, it as Command, k as parseScript, lt as __toESM, m as formatFiles, n as templates, nt as Vu, o as installDependencies, ot as program, q as Ge, r as AGENT_NAMES, rt as require_picocolors, s as installOption, t as create$1, tt as ze, u as up$1, w as getSharedFiles } from "./create-DTIS6AzL.js";
+import { a as communityAddonIds, c as officialAddons, d as create$2, f as overrideProperties, i as createWorkspace, l as createDefault, o as getCommunityAddon, r as setupAddons, s as getAddonDetails, t as applyAddons, u as addDefault } from "./install-BfCQ4zdp.js";
 import { exec, execSync } from "node:child_process";
 import path, { dirname, join } from "node:path";
 import fs, { existsSync } from "node:fs";
@@ -12,7 +12,7 @@ import { pipeline } from "node:stream/promises";
 
 //#region package.json
 var name = "sv";
-var version = "0.10.4";
+var version = "0.10.6";
 
 //#endregion
 //#region ../../node_modules/.pnpm/empathic@1.1.0/node_modules/empathic/package.mjs
@@ -984,7 +984,8 @@ async function runAddonsApply({ answersOfficial, answersCommunity, options: opti
 	if (!addonSetupResults) addonSetupResults = setupAddons(selectedAddons.length ? selectedAddons.map(({ addon }) => addon) : officialAddons$1, workspace);
 	if (selectedAddons.length === 0) return {
 		nextSteps: [],
-		argsFormattedAddons: []
+		argsFormattedAddons: [],
+		filesToFormat: []
 	};
 	const officialDetails = Object.keys(answersOfficial).map((id) => getAddonDetails(id));
 	const commDetails = Object.keys(answersCommunity).map((id) => communityDetails.find((a) => a.id === id));
@@ -1038,21 +1039,11 @@ async function runAddonsApply({ answersOfficial, answersCommunity, options: opti
 	if (packageManager) {
 		workspace.packageManager = packageManager;
 		await installDependencies(packageManager, options$1.cwd);
-	}
-	if (filesToFormat.length > 0 && packageManager && !!workspace.dependencyVersion("prettier")) {
-		const { start, stop } = J();
-		start("Formatting modified files");
-		try {
-			await formatFiles({
-				packageManager,
-				cwd: options$1.cwd,
-				paths: filesToFormat
-			});
-			stop("Successfully formatted modified files");
-		} catch (e) {
-			stop("Failed to format files");
-			if (e instanceof Error) T.error(e.message);
-		}
+		await formatFiles({
+			packageManager,
+			cwd: options$1.cwd,
+			filesToFormat
+		});
 	}
 	const highlighter = getHighlighter();
 	return {
@@ -1069,7 +1060,8 @@ async function runAddonsApply({ answersOfficial, answersCommunity, options: opti
 			addonMessage += `  - ${addonNextSteps.join("\n  - ")}`;
 			return addonMessage;
 		}).filter((msg) => msg !== void 0),
-		argsFormattedAddons
+		argsFormattedAddons,
+		filesToFormat
 	};
 }
 /**
@@ -1520,7 +1512,6 @@ async function createProject(cwd, options$1) {
 	const workspace = await createVirtualWorkspace({
 		cwd: projectPath,
 		template,
-		packageManager: "npm",
 		type: language
 	});
 	if (options$1.addOns || options$1.add.length > 0) {
@@ -1552,8 +1543,9 @@ async function createProject(cwd, options$1) {
 	T.success("Project created");
 	let addOnNextSteps = [];
 	let argsFormattedAddons = [];
+	let addOnFilesToFormat = [];
 	if (options$1.addOns || options$1.add.length > 0) {
-		const { nextSteps, argsFormattedAddons: argsFormatted$1 } = await runAddonsApply({
+		const { nextSteps, argsFormattedAddons: argsFormatted$1, filesToFormat } = await runAddonsApply({
 			answersOfficial,
 			answersCommunity,
 			options: {
@@ -1569,6 +1561,7 @@ async function createProject(cwd, options$1) {
 			fromCommand: "create"
 		});
 		argsFormattedAddons = argsFormatted$1;
+		addOnFilesToFormat = filesToFormat;
 		addOnNextSteps = nextSteps;
 	}
 	const packageManager = options$1.install === false ? null : options$1.install === true ? await packageManagerPrompt(projectPath) : options$1.install;
@@ -1580,7 +1573,14 @@ async function createProject(cwd, options$1) {
 	if (argsFormattedAddons.length > 0) argsFormatted.push("--add", ...argsFormattedAddons);
 	logArgs(packageManager, "create", argsFormatted, [directory]);
 	await addPnpmBuildDependencies(projectPath, packageManager, ["esbuild"]);
-	if (packageManager) await installDependencies(packageManager, projectPath);
+	if (packageManager) {
+		await installDependencies(packageManager, projectPath);
+		await formatFiles({
+			packageManager,
+			cwd: projectPath,
+			filesToFormat: addOnFilesToFormat
+		});
+	}
 	return {
 		directory: projectPath,
 		addOnNextSteps,
@@ -1606,7 +1606,7 @@ async function confirmExternalDependencies(dependencies) {
 	}
 	return installDeps;
 }
-async function createVirtualWorkspace({ cwd, template, packageManager, type }) {
+async function createVirtualWorkspace({ cwd, template, type }) {
 	const override = { dependencies: {} };
 	if (template === "minimal" || template === "demo" || template === "library") override.kit = {
 		routesDirectory: "src/routes",
@@ -1620,7 +1620,6 @@ async function createVirtualWorkspace({ cwd, template, packageManager, type }) {
 	};
 	const tentativeWorkspace = await createWorkspace({
 		cwd,
-		packageManager,
 		override
 	});
 	return {

package/dist/{create-DJeT6Cfe.js → create-DTIS6AzL.js}

@@ -32104,20 +32104,35 @@ function getPackageJson(cwd$1) {
 	};
 }
 async function formatFiles(options) {
+	if (options.filesToFormat.length === 0) return;
+	const { start, stop } = J();
+	start("Formatting modified files");
 	const args = [
 		"prettier",
 		"--write",
 		"--ignore-unknown",
-		...options.paths
+		...options.filesToFormat
 	];
 	const cmd = resolveCommand(options.packageManager, "execute-local", args);
-	await be(cmd.command, cmd.args, {
-		nodeOptions: {
-			cwd: options.cwd,
-			stdio: "pipe"
-		},
-		throwOnError: true
-	});
+	try {
+		const result = await be(cmd.command, cmd.args, {
+			nodeOptions: {
+				cwd: options.cwd,
+				stdio: "pipe"
+			},
+			throwOnError: true
+		});
+		if (result.exitCode !== 0) {
+			stop("Failed to format files");
+			T.error(result.stderr);
+			return;
+		}
+	} catch (e$1) {
+		stop("Failed to format files");
+		T.error(e$1?.output?.stderr || "unknown error");
+		return;
+	}
+	stop("Successfully formatted modified files");
 }
 function readFile(cwd$1, filePath) {
 	const fullFilePath = path.resolve(cwd$1, filePath);

package/dist/{install-6J55LDIW.js → install-BfCQ4zdp.js}

@@ -1,4 +1,4 @@
-import { A as parseSvelte, D as parseHtml, E as parseCss, F as serializeScript, H as dedent_default, I as stripAst, L as Element, M as import_picocolors$1, N as parseHtml$1, O as parseJson, P as parseScript$1, R as Tag, T as resolveCommand, U as defineAddon, V as createPrinter, W as defineAddonOptions, X as T, _ as installPackages, a as getUserAgent, b as detect, f as commonFilePaths, g as getPackageJson, h as getHighlighter, j as MagicString, k as parseScript, l as any, lt as __toESM, p as fileExists, rt as require_picocolors, v as readFile, w as getSharedFiles, x as be, y as writeFile, z as walk } from "./create-DJeT6Cfe.js";
+import { A as parseSvelte, D as parseHtml, E as parseCss, F as serializeScript, H as dedent_default, I as stripAst, L as Element, M as import_picocolors$1, N as parseHtml$1, O as parseJson, P as parseScript$1, R as Tag, T as resolveCommand, U as defineAddon, V as createPrinter, W as defineAddonOptions, X as T, _ as installPackages, a as getUserAgent, b as detect, f as commonFilePaths, g as getPackageJson, h as getHighlighter, j as MagicString, k as parseScript, l as any, lt as __toESM, p as fileExists, rt as require_picocolors, v as readFile, w as getSharedFiles, x as be, y as writeFile, z as walk } from "./create-DTIS6AzL.js";
 import path from "node:path";
 import fs from "node:fs";
 import process from "node:process";
@@ -2464,7 +2464,7 @@ var prettier_default = defineAddon({
 				if (!plugins$1.includes("prettier-plugin-tailwindcss")) data.plugins.unshift("prettier-plugin-tailwindcss");
 				data.tailwindStylesheet ??= files.getRelative({ to: files.stylesheet });
 			}
-			if (!plugins$1.includes("prettier-plugin-svelte")) data.plugins.unshift("prettier-plugin-svelte");
+			if (!plugins$1.includes("prettier-plugin-svelte")) data.plugins.push("prettier-plugin-svelte");
 			data.overrides ??= [];
 			const overrides = data.overrides;
 			if (!overrides.find((o) => o?.options?.parser === "svelte")) overrides.push({
@@ -2501,6 +2501,7 @@ function hasEslint(version) {
 
 //#endregion
 //#region ../addons/storybook/index.ts
+const STORYBOOK_VERSION = "10.1.0";
 var storybook_default = defineAddon({
 	id: "storybook",
 	shortDescription: "frontend workshop",
@@ -2512,9 +2513,10 @@ var storybook_default = defineAddon({
 	},
 	run: async ({ sv }) => {
 		const args = [
-			"create-storybook@latest",
+			`create-storybook@${STORYBOOK_VERSION}`,
 			"--skip-install",
-			"--no-dev"
+			"--no-dev",
+			"--no-features"
 		];
 		if (process.env.NODE_ENV?.toLowerCase() === "test") args.push("--yes");
 		await sv.execute(args, "inherit");
@@ -2733,7 +2735,7 @@ var tailwindcss_default = defineAddon({
 			const PLUGIN_NAME = "prettier-plugin-tailwindcss";
 			data.plugins ??= [];
 			const plugins$1 = data.plugins;
-			if (!plugins$1.includes(PLUGIN_NAME)) plugins$1.push(PLUGIN_NAME);
+			if (!plugins$1.includes(PLUGIN_NAME)) plugins$1.unshift(PLUGIN_NAME);
 			data.tailwindStylesheet ??= files.getRelative({ to: files.stylesheet });
 			return generateCode();
 		});
@@ -3057,10 +3059,17 @@ async function applyAddons({ addons, workspace, addonSetupResults, options: opti
 	const allPnpmBuildDependencies = [];
 	const status = {};
 	const ordered = orderAddons(Object.entries(addons).map(([, addon]) => addon), addonSetupResults);
+	let hasFormatter = false;
 	for (const addon of ordered) {
+		const workspaceOptions = options$7[addon.id] || {};
+		const addonWorkspace = await createWorkspace({
+			cwd: workspace.cwd,
+			packageManager: workspace.packageManager
+		});
+		if (!hasFormatter) hasFormatter = !!addonWorkspace.dependencyVersion("prettier");
 		const { files, pnpmBuildDependencies, cancels } = await runAddon({
-			workspace,
-			workspaceOptions: options$7[addon.id] || {},
+			workspace: addonWorkspace,
+			workspaceOptions,
 			addon,
 			multiple: ordered.length > 1
 		});
@@ -3070,7 +3079,7 @@ async function applyAddons({ addons, workspace, addonSetupResults, options: opti
 		else status[addon.id] = cancels;
 	}
 	return {
-		filesToFormat: Array.from(filesToFormat),
+		filesToFormat: hasFormatter ? Array.from(filesToFormat) : [],
 		pnpmBuildDependencies: allPnpmBuildDependencies,
 		status
 	};

package/dist/lib/index.js

@@ -1,4 +1,4 @@
-import { t as create } from "../create-DJeT6Cfe.js";
-import { c as officialAddons, n as installAddon } from "../install-6J55LDIW.js";
+import { t as create } from "../create-DTIS6AzL.js";
+import { c as officialAddons, n as installAddon } from "../install-BfCQ4zdp.js";
 
 export { create, installAddon, officialAddons };

package/dist/lib/testing.js

@@ -1,4 +1,4 @@
-import { S as ve, ct as __require, i as addPnpmBuildDependencies, lt as __toESM, st as __commonJS, t as create, x as be } from "../create-DJeT6Cfe.js";
+import { S as ve, ct as __require, i as addPnpmBuildDependencies, lt as __toESM, st as __commonJS, t as create, x as be } from "../create-DTIS6AzL.js";
 import path from "node:path";
 import fs from "node:fs";
 import process$1 from "node:process";

package/dist/shared.json

@@ -137,7 +137,7 @@
 				"typescript"
 			],
 			"exclude": [],
-			"contents": "{\n\t\"extends\": \"./.svelte-kit/tsconfig.json\",\n\t\"compilerOptions\": {\n\t\t\"rewriteRelativeImportExtensions\": true,\n\t\t\"allowJs\": true,\n\t\t\"checkJs\": true,\n\t\t\"esModuleInterop\": true,\n\t\t\"forceConsistentCasingInFileNames\": true,\n\t\t\"resolveJsonModule\": true,\n\t\t\"skipLibCheck\": true,\n\t\t\"sourceMap\": true,\n\t\t\"strict\": true,\n\t\t\"module\": \"NodeNext\",\n\t\t\"moduleResolution\": \"NodeNext\"\n\t}\n}\n"
+			"contents": "{\n\t\"extends\": \"./.svelte-kit/tsconfig.json\",\n\t\"compilerOptions\": {\n\t\t\"rewriteRelativeImportExtensions\": true,\n\t\t\"allowJs\": true,\n\t\t\"checkJs\": true,\n\t\t\"forceConsistentCasingInFileNames\": true,\n\t\t\"resolveJsonModule\": true,\n\t\t\"skipLibCheck\": true,\n\t\t\"sourceMap\": true,\n\t\t\"strict\": true,\n\t\t\"module\": \"NodeNext\",\n\t\t\"moduleResolution\": \"NodeNext\"\n\t}\n}\n"
 		},
 		{
 			"name": "vite.config.js",
@@ -157,7 +157,7 @@
 				"typescript",
 				"checkjs"
 			],
-			"contents": "{\n\t\"extends\": \"./.svelte-kit/tsconfig.json\",\n\t\"compilerOptions\": {\n\t\t\"esModuleInterop\": true,\n\t\t\"forceConsistentCasingInFileNames\": true,\n\t\t\"resolveJsonModule\": true,\n\t\t\"skipLibCheck\": true,\n\t\t\"sourceMap\": true,\n\t\t\"module\": \"NodeNext\",\n\t\t\"moduleResolution\": \"NodeNext\"\n\t}\n}\n"
+			"contents": "{\n\t\"extends\": \"./.svelte-kit/tsconfig.json\",\n\t\"compilerOptions\": {\n\t\t\"forceConsistentCasingInFileNames\": true,\n\t\t\"resolveJsonModule\": true,\n\t\t\"skipLibCheck\": true,\n\t\t\"sourceMap\": true,\n\t\t\"module\": \"NodeNext\",\n\t\t\"moduleResolution\": \"NodeNext\"\n\t}\n}\n"
 		}
 	]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sv",
-  "version": "0.10.4",
+  "version": "0.10.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/create": "0.0.0",
     "@sveltejs/addons": "0.0.0",
-    "@sveltejs/cli-core": "0.0.0"
+    "@sveltejs/cli-core": "0.0.0",
+    "@sveltejs/create": "0.0.0"
   },
   "keywords": [
     "create",