From 2be9945350ca4b29a78d34a84e7ec1767a753819 Mon Sep 17 00:00:00 2001
From: Ciaran Ainsworth <ciaranainsworth@outlook.com>
Date: Tue, 7 Sep 2021 14:01:07 +0200
Subject: [PATCH] Fix sass-loader version, move globals into main

---
 package.json              |  2 +-
 src/components/globals.js | 16 ----------------
 src/main.js               | 12 ++++++++++++
 yarn.lock                 |  2 +-
 4 files changed, 14 insertions(+), 18 deletions(-)
 delete mode 100644 src/components/globals.js

diff --git a/package.json b/package.json
index 846c427..20f3446 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
     "eslint-plugin-vue": "^7.16.0",
     "node-sass": "6.0.1",
     "prerender-spa-plugin": "^3.4.0",
-    "sass-loader": "^10.1.0",
+    "sass-loader": "^10.1.1",
     "style-loader": "^3.2.1",
     "@vue/compiler-sfc": "^3.1.0"
   },
diff --git a/src/components/globals.js b/src/components/globals.js
deleted file mode 100644
index ef9b506..0000000
--- a/src/components/globals.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import Vue from "vue";
-import Icon from "./Icon";
-import GuideMenu from "./guide/Menu";
-import GuideContent from "./guide/Content";
-import GuideStep from "./guide/Step";
-import StepImage from "./guide/Image";
-import Modal from "./Modal";
-
-Vue.component('icon', Icon)
-Vue.component('guide-menu', GuideMenu)
-Vue.component('guide-content', GuideContent)
-Vue.component('guide-step', GuideStep)
-Vue.component('step-image', StepImage)
-Vue.component('modal', Modal)
-
-export default {}
diff --git a/src/main.js b/src/main.js
index 64ef546..e5b92bc 100644
--- a/src/main.js
+++ b/src/main.js
@@ -3,6 +3,12 @@ import App from "./App.vue";
 import router from './router'
 import locales from '@/locales'
 import { createGettext } from "@jshmrtn/vue3-gettext";
+import Icon from "./components/Icon.vue";
+import GuideMenu from "./components/guide/Menu.vue";
+import GuideContent from "./components/guide/Content.vue";
+import GuideStep from "./components/guide/Step.vue";
+import StepImage from "./components/guide/Image.vue";
+import Modal from "./components/Modal.vue";
 
 let availableLanguages = (function() {
   let l = {};
@@ -26,6 +32,12 @@ const mainApp = createApp(App)
   .use(gettext);
 
 mainApp.config.globalProperties.$translations = gettext.translations;
+mainApp.component('icon', Icon);
+mainApp.component('guide-menu', GuideMenu);
+mainApp.component('guide-content', GuideContent);
+mainApp.component('guide-step', GuideStep);
+mainApp.component('step-image', StepImage);
+mainApp.component('modal', Modal);
 
 require("bulma/css/bulma.css");
 require('fork-awesome/css/fork-awesome.min.css')
diff --git a/yarn.lock b/yarn.lock
index a12f4d6..644db6d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9885,7 +9885,7 @@ sass-graph@2.2.5:
     scss-tokenizer "^0.2.3"
     yargs "^13.3.2"
 
-sass-loader@^10.1.0:
+sass-loader@^10.1.1:
   version "10.2.0"
   resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-10.2.0.tgz#3d64c1590f911013b3fa48a0b22a83d5e1494716"
   integrity sha512-kUceLzC1gIHz0zNJPpqRsJyisWatGYNFRmv2CKZK2/ngMJgLqxTbXwe/hJ85luyvZkgqU3VlJ33UVF2T/0g6mw==
-- 
GitLab