merge

index.js

@@ -115,17 +115,21 @@ var transformTSX = function(code, fileName, cb) {
 //transformTSX('', 'aga', ()=>{})
 var sass = require('node-sass');
 var transformServe = function(dir, anything) {
-  let fixedUrl;
+  let outerFixedUrl;
 
   let serve = function (req, res, next) {
     var qRes = res;
+    let fixedUrl;
     if (req.url in cache) {
       return res.end(cache[req.url])
     }
 
     if(!anything){
       fixedUrl = req.url;
+    }else{
+      fixedUrl = arguments[3];
     }
+
     if (fixedUrl.substr(-5) === '.scss'){
 // not secure
       //console.log('scss', dir, req.url, __dirname)
@@ -133,7 +137,6 @@ var transformServe = function(dir, anything) {
         if( err ){
           next();
         }else{
-          console.log(req.url)
           if(pack && pack.scss && pack.scss.shared){
             data = pack.scss.shared+';\n'+data;
           }
@@ -165,8 +168,9 @@ var transformServe = function(dir, anything) {
                         if(err){
                           var origEnd = qRes.end;
                           qRes.end = function(data) {
+                            qRes.end = origEnd;
+                            qRes.end(qRes, data);
                             console.error(data);
-                            origEnd.call(qRes, data)
                           };
                           done(new Error('Can not resolve dependency!'))
                         }else{ thisOne(fName, res+'') }
@@ -229,7 +233,6 @@ var transformServe = function(dir, anything) {
         }
       });
     }*/else if (fixedUrl.substr(-4) === '.svg') {
-      console.log('Serve svg', dir, req.url)
       fs.readFile(path.join(dir, fixedUrl), function(err, data){
         if( err ){
           next();
@@ -275,23 +278,39 @@ var transformServe = function(dir, anything) {
       return serve(req, res, next);
     };
 
-  let types = 'scss,jsx,svg'.split(',')
-  let test = 0;
-  let iterate = function(req, res, next) {
-    fixedUrl = req.url+'.'+types[test];
-    serve(req, res, function() {
-      if(test<types.length){
-        test++;
-        iterate(req, res, next);
-      }else{
-        next();
-        test = 0;
-      }
-    });
+
+  return function(req, res, next) {
+    let types = 'scss,jsx,svg'.split(',')
+    let test = 0;
+    let iterate = function() {
+      let outerFixedUrl = req.url+'.'+types[test];
+      serve(req, res, function() {
+
+        if(test<types.length){
+          console.log('try serve', outerFixedUrl);
+          test++;
+          iterate();
+        }else{
+          next();
+          test = 0;
+        }
+      }, outerFixedUrl);
+    };
+    iterate();
   };
-  return iterate;
 };
 
+var count = 0;
+var list = [];
+app.use(function(req, res, next) {
+  setTimeout(function() {
+    //res.end('{}')
+  },1000)
+
+
+  next();
+
+});
 
 app.use(transformServe('src'));
 var lives = [];
@@ -321,7 +340,9 @@ app.use(App.static(dir(pack.src)))
 
 app.use(transformServe('src', true));
 
-
+app.use(function(req, res, next) {
+  console.error('Not serving', req.url);
+});
 
 const util = require('util');
 const readFile = util.promisify(fs.readFile);

src/view/page/account/Account.jsx

@@ -6,7 +6,7 @@ export default D.declare('view.page.Account', ()=>
     <div>
         Hello, {store.val('account.name')}
 
-        <Info img={<img src="baba1"/>} buttons={<button>bb</button>}>
+        <Info img={<img/>} buttons={<button>bb</button>}>
           <h1>olololo</h1>
         </Info>
     </div>