Fix /*! data-uri */ lookup path

lauriro · lauriro · commit 9b73f1c6dfb7 · 2026-05-31T23:39:43.000+03:00
diff --git a/lib/build.js b/lib/build.js
@@ -197,6 +197,7 @@ function html(opts, next) {
 
 	$$("[exclude]").forEach(remove)
 	classes = new Set()
+	cssOpts.root = inDir
 
 	following("cat", "cat-drop", function(el, siblings) {
 		if (opts.cat === false) {
@@ -283,7 +284,6 @@ function html(opts, next) {
 		write("", cacheFile, JSON.stringify(cache, null, 2))
 	}
 
-	cssOpts.root = inDir
 	cssOpts.url = urlFn
 	if (opts.cssPrune !== false) {
 		$$("[class]").forEach(function(el) {
diff --git a/test/data/build-simple/d.css b/test/data/build-simple/d.css
@@ -1,4 +1,4 @@
 .d {
 	color: red;
-	background: url("b.svg");
+	background: url("b.svg"); /*! data-uri */
 }
diff --git a/test/data/snap/3/d-2438.css b/test/data/snap/3/d-2438.css
@@ -0,0 +1 @@
+.d{color:red;background:url('data:image/svg+xml;,<svg b=""></svg>')}
diff --git a/test/data/snap/3/d-363d.css b/test/data/snap/3/d-363d.css
diff --git a/test/data/snap/3/index.html b/test/data/snap/3/index.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html><html><head><base href=/ ><link rel=stylesheet href=a.css><link rel=stylesheet href=d-363d.css><link rel=manifest href=app.webmanifest><link rel=a href=a.json><link rel=b href=b.json?daa5><link rel=c href=c-daa5.json></head><body><img src=c.svg><img src=a.svg><style>
+<!DOCTYPE html><html><head><base href=/ ><link rel=stylesheet href=a.css><link rel=stylesheet href=d-2438.css><link rel=manifest href=app.webmanifest><link rel=a href=a.json><link rel=b href=b.json?daa5><link rel=c href=c-daa5.json></head><body><img src=c.svg><img src=a.svg><style>
 body{background:url(b.svg)}
 </style><style>
 p{top:2px}
diff --git a/test/data/snap/3/ls.snap b/test/data/snap/3/ls.snap
@@ -7,7 +7,7 @@
 ./b.svg
 ./c-daa5.json
 ./c.svg
-./d-363d.css
+./d-2438.css
 ./d.css
 ./dev.html
 ./index.html
diff --git a/test/data/snap/4/build/d-2438.css b/test/data/snap/4/build/d-2438.css
@@ -0,0 +1 @@
+.d{color:red;background:url('data:image/svg+xml;,<svg b=""></svg>')}
diff --git a/test/data/snap/4/build/d-df49.css b/test/data/snap/4/build/d-df49.css
diff --git a/test/data/snap/4/build/index.html b/test/data/snap/4/build/index.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html><html><head><base href=/ ><link rel=stylesheet href=9002.css><link rel=stylesheet href=d-df49.css><link rel=manifest href=app.webmanifest><link rel=a href=8d6b.json><link rel=b href=b.json?daa5><link rel=c href=c-daa5.json></head><body><img src=b1a4.svg><img src=a.svg><style>
+<!DOCTYPE html><html><head><base href=/ ><link rel=stylesheet href=9002.css><link rel=stylesheet href=d-2438.css><link rel=manifest href=app.webmanifest><link rel=a href=8d6b.json><link rel=b href=b.json?daa5><link rel=c href=c-daa5.json></head><body><img src=b1a4.svg><img src=a.svg><style>
 body{background:url(f78c.svg)}
 </style><style>
 p{top:2px}
diff --git a/test/data/snap/4/index.html b/test/data/snap/4/index.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html><html><head><base href=/ ><link rel=stylesheet href=9002.css><link rel=stylesheet href=d-df49.css><link rel=manifest href=app.webmanifest><link rel=a href=8d6b.json><link rel=b href=b.json?daa5><link rel=c href=c-daa5.json></head><body><img src=b1a4.svg><img src=a.svg><style>
+<!DOCTYPE html><html><head><base href=/ ><link rel=stylesheet href=9002.css><link rel=stylesheet href=d-2438.css><link rel=manifest href=app.webmanifest><link rel=a href=8d6b.json><link rel=b href=b.json?daa5><link rel=c href=c-daa5.json></head><body><img src=b1a4.svg><img src=a.svg><style>
 body{background:url(f78c.svg)}
 </style><style>
 p{top:2px}
diff --git a/test/data/snap/4/ls.snap b/test/data/snap/4/ls.snap
@@ -12,7 +12,7 @@
 ./build/b.json
 ./build/b1a4.svg
 ./build/c-daa5.json
-./build/d-df49.css
+./build/d-2438.css
 ./build/f78c.svg
 ./build/index.html
 ./c.svg

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`	`1`	`.d {`
`2`	`2`	`color: red;`
`3`		`- background: url("b.svg");`
	`3`	`+ background: url("b.svg"); /! data-uri /`
`4`	`4`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+.d{color:red;background:url('data:image/svg+xml;,<svg b=""></svg>')}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-<!DOCTYPE html><html><head><base href=/ ><link rel=stylesheet href=a.css><link rel=stylesheet href=d-363d.css><link rel=manifest href=app.webmanifest><link rel=a href=a.json><link rel=b href=b.json?daa5><link rel=c href=c-daa5.json></head><body><img src=c.svg><img src=a.svg><style>`
	`1`	`+<!DOCTYPE html><html><head><base href=/ ><link rel=stylesheet href=a.css><link rel=stylesheet href=d-2438.css><link rel=manifest href=app.webmanifest><link rel=a href=a.json><link rel=b href=b.json?daa5><link rel=c href=c-daa5.json></head><body><img src=c.svg><img src=a.svg><style>`
`2`	`2`	`body{background:url(b.svg)}`
`3`	`3`	`</style><style>`
`4`	`4`	`p{top:2px}`