@valbuild/cli 0.138.3 → 0.138.4

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # @valbuild/cli
 
+## 0.138.4
+
+### Patch Changes
+
+- [#770](https://github.com/valbuild/val/pull/770) [`0a885b1`](https://github.com/valbuild/val/commit/0a885b1f0304517b167b959958464066194732d0) Thanks [@freekh](https://github.com/freekh)! - `val publish` no longer fails when a newer publish is already live. Two publishes in a row start two CI runs, and the newer one can finish first. The older run is then told that the site already has its changes. It now prints that and exits with 0, instead of turning CI red.
+- Updated dependencies [[`63bff05`](https://github.com/valbuild/val/commit/63bff0589b6df42efaa63ec606688d20a9670439), [`0a885b1`](https://github.com/valbuild/val/commit/0a885b1f0304517b167b959958464066194732d0), [`58d13a2`](https://github.com/valbuild/val/commit/58d13a2a534421b341b1bf71d02f0a2290fc0d61)]:
+  - @valbuild/server@0.138.4
+  - @valbuild/tanstack-build@0.138.4
+  - @valbuild/shared@0.138.4
+  - @valbuild/language-server@0.138.4
+
 ## 0.138.3
 
 ### Patch Changes

package/cli/dist/valbuild-cli-cli.cjs.dev.js

@@ -3398,6 +3398,13 @@ async function publishDeclaredBuild(args) {
     };
   }
   const promoted = await promote(client, publishId);
+  if (promoted.status === "superseded") {
+    return {
+      status: "superseded",
+      message: promoted.message,
+      ...summary
+    };
+  }
   if (promoted.status === "stale") {
     return {
       status: "failed",
@@ -3498,6 +3505,13 @@ async function promote(client, publishId) {
        * worth having when it arrives; failing without it would be this CLI
        * refusing an answer that is otherwise complete.
        */
+      const problems = internal.parseProblems(err.details);
+      if (problems.some(p => p.code === "SUPERSEDED")) {
+        return {
+          status: "superseded",
+          message: err.message
+        };
+      }
       const head = stringField(err.body, "head");
       return {
         status: "stale",
@@ -3707,6 +3721,12 @@ async function publish(options) {
         }
         return;
       }
+    case "superseded":
+      {
+        // Content's sentence says it all: a newer publish is live and has this.
+        console.log(pc__default["default"].green("✅ ") + result.message);
+        return;
+      }
     case "failed":
       {
         error(result.message);

package/cli/dist/valbuild-cli-cli.cjs.prod.js

@@ -3398,6 +3398,13 @@ async function publishDeclaredBuild(args) {
     };
   }
   const promoted = await promote(client, publishId);
+  if (promoted.status === "superseded") {
+    return {
+      status: "superseded",
+      message: promoted.message,
+      ...summary
+    };
+  }
   if (promoted.status === "stale") {
     return {
       status: "failed",
@@ -3498,6 +3505,13 @@ async function promote(client, publishId) {
        * worth having when it arrives; failing without it would be this CLI
        * refusing an answer that is otherwise complete.
        */
+      const problems = internal.parseProblems(err.details);
+      if (problems.some(p => p.code === "SUPERSEDED")) {
+        return {
+          status: "superseded",
+          message: err.message
+        };
+      }
       const head = stringField(err.body, "head");
       return {
         status: "stale",
@@ -3707,6 +3721,12 @@ async function publish(options) {
         }
         return;
       }
+    case "superseded":
+      {
+        // Content's sentence says it all: a newer publish is live and has this.
+        console.log(pc__default["default"].green("✅ ") + result.message);
+        return;
+      }
     case "failed":
       {
         error(result.message);

package/cli/dist/valbuild-cli-cli.esm.js

@@ -3363,6 +3363,13 @@ async function publishDeclaredBuild(args) {
     };
   }
   const promoted = await promote(client, publishId);
+  if (promoted.status === "superseded") {
+    return {
+      status: "superseded",
+      message: promoted.message,
+      ...summary
+    };
+  }
   if (promoted.status === "stale") {
     return {
       status: "failed",
@@ -3463,6 +3470,13 @@ async function promote(client, publishId) {
        * worth having when it arrives; failing without it would be this CLI
        * refusing an answer that is otherwise complete.
        */
+      const problems = parseProblems(err.details);
+      if (problems.some(p => p.code === "SUPERSEDED")) {
+        return {
+          status: "superseded",
+          message: err.message
+        };
+      }
       const head = stringField(err.body, "head");
       return {
         status: "stale",
@@ -3672,6 +3686,12 @@ async function publish(options) {
         }
         return;
       }
+    case "superseded":
+      {
+        // Content's sentence says it all: a newer publish is live and has this.
+        console.log(pc.green("✅ ") + result.message);
+        return;
+      }
     case "failed":
       {
         error(result.message);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@valbuild/cli",
   "private": false,
-  "version": "0.138.3",
+  "version": "0.138.4",
   "description": "Val CLI tools",
   "repository": {
     "type": "git",
@@ -28,9 +28,9 @@
     "zod-validation-error": "^5.0.0",
     "@valbuild/core": "0.138.2",
     "@valbuild/eslint-plugin": "0.125.0",
-    "@valbuild/language-server": "0.138.3",
-    "@valbuild/server": "0.138.3",
-    "@valbuild/shared": "0.138.2"
+    "@valbuild/language-server": "0.138.4",
+    "@valbuild/server": "0.138.4",
+    "@valbuild/shared": "0.138.4"
   },
   "peerDependencies": {
     "prettier": "*",
@@ -38,7 +38,7 @@
     "rolldown": ">=1.2.5",
     "@tanstack/router-generator": ">=1.167.0",
     "@tanstack/router-plugin": ">=1.168.0",
-    "@valbuild/tanstack-build": "^0.136.10"
+    "@valbuild/tanstack-build": "^0.138.4"
   },
   "peerDependenciesMeta": {
     "@valbuild/tanstack-build": {
@@ -70,7 +70,7 @@
     "prettier": "~3.8.5",
     "rolldown": "^1.2.5",
     "tsx": "^4.23.12",
-    "@valbuild/tanstack-build": "0.136.10"
+    "@valbuild/tanstack-build": "0.138.4"
   },
   "scripts": {
     "start": "tsx src/cli.ts --",

package/src/publish/fakeContent.ts

@@ -41,7 +41,7 @@ export type FakeContentOptions = {
   /** What the canary does. */
   verify?: "ok" | "fail";
   /** Refuse the promote because the branch moved on. */
-  promote?: "ok" | "stale";
+  promote?: "ok" | "stale" | "superseded";
   /**
    * The head the branch is at now.
    *
@@ -378,6 +378,18 @@ export async function startFakeContentService(
 
     // POST /v1/publish/{id}/promote - the pointer moves, or it does not.
     if (parts[3] === "promote") {
+      if (options.promote === "superseded") {
+        // As `postPublishPromote.ts` refuses an older build than the one served.
+        send(res, 409, {
+          statusCode: 409,
+          message:
+            "A newer publish is already live, and it includes this change, so this older one was not put live. Nothing was lost.",
+          details: [
+            { code: "SUPERSEDED", message: "The site serves a newer commit." },
+          ],
+        });
+        return;
+      }
       if (options.promote === "stale") {
         // The shape `postPublishPromote.ts` sends: the ordinary error envelope,
         // with the code in `details`. `head` is in the API's written contract

package/src/publish/runPublish.test.ts

@@ -341,6 +341,27 @@ describe("val publish", () => {
     }
   });
 
+  test("a publish the site has already moved past is not a failure", async () => {
+    // Two publishes in a row are two CI runs; the newer one can go live first.
+    // The older run is then refused as SUPERSEDED -- nothing is lost, because
+    // the commit it built is inside the one the site serves.
+    const fake = await startFakeContentService({
+      token: TOKEN,
+      promote: "superseded",
+    });
+    const root = makeArtifacts();
+    try {
+      const result = await run(root, fake.url);
+
+      expect(result.status).toBe("superseded");
+      if (result.status === "superseded") {
+        expect(result.message).toContain("Nothing was lost");
+      }
+    } finally {
+      await fake.close();
+    }
+  });
+
   test("a refused declaration reports every problem, not the first", async () => {
     const fake = await startFakeContentService({ token: TOKEN });
     // No server bundle, and a layer with no rev to name it by.

package/src/publish/runPublish.ts

@@ -79,6 +79,13 @@ type Summary = {
 
 export type PublishResult =
   | ({ status: "live"; url: string | null; commit: string | null } & Summary)
+  /**
+   * Not put live, and not a failure: a newer publish already is, and it
+   * contains this one (content's `SUPERSEDED`). Two publishes in a row are two
+   * CI runs; the older one's promote can land last. Red CI for it would be
+   * noise on every fast-typing session (docs/app-mode.md, Flow B).
+   */
+  | ({ status: "superseded"; message: string } & Summary)
   | ({ status: "verified" } & Summary)
   | {
       status: "failed";
@@ -438,6 +445,9 @@ async function publishDeclaredBuild(args: {
   }
 
   const promoted = await promote(client, publishId);
+  if (promoted.status === "superseded") {
+    return { status: "superseded", message: promoted.message, ...summary };
+  }
   if (promoted.status === "stale") {
     return {
       status: "failed",
@@ -520,6 +530,7 @@ async function promote(
 ): Promise<
   | { status: "ok"; response: PromoteResponse }
   | { status: "stale"; message: string; problems: PublishProblem[] }
+  | { status: "superseded"; message: string }
 > {
   try {
     return { status: "ok", response: await client.promote(publishId) };
@@ -547,6 +558,10 @@ async function promote(
        * worth having when it arrives; failing without it would be this CLI
        * refusing an answer that is otherwise complete.
        */
+      const problems = parseProblems(err.details);
+      if (problems.some((p) => p.code === "SUPERSEDED")) {
+        return { status: "superseded", message: err.message };
+      }
       const head = stringField(err.body, "head");
       return {
         status: "stale",

package/src/publish.ts

@@ -59,6 +59,11 @@ export async function publish(options: {
       }
       return;
     }
+    case "superseded": {
+      // Content's sentence says it all: a newer publish is live and has this.
+      console.log(pc.green("✅ ") + result.message);
+      return;
+    }
     case "failed": {
       error(result.message);
       for (const problem of result.problems) {