getting the CSS output correct, just the variable rewriting to go

Author: geelen

src/file-system-loader.js

@@ -14,10 +14,6 @@ export default class FileSystemLoader {
     return new Promise( ( resolve, reject ) => {
       let rootRelativePath = path.resolve( path.dirname( relativeTo ), newPath ),
         fileRelativePath = this.root + rootRelativePath
-      console.log( newPath )
-      console.log( relativeTo )
-      console.log( rootRelativePath )
-      console.log( fileRelativePath )
 
       fs.readFile( fileRelativePath, "utf-8", ( err, source ) => {
         if ( err ) reject( err )

src/index.js

@@ -21,10 +21,12 @@ export default {
   load( sourceString, sourcePath, pathFetcher ) {
     let parser = new Parser( pathFetcher )
 
+    console.log("PROCESSING " + sourcePath)
     return postcss( this.plugins.concat( [parser.plugin] ) )
       .process( sourceString, { from: "/" + sourcePath } )
       .then( result => {
-        return Promise.resolve( { injectableSource: result.css, exportTokens: parser.exportTokens } )
+        console.log("GOT RESULT " + sourcePath)
+        return { injectableSource: result.css, exportTokens: parser.exportTokens }
       } )
   }
 }

src/parser.js

@@ -9,7 +9,7 @@ export default class Parser {
   }
 
   plugin( css, result ) {
-    Promise.all( this.fetchAllImports( css ) ).then( _ => {
+    return Promise.all( this.fetchAllImports( css ) ).then( _ => {
       css.each( node => {
         if ( node.type == "rule" && node.selector == ":export" ) this.handleExport( node )
       } )
@@ -37,9 +37,10 @@ export default class Parser {
 
   fetchImport( importNode, relativeTo ) {
     let file = importNode.selector.match( importRegexp )[1]
-    console.log(file, relativeTo)
+    importNode.removeSelf()
     return this.pathFetcher(file, relativeTo).then(exports => {
+      console.log("got export")
       console.log(exports)
-    })
+    }, err => console.log(err))
   }
 }

test/test-cases/single-import-export/expected.css

@@ -1,7 +1,6 @@
 .__global_blackShadow {
   box-shadow: 0 0 10px -2px black;
 }
-
 .__globalName {
   color: red;
 }