build: Do not try to copy data url

litejs · Dec 9, 2024 · a893020 · a893020
1 parent 5021ee4
commit a893020
Show file tree

Hide file tree

Showing 13 changed files with 20 additions and 20 deletions.
diff --git a/lib/build.js b/lib/build.js
@@ -381,13 +381,14 @@ function view2js(content) {
 function cssImport(str, attrs) {
 	var match, out
 	, lastIndex = 0
-	, re = /@import\s+url\((['"]?)(?!data:)(.+?)\1\);*/ig
+	, re = /@import\s+url\((['"]?)(.+?)\1\);*/ig
 	, inDir = path.resolve(attrs.inDir || "", attrs.inFile || "").replace(/[^\/]+$/, "")
 	, outDir = path.resolve(attrs.outDir || "", attrs.outFile || "inline").replace(/[^\/]+$/, "")
+	, noCpRe = /^(https?|data):/
 
 	if (inDir !== outDir) {
-		str = str.replace(/\/\*(?!!)[^]*?\*\/|url\((['"]?)(?!data:)(.+?)\1\)/ig, function(_, q, name) {
-			if (name && !httpRe.test(name)) {
+		str = str.replace(/\/\*(?!!)[^]*?\*\/|url\((['"]?)(.+?)\1\)/ig, function(_, q, name) {
+			if (name && !noCpRe.test(name)) {
 				try {
 					cli.cp(inDir + name, path.join(outDir, name))
 				} catch (e) {

diff --git a/test/data/build-cp/a.css b/test/data/build-cp/a.css
@@ -1,4 +1,4 @@
 		.a {
-			background: url("a.svg");
+			background: url("a.svg") url('data:x');
 		}
 
diff --git a/test/data/build-cp/dev.html b/test/data/build-cp/dev.html
@@ -3,8 +3,8 @@
 <html>
 	<head>
 		<base href="/">
-		<link rel="stylesheet" href="a.css">
-		<style>
+		<link rel="stylesheet" href="a.css" min="a-{h}.css">
+		<style min>
 		.b {
 			background: url("b.svg");
 		}

diff --git a/test/data/snap/1/a-72b5.css b/test/data/snap/1/a-72b5.css
@@ -0,0 +1,2 @@
+.a{background:url(a.svg) url("data:x")}
+.b{background:url(b.svg)}
diff --git a/test/data/snap/1/index.html b/test/data/snap/1/index.html
@@ -1,3 +1 @@
-<!DOCTYPE html><html><head><base href=/ ><link rel=stylesheet href=a.css><style>
-.b{background:url(b.svg)}
-</style></head><body><img src=c.svg></body></html>
+<!DOCTYPE html><html><head><base href=/ ><link rel=stylesheet href=a-72b5.css></head><body><img src=c.svg></body></html>
diff --git a/test/data/snap/1/ls.snap b/test/data/snap/1/ls.snap
@@ -1,4 +1,5 @@
 .
+./a-72b5.css
 ./a.css
 ./a.svg
 ./b.svg

diff --git a/test/data/snap/2/build/a-72b5.css b/test/data/snap/2/build/a-72b5.css
@@ -0,0 +1,2 @@
+.a{background:url(a.svg) url("data:x")}
+.b{background:url(b.svg)}
diff --git a/test/data/snap/2/build/a.css b/test/data/snap/2/build/a.css
diff --git a/test/data/snap/2/build/a.svg b/test/data/snap/2/build/a.svg
diff --git a/test/data/snap/2/build/b.svg b/test/data/snap/2/build/b.svg
diff --git a/test/data/snap/2/build/index.html b/test/data/snap/2/build/index.html
@@ -1,3 +1 @@
-<!DOCTYPE html><html><head><base href=/ ><link rel=stylesheet href=a.css><style>
-.b{background:url(b.svg)}
-</style></head><body><img src=c.svg></body></html>
+<!DOCTYPE html><html><head><base href=/ ><link rel=stylesheet href=a-72b5.css></head><body><img src=c.svg></body></html>
diff --git a/test/data/snap/2/index.html b/test/data/snap/2/index.html
@@ -1,3 +1 @@
-<!DOCTYPE html><html><head><base href=/ ><link rel=stylesheet href=a.css><style>
-.b{background:url(b.svg)}
-</style></head><body><img src=c.svg></body></html>
+<!DOCTYPE html><html><head><base href=/ ><link rel=stylesheet href=a-72b5.css></head><body><img src=c.svg></body></html>
diff --git a/test/data/snap/2/ls.snap b/test/data/snap/2/ls.snap
@@ -3,7 +3,9 @@
 ./a.svg
 ./b.svg
 ./build
-./build/a.css
+./build/a-72b5.css
+./build/a.svg
+./build/b.svg
 ./build/c.svg
 ./build/index.html
 ./c.svg
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		.a{background:url(a.svg) url("data:x")}
		.b{background:url(b.svg)}
-Original file line number
+Diff line change
@@ -1,4 +1,5 @@
     .
+    ./a-72b5.css
     ./a.css
     ./a.svg
     ./b.svg
@@ Expand Down @@