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
refactor: reuse css parser in tailwind parser (#3641)
Bogdan Chadkin1d9770bcae8c
diff --git a/packages/css-data/package.json b/packages/css-data/package.jsonindex 950c134f7f..cf837a7d07 100644--- a/packages/css-data/package.json+++ b/packages/css-data/package.json@@ -38,8 +38,8 @@"private": true,"sideEffects": false,"dependencies": {- "@unocss/core": "^0.56.4",- "@unocss/preset-uno": "^0.56.4",+ "@unocss/core": "^0.61.0",+ "@unocss/preset-uno": "^0.61.0","@webstudio-is/css-engine": "workspace:*","change-case": "^5.4.4","colord": "^2.9.3",diff --git a/packages/css-data/src/parse-css-value.test.ts b/packages/css-data/src/parse-css-value.test.tsindex e611f73c39..ef1b606c53 100644--- a/packages/css-data/src/parse-css-value.test.ts+++ b/packages/css-data/src/parse-css-value.test.ts@@ -112,6 +112,16 @@ describe("Parse CSS value", () => {});});+ test("modern format", () => {+ expect(parseCssValue("backgroundColor", "rgb(99 102 241/0.5)")).toEqual({+ type: "rgb",+ r: 99,+ g: 102,+ b: 241,+ alpha: 0.5,+ });+ });+test("Color rgba values", () => {expect(parseCssValue("backgroundColor", "#00220011")).toEqual({type: "rgb",diff --git a/packages/css-data/src/tailwind-parser/parse.test.ts b/packages/css-data/src/tailwind-parser/parse.test.tsindex e65b5be6a1..1b310bcc7f 100644--- a/packages/css-data/src/tailwind-parser/parse.test.ts+++ b/packages/css-data/src/tailwind-parser/parse.test.ts@@ -22,7 +22,7 @@ Quick Validation of Generated CSS in WebStudio:"type": "layers","value": [{type: "unparsed",- value: "linear-gradient(to right,rgba(99,102,241,1) 0%,rgba(99,102,241,0) 100%)"+ value: "linear-gradient(to right,rgb(99 102 241/1) 0%,rgb(99 102 241/0) 100%)"}]}}@@ -107,7 +107,7 @@ describe("parseTailwindToWebstudio", () => {"value": [{"type": "unparsed",- "value": "linear-gradient(to right,rgba(99,102,241,1) 10%,rgba(14,165,233,1) 30%,rgba(16,185,129,1) 90%)",+ "value": "linear-gradient(to right,rgb(99 102 241/1) 10%,rgb(14 165 233/1) 30%,rgb(16 185 129/1) 90%)",},],},@@ -387,7 +387,7 @@ describe("parseTailwindToCss", () => {const tailwindClasses = `bg-gradient-to-r from-indigo-500`;expect(await parseTailwindToCss(tailwindClasses)).toMatchInlineSnapshot(- `".bg-gradient-to-r{background-image:linear-gradient(to right,rgba(99,102,241,1) 0%,rgba(99,102,241,0) 100%)}"`+ `".bg-gradient-to-r{background-image:linear-gradient(to right,rgb(99 102 241/1) 0%,rgb(99 102 241/0) 100%)}"`);});@@ -403,7 +403,7 @@ describe("parseTailwindToCss", () => {const tailwindClasses = `shadow`;expect(await parseTailwindToCss(tailwindClasses)).toMatchInlineSnapshot(- `".shadow{box-shadow:0 0 rgba(0,0,0,0),0 0 rgba(0,0,0,0),0 1px 3px 0 rgba(0,0,0,0.1),0 1px 2px -1px rgba(0,0,0,0.1)}"`+ `".shadow{box-shadow:0 0 rgb(0 0 0/0),0 0 rgb(0 0 0/0),0 1px 3px 0 rgb(0 0 0/0.1),0 1px 2px -1px rgb(0 0 0/0.1)}"`);});diff --git a/packages/css-data/src/tailwind-parser/parse.ts b/packages/css-data/src/tailwind-parser/parse.tsindex 84b2937f73..8f85661791 100644--- a/packages/css-data/src/tailwind-parser/parse.ts+++ b/packages/css-data/src/tailwind-parser/parse.ts@@ -1,14 +1,10 @@-import * as csstree from "css-tree";-import { camelCase } from "change-case";import { UnoGenerator, createGenerator } from "@unocss/core";import { type Theme, presetUno } from "@unocss/preset-uno";import type { EmbedTemplateStyleDecl } from "@webstudio-is/react-sdk";import { expandTailwindShorthand } from "./shorthand";import { substituteVariables } from "./substitute";import warnOnce from "warn-once";-import { parseCssValue } from "../parse-css-value";-import { LayersValue, type StyleProperty } from "@webstudio-is/css-engine";-import { parseShadow } from "../property-parsers/shadows";+import { parseCss } from "../parse-css";let unoLazy: UnoGenerator<Theme> | undefined = undefined;@@ -24,9 +20,7 @@ const uno = () => {*/export const parseTailwindToCss = async (classes: string, warn = warnOnce) => {const expandedClasses = expandTailwindShorthand(classes);- // Workaround for Uno bug: When expandedClasses is "[text-decoration-line:none]", CSS generation fails.- // Adding a preceding space as a fix.- const generated = await uno().generate(` ${expandedClasses}`, {+ const generated = await uno().generate(expandedClasses, {preflights: true,});@@ -34,77 +28,9 @@ export const parseTailwindToCss = async (classes: string, warn = warnOnce) => {return cssWithClasses;};-/**- * Convert CSS prepared by parseTailwindToCss to Webstudio format.- */-const parseCssToWebstudio = (css: string) => {- const ast = csstree.parse(css);- const styles: EmbedTemplateStyleDecl[] = [];-- csstree.walk(ast, {- enter: (node, item, list) => {- if (node.type === "Declaration") {- const property = camelCase(node.property.trim());- const cssValue = csstree.generate(node.value);-- const style: EmbedTemplateStyleDecl = {- property: property as StyleProperty,- value: parseCssValue(property as StyleProperty, cssValue),- };-- styles.push(style);- }- },- });-- return styles;-};--/**- * In WebStudio, background-related properties are managed using a specialized "layer" type.- **/-const postprocessBackgrounds = (- styles: EmbedTemplateStyleDecl[],- warn = warnOnce-) => {- const backgroundProps = [- "backgroundAttachment",- "backgroundClip",- "backgroundBlendMode",- "backgroundImage",- "backgroundOrigin",- "backgroundPosition",- "backgroundRepeat",- "backgroundSize",- ];-- return styles.map((style) => {- if (backgroundProps.includes(style.property)) {- const layersResult = LayersValue.safeParse({- type: "layers",- value: [style.value],- });-- if (layersResult.success) {- return {- property: style.property,- value: layersResult.data,- };- }- warn(- true,- `Failed to convert background property ${- style.property- } with value ${JSON.stringify(style.value)} to layers`- );- }- return style;- });-};-/*** Tailwind by default has border-style: solid, but WebStudio doesn't.- * Provide boder-style: solid if border-width is provided.+ * Provide border-style: solid if border-width is provided.**/const postprocessBorder = (styles: EmbedTemplateStyleDecl[]) => {const borderPairs = [@@ -136,22 +62,6 @@ const postprocessBorder = (styles: EmbedTemplateStyleDecl[]) => {return resultStyles;};-/**- * In WebStudio, box-shadow property is managed using a specialized "layer" type.- **/-const postprocessBoxShadows = (styles: EmbedTemplateStyleDecl[]) => {- return styles.map((style) => {- if (style.property === "boxShadow" && style.value.type === "unparsed") {- const shadowStyle = parseShadow("boxShadow", style.value.value);- return {- property: style.property,- value: shadowStyle,- };- }- return style;- });-};-/*** Parses Tailwind classes to webstudio template format.*/@@ -160,11 +70,9 @@ export const parseTailwindToWebstudio = async (warn = warnOnce) => {const css = await parseTailwindToCss(classes, warn);- let styles = parseCssToWebstudio(css);+ let styles = Object.values(parseCss(css)).flat();// postprocessing- styles = postprocessBackgrounds(styles, warn);styles = postprocessBorder(styles);- styles = postprocessBoxShadows(styles);return styles;};diff --git a/packages/css-data/src/tailwind-parser/shorthand.ts b/packages/css-data/src/tailwind-parser/shorthand.tsindex d147dbf7ba..c1731428b8 100644--- a/packages/css-data/src/tailwind-parser/shorthand.ts+++ b/packages/css-data/src/tailwind-parser/shorthand.ts@@ -1,5 +1,3 @@-export const expandShorthand = (property: string) => {};-/*** Expands shorthand CSS properties into their long-form equivalents.* For example, 'mx' is expanded to 'mr' (margin-right) and 'ml' (margin-left).diff --git a/pnpm-lock.yaml b/pnpm-lock.yamlindex 4531dcebf6..fefcb90b7c 100644--- a/pnpm-lock.yaml+++ b/pnpm-lock.yaml@@ -1068,11 +1068,11 @@ importers:packages/css-data:dependencies:'@unocss/core':- specifier: ^0.56.4- version: 0.56.4+ specifier: ^0.61.0+ version: 0.61.0'@unocss/preset-uno':- specifier: ^0.56.4- version: 0.56.4+ specifier: ^0.61.0+ version: 0.61.0'@webstudio-is/css-engine':specifier: workspace:*version: link:../css-engine@@ -5557,23 +5557,23 @@ packages:'@ungap/[email protected]':resolution: {integrity: sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==}- '@unocss/[email protected]':- resolution: {integrity: sha512-9DL+2adfjWWnFWp2QOJTq2OcfKKo++agaXnCX7CzeD8KgfWCBqxs2RDoxP3HrDbTflhDHdbjz23B+vJoVykhZw==}+ '@unocss/[email protected]':+ resolution: {integrity: sha512-Y/Ly3LPIAzOBlWCdKBVzVzIaaWDsf+oWPIUZlaW7DL++WWypVBCghmxXIT5dyuMGXE560Hj92st4AkXfuVdxGQ==}- '@unocss/[email protected]':- resolution: {integrity: sha512-Q93Bu3wZld+Vj5dqfJYH6phcmjm7fy6mEul64RexLWF00As9WrRzWEXbLVYmmVwUm9e5xcxZO6s98gKq1nTH6Q==}+ '@unocss/[email protected]':+ resolution: {integrity: sha512-9ru/UR4kZ1+jGXpMawV9T8kpL54FrJBmWKMuFlDTEDIwtzDyyfLbt/buoXdzKDLmil9hOXH3IH8+dah/OiiDoA==}- '@unocss/[email protected]':- resolution: {integrity: sha512-FCKs3sUUiHLXQ/ON/ZCQc2JZQox4tv0W8Du+8Y1mRZ6w1yazqqBhR2yDPaEZ51yKcHmDf6ndiTvcJ2tPIz/o8g==}+ '@unocss/[email protected]':+ resolution: {integrity: sha512-P+DdMtPtzAQ2aQ1/WWPoO3X/qvky+Fqq4eKXIvbqXOQ9c2oem7/dnsPeT08zzLIqxVJnuykymPwRT85EumS0gg==}- '@unocss/[email protected]':- resolution: {integrity: sha512-E4VbUe1nIeJ7D1en84osGzwP79IBJ1P9v37Pcx2PvaRAQTKf6WRF7EXzmzEm6HPF+skyGOX9RWuXs9QFODsW8A==}+ '@unocss/[email protected]':+ resolution: {integrity: sha512-mkKOra3dQEc3uI7aPIqa3t8MJXlmpLSgGaPfEJK52xkFe991ex6CiUunYMMWbh6ZSzmdxkO31IwQIH9lcmj/Uw==}- '@unocss/[email protected]':- resolution: {integrity: sha512-llQYQxrA531kl1juYMyaDEEl/IVdHoIPXaaJTdNHbGkSbMqrpZSRzLPsGE+CpaOBKTNqa93UyU1qlUGSr9ZB+A==}+ '@unocss/[email protected]':+ resolution: {integrity: sha512-PooyLVAF4wH9KvW4OKfDxYFuM4qmnlU+Ci6O6RGgVsKyQMq76crRqqK76lbnehg7jOoZJVxmWfQ6k5gT3aQeXQ==}- '@unocss/[email protected]':- resolution: {integrity: sha512-pZmTPqi/Tb+vbwjNXu9+PwxEh7PVe+FwP+pzUbfNSUpE5Hg9CCbl8hpsXRE/r8kdaoKhmw2ryxvjocOgKXG/ag==}+ '@unocss/[email protected]':+ resolution: {integrity: sha512-MCdmfhE6Q9HSWjWqi2sx5/nnKyOEhfhoo+pVumHIqkHQICQ/LuKioFf7Y7e5ycqjFE/7dC2hKGZJ8WTMGIOMwA==}engines: {node: '>=14'}'@upstash/[email protected]':@@ -7834,6 +7834,9 @@ packages:resolution: {integrity: sha512-mbVKXPmS0z0G4XqFDCTllmDQ6coZzn94aMlb0o/A4HEHJCKcanlDZwYJgwnkmgD3jyWhUgj9VsPrfd972yPffA==}engines: {node: '>=12'}+ resolution: {integrity: sha512-iIRwTIf0QKV3UAnYK4PU8uiEc4SRh5jX0mwpIwETPpHdhVM4f53RSwS/vXvN1JhGX+Cs7B8qIq3d6AH49O5fAQ==}+resolution: {integrity: sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==}engines: {node: '>=6'}@@ -14508,34 +14511,35 @@ snapshots:'@ungap/[email protected]': {}- '@unocss/[email protected]': {}+ '@unocss/[email protected]': {}- '@unocss/[email protected]':+ '@unocss/[email protected]':dependencies:- '@unocss/core': 0.56.4+ '@unocss/core': 0.61.0- '@unocss/[email protected]':+ '@unocss/[email protected]':dependencies:- '@unocss/core': 0.56.4- '@unocss/extractor-arbitrary-variants': 0.56.4- '@unocss/rule-utils': 0.56.4+ '@unocss/core': 0.61.0+ '@unocss/extractor-arbitrary-variants': 0.61.0+ '@unocss/rule-utils': 0.61.0- '@unocss/[email protected]':+ '@unocss/[email protected]':dependencies:- '@unocss/core': 0.56.4- '@unocss/preset-mini': 0.56.4- '@unocss/preset-wind': 0.56.4- '@unocss/rule-utils': 0.56.4+ '@unocss/core': 0.61.0+ '@unocss/preset-mini': 0.61.0+ '@unocss/preset-wind': 0.61.0+ '@unocss/rule-utils': 0.61.0- '@unocss/[email protected]':+ '@unocss/[email protected]':dependencies:- '@unocss/core': 0.56.4- '@unocss/preset-mini': 0.56.4- '@unocss/rule-utils': 0.56.4+ '@unocss/core': 0.61.0+ '@unocss/preset-mini': 0.61.0+ '@unocss/rule-utils': 0.61.0- '@unocss/[email protected]':+ '@unocss/[email protected]':dependencies:- '@unocss/core': 0.56.4+ '@unocss/core': 0.61.0+ magic-string: 0.30.10'@upstash/[email protected]':dependencies:@@ -17315,6 +17319,10 @@ snapshots:dependencies:'@jridgewell/sourcemap-codec': 1.4.15+ dependencies:+ '@jridgewell/sourcemap-codec': 1.4.15+dependencies:pify: 4.0.1