From 7956f03f0e649a18b9d6005e5ef9f554001177c6 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 22 Dec 2017 22:11:47 -0700
Subject: [PATCH] Use nodejs 8 in travis; Update web start script

---
 .travis.yml    |  3 ++-
 DEVELOPMENT.md |  2 +-
 app.js         | 17 -----------------
 package.json   |  2 +-
 4 files changed, 4 insertions(+), 20 deletions(-)
 delete mode 100644 app.js

diff --git a/.travis.yml b/.travis.yml
index 297b85c..ded455e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,10 +1,11 @@
 language: node_js
 node_js:
-  - "6"
+  - "8"
 env:
 - NODE_ENV=development
 before_install:
 - npm i -g npm
+- npm i -g typescript
 install:
   - npm install
 script:
diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md
index 474db28..1cefaa8 100644
--- a/DEVELOPMENT.md
+++ b/DEVELOPMENT.md
@@ -16,7 +16,7 @@ cp config/default.yaml config/development.yaml
 nano config/development.yaml
 
 # Run the webserver (it watches for changes)
-npm run start:dev
+npm run start:web
 
 # Run the backend (does not watch for changes)
 npm run build:app && node build/app/index.js
diff --git a/app.js b/app.js
deleted file mode 100644
index 7a2003b..0000000
--- a/app.js
+++ /dev/null
@@ -1,17 +0,0 @@
-var log = require("./src/util/LogService");
-var Dimension = require("./src/Dimension");
-var DimensionStore = require("./src/storage/DimensionStore");
-var DemoBot = require("./src/matrix/DemoBot");
-var config = require("config");
-
-log.info("app", "Bootstrapping Dimension...");
-var db = new DimensionStore();
-db.prepare().then(() => {
-    Dimension.start(db);
-
-    if (config.get("demobot.enabled")) {
-        log.info("app", "Demo bot enabled - starting up");
-        var bot = new DemoBot(config.get("demobot.homeserverUrl"), config.get("demobot.userId"), config.get("demobot.accessToken"));
-        bot.start();
-    }
-}, err => log.error("app", err)).catch(err => log.error("app", err));
\ No newline at end of file
diff --git a/package.json b/package.json
index 24faf72..bcc7d46 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
   "main": "build/app/index.js",
   "license": "GPL-3.0",
   "scripts": {
-    "start:dev": "webpack-dev-server --inline --progress --port 8080 --host 0.0.0.0",
+    "start:web": "webpack-dev-server --inline --progress --port 8080 --host 0.0.0.0",
     "start:app": "npm run-script build && node build/app/index.js",
     "build": "rimraf build && npm run-script build:web && npm run-script build:app",
     "build:web": "webpack --progress --profile --bail",