Skip to content

Open source website builder and Webflow alternative. Webstudio is an advanced visual builder that connects to any headless CMS, supports all CSS properties, and can be hosted anywhere, including with us.

feat: Project settings dialog accessible from dashboard (#5514)

Oleg Isonendcdac0eaa764
diff --git a/apps/builder/app/builder/builder.tsx b/apps/builder/app/builder/builder.tsx
index 7f39eecfad..97d4e10bed 100644
--- a/apps/builder/app/builder/builder.tsx
+++ b/apps/builder/app/builder/builder.tsx
@@ -1,9 +1,6 @@
import { useEffect, useMemo, useState, type JSX, type ReactNode } from "react";
import { useStore } from "@nanostores/react";
import { TooltipProvider } from "@radix-ui/react-tooltip";
-import { usePublish, $publisher } from "~/shared/pubsub";
-import type { Build } from "@webstudio-is/project-build";
-import type { Project } from "@webstudio-is/project";
import {
theme,
Box,
@@ -13,12 +10,9 @@ import {
rawTheme,
} from "@webstudio-is/design-system";
import type { AuthPermit } from "@webstudio-is/trpc-interface/index.server";
-import { registerContainers, createObjectPool } from "~/shared/sync";
-import {
- ServerSyncStorage,
- startProjectSync,
- useSyncServer,
-} from "./shared/sync/sync-server";
+import { initializeClientSync, getSyncClient } from "~/shared/sync/sync-client";
+import { usePreventUnload } from "~/shared/sync/project-queue";
+import { usePublish, $publisher } from "~/shared/pubsub";
import { Inspector } from "./inspector";
import { Topbar } from "./features/topbar";
import { Footer } from "./features/footer";
@@ -35,7 +29,6 @@ import {
$project,
subscribeResources,
$authTokenPermissions,
- $publisherHost,
$isDesignMode,
$isContentMode,
$userPlanFeatures,
@@ -47,7 +40,7 @@ import { BlockingAlerts } from "./features/blocking-alerts";
import { useSyncPageUrl } from "~/shared/pages";
import { useMount, useUnmount } from "~/shared/hook-utils/use-mount";
import { subscribeCommands } from "~/builder/shared/commands";
-import { ProjectSettings } from "./features/project-settings";
+import { ProjectSettings } from "~/shared/project-settings";
import type { UserPlanFeatures } from "~/shared/db/user-plan-features.server";
import {
$activeSidebarPanel,
@@ -75,14 +68,11 @@ import {
} from "~/shared/copy-paste/init-copy-paste";
import { useInertHandlers } from "./shared/inert-handlers";
import { TextToolbar } from "./features/workspace/canvas-tools/text-toolbar";
-import { SyncClient } from "~/shared/sync-client";
import { RemoteDialog } from "./features/help/remote-dialog";
import type { SidebarPanelName } from "./sidebar-left/types";
import { SidebarLeft } from "./sidebar-left/sidebar-left";
import { useDisableContextMenu } from "./shared/use-disable-context-menu";
-registerContainers();
-
const useSetWindowTitle = () => {
const project = useStore($project);
useEffect(() => {
@@ -227,16 +217,8 @@ const ChromeWrapper = ({
);
};
-const builderClient = new SyncClient({
- role: "leader",
- object: createObjectPool(),
- storages: [new ServerSyncStorage()],
-});
-
export type BuilderProps = {
- project: Project;
- publisherHost: string;
- build: Pick<Build, "id" | "version">;
+ projectId: string;
authToken?: string;
authPermit: AuthPermit;
authTokenPermissions: TokenPermissions;
@@ -244,9 +226,7 @@ export type BuilderProps = {
};
export const Builder = ({
- project,
- publisherHost,
- build,
+ projectId,
authToken,
authPermit,
userPlanFeatures,
@@ -256,8 +236,6 @@ export const Builder = ({
useMount(() => {
// additional data stores
- $project.set(project);
- $publisherHost.set(publisherHost);
$authPermit.set(authPermit);
$authToken.set(authToken);
$userPlanFeatures.set(userPlanFeatures);
@@ -266,16 +244,12 @@ export const Builder = ({
const controller = new AbortController();
$dataLoadingState.set("loading");
- builderClient.connect({
+ initializeClientSync({
+ projectId,
+ authPermit,
+ authToken,
signal: controller.signal,
onReady() {
- startProjectSync({
- projectId: project.id,
- buildId: build.id,
- version: build.version,
- authPermit,
- authToken,
- });
updateWebstudioData((data) => {
migrateWebstudioDataMutable(data);
});
@@ -288,6 +262,7 @@ export const Builder = ({
// @todo make needs error handling and error state? e.g. a toast
},
});
+
return () => {
$dataLoadingState.set("idle");
controller.abort("unmount");
@@ -310,10 +285,9 @@ export const Builder = ({
$publisher.set({ publish });
}, [publish]);
- useSyncServer({
- projectId: project.id,
- authPermit,
- });
+ const project = useStore($project);
+
+ usePreventUnload();
const isCloneDialogOpen = useStore($isCloneDialogOpen);
const isPreviewMode = useStore($isPreviewMode);
const isDesignMode = useStore($isDesignMode);
@@ -325,10 +299,13 @@ export const Builder = ({
() =>
mergeRefs((element: HTMLIFrameElement | null) => {
if (element?.contentWindow) {
- // added to iframe window and stored in local variable right away to prevent
- // overriding in emebedded scripts on canvas
- element.contentWindow.__webstudioSharedSyncEmitter__ =
- builderClient.emitter;
+ const client = getSyncClient();
+ if (client) {
+ // added to iframe window and stored in local variable right away to prevent
+ // overriding in emebedded scripts on canvas
+ element.contentWindow.__webstudioSharedSyncEmitter__ =
+ client.emitter;
+ }
}
}, publishRef),
[publishRef]
@@ -375,6 +352,15 @@ export const Builder = ({
const inertHandlers = useInertHandlers();
+ // Show loading screen if project isn't ready yet
+ if (!project || dataLoadingState !== "loaded") {
+ return (
+ <TooltipProvider>
+ <Loading state={loadingState} />
+ </TooltipProvider>
+ );
+ }
+
return (
<TooltipProvider>
<div
@@ -397,7 +383,7 @@ export const Builder = ({
<ProjectSettings />
<Main>
<Workspace>
- {dataLoadingState === "loaded" && (
+ {dataLoadingState === "loaded" && project && (
<CanvasIframe
ref={iframeRefCallback}
src={canvasUrl}
@@ -437,36 +423,40 @@ export const Builder = ({
>
<SidebarLeft publish={publish} />
</SidePanel>
- <Topbar
- project={project}
- hasProPlan={userPlanFeatures.hasProPlan}
- css={{ gridArea: "header" }}
- loading={
- <LoadingBackground
- // Looks nicer when topbar is already visible earlier, so user has more sense of progress.
- show={
- loadingState.readyStates.get("dataLoadingState")
- ? false
- : true
- }
- />
- }
- />
+ {project ? (
+ <Topbar
+ project={project}
+ hasProPlan={userPlanFeatures.hasProPlan}
+ css={{ gridArea: "header" }}
+ loading={
+ <LoadingBackground
+ // Looks nicer when topbar is already visible earlier, so user has more sense of progress.
+ show={
+ loadingState.readyStates.get("dataLoadingState")
+ ? false
+ : true
+ }
+ />
+ }
+ />
+ ) : null}
<Main css={{ pointerEvents: "none" }}>
<TextToolbar />
</Main>
{isPreviewMode === false && <Footer />}
- <CloneProjectDialog
- isOpen={isCloneDialogOpen}
- onOpenChange={$isCloneDialogOpen.set}
- project={project}
- onCreate={(projectId) => {
- window.location.href = builderUrl({
- origin: window.origin,
- projectId: projectId,
- });
- }}
- />
+ {project ? (
+ <CloneProjectDialog
+ isOpen={isCloneDialogOpen}
+ onOpenChange={$isCloneDialogOpen.set}
+ project={project}
+ onCreate={(projectId) => {
+ window.location.href = builderUrl({
+ origin: window.origin,
+ projectId: projectId,
+ });
+ }}
+ />
+ ) : null}
</ChromeWrapper>
<Loading state={loadingState} />
<BlockingAlerts />
diff --git a/apps/builder/app/builder/features/address-bar.stories.tsx b/apps/builder/app/builder/features/address-bar.stories.tsx
index b0792e39ef..0ad06c09b2 100644
--- a/apps/builder/app/builder/features/address-bar.stories.tsx
+++ b/apps/builder/app/builder/features/address-bar.stories.tsx
@@ -2,8 +2,8 @@ import { useStore } from "@nanostores/react";
import type { Meta, StoryFn } from "@storybook/react";
import { Box, Text, theme } from "@webstudio-is/design-system";
import { AddressBarPopover } from "./address-bar";
-import { $dataSources, $pages } from "~/shared/nano-states";
-import { registerContainers } from "~/shared/sync";
+import { $dataSources, $pages } from "~/shared/sync/data-stores";
+import { registerContainers } from "~/shared/sync/sync-stores";
import { $awareness, $selectedPage } from "~/shared/awareness";
import { $currentSystem } from "~/shared/system";
diff --git a/apps/builder/app/builder/features/assets/assets.tsx b/apps/builder/app/builder/features/assets/assets.tsx
index 3fc36873a4..9e486b476e 100644
--- a/apps/builder/app/builder/features/assets/assets.tsx
+++ b/apps/builder/app/builder/features/assets/assets.tsx
@@ -1,5 +1,5 @@
import { PanelTitle, Separator } from "@webstudio-is/design-system";
-import { ImageManager } from "~/builder/shared/image-manager";
+import { ImageManager } from "~/shared/image-manager";
export const AssetsPanel = (_props: { onClose: () => void }) => {
return (
diff --git a/apps/builder/app/builder/features/breakpoints/breakpoints-editor.tsx b/apps/builder/app/builder/features/breakpoints/breakpoints-editor.tsx
index 31a91905bf..d41beefb2e 100644
--- a/apps/builder/app/builder/features/breakpoints/breakpoints-editor.tsx
+++ b/apps/builder/app/builder/features/breakpoints/breakpoints-editor.tsx
@@ -17,9 +17,9 @@ import {
} from "@webstudio-is/design-system";
import { MinusIcon, PlusIcon } from "@webstudio-is/icons";
import { useStore } from "@nanostores/react";
-import { $breakpoints } from "~/shared/nano-states";
+import { $breakpoints } from "~/shared/sync/data-stores";
import { groupBreakpoints, isBaseBreakpoint } from "~/shared/breakpoints";
-import { serverSyncStore } from "~/shared/sync";
+import { serverSyncStore } from "~/shared/sync/sync-stores";
type BreakpointEditorItemProps = {
breakpoint: Breakpoint;
diff --git a/apps/builder/app/builder/features/breakpoints/breakpoints-popover.tsx b/apps/builder/app/builder/features/breakpoints/breakpoints-popover.tsx
index 053131e766..664ce689b7 100644
--- a/apps/builder/app/builder/features/breakpoints/breakpoints-popover.tsx
+++ b/apps/builder/app/builder/features/breakpoints/breakpoints-popover.tsx
@@ -38,7 +38,7 @@ import {
minCanvasWidth,
} from "~/shared/breakpoints";
import { $scale } from "~/builder/shared/nano-states";
-import { serverSyncStore } from "~/shared/sync";
+import { serverSyncStore } from "~/shared/sync/sync-stores";
import { setCanvasWidth } from "~/builder/shared/calc-canvas-width";
export const BreakpointsPopover = () => {
diff --git a/apps/builder/app/builder/features/breakpoints/breakpoints-selector-container.tsx b/apps/builder/app/builder/features/breakpoints/breakpoints-selector-container.tsx
index 53aa7f7b13..4b14aaafde 100644
--- a/apps/builder/app/builder/features/breakpoints/breakpoints-selector-container.tsx
+++ b/apps/builder/app/builder/features/breakpoints/breakpoints-selector-container.tsx
@@ -1,5 +1,6 @@
import { useStore } from "@nanostores/react";
-import { $breakpoints, $selectedBreakpoint } from "~/shared/nano-states";
+import { $breakpoints } from "~/shared/sync/data-stores";
+import { $selectedBreakpoint } from "~/shared/nano-states";
import { BreakpointsSelector } from "./breakpoints-selector";
export const BreakpointsSelectorContainer = () => {
diff --git a/apps/builder/app/builder/features/breakpoints/cascade-indicator.tsx b/apps/builder/app/builder/features/breakpoints/cascade-indicator.tsx
index 6fe5e1e8eb..f020b988aa 100644
--- a/apps/builder/app/builder/features/breakpoints/cascade-indicator.tsx
+++ b/apps/builder/app/builder/features/breakpoints/cascade-indicator.tsx
@@ -2,7 +2,7 @@ import { useEffect, useState } from "react";
import { useStore } from "@nanostores/react";
import { css, theme } from "@webstudio-is/design-system";
import type { Breakpoint, Breakpoints } from "@webstudio-is/sdk";
-import { $breakpoints } from "~/shared/nano-states";
+import { $breakpoints } from "~/shared/sync/data-stores";
import { isBaseBreakpoint } from "~/shared/breakpoints";
const cascadeIndicatorStyle = css({
diff --git a/apps/builder/app/builder/features/breakpoints/width-input.tsx b/apps/builder/app/builder/features/breakpoints/width-input.tsx
index 10423b0ed3..be5677cb3a 100644
--- a/apps/builder/app/builder/features/breakpoints/width-input.tsx
+++ b/apps/builder/app/builder/features/breakpoints/width-input.tsx
@@ -11,7 +11,8 @@ import {
useScrub,
handleNumericInputArrowKeys,
} from "@webstudio-is/design-system";
-import { $breakpoints, $isResizingCanvas } from "~/shared/nano-states";
+import { $breakpoints } from "~/shared/sync/data-stores";
+import { $isResizingCanvas } from "~/shared/nano-states";
import {
$selectedBreakpointId,
$selectedBreakpoint,
diff --git a/apps/builder/app/builder/features/command-panel/command-panel.stories.tsx b/apps/builder/app/builder/features/command-panel/command-panel.stories.tsx
index beed546440..24c8c1314b 100644
--- a/apps/builder/app/builder/features/command-panel/command-panel.stories.tsx
+++ b/apps/builder/app/builder/features/command-panel/command-panel.stories.tsx
@@ -9,7 +9,7 @@ import {
$registeredComponentMetas,
} from "~/shared/nano-states";
import { $awareness } from "~/shared/awareness";
-import { registerContainers } from "~/shared/sync";
+import { registerContainers } from "~/shared/sync/sync-stores";
import { CommandPanel as CommandPanelComponent } from "./command-panel";
import { openCommandPanel } from "./command-state";
diff --git a/apps/builder/app/builder/features/command-panel/groups/data-variables-group.tsx b/apps/builder/app/builder/features/command-panel/groups/data-variables-group.tsx
index e3707a432f..5f553b6a30 100644
--- a/apps/builder/app/builder/features/command-panel/groups/data-variables-group.tsx
+++ b/apps/builder/app/builder/features/command-panel/groups/data-variables-group.tsx
@@ -9,7 +9,7 @@ import {
useSelectedAction,
useResetActionIndex,
} from "@webstudio-is/design-system";
-import { $dataSources } from "~/shared/nano-states";
+import { $dataSources } from "~/shared/sync/data-stores";
import {
$commandContent,
$isCommandPanelOpen,
diff --git a/apps/builder/app/builder/features/command-panel/groups/pages-group.tsx b/apps/builder/app/builder/features/command-panel/groups/pages-group.tsx
index b3e120c6a6..107b4499bf 100644
--- a/apps/builder/app/builder/features/command-panel/groups/pages-group.tsx
+++ b/apps/builder/app/builder/features/command-panel/groups/pages-group.tsx
@@ -7,7 +7,8 @@ import {
} from "@webstudio-is/design-system";
import { computed } from "nanostores";
import type { Page } from "@webstudio-is/sdk";
-import { $pages, $editingPageId } from "~/shared/nano-states";
+import { $pages } from "~/shared/sync/data-stores";
+import { $editingPageId } from "~/shared/nano-states";
import { $selectedPage, selectPage } from "~/shared/awareness";
import { setActiveSidebarPanel } from "~/builder/shared/nano-states";
import { closeCommandPanel, $isCommandPanelOpen } from "../command-state";
diff --git a/apps/builder/app/builder/features/command-panel/groups/tokens-group.tsx b/apps/builder/app/builder/features/command-panel/groups/tokens-group.tsx
index 09ccabeee7..1d05aaa2d2 100644
--- a/apps/builder/app/builder/features/command-panel/groups/tokens-group.tsx
+++ b/apps/builder/app/builder/features/command-panel/groups/tokens-group.tsx
@@ -11,7 +11,8 @@ import {
useResetActionIndex,
} from "@webstudio-is/design-system";
import type { Instance, StyleSource } from "@webstudio-is/sdk";
-import { $selectedStyleSources, $styleSources } from "~/shared/nano-states";
+import { $styleSources } from "~/shared/sync/data-stores";
+import { $selectedStyleSources } from "~/shared/nano-states";
import {
deleteStyleSource,
DeleteStyleSourceDialog,
diff --git a/apps/builder/app/builder/features/command-panel/groups/wrap-group.test.tsx b/apps/builder/app/builder/features/command-panel/groups/wrap-group.test.tsx
index 6d6001986e..9661b27768 100644
--- a/apps/builder/app/builder/features/command-panel/groups/wrap-group.test.tsx
+++ b/apps/builder/app/builder/features/command-panel/groups/wrap-group.test.tsx
@@ -10,7 +10,7 @@ import {
$props,
$registeredComponentMetas,
} from "~/shared/nano-states";
-import { registerContainers } from "~/shared/sync";
+import { registerContainers } from "~/shared/sync/sync-stores";
import { $awareness, selectInstance } from "~/shared/awareness";
import { __testing__ } from "./wrap-group";
diff --git a/apps/builder/app/builder/features/command-panel/shared/instance-list.tsx b/apps/builder/app/builder/features/command-panel/shared/instance-list.tsx
index efd74f69e8..76b1ddab6f 100644
--- a/apps/builder/app/builder/features/command-panel/shared/instance-list.tsx
+++ b/apps/builder/app/builder/features/command-panel/shared/instance-list.tsx
@@ -11,7 +11,7 @@ import {
Text,
} from "@webstudio-is/design-system";
import type { Instance } from "@webstudio-is/sdk";
-import { $instances, $pages } from "~/shared/nano-states";
+import { $instances, $pages } from "~/shared/sync/data-stores";
import { getInstanceLabel } from "~/builder/shared/instance-label";
import { $awareness, findAwarenessByInstanceId } from "~/shared/awareness";
import { buildInstancePath } from "~/shared/instance-utils";
diff --git a/apps/builder/app/builder/features/navigator/css-preview.tsx b/apps/builder/app/builder/features/navigator/css-preview.tsx
index a21edb2965..ccb35104b2 100644
--- a/apps/builder/app/builder/features/navigator/css-preview.tsx
+++ b/apps/builder/app/builder/features/navigator/css-preview.tsx
@@ -9,7 +9,7 @@ import {
import { generateStyleMap, mergeStyles } from "@webstudio-is/css-engine";
import type { StyleMap } from "@webstudio-is/css-engine";
import { CollapsibleSection } from "~/builder/shared/collapsible-section";
-import { highlightCss } from "~/builder/shared/code-highlight";
+import { highlightCss } from "~/shared/code-highlight";
import type { ComputedStyleDecl } from "~/shared/style-object-model";
import { $computedStyleDeclarations } from "~/builder/features/style-panel/shared/model";
import { $selectedInstance } from "~/shared/awareness";
diff --git a/apps/builder/app/builder/features/navigator/navigator-tree.tsx b/apps/builder/app/builder/features/navigator/navigator-tree.tsx
index ac2baef479..d72cd03eeb 100644
--- a/apps/builder/app/builder/features/navigator/navigator-tree.tsx
+++ b/apps/builder/app/builder/features/navigator/navigator-tree.tsx
@@ -52,7 +52,7 @@ import {
$propValuesByInstanceSelectorWithMemoryProps,
} from "~/shared/nano-states";
import type { InstanceSelector } from "~/shared/tree-utils";
-import { serverSyncStore } from "~/shared/sync";
+import { serverSyncStore } from "~/shared/sync/sync-stores";
import { reparentInstance, toggleInstanceShow } from "~/shared/instance-utils";
import { emitCommand } from "~/builder/shared/commands";
import { useContentEditable } from "~/shared/dom-hooks";
diff --git a/apps/builder/app/builder/features/pages/folder-settings.tsx b/apps/builder/app/builder/features/pages/folder-settings.tsx
index 4e1918028c..7de7e05229 100644
--- a/apps/builder/app/builder/features/pages/folder-settings.tsx
+++ b/apps/builder/app/builder/features/pages/folder-settings.tsx
@@ -30,8 +30,9 @@ import { z } from "zod";
import { useIds } from "~/shared/form-utils";
import { useEffectEvent } from "~/shared/hook-utils/effect-event";
import { useUnmount } from "~/shared/hook-utils/use-mount";
-import { $pages, $isDesignMode } from "~/shared/nano-states";
-import { serverSyncStore } from "~/shared/sync";
+import { $pages } from "~/shared/sync/data-stores";
+import { $isDesignMode } from "~/shared/nano-states";
+import { serverSyncStore } from "~/shared/sync/sync-stores";
import { Form } from "./form";
import { isSlugAvailable, registerFolderChildMutable } from "./page-utils";
diff --git a/apps/builder/app/builder/features/pages/image-info.tsx b/apps/builder/app/builder/features/pages/image-info.tsx
index 1f56351dc7..4d5a951bd1 100644
--- a/apps/builder/app/builder/features/pages/image-info.tsx
+++ b/apps/builder/app/builder/features/pages/image-info.tsx
@@ -13,7 +13,7 @@ import {
} from "@webstudio-is/icons";
import type { ImageAsset } from "@webstudio-is/sdk";
import { formatAssetName } from "~/builder/shared/assets/asset-utils";
-import { getFormattedAspectRatio } from "~/builder/shared/image-manager/utils";
+import { getFormattedAspectRatio } from "~/shared/image-manager/utils";
type ImageInfoProps = {
asset: ImageAsset;
diff --git a/apps/builder/app/builder/features/pages/page-settings.stories.tsx b/apps/builder/app/builder/features/pages/page-settings.stories.tsx
index e413741aeb..8378896b31 100644
--- a/apps/builder/app/builder/features/pages/page-settings.stories.tsx
+++ b/apps/builder/app/builder/features/pages/page-settings.stories.tsx
@@ -1,7 +1,7 @@
import { $pages } from "~/shared/nano-states/pages";
import { PageSettings } from "./page-settings";
import { Grid, theme } from "@webstudio-is/design-system";
-import { $assets, $project } from "~/shared/nano-states";
+import { $assets, $project } from "~/shared/sync/data-stores";
import { createDefaultPages } from "@webstudio-is/project-build";
import { isRootFolder } from "@webstudio-is/sdk";
diff --git a/apps/builder/app/builder/features/pages/page-settings.tsx b/apps/builder/app/builder/features/pages/page-settings.tsx
index eba08ed076..04f1d3f283 100644
--- a/apps/builder/app/builder/features/pages/page-settings.tsx
+++ b/apps/builder/app/builder/features/pages/page-settings.tsx
@@ -80,9 +80,9 @@ import {
BindingControl,
BindingPopover,
} from "~/builder/shared/binding-popover";
-import { serverSyncStore } from "~/shared/sync";
+import { serverSyncStore } from "~/shared/sync/sync-stores";
// @todo should be moved to shared because features should not depend on features
-import { ImageControl } from "~/builder/features/project-settings";
+import { ImageControl } from "~/shared/project-settings";
// @todo should be moved to shared because features should not depend on features
import { useEffectEvent } from "~/shared/hook-utils/effect-event";
import {
diff --git a/apps/builder/app/builder/features/pages/page-utils.test.ts b/apps/builder/app/builder/features/pages/page-utils.test.ts
index 1061e45be7..ab86ef7b90 100644
--- a/apps/builder/app/builder/features/pages/page-utils.test.ts
+++ b/apps/builder/app/builder/features/pages/page-utils.test.ts
@@ -30,7 +30,7 @@ import {
$project,
$resources,
} from "~/shared/nano-states";
-import { registerContainers } from "~/shared/sync";
+import { registerContainers } from "~/shared/sync/sync-stores";
import { $awareness } from "~/shared/awareness";
import { updateCurrentSystem } from "~/shared/system";
import { $resourcesCache, getResourceKey } from "~/shared/resources";
diff --git a/apps/builder/app/builder/features/pages/pages.tsx b/apps/builder/app/builder/features/pages/pages.tsx
index 436fbed046..fc8e606eb3 100644
--- a/apps/builder/app/builder/features/pages/pages.tsx
+++ b/apps/builder/app/builder/features/pages/pages.tsx
@@ -54,7 +54,7 @@ import {
NewFolderSettings,
newFolderId,
} from "./folder-settings";
-import { serverSyncStore } from "~/shared/sync";
+import { serverSyncStore } from "~/shared/sync/sync-stores";
import { useMount } from "~/shared/hook-utils/use-mount";
import {
isRootFolder,
diff --git a/apps/builder/app/builder/features/project-settings/index.ts b/apps/builder/app/builder/features/project-settings/index.ts
deleted file mode 100644
index cf35363562..0000000000
--- a/apps/builder/app/builder/features/project-settings/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from "./project-settings";
-export * from "./image-control";
diff --git a/apps/builder/app/builder/features/settings-panel/controls/code.tsx b/apps/builder/app/builder/features/settings-panel/controls/code.tsx
index 00ca36956a..fe389a32af 100644
--- a/apps/builder/app/builder/features/settings-panel/controls/code.tsx
+++ b/apps/builder/app/builder/features/settings-panel/controls/code.tsx
@@ -14,7 +14,7 @@ import {
theme,
} from "@webstudio-is/design-system";
import { InfoCircleIcon } from "@webstudio-is/icons";
-import { CodeEditor } from "~/builder/shared/code-editor";
+import { CodeEditor } from "~/shared/code-editor";
import {
BindingControl,
BindingPopover,
diff --git a/apps/builder/app/builder/features/settings-panel/controls/select-asset.tsx b/apps/builder/app/builder/features/settings-panel/controls/select-asset.tsx
index 21394e714b..29379e69f7 100644
--- a/apps/builder/app/builder/features/settings-panel/controls/select-asset.tsx
+++ b/apps/builder/app/builder/features/settings-panel/controls/select-asset.tsx
@@ -3,8 +3,8 @@ import { computed } from "nanostores";
import { useStore } from "@nanostores/react";
import { Button, Flex, Text, FloatingPanel } from "@webstudio-is/design-system";
import type { Prop } from "@webstudio-is/sdk";
-import { $assets } from "~/shared/nano-states";
-import { ImageManager } from "~/builder/shared/image-manager";
+import { $assets } from "~/shared/sync/data-stores";
+import { ImageManager } from "~/shared/image-manager";
import { type ControlProps } from "../shared";
import { acceptToMimeCategories } from "@webstudio-is/asset-uploader";
import { formatAssetName } from "~/builder/shared/assets/asset-utils";
diff --git a/apps/builder/app/builder/features/settings-panel/controls/text-content.tsx b/apps/builder/app/builder/features/settings-panel/controls/text-content.tsx
index ae96f3241a..2fa42f1535 100644
--- a/apps/builder/app/builder/features/settings-panel/controls/text-content.tsx
+++ b/apps/builder/app/builder/features/settings-panel/controls/text-content.tsx
@@ -12,13 +12,13 @@ import {
} from "@webstudio-is/design-system";
import type { Instance } from "@webstudio-is/sdk";
import { AlertIcon } from "@webstudio-is/icons";
-import { $instances } from "~/shared/nano-states";
+import { $instances } from "~/shared/sync/data-stores";
import {
BindingControl,
BindingPopover,
} from "~/builder/shared/binding-popover";
import { updateWebstudioData } from "~/shared/instance-utils";
-import { CodeEditor } from "~/builder/shared/code-editor";
+import { CodeEditor } from "~/shared/code-editor";
import {
type ControlProps,
useLocalValue,
diff --git a/apps/builder/app/builder/features/settings-panel/controls/url.tsx b/apps/builder/app/builder/features/settings-panel/controls/url.tsx
index b281d83b44..39e285a5bc 100644
--- a/apps/builder/app/builder/features/settings-panel/controls/url.tsx
+++ b/apps/builder/app/builder/features/settings-panel/controls/url.tsx
@@ -25,7 +25,7 @@ import {
findParentFolderByChildId,
findTreeInstanceIds,
} from "@webstudio-is/sdk";
-import { $instances, $pages, $props } from "~/shared/nano-states";
+import { $instances, $pages, $props } from "~/shared/sync/data-stores";
import {
BindingControl,
BindingPopover,
diff --git a/apps/builder/app/builder/features/settings-panel/property-label.tsx b/apps/builder/app/builder/features/settings-panel/property-label.tsx
index d3dfb3f20e..1b28719e25 100644
--- a/apps/builder/app/builder/features/settings-panel/property-label.tsx
+++ b/apps/builder/app/builder/features/settings-panel/property-label.tsx
@@ -17,7 +17,7 @@ import type { Prop } from "@webstudio-is/sdk";
import { showAttribute } from "@webstudio-is/react-sdk";
import { updateWebstudioData } from "~/shared/instance-utils";
import { $selectedInstance } from "~/shared/awareness";
-import { $props } from "~/shared/nano-states";
+import { $props } from "~/shared/sync/data-stores";
import {
$selectedInstanceInitialPropNames,
$selectedInstancePropsMetas,
diff --git a/apps/builder/app/builder/features/settings-panel/props-section/props-section.tsx b/apps/builder/app/builder/features/settings-panel/props-section/props-section.tsx
index 279df5c509..3719a954df 100644
--- a/apps/builder/app/builder/features/settings-panel/props-section/props-section.tsx
+++ b/apps/builder/app/builder/features/settings-panel/props-section/props-section.tsx
@@ -33,7 +33,7 @@ import {
$selectedBreakpoint,
} from "~/shared/nano-states";
import { CollapsibleSectionWithAddButton } from "~/builder/shared/collapsible-section";
-import { serverSyncStore } from "~/shared/sync";
+import { serverSyncStore } from "~/shared/sync/sync-stores";
import { $selectedInstance, $selectedInstanceKey } from "~/shared/awareness";
import { renderControl } from "../controls/combined";
import { usePropsLogic, type PropAndMeta } from "./use-props-logic";
diff --git a/apps/builder/app/builder/features/settings-panel/resource-panel.tsx b/apps/builder/app/builder/features/settings-panel/resource-panel.tsx
index 0e8bd10261..aa34949580 100644
--- a/apps/builder/app/builder/features/settings-panel/resource-panel.tsx
+++ b/apps/builder/app/builder/features/settings-panel/resource-panel.tsx
@@ -61,7 +61,7 @@ import {
EditorDialog,
EditorDialogButton,
EditorDialogControl,
-} from "~/builder/shared/code-editor-base";
+} from "~/shared/code-editor-base";
import {
$selectedInstance,
$selectedInstancePathWithRoot,
diff --git a/apps/builder/app/builder/features/settings-panel/settings-panel.tsx b/apps/builder/app/builder/features/settings-panel/settings-panel.tsx
index 6cc6eab386..2d314a4746 100644
--- a/apps/builder/app/builder/features/settings-panel/settings-panel.tsx
+++ b/apps/builder/app/builder/features/settings-panel/settings-panel.tsx
@@ -13,7 +13,7 @@ import {
} from "@webstudio-is/design-system";
import { UpgradeIcon } from "@webstudio-is/icons";
import { useStore } from "@nanostores/react";
-import cmsUpgradeBanner from "./cms-upgrade-banner.svg?url";
+import cmsUpgradeBanner from "~/shared/cms-upgrade-banner.svg?url";
import { $isDesignMode, $userPlanFeatures } from "~/shared/nano-states";
export const SettingsPanel = ({
diff --git a/apps/builder/app/builder/features/settings-panel/settings-section.tsx b/apps/builder/app/builder/features/settings-panel/settings-section.tsx
index 53dcae248a..589b7d32f5 100644
--- a/apps/builder/app/builder/features/settings-panel/settings-section.tsx
+++ b/apps/builder/app/builder/features/settings-panel/settings-section.tsx
@@ -2,9 +2,9 @@ import { useId } from "react";
import { useStore } from "@nanostores/react";
import type { Instance } from "@webstudio-is/sdk";
import { InputField } from "@webstudio-is/design-system";
-import { $instances } from "~/shared/nano-states";
+import { $instances } from "~/shared/sync/data-stores";
import { HorizontalLayout, Label, Row, useLocalValue } from "./shared";
-import { serverSyncStore } from "~/shared/sync";
+import { serverSyncStore } from "~/shared/sync/sync-stores";
import { $selectedInstance } from "~/shared/awareness";
import { getInstanceLabel } from "~/builder/shared/instance-label";
diff --git a/apps/builder/app/builder/features/settings-panel/variable-popover.tsx b/apps/builder/app/builder/features/settings-panel/variable-popover.tsx
index c671ec1116..71eb9e8ddd 100644
--- a/apps/builder/app/builder/features/settings-panel/variable-popover.tsx
+++ b/apps/builder/app/builder/features/settings-panel/variable-popover.tsx
@@ -71,7 +71,7 @@ import {
EditorDialogButton,
EditorDialogControl,
foldGutterExtension,
-} from "~/builder/shared/code-editor-base";
+} from "~/shared/code-editor-base";
import { updateWebstudioData } from "~/shared/instance-utils";
import {
findUnsetVariableNames,
diff --git a/apps/builder/app/builder/features/settings-panel/variables-section.stories.tsx b/apps/builder/app/builder/features/settings-panel/variables-section.stories.tsx
index 6150f9ba5b..6f955140ee 100644
--- a/apps/builder/app/builder/features/settings-panel/variables-section.stories.tsx
+++ b/apps/builder/app/builder/features/settings-panel/variables-section.stories.tsx
@@ -1,8 +1,9 @@
import type { Meta, StoryObj } from "@storybook/react";
import { Box } from "@webstudio-is/design-system";
import { createDefaultPages } from "@webstudio-is/project-build";
-import { $pages, $instances, $userPlanFeatures } from "~/shared/nano-states";
-import { registerContainers } from "~/shared/sync";
+import { $pages, $instances } from "~/shared/sync/data-stores";
+import { $userPlanFeatures } from "~/shared/nano-states";
+import { registerContainers } from "~/shared/sync/sync-stores";
import { $awareness } from "~/shared/awareness";
import { VariablesSection as VariablesSectionComponent } from "./variables-section";
diff --git a/apps/builder/app/builder/features/style-panel/controls/image/image-control.tsx b/apps/builder/app/builder/features/style-panel/controls/image/image-control.tsx
index f2f5f722f0..650882833d 100644
--- a/apps/builder/app/builder/features/style-panel/controls/image/image-control.tsx
+++ b/apps/builder/app/builder/features/style-panel/controls/image/image-control.tsx
@@ -7,8 +7,8 @@ import {
FloatingPanel,
} from "@webstudio-is/design-system";
import type { CssProperty, InvalidValue } from "@webstudio-is/css-engine";
-import { $assets } from "~/shared/nano-states";
-import { ImageManager } from "~/builder/shared/image-manager";
+import { $assets } from "~/shared/sync/data-stores";
+import { ImageManager } from "~/shared/image-manager";
import { useComputedStyleDecl } from "../../shared/model";
import {
getRepeatedStyleItem,
diff --git a/apps/builder/app/builder/features/style-panel/sections/backgrounds/background-content.stories.tsx b/apps/builder/app/builder/features/style-panel/sections/backgrounds/background-content.stories.tsx
index c994efbffb..e83e68514e 100644
--- a/apps/builder/app/builder/features/style-panel/sections/backgrounds/background-content.stories.tsx
+++ b/apps/builder/app/builder/features/style-panel/sections/backgrounds/background-content.stories.tsx
@@ -10,7 +10,7 @@ import {
$styles,
$styleSourceSelections,
} from "~/shared/nano-states";
-import { registerContainers } from "~/shared/sync";
+import { registerContainers } from "~/shared/sync/sync-stores";
import { BackgroundContent } from "./background-content";
import { $awareness } from "~/shared/awareness";
import { useComputedStyleDecl } from "../../shared/model";
diff --git a/apps/builder/app/builder/features/style-panel/sections/backgrounds/background-image.tsx b/apps/builder/app/builder/features/style-panel/sections/backgrounds/background-image.tsx
index cbf4666b9a..87121c420b 100644
--- a/apps/builder/app/builder/features/style-panel/sections/backgrounds/background-image.tsx
+++ b/apps/builder/app/builder/features/style-panel/sections/backgrounds/background-image.tsx
@@ -5,7 +5,7 @@ import { ImageControl } from "../../controls";
import { PropertyInlineLabel } from "../../property-label";
import { propertyDescriptions } from "@webstudio-is/css-data";
import { BackgroundCodeEditor } from "./background-code-editor";
-import { $assets } from "~/shared/nano-states";
+import { $assets } from "~/shared/sync/data-stores";
const isAbsoluteURL = (value: string) => {
try {
diff --git a/apps/builder/app/builder/features/style-panel/sections/backgrounds/background-thumbnail.tsx b/apps/builder/app/builder/features/style-panel/sections/backgrounds/background-thumbnail.tsx
index 0070ee099e..b332e32628 100644
--- a/apps/builder/app/builder/features/style-panel/sections/backgrounds/background-thumbnail.tsx
+++ b/apps/builder/app/builder/features/style-panel/sections/backgrounds/background-thumbnail.tsx
@@ -7,7 +7,7 @@ import {
toValue,
type CssProperty,
} from "@webstudio-is/css-engine";
-import { $assets } from "~/shared/nano-states";
+import { $assets } from "~/shared/sync/data-stores";
import brokenImage from "~/shared/images/broken-image-placeholder.svg";
import { humanizeString } from "~/shared/string-utils";
import { useComputedStyles } from "../../shared/model";
diff --git a/apps/builder/app/builder/features/style-panel/sections/backgrounds/backgrounds.stories.tsx b/apps/builder/app/builder/features/style-panel/sections/backgrounds/backgrounds.stories.tsx
index 9e01f60ce8..b94f5c7ee9 100644
--- a/apps/builder/app/builder/features/style-panel/sections/backgrounds/backgrounds.stories.tsx
+++ b/apps/builder/app/builder/features/style-panel/sections/backgrounds/backgrounds.stories.tsx
@@ -1,6 +1,6 @@
import { getStyleDeclKey, type StyleDecl } from "@webstudio-is/sdk";
import { styled, theme } from "@webstudio-is/design-system";
-import { registerContainers } from "~/shared/sync";
+import { registerContainers } from "~/shared/sync/sync-stores";
import {
$breakpoints,
$instances,
diff --git a/apps/builder/app/builder/features/style-panel/sections/backgrounds/backgrounds.tsx b/apps/builder/app/builder/features/style-panel/sections/backgrounds/backgrounds.tsx
index 21a3519228..45deeb2b6d 100644
--- a/apps/builder/app/builder/features/style-panel/sections/backgrounds/backgrounds.tsx
+++ b/apps/builder/app/builder/features/style-panel/sections/backgrounds/backgrounds.tsx
@@ -2,7 +2,7 @@ import { useStore } from "@nanostores/react";
import type { CssProperty } from "@webstudio-is/css-engine";
import { propertyDescriptions } from "@webstudio-is/css-data";
import { Flex, Grid, theme } from "@webstudio-is/design-system";
-import { $assets } from "~/shared/nano-states";
+import { $assets } from "~/shared/sync/data-stores";
import { ColorControl } from "../../controls/color/color-control";
import { RepeatedStyleSection } from "../../shared/style-section";
import { PropertyLabel } from "../../property-label";
diff --git a/apps/builder/app/builder/features/style-panel/sections/position/inset-control.stories.tsx b/apps/builder/app/builder/features/style-panel/sections/position/inset-control.stories.tsx
index b7a0157823..a89313989a 100644
--- a/apps/builder/app/builder/features/style-panel/sections/position/inset-control.stories.tsx
+++ b/apps/builder/app/builder/features/style-panel/sections/position/inset-control.stories.tsx
@@ -3,7 +3,7 @@ import { Box } from "@webstudio-is/design-system";
import { getStyleDeclKey, StyleDecl } from "@webstudio-is/sdk";
import { createDefaultPages } from "@webstudio-is/project-build";
import { InsetControl } from "./inset-control";
-import { registerContainers } from "~/shared/sync";
+import { registerContainers } from "~/shared/sync/sync-stores";
import {
$breakpoints,
$pages,
diff --git a/apps/builder/app/builder/features/style-panel/sections/transitions/transitions.stories.tsx b/apps/builder/app/builder/features/style-panel/sections/transitions/transitions.stories.tsx
index bb6e5d7ea9..e7f1669c70 100644
--- a/apps/builder/app/builder/features/style-panel/sections/transitions/transitions.stories.tsx
+++ b/apps/builder/app/builder/features/style-panel/sections/transitions/transitions.stories.tsx
@@ -8,7 +8,7 @@ import {
$styleSources,
$styleSourceSelections,
} from "~/shared/nano-states";
-import { registerContainers } from "~/shared/sync";
+import { registerContainers } from "~/shared/sync/sync-stores";
import { Section } from "./transitions";
import { $awareness } from "~/shared/awareness";
import { createDefaultPages } from "@webstudio-is/project-build";
diff --git a/apps/builder/app/builder/features/style-panel/shared/css-fragment.tsx b/apps/builder/app/builder/features/style-panel/shared/css-fragment.tsx
index 9f87003706..895226001a 100644
--- a/apps/builder/app/builder/features/style-panel/shared/css-fragment.tsx
+++ b/apps/builder/app/builder/features/style-panel/shared/css-fragment.tsx
@@ -16,7 +16,7 @@ import {
EditorDialogButton,
EditorDialogControl,
getCodeEditorCssVars,
-} from "~/builder/shared/code-editor-base";
+} from "~/shared/code-editor-base";
import { $availableVariables } from "./model";
type ShorthandProperty = (typeof shorthandProperties)[number];
diff --git a/apps/builder/app/builder/features/style-panel/shared/css-value-input/value-editor-dialog.tsx b/apps/builder/app/builder/features/style-panel/shared/css-value-input/value-editor-dialog.tsx
index 63fd5f0cd5..e15ff20a7b 100644
--- a/apps/builder/app/builder/features/style-panel/shared/css-value-input/value-editor-dialog.tsx
+++ b/apps/builder/app/builder/features/style-panel/shared/css-value-input/value-editor-dialog.tsx
@@ -10,7 +10,7 @@ import type {
InvalidValue,
StyleValue,
} from "@webstudio-is/css-engine";
-import { EditorDialog } from "~/builder/shared/code-editor-base";
+import { EditorDialog } from "~/shared/code-editor-base";
import { CssFragmentEditorContent } from "../css-fragment";
import type {
CssValueInputValue,
diff --git a/apps/builder/app/builder/features/style-panel/shared/repeated-style.test.ts b/apps/builder/app/builder/features/style-panel/shared/repeated-style.test.ts
index 5646592ed9..358f880776 100644
--- a/apps/builder/app/builder/features/style-panel/shared/repeated-style.test.ts
+++ b/apps/builder/app/builder/features/style-panel/shared/repeated-style.test.ts
@@ -25,7 +25,7 @@ import {
$styleSources,
$styleSourceSelections,
} from "~/shared/nano-states";
-import { registerContainers } from "~/shared/sync";
+import { registerContainers } from "~/shared/sync/sync-stores";
import { setProperty } from "./use-style-data";
import type { ComputedStyleDecl } from "~/shared/style-object-model";
import { $awareness } from "~/shared/awareness";
diff --git a/apps/builder/app/builder/features/style-panel/shared/use-style-data.ts b/apps/builder/app/builder/features/style-panel/shared/use-style-data.ts
index 5e274ccb28..b2c1a09398 100644
--- a/apps/builder/app/builder/features/style-panel/shared/use-style-data.ts
+++ b/apps/builder/app/builder/features/style-panel/shared/use-style-data.ts
@@ -9,7 +9,7 @@ import {
$styleSources,
$styles,
} from "~/shared/nano-states";
-import { serverSyncStore } from "~/shared/sync";
+import { serverSyncStore } from "~/shared/sync/sync-stores";
import { $ephemeralStyles } from "~/canvas/stores";
import { $selectedInstance } from "~/shared/awareness";
diff --git a/apps/builder/app/builder/features/style-panel/style-source-section.test.ts b/apps/builder/app/builder/features/style-panel/style-source-section.test.ts
index 4e6373a733..ca965adc1a 100644
--- a/apps/builder/app/builder/features/style-panel/style-source-section.test.ts
+++ b/apps/builder/app/builder/features/style-panel/style-source-section.test.ts
@@ -1,6 +1,6 @@
import { enableMapSet } from "immer";
import { expect, test } from "vitest";
-import { registerContainers } from "~/shared/sync";
+import { registerContainers } from "~/shared/sync/sync-stores";
import {
$instances,
$selectedStyleSources,
diff --git a/apps/builder/app/builder/features/style-panel/style-source-section.tsx b/apps/builder/app/builder/features/style-panel/style-source-section.tsx
index 30f95a1cda..de59c8ad79 100644
--- a/apps/builder/app/builder/features/style-panel/style-source-section.tsx
+++ b/apps/builder/app/builder/features/style-panel/style-source-section.tsx
@@ -32,7 +32,7 @@ import {
} from "~/shared/nano-states";
import { removeByMutable } from "~/shared/array-utils";
import { cloneStyles } from "~/shared/tree-utils";
-import { serverSyncStore } from "~/shared/sync";
+import { serverSyncStore } from "~/shared/sync/sync-stores";
import { $selectedInstance } from "~/shared/awareness";
import { $instanceTags } from "./shared/model";
import { humanizeString } from "~/shared/string-utils";
diff --git a/apps/builder/app/builder/features/topbar/domain-checkbox.tsx b/apps/builder/app/builder/features/topbar/domain-checkbox.tsx
index 849a3ff339..ea5eca6cc3 100644
--- a/apps/builder/app/builder/features/topbar/domain-checkbox.tsx
+++ b/apps/builder/app/builder/features/topbar/domain-checkbox.tsx
@@ -9,7 +9,8 @@ import {
Checkbox,
} from "@webstudio-is/design-system";
-import { $project, $userPlanFeatures } from "~/shared/nano-states";
+import { $project } from "~/shared/sync/data-stores";
+import { $userPlanFeatures } from "~/shared/nano-states";
export const domainToPublishName = "domainToPublish[]";
diff --git a/apps/builder/app/builder/features/topbar/domains.tsx b/apps/builder/app/builder/features/topbar/domains.tsx
index b94b548c4a..7eb08e4ca2 100644
--- a/apps/builder/app/builder/features/topbar/domains.tsx
+++ b/apps/builder/app/builder/features/topbar/domains.tsx
@@ -32,11 +32,11 @@ import {
import { Entri } from "./entri";
import { nativeClient } from "~/shared/trpc/trpc-client";
import { useStore } from "@nanostores/react";
-import { $publisherHost } from "~/shared/nano-states";
+import { $publisherHost } from "~/shared/sync/data-stores";
import { extractCname } from "./cname";
import { useEffectEvent } from "~/shared/hook-utils/effect-event";
import { DomainCheckbox } from "./domain-checkbox";
-import { CopyToClipboard } from "~/builder/shared/copy-to-clipboard";
+import { CopyToClipboard } from "~/shared/copy-to-clipboard";
import { RelativeTime } from "~/builder/shared/relative-time";
export type Domain = Project["domainsVirtual"][number];
diff --git a/apps/builder/app/builder/features/topbar/publish.tsx b/apps/builder/app/builder/features/topbar/publish.tsx
index 263f0e11c5..f37c9adea1 100644
--- a/apps/builder/app/builder/features/topbar/publish.tsx
+++ b/apps/builder/app/builder/features/topbar/publish.tsx
@@ -82,10 +82,10 @@ import {
type Templates,
} from "@webstudio-is/sdk";
import { DomainCheckbox, domainToPublishName } from "./domain-checkbox";
-import { CopyToClipboard } from "~/builder/shared/copy-to-clipboard";
+import { CopyToClipboard } from "~/shared/copy-to-clipboard";
import { $openProjectSettings } from "~/shared/nano-states/project-settings";
import { RelativeTime } from "~/builder/shared/relative-time";
-import cmsUpgradeBanner from "../settings-panel/cms-upgrade-banner.svg?url";
+import cmsUpgradeBanner from "~/shared/cms-upgrade-banner.svg?url";
type ChangeProjectDomainProps = {
project: Project;
diff --git a/apps/builder/app/builder/features/topbar/sync-status.tsx b/apps/builder/app/builder/features/topbar/sync-status.tsx
index ebf9457626..db5d525cd9 100644
--- a/apps/builder/app/builder/features/topbar/sync-status.tsx
+++ b/apps/builder/app/builder/features/topbar/sync-status.tsx
@@ -9,7 +9,7 @@ import {
} from "@webstudio-is/design-system";
import { OfflineIcon } from "@webstudio-is/icons";
import { useEffect } from "react";
-import { $queueStatus } from "~/builder/shared/sync";
+import { $queueStatus } from "~/shared/sync/project-queue";
const $isOnline = atom(false);
diff --git a/apps/builder/app/builder/features/topbar/topbar.tsx b/apps/builder/app/builder/features/topbar/topbar.tsx
index 6dd722d1a0..af7297b418 100644
--- a/apps/builder/app/builder/features/topbar/topbar.tsx
+++ b/apps/builder/app/builder/features/topbar/topbar.tsx
@@ -12,7 +12,8 @@ import {
Kbd,
} from "@webstudio-is/design-system";
import type { Project } from "@webstudio-is/project";
-import { $editingPageId, $pages } from "~/shared/nano-states";
+import { $pages } from "~/shared/sync/data-stores";
+import { $editingPageId } from "~/shared/nano-states";
import { ShareButton } from "./share";
import { PublishButton } from "./publish";
diff --git a/apps/builder/app/builder/shared/assets/use-assets.tsx b/apps/builder/app/builder/shared/assets/use-assets.tsx
index ea1659864e..cc65c97203 100644
--- a/apps/builder/app/builder/shared/assets/use-assets.tsx
+++ b/apps/builder/app/builder/shared/assets/use-assets.tsx
@@ -22,7 +22,7 @@ import {
$uploadingFilesDataStore,
type UploadingFileData,
} from "~/shared/nano-states";
-import { serverSyncStore } from "~/shared/sync";
+import { serverSyncStore } from "~/shared/sync/sync-stores";
import type {
AssetContainer,
UploadedAssetContainer,
diff --git a/apps/builder/app/builder/shared/calc-canvas-width.test.ts b/apps/builder/app/builder/shared/calc-canvas-width.test.ts
index 3517fa33ed..5b3d4a384c 100644
--- a/apps/builder/app/builder/shared/calc-canvas-width.test.ts
+++ b/apps/builder/app/builder/shared/calc-canvas-width.test.ts
@@ -1,7 +1,7 @@
import { test, expect, describe, beforeEach } from "vitest";
import { calcCanvasWidth, setCanvasWidth } from "./calc-canvas-width";
import { $workspaceRect, $canvasWidth } from "~/builder/shared/nano-states";
-import { $breakpoints } from "~/shared/nano-states";
+import { $breakpoints } from "~/shared/sync/data-stores";
// Helper to create a DOMRect-like object for testing
const createRect = (width: number, height: number): DOMRect => ({
diff --git a/apps/builder/app/builder/shared/commands.test.tsx b/apps/builder/app/builder/shared/commands.test.tsx
index f141f792ff..46052ec0c4 100644
--- a/apps/builder/app/builder/shared/commands.test.tsx
+++ b/apps/builder/app/builder/shared/commands.test.tsx
@@ -9,7 +9,7 @@ import {
$props,
$registeredComponentMetas,
} from "~/shared/nano-states";
-import { registerContainers } from "~/shared/sync";
+import { registerContainers } from "~/shared/sync/sync-stores";
import { $awareness, selectInstance } from "~/shared/awareness";
import { deleteSelectedInstance, replaceWith } from "./commands";
diff --git a/apps/builder/app/builder/shared/commands.ts b/apps/builder/app/builder/shared/commands.ts
index 4ef98ddc5c..0ac222e320 100644
--- a/apps/builder/app/builder/shared/commands.ts
+++ b/apps/builder/app/builder/shared/commands.ts
@@ -31,7 +31,7 @@ import {
canUnwrapInstance,
} from "~/shared/instance-utils";
import type { InstanceSelector } from "~/shared/tree-utils";
-import { serverSyncStore } from "~/shared/sync";
+import { serverSyncStore } from "~/shared/sync/sync-stores";
import { $publisher } from "~/shared/pubsub";
import {
$activeInspectorPanel,
@@ -53,7 +53,7 @@ import { denormalizeSrcProps } from "~/shared/copy-paste/asset-upload";
import { getInstanceLabel } from "./instance-label";
import { $instanceTags } from "../features/style-panel/shared/model";
import { reactPropsToStandardAttributes } from "@webstudio-is/react-sdk";
-import { isSyncIdle } from "./sync/sync-server";
+import { isSyncIdle } from "~/shared/sync/project-queue";
import { openDeleteUnusedTokensDialog } from "~/builder/shared/style-source-utils";
import { openDeleteUnusedDataVariablesDialog } from "~/builder/shared/data-variable-utils";
import { openDeleteUnusedCssVariablesDialog } from "~/builder/shared/css-variable-utils";
diff --git a/apps/builder/app/builder/shared/css-variable-utils.test.tsx b/apps/builder/app/builder/shared/css-variable-utils.test.tsx
index dce290078a..676cb7ef7e 100644
--- a/apps/builder/app/builder/shared/css-variable-utils.test.tsx
+++ b/apps/builder/app/builder/shared/css-variable-utils.test.tsx
@@ -3,7 +3,7 @@ import { atom } from "nanostores";
import type { StyleDecl, Styles, Prop } from "@webstudio-is/sdk";
import type { StyleProperty, StyleValue } from "@webstudio-is/css-engine";
import { parseCssValue } from "@webstudio-is/css-data";
-import { $styles } from "~/shared/nano-states";
+import { $styles } from "~/shared/sync/data-stores";
import {
findCssVariableUsagesByInstance,
validateCssVariableName,
diff --git a/apps/builder/app/builder/shared/css-variable-utils.tsx b/apps/builder/app/builder/shared/css-variable-utils.tsx
index 4903a27fe3..33527872b8 100644
--- a/apps/builder/app/builder/shared/css-variable-utils.tsx
+++ b/apps/builder/app/builder/shared/css-variable-utils.tsx
@@ -25,8 +25,12 @@ import type {
CustomProperty,
} from "@webstudio-is/css-engine";
import { toValue } from "@webstudio-is/css-engine";
-import { $styles, $styleSourceSelections, $props } from "~/shared/nano-states";
-import { serverSyncStore } from "~/shared/sync";
+import {
+ $styles,
+ $styleSourceSelections,
+ $props,
+} from "~/shared/sync/data-stores";
+import { serverSyncStore } from "~/shared/sync/sync-stores";
import { getStyleDeclKey } from "@webstudio-is/sdk";
const $isDeleteUnusedCssVariablesDialogOpen = atom(false);
diff --git a/apps/builder/app/builder/shared/data-variable-utils.test.tsx b/apps/builder/app/builder/shared/data-variable-utils.test.tsx
index 3c8cdc446d..465ecf75c1 100644
--- a/apps/builder/app/builder/shared/data-variable-utils.test.tsx
+++ b/apps/builder/app/builder/shared/data-variable-utils.test.tsx
@@ -1,6 +1,6 @@
import { expect, test } from "vitest";
import { atom } from "nanostores";
-import { $dataSources } from "~/shared/nano-states";
+import { $dataSources } from "~/shared/sync/data-stores";
import { validateDataVariableName } from "./data-variable-utils";
import type { DataSources, DataSource } from "@webstudio-is/sdk";
diff --git a/apps/builder/app/builder/shared/data-variable-utils.tsx b/apps/builder/app/builder/shared/data-variable-utils.tsx
index 73967e3a30..f92baeba81 100644
--- a/apps/builder/app/builder/shared/data-variable-utils.tsx
+++ b/apps/builder/app/builder/shared/data-variable-utils.tsx
@@ -22,7 +22,7 @@ import {
$dataSources,
$resources,
} from "~/shared/nano-states";
-import { serverSyncStore } from "~/shared/sync";
+import { serverSyncStore } from "~/shared/sync/sync-stores";
import { findVariableUsagesByInstance } from "~/shared/data-variables";
const $isDeleteUnusedDataVariablesDialogOpen = atom(false);
diff --git a/apps/builder/app/builder/shared/expression-editor.tsx b/apps/builder/app/builder/shared/expression-editor.tsx
index d5a5ad4139..8b6a42187e 100644
--- a/apps/builder/app/builder/shared/expression-editor.tsx
+++ b/apps/builder/app/builder/shared/expression-editor.tsx
@@ -39,7 +39,7 @@ import {
EditorDialogButton,
EditorDialogControl,
type EditorApi,
-} from "./code-editor-base";
+} from "~/shared/code-editor-base";
import {
decodeDataVariableName,
encodeDataVariableName,
@@ -525,14 +525,14 @@ export const ExpressionEditor = ({
readOnly={readOnly}
autoFocus={autoFocus}
value={expressionWithUnsetVariables}
- onChange={(newValue) => {
+ onChange={(newValue: string) => {
const expressionWithRestoredVariables = restoreExpressionVariables({
expression: newValue,
maskedIdByName: idByName,
});
onChange(expressionWithRestoredVariables);
}}
- onChangeComplete={(newValue) => {
+ onChangeComplete={(newValue: string) => {
const expressionWithRestoredVariables = restoreExpressionVariables({
expression: newValue,
maskedIdByName: idByName,
diff --git a/apps/builder/app/builder/shared/instance-label.tsx b/apps/builder/app/builder/shared/instance-label.tsx
index 07b1b2be87..be4d384f20 100644
--- a/apps/builder/app/builder/shared/instance-label.tsx
+++ b/apps/builder/app/builder/shared/instance-label.tsx
@@ -31,7 +31,8 @@ import {
ROOT_INSTANCE_ID,
type Instance,
} from "@webstudio-is/sdk";
-import { $registeredComponentMetas, $instances } from "~/shared/nano-states";
+import { $instances } from "~/shared/sync/data-stores";
+import { $registeredComponentMetas } from "~/shared/nano-states";
import { humanizeString } from "~/shared/string-utils";
const htmlIcons: Record<string, undefined | string> = {
diff --git a/apps/builder/app/builder/shared/style-source-utils.tsx b/apps/builder/app/builder/shared/style-source-utils.tsx
index 8a8f661516..2c7f565f94 100644
--- a/apps/builder/app/builder/shared/style-source-utils.tsx
+++ b/apps/builder/app/builder/shared/style-source-utils.tsx
@@ -22,7 +22,7 @@ import {
$selectedStyleState,
} from "~/shared/nano-states";
import { removeByMutable } from "~/shared/array-utils";
-import { serverSyncStore } from "~/shared/sync";
+import { serverSyncStore } from "~/shared/sync/sync-stores";
import { $selectedInstance } from "~/shared/awareness";
const $isDeleteUnusedTokensDialogOpen = atom(false);
diff --git a/apps/builder/app/builder/shared/sync/index.ts b/apps/builder/app/builder/shared/sync/index.ts
deleted file mode 100644
index 0b3c13a9b0..0000000000
--- a/apps/builder/app/builder/shared/sync/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { useSyncServer, $queueStatus } from "./sync-server";
diff --git a/apps/builder/app/canvas/canvas.tsx b/apps/builder/app/canvas/canvas.tsx
index d028f9ec36..c7016ac839 100644
--- a/apps/builder/app/canvas/canvas.tsx
+++ b/apps/builder/app/canvas/canvas.tsx
@@ -24,7 +24,7 @@ import {
registerContainers,
serverSyncStore,
useCanvasStore,
-} from "~/shared/sync";
+} from "~/shared/sync/sync-stores";
import {
GlobalStyles,
subscribeStyles,
diff --git a/apps/builder/app/canvas/collapsed.ts b/apps/builder/app/canvas/collapsed.ts
index 4099b8d7e7..ee7a9aa9c2 100644
--- a/apps/builder/app/canvas/collapsed.ts
+++ b/apps/builder/app/canvas/collapsed.ts
@@ -9,7 +9,7 @@ import {
} from "~/shared/nano-states";
import { $selectedBreakpoint } from "~/shared/nano-states";
import { $selectedPage } from "~/shared/awareness";
-import { serverSyncStore } from "~/shared/sync";
+import { serverSyncStore } from "~/shared/sync/sync-stores";
import { doNotTrackMutation } from "~/shared/dom-utils";
const isHtmlTag = (tag: string): tag is HtmlTags =>
diff --git a/apps/builder/app/canvas/features/webstudio-component/webstudio-component.tsx b/apps/builder/app/canvas/features/webstudio-component/webstudio-component.tsx
index a8f5ca2ac4..2e38bdc72a 100644
--- a/apps/builder/app/canvas/features/webstudio-component/webstudio-component.tsx
+++ b/apps/builder/app/canvas/features/webstudio-component/webstudio-component.tsx
@@ -57,7 +57,7 @@ import {
} from "~/shared/tree-utils";
import { setDataCollapsed } from "~/canvas/collapsed";
import { getIsVisuallyHidden } from "~/shared/visually-hidden";
-import { serverSyncStore } from "~/shared/sync";
+import { serverSyncStore } from "~/shared/sync/sync-stores";
import { TextEditor } from "../text-editor";
import {
$selectedPage,
diff --git a/apps/builder/app/canvas/shared/scroll-new-instance-into-view.ts b/apps/builder/app/canvas/shared/scroll-new-instance-into-view.ts
index 4087f63544..1870e99ee9 100644
--- a/apps/builder/app/canvas/shared/scroll-new-instance-into-view.ts
+++ b/apps/builder/app/canvas/shared/scroll-new-instance-into-view.ts
@@ -1,6 +1,6 @@
import { idAttribute } from "@webstudio-is/react-sdk";
import type { Instances } from "@webstudio-is/sdk";
-import { $instances } from "~/shared/nano-states";
+import { $instances } from "~/shared/sync/data-stores";
/**
* When a new instance is added to the canvas, scroll it into view.
diff --git a/apps/builder/app/dashboard/projects/project-card.tsx b/apps/builder/app/dashboard/projects/project-card.tsx
index 2bcf206c61..d95d67473b 100644
--- a/apps/builder/app/dashboard/projects/project-card.tsx
+++ b/apps/builder/app/dashboard/projects/project-card.tsx
@@ -13,12 +13,7 @@ import {
import { InfoCircleIcon } from "@webstudio-is/icons";
import type { DashboardProject } from "@webstudio-is/dashboard";
import { builderUrl } from "~/shared/router-utils";
-import {
- RenameProjectDialog,
- DeleteProjectDialog,
- useCloneProject,
- ShareProjectDialog,
-} from "./project-dialogs";
+import { ProjectDialogs, type DialogType } from "./project-dialogs";
import {
ThumbnailLinkWithAbbr,
ThumbnailLinkWithImage,
@@ -26,7 +21,6 @@ import {
import { Spinner } from "../shared/spinner";
import { Card, CardContent, CardFooter } from "../shared/card";
import type { User } from "~/shared/db/user.server";
-import { TagsDialog } from "./tags";
import { ProjectMenu } from "./project-menu";
import { formatDate } from "./utils";
@@ -85,12 +79,8 @@ export const ProjectCard = ({
d.status === "ACTIVE" && d.verified
)?.domain;
const displayDomain = customDomain ?? `${domain}.${publisherHost}`;
- const [isRenameDialogOpen, setIsRenameDialogOpen] = useState(false);
- const [isDeleteDialogOpen, setIsDeleteDialogOpen] = useState(false);
- const [isShareDialogOpen, setIsShareDialogOpen] = useState(false);
- const [isTagsDialogOpen, setIsTagsDialogOpen] = useState(false);
+ const [openDialog, setOpenDialog] = useState<DialogType | undefined>();
const [isHidden, setIsHidden] = useState(false);
- const handleCloneProject = useCloneProject(id);
const [isTransitioning, setIsTransitioning] = useState(false);
// Makes sure there are no project tags that reference deleted User tags.
@@ -225,39 +215,17 @@ export const ProjectCard = ({
<Text color="subtle">Not Published</Text>
)}
</Flex>
- <ProjectMenu
- onDelete={() => setIsDeleteDialogOpen(true)}
- onRename={() => setIsRenameDialogOpen(true)}
- onShare={() => setIsShareDialogOpen(true)}
- onDuplicate={handleCloneProject}
- onUpdateTags={() => setIsTagsDialogOpen(true)}
- />
+ <ProjectMenu projectId={id} onOpenChange={setOpenDialog} />
</CardFooter>
- <RenameProjectDialog
- isOpen={isRenameDialogOpen}
- onOpenChange={setIsRenameDialogOpen}
- title={title}
+ <ProjectDialogs
projectId={id}
- />
- <DeleteProjectDialog
- isOpen={isDeleteDialogOpen}
- onOpenChange={setIsDeleteDialogOpen}
- onHiddenChange={setIsHidden}
title={title}
- projectId={id}
- />
- <ShareProjectDialog
- isOpen={isShareDialogOpen}
- onOpenChange={setIsShareDialogOpen}
- projectId={id}
+ tags={tags}
+ openDialog={openDialog}
+ onOpenDialogChange={setOpenDialog}
+ onHiddenChange={setIsHidden}
hasProPlan={hasProPlan}
- />
- <TagsDialog
- projectId={id}
projectsTags={projectsTags}
- projectTagsIds={projectTagsIds}
- isOpen={isTagsDialogOpen}
- onOpenChange={setIsTagsDialogOpen}
/>
</Card>
);
diff --git a/apps/builder/app/dashboard/projects/project-dialogs.tsx b/apps/builder/app/dashboard/projects/project-dialogs.tsx
index eee359dacf..6cac84c52a 100644
--- a/apps/builder/app/dashboard/projects/project-dialogs.tsx
+++ b/apps/builder/app/dashboard/projects/project-dialogs.tsx
@@ -21,6 +21,19 @@ import { Title } from "@webstudio-is/project";
import { builderUrl } from "~/shared/router-utils";
import { ShareProjectContainer } from "~/shared/share-project";
import { trpcClient } from "~/shared/trpc/trpc-client";
+import type { DashboardProject } from "@webstudio-is/dashboard";
+import {
+ ProjectSettingsDialog,
+ type SectionName,
+} from "~/shared/project-settings";
+import type { User } from "~/shared/db/user.server";
+import { TagsDialog } from "./tags";
+import {
+ destroyClientSync,
+ initializeClientSync,
+} from "~/shared/sync/sync-client";
+
+export type DialogType = "rename" | "delete" | "share" | "tags" | "settings";
type DialogProps = {
title: string;
@@ -129,8 +142,6 @@ const useCreateProject = () => {
setErrors(errors);
if (parsed.success) {
send({ title }, (data) => {
- console.info("data");
-
if (data?.id) {
window.location.href = builderUrl({
origin: window.origin,
@@ -361,7 +372,7 @@ export const DeleteProjectDialog = ({
);
};
-export const useCloneProject = (projectId: string) => {
+export const useDuplicateProject = (projectId: string) => {
const { send } = trpcClient.dashboardProject.clone.useMutation();
const revalidator = useRevalidator();
@@ -389,3 +400,130 @@ export const ShareProjectDialog = ({
</Dialog>
);
};
+
+/**
+ * Container component that manages data loading for ProjectSettingsDialog.
+ * Handles sync initialization when the dialog is opened from the dashboard.
+ */
+const ProjectSettingsDialogContainer = ({
+ projectId,
+ onOpenChange,
+ isOpen,
+}: {
+ projectId: string;
+ onOpenChange: (isOpen: boolean) => void;
+ isOpen: boolean;
+}) => {
+ const [currentSection, setCurrentSection] = useState<
+ SectionName | undefined
+ >();
+
+ // Set section when dialog opens
+ useEffect(() => {
+ setCurrentSection(isOpen ? "general" : undefined);
+
+ // Reset data stores and stop sync when dialog closes
+ if (!isOpen) {
+ destroyClientSync();
+ }
+ }, [isOpen]);
+
+ // Initialize sync when settings dialog is opened
+ useEffect(() => {
+ if (!isOpen) {
+ return;
+ }
+
+ // Initialize sync which will load data, start project sync, and start polling
+ const controller = new AbortController();
+
+ initializeClientSync({
+ projectId,
+ authPermit: "own", // Dashboard projects are always owned by the current user
+ signal: controller.signal,
+ });
+
+ return () => {
+ controller.abort("settings-closed");
+ };
+ }, [isOpen, projectId]);
+
+ return (
+ <ProjectSettingsDialog
+ projectId={projectId}
+ currentSection={currentSection}
+ onSectionChange={setCurrentSection}
+ onOpenChange={onOpenChange}
+ />
+ );
+};
+
+type ProjectDialogsProps = {
+ projectId: string;
+ title: string;
+ tags: DashboardProject["tags"];
+ openDialog: DialogType | undefined;
+ onOpenDialogChange: (dialog: DialogType | undefined) => void;
+ onHiddenChange: (isHidden: boolean) => void;
+ hasProPlan: boolean;
+ projectsTags: User["projectsTags"];
+};
+
+/**
+ * Shared component that handles all project dialogs.
+ */
+export const ProjectDialogs = ({
+ projectId,
+ title,
+ tags,
+ openDialog,
+ onOpenDialogChange,
+ onHiddenChange,
+ hasProPlan,
+ projectsTags,
+}: ProjectDialogsProps) => {
+ const projectTagsIds = (tags || [])
+ .map((tagId) => {
+ const tag = projectsTags.find((tag) => tag.id === tagId);
+ return tag ? tag.id : undefined;
+ })
+ .filter(Boolean) as string[];
+
+ return (
+ <>
+ <RenameProjectDialog
+ isOpen={openDialog === "rename"}
+ onOpenChange={(open) => onOpenDialogChange(open ? "rename" : undefined)}
+ title={title}
+ projectId={projectId}
+ />
+ <DeleteProjectDialog
+ isOpen={openDialog === "delete"}
+ onOpenChange={(open) => onOpenDialogChange(open ? "delete" : undefined)}
+ onHiddenChange={onHiddenChange}
+ title={title}
+ projectId={projectId}
+ />
+ <ShareProjectDialog
+ isOpen={openDialog === "share"}
+ onOpenChange={(open) => onOpenDialogChange(open ? "share" : undefined)}
+ projectId={projectId}
+ hasProPlan={hasProPlan}
+ />
+ <TagsDialog
+ projectId={projectId}
+ projectsTags={projectsTags}
+ projectTagsIds={projectTagsIds}
+ isOpen={openDialog === "tags"}
+ onOpenChange={(open) => onOpenDialogChange(open ? "tags" : undefined)}
+ />
+ <ProjectSettingsDialogContainer
+ projectId={projectId}
+ onOpenChange={(open) =>
+ onOpenDialogChange(open ? "settings" : undefined)
+ }
+ isOpen={openDialog === "settings"}
+ />
+ </>
+ );
+};
diff --git a/apps/builder/app/dashboard/projects/project-menu.tsx b/apps/builder/app/dashboard/projects/project-menu.tsx
index 2cff5b5cbe..00699e1583 100644
--- a/apps/builder/app/dashboard/projects/project-menu.tsx
+++ b/apps/builder/app/dashboard/projects/project-menu.tsx
@@ -8,23 +8,18 @@ import {
theme,
} from "@webstudio-is/design-system";
import { EllipsesIcon } from "@webstudio-is/icons";
+import type { DialogType } from "./project-dialogs";
+import { useDuplicateProject } from "./project-dialogs";
type ProjectMenuProps = {
- onDelete: () => void;
- onRename: () => void;
- onDuplicate: () => void;
- onShare: () => void;
- onUpdateTags: () => void;
+ projectId: string;
+ onOpenChange: (dialog: DialogType) => void;
};
-export const ProjectMenu = ({
- onDelete,
- onRename,
- onDuplicate,
- onShare,
- onUpdateTags,
-}: ProjectMenuProps) => {
+export const ProjectMenu = ({ projectId, onOpenChange }: ProjectMenuProps) => {
const [isOpen, setIsOpen] = useState(false);
+ const handleDuplicateProject = useDuplicateProject(projectId);
+
return (
<DropdownMenu open={isOpen} onOpenChange={setIsOpen}>
<DropdownMenuTrigger asChild>
@@ -37,11 +32,24 @@ export const ProjectMenu = ({
</IconButton>
</DropdownMenuTrigger>
<DropdownMenuContent align="end" css={{ width: theme.spacing[24] }}>
- <DropdownMenuItem onSelect={onDuplicate}>Duplicate</DropdownMenuItem>
- <DropdownMenuItem onSelect={onRename}>Rename</DropdownMenuItem>
- <DropdownMenuItem onSelect={onShare}>Share</DropdownMenuItem>
- <DropdownMenuItem onSelect={onUpdateTags}>Tags</DropdownMenuItem>
- <DropdownMenuItem onSelect={onDelete}>Delete</DropdownMenuItem>
+ <DropdownMenuItem onSelect={handleDuplicateProject}>
+ Duplicate
+ </DropdownMenuItem>
+ <DropdownMenuItem onSelect={() => onOpenChange("rename")}>
+ Rename
+ </DropdownMenuItem>
+ <DropdownMenuItem onSelect={() => onOpenChange("share")}>
+ Share
+ </DropdownMenuItem>
+ <DropdownMenuItem onSelect={() => onOpenChange("tags")}>
+ Tags
+ </DropdownMenuItem>
+ <DropdownMenuItem onSelect={() => onOpenChange("settings")}>
+ Settings
+ </DropdownMenuItem>
+ <DropdownMenuItem onSelect={() => onOpenChange("delete")}>
+ Delete
+ </DropdownMenuItem>
</DropdownMenuContent>
</DropdownMenu>
);
diff --git a/apps/builder/app/dashboard/projects/projects-list.tsx b/apps/builder/app/dashboard/projects/projects-list.tsx
index 1d36b5991e..5d4f2df3d0 100644
--- a/apps/builder/app/dashboard/projects/projects-list.tsx
+++ b/apps/builder/app/dashboard/projects/projects-list.tsx
@@ -12,14 +12,8 @@ import {
import { ChevronUpIcon, ChevronDownIcon } from "@webstudio-is/icons";
import type { DashboardProject } from "@webstudio-is/dashboard";
import { builderUrl } from "~/shared/router-utils";
-import {
- RenameProjectDialog,
- DeleteProjectDialog,
- useCloneProject,
- ShareProjectDialog,
-} from "./project-dialogs";
+import { ProjectDialogs, type DialogType } from "./project-dialogs";
import type { User } from "~/shared/db/user.server";
-import { TagsDialog } from "./tags";
import { ProjectMenu } from "./project-menu";
import { formatDate } from "./utils";
import type { SortField, SortOrder } from "./sort";
@@ -99,23 +93,13 @@ export const ProjectsListItem = ({
d.status === "ACTIVE" && d.verified
)?.domain;
const displayDomain = customDomain ?? `${domain}.${publisherHost}`;
- const [openDialog, setOpenDialog] = useState<
- "rename" | "delete" | "share" | "tags" | undefined
- >(undefined);
+ const [openDialog, setOpenDialog] = useState<DialogType | undefined>();
const [isHidden, setIsHidden] = useState(false);
- const handleCloneProject = useCloneProject(id);
if (isHidden) {
return;
}
- const projectTagsIds = (tags || [])
- .map((tagId) => {
- const tag = projectsTags.find((tag) => tag.id === tagId);
- return tag ? tag.id : undefined;
- })
- .filter(Boolean) as string[];
-
const linkPath = builderUrl({ origin: window.origin, projectId: id });
return (
@@ -171,42 +155,20 @@ export const ProjectsListItem = ({
</div>
<div role="cell">
- <ProjectMenu
- onDelete={() => setOpenDialog("delete")}
- onRename={() => setOpenDialog("rename")}
- onShare={() => setOpenDialog("share")}
- onDuplicate={handleCloneProject}
- onUpdateTags={() => setOpenDialog("tags")}
- />
+ <ProjectMenu projectId={id} onOpenChange={setOpenDialog} />
</div>
</div>
</ListItem>
- <RenameProjectDialog
- isOpen={openDialog === "rename"}
- onOpenChange={(open) => setOpenDialog(open ? "rename" : undefined)}
- title={title}
+ <ProjectDialogs
projectId={id}
- />
- <DeleteProjectDialog
- isOpen={openDialog === "delete"}
- onOpenChange={(open) => setOpenDialog(open ? "delete" : undefined)}
- onHiddenChange={setIsHidden}
title={title}
- projectId={id}
- />
- <ShareProjectDialog
- isOpen={openDialog === "share"}
- onOpenChange={(open) => setOpenDialog(open ? "share" : undefined)}
- projectId={id}
+ tags={tags}
+ openDialog={openDialog}
+ onOpenDialogChange={setOpenDialog}
+ onHiddenChange={setIsHidden}
hasProPlan={hasProPlan}
- />
- <TagsDialog
- projectId={id}
projectsTags={projectsTags}
- projectTagsIds={projectTagsIds}
- isOpen={openDialog === "tags"}
- onOpenChange={(open) => setOpenDialog(open ? "tags" : undefined)}
/>
</>
);
diff --git a/apps/builder/app/routes/_ui.(builder).tsx b/apps/builder/app/routes/_ui.(builder).tsx
index 365d23f9be..bec8b9de0a 100644
--- a/apps/builder/app/routes/_ui.(builder).tsx
+++ b/apps/builder/app/routes/_ui.(builder).tsx
@@ -11,8 +11,6 @@ import {
type HeadersArgs,
type LoaderFunctionArgs,
} from "@remix-run/server-runtime";
-
-import { loadBuildIdAndVersionByProjectId } from "@webstudio-is/project-build/index.server";
import * as projectApi from "@webstudio-is/project/index.server";
import { db as authDb } from "@webstudio-is/authorization-token/index.server";
@@ -48,12 +46,8 @@ export const meta: MetaFunction<typeof loader> = ({ data }) => {
if (data === undefined) {
return metas;
}
- const { project } = data;
-
- if (project.title) {
- metas.push({ title: project.title });
- }
+ // Project title will be set dynamically after data loads
return metas;
};
@@ -139,11 +133,6 @@ export const loader = async (loaderArgs: LoaderFunctionArgs) => {
context
)) ?? "view";
- const devBuild = await loadBuildIdAndVersionByProjectId(
- context,
- project.id
- );
-
const end = Date.now();
const diff = end - start;
@@ -176,8 +165,6 @@ export const loader = async (loaderArgs: LoaderFunctionArgs) => {
throw new AuthorizationError("Project must have project userId defined");
}
- const publisherHost = env.PUBLISHER_HOST;
-
const headers = new Headers();
if (context.authorization.type === "token") {
@@ -209,12 +196,7 @@ export const loader = async (loaderArgs: LoaderFunctionArgs) => {
return json(
{
- project,
- publisherHost,
- build: {
- id: devBuild.id,
- version: devBuild.version,
- },
+ projectId: project.id,
authToken,
authTokenPermissions,
authPermit,
@@ -260,7 +242,7 @@ const BuilderRoute = () => {
<ClientOnly>
{/* Using a key here ensures that certain effects are re-executed inside the builder,
especially in cases like cloning a project */}
- <Builder key={data.project.id} {...data} />
+ <Builder key={data.projectId} {...data} />
</ClientOnly>
);
};
diff --git a/apps/builder/app/routes/rest.data.$projectId.ts b/apps/builder/app/routes/rest.data.$projectId.ts
index a0ce881bb9..2e36c8a12f 100644
--- a/apps/builder/app/routes/rest.data.$projectId.ts
+++ b/apps/builder/app/routes/rest.data.$projectId.ts
@@ -6,6 +6,7 @@ import { createContext } from "~/shared/context.server";
import { preventCrossOriginCookie } from "~/services/no-cross-origin-cookie";
import { checkCsrf } from "~/services/csrf-session.server";
import { allowedDestinations } from "~/services/destinations.server";
+import env from "~/env/env.server";
export const loader = async ({ params, request }: LoaderFunctionArgs) => {
preventCrossOriginCookie(request);
@@ -28,5 +29,7 @@ export const loader = async ({ params, request }: LoaderFunctionArgs) => {
return {
...build,
assets,
+ project,
+ publisherHost: env.PUBLISHER_HOST,
};
};
diff --git a/apps/builder/app/shared/builder-data.ts b/apps/builder/app/shared/builder-data.ts
index 872bfeae82..ce20d9af44 100644
--- a/apps/builder/app/shared/builder-data.ts
+++ b/apps/builder/app/shared/builder-data.ts
@@ -1,7 +1,9 @@
import { getStyleDeclKey, type WebstudioData } from "@webstudio-is/sdk";
import type { MarketplaceProduct } from "@webstudio-is/project-build";
+import type { Project } from "@webstudio-is/project";
import type { loader } from "~/routes/rest.data.$projectId";
import {
+ $project,
$assets,
$breakpoints,
$dataSources,
@@ -18,15 +20,27 @@ import { fetch } from "~/shared/fetch.client";
export type BuilderData = WebstudioData & {
marketplaceProduct: undefined | MarketplaceProduct;
+ project: Project;
};
+export type LoadedBuilderData = BuilderData &
+ Pick<
+ Awaited<ReturnType<typeof loader>>,
+ "id" | "version" | "publisherHost" | "projectId"
+ >;
+
export const getBuilderData = (): BuilderData => {
const pages = $pages.get();
if (pages === undefined) {
throw Error(`Cannot get webstudio data with empty pages`);
}
+ const project = $project.get();
+ if (project === undefined) {
+ throw Error(`Cannot get webstudio data with empty project`);
+ }
return {
pages,
+ project,
instances: $instances.get(),
props: $props.get(),
dataSources: $dataSources.get(),
@@ -49,16 +63,21 @@ export const loadBuilderData = async ({
}: {
projectId: string;
signal: AbortSignal;
-}) => {
+}): Promise<LoadedBuilderData> => {
const currentUrl = new URL(location.href);
const url = new URL(`/rest/data/${projectId}`, currentUrl.origin);
const headers = new Headers();
+
const response = await fetch(url, { headers, signal });
if (response.ok) {
- const data: Awaited<ReturnType<typeof loader>> = await response.json();
+ const data = (await response.json()) as Awaited<ReturnType<typeof loader>>;
return {
+ id: data.id,
version: data.version,
+ projectId: data.projectId,
+ project: data.project,
+ publisherHost: data.publisherHost,
assets: new Map(data.assets.map(getPair)),
instances: new Map(data.instances.map(getPair)),
dataSources: new Map(data.dataSources.map(getPair)),
@@ -72,7 +91,7 @@ export const loadBuilderData = async ({
),
styles: new Map(data.styles.map((item) => [getStyleDeclKey(item), item])),
marketplaceProduct: data.marketplaceProduct,
- } satisfies BuilderData & { version: number };
+ };
}
const text = await response.text();
diff --git a/apps/builder/app/shared/clone-project.tsx b/apps/builder/app/shared/clone-project.tsx
index fe90ce66ed..a09cd109cd 100644
--- a/apps/builder/app/shared/clone-project.tsx
+++ b/apps/builder/app/shared/clone-project.tsx
@@ -18,7 +18,7 @@ import { Title, type Project } from "@webstudio-is/project";
import { nativeClient } from "./trpc/trpc-client";
import { useEffectEvent } from "./hook-utils/effect-event";
-const useCloneProject = ({
+const useCloneProjectWithDialog = ({
projectId,
onCreate,
authToken,
@@ -148,7 +148,7 @@ export const CloneProjectDialog = ({
onOpenChange(false);
});
- const { handleSubmit, errors, state } = useCloneProject({
+ const { handleSubmit, errors, state } = useCloneProjectWithDialog({
projectId: id,
authToken,
onCreate: handleOnCreate,
diff --git a/apps/builder/app/builder/features/settings-panel/cms-upgrade-banner.svg b/apps/builder/app/shared/cms-upgrade-banner.svg
similarity index 100%
rename from apps/builder/app/builder/features/settings-panel/cms-upgrade-banner.svg
rename to apps/builder/app/shared/cms-upgrade-banner.svg
diff --git a/apps/builder/app/builder/shared/code-editor-base.tsx b/apps/builder/app/shared/code-editor-base.tsx
similarity index 100%
rename from apps/builder/app/builder/shared/code-editor-base.tsx
rename to apps/builder/app/shared/code-editor-base.tsx
diff --git a/apps/builder/app/builder/shared/code-editor.stories.tsx b/apps/builder/app/shared/code-editor.stories.tsx
similarity index 100%
rename from apps/builder/app/builder/shared/code-editor.stories.tsx
rename to apps/builder/app/shared/code-editor.stories.tsx
diff --git a/apps/builder/app/builder/shared/code-editor.tsx b/apps/builder/app/shared/code-editor.tsx
similarity index 99%
rename from apps/builder/app/builder/shared/code-editor.tsx
rename to apps/builder/app/shared/code-editor.tsx
index b703c8f8b9..318731a860 100644
--- a/apps/builder/app/builder/shared/code-editor.tsx
+++ b/apps/builder/app/shared/code-editor.tsx
@@ -34,7 +34,7 @@ import {
EditorDialogControl,
foldGutterExtension,
getCodeEditorCssVars,
-} from "./code-editor-base";
+} from "~/shared/code-editor-base";
import { cssCompletionSource, cssLanguage } from "@codemirror/lang-css";
const wrapperStyle = css({
diff --git a/apps/builder/app/builder/shared/code-highlight.ts b/apps/builder/app/shared/code-highlight.ts
similarity index 100%
rename from apps/builder/app/builder/shared/code-highlight.ts
rename to apps/builder/app/shared/code-highlight.ts
diff --git a/apps/builder/app/shared/commands-emitter.ts b/apps/builder/app/shared/commands-emitter.ts
index ac1bcef21e..c365baa286 100644
--- a/apps/builder/app/shared/commands-emitter.ts
+++ b/apps/builder/app/shared/commands-emitter.ts
@@ -1,6 +1,6 @@
import { atom } from "nanostores";
import { $publisher, subscribe } from "~/shared/pubsub";
-import { clientSyncStore } from "~/shared/sync";
+import { clientSyncStore } from "~/shared/sync/sync-stores";
export type CommandMeta<CommandName extends string> = {
name: CommandName;
diff --git a/apps/builder/app/shared/copy-paste/plugin-html.test.tsx b/apps/builder/app/shared/copy-paste/plugin-html.test.tsx
index f54d84b898..b8fd1ed6bc 100644
--- a/apps/builder/app/shared/copy-paste/plugin-html.test.tsx
+++ b/apps/builder/app/shared/copy-paste/plugin-html.test.tsx
@@ -3,7 +3,7 @@ import { setEnv } from "@webstudio-is/feature-flags";
import { renderData, ws } from "@webstudio-is/template";
import { createDefaultPages } from "@webstudio-is/project-build";
import type { Project } from "@webstudio-is/project";
-import { registerContainers } from "../sync";
+import { registerContainers } from "../sync/sync-stores";
import { $instances, $pages, $project } from "../nano-states";
import { $awareness } from "../awareness";
import { html } from "./plugin-html";
diff --git a/apps/builder/app/shared/copy-paste/plugin-instance.test.ts b/apps/builder/app/shared/copy-paste/plugin-instance.test.ts
index 01c07c5044..75935d2570 100644
--- a/apps/builder/app/shared/copy-paste/plugin-instance.test.ts
+++ b/apps/builder/app/shared/copy-paste/plugin-instance.test.ts
@@ -16,7 +16,7 @@ import {
} from "@webstudio-is/sdk";
import type { Project } from "@webstudio-is/project";
import * as baseComponentMetas from "@webstudio-is/sdk-components-react/metas";
-import { registerContainers } from "../sync";
+import { registerContainers } from "../sync/sync-stores";
import {
$instances,
$dataSources,
diff --git a/apps/builder/app/shared/copy-paste/plugin-webflow/styles.ts b/apps/builder/app/shared/copy-paste/plugin-webflow/styles.ts
index 18906082fd..798be6d546 100644
--- a/apps/builder/app/shared/copy-paste/plugin-webflow/styles.ts
+++ b/apps/builder/app/shared/copy-paste/plugin-webflow/styles.ts
@@ -12,7 +12,7 @@ import {
pseudoElements,
type ParsedStyleDecl,
} from "@webstudio-is/css-data";
-import { $styleSources } from "~/shared/nano-states";
+import { $styleSources } from "~/shared/sync/data-stores";
import { builderApi } from "~/shared/builder-api";
import { mapGroupBy } from "~/shared/shim";
import type { WfStylePresets } from "./style-presets-overrides";
diff --git a/apps/builder/app/builder/shared/copy-to-clipboard.tsx b/apps/builder/app/shared/copy-to-clipboard.tsx
similarity index 100%
rename from apps/builder/app/builder/shared/copy-to-clipboard.tsx
rename to apps/builder/app/shared/copy-to-clipboard.tsx
diff --git a/apps/builder/app/builder/shared/image-manager/image-info.tsx b/apps/builder/app/shared/image-manager/image-info.tsx
similarity index 98%
rename from apps/builder/app/builder/shared/image-manager/image-info.tsx
rename to apps/builder/app/shared/image-manager/image-info.tsx
index 91959932c7..0648b99366 100644
--- a/apps/builder/app/builder/shared/image-manager/image-info.tsx
+++ b/apps/builder/app/shared/image-manager/image-info.tsx
@@ -59,9 +59,19 @@ import {
selectPage,
} from "~/shared/awareness";
import { updateWebstudioData } from "~/shared/instance-utils";
-import { deleteAssets, $usagesByAssetId, type AssetUsage } from "../assets";
-import { $activeInspectorPanel, setActiveSidebarPanel } from "../nano-states";
-import { formatAssetName, parseAssetName } from "../assets/asset-utils";
+import {
+ deleteAssets,
+ $usagesByAssetId,
+ type AssetUsage,
+} from "~/builder/shared/assets";
+import {
+ $activeInspectorPanel,
+ setActiveSidebarPanel,
+} from "~/builder/shared/nano-states";
+import {
+ formatAssetName,
+ parseAssetName,
+} from "~/builder/shared/assets/asset-utils";
import { getFormattedAspectRatio } from "./utils";
const buttonLinkClass = css({
diff --git a/apps/builder/app/builder/shared/image-manager/image-manager.tsx b/apps/builder/app/shared/image-manager/image-manager.tsx
similarity index 97%
rename from apps/builder/app/builder/shared/image-manager/image-manager.tsx
rename to apps/builder/app/shared/image-manager/image-manager.tsx
index ddbcb94b3c..686e46df97 100644
--- a/apps/builder/app/builder/shared/image-manager/image-manager.tsx
+++ b/apps/builder/app/shared/image-manager/image-manager.tsx
@@ -11,7 +11,11 @@ import {
acceptToMimePatterns,
doesAssetMatchMimePatterns,
} from "@webstudio-is/asset-uploader";
-import { AssetsShell, type AssetContainer, useAssets } from "../assets";
+import {
+ AssetsShell,
+ type AssetContainer,
+ useAssets,
+} from "~/builder/shared/assets";
import { ImageThumbnail } from "./image-thumbnail";
const useLogic = ({
diff --git a/apps/builder/app/builder/shared/image-manager/image-thumbnail.tsx b/apps/builder/app/shared/image-manager/image-thumbnail.tsx
similarity index 99%
rename from apps/builder/app/builder/shared/image-manager/image-thumbnail.tsx
rename to apps/builder/app/shared/image-manager/image-thumbnail.tsx
index 098cf4401f..e5d18e171e 100644
--- a/apps/builder/app/builder/shared/image-manager/image-thumbnail.tsx
+++ b/apps/builder/app/shared/image-manager/image-thumbnail.tsx
@@ -10,7 +10,7 @@ import {
formatAssetName,
isVideoFormat,
parseAssetName,
-} from "../assets/asset-utils";
+} from "~/builder/shared/assets/asset-utils";
const StyledWebstudioImage = styled(Image, {
position: "absolute",
diff --git a/apps/builder/app/builder/shared/image-manager/image.tsx b/apps/builder/app/shared/image-manager/image.tsx
similarity index 100%
rename from apps/builder/app/builder/shared/image-manager/image.tsx
rename to apps/builder/app/shared/image-manager/image.tsx
diff --git a/apps/builder/app/builder/shared/image-manager/index.ts b/apps/builder/app/shared/image-manager/index.ts
similarity index 100%
rename from apps/builder/app/builder/shared/image-manager/index.ts
rename to apps/builder/app/shared/image-manager/index.ts
diff --git a/apps/builder/app/builder/shared/image-manager/uploading-animation.tsx b/apps/builder/app/shared/image-manager/uploading-animation.tsx
similarity index 100%
rename from apps/builder/app/builder/shared/image-manager/uploading-animation.tsx
rename to apps/builder/app/shared/image-manager/uploading-animation.tsx
diff --git a/apps/builder/app/builder/shared/image-manager/utils.ts b/apps/builder/app/shared/image-manager/utils.ts
similarity index 100%
rename from apps/builder/app/builder/shared/image-manager/utils.ts
rename to apps/builder/app/shared/image-manager/utils.ts
diff --git a/apps/builder/app/shared/instance-utils.test.tsx b/apps/builder/app/shared/instance-utils.test.tsx
index 641b687caa..1f4c7659d7 100644
--- a/apps/builder/app/shared/instance-utils.test.tsx
+++ b/apps/builder/app/shared/instance-utils.test.tsx
@@ -61,7 +61,7 @@ import {
$registeredComponentMetas,
$resources,
} from "./nano-states";
-import { registerContainers } from "./sync";
+import { registerContainers } from "./sync/sync-stores";
import {
$awareness,
getInstancePath,
diff --git a/apps/builder/app/shared/instance-utils.ts b/apps/builder/app/shared/instance-utils.ts
index b6fc6e344e..6d67a34bf7 100644
--- a/apps/builder/app/shared/instance-utils.ts
+++ b/apps/builder/app/shared/instance-utils.ts
@@ -58,7 +58,7 @@ import {
wrapEditableChildrenAroundDropTargetMutable,
} from "./tree-utils";
import { removeByMutable } from "./array-utils";
-import { serverSyncStore } from "./sync";
+import { serverSyncStore } from "./sync/sync-stores";
import { setDifference, setUnion } from "./shim";
import { breakCyclesMutable, findCycles } from "@webstudio-is/project-build";
import {
diff --git a/apps/builder/app/shared/nano-states/breakpoints.ts b/apps/builder/app/shared/nano-states/breakpoints.ts
index 86662d71c0..7b8ff3035f 100644
--- a/apps/builder/app/shared/nano-states/breakpoints.ts
+++ b/apps/builder/app/shared/nano-states/breakpoints.ts
@@ -1,13 +1,15 @@
import { atom, computed } from "nanostores";
-import type { Breakpoint, Breakpoints } from "@webstudio-is/sdk";
+import type { Breakpoint } from "@webstudio-is/sdk";
+import { $breakpoints } from "../sync/data-stores";
+
+// Re-export for backward compatibility
+export { $breakpoints };
export const isBaseBreakpoint = (breakpoint: {
minWidth?: number;
maxWidth?: number;
}) => breakpoint.minWidth === undefined && breakpoint.maxWidth === undefined;
-export const $breakpoints = atom<Breakpoints>(new Map());
-
export const $selectedBreakpointId = atom<undefined | Breakpoint["id"]>(
undefined
);
diff --git a/apps/builder/app/shared/nano-states/index.ts b/apps/builder/app/shared/nano-states/index.ts
index 7ae895eb2b..25870c5737 100644
--- a/apps/builder/app/shared/nano-states/index.ts
+++ b/apps/builder/app/shared/nano-states/index.ts
@@ -1,3 +1,20 @@
+// Re-export data stores that were moved to sync/data-stores
+export {
+ $project,
+ $publisherHost,
+ $dataSources,
+ $resources,
+ $props,
+ $styles,
+ $styleSources,
+ $styleSourceSelections,
+ $assets,
+ $marketplaceProduct,
+ $pages,
+ $instances,
+ $breakpoints,
+} from "../sync/data-stores";
+
export * from "./misc";
export * from "./breakpoints";
export * from "./instances";
diff --git a/apps/builder/app/shared/nano-states/instances.ts b/apps/builder/app/shared/nano-states/instances.ts
index d2a2a6415a..d47f6ae4e5 100644
--- a/apps/builder/app/shared/nano-states/instances.ts
+++ b/apps/builder/app/shared/nano-states/instances.ts
@@ -1,6 +1,9 @@
import { atom } from "nanostores";
-import type { Instances } from "@webstudio-is/sdk";
import type { InstanceSelector } from "../tree-utils";
+import { $instances } from "../sync/data-stores";
+
+// Re-export for backward compatibility
+export { $instances };
export const $isResizingCanvas = atom(false);
@@ -60,5 +63,3 @@ export const execTextEditorContextMenuCommand = (
) => {
$textEditorContextMenuCommand.set(command);
};
-
-export const $instances = atom<Instances>(new Map());
diff --git a/apps/builder/app/shared/nano-states/misc.ts b/apps/builder/app/shared/nano-states/misc.ts
index ff02c39bd9..8d3b17ab91 100644
--- a/apps/builder/app/shared/nano-states/misc.ts
+++ b/apps/builder/app/shared/nano-states/misc.ts
@@ -4,21 +4,13 @@ import { nanoid } from "nanoid";
import type { AuthPermit } from "@webstudio-is/trpc-interface/index.server";
import { toast, type Placement } from "@webstudio-is/design-system";
import type {
- Assets,
- DataSources,
Instance,
Prop,
Props,
- Resource,
StyleDecl,
- Styles,
StyleSource,
- StyleSources,
- StyleSourceSelections,
} from "@webstudio-is/sdk";
import type { CssProperty, UnitValue } from "@webstudio-is/css-engine";
-import type { Project } from "@webstudio-is/project";
-import type { MarketplaceProduct } from "@webstudio-is/project-build";
import type { TokenPermissions } from "@webstudio-is/authorization-token";
import type { AssetType } from "@webstudio-is/asset-uploader";
import type { DragStartPayload } from "~/canvas/shared/use-drag-drop";
@@ -26,22 +18,38 @@ import { type InstanceSelector } from "../tree-utils";
import type { ChildrenOrientation } from "node_modules/@webstudio-is/design-system/src/components/primitives/dnd/geometry-utils";
import { $awareness, $selectedInstance } from "../awareness";
import type { UserPlanFeatures } from "../db/user-plan-features.server";
-
-export const $project = atom<Project | undefined>();
-
-export const $publisherHost = atom<string>("wstd.work");
+import {
+ $project,
+ $publisherHost,
+ $dataSources,
+ $resources,
+ $props,
+ $styles,
+ $styleSources,
+ $styleSourceSelections,
+ $assets,
+ $marketplaceProduct,
+} from "../sync/data-stores";
+
+// Re-export data stores for backward compatibility
+export {
+ $project,
+ $publisherHost,
+ $dataSources,
+ $resources,
+ $props,
+ $styles,
+ $styleSources,
+ $styleSourceSelections,
+ $assets,
+ $marketplaceProduct,
+};
export const $publishedOrigin = computed(
[$project, $publisherHost],
(project, publisherHost) => `https://${project?.domain}.${publisherHost}`
);
-export const $dataSources = atom<DataSources>(new Map());
-
-export const $resources = atom(new Map<Resource["id"], Resource>());
-
-export const $props = atom<Props>(new Map());
-
export const $memoryProps = atom<Map<string, Props>>(new Map());
export const $propsIndex = computed($props, (props) => {
@@ -60,27 +68,6 @@ export const $propsIndex = computed($props, (props) => {
};
});
-/**
- * $styles contains actual styling rules
- * (breakpointId, styleSourceId, property, value, listed), tied to styleSourceIds
- * $styles.styleSourceId -> $styleSources.id
- */
-export const $styles = atom<Styles>(new Map());
-
-/**
- * styleSources defines where styles come from (local or token).
- *
- * $styles contains actual styling rules, tied to styleSourceIds.
- * $styles.styleSourceId -> $styleSources.id
- */
-export const $styleSources = atom<StyleSources>(new Map());
-
-/**
- * This is a list of connections between instances (instanceIds) and styleSources.
- * $styleSourceSelections.values[] -> $styleSources.id[]
- */
-export const $styleSourceSelections = atom<StyleSourceSelections>(new Map());
-
export type StyleSourceSelector = {
styleSourceId: StyleSource["id"];
state?: string;
@@ -137,8 +124,6 @@ export const $stylesIndex = computed(
}
);
-export const $assets = atom<Assets>(new Map());
-
export type UploadingFileData = Simplify<
{
// common props
@@ -487,6 +472,4 @@ export const $dragAndDropState = atom<DragAndDropState>({
isDragging: false,
});
-export const $marketplaceProduct = atom<undefined | MarketplaceProduct>();
-
export const $canvasToolsVisible = atom<boolean>(true);
diff --git a/apps/builder/app/shared/nano-states/pages.ts b/apps/builder/app/shared/nano-states/pages.ts
index aab3671571..11c50a7f3e 100644
--- a/apps/builder/app/shared/nano-states/pages.ts
+++ b/apps/builder/app/shared/nano-states/pages.ts
@@ -1,7 +1,9 @@
import { atom } from "nanostores";
-import type { Page, Pages } from "@webstudio-is/sdk";
+import type { Page } from "@webstudio-is/sdk";
+import { $pages } from "../sync/data-stores";
-export const $pages = atom<undefined | Pages>(undefined);
+// Re-export for backward compatibility
+export { $pages };
export const $selectedPageHash = atom<{ hash: string }>({ hash: "" });
diff --git a/apps/builder/app/shared/nano-states/props.test.tsx b/apps/builder/app/shared/nano-states/props.test.tsx
index 10546418dc..2134b94d37 100644
--- a/apps/builder/app/shared/nano-states/props.test.tsx
+++ b/apps/builder/app/shared/nano-states/props.test.tsx
@@ -30,7 +30,7 @@ import {
ws,
} from "@webstudio-is/template";
import { $systemDataByPage, updateCurrentSystem } from "../system";
-import { registerContainers } from "../sync";
+import { registerContainers } from "../sync/sync-stores";
import { $resourcesCache, getResourceKey } from "../resources";
const initialSystem = {
diff --git a/apps/builder/app/builder/features/project-settings/image-control.tsx b/apps/builder/app/shared/project-settings/image-control.tsx
similarity index 90%
rename from apps/builder/app/builder/features/project-settings/image-control.tsx
rename to apps/builder/app/shared/project-settings/image-control.tsx
index 0e472dc523..9e4c7d90a2 100644
--- a/apps/builder/app/builder/features/project-settings/image-control.tsx
+++ b/apps/builder/app/shared/project-settings/image-control.tsx
@@ -1,6 +1,6 @@
import type { ReactElement } from "react";
import { FloatingPanel } from "@webstudio-is/design-system";
-import { ImageManager } from "~/builder/shared/image-manager";
+import { ImageManager } from "~/shared/image-manager";
// @todo should be moved to shared as its being reused in another feature
export const ImageControl = (props: {
diff --git a/apps/builder/app/shared/project-settings/index.ts b/apps/builder/app/shared/project-settings/index.ts
new file mode 100644
index 0000000000..1d415ff349
--- /dev/null
+++ b/apps/builder/app/shared/project-settings/index.ts
@@ -0,0 +1,3 @@
+export * from "./project-settings";
+export * from "./image-control";
+export type { SectionName } from "~/shared/nano-states/project-settings";
diff --git a/apps/builder/app/builder/features/project-settings/project-settings.stories.tsx b/apps/builder/app/shared/project-settings/project-settings.stories.tsx
similarity index 78%
rename from apps/builder/app/builder/features/project-settings/project-settings.stories.tsx
rename to apps/builder/app/shared/project-settings/project-settings.stories.tsx
index ca2f5a44e3..db04810e43 100644
--- a/apps/builder/app/builder/features/project-settings/project-settings.stories.tsx
+++ b/apps/builder/app/shared/project-settings/project-settings.stories.tsx
@@ -1,12 +1,12 @@
import type { JSX } from "react";
import { createBrowserRouter, RouterProvider } from "react-router-dom";
-import { ProjectSettingsView } from "./project-settings";
-import { $pages, $project } from "~/shared/nano-states";
+import { ProjectSettingsDialog } from "./project-settings";
+import { $pages, $project } from "~/shared/sync/data-stores";
import type { Project } from "@webstudio-is/project";
export default {
title: "Project Settings",
- component: ProjectSettingsView,
+ component: ProjectSettingsDialog,
};
const createRouter = (element: JSX.Element) =>
@@ -21,7 +21,9 @@ const createRouter = (element: JSX.Element) =>
$project.set({ id: "projectId" } as Project);
export const General = () => {
- const router = createRouter(<ProjectSettingsView currentSection="general" />);
+ const router = createRouter(
+ <ProjectSettingsDialog currentSection="general" />
+ );
return <RouterProvider router={router} />;
};
@@ -49,7 +51,7 @@ export const Redirects = () => {
});
const router = createRouter(
- <ProjectSettingsView currentSection="redirects" />
+ <ProjectSettingsDialog currentSection="redirects" />
);
return <RouterProvider router={router} />;
};
diff --git a/apps/builder/app/builder/features/project-settings/project-settings.tsx b/apps/builder/app/shared/project-settings/project-settings.tsx
similarity index 93%
rename from apps/builder/app/builder/features/project-settings/project-settings.tsx
rename to apps/builder/app/shared/project-settings/project-settings.tsx
index 8676b91d83..04287a0c97 100644
--- a/apps/builder/app/builder/features/project-settings/project-settings.tsx
+++ b/apps/builder/app/shared/project-settings/project-settings.tsx
@@ -25,7 +25,10 @@ import { SectionPublish } from "./section-publish";
import { SectionMarketplace } from "./section-marketplace";
import { SectionBackups } from "./section-backups";
-const sections = new Map<SectionName, FunctionComponent>([
+const sections = new Map<
+ SectionName,
+ FunctionComponent<{ projectId?: string }>
+>([
["general", SectionGeneral],
["redirects", SectionRedirects],
["publish", SectionPublish],
@@ -33,14 +36,16 @@ const sections = new Map<SectionName, FunctionComponent>([
["backups", SectionBackups],
] as const);
-export const ProjectSettingsView = ({
+export const ProjectSettingsDialog = ({
currentSection,
onSectionChange,
onOpenChange,
+ projectId,
}: {
currentSection?: SectionName;
onSectionChange?: (section: SectionName) => void;
onOpenChange?: (isOpen: boolean) => void;
+ projectId?: string;
}) => {
const isDesignMode = useStore($isDesignMode);
const SectionComponent = currentSection
@@ -110,7 +115,7 @@ export const ProjectSettingsView = ({
</List>
<ScrollArea css={{ width: "100%" }}>
<Grid gap={2} css={{ py: theme.spacing[5] }}>
- {SectionComponent && <SectionComponent />}
+ {SectionComponent && <SectionComponent projectId={projectId} />}
<div />
</Grid>
</ScrollArea>
@@ -129,7 +134,7 @@ export const ProjectSettings = () => {
const currentSection = useStore($openProjectSettings);
return (
- <ProjectSettingsView
+ <ProjectSettingsDialog
currentSection={currentSection}
onSectionChange={$openProjectSettings.set}
onOpenChange={(open) => {
diff --git a/apps/builder/app/builder/features/project-settings/section-backups.tsx b/apps/builder/app/shared/project-settings/section-backups.tsx
similarity index 91%
rename from apps/builder/app/builder/features/project-settings/section-backups.tsx
rename to apps/builder/app/shared/project-settings/section-backups.tsx
index 6986bde16e..f39b23d2d0 100644
--- a/apps/builder/app/builder/features/project-settings/section-backups.tsx
+++ b/apps/builder/app/shared/project-settings/section-backups.tsx
@@ -19,9 +19,10 @@ import {
} from "@webstudio-is/design-system";
import { UpgradeIcon } from "@webstudio-is/icons";
import { nativeClient, trpcClient } from "~/shared/trpc/trpc-client";
-import { $project, $userPlanFeatures } from "~/shared/nano-states";
+import { $project } from "~/shared/sync/data-stores";
+import { $userPlanFeatures } from "~/shared/nano-states";
import { sectionSpacing } from "./utils";
-import cmsUpgradeBanner from "../settings-panel/cms-upgrade-banner.svg?url";
+import cmsUpgradeBanner from "../cms-upgrade-banner.svg?url";
const formatPublishDate = (date: string) => {
try {
@@ -35,10 +36,16 @@ const formatPublishDate = (date: string) => {
}
};
-export const SectionBackups = () => {
+export const SectionBackups = ({
+ projectId: projectIdProp,
+}: {
+ projectId?: string;
+}) => {
const { hasProPlan } = useStore($userPlanFeatures);
const { data, load } = trpcClient.project.publishedBuilds.useQuery();
- const projectId = $project.get()?.id ?? "";
+ const project = useStore($project);
+ const projectId = projectIdProp ?? project?.id ?? "";
+
useEffect(() => {
load({ projectId });
}, [load, projectId]);
diff --git a/apps/builder/app/builder/features/project-settings/section-general.tsx b/apps/builder/app/shared/project-settings/section-general.tsx
similarity index 86%
rename from apps/builder/app/builder/features/project-settings/section-general.tsx
rename to apps/builder/app/shared/project-settings/section-general.tsx
index 23fe7518df..332e9551ac 100644
--- a/apps/builder/app/builder/features/project-settings/section-general.tsx
+++ b/apps/builder/app/shared/project-settings/section-general.tsx
@@ -1,5 +1,5 @@
import { z } from "zod";
-import { useId, useState } from "react";
+import { useId, useState, useEffect } from "react";
import { useStore } from "@nanostores/react";
import {
Grid,
@@ -27,10 +27,10 @@ import {
$project,
$userPlanFeatures,
} from "~/shared/nano-states";
-import { serverSyncStore } from "~/shared/sync";
+import { serverSyncStore } from "~/shared/sync/sync-stores";
import { sectionSpacing } from "./utils";
-import { CodeEditor } from "~/builder/shared/code-editor";
-import { CopyToClipboard } from "~/builder/shared/copy-to-clipboard";
+import { CodeEditor } from "~/shared/code-editor";
+import { CopyToClipboard } from "~/shared/copy-to-clipboard";
const imgStyle = css({
objectFit: "contain",
@@ -86,26 +86,32 @@ const saveSetting = <Name extends keyof ProjectMeta>(
});
};
-export const SectionGeneral = () => {
+export const SectionGeneral = ({ projectId }: { projectId?: string }) => {
const { maxContactEmails } = useStore($userPlanFeatures);
const allowContactEmail = maxContactEmails > 0;
- const [meta, setMeta] = useState(
- () => $pages.get()?.meta ?? defaultMetaSettings
- );
+ const pages = useStore($pages);
+ const project = useStore($project);
+ const assets = useStore($assets);
+ const [meta, setMeta] = useState(() => pages?.meta ?? defaultMetaSettings);
const siteNameId = useId();
const contactEmailId = useId();
+
+ // Update meta when pages data loads (important for dashboard mode)
+ useEffect(() => {
+ if (pages?.meta) {
+ setMeta(pages.meta);
+ }
+ }, [pages?.meta]);
+
const contactEmailError = validateContactEmail(
meta.contactEmail ?? "",
maxContactEmails
);
- const assets = useStore($assets);
const asset = assets.get(meta.faviconAssetId ?? "");
const favIconUrl = asset ? `${asset.name}` : undefined;
- const project = $project.get();
- if (project === undefined) {
- return;
- }
+ // Use projectId prop if available (dashboard mode), otherwise use project from store (builder mode)
+ const effectiveProjectId = projectId ?? project?.id ?? "";
const handleSave = <Name extends keyof ProjectMeta>(
name: keyof ProjectMeta
@@ -125,8 +131,8 @@ export const SectionGeneral = () => {
<Grid gap={1} css={sectionSpacing}>
<Flex gap={1} align="center">
<Text variant="labelsSentenceCase">Project ID:</Text>
- <Text userSelect="text">{project.id}</Text>
- <CopyToClipboard text={project.id} copyText="Copy ID">
+ <Text userSelect="text">{effectiveProjectId}</Text>
+ <CopyToClipboard text={effectiveProjectId} copyText="Copy ID">
<IconButton aria-label="Copy ID">
<CopyIcon aria-hidden />
</IconButton>
diff --git a/apps/builder/app/builder/features/project-settings/section-marketplace.tsx b/apps/builder/app/shared/project-settings/section-marketplace.tsx
similarity index 98%
rename from apps/builder/app/builder/features/project-settings/section-marketplace.tsx
rename to apps/builder/app/shared/project-settings/section-marketplace.tsx
index 3b64b475ac..ac27761f66 100644
--- a/apps/builder/app/builder/features/project-settings/section-marketplace.tsx
+++ b/apps/builder/app/shared/project-settings/section-marketplace.tsx
@@ -23,10 +23,14 @@ import {
marketplaceCategories,
} from "@webstudio-is/project-build";
import { ImageControl } from "./image-control";
-import { $assets, $marketplaceProduct, $project } from "~/shared/nano-states";
+import {
+ $assets,
+ $marketplaceProduct,
+ $project,
+} from "~/shared/sync/data-stores";
import { useIds } from "~/shared/form-utils";
import { MarketplaceApprovalStatus } from "@webstudio-is/project";
-import { serverSyncStore } from "~/shared/sync";
+import { serverSyncStore } from "~/shared/sync/sync-stores";
import { trpcClient } from "~/shared/trpc/trpc-client";
import { rightPanelWidth, sectionSpacing } from "./utils";
diff --git a/apps/builder/app/builder/features/project-settings/section-publish.tsx b/apps/builder/app/shared/project-settings/section-publish.tsx
similarity index 93%
rename from apps/builder/app/builder/features/project-settings/section-publish.tsx
rename to apps/builder/app/shared/project-settings/section-publish.tsx
index 0bffc9e113..8c18c1a3f2 100644
--- a/apps/builder/app/builder/features/project-settings/section-publish.tsx
+++ b/apps/builder/app/shared/project-settings/section-publish.tsx
@@ -7,9 +7,9 @@ import {
Text,
} from "@webstudio-is/design-system";
import type { CompilerSettings } from "@webstudio-is/sdk";
-import { $pages } from "~/shared/nano-states";
+import { $pages } from "~/shared/sync/data-stores";
import { useIds } from "~/shared/form-utils";
-import { serverSyncStore } from "~/shared/sync";
+import { serverSyncStore } from "~/shared/sync/sync-stores";
import { sectionSpacing } from "./utils";
const defaultPublishSettings: CompilerSettings = {
diff --git a/apps/builder/app/builder/features/project-settings/section-redirects.tsx b/apps/builder/app/shared/project-settings/section-redirects.tsx
similarity index 98%
rename from apps/builder/app/builder/features/project-settings/section-redirects.tsx
rename to apps/builder/app/shared/project-settings/section-redirects.tsx
index 2a61a4998b..cbc3288103 100644
--- a/apps/builder/app/builder/features/project-settings/section-redirects.tsx
+++ b/apps/builder/app/shared/project-settings/section-redirects.tsx
@@ -22,8 +22,9 @@ import {
} from "@webstudio-is/sdk";
import { useRef, useState, type ChangeEvent } from "react";
import { flushSync } from "react-dom";
-import { $pages, $publishedOrigin } from "~/shared/nano-states";
-import { serverSyncStore } from "~/shared/sync";
+import { $pages } from "~/shared/sync/data-stores";
+import { $publishedOrigin } from "~/shared/nano-states";
+import { serverSyncStore } from "~/shared/sync/sync-stores";
import { getExistingRoutePaths, sectionSpacing } from "./utils";
export const SectionRedirects = () => {
diff --git a/apps/builder/app/builder/features/project-settings/utils.test.ts b/apps/builder/app/shared/project-settings/utils.test.ts
similarity index 100%
rename from apps/builder/app/builder/features/project-settings/utils.test.ts
rename to apps/builder/app/shared/project-settings/utils.test.ts
diff --git a/apps/builder/app/builder/features/project-settings/utils.ts b/apps/builder/app/shared/project-settings/utils.ts
similarity index 100%
rename from apps/builder/app/builder/features/project-settings/utils.ts
rename to apps/builder/app/shared/project-settings/utils.ts
diff --git a/apps/builder/app/shared/share-project/share-project.tsx b/apps/builder/app/shared/share-project/share-project.tsx
index ad9b399a35..3390478f73 100644
--- a/apps/builder/app/shared/share-project/share-project.tsx
+++ b/apps/builder/app/shared/share-project/share-project.tsx
@@ -35,7 +35,7 @@ import {
PlusIcon,
InfoCircleIcon,
} from "@webstudio-is/icons";
-import { CopyToClipboard } from "~/builder/shared/copy-to-clipboard";
+import { CopyToClipboard } from "~/shared/copy-to-clipboard";
import { useIds } from "../form-utils";
import type { BuilderMode } from "../nano-states";
diff --git a/apps/builder/app/builder/shared/sync/command-queue.ts b/apps/builder/app/shared/sync/command-queue.ts
similarity index 100%
rename from apps/builder/app/builder/shared/sync/command-queue.ts
rename to apps/builder/app/shared/sync/command-queue.ts
diff --git a/apps/builder/app/shared/sync/data-stores.ts b/apps/builder/app/shared/sync/data-stores.ts
new file mode 100644
index 0000000000..f0d2c85b4b
--- /dev/null
+++ b/apps/builder/app/shared/sync/data-stores.ts
@@ -0,0 +1,102 @@
+/**
+ * All data stores used by the sync infrastructure.
+ * This provides a single source of truth for stores used in sync-server and sync-stores.
+ */
+
+import { atom } from "nanostores";
+import type {
+ Assets,
+ Breakpoints,
+ DataSources,
+ Instances,
+ Pages,
+ Props,
+ Resource,
+ Styles,
+ StyleSources,
+ StyleSourceSelections,
+} from "@webstudio-is/sdk";
+import type { Project } from "@webstudio-is/project";
+import type { MarketplaceProduct } from "@webstudio-is/project-build";
+
+export const $project = atom<Project | undefined>();
+
+export const $pages = atom<undefined | Pages>(undefined);
+
+export const $assets = atom<Assets>(new Map());
+
+export const $instances = atom<Instances>(new Map());
+
+export const $props = atom<Props>(new Map());
+
+export const $dataSources = atom<DataSources>(new Map());
+
+export const $resources = atom(new Map<Resource["id"], Resource>());
+
+export const $breakpoints = atom<Breakpoints>(new Map());
+
+/**
+ * styleSources defines where styles come from (local or token).
+ *
+ * $styles contains actual styling rules, tied to styleSourceIds.
+ * $styles.styleSourceId -> $styleSources.id
+ */
+export const $styleSources = atom<StyleSources>(new Map());
+
+/**
+ * This is a list of connections between instances (instanceIds) and styleSources.
+ * $styleSourceSelections.values[] -> $styleSources.id[]
+ */
+export const $styleSourceSelections = atom<StyleSourceSelections>(new Map());
+
+/**
+ * $styles contains actual styling rules
+ * (breakpointId, styleSourceId, property, value, listed), tied to styleSourceIds
+ * $styles.styleSourceId -> $styleSources.id
+ */
+export const $styles = atom<Styles>(new Map());
+
+export const $marketplaceProduct = atom<undefined | MarketplaceProduct>();
+
+export const $publisherHost = atom<string>("wstd.work");
+
+/**
+ * Get initial values for all data stores.
+ * Used for resetting stores when switching between projects.
+ */
+const getInitialDataStoreValues = () => ({
+ project: undefined,
+ pages: undefined,
+ assets: new Map(),
+ instances: new Map(),
+ props: new Map(),
+ dataSources: new Map(),
+ resources: new Map(),
+ breakpoints: new Map(),
+ styleSources: new Map(),
+ styleSourceSelections: new Map(),
+ styles: new Map(),
+ marketplaceProduct: undefined,
+ publisherHost: "wstd.work",
+});
+
+/**
+ * Reset all data stores to their initial values.
+ * Call this when switching between projects to prevent data leakage.
+ */
+export const resetDataStores = () => {
+ const initial = getInitialDataStoreValues();
+ $project.set(initial.project);
+ $pages.set(initial.pages);
+ $assets.set(initial.assets);
+ $instances.set(initial.instances);
+ $props.set(initial.props);
+ $dataSources.set(initial.dataSources);
+ $resources.set(initial.resources);
+ $breakpoints.set(initial.breakpoints);
+ $styleSources.set(initial.styleSources);
+ $styleSourceSelections.set(initial.styleSourceSelections);
+ $styles.set(initial.styles);
+ $marketplaceProduct.set(initial.marketplaceProduct);
+ $publisherHost.set(initial.publisherHost);
+};
diff --git a/apps/builder/app/shared/sync/index.ts b/apps/builder/app/shared/sync/index.ts
deleted file mode 100644
index 9e9c46e6bd..0000000000
--- a/apps/builder/app/shared/sync/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./sync-stores";
diff --git a/apps/builder/app/builder/shared/sync/sync-server.ts b/apps/builder/app/shared/sync/project-queue.ts
similarity index 88%
rename from apps/builder/app/builder/shared/sync/sync-server.ts
rename to apps/builder/app/shared/sync/project-queue.ts
index b246acbcbd..613573b5d8 100644
--- a/apps/builder/app/builder/shared/sync/sync-server.ts
+++ b/apps/builder/app/shared/sync/project-queue.ts
@@ -9,9 +9,10 @@ import { restPatchPath } from "~/shared/router-utils";
import { toast } from "@webstudio-is/design-system";
import { fetch } from "~/shared/fetch.client";
import type { SyncStorage, Transaction } from "~/shared/sync-client";
-import { $project } from "~/shared/nano-states";
import { loadBuilderData } from "~/shared/builder-data";
+export { commandQueue };
+
// Periodic check for new entries to group them into one job/call in sync queue.
const NEW_ENTRIES_INTERVAL = 1000;
@@ -88,14 +89,70 @@ const retry = async function* () {
}
};
-let syncServerIsRunning = false;
+let isPolling = false;
+let pollingAbortController: AbortController | undefined;
+
+/**
+ * Start the queue polling loop.
+ * Called automatically by enqueueProjectDetails.
+ */
+const startPolling = () => {
+ if (pollingAbortController) {
+ return; // Already running
+ }
+ pollingAbortController = new AbortController();
+ pollQueue(pollingAbortController.signal);
+};
+
+/**
+ * Stop the queue polling loop.
+ * Call this to stop transaction synchronization (e.g., when closing a dialog).
+ */
+export const stopPolling = () => {
+ if (pollingAbortController) {
+ pollingAbortController.abort();
+ pollingAbortController = undefined;
+ }
+ isPolling = false;
+};
+
+/**
+ * Enqueue project details for synchronization.
+ * Called automatically by initializeClientSync after loading builder data.
+ */
+export const enqueueProjectDetails = ({
+ projectId,
+ buildId,
+ version,
+ authPermit,
+ authToken,
+}: {
+ buildId: Build["id"];
+ projectId: Project["id"];
+ authToken: string | undefined;
+ version: number;
+ authPermit: AuthPermit;
+}) => {
+ if (authPermit === "view") {
+ return;
+ }
+ commandQueue.enqueue({
+ type: "setDetails",
+ projectId,
+ buildId,
+ version,
+ authToken,
+ });
+ // Start polling after enqueuing to ensure command is in queue
+ startPolling();
+};
-const syncServer = async function () {
- if (syncServerIsRunning) {
+const pollQueue = async (signal: AbortSignal) => {
+ if (isPolling) {
return;
}
- syncServerIsRunning = true;
+ isPolling = true;
const detailsMap = new Map<
Project["id"],
@@ -103,6 +160,12 @@ const syncServer = async function () {
>();
polling: for await (const command of pollCommands()) {
+ // Check if aborted
+ if (signal.aborted) {
+ isPolling = false;
+ break polling;
+ }
+
if (command.type === "setDetails") {
// At this moment we can be sure that all transactions for the command.projectId is already synchronized
// There are 2 options
@@ -246,7 +309,7 @@ const syncServer = async function () {
const text = await response.text();
// To investigate some strange errors we have seen
- console.info(`Non ok respone: ${text}`);
+ console.info(`Non ok response: ${text}`);
}
} catch (error) {
if (navigator.onLine) {
@@ -262,60 +325,25 @@ const syncServer = async function () {
}
};
-export const startProjectSync = ({
- projectId,
- buildId,
- version,
- authPermit,
- authToken,
-}: {
- buildId: Build["id"];
- projectId: Project["id"];
- authToken: string | undefined;
- version: number;
- authPermit: AuthPermit;
-}) => {
- if (authPermit === "view") {
- return;
- }
- commandQueue.enqueue({
- type: "setDetails",
- projectId,
- buildId,
- version,
- authToken,
- });
-};
-
-const useSyncProject = ({
- projectId,
- authPermit,
-}: {
- projectId: Project["id"];
- authPermit: AuthPermit;
-}) => {
- useEffect(() => {
- if (authPermit === "view") {
- return;
- }
- syncServer();
- }, [projectId, authPermit]);
-};
-
export class ServerSyncStorage implements SyncStorage {
name = "server";
+ private projectId: string;
+
+ constructor(projectId: string) {
+ this.projectId = projectId;
+ }
+
sendTransaction(transaction: Transaction<Change[]>) {
if (transaction.object === "server") {
- const projectId = $project.get()?.id ?? "";
commandQueue.enqueue({
type: "transactions",
transactions: [transaction],
- projectId,
+ projectId: this.projectId,
});
}
}
subscribe(setState: (state: unknown) => void, signal: AbortSignal) {
- const projectId = $project.get()?.id ?? "";
+ const projectId = this.projectId;
loadBuilderData({ projectId, signal })
.then((data) => {
const serverData = new Map(Object.entries(data));
@@ -364,17 +392,7 @@ export const isSyncIdle = () => {
});
};
-type SyncServerProps = {
- projectId: Project["id"];
- authPermit: AuthPermit;
-};
-
-export const useSyncServer = ({ projectId, authPermit }: SyncServerProps) => {
- useSyncProject({
- projectId,
- authPermit,
- });
-
+export const usePreventUnload = () => {
useEffect(() => {
const handler = (event: BeforeUnloadEvent) => {
const { status } = $queueStatus.get();
diff --git a/apps/builder/app/shared/sync/sync-client.ts b/apps/builder/app/shared/sync/sync-client.ts
new file mode 100644
index 0000000000..0cd8460f29
--- /dev/null
+++ b/apps/builder/app/shared/sync/sync-client.ts
@@ -0,0 +1,127 @@
+import type { Project } from "@webstudio-is/project";
+import type { AuthPermit } from "@webstudio-is/trpc-interface/index.server";
+import { SyncClient } from "~/shared/sync-client";
+import { registerContainers, createObjectPool } from "./sync-stores";
+import {
+ ServerSyncStorage,
+ enqueueProjectDetails,
+ stopPolling,
+} from "./project-queue";
+import { loadBuilderData } from "~/shared/builder-data";
+import {
+ $project,
+ $pages,
+ $assets,
+ $instances,
+ $props,
+ $dataSources,
+ $resources,
+ $breakpoints,
+ $styleSources,
+ $styleSourceSelections,
+ $styles,
+ $marketplaceProduct,
+ $publisherHost,
+ resetDataStores,
+} from "./data-stores";
+
+let client: SyncClient | undefined;
+let currentProjectId: string | undefined;
+
+/**
+ * Initialize the sync infrastructure and load project data.
+ * Can be used from both the builder and dashboard contexts.
+ */
+export const initializeClientSync = ({
+ projectId,
+ authPermit,
+ authToken,
+ signal,
+ onReady,
+}: {
+ projectId: Project["id"];
+ authPermit: AuthPermit;
+ authToken?: string;
+ signal: AbortSignal;
+ onReady?: () => void;
+}) => {
+ // Note: "view" permit will skip transaction synchronization
+
+ // Reset sync client if projectId changed
+ if (client && currentProjectId !== projectId) {
+ destroyClientSync();
+ client = undefined;
+ }
+
+ // Only register containers once and create sync client
+ if (!client) {
+ registerContainers();
+ client = new SyncClient({
+ role: "leader",
+ object: createObjectPool(),
+ storages: [new ServerSyncStorage(projectId)],
+ });
+ currentProjectId = projectId;
+ }
+
+ client.connect({
+ signal,
+ onReady() {
+ // Load builder data if we don't have it yet OR if projectId changed
+ const currentProjectInStore = $project.get()?.id;
+ const needsDataLoad =
+ !$pages.get() || currentProjectInStore !== projectId;
+
+ loadBuilderData({ projectId, signal })
+ .then((data) => {
+ if (needsDataLoad) {
+ // Set publisherHost from loaded data (needed for $publishedOrigin computed store)
+ $publisherHost.set(data.publisherHost);
+
+ // Set all the stores with loaded data
+ $project.set(data.project);
+ $pages.set(data.pages);
+ $assets.set(data.assets);
+ $instances.set(data.instances);
+ $props.set(data.props);
+ $dataSources.set(data.dataSources);
+ $resources.set(data.resources);
+ $breakpoints.set(data.breakpoints);
+ $styleSources.set(data.styleSources);
+ $styleSourceSelections.set(data.styleSourceSelections);
+ $styles.set(data.styles);
+ $marketplaceProduct.set(data.marketplaceProduct);
+ }
+
+ // Start project sync with build info from loaded data
+ if (authPermit !== "view") {
+ enqueueProjectDetails({
+ projectId,
+ buildId: data.id,
+ version: data.version,
+ authPermit,
+ authToken,
+ });
+ }
+
+ onReady?.();
+ })
+ .catch((error) => {
+ if (error.name !== "AbortError") {
+ console.error("Failed to load project data:", error);
+ }
+ });
+ },
+ });
+};
+
+/**
+ * Destroy sync client and reset all data stores.
+ * Call this when closing the builder or switching between projects.
+ */
+export const destroyClientSync = () => {
+ resetDataStores();
+ stopPolling();
+};
+
+export const getSyncClient = () => client;
diff --git a/apps/builder/app/shared/sync/sync-stores.ts b/apps/builder/app/shared/sync/sync-stores.ts
index 5558323d18..74a7a1224f 100644
--- a/apps/builder/app/shared/sync/sync-stores.ts
+++ b/apps/builder/app/shared/sync/sync-stores.ts
@@ -12,6 +12,10 @@ import {
$styleSources,
$styleSourceSelections,
$assets,
+ $resources,
+ $marketplaceProduct,
+} from "./data-stores";
+import {
$selectedPageHash,
$selectedInstanceSizes,
$selectedInstanceRenderState,
@@ -23,8 +27,6 @@ import {
$dataSourceVariables,
$dragAndDropState,
$selectedInstanceStates,
- $resources,
- $marketplaceProduct,
$canvasIframeState,
$uploadingFilesDataStore,
$memoryProps,
diff --git a/apps/builder/app/shared/system.test.ts b/apps/builder/app/shared/system.test.ts
index 4fa4cdf30a..03a6402a9b 100644
--- a/apps/builder/app/shared/system.test.ts
+++ b/apps/builder/app/shared/system.test.ts
@@ -1,7 +1,7 @@
import { describe, expect, test } from "vitest";
import type { Page, Pages } from "@webstudio-is/sdk";
-import { $pages } from "~/shared/nano-states";
-import { registerContainers } from "~/shared/sync";
+import { $pages } from "~/shared/sync/data-stores";
+import { registerContainers } from "~/shared/sync/sync-stores";
import { updateCurrentSystem } from "./system";
import { selectPage } from "./awareness";
diff --git a/apps/builder/app/shared/system.ts b/apps/builder/app/shared/system.ts
index b42231507b..dfa0df2659 100644
--- a/apps/builder/app/shared/system.ts
+++ b/apps/builder/app/shared/system.ts
@@ -7,7 +7,7 @@ import {
} from "~/builder/shared/url-pattern";
import { $selectedPage } from "./awareness";
import { $pages, $publishedOrigin } from "./nano-states";
-import { serverSyncStore } from "./sync";
+import { serverSyncStore } from "./sync/sync-stores";
export const $systemDataByPage = atom(
new Map<Page["id"], Pick<System, "search" | "params">>()
diff --git a/packages/project-build/src/db/build.ts b/packages/project-build/src/db/build.ts
index 15fa7b521e..6a156e337c 100644
--- a/packages/project-build/src/db/build.ts
+++ b/packages/project-build/src/db/build.ts
@@ -130,30 +130,6 @@ export const loadBuildById = async (context: AppContext, id: Build["id"]) => {
return parseCompactBuild(build);
};
-export const loadBuildIdAndVersionByProjectId = async (
- context: AppContext,
- projectId: Build["projectId"]
-): Promise<{ id: string; version: number }> => {
- const build = await context.postgrest.client
- .from("Build")
- .select("id,version")
- .eq("projectId", projectId)
- .is("deployment", null);
- // .single(); Note: Single response is not compressed. Uncomment the following line once the issue is resolved: https://github.com/orgs/supabase/discussions/28757
-
- if (build.error) {
- throw build.error;
- }
-
- if (build.data.length !== 1) {
- throw new Error(
- `Results contain ${build.data.length} row(s) requires 1 row`
- );
- }
-
- return build.data[0];
-};
-
export const loadDevBuildByProjectId = async (
context: AppContext,
projectId: Build["projectId"]