From 1effa16b5b47381c505a0ed3cb5578f191a413da Mon Sep 17 00:00:00 2001
From: Matteo Pagliazzi <matteopagliazzi@gmail.com>
Date: Fri, 27 Apr 2018 20:52:33 +0200
Subject: [PATCH] load memwatch-next only if installed

---
 package-lock.json        |  4 +++-
 website/server/server.js | 17 ++++++++++-------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index dfa4a9eb7b..c11283f195 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2365,7 +2365,8 @@
     "bindings": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.3.0.tgz",
-      "integrity": "sha512-DpLh5EzMR2kzvX1KIlVC0VkC3iZtHKTgdtZ0a3pglBZdaQFjt5S9g9xd1lE+YvXyfd6mtCeRnrUfOLYiTMlNSw=="
+      "integrity": "sha512-DpLh5EzMR2kzvX1KIlVC0VkC3iZtHKTgdtZ0a3pglBZdaQFjt5S9g9xd1lE+YvXyfd6mtCeRnrUfOLYiTMlNSw==",
+      "optional": true
     },
     "bitsyntax": {
       "version": "0.0.4",
@@ -12973,6 +12974,7 @@
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/memwatch-next/-/memwatch-next-0.3.0.tgz",
       "integrity": "sha1-IREFD5qQbgqi1ypOwPAInHhyb48=",
+      "optional": true,
       "requires": {
         "bindings": "1.3.0",
         "nan": "2.6.2"
diff --git a/website/server/server.js b/website/server/server.js
index 5dee447b95..bf22c445e4 100644
--- a/website/server/server.js
+++ b/website/server/server.js
@@ -3,13 +3,16 @@ import logger from './libs/logger';
 import express from 'express';
 import http from 'http';
 
-// @TODO: May need to remove - testing
-import memwatch from 'memwatch-next';
-
-memwatch.on('leak', (info) => {
-  const message = 'Memory leak detected.';
-  logger.error(message, info);
-});
+try {
+  // @TODO: May need to remove - testing
+  const memwatch = require('memwatch-next'); // eslint-disable-line global-require
+  memwatch.on('leak', (info) => {
+    const message = 'Memory leak detected.';
+    logger.error(message, info);
+  });
+} catch (err) {
+  logger.info('"memwatch-next" couldn\'t be loaded.');
+}
 
 const server = http.createServer();
 const app = express();