From 665c1d5fe49e16b0190347127a1bb9daa283bab6 Mon Sep 17 00:00:00 2001
From: Samuel Elliott <samuel@fancy.org.uk>
Date: Sun, 20 May 2018 00:46:15 +0100
Subject: [PATCH] =?UTF-8?q?Use=20local=20Moment.js=20instead=20of=20Discor?=
 =?UTF-8?q?d=E2=80=99s?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes a recursive dependency issue
---
 client/src/modules/vendor.js | 10 +++-------
 common/modules/logger.js     |  4 ++--
 package-lock.json            |  5 +++++
 package.json                 |  1 +
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/client/src/modules/vendor.js b/client/src/modules/vendor.js
index 4b5c2d58..25e95e2d 100644
--- a/client/src/modules/vendor.js
+++ b/client/src/modules/vendor.js
@@ -8,10 +8,10 @@
  * LICENSE file in the root directory of this source tree.
 */
 
-import { WebpackModules } from './webpackmodules';
 import jQuery from 'jquery';
 import lodash from 'lodash';
 import Vue from 'vue';
+import moment from 'moment';
 
 export { jQuery as $ };
 
@@ -32,15 +32,11 @@ export default class {
     /**
      * Moment
      */
-    static get moment() {
-        return WebpackModules.getModuleByName('Moment');
-    }
+    static get moment() { return moment }
 
     /**
      * Vue
      */
-    static get Vue() {
-        return Vue;
-    }
+    static get Vue() { return Vue }
 
 }
diff --git a/common/modules/logger.js b/common/modules/logger.js
index 8c12fef8..4fb87a7e 100644
--- a/common/modules/logger.js
+++ b/common/modules/logger.js
@@ -8,8 +8,8 @@
  * LICENSE file in the root directory of this source tree.
 */
 
-import { Vendor } from 'modules';
 import { FileUtils } from './utils';
+import moment from 'moment';
 import node_utils from 'node_utils';
 
 export const logLevels = {
@@ -60,7 +60,7 @@ export default class Logger {
     }
 
     static get timestamp() {
-        return Vendor.moment().format('DD/MM/YY hh:mm:ss');
+        return moment().format('DD/MM/YY hh:mm:ss');
     }
 
 }
diff --git a/package-lock.json b/package-lock.json
index f3b3a2ec..af3c075d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -7951,6 +7951,11 @@
         "minimist": "0.0.8"
       }
     },
+    "moment": {
+      "version": "2.22.1",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.22.1.tgz",
+      "integrity": "sha512-shJkRTSebXvsVqk56I+lkb2latjBs8I+pc2TzWc545y2iFnSjm7Wg0QMh+ZWcdSLQyGEau5jI8ocnmkyTgr9YQ=="
+    },
     "move-concurrently": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",
diff --git a/package.json b/package.json
index fa600eb4..eced1743 100644
--- a/package.json
+++ b/package.json
@@ -16,6 +16,7 @@
   },
   "private": false,
   "dependencies": {
+    "moment": "^2.22.1",
     "nedb": "^1.8.0",
     "node-sass": "^4.7.2"
   },