fix: replace escaped quotes within class names during SSR

tw-in-js · May 5, 2022 · b212b52 · b212b52
1 parent 7795440
commit b212b52
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/.changeset/angry-humans-relax.md b/.changeset/angry-humans-relax.md
@@ -0,0 +1,5 @@
+---
+'twind': patch
+---
+
+fix: replace escaped quotes within class names during SSR
diff --git a/packages/twind/src/ssr.ts b/packages/twind/src/ssr.ts
@@ -229,9 +229,11 @@ export function consume(markup: string, tw: (className: string) => string = tw$)
     // but this works for now
     const token =
       quote == `"`
-        ? value.replace(/(\[)&#x27;|&#x27;(])/g, `$1'$2`)
+        ? // `'` -> &#39; &apos; &#x27;
+          value.replace(/(=|\[)(?:&#39;|&apos;|&#x27;)|(?:&#39;|&apos;|&#x27;)(])/g, `$1'$2`)
         : quote == `'`
-        ? value.replace(/(\[)&quot;|&quot;(])/g, `$1"$2`)
+        ? // `"` -> &#34; &quot; &#x22;
+          value.replace(/(=|\[)(?:&#34;|&quot;|&#x22;)|(?:&#34;|&quot;|&#x22;)(])/g, `$1"$2`)
         : value
 
     const className = tw(token)