Merged with nathantreid fork

Author: stanislav1125

package.json

@@ -8,6 +8,7 @@
   },
   "dependencies": {
     "icss-replace-symbols": "1.0.2",
+    "path-is-absolute": "^1.0.0",
     "postcss": "5.2.9",
     "postcss-modules-values": "1.2.2",
     "postcss-modules-extract-imports": "1.0.1",

src/file-system-loader.js

@@ -1,6 +1,7 @@
 import Core from './index.js'
 import fs from 'fs'
 import path from 'path'
+import pathIsAbsolute from 'path-is-absolute';
 
 // Sorts dependencies in the following way:
 // AAA comes before AA and A
@@ -27,15 +28,20 @@ export default class FileSystemLoader {
     this.importNr = 0
     this.core = new Core(plugins)
     this.tokensByFile = {};
+
+    Core.scope.generateScopedName = function (exportedName, unsanitizedPath) {
+      let sanitizedPath = path.relative(root, unsanitizedPath).replace(/\.[^\.\/\\]+$/, '').replace(/[\W_]+/g, '_').replace(/^_|_$/g, '');
+      return `_${sanitizedPath}__${exportedName}`;
+    };
+
   }
 
   fetch( _newPath, relativeTo, _trace ) {
     let newPath = _newPath.replace( /^["']|["']$/g, "" ),
       trace = _trace || String.fromCharCode( this.importNr++ )
     return new Promise( ( resolve, reject ) => {
       let relativeDir = path.dirname( relativeTo ),
-        rootRelativePath = path.resolve( relativeDir, newPath ),
-        fileRelativePath = path.resolve( path.join( this.root, relativeDir ), newPath )
+        fileRelativePath = path.resolve(pathIsAbsolute(relativeDir) ? relativeDir : path.join( this.root, relativeDir ), newPath )
 
       // if the path is not relative or absolute, try to resolve it in node_modules
       if (newPath[0] !== '.' && newPath[0] !== '/') {
@@ -50,7 +56,7 @@ export default class FileSystemLoader {
 
       fs.readFile( fileRelativePath, "utf-8", ( err, source ) => {
         if ( err ) reject( err )
-        this.core.load( source, rootRelativePath, trace, this.fetch.bind( this ) )
+        this.core.load( source, fileRelativePath, trace, this.fetch.bind( this ) )
           .then( ( { injectableSource, exportTokens } ) => {
             this.sources[fileRelativePath] = injectableSource
             this.traces[trace] = fileRelativePath

src/index.js

@@ -15,7 +15,7 @@ export default class Core {
     let parser = new Parser( pathFetcher, trace )
 
     return postcss( this.plugins.concat( [parser.plugin] ) )
-      .process( sourceString, { from: "/" + sourcePath } )
+      .process( sourceString, { from: sourcePath } )
       .then( result => {
         return { injectableSource: result.css, exportTokens: parser.exportTokens }
       } )

test/test-cases.js

@@ -23,8 +23,8 @@ Object.keys( pipelines ).forEach( dirname => {
           let expected = normalize( fs.readFileSync( path.join( testDir, testCase, "expected.css" ), "utf-8" ) )
           let loader = new FileSystemLoader( testDir, pipelines[dirname] )
           let expectedTokens = JSON.parse( fs.readFileSync( path.join( testDir, testCase, "expected.json" ), "utf-8" ) )
-          loader.fetch( `${testCase}/source.css`, "/" ).then( tokens => {
-            assert.equal( loader.finalSource, expected )
+          loader.fetch( `${testCase}/source.css`, "./" ).then( tokens => {
+            assert.equal( normalize(loader.finalSource), expected )
             assert.equal( JSON.stringify( tokens ), JSON.stringify( expectedTokens ) )
           } ).then( done, done )
         } );
@@ -43,9 +43,9 @@ describe( 'multiple sources', () => {
       let expected = normalize( fs.readFileSync( path.join( testDir, testCase, "expected.css" ), "utf-8" ) )
       let loader = new FileSystemLoader( testDir, pipelines[dirname] )
       let expectedTokens = JSON.parse( fs.readFileSync( path.join( testDir, testCase, "expected.json" ), "utf-8" ) )
-      loader.fetch( `${testCase}/source1.css`, "/" ).then( tokens1 => {
-        loader.fetch( `${testCase}/source2.css`, "/" ).then( tokens2 => {
-          assert.equal( loader.finalSource, expected )
+      loader.fetch( `${testCase}/source1.css`, "./" ).then( tokens1 => {
+        loader.fetch( `${testCase}/source2.css`, "./" ).then( tokens2 => {
+          assert.equal( normalize(loader.finalSource), expected )
           const tokens = Object.assign({}, tokens1, tokens2);
           assert.equal( JSON.stringify( tokens ), JSON.stringify( expectedTokens ) )
         } ).then( done, done )

test/test-cases/compose-node-module/expected.css

@@ -1,4 +1,4 @@
-._compose_node_module_cool_styles_foo__example {
+._node_modules_cool_styles_foo__example {
   color: #F00;
 }
 ._compose_node_module_source__foo {

test/test-cases/compose-node-module/expected.json

@@ -1,3 +1,3 @@
 {
-  "foo": "_compose_node_module_source__foo _compose_node_module_cool_styles_foo__example"
+  "foo": "_compose_node_module_source__foo _node_modules_cool_styles_foo__example"
 }