sv 0.9.8 → 0.9.9

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, addPnpmBuildDependencies, create as create$1, detect, et, from, getUserAgent, installDependencies, installOption, isVersionUnsupportedBelow, ke, packageManagerPrompt, parseJson, parseScript, parseSvelte, program, require_picocolors, resolveCommand, templates, up as up$1, ze } from "./create-G_G45yBx.js";
-import { addDefault, applyAddons, communityAddonIds, create as create$2, createDefault, createWorkspace, formatFiles, getAddonDetails, getCommunityAddon, getHighlighter, officialAddons, overrideProperties, setupAddons } from "./install-DhHe_LP6.js";
+import { AGENT_NAMES, Command, De, Fe, Ge, J, Ke, Option, T, Ue, Vu, We, __toESM, addPnpmBuildDependencies, create as create$1, detect, dist, et, from, getUserAgent, installDependencies, installOption, isVersionUnsupportedBelow, ke, packageManagerPrompt, parseJson, parseScript, parseSvelte, program, require_picocolors, resolveCommand, templates, up as up$1, ze } from "./create-CdiXN6U7.js";
+import { addDefault, applyAddons, communityAddonIds, create as create$2, createDefault, createWorkspace, formatFiles, getAddonDetails, getCommunityAddon, getHighlighter, officialAddons, overrideProperties, setupAddons } from "./install-CD-dlXd7.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.9.8";
+var version = "0.9.9";
 var type = "module";
 var description = "A CLI for creating and updating SvelteKit projects";
 var license = "MIT";
