sv 0.6.26 → 0.6.27

package/dist/bin.js

@@ -12,7 +12,7 @@ import { promisify } from "node:util";
 
 //#region packages/cli/package.json
 var name = "sv";
-var version = "0.6.26";
+var version = "0.6.27";
 var type = "module";
 var description = "A CLI for creating and updating SvelteKit projects";
 var license = "MIT";
@@ -4160,11 +4160,19 @@ var drizzle_default = defineAddon({
 			if (options$6.mysql === "mysql2") dbSpecificContent = `
                       MYSQL_ROOT_PASSWORD: ${PASSWORD}
                       MYSQL_DATABASE: ${DB_NAME}
+                    volumes:
+                      - mysqldata:/var/lib/mysql
+                volumes:
+                  mysqldata:
                 `;
 			if (options$6.postgresql === "postgres.js") dbSpecificContent = `
                       POSTGRES_USER: ${USER}
                       POSTGRES_PASSWORD: ${PASSWORD}
                       POSTGRES_DB: ${DB_NAME}
+                    volumes:
+                      - pgdata:/var/lib/postgresql/data
+                volumes:
+                  pgdata:
                 `;
 			content = dedent_default`
                 services:
@@ -6191,22 +6199,14 @@ function addSlot(jsAst, htmlAst, svelteVersion) {
 //#region packages/addons/paraglide/index.ts
 const DEFAULT_INLANG_PROJECT = {
 	$schema: "https://inlang.com/schema/project-settings",
-	modules: [
-		"https://cdn.jsdelivr.net/npm/@inlang/message-lint-rule-empty-pattern@1/dist/index.js",
-		"https://cdn.jsdelivr.net/npm/@inlang/message-lint-rule-identical-pattern@1/dist/index.js",
-		"https://cdn.jsdelivr.net/npm/@inlang/message-lint-rule-missing-translation@1/dist/index.js",
-		"https://cdn.jsdelivr.net/npm/@inlang/message-lint-rule-without-source@1/dist/index.js",
-		"https://cdn.jsdelivr.net/npm/@inlang/message-lint-rule-valid-js-identifier@1/dist/index.js",
-		"https://cdn.jsdelivr.net/npm/@inlang/plugin-message-format@2/dist/index.js",
-		"https://cdn.jsdelivr.net/npm/@inlang/plugin-m-function-matcher@0/dist/index.js"
-	],
-	"plugin.inlang.messageFormat": { pathPattern: "./messages/{languageTag}.json" }
+	modules: ["https://cdn.jsdelivr.net/npm/@inlang/plugin-message-format@4/dist/index.js", "https://cdn.jsdelivr.net/npm/@inlang/plugin-m-function-matcher@2/dist/index.js"],
+	"plugin.inlang.messageFormat": { pathPattern: "./messages/{locale}.json" }
 };
 const options$2 = defineAddonOptions({
 	availableLanguageTags: {
 		question: `Which languages would you like to support? ${colors.gray("(e.g. en,de-ch)")}`,
 		type: "string",
-		default: "en",
+		default: "en, es",
 		validate(input) {
 			const { invalidLanguageTags, validLanguageTags } = parseLanguageTagInput(input);
 			if (invalidLanguageTags.length > 0) if (invalidLanguageTags.length === 1) return `The input "${invalidLanguageTags[0]}" is not a valid IETF BCP 47 language tag`;
@@ -6230,30 +6230,30 @@ else {
 var paraglide_default = defineAddon({
 	id: "paraglide",
 	shortDescription: "i18n",
-	homepage: "https://inlang.com",
+	homepage: "https://inlang.com/m/gerre34r/library-inlang-paraglideJs",
 	options: options$2,
 	setup: ({ kit, unsupported }) => {
 		if (!kit) unsupported("Requires SvelteKit");
 	},
-	run: ({ sv, options: options$6, typescript, kit, dependencyVersion }) => {
+	run: ({ sv, options: options$6, typescript, kit }) => {
 		const ext = typescript ? "ts" : "js";
 		if (!kit) throw new Error("SvelteKit is required");
 		const paraglideOutDir = "src/lib/paraglide";
-		sv.dependency("@inlang/paraglide-sveltekit", "^0.15.5");
+		sv.dependency("@inlang/paraglide-js", "^2.0.0");
 		sv.file("project.inlang/settings.json", (content) => {
 			if (content) return content;
 			const { data, generateCode } = parseJson(content);
 			for (const key in DEFAULT_INLANG_PROJECT) data[key] = DEFAULT_INLANG_PROJECT[key];
 			const { validLanguageTags: validLanguageTags$1 } = parseLanguageTagInput(options$6.availableLanguageTags);
-			const sourceLanguageTag = validLanguageTags$1[0];
-			data.sourceLanguageTag = sourceLanguageTag;
-			data.languageTags = validLanguageTags$1;
+			const baseLocale = validLanguageTags$1[0];
+			data.baseLocale = baseLocale;
+			data.locales = validLanguageTags$1;
 			return generateCode();
 		});
 		sv.file(`vite.config.${ext}`, (content) => {
 			const { ast, generateCode } = parseScript(content);
-			const vitePluginName = "paraglide";
-			imports_exports.addNamed(ast, "@inlang/paraglide-sveltekit/vite", { paraglide: vitePluginName });
+			const vitePluginName = "paraglideVitePlugin";
+			imports_exports.addNamed(ast, "@inlang/paraglide-js", { paraglideVitePlugin: vitePluginName });
 			const { value: rootObject } = exports_exports.defaultExport(ast, function_exports.call("defineConfig", []));
 			const param1 = function_exports.argumentByIndex(rootObject, 0, object_exports.createEmpty());
 			const pluginsArray = object_exports.property(param1, "plugins", array_exports.createEmpty());
@@ -6266,20 +6266,10 @@ var paraglide_default = defineAddon({
 			array_exports.push(pluginsArray, pluginFunctionCall);
 			return generateCode();
 		});
-		sv.file(`src/lib/i18n.${ext}`, (content) => {
-			const { ast, generateCode } = parseScript(content);
-			imports_exports.addNamed(ast, "@inlang/paraglide-sveltekit", { createI18n: "createI18n" });
-			imports_exports.addDefault(ast, "$lib/paraglide/runtime", "* as runtime");
-			const createI18nExpression = common_exports.expressionFromString("createI18n(runtime)");
-			const i18n = variables_exports.declaration(ast, "const", "i18n", createI18nExpression);
-			const existingExport = exports_exports.namedExport(ast, "i18n", i18n);
-			if (existingExport.declaration !== i18n) log$1.warn("Setting up $lib/i18n failed because it already exports an i18n function");
-			return generateCode();
-		});
 		sv.file(`src/hooks.${ext}`, (content) => {
 			const { ast, generateCode } = parseScript(content);
-			imports_exports.addNamed(ast, "$lib/i18n", { i18n: "i18n" });
-			const expression = common_exports.expressionFromString("i18n.reroute()");
+			imports_exports.addNamed(ast, "$lib/paraglide/runtime", { deLocalizeUrl: "deLocalizeUrl" });
+			const expression = common_exports.expressionFromString("(request) => deLocalizeUrl(request.url).pathname");
 			const rerouteIdentifier = variables_exports.declaration(ast, "const", "reroute", expression);
 			const existingExport = exports_exports.namedExport(ast, "reroute", rerouteIdentifier);
 			if (existingExport.declaration !== rerouteIdentifier) log$1.warn("Adding the reroute hook automatically failed. Add it manually");
@@ -6287,32 +6277,16 @@ var paraglide_default = defineAddon({
 		});
 		sv.file(`src/hooks.server.${ext}`, (content) => {
 			const { ast, generateCode } = parseScript(content);
-			imports_exports.addNamed(ast, "$lib/i18n", { i18n: "i18n" });
-			const hookHandleContent = "i18n.handle()";
+			imports_exports.addNamed(ast, "$lib/paraglide/server", { paraglideMiddleware: "paraglideMiddleware" });
+			const hookHandleContent = `({ event, resolve }) => paraglideMiddleware(event.request, ({ request, locale }) => {
+		event.request = request;
+		return resolve(event, {
+			transformPageChunk: ({ html }) => html.replace('%paraglide.lang%', locale)
+		});
+	});`;
 			kit_exports.addHooksHandle(ast, typescript, "handleParaglide", hookHandleContent);
 			return generateCode();
 		});
-		sv.file(`${kit.routesDirectory}/+layout.svelte`, (content) => {
-			const { script, template, generateCode } = parseSvelte(content, { typescript });
-			const paraglideComponentName = "ParaglideJS";
-			imports_exports.addNamed(script.ast, "@inlang/paraglide-sveltekit", { [paraglideComponentName]: paraglideComponentName });
-			imports_exports.addNamed(script.ast, "$lib/i18n", { i18n: "i18n" });
-			if (template.source.length === 0) {
-				const svelteVersion = dependencyVersion("svelte");
-				if (!svelteVersion) throw new Error("Failed to determine svelte version");
-				addSlot(script.ast, template.ast, svelteVersion);
-			}
-			const templateCode = new MagicString(template.generateCode());
-			if (!templateCode.original.includes("<ParaglideJS")) {
-				templateCode.indent();
-				templateCode.prepend("<ParaglideJS {i18n}>\n");
-				templateCode.append("\n</ParaglideJS>");
-			}
-			return generateCode({
-				script: script.generateCode(),
-				template: templateCode.toString()
-			});
-		});
 		sv.file("src/app.html", (content) => {
 			const { ast, generateCode } = parseHtml(content);
 			const htmlNode = ast.children.find((child) => child.type === esm_exports.Tag && child.name === "html");
@@ -6322,8 +6296,7 @@ var paraglide_default = defineAddon({
 			}
 			htmlNode.attribs = {
 				...htmlNode.attribs,
-				lang: "%paraglide.lang%",
-				dir: "%paraglide.textDirection%"
+				lang: "%paraglide.lang%"
 			};
 			return generateCode();
 		});
@@ -6338,32 +6311,17 @@ var paraglide_default = defineAddon({
 			});
 			sv.file(`${kit.routesDirectory}/demo/paraglide/+page.svelte`, (content) => {
 				const { script, template, generateCode } = parseSvelte(content, { typescript });
-				imports_exports.addDefault(script.ast, "$lib/paraglide/messages.js", "* as m");
+				imports_exports.addNamed(script.ast, "$lib/paraglide/messages.js", { m: "m" });
 				imports_exports.addNamed(script.ast, "$app/navigation", { goto: "goto" });
 				imports_exports.addNamed(script.ast, "$app/state", { page: "page" });
-				imports_exports.addNamed(script.ast, "$lib/i18n", { i18n: "i18n" });
-				if (typescript) imports_exports.addNamed(script.ast, "$lib/paraglide/runtime", { AvailableLanguageTag: "AvailableLanguageTag" }, true);
-				const [ts] = utils_exports.createPrinter(typescript);
+				imports_exports.addNamed(script.ast, "$lib/paraglide/runtime", { setLocale: "setLocale" });
 				const scriptCode = new MagicString(script.generateCode());
-				if (!scriptCode.original.includes("function switchToLanguage")) {
-					scriptCode.trim();
-					scriptCode.append("\n\n");
-					scriptCode.append(dedent_default`
-						${ts("", "/**")} 
-						${ts("", "* @param {import(\"$lib/paraglide/runtime\").AvailableLanguageTag} newLanguage")} 
-						${ts("", "*/")} 
-						function switchToLanguage(newLanguage${ts(": AvailableLanguageTag")}) {
-							const canonicalPath = i18n.route(page.url.pathname);
-							const localisedPath = i18n.resolveRoute(canonicalPath, newLanguage);
-							goto(localisedPath);
-						}
-					`);
-				}
 				const templateCode = new MagicString(template.source);
 				templateCode.append("\n\n<h1>{m.hello_world({ name: 'SvelteKit User' })}</h1>\n");
 				const { validLanguageTags: validLanguageTags$1 } = parseLanguageTagInput(options$6.availableLanguageTags);
-				const links = validLanguageTags$1.map((x) => `${templateCode.getIndentString()}<button onclick={() => switchToLanguage('${x}')}>${x}</button>`).join("\n");
+				const links = validLanguageTags$1.map((x) => `${templateCode.getIndentString()}<button onclick={() => setLocale('${x}')}>${x}</button>`).join("\n");
 				templateCode.append(`<div>\n${links}\n</div>`);
+				templateCode.append("<p>\nIf you use VSCode, install the <a href=\"https://marketplace.visualstudio.com/items?itemName=inlang.vs-code-extension\" target=\"_blank\">Sherlock i18n extension</a> for a better i18n experience.\n</p>");
 				return generateCode({
 					script: scriptCode.toString(),
 					template: templateCode.toString()
@@ -6379,7 +6337,7 @@ var paraglide_default = defineAddon({
 		});
 	},
 	nextSteps: ({ highlighter }) => {
-		const steps = [`Edit your messages in ${highlighter.path("messages/en.json")}`, "Consider installing the Sherlock IDE Extension"];
+		const steps = [`Edit your messages in ${highlighter.path("messages/en.json")}`];
 		if (options$2.demo) steps.push(`Visit ${highlighter.route("/demo/paraglide")} route to view the demo`);
 		return steps;
 	}
@@ -6472,6 +6430,8 @@ var prettier_default = defineAddon({
 				package-lock.json
 				pnpm-lock.yaml
 				yarn.lock
+				bun.lock
+				bun.lockb
 			`;
 		});
 		sv.file(".prettierrc", (content) => {

package/package.json

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