From 68e41d7086502262a1b0758825a2528d920040e9 Mon Sep 17 00:00:00 2001
From: Roman Timashev <roman@tmshv.ru>
Date: Fri, 25 Mar 2016 20:31:25 +0300
Subject: [PATCH] compiling node es6 to babelless /out

---
 .gitignore   |  1 +
 package.json |  3 +++
 src/index.js | 40 +++++++++++++++++++++++-----------------
 3 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/.gitignore b/.gitignore
index 12c3b6ed..05647c85 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,7 @@ private*.json
 /bower_components
 /public
 /build
+/out
 **/__pycache__
 **/*.pyc
 /coverage
diff --git a/package.json b/package.json
index 06ab1845..fd5f2866 100644
--- a/package.json
+++ b/package.json
@@ -5,6 +5,8 @@
   "description": "",
   "main": "src/bin/www.js",
   "scripts": {
+    "start": "babel-node src/index.js",
+    "out": "babel src/ -d out/",
     "test": "mocha --compilers js:babel-register",
     "coverage": "istanbul cover mocha -- --compilers js:babel-register",
     "bower": "bower"
@@ -43,6 +45,7 @@
   },
   "devDependencies": {
     "autoprefixer": "^6.2.3",
+    "babel-cli": "^6.6.5",
     "babel-loader": "^6.2.2",
     "bower": "^1.3.12",
     "cssnano": "^3.4.0",
diff --git a/src/index.js b/src/index.js
index f96ee64e..296523bb 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,21 +1,27 @@
-require('babel-core/register');
-require('babel-polyfill');
+import 'babel-polyfill';
 
-var config = require('./config').default;
-var db = require('./core/db');
+import config from './config';
+import {connect} from './core/db';
 
-db.connect(config.db.uri)
-    .then(function () {
-        var server = require('./server').default;
-        var io = require('./io').default;
+function main() {
+    async function loop(){
+        await connect(config.db.uri);
+
+        try{
+            var server = require('./server').default;
+            var io = require('./io').default;
+
+            var app = server();
+            io(app);
+            app.listen(config.port);
+        }catch(e){
+            console.error(e.stack);
+        }
 
-        var app = server();
-        io(app);
-        app.listen(config.port);
-    })
-    .catch(function(e){
-        console.error(e.stack);
-    })
-    .then(function(){
         console.log(`Start listening ${config.port}`);
-    });
+    }
+
+    loop();
+}
+
+main();
\ No newline at end of file