fix: use current page patches in release

Author: kof

apps/builder/app/shared/sync/sync-stores.ts

@@ -4,10 +4,6 @@ import { useEffect } from "react";
 import { batched } from "nanostores";
 import { nanoid } from "nanoid";
 import { $project } from "./data-stores";
-import {
-  normalizePagesPatch,
-  denormalizePagesPatch,
-} from "@webstudio-is/project/pages-patch-normalizer";
 import {
   $selectedPageHash,
   $selectedInstanceSizes,

packages/project/package.json

@@ -40,10 +40,6 @@
     "./build-patch-core.server": {
       "webstudio": "./src/db/build-patch-core.ts",
       "import": "./src/db/build-patch-core.ts"
-    },
-    "./pages-patch-normalizer": {
-      "webstudio": "./src/shared/pages-patch-normalizer.ts",
-      "import": "./src/shared/pages-patch-normalizer.ts"
     }
   },
   "license": "AGPL-3.0-or-later",

packages/project/src/db/build-patch-core.ts

@@ -33,7 +33,6 @@ import {
   serializeData,
 } from "@webstudio-is/project-build";
 import type { Database } from "@webstudio-is/postgrest/index.server";
-import { denormalizePagesPatch } from "../shared/pages-patch-normalizer";
 
 enableMapSet();
 enablePatches();
@@ -67,12 +66,6 @@ export const singlePlayerVersionMismatchResult = {
   errors: singlePlayerVersionMismatchError,
 } as const satisfies BuildPatchUpdateResult;
 
-const denormalizePagesPatches = (patches: Patch[], pages: Pages): Patch[] => {
-  return denormalizePagesPatch([{ namespace: "pages", patches }], pages, {
-    onMissing: "throw",
-  })[0].patches;
-};
-
 export const createBuildPatchUpdate = async ({
   build,
   clientVersion,
@@ -127,13 +120,10 @@ export const createBuildPatchUpdate = async ({
       if (namespace === "pages") {
         const pages = buildData.pages ?? parsePages(build.pages);
         const currentSocialImageAssetId =
-          pages.homePage.meta.socialImageAssetId;
-        buildData.pages = applyPatches(
-          pages,
-          denormalizePagesPatches(patches, pages)
-        );
-        const newSocialImageAssetId =
-          buildData.pages.homePage.meta.socialImageAssetId;
+          getHomePage(pages).meta.socialImageAssetId;
+        buildData.pages = applyPatches(pages, patches);
+        const newSocialImageAssetId = getHomePage(buildData.pages).meta
+          .socialImageAssetId;
         if (currentSocialImageAssetId !== newSocialImageAssetId) {
           previewImageAssetId = newSocialImageAssetId || null;
         }

packages/project/src/db/build-patch.test.ts

@@ -135,8 +135,18 @@ describe("patchBuild", () => {
           {
             ...buildRow,
             pages: JSON.stringify({
-              ...JSON.parse(buildRow.pages),
+              meta: {},
+              homePageId: "page-1",
+              rootFolderId: "root",
               pages: [
+                {
+                  id: "page-1",
+                  name: "Home",
+                  path: "",
+                  title: "Home",
+                  meta: {},
+                  rootInstanceId: "body-1",
+                },
                 {
                   id: "page-2",
                   name: "About",
@@ -146,6 +156,14 @@ describe("patchBuild", () => {
                   rootInstanceId: "body-1",
                 },
               ],
+              folders: [
+                {
+                  id: "root",
+                  name: "Root",
+                  slug: "",
+                  children: ["page-1", "page-2"],
+                },
+              ],
             }),
           },
         ])
@@ -169,7 +187,7 @@ describe("patchBuild", () => {
                 patches: [
                   {
                     op: "replace",
-                    path: ["pages", "@page-2", "path"],
+                    path: ["pages", "page-2", "path"],
                     value: "/company",
                   },
                 ],
@@ -183,7 +201,9 @@ describe("patchBuild", () => {
 
     expect(result).toEqual({ status: "ok", version: 4 });
     expect(
-      JSON.parse((updatedBuild as { pages: string }).pages).pages[0].path
+      JSON.parse((updatedBuild as { pages: string }).pages).pages.find(
+        (page: { id: string }) => page.id === "page-2"
+      )?.path
     ).toBe("/company");
   });