Skip to content

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.

Fix publish (#1151)

Ivan Starkov42cbd5eabc0c
diff --git a/apps/builder/app/routes/$.tsx b/apps/builder/app/routes/$.tsx
index 29ccf3575c..f2a33dc344 100644
--- a/apps/builder/app/routes/$.tsx
+++ b/apps/builder/app/routes/$.tsx
@@ -92,17 +92,15 @@ export const loader = async ({ request }: LoaderArgs): Promise<Data> => {
const pagePath = buildParams.pagePath === "/" ? "" : buildParams.pagePath;
- const canvasData = pagesCanvasData.find(
- (data) => data.page.path === pagePath
- );
+ const page = pagesCanvasData.pages.find((page) => page.path === pagePath);
- if (canvasData === undefined) {
+ if (page === undefined) {
throw json("Page not found", {
status: 404,
});
}
- return { ...canvasData, env, mode, params };
+ return { ...pagesCanvasData, page, env, mode, params };
};
export const ErrorBoundary: ErrorBoundaryComponent = ({ error }) => {
diff --git a/apps/builder/app/routes/rest/project.$projectId.tsx b/apps/builder/app/routes/rest/project.$projectId.tsx
index fb2ff75487..272b1d0ae7 100644
--- a/apps/builder/app/routes/rest/project.$projectId.tsx
+++ b/apps/builder/app/routes/rest/project.$projectId.tsx
@@ -4,12 +4,10 @@ import { loadProductionCanvasData } from "~/shared/db";
import type { CanvasData } from "@webstudio-is/project";
import { createContext } from "~/shared/context.server";
-type PagesDetails = Array<CanvasData>;
-
export const loader = async ({
params,
request,
-}: LoaderArgs): Promise<PagesDetails> => {
+}: LoaderArgs): Promise<CanvasData> => {
try {
const projectId = params.projectId ?? undefined;
diff --git a/apps/builder/app/routes/s/css.ts b/apps/builder/app/routes/s/css.ts
index b80d2b5c81..cdcc7ee39d 100644
--- a/apps/builder/app/routes/s/css.ts
+++ b/apps/builder/app/routes/s/css.ts
@@ -75,17 +75,11 @@ export const loader = async ({ request }: ActionArgs) => {
context
);
- if (pagesCanvasData.length === 0) {
- throw json("Project not found or not published yet", { status: 404 });
- }
-
- const canvasData = pagesCanvasData[0];
-
const cssText = generateCssText({
- assets: canvasData.assets,
- breakpoints: canvasData.build?.breakpoints,
- styles: canvasData.build?.styles,
- styleSourceSelections: canvasData.build?.styleSourceSelections,
+ assets: pagesCanvasData.assets,
+ breakpoints: pagesCanvasData.build?.breakpoints,
+ styles: pagesCanvasData.build?.styles,
+ styleSourceSelections: pagesCanvasData.build?.styleSourceSelections,
});
return new Response(cssText, {
diff --git a/apps/builder/app/shared/db/canvas.server.ts b/apps/builder/app/shared/db/canvas.server.ts
index 7fcd6539e7..1fc79da1dc 100644
--- a/apps/builder/app/shared/db/canvas.server.ts
+++ b/apps/builder/app/shared/db/canvas.server.ts
@@ -10,18 +10,7 @@ export const loadProductionCanvasData = async (
projectId: Project["id"];
},
context: AppContext
-): Promise<CanvasData[]> => {
- const pagesCanvasData: CanvasData[] = [];
-
- const prodBuild = await loadBuildByProjectId(props.projectId, "prod");
- if (prodBuild === undefined) {
- throw new Error(
- `Project ${props.projectId} not found or not published yet. Please contact us to get help.`
- );
- }
- const {
- pages: { homePage, pages: otherPages },
- } = prodBuild;
+): Promise<CanvasData> => {
const project = await projectDb.project.loadByParams(
{ projectId: props.projectId },
context
@@ -33,7 +22,9 @@ export const loadProductionCanvasData = async (
{
project,
env: "prod",
- pageIdOrPath: homePage.path,
+ // 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
);
@@ -57,22 +48,10 @@ export const loadProductionCanvasData = async (
(asset.type === "font" && fontFamilySet.has(asset.meta.family))
);
- pagesCanvasData.push({ ...canvasData, assets });
-
- if (otherPages.length > 0) {
- for (const page of otherPages) {
- const canvasData = await loadCanvasData(
- { project, env: "prod", pageIdOrPath: page.path },
- context
- );
- pagesCanvasData.push({
- ...canvasData,
- assets,
- });
- }
- }
-
- return pagesCanvasData;
+ return {
+ ...canvasData,
+ assets,
+ };
};
export const loadCanvasData = async (
@@ -103,6 +82,7 @@ export const loadCanvasData = async (
return {
build,
page,
+ pages: [build.pages.homePage, ...build.pages.pages],
assets,
};
};
diff --git a/packages/project/src/shared/schema.ts b/packages/project/src/shared/schema.ts
index d9f70e350c..0954b9c1b6 100644
--- a/packages/project/src/shared/schema.ts
+++ b/packages/project/src/shared/schema.ts
@@ -23,4 +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;
+export type CanvasData = Data & { pages: Data["page"][] };