Merge branch 'release/2.31.0' into main

.github/dependabot.yml

@@ -3,7 +3,8 @@ updates:
   - package-ecosystem: "npm"
     directory: "/"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
     target-branch: "develop"
     ignore:
       - dependency-name: "@quasar/app"
+        versions: [">=2.4.3"]

package.json

@@ -1,5 +1,5 @@
 {
-	"version": "2.30.0",
+	"version": "2.31.0",
 	"name": "shieldmaiden",
 	"description": "A Dungeons and Dragons Combat Tracker",
 	"productName": "Shieldmaiden",
@@ -18,16 +18,16 @@
 	"dependencies": {
 		"@gtm-support/vue2-gtm": "^1.3.0",
 		"@octokit/rest": "^19.0.5",
-		"@quasar/extras": "^1.16.11",
+		"@quasar/extras": "^1.16.12",
 		"ajv": "^8.13.0",
 		"ajv-formats": "^2.1.1",
 		"animate.css": "^4.1.1",
 		"axios": "^0.28.1",
-		"core-js": "^3.37.0",
+		"core-js": "^3.37.1",
 		"cors": "^2.8.5",
 		"dotenv": "^16.4.5",
 		"firebase": "^8.0.0",
-		"helmet": "^5.0.2",
+		"helmet": "^7.1.0",
 		"jwt-decode": "^3.1.2",
 		"lodash": "^4.17.21",
 		"marked": "^4.0.16",
@@ -50,15 +50,15 @@
 		"vuex": "^3.0.1"
 	},
 	"devDependencies": {
-		"@quasar/app": "^2.4.3",
-		"@types/sanitize-html": "^2.6.2",
+		"@quasar/app": "2.4.3",
+		"@types/sanitize-html": "^2.11.0",
 		"babel-eslint": "^10.0.1",
 		"eslint": "^7.21.0",
 		"eslint-config-prettier": "^8.1.0",
 		"eslint-plugin-vue": "^7.7.0",
 		"eslint-webpack-plugin": "^2.4.0",
 		"husky": "^8.0.2",
-		"prettier": "^2.7.1",
+		"prettier": "^3.3.3",
 		"workbox-webpack-plugin": "^6.5.3"
 	},
 	"overrides": {

quasar.conf.js

@@ -50,7 +50,7 @@ module.exports = function (/* ctx */) {
 			vueRouterMode: "history", // available values: 'hash', 'history'
 			env: require("dotenv").config({ path: `.env.${process.env.NODE_ENV}.local` }).parsed,
 			scssLoaderOptions: {
-				additionalData: '@import "src/css/variables.scss";',
+				additionalData: "",
 			},
 			vueCompiler: true,
 			transpile: true,