Open source website builder and Webflow alternative. Webstudio is an advanced visual builder that connects to any headless CMS, supports all CSS properties, and can be hosted anywhere, including with us.
TypeScript accessibilityalternativecloudflarecloudflare-workersdesignfreefrontendopen-sourceradix-uireactremixweb-developmentwebflowwebsite-builderwebsite-developmentwebsiteswebstudio
Drop tree table (#1147)
Bogdan Chadkin7e80f1816357
diff --git a/apps/builder/app/builder/builder.tsx b/apps/builder/app/builder/builder.tsxindex a408b6327c..132dce21e2 100644--- a/apps/builder/app/builder/builder.tsx+++ b/apps/builder/app/builder/builder.tsx@@ -237,7 +237,6 @@ export type BuilderProps = {project: Project;pages: Pages;pageId: string;- treeId: string;buildId: string;buildOrigin: string;authReadToken: string;@@ -249,7 +248,6 @@ export const Builder = ({project,pages,pageId,- treeId,buildId,buildOrigin,authReadToken,@@ -265,7 +263,6 @@ export const Builder = ({useBuilderStore(publish);useSyncServer({buildId,- treeId,projectId: project.id,authToken,authPermit,diff --git a/apps/builder/app/builder/shared/sync/sync-server.ts b/apps/builder/app/builder/shared/sync/sync-server.tsindex 2f59901fb4..1d0e2c0ab4 100644--- a/apps/builder/app/builder/shared/sync/sync-server.ts+++ b/apps/builder/app/builder/shared/sync/sync-server.ts@@ -1,6 +1,6 @@import { sync } from "immerhin";import type { Project } from "@webstudio-is/project";-import type { Build, Tree } from "@webstudio-is/project-build";+import type { Build } from "@webstudio-is/project-build";import { restPatchPath } from "~/shared/router-utils";import { useEffect } from "react";import { enqueue, dequeue, queueStatus } from "./queue";@@ -41,7 +41,6 @@ const useErrorCheck = () => {};const useNewEntriesCheck = ({- treeId,buildId,projectId,authToken,@@ -68,7 +67,6 @@ const useNewEntriesCheck = ({method: "post",body: JSON.stringify({transactions,- treeId,buildId,projectId,}),@@ -77,12 +75,11 @@ const useNewEntriesCheck = ({}, NEW_ENTRIES_INTERVAL);return () => clearInterval(intervalId);- }, [treeId, buildId, projectId, authToken, authPermit]);+ }, [buildId, projectId, authToken, authPermit]);};type UserSyncServerProps = {buildId: Build["id"];- treeId: Tree["id"];projectId: Project["id"];authToken: string | undefined;authPermit: AuthPermit;diff --git a/apps/builder/app/canvas/canvas.tsx b/apps/builder/app/canvas/canvas.tsxindex 255630a78c..7f0b243485 100644--- a/apps/builder/app/canvas/canvas.tsx+++ b/apps/builder/app/canvas/canvas.tsx@@ -94,12 +94,6 @@ export const Canvas = ({data,getComponent,}: CanvasProps): JSX.Element | null => {- if (data.build === null) {- throw new Error("Build is null");- }- if (data.tree === null) {- throw new Error("Tree is null");- }const isBuilderReady = useSubscribeBuilderReady();useSetAssets(data.assets);useSetBreakpoints(data.build.breakpoints);diff --git a/apps/builder/app/routes/builder/$projectId.tsx b/apps/builder/app/routes/builder/$projectId.tsxindex 3ed4b025db..7bedbd858c 100644--- a/apps/builder/app/routes/builder/$projectId.tsx+++ b/apps/builder/app/routes/builder/$projectId.tsx@@ -45,8 +45,6 @@ export const loader = async ({const devBuild = await loadBuildByProjectId(project.id, "dev");const pages = devBuild.pages;- const page =- pages.pages.find((page) => page.id === pageIdParam) ?? pages.homePage;const authReadToken = await createAuthReadToken({ projectId: project.id });const authToken = url.searchParams.get("authToken") ?? undefined;@@ -55,7 +53,6 @@ export const loader = async ({project,pages,pageId: pageIdParam || devBuild.pages.homePage.id,- treeId: page.treeId,buildId: devBuild.id,buildOrigin: getBuildOrigin(request),authReadToken,diff --git a/apps/builder/app/routes/rest/patch.ts b/apps/builder/app/routes/rest/patch.tsindex 8b1499e6ae..5237fab8f6 100644--- a/apps/builder/app/routes/rest/patch.ts+++ b/apps/builder/app/routes/rest/patch.ts@@ -1,6 +1,6 @@import type { ActionArgs } from "@remix-run/node";import type { SyncItem } from "immerhin";-import type { Build, Tree } from "@webstudio-is/project-build";+import type { Build } from "@webstudio-is/project-build";import {patchBreakpoints,patchProps,@@ -14,17 +14,12 @@ import { createContext } from "~/shared/context.server";type PatchData = {transactions: Array<SyncItem>;- treeId: Tree["id"];buildId: Build["id"];projectId: Project["id"];};export const action = async ({ request }: ActionArgs) => {- const { treeId, buildId, projectId, transactions }: PatchData =- await request.json();- if (treeId === undefined) {- return { errors: "Tree id required" };- }+ const { buildId, projectId, transactions }: PatchData = await request.json();if (buildId === undefined) {return { errors: "Build id required" };}diff --git a/apps/builder/app/shared/db/canvas.server.ts b/apps/builder/app/shared/db/canvas.server.tsindex 0f3fa6543c..7fcd6539e7 100644--- a/apps/builder/app/shared/db/canvas.server.ts+++ b/apps/builder/app/shared/db/canvas.server.ts@@ -1,8 +1,5 @@import type { CanvasData, Project } from "@webstudio-is/project";-import {- loadBuildByProjectId,- loadTreeById,-} from "@webstudio-is/project-build/server";+import { loadBuildByProjectId } from "@webstudio-is/project-build/server";import { db as projectDb } from "@webstudio-is/project/server";import { loadByProject } from "@webstudio-is/asset-uploader/server";import type { AppContext } from "@webstudio-is/trpc-interface/server";@@ -101,26 +98,10 @@ export const loadCanvasData = async (throw new Error(`Page ${props.pageIdOrPath} not found`);}- const [tree, assets] = await Promise.all([- loadTreeById(- {- projectId: props.project.id,- treeId: page.treeId,- },- context- ),-- loadByProject(props.project.id, context),- ]);-- if (tree === null) {- throw new Error(`Tree not found for project ${props.project.id}`);- }+ const assets = await loadByProject(props.project.id, context);return {build,- tree,- buildId: build.id,page,assets,};diff --git a/packages/prisma-client/prisma/migrations/20230301101527_drop_page_tree_id/migration.ts b/packages/prisma-client/prisma/migrations/20230301101527_drop_page_tree_id/migration.tsnew file mode 100644index 0000000000..40a00ca5c4--- /dev/null+++ b/packages/prisma-client/prisma/migrations/20230301101527_drop_page_tree_id/migration.ts@@ -0,0 +1,66 @@+import { PrismaClient } from "./client";++type TreeId = string;++type Page = {+ id: string;+ treeId?: TreeId;+};++type Pages = {+ homePage: Page;+ pages: Page[];+};++export default async () => {+ const client = new PrismaClient({+ // Uncomment to see the queries in console as the migration runs+ // log: ["query", "info", "warn", "error"],+ });++ await client.$transaction(+ async (prisma) => {+ const chunkSize = 1000;+ let cursor: undefined | { id: string; projectId: string } = undefined;+ let hasNext = true;+ while (hasNext) {+ const builds = await prisma.build.findMany({+ take: chunkSize,+ orderBy: {+ id: "asc",+ },+ ...(cursor+ ? {+ skip: 1, // Skip the cursor+ cursor: { id_projectId: cursor },+ }+ : null),+ });+ const lastBuild = builds.at(-1);+ if (lastBuild) {+ cursor = { id: lastBuild.id, projectId: lastBuild.projectId };+ }+ hasNext = builds.length === chunkSize;++ for (const build of builds) {+ const { homePage, pages }: Pages = JSON.parse(build.pages);+ delete homePage.treeId;+ for (const page of pages) {+ delete page.treeId;+ }+ build.pages = JSON.stringify({ homePage, pages });+ }++ await Promise.all(+ builds.map(({ id, projectId, pages }) =>+ prisma.build.update({+ where: { id_projectId: { id, projectId } },+ data: { pages },+ })+ )+ );+ }+ },+ { timeout: 1000 * 60 * 8 }+ );+};diff --git a/packages/prisma-client/prisma/migrations/20230301101527_drop_page_tree_id/schema.prisma b/packages/prisma-client/prisma/migrations/20230301101527_drop_page_tree_id/schema.prismanew file mode 100644index 0000000000..3afc67aa01--- /dev/null+++ b/packages/prisma-client/prisma/migrations/20230301101527_drop_page_tree_id/schema.prisma@@ -0,0 +1,145 @@+// DO NOT EDIT THIS FILE!+// This is a copy of your schema.prisma that corresponds to the state of the database+// when all migrations up until this one are applied.+// It's used to generate a Prisma Client for the migration.++// This is your Prisma schema file,+// learn more about it in the docs: https://pris.ly/d/prisma-schema++generator client {+ provider = "prisma-client-js"+ previewFeatures = ["views", "clientExtensions"]+ output = "client"+}++datasource db {+ provider = "postgres"+ url = env("DATABASE_URL")+}++model Team {+ id String @id @default(uuid())+ users User[]+}++enum Location {+ FS+ REMOTE+}++enum UploadStatus {+ UPLOADING+ UPLOADED+}++model Asset {+ id String @default(uuid()) // not unique!+ projectId String+ format String+ size Int+ name String+ description String?+ location Location+ createdAt DateTime @default(now())+ meta String @default("{}")+ status UploadStatus @default(UPLOADED)++ @@id([id, projectId])+}++model User {+ id String @id @default(uuid())+ email String? @unique+ provider String?+ image String?+ username String?+ createdAt DateTime @default(now())+ team Team? @relation(fields: [teamId], references: [id])+ teamId String?+ projects Project[]+}++model Project {+ id String @id @default(uuid())+ createdAt DateTime @default(now())+ title String+ domain String @unique+ user User? @relation(fields: [userId], references: [id])+ userId String?+ build Build[]+ trees Tree[]+ isDeleted Boolean @default(false)++ @@unique([id, isDeleted])+ @@unique([domain, isDeleted])+}++model Build {+ id String @default(uuid())+ createdAt DateTime @default(now())+ pages String++ project Project @relation(fields: [projectId], references: [id])+ projectId String+ trees Tree[]++ isDev Boolean // exctly one is true per project+ isProd Boolean // at most one is true per project (none if not published)++ breakpoints String @default("[]")+ styles String @default("[]")+ styleSources String @default("[]")+ styleSourceSelections String @default("[]")+ props String @default("[]")+ instances String @default("[]")++ @@id([id, projectId])+}++model Tree {+ id String @default(uuid())+ project Project @relation(fields: [projectId], references: [id])+ projectId String+ build Build @relation(fields: [buildId, projectId], references: [id, projectId])+ buildId String+ root String+ instances String @default("[]")+ props String @default("[]")+ styles String @default("[]")+ styleSelections String @default("[]")++ @@id([id, projectId])+}++model Breakpoints {+ buildId String @id+ values String @default("[]")+}++enum AuthorizationRelation {+ viewers+ editors+ builders+}++model AuthorizationToken {+ token String @default(uuid())+ // No relation to Project, as the Authorization system is not tied to a project+ projectId String+ name String @default("")+ relation AuthorizationRelation @default(viewers)+ createdAt DateTime @default(now())++ @@id([token, projectId])+}++// Dashboard+view DashboardProject {+ id String @id @default(uuid())+ createdAt DateTime @default(now())+ title String+ domain String+ userId String?+ isDeleted Boolean @default(false)+ isPublished Boolean+}diff --git a/packages/prisma-client/prisma/migrations/20230301101856_drop_tree/migration.sql b/packages/prisma-client/prisma/migrations/20230301101856_drop_tree/migration.sqlnew file mode 100644index 0000000000..2b1cfc3ee1--- /dev/null+++ b/packages/prisma-client/prisma/migrations/20230301101856_drop_tree/migration.sql@@ -0,0 +1,8 @@+-- DropForeignKey+ALTER TABLE "Tree" DROP CONSTRAINT "Tree_buildId_projectId_fkey";++-- DropForeignKey+ALTER TABLE "Tree" DROP CONSTRAINT "Tree_projectId_fkey";++-- DropTable+DROP TABLE "Tree";diff --git a/packages/prisma-client/prisma/schema.prisma b/packages/prisma-client/prisma/schema.prismaindex 54408a8474..64ed36a7b0 100644--- a/packages/prisma-client/prisma/schema.prisma+++ b/packages/prisma-client/prisma/schema.prisma@@ -62,7 +62,6 @@ model Project {user User? @relation(fields: [userId], references: [id])userId String?build Build[]- trees Tree[]isDeleted Boolean @default(false)@@unique([id, isDeleted])@@ -76,7 +75,6 @@ model Build {project Project @relation(fields: [projectId], references: [id])projectId String- trees Tree[]isDev Boolean // exctly one is true per projectisProd Boolean // at most one is true per project (none if not published)@@ -91,21 +89,6 @@ model Build {@@id([id, projectId])}-model Tree {- id String @default(uuid())- project Project @relation(fields: [projectId], references: [id])- projectId String- build Build @relation(fields: [buildId, projectId], references: [id, projectId])- buildId String- root String- instances String @default("[]")- props String @default("[]")- styles String @default("[]")- styleSelections String @default("[]")-- @@id([id, projectId])-}-model Breakpoints {buildId String @idvalues String @default("[]")diff --git a/packages/prisma-client/src/types.ts b/packages/prisma-client/src/types.tsindex b564664793..847025e9ff 100644--- a/packages/prisma-client/src/types.ts+++ b/packages/prisma-client/src/types.ts@@ -5,7 +5,6 @@ export type {Build,Project,Asset,- Tree,DashboardProject,AuthorizationToken,} from "@prisma/client";diff --git a/packages/project-build/src/db/build.ts b/packages/project-build/src/db/build.tsindex 9eaa4be9af..494dcfda30 100644--- a/packages/project-build/src/db/build.ts+++ b/packages/project-build/src/db/build.ts@@ -22,7 +22,6 @@ import {} from "./style-source-selections";import { parseProps, serializeProps } from "./props";import { parseInstances, serializeInstances } from "./instances";-import { cloneTree, createTree, deleteTreeById } from "./tree";const parseBuild = async (build: DbBuild): Promise<Build> => {const pages = Pages.parse(JSON.parse(build.pages));@@ -140,32 +139,42 @@ export const addPage = async ({projectId: Project["id"];buildId: Build["id"];data: Pick<Page, "name" | "path"> &- Partial<Omit<Page, "id" | "treeId" | "name" | "path">>;+ Partial<Omit<Page, "id" | "name" | "path">>;}) => {- return updatePages({ projectId, buildId }, async (currentPages) => {- const instances = createNewPageInstances();- const [rootInstanceId] = instances[0];- const tree = await createTree({- projectId,- buildId,- });+ const build = await loadBuildById({ projectId, buildId });+ const currentPages = build.pages;+ const currentInstances = build.instances;- return {- homePage: currentPages.homePage,- pages: [- ...currentPages.pages,- {- id: nanoid(),- treeId: tree.id,- rootInstanceId,- name: data.name,- path: data.path,- title: data.title ?? data.name,- meta: data.meta ?? {},- },- ],- };+ const instances = createNewPageInstances();+ const [rootInstanceId] = instances[0];++ const updatedPages = Pages.parse({+ homePage: currentPages.homePage,+ pages: [+ ...currentPages.pages,+ {+ id: nanoid(),+ rootInstanceId,+ name: data.name,+ path: data.path,+ title: data.title ?? data.name,+ meta: data.meta ?? {},+ },+ ],+ } satisfies Pages);++ const updatedBuild = await prisma.build.update({+ where: {+ id_projectId: { projectId, id: buildId },+ },+ data: {+ pages: JSON.stringify(updatedPages),+ instances: serializeInstances(+ new Map([...currentInstances, ...instances])+ ),+ },});+ return parseBuild(updatedBuild);};export const editPage = async ({@@ -177,7 +186,7 @@ export const editPage = async ({projectId: Project["id"];buildId: Build["id"];pageId: Page["id"];- data: Partial<Omit<Page, "id" | "treeId">>;+ data: Partial<Omit<Page, "id">>;}) => {return updatePages({ projectId, buildId }, async (currentPages) => {const currentPage = findPageByIdOrPath(currentPages, pageId);@@ -187,7 +196,6 @@ export const editPage = async ({const updatedPage: Page = {id: currentPage.id,- treeId: currentPage.treeId,rootInstanceId: currentPage.rootInstanceId,name: data.name ?? currentPage.name,path: data.path ?? currentPage.path,@@ -226,8 +234,6 @@ export const deletePage = async ({throw new Error(`Page with id "${pageId}" not found`);}- await deleteTreeById({ projectId, treeId: page.treeId });-// @todo cleanup style source selections of deleted pages// @todo cleanup props of deleted pages// @todo cleanup instances of deleted pages@@ -239,72 +245,6 @@ export const deletePage = async ({});};-const createPages = async (- { projectId, buildId }: { projectId: Project["id"]; buildId: Build["id"] },- _context: AppContext,- client: Prisma.TransactionClient = prisma-) => {- const instances = createNewPageInstances();- const [rootInstanceId] = instances[0];- const tree = await createTree(- {- projectId,- buildId,- },- client- );- return Pages.parse({- homePage: {- id: nanoid(),- name: "Home",- path: "",- title: "Home",- meta: {},- treeId: tree.id,- rootInstanceId,- },- pages: [],- } satisfies Pages);-};--const clonePage = async (- from: { projectId: Project["id"]; page: Page },- to: { projectId: Project["id"]; buildId: Build["id"] },- context: AppContext,- client: Prisma.TransactionClient = prisma-) => {- const tree = await cloneTree(- { projectId: from.projectId, treeId: from.page.treeId },- to,- context,- client- );- return { ...from.page, id: nanoid(), treeId: tree.id };-};--const clonePages = async (- from: { projectId: Project["id"]; pages: Pages },- to: { projectId: Project["id"]; buildId: Build["id"] },- context: AppContext,- client: Prisma.TransactionClient = prisma-) => {- const clones = [];- for (const page of from.pages.pages) {- clones.push(- await clonePage({ projectId: from.projectId, page }, to, context, client)- );- }- return Pages.parse({- homePage: await clonePage(- { projectId: from.projectId, page: from.pages.homePage },- to,- context,- client- ),- pages: clones,- } satisfies Pages);-};-/** We create "dev" build in two cases:* 1. when we create a new project@@ -336,7 +276,7 @@ export async function createBuild(env: "dev" | "prod";sourceBuild: Build | undefined;},- context: AppContext,+ _context: AppContext,client: Prisma.TransactionClient): Promise<void> {if (props.env === "dev") {@@ -360,10 +300,31 @@ export async function createBuild(});}- const build = await client.build.create({+ let newInstances: Build["instances"];+ let newPages: Pages;+ if (props.sourceBuild === undefined) {+ newInstances = createNewPageInstances();+ const [rootInstanceId] = newInstances[0];+ newPages = Pages.parse({+ homePage: {+ id: nanoid(),+ name: "Home",+ path: "",+ title: "Home",+ meta: {},+ rootInstanceId,+ },+ pages: [],+ } satisfies Pages);+ } else {+ newInstances = props.sourceBuild.instances;+ newPages = props.sourceBuild.pages;+ }++ await client.build.create({data: {projectId: props.projectId,- pages: JSON.stringify([]),+ pages: JSON.stringify(newPages),breakpoints: serializeBreakpoints(new Map(props.sourceBuild?.breakpoints ?? createInitialBreakpoints())),@@ -375,35 +336,9 @@ export async function createBuild(new Map(props.sourceBuild?.styleSourceSelections)),props: serializeProps(new Map(props.sourceBuild?.props)),- instances: serializeInstances(new Map(props.sourceBuild?.instances)),+ instances: serializeInstances(new Map(newInstances)),isDev: props.env === "dev",isProd: props.env === "prod",},});-- const pages =- props.sourceBuild === undefined- ? await createPages(- { projectId: props.projectId, buildId: build.id },- context,- client- )- : await clonePages(- {- projectId: props.sourceBuild.projectId,- pages: props.sourceBuild.pages,- },- { projectId: props.projectId, buildId: build.id },- context,- client- );-- await client.build.update({- where: {- id_projectId: { projectId: props.projectId, id: build.id },- },- data: {- pages: JSON.stringify(pages),- },- });}diff --git a/packages/project-build/src/db/tree.ts b/packages/project-build/src/db/tree.tsdeleted file mode 100644index e155635577..0000000000--- a/packages/project-build/src/db/tree.ts+++ /dev/null@@ -1,72 +0,0 @@-import { v4 as uuid } from "uuid";-import { type Project, type Prisma, prisma } from "@webstudio-is/prisma-client";-import type { AppContext } from "@webstudio-is/trpc-interface/server";-import type { Tree } from "../types";--type TreeData = Omit<Tree, "id">;--export const createTree = async (- treeData: TreeData,- client: Prisma.TransactionClient = prisma-) => {- const newTreeId = uuid();-- return await client.tree.create({- data: {- id: newTreeId,- projectId: treeData.projectId,- buildId: treeData.buildId,- root: "",- styles: "",- },- });-};--export const deleteTreeById = async ({- projectId,- treeId,-}: {- projectId: Project["id"];- treeId: Tree["id"];-}): Promise<void> => {- await prisma.tree.delete({- where: {- id_projectId: { projectId, id: treeId },- },- });-};--export const loadTreeById = async (- { projectId, treeId }: { projectId: Project["id"]; treeId: Tree["id"] },- _context: AppContext,- client: Prisma.TransactionClient = prisma-): Promise<Tree | null> => {- const tree = await client.tree.findUnique({- where: {- id_projectId: { projectId, id: treeId },- },- });- if (tree === null) {- return null;- }-- return {- id: tree.id,- projectId: tree.projectId,- buildId: tree.buildId,- };-};--export const cloneTree = async (- from: { projectId: Project["id"]; treeId: Tree["id"] },- to: { projectId: Project["id"]; buildId: Project["id"] },- context: AppContext,- client: Prisma.TransactionClient = prisma-) => {- const tree = await loadTreeById(from, context, client);- if (tree === null) {- throw new Error(`Tree ${from.projectId}/${from.treeId} not found`);- }-- return await createTree({ ...tree, ...to }, client);-};diff --git a/packages/project-build/src/index.server.ts b/packages/project-build/src/index.server.tsindex 3deb2786fa..b5df2e8062 100644--- a/packages/project-build/src/index.server.ts+++ b/packages/project-build/src/index.server.ts@@ -2,7 +2,6 @@ export * from "./db/build";export * from "./db/breakpoints";export * from "./db/styles";export * from "./db/style-sources";-export * from "./db/tree";export * from "./db/instances";export * from "./db/props";export * from "./db/style-source-selections";diff --git a/packages/project-build/src/schema/pages.ts b/packages/project-build/src/schema/pages.tsindex 80ecf4b078..3d6e866cd8 100644--- a/packages/project-build/src/schema/pages.ts+++ b/packages/project-build/src/schema/pages.ts@@ -14,7 +14,6 @@ const commonPageFields = {name: z.string().refine((val) => val !== "", "Can't be empty"),title: Title,meta: z.record(z.string(), z.string()),- treeId: z.string(),rootInstanceId: z.string(),} as const;diff --git a/packages/project-build/src/shared/pages-utils.test.ts b/packages/project-build/src/shared/pages-utils.test.tsindex c25d2c2d7c..5fadbc843e 100644--- a/packages/project-build/src/shared/pages-utils.test.ts+++ b/packages/project-build/src/shared/pages-utils.test.ts@@ -8,7 +8,6 @@ const pages = {path: "/",name: "Home",title: "Home",- treeId: "tree-1",rootInstanceId: "instance-1",meta: {},} satisfies Page,@@ -18,7 +17,6 @@ const pages = {path: "/page1",name: "Page",title: "Page",- treeId: "tree-1",rootInstanceId: "instance-1",meta: {},} satisfies Page,diff --git a/packages/project-build/src/types.ts b/packages/project-build/src/types.tsindex 6065cc960a..e3f59f8d05 100644--- a/packages/project-build/src/types.ts+++ b/packages/project-build/src/types.ts@@ -20,9 +20,3 @@ export type Build = {props: [Prop["id"], Prop][];instances: [InstancesItem["id"], InstancesItem][];};--export type Tree = {- id: string;- projectId: string;- buildId: string;-};diff --git a/packages/project/src/shared/schema.ts b/packages/project/src/shared/schema.tsindex a027c1cf66..d9f70e350c 100644--- a/packages/project/src/shared/schema.ts+++ b/packages/project/src/shared/schema.ts@@ -1,6 +1,5 @@import { z } from "zod";import type { Data } from "@webstudio-is/react-sdk";-import type { Build } from "@webstudio-is/project-build";const MIN_TITLE_LENGTH = 2;@@ -24,6 +23,4 @@ export type Project = z.infer<typeof Project>;export const Projects = z.array(Project);export type Projects = z.infer<typeof Projects>;-export type CanvasData = Data & {- buildId: Build["id"];-};+export type CanvasData = Data;diff --git a/packages/react-sdk/src/tree/root.ts b/packages/react-sdk/src/tree/root.tsindex dbdfbb4a99..6cb67d3d37 100644--- a/packages/react-sdk/src/tree/root.ts+++ b/packages/react-sdk/src/tree/root.ts@@ -6,7 +6,6 @@ import type {Instances,InstancesItem,Page,- Tree,} from "@webstudio-is/project-build";import type { Asset } from "@webstudio-is/asset-uploader";import { createElementsTree } from "./create-elements-tree";@@ -19,8 +18,7 @@ import type { GetComponent } from "../components/components-utils";export type Data = {page: Page;- tree: Tree | null;- build: Build | null;+ build: Build;assets: Array<Asset>;params?: Params;};@@ -68,10 +66,6 @@ export const InstanceRoot = ({customComponents = defaultCustomComponents,getComponent,}: RootProps): JSX.Element | null => {- if (data.tree === null || data.build === null) {- throw new Error("Tree and build are required");- }-setParams(data.params ?? null);registerComponents(customComponents);