@@ -842,7 +842,7 @@ const add = new Command("add").description("applies specified add-ons into a pro
 	});
 });
 async function runAddCommand(options$1, selectedAddonIds) {
-	const selectedAddons = selectedAddonIds.map((id) => ({
+	let selectedAddons = selectedAddonIds.map((id) => ({
 		type: "official",
 		addon: getAddonDetails(id)
 	}));
@@ -1067,19 +1067,29 @@ async function runAddCommand(options$1, selectedAddonIds) {
 	const commDetails = Object.keys(community).map((id) => communityDetails.find((a) => a.id === id));
 	const details = officialDetails.concat(commDetails);
 	const addonMap = Object.assign({}, ...details.map((a) => ({ [a.id]: a })));
-	const { filesToFormat, pnpmBuildDependencies: addonPnpmBuildDependencies } = await applyAddons({
+	const { filesToFormat, pnpmBuildDependencies, status } = await applyAddons({
 		workspace,
 		addonSetupResults,
 		addons: addonMap,
 		options: official
 	});
-	T.success("Successfully setup add-ons");
+	const addonSuccess = [];
+	for (const [addonId, info] of Object.entries(status)) if (info === "success") addonSuccess.push(addonId);
+	else {
+		T.warn(`Canceled ${addonId}: ${info.join(", ")}`);
+		selectedAddons = selectedAddons.filter((a) => a.addon.id !== addonId);
+	}
+	if (addonSuccess.length === 0) {
+		De("All selected add-ons were canceled.");
+		process.exit(1);
+	} else if (addonSuccess.length === Object.entries(status).length) T.success("Successfully setup add-ons");
+	else T.success(`Successfully setup: ${addonSuccess.join(", ")}`);
 	let packageManager;
 	if (options$1.install) {
 		packageManager = options$1.install === true ? await packageManagerPrompt(options$1.cwd) : options$1.install;
 		if (packageManager) {
 			workspace.packageManager = packageManager;
-			await addPnpmBuildDependencies(workspace.cwd, packageManager, ["esbuild", ...addonPnpmBuildDependencies]);
+			await addPnpmBuildDependencies(workspace.cwd, packageManager, ["esbuild", ...pnpmBuildDependencies]);
 			await installDependencies(packageManager, options$1.cwd);
 		}
 	}
@@ -1103,13 +1113,14 @@ async function runAddCommand(options$1, selectedAddonIds) {
 	return {
 		nextSteps: selectedAddons.map(({ addon }) => {
 			if (!addon.nextSteps) return;
-			let addonMessage = `${import_picocolors$2.default.green(addon.id)}:\n`;
 			const options$2 = official[addon.id];
 			const addonNextSteps = addon.nextSteps({
 				...workspace,
 				options: options$2,
 				highlighter
 			});
+			if (addonNextSteps.length === 0) return;
+			let addonMessage = `${import_picocolors$2.default.green(addon.id)}:\n`;
 			addonMessage += `  - ${addonNextSteps.join("\n  - ")}`;
 			return addonMessage;
 		}).filter((msg) => msg !== void 0),
@@ -1286,26 +1297,50 @@ function extractPackageVersion(pkgName) {
 	if (pkgName.includes("@", 1)) [, version$1] = pkgName.split("@");
 	return version$1;
 }
-function setupPlaygroundProject(playground, cwd, installDependencies$1) {
+function setupPlaygroundProject(url, playground, cwd, installDependencies$1, typescript) {
 	const mainFile = playground.files.find((file) => file.name === "App.svelte");
 	if (!mainFile) throw new Error("Failed to find `App.svelte` entrypoint.");
 	const dependencies = detectPlaygroundDependencies(playground.files);
 	for (const file of playground.files) {
 		for (const [pkg, version$1] of dependencies) if (version$1 !== "latest") file.content = file.content.replaceAll(`${pkg}@${version$1}`, pkg);
-		const filePath$1 = path.join(cwd, "src", "routes", file.name);
+		const filePath$1 = path.join(cwd, "src", "lib", "playground", file.name);
 		fs.mkdirSync(path.dirname(filePath$1), { recursive: true });
 		fs.writeFileSync(filePath$1, file.content, "utf8");
 	}
+	{
+		const shared = dist("shared.json");
+		const { files: files$1 } = JSON.parse(fs.readFileSync(shared, "utf-8"));
+		const playgroundFiles = files$1.filter((file) => file.include.includes("playground"));
+		for (const file of playgroundFiles) {
+			let contentToWrite = file.contents;
+			if (file.name === "src/lib/PlaygroundLayout.svelte") {
+				const { script: script$1, template, css } = parseSvelte(file.contents);
+				const { generateCode: generateCode$1 } = parseSvelte("", { typescript });
+				contentToWrite = generateCode$1({
+					script: script$1.generateCode().replaceAll("$sv-title-$sv", playground.name).replaceAll("$sv-url-$sv", url),
+					template: template.generateCode().replaceAll("onclick=\"{switchTheme}\"", "onclick={switchTheme}"),
+					css: css.generateCode()
+				});
+			}
+			fs.writeFileSync(path.join(cwd, file.name), contentToWrite, "utf-8");
+		}
+	}
 	const filePath = path.join(cwd, "src/routes/+page.svelte");
 	const content = fs.readFileSync(filePath, "utf-8");
-	const { script, generateCode } = parseSvelte(content);
+	const { script, generateCode } = parseSvelte(content, { typescript });
+	addDefault(script.ast, {
+		as: "App",
+		from: `$lib/playground/${mainFile.name}`
+	});
 	addDefault(script.ast, {
-		from: `./${mainFile.name}`,
-		as: "App"
+		as: "PlaygroundLayout",
+		from: `$lib/PlaygroundLayout.svelte`
 	});
 	const newContent = generateCode({
 		script: script.generateCode(),
-		template: `<App />`
+		template: `<PlaygroundLayout>
+	<App />
+</PlaygroundLayout>`
 	});
 	fs.writeFileSync(filePath, newContent, "utf-8");
 	const pkgPath = path.join(cwd, "package.json");
@@ -1468,7 +1503,7 @@ async function createProject(cwd, options$1) {
 		template,
 		types: language
 	});
-	if (options$1.fromPlayground) await createProjectFromPlayground(options$1.fromPlayground, projectPath);
+	if (options$1.fromPlayground) await createProjectFromPlayground(options$1.fromPlayground, projectPath, language === "typescript");
 	T.success("Project created");
 	let packageManager;
 	let addOnNextSteps = [];
@@ -1495,12 +1530,12 @@ async function createProject(cwd, options$1) {
 		packageManager
 	};
 }
-async function createProjectFromPlayground(url, cwd) {
+async function createProjectFromPlayground(url, cwd, typescript) {
 	const urlData = parsePlaygroundUrl(url);
 	const playground = await downloadPlaygroundData(urlData);
 	const dependencies = detectPlaygroundDependencies(playground.files);
 	const installDependencies$1 = await confirmExternalDependencies(Array.from(dependencies.keys()));
-	setupPlaygroundProject(playground, cwd, installDependencies$1);
+	setupPlaygroundProject(url, playground, cwd, installDependencies$1, typescript);
 }
 async function confirmExternalDependencies(dependencies) {
 	if (dependencies.length === 0) return false;

package/dist/{create-G_G45yBx.js → create-CdiXN6U7.js}

@@ -32398,4 +32398,4 @@ function to_valid_package_name(name) {
 }
 
 //#endregion
-export { AGENT_NAMES, Command, De, Element, Fe, Ge, J, Ke, MagicString, Option, T, Tag, Ue, Vu, We, __commonJS, __require, __toESM, addPnpmBuildDependencies, any, be, create, createPrinter, dedent_default, defineAddon, defineAddonOptions, detect, et$1 as et, from, getUserAgent, import_picocolors, installDependencies, installOption, isVersionUnsupportedBelow, ke, packageManagerPrompt, parseCss, parseHtml, parseHtml$1, parseJson, parseScript, parseScript$1, parseSvelte, program, require_picocolors, resolveCommand, serializeScript, stripAst, templates, up, ve, walk, ze };
+export { AGENT_NAMES, Command, De, Element, Fe, Ge, J, Ke, MagicString, Option, T, Tag, Ue, Vu, We, __commonJS, __require, __toESM, addPnpmBuildDependencies, any, be, create, createPrinter, dedent_default, defineAddon, defineAddonOptions, detect, dist, et$1 as et, from, getUserAgent, import_picocolors, installDependencies, installOption, isVersionUnsupportedBelow, ke, packageManagerPrompt, parseCss, parseHtml, parseHtml$1, parseJson, parseScript, parseScript$1, parseSvelte, program, require_picocolors, resolveCommand, serializeScript, stripAst, templates, up, ve, walk, ze };