Skip to content

Commit 51ae170

Browse files
committed
refactor: upgrade uno
The new version deprecated "uno" preset in favor of wind3 and wind4 presets to support both tailwind versions. We can switch to wind4 later.
1 parent 678dde8 commit 51ae170

File tree

3 files changed

+48
-68
lines changed

3 files changed

+48
-68
lines changed

packages/css-data/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,15 @@
3333
"private": true,
3434
"sideEffects": false,
3535
"dependencies": {
36-
"@unocss/core": "^0.65.1",
37-
"@unocss/preset-legacy-compat": "^0.65.1",
38-
"@unocss/preset-uno": "^0.65.1",
36+
"@unocss/core": "66.1.0-beta.7",
37+
"@unocss/preset-legacy-compat": "66.1.0-beta.7",
38+
"@unocss/preset-wind3": "66.1.0-beta.7",
3939
"@webstudio-is/css-engine": "workspace:*",
4040
"change-case": "^5.4.4",
4141
"colord": "^2.9.3",
4242
"css-tree": "^2.3.1",
4343
"openai": "^3.2.1",
44-
"p-retry": "^6.2.0",
44+
"p-retry": "^6.2.1",
4545
"warn-once": "^0.1.1"
4646
}
4747
}

packages/css-data/src/tailwind-parser/parse.ts

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
import { UnoGenerator, createGenerator } from "@unocss/core";
2-
import { type Theme, presetUno } from "@unocss/preset-uno";
2+
import { presetWind3 } from "@unocss/preset-wind3";
33
import { presetLegacyCompat } from "@unocss/preset-legacy-compat";
44
import warnOnce from "warn-once";
55
import { substituteVariables } from "./substitute";
66
import { parseCss, type ParsedStyleDecl } from "../parse-css";
77

88
type Warn = (condition: boolean, message: string) => void;
99

10-
let unoLazy: UnoGenerator<Theme> | undefined = undefined;
10+
let unoLazy: UnoGenerator | undefined = undefined;
1111

1212
const createUnoGenerator = async () => {
1313
unoLazy = await createGenerator({
1414
presets: [
15-
presetUno(),
15+
presetWind3({ preflight: "on-demand" }),
1616
// until we support oklch natively
1717
presetLegacyCompat({ legacyColorSpace: true }),
1818
],
@@ -28,10 +28,7 @@ export const parseTailwindToCss = async (
2828
warn: Warn = warnOnce
2929
): Promise<string> => {
3030
const generator = unoLazy ?? (await createUnoGenerator());
31-
const generated = await generator.generate(classes, {
32-
preflights: true,
33-
});
34-
31+
const generated = await generator.generate(classes);
3532
const cssWithClasses = substituteVariables(generated.css, warn);
3633
return cssWithClasses;
3734
};

pnpm-lock.yaml

Lines changed: 40 additions & 57 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)