@valbuild/server 0.144.7 → 0.144.8

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @valbuild/server
 
+## 0.144.8
+
+### Patch Changes
+
+- [#844](https://github.com/valbuild/val/pull/844) [`b67c03e`](https://github.com/valbuild/val/commit/b67c03ee1876803c31098098ae0becf3f4ad6ade) Thanks [@freekh](https://github.com/freekh)! - Publishing a proposal now says what blocks it, and what to do about it:
+
+  - When the site's code changed after a proposal with code changes started, the Publish dialog offers **Update from the site**. It moves the proposal onto the site as it is now, and its code then needs building again ("Build required").
+  - When someone published changes to the same page since the proposal started, the dialog names the fields each side changed.
+
+- Updated dependencies [[`6fd8f79`](https://github.com/valbuild/val/commit/6fd8f791a83d37f95dc3ae12bd8025ccf81e4a7c), [`b67c03e`](https://github.com/valbuild/val/commit/b67c03ee1876803c31098098ae0becf3f4ad6ade)]:
+  - @valbuild/ui@0.144.8
+
 ## 0.144.7
 
 ### Patch Changes

package/dist/declarations/src/ValOpsHttp.d.ts

@@ -294,8 +294,9 @@ export declare class ValOpsHttp extends ValOps {
      */
     private static proposalsApiAllowed;
     /**
-     * A write to a proposal's FILES -- staging code, or serving a build of it
-     * (valbuild/home `docs/hosted-publishing.md`, step 7) -- is made by the
+     * A write to a proposal's FILES -- staging code, serving a build of it
+     * (valbuild/home `docs/hosted-publishing.md`, step 7), or moving it onto the
+     * site's code (step 8, "Update from the site") -- is made by the
      * proposal's own server and nobody else's: the file tools act on the
      * proposal the Studio is open in (P11), and the site's files change only
      * when a proposal is merged. The proposal it names, or `null` when this

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

@@ -10130,12 +10130,13 @@ class ValOpsHttp extends ValOps {
     const one = /^\/[0-9a-f]{20}$/.test(path);
     if (one) return method === "GET" || method === "PATCH";
     if (method === "GET") return /^\/[0-9a-f]{20}\/(merge-checks|files)$/.test(path);
-    return method === "POST" && /^\/[0-9a-f]{20}\/(close|reopen|setup\/retry|merge|files|build)$/.test(path);
+    return method === "POST" && /^\/[0-9a-f]{20}\/(close|reopen|setup\/retry|merge|files|build|update-from-site)$/.test(path);
   }
 
   /**
-   * A write to a proposal's FILES -- staging code, or serving a build of it
-   * (valbuild/home `docs/hosted-publishing.md`, step 7) -- is made by the
+   * A write to a proposal's FILES -- staging code, serving a build of it
+   * (valbuild/home `docs/hosted-publishing.md`, step 7), or moving it onto the
+   * site's code (step 8, "Update from the site") -- is made by the
    * proposal's own server and nobody else's: the file tools act on the
    * proposal the Studio is open in (P11), and the site's files change only
    * when a proposal is merged. The proposal it names, or `null` when this
@@ -10144,7 +10145,7 @@ class ValOpsHttp extends ValOps {
   static proposalFilesWrite(method, path) {
     var _exec;
     if (method !== "POST") return null;
-    return ((_exec = /^\/([0-9a-f]{20})\/(files|build)$/.exec(path)) === null || _exec === void 0 ? void 0 : _exec[1]) ?? null;
+    return ((_exec = /^\/([0-9a-f]{20})\/(files|build|update-from-site)$/.exec(path)) === null || _exec === void 0 ? void 0 : _exec[1]) ?? null;
   }
 
   /**

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

@@ -10130,12 +10130,13 @@ class ValOpsHttp extends ValOps {
     const one = /^\/[0-9a-f]{20}$/.test(path);
     if (one) return method === "GET" || method === "PATCH";
     if (method === "GET") return /^\/[0-9a-f]{20}\/(merge-checks|files)$/.test(path);
-    return method === "POST" && /^\/[0-9a-f]{20}\/(close|reopen|setup\/retry|merge|files|build)$/.test(path);
+    return method === "POST" && /^\/[0-9a-f]{20}\/(close|reopen|setup\/retry|merge|files|build|update-from-site)$/.test(path);
   }
 
   /**
-   * A write to a proposal's FILES -- staging code, or serving a build of it
-   * (valbuild/home `docs/hosted-publishing.md`, step 7) -- is made by the
+   * A write to a proposal's FILES -- staging code, serving a build of it
+   * (valbuild/home `docs/hosted-publishing.md`, step 7), or moving it onto the
+   * site's code (step 8, "Update from the site") -- is made by the
    * proposal's own server and nobody else's: the file tools act on the
    * proposal the Studio is open in (P11), and the site's files change only
    * when a proposal is merged. The proposal it names, or `null` when this
@@ -10144,7 +10145,7 @@ class ValOpsHttp extends ValOps {
   static proposalFilesWrite(method, path) {
     var _exec;
     if (method !== "POST") return null;
-    return ((_exec = /^\/([0-9a-f]{20})\/(files|build)$/.exec(path)) === null || _exec === void 0 ? void 0 : _exec[1]) ?? null;
+    return ((_exec = /^\/([0-9a-f]{20})\/(files|build|update-from-site)$/.exec(path)) === null || _exec === void 0 ? void 0 : _exec[1]) ?? null;
   }
 
   /**

package/dist/valbuild-server.esm.js

@@ -10093,12 +10093,13 @@ class ValOpsHttp extends ValOps {
     const one = /^\/[0-9a-f]{20}$/.test(path);
     if (one) return method === "GET" || method === "PATCH";
     if (method === "GET") return /^\/[0-9a-f]{20}\/(merge-checks|files)$/.test(path);
-    return method === "POST" && /^\/[0-9a-f]{20}\/(close|reopen|setup\/retry|merge|files|build)$/.test(path);
+    return method === "POST" && /^\/[0-9a-f]{20}\/(close|reopen|setup\/retry|merge|files|build|update-from-site)$/.test(path);
   }
 
   /**
-   * A write to a proposal's FILES -- staging code, or serving a build of it
-   * (valbuild/home `docs/hosted-publishing.md`, step 7) -- is made by the
+   * A write to a proposal's FILES -- staging code, serving a build of it
+   * (valbuild/home `docs/hosted-publishing.md`, step 7), or moving it onto the
+   * site's code (step 8, "Update from the site") -- is made by the
    * proposal's own server and nobody else's: the file tools act on the
    * proposal the Studio is open in (P11), and the site's files change only
    * when a proposal is merged. The proposal it names, or `null` when this
@@ -10107,7 +10108,7 @@ class ValOpsHttp extends ValOps {
   static proposalFilesWrite(method, path) {
     var _exec;
     if (method !== "POST") return null;
-    return ((_exec = /^\/([0-9a-f]{20})\/(files|build)$/.exec(path)) === null || _exec === void 0 ? void 0 : _exec[1]) ?? null;
+    return ((_exec = /^\/([0-9a-f]{20})\/(files|build|update-from-site)$/.exec(path)) === null || _exec === void 0 ? void 0 : _exec[1]) ?? null;
   }
 
   /**

package/package.json

@@ -16,7 +16,7 @@
     "./package.json": "./package.json"
   },
   "types": "dist/valbuild-server.cjs.d.ts",
-  "version": "0.144.7",
+  "version": "0.144.8",
   "devDependencies": {
     "@prettier/sync": "^0.6.1",
     "@types/jest": "^30.0.0",
@@ -32,7 +32,7 @@
     "zod-validation-error": "^5.0.0",
     "@valbuild/core": "0.144.0",
     "@valbuild/shared": "0.144.5",
-    "@valbuild/ui": "0.144.7"
+    "@valbuild/ui": "0.144.8"
   },
   "engines": {
     "node": "^20.19.0 || >=22"