From 5758c0d6baaadf4d6e91ea84752ff4db583563c1 Mon Sep 17 00:00:00 2001
From: Jori Lallo <jtlallo@gmail.com>
Date: Sat, 10 Feb 2018 22:58:22 -0800
Subject: [PATCH 1/2] Catch server errors with koa-onerror

---
 package.json    |  1 +
 server/index.js | 19 ++++++++++---------
 yarn.lock       |  4 ++++
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/package.json b/package.json
index e3085c97c..4a1231995 100644
--- a/package.json
+++ b/package.json
@@ -124,6 +124,7 @@
     "koa-jwt": "^3.2.1",
     "koa-logger": "^2.0.1",
     "koa-mount": "^3.0.0",
+    "koa-onerror": "^4.0.0",
     "koa-router": "7.0.1",
     "koa-sendfile": "2.0.0",
     "koa-static": "^4.0.1",
diff --git a/server/index.js b/server/index.js
index ccde77634..6ce3afa04 100644
--- a/server/index.js
+++ b/server/index.js
@@ -5,6 +5,7 @@ import logger from 'koa-logger';
 import mount from 'koa-mount';
 import Koa from 'koa';
 import bugsnag from 'bugsnag';
+import onerror from 'koa-onerror';
 import updates from './utils/updates';
 
 import api from './api';
@@ -65,17 +66,17 @@ if (process.env.NODE_ENV === 'development') {
     )
   );
   app.use(logger());
-}
 
-if (process.env.NODE_ENV === 'production' && process.env.BUGSNAG_KEY) {
-  bugsnag.register(process.env.BUGSNAG_KEY, {
-    filters: ['authorization'],
-  });
-  app.on('error', bugsnag.koaHandler);
-}
-
-if (process.env.NODE_ENV === 'development') {
   app.use(mount('/emails', emails));
+} else if (process.env.NODE_ENV === 'production') {
+  onerror(app);
+
+  if (process.env.BUGSNAG_KEY) {
+    bugsnag.register(process.env.BUGSNAG_KEY, {
+      filters: ['authorization'],
+    });
+    app.on('error', bugsnag.koaHandler);
+  }
 }
 
 app.use(mount('/api', api));
diff --git a/yarn.lock b/yarn.lock
index b5566c14f..169e8c392 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5571,6 +5571,10 @@ koa-mount@^3.0.0:
     debug "^2.6.1"
     koa-compose "^3.2.1"
 
+koa-onerror@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/koa-onerror/-/koa-onerror-4.0.0.tgz#2c1bbf0ac9352e702f161591ddf1e8373716d507"
+
 koa-router@7.0.1:
   version "7.0.1"
   resolved "https://registry.yarnpkg.com/koa-router/-/koa-router-7.0.1.tgz#800a61d0a3342d3d1f96d8c688b84ed2a6314d97"

From 81f95b198de438e6820ccf5e525714efbeb89b70 Mon Sep 17 00:00:00 2001
From: Jori Lallo <jtlallo@gmail.com>
Date: Sat, 10 Feb 2018 23:03:13 -0800
Subject: [PATCH 2/2] Up Node version

---
 circle.yml   | 2 +-
 package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/circle.yml b/circle.yml
index 6d7673c8f..2af09c145 100644
--- a/circle.yml
+++ b/circle.yml
@@ -1,6 +1,6 @@
 machine:
   node:
-    version: 7.6
+    version: 8.0
   services:
     - redis
   environment:
diff --git a/package.json b/package.json
index 4a1231995..d7af08fd5 100644
--- a/package.json
+++ b/package.json
@@ -54,7 +54,7 @@
     ]
   },
   "engines": {
-    "node": ">= 7.6"
+    "node": ">= 8.0"
   },
   "repository": {
     "type": "git",