sv 0.6.22 → 0.6.24

package/dist/bin.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
-import { AtRule, Element, __commonJS, __require, __toESM, addPnpmBuildDependendencies, box, cancel, confirm, create, detectSync, esm_exports, from, getUserAgent, group, installDependencies, intro, isCancel, log, multiselect, note, outro, packageManagerPrompt, parseCss, parseHtml as parseHtml$1, parseHtml$1 as parseHtml, parseJson, parseScript, parseSvelte, resolveCommand, select, spinner, templates, text, up, walk_exports } from "./package-manager-f0ge7H2V.js";
-import { __commonJS$1, __export, __toESM$1, addFromString, applyAddons, array_exports, common_exports, createWorkspace, dedent_default, exports_exports, formatFiles, function_exports, getHighlighter, imports_exports, kit_exports, object_exports, require_picocolors, setupAddons, variables_exports } from "./install-PTlNv0EA.js";
+import { Element, __commonJS, __require, __toESM, addPnpmBuildDependendencies, box, cancel, confirm, create, detectSync, esm_exports, from, getUserAgent, group, installDependencies, intro, isCancel, log, multiselect, note, outro, packageManagerPrompt, parseCss, parseHtml, parseHtml$1, parseJson, parseScript, parseSvelte, resolveCommand, select, spinner, templates, text, up, walk_exports } from "./package-manager-DYKbLpuq.js";
+import { __commonJS$1, __export, __toESM$1, addFromString, applyAddons, array_exports, common_exports, createWorkspace, dedent_default, exports_exports, formatFiles, function_exports, getHighlighter, imports_exports, kit_exports, object_exports, require_picocolors, setupAddons, variables_exports } from "./install-Bjzz5ixb.js";
 import fs, { existsSync } from "node:fs";
 import path, { dirname, join } from "node:path";
 import { fileURLToPath } from "node:url";
@@ -12,7 +12,7 @@ import { promisify } from "node:util";
 
 //#region packages/cli/package.json
 var name = "sv";
-var version = "0.6.22";
+var version = "0.6.24";
 var type = "module";
 var description = "A CLI for creating and updating SvelteKit projects";
 var license = "MIT";
