Merge pull request #503 from calzoneman/es6

Transpile with babel for ES2015 support

.gitignore

@@ -11,3 +11,4 @@ node_modules
 torlist
 www/cache
 google-drive-subtitles
+lib/

NEWS.md

@@ -1,3 +1,17 @@
+2015-09-21
+==========
+
+  * CyTube is now transpiled with [babel] to allow the use of ES6/ES2015
+    features.  All source files have been moved from `lib` to `src`.
+  * Running `npm install` or `npm run postinstall` will prompt you to
+    build from `src` to `lib`.
+  * Running `npm run build-server` will run the build script without any
+    prompts.
+  * After updating with `git pull`, you should run `npm install` or `npm run
+    build-server` in order to rebuild after the changes.
+
+[babel]: https://babeljs.io/
+
 2015-07-25
 ==========
 

index.js

@@ -1,6 +1,7 @@
 var Server = require("./lib/server");
 var Config = require("./lib/config");
 var Logger = require("./lib/logger");
+require("source-map-support").install();
 
 Config.load("config.yaml");
 var sv = Server.init();

package.json

@@ -6,8 +6,9 @@
   "repository": {
     "url": "http://github.com/calzoneman/sync"
   },
-  "license":"MIT",
+  "license": "MIT",
   "dependencies": {
+    "babel": "^5.8.23",
     "bcrypt": "^0.8.5",
     "body-parser": "^1.14.0",
     "cheerio": "^0.19.0",
@@ -30,11 +31,15 @@
     "sanitize-html": "git://github.com/calzoneman/sanitize-html",
     "serve-static": "^1.10.0",
     "socket.io": "^1.3.7",
+    "source-map-support": "^0.3.2",
     "status-message-polyfill": "calzoneman/status-message-polyfill",
     "yamljs": "^0.1.6"
   },
   "scripts": {
-    "build-player": "$npm_node_execpath build-player.js"
+    "build-player": "$npm_node_execpath build-player.js",
+    "build-server": "babel --source-maps --out-dir lib/ src/",
+    "postinstall": "./postinstall.sh",
+    "server-dev": "babel --watch --source-maps --out-dir lib/ src/"
   },
   "devDependencies": {
     "coffee-script": "^1.9.2"

postinstall.sh

@@ -0,0 +1,13 @@
+#!/bin/sh
+
+echo "In order to run the server, the source files in src/ must be transpiled to lib/.  This will overwrite any changes you have made to the files in lib/."
+echo -n "Do you want to build now? [y/N]? "
+read answer
+echo
+
+if test "$answer" = "y" || test "$answer" = "Y"; then
+    echo "Running $npm_package_scripts_build_server"
+    $npm_package_scripts_build_server
+else
+    echo "Skipping build step.  You can build at a later time by running \`npm run build-server\`."
+fi

src/web/webserver.js

@@ -11,7 +11,7 @@ var Config = require("../config");
 var db = require("../database");
 var bodyParser = require("body-parser");
 var cookieParser = require("cookie-parser");
-var static = require("serve-static");
+var serveStatic = require("serve-static");
 var morgan = require("morgan");
 var session = require("../session");
 var csrf = require("./csrf");
@@ -244,7 +244,7 @@ module.exports = {
         require("./account").init(app);
         require("./acp").init(app);
         require("../google2vtt").attach(app);
-        app.use(static(path.join(__dirname, "..", "..", "www"), {
+        app.use(serveStatic(path.join(__dirname, "..", "..", "www"), {
             maxAge: Config.get("http.max-age") || Config.get("http.cache-ttl")
         }));
         app.use(function (err, req, res, next) {