Skip to content

experimental: use --tw- prefix for tailwind css variables #5294

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 26, 2025
Merged

experimental: use --tw- prefix for tailwind css variables #5294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion apps/builder/app/builder/features/topbar/entri.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,6 @@ export const Entri = ({ domain, dnsRecords, onClose }: EntriProps) => {
css={{ width: "100%", flexShrink: 0 }}
type="button"
onClick={() => {
// @todo temporary for testing
if (hasProPlan) {
showDialog();
} else {
Expand Down
40 changes: 20 additions & 20 deletions apps/builder/app/shared/tailwind/tailwind.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ test("ignore dark mode", async () => {
<ws.element
ws:tag="div"
ws:style={css`
--un-bg-opacity: 1;
background-color: rgb(255 255 255 / var(--un-bg-opacity));
--tw-bg-opacity: 1;
background-color: rgb(255 255 255 / var(--tw-bg-opacity));
`}
></ws.element>
)
Expand Down Expand Up @@ -90,7 +90,7 @@ test("generate border", async () => {
ws:tag="div"
ws:style={css`
border-style: solid;
border-color: var(--un-default-border-color, #e5e7eb);
border-color: var(--tw-default-border-color, #e5e7eb);
border-width: 1px;
`}
></ws.element>
Expand All @@ -115,8 +115,8 @@ test("override border opacity", async () => {
ws:style={css`
border-style: solid;
border-width: 1px;
border-color: rgb(229 231 235 / var(--un-border-opacity));
--un-border-opacity: 0.6;
border-color: rgb(229 231 235 / var(--tw-border-opacity));
--tw-border-opacity: 0.6;
`}
></ws.element>
)
Expand All @@ -133,17 +133,17 @@ test("generate shadow", async () => {
<ws.element
ws:tag="div"
ws:style={css`
--un-ring-offset-shadow: 0 0 rgb(0 0 0 / 0);
--un-ring-shadow: 0 0 rgb(0 0 0 / 0);
--un-shadow-inset: ;
--un-shadow:
var(--un-shadow-inset) 0 1px 3px 0
var(--un-shadow-color, rgb(0 0 0 / 0.1)),
var(--un-shadow-inset) 0 1px 2px -1px
var(--un-shadow-color, rgb(0 0 0 / 0.1));
--tw-ring-offset-shadow: 0 0 rgb(0 0 0 / 0);
--tw-ring-shadow: 0 0 rgb(0 0 0 / 0);
--tw-shadow-inset: ;
--tw-shadow:
var(--tw-shadow-inset) 0 1px 3px 0
var(--tw-shadow-color, rgb(0 0 0 / 0.1)),
var(--tw-shadow-inset) 0 1px 2px -1px
var(--tw-shadow-color, rgb(0 0 0 / 0.1));
box-shadow:
var(--un-ring-offset-shadow), var(--un-ring-shadow),
var(--un-shadow);
var(--tw-ring-offset-shadow), var(--tw-ring-shadow),
var(--tw-shadow);
`}
></ws.element>
)
Expand Down Expand Up @@ -192,7 +192,7 @@ test("add preflight matching tags", async () => {
/* this one comes from tag preflight */
margin: 0;
border-style: solid;
border-color: var(--un-default-border-color, #e5e7eb);
border-color: var(--tw-default-border-color, #e5e7eb);
border-width: 1px;
text-wrap: pretty;
`}
Expand Down Expand Up @@ -234,11 +234,11 @@ test("extract states from tailwind classes", async () => {
<ws.element
ws:tag="div"
ws:style={css`
--un-bg-opacity: 1;
background-color: rgb(79 70 229 / var(--un-bg-opacity));
--tw-bg-opacity: 1;
background-color: rgb(79 70 229 / var(--tw-bg-opacity));
&:hover {
--un-bg-opacity: 1;
background-color: rgb(99 102 241 / var(--un-bg-opacity));
--tw-bg-opacity: 1;
background-color: rgb(99 102 241 / var(--tw-bg-opacity));
}
`}
></ws.element>
Expand Down
5 changes: 3 additions & 2 deletions apps/builder/app/shared/tailwind/tailwind.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,15 +208,16 @@ const parseTailwindClasses = async (classes: string) => {
})
.join(" ");
const generated = await generator.generate(classes);
const css = generated.css;
// use tailwind prefix instead of unocss one
const css = generated.css.replaceAll("--un-", "--tw-");
let parsedStyles: Omit<ParsedStyleDecl, "selector">[] = [];
// @todo probably builtin in v4
if (css.includes("border")) {
// Allow adding a border to an element by just adding a border-width. (https://github.com/tailwindcss/tailwindcss/pull/116)
// [UnoCSS]: allow to override the default border color with css var `--un-default-border-color`
const reset = `.styles {
border-style: solid;
border-color: var(--un-default-border-color, #e5e7eb);
border-color: var(--tw-default-border-color, #e5e7eb);
border-width: 0;
}`;
parsedStyles.push(...parseCss(reset));
Expand Down