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
Publish by buildId (#1689)
Ivan Starkovdafa7e8b3552
diff --git a/apps/builder/app/routes/builder.$projectId.tsx b/apps/builder/app/routes/builder.$projectId.tsxindex 56107cb852..35d78ddb67 100644--- a/apps/builder/app/routes/builder.$projectId.tsx+++ b/apps/builder/app/routes/builder.$projectId.tsx@@ -51,7 +51,7 @@ export const loader = async ({throw new Error(`Project "${params.projectId}" not found`);}- const devBuild = await loadBuildByProjectId(project.id, "dev");+ const devBuild = await loadBuildByProjectId(project.id);const assets = await loadAssetsByProject(project.id, context);const end = Date.now();diff --git a/apps/builder/app/routes/rest.project.$projectId.tsx b/apps/builder/app/routes/rest.build.$buildId.tsxsimilarity index 78%rename from apps/builder/app/routes/rest.project.$projectId.tsxrename to apps/builder/app/routes/rest.build.$buildId.tsxindex 471a60b6ec..9820714ee8 100644--- a/apps/builder/app/routes/rest.project.$projectId.tsx+++ b/apps/builder/app/routes/rest.build.$buildId.tsx@@ -10,24 +10,23 @@ export const loader = async ({params,request,}: LoaderArgs): Promise<- Data & { user: { email: User["email"] } | undefined }+ Data & { user: { email: User["email"] } | undefined } & {+ projectDomain: string;+ }> => {try {- const projectId = params.projectId ?? undefined;+ const buildId = params.buildId;- if (projectId === undefined) {+ if (buildId === undefined) {throw json("Required project id", { status: 400 });}const context = await createContext(request, "prod");- const pagesCanvasData = await loadProductionCanvasData(- { projectId },- context- );+ const pagesCanvasData = await loadProductionCanvasData(buildId, context);- const project = await projectDb.project.loadByParams(- { projectId },+ const project = await projectDb.project.loadById(+ pagesCanvasData.build.projectId,context);@@ -39,6 +38,7 @@ export const loader = async ({return {...pagesCanvasData,user: user ? { email: user.email } : undefined,+ projectDomain: project.domain,};} catch (error) {// If a Response is thrown, we're rethrowing it for Remix to handle.diff --git a/apps/builder/app/routes/rest.project.clone.$domain.ts b/apps/builder/app/routes/rest.project.clone.$domain.tsdeleted file mode 100644index 853c743172..0000000000--- a/apps/builder/app/routes/rest.project.clone.$domain.ts+++ /dev/null@@ -1,61 +0,0 @@-import { redirect, type LoaderArgs } from "@remix-run/node";-import { db as projectDb } from "@webstudio-is/project/index.server";-import type { Project } from "@webstudio-is/project";-import type { AppContext } from "@webstudio-is/trpc-interface/index.server";-import { findAuthenticatedUser } from "~/services/auth.server";-import { builderPath, loginPath } from "~/shared/router-utils";-import { createContext } from "~/shared/context.server";--const ensureProject = async (- {- domain,- }: {- domain: string;- },- context: AppContext-): Promise<Project> => {- return await projectDb.project.cloneByDomain(domain, context);-};--/**- * Currently this is used to demo the builder from landing page without- * having to sign up.- *- * 1. Set cookie with a random user id if not already set- * 2. Clone the project by domain if user doesn't have any projects yet- * 3. Redirect user to the builder with the cloned project- */-export const loader = async ({ request, params }: LoaderArgs) => {- if (params.domain === undefined) {- return { errors: "Domain required" };- }-- const user = await findAuthenticatedUser(request);-- if (user === null) {- const url = new URL(request.url);- return redirect(- loginPath({- returnTo: url.pathname,- })- );- }-- const context = await createContext(request);-- try {- const project = await ensureProject(- {- domain: params.domain,- },- context- );-- return redirect(builderPath({ projectId: project.id }));- } catch (error) {- if (error instanceof Error) {- return { errors: error.message };- }- }- return { errors: "Unexpected error" };-};diff --git a/apps/builder/app/shared/context.server.ts b/apps/builder/app/shared/context.server.tsindex 59800437a5..ccf25b2f61 100644--- a/apps/builder/app/shared/context.server.ts+++ b/apps/builder/app/shared/context.server.ts@@ -24,15 +24,21 @@ const createAuthorizationContext = async (};const createDomainContext = (request: Request) => {- const url = new URL(request.url);-const context: AppContext["domain"] = {domainTrpc: trpcClient.domain,- domainEnv: {- BRANCH_NAME: env.BRANCH_NAME ?? "main",- PUBLISHER_TOKEN: env.PUBLISHER_TOKEN ?? "",- PUBLISHER_ENDPOINT: env.PUBLISHER_ENDPOINT,+ };++ return context;+};++const createDeploymentContext = (request: Request) => {+ const url = new URL(request.url);++ const context: AppContext["deployment"] = {+ deploymentTrpc: trpcClient.deployment,+ env: {BUILDER_ORIGIN: url.origin,+ BRANCH_NAME: env.BRANCH_NAME ?? "main",},};@@ -47,10 +53,12 @@ export const createContext = async (buildEnv: AppContext["authorization"]["buildEnv"] = "dev"): Promise<AppContext> => {const authorization = await createAuthorizationContext(request, buildEnv);- const domain = await createDomainContext(request);+ const domain = createDomainContext(request);+ const deployment = createDeploymentContext(request);return {authorization,domain,+ deployment,};};diff --git a/apps/builder/app/shared/db/canvas.server.ts b/apps/builder/app/shared/db/canvas.server.tsindex c675ad4508..e1ee794a44 100644--- a/apps/builder/app/shared/db/canvas.server.ts+++ b/apps/builder/app/shared/db/canvas.server.ts@@ -1,34 +1,33 @@-import type { Project } from "@webstudio-is/project";import type { Data } from "@webstudio-is/react-sdk";-import { loadBuildByProjectId } from "@webstudio-is/project-build/index.server";-import { db as projectDb } from "@webstudio-is/project/index.server";+import { loadBuildById } from "@webstudio-is/project-build/index.server";import { loadAssetsByProject } from "@webstudio-is/asset-uploader/index.server";import type { AppContext } from "@webstudio-is/trpc-interface/index.server";import { findPageByIdOrPath } from "@webstudio-is/project-build";+import type { Build } from "@webstudio-is/prisma-client";export const loadProductionCanvasData = async (- props: {- projectId: Project["id"];- },+ buildId: Build["id"],context: AppContext): Promise<Data> => {- const project = await projectDb.project.loadByParams(- { projectId: props.projectId },- context- );- if (project === null) {- throw new Error("Project not found");+ const build = await loadBuildById(buildId);++ if (build === undefined) {+ throw new Error("The project is not published");+ }++ const page = findPageByIdOrPath(build.pages, "/");++ if (page === undefined) {+ throw new Error(`Page / not found`);}- const canvasData = await loadCanvasData(- {- project,- env: "prod",- // For the production build, we don't care which page will be in the CanvasData.page property- // Use the default page, since it always exists- pageIdOrPath: "/",- },- context- );++ const allAssets = await loadAssetsByProject(build.projectId, context);++ const canvasData = {+ build,+ page,+ pages: [build.pages.homePage, ...build.pages.pages],+ };const styles = canvasData.build?.styles ?? [];@@ -43,7 +42,7 @@ export const loadProductionCanvasData = async (}// Filter unused font assets- const assets = canvasData.assets.filter(+ const assets = allAssets.filter((asset) =>asset.type === "image" ||(asset.type === "font" && fontFamilySet.has(asset.meta.family))@@ -54,36 +53,3 @@ export const loadProductionCanvasData = async (assets,};};--const loadCanvasData = async (- props: {- project: Project;- env: "dev" | "prod";- pageIdOrPath: string;- },- context: AppContext-): Promise<Data> => {- const build =- props.env === "dev"- ? await loadBuildByProjectId(props.project.id, "dev")- : await loadBuildByProjectId(props.project.id, "prod");-- if (build === undefined) {- throw new Error("The project is not published");- }-- const page = findPageByIdOrPath(build.pages, props.pageIdOrPath);-- if (page === undefined) {- throw new Error(`Page ${props.pageIdOrPath} not found`);- }-- const assets = await loadAssetsByProject(props.project.id, context);-- return {- build,- page,- pages: [build.pages.homePage, ...build.pages.pages],- assets,- };-};diff --git a/packages/domain/src/trpc/domain.ts b/packages/domain/src/trpc/domain.tsindex 9e2795ed1f..60a24c6328 100644--- a/packages/domain/src/trpc/domain.ts+++ b/packages/domain/src/trpc/domain.ts@@ -28,50 +28,31 @@ export const domainRouter = router({.input(z.object({ projectId: z.string() })).mutation(async ({ input, ctx }) => {try {- await createProductionBuild(+ const build = await createProductionBuild({projectId: input.projectId,+ deployment: {+ domains: [],+ },},ctx);const project = await projectDb.project.loadById(input.projectId, ctx);- const { domainEnv } = ctx.domain;+ const { deploymentTrpc, env } = ctx.deployment;- const headers = new Headers();-- headers.append("X-AUTH-WEBSTUDIO", domainEnv.PUBLISHER_TOKEN || "");- headers.append("Content-Type", "text/plain");-- const url = new URL(domainEnv.BUILDER_ORIGIN);- if (domainEnv.PUBLISHER_ENDPOINT === undefined) {- return {- success: false,- error: "PUBLISHER_ENDPOINT is not defined",- };- }-- const response = await fetch(domainEnv.PUBLISHER_ENDPOINT, {- method: "PUT",- headers,- body: JSON.stringify({- builderApiOrigin: url.origin,- projectId: input.projectId,- // @todo: useless and must be provided by the rest/project endpoint- projectName: project.domain,- // To support preview deployments- // @todo: useless and must be provided by the rest/project endpoint- branchName: domainEnv.BRANCH_NAME,- }),+ const result = deploymentTrpc.publish.mutate({+ // used to load build data from the builder see routes/rest.build.$buildId.ts+ builderApiOrigin: env.BUILDER_ORIGIN,+ buildId: build.id,+ // preview support+ branchName: env.BRANCH_NAME,+ // action log helper (not used for deployment, but for action logs readablity)+ projectDomainName: project.domain,});- const text = await response.text();- if (response.ok === false) {- throw new Error(text);- }-- return { success: true } as const;+ return result;} catch (error) {return {success: false,diff --git a/packages/prisma-client/prisma/migrations/20230530132921_deployment/migration.sql b/packages/prisma-client/prisma/migrations/20230530132921_deployment/migration.sqlnew file mode 100644index 0000000000..9820f1c7d4--- /dev/null+++ b/packages/prisma-client/prisma/migrations/20230530132921_deployment/migration.sql@@ -0,0 +1,37 @@+-- Drop DashboardProject View+DROP VIEW IF EXISTS "DashboardProject";++-- AlterTable++ALTER TABLE "Build"+ ADD COLUMN "deployment" TEXT;++UPDATE "Build"+ SET "deployment" = '{"domains":[]}'+ WHERE "isDev" = false;+++ALTER TABLE "Build"+ DROP COLUMN "isDev",+ DROP COLUMN "isProd";++-- CreateIndexes+CREATE UNIQUE INDEX "Build_id_key" ON "Build"("id");+-- Ensure that only single "dev" build per project exists+CREATE UNIQUE INDEX "Build_dev_index" ON "Build" ("projectId") WHERE "deployment" IS NULL;++-- Update DashboardProject View+CREATE VIEW "DashboardProject" AS+SELECT+ *,+ EXISTS (+ SELECT+ 1+ from+ "Build"+ WHERE+ "Build"."projectId" = "Project".id+ AND "Build"."deployment" IS NOT NULL+ ) AS "isPublished"+FROM+ "Project";\ No newline at end of filediff --git a/packages/prisma-client/prisma/schema.prisma b/packages/prisma-client/prisma/schema.prismaindex 546e05f7d5..7a079074e7 100644--- a/packages/prisma-client/prisma/schema.prisma+++ b/packages/prisma-client/prisma/schema.prisma@@ -41,9 +41,9 @@ model File {}model Asset {- id String @default(uuid()) // not unique!+ id String @default(uuid()) // not unique!projectId String- file File @relation(fields: [name], references: [name])+ file File @relation(fields: [name], references: [name])name String@@id([id, projectId])@@ -78,7 +78,7 @@ model Project {}model Build {- id String @default(uuid())+ id String @unique @default(uuid())version Int @default(0)createdAt DateTime @default(now())updatedAt DateTime @default(now()) @updatedAt@@ -87,9 +87,6 @@ model Build {project Project @relation(fields: [projectId], references: [id])projectId String- 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("[]")@@ -97,6 +94,8 @@ model Build {props String @default("[]")instances String @default("[]")+ deployment String?+@@id([id, projectId])}diff --git a/packages/project-build/src/db/build.ts b/packages/project-build/src/db/build.tsindex 2fd100867a..d985cd85b7 100644--- a/packages/project-build/src/db/build.ts+++ b/packages/project-build/src/db/build.ts@@ -26,6 +26,8 @@ import {} from "./style-source-selections";import { parseProps, serializeProps } from "./props";import { parseInstances, serializeInstances } from "./instances";+import { parseDeployment, serializeDeployment } from "./deployment";+import type { Deployment } from "../schema/deployment";const parseBuild = async (build: DbBuild): Promise<Build> => {// Hardcode skipValidation to true for now@@ -52,12 +54,12 @@ const parseBuild = async (build: DbBuild): Promise<Build> => {parseInstances(build.instances, skipValidation));+ const deployment = parseDeployment(build.deployment, skipValidation);+return {id: build.id,projectId: build.projectId,version: build.version,- isDev: build.isDev,- isProd: build.isProd,createdAt: build.createdAt.toISOString(),pages,breakpoints,@@ -66,6 +68,7 @@ const parseBuild = async (build: DbBuild): Promise<Build> => {styleSourceSelections,props,instances,+ deployment,};} finally {// eslint-disable-next-line no-console@@ -73,41 +76,33 @@ const parseBuild = async (build: DbBuild): Promise<Build> => {}};-export async function loadBuildByProjectId(- projectId: Build["projectId"],- env: "dev"-): Promise<Build>;-export async function loadBuildByProjectId(- projectId: Build["projectId"],- env: "prod"-): Promise<Build | undefined>;-// eslint-disable-next-line func-style-export async function loadBuildByProjectId(- projectId: Build["projectId"],- env: "prod" | "dev"-): Promise<Build | undefined> {- if (env === "dev") {- const build = await prisma.build.findFirst({- where: { projectId, isDev: true },- });-- if (build === null) {- throw new Error("Dev build not found");- }-- return parseBuild(build);+export const loadBuildById = async (+ id: Build["id"]+): Promise<Build | undefined> => {+ const build = await prisma.build.findUnique({+ where: { id },+ });++ if (build === null) {+ return;}+ return parseBuild(build);+};++export const loadBuildByProjectId = async (+ projectId: Build["projectId"]+): Promise<Build> => {const build = await prisma.build.findFirst({- where: { projectId, isProd: true },+ where: { projectId, deployment: null },});if (build === null) {- return;+ throw new Error("Dev build not found");}return parseBuild(build);-}+};const createNewPageInstances = (): Build["instances"] => {const instanceId = nanoid();@@ -130,100 +125,89 @@ const createNewPageInstances = (): Build["instances"] => {* 2. when we clone a project* We create "prod" build when we publish a dev build.*/-export async function createBuild(- props: {- projectId: Build["projectId"];- env: "prod";- sourceBuild: Build | undefined;- },- context: AppContext,- client: Prisma.TransactionClient-): Promise<void>;-export async function createBuild(+export const createBuild = async (props: {projectId: Build["projectId"];- env: "dev";- sourceBuild: Build | undefined;- },- context: AppContext,- client: Prisma.TransactionClient-): Promise<void>;-// eslint-disable-next-line func-style-export async function createBuild(- props: {- projectId: Build["projectId"];- env: "dev" | "prod";- sourceBuild: Build | undefined;},_context: AppContext,client: Prisma.TransactionClient-): Promise<void> {- if (props.env === "dev") {- const count = await client.build.count({- where: { projectId: props.projectId, isDev: true },- });-- if (count > 0) {- throw new Error("Dev build already exists");- }- }+): Promise<void> => {+ const count = await client.build.count({+ where: { projectId: props.projectId, deployment: null },+ });- if (props.env === "prod" && props.sourceBuild === undefined) {- throw new Error("Source build required for production build");+ if (count > 0) {+ throw new Error("Dev build already exists");}- if (props.env === "prod") {- await client.build.updateMany({- where: { projectId: props.projectId, isProd: true },- data: { isProd: false },- });- }+ const newInstances = createNewPageInstances();+ const [rootInstanceId] = newInstances[0];++ const newPages = Pages.parse({+ homePage: {+ id: nanoid(),+ name: "Home",+ path: "",+ title: "Home",+ meta: {},+ rootInstanceId,+ },+ pages: [],+ } satisfies Pages);- 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(newPages),- breakpoints: serializeBreakpoints(- new Map(props.sourceBuild?.breakpoints ?? createInitialBreakpoints())- ),- styles: serializeStyles(new Map(props.sourceBuild?.styles)),- styleSources: serializeStyleSources(- new Map(props.sourceBuild?.styleSources)- ),- styleSourceSelections: serializeStyleSourceSelections(- new Map(props.sourceBuild?.styleSourceSelections)- ),- props: serializeProps(new Map(props.sourceBuild?.props)),+ breakpoints: serializeBreakpoints(new Map(createInitialBreakpoints())),+ styles: serializeStyles(new Map()),+ styleSources: serializeStyleSources(new Map()),+ styleSourceSelections: serializeStyleSourceSelections(new Map()),+ props: serializeProps(new Map()),instances: serializeInstances(new Map(newInstances)),- isDev: props.env === "dev",- isProd: props.env === "prod",},});-}+};++export const cloneBuild = async (+ props: {+ projectId: Build["projectId"];+ deployment: Deployment | undefined;+ },+ _context: AppContext,+ client: Prisma.TransactionClient+) => {+ const build = await prisma.build.findFirst({+ where: { projectId: props.projectId, deployment: null },+ });++ if (build === null) {+ throw new Error("Dev build not found");+ }++ const data = {+ ...build,+ id: undefined,+ deployment: props.deployment+ ? serializeDeployment(props.deployment)+ : undefined,+ projectId: props.projectId,+ };++ const result = await client.build.create({+ data,+ select: {+ id: true,+ },+ });++ return result;+};export const createProductionBuild = async (props: {projectId: Build["projectId"];+ deployment: Deployment;},context: AppContext) => {@@ -236,13 +220,9 @@ export const createProductionBuild = async (throw new AuthorizationError("You don't have access to build this project");}- // @todo: This is highly unoptimal and on a big project would take few seconds of CPU time.- // we need just duplicate row from dev build and change isDev to false and isProd to true- const devBuild = await loadBuildByProjectId(props.projectId, "dev");-- await prisma.$transaction(async (client) => {- await createBuild(- { projectId: props.projectId, env: "prod", sourceBuild: devBuild },+ return await prisma.$transaction(async (client) => {+ return await cloneBuild(+ { projectId: props.projectId, deployment: props.deployment },context,client);diff --git a/packages/project-build/src/db/deployment.ts b/packages/project-build/src/db/deployment.tsnew file mode 100644index 0000000000..78ae3b6fee--- /dev/null+++ b/packages/project-build/src/db/deployment.ts@@ -0,0 +1,18 @@+import { Deployment } from "../schema/deployment";++export const parseDeployment = (+ deployment: string | null,+ skipValidation = false+) => {+ if (deployment === null) {+ return;+ }++ return skipValidation+ ? (JSON.parse(deployment) as Deployment)+ : Deployment.parse(JSON.parse(deployment));+};++export const serializeDeployment = (deployment: Deployment) => {+ return JSON.stringify(deployment);+};diff --git a/packages/project-build/src/schema/deployment.ts b/packages/project-build/src/schema/deployment.tsnew file mode 100644index 0000000000..5c6076bd49--- /dev/null+++ b/packages/project-build/src/schema/deployment.ts@@ -0,0 +1,7 @@+import { z } from "zod";++export const Deployment = z.object({+ domains: z.array(z.string()),+});++export type Deployment = z.infer<typeof Deployment>;diff --git a/packages/project-build/src/types.ts b/packages/project-build/src/types.tsindex 48c539cae2..564c7ff82d 100644--- a/packages/project-build/src/types.ts+++ b/packages/project-build/src/types.ts@@ -5,14 +5,13 @@ import type { StyleSource } from "./schema/style-sources";import type { Instance } from "./schema/instances";import type { Prop } from "./schema/props";import type { StyleSourceSelection } from "./schema/style-source-selections";+import type { Deployment } from "./schema/deployment";export type Build = {id: string;projectId: string;version: number;createdAt: string;- isDev: boolean;- isProd: boolean;pages: Pages;breakpoints: [Breakpoint["id"], Breakpoint][];styles: [StyleDeclKey, StyleDecl][];@@ -20,4 +19,5 @@ export type Build = {styleSourceSelections: [Instance["id"], StyleSourceSelection][];props: [Prop["id"], Prop][];instances: [Instance["id"], Instance][];+ deployment?: Deployment | undefined;};diff --git a/packages/project/src/db/project.ts b/packages/project/src/db/project.tsindex e85993441e..46ee7e0b3f 100644--- a/packages/project/src/db/project.ts+++ b/packages/project/src/db/project.ts@@ -8,20 +8,11 @@ import {} from "@webstudio-is/trpc-interface/index.server";import {createBuild,- loadBuildByProjectId,+ cloneBuild,} from "@webstudio-is/project-build/index.server";import { Project, Title } from "../shared/schema";import { generateDomain, validateProjectDomain } from "./project-domain";-export const loadByParams = async (- params: { projectId: string } | { projectDomain: string },- context: AppContext-) => {- return "projectId" in params- ? await loadById(params.projectId, context)- : await loadByDomain(params.projectDomain, context);-};-export const loadById = async (projectId: Project["id"],context: AppContext@@ -42,31 +33,6 @@ export const loadById = async (return Project.parse(data);};-export const loadByDomain = async (- domain: string,- context: AppContext-): Promise<Project | null> => {- // The authorization system needs the project id to check if the user has access to the project- const projectWithId = await prisma.project.findUnique({- where: {- domain_isDeleted: { domain: domain.toLowerCase(), isDeleted: false },- },- });-- if (projectWithId === null) {- return null;- }-- // Edge case for webstudiois project- if (projectWithId.domain === "webstudiois") {- // Hardcode for now that everyone can duplicate webstudiois project- return Project.parse(projectWithId);- }-- // Otherwise, check if the user has access to the project- return await loadById(projectWithId.id, context);-};-export const create = async ({ title }: { title: string },context: AppContext@@ -92,11 +58,7 @@ export const create = async (},});- await createBuild(- { projectId: project.id, env: "dev", sourceBuild: undefined },- context,- client- );+ await createBuild({ projectId: project.id }, context, client);return project;});@@ -170,11 +132,6 @@ const clone = async (throw new Error("The user must be authenticated to clone the project");}- const build =- env === "dev"- ? await loadBuildByProjectId(project.id, "dev")- : await loadBuildByProjectId(project.id, "prod");-const newProjectId = uuid();await authorizeProject.registerProjectOwner({ projectId: newProjectId },@@ -191,8 +148,8 @@ const clone = async (},});- await createBuild(- { projectId: newProjectId, env: "dev", sourceBuild: build },+ await cloneBuild(+ { projectId: newProjectId, deployment: undefined },context,client);@@ -229,16 +186,6 @@ export const duplicate = async (projectId: string, context: AppContext) => {);};-export const cloneByDomain = async (domain: string, context: AppContext) => {- const project = await loadByDomain(domain, context);-- if (project === null) {- throw new Error(`Not found project "${domain}"`);- }-- return await clone({ project, env: "prod" }, context);-};-export const updateDomain = async (input: {id: string;diff --git a/packages/trpc-interface/src/context/context.server.ts b/packages/trpc-interface/src/context/context.server.tsindex 345c7f5337..101f2c809c 100644--- a/packages/trpc-interface/src/context/context.server.ts+++ b/packages/trpc-interface/src/context/context.server.ts@@ -25,12 +25,13 @@ type AuthorizationContext = {type DomainContext = {domainTrpc: TrpcInterfaceClient["domain"];- domainEnv: {- PUBLISHER_TOKEN: string;- PUBLISHER_ENDPOINT?: string;+};++type DeploymentContext = {+ deploymentTrpc: TrpcInterfaceClient["deployment"];+ env: {BUILDER_ORIGIN: string;- // @todo remove and get from the /rest/project endpoint- BRANCH_NAME?: string;+ BRANCH_NAME: string;};};@@ -42,4 +43,5 @@ type DomainContext = {export type AppContext = {authorization: AuthorizationContext;domain: DomainContext;+ deployment: DeploymentContext;};diff --git a/packages/trpc-interface/src/shared/deployment.ts b/packages/trpc-interface/src/shared/deployment.tsnew file mode 100644index 0000000000..f951b123b3--- /dev/null+++ b/packages/trpc-interface/src/shared/deployment.ts@@ -0,0 +1,35 @@+import { z } from "zod";+import { router, procedure } from "./trpc";++const PublishInput = z.object({+ // used to load build data from the builder see routes/rest.build.$buildId.ts+ buildId: z.string(),+ builderApiOrigin: z.string(),+ // preview support+ branchName: z.string(),+ // action log helper (not used for deployment, but for action logs readablity)+ projectDomainName: z.string(),+});++const Output = z.discriminatedUnion("success", [+ z.object({+ success: z.literal(true),+ }),+ z.object({+ success: z.literal(false),+ error: z.string(),+ }),+]);++/**+ * This is the ContentManagementService. It is currently used to publish content to a custom domain.+ * In the future, additional methods, such as a 'preview' function, could be added.+ **/+export const deploymentRouter = router({+ publish: procedure+ .input(PublishInput)+ .output(Output)+ .mutation(async ({ input, ctx }) => {+ return { success: false, error: "Not implemented" };+ }),+});diff --git a/packages/trpc-interface/src/shared/shared-router.ts b/packages/trpc-interface/src/shared/shared-router.tsindex 8ec8a5d886..c935624056 100644--- a/packages/trpc-interface/src/shared/shared-router.ts+++ b/packages/trpc-interface/src/shared/shared-router.ts@@ -2,10 +2,12 @@ import type { createTRPCProxyClient } from "@trpc/client";import { router } from "./trpc";import { authorizationRouter } from "./authorization-router";import { domainRouter } from "./domain";+import { deploymentRouter } from "./deployment";export const sharedRouter = router({authorize: authorizationRouter,domain: domainRouter,+ deployment: deploymentRouter,});export type SharedRouter = typeof sharedRouter;