Improve properties detection: Now we can detect: * @import * Properti…

…es that have different values before the 'url('.
callumlocke · Jul 1, 2014 · 29e5889 · 29e5889
1 parent 6118ae4
commit 29e5889
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 7 deletions.
diff --git a/lib/css-url-rewriter.js b/lib/css-url-rewriter.js
@@ -12,7 +12,7 @@ var extend = require('extend');
 // Regex to find CSS properties that contain URLs
 // Fiddle: http://refiddle.com/refiddles/css-url-matcher
 // Railroad: http://goo.gl/LXpk52
-var cssPropertyMatcher = /[;\s]\*?[a-zA-Z\-]+\s*\:\s*url\(\s*['"]?[^'"\)\s]+['"]?\s*\)[^;}]*/g;
+var cssPropertyMatcher = /@import[^;]*|[;\s]?\*?[a-zA-Z\-]+\s*\:\#?[\s\S]*url\(\s*['"]?[^'"\)\s]+['"]?\s*\)[^;}]*/g;
 
 // Regex to find the URLs within a CSS property value
 // Fiddle: http://refiddle.com/refiddles/match-multiple-urls-within-a-css-property-value

diff --git a/test/css-url-rewriter_test.js b/test/css-url-rewriter_test.js
@@ -34,7 +34,6 @@ module.exports = {
             expected = fs.readFileSync(expectedFile).toString();
 
         var result = rewriteCSSURLs(fixture, rewrite);
-
         if (SAVE)
           fs.writeFileSync(path.join(__dirname, 'results', basename), result);
 

diff --git a/test/expected/general.css b/test/expected/general.css
@@ -1,11 +1,14 @@
+@import url("_../stylesheet.css");
 .something {
   background: url('_../images/foo.png');
   background: url('_../images/bar.png?12345');
   background: url(_../images/foo.png) ;
   background: url( _../images/bar.png  );
   background: url(  
     _../images/bar.png
-       )
+       );
+  background: transparent url( _../images/bar.png  );
+  background: #EEEEEE url( _../images/bar.png  );
 }
 
 .another-thing {

diff --git a/test/expected/msie-behavior.css b/test/expected/msie-behavior.css
@@ -3,11 +3,11 @@
   box-sizing: border-box;
 
   /* without hack */
-  behavior: url(scripts/boxsizing.htc);
-  behavior  : url(  scripts/boxsizing.htc  );
+  behavior: url(_scripts/boxsizing.htc);
+  behavior  : url(  _scripts/boxsizing.htc  );
 
   /* with IE<8 hack */
-  *behavior: url(scripts/boxsizing.htc);
+  *behavior: url(_scripts/boxsizing.htc);
 }
 
 .thing {

diff --git a/test/fixtures/general.css b/test/fixtures/general.css
@@ -1,11 +1,14 @@
+@import url("../stylesheet.css");
 .something {
   background: url('../images/foo.png');
   background: url('../images/bar.png?12345');
   background: url(../images/foo.png) ;
   background: url( ../images/bar.png  );
   background: url(  
     ../images/bar.png
-       )
+       );
+  background: transparent url( ../images/bar.png  );
+  background: #EEEEEE url( ../images/bar.png  );
 }
 
 .another-thing {