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.

refactor: split stores with server synchronization (#2410)

Bogdan Chadkina379a98c1f48
diff --git a/apps/builder/app/builder/features/ai/copywriter.tsx b/apps/builder/app/builder/features/ai/copywriter.tsx
index 36bf3dd303..53ece6bd7c 100644
--- a/apps/builder/app/builder/features/ai/copywriter.tsx
+++ b/apps/builder/app/builder/features/ai/copywriter.tsx
@@ -1,5 +1,4 @@
import { z } from "zod";
-import store from "immerhin";
import untruncateJson from "untruncate-json";
import { copywriter, requestStream } from "@webstudio-is/ai";
import { restAiCopy } from "~/shared/router-utils";
@@ -18,9 +17,10 @@ import {
import { useStore } from "@nanostores/react";
import { useRef, useState } from "react";
import { computed } from "nanostores";
+import { serverSyncStore } from "~/shared/sync";
const patchTextInstance = (textInstance: copywriter.TextInstance) => {
- store.createTransaction([instancesStore], (instances) => {
+ serverSyncStore.createTransaction([instancesStore], (instances) => {
const currentInstance = instances.get(textInstance.instanceId);
if (currentInstance === undefined) {
@@ -68,7 +68,7 @@ const $textInstances = computed(
(instances, selectedInstance) => {
if (selectedInstance) {
return copywriter.collectTextInstances({
- instances: instancesStore.get(),
+ instances,
rootInstanceId: selectedInstance.id,
});
}
diff --git a/apps/builder/app/builder/features/breakpoints/breakpoints-editor.tsx b/apps/builder/app/builder/features/breakpoints/breakpoints-editor.tsx
index 9067fe55a2..b311787bf7 100644
--- a/apps/builder/app/builder/features/breakpoints/breakpoints-editor.tsx
+++ b/apps/builder/app/builder/features/breakpoints/breakpoints-editor.tsx
@@ -1,7 +1,6 @@
import { z } from "zod";
import { Fragment, useEffect, useRef, useState } from "react";
import { nanoid } from "nanoid";
-import store from "immerhin";
import type { Breakpoint } from "@webstudio-is/sdk";
import {
theme,
@@ -20,6 +19,7 @@ import { MinusIcon, PlusIcon } from "@webstudio-is/icons";
import { useStore } from "@nanostores/react";
import { breakpointsStore } from "~/shared/nano-states";
import { groupBreakpoints, isBaseBreakpoint } from "~/shared/breakpoints";
+import { serverSyncStore } from "~/shared/sync";
type BreakpointEditorItemProps = {
breakpoint: Breakpoint;
@@ -178,7 +178,7 @@ export const BreakpointsEditor = ({ onDelete }: BreakpointsEditorProps) => {
].filter((breakpoint) => isBaseBreakpoint(breakpoint) === false);
const handleChangeComplete = (breakpoint: Breakpoint) => {
- store.createTransaction([breakpointsStore], (breakpoints) => {
+ serverSyncStore.createTransaction([breakpointsStore], (breakpoints) => {
breakpoints.set(breakpoint.id, breakpoint);
});
};
diff --git a/apps/builder/app/builder/features/breakpoints/breakpoints-popover.tsx b/apps/builder/app/builder/features/breakpoints/breakpoints-popover.tsx
index 485f906690..7560e351e9 100644
--- a/apps/builder/app/builder/features/breakpoints/breakpoints-popover.tsx
+++ b/apps/builder/app/builder/features/breakpoints/breakpoints-popover.tsx
@@ -1,6 +1,5 @@
import { useState } from "react";
import { useStore } from "@nanostores/react";
-import store from "immerhin";
import type { Breakpoint } from "@webstudio-is/sdk";
import {
theme,
@@ -41,6 +40,7 @@ import {
} from "~/shared/breakpoints";
import { scaleStore } from "~/builder/shared/nano-states";
import { useSetInitialCanvasWidth } from "./use-set-initial-canvas-width";
+import { serverSyncStore } from "~/shared/sync";
export const BreakpointsPopover = () => {
const view = useStore($breakpointsMenuView);
@@ -64,7 +64,7 @@ export const BreakpointsPopover = () => {
if (breakpointToDelete === undefined) {
return;
}
- store.createTransaction(
+ serverSyncStore.createTransaction(
[breakpointsStore, stylesStore],
(breakpoints, styles) => {
const breakpointId = breakpointToDelete.id;
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 88719d7f38..fcb66a8e01 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
@@ -1,6 +1,5 @@
import { useState } from "react";
import { useStore } from "@nanostores/react";
-import store from "immerhin";
import type { Instance } from "@webstudio-is/sdk";
import {
theme,
@@ -33,6 +32,7 @@ import {
type PropAndMeta,
} from "./use-props-logic";
import { Row, getLabel } from "../shared";
+import { serverSyncStore } from "~/shared/sync";
const itemToString = (item: NameAndLabel | null) =>
item ? getLabel(item, item.name) : "";
@@ -216,7 +216,7 @@ export const PropsSectionContainer = ({
dataSourceVariables.set(dataSourceId, update.value);
dataSourceVariablesStore.set(dataSourceVariables);
} else {
- store.createTransaction([propsStore], (props) => {
+ serverSyncStore.createTransaction([propsStore], (props) => {
const istanceProps = propsByInstanceId.get(instance.id) ?? [];
// Fixing a bug that caused some props to be duplicated on unmount by removing duplicates.
// see for details https://github.com/webstudio-is/webstudio/pull/2170
@@ -233,7 +233,7 @@ export const PropsSectionContainer = ({
}
},
deleteProp: (propId) => {
- store.createTransaction([propsStore], (props) => {
+ serverSyncStore.createTransaction([propsStore], (props) => {
props.delete(propId);
});
},
diff --git a/apps/builder/app/builder/features/settings-panel/settings-section/use-settings-logic.ts b/apps/builder/app/builder/features/settings-panel/settings-section/use-settings-logic.ts
index 1e37814a12..7030f83f71 100644
--- a/apps/builder/app/builder/features/settings-panel/settings-section/use-settings-logic.ts
+++ b/apps/builder/app/builder/features/settings-panel/settings-section/use-settings-logic.ts
@@ -1,4 +1,3 @@
-import store from "immerhin";
import {
type KeyboardEventHandler,
useRef,
@@ -6,6 +5,7 @@ import {
useCallback,
} from "react";
import { instancesStore, selectedInstanceStore } from "~/shared/nano-states";
+import { serverSyncStore } from "~/shared/sync";
type Setting = "label";
type Value = string;
@@ -50,7 +50,7 @@ export const useSettingsLogic = () => {
if (selectedInstance === undefined) {
return;
}
- store.createTransaction([instancesStore], (instances) => {
+ serverSyncStore.createTransaction([instancesStore], (instances) => {
const instance = instances.get(selectedInstance.id);
if (instance === undefined) {
return;
diff --git a/apps/builder/app/builder/features/sidebar-left/panels/pages/settings.tsx b/apps/builder/app/builder/features/sidebar-left/panels/pages/settings.tsx
index 9625ff7760..57e1bc0106 100644
--- a/apps/builder/app/builder/features/sidebar-left/panels/pages/settings.tsx
+++ b/apps/builder/app/builder/features/sidebar-left/panels/pages/settings.tsx
@@ -1,5 +1,4 @@
import { z } from "zod";
-import store from "immerhin";
import {
useState,
useCallback,
@@ -43,6 +42,7 @@ import {
} from "~/shared/nano-states";
import { nanoid } from "nanoid";
import { removeByMutable } from "~/shared/array-utils";
+import { serverSyncStore } from "~/shared/sync";
const Group = styled(Flex, {
marginBottom: theme.spacing[9],
@@ -271,7 +271,7 @@ export const NewPageSettings = ({
const handleSubmit = () => {
if (Object.keys(errors).length === 0) {
const pageId = nanoid();
- store.createTransaction(
+ serverSyncStore.createTransaction(
[pagesStore, instancesStore],
(pages, instances) => {
if (pages === undefined) {
@@ -402,7 +402,7 @@ const updatePage = (pageId: Page["id"], values: Partial<Values>) => {
page.meta.description = values.description;
}
};
- store.createTransaction([pagesStore], (pages) => {
+ serverSyncStore.createTransaction([pagesStore], (pages) => {
if (pages === undefined) {
return;
}
@@ -430,7 +430,7 @@ const deletePage = (pageId: Page["id"]) => {
if (rootInstanceId !== undefined) {
deleteInstance([rootInstanceId]);
}
- store.createTransaction([pagesStore], (pages) => {
+ serverSyncStore.createTransaction([pagesStore], (pages) => {
if (pages === undefined) {
return;
}
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 da0bc933ca..2a5b3ef950 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
@@ -1,6 +1,5 @@
import { useCallback } from "react";
import { useStore } from "@nanostores/react";
-import store from "immerhin";
import {
type Breakpoint,
type Instance,
@@ -17,6 +16,7 @@ import {
stylesStore,
} from "~/shared/nano-states";
import { useStyleInfo } from "./style-info";
+import { serverSyncStore } from "~/shared/sync";
export type StyleUpdate =
| {
@@ -100,7 +100,7 @@ export const useStyleData = ({ selectedInstance, publish }: UseStyleData) => {
return;
}
- store.createTransaction(
+ serverSyncStore.createTransaction(
[styleSourceSelectionsStore, styleSourcesStore, stylesStore],
(styleSourceSelections, styleSources, styles) => {
const instanceId = selectedInstance.id;
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 04fa5cbf30..48c4585687 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
@@ -2,7 +2,6 @@ import { useState } from "react";
import { useStore } from "@nanostores/react";
import { nanoid } from "nanoid";
import { computed } from "nanostores";
-import store from "immerhin";
import {
type Instance,
type StyleSource,
@@ -42,6 +41,7 @@ import { cloneStyles } from "~/shared/tree-utils";
import { humanizeString } from "~/shared/string-utils";
import { isBaseBreakpoint } from "~/shared/breakpoints";
import { shallowComputed } from "~/shared/store-utils";
+import { serverSyncStore } from "~/shared/sync";
const getOrCreateStyleSourceSelectionMutable = (
styleSourceSelections: StyleSourceSelections,
@@ -148,7 +148,7 @@ const createStyleSource = (id: StyleSource["id"], name: string) => {
name,
};
const presetTokens = $presetTokens.get();
- store.createTransaction(
+ serverSyncStore.createTransaction(
[styleSourcesStore, stylesStore, styleSourceSelectionsStore],
(styleSources, styles, styleSourceSelections) => {
styleSources.set(newStyleSource.id, newStyleSource);
@@ -178,7 +178,7 @@ export const addStyleSourceToInstance = (
return;
}
const [selectedInstanceId] = selectedInstanceSelector;
- store.createTransaction(
+ serverSyncStore.createTransaction(
[styleSourceSelectionsStore, styleSourcesStore],
(styleSourceSelections, styleSources) => {
addStyleSourceToInstaceMutable(
@@ -198,7 +198,7 @@ const removeStyleSourceFromInstance = (styleSourceId: StyleSource["id"]) => {
return;
}
const [selectedInstanceId] = selectedInstanceSelector;
- store.createTransaction(
+ serverSyncStore.createTransaction(
[styleSourceSelectionsStore],
(styleSourceSelections) => {
const styleSourceSelection =
@@ -221,7 +221,7 @@ const removeStyleSourceFromInstance = (styleSourceId: StyleSource["id"]) => {
};
const deleteStyleSource = (styleSourceId: StyleSource["id"]) => {
- store.createTransaction(
+ serverSyncStore.createTransaction(
[styleSourcesStore, styleSourceSelectionsStore, stylesStore],
(styleSources, styleSourceSelections, styles) => {
styleSources.delete(styleSourceId);
@@ -271,7 +271,7 @@ const duplicateStyleSource = (styleSourceId: StyleSource["id"]) => {
clonedStyleSourceIds.set(styleSourceId, newStyleSource.id);
const clonedStyles = cloneStyles(stylesStore.get(), clonedStyleSourceIds);
- store.createTransaction(
+ serverSyncStore.createTransaction(
[styleSourcesStore, stylesStore, styleSourceSelectionsStore],
(styleSources, styles, styleSourceSelections) => {
const styleSourceSelection =
@@ -305,7 +305,7 @@ const convertLocalStyleSourceToToken = (styleSourceId: StyleSource["id"]) => {
id: styleSourceId,
name: "Local (Copy)",
};
- store.createTransaction(
+ serverSyncStore.createTransaction(
[styleSourcesStore, styleSourceSelectionsStore],
(styleSources, styleSourceSelections) => {
const styleSourceSelection = getOrCreateStyleSourceSelectionMutable(
@@ -328,7 +328,7 @@ const reorderStyleSources = (styleSourceIds: StyleSource["id"][]) => {
return;
}
const [selectedInstanceId] = selectedInstanceSelector;
- store.createTransaction(
+ serverSyncStore.createTransaction(
[styleSourceSelectionsStore],
(styleSourceSelections) => {
const styleSourceSelection =
@@ -342,7 +342,7 @@ const reorderStyleSources = (styleSourceIds: StyleSource["id"][]) => {
};
const renameStyleSource = (id: StyleSource["id"], label: string) => {
- store.createTransaction([styleSourcesStore], (styleSources) => {
+ serverSyncStore.createTransaction([styleSourcesStore], (styleSources) => {
const styleSource = styleSources.get(id);
if (styleSource?.type === "token") {
styleSource.name = label;
@@ -351,7 +351,7 @@ const renameStyleSource = (id: StyleSource["id"], label: string) => {
};
const clearStyles = (styleSourceId: StyleSource["id"]) => {
- store.createTransaction([stylesStore], (styles) => {
+ serverSyncStore.createTransaction([stylesStore], (styles) => {
for (const [styleDeclKey, styleDecl] of styles) {
if (styleDecl.styleSourceId === styleSourceId) {
styles.delete(styleDeclKey);
diff --git a/apps/builder/app/builder/features/topbar/menu/menu.tsx b/apps/builder/app/builder/features/topbar/menu/menu.tsx
index 03f904c2ad..94d1699b63 100644
--- a/apps/builder/app/builder/features/topbar/menu/menu.tsx
+++ b/apps/builder/app/builder/features/topbar/menu/menu.tsx
@@ -1,6 +1,5 @@
import { useNavigate } from "@remix-run/react";
import { useStore } from "@nanostores/react";
-import store from "immerhin";
import { isFeatureEnabled } from "@webstudio-is/feature-flags";
import {
theme,
@@ -31,6 +30,7 @@ import { dashboardPath } from "~/shared/router-utils";
import { $authPermit } from "~/shared/nano-states";
import { emitCommand } from "~/builder/shared/commands";
import { MenuButton } from "./menu-button";
+import { serverSyncStore } from "~/shared/sync";
const ThemeMenuItem = () => {
if (isFeatureEnabled("dark") === false) {
@@ -125,13 +125,13 @@ export const Menu = () => {
Dashboard
</DropdownMenuItem>
<DropdownMenuSeparator />
- <DropdownMenuItem onSelect={() => store.undo()}>
+ <DropdownMenuItem onSelect={() => serverSyncStore.undo()}>
Undo
<DropdownMenuItemRightSlot>
<ShortcutHint value={["cmd", "z"]} />
</DropdownMenuItemRightSlot>
</DropdownMenuItem>
- <DropdownMenuItem onSelect={() => store.redo()}>
+ <DropdownMenuItem onSelect={() => serverSyncStore.redo()}>
Redo
<DropdownMenuItemRightSlot>
<ShortcutHint value={["shift", "cmd", "z"]} />
diff --git a/apps/builder/app/builder/shared/assets/use-assets.tsx b/apps/builder/app/builder/shared/assets/use-assets.tsx
index 8f2ed524be..e1444909d2 100644
--- a/apps/builder/app/builder/shared/assets/use-assets.tsx
+++ b/apps/builder/app/builder/shared/assets/use-assets.tsx
@@ -1,7 +1,6 @@
import { useMemo } from "react";
import { useStore } from "@nanostores/react";
import warnOnce from "warn-once";
-import store from "immerhin";
import type { Asset } from "@webstudio-is/sdk";
import type { AssetType } from "@webstudio-is/asset-uploader";
import { toast } from "@webstudio-is/design-system";
@@ -15,9 +14,10 @@ import type {
import type { ActionData } from "~/builder/shared/assets";
import { assetsStore, $authToken, projectStore } from "~/shared/nano-states";
import { atom, computed } from "nanostores";
+import { serverSyncStore } from "~/shared/sync";
export const deleteAssets = (assetIds: Asset["id"][]) => {
- store.createTransaction([assetsStore], (assets) => {
+ serverSyncStore.createTransaction([assetsStore], (assets) => {
for (const assetId of assetIds) {
assets.delete(assetId);
}
@@ -25,7 +25,7 @@ export const deleteAssets = (assetIds: Asset["id"][]) => {
};
const setAsset = (asset: Asset) => {
- store.createTransaction([assetsStore], (assets) => {
+ serverSyncStore.createTransaction([assetsStore], (assets) => {
assets.set(asset.id, asset);
});
};
diff --git a/apps/builder/app/builder/shared/sync/sync-server.ts b/apps/builder/app/builder/shared/sync/sync-server.ts
index edeafb85d3..6ecd012c0f 100644
--- a/apps/builder/app/builder/shared/sync/sync-server.ts
+++ b/apps/builder/app/builder/shared/sync/sync-server.ts
@@ -1,13 +1,13 @@
import { useEffect } from "react";
import { useBeforeUnload } from "react-use";
import { atom } from "nanostores";
-import store, { sync } from "immerhin";
import { Project } from "@webstudio-is/project";
import type { Build } from "@webstudio-is/project-build";
import type { AuthPermit } from "@webstudio-is/trpc-interface/index.server";
import * as commandQueue from "./command-queue";
import { restPatchPath } from "~/shared/router-utils";
import { toast } from "@webstudio-is/design-system";
+import { serverSyncStore } from "~/shared/sync";
// Periodic check for new entries to group them into one job/call in sync queue.
const NEW_ENTRIES_INTERVAL = 1000;
@@ -25,22 +25,6 @@ const MAX_ALLOWED_API_ERRORS = 5;
const INTERVAL_ERROR = 5000;
const MAX_INTERVAL_ERROR = 2 * 60000;
-const filterServerTransactions = (transactions: ReturnType<typeof sync>) => {
- const filteredTransactions: ReturnType<typeof sync> = [];
- for (const transaction of transactions) {
- const filteredChanges = transaction.changes.filter((change) =>
- store.containers.has(change.namespace)
- );
- if (filteredChanges.length !== 0) {
- filteredTransactions.push({
- ...transaction,
- changes: filteredChanges,
- });
- }
- }
- return filteredTransactions;
-};
-
const pause = (timeout: number) => {
return new Promise((resolve) => setTimeout(resolve, timeout));
};
@@ -285,7 +269,7 @@ const useSyncProject = async ({
});
const updateProjectTransactions = () => {
- const transactions = filterServerTransactions(sync());
+ const transactions = serverSyncStore.popAll();
if (transactions.length === 0) {
return;
}
diff --git a/apps/builder/app/builder/shared/tree/index.tsx b/apps/builder/app/builder/shared/tree/index.tsx
index 73d76dd7f7..71e6da04a3 100644
--- a/apps/builder/app/builder/shared/tree/index.tsx
+++ b/apps/builder/app/builder/shared/tree/index.tsx
@@ -10,7 +10,6 @@ import {
theme,
} from "@webstudio-is/design-system";
import type { Instance } from "@webstudio-is/sdk";
-import store from "immerhin";
import {
editingItemIdStore,
instancesStore,
@@ -19,6 +18,7 @@ import {
import { MetaIcon } from "../meta-icon";
import { useContentEditable } from "~/shared/dom-hooks";
import { getInstanceLabel } from "~/shared/instance-utils";
+import { serverSyncStore } from "~/shared/sync";
export const InstanceTree = (
props: Omit<
@@ -67,7 +67,7 @@ export const InstanceTree = (
const updateInstanceLabel = useCallback(
(instanceId: string, value: string) => {
- store.createTransaction([instancesStore], (instances) => {
+ serverSyncStore.createTransaction([instancesStore], (instances) => {
const instance = instances.get(instanceId);
if (instance === undefined) {
return;
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 2fbf5cf0c1..3608918874 100644
--- a/apps/builder/app/canvas/features/webstudio-component/webstudio-component.tsx
+++ b/apps/builder/app/canvas/features/webstudio-component/webstudio-component.tsx
@@ -13,7 +13,6 @@ import { computed, type Atom, atom } from "nanostores";
import { useStore } from "@nanostores/react";
import { useLexicalComposerContext } from "@lexical/react/LexicalComposerContext";
import { mergeRefs } from "@react-aria/utils";
-import store from "immerhin";
import type { Instance, Instances, Prop } from "@webstudio-is/sdk";
import { findTreeInstanceIds } from "@webstudio-is/sdk";
import {
@@ -44,6 +43,7 @@ import {
} from "~/shared/tree-utils";
import { setDataCollapsed } from "~/canvas/collapsed";
import { getIsVisuallyHidden } from "~/shared/visually-hidden";
+import { serverSyncStore } from "~/shared/sync";
const TextEditor = lazy(() => import("../text-editor"));
@@ -353,7 +353,7 @@ export const WebstudioComponentCanvas = forwardRef<
/>
}
onChange={(instancesList) => {
- store.createTransaction([instancesStore], (instances) => {
+ serverSyncStore.createTransaction([instancesStore], (instances) => {
const deletedTreeIds = findTreeInstanceIds(instances, instance.id);
for (const updatedInstance of instancesList) {
instances.set(updatedInstance.id, updatedInstance);
diff --git a/apps/builder/app/shared/commands-emitter.ts b/apps/builder/app/shared/commands-emitter.ts
index 3558321113..7a475f003a 100644
--- a/apps/builder/app/shared/commands-emitter.ts
+++ b/apps/builder/app/shared/commands-emitter.ts
@@ -1,7 +1,7 @@
import { isHotkeyPressed } from "react-hotkeys-hook";
import { atom, onMount } from "nanostores";
import { $publisher, subscribe } from "~/shared/pubsub";
-import { clientImmerhinStore } from "~/shared/sync";
+import { clientSyncStore } from "~/shared/sync";
type CommandMeta<CommandName extends string> = {
// @todo category, description
@@ -61,14 +61,11 @@ export const createCommandsEmitter = <CommandName extends string>({
// schedule store.set to the next tick
// so store.listen is executed after store.set below
Promise.resolve().then(() => {
- clientImmerhinStore.createTransaction(
- [$commandMetas],
- (commandMetas) => {
- for (const { handler, ...meta } of commands) {
- commandMetas.set(meta.name, meta);
- }
+ clientSyncStore.createTransaction([$commandMetas], (commandMetas) => {
+ for (const { handler, ...meta } of commands) {
+ commandMetas.set(meta.name, meta);
}
- );
+ });
});
});
}
diff --git a/apps/builder/app/shared/copy-paste/plugin-instance.ts b/apps/builder/app/shared/copy-paste/plugin-instance.ts
index 45ae8c3a5c..97e6ad1b35 100644
--- a/apps/builder/app/shared/copy-paste/plugin-instance.ts
+++ b/apps/builder/app/shared/copy-paste/plugin-instance.ts
@@ -1,6 +1,5 @@
import { shallowEqual } from "shallow-equal";
import { nanoid } from "nanoid";
-import store from "immerhin";
import { z } from "zod";
import { toast } from "@webstudio-is/design-system";
import { findTreeInstanceIds } from "@webstudio-is/sdk";
@@ -54,6 +53,7 @@ import {
isInstanceDetachable,
} from "../instance-utils";
import { getMapValuesBy, getMapValuesByKeysSet } from "../array-utils";
+import { serverSyncStore } from "../sync";
const version = "@webstudio/instance/v0.1";
@@ -426,7 +426,7 @@ export const onPaste = (clipboardData: string): boolean => {
}
const dropTarget = potentialDropTarget;
- store.createTransaction(
+ serverSyncStore.createTransaction(
[
breakpointsStore,
instancesStore,
diff --git a/apps/builder/app/shared/instance-utils.ts b/apps/builder/app/shared/instance-utils.ts
index aa1afb9754..87bd757e01 100644
--- a/apps/builder/app/shared/instance-utils.ts
+++ b/apps/builder/app/shared/instance-utils.ts
@@ -1,4 +1,3 @@
-import store from "immerhin";
import { toast } from "@webstudio-is/design-system";
import {
type Instance,
@@ -37,6 +36,7 @@ import {
import { removeByMutable } from "./array-utils";
import { isBaseBreakpoint } from "./breakpoints";
import { humanizeString } from "./string-utils";
+import { serverSyncStore } from "./sync";
const getLabelFromComponentName = (component: Instance["component"]) => {
if (component.includes(":")) {
@@ -286,7 +286,7 @@ export const insertTemplateData = (
dataSources: insertedDataSources,
} = templateData;
const rootInstanceId = insertedInstances[0].id;
- store.createTransaction(
+ serverSyncStore.createTransaction(
[
instancesStore,
// insert data sources before props to avoid error
@@ -374,15 +374,18 @@ export const reparentInstance = (
targetInstanceSelector: InstanceSelector,
dropTarget: DroppableTarget
) => {
- store.createTransaction([instancesStore, propsStore], (instances, props) => {
- reparentInstanceMutable(
- instances,
- props,
- registeredComponentMetasStore.get(),
- targetInstanceSelector,
- dropTarget
- );
- });
+ serverSyncStore.createTransaction(
+ [instancesStore, propsStore],
+ (instances, props) => {
+ reparentInstanceMutable(
+ instances,
+ props,
+ registeredComponentMetasStore.get(),
+ targetInstanceSelector,
+ dropTarget
+ );
+ }
+ );
selectedInstanceSelectorStore.set(targetInstanceSelector);
selectedStyleSourceSelectorStore.set(undefined);
};
@@ -394,7 +397,7 @@ export const deleteInstance = (instanceSelector: InstanceSelector) => {
);
return;
}
- store.createTransaction(
+ serverSyncStore.createTransaction(
[
instancesStore,
propsStore,
diff --git a/apps/builder/app/shared/shortcuts/shortcuts.ts b/apps/builder/app/shared/shortcuts/shortcuts.ts
index ae2dba2c0c..8f5a984993 100644
--- a/apps/builder/app/shared/shortcuts/shortcuts.ts
+++ b/apps/builder/app/shared/shortcuts/shortcuts.ts
@@ -1,5 +1,5 @@
import { type Options, useHotkeys } from "react-hotkeys-hook";
-import store from "immerhin";
+import { serverSyncStore } from "../sync";
export const shortcuts = {
esc: "esc",
@@ -17,7 +17,7 @@ export const useSharedShortcuts = ({
useHotkeys(
// safari use cmd+z to reopen closed tabs so fallback to ctrl
"meta+z, ctrl+z",
- () => store.undo(),
+ () => serverSyncStore.undo(),
{
// prevents undoing when user is editing text in a control on style panel etc.
enableOnFormTags: source === "canvas",
@@ -29,7 +29,7 @@ export const useSharedShortcuts = ({
useHotkeys(
// safari use cmd+shift+z to close reopened tabs so fallback to ctrl
"meta+shift+z, ctrl+shift+z",
- () => store.redo(),
+ () => serverSyncStore.redo(),
{
// prevents undoing when user is editing text in a control on style panel etc.
enableOnFormTags: source === "canvas",
diff --git a/apps/builder/app/shared/sync/sync-stores.ts b/apps/builder/app/shared/sync/sync-stores.ts
index 0f3053e2fd..e2d317d847 100644
--- a/apps/builder/app/shared/sync/sync-stores.ts
+++ b/apps/builder/app/shared/sync/sync-stores.ts
@@ -1,4 +1,4 @@
-import store, { Store, type Change } from "immerhin";
+import { Store, type Change } from "immerhin";
import { enableMapSet } from "immer";
import { atom, type WritableAtom } from "nanostores";
import { useEffect } from "react";
@@ -59,22 +59,23 @@ declare module "~/shared/pubsub" {
}
}
-export const clientImmerhinStore = new Store();
+export const clientSyncStore = new Store();
+export const serverSyncStore = new Store();
const clientStores = new Map<string, WritableAtom<unknown>>();
const initializedStores = new Set<string>();
export const registerContainers = () => {
// synchronize patches
- store.register("pages", pagesStore);
- store.register("breakpoints", breakpointsStore);
- store.register("instances", instancesStore);
- store.register("styles", stylesStore);
- store.register("styleSources", styleSourcesStore);
- store.register("styleSourceSelections", styleSourceSelectionsStore);
- store.register("props", propsStore);
- store.register("dataSources", dataSourcesStore);
- store.register("assets", assetsStore);
- clientImmerhinStore.register("commandMetas", $commandMetas);
+ serverSyncStore.register("pages", pagesStore);
+ serverSyncStore.register("breakpoints", breakpointsStore);
+ serverSyncStore.register("instances", instancesStore);
+ serverSyncStore.register("styles", stylesStore);
+ serverSyncStore.register("styleSources", styleSourcesStore);
+ serverSyncStore.register("styleSourceSelections", styleSourceSelectionsStore);
+ serverSyncStore.register("props", propsStore);
+ serverSyncStore.register("dataSources", dataSourcesStore);
+ serverSyncStore.register("assets", assetsStore);
+ clientSyncStore.register("commandMetas", $commandMetas);
// synchronize whole states
clientStores.set("project", projectStore);
clientStores.set("dataSourceVariables", dataSourceVariablesStore);
@@ -139,15 +140,15 @@ const syncStoresChanges = (name: SyncEventSource, publish: Publish) => {
return;
}
if (namespace === "server") {
- store.createTransactionFromChanges(changes, "remote");
+ serverSyncStore.createTransactionFromChanges(changes, "remote");
}
if (namespace === "client") {
- clientImmerhinStore.createTransactionFromChanges(changes, "remote");
+ clientSyncStore.createTransactionFromChanges(changes, "remote");
}
}
);
- const unsubscribeStoreChanges = store.subscribe(
+ const unsubscribeStoreChanges = serverSyncStore.subscribe(
(_transactionId, changes, source) => {
// prevent sending remote patches back
if (source === "remote") {
@@ -165,7 +166,7 @@ const syncStoresChanges = (name: SyncEventSource, publish: Publish) => {
}
);
- const unsubscribeClientImmerhinStoreChanges = clientImmerhinStore.subscribe(
+ const unsubscribeClientImmerhinStoreChanges = clientSyncStore.subscribe(
(_transactionId, changes, source) => {
// prevent sending remote patches back
if (source === "remote") {
@@ -202,11 +203,11 @@ const syncStoresState = (name: SyncEventSource, publish: Publish) => {
}
for (const { namespace, value } of data) {
// apply immerhin stores data
- const container = store.containers.get(namespace);
+ const container = serverSyncStore.containers.get(namespace);
if (container) {
container.set(value);
}
- const clientContainer = clientImmerhinStore.containers.get(namespace);
+ const clientContainer = clientSyncStore.containers.get(namespace);
if (clientContainer) {
clientContainer.set(value);
}
@@ -361,7 +362,7 @@ export const useBuilderStore = (publish: Publish) => {
// immerhin data is sent only initially so not part of syncStoresState
// expect data to be populated by the time effect is called
const data = [];
- for (const [namespace, container] of store.containers) {
+ for (const [namespace, container] of serverSyncStore.containers) {
data.push({
namespace,
value: container.get(),
diff --git a/apps/builder/package.json b/apps/builder/package.json
index e5f35f3f40..e3f0c024e7 100644
--- a/apps/builder/package.json
+++ b/apps/builder/package.json
@@ -76,8 +76,8 @@
"downshift": "^6.1.7",
"hono": "^3.7.3",
"hyphenate-style-name": "^1.0.4",
- "immer": "^10.0.2",
- "immerhin": "^0.7.0",
+ "immer": "^10.0.3",
+ "immerhin": "^0.8.1",
"jose": "^4.11.2",
"lexical": "^0.11.3",
"match-sorter": "^6.3.1",
diff --git a/packages/asset-uploader/package.json b/packages/asset-uploader/package.json
index 19872b3503..2ca210de57 100644
--- a/packages/asset-uploader/package.json
+++ b/packages/asset-uploader/package.json
@@ -22,7 +22,7 @@
"@webstudio-is/trpc-interface": "workspace:*",
"fontkit": "^2.0.2",
"image-size": "^1.0.2",
- "immer": "^10.0.2",
+ "immer": "^10.0.3",
"nanoid": "^4.0.2",
"warn-once": "^0.1.1"
},
diff --git a/packages/design-system/package.json b/packages/design-system/package.json
index a9a50105f5..e34bea4d81 100644
--- a/packages/design-system/package.json
+++ b/packages/design-system/package.json
@@ -69,7 +69,7 @@
"@webstudio-is/icons": "workspace:*",
"camelcase": "^7.0.1",
"downshift": "^6.1.7",
- "immer": "^10.0.2",
+ "immer": "^10.0.3",
"match-sorter": "^6.3.1",
"react-hot-toast": "^2.4.1",
"token-transformer": "^0.0.28",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 7fee14eb2e..de5c7476ca 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -230,11 +230,11 @@ importers:
specifier: ^1.0.4
version: 1.0.4
immer:
- specifier: ^10.0.2
- version: 10.0.2
+ specifier: ^10.0.3
+ version: 10.0.3
immerhin:
- specifier: ^0.7.0
- version: 0.7.0
+ specifier: ^0.8.1
+ version: 0.8.1
jose:
specifier: ^4.11.2
version: 4.11.2
@@ -737,8 +737,8 @@ importers:
specifier: ^1.0.2
version: 1.0.2
immer:
- specifier: ^10.0.2
- version: 10.0.2
+ specifier: ^10.0.3
+ version: 10.0.3
nanoid:
specifier: ^4.0.2
version: 4.0.2
@@ -1106,8 +1106,8 @@ importers:
specifier: ^6.1.7
version: 6.1.7([email protected])
immer:
- specifier: ^10.0.2
- version: 10.0.2
+ specifier: ^10.0.3
+ version: 10.0.3
match-sorter:
specifier: ^6.3.1
version: 6.3.1
@@ -11515,14 +11515,14 @@ packages:
queue: 6.0.2
dev: false
- resolution: {integrity: sha512-Rx3CqeqQ19sxUtYV9CU911Vhy8/721wRFnJv3REVGWUmoAcIwzifTsdmJte/MV+0/XpM35LZdQMBGkRIoLPwQA==}
+ resolution: {integrity: sha512-pwupu3eWfouuaowscykeckFmVTpqbzW+rXFCX8rQLkZzM9ftBmU/++Ra+o+L27mz03zJTlyV4UUr+fdKNffo4A==}
dev: false
- resolution: {integrity: sha512-nzaOZY6PqssWqxi+NVWD5EuWUJlD7NrrD/cPq6kCahJCQ6LMUXG7oP+CeRNNEOvDULYidoBxfJ7mDtA0bRqTSQ==}
+ resolution: {integrity: sha512-pQrkWwkPj7/UHL7qVU7hTjTxN8uGy6ewhyfEiooY0lkT00h7i+HbV0cvKud6mZzcz5o2iAMiKiq55twxON4+QQ==}
dependencies:
- immer: 10.0.2
+ immer: 10.0.3
nanoid: 4.0.2
dev: false