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 link behaviour in preview (#1237)
Roman Pominov4b1a6847a43f
diff --git a/apps/builder/app/builder/builder.tsx b/apps/builder/app/builder/builder.tsxindex d27b61d933..e922e3a552 100644--- a/apps/builder/app/builder/builder.tsx+++ b/apps/builder/app/builder/builder.tsx@@ -306,7 +306,6 @@ export const Builder = ({buildOrigin,project,page: build.pages.homePage,- mode: "edit",authReadToken,});diff --git a/apps/builder/app/builder/features/sidebar-left/panels/pages/pages.tsx b/apps/builder/app/builder/features/sidebar-left/panels/pages/pages.tsxindex b9b232cb5b..34f3e76de9 100644--- a/apps/builder/app/builder/features/sidebar-left/panels/pages/pages.tsx+++ b/apps/builder/app/builder/features/sidebar-left/panels/pages/pages.tsx@@ -1,6 +1,5 @@import { useCallback, useEffect, useMemo, useRef, useState } from "react";import { useStore } from "@nanostores/react";-import { useNavigate } from "@remix-run/react";import {DeprecatedIconButton,TreeItemLabel,@@ -23,16 +22,12 @@ import {import type { Page, Pages } from "@webstudio-is/project-build";import type { Publish } from "~/shared/pubsub";import { useProject } from "~/builder/shared/nano-states";-import { builderPath } from "~/shared/router-utils";import type { TabName } from "../../types";import { CloseButton, Header } from "../../header";import { SettingsPanel } from "./settings-panel";import { NewPageSettings, PageSettings } from "./settings";-import {- pagesStore,- selectedPageIdStore,- useAuthToken,-} from "~/shared/nano-states";+import { pagesStore, selectedPageIdStore } from "~/shared/nano-states";+import { useSwitchPage } from "~/shared/pages";type TabContentProps = {onSetActiveTab: (tabName: TabName) => void;@@ -234,21 +229,7 @@ const PagesPanel = ({export const TabContent = (props: TabContentProps) => {const currentPageId = useStore(selectedPageIdStore);const [project] = useProject();- const [authToken] = useAuthToken();-- const navigate = useNavigate();- const handleSelect = (pageId: "home" | Page["id"]) => {- if (project === undefined) {- return;- }- navigate(- builderPath({- projectId: project.id,- pageId: pageId === "home" ? undefined : pageId,- authToken,- })- );- };+ const switchPage = useSwitchPage();const newPageId = "new-page";const [editingPageId, setEditingPageId] = useState<string>();@@ -266,7 +247,7 @@ export const TabContent = (props: TabContentProps) => {current === newPageId ? undefined : newPageId)}- onSelect={handleSelect}+ onSelect={switchPage}selectedPageId={currentPageId}onEdit={setEditingPageId}editingPageId={editingPageId}@@ -277,7 +258,7 @@ export const TabContent = (props: TabContentProps) => {onClose={() => setEditingPageId(undefined)}onSuccess={(pageId) => {setEditingPageId(undefined);- handleSelect(pageId);+ switchPage(pageId);}}/>)}@@ -287,7 +268,7 @@ export const TabContent = (props: TabContentProps) => {onDelete={() => {setEditingPageId(undefined);if (editingPageId === currentPageId) {- handleSelect("home");+ switchPage();}}}pageId={editingPageId}diff --git a/apps/builder/app/builder/features/workspace/canvas-tools/canvas-tools.tsx b/apps/builder/app/builder/features/workspace/canvas-tools/canvas-tools.tsxindex 56a1a35179..7dd99d5179 100644--- a/apps/builder/app/builder/features/workspace/canvas-tools/canvas-tools.tsx+++ b/apps/builder/app/builder/features/workspace/canvas-tools/canvas-tools.tsx@@ -16,6 +16,7 @@ import {import { useSubscribeTextToolbar, TextToolbar } from "./text-toolbar";import { useSubscribeInstanceRect } from "./hooks/use-subscribe-instance-rect";import { useSubscribeTextEditingInstanceId } from "./hooks/use-subscribe-editing-instance-id";+import { useSubscribeSwitchPage } from "~/shared/pages";const toolsStyle = {position: "absolute",@@ -38,6 +39,7 @@ export const CanvasTools = ({ publish }: CanvasToolsProps) => {useSubscribeScrollState();useSubscribeDragAndDropState();useSubscribeTextEditingInstanceId();+ useSubscribeSwitchPage();const [isPreviewMode] = useIsPreviewMode();const [isScrolling] = useIsScrolling();diff --git a/apps/builder/app/builder/shared/nano-states/index.ts b/apps/builder/app/builder/shared/nano-states/index.tsindex 34801395e8..b765762f54 100644--- a/apps/builder/app/builder/shared/nano-states/index.ts+++ b/apps/builder/app/builder/shared/nano-states/index.ts@@ -20,7 +20,7 @@ export const useCanvasWidth = () => useValue(canvasWidthContainer);const canvasRectContainer = atom<DOMRect | undefined>();export const useCanvasRect = () => useValue(canvasRectContainer);-const projectContainer = atom<Project | undefined>();+export const projectContainer = atom<Project | undefined>();export const useProject = () => useValue(projectContainer);export type TextToolbarState = {diff --git a/apps/builder/app/canvas/canvas.tsx b/apps/builder/app/canvas/canvas.tsxindex 1eb937cbc8..b25ab02aba 100644--- a/apps/builder/app/canvas/canvas.tsx+++ b/apps/builder/app/canvas/canvas.tsx@@ -11,6 +11,7 @@ import {customComponentMetas,customComponentPropsMetas,setParams,+ customComponents,type GetComponent,} from "@webstudio-is/react-sdk";import { publish } from "~/shared/pubsub";@@ -33,7 +34,6 @@ import { usePublishScrollState } from "./shared/use-publish-scroll-state";import { useDragAndDrop } from "./shared/use-drag-drop";import { useSubscribeBuilderReady } from "./shared/use-builder-ready";import { useCopyPaste } from "~/shared/copy-paste";-import { customComponents } from "./custom-components";import { useHoveredInstanceConnector } from "./hovered-instance-connector";import { setDataCollapsed, subscribeCollapsedToPubSub } from "./collapsed";import { useWindowResizeDebounced } from "~/shared/dom-hooks";diff --git a/apps/builder/app/canvas/custom-components/index.ts b/apps/builder/app/canvas/custom-components/index.tsdeleted file mode 100644index 487f05b424..0000000000--- a/apps/builder/app/canvas/custom-components/index.ts+++ /dev/null@@ -1,9 +0,0 @@-import { customComponents as baseCustomComponents } from "@webstudio-is/react-sdk";-import { wrapLinkComponent } from "./link";--export const customComponents = {- ...baseCustomComponents,- Link: wrapLinkComponent(baseCustomComponents.Link),- LinkBlock: wrapLinkComponent(baseCustomComponents.LinkBlock),- RichTextLink: wrapLinkComponent(baseCustomComponents.RichTextLink),-};diff --git a/apps/builder/app/canvas/custom-components/link.test.ts b/apps/builder/app/canvas/custom-components/link.test.tsdeleted file mode 100644index d5ec70d256..0000000000--- a/apps/builder/app/canvas/custom-components/link.test.ts+++ /dev/null@@ -1,34 +0,0 @@-import { describe, test, expect } from "@jest/globals";-import { preserveBuildParams } from "./link";--describe("preserveBuildParams", () => {- test("absolute url is returned as is", () => {- const search = "?mode=preview&projectId=123";- expect(preserveBuildParams("https://example.com", search)).toBe(- "https://example.com"- );- expect(preserveBuildParams("mailto:[email protected]", search)).toBe(- "mailto:[email protected]"- );- });-- test("doesn't crash on a weird value", () => {- expect(preserveBuildParams("http://", "?projectId=123")).toBe("http://");- });-- test("projectId is preserved", () => {- expect(preserveBuildParams("/foo", "?projectId=123")).toBe(- "/foo?projectId=123"- );- });-- test("mode is preserved", () => {- expect(preserveBuildParams("/foo", "?mode=preview")).toBe(- "/foo?mode=preview"- );- });-- test("invalid mode is not preserved", () => {- expect(preserveBuildParams("/foo", "?mode=invalid")).toBe("/foo");- });-});diff --git a/apps/builder/app/canvas/custom-components/link.tsx b/apps/builder/app/canvas/custom-components/link.tsxdeleted file mode 100644index dd66fcd3c3..0000000000--- a/apps/builder/app/canvas/custom-components/link.tsx+++ /dev/null@@ -1,72 +0,0 @@-import { useLocation } from "@remix-run/react";-import type {- ElementRef,- ComponentProps,- ForwardRefExoticComponent,- RefAttributes,-} from "react";-import { forwardRef } from "react";-import { preserveSearchBuildParams } from "~/shared/router-utils";--const isAbsoluteUrl = (href: string) => {- try {- new URL(href);- } catch {- return false;- }- return true;-};--export const preserveBuildParams = (href: string, sourceSearch: string) => {- if (isAbsoluteUrl(href)) {- return href;- }-- let url;- let sourceSearchParams;- try {- url = new URL(- href,- // doesn't affect anything, just need some base to use URL- "http://localhost"- );- sourceSearchParams = new URLSearchParams(sourceSearch);-- // eslint-disable-next-line no-empty- } catch {}-- if (url === undefined || sourceSearchParams === undefined) {- return href;- }-- preserveSearchBuildParams(sourceSearchParams, url.searchParams);-- const search = url.searchParams.toString();-- return `${url.pathname}${search === "" ? "" : `?${search}`}`;-};--// @todo this copy-paste has to go away, along with this wrapper component-// changing this requires an update in react-sdk/components/link-type Props = Omit<ComponentProps<"a">, "href" | "target"> & {- href?: string;- target?: "_self" | "_blank" | "_parent" | "_top";- prefetch?: "none" | "intent" | "render";-};--type Ref = ElementRef<"a">;--export const wrapLinkComponent = (- BaseLink: ForwardRefExoticComponent<Props & RefAttributes<Ref>>-) => {- const Component = forwardRef<Ref, Props>(({ href = "", ...props }, ref) => {- const { search } = useLocation();- return (- <BaseLink {...props} href={preserveBuildParams(href, search)} ref={ref} />- );- });-- Component.displayName = BaseLink.displayName;-- return Component;-};diff --git a/apps/builder/app/canvas/features/webstudio-component/link.ts b/apps/builder/app/canvas/features/webstudio-component/link.tsnew file mode 100644index 0000000000..8ed78b19ed--- /dev/null+++ b/apps/builder/app/canvas/features/webstudio-component/link.ts@@ -0,0 +1,46 @@+import type { MouseEvent } from "react";+import { findPageByIdOrPath, Page } from "@webstudio-is/project-build";+import { pagesStore, isPreviewModeStore } from "~/shared/nano-states";+import { publish } from "~/shared/pubsub";++declare module "~/shared/pubsub" {+ export interface PubsubMap {+ switchPage: { pageId: Page["id"] };+ }+}++const isAbsoluteUrl = (href: string) => {+ try {+ new URL(href);+ return true;+ } catch {+ return false;+ }+};++export const handleLinkClick = (event: MouseEvent) => {+ event.preventDefault();++ const pages = pagesStore.get();++ if (isPreviewModeStore.get() === false || pages === undefined) {+ return;+ }++ const href = event.currentTarget.getAttribute("href");++ if (href === null) {+ return;+ }++ const page = findPageByIdOrPath(pages, href);++ if (page) {+ publish({ type: "switchPage", payload: { pageId: page.id } });+ return;+ }++ if (isAbsoluteUrl(href)) {+ window.open(href, "_blank");+ }+};diff --git a/apps/builder/app/canvas/features/webstudio-component/webstudio-component.tsx b/apps/builder/app/canvas/features/webstudio-component/webstudio-component.tsxindex 71e723a91d..fe67b00fe3 100644--- a/apps/builder/app/canvas/features/webstudio-component/webstudio-component.tsx+++ b/apps/builder/app/canvas/features/webstudio-component/webstudio-component.tsx@@ -24,6 +24,7 @@ import {import { useCssRules } from "~/canvas/shared/styles";import { SelectedInstanceConnector } from "./selected-instance-connector";import { getInstanceSelector } from "~/shared/tree-utils";+import { handleLinkClick } from "./link";const TextEditor = lazy(() => import("../text-editor"));@@ -117,8 +118,8 @@ export const WebstudioComponentDev = ({[componentAttribute]: instance.component,[idAttribute]: instance.id,onClick: (event: MouseEvent) => {- if ((event.target as HTMLElement).closest("a")) {- event.preventDefault();+ if (event.currentTarget instanceof HTMLAnchorElement) {+ handleLinkClick(event);}},onSubmit: (event: FormEvent) => {diff --git a/apps/builder/app/routes/$.tsx b/apps/builder/app/routes/$.tsxindex fd0dc21401..d763ff6476 100644--- a/apps/builder/app/routes/$.tsx+++ b/apps/builder/app/routes/$.tsx@@ -1,23 +1,18 @@import { redirect, json, LoaderArgs, LinksFunction } from "@remix-run/node";import type { MetaFunction, ErrorBoundaryComponent } from "@remix-run/node";import { useLoaderData } from "@remix-run/react";-import { InstanceRoot, Root, getComponent } from "@webstudio-is/react-sdk";-import { loadCanvasData, loadProductionCanvasData } from "~/shared/db";+import { Root, getComponent } from "@webstudio-is/react-sdk";+import { loadCanvasData } from "~/shared/db";import env, { type PublicEnv } from "~/env/env.public.server";import { sentryException } from "~/shared/sentry";import { Canvas } from "~/canvas";import { ErrorMessage } from "~/shared/error";-import {- type BuildMode,- getBuildParams,- dashboardPath,-} from "~/shared/router-utils";+import { getBuildParams, dashboardPath } from "~/shared/router-utils";import { db } from "@webstudio-is/project/server";import type { CanvasData } from "@webstudio-is/project";-import { customComponents } from "~/canvas/custom-components";import { createContext } from "~/shared/context.server";-type Data = CanvasData & { env: PublicEnv; mode: BuildMode };+type Data = CanvasData & { env: PublicEnv };export const links: LinksFunction = () => {return [@@ -36,9 +31,8 @@ export const meta: MetaFunction = ({ data }: { data: Data }) => {export const loader = async ({ request }: LoaderArgs): Promise<Data> => {const buildParams = getBuildParams(request);- const buildEnv = buildParams?.mode === "published" ? "prod" : "dev";- const context = await createContext(request, buildEnv);+ const context = await createContext(request, "dev");if (buildParams === undefined) {throw redirect(dashboardPath());@@ -50,57 +44,27 @@ export const loader = async ({ request }: LoaderArgs): Promise<Data> => {throw json("Project not found", { status: 404 });}- const { mode } = buildParams;-const params: CanvasData["params"] = {};if (env.RESIZE_ORIGIN != null) {params.resizeOrigin = env.RESIZE_ORIGIN;}- if (buildEnv === "dev") {- const canvasData = await loadCanvasData(- {- project,- env: buildEnv,- pageIdOrPath:- "pageId" in buildParams ? buildParams.pageId : buildParams.pagePath,- },- context- );-- if (canvasData === undefined) {- throw json("Page not found", { status: 404 });- }-- return { ...canvasData, env, mode, params };- }-- // For "prod" builds we emulate the published site behaviour, reusing the same data production site uses.- // https://github.com/webstudio-is/webstudio-builder/issues/929- // The code below only used on localhost "publish".- const pagesCanvasData = await loadProductionCanvasData(- { projectId: project.id },+ const canvasData = await loadCanvasData(+ {+ project,+ env: "dev",+ pageIdOrPath:+ "pageId" in buildParams ? buildParams.pageId : buildParams.pagePath,+ },context);- if (!("pagePath" in buildParams)) {- throw json("pagePath must exists in buildParams in production mode", {- status: 404,- });+ if (canvasData === undefined) {+ throw json("Page not found", { status: 404 });}- const pagePath = buildParams.pagePath === "/" ? "" : buildParams.pagePath;-- const page = pagesCanvasData.pages.find((page) => page.path === pagePath);-- if (page === undefined) {- throw json("Page not found", {- status: 404,- });- }-- return { ...pagesCanvasData, page, env, mode, params };+ return { ...canvasData, env, params };};export const ErrorBoundary: ErrorBoundaryComponent = ({ error }) => {@@ -111,18 +75,7 @@ export const ErrorBoundary: ErrorBoundaryComponent = ({ error }) => {const Outlet = () => {const data = useLoaderData<Data>();-- if (data.mode === "edit") {- return <Canvas data={data} getComponent={getComponent} />;- }-- return (- <InstanceRoot- data={data}- getComponent={getComponent}- customComponents={customComponents}- />- );+ return <Canvas data={data} getComponent={getComponent} />;};const Content = () => {diff --git a/apps/builder/app/routes/s/css.ts b/apps/builder/app/routes/s/css.tsindex cdcc7ee39d..79f20a2bbb 100644--- a/apps/builder/app/routes/s/css.ts+++ b/apps/builder/app/routes/s/css.ts@@ -5,7 +5,7 @@ import env from "~/env/env.public.server";import { getBuildParams } from "~/shared/router-utils";import { sentryException } from "~/shared/sentry";import { createContext } from "~/shared/context.server";-import { loadCanvasData, loadProductionCanvasData } from "~/shared/db";+import { loadCanvasData } from "~/shared/db";import { createCssEngine } from "@webstudio-is/css-engine";import { helperStyles } from "~/canvas/shared/styles";@@ -13,9 +13,7 @@ export const loader = async ({ request }: ActionArgs) => {try {const buildParams = getBuildParams(request);- const buildEnv = buildParams?.mode === "published" ? "prod" : "dev";-- const context = await createContext(request, buildEnv);+ const context = await createContext(request, "dev");if (buildParams === undefined) {throw json("Required project info", { status: 400 });@@ -27,62 +25,33 @@ export const loader = async ({ request }: ActionArgs) => {throw json("Project not found", { status: 404 });}- if (buildEnv === "dev") {- const canvasData = await loadCanvasData(- {- project,- env: buildParams.mode === "published" ? "prod" : "dev",- pageIdOrPath:- "pageId" in buildParams ? buildParams.pageId : buildParams.pagePath,- },- context- );-- if (canvasData === undefined) {- throw json("Page not found", { status: 404 });- }-- const cssText = generateCssText({- assets: canvasData.assets,- breakpoints: canvasData.build?.breakpoints,- styles: canvasData.build?.styles,- styleSourceSelections: canvasData.build?.styleSourceSelections,- });-- const engine = createCssEngine({ name: "ssr" });- for (const style of helperStyles) {- engine.addPlaintextRule(style);- }-- return new Response(`${cssText}\n${engine.cssText}`, {- headers: {- "Content-Type": "text/css",- // We have no way with Remix links to know if CSS has changed (no ?cache-breaker in url)- // We can add Last-Modified and change Cache-Control: no-cache, but this is only used to publish on localhost.- // And can be completely omitted for Designer Canvas see https://github.com/webstudio-is/webstudio-builder/issues/1044- // This is not a problem on the published site, since we know the data at build time.- // https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Cache-Control- "Cache-Control": "no-store",- },- });- }-- // For "prod" builds we emulate the published site behaviour, reusing the same data production site uses.- // https://github.com/webstudio-is/webstudio-builder/issues/929- // The code below only used on localhost "publish".- const pagesCanvasData = await loadProductionCanvasData(- { projectId: project.id },+ 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 });+ }+const cssText = generateCssText({- assets: pagesCanvasData.assets,- breakpoints: pagesCanvasData.build?.breakpoints,- styles: pagesCanvasData.build?.styles,- styleSourceSelections: pagesCanvasData.build?.styleSourceSelections,+ assets: canvasData.assets,+ breakpoints: canvasData.build?.breakpoints,+ styles: canvasData.build?.styles,+ styleSourceSelections: canvasData.build?.styleSourceSelections,});- return new Response(cssText, {+ const engine = createCssEngine({ name: "ssr" });+ for (const style of helperStyles) {+ engine.addPlaintextRule(style);+ }++ return new Response(`${cssText}\n${engine.cssText}`, {headers: {"Content-Type": "text/css",// We have no way with Remix links to know if CSS has changed (no ?cache-breaker in url)diff --git a/apps/builder/app/shared/nano-states/nano-states.ts b/apps/builder/app/shared/nano-states/nano-states.tsindex 200e49d2c9..082ae8d4f3 100644--- a/apps/builder/app/shared/nano-states/nano-states.ts+++ b/apps/builder/app/shared/nano-states/nano-states.ts@@ -394,7 +394,7 @@ export const useSetAuthPermit = (authPermit: AuthPermit) => {});};-const authTokenStore = atom<string | undefined>(undefined);+export const authTokenStore = atom<string | undefined>(undefined);export const useAuthToken = () => useValue(authTokenStore);export const useSetAuthToken = (authToken: string | undefined) => {useSyncInitializeOnce(() => {diff --git a/apps/builder/app/shared/pages/index.ts b/apps/builder/app/shared/pages/index.tsindex eea524d655..698795bdbc 100644--- a/apps/builder/app/shared/pages/index.ts+++ b/apps/builder/app/shared/pages/index.ts@@ -1 +1,2 @@export * from "./types";+export * from "./use-switch-page";diff --git a/apps/builder/app/shared/pages/use-switch-page.ts b/apps/builder/app/shared/pages/use-switch-page.tsnew file mode 100644index 0000000000..3fccbfde46--- /dev/null+++ b/apps/builder/app/shared/pages/use-switch-page.ts@@ -0,0 +1,35 @@+import { useNavigate } from "@remix-run/react";+import type { Page } from "@webstudio-is/project-build";+import { projectContainer } from "~/builder/shared/nano-states";+import { authTokenStore, pagesStore } from "~/shared/nano-states";+import { builderPath } from "~/shared/router-utils";+import { useSubscribe } from "~/shared/pubsub";++export const useSwitchPage = () => {+ const navigate = useNavigate();++ /**+ * If no `pageId` provided, switches to default page (home)+ */+ return (pageId?: Page["id"]) => {+ const project = projectContainer.get();+ const pages = pagesStore.get();++ if (project === undefined || pages === undefined) {+ return;+ }++ navigate(+ builderPath({+ projectId: project.id,+ pageId: pageId === pages.homePage.id ? undefined : pageId,+ authToken: authTokenStore.get(),+ })+ );+ };+};++export const useSubscribeSwitchPage = () => {+ const switchPage = useSwitchPage();+ useSubscribe("switchPage", ({ pageId }) => switchPage(pageId));+};diff --git a/apps/builder/app/shared/router-utils/build-params.test.ts b/apps/builder/app/shared/router-utils/build-params.test.tsindex 382f188040..d01509efc8 100644--- a/apps/builder/app/shared/router-utils/build-params.test.ts+++ b/apps/builder/app/shared/router-utils/build-params.test.ts@@ -110,16 +110,4 @@ describe("getBuildParams", () => {).pagePath).toBe("/abc/123");});-- test("detects mode", () => {- expect(- getBuildParams(makeRequest("https://bar.foo.com?mode=edit"), env)?.mode- ).toBe("edit");- expect(- getBuildParams(makeRequest("https://bar.foo.com?mode=preview"), env)?.mode- ).toBe("preview");- expect(getBuildParams(makeRequest("https://bar.foo.com"), env)?.mode).toBe(- "published"- );- });});diff --git a/apps/builder/app/shared/router-utils/build-params.ts b/apps/builder/app/shared/router-utils/build-params.tsindex e323e6b1c4..899f898ae3 100644--- a/apps/builder/app/shared/router-utils/build-params.ts+++ b/apps/builder/app/shared/router-utils/build-params.ts@@ -3,9 +3,8 @@import serverEnv from "~/env/env.server";-export type BuildMode = "edit" | "preview" | "published";export type BuildParams = ({ pagePath: string } | { pageId: string }) &- ({ projectId: string } | { projectDomain: string }) & { mode: BuildMode };+ ({ projectId: string } | { projectDomain: string });// A subtype of Request. To make testing easier.type MinimalRequest = {@@ -13,17 +12,6 @@ type MinimalRequest = {headers: { get: (name: string) => string | null };};-const modes = ["edit", "preview", "published"] as BuildMode[];-export const getMode = (url: URL): BuildMode => {- const modeParam = url.searchParams.get("mode");- const mode =- modeParam === null ? "published" : modes.find((mode) => mode === modeParam);- if (mode === undefined) {- throw new Error(`Invalid mode "${modeParam}"`);- }- return mode;-};-export const getRequestHost = (request: MinimalRequest): string =>request.headers.get("x-forwarded-host") || request.headers.get("host") || "";@@ -100,13 +88,12 @@ export const getBuildParams = (// Try to get projectId from referrerconst refererUrl = new URL(referer);const projectId = refererUrl.searchParams.get("projectId");- const mode = getMode(refererUrl);const pageId = url.searchParams.get("pageId") ?? undefined;- if (mode === "edit" && projectId !== null) {+ if (projectId !== null) {return pageId === undefined- ? { projectId, mode, pagePath: refererUrl.pathname }- : { projectId, mode, pageId };+ ? { projectId, pagePath: refererUrl.pathname }+ : { projectId, pageId };}}}@@ -119,8 +106,8 @@ export const getBuildParams = (const projectId = url.searchParams.get("projectId");if (projectId !== null && buildHost === requestHost) {return pageId === undefined- ? { projectId, mode: getMode(url), pagePath: url.pathname }- : { projectId, mode: getMode(url), pageId };+ ? { projectId, pagePath: url.pathname }+ : { projectId, pageId };}}@@ -128,22 +115,7 @@ export const getBuildParams = (const baseHost = rest.join(".");if (baseHost === buildHost) {return pageId === undefined- ? { projectDomain, mode: getMode(url), pagePath: url.pathname }- : { projectDomain, mode: getMode(url), pageId };- }-};--export const preserveSearchBuildParams = (- source: URLSearchParams,- target: URLSearchParams-): void => {- const mode = source.get("mode");- if (typeof mode === "string" && modes.includes(mode as BuildMode)) {- target.set("mode", mode);- }-- const projectId = source.get("projectId");- if (projectId) {- target.set("projectId", projectId);+ ? { projectDomain, pagePath: url.pathname }+ : { projectDomain, pageId };}};diff --git a/apps/builder/app/shared/router-utils/path-utils.ts b/apps/builder/app/shared/router-utils/path-utils.tsindex 2764c3e462..cefcf1ce6c 100644--- a/apps/builder/app/shared/router-utils/path-utils.ts+++ b/apps/builder/app/shared/router-utils/path-utils.ts@@ -1,7 +1,6 @@import type { AUTH_PROVIDERS } from "~/shared/session";import type { Page } from "@webstudio-is/project-build";import type { Project } from "@webstudio-is/project";-import type { BuildMode } from "./build-params";import type { ThemeSetting } from "~/shared/theme";import env from "~/shared/env";@@ -121,7 +120,6 @@ export const getBuildUrl = ({buildOrigin,project,page,- mode,// Hidden token for canvas (should not be visible in browser URL)authReadToken,// Token to share project@@ -130,7 +128,6 @@ export const getBuildUrl = ({buildOrigin: string;project: Project;page: Page;- mode?: BuildMode;authReadToken?: string;authToken?: string;}) => {@@ -143,10 +140,6 @@ export const getBuildUrl = ({url.searchParams.set("projectId", project.id);- if (mode) {- url.searchParams.set("mode", mode);- }-if (authReadToken) {url.searchParams.set("authReadToken", authReadToken);}