Open source website builder and Webflow alternative. Webstudio is an advanced visual builder that connects to any headless CMS, supports all CSS properties, and can be hosted anywhere, including with us.
TypeScript accessibilityalternativecloudflarecloudflare-workersdesignfreefrontendopen-sourceradix-uireactremixweb-developmentwebflowwebsite-builderwebsite-developmentwebsiteswebstudio
Delete design tokens prototype (#873)
Oleg Isonene925d26bc9f1
diff --git a/apps/designer/app/canvas/canvas.tsx b/apps/designer/app/canvas/canvas.tsxindex f2500670e7..c827508e6d 100644--- a/apps/designer/app/canvas/canvas.tsx+++ b/apps/designer/app/canvas/canvas.tsx@@ -33,7 +33,6 @@ import {useInstanceStyles,useRootInstance,useSetBreakpoints,- useSetDesignTokens,useSetProps,useSetRootInstance,useSetStyles,@@ -164,7 +163,6 @@ export const Canvas = ({ data }: CanvasProps): JSX.Element | null => {const isDesignerReady = useSubscribeDesignerReady();const assets = useAssets(data.assets);useSetBreakpoints(data.breakpoints);- useSetDesignTokens(data.designTokens);useSetProps(data.tree.props);// inject props store to sdksetPropsByInstanceIdStore(propsByInstanceIdStore);diff --git a/apps/designer/app/canvas/shared/styles.ts b/apps/designer/app/canvas/shared/styles.tsindex f41695e6cd..6a135394d8 100644--- a/apps/designer/app/canvas/shared/styles.ts+++ b/apps/designer/app/canvas/shared/styles.ts@@ -1,11 +1,7 @@import { useEffect } from "react";import { useSubscribe } from "~/shared/pubsub";import { addGlobalRules } from "@webstudio-is/project";-import {- selectedInstanceIdStore,- useBreakpoints,- useDesignTokens,-} from "~/shared/nano-states";+import { selectedInstanceIdStore, useBreakpoints } from "~/shared/nano-states";import type { Styles } from "@webstudio-is/project-build";import {getComponentMeta,@@ -28,7 +24,6 @@ import {} from "@webstudio-is/css-engine";import { useIsomorphicLayoutEffect } from "react-use";import type { Asset } from "@webstudio-is/asset-uploader";-import { tokensToStyle } from "~/designer/shared/design-tokens-manager";const cssEngine = createCssEngine({ name: "user-styles" });@@ -65,7 +60,6 @@ const helpersCssEngine = createCssEngine({ name: "helpers" });const fontsAndDefaultsCssEngine = createCssEngine({name: "fonts-and-defaults",});-const tokensCssEngine = createCssEngine({ name: "tokens" });const presetStylesEngine = createCssEngine({ name: "presetStyles" });export const GlobalStyles = ({ assets }: { assets: Array<Asset> }) => {@@ -90,18 +84,6 @@ export const GlobalStyles = ({ assets }: { assets: Array<Asset> }) => {fontsAndDefaultsCssEngine.render();}, [assets]);- const [tokens] = useDesignTokens();-- useIsomorphicLayoutEffect(() => {- tokensCssEngine.clear();- if (tokens.length !== 0) {- const style = tokensToStyle(tokens);- tokensCssEngine.addStyleRule(`:root`, { style });- }-- tokensCssEngine.render();- }, [tokens]);-useIsomorphicLayoutEffect(() => {presetStylesEngine.clear();for (const component of getComponentNames()) {diff --git a/apps/designer/app/designer/features/sidebar-left/panels/design-tokens/design-tokens.tsx b/apps/designer/app/designer/features/sidebar-left/panels/design-tokens/design-tokens.tsxdeleted file mode 100644index c797858a24..0000000000--- a/apps/designer/app/designer/features/sidebar-left/panels/design-tokens/design-tokens.tsx+++ /dev/null@@ -1,23 +0,0 @@-import { TokensIcon } from "@webstudio-is/icons";-import { Flex } from "@webstudio-is/design-system";-import { DesignTokensManager } from "~/designer/shared/design-tokens-manager";-import { TabName } from "../../types";-import { Header, CloseButton } from "../../header";--export const TabContent = ({- onSetActiveTab,-}: {- onSetActiveTab: (tabName: TabName) => void;-}) => {- return (- <Flex direction="column" css={{ height: "100%" }}>- <Header- title="Design Tokens"- suffix={<CloseButton onClick={() => onSetActiveTab("none")} />}- />- <DesignTokensManager />- </Flex>- );-};--export const icon = <TokensIcon />;diff --git a/apps/designer/app/designer/features/sidebar-left/panels/design-tokens/index.ts b/apps/designer/app/designer/features/sidebar-left/panels/design-tokens/index.tsdeleted file mode 100644index 531913bc9a..0000000000--- a/apps/designer/app/designer/features/sidebar-left/panels/design-tokens/index.ts+++ /dev/null@@ -1 +0,0 @@-export * from "./design-tokens";diff --git a/apps/designer/app/designer/features/sidebar-left/panels/index.ts b/apps/designer/app/designer/features/sidebar-left/panels/index.tsindex 8fcdad47d3..2a1c0bbbe8 100644--- a/apps/designer/app/designer/features/sidebar-left/panels/index.ts+++ b/apps/designer/app/designer/features/sidebar-left/panels/index.ts@@ -2,12 +2,10 @@ import * as components from "./components";import * as navigator from "./navigator";import * as assets from "./assets";import * as pages from "./pages";-import * as designTokens from "./design-tokens";export const panels = {components,navigator,assets,pages,- designTokens,} as const;diff --git a/apps/designer/app/designer/features/sidebar-left/sidebar-left.tsx b/apps/designer/app/designer/features/sidebar-left/sidebar-left.tsxindex 367b93c87e..5ba06211ed 100644--- a/apps/designer/app/designer/features/sidebar-left/sidebar-left.tsx+++ b/apps/designer/app/designer/features/sidebar-left/sidebar-left.tsx@@ -1,5 +1,4 @@import { useState } from "react";-import { isFeatureEnabled } from "@webstudio-is/feature-flags";import {SidebarTabs,SidebarTabsContent,@@ -36,8 +35,6 @@ export const SidebarLeft = ({ publish }: SidebarLeftProps) => {const enabledPanels = (Object.keys(panels) as Array<TabName>).filter((panel) => {switch (panel) {- case "designTokens":- return isFeatureEnabled("designTokens");case "navigator":return clientSettings.navigatorLayout === "docked";}diff --git a/apps/designer/app/designer/shared/design-tokens-manager/design-tokens-manager.tsx b/apps/designer/app/designer/shared/design-tokens-manager/design-tokens-manager.tsxdeleted file mode 100644index 64630e38ce..0000000000--- a/apps/designer/app/designer/shared/design-tokens-manager/design-tokens-manager.tsx+++ /dev/null@@ -1,164 +0,0 @@-import { useState } from "react";-import store from "immerhin";-import { Flex, List, ListItem, useList } from "@webstudio-is/design-system";-import { CheckIcon } from "@webstudio-is/icons";-import type { DesignToken } from "@webstudio-is/design-tokens";-import { designTokensGroups } from "@webstudio-is/design-tokens";-import { designTokensContainer, useDesignTokens } from "~/shared/nano-states";-import {- removeByMutable,- replaceByOrAppendMutable,-} from "~/shared/array-utils";-// @todo this is temporary, we need to either make that collapsible reusable or copy it over-// This wasn't properly designed, so this is mostly temp-import { CollapsibleSection } from "../inspector";-import { filterByType } from "./utils";-import { useMenu } from "./item-menu";-import { type DesignTokenSeed, TokenEditor } from "./token-editor";--const useLogic = () => {- const [tokens] = useDesignTokens();- const [selectedIndex, setSelectedIndex] = useState(-1);- const [currentIndex, setCurrentIndex] = useState(-1);- const { getItemProps, getListProps } = useList({- items: tokens,- selectedIndex,- currentIndex,- onSelect: setSelectedIndex,- onChangeCurrent: setCurrentIndex,- });- const [editingToken, setEditingToken] = useState<- Partial<DesignToken> | undefined- >();- const { render: renderMenu, isOpen: isMenuOpen } = useMenu({- selectedIndex,- onSelect: setSelectedIndex,- onDelete: () => {- const { name } = tokens[selectedIndex];- store.createTransaction([designTokensContainer], (tokens) => {- removeByMutable(tokens, (item) => item.name === name);- });- },- onEdit: (index) => {- setEditingToken(tokens[index]);- },- });-- const setToken = (name: undefined | string, token: DesignToken) => {- store.createTransaction([designTokensContainer], (tokens) => {- replaceByOrAppendMutable(tokens, token, (item) => item.name === name);- });- };-- return {- isMenuOpen,- getListProps,- getItemProps,- setToken,- setEditingToken,- editingToken,- tokens,- renderMenu,- };-};--export const DesignTokensManager = () => {- const {- getListProps,- getItemProps,- setToken,- setEditingToken,- isMenuOpen,- editingToken,- tokens,- renderMenu,- } = useLogic();-- const renderEditor = ({- token,- seed,- isOpen,- trigger,- }: {- token?: DesignToken;- seed?: DesignTokenSeed;- isOpen: boolean;- trigger?: JSX.Element;- }) => {- return (- <TokenEditor- seed={seed}- token={token}- isOpen={isOpen}- trigger={trigger}- onChangeComplete={(updatedToken) => {- // Previously known token name in case token name has changed- setToken(token?.name, updatedToken);- }}- onOpenChange={(isOpen) => {- if (isOpen === false) {- return setEditingToken(undefined);- }- setEditingToken(token ?? seed);- }}- />- );- };-- let index = -1;- const listProps = getListProps();-- return (- <List- {...listProps}- css={{ overflow: "auto" }}- onBlur={(event) => {- if (isMenuOpen === false && editingToken === undefined) {- listProps.onBlur(event);- }- }}- >- {designTokensGroups.map(({ group, type }) => {- return (- <CollapsibleSection- label={group}- key={group}- rightSlot={renderEditor({- seed: { group, type },- isOpen:- editingToken?.name === undefined && editingToken?.type === type,- })}- >- <Flex direction="column">- {filterByType(tokens, type).map((token) => {- const itemProps = getItemProps({ index: ++index });- return (- <ListItem- {...itemProps}- key={token.name}- prefix={itemProps.current ? <CheckIcon /> : undefined}- suffix={renderMenu(index)}- >- {renderEditor({- token,- trigger: (- <div- onClick={(event) => {- event.preventDefault();- }}- >- {token.name}- </div>- ),- isOpen: editingToken?.name === token.name,- })}- </ListItem>- );- })}- </Flex>- </CollapsibleSection>- );- })}- </List>- );-};diff --git a/apps/designer/app/designer/shared/design-tokens-manager/index.ts b/apps/designer/app/designer/shared/design-tokens-manager/index.tsdeleted file mode 100644index b86ceadc28..0000000000--- a/apps/designer/app/designer/shared/design-tokens-manager/index.ts+++ /dev/null@@ -1,2 +0,0 @@-export * from "./design-tokens-manager";-export { tokensToStyle } from "./utils";diff --git a/apps/designer/app/designer/shared/design-tokens-manager/item-menu.tsx b/apps/designer/app/designer/shared/design-tokens-manager/item-menu.tsxdeleted file mode 100644index fd06031e9d..0000000000--- a/apps/designer/app/designer/shared/design-tokens-manager/item-menu.tsx+++ /dev/null@@ -1,158 +0,0 @@-import {- DropdownMenu,- DropdownMenuTrigger,- DeprecatedIconButton,- DropdownMenuContent,- DropdownMenuItem,- Text,- DropdownMenuPortal,- styled,-} from "@webstudio-is/design-system";-import { MenuIcon } from "@webstudio-is/icons";-import {- type FocusEventHandler,- useState,- useRef,- useEffect,- type MouseEventHandler,-} from "react";-import { theme } from "@webstudio-is/design-system";--const stopPropagation: MouseEventHandler = (event) => {- // Prevent setting the current font to the item.- event.stopPropagation();-};--const MenuButton = styled(DeprecatedIconButton, {- color: theme.colors.hint,- "&:hover, &:focus-visible": {- color: theme.colors.hiContrast,- },-});--type ItemMenuProps = {- onDelete: () => void;- onEdit: () => void;- onOpenChange: (open: boolean) => void;- onFocusTrigger?: FocusEventHandler;- onBlurTrigger?: FocusEventHandler;-};--const ItemMenu = ({- onDelete,- onEdit,- onOpenChange,- onFocusTrigger,- onBlurTrigger,-}: ItemMenuProps) => {- const [isOpen, setIsOpen] = useState(false);- const isMounted = useRef(false);-- useEffect(() => {- isMounted.current = true;- return () => {- isMounted.current = false;- };- }, []);-- return (- <DropdownMenu- open={isOpen}- onOpenChange={(open) => {- // Apparently onOpenChange can be called after component was unmounted and results in warning.- // Use case: deleting list item removes the item itself while menu is open.- if (isMounted.current) {- setIsOpen(open);- }- onOpenChange(open);- }}- >- <DropdownMenuTrigger asChild>- <MenuButton- aria-label="Token menu"- onFocus={onFocusTrigger}- onBlur={onBlurTrigger}- tabIndex={0}- onClick={stopPropagation}- >- <MenuIcon />- </MenuButton>- </DropdownMenuTrigger>- <DropdownMenuPortal>- <DropdownMenuContent align="start" css={{ zIndex: theme.zIndices[1] }}>- <DropdownMenuItem- onClick={stopPropagation}- onSelect={() => {- onEdit();- }}- >- <Text>Edit</Text>- </DropdownMenuItem>- <DropdownMenuItem- onClick={stopPropagation}- onSelect={() => {- onDelete();- }}- >- <Text>Delete</Text>- </DropdownMenuItem>- </DropdownMenuContent>- </DropdownMenuPortal>- </DropdownMenu>- );-};--type UseMenu = {- selectedIndex: number;- onSelect: (index: number) => void;- onDelete: (index: number) => void;- onEdit: (index: number) => void;-};--export const useMenu = ({- selectedIndex,- onSelect,- onDelete,- onEdit,-}: UseMenu) => {- const openMenu = useRef(-1);- const focusedMenuTrigger = useRef(-1);-- const render = (index: number) => {- const show =- selectedIndex === index ||- openMenu.current === index ||- focusedMenuTrigger.current === index;-- if (show === false) {- return;- }-- return (- <ItemMenu- onOpenChange={(open) => {- openMenu.current = open === true ? index : -1;- onSelect(index);- }}- onDelete={() => {- onDelete(index);- }}- onFocusTrigger={() => {- focusedMenuTrigger.current = index;- onSelect(-1);- }}- onBlurTrigger={() => {- focusedMenuTrigger.current = -1;- }}- onEdit={() => {- onEdit(index);- }}- />- );- };-- return {- render,- isOpen: openMenu.current !== -1,- };-};diff --git a/apps/designer/app/designer/shared/design-tokens-manager/token-editor.tsx b/apps/designer/app/designer/shared/design-tokens-manager/token-editor.tsxdeleted file mode 100644index 79a39afd72..0000000000--- a/apps/designer/app/designer/shared/design-tokens-manager/token-editor.tsx+++ /dev/null@@ -1,203 +0,0 @@-import { useState, useEffect, type FormEvent, useRef } from "react";-import { z } from "zod";-import {- Button,- Flex,- InputErrorsTooltip,- DeprecatedLabel,- Popover,- PopoverContent,- PopoverHeader,- PopoverPortal,- PopoverTrigger,- TextArea,- TextField,-} from "@webstudio-is/design-system";-import { PlusIcon } from "@webstudio-is/icons";-import { DesignToken } from "@webstudio-is/design-tokens";-import { useDesignTokens } from "~/shared/nano-states";-import { findByName } from "./utils";-import { theme } from "@webstudio-is/design-system";--const validate = (- tokens: Array<DesignToken>,- data: Partial<DesignToken>,- token?: DesignToken-) => {- const result = DesignToken.safeParse(data);- const foundToken = findByName(tokens, data.name);- const isRenaming =- token !== undefined &&- token.name !== data.name &&- foundToken?.name !== data.name;-- if (foundToken && isRenaming === false) {- const finalResult = result.success- ? {- error: new z.ZodError([]),- success: false,- }- : result;-- finalResult.error.addIssue({- code: "custom",- message: "Name has to be unique",- path: ["name"],- });- return finalResult;- }-- return result;-};--const getToken = (- form: HTMLFormElement,- tokenOrSeed?: DesignToken | DesignTokenSeed-) => {- const formData = new FormData(form);- const data = Object.fromEntries(formData);- return { ...tokenOrSeed, ...data } as DesignToken;-};--const getErrors = (- field: string,- validationResult?: ReturnType<typeof validate>-) => {- if (validationResult === undefined || validationResult.success) {- return [];- }- return validationResult.error?.issues- .filter((issue) => issue.path[0] === field)- .map((issue) => issue.message);-};--export type DesignTokenSeed = Pick<DesignToken, "group" | "type">;--export const TokenEditor = ({- token,- seed,- trigger,- isOpen,- onChangeComplete,- onOpenChange,-}: {- token?: DesignToken;- seed?: DesignTokenSeed;- trigger?: JSX.Element;- isOpen: boolean;- onChangeComplete: (token: DesignToken) => void;- onOpenChange: (isOpen: boolean) => void;-}) => {- const [tokens] = useDesignTokens();- const [validationResult, setValidationResult] = useState<- ReturnType<typeof validate> | undefined- >();- const formRef = useRef<HTMLFormElement>(null);-- useEffect(() => {- if (isOpen === false && validationResult?.success === false) {- setValidationResult(undefined);- }- }, [isOpen, validationResult?.success]);-- const handleChange = (event: FormEvent<HTMLFormElement>) => {- if (token === undefined || formRef.current === null) {- return;- }- const updatedToken = getToken(formRef.current, token ?? seed);- const nextValidationResult = validate(tokens, updatedToken, token);- setValidationResult(nextValidationResult);- };-- const submit = (ignoreErrors = false) => {- if (formRef.current === null) {- return;- }- const updatedToken = getToken(formRef.current, token ?? seed);- const nextValidationResult = validate(tokens, updatedToken, token);- setValidationResult(nextValidationResult);-- if (nextValidationResult.success) {- onChangeComplete(updatedToken);- onOpenChange(false);- return;- }-- if (ignoreErrors) {- onOpenChange(false);- }- };-- const handleSubmit = (event: FormEvent<HTMLFormElement>) => {- event.preventDefault();- submit();- };-- const handleOpenChange = (isOpen: boolean) => {- if (isOpen === false) {- submit(true);- return;- }- onOpenChange(isOpen);- };-- return (- <Popover modal open={isOpen} onOpenChange={handleOpenChange}>- <PopoverTrigger- asChild- aria-label={token === undefined ? "Create Token" : "Edit Token"}- >- {trigger ?? (- <Button- variant="ghost"- onClick={(event) => {- event.preventDefault();- onOpenChange(true);- }}- prefix={<PlusIcon />}- />- )}- </PopoverTrigger>- <PopoverPortal>- <PopoverContent align="end" css={{ zIndex: theme.zIndices[1] }}>- <form onChange={handleChange} onSubmit={handleSubmit} ref={formRef}>- <Flex- direction="column"- gap="2"- css={{ padding: theme.spacing[7] }}- >- <DeprecatedLabel htmlFor="name">Name</DeprecatedLabel>- <InputErrorsTooltip- errors={getErrors("name", validationResult)}- css={{ zIndex: theme.zIndices[2] }}- >- <TextField id="name" name="name" defaultValue={token?.name} />- </InputErrorsTooltip>- <DeprecatedLabel htmlFor="value">Value</DeprecatedLabel>- <InputErrorsTooltip- errors={getErrors("value", validationResult)}- css={{ zIndex: theme.zIndices[2] }}- >- <TextField- id="value"- name="value"- defaultValue={token?.value}- />- </InputErrorsTooltip>- <DeprecatedLabel htmlFor="description">- Description- </DeprecatedLabel>- <TextArea- id="description"- name="description"- defaultValue={token?.description}- />- {token === undefined && <Button type="submit">Create</Button>}- </Flex>- </form>- <PopoverHeader title={token?.name ?? "New Token"} />- </PopoverContent>- </PopoverPortal>- </Popover>- );-};diff --git a/apps/designer/app/designer/shared/design-tokens-manager/utils.test.ts b/apps/designer/app/designer/shared/design-tokens-manager/utils.test.tsdeleted file mode 100644index 43d284dc7e..0000000000--- a/apps/designer/app/designer/shared/design-tokens-manager/utils.test.ts+++ /dev/null@@ -1,60 +0,0 @@-import { describe, test, expect } from "@jest/globals";-import type { DesignToken } from "@webstudio-is/design-tokens";-import { filterByType, findByName, tokensToStyle } from "./utils";--const tokens: Array<DesignToken> = [- { name: "a", type: "color", value: "red", group: "Color" },- { name: "b", type: "color", value: "green", group: "Color" },- { name: "c", type: "sizing", value: "20px", group: "Sizing" },-];--describe("design tokens manager utils", () => {- test("tokensToStyle", () => {- expect(tokensToStyle(tokens)).toMatchInlineSnapshot(`- {- "--token-a": {- "type": "keyword",- "value": "red",- },- "--token-b": {- "type": "keyword",- "value": "green",- },- "--token-c": {- "type": "keyword",- "value": "20px",- },- }- `);- });-- test("findByName", () => {- expect(findByName(tokens, "a")).toMatchInlineSnapshot(`- {- "group": "Color",- "name": "a",- "type": "color",- "value": "red",- }- `);- });-- test("filterByType", () => {- expect(filterByType(tokens, "color")).toMatchInlineSnapshot(`- [- {- "group": "Color",- "name": "a",- "type": "color",- "value": "red",- },- {- "group": "Color",- "name": "b",- "type": "color",- "value": "green",- },- ]- `);- });-});diff --git a/apps/designer/app/designer/shared/design-tokens-manager/utils.ts b/apps/designer/app/designer/shared/design-tokens-manager/utils.tsdeleted file mode 100644index 071931f830..0000000000--- a/apps/designer/app/designer/shared/design-tokens-manager/utils.ts+++ /dev/null@@ -1,19 +0,0 @@-import type { Style } from "@webstudio-is/css-data";-import type { DesignToken } from "@webstudio-is/design-tokens";--export const filterByType = (tokens: Array<DesignToken>, type: string) =>- tokens.filter((token) => token.type === type);--export const findByName = (tokens: Array<DesignToken>, name?: string) =>- tokens.find((token) => token.name === name);--export const tokensToStyle = (tokens: Array<DesignToken>) => {- const style: Style = {};- for (const token of tokens) {- style[`--token-${token.name}`] = {- type: "keyword",- value: token.value,- };- }- return style;-};diff --git a/apps/designer/app/routes/rest/patch.ts b/apps/designer/app/routes/rest/patch.tsindex 3cb0024bf2..b116bbe2b3 100644--- a/apps/designer/app/routes/rest/patch.ts+++ b/apps/designer/app/routes/rest/patch.ts@@ -1,7 +1,6 @@import type { ActionArgs } from "@remix-run/node";import type { Build } from "@webstudio-is/project";import { db as projectDb } from "@webstudio-is/project/server";-import { db as designTokensDb } from "@webstudio-is/design-tokens/server";import { type SyncItem } from "immerhin";import type { Tree } from "@webstudio-is/project-build";@@ -34,8 +33,6 @@ export const action = async ({ request }: ActionArgs) => {await projectDb.props.patch({ treeId }, patches);} else if (namespace === "breakpoints") {await projectDb.breakpoints.patch(buildId, patches);- } else if (namespace === "designTokens") {- await designTokensDb.patch(buildId, patches);} else {return { errors: `Unknown namespace "${namespace}"` };}diff --git a/apps/designer/app/shared/db/canvas.server.ts b/apps/designer/app/shared/db/canvas.server.tsindex ee0f50d5d9..b8c020394b 100644--- a/apps/designer/app/shared/db/canvas.server.ts+++ b/apps/designer/app/shared/db/canvas.server.ts@@ -1,6 +1,5 @@import type { CanvasData, Project } from "@webstudio-is/project";import { db as projectDb } from "@webstudio-is/project/server";-import { db as designTokensDb } from "@webstudio-is/design-tokens/server";import { utils } from "@webstudio-is/project";import { loadByProject } from "@webstudio-is/asset-uploader/server";@@ -24,10 +23,9 @@ export const loadCanvasData = async (throw new Error(`Page ${pageIdOrPath} not found`);}- const [tree, breakpoints, designTokens, assets] = await Promise.all([+ const [tree, breakpoints, assets] = await Promise.all([projectDb.tree.loadById(page.treeId),projectDb.breakpoints.load(build.id),- designTokensDb.load(build.id),loadByProject(project.id),]);@@ -42,7 +40,6 @@ export const loadCanvasData = async (return {tree,breakpoints: breakpoints.values,- designTokens,buildId: build.id,page,assets,diff --git a/apps/designer/app/shared/nano-states/nano-states.ts b/apps/designer/app/shared/nano-states/nano-states.tsindex 6e1dbb1fa9..b8bdc44f84 100644--- a/apps/designer/app/shared/nano-states/nano-states.ts+++ b/apps/designer/app/shared/nano-states/nano-states.ts@@ -7,7 +7,6 @@ import type {DragStartPayload,} from "~/canvas/shared/use-drag-drop";import type { Breakpoint, Style } from "@webstudio-is/css-data";-import type { DesignToken } from "@webstudio-is/design-tokens";import { useSyncInitializeOnce } from "../hook-utils";import { shallowComputed } from "../store-utils";@@ -131,14 +130,6 @@ export const useSetBreakpoints = (breakpoints: Breakpoint[]) => {});};-export const designTokensContainer = atom<DesignToken[]>([]);-export const useDesignTokens = () => useValue(designTokensContainer);-export const useSetDesignTokens = (designTokens: DesignToken[]) => {- useSyncInitializeOnce(() => {- designTokensContainer.set(designTokens);- });-};-export const selectedInstanceIdStore = atom<undefined | Instance["id"]>(undefined);diff --git a/apps/designer/app/shared/sync/sync-stores.ts b/apps/designer/app/shared/sync/sync-stores.tsindex 3c2bc015ba..02cec65f3b 100644--- a/apps/designer/app/shared/sync/sync-stores.ts+++ b/apps/designer/app/shared/sync/sync-stores.ts@@ -6,7 +6,6 @@ import {rootInstanceContainer,propsStore,breakpointsContainer,- designTokensContainer,stylesContainer,selectedInstanceIdStore,selectedInstanceBrowserStyleStore,@@ -44,7 +43,6 @@ export const registerContainers = () => {store.register("root", rootInstanceContainer);store.register("styles", stylesContainer);store.register("props", propsStore);- store.register("designTokens", designTokensContainer);// synchronize whole statesclientStores.set("selectedInstanceId", selectedInstanceIdStore);clientStores.set(diff --git a/apps/designer/package.json b/apps/designer/package.jsonindex 1f3331d25d..6e8ac95cd6 100644--- a/apps/designer/package.json+++ b/apps/designer/package.json@@ -42,7 +42,6 @@"@webstudio-is/css-vars": "workspace:^","@webstudio-is/dashboard": "workspace:^","@webstudio-is/design-system": "workspace:^",- "@webstudio-is/design-tokens": "workspace:^","@webstudio-is/feature-flags": "workspace:^","@webstudio-is/fonts": "workspace:^","@webstudio-is/icons": "workspace:^",diff --git a/packages/design-tokens/LICENSE b/packages/design-tokens/LICENSEdeleted file mode 100644index 1f6edad9a7..0000000000--- a/packages/design-tokens/LICENSE+++ /dev/null@@ -1,21 +0,0 @@-MIT License--Copyright (c) 2022 Webstudio--Permission is hereby granted, free of charge, to any person obtaining a copy-of this software and associated documentation files (the "Software"), to deal-in the Software without restriction, including without limitation the rights-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell-copies of the Software, and to permit persons to whom the Software is-furnished to do so, subject to the following conditions:--The above copyright notice and this permission notice shall be included in all-copies or substantial portions of the Software.--THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE-SOFTWARE.diff --git a/packages/design-tokens/README.md b/packages/design-tokens/README.mddeleted file mode 100644index 93b92f3b6f..0000000000--- a/packages/design-tokens/README.md+++ /dev/null@@ -1,3 +0,0 @@-# Webstudio Design Tokens--Shared functionality for Design Tokensdiff --git a/packages/design-tokens/jest.config.js b/packages/design-tokens/jest.config.jsdeleted file mode 100644index e7fc137533..0000000000--- a/packages/design-tokens/jest.config.js+++ /dev/null@@ -1 +0,0 @@-export { default } from "@webstudio-is/jest-config";diff --git a/packages/design-tokens/package.json b/packages/design-tokens/package.jsondeleted file mode 100644index b0d289092f..0000000000--- a/packages/design-tokens/package.json+++ /dev/null@@ -1,43 +0,0 @@-{- "name": "@webstudio-is/design-tokens",- "version": "0.22.0",- "description": "Webstudio Design Tokens",- "author": "Webstudio <[email protected]>",- "homepage": "https://webstudio.is",- "type": "module",- "scripts": {- "typecheck": "tsc --noEmit",- "test": "NODE_OPTIONS=--experimental-vm-modules jest",- "checks": "pnpm typecheck && pnpm lint",- "dev": "build-package --watch",- "build": "build-package",- "lint": "eslint ./src --ext .ts,.tsx --max-warnings 0"- },- "dependencies": {- "@webstudio-is/prisma-client": "workspace:^",- "immer": "^9.0.12",- "zod": "^3.19.1"- },- "devDependencies": {- "@types/node": "^17.0.21",- "@webstudio-is/scripts": "workspace:^",- "@webstudio-is/tsconfig": "workspace:^",- "typescript": "4.7.4"- },- "exports": {- ".": {- "import": "./lib/index.js",- "require": "./lib/cjs/index.cjs"- },- "./server": "./server.js"- },- "types": "src/index.ts",- "files": [- "lib/*",- "src/*",- "!*.test.*"- ],- "license": "MIT",- "private": false,- "sideEffects": false-}diff --git a/packages/design-tokens/server.d.ts b/packages/design-tokens/server.d.tsdeleted file mode 100644index ad6dde9958..0000000000--- a/packages/design-tokens/server.d.ts+++ /dev/null@@ -1 +0,0 @@-export * from "./src/index.server";diff --git a/packages/design-tokens/server.js b/packages/design-tokens/server.jsdeleted file mode 100644index a6fbe7c12c..0000000000--- a/packages/design-tokens/server.js+++ /dev/null@@ -1 +0,0 @@-export * from "./lib/index.server";diff --git a/packages/design-tokens/src/db.ts b/packages/design-tokens/src/db.tsdeleted file mode 100644index efec3692df..0000000000--- a/packages/design-tokens/src/db.ts+++ /dev/null@@ -1,56 +0,0 @@-import {- type DesignTokens as DbDesignTokens,- prisma,- Prisma,-} from "@webstudio-is/prisma-client";-import { applyPatches, Patch } from "immer";-import { DesignToken, DesignTokens } from "./schema";--export const load = async (buildId: DbDesignTokens["buildId"]) => {- const data = await prisma.designTokens.findUnique({- where: { buildId },- });-- if (data === null) {- return [];- }-- const designTokens: Array<DesignToken> = JSON.parse(data.value);-- return designTokens.map((token) => DesignToken.parse(token));-};--export const clone = async (- previousBuildId: DbDesignTokens["buildId"],- nextBuildId: DbDesignTokens["buildId"],- client: Prisma.TransactionClient = prisma-) => {- const data = await client.designTokens.findUnique({- where: { buildId: previousBuildId },- });-- if (data === null) {- return;- }-- await client.designTokens.create({- data: {- buildId: nextBuildId,- value: data.value,- },- });-};--export const patch = async (- buildId: DbDesignTokens["buildId"],- patches: Array<Patch>-) => {- const designTokens = await load(buildId);- const nextDesignTokens = applyPatches(designTokens, patches);- const parsedNextDesignTokens = DesignTokens.parse(nextDesignTokens);- await prisma.designTokens.upsert({- where: { buildId },- update: { value: JSON.stringify(parsedNextDesignTokens) },- create: { buildId, value: JSON.stringify(parsedNextDesignTokens) },- });-};diff --git a/packages/design-tokens/src/groups.ts b/packages/design-tokens/src/groups.tsdeleted file mode 100644index 8258e22d54..0000000000--- a/packages/design-tokens/src/groups.ts+++ /dev/null@@ -1,19 +0,0 @@-// Copied from https://docs.tokens.studio/available-tokens/available-tokens--export const designTokensGroups = [- { type: "sizing", group: "Sizing" },- { type: "spacing", group: "Spacing" },- { type: "color", group: "Color" },- { type: "borderRadius", group: "Border Radius" },- { type: "borderWidth", group: "Border Width" },- { type: "boxShadow", group: "Box Shadow" },- { type: "opacity", group: "Opacity" },- { type: "fontFamilies", group: "Font Families" },- { type: "fontSizes", group: "Font Size" },- { type: "fontWeights", group: "Font Weight" },- { type: "lineHeight", group: "Line Height" },- { type: "letterSpacing", group: "Letter Spacing" },- { type: "paragraphSpacing", group: "Paragraph Spacing" },- { type: "textCase", group: "Text Case" },- { type: "textDecoration", group: "Text Decoration" },-] as const;diff --git a/packages/design-tokens/src/index.server.ts b/packages/design-tokens/src/index.server.tsdeleted file mode 100644index a89f5bdf70..0000000000--- a/packages/design-tokens/src/index.server.ts+++ /dev/null@@ -1,2 +0,0 @@-import * as dbFunctions from "./db";-export const db = dbFunctions;diff --git a/packages/design-tokens/src/index.ts b/packages/design-tokens/src/index.tsdeleted file mode 100644index 27ebb93924..0000000000--- a/packages/design-tokens/src/index.ts+++ /dev/null@@ -1,2 +0,0 @@-export * from "./schema";-export * from "./groups";diff --git a/packages/design-tokens/src/schema.ts b/packages/design-tokens/src/schema.tsdeleted file mode 100644index 2d02d0051f..0000000000--- a/packages/design-tokens/src/schema.ts+++ /dev/null@@ -1,33 +0,0 @@-import { z } from "zod";-import { designTokensGroups } from "./groups";--type Type = typeof designTokensGroups[number]["type"];-type Group = typeof designTokensGroups[number]["group"];--const types = designTokensGroups.map(- (group) => group.type-) as unknown as readonly [Type];-const groupNames = designTokensGroups.map(- (group) => group.group-) as unknown as readonly [Group];--export const DesignToken = z.object({- name: z- .string()- .refine((name) => name.trim().length !== 0, "Name can't be empty"),- type: z.enum(types),- value: z- .string()- .refine((value) => value.trim().length !== 0, "Value can't be empty"),- description: z.optional(z.string()),- group: z.enum(groupNames),-});--export type DesignToken = z.infer<typeof DesignToken>;--export const DesignTokens = z.array(DesignToken).refine((tokens) => {- const names = tokens.map((token) => token.name);- return new Set(names).size === names.length;-}, "Name must be unique");--export type DesignTokens = z.infer<typeof DesignTokens>;diff --git a/packages/design-tokens/tsconfig.json b/packages/design-tokens/tsconfig.jsondeleted file mode 100644index ecb353d7bb..0000000000--- a/packages/design-tokens/tsconfig.json+++ /dev/null@@ -1,11 +0,0 @@-{- "extends": "@webstudio-is/tsconfig/base.json",- "include": ["src", "../../@types/**/*.d.ts"],- "compilerOptions": {- "module": "ES2020",- "target": "ES2020",- "baseUrl": ".",- "outDir": "./lib",- "rootDir": "./src"- }-}diff --git a/packages/icons/src/legacy.ts b/packages/icons/src/legacy.tsindex dfc160e741..0877602ee2 100644--- a/packages/icons/src/legacy.ts+++ b/packages/icons/src/legacy.ts@@ -26,5 +26,4 @@ export {SquareIcon,CrossCircledIcon,CheckCircledIcon,- TokensIcon,} from "@radix-ui/react-icons";diff --git a/packages/prisma-client/prisma/schema.prisma b/packages/prisma-client/prisma/schema.prismaindex dcc3eac83b..d14e563f39 100644--- a/packages/prisma-client/prisma/schema.prisma+++ b/packages/prisma-client/prisma/schema.prisma@@ -73,8 +73,7 @@ model Build {isDev Boolean // exctly one is true per projectisProd Boolean // at most one is true per project (none if not published)- breakpoints Breakpoints?- designTokens DesignTokens?+ breakpoints Breakpoints?styles String @default("[]")styleSources String @default("[]")@@ -105,12 +104,6 @@ model Breakpoints {values String @default("[]")}-model DesignTokens {- build Build @relation(fields: [buildId], references: [id])- buildId String @id- value String @default("[]")-}-// Dashboardview DashboardProject {id String @id @default(uuid())diff --git a/packages/prisma-client/src/types.ts b/packages/prisma-client/src/types.tsindex fcb47cd28a..8dc6f15b80 100644--- a/packages/prisma-client/src/types.ts+++ b/packages/prisma-client/src/types.ts@@ -4,7 +4,6 @@ export type {User,Breakpoints,Build,- DesignTokens,Project,Asset,Tree,diff --git a/packages/project/package.json b/packages/project/package.jsonindex 2c98b2cc8e..25ff16e8c9 100644--- a/packages/project/package.json+++ b/packages/project/package.json@@ -17,7 +17,6 @@"@webstudio-is/asset-uploader": "workspace:^","@webstudio-is/css-data": "workspace:^","@webstudio-is/css-engine": "workspace:^",- "@webstudio-is/design-tokens": "workspace:^","@webstudio-is/fonts": "workspace:^","@webstudio-is/prisma-client": "workspace:^","@webstudio-is/project-build": "workspace:^",diff --git a/packages/project/src/db/build.ts b/packages/project/src/db/build.tsindex eb91e6d9c4..0ee617b2f0 100644--- a/packages/project/src/db/build.ts+++ b/packages/project/src/db/build.ts@@ -1,6 +1,5 @@import { v4 as uuid } from "uuid";import { prisma, Build as DbBuild, Prisma } from "@webstudio-is/prisma-client";-import { db as designTokensDb } from "@webstudio-is/design-tokens/server";import * as db from ".";import { Build, Page, Pages } from "./schema";import * as pagesUtils from "../shared/pages";@@ -255,7 +254,4 @@ export async function create(});await db.breakpoints.create(build.id, breakpointsValues, client);- if (sourceBuild) {- await designTokensDb.clone(sourceBuild.id, build.id, client);- }}diff --git a/packages/react-sdk/package.json b/packages/react-sdk/package.jsonindex 2e6ce6a58a..bdfd032cad 100644--- a/packages/react-sdk/package.json+++ b/packages/react-sdk/package.json@@ -56,7 +56,6 @@"@nanostores/react": "^0.4.1","@webstudio-is/asset-uploader": "workspace:^","@webstudio-is/css-data": "workspace:^",- "@webstudio-is/design-tokens": "workspace:^","@webstudio-is/icons": "workspace:^","@webstudio-is/image": "workspace:^","@webstudio-is/prisma-client": "workspace:^",diff --git a/packages/react-sdk/src/tree/root.ts b/packages/react-sdk/src/tree/root.tsindex 5a73209410..15a9ae19c9 100644--- a/packages/react-sdk/src/tree/root.ts+++ b/packages/react-sdk/src/tree/root.ts@@ -1,7 +1,6 @@import type { ComponentProps } from "react";import { atom } from "nanostores";import type { Breakpoint } from "@webstudio-is/css-data";-import type { DesignToken } from "@webstudio-is/design-tokens";import type { Tree } from "@webstudio-is/project-build";import type { Asset } from "@webstudio-is/asset-uploader";import { createElementsTree } from "./create-elements-tree";@@ -14,7 +13,6 @@ import { getPropsByInstanceId, setPropsByInstanceIdStore } from "../props";export type Data = {tree: Tree | null;breakpoints: Array<Breakpoint>;- designTokens: Array<DesignToken>;assets: Array<Asset>;params?: Params;};diff --git a/pnpm-lock.yaml b/pnpm-lock.yamlindex f3029b7c5c..c4c949e66f 100644--- a/pnpm-lock.yaml+++ b/pnpm-lock.yaml@@ -89,7 +89,6 @@ importers:'@webstudio-is/css-vars': workspace:^'@webstudio-is/dashboard': workspace:^'@webstudio-is/design-system': workspace:^- '@webstudio-is/design-tokens': workspace:^'@webstudio-is/eslint-config-custom': workspace:^'@webstudio-is/feature-flags': workspace:^'@webstudio-is/fonts': workspace:^@@ -180,7 +179,6 @@ importers:'@webstudio-is/css-vars': link:../../packages/css-vars'@webstudio-is/dashboard': link:../../packages/dashboard'@webstudio-is/design-system': link:../../packages/design-system- '@webstudio-is/design-tokens': link:../../packages/design-tokens'@webstudio-is/feature-flags': link:../../packages/feature-flags'@webstudio-is/fonts': link:../../packages/fonts'@webstudio-is/icons': link:../../packages/icons@@ -528,25 +526,6 @@ importers:react-dom: [email protected]typescript: 4.7.4- packages/design-tokens:- specifiers:- '@types/node': ^17.0.21- '@webstudio-is/prisma-client': workspace:^- '@webstudio-is/scripts': workspace:^- '@webstudio-is/tsconfig': workspace:^- immer: ^9.0.12- typescript: 4.7.4- zod: ^3.19.1- dependencies:- '@webstudio-is/prisma-client': link:../prisma-client- immer: 9.0.15- zod: 3.19.1- devDependencies:- '@types/node': 17.0.45- '@webstudio-is/scripts': link:../scripts- '@webstudio-is/tsconfig': link:../tsconfig- typescript: 4.7.4-packages/eslint-config-custom:specifiers:'@typescript-eslint/eslint-plugin': ^5.36.2@@ -767,7 +746,6 @@ importers:'@webstudio-is/asset-uploader': workspace:^'@webstudio-is/css-data': workspace:^'@webstudio-is/css-engine': workspace:^- '@webstudio-is/design-tokens': workspace:^'@webstudio-is/fonts': workspace:^'@webstudio-is/jest-config': workspace:^'@webstudio-is/prisma-client': workspace:^@@ -790,7 +768,6 @@ importers:'@webstudio-is/asset-uploader': link:../asset-uploader'@webstudio-is/css-data': link:../css-data'@webstudio-is/css-engine': link:../css-engine- '@webstudio-is/design-tokens': link:../design-tokens'@webstudio-is/fonts': link:../fonts'@webstudio-is/prisma-client': link:../prisma-client'@webstudio-is/project-build': link:../project-build@@ -845,7 +822,6 @@ importers:'@types/react-dom': ^17.0.9'@webstudio-is/asset-uploader': workspace:^'@webstudio-is/css-data': workspace:^- '@webstudio-is/design-tokens': workspace:^'@webstudio-is/generate-arg-types': workspace:^'@webstudio-is/icons': workspace:^'@webstudio-is/image': workspace:^@@ -873,7 +849,6 @@ importers:'@nanostores/react': 0.4.1_hn2jst675metodsznud55jugtu'@webstudio-is/asset-uploader': link:../asset-uploader'@webstudio-is/css-data': link:../css-data- '@webstudio-is/design-tokens': link:../design-tokens'@webstudio-is/icons': link:../icons'@webstudio-is/image': link:../image'@webstudio-is/prisma-client': link:../prisma-client