From ee48cb1b1dd834e4bc3cf7b373a61705aef8f87c Mon Sep 17 00:00:00 2001
From: Robin Appelman <robin@icewind.nl>
Date: Tue, 25 Aug 2020 18:52:08 +0200
Subject: [PATCH] switch from vue-style-loader to style-loader

vue-style-loader is unmaintained, broken with css-loader 4.x and regular style-loader now works properly with vue

this fixes styles not being loaded

Signed-off-by: Robin Appelman <robin@icewind.nl>
---
 package-lock.json | 26 ++++++++++++++++++++++++--
 package.json      |  2 +-
 webpack.common.js |  4 ++--
 3 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 19f8a4da..0e5f8d75 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -7527,8 +7527,7 @@
 		"file-uri-to-path": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
-			"integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
-			"optional": true
+			"integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw=="
 		},
 		"filename-regex": {
 			"version": "2.0.1",
@@ -14587,6 +14586,29 @@
 			"integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
 			"dev": true
 		},
+		"style-loader": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/style-loader/-/style-loader-1.2.1.tgz",
+			"integrity": "sha512-ByHSTQvHLkWE9Ir5+lGbVOXhxX10fbprhLvdg96wedFZb4NDekDPxVKv5Fwmio+QcMlkkNfuK+5W1peQ5CUhZg==",
+			"dev": true,
+			"requires": {
+				"loader-utils": "^2.0.0",
+				"schema-utils": "^2.6.6"
+			},
+			"dependencies": {
+				"loader-utils": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
+					"integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
+					"dev": true,
+					"requires": {
+						"big.js": "^5.2.2",
+						"emojis-list": "^3.0.0",
+						"json5": "^2.1.2"
+					}
+				}
+			}
+		},
 		"style-search": {
 			"version": "0.1.0",
 			"resolved": "https://registry.npmjs.org/style-search/-/style-search-0.1.0.tgz",
diff --git a/package.json b/package.json
index 8dd29f12..096ba37e 100644
--- a/package.json
+++ b/package.json
@@ -87,12 +87,12 @@
 		"prettier-eslint": "^11.0.0",
 		"raw-loader": "^4.0.1",
 		"sass-loader": "^9.0.3",
+		"style-loader": "^1.2.1",
 		"stylelint": "^8.4.0",
 		"stylelint-config-recommended-scss": "^3.3.0",
 		"stylelint-webpack-plugin": "^0.10.5",
 		"vue-jest": "^3.0.6",
 		"vue-loader": "^15.9.3",
-		"vue-style-loader": "^4.1.1",
 		"vue-template-compiler": "^2.6.10",
 		"webpack": "^4.44.1",
 		"webpack-cli": "^3.3.11",
diff --git a/webpack.common.js b/webpack.common.js
index baaf5b52..db2fadb7 100644
--- a/webpack.common.js
+++ b/webpack.common.js
@@ -18,14 +18,14 @@ module.exports = {
 			{
 				test: /\.css$/,
 				use: [
-					'vue-style-loader',
+					'style-loader',
 					'css-loader'
 				]
 			},
 			{
 				test: /\.scss$/,
 				use: [
-					'vue-style-loader',
+					'style-loader',
 					'css-loader',
 					'sass-loader'
 				]