From fa32b23b4067c844b9d63b6628476911fea18bc5 Mon Sep 17 00:00:00 2001
From: ManjaroOne666 <git@gabbaell.co.uk>
Date: Mon, 25 Feb 2019 13:57:14 +0000
Subject: [PATCH] replace nuxt-sass-resources-loader with
 @nuxtjs/style-resources

---
 app/nuxt.config.js | 17 +++++++++++------
 app/package.json   |  3 ++-
 app/yarn.lock      | 44 ++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 57 insertions(+), 7 deletions(-)

diff --git a/app/nuxt.config.js b/app/nuxt.config.js
index c680ce6..d86f02d 100644
--- a/app/nuxt.config.js
+++ b/app/nuxt.config.js
@@ -78,15 +78,20 @@ module.exports = {
     '@nuxtjs/axios',
     // Doc: https://buefy.github.io/#/documentation
     'nuxt-buefy',
-    [
-      'nuxt-sass-resources-loader',
-      [
-        '@/assets/scss/_globals.scss'
-      ]
-    ],
+    // [
+      // 'nuxt-sass-resources-loader',
+      // [
+      //   '@/assets/scss/_globals.scss'
+      // ]
+    // ],
+    '@nuxtjs/style-resources',
     '@nuxtjs/proxy',
   ],
 
+  styleResources: {
+    scss: './assets/scss/_globals.scss',
+  },
+
   /*
   ** Axios module configuration
   */
diff --git a/app/package.json b/app/package.json
index ecd04e2..b540bc5 100644
--- a/app/package.json
+++ b/app/package.json
@@ -15,13 +15,14 @@
   "dependencies": {
     "@nuxtjs/axios": "^5.3.6",
     "@nuxtjs/proxy": "^1.3.1",
+    "@nuxtjs/style-resources": "^0.1.2",
     "cross-env": "^5.2.0",
     "express": "^4.16.4",
     "nodemailer": "^5.1.1",
     "nuxt": "^2.0.0",
     "nuxt-buefy": "^0.2.1",
-    "sass-loader": "^7.1.0",
     "nuxt-sass-resources-loader": "^2.0.5",
+    "sass-loader": "^7.1.0",
     "validator": "^10.11.0",
     "vuelidate": "^0.7.4",
     "xss-filters": "^1.2.7"
diff --git a/app/yarn.lock b/app/yarn.lock
index 8007df0..888d73d 100644
--- a/app/yarn.lock
+++ b/app/yarn.lock
@@ -976,6 +976,15 @@
     consola "^1.4.4"
     http-proxy-middleware "^0.19.0"
 
+"@nuxtjs/style-resources@^0.1.2":
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/@nuxtjs/style-resources/-/style-resources-0.1.2.tgz#6d90637611d3a445158224c34e42ec5769e13aaa"
+  integrity sha512-hF4kxO3ETHnJlscBOHM/UKasMwrdlODb+y6mv9mnsyn1Ujvp7kMqOmUmhKcemDexXEzpc5eniIOOq+Nul8JAKA==
+  dependencies:
+    consola "^2.4.0"
+    glob-all "^3.1.0"
+    sass-resources-loader "^2.0.0"
+
 "@nuxtjs/youch@^4.2.3":
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/@nuxtjs/youch/-/youch-4.2.3.tgz#36f8b22df5a0efaa81373109851e1d857aca6bed"
@@ -2225,6 +2234,11 @@ consola@^2.0.0-1, consola@^2.3.0:
     std-env "^2.2.1"
     string-width "^2.1.1"
 
+consola@^2.4.0:
+  version "2.5.4"
+  resolved "https://registry.yarnpkg.com/consola/-/consola-2.5.4.tgz#127627375ca45a1d507223dee770aba17cb991f7"
+  integrity sha512-4XX27fEcMgE0RDI9E4Dl0jYZm5IBFfpb4HlDMj0mgeULjj/hKXEjaDZEzQho0A8O6Cb3kiVnz2Tr9YfmGo2DNw==
+
 console-browserify@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.1.0.tgz#f0241c45730a9fc6323b206dbf38edc741d0bb10"
@@ -3648,6 +3662,14 @@ getpass@^0.1.1:
   dependencies:
     assert-plus "^1.0.0"
 
+glob-all@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/glob-all/-/glob-all-3.1.0.tgz#8913ddfb5ee1ac7812656241b03d5217c64b02ab"
+  integrity sha1-iRPd+17hrHgSZWJBsD1SF8ZLAqs=
+  dependencies:
+    glob "^7.0.5"
+    yargs "~1.2.6"
+
 glob-parent@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae"
@@ -4929,6 +4951,11 @@ minimist@0.0.8:
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
   integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=
 
+minimist@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.1.0.tgz#99df657a52574c21c9057497df742790b2b4c0de"
+  integrity sha1-md9lelJXTCHJBXSX33QnkLK0wN4=
+
 minimist@^1.1.3, minimist@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
@@ -6927,6 +6954,16 @@ sass-resources-loader@^1.3.1:
     glob "^7.1.1"
     loader-utils "^1.0.4"
 
+sass-resources-loader@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/sass-resources-loader/-/sass-resources-loader-2.0.0.tgz#88569c542fbf1f18f33a6578b77cc5b36c56911d"
+  integrity sha512-I+5FfV+Hb29U5Nt8DbslWOBgRmTv1M/EwOn4/4rc6Aqy9yjygoa8UTnyCFXfTZV8FoQyIBZbEyKSBryhByqQbA==
+  dependencies:
+    async "^2.1.4"
+    chalk "^1.1.3"
+    glob "^7.1.1"
+    loader-utils "^1.0.4"
+
 sax@^1.2.4, sax@~1.2.4:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
@@ -8376,3 +8413,10 @@ yargs@^7.0.0:
     which-module "^1.0.0"
     y18n "^3.2.1"
     yargs-parser "^5.0.0"
+
+yargs@~1.2.6:
+  version "1.2.6"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-1.2.6.tgz#9c7b4a82fd5d595b2bf17ab6dcc43135432fe34b"
+  integrity sha1-nHtKgv1dWVsr8Xq23MQxNUMv40s=
+  dependencies:
+    minimist "^0.1.0"