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: upgrade uno (#4905)
Bogdan Chadkinfb40632e99c8
diff --git a/packages/css-data/package.json b/packages/css-data/package.jsonindex ee9a05bdf8..8ce4a8a505 100644--- a/packages/css-data/package.json+++ b/packages/css-data/package.json@@ -33,15 +33,15 @@"private": true,"sideEffects": false,"dependencies": {- "@unocss/core": "^0.65.1",- "@unocss/preset-legacy-compat": "^0.65.1",- "@unocss/preset-uno": "^0.65.1",+ "@unocss/core": "66.1.0-beta.7",+ "@unocss/preset-legacy-compat": "66.1.0-beta.7",+ "@unocss/preset-wind3": "66.1.0-beta.7","@webstudio-is/css-engine": "workspace:*","change-case": "^5.4.4","colord": "^2.9.3","css-tree": "^2.3.1","openai": "^3.2.1",- "p-retry": "^6.2.0",+ "p-retry": "^6.2.1","warn-once": "^0.1.1"}}diff --git a/packages/css-data/src/tailwind-parser/parse.ts b/packages/css-data/src/tailwind-parser/parse.tsindex d382be65b5..3f6b260333 100644--- a/packages/css-data/src/tailwind-parser/parse.ts+++ b/packages/css-data/src/tailwind-parser/parse.ts@@ -1,5 +1,5 @@import { UnoGenerator, createGenerator } from "@unocss/core";-import { type Theme, presetUno } from "@unocss/preset-uno";+import { presetWind3 } from "@unocss/preset-wind3";import { presetLegacyCompat } from "@unocss/preset-legacy-compat";import warnOnce from "warn-once";import { substituteVariables } from "./substitute";@@ -7,12 +7,12 @@ import { parseCss, type ParsedStyleDecl } from "../parse-css";type Warn = (condition: boolean, message: string) => void;-let unoLazy: UnoGenerator<Theme> | undefined = undefined;+let unoLazy: UnoGenerator | undefined = undefined;const createUnoGenerator = async () => {unoLazy = await createGenerator({presets: [- presetUno(),+ presetWind3({ preflight: "on-demand" }),// until we support oklch nativelypresetLegacyCompat({ legacyColorSpace: true }),],@@ -28,10 +28,7 @@ export const parseTailwindToCss = async (warn: Warn = warnOnce): Promise<string> => {const generator = unoLazy ?? (await createUnoGenerator());- const generated = await generator.generate(classes, {- preflights: true,- });-+ const generated = await generator.generate(classes);const cssWithClasses = substituteVariables(generated.css, warn);return cssWithClasses;};diff --git a/pnpm-lock.yaml b/pnpm-lock.yamlindex 48221887bb..d1062fa725 100644--- a/pnpm-lock.yaml+++ b/pnpm-lock.yaml@@ -1196,14 +1196,14 @@ importers:packages/css-data:dependencies:'@unocss/core':- specifier: ^0.65.1- version: 0.65.1+ specifier: 66.1.0-beta.7+ version: 66.1.0-beta.7'@unocss/preset-legacy-compat':- specifier: ^0.65.1- version: 0.65.1- '@unocss/preset-uno':- specifier: ^0.65.1- version: 0.65.1+ specifier: 66.1.0-beta.7+ version: 66.1.0-beta.7+ '@unocss/preset-wind3':+ specifier: 66.1.0-beta.7+ version: 66.1.0-beta.7'@webstudio-is/css-engine':specifier: workspace:*version: link:../css-engine@@ -1220,8 +1220,8 @@ importers:specifier: ^3.2.1version: 3.2.1p-retry:- specifier: ^6.2.0- version: 6.2.0+ specifier: ^6.2.1+ version: 6.2.1warn-once:specifier: ^0.1.1version: 0.1.1@@ -5269,26 +5269,23 @@ packages:resolution: {integrity: sha512-AjOC3zfnxd6S4Eiy3jwktJPclqhFHNyd8L6Gycf9WUPoKZpgM5PjkxY1X7uSy61xVpiJDhhk7XT2NVsN3ALTWg==}engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}- '@unocss/[email protected]':- resolution: {integrity: sha512-Ke0WNZjfSCE6pniJb8PjiwhO6/McxVb1EQYrkkz8aJuR83xu+AEcTog9D4N9EUkRfHS5tZYXQtTj4Uh90T6CEg==}-- '@unocss/[email protected]':- resolution: {integrity: sha512-VpF7j29TlmVjNolkIjhQ/cwYkuPUoXLv+ko62YRMibE5632QepbNob69pNYGOZustrZt3LvgHD/GcriKwJO4BA==}+ '@unocss/[email protected]':+ resolution: {integrity: sha512-l1/r+Jd9TbsRqR/geEdIV/Erzvs26GitTtMVsGcJfuaK1/WWOLtbSHRUDQAB/UpcOOWvuNuAv4UWsXX9Z0DFmw==}- '@unocss/[email protected]':- resolution: {integrity: sha512-NKprPzVeZnwLs89APm4foJ01jz3KywwHIJo5n2RqmURdjVg71iW+H/YW3169i8s/0KlKUHO9qWKyOMNvqTZoqw==}+ '@unocss/[email protected]':+ resolution: {integrity: sha512-LD8W9PlpHnFmuynI+TJzdE5z9OKY/tVaagY/Ak1mICFEWveH3jFuN13KH2jaI3/V2KaTwkcY/8tGQJXv8dKWAw==}- '@unocss/[email protected]':- resolution: {integrity: sha512-dKIxi+ChWSZvXG8I7yVBjw4FLHdAvKrrCN9bjKpR4/4epKD6jRtEcR6S1wL6XSBWabh7V7D/VbVk+XZ6WsGuXA==}+ '@unocss/[email protected]':+ resolution: {integrity: sha512-AZBC95jFCyiJetxFa/GfM+FCVIrNT6Kd8mVBiighSQfhUEmfTLhTen41/tUrCtUtxpbwgyxRmmkSUZjvsymodw==}- '@unocss/[email protected]':- resolution: {integrity: sha512-OSEkphrlR9/RM5un9t9AqVQXOGBLJgjcEweZSm2ng9AK7BsxBXuVP1FelmRqeXVYT5uFtBoD4dfgCgBjGFIW9Q==}+ '@unocss/[email protected]':+ resolution: {integrity: sha512-5v9RNFTk2OMLbE45JVoYA0HtZKCDCI3j7uRAcuRLVP3O/yAd9JlP/b8ou3wvtgxHTXFEgk6Pt8dFDKPadA3Hrw==}- '@unocss/[email protected]':- resolution: {integrity: sha512-7rw3hAWOkWMSjoprWKcQidqJRFQm8qM0IdLjFLQa2ROSzPSnIlNisXGEwAphf4/VYdP7+URUnu5eySQsIRWRzg==}+ '@unocss/[email protected]':+ resolution: {integrity: sha512-JgiHl2L0J6VdmowGk45WB9NLYxO1tTQpr6GspMyhMz63pkcqjJtP5g8JfeIw5G0uwfWhoGubqG3RxKKaWHsoyg==}- '@unocss/[email protected]':- resolution: {integrity: sha512-XGXdXsRmIuMDQk/3Fd3g5JMhsyDGWsTfs6aN4vFQ1rfdSgY4UwbslqUNbIH9xxoTfmzUOJ2lhNrFw78RygCNSA==}+ '@unocss/[email protected]':+ resolution: {integrity: sha512-oJ5lcHRgN1aabsszkBXoiYp0G6LLM011BJoAEfKOeRZ14FGFlg0zuOi/h7aKlVuIvBt6q8BWosJLlZSAQnNypg==}engines: {node: '>=14'}'@vanilla-extract/[email protected]':@@ -7099,9 +7096,6 @@ packages:resolution: {integrity: sha512-8UnnX2PeRAPZuN12svgR9j7M1uWMovg/CEnIwIG0LFkXSJJe4PdfUGiTGl8V9bsBHFUtfVINcSyYxd7q+kx9fA==}engines: {node: '>=12'}- resolution: {integrity: sha512-zXeaYRgZ6ldS1RJJUrMrYgNJ4fdwnyI6tVqoiIhyCyv5IVTK9BU8Ic2l253GGETQHxI4HNUwhJ3fjDhKqEoaAw==}-resolution: {integrity: sha512-sNPKHvyjVf7gyjwS4xGTaW/mCnF8wnjtifKBEhxfZ7E/S8tQ0rssrwGNn6q8JH/ohItJfSQp9mBtQYuTlH5QnA==}@@ -7727,8 +7721,8 @@ packages:resolution: {integrity: sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==}engines: {node: '>=10'}- resolution: {integrity: sha512-JA6nkq6hKyWLLasXQXUrO4z8BUZGUt/LjlJxx8Gb2+2ntodU/SS63YZ8b0LUTbQ8ZB9iwOfhEPhg4ykKnn2KsA==}+ resolution: {integrity: sha512-hEt02O4hUct5wtwg4H4KcWgDdm+l1bOaEy/hWzd8xtXB9BqxTWBBhb+2ImAtH4Cv4rPjV76xN3Zumqk3k3AhhQ==}engines: {node: '>=16.17'}@@ -12417,39 +12411,32 @@ snapshots:'@typescript-eslint/types': 8.26.1eslint-visitor-keys: 4.2.0- '@unocss/[email protected]': {}-- '@unocss/[email protected]':- dependencies:- '@unocss/core': 0.65.1+ '@unocss/[email protected]': {}- '@unocss/[email protected]':+ '@unocss/[email protected]':dependencies:- '@unocss/core': 0.65.1+ '@unocss/core': 66.1.0-beta.7- '@unocss/[email protected]':+ '@unocss/[email protected]':dependencies:- '@unocss/core': 0.65.1- '@unocss/extractor-arbitrary-variants': 0.65.1- '@unocss/rule-utils': 0.65.1+ '@unocss/core': 66.1.0-beta.7- '@unocss/[email protected]':+ '@unocss/[email protected]':dependencies:- '@unocss/core': 0.65.1- '@unocss/preset-mini': 0.65.1- '@unocss/preset-wind': 0.65.1- '@unocss/rule-utils': 0.65.1+ '@unocss/core': 66.1.0-beta.7+ '@unocss/extractor-arbitrary-variants': 66.1.0-beta.7+ '@unocss/rule-utils': 66.1.0-beta.7- '@unocss/[email protected]':+ '@unocss/[email protected]':dependencies:- '@unocss/core': 0.65.1- '@unocss/preset-mini': 0.65.1- '@unocss/rule-utils': 0.65.1+ '@unocss/core': 66.1.0-beta.7+ '@unocss/preset-mini': 66.1.0-beta.7+ '@unocss/rule-utils': 66.1.0-beta.7- '@unocss/[email protected]':+ '@unocss/[email protected]':dependencies:- '@unocss/core': 0.65.1- magic-string: 0.30.15+ '@unocss/core': 66.1.0-beta.7+ magic-string: 0.30.17'@vanilla-extract/[email protected]':dependencies:@@ -14557,10 +14544,6 @@ snapshots:dependencies:'@jridgewell/sourcemap-codec': 1.5.0- dependencies:- '@jridgewell/sourcemap-codec': 1.5.0-dependencies:'@jridgewell/sourcemap-codec': 1.5.0@@ -15571,7 +15554,7 @@ snapshots:dependencies:aggregate-error: 3.1.0dependencies:'@types/retry': 0.12.2is-network-error: 1.1.0