Skip to content

Commit 701793d

Browse files
authored
experimental: use --tw- prefix for tailwind css variables (#5294)
Ref #2651
1 parent 3cc2f3b commit 701793d

File tree

3 files changed

+23
-23
lines changed

3 files changed

+23
-23
lines changed

apps/builder/app/builder/features/topbar/entri.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,6 @@ export const Entri = ({ domain, dnsRecords, onClose }: EntriProps) => {
105105
css={{ width: "100%", flexShrink: 0 }}
106106
type="button"
107107
onClick={() => {
108-
// @todo temporary for testing
109108
if (hasProPlan) {
110109
showDialog();
111110
} else {

apps/builder/app/shared/tailwind/tailwind.test.tsx

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ test("ignore dark mode", async () => {
4343
<ws.element
4444
ws:tag="div"
4545
ws:style={css`
46-
--un-bg-opacity: 1;
47-
background-color: rgb(255 255 255 / var(--un-bg-opacity));
46+
--tw-bg-opacity: 1;
47+
background-color: rgb(255 255 255 / var(--tw-bg-opacity));
4848
`}
4949
></ws.element>
5050
)
@@ -90,7 +90,7 @@ test("generate border", async () => {
9090
ws:tag="div"
9191
ws:style={css`
9292
border-style: solid;
93-
border-color: var(--un-default-border-color, #e5e7eb);
93+
border-color: var(--tw-default-border-color, #e5e7eb);
9494
border-width: 1px;
9595
`}
9696
></ws.element>
@@ -115,8 +115,8 @@ test("override border opacity", async () => {
115115
ws:style={css`
116116
border-style: solid;
117117
border-width: 1px;
118-
border-color: rgb(229 231 235 / var(--un-border-opacity));
119-
--un-border-opacity: 0.6;
118+
border-color: rgb(229 231 235 / var(--tw-border-opacity));
119+
--tw-border-opacity: 0.6;
120120
`}
121121
></ws.element>
122122
)
@@ -133,17 +133,17 @@ test("generate shadow", async () => {
133133
<ws.element
134134
ws:tag="div"
135135
ws:style={css`
136-
--un-ring-offset-shadow: 0 0 rgb(0 0 0 / 0);
137-
--un-ring-shadow: 0 0 rgb(0 0 0 / 0);
138-
--un-shadow-inset: ;
139-
--un-shadow:
140-
var(--un-shadow-inset) 0 1px 3px 0
141-
var(--un-shadow-color, rgb(0 0 0 / 0.1)),
142-
var(--un-shadow-inset) 0 1px 2px -1px
143-
var(--un-shadow-color, rgb(0 0 0 / 0.1));
136+
--tw-ring-offset-shadow: 0 0 rgb(0 0 0 / 0);
137+
--tw-ring-shadow: 0 0 rgb(0 0 0 / 0);
138+
--tw-shadow-inset: ;
139+
--tw-shadow:
140+
var(--tw-shadow-inset) 0 1px 3px 0
141+
var(--tw-shadow-color, rgb(0 0 0 / 0.1)),
142+
var(--tw-shadow-inset) 0 1px 2px -1px
143+
var(--tw-shadow-color, rgb(0 0 0 / 0.1));
144144
box-shadow:
145-
var(--un-ring-offset-shadow), var(--un-ring-shadow),
146-
var(--un-shadow);
145+
var(--tw-ring-offset-shadow), var(--tw-ring-shadow),
146+
var(--tw-shadow);
147147
`}
148148
></ws.element>
149149
)
@@ -192,7 +192,7 @@ test("add preflight matching tags", async () => {
192192
/* this one comes from tag preflight */
193193
margin: 0;
194194
border-style: solid;
195-
border-color: var(--un-default-border-color, #e5e7eb);
195+
border-color: var(--tw-default-border-color, #e5e7eb);
196196
border-width: 1px;
197197
text-wrap: pretty;
198198
`}
@@ -234,11 +234,11 @@ test("extract states from tailwind classes", async () => {
234234
<ws.element
235235
ws:tag="div"
236236
ws:style={css`
237-
--un-bg-opacity: 1;
238-
background-color: rgb(79 70 229 / var(--un-bg-opacity));
237+
--tw-bg-opacity: 1;
238+
background-color: rgb(79 70 229 / var(--tw-bg-opacity));
239239
&:hover {
240-
--un-bg-opacity: 1;
241-
background-color: rgb(99 102 241 / var(--un-bg-opacity));
240+
--tw-bg-opacity: 1;
241+
background-color: rgb(99 102 241 / var(--tw-bg-opacity));
242242
}
243243
`}
244244
></ws.element>

apps/builder/app/shared/tailwind/tailwind.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -208,15 +208,16 @@ const parseTailwindClasses = async (classes: string) => {
208208
})
209209
.join(" ");
210210
const generated = await generator.generate(classes);
211-
const css = generated.css;
211+
// use tailwind prefix instead of unocss one
212+
const css = generated.css.replaceAll("--un-", "--tw-");
212213
let parsedStyles: Omit<ParsedStyleDecl, "selector">[] = [];
213214
// @todo probably builtin in v4
214215
if (css.includes("border")) {
215216
// Allow adding a border to an element by just adding a border-width. (https://github.com/tailwindcss/tailwindcss/pull/116)
216217
// [UnoCSS]: allow to override the default border color with css var `--un-default-border-color`
217218
const reset = `.styles {
218219
border-style: solid;
219-
border-color: var(--un-default-border-color, #e5e7eb);
220+
border-color: var(--tw-default-border-color, #e5e7eb);
220221
border-width: 0;
221222
}`;
222223
parsedStyles.push(...parseCss(reset));

0 commit comments

Comments
 (0)