merge

index.js

@@ -123,7 +123,8 @@ var transformServe = function(dir, anything) {
     if (req.url in cache) {
       return res.end(cache[req.url])
     }
-
+    if(req.url === '/global-styles/base.scss')
+      debugger
     if(!anything){
       fixedUrl = req.url;
     }else{
@@ -141,11 +142,11 @@ var transformServe = function(dir, anything) {
             data = pack.scss.shared+';\n'+data;
           }
           sass.render( {
-            data: data,
+            data: data+'',
             file: path.join( __dirname, dir, req.url ),
             sourceMap: true,
             importer: function( url, prev, done ){
-
+              console.log('Resolve scss dep ', url, 'for', fixedUrl);
               if(url[0] === '/'){
                 url = path.join( __dirname, dir, url.substr(1));
               }
@@ -154,6 +155,11 @@ var transformServe = function(dir, anything) {
 
 
               let fName;
+              done( {
+                file: displayName, // only one of them is required, see section Special Behaviours.
+                contents: fs.readFileSync( name ) + ''
+              } );
+              return;
               let thisOne = function(name, data) {
                 done( {
                   file: displayName, // only one of them is required, see section Special Behaviours.
@@ -178,7 +184,7 @@ var transformServe = function(dir, anything) {
                     }else{ thisOne(fName, res+'') }
                   })
                 }else{ thisOne(fName, res+'') }
-              })
+              });
 
 
             }
@@ -284,8 +290,8 @@ var transformServe = function(dir, anything) {
     let test = 0;
     let iterate = function() {
       let outerFixedUrl = req.url+'.'+types[test];
-      serve(req, res, function() {
-
+      serve(req, res, function(a,b,c) {
+        console.log('!!!', a,b,c)
         if(test<types.length){
           console.log('try serve', outerFixedUrl);
           test++;
@@ -303,13 +309,8 @@ var transformServe = function(dir, anything) {
 var count = 0;
 var list = [];
 app.use(function(req, res, next) {
-  setTimeout(function() {
-    //res.end('{}')
-  },1000)
-
-
+  console.log('Request', req.url);
   next();
-
 });
 
 app.use(transformServe('src'));