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
Optimize canvas loading (#1310)
Bogdan Chadkin3edd4ea3ccc5
diff --git a/apps/builder/app/builder/builder.tsx b/apps/builder/app/builder/builder.tsxindex a9739a5b61..d3825fb8d8 100644--- a/apps/builder/app/builder/builder.tsx+++ b/apps/builder/app/builder/builder.tsx@@ -242,7 +242,6 @@ export type BuilderProps = {build: Build;assets: Asset[];buildOrigin: string;- authReadToken: string;authToken?: string;authPermit: AuthPermit;};@@ -252,7 +251,6 @@ export const Builder = ({build,assets,buildOrigin,- authReadToken,authToken,authPermit,}: BuilderProps) => {@@ -315,8 +313,6 @@ export const Builder = ({const canvasUrl = getBuildUrl({buildOrigin,project,- page: build.pages.homePage,- authReadToken,});return (diff --git a/apps/builder/app/canvas/canvas.tsx b/apps/builder/app/canvas/canvas.tsxindex 2a028ffde1..19bc4bbcbf 100644--- a/apps/builder/app/canvas/canvas.tsx+++ b/apps/builder/app/canvas/canvas.tsx@@ -101,16 +101,16 @@ const DesignMode = () => {};type CanvasProps = {- data: CanvasData;+ params: CanvasData["params"];getComponent: GetComponent;};export const Canvas = ({- data,+ params,getComponent,}: CanvasProps): JSX.Element | null => {const isBuilderReady = useSubscribeBuilderReady();- setParams(data.params ?? null);+ setParams(params ?? null);useCanvasStore(publish);const [isPreviewMode] = useIsPreviewMode();diff --git a/apps/builder/app/canvas/shared/styles.ts b/apps/builder/app/canvas/shared/styles.tsindex 27413de577..019f47ccc4 100644--- a/apps/builder/app/canvas/shared/styles.ts+++ b/apps/builder/app/canvas/shared/styles.ts@@ -107,7 +107,6 @@ const subscribePreviewMode = () => {export const useManageDesignModeStyles = () => {useUpdateStyle();usePreviewStyle();- useRemoveSsrStyles();useEffect(subscribePreviewMode, []);};@@ -307,12 +306,3 @@ const usePreviewStyle = () => {cssEngine.render();});};--// Once we rendered the tree in editing mode, we have rendered all styles in a <style> tag.-// We keep the SSR styles just for the page on canvas to show up like it does in preview.-const useRemoveSsrStyles = () => {- useEffect(() => {- const link = document.head.querySelector('[data-webstudio="ssr"]');- link?.parentElement?.removeChild(link);- }, []);-};diff --git a/apps/builder/app/routes/$.tsx b/apps/builder/app/routes/$.tsxindex d763ff6476..e8006e7fa9 100644--- a/apps/builder/app/routes/$.tsx+++ b/apps/builder/app/routes/$.tsx@@ -1,70 +1,27 @@-import { redirect, json, LoaderArgs, LinksFunction } from "@remix-run/node";-import type { MetaFunction, ErrorBoundaryComponent } from "@remix-run/node";+import { redirect } from "@remix-run/node";+import type { LoaderArgs, ErrorBoundaryComponent } from "@remix-run/node";import { useLoaderData } from "@remix-run/react";import { Root, getComponent } from "@webstudio-is/react-sdk";-import { loadCanvasData } from "~/shared/db";-import env, { type PublicEnv } from "~/env/env.public.server";+import env from "~/env/env.public.server";import { sentryException } from "~/shared/sentry";import { Canvas } from "~/canvas";import { ErrorMessage } from "~/shared/error";import { getBuildParams, dashboardPath } from "~/shared/router-utils";-import { db } from "@webstudio-is/project/server";import type { CanvasData } from "@webstudio-is/project";-import { createContext } from "~/shared/context.server";-type Data = CanvasData & { env: PublicEnv };--export const links: LinksFunction = () => {- return [- {- rel: "stylesheet",- href: `/s/css`,- "data-webstudio": "ssr",- },- ];-};--export const meta: MetaFunction = ({ data }: { data: Data }) => {- const { page } = data;- return { title: page.title, ...page.meta };-};--export const loader = async ({ request }: LoaderArgs): Promise<Data> => {+export const loader = async ({ request }: LoaderArgs) => {const buildParams = getBuildParams(request);-- const context = await createContext(request, "dev");-if (buildParams === undefined) {throw redirect(dashboardPath());}- const project = await db.project.loadByParams(buildParams, context);-- if (project === null) {- throw json("Project not found", { status: 404 });- }-const params: CanvasData["params"] = {};if (env.RESIZE_ORIGIN != null) {params.resizeOrigin = env.RESIZE_ORIGIN;}- const canvasData = await loadCanvasData(- {- project,- env: "dev",- pageIdOrPath:- "pageId" in buildParams ? buildParams.pageId : buildParams.pagePath,- },- context- );-- if (canvasData === undefined) {- throw json("Page not found", { status: 404 });- }-- return { ...canvasData, env, params };+ return { params };};export const ErrorBoundary: ErrorBoundaryComponent = ({ error }) => {@@ -74,10 +31,15 @@ export const ErrorBoundary: ErrorBoundaryComponent = ({ error }) => {};const Outlet = () => {- const data = useLoaderData<Data>();- return <Canvas data={data} getComponent={getComponent} />;+ const { params } = useLoaderData<typeof loader>();+ return <Canvas params={params} getComponent={getComponent} />;};+/**+ * @todo add support for published site on localhost+ * consider switching current route to something like /canvas+ */+const Content = () => {// @todo This is non-standard for Remix, is there a better way?// Maybe there is a way to tell remix to use the right outlet somehow and avoid passing it?diff --git a/apps/builder/app/routes/builder/$projectId.tsx b/apps/builder/app/routes/builder/$projectId.tsxindex 11f5a5fb08..c02a2ff1d8 100644--- a/apps/builder/app/routes/builder/$projectId.tsx+++ b/apps/builder/app/routes/builder/$projectId.tsx@@ -4,7 +4,7 @@ import type { ErrorBoundaryComponent, LoaderArgs } from "@remix-run/node";import { loadBuildByProjectId } from "@webstudio-is/project-build/server";import { db } from "@webstudio-is/project/server";import { authorizeProject } from "@webstudio-is/trpc-interface/server";-import { createContext, createAuthReadToken } from "~/shared/context.server";+import { createContext } from "~/shared/context.server";import { ErrorMessage } from "~/shared/error";import { sentryException } from "~/shared/sentry";import { getBuildOrigin } from "~/shared/router-utils";@@ -25,6 +25,7 @@ export const loader = async ({const url = new URL(request.url);+ const start = Date.now();const project = await db.project.loadById(params.projectId, context);const authPermit =@@ -45,7 +46,14 @@ export const loader = async ({const devBuild = await loadBuildByProjectId(project.id, "dev");const assets = await loadByProject(project.id, context);- const authReadToken = await createAuthReadToken({ projectId: project.id });+ const end = Date.now();++ const diff = end - start;++ // we need to log timings to figure out how to speed up loading+ // eslint-disable-next-line no-console+ console.log(`Project ${project.id} is loaded in ${diff}ms`);+const authToken = url.searchParams.get("authToken") ?? undefined;return {@@ -53,7 +61,6 @@ export const loader = async ({build: devBuild,assets,buildOrigin: getBuildOrigin(request),- authReadToken,authToken,authPermit,};diff --git a/apps/builder/app/routes/index.tsx b/apps/builder/app/routes/index.tsxindex c8ca97fa39..6f8291ab67 100644--- a/apps/builder/app/routes/index.tsx+++ b/apps/builder/app/routes/index.tsx@@ -3,23 +3,15 @@// see https://github.com/remix-run/remix/issues/2098#issuecomment-1049262218 .// To solve this, we're re-exporting the $.tsx route API in index.tsx-import type {- ErrorBoundaryComponent,- LoaderArgs,- MetaFunction,-} from "@remix-run/node";+import type { ErrorBoundaryComponent, LoaderArgs } from "@remix-run/node";import CatchAllContnet, {loader as catchAllloader,- meta as catchAllmeta,ErrorBoundary as CatchAllErrorBoundary,- links as catchAllLinks,} from "./$";// We're wrapping functions in order for them to be distinct from the ones in $.tsx.// If they are the same, Remix may get confused, and don't load data on page transitions.-export const links = catchAllLinks;-export const meta: MetaFunction = (args) => catchAllmeta(args);export const loader = (args: LoaderArgs) => catchAllloader(args);export const ErrorBoundary: ErrorBoundaryComponent = ({ error }) => (<CatchAllErrorBoundary error={error} />diff --git a/apps/builder/app/shared/context.server.ts b/apps/builder/app/shared/context.server.tsindex 49180ae7fe..5f3125b661 100644--- a/apps/builder/app/shared/context.server.ts+++ b/apps/builder/app/shared/context.server.ts@@ -1,15 +1,6 @@import type { AppContext } from "@webstudio-is/trpc-interface/server";-import { z } from "zod";-import * as cryptoJson from "./crypto/crypto-json.server";import { authenticator } from "~/services/auth.server";import { trpcClient } from "~/services/trpc.server";-import env from "~/env/env.server";--const AuthReadToken = z.object({- projectId: z.string(),-});--type AuthReadToken = z.infer<typeof AuthReadToken>;const createAuthorizationContext = async (request: Request,@@ -26,22 +17,12 @@ const createAuthorizationContext = async (}}- const authReadTokenRaw = url.searchParams.get("authReadToken") ?? undefined;const authToken = url.searchParams.get("authToken") ?? url.hostname;const user = await authenticator.isAuthenticated(request);- let authReadToken: AuthReadToken | undefined;-- if (authReadTokenRaw !== undefined) {- authReadToken = AuthReadToken.parse(- await cryptoJson.decode(authReadTokenRaw, env.AUTH_SECRET ?? "NO-SECRET")- );- }-const context: AppContext["authorization"] = {userId: user?.id,- authReadToken,authToken,buildEnv,authorizeTrpc: trpcClient.authorize,@@ -50,10 +31,6 @@ const createAuthorizationContext = async (return context;};-export const createAuthReadToken = async (tokenData: AuthReadToken) => {- return cryptoJson.encode(tokenData, env.AUTH_SECRET ?? "NO-SECRET");-};-/*** argument buildEnv==="prod" only if we are loading project with production build*/diff --git a/apps/builder/app/shared/router-utils/path-utils.ts b/apps/builder/app/shared/router-utils/path-utils.tsindex 914146b925..66262b138c 100644--- a/apps/builder/app/shared/router-utils/path-utils.ts+++ b/apps/builder/app/shared/router-utils/path-utils.ts@@ -1,5 +1,4 @@import type { AUTH_PROVIDERS } from "~/shared/session";-import type { Page } from "@webstudio-is/project-build";import type { Project } from "@webstudio-is/project";import type { ThemeSetting } from "~/shared/theme";import env from "~/shared/env";@@ -116,20 +115,11 @@ export const restPublishPath = () => "/rest/publish";export const getBuildUrl = ({buildOrigin,project,- page,- // Hidden token for canvas (should not be visible in browser URL)- authReadToken,- // Token to share project- authToken,}: {buildOrigin: string;project: Project;- page: Page;- authReadToken?: string;- authToken?: string;}) => {const url = new URL(buildOrigin);- url.pathname = page.path;if (env.BUILD_REQUIRE_SUBDOMAIN) {url.host = `${project.domain}.${url.host}`;@@ -137,14 +127,6 @@ export const getBuildUrl = ({url.searchParams.set("projectId", project.id);- if (authReadToken) {- url.searchParams.set("authReadToken", authReadToken);- }-- if (authToken) {- url.searchParams.set("authToken", authToken);- }-return url.toString();};diff --git a/packages/trpc-interface/src/authorize/project.server.ts b/packages/trpc-interface/src/authorize/project.server.tsindex 27af180152..85b86fd8cc 100644--- a/packages/trpc-interface/src/authorize/project.server.ts+++ b/packages/trpc-interface/src/authorize/project.server.ts@@ -59,15 +59,6 @@ export const hasProjectPermit = async (return true;}- // Edge-case to allow access the project on the canvas- if (- props.permit === "view" &&- authorization.authReadToken !== undefined &&- authorization.authReadToken.projectId === props.projectId- ) {- return true;- }-// Check if the user is allowed to access the projectif (authorization.userId !== undefined) {checks.push(diff --git a/packages/trpc-interface/src/context/context.server.ts b/packages/trpc-interface/src/context/context.server.tsindex ac70fe98e3..fcc0d9b3c7 100644--- a/packages/trpc-interface/src/context/context.server.ts+++ b/packages/trpc-interface/src/context/context.server.ts@@ -4,13 +4,6 @@ import type { TrpcInterfaceClient } from "../shared/shared-router";* All necessary parameters for Authorization*/type AuthorizationContext = {- /**- * Canvas generally resides on a different domain,- * and we can't bridge a session with it because "Safari won't let us just do it.- * So we generate an encrypted token allowing read access to the project inside the canvas.- */- authReadToken: { projectId: string } | undefined;-/*** userId of the current authenticated user*/