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.

Move style schema into css-engine (#2251)

Bogdan Chadkin87e69b2e853c
diff --git a/apps/builder/app/builder/features/sidebar-left/navigator/css-preview.tsx b/apps/builder/app/builder/features/sidebar-left/navigator/css-preview.tsx
index edc2f47305..85b7bd3cd9 100644
--- a/apps/builder/app/builder/features/sidebar-left/navigator/css-preview.tsx
+++ b/apps/builder/app/builder/features/sidebar-left/navigator/css-preview.tsx
@@ -13,7 +13,7 @@ import { createCssEngine } from "@webstudio-is/css-engine";
import { CollapsibleSection } from "~/builder/shared/collapsible-section";
import { useMemo } from "react";
import * as Prism from "prismjs";
-import type { Style, StyleProperty } from "@webstudio-is/css-data";
+import type { Style, StyleProperty } from "@webstudio-is/css-engine";
import { captureError } from "@webstudio-is/error-utils";
const preStyle = css(textVariants.mono, {
diff --git a/apps/builder/app/builder/features/style-panel/controls/color/color-control.tsx b/apps/builder/app/builder/features/style-panel/controls/color/color-control.tsx
index 2a6b04a447..f78a5c1446 100644
--- a/apps/builder/app/builder/features/style-panel/controls/color/color-control.tsx
+++ b/apps/builder/app/builder/features/style-panel/controls/color/color-control.tsx
@@ -9,7 +9,7 @@ import { colord } from "colord";
import { getStyleSource } from "../../shared/style-info";
import { styleConfigByName } from "../../shared/configs";
import { useState } from "react";
-import type { RgbValue, StyleValue } from "@webstudio-is/css-data";
+import type { RgbValue, StyleValue } from "@webstudio-is/css-engine";
const parseColor = (color?: StyleValue): RgbValue => {
const colordValue = colord(toValue(color));
diff --git a/apps/builder/app/builder/features/style-panel/controls/position/css-value-input-container.tsx b/apps/builder/app/builder/features/style-panel/controls/position/css-value-input-container.tsx
index 6119400b61..0cd1b8a4c7 100644
--- a/apps/builder/app/builder/features/style-panel/controls/position/css-value-input-container.tsx
+++ b/apps/builder/app/builder/features/style-panel/controls/position/css-value-input-container.tsx
@@ -1,5 +1,5 @@
import { type ComponentProps, useState } from "react";
-import type { StyleValue, StyleProperty } from "@webstudio-is/css-data";
+import type { StyleValue, StyleProperty } from "@webstudio-is/css-engine";
import { Box, EnhancedTooltip } from "@webstudio-is/design-system";
import {
CssValueInput,
diff --git a/apps/builder/app/builder/features/style-panel/controls/position/position-control.tsx b/apps/builder/app/builder/features/style-panel/controls/position/position-control.tsx
index 5b76bf3036..fbc73133ba 100644
--- a/apps/builder/app/builder/features/style-panel/controls/position/position-control.tsx
+++ b/apps/builder/app/builder/features/style-panel/controls/position/position-control.tsx
@@ -2,7 +2,7 @@ import {
TupleValue,
type StyleValue,
TupleValueItem,
-} from "@webstudio-is/css-data";
+} from "@webstudio-is/css-engine";
import { Flex, Grid, PositionGrid } from "@webstudio-is/design-system";
import type { ControlProps } from "../../style-sections";
import { styleConfigByName } from "../../shared/configs";
diff --git a/apps/builder/app/builder/features/style-panel/controls/text/text-control.tsx b/apps/builder/app/builder/features/style-panel/controls/text/text-control.tsx
index d833ab2574..e29f0e5b89 100644
--- a/apps/builder/app/builder/features/style-panel/controls/text/text-control.tsx
+++ b/apps/builder/app/builder/features/style-panel/controls/text/text-control.tsx
@@ -3,7 +3,7 @@ import {
type IntermediateStyleValue,
} from "../../shared/css-value-input";
import type { ControlProps } from "../../style-sections";
-import type { StyleValue } from "@webstudio-is/css-data";
+import type { StyleValue } from "@webstudio-is/css-engine";
import { useState } from "react";
import { Box } from "@webstudio-is/design-system";
import { styleConfigByName } from "../../shared/configs";
diff --git a/apps/builder/app/builder/features/style-panel/controls/toggle/toggle-control.tsx b/apps/builder/app/builder/features/style-panel/controls/toggle/toggle-control.tsx
index 0eb590727f..708896a44c 100644
--- a/apps/builder/app/builder/features/style-panel/controls/toggle/toggle-control.tsx
+++ b/apps/builder/app/builder/features/style-panel/controls/toggle/toggle-control.tsx
@@ -6,7 +6,7 @@ import {
import type { StyleInfo, StyleSource } from "../../shared/style-info";
import { useState, type ReactElement } from "react";
import { PropertyTooltip } from "../../shared/property-name";
-import type { StyleProperty } from "@webstudio-is/css-data";
+import type { StyleProperty } from "@webstudio-is/css-engine";
export type ToggleGroupControlProps = {
style: StyleInfo;
diff --git a/apps/builder/app/builder/features/style-panel/sections/backgrounds/background-content.tsx b/apps/builder/app/builder/features/style-panel/sections/backgrounds/background-content.tsx
index 354c2cb402..3b65746a5b 100644
--- a/apps/builder/app/builder/features/style-panel/sections/backgrounds/background-content.tsx
+++ b/apps/builder/app/builder/features/style-panel/sections/backgrounds/background-content.tsx
@@ -3,7 +3,7 @@
* as of now just implement feature parity with old backgrounds section
**/
-import type { RgbValue, StyleValue } from "@webstudio-is/css-data";
+import type { RgbValue, StyleValue } from "@webstudio-is/css-engine";
import {
theme,
Flex,
diff --git a/apps/builder/app/builder/features/style-panel/sections/backgrounds/background-gradient.tsx b/apps/builder/app/builder/features/style-panel/sections/backgrounds/background-gradient.tsx
index 5d97a2162b..1df9fc3d40 100644
--- a/apps/builder/app/builder/features/style-panel/sections/backgrounds/background-gradient.tsx
+++ b/apps/builder/app/builder/features/style-panel/sections/backgrounds/background-gradient.tsx
@@ -1,4 +1,4 @@
-import type { InvalidValue, RgbValue } from "@webstudio-is/css-data";
+import type { InvalidValue, RgbValue } from "@webstudio-is/css-engine";
import { parseCssValue, parseBackground } from "@webstudio-is/css-data";
import { TextArea, textVariants, theme } from "@webstudio-is/design-system";
import { useEffect, useRef, useState } from "react";
diff --git a/apps/builder/app/builder/features/style-panel/sections/backgrounds/background-layers.test.ts b/apps/builder/app/builder/features/style-panel/sections/backgrounds/background-layers.test.ts
index 4e462ec3cc..a775147ae5 100644
--- a/apps/builder/app/builder/features/style-panel/sections/backgrounds/background-layers.test.ts
+++ b/apps/builder/app/builder/features/style-panel/sections/backgrounds/background-layers.test.ts
@@ -13,7 +13,7 @@ import type {
LayersValue,
StyleProperty,
StyleValue,
-} from "@webstudio-is/css-data";
+} from "@webstudio-is/css-engine";
describe("setLayerProperty", () => {
test("should work", () => {
diff --git a/apps/builder/app/builder/features/style-panel/sections/backgrounds/background-layers.ts b/apps/builder/app/builder/features/style-panel/sections/backgrounds/background-layers.ts
index 6022b7d25b..9742239500 100644
--- a/apps/builder/app/builder/features/style-panel/sections/backgrounds/background-layers.ts
+++ b/apps/builder/app/builder/features/style-panel/sections/backgrounds/background-layers.ts
@@ -1,4 +1,4 @@
-import type { LayersValue, StyleValue } from "@webstudio-is/css-data";
+import type { LayersValue, StyleValue } from "@webstudio-is/css-engine";
import {
type StyleInfo,
type StyleValueInfo,
diff --git a/apps/builder/app/builder/features/style-panel/sections/backgrounds/background-size.tsx b/apps/builder/app/builder/features/style-panel/sections/backgrounds/background-size.tsx
index 19bf225974..eb1afc95d4 100644
--- a/apps/builder/app/builder/features/style-panel/sections/backgrounds/background-size.tsx
+++ b/apps/builder/app/builder/features/style-panel/sections/backgrounds/background-size.tsx
@@ -9,7 +9,7 @@ import {
type StyleValue,
TupleValue,
TupleValueItem,
-} from "@webstudio-is/css-data";
+} from "@webstudio-is/css-engine";
import type { SetValue } from "../../shared/use-style-data";
import { NonResetablePropertyName } from "../../shared/property-name";
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 a945afcc2c..88ec1cf721 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,4 +1,4 @@
-import type { LayersValue } from "@webstudio-is/css-data";
+import type { LayersValue } from "@webstudio-is/css-engine";
import { styled, theme } from "@webstudio-is/design-system";
import { setEnv } from "@webstudio-is/feature-flags";
import { useRef, useState } from "react";
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 79d6061dd3..7167923256 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
@@ -43,7 +43,7 @@ import {
import { BackgroundContent } from "./background-content";
import { getLayerName, LayerThumbnail } from "./background-thumbnail";
import { useMemo } from "react";
-import type { RgbValue, StyleProperty } from "@webstudio-is/css-data";
+import type { RgbValue, StyleProperty } from "@webstudio-is/css-engine";
import {
CollapsibleSectionBase,
useOpenState,
diff --git a/apps/builder/app/builder/features/style-panel/sections/borders/border-property.tsx b/apps/builder/app/builder/features/style-panel/sections/borders/border-property.tsx
index c360f96281..42c451f5d3 100644
--- a/apps/builder/app/builder/features/style-panel/sections/borders/border-property.tsx
+++ b/apps/builder/app/builder/features/style-panel/sections/borders/border-property.tsx
@@ -12,7 +12,7 @@ import { getStyleSource } from "../../shared/style-info";
import type { RenderCategoryProps } from "../../style-sections";
import { toValue } from "@webstudio-is/css-engine";
import { deleteAllProperties, setAllProperties } from "./border-utils";
-import type { StyleProperty, UnitValue } from "@webstudio-is/css-data";
+import type { StyleProperty, UnitValue } from "@webstudio-is/css-engine";
import { type ReactNode } from "react";
import { useSelectedInstanceKv } from "../../shared/instances-kv";
diff --git a/apps/builder/app/builder/features/style-panel/sections/borders/border-radius.tsx b/apps/builder/app/builder/features/style-panel/sections/borders/border-radius.tsx
index fd08554d71..3acf55207f 100644
--- a/apps/builder/app/builder/features/style-panel/sections/borders/border-radius.tsx
+++ b/apps/builder/app/builder/features/style-panel/sections/borders/border-radius.tsx
@@ -1,4 +1,4 @@
-import type { StyleProperty } from "@webstudio-is/css-data";
+import type { StyleProperty } from "@webstudio-is/css-engine";
import {
BorderRadiusIndividualIcon,
BorderRadiusBottomRightIcon,
diff --git a/apps/builder/app/builder/features/style-panel/sections/borders/border-style.tsx b/apps/builder/app/builder/features/style-panel/sections/borders/border-style.tsx
index d72b89e8ee..2f43de32dc 100644
--- a/apps/builder/app/builder/features/style-panel/sections/borders/border-style.tsx
+++ b/apps/builder/app/builder/features/style-panel/sections/borders/border-style.tsx
@@ -1,4 +1,4 @@
-import type { StyleProperty } from "@webstudio-is/css-data";
+import type { StyleProperty } from "@webstudio-is/css-engine";
import { toValue } from "@webstudio-is/css-engine";
import {
Grid,
diff --git a/apps/builder/app/builder/features/style-panel/sections/borders/border-utils.ts b/apps/builder/app/builder/features/style-panel/sections/borders/border-utils.ts
index 45d60a2479..2c1d4cd9ed 100644
--- a/apps/builder/app/builder/features/style-panel/sections/borders/border-utils.ts
+++ b/apps/builder/app/builder/features/style-panel/sections/borders/border-utils.ts
@@ -1,4 +1,4 @@
-import type { StyleProperty } from "@webstudio-is/css-data";
+import type { StyleProperty } from "@webstudio-is/css-engine";
import type {
CreateBatchUpdate,
DeleteProperty,
diff --git a/apps/builder/app/builder/features/style-panel/sections/borders/border-width.tsx b/apps/builder/app/builder/features/style-panel/sections/borders/border-width.tsx
index 6338b628a1..8a9dbfd519 100644
--- a/apps/builder/app/builder/features/style-panel/sections/borders/border-width.tsx
+++ b/apps/builder/app/builder/features/style-panel/sections/borders/border-width.tsx
@@ -1,4 +1,4 @@
-import type { StyleProperty } from "@webstudio-is/css-data";
+import type { StyleProperty } from "@webstudio-is/css-engine";
import {
BorderWidthIndividualIcon,
BorderWidthTopIcon,
diff --git a/apps/builder/app/builder/features/style-panel/sections/borders/borders.tsx b/apps/builder/app/builder/features/style-panel/sections/borders/borders.tsx
index 73226d2f6f..0cf9a61dd6 100644
--- a/apps/builder/app/builder/features/style-panel/sections/borders/borders.tsx
+++ b/apps/builder/app/builder/features/style-panel/sections/borders/borders.tsx
@@ -1,5 +1,5 @@
import { Box, Flex, Grid, theme } from "@webstudio-is/design-system";
-import type { StyleProperty } from "@webstudio-is/css-data";
+import type { StyleProperty } from "@webstudio-is/css-engine";
import { ColorControl } from "../../controls";
import { styleConfigByName } from "../../shared/configs";
import { PropertyName } from "../../shared/property-name";
diff --git a/apps/builder/app/builder/features/style-panel/sections/box-shadows/box-shadow-content.tsx b/apps/builder/app/builder/features/style-panel/sections/box-shadows/box-shadow-content.tsx
index 9d068d3e05..5e4d80c90b 100644
--- a/apps/builder/app/builder/features/style-panel/sections/box-shadows/box-shadow-content.tsx
+++ b/apps/builder/app/builder/features/style-panel/sections/box-shadows/box-shadow-content.tsx
@@ -1,4 +1,4 @@
-import type { InvalidValue, LayersValue } from "@webstudio-is/css-data";
+import type { InvalidValue, LayersValue } from "@webstudio-is/css-engine";
import { parseBoxShadow } from "@webstudio-is/css-data";
import {
Flex,
diff --git a/apps/builder/app/builder/features/style-panel/sections/box-shadows/box-shadow-layer.tsx b/apps/builder/app/builder/features/style-panel/sections/box-shadows/box-shadow-layer.tsx
index c382868ef5..dfb9b7333e 100644
--- a/apps/builder/app/builder/features/style-panel/sections/box-shadows/box-shadow-layer.tsx
+++ b/apps/builder/app/builder/features/style-panel/sections/box-shadows/box-shadow-layer.tsx
@@ -1,4 +1,4 @@
-import type { LayersValue, TupleValue } from "@webstudio-is/css-data";
+import type { LayersValue, TupleValue } from "@webstudio-is/css-engine";
import {
Label,
SmallIconButton,
diff --git a/apps/builder/app/builder/features/style-panel/sections/box-shadows/box-shadow-layers.tsx b/apps/builder/app/builder/features/style-panel/sections/box-shadows/box-shadow-layers.tsx
index b914060b7a..5b8e4e6c57 100644
--- a/apps/builder/app/builder/features/style-panel/sections/box-shadows/box-shadow-layers.tsx
+++ b/apps/builder/app/builder/features/style-panel/sections/box-shadows/box-shadow-layers.tsx
@@ -1,4 +1,4 @@
-import type { LayersValue } from "@webstudio-is/css-data";
+import type { LayersValue } from "@webstudio-is/css-engine";
import {
CssValueListArrowFocus,
Flex,
diff --git a/apps/builder/app/builder/features/style-panel/sections/box-shadows/box-shadow-utils.test.ts b/apps/builder/app/builder/features/style-panel/sections/box-shadows/box-shadow-utils.test.ts
index 64b27668da..cbaf5c57d9 100644
--- a/apps/builder/app/builder/features/style-panel/sections/box-shadows/box-shadow-utils.test.ts
+++ b/apps/builder/app/builder/features/style-panel/sections/box-shadows/box-shadow-utils.test.ts
@@ -4,7 +4,7 @@ import type {
StyleProperty,
StyleValue,
TupleValue,
-} from "@webstudio-is/css-data";
+} from "@webstudio-is/css-engine";
import type { CreateBatchUpdate } from "../../shared/use-style-data";
import {
addBoxShadow,
diff --git a/apps/builder/app/builder/features/style-panel/sections/box-shadows/box-shadow-utils.ts b/apps/builder/app/builder/features/style-panel/sections/box-shadows/box-shadow-utils.ts
index 443435be42..07f3b7e483 100644
--- a/apps/builder/app/builder/features/style-panel/sections/box-shadows/box-shadow-utils.ts
+++ b/apps/builder/app/builder/features/style-panel/sections/box-shadows/box-shadow-utils.ts
@@ -1,4 +1,5 @@
-import { parseBoxShadow, type LayersValue } from "@webstudio-is/css-data";
+import type { LayersValue } from "@webstudio-is/css-engine";
+import { parseBoxShadow } from "@webstudio-is/css-data";
import type { RenderCategoryProps } from "../../style-sections";
import type { StyleInfo } from "../../shared/style-info";
import type { CreateBatchUpdate } from "../../shared/use-style-data";
diff --git a/apps/builder/app/builder/features/style-panel/sections/effects/effects.tsx b/apps/builder/app/builder/features/style-panel/sections/effects/effects.tsx
index c05fa4af77..f0722341cb 100644
--- a/apps/builder/app/builder/features/style-panel/sections/effects/effects.tsx
+++ b/apps/builder/app/builder/features/style-panel/sections/effects/effects.tsx
@@ -1,4 +1,4 @@
-import type { StyleProperty } from "@webstudio-is/css-data";
+import type { StyleProperty } from "@webstudio-is/css-engine";
import { Grid } from "@webstudio-is/design-system";
import { styleConfigByName } from "../../shared/configs";
import type { RenderCategoryProps } from "../../style-sections";
diff --git a/apps/builder/app/builder/features/style-panel/sections/flex-child/flex-child.tsx b/apps/builder/app/builder/features/style-panel/sections/flex-child/flex-child.tsx
index ef24416a39..7abe3b353a 100644
--- a/apps/builder/app/builder/features/style-panel/sections/flex-child/flex-child.tsx
+++ b/apps/builder/app/builder/features/style-panel/sections/flex-child/flex-child.tsx
@@ -1,6 +1,6 @@
import { Flex, Grid, theme } from "@webstudio-is/design-system";
import { toValue } from "@webstudio-is/css-engine";
-import type { StyleProperty } from "@webstudio-is/css-data";
+import type { StyleProperty } from "@webstudio-is/css-engine";
import type { RenderCategoryProps } from "../../style-sections";
import { ToggleGroupControl } from "../../controls/toggle/toggle-control";
import { PropertyName } from "../../shared/property-name";
diff --git a/apps/builder/app/builder/features/style-panel/sections/grid-child/grid-child.tsx b/apps/builder/app/builder/features/style-panel/sections/grid-child/grid-child.tsx
index a02bec9b54..5e3e73d6f5 100644
--- a/apps/builder/app/builder/features/style-panel/sections/grid-child/grid-child.tsx
+++ b/apps/builder/app/builder/features/style-panel/sections/grid-child/grid-child.tsx
@@ -1,4 +1,4 @@
-import type { StyleProperty } from "@webstudio-is/css-data";
+import type { StyleProperty } from "@webstudio-is/css-engine";
import type { RenderCategoryProps } from "../../style-sections";
import { renderProperty } from "../../style-sections";
import { CollapsibleSection } from "../../shared/collapsible-section";
diff --git a/apps/builder/app/builder/features/style-panel/sections/layout/layout.tsx b/apps/builder/app/builder/features/style-panel/sections/layout/layout.tsx
index 44d641c46f..0405c15cf2 100644
--- a/apps/builder/app/builder/features/style-panel/sections/layout/layout.tsx
+++ b/apps/builder/app/builder/features/style-panel/sections/layout/layout.tsx
@@ -7,7 +7,7 @@ import {
SmallToggleButton,
ToggleButton,
} from "@webstudio-is/design-system";
-import type { StyleProperty, StyleValue } from "@webstudio-is/css-data";
+import type { StyleProperty, StyleValue } from "@webstudio-is/css-engine";
import { toValue } from "@webstudio-is/css-engine";
import {
Link2Icon,
diff --git a/apps/builder/app/builder/features/style-panel/sections/list-item.tsx b/apps/builder/app/builder/features/style-panel/sections/list-item.tsx
index 158a4306b5..e8d304fb4e 100644
--- a/apps/builder/app/builder/features/style-panel/sections/list-item.tsx
+++ b/apps/builder/app/builder/features/style-panel/sections/list-item.tsx
@@ -1,4 +1,4 @@
-import type { StyleProperty } from "@webstudio-is/css-data";
+import type { StyleProperty } from "@webstudio-is/css-engine";
import { Grid, theme } from "@webstudio-is/design-system";
import { styleConfigByName } from "../shared/configs";
import type { RenderCategoryProps } from "../style-sections";
diff --git a/apps/builder/app/builder/features/style-panel/sections/outline/outline-offset.tsx b/apps/builder/app/builder/features/style-panel/sections/outline/outline-offset.tsx
index 2dc31f3529..b57cf0f4ed 100644
--- a/apps/builder/app/builder/features/style-panel/sections/outline/outline-offset.tsx
+++ b/apps/builder/app/builder/features/style-panel/sections/outline/outline-offset.tsx
@@ -1,4 +1,4 @@
-import type { StyleProperty, UnitValue } from "@webstudio-is/css-data";
+import type { StyleProperty, UnitValue } from "@webstudio-is/css-engine";
import { Grid, theme } from "@webstudio-is/design-system";
import { CssValueInputContainer } from "../../controls/position/css-value-input-container";
import type { RenderCategoryProps } from "../../style-sections";
diff --git a/apps/builder/app/builder/features/style-panel/sections/outline/outline-style.tsx b/apps/builder/app/builder/features/style-panel/sections/outline/outline-style.tsx
index e2b1516cfd..04eadf716b 100644
--- a/apps/builder/app/builder/features/style-panel/sections/outline/outline-style.tsx
+++ b/apps/builder/app/builder/features/style-panel/sections/outline/outline-style.tsx
@@ -1,4 +1,4 @@
-import type { StyleProperty } from "@webstudio-is/css-data";
+import type { StyleProperty } from "@webstudio-is/css-engine";
import {
Grid,
theme,
diff --git a/apps/builder/app/builder/features/style-panel/sections/outline/outline-width.tsx b/apps/builder/app/builder/features/style-panel/sections/outline/outline-width.tsx
index 8395ac90f2..1e5a2769db 100644
--- a/apps/builder/app/builder/features/style-panel/sections/outline/outline-width.tsx
+++ b/apps/builder/app/builder/features/style-panel/sections/outline/outline-width.tsx
@@ -1,4 +1,4 @@
-import type { StyleProperty } from "@webstudio-is/css-data";
+import type { StyleProperty } from "@webstudio-is/css-engine";
import { Grid, theme } from "@webstudio-is/design-system";
import type { RenderCategoryProps } from "../../style-sections";
import { PropertyName } from "../../shared/property-name";
diff --git a/apps/builder/app/builder/features/style-panel/sections/outline/outline.tsx b/apps/builder/app/builder/features/style-panel/sections/outline/outline.tsx
index 643150fca8..ca954ed5f6 100644
--- a/apps/builder/app/builder/features/style-panel/sections/outline/outline.tsx
+++ b/apps/builder/app/builder/features/style-panel/sections/outline/outline.tsx
@@ -1,5 +1,5 @@
import { Flex, Grid, theme, Box } from "@webstudio-is/design-system";
-import type { StyleProperty } from "@webstudio-is/css-data";
+import type { StyleProperty } from "@webstudio-is/css-engine";
import { ColorControl } from "../../controls";
import { CollapsibleSection } from "../../shared/collapsible-section";
import type { RenderCategoryProps } from "../../style-sections";
diff --git a/apps/builder/app/builder/features/style-panel/sections/position/position-control.tsx b/apps/builder/app/builder/features/style-panel/sections/position/position-control.tsx
index 96744f6e8e..bab71c4653 100644
--- a/apps/builder/app/builder/features/style-panel/sections/position/position-control.tsx
+++ b/apps/builder/app/builder/features/style-panel/sections/position/position-control.tsx
@@ -10,7 +10,7 @@ import type {
import { getStyleSource, type StyleInfo } from "../../shared/style-info";
import { getPositionModifiersGroup, useScrub } from "../shared/scrub";
import { ValueText } from "../shared/value-text";
-import type { StyleValue } from "@webstudio-is/css-data";
+import type { StyleValue } from "@webstudio-is/css-engine";
import { InputPopover } from "../shared/input-popover";
import { PositionTooltip } from "./position-tooltip";
diff --git a/apps/builder/app/builder/features/style-panel/sections/position/position.tsx b/apps/builder/app/builder/features/style-panel/sections/position/position.tsx
index 6208cc1aaa..52bb85648a 100644
--- a/apps/builder/app/builder/features/style-panel/sections/position/position.tsx
+++ b/apps/builder/app/builder/features/style-panel/sections/position/position.tsx
@@ -1,4 +1,4 @@
-import type { StyleProperty } from "@webstudio-is/css-data";
+import type { StyleProperty } from "@webstudio-is/css-engine";
import type { RenderCategoryProps } from "../../style-sections";
import { CollapsibleSection } from "../../shared/collapsible-section";
import { Grid, theme } from "@webstudio-is/design-system";
diff --git a/apps/builder/app/builder/features/style-panel/sections/shared/input-popover.tsx b/apps/builder/app/builder/features/style-panel/sections/shared/input-popover.tsx
index 16b5bee7db..877b959055 100644
--- a/apps/builder/app/builder/features/style-panel/sections/shared/input-popover.tsx
+++ b/apps/builder/app/builder/features/style-panel/sections/shared/input-popover.tsx
@@ -7,7 +7,7 @@ import {
DeprecatedPopoverPortal,
styled,
} from "@webstudio-is/design-system";
-import type { StyleProperty, StyleValue } from "@webstudio-is/css-data";
+import type { StyleProperty, StyleValue } from "@webstudio-is/css-engine";
import {
CssValueInput,
type IntermediateStyleValue,
diff --git a/apps/builder/app/builder/features/style-panel/sections/shared/scrub.tsx b/apps/builder/app/builder/features/style-panel/sections/shared/scrub.tsx
index 0e9dc148f9..8fe0438cb8 100644
--- a/apps/builder/app/builder/features/style-panel/sections/shared/scrub.tsx
+++ b/apps/builder/app/builder/features/style-panel/sections/shared/scrub.tsx
@@ -2,7 +2,7 @@ import type {
StyleProperty,
StyleValue,
UnitValue,
-} from "@webstudio-is/css-data";
+} from "@webstudio-is/css-engine";
import { numericScrubControl } from "@webstudio-is/design-system";
import { useState, useEffect, useRef } from "react";
import { useModifierKeys } from "../../shared/modifier-keys";
diff --git a/apps/builder/app/builder/features/style-panel/sections/shared/value-text.tsx b/apps/builder/app/builder/features/style-panel/sections/shared/value-text.tsx
index 33f959e897..d259f080f0 100644
--- a/apps/builder/app/builder/features/style-panel/sections/shared/value-text.tsx
+++ b/apps/builder/app/builder/features/style-panel/sections/shared/value-text.tsx
@@ -1,5 +1,5 @@
import { styled, Text } from "@webstudio-is/design-system";
-import type { StyleValue } from "@webstudio-is/css-data";
+import type { StyleValue } from "@webstudio-is/css-engine";
import { useMemo, type ComponentProps } from "react";
import { theme } from "@webstudio-is/design-system";
import { toValue } from "@webstudio-is/css-engine";
diff --git a/apps/builder/app/builder/features/style-panel/sections/size/size.tsx b/apps/builder/app/builder/features/style-panel/sections/size/size.tsx
index 9601de5a42..9783a282ad 100644
--- a/apps/builder/app/builder/features/style-panel/sections/size/size.tsx
+++ b/apps/builder/app/builder/features/style-panel/sections/size/size.tsx
@@ -1,4 +1,4 @@
-import type { StyleProperty } from "@webstudio-is/css-data";
+import type { StyleProperty } from "@webstudio-is/css-engine";
import { toValue } from "@webstudio-is/css-engine";
import { Flex, Grid } from "@webstudio-is/design-system";
import { styleConfigByName } from "../../shared/configs";
diff --git a/apps/builder/app/builder/features/style-panel/sections/space/types.ts b/apps/builder/app/builder/features/style-panel/sections/space/types.ts
index 5287891999..3b39334754 100644
--- a/apps/builder/app/builder/features/style-panel/sections/space/types.ts
+++ b/apps/builder/app/builder/features/style-panel/sections/space/types.ts
@@ -1,4 +1,4 @@
-import type { StyleProperty } from "@webstudio-is/css-data";
+import type { StyleProperty } from "@webstudio-is/css-engine";
export const spacePropertiesNames = [
"marginTop",
diff --git a/apps/builder/app/builder/features/style-panel/sections/typography/typography.tsx b/apps/builder/app/builder/features/style-panel/sections/typography/typography.tsx
index fbfd1d5047..b55c541017 100644
--- a/apps/builder/app/builder/features/style-panel/sections/typography/typography.tsx
+++ b/apps/builder/app/builder/features/style-panel/sections/typography/typography.tsx
@@ -6,7 +6,7 @@ import {
theme,
} from "@webstudio-is/design-system";
import { toValue } from "@webstudio-is/css-engine";
-import type { StyleProperty } from "@webstudio-is/css-data";
+import type { StyleProperty } from "@webstudio-is/css-engine";
import type { RenderCategoryProps } from "../../style-sections";
import { PropertyName } from "../../shared/property-name";
import {
diff --git a/apps/builder/app/builder/features/style-panel/shared/collapsible-section.tsx b/apps/builder/app/builder/features/style-panel/shared/collapsible-section.tsx
index 068245173f..d79f03754d 100644
--- a/apps/builder/app/builder/features/style-panel/shared/collapsible-section.tsx
+++ b/apps/builder/app/builder/features/style-panel/shared/collapsible-section.tsx
@@ -1,4 +1,4 @@
-import type { StyleProperty } from "@webstudio-is/css-data";
+import type { StyleProperty } from "@webstudio-is/css-engine";
import { SectionTitle, SectionTitleLabel } from "@webstudio-is/design-system";
import type { ReactNode } from "react";
import {
diff --git a/apps/builder/app/builder/features/style-panel/shared/color-picker.tsx b/apps/builder/app/builder/features/style-panel/shared/color-picker.tsx
index f3d42f0cf6..c5ada739e3 100644
--- a/apps/builder/app/builder/features/style-panel/shared/color-picker.tsx
+++ b/apps/builder/app/builder/features/style-panel/shared/color-picker.tsx
@@ -8,7 +8,7 @@ import type {
RgbValue,
StyleProperty,
StyleValue,
-} from "@webstudio-is/css-data";
+} from "@webstudio-is/css-engine";
import {
Popover,
PopoverTrigger,
diff --git a/apps/builder/app/builder/features/style-panel/shared/configs.ts b/apps/builder/app/builder/features/style-panel/shared/configs.ts
index 0bf571ef51..cdc6a957da 100644
--- a/apps/builder/app/builder/features/style-panel/shared/configs.ts
+++ b/apps/builder/app/builder/features/style-panel/shared/configs.ts
@@ -1,4 +1,4 @@
-import type { StyleProperty, AppliesTo } from "@webstudio-is/css-data";
+import type { StyleProperty } from "@webstudio-is/css-engine";
import { keywordValues, properties } from "@webstudio-is/css-data";
import { humanizeString } from "~/shared/string-utils";
import {
@@ -29,6 +29,7 @@ import {
GapHorizontalIcon,
GapVerticalIcon,
} from "@webstudio-is/icons";
+import type { AppliesTo } from "./dependencies";
import type * as Controls from "../controls";
type BaseStyleConfig = {
diff --git a/apps/builder/app/builder/features/style-panel/shared/css-value-input/convert-units.ts b/apps/builder/app/builder/features/style-panel/shared/css-value-input/convert-units.ts
index 476a38e7da..102f43e83c 100644
--- a/apps/builder/app/builder/features/style-panel/shared/css-value-input/convert-units.ts
+++ b/apps/builder/app/builder/features/style-panel/shared/css-value-input/convert-units.ts
@@ -1,4 +1,4 @@
-import type { Unit } from "@webstudio-is/css-data";
+import type { Unit } from "@webstudio-is/css-engine";
const convertibleUnits = ["px", "ch", "vw", "vh", "em", "rem"] as const;
diff --git a/apps/builder/app/builder/features/style-panel/shared/css-value-input/css-value-input.stories.tsx b/apps/builder/app/builder/features/style-panel/shared/css-value-input/css-value-input.stories.tsx
index cd53a3c8d8..b2e221a742 100644
--- a/apps/builder/app/builder/features/style-panel/shared/css-value-input/css-value-input.stories.tsx
+++ b/apps/builder/app/builder/features/style-panel/shared/css-value-input/css-value-input.stories.tsx
@@ -1,6 +1,6 @@
import * as React from "react";
import { Flex, DeprecatedTextField } from "@webstudio-is/design-system";
-import type { StyleValue } from "@webstudio-is/css-data";
+import type { StyleValue } from "@webstudio-is/css-engine";
import { CssValueInput, type IntermediateStyleValue } from "./css-value-input";
import { action } from "@storybook/addon-actions";
import { toValue } from "@webstudio-is/css-engine";
diff --git a/apps/builder/app/builder/features/style-panel/shared/css-value-input/css-value-input.tsx b/apps/builder/app/builder/features/style-panel/shared/css-value-input/css-value-input.tsx
index 889f558eb1..e34af53f14 100644
--- a/apps/builder/app/builder/features/style-panel/shared/css-value-input/css-value-input.tsx
+++ b/apps/builder/app/builder/features/style-panel/shared/css-value-input/css-value-input.tsx
@@ -18,7 +18,7 @@ import type {
StyleProperty,
StyleValue,
Unit,
-} from "@webstudio-is/css-data";
+} from "@webstudio-is/css-engine";
import {
type KeyboardEventHandler,
type KeyboardEvent,
diff --git a/apps/builder/app/builder/features/style-panel/shared/css-value-input/parse-intermediate-or-invalid-value.ts b/apps/builder/app/builder/features/style-panel/shared/css-value-input/parse-intermediate-or-invalid-value.ts
index 9a300e619a..77b8d45a14 100644
--- a/apps/builder/app/builder/features/style-panel/shared/css-value-input/parse-intermediate-or-invalid-value.ts
+++ b/apps/builder/app/builder/features/style-panel/shared/css-value-input/parse-intermediate-or-invalid-value.ts
@@ -2,7 +2,7 @@ import type {
StyleProperty,
StyleValue,
InvalidValue,
-} from "@webstudio-is/css-data";
+} from "@webstudio-is/css-engine";
import type { IntermediateStyleValue } from "./css-value-input";
import { evaluateMath } from "./evaluate-math";
import { units, parseCssValue } from "@webstudio-is/css-data";
diff --git a/apps/builder/app/builder/features/style-panel/shared/css-value-input/unit-select.tsx b/apps/builder/app/builder/features/style-panel/shared/css-value-input/unit-select.tsx
index 1e05a0fe75..6e6f7d5f07 100644
--- a/apps/builder/app/builder/features/style-panel/shared/css-value-input/unit-select.tsx
+++ b/apps/builder/app/builder/features/style-panel/shared/css-value-input/unit-select.tsx
@@ -1,6 +1,6 @@
import { useState, useMemo } from "react";
-import { type Unit } from "@webstudio-is/css-data";
import * as SelectPrimitive from "@radix-ui/react-select";
+import type { Unit } from "@webstudio-is/css-engine";
import {
SelectScrollUpButton,
SelectScrollDownButton,
diff --git a/apps/builder/app/builder/features/style-panel/shared/dependencies.ts b/apps/builder/app/builder/features/style-panel/shared/dependencies.ts
index 90a3a8326b..b126186f35 100644
--- a/apps/builder/app/builder/features/style-panel/shared/dependencies.ts
+++ b/apps/builder/app/builder/features/style-panel/shared/dependencies.ts
@@ -1,4 +1,15 @@
-import type { AppliesTo, StyleProperty } from "@webstudio-is/css-data";
+import type { CustomProperty, StyleProperty } from "@webstudio-is/css-engine";
+import type { properties } from "@webstudio-is/css-data";
+
+type Properties = typeof properties & {
+ [custom: CustomProperty]: {
+ appliesTo: "allElements";
+ initial: string;
+ inherited: boolean;
+ };
+};
+
+export type AppliesTo = Properties[StyleProperty]["appliesTo"];
const displayInline = [
"inline",
diff --git a/apps/builder/app/builder/features/style-panel/shared/property-name.tsx b/apps/builder/app/builder/features/style-panel/shared/property-name.tsx
index a179591729..a51a6c57bd 100644
--- a/apps/builder/app/builder/features/style-panel/shared/property-name.tsx
+++ b/apps/builder/app/builder/features/style-panel/shared/property-name.tsx
@@ -1,9 +1,7 @@
import { useState, type ReactElement, type ReactNode } from "react";
import { useStore } from "@nanostores/react";
-import {
- type StyleProperty,
- propertyDescriptions,
-} from "@webstudio-is/css-data";
+import type { StyleProperty } from "@webstudio-is/css-engine";
+import { propertyDescriptions } from "@webstudio-is/css-data";
import {
theme,
Button,
diff --git a/apps/builder/app/builder/features/style-panel/shared/style-info.ts b/apps/builder/app/builder/features/style-panel/shared/style-info.ts
index 2bcce13da1..069eeaba20 100644
--- a/apps/builder/app/builder/features/style-panel/shared/style-info.ts
+++ b/apps/builder/app/builder/features/style-panel/shared/style-info.ts
@@ -1,13 +1,13 @@
import { useMemo } from "react";
import { useStore } from "@nanostores/react";
import type { htmlTags as HtmlTags } from "html-tags";
-import {
- html,
- type Style,
- type StyleProperty,
- type StyleValue,
-} from "@webstudio-is/css-data";
-import { properties } from "@webstudio-is/css-data";
+import type {
+ Style,
+ StyleProperty,
+ StyleValue,
+} from "@webstudio-is/css-engine";
+import { compareMedia } from "@webstudio-is/css-engine";
+import { html, properties } from "@webstudio-is/css-data";
import type {
StyleSourceSelections,
Breakpoints,
@@ -17,7 +17,6 @@ import type {
StyleSource as StyleSourceType,
Breakpoint,
} from "@webstudio-is/sdk";
-import { compareMedia } from "@webstudio-is/css-engine";
import {
type StyleSourceSelector,
instancesStore,
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 898b83c581..da0bc933ca 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
@@ -6,7 +6,7 @@ import {
type Instance,
getStyleDeclKey,
} from "@webstudio-is/sdk";
-import type { StyleProperty, StyleValue } from "@webstudio-is/css-data";
+import type { StyleProperty, StyleValue } from "@webstudio-is/css-engine";
import type { Publish } from "~/shared/pubsub";
import {
selectedBreakpointStore,
diff --git a/apps/builder/app/builder/features/style-panel/style-sections.tsx b/apps/builder/app/builder/features/style-panel/style-sections.tsx
index 5e76afadfb..76fbb4ca9c 100644
--- a/apps/builder/app/builder/features/style-panel/style-sections.tsx
+++ b/apps/builder/app/builder/features/style-panel/style-sections.tsx
@@ -1,8 +1,8 @@
import type { htmlTags as HtmlTag } from "html-tags";
import { Grid } from "@webstudio-is/design-system";
import { toValue } from "@webstudio-is/css-engine";
+import type { StyleProperty } from "@webstudio-is/css-engine";
import { styleConfigByName } from "./shared/configs";
-import type { StyleProperty } from "@webstudio-is/css-data";
import type {
SetProperty,
DeleteProperty,
diff --git a/apps/builder/app/builder/features/style-panel/style-settings.tsx b/apps/builder/app/builder/features/style-panel/style-settings.tsx
index 0280c44513..5a1653efde 100644
--- a/apps/builder/app/builder/features/style-panel/style-settings.tsx
+++ b/apps/builder/app/builder/features/style-panel/style-settings.tsx
@@ -1,5 +1,5 @@
import { Fragment } from "react";
-import type { StyleProperty } from "@webstudio-is/css-data";
+import type { StyleProperty } from "@webstudio-is/css-engine";
import {
categories,
renderCategory,
diff --git a/apps/builder/app/canvas/features/webstudio-component/get-browser-style.ts b/apps/builder/app/canvas/features/webstudio-component/get-browser-style.ts
index 7db1e9363e..e796368b15 100644
--- a/apps/builder/app/canvas/features/webstudio-component/get-browser-style.ts
+++ b/apps/builder/app/canvas/features/webstudio-component/get-browser-style.ts
@@ -1,10 +1,6 @@
import { detectFont } from "detect-font";
-import {
- type Style,
- type StyleValue,
- type Unit,
- keywordValues,
-} from "@webstudio-is/css-data";
+import type { Style, StyleValue, Unit } from "@webstudio-is/css-engine";
+import { keywordValues } from "@webstudio-is/css-data";
import { properties, units } from "@webstudio-is/css-data";
const unitsList = Object.values(units).flat();
diff --git a/apps/builder/app/canvas/shared/styles.ts b/apps/builder/app/canvas/shared/styles.ts
index d5ae77a577..9d70cb0a80 100644
--- a/apps/builder/app/canvas/shared/styles.ts
+++ b/apps/builder/app/canvas/shared/styles.ts
@@ -16,7 +16,7 @@ import {
type StyleValue,
type StyleProperty,
isValidStaticStyleValue,
-} from "@webstudio-is/css-data";
+} from "@webstudio-is/css-engine";
import {
assetsStore,
breakpointsStore,
diff --git a/apps/builder/app/shared/nano-states/nano-states.ts b/apps/builder/app/shared/nano-states/nano-states.ts
index 28cefd1c3e..a09400ed97 100644
--- a/apps/builder/app/shared/nano-states/nano-states.ts
+++ b/apps/builder/app/shared/nano-states/nano-states.ts
@@ -26,7 +26,7 @@ import {
encodeDataSourceVariable,
decodeDataSourceVariable,
} from "@webstudio-is/react-sdk";
-import type { Style } from "@webstudio-is/css-data";
+import type { Style } from "@webstudio-is/css-engine";
import type { DragStartPayload } from "~/canvas/shared/use-drag-drop";
import { useMount } from "~/shared/hook-utils/use-mount";
import { shallowComputed } from "../store-utils";
diff --git a/packages/css-data/bin/mdn-data.ts b/packages/css-data/bin/mdn-data.ts
index 570d4a9d15..8bac9826ff 100755
--- a/packages/css-data/bin/mdn-data.ts
+++ b/packages/css-data/bin/mdn-data.ts
@@ -1,14 +1,12 @@
/* eslint-disable import/no-internal-modules */
-import * as fs from "node:fs";
-import * as path from "node:path";
+import { mkdirSync, writeFileSync } from "node:fs";
+import { join, dirname } from "node:path";
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore @todo add missing type defitions for definitionSyntax, type DSNode, type CssNode
import { parse, definitionSyntax, type DSNode, type CssNode } from "css-tree";
import properties from "mdn-data/css/properties.json";
import syntaxes from "mdn-data/css/syntaxes.json";
import data from "css-tree/dist/data";
-import { popularityIndex } from "../src/popularity-index";
-import * as customData from "../src/custom-data";
import camelCase from "camelcase";
import type {
KeywordValue,
@@ -16,7 +14,9 @@ import type {
Unit,
UnitValue,
UnparsedValue,
-} from "../src/schema";
+} from "@webstudio-is/css-engine";
+import { popularityIndex } from "../src/popularity-index";
+import * as customData from "../src/custom-data";
const units = {
number: [],
@@ -307,14 +307,9 @@ for (property in filteredProperties) {
};
}
-const targetDir = path.join(
- process.cwd(),
- process.argv.slice(2).pop() as string
-);
+const targetDir = join(process.cwd(), process.argv.slice(2).pop() as string);
-if (!fs.existsSync(targetDir)) {
- fs.mkdirSync(targetDir, { recursive: true });
-}
+mkdirSync(targetDir, { recursive: true });
const writeToFile = (fileName: string, constant: string, data: unknown) => {
const autogeneratedHint = "// This file was generated by pnpm mdn-data\n";
@@ -324,7 +319,7 @@ const writeToFile = (fileName: string, constant: string, data: unknown) => {
JSON.stringify(data, null, 2) +
" as const;";
- fs.writeFileSync(path.join(targetDir, fileName), content, "utf8");
+ writeFileSync(join(targetDir, fileName), content, "utf8");
};
// Non-standard properties are just missing in mdn data
@@ -374,3 +369,22 @@ const keywordValues = (() => {
writeToFile("units.ts", "units", units);
writeToFile("properties.ts", "properties", propertiesData);
writeToFile("keyword-values.ts", "keywordValues", keywordValues);
+
+let types = "";
+
+const propertyLiterals = Object.keys(propertiesData).map((property) =>
+ JSON.stringify(property)
+);
+types += `export type Property = ${propertyLiterals.join(" | ")};\n\n`;
+
+const unitLiterals = Object.values(units)
+ .flat()
+ .map((unit) => JSON.stringify(unit));
+types += `export type Unit = ${unitLiterals.join(" | ")};\n`;
+
+const typesFile = join(
+ process.cwd(),
+ "../css-engine/src/__generated__/types.ts"
+);
+mkdirSync(dirname(typesFile), { recursive: true });
+writeFileSync(typesFile, types);
diff --git a/packages/css-data/package.json b/packages/css-data/package.json
index 63bd16a471..5be6a2bf80 100644
--- a/packages/css-data/package.json
+++ b/packages/css-data/package.json
@@ -10,7 +10,7 @@
"checks": "pnpm typecheck",
"dev": "build-package --watch",
"build": "build-package",
- "build:mdn-data": "tsx ./bin/mdn-data.ts ./src/__generated__ && prettier --write \"./src/__generated__/**/*.ts\"",
+ "build:mdn-data": "tsx ./bin/mdn-data.ts ./src/__generated__ && prettier --write \"./src/__generated__/\" \"../css-engine/src/__generated__/\"",
"build:descriptions": "tsx ./bin/property-value-descriptions.ts",
"dts": "tsc --project tsconfig.dts.json",
"test": "NODE_OPTIONS=--experimental-vm-modules jest"
@@ -47,6 +47,7 @@
"private": false,
"sideEffects": false,
"dependencies": {
+ "@webstudio-is/css-engine": "workspace:^",
"colord": "^2.9.3",
"css-tree": "^2.3.1",
"hyphenate-style-name": "^1.0.4",
diff --git a/packages/css-data/src/custom-data.ts b/packages/css-data/src/custom-data.ts
index d66d074425..8c036bb3eb 100644
--- a/packages/css-data/src/custom-data.ts
+++ b/packages/css-data/src/custom-data.ts
@@ -1,4 +1,4 @@
-import type { StyleValue } from "./schema";
+import type { StyleValue } from "@webstudio-is/css-engine";
import { popularityIndex } from "./popularity-index";
// Data type used before we generate a the constants.
diff --git a/packages/css-data/src/html.ts b/packages/css-data/src/html.ts
index 6cfb67ccc5..10af0e93b5 100644
--- a/packages/css-data/src/html.ts
+++ b/packages/css-data/src/html.ts
@@ -4,7 +4,7 @@
// https://trac.webkit.org/browser/trunk/Source/WebCore/css/html.css
import type { htmlTags as HtmlTags } from "html-tags";
-import type { StyleProperty, StyleValue } from "./schema";
+import type { StyleProperty, StyleValue } from "@webstudio-is/css-engine";
type StyleDecl = {
property: StyleProperty;
diff --git a/packages/css-data/src/index.ts b/packages/css-data/src/index.ts
index 21e5e59ca7..0227a7cd5d 100644
--- a/packages/css-data/src/index.ts
+++ b/packages/css-data/src/index.ts
@@ -9,7 +9,6 @@ export {
properties as propertyDescriptions,
declarations as declarationDescriptions,
} from "./__generated__/property-value-descriptions";
-export * from "./schema";
// longhand property parsers
export * from "./property-parsers/index";
diff --git a/packages/css-data/src/parse-css-value.ts b/packages/css-data/src/parse-css-value.ts
index f473c7e22e..e2803d4969 100644
--- a/packages/css-data/src/parse-css-value.ts
+++ b/packages/css-data/src/parse-css-value.ts
@@ -2,9 +2,9 @@ import { colord } from "colord";
import * as csstree from "css-tree";
import hyphenate from "hyphenate-style-name";
import warnOnce from "warn-once";
+import type { StyleProperty, StyleValue, Unit } from "@webstudio-is/css-engine";
import { keywordValues } from "./__generated__/keyword-values";
import { units } from "./__generated__/units";
-import type { StyleProperty, StyleValue, Unit } from "./schema";
const cssTryParseValue = (input: string) => {
try {
diff --git a/packages/css-data/src/parse-css.ts b/packages/css-data/src/parse-css.ts
index 484b6d8849..5d318e3d45 100644
--- a/packages/css-data/src/parse-css.ts
+++ b/packages/css-data/src/parse-css.ts
@@ -1,8 +1,12 @@
import * as csstree from "css-tree";
+import {
+ StyleValue,
+ type Style as S,
+ type StyleProperty,
+} from "@webstudio-is/css-engine";
import { parseCssValue as parseCssValueLonghand } from "./parse-css-value";
import * as parsers from "./property-parsers/parsers";
import * as toLonghand from "./property-parsers/to-longhand";
-import { StyleValue, type Style as S, type StyleProperty } from "./schema";
type Selector = string;
type Style = {
diff --git a/packages/css-data/src/property-parsers/background.ts b/packages/css-data/src/property-parsers/background.ts
index ec21dbf1a5..5d0e2669ec 100644
--- a/packages/css-data/src/property-parsers/background.ts
+++ b/packages/css-data/src/property-parsers/background.ts
@@ -1,11 +1,11 @@
import * as csstree from "css-tree";
-import { parseCssValue } from "../parse-css-value";
import type {
InvalidValue,
LayersValue,
RgbValue,
UnparsedValue,
-} from "../schema";
+} from "@webstudio-is/css-engine";
+import { parseCssValue } from "../parse-css-value";
export const gradientNames = [
"conic-gradient",
diff --git a/packages/css-data/src/property-parsers/box-shadow.ts b/packages/css-data/src/property-parsers/box-shadow.ts
index 156ec938f2..97931b0a43 100644
--- a/packages/css-data/src/property-parsers/box-shadow.ts
+++ b/packages/css-data/src/property-parsers/box-shadow.ts
@@ -1,7 +1,12 @@
import * as csstree from "css-tree";
-import { LayersValue, TupleValue } from "../schema";
-import type { InvalidValue, TupleValueItem, Unit } from "../schema";
import { colord } from "colord";
+import type {
+ LayersValue,
+ TupleValue,
+ InvalidValue,
+ TupleValueItem,
+ Unit,
+} from "@webstudio-is/css-engine";
const cssTreeTryParseValue = (input: string) => {
try {
diff --git a/packages/css-engine/package.json b/packages/css-engine/package.json
index 88a9ba9622..966bb75afb 100644
--- a/packages/css-engine/package.json
+++ b/packages/css-engine/package.json
@@ -16,12 +16,9 @@
"storybook:build": "storybook build"
},
"dependencies": {
- "@webstudio-is/css-data": "workspace:^",
"@webstudio-is/error-utils": "workspace:^",
"@webstudio-is/fonts": "workspace:^",
- "hyphenate-style-name": "^1.0.4",
- "react": "^18.2.0",
- "react-dom": "^18.2.0"
+ "hyphenate-style-name": "^1.0.4"
},
"devDependencies": {
"@jest/globals": "^29.6.4",
@@ -33,6 +30,8 @@
"@webstudio-is/storybook-config": "workspace:^",
"@webstudio-is/tsconfig": "workspace:^",
"jest": "^29.6.4",
+ "react": "^18.2.0",
+ "react-dom": "^18.2.0",
"typescript": "5.2.2"
},
"exports": {
diff --git a/packages/css-engine/src/__generated__/types.ts b/packages/css-engine/src/__generated__/types.ts
new file mode 100644
index 0000000000..d8e32b8ada
--- /dev/null
+++ b/packages/css-engine/src/__generated__/types.ts
@@ -0,0 +1,424 @@
+export type Property =
+ | "WebkitFontSmoothing"
+ | "MozOsxFontSmoothing"
+ | "accentColor"
+ | "alignContent"
+ | "alignItems"
+ | "alignSelf"
+ | "alignTracks"
+ | "animationComposition"
+ | "animationDelay"
+ | "animationDirection"
+ | "animationDuration"
+ | "animationFillMode"
+ | "animationIterationCount"
+ | "animationName"
+ | "animationPlayState"
+ | "animationTimingFunction"
+ | "animationTimeline"
+ | "appearance"
+ | "aspectRatio"
+ | "backdropFilter"
+ | "backfaceVisibility"
+ | "backgroundAttachment"
+ | "backgroundBlendMode"
+ | "backgroundClip"
+ | "backgroundColor"
+ | "backgroundImage"
+ | "backgroundOrigin"
+ | "backgroundPosition"
+ | "backgroundPositionX"
+ | "backgroundPositionY"
+ | "backgroundRepeat"
+ | "backgroundSize"
+ | "blockOverflow"
+ | "blockSize"
+ | "borderBlockColor"
+ | "borderBlockStyle"
+ | "borderBlockWidth"
+ | "borderBlockEndColor"
+ | "borderBlockEndStyle"
+ | "borderBlockEndWidth"
+ | "borderBlockStartColor"
+ | "borderBlockStartStyle"
+ | "borderBlockStartWidth"
+ | "borderBottomColor"
+ | "borderBottomLeftRadius"
+ | "borderBottomRightRadius"
+ | "borderBottomStyle"
+ | "borderBottomWidth"
+ | "borderCollapse"
+ | "borderEndEndRadius"
+ | "borderEndStartRadius"
+ | "borderImageOutset"
+ | "borderImageRepeat"
+ | "borderImageSlice"
+ | "borderImageSource"
+ | "borderImageWidth"
+ | "borderInlineColor"
+ | "borderInlineStyle"
+ | "borderInlineWidth"
+ | "borderInlineEndColor"
+ | "borderInlineEndStyle"
+ | "borderInlineEndWidth"
+ | "borderInlineStartColor"
+ | "borderInlineStartStyle"
+ | "borderInlineStartWidth"
+ | "borderLeftColor"
+ | "borderLeftStyle"
+ | "borderLeftWidth"
+ | "borderRightColor"
+ | "borderRightStyle"
+ | "borderRightWidth"
+ | "borderSpacing"
+ | "borderStartEndRadius"
+ | "borderStartStartRadius"
+ | "borderTopColor"
+ | "borderTopLeftRadius"
+ | "borderTopRightRadius"
+ | "borderTopStyle"
+ | "borderTopWidth"
+ | "bottom"
+ | "boxDecorationBreak"
+ | "boxShadow"
+ | "boxSizing"
+ | "breakAfter"
+ | "breakBefore"
+ | "breakInside"
+ | "captionSide"
+ | "caretColor"
+ | "caretShape"
+ | "clear"
+ | "clip"
+ | "clipPath"
+ | "color"
+ | "colorScheme"
+ | "columnCount"
+ | "columnFill"
+ | "columnGap"
+ | "columnRuleColor"
+ | "columnRuleStyle"
+ | "columnRuleWidth"
+ | "columnSpan"
+ | "columnWidth"
+ | "contain"
+ | "containIntrinsicBlockSize"
+ | "containIntrinsicHeight"
+ | "containIntrinsicInlineSize"
+ | "containIntrinsicWidth"
+ | "containerName"
+ | "containerType"
+ | "content"
+ | "contentVisibility"
+ | "counterIncrement"
+ | "counterReset"
+ | "counterSet"
+ | "cursor"
+ | "direction"
+ | "display"
+ | "emptyCells"
+ | "filter"
+ | "flexBasis"
+ | "flexDirection"
+ | "flexGrow"
+ | "flexShrink"
+ | "flexWrap"
+ | "float"
+ | "fontFamily"
+ | "fontFeatureSettings"
+ | "fontKerning"
+ | "fontLanguageOverride"
+ | "fontOpticalSizing"
+ | "fontPalette"
+ | "fontVariationSettings"
+ | "fontSize"
+ | "fontSizeAdjust"
+ | "fontStretch"
+ | "fontStyle"
+ | "fontSynthesis"
+ | "fontVariant"
+ | "fontVariantAlternates"
+ | "fontVariantCaps"
+ | "fontVariantEastAsian"
+ | "fontVariantEmoji"
+ | "fontVariantLigatures"
+ | "fontVariantNumeric"
+ | "fontVariantPosition"
+ | "fontWeight"
+ | "forcedColorAdjust"
+ | "gridAutoColumns"
+ | "gridAutoFlow"
+ | "gridAutoRows"
+ | "gridColumnEnd"
+ | "gridColumnStart"
+ | "gridRowEnd"
+ | "gridRowStart"
+ | "gridTemplateAreas"
+ | "gridTemplateColumns"
+ | "gridTemplateRows"
+ | "hangingPunctuation"
+ | "height"
+ | "hyphenateCharacter"
+ | "hyphenateLimitChars"
+ | "hyphens"
+ | "imageOrientation"
+ | "imageRendering"
+ | "imageResolution"
+ | "initialLetter"
+ | "initialLetterAlign"
+ | "inlineSize"
+ | "inputSecurity"
+ | "insetBlockEnd"
+ | "insetBlockStart"
+ | "insetInlineEnd"
+ | "insetInlineStart"
+ | "isolation"
+ | "justifyContent"
+ | "justifyItems"
+ | "justifySelf"
+ | "justifyTracks"
+ | "left"
+ | "letterSpacing"
+ | "lineBreak"
+ | "lineClamp"
+ | "lineHeight"
+ | "lineHeightStep"
+ | "listStyleImage"
+ | "listStylePosition"
+ | "listStyleType"
+ | "marginBlockEnd"
+ | "marginBlockStart"
+ | "marginBottom"
+ | "marginInlineEnd"
+ | "marginInlineStart"
+ | "marginLeft"
+ | "marginRight"
+ | "marginTop"
+ | "marginTrim"
+ | "maskBorderMode"
+ | "maskBorderOutset"
+ | "maskBorderRepeat"
+ | "maskBorderSlice"
+ | "maskBorderSource"
+ | "maskBorderWidth"
+ | "maskClip"
+ | "maskComposite"
+ | "maskImage"
+ | "maskMode"
+ | "maskOrigin"
+ | "maskPosition"
+ | "maskRepeat"
+ | "maskSize"
+ | "maskType"
+ | "masonryAutoFlow"
+ | "mathDepth"
+ | "mathShift"
+ | "mathStyle"
+ | "maxBlockSize"
+ | "maxHeight"
+ | "maxInlineSize"
+ | "maxLines"
+ | "maxWidth"
+ | "minBlockSize"
+ | "minHeight"
+ | "minInlineSize"
+ | "minWidth"
+ | "mixBlendMode"
+ | "objectFit"
+ | "objectPosition"
+ | "offsetAnchor"
+ | "offsetDistance"
+ | "offsetPath"
+ | "offsetPosition"
+ | "offsetRotate"
+ | "opacity"
+ | "order"
+ | "orphans"
+ | "outlineColor"
+ | "outlineOffset"
+ | "outlineStyle"
+ | "outlineWidth"
+ | "overflow"
+ | "overflowAnchor"
+ | "overflowBlock"
+ | "overflowClipMargin"
+ | "overflowInline"
+ | "overflowWrap"
+ | "overflowX"
+ | "overflowY"
+ | "overscrollBehavior"
+ | "overscrollBehaviorBlock"
+ | "overscrollBehaviorInline"
+ | "overscrollBehaviorX"
+ | "overscrollBehaviorY"
+ | "paddingBlockEnd"
+ | "paddingBlockStart"
+ | "paddingBottom"
+ | "paddingInlineEnd"
+ | "paddingInlineStart"
+ | "paddingLeft"
+ | "paddingRight"
+ | "paddingTop"
+ | "page"
+ | "pageBreakAfter"
+ | "pageBreakBefore"
+ | "pageBreakInside"
+ | "paintOrder"
+ | "perspective"
+ | "perspectiveOrigin"
+ | "pointerEvents"
+ | "position"
+ | "printColorAdjust"
+ | "quotes"
+ | "resize"
+ | "right"
+ | "rotate"
+ | "rowGap"
+ | "rubyAlign"
+ | "rubyMerge"
+ | "rubyPosition"
+ | "scale"
+ | "scrollbarColor"
+ | "scrollbarGutter"
+ | "scrollbarWidth"
+ | "scrollBehavior"
+ | "scrollMarginBlockStart"
+ | "scrollMarginBlockEnd"
+ | "scrollMarginBottom"
+ | "scrollMarginInlineStart"
+ | "scrollMarginInlineEnd"
+ | "scrollMarginLeft"
+ | "scrollMarginRight"
+ | "scrollMarginTop"
+ | "scrollPaddingBlockStart"
+ | "scrollPaddingBlockEnd"
+ | "scrollPaddingBottom"
+ | "scrollPaddingInlineStart"
+ | "scrollPaddingInlineEnd"
+ | "scrollPaddingLeft"
+ | "scrollPaddingRight"
+ | "scrollPaddingTop"
+ | "scrollSnapAlign"
+ | "scrollSnapStop"
+ | "scrollSnapType"
+ | "scrollTimelineAxis"
+ | "scrollTimelineName"
+ | "shapeImageThreshold"
+ | "shapeMargin"
+ | "shapeOutside"
+ | "tabSize"
+ | "tableLayout"
+ | "textAlign"
+ | "textAlignLast"
+ | "textCombineUpright"
+ | "textDecorationColor"
+ | "textDecorationLine"
+ | "textDecorationSkip"
+ | "textDecorationSkipInk"
+ | "textDecorationStyle"
+ | "textDecorationThickness"
+ | "textEmphasisColor"
+ | "textEmphasisPosition"
+ | "textEmphasisStyle"
+ | "textIndent"
+ | "textJustify"
+ | "textOrientation"
+ | "textOverflow"
+ | "textRendering"
+ | "textShadow"
+ | "textSizeAdjust"
+ | "textTransform"
+ | "textUnderlineOffset"
+ | "textUnderlinePosition"
+ | "top"
+ | "touchAction"
+ | "transform"
+ | "transformBox"
+ | "transformOrigin"
+ | "transformStyle"
+ | "transitionDelay"
+ | "transitionDuration"
+ | "transitionProperty"
+ | "transitionTimingFunction"
+ | "translate"
+ | "unicodeBidi"
+ | "userSelect"
+ | "verticalAlign"
+ | "viewTransitionName"
+ | "visibility"
+ | "whiteSpace"
+ | "widows"
+ | "width"
+ | "willChange"
+ | "wordBreak"
+ | "wordSpacing"
+ | "wordWrap"
+ | "writingMode"
+ | "zIndex";
+
+export type Unit =
+ | "%"
+ | "deg"
+ | "grad"
+ | "rad"
+ | "turn"
+ | "db"
+ | "fr"
+ | "hz"
+ | "khz"
+ | "cm"
+ | "mm"
+ | "q"
+ | "in"
+ | "pt"
+ | "pc"
+ | "px"
+ | "em"
+ | "rem"
+ | "ex"
+ | "rex"
+ | "cap"
+ | "rcap"
+ | "ch"
+ | "rch"
+ | "ic"
+ | "ric"
+ | "lh"
+ | "rlh"
+ | "vw"
+ | "svw"
+ | "lvw"
+ | "dvw"
+ | "vh"
+ | "svh"
+ | "lvh"
+ | "dvh"
+ | "vi"
+ | "svi"
+ | "lvi"
+ | "dvi"
+ | "vb"
+ | "svb"
+ | "lvb"
+ | "dvb"
+ | "vmin"
+ | "svmin"
+ | "lvmin"
+ | "dvmin"
+ | "vmax"
+ | "svmax"
+ | "lvmax"
+ | "dvmax"
+ | "cqw"
+ | "cqh"
+ | "cqi"
+ | "cqb"
+ | "cqmin"
+ | "cqmax"
+ | "dpi"
+ | "dpcm"
+ | "dppx"
+ | "x"
+ | "st"
+ | "s"
+ | "ms";
diff --git a/packages/css-engine/src/core/css-engine.ts b/packages/css-engine/src/core/css-engine.ts
index 6cf3c99417..80547f7a49 100644
--- a/packages/css-engine/src/core/css-engine.ts
+++ b/packages/css-engine/src/core/css-engine.ts
@@ -1,4 +1,4 @@
-import type { Style } from "@webstudio-is/css-data";
+import type { Style } from "../schema";
import {
FontFaceRule,
MediaRule,
diff --git a/packages/css-engine/src/core/rules.ts b/packages/css-engine/src/core/rules.ts
index 85f7eea845..6a5302f350 100644
--- a/packages/css-engine/src/core/rules.ts
+++ b/packages/css-engine/src/core/rules.ts
@@ -1,4 +1,4 @@
-import type { Style, StyleProperty, StyleValue } from "@webstudio-is/css-data";
+import type { Style, StyleProperty, StyleValue } from "../schema";
import { toValue, type TransformValue } from "./to-value";
import { toProperty } from "./to-property";
diff --git a/packages/css-engine/src/core/to-property.ts b/packages/css-engine/src/core/to-property.ts
index d91ebc0b92..76dece9dfd 100644
--- a/packages/css-engine/src/core/to-property.ts
+++ b/packages/css-engine/src/core/to-property.ts
@@ -1,5 +1,5 @@
-import type { StyleProperty } from "@webstudio-is/css-data";
import hyphenate from "hyphenate-style-name";
+import type { StyleProperty } from "../schema";
export const toProperty = (property: StyleProperty) => {
// Currently its a non-standard property and is only officially supported via -webkit- prefix.
diff --git a/packages/css-engine/src/core/to-value.ts b/packages/css-engine/src/core/to-value.ts
index 076f937687..f9233a9225 100644
--- a/packages/css-engine/src/core/to-value.ts
+++ b/packages/css-engine/src/core/to-value.ts
@@ -1,6 +1,6 @@
-import type { StyleValue } from "@webstudio-is/css-data";
import { captureError } from "@webstudio-is/error-utils";
import { DEFAULT_FONT_FALLBACK, SYSTEM_FONTS } from "@webstudio-is/fonts";
+import type { StyleValue } from "../schema";
export type TransformValue = (styleValue: StyleValue) => undefined | StyleValue;
diff --git a/packages/css-engine/src/index.ts b/packages/css-engine/src/index.ts
index 8d119dee81..b60156ec4f 100644
--- a/packages/css-engine/src/index.ts
+++ b/packages/css-engine/src/index.ts
@@ -1 +1,8 @@
export * from "./core";
+export * from "./schema";
+
+// necessary for sdk dts generation
+export type {
+ Property as __Property,
+ Unit as __Unit,
+} from "./__generated__/types";
diff --git a/packages/css-data/src/schema.ts b/packages/css-engine/src/schema.ts
similarity index 85%
rename from packages/css-data/src/schema.ts
rename to packages/css-engine/src/schema.ts
index b61773f8c5..3abc019540 100644
--- a/packages/css-data/src/schema.ts
+++ b/packages/css-engine/src/schema.ts
@@ -1,31 +1,14 @@
-import { units } from "./__generated__/units";
-import type { properties } from "./__generated__/properties";
import { z } from "zod";
+import type {
+ Property as GeneratedProperty,
+ Unit as GeneratedUnit,
+} from "./__generated__/types";
-type Properties = typeof properties & {
- [custom: CustomProperty]: {
- appliesTo: "allElements";
- initial: string;
- inherited: boolean;
- };
-};
-
-export type StyleProperty = keyof Properties;
-
-type CustomProperty = `--${string}`;
+export type CustomProperty = `--${string}`;
-export type AppliesTo = Properties[StyleProperty]["appliesTo"];
+export type StyleProperty = GeneratedProperty | CustomProperty;
-export type UnitGroup = keyof typeof units;
-
-type UnitEnum = (typeof units)[UnitGroup][number];
-
-const Unit = z.union([
- // expected tuple with at least single element
- // so cast to tuple with single union element to get correct inference
- z.enum(Object.values(units).flat() as [UnitEnum]),
- z.literal("number"),
-]);
+const Unit = z.string() as z.ZodType<GeneratedUnit | "number">;
export type Unit = z.infer<typeof Unit>;
diff --git a/packages/project-build/package.json b/packages/project-build/package.json
index 3029dd18d1..728f18dc51 100644
--- a/packages/project-build/package.json
+++ b/packages/project-build/package.json
@@ -34,7 +34,6 @@
"dts": "tsc --project tsconfig.dts.json"
},
"dependencies": {
- "@webstudio-is/css-data": "workspace:^",
"@webstudio-is/prisma-client": "workspace:^",
"@webstudio-is/sdk": "workspace:^",
"@webstudio-is/trpc-interface": "workspace:^",
diff --git a/packages/react-sdk/package.json b/packages/react-sdk/package.json
index 390cf6090c..fe239650c2 100644
--- a/packages/react-sdk/package.json
+++ b/packages/react-sdk/package.json
@@ -37,7 +37,6 @@
"dependencies": {
"@jsep-plugin/assignment": "^1.2.1",
"@nanostores/react": "^0.7.1",
- "@webstudio-is/css-data": "workspace:^",
"@webstudio-is/css-engine": "workspace:^",
"@webstudio-is/fonts": "workspace:^",
"@webstudio-is/sdk": "workspace:^",
diff --git a/packages/react-sdk/src/css/normalize-type-check.ts b/packages/react-sdk/src/css/normalize-type-check.ts
index 1c2d29f548..bf1c549c13 100644
--- a/packages/react-sdk/src/css/normalize-type-check.ts
+++ b/packages/react-sdk/src/css/normalize-type-check.ts
@@ -1,6 +1,6 @@
import * as normalize from "./normalize";
import type { htmlTags as HtmlTags } from "html-tags";
-import type { Style } from "@webstudio-is/css-data";
+import type { Style } from "@webstudio-is/css-engine";
// no way I found to check exports https://github.com/microsoft/TypeScript/issues/38511
// we can check here that all exports represents a valid html tag
diff --git a/packages/react-sdk/src/css/style-rules.ts b/packages/react-sdk/src/css/style-rules.ts
index e53b5242e9..9a22e09663 100644
--- a/packages/react-sdk/src/css/style-rules.ts
+++ b/packages/react-sdk/src/css/style-rules.ts
@@ -1,4 +1,4 @@
-import type { Style } from "@webstudio-is/css-data";
+import type { Style } from "@webstudio-is/css-engine";
import type {
Breakpoint,
StyleDecl,
diff --git a/packages/react-sdk/src/embed-template.ts b/packages/react-sdk/src/embed-template.ts
index f09e8405dd..65ffc635ae 100644
--- a/packages/react-sdk/src/embed-template.ts
+++ b/packages/react-sdk/src/embed-template.ts
@@ -11,7 +11,7 @@ import type {
Breakpoint,
DataSource,
} from "@webstudio-is/sdk";
-import { StyleValue, type StyleProperty } from "@webstudio-is/css-data";
+import { StyleValue, type StyleProperty } from "@webstudio-is/css-engine";
import type { Simplify } from "type-fest";
import { encodeDataSourceVariable, validateExpression } from "./expression";
import type { WsComponentMeta } from "./components/component-meta";
diff --git a/packages/sdk-components-react-radix/package.json b/packages/sdk-components-react-radix/package.json
index 5e27ff9b12..9f8be39112 100644
--- a/packages/sdk-components-react-radix/package.json
+++ b/packages/sdk-components-react-radix/package.json
@@ -66,7 +66,7 @@
"@radix-ui/react-switch": "^1.0.3",
"@radix-ui/react-tabs": "^1.0.4",
"@radix-ui/react-tooltip": "^1.0.6",
- "@webstudio-is/css-data": "workspace:^",
+ "@webstudio-is/css-engine": "workspace:^",
"@webstudio-is/icons": "workspace:^",
"@webstudio-is/react-sdk": "workspace:^"
},
@@ -74,6 +74,7 @@
"@storybook/react": "^7.2.1",
"@types/react": "^18.2.20",
"@types/react-dom": "^18.2.7",
+ "@webstudio-is/css-data": "workspace:^",
"@webstudio-is/generate-arg-types": "workspace:^",
"@webstudio-is/scripts": "workspace:^",
"@webstudio-is/sdk-components-react": "workspace:^",
diff --git a/packages/sdk-components-react-radix/scripts/generate-tailwind-theme.ts b/packages/sdk-components-react-radix/scripts/generate-tailwind-theme.ts
index a73f50a854..f06a8806f6 100644
--- a/packages/sdk-components-react-radix/scripts/generate-tailwind-theme.ts
+++ b/packages/sdk-components-react-radix/scripts/generate-tailwind-theme.ts
@@ -2,12 +2,8 @@ import { writeFile, mkdir } from "node:fs/promises";
// Imported theme https://github.com/tailwindlabs/tailwindcss/blob/e0c52a9332a64ef7eb0ba23d2a0fd5a16fe57ab7/stubs/config.full.js
// eslint-disable-next-line import/no-internal-modules
import defaultTheme from "tailwindcss/defaultTheme";
-import {
- StyleValue,
- parseCssValue,
- type StyleProperty,
- parseBoxShadow,
-} from "@webstudio-is/css-data";
+import type { StyleValue, StyleProperty } from "@webstudio-is/css-engine";
+import { parseCssValue, parseBoxShadow } from "@webstudio-is/css-data";
import type { ResolvableTo } from "tailwindcss/types/config";
import { colors as colorOverrides } from "../src/theme/tailwind-colors";
@@ -204,7 +200,7 @@ const generatedThemeData: GeneratedThemeItem[] = [
];
let generatedTheme = "";
-generatedTheme += `import type { StyleValue } from '@webstudio-is/css-data';\n\n`;
+generatedTheme += `import type { StyleValue } from '@webstudio-is/css-engine';\n\n`;
for (const item of generatedThemeData) {
const enumItems = Object.keys(item.values).map((key) => JSON.stringify(key));
let jsonString = JSON.stringify(item.values);
diff --git a/packages/sdk-components-react-radix/src/theme/__generated__/tailwind-theme.ts b/packages/sdk-components-react-radix/src/theme/__generated__/tailwind-theme.ts
index 3671e38fa1..3ef6ffa5cf 100644
--- a/packages/sdk-components-react-radix/src/theme/__generated__/tailwind-theme.ts
+++ b/packages/sdk-components-react-radix/src/theme/__generated__/tailwind-theme.ts
@@ -1,4 +1,4 @@
-import type { StyleValue } from "@webstudio-is/css-data";
+import type { StyleValue } from "@webstudio-is/css-engine";
export const spacing: Record<
| "0"
diff --git a/packages/sdk-components-react-radix/src/theme/tailwind-classes.ts b/packages/sdk-components-react-radix/src/theme/tailwind-classes.ts
index 7602f52b6a..92f7c3184c 100644
--- a/packages/sdk-components-react-radix/src/theme/tailwind-classes.ts
+++ b/packages/sdk-components-react-radix/src/theme/tailwind-classes.ts
@@ -7,7 +7,7 @@ import type {
StyleProperty,
TupleValue,
TupleValueItem,
-} from "@webstudio-is/css-data";
+} from "@webstudio-is/css-engine";
import * as theme from "./__generated__/tailwind-theme";
export const property = (
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index b122871712..c577b6bf42 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -28,7 +28,7 @@
},
"dependencies": {
"@webstudio-is/fonts": "workspace:^",
- "@webstudio-is/css-data": "workspace:^",
+ "@webstudio-is/css-engine": "workspace:^",
"zod": "^3.21.4"
},
"devDependencies": {
diff --git a/packages/sdk/src/schema/styles.ts b/packages/sdk/src/schema/styles.ts
index 48d5c45ead..07194cfcea 100644
--- a/packages/sdk/src/schema/styles.ts
+++ b/packages/sdk/src/schema/styles.ts
@@ -1,5 +1,5 @@
import { z } from "zod";
-import { type StyleProperty, StyleValue } from "@webstudio-is/css-data";
+import { type StyleProperty, StyleValue } from "@webstudio-is/css-engine";
import type { Simplify } from "type-fest";
const StyleDeclRaw = z.object({
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 319ddb23c7..49503ec047 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -511,6 +511,9 @@ importers:
packages/css-data:
dependencies:
+ '@webstudio-is/css-engine':
+ specifier: workspace:^
+ version: link:../css-engine
colord:
specifier: ^2.9.3
version: 2.9.3
@@ -566,9 +569,6 @@ importers:
packages/css-engine:
dependencies:
- '@webstudio-is/css-data':
- specifier: workspace:^
- version: link:../css-data
'@webstudio-is/error-utils':
specifier: workspace:^
version: link:../error-utils
@@ -578,12 +578,6 @@ importers:
hyphenate-style-name:
specifier: ^1.0.4
version: 1.0.4
- react:
- specifier: ^18.2.0
- version: 18.2.0
- react-dom:
- specifier: ^18.2.0
- version: 18.2.0([email protected])
devDependencies:
'@jest/globals':
specifier: ^29.6.4
@@ -612,6 +606,12 @@ importers:
jest:
specifier: ^29.6.4
version: 29.6.4(@types/[email protected])
+ react:
+ specifier: ^18.2.0
+ version: 18.2.0
+ react-dom:
+ specifier: ^18.2.0
+ version: 18.2.0([email protected])
typescript:
specifier: 5.2.2
version: 5.2.2
@@ -1196,9 +1196,6 @@ importers:
packages/project-build:
dependencies:
- '@webstudio-is/css-data':
- specifier: workspace:^
- version: link:../css-data
'@webstudio-is/prisma-client':
specifier: workspace:^
version: link:../prisma-client
@@ -1245,9 +1242,6 @@ importers:
'@nanostores/react':
specifier: ^0.7.1
- '@webstudio-is/css-data':
- specifier: workspace:^
- version: link:../css-data
'@webstudio-is/css-engine':
specifier: workspace:^
version: link:../css-engine
@@ -1343,9 +1337,9 @@ importers:
packages/sdk:
dependencies:
- '@webstudio-is/css-data':
+ '@webstudio-is/css-engine':
specifier: workspace:^
- version: link:../css-data
+ version: link:../css-engine
'@webstudio-is/fonts':
specifier: workspace:^
version: link:../fonts
@@ -1462,9 +1456,9 @@ importers:
'@radix-ui/react-tooltip':
specifier: ^1.0.6
- '@webstudio-is/css-data':
+ '@webstudio-is/css-engine':
specifier: workspace:^
- version: link:../css-data
+ version: link:../css-engine
'@webstudio-is/icons':
specifier: workspace:^
version: link:../icons
@@ -1481,6 +1475,9 @@ importers:
'@types/react-dom':
specifier: ^18.2.7
version: 18.2.7
+ '@webstudio-is/css-data':
+ specifier: workspace:^
+ version: link:../css-data
'@webstudio-is/generate-arg-types':
specifier: workspace:^
version: link:../generate-arg-types