vela 0.18.0 → 0.18.1

package/dist/bin.js

@@ -20,7 +20,7 @@ import dotenv2 from "dotenv";
 // package.json
 var package_default = {
   name: "vela",
-  version: "0.18.0",
+  version: "0.18.1",
   type: "module",
   description: "A CLI for creating and updating SvelteKit projects",
   license: "MIT",
@@ -57,7 +57,7 @@ var package_default = {
   dependencies: {
     "@clack/prompts": "^1.7.0",
     "@faker-js/faker": "^10.6.0",
-    "@velastack/patterns": "^0.7.0",
+    "@velastack/patterns": "^0.7.1",
     "@velastack/pocketbase-codegen": "^0.1.0",
     "@velastack/schema": "^0.3.0",
     "@velastack/schema-ui": "^0.3.1",
@@ -372,6 +372,19 @@ function raiseFloor(pkg, name, range) {
   }
   return changed;
 }
+function dropFormsnapOverride(pkg) {
+  const overrides = pkg.overrides;
+  const entry = overrides?.formsnap;
+  if (typeof entry !== "object" || entry === null || !("sveltekit-superforms" in entry)) {
+    return false;
+  }
+  const { "sveltekit-superforms": _, ...rest } = entry;
+  const { formsnap: __, ...others } = overrides;
+  const next = Object.keys(rest).length > 0 ? { ...others, formsnap: rest } : others;
+  if (Object.keys(next).length > 0) pkg.overrides = next;
+  else delete pkg.overrides;
+  return true;
+}
 var VERSION_PART = /^v?(\d+|[xX*])(?:\.(\d+|[xX*]))?(?:\.(\d+|[xX*]))?(?:-([0-9A-Za-z.-]+))?(?:\+[0-9A-Za-z.-]+)?$/;
 function minVersion(range) {
   const alternatives = range.split("||").map((alt) => alt.trim());
@@ -2888,8 +2901,10 @@ function mergeDependencies(projectPath, templateDir) {
   if (ensureLibImports(merged)) p6.log.info("package.json: added the #lib imports.");
   writePackageJson(userPkgPath, merged);
   if (pinned.length > 0) {
-    p6.log.info(`Pinned what SvelteKit 3 needs exactly:
-${pinned.map((l) => `  ${l}`).join("\n")}`);
+    p6.log.info(
+      `Set what SvelteKit 3's form libraries need:
+${pinned.map((l) => `  ${l}`).join("\n")}`
+    );
   }
   if (added.length > 0) {
     p6.log.info(
@@ -2926,16 +2941,15 @@ function applyTemplatePins(merged, template, conflicts) {
     const index = conflicts.findIndex((c) => c.name === name);
     if (index !== -1) conflicts.splice(index, 1);
   }
-  const overrides = template.overrides;
-  const hasFormsnap = Boolean(merged.dependencies?.formsnap ?? merged.devDependencies?.formsnap);
-  if (overrides?.formsnap && hasFormsnap) {
-    const existing = merged.overrides ?? {};
-    const current = existing.formsnap;
-    const next = typeof current === "object" && current !== null ? { ...current, ...overrides.formsnap } : overrides.formsnap;
-    if (JSON.stringify(current) !== JSON.stringify(next)) {
-      merged.overrides = { ...existing, formsnap: next };
-      lines.push(`overrides.formsnap: ${JSON.stringify(next)}`);
-    }
+  const formsnapRange = template.devDependencies?.formsnap ?? template.dependencies?.formsnap;
+  const formsnapBefore = merged.devDependencies?.formsnap ?? merged.dependencies?.formsnap;
+  if (formsnapRange && raiseFloor(merged, "formsnap", formsnapRange)) {
+    lines.push(`formsnap: ${formsnapBefore} \u2192 ${formsnapRange}`);
+    const index = conflicts.findIndex((c) => c.name === "formsnap");
+    if (index !== -1) conflicts.splice(index, 1);
+  }
+  if (dropFormsnapOverride(merged)) {
+    lines.push("overrides.formsnap: dropped the sveltekit-superforms entry formsnap 2.0 needed");
   }
   const engines = template.engines;
   const userEngines = merged.engines ?? {};
@@ -3931,6 +3945,7 @@ import {
   ADAPTER_STATIC as ADAPTER_STATIC2,
   ensurePackageOverrides,
   FLASH,
+  FORMSNAP,
   SUPERFORMS_VERSION,
   VELASTACK_CMS,
   VELASTACK_KIT,
@@ -5670,6 +5685,8 @@ var FLOORS = [
   ["svelte-check", "^4.7.6"],
   ["typescript", "^6.0.0"],
   ["shadcn-svelte", "^1.7.0"],
+  // 2.1 is the first formsnap whose superforms peer admits 3.x.
+  splitSpec(FORMSNAP),
   splitSpec(VELASTACK_KIT),
   splitSpec(VELASTACK_POCKETBASE),
   splitSpec(VELASTACK_CMS),
@@ -5706,23 +5723,10 @@ function packageFixup(root, cliVersion) {
     changed.push(`engines.node ${engines.node ?? "(unset)"} \u2192 ${ENGINES_FLOOR}`);
     data.engines = { ...engines, node: ENGINES_FLOOR };
   }
-  if (depRange(data, "formsnap") !== void 0) {
-    const overrides = data.overrides ?? {};
-    const current = overrides.formsnap;
-    if (current !== void 0 && (typeof current !== "object" || current === null)) {
-      f.warnings.push(
-        `overrides.formsnap is not an object; set "formsnap": { "sveltekit-superforms": "${SUPERFORMS_VERSION}" } by hand`
-      );
-    } else {
-      const formsnap = current ?? {};
-      if (formsnap["sveltekit-superforms"] !== SUPERFORMS_VERSION) {
-        data.overrides = {
-          ...overrides,
-          formsnap: { ...formsnap, "sveltekit-superforms": SUPERFORMS_VERSION }
-        };
-        changed.push(`overrides formsnap \u2192 sveltekit-superforms ${SUPERFORMS_VERSION}`);
-      }
-    }
+  if (dropFormsnapOverride(data)) {
+    changed.push(
+      "overrides formsnap \u2192 sveltekit-superforms dropped (formsnap 2.1 peers superforms 3)"
+    );
   }
   if (changed.length > 0) {
     writeJson(pkgPath, data, indent);