Merge pull request #5 from rtsao/fix-relative-paths

Fixed relative paths
css-modules · Jun 9, 2015 · 7f660e7 · 7f660e7
2 parents eef3868 + bbcce9e
commit 7f660e7
Showing 1 changed file with 3 additions and 2 deletions.
diff --git 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 )