fix urls replace in css files

Author: s0ph1e

lib/load.js

@@ -180,11 +180,11 @@ var Loader = function (data) {
     }
 
     // Convert local path to unix format
-    localFilename = utils.pathToUnixFormat(path.relative(baseLocalFilename || options.path, localFilename));
+    var relativeFilename = utils.pathToUnixFormat(path.relative(baseLocalFilename || options.path, localFilename));
 
     return {
       promise: promise,
-      localPath: localFilename
+      localPath: relativeFilename
     }
   }
 
@@ -235,32 +235,35 @@ var Loader = function (data) {
   function loadCssSources(text, cssRemotePath, cssLocalPath) {
     var cssLocalDirname = cssLocalPath ? path.dirname(cssLocalPath) : options.path,
       commentRegexp = /\/\*([\s\S]*?)\*\//g,
-      urlRegexp = /(@import[\s]*){0,1}url[\s]*\([\s'"]*(.+?)[\s'"]*\)/gi,
-      importRegexp = /@import[\s]*['"]{0,1}[\s]*(.+?)[\s]*['"]{0,1};/gi,
-      urlMatch,
-      urlPromises = [],
-      urlsToLoad = [];
+      sourcesRegexps = [
+        /(url[\s]*\([\s'"]*)(.+?)([\s'"]*\))/gi,
+        /(@import[\s]*['"]?[\s]*)(.+?)([\s]*['"]?;)/gi,
+        /(@import[\s]*url[\s]*\([\s'"]*)(.+?)([\s'"]*\))/gi
+      ],
+      urlPromises = [];
 
     // Remove all comments
     text = text.replace(commentRegexp, '');
 
-    // Foreach 'url() or @import url()'
-    while (urlMatch = urlRegexp.exec(text))
-      urlsToLoad.push(urlMatch[2]);
-    // Foreach @import
-    while (urlMatch = importRegexp.exec(text))
-      urlsToLoad.push(urlMatch[1]);
-
-    _.each(urlsToLoad, function (url) {
-      // skip base64 encoded image and empty url
-      if (url && !utils.isEmbeddedImage(url)) {
-        var urlAbsolutePath = utils.getAbsolutePath(cssRemotePath, url);
-        var result = loadFileFromUrl(urlAbsolutePath, cssLocalDirname);
-
-        if (result.promise)
-          urlPromises.push(result.promise);
-        if (result.localPath)
-          text = text.replace(url, result.localPath);
+    _.each(sourcesRegexps, function(regexp) {
+      var textOrigin = text,
+        urlMatch,
+        url;
+
+      while(urlMatch = regexp.exec(textOrigin)) {
+        url = urlMatch[2];
+        logger.log(urlMatch[0]);
+
+        if (url && !utils.isEmbeddedImage(url)) {
+          var urlAbsolutePath = utils.getAbsolutePath(cssRemotePath, url);
+          var result = loadFileFromUrl(urlAbsolutePath, cssLocalDirname);
+
+          if (result.promise)
+            urlPromises.push(result.promise);
+          if (result.localPath) {
+            text = text.replace(urlMatch[0], urlMatch[1] + result.localPath + urlMatch[3]);
+          }
+        }
       }
     });