componentjs
diff --git a/‎lib/builder.js
Copy file name to clipboardExpand all lines: lib/builder.js
+5-1Lines changed: 5 additions & 1 deletion b/‎lib/builder.js
Copy file name to clipboardExpand all lines: lib/builder.js
+5-1Lines changed: 5 additions & 1 deletion
diff --git a/‎test/builder.js
Copy file name to clipboardExpand all lines: test/builder.js
+3-3Lines changed: 3 additions & 3 deletions b/‎test/builder.js
Copy file name to clipboardExpand all lines: test/builder.js
+3-3Lines changed: 3 additions & 3 deletions
@@ -18,6 +18,7 @@ var fs = require('fs')
   , utils = require('./utils')
   , dirname = path.dirname
   , basename = path.basename
+  , resolveURL = require('url').resolve
   , strtojs = require('string-to-js');
 
 /**
@@ -989,7 +990,10 @@ function rewriteUrls(builder, file, css) {
     if (isData(url)) return orig;
     if (isAbsolute(url)) return orig;
     var name = normalize(builder.basename);
-    url = [builder.urlPrefix, name, dirname(file), url].filter(empty).join('/');
+    // trailing `/` needed to distinguish the URL as a folder
+    // for `url.resolve()`
+    var folder = [builder.urlPrefix, name, dirname(file)].filter(empty).join('/') + '/';
+    url = resolveURL(folder, url);
     return 'url("' + url + '")';
   }
 
 
@@ -243,9 +243,9 @@ describe('Builder', function(){
       builder.prefixUrls('build');
       builder.build(function(err, res){
         if (err) return done(err);
-        res.css.should.include('url("build/assets/./images/logo.png")');
-        res.css.should.include('url("build/assets/./images/maru.jpeg")');
-        res.css.should.include('url("build/assets/css/../images/npm.png")');
+        res.css.should.include('url("build/assets/images/logo.png")');
+        res.css.should.include('url("build/assets/images/maru.jpeg")');
+        res.css.should.include('url("build/assets/images/npm.png")');
         res.css.should.include('url(http://example.com/images/manny.png)');
         res.css.should.include('url(/public/images/foo.png)')
         res.css.should.include('url(data:image/png;base64,PNG DATA HERE)');