From bbcce9e10e92f851b5ec6787b5b3651e4429d87b Mon Sep 17 00:00:00 2001
From: Ryan Tsao <rtsao@uber.com>
Date: Mon, 8 Jun 2015 21:09:43 -0700
Subject: [PATCH] Fixed relative paths

---
 src/file-system-loader.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/file-system-loader.js b/src/file-system-loader.js
index 7afcef1..98c1d4f 100644
--- a/src/file-system-loader.js
+++ b/src/file-system-loader.js
@@ -31,8 +31,9 @@ export default class FileSystemLoader {
     let newPath = _newPath.replace( /^["']|["']$/g, "" ),
       trace = _trace || String.fromCharCode( this.importNr++ )
     return new Promise( ( resolve, reject ) => {
-      let rootRelativePath = path.resolve( path.dirname( relativeTo ), newPath ),
-        fileRelativePath = this.root + rootRelativePath
+      let relativeDir = path.dirname( relativeTo ),
+        rootRelativePath = path.resolve( relativeDir, newPath ),
+        fileRelativePath = path.resolve( path.join( this.root, relativeDir ), newPath )
 
       fs.readFile( fileRelativePath, "utf-8", ( err, source ) => {
         if ( err ) reject( err )