From bb032e7e1ea196c8cc0e360577b24d52711741f6 Mon Sep 17 00:00:00 2001
From: Slava Kim <slava@meteor.com>
Date: Wed, 17 Dec 2014 15:53:09 -0800
Subject: [PATCH] Never use url.resolve as a substitute for files.pathJoin

even if it makes more sense semantically, url.resolve has a very different
behavior
---
 tools/compiler.js       | 7 +++----
 tools/package-source.js | 3 +--
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/tools/compiler.js b/tools/compiler.js
index 04f30b3974..f768f9bfe3 100644
--- a/tools/compiler.js
+++ b/tools/compiler.js
@@ -1,5 +1,4 @@
 var _ = require('underscore');
-var url = require('url');
 
 var archinfo = require('./archinfo.js');
 var buildmessage = require('./buildmessage.js');
@@ -318,7 +317,7 @@ var compileUnibuild = function (options) {
       type: "asset",
       data: contents,
       path: relPath,
-      servePath: url.resolve(inputSourceArch.pkg.serveRoot, relPath),
+      servePath: files.pathJoin(inputSourceArch.pkg.serveRoot, relPath),
       hash: hash
     });
   };
@@ -647,7 +646,7 @@ var compileUnibuild = function (options) {
           type: "css",
           refreshable: true,
           data: new Buffer(options.data, 'utf8'),
-          servePath: url.resolve(inputSourceArch.pkg.serveRoot, options.path),
+          servePath: files.pathJoin(inputSourceArch.pkg.serveRoot, options.path),
           sourceMap: options.sourceMap
         });
       },
@@ -685,7 +684,7 @@ var compileUnibuild = function (options) {
         js.push({
           source: options.data,
           sourcePath: options.sourcePath,
-          servePath: url.resolve(inputSourceArch.pkg.serveRoot, options.path),
+          servePath: files.pathJoin(inputSourceArch.pkg.serveRoot, options.path),
           bare: !! bare,
           sourceMap: options.sourceMap,
           sourceHash: options._hash
diff --git a/tools/package-source.js b/tools/package-source.js
index ffec2a6db1..54c9f1a092 100644
--- a/tools/package-source.js
+++ b/tools/package-source.js
@@ -1,6 +1,5 @@
 var _ = require('underscore');
 var sourcemap = require('source-map');
-var url = require('url');
 
 var files = require('./files.js');
 var utils = require('./utils.js');
@@ -1482,7 +1481,7 @@ _.extend(PackageSource.prototype, {
     });
 
     // Serve root of the package.
-    self.serveRoot = url.resolve('/packages/', self.name);
+    self.serveRoot = files.pathJoin('/packages/', self.name);
 
     // Name of the test.
     if (hasTests) {