@wraps.dev/cli 2.10.2 → 2.10.4

package/dist/cli.js

@@ -19348,7 +19348,7 @@ async function templatesPush(options) {
     const filePath = join9(templatesDir, file);
     const source = await readFile4(filePath, "utf-8");
     const sourceHash = sha256(source);
-    if (!options.force && lockfile.templates[slug]?.localHash === sourceHash) {
+    if (lockfile.templates[slug]?.localHash === sourceHash) {
       unchanged.push(slug);
       continue;
     }
@@ -19699,17 +19699,30 @@ async function pushToAPI(templates, token, _org, progress, force) {
           }))
         })
       });
-      if (resp.status === 409) {
+      if (Number(resp.status) === 409) {
         const data = await resp.json();
         for (const c of data.conflicts ?? []) {
           results.push({ slug: c.slug, success: false });
-          progress.fail(
-            `${pc26.cyan(c.slug)} was edited on the dashboard. Use ${pc26.bold("--force")} to overwrite.`
-          );
         }
         for (const r of data.results ?? []) {
           results.push({ slug: r.slug, id: r.id, success: true });
         }
+        const successCount = data.results?.length ?? 0;
+        const conflictCount = data.conflicts?.length ?? 0;
+        if (successCount > 0 && conflictCount > 0) {
+          progress.succeed(`Synced ${successCount} templates to dashboard`);
+          for (const c of data.conflicts ?? []) {
+            progress.fail(
+              `${pc26.cyan(c.slug)} was edited on the dashboard. Use ${pc26.bold("--force")} to overwrite.`
+            );
+          }
+        } else if (conflictCount > 0) {
+          for (const c of data.conflicts ?? []) {
+            progress.fail(
+              `${pc26.cyan(c.slug)} was edited on the dashboard. Use ${pc26.bold("--force")} to overwrite.`
+            );
+          }
+        }
       } else if (!resp.ok) {
         const body = await resp.text();
         throw new Error(`API returned ${resp.status}: ${body}`);
@@ -19752,7 +19765,7 @@ async function pushToAPI(templates, token, _org, progress, force) {
           force: force ?? false
         })
       });
-      if (resp.status === 409) {
+      if (Number(resp.status) === 409) {
         results.push({ slug: t.slug, success: false });
         progress.fail(
           `${pc26.cyan(t.slug)} was edited on the dashboard since your last push. Use ${pc26.bold("--force")} to overwrite.`