Merge branch 'hapi-upgrade'

Updates Hapi to v9.x
tribou · Sep 15, 2015 · 3577b5e · 3577b5e
2 parents c33483e + 5c1538a
commit 3577b5e
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 31 deletions.
diff --git a/package.json b/package.json
@@ -6,11 +6,13 @@
   "dependencies": {
     "dateformat": "^1.0.11",
     "flux": "^2.0.3",
-    "hapi": "^8.8.0",
+    "hapi": "^9.3.1",
     "hapi-react-views": "^3.0.1",
+    "inert": "^3.0.1",
     "object-assign": "^3.0.0",
     "react": "^0.13.3",
-    "superagent": "^1.2.0"
+    "superagent": "^1.2.0",
+    "vision": "^3.0.0"
   },
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",

diff --git a/server.js b/server.js
@@ -14,37 +14,51 @@ server.connection({
   port: 8000
 });
 
-// Add the React-rendering view engine
-server.views({
-    engines: {
-        jsx: require('hapi-react-views')
-    },
-    relativeTo: __dirname,
-    path: 'views'
-});
+// Register the inert and vision Hapi plugins
+// As of Hapi 9.x, these two plugins are no longer
+// included in Hapi automatically
+// https://github.com/hapijs/hapi/issues/2682
+server.register([{
+  register: require('inert')
+}, {
+  register: require('vision')
+}], function(err) {
 
-// Add a route to serve static assets (CSS, JS, IMG)
-server.route({
-  method: 'GET',
-  path: '/{param*}',
-  handler: {
-    directory: {
-      path: 'assets',
-      index: ['index.html']
-    }
-  }
-});
+  if (err) return console.error(err);
 
-// Add main app route
-server.route({
-  method: 'GET',
-  path: '/',
-  handler: {
-    view: 'Default'
-  }
-});
+    // Add the React-rendering view engine
+    server.views({
+        engines: {
+            jsx: require('hapi-react-views')
+        },
+        relativeTo: __dirname,
+        path: 'views'
+    });
+
+    // Add a route to serve static assets (CSS, JS, IMG)
+    server.route({
+      method: 'GET',
+      path: '/{param*}',
+      handler: {
+        directory: {
+          path: 'assets',
+          index: ['index.html']
+        }
+      }
+    });
+
+    // Add main app route
+    server.route({
+      method: 'GET',
+      path: '/',
+      handler: {
+        view: 'Default'
+      }
+    });
+
+    server.start(function() {
+      console.log(dateFormat(new Date(), format) + ' - Server started at: ' + server.info.uri);
+    });
 
-server.start(function() {
-  console.log(dateFormat(new Date(), format) + ' - Server started at: ' + server.info.uri);
 });