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
refactor: migrate project build to postgrest (#3854)
Bogdan Chadkin07decaa02a42
diff --git a/apps/builder/app/shared/marketplace/db.server.ts b/apps/builder/app/shared/marketplace/db.server.tsindex 4d90a588a4..d63d6fc95d 100644--- a/apps/builder/app/shared/marketplace/db.server.ts+++ b/apps/builder/app/shared/marketplace/db.server.ts@@ -13,7 +13,7 @@ export const getBuildProdData = async ({ projectId }: { projectId: Project["id"] },context: AppContext): Promise<BuildData> => {- const build = await loadApprovedProdBuildByProjectId(projectId);+ const build = await loadApprovedProdBuildByProjectId(context, projectId);const assets = await loadAssetsByProject(projectId, context, {skipPermissionsCheck: true,diff --git a/packages/project-build/package.json b/packages/project-build/package.jsonindex 3ba4feb8cf..dd1210215d 100644--- a/packages/project-build/package.json+++ b/packages/project-build/package.json@@ -21,7 +21,6 @@"test": "NODE_OPTIONS=--experimental-vm-modules jest"},"dependencies": {- "@webstudio-is/prisma-client": "workspace:*","@webstudio-is/sdk": "workspace:*","@webstudio-is/trpc-interface": "workspace:*","@webstudio-is/postrest": "workspace:*",diff --git a/packages/project-build/src/db/build.ts b/packages/project-build/src/db/build.tsindex a27d1300dc..49ba7bcb8c 100644--- a/packages/project-build/src/db/build.ts+++ b/packages/project-build/src/db/build.ts@@ -1,7 +1,6 @@/* eslint no-console: ["error", { allow: ["time", "timeEnd"] }] */import { nanoid } from "nanoid";-import { prisma, Prisma } from "@webstudio-is/prisma-client";import type { Database } from "@webstudio-is/postrest/index.server";import {AuthorizationError,@@ -151,32 +150,36 @@ export const loadBuildByProjectId = async (};export const loadApprovedProdBuildByProjectId = async (+ context: AppContext,projectId: Build["projectId"]): Promise<Build> => {- const projectData = await prisma.project.findUnique({- where: {- marketplaceApprovalStatus: "APPROVED",- id_isDeleted: { id: projectId, isDeleted: false },- },- select: {- latestBuild: {- select: {- build: true,- },- },- },- });-- const build = projectData?.latestBuild?.build;- if (build === undefined) {- throw new Error("Prod build not found");+ const latestBuild = await context.postgrest.client+ .from("LatestBuildPerProject")+ .select(+ `+ buildId,+ project:Project!inner (id)+ `+ )+ .eq("projectId", projectId)+ .eq("project.isDeleted", false)+ .eq("project.marketplaceApprovalStatus", "APPROVED")+ .single();+ if (latestBuild.error) {+ throw latestBuild.error;}-- return parseBuild({- ...build,- createdAt: build.createdAt.toISOString(),- updatedAt: build.updatedAt.toISOString(),- });+ if (latestBuild.data.buildId === null) {+ throw Error("Build not found");+ }+ const build = await context.postgrest.client+ .from("Build")+ .select()+ .eq("id", latestBuild.data.buildId)+ .single();+ if (build.error) {+ throw build.error;+ }+ return parseBuild(build.data);};const createNewPageInstances = (): Build["instances"] => {@@ -217,17 +220,8 @@ export const createBuild = async (props: {projectId: Build["projectId"];},- _context: AppContext,- client: Prisma.TransactionClient+ context: AppContext): Promise<void> => {- const count = await client.build.count({- where: { projectId: props.projectId, deployment: null },- });-- if (count > 0) {- throw new Error("Dev build already exists");- }-const newInstances = createNewPageInstances();const [rootInstanceId] = newInstances[0];const systemDataSource: DataSource = {@@ -244,19 +238,19 @@ export const createBuild = async (}));- await client.build.create({- data: {- projectId: props.projectId,- pages: serializePages(defaultPages),- breakpoints: serializeData<Breakpoint>(- new Map(createInitialBreakpoints())- ),- instances: serializeData<Instance>(new Map(newInstances)),- dataSources: serializeData<DataSource>(- new Map([[systemDataSource.id, systemDataSource]])- ),- },+ const newBuild = await context.postgrest.client.from("Build").insert({+ id: crypto.randomUUID(),+ projectId: props.projectId,+ pages: serializePages(defaultPages),+ breakpoints: serializeData<Breakpoint>(new Map(createInitialBreakpoints())),+ instances: serializeData<Instance>(new Map(newInstances)),+ dataSources: serializeData<DataSource>(+ new Map([[systemDataSource.id, systemDataSource]])+ ),});+ if (newBuild.error) {+ throw newBuild.error;+ }};export const createProductionBuild = async (diff --git a/packages/project/src/db/project.ts b/packages/project/src/db/project.tsindex 348c7d9b20..049a18f13c 100644--- a/packages/project/src/db/project.ts+++ b/packages/project/src/db/project.ts@@ -51,22 +51,31 @@ export const create = async (const projectId = crypto.randomUUID();- const project = await prisma.$transaction(async (client) => {- const project = await client.project.create({- data: {- id: projectId,- userId,- title,- domain: generateDomain(title),- },- });-- await createBuild({ projectId: project.id }, context, client);-- return project;+ // create project without user first+ // and set user only after build is successfully created+ // this way to make project creation transactional+ // for user+ const newProject = await context.postgrest.client.from("Project").insert({+ id: projectId,+ title,+ domain: generateDomain(title),});+ if (newProject.error) {+ throw newProject.error;+ }- return project;+ await createBuild({ projectId }, context);++ const updatedProject = await context.postgrest.client+ .from("Project")+ .update({ userId })+ .eq("id", projectId)+ .select("*")+ .single();+ if (updatedProject.error) {+ throw updatedProject.error;+ }+ return updatedProject.data;};export const markAsDeleted = async (diff --git a/pnpm-lock.yaml b/pnpm-lock.yamlindex 61ff31329b..05b9e395f5 100644--- a/pnpm-lock.yaml+++ b/pnpm-lock.yaml@@ -1716,9 +1716,6 @@ importers:'@webstudio-is/postrest':specifier: workspace:*version: link:../postgrest- '@webstudio-is/prisma-client':- specifier: workspace:*- version: link:../prisma-client'@webstudio-is/sdk':specifier: workspace:*version: link:../sdk