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
experimental: use --tw- prefix for tailwind css variables (#5294)
Bogdan Chadkin701793d8b8f2
diff --git a/apps/builder/app/builder/features/topbar/entri.tsx b/apps/builder/app/builder/features/topbar/entri.tsxindex eacb1dcd6f..f8e48cafcc 100644--- a/apps/builder/app/builder/features/topbar/entri.tsx+++ b/apps/builder/app/builder/features/topbar/entri.tsx@@ -105,7 +105,6 @@ export const Entri = ({ domain, dnsRecords, onClose }: EntriProps) => {css={{ width: "100%", flexShrink: 0 }}type="button"onClick={() => {- // @todo temporary for testingif (hasProPlan) {showDialog();} else {diff --git a/apps/builder/app/shared/tailwind/tailwind.test.tsx b/apps/builder/app/shared/tailwind/tailwind.test.tsxindex 339d6d0ca4..19cc8e3df0 100644--- a/apps/builder/app/shared/tailwind/tailwind.test.tsx+++ b/apps/builder/app/shared/tailwind/tailwind.test.tsx@@ -43,8 +43,8 @@ test("ignore dark mode", async () => {<ws.elementws: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>)@@ -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>@@ -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>)@@ -133,17 +133,17 @@ test("generate shadow", async () => {<ws.elementws: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>)@@ -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;`}@@ -234,11 +234,11 @@ test("extract states from tailwind classes", async () => {<ws.elementws: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>diff --git a/apps/builder/app/shared/tailwind/tailwind.ts b/apps/builder/app/shared/tailwind/tailwind.tsindex 8610067339..2844faa68c 100644--- a/apps/builder/app/shared/tailwind/tailwind.ts+++ b/apps/builder/app/shared/tailwind/tailwind.ts@@ -208,7 +208,8 @@ 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 v4if (css.includes("border")) {@@ -216,7 +217,7 @@ const parseTailwindClasses = async (classes: string) => {// [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));