From 696cbdfe7029ecd6465346f285c900caa41c8f7a Mon Sep 17 00:00:00 2001
From: Joakim Olsson <joakim@unbound.se>
Date: Mon, 4 Feb 2019 08:27:13 +0100
Subject: [PATCH] Use import rather than require

---
 package.json          | 1 +
 plugins/vue-moment.js | 7 ++++---
 yarn.lock             | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index 562d226..8310d8b 100644
--- a/package.json
+++ b/package.json
@@ -17,6 +17,7 @@
     "graphql-tag": "^2.10.1",
     "lodash": "^4.17.10",
     "mem": "^4.0.0",
+    "moment": "^2.24.0",
     "node-sass": "^4.9.0",
     "nuxt": "^2.0.0",
     "s-ago": "^1.3.0",
diff --git a/plugins/vue-moment.js b/plugins/vue-moment.js
index 4cc531e..fabfd9b 100644
--- a/plugins/vue-moment.js
+++ b/plugins/vue-moment.js
@@ -1,8 +1,9 @@
 import Vue from 'vue'
 
-const moment = require('moment');
-require('moment/locale/sv');
+import moment from 'moment';
+import vueMoment from 'vue-moment';
+import 'moment/locale/sv';
 
-Vue.use(require('vue-moment'), {
+Vue.use(vueMoment, {
   moment
 });
diff --git a/yarn.lock b/yarn.lock
index ceac06d..090961a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5321,7 +5321,7 @@ moment@2.22.2:
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.22.2.tgz#3c257f9839fc0e93ff53149632239eb90783ff66"
   integrity sha1-PCV/mDn8DpP/UxSWMiOeuQeD/2Y=
 
-moment@^2.11.1:
+moment@^2.11.1, moment@^2.24.0:
   version "2.24.0"
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.24.0.tgz#0d055d53f5052aa653c9f6eb68bb5d12bf5c2b5b"
   integrity sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==