@@ -4378,7 +4378,7 @@ function addEslintConfigPrettier(content) {
 	const eslintConfig = defaultExport.value;
 	if (eslintConfig.type !== "ArrayExpression" && eslintConfig.type !== "CallExpression") return content;
 	const prettier = common_exports.expressionFromString("prettier");
-	const sveltePrettierConfig = common_exports.expressionFromString(`${svelteImportName}.configs['flat/prettier']`);
+	const sveltePrettierConfig = common_exports.expressionFromString(`${svelteImportName}.configs.prettier`);
 	const configSpread = common_exports.createSpreadElement(sveltePrettierConfig);
 	const nodesToInsert = [];
 	if (!common_exports.hasNode(eslintConfig, prettier)) nodesToInsert.push(prettier);
@@ -4408,10 +4408,8 @@ var eslint_default = defineAddon({
 		const prettierInstalled = Boolean(dependencyVersion("prettier"));
 		sv.devDependency("eslint", "^9.18.0");
 		sv.devDependency("@eslint/compat", "^1.2.5");
-		sv.devDependency("globals", "^15.14.0");
 		sv.devDependency("eslint-plugin-svelte", "^3.0.0");
 		sv.devDependency("globals", "^16.0.0");
-		sv.devDependency("eslint-plugin-svelte", "^2.46.1");
 		sv.devDependency("@eslint/js", "^9.18.0");
 		if (typescript) sv.devDependency("typescript-eslint", "^8.20.0");
 		if (prettierInstalled) sv.devDependency("eslint-config-prettier", "^10.0.1");
@@ -6173,7 +6171,7 @@ function appendElement(childNodes, elementToAppend) {
 	childNodes.push(elementToAppend);
 }
 function addFromRawHtml(childNodes, html) {
-	const document = parseHtml(html);
+	const document = parseHtml$1(html);
 	for (const childNode of document.childNodes) childNodes.push(childNode);
 }
 function addSlot(jsAst, htmlAst, svelteVersion) {
@@ -6314,7 +6312,7 @@ var paraglide_default = defineAddon({
 			});
 		});
 		sv.file("src/app.html", (content) => {
-			const { ast, generateCode } = parseHtml$1(content);
+			const { ast, generateCode } = parseHtml(content);
 			const htmlNode = ast.children.find((child) => child.type === esm_exports.Tag && child.name === "html");
 			if (!htmlNode) {
 				log$1.warn("Could not find <html> node in app.html. You'll need to add the language placeholder manually");
@@ -6537,36 +6535,6 @@ var storybook_default = defineAddon({
 	}
 });
 
-//#endregion
-//#region packages/core/dist/css.js
-function addImports(ast, imports) {
-	let prev;
-	const nodes = imports.map((param) => {
-		const found = ast.nodes.find((x) => x.type === "atrule" && x.name === "import" && x.params === param);
-		if (found) return prev = found;
-		const rule = new AtRule({
-			name: "import",
-			params: param
-		});
-		if (prev) ast.insertAfter(prev, rule);
-else ast.prepend(rule);
-		return prev = rule;
-	});
-	return nodes;
-}
-function addAtRule(ast, name$1, params, append = false) {
-	const atRules = ast.nodes.filter((x) => x.type == "atrule");
-	let atRule = atRules.find((x) => x.name == name$1 && x.params == params);
-	if (atRule) return atRule;
-	atRule = new AtRule({
-		name: name$1,
-		params
-	});
-	if (!append) ast.prepend(atRule);
-else ast.append(atRule);
-	return atRule;
-}
-
 //#endregion
 //#region packages/addons/tailwindcss/index.ts
 const plugins = [{
@@ -6618,18 +6586,25 @@ var tailwindcss_default = defineAddon({
 			return generateCode();
 		});
 		sv.file("src/app.css", (content) => {
-			if (content.includes("tailwindcss")) return content;
-			const { ast, generateCode } = parseCss(content);
-			const originalFirst = ast.first;
-			const nodes = addImports(ast, ["'tailwindcss'"]);
+			let atRules = parseCss(content).ast.nodes.filter((node) => node.type === "atrule");
+			const findAtRule = (name$1, params) => atRules.find((rule) => rule.name === name$1 && rule.params.replace(/['"]/g, "") === params);
+			let code = content;
+			const importsTailwind = findAtRule("import", "tailwindcss");
+			if (!importsTailwind) {
+				code = "@import 'tailwindcss';\n" + code;
+				atRules = parseCss(code).ast.nodes.filter((node) => node.type === "atrule");
+			}
+			const lastAtRule = atRules.findLast((rule) => ["plugin", "import"].includes(rule.name));
+			const pluginPos = lastAtRule.source.end.offset;
 			for (const plugin of plugins) {
 				if (!options$6.plugins.includes(plugin.id)) continue;
-				addAtRule(ast, "plugin", `'${plugin.package}'`, true);
+				const pluginRule = findAtRule("plugin", plugin.package);
+				if (!pluginRule) {
+					const pluginImport = `\n@plugin '${plugin.package}';`;
+					code = code.substring(0, pluginPos) + pluginImport + code.substring(pluginPos);
+				}
 			}
-			if (originalFirst !== ast.first && originalFirst?.type === "atrule" && originalFirst.name === "import") originalFirst.raws.before = "\n";
-			nodes.shift();
-			nodes.forEach((n$1) => n$1.raws.before = "\n");
-			return generateCode();
+			return code;
 		});
 		if (!kit) sv.file("src/App.svelte", (content) => {
 			const { script, generateCode } = parseSvelte(content, { typescript });
@@ -10188,15 +10163,15 @@ async function createProject(cwd, options$6) {
 		language: () => {
 			if (options$6.types) return Promise.resolve(options$6.types);
 			return select({
-				message: "Add type checking with Typescript?",
+				message: "Add type checking with TypeScript?",
 				initialValue: "typescript",
 				options: [
 					{
-						label: "Yes, using Typescript syntax",
+						label: "Yes, using TypeScript syntax",
 						value: "typescript"
 					},
 					{
-						label: "Yes, using Javascript with JSDoc comments",
+						label: "Yes, using JavaScript with JSDoc comments",
 						value: "checkjs"
 					},
 					{

package/dist/index.js

@@ -1,4 +1,4 @@
-import { create } from "./package-manager-f0ge7H2V.js";
-import { installAddon } from "./install-PTlNv0EA.js";
+import { create } from "./package-manager-DYKbLpuq.js";
+import { installAddon } from "./install-Bjzz5ixb.js";
 
 export { create, installAddon };

package/dist/{install-PTlNv0EA.js → install-Bjzz5ixb.js}

@@ -1,4 +1,4 @@
-import { __commonJS, __toESM, be, detectSync, getUserAgent, log, parseJson, parseScript as parseScript$1, parseScript$1 as parseScript, resolveCommand, serializeScript, stripAst, up, walk_exports } from "./package-manager-f0ge7H2V.js";
+import { __commonJS, __toESM, be, detectSync, getUserAgent, log, parseJson, parseScript as parseScript$1, parseScript$1 as parseScript, resolveCommand, serializeScript, stripAst, up, walk_exports } from "./package-manager-DYKbLpuq.js";
 import fs from "node:fs";
 import path from "node:path";
 import process$1 from "node:process";

package/dist/{package-manager-f0ge7H2V.js → package-manager-DYKbLpuq.js}

@@ -40223,4 +40223,4 @@ else packageDirectory = cwd$1;
 }
 
 //#endregion
-export { AtRule, Element, __commonJS$3 as __commonJS, __require$1 as __require, __toESM$3 as __toESM, addPnpmBuildDependendencies, be, box, cancel, confirm, create, detectSync, esm_exports, from, getUserAgent, group, installDependencies, intro, isCancel, log, multiselect, note, outro, packageManagerPrompt, parseCss, parseHtml, parseHtml$1, parseJson, parseScript, parseScript$1, parseSvelte, resolveCommand, select, serializeScript, spinner, stripAst, templates, text, up, walk_exports };
+export { Element, __commonJS$3 as __commonJS, __require$1 as __require, __toESM$3 as __toESM, addPnpmBuildDependendencies, be, box, cancel, confirm, create, detectSync, esm_exports, from, getUserAgent, group, installDependencies, intro, isCancel, log, multiselect, note, outro, packageManagerPrompt, parseCss, parseHtml, parseHtml$1, parseJson, parseScript, parseScript$1, parseSvelte, resolveCommand, select, serializeScript, spinner, stripAst, templates, text, up, walk_exports };

package/dist/testing.js

@@ -1,4 +1,4 @@
-import { __commonJS, __require, __toESM, addPnpmBuildDependendencies, be, create } from "./package-manager-f0ge7H2V.js";
+import { __commonJS, __require, __toESM, addPnpmBuildDependendencies, be, create } from "./package-manager-DYKbLpuq.js";
 import fs from "node:fs";
 import path from "node:path";
 import process$1 from "node:process";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sv",
-  "version": "0.6.22",
+  "version": "0.6.24",
   "type": "module",
   "description": "A CLI for creating and updating SvelteKit projects",
   "license": "MIT",
@@ -38,8 +38,8 @@
     "tinyexec": "^0.3.1",
     "valibot": "^0.41.0",
     "@sveltejs/addons": "0.0.0",
-    "@sveltejs/cli-core": "0.0.0",
     "@sveltejs/clack-prompts": "0.9.1",
+    "@sveltejs/cli-core": "0.0.0",
     "@sveltejs/create": "0.0.0"
   },
   "keywords": [