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
rename designer to builder
Andras Bacsaiac413cdd5f16
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.mdindex 7ff6b5325e..c469b9710f 100644--- a/.github/pull_request_template.md+++ b/.github/pull_request_template.md@@ -22,6 +22,6 @@## Before merging- [ ] tested locally and on preview environment (preview dev login: 5de6)-- [ ] updated [test cases](https://github.com/webstudio-is/webstudio-designer/blob/main/apps/designer/docs/test-cases.md) document+- [ ] updated [test cases](https://github.com/webstudio-is/webstudio-builder/blob/main/apps/builder/docs/test-cases.md) document- [ ] added tests-- [ ] if any new env variables are added, added them to `.env.example` and the `designer/env-check.js` if mandatory+- [ ] if any new env variables are added, added them to `.env.example` and the `builder/env-check.js` if mandatorydiff --git a/.github/workflows/chromatic.yml b/.github/workflows/chromatic.ymlindex 50d9d7bd1c..2d2d3a793d 100644--- a/.github/workflows/chromatic.yml+++ b/.github/workflows/chromatic.yml@@ -11,11 +11,11 @@ jobs:strategy:matrix:project:- [designer-app, css-engine, design-system, icons, image, react-sdk]+ [builder-app, css-engine, design-system, icons, image, react-sdk]include:- - project: designer-app+ - project: builder-appchromaticSecretKey: CHROMATIC_DESIGNER_APP_TOKEN- workingDir: apps/designer+ workingDir: apps/builder- project: css-enginechromaticSecretKey: CHROMATIC_CSS_ENGINE_TOKEN@@ -38,7 +38,7 @@ jobs:workingDir: packages/react-sdkoutputs:- designer-app: ${{ steps.deployed-url.outputs.designer-app }}+ builder-app: ${{ steps.deployed-url.outputs.builder-app }}css-engine: ${{ steps.deployed-url.outputs.css-engine }}design-system: ${{ steps.deployed-url.outputs.design-system }}icons: ${{ steps.deployed-url.outputs.icons }}diff --git a/README.md b/README.mdindex 532951e854..2f12acdde4 100644--- a/README.md+++ b/README.md@@ -1,10 +1,12 @@-# Webstudio Designer+# Webstudio Builder-Webstudio Designer is a NoCode Visual Tool inspired by Webflow. It is the place where you can build your site or app visually.+Webstudio Builder is a NoCode Visual Tool inspired by Webflow. It is the place+where you can build your site or app visually.## Contributing-Don't hesitate to reach out of you have questions around contributing to the project.+Don't hesitate to reach out of you have questions around contributing to the+project.[Contributing guide](https://github.com/webstudio-is/webstudio/blob/main/docs/contributing.md)diff --git a/apps/designer/.env.example b/apps/builder/.env.examplesimilarity index 89%rename from apps/designer/.env.examplerename to apps/builder/.env.exampleindex 0c48996186..a4dafb0f2e 100644--- a/apps/designer/.env.example+++ b/apps/builder/.env.example@@ -1,6 +1,6 @@-DESIGNER_HOST=webstudio.is+BUILDER_HOST=webstudio.isDATABASE_URL=postgresql://user:pass@localhost/webstudio-AUTH_SECRET="# Linux: `openssl rand -hex 32` or go to https://generate-secret.now.sh/64"+AUTH_SECRET="# Linux: $(openssl rand -hex 32) or go to https://generate-secret.now.sh/64"GH_CLIENT_SECRET=GH_CLIENT_ID=DEV_LOGIN=true@@ -45,4 +45,4 @@ FEATURES=*# TRCP server url and API token. If empty local TRPC server is usedTRPC_SERVER_URL=-TRPC_SERVER_API_TOKEN=\ No newline at end of file+TRPC_SERVER_API_TOKEN=diff --git a/apps/designer/.gitignore b/apps/builder/.gitignoresimilarity index 100%rename from apps/designer/.gitignorerename to apps/builder/.gitignorediff --git a/apps/designer/.storybook/main.js b/apps/builder/.storybook/main.jssimilarity index 100%rename from apps/designer/.storybook/main.jsrename to apps/builder/.storybook/main.jsdiff --git a/apps/designer/.storybook/preview.tsx b/apps/builder/.storybook/preview.tsxsimilarity index 100%rename from apps/designer/.storybook/preview.tsxrename to apps/builder/.storybook/preview.tsxdiff --git a/apps/designer/app/auth/index.ts b/apps/builder/app/auth/index.tssimilarity index 100%rename from apps/designer/app/auth/index.tsrename to apps/builder/app/auth/index.tsdiff --git a/apps/designer/app/auth/login-button.tsx b/apps/builder/app/auth/login-button.tsxsimilarity index 100%rename from apps/designer/app/auth/login-button.tsxrename to apps/builder/app/auth/login-button.tsxdiff --git a/apps/designer/app/auth/login.css b/apps/builder/app/auth/login.csssimilarity index 100%rename from apps/designer/app/auth/login.cssrename to apps/builder/app/auth/login.cssdiff --git a/apps/designer/app/auth/login.tsx b/apps/builder/app/auth/login.tsxsimilarity index 100%rename from apps/designer/app/auth/login.tsxrename to apps/builder/app/auth/login.tsxdiff --git a/apps/designer/app/designer/designer.css b/apps/builder/app/builder/builder.csssimilarity index 100%rename from apps/designer/app/designer/designer.cssrename to apps/builder/app/builder/builder.cssdiff --git a/apps/designer/app/designer/designer.tsx b/apps/builder/app/builder/builder.tsxsimilarity index 96%rename from apps/designer/app/designer/designer.tsxrename to apps/builder/app/builder/builder.tsxindex 379c108496..29ee8ba966 100644--- a/apps/designer/app/designer/designer.tsx+++ b/apps/builder/app/builder/builder.tsx@@ -6,7 +6,7 @@ import {type Project,} from "@webstudio-is/project";import { theme, Box, type CSS, Flex, Grid } from "@webstudio-is/design-system";-import { registerContainers, useDesignerStore } from "~/shared/sync";+import { registerContainers, useBuilderStore } from "~/shared/sync";import { useSyncServer } from "./shared/sync/sync-server";// eslint-disable-next-line import/no-internal-modulesimport interFont from "@fontsource/inter/variable.css";@@ -17,7 +17,7 @@ import { SidebarLeft } from "./features/sidebar-left";import { Inspector } from "./features/inspector";import { usePages, useProject, useCurrentPageId } from "./shared/nano-states";import { Topbar } from "./features/topbar";-import designerStyles from "./designer.css";+import builderStyles from "./builder.css";import { Footer } from "./features/footer";import { TreePrevew } from "./features/tree-preview";import { useUpdateCanvasWidth } from "./features/breakpoints";@@ -46,7 +46,7 @@ export const links = () => {return [{ rel: "stylesheet", href: interFont },{ rel: "stylesheet", href: robotoMonoFont },- { rel: "stylesheet", href: designerStyles },+ { rel: "stylesheet", href: builderStyles },];};@@ -235,7 +235,7 @@ const NavigatorPanel = ({ isPreviewMode }: NavigatorPanelProps) => {);};-export type DesignerProps = {+export type BuilderProps = {project: Project;pages: Pages;pageId: string;@@ -247,7 +247,7 @@ export type DesignerProps = {authPermit: AuthPermit;};-export const Designer = ({+export const Builder = ({project,pages,pageId,@@ -257,14 +257,14 @@ export const Designer = ({authReadToken,authToken,authPermit,-}: DesignerProps) => {+}: BuilderProps) => {useSetAuthPermit(authPermit);useSetProject(project);useSetTreeId(treeId);useSetPages(pages);useSetCurrentPageId(pageId);const [publish, publishRef] = usePublish();- useDesignerStore(publish);+ useBuilderStore(publish);useSyncServer({buildId,treeId,@@ -280,7 +280,7 @@ export const Designer = ({const { onRef: onRefReadCanvas, onTransitionEnd } = useReadCanvasRect();const [dragAndDropState] = useDragAndDropState();useSubscribeCanvasReady(publish);- // We need to initialize this in both canvas and designer,+ // We need to initialize this in both canvas and builder,// because the events will fire in either one, depending on where the focus isuseCopyPasteInstance();useSetWindowTitle();diff --git a/apps/designer/app/designer/features/breakpoints/breakpoints-editor.tsx b/apps/builder/app/builder/features/breakpoints/breakpoints-editor.tsxsimilarity index 100%rename from apps/designer/app/designer/features/breakpoints/breakpoints-editor.tsxrename to apps/builder/app/builder/features/breakpoints/breakpoints-editor.tsxdiff --git a/apps/designer/app/designer/features/breakpoints/breakpoints.tsx b/apps/builder/app/builder/features/breakpoints/breakpoints.tsxsimilarity index 100%rename from apps/designer/app/designer/features/breakpoints/breakpoints.tsxrename to apps/builder/app/builder/features/breakpoints/breakpoints.tsxdiff --git a/apps/designer/app/designer/features/breakpoints/confirmation-dialog.tsx b/apps/builder/app/builder/features/breakpoints/confirmation-dialog.tsxsimilarity index 100%rename from apps/designer/app/designer/features/breakpoints/confirmation-dialog.tsxrename to apps/builder/app/builder/features/breakpoints/confirmation-dialog.tsxdiff --git a/apps/designer/app/designer/features/breakpoints/index.ts b/apps/builder/app/builder/features/breakpoints/index.tssimilarity index 100%rename from apps/designer/app/designer/features/breakpoints/index.tsrename to apps/builder/app/builder/features/breakpoints/index.tsdiff --git a/apps/designer/app/designer/features/breakpoints/preview.tsx b/apps/builder/app/builder/features/breakpoints/preview.tsxsimilarity index 100%rename from apps/designer/app/designer/features/breakpoints/preview.tsxrename to apps/builder/app/builder/features/breakpoints/preview.tsxdiff --git a/apps/designer/app/designer/features/breakpoints/trigger-button.tsx b/apps/builder/app/builder/features/breakpoints/trigger-button.tsxsimilarity index 88%rename from apps/designer/app/designer/features/breakpoints/trigger-button.tsxrename to apps/builder/app/builder/features/breakpoints/trigger-button.tsxindex 2928bf6698..ac620b20a6 100644--- a/apps/designer/app/designer/features/breakpoints/trigger-button.tsx+++ b/apps/builder/app/builder/features/breakpoints/trigger-button.tsx@@ -1,8 +1,8 @@import { forwardRef, type ComponentProps, type ElementRef } from "react";import { useStore } from "@nanostores/react";import { Button, Text } from "@webstudio-is/design-system";-import { useCanvasWidth } from "~/designer/shared/nano-states";-import { willRender } from "~/designer/shared/breakpoints";+import { useCanvasWidth } from "~/builder/shared/nano-states";+import { willRender } from "~/builder/shared/breakpoints";import {selectedBreakpointStore,zoomStore,diff --git a/apps/designer/app/designer/features/breakpoints/use-next-breakpoint.ts b/apps/builder/app/builder/features/breakpoints/use-next-breakpoint.tssimilarity index 100%rename from apps/designer/app/designer/features/breakpoints/use-next-breakpoint.tsrename to apps/builder/app/builder/features/breakpoints/use-next-breakpoint.tsdiff --git a/apps/designer/app/designer/features/breakpoints/use-update-canvas-width.ts b/apps/builder/app/builder/features/breakpoints/use-update-canvas-width.tssimilarity index 96%rename from apps/designer/app/designer/features/breakpoints/use-update-canvas-width.tsrename to apps/builder/app/builder/features/breakpoints/use-update-canvas-width.tsindex 6e162571af..1c42d5b2ae 100644--- a/apps/designer/app/designer/features/breakpoints/use-update-canvas-width.ts+++ b/apps/builder/app/builder/features/breakpoints/use-update-canvas-width.ts@@ -1,6 +1,6 @@import { useStore } from "@nanostores/react";import { useCallback, useEffect } from "react";-import { useCanvasWidth } from "~/designer/shared/nano-states";+import { useCanvasWidth } from "~/builder/shared/nano-states";import { useIsPreviewMode } from "~/shared/nano-states";import { selectedBreakpointStore } from "~/shared/nano-states/breakpoints";import { minWidth } from "./width-setting";diff --git a/apps/designer/app/designer/features/breakpoints/width-setting.tsx b/apps/builder/app/builder/features/breakpoints/width-setting.tsxsimilarity index 96%rename from apps/designer/app/designer/features/breakpoints/width-setting.tsxrename to apps/builder/app/builder/features/breakpoints/width-setting.tsxindex c7a985088e..7d1b9be797 100644--- a/apps/designer/app/designer/features/breakpoints/width-setting.tsx+++ b/apps/builder/app/builder/features/breakpoints/width-setting.tsx@@ -7,7 +7,7 @@ import {} from "@webstudio-is/design-system";import { useIsPreviewMode } from "~/shared/nano-states";import { selectedBreakpointStore } from "~/shared/nano-states/breakpoints";-import { useCanvasWidth } from "~/designer/shared/nano-states";+import { useCanvasWidth } from "~/builder/shared/nano-states";import { useNextBreakpoint } from "./use-next-breakpoint";// Doesn't make sense to allow resizing the canvas lower/higher than this.diff --git a/apps/designer/app/designer/features/breakpoints/zoom-setting.tsx b/apps/builder/app/builder/features/breakpoints/zoom-setting.tsxsimilarity index 100%rename from apps/designer/app/designer/features/breakpoints/zoom-setting.tsxrename to apps/builder/app/builder/features/breakpoints/zoom-setting.tsxdiff --git a/apps/designer/app/designer/features/footer/breadcrumbs.tsx b/apps/builder/app/builder/features/footer/breadcrumbs.tsxsimilarity index 94%rename from apps/designer/app/designer/features/footer/breadcrumbs.tsxrename to apps/builder/app/builder/features/footer/breadcrumbs.tsxindex c674025537..3ba6d50ed1 100644--- a/apps/designer/app/designer/features/footer/breadcrumbs.tsx+++ b/apps/builder/app/builder/features/footer/breadcrumbs.tsx@@ -7,7 +7,7 @@ import {} from "@webstudio-is/design-system";import { theme } from "@webstudio-is/design-system";import { selectedInstanceIdStore } from "~/shared/nano-states";-import { useSelectedInstancePath } from "~/designer/shared/instance/use-selected-instance-path";+import { useSelectedInstancePath } from "~/builder/shared/instance/use-selected-instance-path";type BreadcrumbProps = {children: JSX.Element | string;diff --git a/apps/designer/app/designer/features/footer/footer.tsx b/apps/builder/app/builder/features/footer/footer.tsxsimilarity index 100%rename from apps/designer/app/designer/features/footer/footer.tsxrename to apps/builder/app/builder/features/footer/footer.tsxdiff --git a/apps/designer/app/designer/features/footer/index.ts b/apps/builder/app/builder/features/footer/index.tssimilarity index 100%rename from apps/designer/app/designer/features/footer/index.tsrename to apps/builder/app/builder/features/footer/index.tsdiff --git a/apps/designer/app/designer/features/inspector/index.ts b/apps/builder/app/builder/features/inspector/index.tssimilarity index 100%rename from apps/designer/app/designer/features/inspector/index.tsrename to apps/builder/app/builder/features/inspector/index.tsdiff --git a/apps/designer/app/designer/features/inspector/inspector.tsx b/apps/builder/app/builder/features/inspector/inspector.tsxsimilarity index 92%rename from apps/designer/app/designer/features/inspector/inspector.tsxrename to apps/builder/app/builder/features/inspector/inspector.tsxindex fa705a3a8b..7ad444a28f 100644--- a/apps/designer/app/designer/features/inspector/inspector.tsx+++ b/apps/builder/app/builder/features/inspector/inspector.tsx@@ -13,9 +13,9 @@ import {Flex,EnhancedTooltipProvider,} from "@webstudio-is/design-system";-import { StylePanel } from "~/designer/features/style-panel";-import { PropsPanel } from "~/designer/features/props-panel";-import { FloatingPanelProvider } from "~/designer/shared/floating-panel";+import { StylePanel } from "~/builder/features/style-panel";+import { PropsPanel } from "~/builder/features/props-panel";+import { FloatingPanelProvider } from "~/builder/shared/floating-panel";import { theme } from "@webstudio-is/design-system";import { selectedInstanceStore } from "~/shared/nano-states";diff --git a/apps/designer/app/designer/features/props-panel/control.stories.tsx b/apps/builder/app/builder/features/props-panel/control.stories.tsxsimilarity index 100%rename from apps/designer/app/designer/features/props-panel/control.stories.tsxrename to apps/builder/app/builder/features/props-panel/control.stories.tsxdiff --git a/apps/designer/app/designer/features/props-panel/control.tsx b/apps/builder/app/builder/features/props-panel/control.tsxsimilarity index 98%rename from apps/designer/app/designer/features/props-panel/control.tsxrename to apps/builder/app/builder/features/props-panel/control.tsxindex eea0b0d781..5944a28945 100644--- a/apps/designer/app/designer/features/props-panel/control.tsx+++ b/apps/builder/app/builder/features/props-panel/control.tsx@@ -16,8 +16,8 @@ import {TextField,} from "@webstudio-is/design-system";import { assetsStore } from "~/shared/nano-states";-import { FloatingPanel } from "~/designer/shared/floating-panel";-import { ImageManager } from "~/designer/shared/image-manager";+import { FloatingPanel } from "~/builder/shared/floating-panel";+import { ImageManager } from "~/builder/shared/image-manager";import type { UserPropValue } from "./use-props-logic";import type { SetProperty } from "../style-panel/shared/use-style-data";diff --git a/apps/designer/app/designer/features/props-panel/index.ts b/apps/builder/app/builder/features/props-panel/index.tssimilarity index 100%rename from apps/designer/app/designer/features/props-panel/index.tsrename to apps/builder/app/builder/features/props-panel/index.tsdiff --git a/apps/designer/app/designer/features/props-panel/props-panel.stories.tsx b/apps/builder/app/builder/features/props-panel/props-panel.stories.tsxsimilarity index 100%rename from apps/designer/app/designer/features/props-panel/props-panel.stories.tsxrename to apps/builder/app/builder/features/props-panel/props-panel.stories.tsxdiff --git a/apps/designer/app/designer/features/props-panel/props-panel.tsx b/apps/builder/app/builder/features/props-panel/props-panel.tsxsimilarity index 98%rename from apps/designer/app/designer/features/props-panel/props-panel.tsxrename to apps/builder/app/builder/features/props-panel/props-panel.tsxindex 7e932f7fd5..1059abb7d4 100644--- a/apps/designer/app/designer/features/props-panel/props-panel.tsx+++ b/apps/builder/app/builder/features/props-panel/props-panel.tsx@@ -25,7 +25,7 @@ import {} from "@webstudio-is/icons";import type { Publish } from "~/shared/pubsub";import { propsStore, useInstanceProps } from "~/shared/nano-states";-import { CollapsibleSection, ComponentInfo } from "~/designer/shared/inspector";+import { CollapsibleSection, ComponentInfo } from "~/builder/shared/inspector";import { Control } from "./control";import { usePropsLogic, type UserPropValue } from "./use-props-logic";import {diff --git a/apps/designer/app/designer/features/props-panel/use-props-logic.test.ts b/apps/builder/app/builder/features/props-panel/use-props-logic.test.tssimilarity index 100%rename from apps/designer/app/designer/features/props-panel/use-props-logic.test.tsrename to apps/builder/app/builder/features/props-panel/use-props-logic.test.tsdiff --git a/apps/designer/app/designer/features/props-panel/use-props-logic.ts b/apps/builder/app/builder/features/props-panel/use-props-logic.tssimilarity index 100%rename from apps/designer/app/designer/features/props-panel/use-props-logic.tsrename to apps/builder/app/builder/features/props-panel/use-props-logic.tsdiff --git a/apps/designer/app/designer/features/sidebar-left/header.tsx b/apps/builder/app/builder/features/sidebar-left/header.tsxsimilarity index 100%rename from apps/designer/app/designer/features/sidebar-left/header.tsxrename to apps/builder/app/builder/features/sidebar-left/header.tsxdiff --git a/apps/designer/app/designer/features/sidebar-left/index.tsx b/apps/builder/app/builder/features/sidebar-left/index.tsxsimilarity index 100%rename from apps/designer/app/designer/features/sidebar-left/index.tsxrename to apps/builder/app/builder/features/sidebar-left/index.tsxdiff --git a/apps/designer/app/designer/features/sidebar-left/navigator/index.ts b/apps/builder/app/builder/features/sidebar-left/navigator/index.tssimilarity index 100%rename from apps/designer/app/designer/features/sidebar-left/navigator/index.tsrename to apps/builder/app/builder/features/sidebar-left/navigator/index.tsdiff --git a/apps/designer/app/designer/features/sidebar-left/navigator/navigator.tsx b/apps/builder/app/builder/features/sidebar-left/navigator/navigator.tsxsimilarity index 97%rename from apps/designer/app/designer/features/sidebar-left/navigator/navigator.tsxrename to apps/builder/app/builder/features/sidebar-left/navigator/navigator.tsxindex 69311576ac..772612e0aa 100644--- a/apps/designer/app/designer/features/sidebar-left/navigator/navigator.tsx+++ b/apps/builder/app/builder/features/sidebar-left/navigator/navigator.tsx@@ -7,7 +7,7 @@ import {hoveredInstanceIdStore,useRootInstance,} from "~/shared/nano-states";-import { InstanceTree } from "~/designer/shared/tree";+import { InstanceTree } from "~/builder/shared/tree";import { reparentInstance } from "~/shared/instance-utils";import { Header, CloseButton } from "../header";diff --git a/apps/designer/app/designer/features/sidebar-left/panels/assets/assets.tsx b/apps/builder/app/builder/features/sidebar-left/panels/assets/assets.tsxsimilarity index 89%rename from apps/designer/app/designer/features/sidebar-left/panels/assets/assets.tsxrename to apps/builder/app/builder/features/sidebar-left/panels/assets/assets.tsxindex b52594d2a6..2ebb19664b 100644--- a/apps/designer/app/designer/features/sidebar-left/panels/assets/assets.tsx+++ b/apps/builder/app/builder/features/sidebar-left/panels/assets/assets.tsx@@ -1,6 +1,6 @@import { ImageIcon } from "@webstudio-is/icons";import { Flex } from "@webstudio-is/design-system";-import { ImageManager } from "~/designer/shared/image-manager";+import { ImageManager } from "~/builder/shared/image-manager";import type { TabName } from "../../types";import { Header, CloseButton } from "../../header";diff --git a/apps/designer/app/designer/features/sidebar-left/panels/assets/index.ts b/apps/builder/app/builder/features/sidebar-left/panels/assets/index.tssimilarity index 100%rename from apps/designer/app/designer/features/sidebar-left/panels/assets/index.tsrename to apps/builder/app/builder/features/sidebar-left/panels/assets/index.tsdiff --git a/apps/designer/app/designer/features/sidebar-left/panels/components/component-thumb.tsx b/apps/builder/app/builder/features/sidebar-left/panels/components/component-thumb.tsxsimilarity index 100%rename from apps/designer/app/designer/features/sidebar-left/panels/components/component-thumb.tsxrename to apps/builder/app/builder/features/sidebar-left/panels/components/component-thumb.tsxdiff --git a/apps/designer/app/designer/features/sidebar-left/panels/components/components.tsx b/apps/builder/app/builder/features/sidebar-left/panels/components/components.tsxsimilarity index 98%rename from apps/designer/app/designer/features/sidebar-left/panels/components/components.tsxrename to apps/builder/app/builder/features/sidebar-left/panels/components/components.tsxindex 199bd63271..d780cdaa81 100644--- a/apps/designer/app/designer/features/sidebar-left/panels/components/components.tsx+++ b/apps/builder/app/builder/features/sidebar-left/panels/components/components.tsx@@ -16,7 +16,7 @@ import {selectedInstanceIdStore,} from "~/shared/nano-states";import { useSubscribe, type Publish } from "~/shared/pubsub";-import { useCanvasRect } from "~/designer/shared/nano-states";+import { useCanvasRect } from "~/builder/shared/nano-states";import { insertInstance } from "~/shared/instance-utils";import { zoomStore } from "~/shared/nano-states/breakpoints";import type { TabName } from "../../types";diff --git a/apps/designer/app/designer/features/sidebar-left/panels/components/index.ts b/apps/builder/app/builder/features/sidebar-left/panels/components/index.tssimilarity index 100%rename from apps/designer/app/designer/features/sidebar-left/panels/components/index.tsrename to apps/builder/app/builder/features/sidebar-left/panels/components/index.tsdiff --git a/apps/designer/app/designer/features/sidebar-left/panels/index.ts b/apps/builder/app/builder/features/sidebar-left/panels/index.tssimilarity index 100%rename from apps/designer/app/designer/features/sidebar-left/panels/index.tsrename to apps/builder/app/builder/features/sidebar-left/panels/index.tsdiff --git a/apps/designer/app/designer/features/sidebar-left/panels/navigator/index.ts b/apps/builder/app/builder/features/sidebar-left/panels/navigator/index.tssimilarity index 100%rename from apps/designer/app/designer/features/sidebar-left/panels/navigator/index.tsrename to apps/builder/app/builder/features/sidebar-left/panels/navigator/index.tsdiff --git a/apps/designer/app/designer/features/sidebar-left/panels/navigator/navigator.tsx b/apps/builder/app/builder/features/sidebar-left/panels/navigator/navigator.tsxsimilarity index 100%rename from apps/designer/app/designer/features/sidebar-left/panels/navigator/navigator.tsxrename to apps/builder/app/builder/features/sidebar-left/panels/navigator/navigator.tsxdiff --git a/apps/designer/app/designer/features/sidebar-left/panels/pages/index.ts b/apps/builder/app/builder/features/sidebar-left/panels/pages/index.tssimilarity index 100%rename from apps/designer/app/designer/features/sidebar-left/panels/pages/index.tsrename to apps/builder/app/builder/features/sidebar-left/panels/pages/index.tsdiff --git a/apps/designer/app/designer/features/sidebar-left/panels/pages/pages.tsx b/apps/builder/app/builder/features/sidebar-left/panels/pages/pages.tsxsimilarity index 98%rename from apps/designer/app/designer/features/sidebar-left/panels/pages/pages.tsxrename to apps/builder/app/builder/features/sidebar-left/panels/pages/pages.tsxindex d92c9955d9..e790aa817a 100644--- a/apps/designer/app/designer/features/sidebar-left/panels/pages/pages.tsx+++ b/apps/builder/app/builder/features/sidebar-left/panels/pages/pages.tsx@@ -25,8 +25,8 @@ import {useCurrentPageId,usePages,useProject,-} from "~/designer/shared/nano-states";-import { designerPath } from "~/shared/router-utils";+} 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";@@ -239,7 +239,7 @@ export const TabContent = (props: TabContentProps) => {return;}navigate(- designerPath({+ builderPath({projectId: project.id,pageId: pageId === "home" ? undefined : pageId,})diff --git a/apps/designer/app/designer/features/sidebar-left/panels/pages/settings-panel.tsx b/apps/builder/app/builder/features/sidebar-left/panels/pages/settings-panel.tsxsimilarity index 100%rename from apps/designer/app/designer/features/sidebar-left/panels/pages/settings-panel.tsxrename to apps/builder/app/builder/features/sidebar-left/panels/pages/settings-panel.tsxdiff --git a/apps/designer/app/designer/features/sidebar-left/panels/pages/settings.tsx b/apps/builder/app/builder/features/sidebar-left/panels/pages/settings.tsxsimilarity index 99%rename from apps/designer/app/designer/features/sidebar-left/panels/pages/settings.tsxrename to apps/builder/app/builder/features/sidebar-left/panels/pages/settings.tsxindex 2f33c89609..5705ee712e 100644--- a/apps/designer/app/designer/features/sidebar-left/panels/pages/settings.tsx+++ b/apps/builder/app/builder/features/sidebar-left/panels/pages/settings.tsx@@ -19,7 +19,7 @@ import {} from "@webstudio-is/design-system";import { ChevronDoubleLeftIcon, TrashIcon } from "@webstudio-is/icons";import { type Pages, utils as projectUtils } from "@webstudio-is/project";-import { usePages } from "~/designer/shared/nano-states";+import { usePages } from "~/builder/shared/nano-states";import { useOnFetchEnd, usePersistentFetcher } from "~/shared/fetcher";import {normalizeErrors,diff --git a/apps/designer/app/designer/features/sidebar-left/sidebar-left.tsx b/apps/builder/app/builder/features/sidebar-left/sidebar-left.tsxsimilarity index 97%rename from apps/designer/app/designer/features/sidebar-left/sidebar-left.tsxrename to apps/builder/app/builder/features/sidebar-left/sidebar-left.tsxindex 5ba06211ed..1f96a8447f 100644--- a/apps/designer/app/designer/features/sidebar-left/sidebar-left.tsx+++ b/apps/builder/app/builder/features/sidebar-left/sidebar-left.tsx@@ -9,7 +9,7 @@ import { useSubscribe, type Publish } from "~/shared/pubsub";import { useDragAndDropState } from "~/shared/nano-states";import { panels } from "./panels";import type { TabName } from "./types";-import { useClientSettings } from "~/designer/shared/client-settings";+import { useClientSettings } from "~/builder/shared/client-settings";import { Flex } from "@webstudio-is/design-system";import { theme } from "@webstudio-is/design-system";diff --git a/apps/designer/app/designer/features/sidebar-left/types.ts b/apps/builder/app/builder/features/sidebar-left/types.tssimilarity index 100%rename from apps/designer/app/designer/features/sidebar-left/types.tsrename to apps/builder/app/builder/features/sidebar-left/types.tsdiff --git a/apps/designer/app/designer/features/style-panel/controls/color/color-control.tsx b/apps/builder/app/builder/features/style-panel/controls/color/color-control.tsxsimilarity index 100%rename from apps/designer/app/designer/features/style-panel/controls/color/color-control.tsxrename to apps/builder/app/builder/features/style-panel/controls/color/color-control.tsxdiff --git a/apps/designer/app/designer/features/style-panel/controls/font-family/font-family-control.tsx b/apps/builder/app/builder/features/style-panel/controls/font-family/font-family-control.tsxsimilarity index 85%rename from apps/designer/app/designer/features/style-panel/controls/font-family/font-family-control.tsxrename to apps/builder/app/builder/features/style-panel/controls/font-family/font-family-control.tsxindex 9eaff404ff..a685b27199 100644--- a/apps/designer/app/designer/features/style-panel/controls/font-family/font-family-control.tsx+++ b/apps/builder/app/builder/features/style-panel/controls/font-family/font-family-control.tsx@@ -1,7 +1,7 @@import { TextField } from "@webstudio-is/design-system";-import { FontsManager } from "~/designer/shared/fonts-manager";+import { FontsManager } from "~/builder/shared/fonts-manager";import type { ControlProps } from "../../style-sections";-import { FloatingPanel } from "~/designer/shared/floating-panel";+import { FloatingPanel } from "~/builder/shared/floating-panel";import { useState } from "react";import { toValue } from "@webstudio-is/css-engine";diff --git a/apps/designer/app/designer/features/style-panel/controls/font-weight/font-weight-control.tsx b/apps/builder/app/builder/features/style-panel/controls/font-weight/font-weight-control.tsxsimilarity index 98%rename from apps/designer/app/designer/features/style-panel/controls/font-weight/font-weight-control.tsxrename to apps/builder/app/builder/features/style-panel/controls/font-weight/font-weight-control.tsxindex edc4416f5a..17b4dacdb7 100644--- a/apps/designer/app/designer/features/style-panel/controls/font-weight/font-weight-control.tsx+++ b/apps/builder/app/builder/features/style-panel/controls/font-weight/font-weight-control.tsx@@ -2,7 +2,7 @@ import { Select } from "@webstudio-is/design-system";import { FontWeight, fontWeights } from "@webstudio-is/fonts";import { toValue } from "@webstudio-is/css-engine";import { useMemo } from "react";-import { useAssets } from "~/designer/shared/assets";+import { useAssets } from "~/builder/shared/assets";import type { ControlProps } from "../../style-sections";import { theme } from "@webstudio-is/design-system";import { isSupportedFontWeight } from "./is-supported-font-weight";diff --git a/apps/designer/app/designer/features/style-panel/controls/font-weight/is-supported-font-weight.test.ts b/apps/builder/app/builder/features/style-panel/controls/font-weight/is-supported-font-weight.test.tssimilarity index 100%rename from apps/designer/app/designer/features/style-panel/controls/font-weight/is-supported-font-weight.test.tsrename to apps/builder/app/builder/features/style-panel/controls/font-weight/is-supported-font-weight.test.tsdiff --git a/apps/designer/app/designer/features/style-panel/controls/font-weight/is-supported-font-weight.ts b/apps/builder/app/builder/features/style-panel/controls/font-weight/is-supported-font-weight.tssimilarity index 100%rename from apps/designer/app/designer/features/style-panel/controls/font-weight/is-supported-font-weight.tsrename to apps/builder/app/builder/features/style-panel/controls/font-weight/is-supported-font-weight.tsdiff --git a/apps/designer/app/designer/features/style-panel/controls/image/image-control.tsx b/apps/builder/app/builder/features/style-panel/controls/image/image-control.tsxsimilarity index 87%rename from apps/designer/app/designer/features/style-panel/controls/image/image-control.tsxrename to apps/builder/app/builder/features/style-panel/controls/image/image-control.tsxindex bb7b05e82c..03f7aed6c5 100644--- a/apps/designer/app/designer/features/style-panel/controls/image/image-control.tsx+++ b/apps/builder/app/builder/features/style-panel/controls/image/image-control.tsx@@ -1,7 +1,7 @@import { TextField } from "@webstudio-is/design-system";import type { ControlProps } from "../../style-sections";-import { FloatingPanel } from "~/designer/shared/floating-panel";-import { ImageManager } from "~/designer/shared/image-manager";+import { FloatingPanel } from "~/builder/shared/floating-panel";+import { ImageManager } from "~/builder/shared/image-manager";export const ImageControl = ({property,diff --git a/apps/designer/app/designer/features/style-panel/controls/index.ts b/apps/builder/app/builder/features/style-panel/controls/index.tssimilarity index 100%rename from apps/designer/app/designer/features/style-panel/controls/index.tsrename to apps/builder/app/builder/features/style-panel/controls/index.tsdiff --git a/apps/designer/app/designer/features/style-panel/controls/menu/menu-control.tsx b/apps/builder/app/builder/features/style-panel/controls/menu/menu-control.tsxsimilarity index 100%rename from apps/designer/app/designer/features/style-panel/controls/menu/menu-control.tsxrename to apps/builder/app/builder/features/style-panel/controls/menu/menu-control.tsxdiff --git a/apps/designer/app/designer/features/style-panel/controls/select/select-control.tsx b/apps/builder/app/builder/features/style-panel/controls/select/select-control.tsxsimilarity index 100%rename from apps/designer/app/designer/features/style-panel/controls/select/select-control.tsxrename to apps/builder/app/builder/features/style-panel/controls/select/select-control.tsxdiff --git a/apps/designer/app/designer/features/style-panel/controls/text/text-control.tsx b/apps/builder/app/builder/features/style-panel/controls/text/text-control.tsxsimilarity index 100%rename from apps/designer/app/designer/features/style-panel/controls/text/text-control.tsxrename to apps/builder/app/builder/features/style-panel/controls/text/text-control.tsxdiff --git a/apps/designer/app/designer/features/style-panel/controls/toggle/toggle-control.tsx b/apps/builder/app/builder/features/style-panel/controls/toggle/toggle-control.tsxsimilarity index 100%rename from apps/designer/app/designer/features/style-panel/controls/toggle/toggle-control.tsxrename to apps/builder/app/builder/features/style-panel/controls/toggle/toggle-control.tsxdiff --git a/apps/designer/app/designer/features/style-panel/index.ts b/apps/builder/app/builder/features/style-panel/index.tssimilarity index 100%rename from apps/designer/app/designer/features/style-panel/index.tsrename to apps/builder/app/builder/features/style-panel/index.tsdiff --git a/apps/designer/app/designer/features/style-panel/sections/backgrounds/backgrounds.tsx b/apps/builder/app/builder/features/style-panel/sections/backgrounds/backgrounds.tsxsimilarity index 100%rename from apps/designer/app/designer/features/style-panel/sections/backgrounds/backgrounds.tsxrename to apps/builder/app/builder/features/style-panel/sections/backgrounds/backgrounds.tsxdiff --git a/apps/designer/app/designer/features/style-panel/sections/borders/borders.tsx b/apps/builder/app/builder/features/style-panel/sections/borders/borders.tsxsimilarity index 100%rename from apps/designer/app/designer/features/style-panel/sections/borders/borders.tsxrename to apps/builder/app/builder/features/style-panel/sections/borders/borders.tsxdiff --git a/apps/designer/app/designer/features/style-panel/sections/effects/effects.tsx b/apps/builder/app/builder/features/style-panel/sections/effects/effects.tsxsimilarity index 100%rename from apps/designer/app/designer/features/style-panel/sections/effects/effects.tsxrename to apps/builder/app/builder/features/style-panel/sections/effects/effects.tsxdiff --git a/apps/designer/app/designer/features/style-panel/sections/flex-child/flex-child.tsx b/apps/builder/app/builder/features/style-panel/sections/flex-child/flex-child.tsxsimilarity index 99%rename from apps/designer/app/designer/features/style-panel/sections/flex-child/flex-child.tsxrename to apps/builder/app/builder/features/style-panel/sections/flex-child/flex-child.tsxindex 8e8b279e85..92ca440c2c 100644--- a/apps/designer/app/designer/features/style-panel/sections/flex-child/flex-child.tsx+++ b/apps/builder/app/builder/features/style-panel/sections/flex-child/flex-child.tsx@@ -17,7 +17,7 @@ import {OrderLastIcon,EllipsesIcon,} from "@webstudio-is/icons";-import { FloatingPanel } from "~/designer/shared/floating-panel";+import { FloatingPanel } from "~/builder/shared/floating-panel";import { getStyleSource } from "../../shared/style-info";import { theme } from "@webstudio-is/design-system";diff --git a/apps/designer/app/designer/features/style-panel/sections/grid-child/grid-child.tsx b/apps/builder/app/builder/features/style-panel/sections/grid-child/grid-child.tsxsimilarity index 100%rename from apps/designer/app/designer/features/style-panel/sections/grid-child/grid-child.tsxrename to apps/builder/app/builder/features/style-panel/sections/grid-child/grid-child.tsxdiff --git a/apps/designer/app/designer/features/style-panel/sections/index.ts b/apps/builder/app/builder/features/style-panel/sections/index.tssimilarity index 100%rename from apps/designer/app/designer/features/style-panel/sections/index.tsrename to apps/builder/app/builder/features/style-panel/sections/index.tsdiff --git a/apps/designer/app/designer/features/style-panel/sections/layout/layout.tsx b/apps/builder/app/builder/features/style-panel/sections/layout/layout.tsxsimilarity index 100%rename from apps/designer/app/designer/features/style-panel/sections/layout/layout.tsxrename to apps/builder/app/builder/features/style-panel/sections/layout/layout.tsxdiff --git a/apps/designer/app/designer/features/style-panel/sections/layout/shared/flex-grid.stories.tsx b/apps/builder/app/builder/features/style-panel/sections/layout/shared/flex-grid.stories.tsxsimilarity index 100%rename from apps/designer/app/designer/features/style-panel/sections/layout/shared/flex-grid.stories.tsxrename to apps/builder/app/builder/features/style-panel/sections/layout/shared/flex-grid.stories.tsxdiff --git a/apps/designer/app/designer/features/style-panel/sections/layout/shared/flex-grid.tsx b/apps/builder/app/builder/features/style-panel/sections/layout/shared/flex-grid.tsxsimilarity index 100%rename from apps/designer/app/designer/features/style-panel/sections/layout/shared/flex-grid.tsxrename to apps/builder/app/builder/features/style-panel/sections/layout/shared/flex-grid.tsxdiff --git a/apps/designer/app/designer/features/style-panel/sections/other/other.tsx b/apps/builder/app/builder/features/style-panel/sections/other/other.tsxsimilarity index 100%rename from apps/designer/app/designer/features/style-panel/sections/other/other.tsxrename to apps/builder/app/builder/features/style-panel/sections/other/other.tsxdiff --git a/apps/designer/app/designer/features/style-panel/sections/position/position.tsx b/apps/builder/app/builder/features/style-panel/sections/position/position.tsxsimilarity index 100%rename from apps/designer/app/designer/features/style-panel/sections/position/position.tsxrename to apps/builder/app/builder/features/style-panel/sections/position/position.tsxdiff --git a/apps/designer/app/designer/features/style-panel/sections/size/size.tsx b/apps/builder/app/builder/features/style-panel/sections/size/size.tsxsimilarity index 100%rename from apps/designer/app/designer/features/style-panel/sections/size/size.tsxrename to apps/builder/app/builder/features/style-panel/sections/size/size.tsxdiff --git a/apps/designer/app/designer/features/style-panel/sections/space/input-popover.tsx b/apps/builder/app/builder/features/style-panel/sections/space/input-popover.tsxsimilarity index 100%rename from apps/designer/app/designer/features/style-panel/sections/space/input-popover.tsxrename to apps/builder/app/builder/features/style-panel/sections/space/input-popover.tsxdiff --git a/apps/designer/app/designer/features/style-panel/sections/space/keyboard.ts b/apps/builder/app/builder/features/style-panel/sections/space/keyboard.tssimilarity index 100%rename from apps/designer/app/designer/features/style-panel/sections/space/keyboard.tsrename to apps/builder/app/builder/features/style-panel/sections/space/keyboard.tsdiff --git a/apps/designer/app/designer/features/style-panel/sections/space/layout.stories.tsx b/apps/builder/app/builder/features/style-panel/sections/space/layout.stories.tsxsimilarity index 100%rename from apps/designer/app/designer/features/style-panel/sections/space/layout.stories.tsxrename to apps/builder/app/builder/features/style-panel/sections/space/layout.stories.tsxdiff --git a/apps/designer/app/designer/features/style-panel/sections/space/layout.tsx b/apps/builder/app/builder/features/style-panel/sections/space/layout.tsxsimilarity index 100%rename from apps/designer/app/designer/features/style-panel/sections/space/layout.tsxrename to apps/builder/app/builder/features/style-panel/sections/space/layout.tsxdiff --git a/apps/designer/app/designer/features/style-panel/sections/space/scrub.tsx b/apps/builder/app/builder/features/style-panel/sections/space/scrub.tsxsimilarity index 100%rename from apps/designer/app/designer/features/style-panel/sections/space/scrub.tsxrename to apps/builder/app/builder/features/style-panel/sections/space/scrub.tsxdiff --git a/apps/designer/app/designer/features/style-panel/sections/space/space.tsx b/apps/builder/app/builder/features/style-panel/sections/space/space.tsxsimilarity index 100%rename from apps/designer/app/designer/features/style-panel/sections/space/space.tsxrename to apps/builder/app/builder/features/style-panel/sections/space/space.tsxdiff --git a/apps/designer/app/designer/features/style-panel/sections/space/tooltip.tsx b/apps/builder/app/builder/features/style-panel/sections/space/tooltip.tsxsimilarity index 100%rename from apps/designer/app/designer/features/style-panel/sections/space/tooltip.tsxrename to apps/builder/app/builder/features/style-panel/sections/space/tooltip.tsxdiff --git a/apps/designer/app/designer/features/style-panel/sections/space/types.ts b/apps/builder/app/builder/features/style-panel/sections/space/types.tssimilarity index 100%rename from apps/designer/app/designer/features/style-panel/sections/space/types.tsrename to apps/builder/app/builder/features/style-panel/sections/space/types.tsdiff --git a/apps/designer/app/designer/features/style-panel/sections/space/value-text.stories.tsx b/apps/builder/app/builder/features/style-panel/sections/space/value-text.stories.tsxsimilarity index 100%rename from apps/designer/app/designer/features/style-panel/sections/space/value-text.stories.tsxrename to apps/builder/app/builder/features/style-panel/sections/space/value-text.stories.tsxdiff --git a/apps/designer/app/designer/features/style-panel/sections/space/value-text.tsx b/apps/builder/app/builder/features/style-panel/sections/space/value-text.tsxsimilarity index 100%rename from apps/designer/app/designer/features/style-panel/sections/space/value-text.tsxrename to apps/builder/app/builder/features/style-panel/sections/space/value-text.tsxdiff --git a/apps/designer/app/designer/features/style-panel/sections/typography/typography.tsx b/apps/builder/app/builder/features/style-panel/sections/typography/typography.tsxsimilarity index 99%rename from apps/designer/app/designer/features/style-panel/sections/typography/typography.tsxrename to apps/builder/app/builder/features/style-panel/sections/typography/typography.tsxindex 2c792c33ba..3c1943b5e3 100644--- a/apps/designer/app/designer/features/style-panel/sections/typography/typography.tsx+++ b/apps/builder/app/builder/features/style-panel/sections/typography/typography.tsx@@ -33,7 +33,7 @@ import {TextUppercaseIcon,} from "@webstudio-is/icons";import { ToggleGroupControl } from "../../controls/toggle/toggle-control";-import { FloatingPanel } from "~/designer/shared/floating-panel";+import { FloatingPanel } from "~/builder/shared/floating-panel";import { getStyleSource } from "../../shared/style-info";import { theme } from "@webstudio-is/design-system";diff --git a/apps/designer/app/designer/features/style-panel/shared/color-picker.tsx b/apps/builder/app/builder/features/style-panel/shared/color-picker.tsxsimilarity index 99%rename from apps/designer/app/designer/features/style-panel/shared/color-picker.tsxrename to apps/builder/app/builder/features/style-panel/shared/color-picker.tsxindex f8179174ff..10bb994f24 100644--- a/apps/designer/app/designer/features/style-panel/shared/color-picker.tsx+++ b/apps/builder/app/builder/features/style-panel/shared/color-picker.tsx@@ -101,7 +101,7 @@ export const ColorPicker = ({}// We don't store invalid values in the CSS data, below is the only way we can show errors.- // See for details: https://github.com/webstudio-is/webstudio-designer/issues/564+ // See for details: https://github.com/webstudio-is/webstudio-builder/issues/564// Anyway same behavior has Webflow - shows an error state on "Enter", and resets on Blur// In case of "Enter" click show that the value is invaliddiff --git a/apps/designer/app/designer/features/style-panel/shared/configs.ts b/apps/builder/app/builder/features/style-panel/shared/configs.tssimilarity index 100%rename from apps/designer/app/designer/features/style-panel/shared/configs.tsrename to apps/builder/app/builder/features/style-panel/shared/configs.tsdiff --git a/apps/designer/app/designer/features/style-panel/shared/constants.ts b/apps/builder/app/builder/features/style-panel/shared/constants.tssimilarity index 100%rename from apps/designer/app/designer/features/style-panel/shared/constants.tsrename to apps/builder/app/builder/features/style-panel/shared/constants.tsdiff --git a/apps/designer/app/designer/features/style-panel/shared/css-value-input/css-value-input.stories.tsx b/apps/builder/app/builder/features/style-panel/shared/css-value-input/css-value-input.stories.tsxsimilarity index 100%rename from apps/designer/app/designer/features/style-panel/shared/css-value-input/css-value-input.stories.tsxrename to apps/builder/app/builder/features/style-panel/shared/css-value-input/css-value-input.stories.tsxdiff --git a/apps/designer/app/designer/features/style-panel/shared/css-value-input/css-value-input.tsx b/apps/builder/app/builder/features/style-panel/shared/css-value-input/css-value-input.tsxsimilarity index 99%rename from apps/designer/app/designer/features/style-panel/shared/css-value-input/css-value-input.tsxrename to apps/builder/app/builder/features/style-panel/shared/css-value-input/css-value-input.tsxindex 58dc3378c0..2c4bbf0182 100644--- a/apps/designer/app/designer/features/style-panel/shared/css-value-input/css-value-input.tsx+++ b/apps/builder/app/builder/features/style-panel/shared/css-value-input/css-value-input.tsx@@ -90,7 +90,7 @@ const useScrub = ({}const scrub = numericScrubControl(scrubRefCurrent, {- // @todo: after this https://github.com/webstudio-is/webstudio-designer/issues/564+ // @todo: after this https://github.com/webstudio-is/webstudio-builder/issues/564// we can switch back on using just initial value//// For now we are reusing controls for different selectedInstanceData,diff --git a/apps/designer/app/designer/features/style-panel/shared/css-value-input/evaluate-math.test.ts b/apps/builder/app/builder/features/style-panel/shared/css-value-input/evaluate-math.test.tssimilarity index 100%rename from apps/designer/app/designer/features/style-panel/shared/css-value-input/evaluate-math.test.tsrename to apps/builder/app/builder/features/style-panel/shared/css-value-input/evaluate-math.test.tsdiff --git a/apps/designer/app/designer/features/style-panel/shared/css-value-input/evaluate-math.ts b/apps/builder/app/builder/features/style-panel/shared/css-value-input/evaluate-math.tssimilarity index 100%rename from apps/designer/app/designer/features/style-panel/shared/css-value-input/evaluate-math.tsrename to apps/builder/app/builder/features/style-panel/shared/css-value-input/evaluate-math.tsdiff --git a/apps/designer/app/designer/features/style-panel/shared/css-value-input/index.ts b/apps/builder/app/builder/features/style-panel/shared/css-value-input/index.tssimilarity index 100%rename from apps/designer/app/designer/features/style-panel/shared/css-value-input/index.tsrename to apps/builder/app/builder/features/style-panel/shared/css-value-input/index.tsdiff --git a/apps/designer/app/designer/features/style-panel/shared/css-value-input/keyword-utils.test.ts b/apps/builder/app/builder/features/style-panel/shared/css-value-input/keyword-utils.test.tssimilarity index 100%rename from apps/designer/app/designer/features/style-panel/shared/css-value-input/keyword-utils.test.tsrename to apps/builder/app/builder/features/style-panel/shared/css-value-input/keyword-utils.test.tsdiff --git a/apps/designer/app/designer/features/style-panel/shared/css-value-input/parse-intermediate-or-invalid-value.ts b/apps/builder/app/builder/features/style-panel/shared/css-value-input/parse-intermediate-or-invalid-value.tssimilarity index 100%rename from apps/designer/app/designer/features/style-panel/shared/css-value-input/parse-intermediate-or-invalid-value.tsrename to apps/builder/app/builder/features/style-panel/shared/css-value-input/parse-intermediate-or-invalid-value.tsdiff --git a/apps/designer/app/designer/features/style-panel/shared/css-value-input/parse-intermediate-or-invalid-value.ts.test.ts b/apps/builder/app/builder/features/style-panel/shared/css-value-input/parse-intermediate-or-invalid-value.ts.test.tssimilarity index 100%rename from apps/designer/app/designer/features/style-panel/shared/css-value-input/parse-intermediate-or-invalid-value.ts.test.tsrename to apps/builder/app/builder/features/style-panel/shared/css-value-input/parse-intermediate-or-invalid-value.ts.test.tsdiff --git a/apps/designer/app/designer/features/style-panel/shared/css-value-input/unit-select.tsx b/apps/builder/app/builder/features/style-panel/shared/css-value-input/unit-select.tsxsimilarity index 100%rename from apps/designer/app/designer/features/style-panel/shared/css-value-input/unit-select.tsxrename to apps/builder/app/builder/features/style-panel/shared/css-value-input/unit-select.tsxdiff --git a/apps/designer/app/designer/features/style-panel/shared/dependencies.ts b/apps/builder/app/builder/features/style-panel/shared/dependencies.tssimilarity index 100%rename from apps/designer/app/designer/features/style-panel/shared/dependencies.tsrename to apps/builder/app/builder/features/style-panel/shared/dependencies.tsdiff --git a/apps/designer/app/designer/features/style-panel/shared/keyword-utils.ts b/apps/builder/app/builder/features/style-panel/shared/keyword-utils.tssimilarity index 100%rename from apps/designer/app/designer/features/style-panel/shared/keyword-utils.tsrename to apps/builder/app/builder/features/style-panel/shared/keyword-utils.tsdiff --git a/apps/designer/app/designer/features/style-panel/shared/modifier-keys.ts b/apps/builder/app/builder/features/style-panel/shared/modifier-keys.tssimilarity index 100%rename from apps/designer/app/designer/features/style-panel/shared/modifier-keys.tsrename to apps/builder/app/builder/features/style-panel/shared/modifier-keys.tsdiff --git a/apps/designer/app/designer/features/style-panel/shared/parse-css-value.test.ts b/apps/builder/app/builder/features/style-panel/shared/parse-css-value.test.tssimilarity index 100%rename from apps/designer/app/designer/features/style-panel/shared/parse-css-value.test.tsrename to apps/builder/app/builder/features/style-panel/shared/parse-css-value.test.tsdiff --git a/apps/designer/app/designer/features/style-panel/shared/parse-css-value.ts b/apps/builder/app/builder/features/style-panel/shared/parse-css-value.tssimilarity index 100%rename from apps/designer/app/designer/features/style-panel/shared/parse-css-value.tsrename to apps/builder/app/builder/features/style-panel/shared/parse-css-value.tsdiff --git a/apps/designer/app/designer/features/style-panel/shared/property-name.tsx b/apps/builder/app/builder/features/style-panel/shared/property-name.tsxsimilarity index 100%rename from apps/designer/app/designer/features/style-panel/shared/property-name.tsxrename to apps/builder/app/builder/features/style-panel/shared/property-name.tsxdiff --git a/apps/designer/app/designer/features/style-panel/shared/show-more.tsx b/apps/builder/app/builder/features/style-panel/shared/show-more.tsxsimilarity index 100%rename from apps/designer/app/designer/features/style-panel/shared/show-more.tsxrename to apps/builder/app/builder/features/style-panel/shared/show-more.tsxdiff --git a/apps/designer/app/designer/features/style-panel/shared/style-info.test.ts b/apps/builder/app/builder/features/style-panel/shared/style-info.test.tssimilarity index 100%rename from apps/designer/app/designer/features/style-panel/shared/style-info.test.tsrename to apps/builder/app/builder/features/style-panel/shared/style-info.test.tsdiff --git a/apps/designer/app/designer/features/style-panel/shared/style-info.ts b/apps/builder/app/builder/features/style-panel/shared/style-info.tssimilarity index 100%rename from apps/designer/app/designer/features/style-panel/shared/style-info.tsrename to apps/builder/app/builder/features/style-panel/shared/style-info.tsdiff --git a/apps/designer/app/designer/features/style-panel/shared/use-style-data.ts b/apps/builder/app/builder/features/style-panel/shared/use-style-data.tssimilarity index 100%rename from apps/designer/app/designer/features/style-panel/shared/use-style-data.tsrename to apps/builder/app/builder/features/style-panel/shared/use-style-data.tsdiff --git a/apps/designer/app/designer/features/style-panel/style-panel.tsx b/apps/builder/app/builder/features/style-panel/style-panel.tsxsimilarity index 94%rename from apps/designer/app/designer/features/style-panel/style-panel.tsxrename to apps/builder/app/builder/features/style-panel/style-panel.tsxindex 1985d602d5..d335426fa7 100644--- a/apps/designer/app/designer/features/style-panel/style-panel.tsx+++ b/apps/builder/app/builder/features/style-panel/style-panel.tsx@@ -9,10 +9,10 @@ import {import type { Instance } from "@webstudio-is/project-build";import type { Publish } from "~/shared/pubsub";import { selectedBreakpointStore } from "~/shared/nano-states/breakpoints";-import { willRender } from "~/designer/shared/breakpoints";+import { willRender } from "~/builder/shared/breakpoints";import { useStyleData } from "./shared/use-style-data";import { StyleSettings } from "./style-settings";-import { useCanvasWidth } from "~/designer/shared/nano-states";+import { useCanvasWidth } from "~/builder/shared/nano-states";import { StyleSourcesSection } from "./style-source-section";type StylePanelProps = {diff --git a/apps/designer/app/designer/features/style-panel/style-sections.tsx b/apps/builder/app/builder/features/style-panel/style-sections.tsxsimilarity index 100%rename from apps/designer/app/designer/features/style-panel/style-sections.tsxrename to apps/builder/app/builder/features/style-panel/style-sections.tsxdiff --git a/apps/designer/app/designer/features/style-panel/style-settings.tsx b/apps/builder/app/builder/features/style-panel/style-settings.tsxsimilarity index 98%rename from apps/designer/app/designer/features/style-panel/style-settings.tsxrename to apps/builder/app/builder/features/style-panel/style-settings.tsxindex b770a71e8a..08aa28eb0b 100644--- a/apps/designer/app/designer/features/style-panel/style-settings.tsx+++ b/apps/builder/app/builder/features/style-panel/style-settings.tsx@@ -8,7 +8,7 @@ import {styleConfigs,styleConfigByName,} from "./shared/configs";-import { CollapsibleSection } from "~/designer/shared/inspector";+import { CollapsibleSection } from "~/builder/shared/inspector";import { renderCategory, shouldRenderCategory } from "./style-sections";import { dependencies } from "./shared/dependencies";import type { SetProperty, CreateBatchUpdate } from "./shared/use-style-data";diff --git a/apps/designer/app/designer/features/style-panel/style-source-section.tsx b/apps/builder/app/builder/features/style-panel/style-source-section.tsxsimilarity index 100%rename from apps/designer/app/designer/features/style-panel/style-source-section.tsxrename to apps/builder/app/builder/features/style-panel/style-source-section.tsxdiff --git a/apps/designer/app/designer/features/style-panel/style-source/index.ts b/apps/builder/app/builder/features/style-panel/style-source/index.tssimilarity index 100%rename from apps/designer/app/designer/features/style-panel/style-source/index.tsrename to apps/builder/app/builder/features/style-panel/style-source/index.tsdiff --git a/apps/designer/app/designer/features/style-panel/style-source/style-source-badge.stories.tsx b/apps/builder/app/builder/features/style-panel/style-source/style-source-badge.stories.tsxsimilarity index 100%rename from apps/designer/app/designer/features/style-panel/style-source/style-source-badge.stories.tsxrename to apps/builder/app/builder/features/style-panel/style-source/style-source-badge.stories.tsxdiff --git a/apps/designer/app/designer/features/style-panel/style-source/style-source-badge.tsx b/apps/builder/app/builder/features/style-panel/style-source/style-source-badge.tsxsimilarity index 100%rename from apps/designer/app/designer/features/style-panel/style-source/style-source-badge.tsxrename to apps/builder/app/builder/features/style-panel/style-source/style-source-badge.tsxdiff --git a/apps/designer/app/designer/features/style-panel/style-source/style-source-input.stories.tsx b/apps/builder/app/builder/features/style-panel/style-source/style-source-input.stories.tsxsimilarity index 99%rename from apps/designer/app/designer/features/style-panel/style-source/style-source-input.stories.tsxrename to apps/builder/app/builder/features/style-panel/style-source/style-source-input.stories.tsxindex 13e3bd74a9..9a7d5e869a 100644--- a/apps/designer/app/designer/features/style-panel/style-source/style-source-input.stories.tsx+++ b/apps/builder/app/builder/features/style-panel/style-source/style-source-input.stories.tsx@@ -1,7 +1,7 @@import { nanoid } from "nanoid";import type { ComponentStory } from "@storybook/react";import { useState } from "react";-import { StyleSourceInput, type ItemState, type ItemSource } from "./";+import { StyleSourceInput, type ItemState, type ItemSource } from ".";export default {component: StyleSourceInput,diff --git a/apps/designer/app/designer/features/style-panel/style-source/style-source-input.tsx b/apps/builder/app/builder/features/style-panel/style-source/style-source-input.tsxsimilarity index 100%rename from apps/designer/app/designer/features/style-panel/style-source/style-source-input.tsxrename to apps/builder/app/builder/features/style-panel/style-source/style-source-input.tsxdiff --git a/apps/designer/app/designer/features/style-panel/style-source/style-source.tsx b/apps/builder/app/builder/features/style-panel/style-source/style-source.tsxsimilarity index 100%rename from apps/designer/app/designer/features/style-panel/style-source/style-source.tsxrename to apps/builder/app/builder/features/style-panel/style-source/style-source.tsxdiff --git a/apps/designer/app/designer/features/style-panel/style-source/use-sortable.tsx b/apps/builder/app/builder/features/style-panel/style-source/use-sortable.tsxsimilarity index 100%rename from apps/designer/app/designer/features/style-panel/style-source/use-sortable.tsxrename to apps/builder/app/builder/features/style-panel/style-source/use-sortable.tsxdiff --git a/apps/designer/app/designer/features/topbar/index.ts b/apps/builder/app/builder/features/topbar/index.tssimilarity index 100%rename from apps/designer/app/designer/features/topbar/index.tsrename to apps/builder/app/builder/features/topbar/index.tsdiff --git a/apps/designer/app/designer/features/topbar/menu/index.ts b/apps/builder/app/builder/features/topbar/menu/index.tssimilarity index 100%rename from apps/designer/app/designer/features/topbar/menu/index.tsrename to apps/builder/app/builder/features/topbar/menu/index.tsdiff --git a/apps/designer/app/designer/features/topbar/menu/menu-button.tsx b/apps/builder/app/builder/features/topbar/menu/menu-button.tsxsimilarity index 100%rename from apps/designer/app/designer/features/topbar/menu/menu-button.tsxrename to apps/builder/app/builder/features/topbar/menu/menu-button.tsxdiff --git a/apps/designer/app/designer/features/topbar/menu/menu.tsx b/apps/builder/app/builder/features/topbar/menu/menu.tsxsimilarity index 97%rename from apps/designer/app/designer/features/topbar/menu/menu.tsxrename to apps/builder/app/builder/features/topbar/menu/menu.tsxindex c70234425e..f99c8fc6c3 100644--- a/apps/designer/app/designer/features/topbar/menu/menu.tsx+++ b/apps/builder/app/builder/features/topbar/menu/menu.tsx@@ -20,13 +20,13 @@ import { ShortcutHint } from "./shortcut-hint";import {useIsShareDialogOpen,useIsPublishDialogOpen,-} from "~/designer/shared/nano-states";+} from "~/builder/shared/nano-states";import {getThemeSetting,setThemeSetting,type ThemeSetting,} from "~/shared/theme";-import { useClientSettings } from "~/designer/shared/client-settings";+import { useClientSettings } from "~/builder/shared/client-settings";import { dashboardPath } from "~/shared/router-utils";import {selectedInstanceIdStore,@@ -147,7 +147,7 @@ export const Menu = ({ publish }: MenuProps) => {</DropdownMenuItemRightSlot></DropdownMenuItem><DropdownMenuSeparator />- {/* https://github.com/webstudio-is/webstudio-designer/issues/499+ {/* https://github.com/webstudio-is/webstudio-builder/issues/499<DropdownMenuItemonSelect={() => {diff --git a/apps/designer/app/designer/features/topbar/menu/shortcut-hint.tsx b/apps/builder/app/builder/features/topbar/menu/shortcut-hint.tsxsimilarity index 100%rename from apps/designer/app/designer/features/topbar/menu/shortcut-hint.tsxrename to apps/builder/app/builder/features/topbar/menu/shortcut-hint.tsxdiff --git a/apps/designer/app/designer/features/topbar/preview.tsx b/apps/builder/app/builder/features/topbar/preview.tsxsimilarity index 100%rename from apps/designer/app/designer/features/topbar/preview.tsxrename to apps/builder/app/builder/features/topbar/preview.tsxdiff --git a/apps/designer/app/designer/features/topbar/publish.tsx b/apps/builder/app/builder/features/topbar/publish.tsxsimilarity index 100%rename from apps/designer/app/designer/features/topbar/publish.tsxrename to apps/builder/app/builder/features/topbar/publish.tsxdiff --git a/apps/designer/app/designer/features/topbar/share.tsx b/apps/builder/app/builder/features/topbar/share.tsxsimilarity index 95%rename from apps/designer/app/designer/features/topbar/share.tsxrename to apps/builder/app/builder/features/topbar/share.tsxindex 80c999fcdd..07804a7987 100644--- a/apps/designer/app/designer/features/topbar/share.tsx+++ b/apps/builder/app/builder/features/topbar/share.tsx@@ -11,7 +11,7 @@ import {import type { Project } from "@webstudio-is/prisma-client";import { ShareProjectContainer } from "~/shared/share-project";import { useAuthPermit } from "~/shared/nano-states";-import { useIsShareDialogOpen } from "~/designer/shared/nano-states";+import { useIsShareDialogOpen } from "~/builder/shared/nano-states";export const ShareButton = ({ projectId }: { projectId: Project["id"] }) => {const [isShareOpen, setIsShareOpen] = useIsShareDialogOpen();diff --git a/apps/designer/app/designer/features/topbar/sync-status.tsx b/apps/builder/app/builder/features/topbar/sync-status.tsxsimilarity index 96%rename from apps/designer/app/designer/features/topbar/sync-status.tsxrename to apps/builder/app/builder/features/topbar/sync-status.tsxindex ba672597ce..16c7721aea 100644--- a/apps/designer/app/designer/features/topbar/sync-status.tsx+++ b/apps/builder/app/builder/features/topbar/sync-status.tsx@@ -3,7 +3,7 @@ import { atom } from "nanostores";import { Flex, rawTheme, Tooltip } from "@webstudio-is/design-system";import { OfflineIcon } from "@webstudio-is/icons";import { useEffect } from "react";-import { queueStatus } from "~/designer/shared/sync";+import { queueStatus } from "~/builder/shared/sync";const isOnlineStore = atom(false);diff --git a/apps/designer/app/designer/features/topbar/topbar.tsx b/apps/builder/app/builder/features/topbar/topbar.tsxsimilarity index 100%rename from apps/designer/app/designer/features/topbar/topbar.tsxrename to apps/builder/app/builder/features/topbar/topbar.tsxdiff --git a/apps/designer/app/designer/features/topbar/view-mode.tsx b/apps/builder/app/builder/features/topbar/view-mode.tsxsimilarity index 100%rename from apps/designer/app/designer/features/topbar/view-mode.tsxrename to apps/builder/app/builder/features/topbar/view-mode.tsxdiff --git a/apps/designer/app/designer/features/tree-preview/index.ts b/apps/builder/app/builder/features/tree-preview/index.tssimilarity index 100%rename from apps/designer/app/designer/features/tree-preview/index.tsrename to apps/builder/app/builder/features/tree-preview/index.tsdiff --git a/apps/designer/app/designer/features/tree-preview/tree-preview.tsx b/apps/builder/app/builder/features/tree-preview/tree-preview.tsxsimilarity index 97%rename from apps/designer/app/designer/features/tree-preview/tree-preview.tsxrename to apps/builder/app/builder/features/tree-preview/tree-preview.tsxindex 38f6a7d91c..dca9d1690b 100644--- a/apps/designer/app/designer/features/tree-preview/tree-preview.tsx+++ b/apps/builder/app/builder/features/tree-preview/tree-preview.tsx@@ -9,7 +9,7 @@ import {useDragAndDropState,instancesIndexStore,} from "~/shared/nano-states";-import { InstanceTreeNode } from "~/designer/shared/tree";+import { InstanceTreeNode } from "~/builder/shared/tree";import {createInstancesIndex,insertInstanceMutable,diff --git a/apps/designer/app/designer/features/workspace/canvas-iframe.tsx b/apps/builder/app/builder/features/workspace/canvas-iframe.tsxsimilarity index 100%rename from apps/designer/app/designer/features/workspace/canvas-iframe.tsxrename to apps/builder/app/builder/features/workspace/canvas-iframe.tsxdiff --git a/apps/designer/app/designer/features/workspace/canvas-tools/canvas-tools.tsx b/apps/builder/app/builder/features/workspace/canvas-tools/canvas-tools.tsxsimilarity index 100%rename from apps/designer/app/designer/features/workspace/canvas-tools/canvas-tools.tsxrename to apps/builder/app/builder/features/workspace/canvas-tools/canvas-tools.tsxdiff --git a/apps/designer/app/designer/features/workspace/canvas-tools/hooks/use-subscribe-editing-instance-id.ts b/apps/builder/app/builder/features/workspace/canvas-tools/hooks/use-subscribe-editing-instance-id.tssimilarity index 100%rename from apps/designer/app/designer/features/workspace/canvas-tools/hooks/use-subscribe-editing-instance-id.tsrename to apps/builder/app/builder/features/workspace/canvas-tools/hooks/use-subscribe-editing-instance-id.tsdiff --git a/apps/designer/app/designer/features/workspace/canvas-tools/hooks/use-subscribe-instance-rect.ts b/apps/builder/app/builder/features/workspace/canvas-tools/hooks/use-subscribe-instance-rect.tssimilarity index 100%rename from apps/designer/app/designer/features/workspace/canvas-tools/hooks/use-subscribe-instance-rect.tsrename to apps/builder/app/builder/features/workspace/canvas-tools/hooks/use-subscribe-instance-rect.tsdiff --git a/apps/designer/app/designer/features/workspace/canvas-tools/index.ts b/apps/builder/app/builder/features/workspace/canvas-tools/index.tssimilarity index 100%rename from apps/designer/app/designer/features/workspace/canvas-tools/index.tsrename to apps/builder/app/builder/features/workspace/canvas-tools/index.tsdiff --git a/apps/designer/app/designer/features/workspace/canvas-tools/outline/drop-target-outline.tsx b/apps/builder/app/builder/features/workspace/canvas-tools/outline/drop-target-outline.tsxsimilarity index 100%rename from apps/designer/app/designer/features/workspace/canvas-tools/outline/drop-target-outline.tsxrename to apps/builder/app/builder/features/workspace/canvas-tools/outline/drop-target-outline.tsxdiff --git a/apps/designer/app/designer/features/workspace/canvas-tools/outline/hovered-instance-outline.tsx b/apps/builder/app/builder/features/workspace/canvas-tools/outline/hovered-instance-outline.tsxsimilarity index 100%rename from apps/designer/app/designer/features/workspace/canvas-tools/outline/hovered-instance-outline.tsxrename to apps/builder/app/builder/features/workspace/canvas-tools/outline/hovered-instance-outline.tsxdiff --git a/apps/designer/app/designer/features/workspace/canvas-tools/outline/index.ts b/apps/builder/app/builder/features/workspace/canvas-tools/outline/index.tssimilarity index 100%rename from apps/designer/app/designer/features/workspace/canvas-tools/outline/index.tsrename to apps/builder/app/builder/features/workspace/canvas-tools/outline/index.tsdiff --git a/apps/designer/app/designer/features/workspace/canvas-tools/outline/label.tsx b/apps/builder/app/builder/features/workspace/canvas-tools/outline/label.tsxsimilarity index 100%rename from apps/designer/app/designer/features/workspace/canvas-tools/outline/label.tsxrename to apps/builder/app/builder/features/workspace/canvas-tools/outline/label.tsxdiff --git a/apps/designer/app/designer/features/workspace/canvas-tools/outline/outline.tsx b/apps/builder/app/builder/features/workspace/canvas-tools/outline/outline.tsxsimilarity index 100%rename from apps/designer/app/designer/features/workspace/canvas-tools/outline/outline.tsxrename to apps/builder/app/builder/features/workspace/canvas-tools/outline/outline.tsxdiff --git a/apps/designer/app/designer/features/workspace/canvas-tools/outline/selected-instance-outline.tsx b/apps/builder/app/builder/features/workspace/canvas-tools/outline/selected-instance-outline.tsxsimilarity index 100%rename from apps/designer/app/designer/features/workspace/canvas-tools/outline/selected-instance-outline.tsxrename to apps/builder/app/builder/features/workspace/canvas-tools/outline/selected-instance-outline.tsxdiff --git a/apps/designer/app/designer/features/workspace/canvas-tools/text-toolbar/index.ts b/apps/builder/app/builder/features/workspace/canvas-tools/text-toolbar/index.tssimilarity index 100%rename from apps/designer/app/designer/features/workspace/canvas-tools/text-toolbar/index.tsrename to apps/builder/app/builder/features/workspace/canvas-tools/text-toolbar/index.tsdiff --git a/apps/designer/app/designer/features/workspace/canvas-tools/text-toolbar/text-toolbar.tsx b/apps/builder/app/builder/features/workspace/canvas-tools/text-toolbar/text-toolbar.tsxsimilarity index 99%rename from apps/designer/app/designer/features/workspace/canvas-tools/text-toolbar/text-toolbar.tsxrename to apps/builder/app/builder/features/workspace/canvas-tools/text-toolbar/text-toolbar.tsxindex 5ff70f9d24..6de8aa2c7c 100644--- a/apps/designer/app/designer/features/workspace/canvas-tools/text-toolbar/text-toolbar.tsx+++ b/apps/builder/app/builder/features/workspace/canvas-tools/text-toolbar/text-toolbar.tsx@@ -5,7 +5,7 @@ import type { Publish } from "~/shared/pubsub";import {type TextToolbarState,useTextToolbarState,-} from "~/designer/shared/nano-states";+} from "~/builder/shared/nano-states";import { Flex, IconButton, Tooltip } from "@webstudio-is/design-system";import {FontBoldIcon,diff --git a/apps/designer/app/designer/features/workspace/index.ts b/apps/builder/app/builder/features/workspace/index.tssimilarity index 100%rename from apps/designer/app/designer/features/workspace/index.tsrename to apps/builder/app/builder/features/workspace/index.tsdiff --git a/apps/designer/app/designer/features/workspace/use-read-canvas-rect.ts b/apps/builder/app/builder/features/workspace/use-read-canvas-rect.tssimilarity index 94%rename from apps/designer/app/designer/features/workspace/use-read-canvas-rect.tsrename to apps/builder/app/builder/features/workspace/use-read-canvas-rect.tsindex 6d690af677..ea0a9d538c 100644--- a/apps/designer/app/designer/features/workspace/use-read-canvas-rect.ts+++ b/apps/builder/app/builder/features/workspace/use-read-canvas-rect.ts@@ -1,6 +1,6 @@import { useCallback, useEffect, useState } from "react";import { useStore } from "@nanostores/react";-import { useCanvasRect, useCanvasWidth } from "~/designer/shared/nano-states";+import { useCanvasRect, useCanvasWidth } from "~/builder/shared/nano-states";import { useWindowResize } from "~/shared/dom-hooks";import { zoomStore } from "~/shared/nano-states/breakpoints";diff --git a/apps/designer/app/designer/features/workspace/workspace.tsx b/apps/builder/app/builder/features/workspace/workspace.tsxsimilarity index 96%rename from apps/designer/app/designer/features/workspace/workspace.tsxrename to apps/builder/app/builder/features/workspace/workspace.tsxindex d5a0bdd87e..9e9b7d476c 100644--- a/apps/designer/app/designer/features/workspace/workspace.tsx+++ b/apps/builder/app/builder/features/workspace/workspace.tsx@@ -1,6 +1,6 @@import { useStore } from "@nanostores/react";import { theme, Box, Flex, Toaster } from "@webstudio-is/design-system";-import { useCanvasWidth } from "~/designer/shared/nano-states";+import { useCanvasWidth } from "~/builder/shared/nano-states";import type { Publish } from "~/shared/pubsub";import { selectedInstanceIdStore } from "~/shared/nano-states";import { zoomStore } from "~/shared/nano-states/breakpoints";diff --git a/apps/builder/app/builder/index.ts b/apps/builder/app/builder/index.tsnew file mode 100644index 0000000000..0873f75023--- /dev/null+++ b/apps/builder/app/builder/index.ts@@ -0,0 +1 @@+export * from "./builder";diff --git a/apps/designer/app/designer/shared/assets/asset-upload.tsx b/apps/builder/app/builder/shared/assets/asset-upload.tsxsimilarity index 100%rename from apps/designer/app/designer/shared/assets/asset-upload.tsxrename to apps/builder/app/builder/shared/assets/asset-upload.tsxdiff --git a/apps/designer/app/designer/shared/assets/assets-shell.tsx b/apps/builder/app/builder/shared/assets/assets-shell.tsxsimilarity index 100%rename from apps/designer/app/designer/shared/assets/assets-shell.tsxrename to apps/builder/app/builder/shared/assets/assets-shell.tsxdiff --git a/apps/designer/app/designer/shared/assets/index.ts b/apps/builder/app/builder/shared/assets/index.tssimilarity index 100%rename from apps/designer/app/designer/shared/assets/index.tsrename to apps/builder/app/builder/shared/assets/index.tsdiff --git a/apps/designer/app/designer/shared/assets/not-found.tsx b/apps/builder/app/builder/shared/assets/not-found.tsxsimilarity index 100%rename from apps/designer/app/designer/shared/assets/not-found.tsxrename to apps/builder/app/builder/shared/assets/not-found.tsxdiff --git a/apps/designer/app/designer/shared/assets/separator.tsx b/apps/builder/app/builder/shared/assets/separator.tsxsimilarity index 100%rename from apps/designer/app/designer/shared/assets/separator.tsxrename to apps/builder/app/builder/shared/assets/separator.tsxdiff --git a/apps/designer/app/designer/shared/assets/types.ts b/apps/builder/app/builder/shared/assets/types.tssimilarity index 100%rename from apps/designer/app/designer/shared/assets/types.tsrename to apps/builder/app/builder/shared/assets/types.tsdiff --git a/apps/designer/app/designer/shared/assets/update-asset-containers.test.ts b/apps/builder/app/builder/shared/assets/update-asset-containers.test.tssimilarity index 100%rename from apps/designer/app/designer/shared/assets/update-asset-containers.test.tsrename to apps/builder/app/builder/shared/assets/update-asset-containers.test.tsdiff --git a/apps/designer/app/designer/shared/assets/update-asset-containers.ts b/apps/builder/app/builder/shared/assets/update-asset-containers.tssimilarity index 100%rename from apps/designer/app/designer/shared/assets/update-asset-containers.tsrename to apps/builder/app/builder/shared/assets/update-asset-containers.tsdiff --git a/apps/designer/app/designer/shared/assets/use-assets.tsx b/apps/builder/app/builder/shared/assets/use-assets.tsxsimilarity index 99%rename from apps/designer/app/designer/shared/assets/use-assets.tsxrename to apps/builder/app/builder/shared/assets/use-assets.tsxindex 547c2448d6..3a08df6887 100644--- a/apps/designer/app/designer/shared/assets/use-assets.tsx+++ b/apps/builder/app/builder/shared/assets/use-assets.tsx@@ -28,7 +28,7 @@ import type {UploadingAssetContainer,} from "./types";import { usePersistentFetcher } from "~/shared/fetcher";-import type { ActionData } from "~/designer/shared/assets";+import type { ActionData } from "~/builder/shared/assets";import { normalizeErrors, toastUnknownFieldErrors } from "~/shared/form-utils";import { updateStateAssets } from "./update-asset-containers";diff --git a/apps/designer/app/designer/shared/assets/use-filter.ts b/apps/builder/app/builder/shared/assets/use-filter.tssimilarity index 100%rename from apps/designer/app/designer/shared/assets/use-filter.tsrename to apps/builder/app/builder/shared/assets/use-filter.tsdiff --git a/apps/designer/app/designer/shared/assets/use-search.tsx b/apps/builder/app/builder/shared/assets/use-search.tsxsimilarity index 100%rename from apps/designer/app/designer/shared/assets/use-search.tsxrename to apps/builder/app/builder/shared/assets/use-search.tsxdiff --git a/apps/designer/app/designer/shared/breakpoints/index.ts b/apps/builder/app/builder/shared/breakpoints/index.tssimilarity index 100%rename from apps/designer/app/designer/shared/breakpoints/index.tsrename to apps/builder/app/builder/shared/breakpoints/index.tsdiff --git a/apps/designer/app/designer/shared/breakpoints/will-render.ts b/apps/builder/app/builder/shared/breakpoints/will-render.tssimilarity index 100%rename from apps/designer/app/designer/shared/breakpoints/will-render.tsrename to apps/builder/app/builder/shared/breakpoints/will-render.tsdiff --git a/apps/designer/app/designer/shared/client-settings/config.ts b/apps/builder/app/builder/shared/client-settings/config.tssimilarity index 100%rename from apps/designer/app/designer/shared/client-settings/config.tsrename to apps/builder/app/builder/shared/client-settings/config.tsdiff --git a/apps/designer/app/designer/shared/client-settings/index.ts b/apps/builder/app/builder/shared/client-settings/index.tssimilarity index 100%rename from apps/designer/app/designer/shared/client-settings/index.tsrename to apps/builder/app/builder/shared/client-settings/index.tsdiff --git a/apps/designer/app/designer/shared/client-settings/settings.ts b/apps/builder/app/builder/shared/client-settings/settings.tssimilarity index 100%rename from apps/designer/app/designer/shared/client-settings/settings.tsrename to apps/builder/app/builder/shared/client-settings/settings.tsdiff --git a/apps/designer/app/designer/shared/floating-panel/floating-panel-provider.tsx b/apps/builder/app/builder/shared/floating-panel/floating-panel-provider.tsxsimilarity index 100%rename from apps/designer/app/designer/shared/floating-panel/floating-panel-provider.tsxrename to apps/builder/app/builder/shared/floating-panel/floating-panel-provider.tsxdiff --git a/apps/designer/app/designer/shared/floating-panel/floating-panel.tsx b/apps/builder/app/builder/shared/floating-panel/floating-panel.tsxsimilarity index 100%rename from apps/designer/app/designer/shared/floating-panel/floating-panel.tsxrename to apps/builder/app/builder/shared/floating-panel/floating-panel.tsxdiff --git a/apps/designer/app/designer/shared/floating-panel/index.ts b/apps/builder/app/builder/shared/floating-panel/index.tssimilarity index 100%rename from apps/designer/app/designer/shared/floating-panel/index.tsrename to apps/builder/app/builder/shared/floating-panel/index.tsdiff --git a/apps/designer/app/designer/shared/fonts-manager/fonts-manager.tsx b/apps/builder/app/builder/shared/fonts-manager/fonts-manager.tsxsimilarity index 99%rename from apps/designer/app/designer/shared/fonts-manager/fonts-manager.tsxrename to apps/builder/app/builder/shared/fonts-manager/fonts-manager.tsxindex bb091229d4..439c6d3c6a 100644--- a/apps/designer/app/designer/shared/fonts-manager/fonts-manager.tsx+++ b/apps/builder/app/builder/shared/fonts-manager/fonts-manager.tsx@@ -9,7 +9,7 @@ import {Separator,useAssets,useSearch,-} from "~/designer/shared/assets";+} from "~/builder/shared/assets";import { useEffect, useMemo, useState } from "react";import { useMenu } from "./item-menu";import { CheckIcon } from "@webstudio-is/icons";diff --git a/apps/designer/app/designer/shared/fonts-manager/index.ts b/apps/builder/app/builder/shared/fonts-manager/index.tssimilarity index 100%rename from apps/designer/app/designer/shared/fonts-manager/index.tsrename to apps/builder/app/builder/shared/fonts-manager/index.tsdiff --git a/apps/designer/app/designer/shared/fonts-manager/item-menu.tsx b/apps/builder/app/builder/shared/fonts-manager/item-menu.tsxsimilarity index 100%rename from apps/designer/app/designer/shared/fonts-manager/item-menu.tsxrename to apps/builder/app/builder/shared/fonts-manager/item-menu.tsxdiff --git a/apps/designer/app/designer/shared/fonts-manager/item-utils.ts b/apps/builder/app/builder/shared/fonts-manager/item-utils.tssimilarity index 100%rename from apps/designer/app/designer/shared/fonts-manager/item-utils.tsrename to apps/builder/app/builder/shared/fonts-manager/item-utils.tsdiff --git a/apps/designer/app/designer/shared/image-manager/filename.tsx b/apps/builder/app/builder/shared/image-manager/filename.tsxsimilarity index 100%rename from apps/designer/app/designer/shared/image-manager/filename.tsxrename to apps/builder/app/builder/shared/image-manager/filename.tsxdiff --git a/apps/designer/app/designer/shared/image-manager/image-info-tigger.tsx b/apps/builder/app/builder/shared/image-manager/image-info-tigger.tsxsimilarity index 100%rename from apps/designer/app/designer/shared/image-manager/image-info-tigger.tsxrename to apps/builder/app/builder/shared/image-manager/image-info-tigger.tsxdiff --git a/apps/designer/app/designer/shared/image-manager/image-info.tsx b/apps/builder/app/builder/shared/image-manager/image-info.tsxsimilarity index 100%rename from apps/designer/app/designer/shared/image-manager/image-info.tsxrename to apps/builder/app/builder/shared/image-manager/image-info.tsxdiff --git a/apps/designer/app/designer/shared/image-manager/image-manager.tsx b/apps/builder/app/builder/shared/image-manager/image-manager.tsxsimilarity index 100%rename from apps/designer/app/designer/shared/image-manager/image-manager.tsxrename to apps/builder/app/builder/shared/image-manager/image-manager.tsxdiff --git a/apps/designer/app/designer/shared/image-manager/image-thumbnail.tsx b/apps/builder/app/builder/shared/image-manager/image-thumbnail.tsxsimilarity index 98%rename from apps/designer/app/designer/shared/image-manager/image-thumbnail.tsxrename to apps/builder/app/builder/shared/image-manager/image-thumbnail.tsxindex 9cf3cd3a11..34f24b67d7 100644--- a/apps/designer/app/designer/shared/image-manager/image-thumbnail.tsx+++ b/apps/builder/app/builder/shared/image-manager/image-thumbnail.tsx@@ -2,7 +2,7 @@ import type { KeyboardEvent, FocusEvent } from "react";import { Box, styled } from "@webstudio-is/design-system";import { UploadingAnimation } from "./uploading-animation";import { ImageInfoTrigger, imageInfoTriggerCssVars } from "./image-info-tigger";-import type { AssetContainer } from "~/designer/shared/assets";+import type { AssetContainer } from "~/builder/shared/assets";import { Filename } from "./filename";import { Image } from "./image";import { theme } from "@webstudio-is/design-system";diff --git a/apps/designer/app/designer/shared/image-manager/image.tsx b/apps/builder/app/builder/shared/image-manager/image.tsxsimilarity index 100%rename from apps/designer/app/designer/shared/image-manager/image.tsxrename to apps/builder/app/builder/shared/image-manager/image.tsxdiff --git a/apps/designer/app/designer/shared/image-manager/index.ts b/apps/builder/app/builder/shared/image-manager/index.tssimilarity index 100%rename from apps/designer/app/designer/shared/image-manager/index.tsrename to apps/builder/app/builder/shared/image-manager/index.tsdiff --git a/apps/designer/app/designer/shared/image-manager/uploading-animation.tsx b/apps/builder/app/builder/shared/image-manager/uploading-animation.tsxsimilarity index 100%rename from apps/designer/app/designer/shared/image-manager/uploading-animation.tsxrename to apps/builder/app/builder/shared/image-manager/uploading-animation.tsxdiff --git a/apps/designer/app/designer/shared/image-manager/utils.ts b/apps/builder/app/builder/shared/image-manager/utils.tssimilarity index 100%rename from apps/designer/app/designer/shared/image-manager/utils.tsrename to apps/builder/app/builder/shared/image-manager/utils.tsdiff --git a/apps/designer/app/designer/shared/inspector/collapsible-section.tsx b/apps/builder/app/builder/shared/inspector/collapsible-section.tsxsimilarity index 100%rename from apps/designer/app/designer/shared/inspector/collapsible-section.tsxrename to apps/builder/app/builder/shared/inspector/collapsible-section.tsxdiff --git a/apps/designer/app/designer/shared/inspector/component-info.tsx b/apps/builder/app/builder/shared/inspector/component-info.tsxsimilarity index 100%rename from apps/designer/app/designer/shared/inspector/component-info.tsxrename to apps/builder/app/builder/shared/inspector/component-info.tsxdiff --git a/apps/designer/app/designer/shared/inspector/index.tsx b/apps/builder/app/builder/shared/inspector/index.tsxsimilarity index 100%rename from apps/designer/app/designer/shared/inspector/index.tsxrename to apps/builder/app/builder/shared/inspector/index.tsxdiff --git a/apps/designer/app/designer/shared/instance/use-selected-instance-path.ts b/apps/builder/app/builder/shared/instance/use-selected-instance-path.tssimilarity index 100%rename from apps/designer/app/designer/shared/instance/use-selected-instance-path.tsrename to apps/builder/app/builder/shared/instance/use-selected-instance-path.tsdiff --git a/apps/designer/app/designer/shared/nano-states/index.ts b/apps/builder/app/builder/shared/nano-states/index.tssimilarity index 100%rename from apps/designer/app/designer/shared/nano-states/index.tsrename to apps/builder/app/builder/shared/nano-states/index.tsdiff --git a/apps/designer/app/designer/shared/shortcuts/index.ts b/apps/builder/app/builder/shared/shortcuts/index.tssimilarity index 100%rename from apps/designer/app/designer/shared/shortcuts/index.tsrename to apps/builder/app/builder/shared/shortcuts/index.tsdiff --git a/apps/designer/app/designer/shared/shortcuts/use-publish-shortcuts.ts b/apps/builder/app/builder/shared/shortcuts/use-publish-shortcuts.tssimilarity index 100%rename from apps/designer/app/designer/shared/shortcuts/use-publish-shortcuts.tsrename to apps/builder/app/builder/shared/shortcuts/use-publish-shortcuts.tsdiff --git a/apps/designer/app/designer/shared/sync/index.ts b/apps/builder/app/builder/shared/sync/index.tssimilarity index 100%rename from apps/designer/app/designer/shared/sync/index.tsrename to apps/builder/app/builder/shared/sync/index.tsdiff --git a/apps/designer/app/designer/shared/sync/queue.test.ts b/apps/builder/app/builder/shared/sync/queue.test.tssimilarity index 100%rename from apps/designer/app/designer/shared/sync/queue.test.tsrename to apps/builder/app/builder/shared/sync/queue.test.tsdiff --git a/apps/designer/app/designer/shared/sync/queue.ts b/apps/builder/app/builder/shared/sync/queue.tssimilarity index 100%rename from apps/designer/app/designer/shared/sync/queue.tsrename to apps/builder/app/builder/shared/sync/queue.tsdiff --git a/apps/designer/app/designer/shared/sync/sync-server.ts b/apps/builder/app/builder/shared/sync/sync-server.tssimilarity index 100%rename from apps/designer/app/designer/shared/sync/sync-server.tsrename to apps/builder/app/builder/shared/sync/sync-server.tsdiff --git a/apps/designer/app/designer/shared/tree/index.tsx b/apps/builder/app/builder/shared/tree/index.tsxsimilarity index 100%rename from apps/designer/app/designer/shared/tree/index.tsxrename to apps/builder/app/builder/shared/tree/index.tsxdiff --git a/apps/designer/app/canvas/canvas.tsx b/apps/builder/app/canvas/canvas.tsxsimilarity index 94%rename from apps/designer/app/canvas/canvas.tsxrename to apps/builder/app/canvas/canvas.tsxindex c051298c37..2069a52dfa 100644--- a/apps/designer/app/canvas/canvas.tsx+++ b/apps/builder/app/canvas/canvas.tsx@@ -38,7 +38,7 @@ import {import { usePublishScrollState } from "./shared/use-publish-scroll-state";import { useDragAndDrop } from "./shared/use-drag-drop";import { utils } from "@webstudio-is/project";-import { useSubscribeDesignerReady } from "./shared/use-designer-ready";+import { useSubscribeBuilderReady } from "./shared/use-builder-ready";import { useCopyPasteInstance } from "~/shared/copy-paste";import { customComponents } from "./custom-components";import { useHoveredInstanceConnector } from "./hovered-instance-connector";@@ -96,7 +96,7 @@ const DesignMode = () => {useSubscribeScrollState();usePublishTextEditingInstanceId();useDragAndDrop();- // We need to initialize this in both canvas and designer,+ // We need to initialize this in both canvas and builder,// because the events will fire in either one, depending on where the focus isuseCopyPasteInstance();useHoveredInstanceConnector();@@ -115,7 +115,7 @@ export const Canvas = ({ data }: CanvasProps): JSX.Element | null => {if (data.tree === null) {throw new Error("Tree is null");}- const isDesignerReady = useSubscribeDesignerReady();+ const isBuilderReady = useSubscribeBuilderReady();useSetTreeId(data.tree.id);useSetAssets(data.assets);useSetBreakpoints(data.build.breakpoints);@@ -142,7 +142,7 @@ export const Canvas = ({ data }: CanvasProps): JSX.Element | null => {return null;}- if (isPreviewMode || isDesignerReady === false) {+ if (isPreviewMode || isBuilderReady === false) {return (<><GlobalStyles />diff --git a/apps/designer/app/canvas/custom-components/index.ts b/apps/builder/app/canvas/custom-components/index.tssimilarity index 100%rename from apps/designer/app/canvas/custom-components/index.tsrename to apps/builder/app/canvas/custom-components/index.tsdiff --git a/apps/designer/app/canvas/custom-components/link.test.ts b/apps/builder/app/canvas/custom-components/link.test.tssimilarity index 100%rename from apps/designer/app/canvas/custom-components/link.test.tsrename to apps/builder/app/canvas/custom-components/link.test.tsdiff --git a/apps/designer/app/canvas/custom-components/link.tsx b/apps/builder/app/canvas/custom-components/link.tsxsimilarity index 100%rename from apps/designer/app/canvas/custom-components/link.tsxrename to apps/builder/app/canvas/custom-components/link.tsxdiff --git a/apps/designer/app/canvas/features/text-editor/index.ts b/apps/builder/app/canvas/features/text-editor/index.tssimilarity index 100%rename from apps/designer/app/canvas/features/text-editor/index.tsrename to apps/builder/app/canvas/features/text-editor/index.tsdiff --git a/apps/designer/app/canvas/features/text-editor/interop.ts b/apps/builder/app/canvas/features/text-editor/interop.tssimilarity index 100%rename from apps/designer/app/canvas/features/text-editor/interop.tsrename to apps/builder/app/canvas/features/text-editor/interop.tsdiff --git a/apps/designer/app/canvas/features/text-editor/text-editor.stories.tsx b/apps/builder/app/canvas/features/text-editor/text-editor.stories.tsxsimilarity index 98%rename from apps/designer/app/canvas/features/text-editor/text-editor.stories.tsxrename to apps/builder/app/canvas/features/text-editor/text-editor.stories.tsxindex 41d3d10b31..b4365b248f 100644--- a/apps/designer/app/canvas/features/text-editor/text-editor.stories.tsx+++ b/apps/builder/app/canvas/features/text-editor/text-editor.stories.tsx@@ -5,7 +5,7 @@ import { action } from "@storybook/addon-actions";import { Box } from "@webstudio-is/design-system";import { useSubscribe, publish } from "~/shared/pubsub";import { utils } from "@webstudio-is/project";-import type { TextToolbarState } from "~/designer/shared/nano-states";+import type { TextToolbarState } from "~/builder/shared/nano-states";import { TextEditor } from "./text-editor";import { theme } from "@webstudio-is/design-system";diff --git a/apps/designer/app/canvas/features/text-editor/text-editor.tsx b/apps/builder/app/canvas/features/text-editor/text-editor.tsxsimilarity index 100%rename from apps/designer/app/canvas/features/text-editor/text-editor.tsxrename to apps/builder/app/canvas/features/text-editor/text-editor.tsxdiff --git a/apps/designer/app/canvas/features/text-editor/toolbar-connector.tsx b/apps/builder/app/canvas/features/text-editor/toolbar-connector.tsxsimilarity index 100%rename from apps/designer/app/canvas/features/text-editor/toolbar-connector.tsxrename to apps/builder/app/canvas/features/text-editor/toolbar-connector.tsxdiff --git a/apps/designer/app/canvas/features/wrapper-component/index.ts b/apps/builder/app/canvas/features/wrapper-component/index.tssimilarity index 100%rename from apps/designer/app/canvas/features/wrapper-component/index.tsrename to apps/builder/app/canvas/features/wrapper-component/index.tsdiff --git a/apps/designer/app/canvas/features/wrapper-component/selected-instance-connector.ts b/apps/builder/app/canvas/features/wrapper-component/selected-instance-connector.tssimilarity index 100%rename from apps/designer/app/canvas/features/wrapper-component/selected-instance-connector.tsrename to apps/builder/app/canvas/features/wrapper-component/selected-instance-connector.tsdiff --git a/apps/designer/app/canvas/features/wrapper-component/wrapper-component.tsx b/apps/builder/app/canvas/features/wrapper-component/wrapper-component.tsxsimilarity index 100%rename from apps/designer/app/canvas/features/wrapper-component/wrapper-component.tsxrename to apps/builder/app/canvas/features/wrapper-component/wrapper-component.tsxdiff --git a/apps/designer/app/canvas/hovered-instance-connector.ts b/apps/builder/app/canvas/hovered-instance-connector.tssimilarity index 100%rename from apps/designer/app/canvas/hovered-instance-connector.tsrename to apps/builder/app/canvas/hovered-instance-connector.tsdiff --git a/apps/designer/app/canvas/index.ts b/apps/builder/app/canvas/index.tssimilarity index 100%rename from apps/designer/app/canvas/index.tsrename to apps/builder/app/canvas/index.tsdiff --git a/apps/designer/app/canvas/shared/instance.ts b/apps/builder/app/canvas/shared/instance.tssimilarity index 100%rename from apps/designer/app/canvas/shared/instance.tsrename to apps/builder/app/canvas/shared/instance.tsdiff --git a/apps/designer/app/canvas/shared/styles.ts b/apps/builder/app/canvas/shared/styles.tssimilarity index 100%rename from apps/designer/app/canvas/shared/styles.tsrename to apps/builder/app/canvas/shared/styles.tsdiff --git a/apps/designer/app/canvas/shared/use-designer-ready.ts b/apps/builder/app/canvas/shared/use-builder-ready.tssimilarity index 64%rename from apps/designer/app/canvas/shared/use-designer-ready.tsrename to apps/builder/app/canvas/shared/use-builder-ready.tsindex 266143e8a0..e252c3b3cc 100644--- a/apps/designer/app/canvas/shared/use-designer-ready.ts+++ b/apps/builder/app/canvas/shared/use-builder-ready.ts@@ -9,14 +9,14 @@ declare module "~/shared/pubsub" {}}-export const useSubscribeDesignerReady = () => {+export const useSubscribeBuilderReady = () => {const [isAcknowledged, setIsAcknowledged] = useState(false);useInterval(() => {- // We publish this event to make sure designer is listening to the events,- // otherwise if canvas loads faster than designer, which is possible with SSR,- // we can miss the events and designer will just not connect to the canvas.+ // We publish this event to make sure builder is listening to the events,+ // otherwise if canvas loads faster than builder, which is possible with SSR,+ // we can miss the events and builder will just not connect to the canvas.publish({ type: "canvasReady" });},isAcknowledged ? null : 100diff --git a/apps/designer/app/canvas/shared/use-drag-drop.ts b/apps/builder/app/canvas/shared/use-drag-drop.tssimilarity index 100%rename from apps/designer/app/canvas/shared/use-drag-drop.tsrename to apps/builder/app/canvas/shared/use-drag-drop.tsdiff --git a/apps/designer/app/canvas/shared/use-pointer-outline.ts b/apps/builder/app/canvas/shared/use-pointer-outline.tssimilarity index 100%rename from apps/designer/app/canvas/shared/use-pointer-outline.tsrename to apps/builder/app/canvas/shared/use-pointer-outline.tsdiff --git a/apps/designer/app/canvas/shared/use-publish-scroll-state.ts b/apps/builder/app/canvas/shared/use-publish-scroll-state.tssimilarity index 100%rename from apps/designer/app/canvas/shared/use-publish-scroll-state.tsrename to apps/builder/app/canvas/shared/use-publish-scroll-state.tsdiff --git a/apps/designer/app/canvas/shared/use-shortcuts.ts b/apps/builder/app/canvas/shared/use-shortcuts.tssimilarity index 100%rename from apps/designer/app/canvas/shared/use-shortcuts.tsrename to apps/builder/app/canvas/shared/use-shortcuts.tsdiff --git a/apps/designer/app/canvas/shared/use-track-selected-element.ts b/apps/builder/app/canvas/shared/use-track-selected-element.tssimilarity index 100%rename from apps/designer/app/canvas/shared/use-track-selected-element.tsrename to apps/builder/app/canvas/shared/use-track-selected-element.tsdiff --git a/apps/designer/app/dashboard/dashboard.stories.tsx b/apps/builder/app/dashboard/dashboard.stories.tsxsimilarity index 100%rename from apps/designer/app/dashboard/dashboard.stories.tsxrename to apps/builder/app/dashboard/dashboard.stories.tsxdiff --git a/apps/designer/app/dashboard/dashboard.tsx b/apps/builder/app/dashboard/dashboard.tsxsimilarity index 100%rename from apps/designer/app/dashboard/dashboard.tsxrename to apps/builder/app/dashboard/dashboard.tsxdiff --git a/apps/designer/app/dashboard/header.tsx b/apps/builder/app/dashboard/header.tsxsimilarity index 100%rename from apps/designer/app/dashboard/header.tsxrename to apps/builder/app/dashboard/header.tsxdiff --git a/apps/designer/app/dashboard/index.ts b/apps/builder/app/dashboard/index.tssimilarity index 100%rename from apps/designer/app/dashboard/index.tsrename to apps/builder/app/dashboard/index.tsdiff --git a/apps/designer/app/dashboard/projects/dialog.tsx b/apps/builder/app/dashboard/projects/dialog.tsxsimilarity index 100%rename from apps/designer/app/dashboard/projects/dialog.tsxrename to apps/builder/app/dashboard/projects/dialog.tsxdiff --git a/apps/designer/app/dashboard/projects/empty-state.tsx b/apps/builder/app/dashboard/projects/empty-state.tsxsimilarity index 100%rename from apps/designer/app/dashboard/projects/empty-state.tsxrename to apps/builder/app/dashboard/projects/empty-state.tsxdiff --git a/apps/designer/app/dashboard/projects/index.ts b/apps/builder/app/dashboard/projects/index.tssimilarity index 100%rename from apps/designer/app/dashboard/projects/index.tsrename to apps/builder/app/dashboard/projects/index.tsdiff --git a/apps/designer/app/dashboard/projects/panel.tsx b/apps/builder/app/dashboard/projects/panel.tsxsimilarity index 100%rename from apps/designer/app/dashboard/projects/panel.tsxrename to apps/builder/app/dashboard/projects/panel.tsxdiff --git a/apps/designer/app/dashboard/projects/project-card.tsx b/apps/builder/app/dashboard/projects/project-card.tsxsimilarity index 98%rename from apps/designer/app/dashboard/projects/project-card.tsxrename to apps/builder/app/dashboard/projects/project-card.tsxindex f44c18ed00..29284d4135 100644--- a/apps/designer/app/dashboard/projects/project-card.tsx+++ b/apps/builder/app/dashboard/projects/project-card.tsx@@ -13,7 +13,7 @@ import {import { MenuIcon } from "@webstudio-is/icons";import type { DashboardProject } from "@webstudio-is/prisma-client";import { KeyboardEvent, useEffect, useRef, useState } from "react";-import { designerPath, getPublishedUrl } from "~/shared/router-utils";+import { builderPath, getPublishedUrl } from "~/shared/router-utils";import { isFeatureEnabled } from "@webstudio-is/feature-flags";import {RenameProjectDialog,@@ -190,7 +190,7 @@ export const ProjectCard = ({><ThumbnailLinktitle={title}- to={designerPath({ projectId: id })}+ to={builderPath({ projectId: id })}ref={thumbnailRef}/><Flexdiff --git a/apps/designer/app/dashboard/projects/project-dialogs.tsx b/apps/builder/app/dashboard/projects/project-dialogs.tsxsimilarity index 98%rename from apps/designer/app/dashboard/projects/project-dialogs.tsxrename to apps/builder/app/dashboard/projects/project-dialogs.tsxindex d6cae42185..9b8643798f 100644--- a/apps/designer/app/dashboard/projects/project-dialogs.tsx+++ b/apps/builder/app/dashboard/projects/project-dialogs.tsx@@ -11,7 +11,7 @@ import {import { PlusIcon } from "@webstudio-is/icons";import { useEffect, useState } from "react";import { useNavigate } from "@remix-run/react";-import { dashboardProjectPath, designerPath } from "~/shared/router-utils";+import { dashboardProjectPath, builderPath } from "~/shared/router-utils";import { createTrpcRemixProxy } from "~/shared/remix/trpc-remix-proxy";import {DialogActions,@@ -102,7 +102,7 @@ const useCreateProject = () => {if (data === undefined) {return;}- navigate(designerPath({ projectId: data.id }));+ navigate(builderPath({ projectId: data.id }));}, [data, navigate]);const handleSubmit = ({ title }: { title: string }) => {diff --git a/apps/designer/app/dashboard/projects/projects.tsx b/apps/builder/app/dashboard/projects/projects.tsxsimilarity index 100%rename from apps/designer/app/dashboard/projects/projects.tsxrename to apps/builder/app/dashboard/projects/projects.tsxdiff --git a/apps/designer/app/dashboard/projects/thumbnail-link.tsx b/apps/builder/app/dashboard/projects/thumbnail-link.tsxsimilarity index 100%rename from apps/designer/app/dashboard/projects/thumbnail-link.tsxrename to apps/builder/app/dashboard/projects/thumbnail-link.tsxdiff --git a/apps/designer/app/entry.client.tsx b/apps/builder/app/entry.client.tsxsimilarity index 100%rename from apps/designer/app/entry.client.tsxrename to apps/builder/app/entry.client.tsxdiff --git a/apps/designer/app/entry.server.tsx b/apps/builder/app/entry.server.tsxsimilarity index 88%rename from apps/designer/app/entry.server.tsxrename to apps/builder/app/entry.server.tsxindex dc79b7812b..affab051ad 100644--- a/apps/designer/app/entry.server.tsx+++ b/apps/builder/app/entry.server.tsx@@ -2,7 +2,7 @@ import type { EntryContext } from "@remix-run/node";import * as Sentry from "@sentry/remix";import { initSentry } from "./shared/sentry";import { prisma } from "@webstudio-is/prisma-client";-import { handleRequest as handleRequestDesigner } from "./shared/remix";+import { handleRequest as handleRequestBuilder } from "./shared/remix";import { handleRequest as handleRequestCanvas } from "@webstudio-is/react-sdk";import { getBuildParams } from "./shared/router-utils";@@ -16,7 +16,7 @@ export default function handleRequest(responseHeaders: Headers,remixContext: EntryContext) {- let handle = handleRequestDesigner;+ let handle = handleRequestBuilder;if (remixContext.staticHandlerContext.matches.some(diff --git a/apps/designer/app/env/env.public.server.ts b/apps/builder/app/env/env.public.server.tssimilarity index 94%rename from apps/designer/app/env/env.public.server.tsrename to apps/builder/app/env/env.public.server.tsindex 2d81595064..c421a0915e 100644--- a/apps/designer/app/env/env.public.server.ts+++ b/apps/builder/app/env/env.public.server.ts@@ -12,7 +12,7 @@ const env = {DEPLOYMENT_ENVIRONMENT: serverEnv.DEPLOYMENT_ENVIRONMENT,DEBUG: process.env.DEBUG,FEATURES: process.env.FEATURES,- DESIGNER_HOST: process.env.DESIGNER_HOST,+ BUILDER_HOST: process.env.BUILDER_HOST,PUBLISHER_ENDPOINT: process.env.PUBLISHER_ENDPOINT || null,PUBLISHER_HOST: process.env.PUBLISHER_HOST || null,BUILD_REQUIRE_SUBDOMAIN: process.env.BUILD_REQUIRE_SUBDOMAIN === "true",diff --git a/apps/designer/app/env/env.server.ts b/apps/builder/app/env/env.server.tssimilarity index 100%rename from apps/designer/app/env/env.server.tsrename to apps/builder/app/env/env.server.tsdiff --git a/apps/designer/app/root.tsx b/apps/builder/app/root.tsxsimilarity index 88%rename from apps/designer/app/root.tsxrename to apps/builder/app/root.tsxindex ef262a9a3c..781975a2d9 100644--- a/apps/designer/app/root.tsx+++ b/apps/builder/app/root.tsx@@ -1,4 +1,4 @@-// Our root outlet doesn't contain a layout because we have 2 types of documents: canvas and designer and we need to decide down the line which one to render, thre is no single root document.+// Our root outlet doesn't contain a layout because we have 2 types of documents: canvas and builder and we need to decide down the line which one to render, thre is no single root document.import { TooltipProvider } from "@radix-ui/react-tooltip";import { Outlet } from "@remix-run/react";import { setEnv } from "@webstudio-is/feature-flags";diff --git a/apps/designer/app/routes/$.tsx b/apps/builder/app/routes/$.tsxsimilarity index 100%rename from apps/designer/app/routes/$.tsxrename to apps/builder/app/routes/$.tsxdiff --git a/apps/designer/app/routes/auth/dev.tsx b/apps/builder/app/routes/auth/dev.tsxsimilarity index 100%rename from apps/designer/app/routes/auth/dev.tsxrename to apps/builder/app/routes/auth/dev.tsxdiff --git a/apps/designer/app/routes/auth/github.tsx b/apps/builder/app/routes/auth/github.tsxsimilarity index 100%rename from apps/designer/app/routes/auth/github.tsxrename to apps/builder/app/routes/auth/github.tsxdiff --git a/apps/designer/app/routes/auth/github/callback.tsx b/apps/builder/app/routes/auth/github/callback.tsxsimilarity index 100%rename from apps/designer/app/routes/auth/github/callback.tsxrename to apps/builder/app/routes/auth/github/callback.tsxdiff --git a/apps/designer/app/routes/auth/google.tsx b/apps/builder/app/routes/auth/google.tsxsimilarity index 100%rename from apps/designer/app/routes/auth/google.tsxrename to apps/builder/app/routes/auth/google.tsxdiff --git a/apps/designer/app/routes/auth/google/callback.tsx b/apps/builder/app/routes/auth/google/callback.tsxsimilarity index 100%rename from apps/designer/app/routes/auth/google/callback.tsxrename to apps/builder/app/routes/auth/google/callback.tsxdiff --git a/apps/designer/app/routes/dashboard.tsx b/apps/builder/app/routes/dashboard.tsxsimilarity index 100%rename from apps/designer/app/routes/dashboard.tsxrename to apps/builder/app/routes/dashboard.tsxdiff --git a/apps/designer/app/routes/dashboard/index.tsx b/apps/builder/app/routes/dashboard/index.tsxsimilarity index 100%rename from apps/designer/app/routes/dashboard/index.tsxrename to apps/builder/app/routes/dashboard/index.tsxdiff --git a/apps/designer/app/routes/dashboard/projects.$method.ts b/apps/builder/app/routes/dashboard/projects.$method.tssimilarity index 100%rename from apps/designer/app/routes/dashboard/projects.$method.tsrename to apps/builder/app/routes/dashboard/projects.$method.tsdiff --git a/apps/designer/app/routes/designer.tsx b/apps/builder/app/routes/designer.tsxsimilarity index 94%rename from apps/designer/app/routes/designer.tsxrename to apps/builder/app/routes/designer.tsxindex 52bae8058c..a96b5fe8fd 100644--- a/apps/designer/app/routes/designer.tsx+++ b/apps/builder/app/routes/designer.tsx@@ -17,7 +17,7 @@ export const meta: MetaFunction = () => {/*** We do not want trpc and other mutations that use the Remix useFetcher hook- * to cause a reload of all designer data.+ * to cause a reload of all builder data.*/export const shouldRevalidate: ShouldRevalidateFunction = ({currentUrl,diff --git a/apps/designer/app/routes/designer/$projectId.tsx b/apps/builder/app/routes/designer/$projectId.tsxsimilarity index 89%rename from apps/designer/app/routes/designer/$projectId.tsxrename to apps/builder/app/routes/designer/$projectId.tsxindex 467f0241d6..d53afd8ee5 100644--- a/apps/designer/app/routes/designer/$projectId.tsx+++ b/apps/builder/app/routes/designer/$projectId.tsx@@ -1,6 +1,6 @@import { useLoaderData } from "@remix-run/react";import type { ErrorBoundaryComponent, LoaderArgs } from "@remix-run/node";-import { type DesignerProps, Designer, links } from "~/designer";+import { type BuilderProps, Builder, links } from "~/builder";import { db } from "@webstudio-is/project/server";import { ErrorMessage } from "~/shared/error";import { sentryException } from "~/shared/sentry";@@ -14,7 +14,7 @@ export { links };export const loader = async ({params,request,-}: LoaderArgs): Promise<DesignerProps> => {+}: LoaderArgs): Promise<BuilderProps> => {if (params.projectId === undefined) {throw new Error("Project id undefined");}@@ -69,15 +69,15 @@ export const ErrorBoundary: ErrorBoundaryComponent = ({ error }) => {return <ErrorMessage message={message} />;};-export const DesignerRoute = () => {- const data = useLoaderData<DesignerProps>();+export const BuilderRoute = () => {+ const data = useLoaderData<BuilderProps>();- return <Designer {...data} />;+ return <Builder {...data} />;};/*** We do not want trpc and other mutations that use the Remix useFetcher hook- * to cause a reload of all designer data.+ * to cause a reload of all builder data.*/export const shouldRevalidate: ShouldRevalidateFunction = ({currentUrl,@@ -87,4 +87,4 @@ export const shouldRevalidate: ShouldRevalidateFunction = ({return currentUrl.href === nextUrl.href ? false : defaultShouldRevalidate;};-export default DesignerRoute;+export default BuilderRoute;diff --git a/apps/designer/app/routes/index.tsx b/apps/builder/app/routes/index.tsxsimilarity index 100%rename from apps/designer/app/routes/index.tsxrename to apps/builder/app/routes/index.tsxdiff --git a/apps/designer/app/routes/login.tsx b/apps/builder/app/routes/login.tsxsimilarity index 100%rename from apps/designer/app/routes/login.tsxrename to apps/builder/app/routes/login.tsxdiff --git a/apps/designer/app/routes/login/index.tsx b/apps/builder/app/routes/login/index.tsxsimilarity index 100%rename from apps/designer/app/routes/login/index.tsxrename to apps/builder/app/routes/login/index.tsxdiff --git a/apps/designer/app/routes/logout.tsx b/apps/builder/app/routes/logout.tsxsimilarity index 100%rename from apps/designer/app/routes/logout.tsxrename to apps/builder/app/routes/logout.tsxdiff --git a/apps/designer/app/routes/rest/assets.$projectId.tsx b/apps/builder/app/routes/rest/assets.$projectId.tsxsimilarity index 97%rename from apps/designer/app/routes/rest/assets.$projectId.tsxrename to apps/builder/app/routes/rest/assets.$projectId.tsxindex 42a9638cbb..5a39877cf1 100644--- a/apps/designer/app/routes/rest/assets.$projectId.tsx+++ b/apps/builder/app/routes/rest/assets.$projectId.tsx@@ -9,7 +9,7 @@ import {import { toast } from "@webstudio-is/design-system";import { useEffect } from "react";import { zfd } from "zod-form-data";-import type { ActionData } from "~/designer/shared/assets";+import type { ActionData } from "~/builder/shared/assets";import { sentryException } from "~/shared/sentry";import { createContext } from "~/shared/context.server";diff --git a/apps/designer/app/routes/rest/authorization-token.$method.ts b/apps/builder/app/routes/rest/authorization-token.$method.tssimilarity index 100%rename from apps/designer/app/routes/rest/authorization-token.$method.tsrename to apps/builder/app/routes/rest/authorization-token.$method.tsdiff --git a/apps/designer/app/routes/rest/pages.$projectId.ts b/apps/builder/app/routes/rest/pages.$projectId.tssimilarity index 100%rename from apps/designer/app/routes/rest/pages.$projectId.tsrename to apps/builder/app/routes/rest/pages.$projectId.tsdiff --git a/apps/designer/app/routes/rest/patch.ts b/apps/builder/app/routes/rest/patch.tssimilarity index 100%rename from apps/designer/app/routes/rest/patch.tsrename to apps/builder/app/routes/rest/patch.tsdiff --git a/apps/designer/app/routes/rest/project.$projectId.tsx b/apps/builder/app/routes/rest/project.$projectId.tsxsimilarity index 100%rename from apps/designer/app/routes/rest/project.$projectId.tsxrename to apps/builder/app/routes/rest/project.$projectId.tsxdiff --git a/apps/designer/app/routes/rest/project/clone.$domain.ts b/apps/builder/app/routes/rest/project/clone.$domain.tssimilarity index 85%rename from apps/designer/app/routes/rest/project/clone.$domain.tsrename to apps/builder/app/routes/rest/project/clone.$domain.tsindex a318aa57e4..9fe906a2b7 100644--- a/apps/designer/app/routes/rest/project/clone.$domain.ts+++ b/apps/builder/app/routes/rest/project/clone.$domain.ts@@ -2,7 +2,7 @@ import { redirect, type LoaderArgs } from "@remix-run/node";import { db as projectDb } from "@webstudio-is/project/server";import type { Project } from "@webstudio-is/project";import { findAuthenticatedUser } from "~/services/auth.server";-import { designerPath, loginPath } from "~/shared/router-utils";+import { builderPath, loginPath } from "~/shared/router-utils";import type { AppContext } from "@webstudio-is/trpc-interface/server";import { createContext } from "~/shared/context.server";@@ -23,12 +23,12 @@ const ensureProject = async (};/**- * Currently this is used to demo the designer from landing page without+ * 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 designer with the cloned project+ * 3. Redirect user to the builder with the cloned project*/export const loader = async ({ request, params }: LoaderArgs) => {if (params.domain === undefined) {@@ -56,7 +56,7 @@ export const loader = async ({ request, params }: LoaderArgs) => {context);- return redirect(designerPath({ projectId: project.id }));+ return redirect(builderPath({ projectId: project.id }));} catch (error: unknown) {if (error instanceof Error) {return { errors: error.message };diff --git a/apps/designer/app/routes/rest/publish.ts b/apps/builder/app/routes/rest/publish.tssimilarity index 100%rename from apps/designer/app/routes/rest/publish.tsrename to apps/builder/app/routes/rest/publish.tsdiff --git a/apps/designer/app/routes/rest/theme.$setting.ts b/apps/builder/app/routes/rest/theme.$setting.tssimilarity index 100%rename from apps/designer/app/routes/rest/theme.$setting.tsrename to apps/builder/app/routes/rest/theme.$setting.tsdiff --git a/apps/designer/app/routes/s/css.ts b/apps/builder/app/routes/s/css.tssimilarity index 100%rename from apps/designer/app/routes/s/css.tsrename to apps/builder/app/routes/s/css.tsdiff --git a/apps/designer/app/services/auth.server.ts b/apps/builder/app/services/auth.server.tssimilarity index 100%rename from apps/designer/app/services/auth.server.tsrename to apps/builder/app/services/auth.server.tsdiff --git a/apps/designer/app/services/cookie.server.ts b/apps/builder/app/services/cookie.server.tssimilarity index 100%rename from apps/designer/app/services/cookie.server.tsrename to apps/builder/app/services/cookie.server.tsdiff --git a/apps/designer/app/services/session.server.ts b/apps/builder/app/services/session.server.tssimilarity index 100%rename from apps/designer/app/services/session.server.tsrename to apps/builder/app/services/session.server.tsdiff --git a/apps/designer/app/services/trpc.server.ts b/apps/builder/app/services/trpc.server.tssimilarity index 100%rename from apps/designer/app/services/trpc.server.tsrename to apps/builder/app/services/trpc.server.tsdiff --git a/apps/designer/app/shared/array-utils.test.ts b/apps/builder/app/shared/array-utils.test.tssimilarity index 100%rename from apps/designer/app/shared/array-utils.test.tsrename to apps/builder/app/shared/array-utils.test.tsdiff --git a/apps/designer/app/shared/array-utils.ts b/apps/builder/app/shared/array-utils.tssimilarity index 100%rename from apps/designer/app/shared/array-utils.tsrename to apps/builder/app/shared/array-utils.tsdiff --git a/apps/designer/app/shared/context.server.ts b/apps/builder/app/shared/context.server.tssimilarity index 100%rename from apps/designer/app/shared/context.server.tsrename to apps/builder/app/shared/context.server.tsdiff --git a/apps/designer/app/shared/copy-paste/copy-paste-instance.ts b/apps/builder/app/shared/copy-paste/copy-paste-instance.tssimilarity index 100%rename from apps/designer/app/shared/copy-paste/copy-paste-instance.tsrename to apps/builder/app/shared/copy-paste/copy-paste-instance.tsdiff --git a/apps/designer/app/shared/copy-paste/copy-paste.ts b/apps/builder/app/shared/copy-paste/copy-paste.tssimilarity index 100%rename from apps/designer/app/shared/copy-paste/copy-paste.tsrename to apps/builder/app/shared/copy-paste/copy-paste.tsdiff --git a/apps/designer/app/shared/copy-paste/index.ts b/apps/builder/app/shared/copy-paste/index.tssimilarity index 100%rename from apps/designer/app/shared/copy-paste/index.tsrename to apps/builder/app/shared/copy-paste/index.tsdiff --git a/apps/designer/app/shared/crypto/crypto-json.server.ts b/apps/builder/app/shared/crypto/crypto-json.server.tssimilarity index 100%rename from apps/designer/app/shared/crypto/crypto-json.server.tsrename to apps/builder/app/shared/crypto/crypto-json.server.tsdiff --git a/apps/designer/app/shared/db/canvas.server.ts b/apps/builder/app/shared/db/canvas.server.tssimilarity index 100%rename from apps/designer/app/shared/db/canvas.server.tsrename to apps/builder/app/shared/db/canvas.server.tsdiff --git a/apps/designer/app/shared/db/index.ts b/apps/builder/app/shared/db/index.tssimilarity index 100%rename from apps/designer/app/shared/db/index.tsrename to apps/builder/app/shared/db/index.tsdiff --git a/apps/designer/app/shared/db/misc.server.ts b/apps/builder/app/shared/db/misc.server.tssimilarity index 100%rename from apps/designer/app/shared/db/misc.server.tsrename to apps/builder/app/shared/db/misc.server.tsdiff --git a/apps/designer/app/shared/db/user.server.ts b/apps/builder/app/shared/db/user.server.tssimilarity index 100%rename from apps/designer/app/shared/db/user.server.tsrename to apps/builder/app/shared/db/user.server.tsdiff --git a/apps/designer/app/shared/dom-hooks/index.ts b/apps/builder/app/shared/dom-hooks/index.tssimilarity index 100%rename from apps/designer/app/shared/dom-hooks/index.tsrename to apps/builder/app/shared/dom-hooks/index.tsdiff --git a/apps/designer/app/shared/dom-hooks/use-scroll-state.ts b/apps/builder/app/shared/dom-hooks/use-scroll-state.tssimilarity index 100%rename from apps/designer/app/shared/dom-hooks/use-scroll-state.tsrename to apps/builder/app/shared/dom-hooks/use-scroll-state.tsdiff --git a/apps/designer/app/shared/dom-hooks/use-window-resize.ts b/apps/builder/app/shared/dom-hooks/use-window-resize.tssimilarity index 100%rename from apps/designer/app/shared/dom-hooks/use-window-resize.tsrename to apps/builder/app/shared/dom-hooks/use-window-resize.tsdiff --git a/apps/designer/app/shared/dom-utils.ts b/apps/builder/app/shared/dom-utils.tssimilarity index 100%rename from apps/designer/app/shared/dom-utils.tsrename to apps/builder/app/shared/dom-utils.tsdiff --git a/apps/designer/app/shared/env/env-getter.ts b/apps/builder/app/shared/env/env-getter.tssimilarity index 100%rename from apps/designer/app/shared/env/env-getter.tsrename to apps/builder/app/shared/env/env-getter.tsdiff --git a/apps/designer/app/shared/env/env.tsx b/apps/builder/app/shared/env/env.tsxsimilarity index 100%rename from apps/designer/app/shared/env/env.tsxrename to apps/builder/app/shared/env/env.tsxdiff --git a/apps/designer/app/shared/env/index.ts b/apps/builder/app/shared/env/index.tssimilarity index 100%rename from apps/designer/app/shared/env/index.tsrename to apps/builder/app/shared/env/index.tsdiff --git a/apps/designer/app/shared/env/namespace.ts b/apps/builder/app/shared/env/namespace.tssimilarity index 100%rename from apps/designer/app/shared/env/namespace.tsrename to apps/builder/app/shared/env/namespace.tsdiff --git a/apps/designer/app/shared/error/error-message.tsx b/apps/builder/app/shared/error/error-message.tsxsimilarity index 100%rename from apps/designer/app/shared/error/error-message.tsxrename to apps/builder/app/shared/error/error-message.tsxdiff --git a/apps/designer/app/shared/error/index.ts b/apps/builder/app/shared/error/index.tssimilarity index 100%rename from apps/designer/app/shared/error/index.tsrename to apps/builder/app/shared/error/index.tsdiff --git a/apps/designer/app/shared/fetcher/index.ts b/apps/builder/app/shared/fetcher/index.tssimilarity index 100%rename from apps/designer/app/shared/fetcher/index.tsrename to apps/builder/app/shared/fetcher/index.tsdiff --git a/apps/designer/app/shared/fetcher/on-fetch-end.ts b/apps/builder/app/shared/fetcher/on-fetch-end.tssimilarity index 100%rename from apps/designer/app/shared/fetcher/on-fetch-end.tsrename to apps/builder/app/shared/fetcher/on-fetch-end.tsdiff --git a/apps/designer/app/shared/fetcher/persistent-fetcher.tsx b/apps/builder/app/shared/fetcher/persistent-fetcher.tsxsimilarity index 100%rename from apps/designer/app/shared/fetcher/persistent-fetcher.tsxrename to apps/builder/app/shared/fetcher/persistent-fetcher.tsxdiff --git a/apps/designer/app/shared/form-utils/index.ts b/apps/builder/app/shared/form-utils/index.tssimilarity index 100%rename from apps/designer/app/shared/form-utils/index.tsrename to apps/builder/app/shared/form-utils/index.tsdiff --git a/apps/designer/app/shared/form-utils/use-ids.ts b/apps/builder/app/shared/form-utils/use-ids.tssimilarity index 100%rename from apps/designer/app/shared/form-utils/use-ids.tsrename to apps/builder/app/shared/form-utils/use-ids.tsdiff --git a/apps/designer/app/shared/form-utils/validation.ts b/apps/builder/app/shared/form-utils/validation.tssimilarity index 100%rename from apps/designer/app/shared/form-utils/validation.tsrename to apps/builder/app/shared/form-utils/validation.tsdiff --git a/apps/designer/app/shared/hook-utils/index.ts b/apps/builder/app/shared/hook-utils/index.tssimilarity index 100%rename from apps/designer/app/shared/hook-utils/index.tsrename to apps/builder/app/shared/hook-utils/index.tsdiff --git a/apps/designer/app/shared/hook-utils/use-sync-initialize-once.ts b/apps/builder/app/shared/hook-utils/use-sync-initialize-once.tssimilarity index 100%rename from apps/designer/app/shared/hook-utils/use-sync-initialize-once.tsrename to apps/builder/app/shared/hook-utils/use-sync-initialize-once.tsdiff --git a/apps/designer/app/shared/images/bg-image-placeholder.svg b/apps/builder/app/shared/images/bg-image-placeholder.svgsimilarity index 100%rename from apps/designer/app/shared/images/bg-image-placeholder.svgrename to apps/builder/app/shared/images/bg-image-placeholder.svgdiff --git a/apps/designer/app/shared/images/broken-image-placeholder.svg b/apps/builder/app/shared/images/broken-image-placeholder.svgsimilarity index 100%rename from apps/designer/app/shared/images/broken-image-placeholder.svgrename to apps/builder/app/shared/images/broken-image-placeholder.svgdiff --git a/apps/designer/app/shared/images/image-placeholder.svg b/apps/builder/app/shared/images/image-placeholder.svgsimilarity index 100%rename from apps/designer/app/shared/images/image-placeholder.svgrename to apps/builder/app/shared/images/image-placeholder.svgdiff --git a/apps/designer/app/shared/instance-utils.ts b/apps/builder/app/shared/instance-utils.tssimilarity index 100%rename from apps/designer/app/shared/instance-utils.tsrename to apps/builder/app/shared/instance-utils.tsdiff --git a/apps/designer/app/shared/nano-states/breakpoints.ts b/apps/builder/app/shared/nano-states/breakpoints.tssimilarity index 100%rename from apps/designer/app/shared/nano-states/breakpoints.tsrename to apps/builder/app/shared/nano-states/breakpoints.tsdiff --git a/apps/designer/app/shared/nano-states/index.ts b/apps/builder/app/shared/nano-states/index.tssimilarity index 100%rename from apps/designer/app/shared/nano-states/index.tsrename to apps/builder/app/shared/nano-states/index.tsdiff --git a/apps/designer/app/shared/nano-states/nano-states.ts b/apps/builder/app/shared/nano-states/nano-states.tssimilarity index 99%rename from apps/designer/app/shared/nano-states/nano-states.tsrename to apps/builder/app/shared/nano-states/nano-states.tsindex 11804b8845..d0d75b2a09 100644--- a/apps/designer/app/shared/nano-states/nano-states.ts+++ b/apps/builder/app/shared/nano-states/nano-states.ts@@ -25,7 +25,7 @@ import type {import type {AssetContainer,DeletingAssetContainer,-} from "~/designer/shared/assets";+} from "~/builder/shared/assets";import { useSyncInitializeOnce } from "../hook-utils";import { shallowComputed } from "../store-utils";import { createInstancesIndex } from "../tree-utils";diff --git a/apps/designer/app/shared/nano-states/use-subscribe-drag-drop-state.ts b/apps/builder/app/shared/nano-states/use-subscribe-drag-drop-state.tssimilarity index 100%rename from apps/designer/app/shared/nano-states/use-subscribe-drag-drop-state.tsrename to apps/builder/app/shared/nano-states/use-subscribe-drag-drop-state.tsdiff --git a/apps/designer/app/shared/nano-states/use-subscribe-scroll-state.ts b/apps/builder/app/shared/nano-states/use-subscribe-scroll-state.tssimilarity index 100%rename from apps/designer/app/shared/nano-states/use-subscribe-scroll-state.tsrename to apps/builder/app/shared/nano-states/use-subscribe-scroll-state.tsdiff --git a/apps/designer/app/shared/pages/index.ts b/apps/builder/app/shared/pages/index.tssimilarity index 100%rename from apps/designer/app/shared/pages/index.tsrename to apps/builder/app/shared/pages/index.tsdiff --git a/apps/designer/app/shared/pages/types.ts b/apps/builder/app/shared/pages/types.tssimilarity index 100%rename from apps/designer/app/shared/pages/types.tsrename to apps/builder/app/shared/pages/types.tsdiff --git a/apps/designer/app/shared/pubsub/index.ts b/apps/builder/app/shared/pubsub/index.tssimilarity index 100%rename from apps/designer/app/shared/pubsub/index.tsrename to apps/builder/app/shared/pubsub/index.tsdiff --git a/apps/designer/app/shared/remix/constants.ts b/apps/builder/app/shared/remix/constants.tssimilarity index 100%rename from apps/designer/app/shared/remix/constants.tsrename to apps/builder/app/shared/remix/constants.tsdiff --git a/apps/designer/app/shared/remix/handle-request.server.tsx b/apps/builder/app/shared/remix/handle-request.server.tsxsimilarity index 100%rename from apps/designer/app/shared/remix/handle-request.server.tsxrename to apps/builder/app/shared/remix/handle-request.server.tsxdiff --git a/apps/designer/app/shared/remix/index.ts b/apps/builder/app/shared/remix/index.tssimilarity index 100%rename from apps/designer/app/shared/remix/index.tsrename to apps/builder/app/shared/remix/index.tsdiff --git a/apps/designer/app/shared/remix/insert-critical-css.ts b/apps/builder/app/shared/remix/insert-critical-css.tssimilarity index 100%rename from apps/designer/app/shared/remix/insert-critical-css.tsrename to apps/builder/app/shared/remix/insert-critical-css.tsdiff --git a/apps/designer/app/shared/remix/root.tsx b/apps/builder/app/shared/remix/root.tsxsimilarity index 100%rename from apps/designer/app/shared/remix/root.tsxrename to apps/builder/app/shared/remix/root.tsxdiff --git a/apps/designer/app/shared/remix/trpc-remix-proxy.ts b/apps/builder/app/shared/remix/trpc-remix-proxy.tssimilarity index 100%rename from apps/designer/app/shared/remix/trpc-remix-proxy.tsrename to apps/builder/app/shared/remix/trpc-remix-proxy.tsdiff --git a/apps/designer/app/shared/remix/trpc-remix-request.server.ts b/apps/builder/app/shared/remix/trpc-remix-request.server.tssimilarity index 100%rename from apps/designer/app/shared/remix/trpc-remix-request.server.tsrename to apps/builder/app/shared/remix/trpc-remix-request.server.tsdiff --git a/apps/designer/app/shared/router-utils/build-params.test.ts b/apps/builder/app/shared/router-utils/build-params.test.tssimilarity index 100%rename from apps/designer/app/shared/router-utils/build-params.test.tsrename to apps/builder/app/shared/router-utils/build-params.test.tsdiff --git a/apps/designer/app/shared/router-utils/build-params.ts b/apps/builder/app/shared/router-utils/build-params.tssimilarity index 100%rename from apps/designer/app/shared/router-utils/build-params.tsrename to apps/builder/app/shared/router-utils/build-params.tsdiff --git a/apps/designer/app/shared/router-utils/index.ts b/apps/builder/app/shared/router-utils/index.tssimilarity index 100%rename from apps/designer/app/shared/router-utils/index.tsrename to apps/builder/app/shared/router-utils/index.tsdiff --git a/apps/designer/app/shared/router-utils/path-utils.ts b/apps/builder/app/shared/router-utils/path-utils.tssimilarity index 93%rename from apps/designer/app/shared/router-utils/path-utils.tsrename to apps/builder/app/shared/router-utils/path-utils.tsindex a9a20fce00..4be58d6560 100644--- a/apps/designer/app/shared/router-utils/path-utils.ts+++ b/apps/builder/app/shared/router-utils/path-utils.ts@@ -15,15 +15,15 @@ const searchParams = (params: Record<string, string | undefined | null>) => {return asString === "" ? "" : `?${asString}`;};-export const designerPath = ({+export const builderPath = ({projectId,pageId,}: {projectId: string;pageId?: string;-}) => `/designer/${projectId}${searchParams({ pageId })}`;+}) => `/builder/${projectId}${searchParams({ pageId })}`;-export const designerUrl = (props: {+export const builderUrl = (props: {projectId: string;pageId?: string;origin: string;@@ -31,7 +31,7 @@ export const designerUrl = (props: {mode?: "edit" | "preview";}) => {const { projectId, pageId } = props;- const url = new URL(designerPath({ projectId, pageId }), props.origin);+ const url = new URL(builderPath({ projectId, pageId }), props.origin);if (props.authToken !== undefined) {url.searchParams.set("authToken", props.authToken);@@ -163,7 +163,7 @@ export const getPublishedUrl = (domain: string) => {// We use location.host to get the hostname and port in development mode and to not break local testing.const localhost = typeof location === "object" ? location.host : "";- const host = publisherHost || env.DESIGNER_HOST || localhost;+ const host = publisherHost || env.BUILDER_HOST || localhost;return `${protocol}//${domain}.${host}`;};diff --git a/apps/designer/app/shared/sentry.ts b/apps/builder/app/shared/sentry.tssimilarity index 100%rename from apps/designer/app/shared/sentry.tsrename to apps/builder/app/shared/sentry.tsdiff --git a/apps/designer/app/shared/session/index.ts b/apps/builder/app/shared/session/index.tssimilarity index 100%rename from apps/designer/app/shared/session/index.tsrename to apps/builder/app/shared/session/index.tsdiff --git a/apps/designer/app/shared/session/use-login-error-message.ts b/apps/builder/app/shared/session/use-login-error-message.tssimilarity index 100%rename from apps/designer/app/shared/session/use-login-error-message.tsrename to apps/builder/app/shared/session/use-login-error-message.tsdiff --git a/apps/designer/app/shared/share-project/index.ts b/apps/builder/app/shared/share-project/index.tssimilarity index 100%rename from apps/designer/app/shared/share-project/index.tsrename to apps/builder/app/shared/share-project/index.tsdiff --git a/apps/designer/app/shared/share-project/share-project-container.tsx b/apps/builder/app/shared/share-project/share-project-container.tsxsimilarity index 94%rename from apps/designer/app/shared/share-project/share-project-container.tsxrename to apps/builder/app/shared/share-project/share-project-container.tsxindex 865c57aedd..07a0790abb 100644--- a/apps/designer/app/shared/share-project/share-project-container.tsx+++ b/apps/builder/app/shared/share-project/share-project-container.tsx@@ -1,7 +1,7 @@import { ShareProject, LinkOptions } from "./share-project";import { createTrpcRemixProxy } from "~/shared/remix/trpc-remix-proxy";import type { AuthorizationTokensRouter } from "@webstudio-is/authorization-token";-import { authorizationTokenPath, designerUrl } from "~/shared/router-utils";+import { authorizationTokenPath, builderUrl } from "~/shared/router-utils";import { useEffect } from "react";import { useDebouncedCallback } from "use-debounce";import type { Project } from "@webstudio-is/prisma-client";@@ -82,8 +82,8 @@ export const ShareProjectContainer = ({ projectId }: ShareButtonProps) => {onChange={handleChangeDebounced}onDelete={handleDelete}onCreate={handleCreate}- designerUrl={({ authToken, mode }) =>- designerUrl({+ builderUrl={({ authToken, mode }) =>+ builderUrl({projectId,origin: window.location.origin,authToken,diff --git a/apps/designer/app/shared/share-project/share-project.stories.tsx b/apps/builder/app/shared/share-project/share-project.stories.tsxsimilarity index 95%rename from apps/designer/app/shared/share-project/share-project.stories.tsxrename to apps/builder/app/shared/share-project/share-project.stories.tsxindex 2b6cd9f251..1991e5810f 100644--- a/apps/designer/app/shared/share-project/share-project.stories.tsx+++ b/apps/builder/app/shared/share-project/share-project.stories.tsx@@ -85,7 +85,7 @@ export const Empty: ComponentStory<typeof ShareProject> = () => {<FloatingPanelPopoverContent><ShareProject{...props}- designerUrl={({ authToken, mode }) =>+ builderUrl={({ authToken, mode }) =>`https://blabla.com/${authToken}/${mode}`}></ShareProject>@@ -105,7 +105,7 @@ export const WithLinks: ComponentStory<typeof ShareProject> = () => {<FloatingPanelPopoverContent><ShareProject{...props}- designerUrl={({ authToken, mode }) =>+ builderUrl={({ authToken, mode }) =>`https://blabla.com/${authToken}/${mode}`}></ShareProject>@@ -125,7 +125,7 @@ export const WithAsyncLinks: ComponentStory<typeof ShareProject> = () => {<FloatingPanelPopoverContent><ShareProject{...props}- designerUrl={({ authToken, mode }) =>+ builderUrl={({ authToken, mode }) =>`https://blabla.com/${authToken}/${mode}`}></ShareProject>diff --git a/apps/designer/app/shared/share-project/share-project.tsx b/apps/builder/app/shared/share-project/share-project.tsxsimilarity index 97%rename from apps/designer/app/shared/share-project/share-project.tsxrename to apps/builder/app/shared/share-project/share-project.tsxindex c98b7031ad..4694175228 100644--- a/apps/designer/app/shared/share-project/share-project.tsx+++ b/apps/builder/app/shared/share-project/share-project.tsx@@ -159,7 +159,7 @@ type SharedLinkItemType = LinkOptions & {onChangeRelation: (permission: Relation) => void;onChangeName: (name: string) => void;onDelete: () => void;- designerUrl: (props: {+ builderUrl: (props: {authToken: string;mode: "preview" | "edit";}) => string;@@ -172,7 +172,7 @@ const SharedLinkItem = ({onChangeRelation,onChangeName,onDelete,- designerUrl,+ builderUrl,}: SharedLinkItemType) => {const [currentName, setCurrentName] = useState(name);@@ -183,7 +183,7 @@ const SharedLinkItem = ({prefix={<CopyIcon />}onClick={() => {navigator.clipboard.writeText(- designerUrl({+ builderUrl({authToken: token,mode: relation === "viewers" ? "preview" : "edit",})@@ -211,7 +211,7 @@ type ShareProjectProps = {onChange: (link: LinkOptions) => void;onDelete: (link: LinkOptions) => void;onCreate: () => void;- designerUrl: SharedLinkItemType["designerUrl"];+ builderUrl: SharedLinkItemType["builderUrl"];};const animateCollapsibleHeight = keyframes({@@ -236,7 +236,7 @@ export const ShareProject = ({onChange,onDelete,onCreate,- designerUrl,+ builderUrl,}: ShareProjectProps) => {const items = links.map((link) => (<Fragment key={link.token}>@@ -251,7 +251,7 @@ export const ShareProject = ({onDelete={() => {onDelete(link);}}- designerUrl={designerUrl}+ builderUrl={builderUrl}/><Separator /></Fragment>diff --git a/apps/designer/app/shared/shortcuts/index.ts b/apps/builder/app/shared/shortcuts/index.tssimilarity index 100%rename from apps/designer/app/shared/shortcuts/index.tsrename to apps/builder/app/shared/shortcuts/index.tsdiff --git a/apps/designer/app/shared/shortcuts/shortcuts.ts b/apps/builder/app/shared/shortcuts/shortcuts.tssimilarity index 100%rename from apps/designer/app/shared/shortcuts/shortcuts.tsrename to apps/builder/app/shared/shortcuts/shortcuts.tsdiff --git a/apps/designer/app/shared/store-utils.test.ts b/apps/builder/app/shared/store-utils.test.tssimilarity index 100%rename from apps/designer/app/shared/store-utils.test.tsrename to apps/builder/app/shared/store-utils.test.tsdiff --git a/apps/designer/app/shared/store-utils.ts b/apps/builder/app/shared/store-utils.tssimilarity index 100%rename from apps/designer/app/shared/store-utils.tsrename to apps/builder/app/shared/store-utils.tsdiff --git a/apps/designer/app/shared/string-utils/index.ts b/apps/builder/app/shared/string-utils/index.tssimilarity index 100%rename from apps/designer/app/shared/string-utils/index.tsrename to apps/builder/app/shared/string-utils/index.tsdiff --git a/apps/designer/app/shared/sync/index.ts b/apps/builder/app/shared/sync/index.tssimilarity index 100%rename from apps/designer/app/shared/sync/index.tsrename to apps/builder/app/shared/sync/index.tsdiff --git a/apps/designer/app/shared/sync/sync-stores.ts b/apps/builder/app/shared/sync/sync-stores.tssimilarity index 95%rename from apps/designer/app/shared/sync/sync-stores.tsrename to apps/builder/app/shared/sync/sync-stores.tsindex de6b7297bf..20efb15e7c 100644--- a/apps/designer/app/shared/sync/sync-stores.ts+++ b/apps/builder/app/shared/sync/sync-stores.ts@@ -26,7 +26,7 @@ type StoreData = {value: unknown;};-type SyncEventSource = "canvas" | "designer";+type SyncEventSource = "canvas" | "builder";declare module "~/shared/pubsub" {export interface PubsubMap {@@ -201,10 +201,10 @@ export const useCanvasStore = (publish: Publish) => {}, [publish]);};-export const useDesignerStore = (publish: Publish) => {+export const useBuilderStore = (publish: Publish) => {useEffect(() => {- const unsubscribeStoresState = syncStoresState("designer", publish);- const unsubscribeStoresChanges = syncStoresChanges("designer", publish);+ const unsubscribeStoresState = syncStoresState("builder", publish);+ const unsubscribeStoresChanges = syncStoresChanges("builder", publish);return () => {unsubscribeStoresState();diff --git a/apps/designer/app/shared/theme/index.ts b/apps/builder/app/shared/theme/index.tssimilarity index 100%rename from apps/designer/app/shared/theme/index.tsrename to apps/builder/app/shared/theme/index.tsdiff --git a/apps/designer/app/shared/theme/theme.server.ts b/apps/builder/app/shared/theme/theme.server.tssimilarity index 100%rename from apps/designer/app/shared/theme/theme.server.tsrename to apps/builder/app/shared/theme/theme.server.tsdiff --git a/apps/designer/app/shared/theme/theme.ts b/apps/builder/app/shared/theme/theme.tssimilarity index 100%rename from apps/designer/app/shared/theme/theme.tsrename to apps/builder/app/shared/theme/theme.tsdiff --git a/apps/designer/app/shared/theme/types.ts b/apps/builder/app/shared/theme/types.tssimilarity index 100%rename from apps/designer/app/shared/theme/types.tsrename to apps/builder/app/shared/theme/types.tsdiff --git a/apps/designer/app/shared/tree-utils.test.ts b/apps/builder/app/shared/tree-utils.test.tssimilarity index 100%rename from apps/designer/app/shared/tree-utils.test.tsrename to apps/builder/app/shared/tree-utils.test.tsdiff --git a/apps/designer/app/shared/tree-utils.ts b/apps/builder/app/shared/tree-utils.tssimilarity index 100%rename from apps/designer/app/shared/tree-utils.tsrename to apps/builder/app/shared/tree-utils.tsdiff --git a/apps/designer/docker-compose.yaml b/apps/builder/docker-compose.yamlsimilarity index 100%rename from apps/designer/docker-compose.yamlrename to apps/builder/docker-compose.yamldiff --git a/apps/designer/docs/test-cases.md b/apps/builder/docs/test-cases.mdsimilarity index 100%rename from apps/designer/docs/test-cases.mdrename to apps/builder/docs/test-cases.mddiff --git a/apps/designer/env-check.js b/apps/builder/env-check.jssimilarity index 91%rename from apps/designer/env-check.jsrename to apps/builder/env-check.jsindex 961ecbae2b..175290765e 100644--- a/apps/designer/env-check.js+++ b/apps/builder/env-check.js@@ -35,14 +35,14 @@ if (process.env.DEPLOYMENT_ENVIRONMENT === "production") {"👉 In production DEPLOYMENT_URL is required for website functionality. Please set it to your production URL.");}- if (!process.env.DESIGNER_HOST) {+ if (!process.env.BUILDER_HOST) {errors.push(- "👉 In production DESIGNER_HOST is required for website functionality. Please set it to your production URL of the designer."+ "👉 In production BUILDER_HOST is required for website functionality. Please set it to your production URL of the builder.");}if (!process.env.PUBLISHER_HOST) {errors.push(- "👉 In production PUBLISHER_HOST is required for website functionality. Please set it to your production URL of the designer."+ "👉 In production PUBLISHER_HOST is required for website functionality. Please set it to your production URL of the builder.");}if (!process.env.BUILD_ORIGIN) {diff --git a/apps/designer/jest.config.js b/apps/builder/jest.config.jssimilarity index 100%rename from apps/designer/jest.config.jsrename to apps/builder/jest.config.jsdiff --git a/apps/designer/package.json b/apps/builder/package.jsonsimilarity index 100%rename from apps/designer/package.jsonrename to apps/builder/package.jsondiff --git a/apps/designer/public/favicon.ico b/apps/builder/public/favicon.icosimilarity index 100%rename from apps/designer/public/favicon.icorename to apps/builder/public/favicon.icodiff --git a/apps/designer/public/logo.webp b/apps/builder/public/logo.webpsimilarity index 100%rename from apps/designer/public/logo.webprename to apps/builder/public/logo.webpdiff --git a/apps/designer/public/octocat.svg b/apps/builder/public/octocat.svgsimilarity index 100%rename from apps/designer/public/octocat.svgrename to apps/builder/public/octocat.svgdiff --git a/apps/designer/remix.config.js b/apps/builder/remix.config.jssimilarity index 100%rename from apps/designer/remix.config.jsrename to apps/builder/remix.config.jsdiff --git a/apps/designer/remix.env.d.ts b/apps/builder/remix.env.d.tssimilarity index 100%rename from apps/designer/remix.env.d.tsrename to apps/builder/remix.env.d.tsdiff --git a/apps/designer/server.js b/apps/builder/server.jssimilarity index 100%rename from apps/designer/server.jsrename to apps/builder/server.jsdiff --git a/apps/designer/tsconfig.json b/apps/builder/tsconfig.jsonsimilarity index 100%rename from apps/designer/tsconfig.jsonrename to apps/builder/tsconfig.jsondiff --git a/apps/designer/app/designer/index.ts b/apps/designer/app/designer/index.tsdeleted file mode 100644index b7f3f61a3d..0000000000--- a/apps/designer/app/designer/index.ts+++ /dev/null@@ -1 +0,0 @@-export * from "./designer";diff --git a/packages/asset-uploader/src/targets/fs/file-path.ts b/packages/asset-uploader/src/targets/fs/file-path.tsindex 60a0215dde..c0a695177e 100644--- a/packages/asset-uploader/src/targets/fs/file-path.ts+++ b/packages/asset-uploader/src/targets/fs/file-path.ts@@ -7,4 +7,4 @@ export const FILE_DIRECTORY =// @todo this will be wrong once we have a local app that is in production and yet saves to local dirprocess.env.NODE_ENV === "production"? path.join(appRoot.path, fsEnv.FILE_UPLOAD_PATH)- : path.join(appRoot.path, "apps", "designer", fsEnv.FILE_UPLOAD_PATH);+ : path.join(appRoot.path, "apps", "builder", fsEnv.FILE_UPLOAD_PATH);diff --git a/packages/css-engine/README.md b/packages/css-engine/README.mdindex 5837fc07c9..f7e932e0ca 100644--- a/packages/css-engine/README.md+++ b/packages/css-engine/README.md@@ -1,4 +1,6 @@## CSS Engine-This package is designed to render effectively CSS in the format produced by Webstudio Designer.-It is using CSS variables for all dynamic parts and can render at runtime as for usage on Live Canvas in the Designer as well as for extracting a fully static style sheet for production.+This package is designed to render effectively CSS in the format produced by+Webstudio Builder. It is using CSS variables for all dynamic parts and can+render at runtime as for usage on Live Canvas in the Builder as well as for+extracting a fully static style sheet for production.diff --git a/packages/design-system/documentation/figma-design-tokens.md b/packages/design-system/documentation/figma-design-tokens.mdindex 836a6c8822..1428eaff4a 100644--- a/packages/design-system/documentation/figma-design-tokens.md+++ b/packages/design-system/documentation/figma-design-tokens.md@@ -11,7 +11,7 @@ We use [Tokens Studio for Figma](https://docs.tokens.studio) plugin to sync desi2. Ask Oleg to add you to the `@webstudio-is/core` team if you are not already in it.3. Go to https://github.com/settings/personal-access-tokens/new- Under "Resource owner" choose "webstudio-is" <br /><img src="./assets/1.png" width="349" />- - Under "Repository access" choose `webstudio-is/webstudio-designer` <br /><img src="./assets/2.png" width="514" />+ - Under "Repository access" choose `webstudio-is/webstudio-builder` <br /><img src="./assets/2.png" width="514" />- Set "Repository permissions" / "Contents" to "Read and write", and leave other permissions as is <br /><img src="./assets/3.png" width="806" />- Press "Generate token and request access"- COPY THE TOKEN NOW AND SAVE IT SOMEWHERE SAFE (you won't be able to see it again)@@ -28,7 +28,7 @@ In case sync provider is not configured in the plugin, you can add one using the- Name: up to you- Personal Access Token: token generated using the instructions above-- Repository: `webstudio-is/webstudio-designer`+- Repository: `webstudio-is/webstudio-builder`- Branch: `figma-tokens`- File Path: `packages/design-system/src/__generated__/figma-design-tokens.json`- baseUrl: leave empty@@ -48,7 +48,7 @@ The process:3. Assign some reviewers. Feel free to always assign me (@rpominov). A Pull Request can't be merged without at least one review. Also you might need a developer's help if you've renamed or removed a token that was used in code. <br/><img src="./assets/10.png" width="329" />4. Click "Create pull request" button. (It might be hidden behind "Draft pull request") <br/><img src="./assets/12.png" width="372" />5. In the PR you can already see the changes in the deployed app <br/><img src="./assets/8.png" width="926" />-6. Also, you can see the cnahges in a Storybook using this link https://figma-tokens--638affb61acca1e593c6e558.chromatic.com/ or by going to the bottom of PR page > "Show all checks" > "Storybook Publish: !webstudio-is/webstudio-designer" > "Details" <br/><img src="./assets/9.png" width="924" />+6. Also, you can see the cnahges in a Storybook using this link https://figma-tokens--638affb61acca1e593c6e558.chromatic.com/ or by going to the bottom of PR page > "Show all checks" > "Storybook Publish: !webstudio-is/webstudio-builder" > "Details" <br/><img src="./assets/9.png" width="924" />7. If you see "This branch is out-of-date with the base branch" message at the bottom, this means that when you look at the changes with the links above, you see all your changes applied, but some of the changes made by developers might not be applied. To fix that, click "Update branch" button, but make sure to choose "Update with merge commit" <br/><img src="./assets/7.png" width="1029" />8. Sometimes a visual regression test may fail in the PR. Next sections describes how to fix it.diff --git a/packages/design-system/src/__generated__/figma-design-tokens.ts b/packages/design-system/src/__generated__/figma-design-tokens.tsindex 70977d63fe..515d50f0f7 100644--- a/packages/design-system/src/__generated__/figma-design-tokens.ts+++ b/packages/design-system/src/__generated__/figma-design-tokens.ts@@ -307,7 +307,7 @@ export const color = {backgroundItemCurrentHidden: "#7e868c",backgroundItemMenuItemHover: "#d3d3d3",backgroundTooltipMain: "#11181c",- backgroundTooltipDesigner: "#ffffff",+ backgroundTooltipBuilder: "#ffffff",backgroundSpacingTopBottom: "#f1f3f5",backgroundSpacingLeftRight: "#eceef0",backgroundSpacingHover: "#d7dbdf",diff --git a/packages/image/src/image-dev.stories.tsx b/packages/image/src/image-dev.stories.tsxindex 3a1507e5b2..056ca17994 100644--- a/packages/image/src/image-dev.stories.tsx+++ b/packages/image/src/image-dev.stories.tsx@@ -1,4 +1,4 @@-// Story for image development, see https://github.com/webstudio-is/webstudio-designer/issues/387+// Story for image development, see https://github.com/webstudio-is/webstudio-builder/issues/387import type * as React from "react";import type { ComponentMeta, ComponentStory } from "@storybook/react";diff --git a/packages/prisma-client/migrations-cli/TROUBLESHOOTING.md b/packages/prisma-client/migrations-cli/TROUBLESHOOTING.mdindex aaad796e53..ce8a2ad7f8 100644--- a/packages/prisma-client/migrations-cli/TROUBLESHOOTING.md+++ b/packages/prisma-client/migrations-cli/TROUBLESHOOTING.md@@ -1,7 +1,7 @@## A migration failed in PREVIEW, how do I fix the PREVIEW database1. Open a new PR where you'll do the fix-1. Go to https://vercel.com/webstudio-is/webstudio-designer/settings/environment-variables+1. Go to https://vercel.com/webstudio-is/webstudio-builder/settings/environment-variables1. Set APPLY_MIGRATIONS to "true" for your PR's branch1. Fix the failed migration code1. Fix the database mannually if the migration have been applied half-waydiff --git a/packages/react-sdk/src/app/custom-components/image.tsx b/packages/react-sdk/src/app/custom-components/image.tsxindex 55254b13a1..6f112e997e 100644--- a/packages/react-sdk/src/app/custom-components/image.tsx+++ b/packages/react-sdk/src/app/custom-components/image.tsx@@ -44,12 +44,12 @@ export const Image = forwardRef<ElementRef<typeof defaultTag>, Props>(return (<WebstudioImage/**- * `key` is needed to recreate the image in case of asset change in designer,+ * `key` is needed to recreate the image in case of asset change in builder,* this gives immediate feedback when an asset is changed.* Also, it visually fixes image distortion when another asset has a seriously different aspectRatio* (we change aspectRatio CSS prop on asset change)*- * In non-designer mode, key on images are usually also a good idea,+ * In non-builder mode, key on images are usually also a good idea,* prevents showing outdated images on route change.**/key={src}diff --git a/packages/react-sdk/src/props.ts b/packages/react-sdk/src/props.tsindex b69ac51fc0..a6ad0e3641 100644--- a/packages/react-sdk/src/props.ts+++ b/packages/react-sdk/src/props.ts@@ -39,7 +39,7 @@ export const useInstanceProps = (instanceId: Instance["id"]) => {return instancePropsObject;};-// this utility is be used for image component in both designer and preview+// this utility is be used for image component in both builder and preview// so need to optimize rerenders with computedexport const usePropAsset = (instanceId: Instance["id"], name: string) => {const { propsByInstanceIdStore, assetsStore } = useContext(ReactSdkContext);diff --git a/packages/react-sdk/src/tree/session-storage-polyfill.tsx b/packages/react-sdk/src/tree/session-storage-polyfill.tsxindex 6e39e4a1b6..5c463ed9f1 100644--- a/packages/react-sdk/src/tree/session-storage-polyfill.tsx+++ b/packages/react-sdk/src/tree/session-storage-polyfill.tsx@@ -8,7 +8,7 @@ const polyfill = function () {sessionStorage.removeItem(key); // cleanup} catch (error) {alert(- 'It looks like you have disabled cookies in your browser. Webstudio designer may not work properly.\n\nTo enable cookies, go to "Setting" > "Privacy and security" > "Cookies and other site data", and make sure neither "Block all cookies" nor "Block third-party cookies" are selected.\n\nRead more at https://support.google.com/chrome/answer/95647'+ 'It looks like you have disabled cookies in your browser. Webstudio builder may not work properly.\n\nTo enable cookies, go to "Setting" > "Privacy and security" > "Cookies and other site data", and make sure neither "Block all cookies" nor "Block third-party cookies" are selected.\n\nRead more at https://support.google.com/chrome/answer/95647');const data = new Map();Object.defineProperty(window, "sessionStorage", {