fix: bg-[url(xxx)] value

unocss-applet · Aug 17, 2022 · 8d84443 · 8d84443
1 parent 897a8f3
commit 8d84443
Show file tree

Hide file tree

Showing 9 changed files with 129 additions and 120 deletions.
diff --git a/package.json b/package.json
@@ -30,7 +30,7 @@
     "rimraf": "^3.0.2",
     "typescript": "^4.7.4",
     "unbuild": "^0.8.8",
-    "unocss": "^0.45.6",
+    "unocss": "^0.45.7",
     "unocss-applet": "workspace:*",
     "vite": "^2.9.15",
     "vitest": "^0.21.1"

diff --git a/packages/preset-applet/package.json b/packages/preset-applet/package.json
@@ -54,8 +54,8 @@
     "stub": "unbuild --stub"
   },
   "dependencies": {
-    "@unocss/core": "0.45.6",
-    "@unocss/preset-mini": "0.45.6",
-    "@unocss/preset-wind": "0.45.6"
+    "@unocss/core": "0.45.7",
+    "@unocss/preset-mini": "0.45.7",
+    "@unocss/preset-wind": "0.45.7"
   }
 }
diff --git a/packages/preset-rem-to-rpx/package.json b/packages/preset-rem-to-rpx/package.json
@@ -37,6 +37,6 @@
     "stub": "unbuild --stub"
   },
   "dependencies": {
-    "@unocss/core": "^0.45.6"
+    "@unocss/core": "^0.45.7"
   }
 }
diff --git a/packages/transformer-rename-class/package.json b/packages/transformer-rename-class/package.json
@@ -35,7 +35,7 @@
     "stub": "unbuild --stub"
   },
   "dependencies": {
-    "@unocss/core": "^0.45.6"
+    "@unocss/core": "^0.45.7"
   },
   "devDependencies": {
     "magic-string": "^0.26.2"

diff --git a/packages/transformer-rename-class/src/index.ts b/packages/transformer-rename-class/src/index.ts
@@ -78,13 +78,13 @@ export default function transformerRenameClass(options: RenameClassOptions = {})
             continue
 
           const start = match.index!
-          const matchSplit = match[0].split('=')
+          const matchSplit = match[0].split('class=')
 
           const body = expandVariantGroup(matchSplit[1].slice(1, -1), options.separators)
 
           if (charReg.test(body)) {
             const replacements = await compileApplet(body, ctx)
-            s.overwrite(start, start + match[0].length, `${matchSplit[0]}="${replacements.join(' ')}"`)
+            s.overwrite(start, start + match[0].length, `${matchSplit[0]}class="${replacements.join(' ')}"`)
           }
         }
 
@@ -95,12 +95,13 @@ export default function transformerRenameClass(options: RenameClassOptions = {})
           if (/\$\{.*\}/g.test(match[0]))
             continue
 
+          // There may be no need
           // https://tailwindcss.com/docs/background-image#arbitrary-values
           // skip all the image formats in HTML for bg-[url('...')]
           if (/\.(png|jpg|jpeg|gif|svg)/g.test(match[0]))
             continue
           // skip http(s)://
-          if (/^http(s)?:\/\//g.test(match[0]))
+          if (/http(s)?:\/\//g.test(match[0]))
             continue
 
           const start = match.index!

diff --git a/playground/src/pages/index/index.vue b/playground/src/pages/index/index.vue
@@ -21,7 +21,10 @@ const type = 'text'
     <div :class="{ 'is-textarea-icon': type === 'textarea' }">
       uniapp
     </div>
-    <div class="bg-[url('https://raw.githubusercontent.com/unocss/unocss/main/playground/public/icon-gray.svg')]">
+    <div
+      class="bg-[url(https://avatars.githubusercontent.com/u/40738594?s=40&v=4)]"
+      :class="{ 'bg-[url(https://avatars.githubusercontent.com/u/40738594?s=40&v=4)]': type === 'textarea' }"
+    >
       uniapp
     </div>
     <div class="m-0.5 p-1 text-2xl" :class="true ? '' : 'text-yellow-500 p-2.5'">

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/test/fixtures/rules.vue b/test/fixtures/rules.vue
@@ -21,7 +21,10 @@ const type = 'text'
     <div :class="{ 'is-textarea-icon': type === 'textarea' }">
       uniapp
     </div>
-    <div class="bg-[url('https://raw.githubusercontent.com/unocss/unocss/main/playground/public/icon-gray.svg')]">
+    <div
+      class="bg-[url(https://avatars.githubusercontent.com/u/40738594?s=40&v=4)]"
+      :class="{ 'bg-[url(https://avatars.githubusercontent.com/u/40738594?s=40&v=4)]': type === 'textarea' }"
+    >
       uniapp
     </div>
     <div class="m-0.5 p-1 text-2xl" :class="true ? '' : 'text-yellow-500 p-2.5'">