Merge pull request #399 from fvtt-fria-ligan/01-19-chore_deps_Upgrade…

…_deps chore(deps): 🔗 Upgrade deps
fvtt-fria-ligan · Jan 19, 2024 · 515b711 · 515b711
2 parents efa8009 + 90c4dae
commit 515b711
Show file tree

Hide file tree

Showing 4 changed files with 64 additions and 59 deletions.
diff --git a/bun.lockb b/bun.lockb
diff --git a/package.json b/package.json
@@ -1,58 +1,61 @@
 {
-	"name": "forbidden-lands",
-	"version": "11.4.1",
-	"private": true,
-	"description": "<p align=\"center\">\r   <a href=\"https://github.com/fvtt-fria-ligan/forbidden-lands-foundry-vtt/releases/latest\" target=\"_blank\"><img alt=\"system version\" src=\"https://img.shields.io/badge/dynamic/json.svg?url=https%3A%2F%2Fraw.githubusercontent.com%2Ffvtt-fria-ligan%2Fforbidden-lands-foundry-vtt%2Fmain%2Fsystem.json&label=Version&query=$.version&colorB=blue\"/></a>\r   <a href=\"https://foundryvtt.com\" target=\"_blank\">\r     <img src=\"https://img.shields.io/badge/dynamic/json.svg?url=https%3A%2F%2Fraw.githubusercontent.com%2Ffvtt-fria-ligan%2Fforbidden-lands-foundry-vtt%2Fmain%2Fsystem.json&label=Foundry&query=$.compatibleCoreVersion&colorB=blue\" alt=\"foundry-compatibility-version\" style=\"max-width:100%;\"/>\r   </a>\r   <a href=\"https://github.com/fvtt-fria-ligan/forbidden-lands-foundry-vtt/graphs/commit-activity\" target=\"_blank\">\r     <img alt=\"Maintenance\" src=\"https://img.shields.io/badge/Maintained%3F-yes-green.svg\"/>\r   </a>\r   <a href=\"https://gitlocalize.com/repo/5750/whole_project?utm_source=badge\" target=\"_blank\"><img alt=\"Localization\" src=\"https://gitlocalize.com/repo/5750/whole_project/badge.svg\" /></a>\r   <a href=\"https://github.com/fvtt-fria-ligan/forbidden-lands-foundry-vtt/blob/main/LICENSE\" target=\"_blank\">\r     <img alt=\"License: GPL\" src=\"https://img.shields.io/github/license/fvtt-fria-ligan/forbidden-lands-foundry-vtt\"/>\r   </a>\r   <br/>\r   <br/>\r   <img src=\"https://user-images.githubusercontent.com/9851733/108728684-1a954b00-752a-11eb-9138-6fab6f83b2a8.jpg\" alt=\"Logo\" style=\"max-width:100%;\" />\r </p>",
-	"homepage": "https://github.com/fvtt-fria-ligan/forbidden-lands-foundry-vtt#readme",
-	"bugs": {
-		"url": "https://github.com/fvtt-fria-ligan/forbidden-lands-foundry-vtt/issues"
-	},
-	"repository": {
-		"type": "git",
-		"url": "git+https://github.com/fvtt-fria-ligan/forbidden-lands-foundry-vtt.git"
-	},
-	"license": "GPL-3.0-or-later",
-	"contributors": [
-		{
-			"name": "aMediocreDad",
-			"email": "[email protected]"
-		}
-	],
-	"type": "module",
-	"scripts": {
-		"build": "bun esbuild.config.ts",
-		"format": "biome format --write .",
-		"lint": "biome check --apply .",
-		"lint:ci": "bunx biome ci .",
-		"postinstall": "lefthook install && bun run setup",
-		"release": "bun tools/release.ts",
-		"setup": "bun tools/setup.ts",
-		"start": "bun run build --development",
-		"test": "bun run test:types && bun run lint:ci",
-		"test:types": "bunx tsc && bunx tsc -p ./src/tsconfig.json",
-		"version": "bun tools/version.ts"
-	},
-	"dependencies": {
-		"foundry-year-zero-roller": "Stefouch/foundry-year-zero-roller#v5.1.1",
-		"rpg-awesome": "0.2.0",
-		"ultrahtml": "1.5.2"
-	},
-	"devDependencies": {
-		"@arkweid/lefthook": "0.7.7",
-		"@biomejs/biome": "1.4.1",
-		"@changesets/changelog-github": "0.5.0",
-		"@changesets/cli": "2.27.1",
-		"@types/jquery": "3.5.29",
-		"@types/node": "20.10.5",
-		"@types/showdown": "2.0.6",
-		"bun": "1.0.18",
-		"bun-types": "1.0.18-1",
-		"devmoji": "2.3.0",
-		"esbuild": "0.19.9",
-		"esbuild-sass-plugin": "2.16.0",
-		"execa": "8.0.1",
-		"globby": "14.0.0",
-		"gluegun": "5.1.6",
-		"typescript": "5.3.3"
-	}
+  "name": "forbidden-lands",
+  "version": "11.4.1",
+  "private": true,
+  "description": "<p align=\"center\">\r   <a href=\"https://github.com/fvtt-fria-ligan/forbidden-lands-foundry-vtt/releases/latest\" target=\"_blank\"><img alt=\"system version\" src=\"https://img.shields.io/badge/dynamic/json.svg?url=https%3A%2F%2Fraw.githubusercontent.com%2Ffvtt-fria-ligan%2Fforbidden-lands-foundry-vtt%2Fmain%2Fsystem.json&label=Version&query=$.version&colorB=blue\"/></a>\r   <a href=\"https://foundryvtt.com\" target=\"_blank\">\r     <img src=\"https://img.shields.io/badge/dynamic/json.svg?url=https%3A%2F%2Fraw.githubusercontent.com%2Ffvtt-fria-ligan%2Fforbidden-lands-foundry-vtt%2Fmain%2Fsystem.json&label=Foundry&query=$.compatibleCoreVersion&colorB=blue\" alt=\"foundry-compatibility-version\" style=\"max-width:100%;\"/>\r   </a>\r   <a href=\"https://github.com/fvtt-fria-ligan/forbidden-lands-foundry-vtt/graphs/commit-activity\" target=\"_blank\">\r     <img alt=\"Maintenance\" src=\"https://img.shields.io/badge/Maintained%3F-yes-green.svg\"/>\r   </a>\r   <a href=\"https://gitlocalize.com/repo/5750/whole_project?utm_source=badge\" target=\"_blank\"><img alt=\"Localization\" src=\"https://gitlocalize.com/repo/5750/whole_project/badge.svg\" /></a>\r   <a href=\"https://github.com/fvtt-fria-ligan/forbidden-lands-foundry-vtt/blob/main/LICENSE\" target=\"_blank\">\r     <img alt=\"License: GPL\" src=\"https://img.shields.io/github/license/fvtt-fria-ligan/forbidden-lands-foundry-vtt\"/>\r   </a>\r   <br/>\r   <br/>\r   <img src=\"https://user-images.githubusercontent.com/9851733/108728684-1a954b00-752a-11eb-9138-6fab6f83b2a8.jpg\" alt=\"Logo\" style=\"max-width:100%;\" />\r </p>",
+  "homepage": "https://github.com/fvtt-fria-ligan/forbidden-lands-foundry-vtt#readme",
+  "bugs": {
+    "url": "https://github.com/fvtt-fria-ligan/forbidden-lands-foundry-vtt/issues"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/fvtt-fria-ligan/forbidden-lands-foundry-vtt.git"
+  },
+  "license": "GPL-3.0-or-later",
+  "contributors": [
+    {
+      "name": "aMediocreDad",
+      "email": "[email protected]"
+    }
+  ],
+  "type": "module",
+  "scripts": {
+    "build": "bun esbuild.config.ts",
+    "format": "biome format --write .",
+    "lint": "biome check --apply .",
+    "lint:ci": "bunx biome ci .",
+    "postinstall": "lefthook install && bun run setup",
+    "release": "bun tools/release.ts",
+    "setup": "bun tools/setup.ts",
+    "start": "bun run build --development",
+    "test": "bun run test:types && bun run lint:ci",
+    "test:types": "bunx tsc && bunx tsc -p ./src/tsconfig.json",
+    "version": "bun tools/version.ts"
+  },
+  "dependencies": {
+    "foundry-year-zero-roller": "Stefouch/foundry-year-zero-roller#v5.1.1",
+    "rpg-awesome": "0.2.0",
+    "ultrahtml": "1.5.2"
+  },
+  "devDependencies": {
+    "@arkweid/lefthook": "0.7.7",
+    "@biomejs/biome": "1.5.2",
+    "@changesets/changelog-github": "0.5.0",
+    "@changesets/cli": "2.27.1",
+    "@types/jquery": "3.5.29",
+    "@types/node": "20.11.5",
+    "@types/showdown": "2.0.6",
+    "bun": "latest",
+    "bun-types": "1.0.23",
+    "devmoji": "2.3.0",
+    "esbuild": "0.19.11",
+    "esbuild-sass-plugin": "2.16.1",
+    "execa": "8.0.1",
+    "globby": "14.0.0",
+    "gluegun": "5.1.6",
+    "typescript": "5.3.3"
+  },
+  "volta": {
+    "node": "20.11.0"
+  }
 }
diff --git a/src/components/roll-engine/engine.js b/src/components/roll-engine/engine.js
@@ -706,7 +706,9 @@ export class FBLRollHandler extends FormApplication {
 	static async decreaseConsumable(messageId) {
 		let {
 			data: { speaker },
-			roll: { options: { consumable } },
+			roll: {
+				options: { consumable },
+			},
 		} = game.messages.get(messageId);
 
 		speaker = this.getSpeaker(speaker);

diff --git a/src/system/core/hooks.js b/src/system/core/hooks.js
@@ -44,9 +44,9 @@ export default function registerHooks() {
 	 * The commands take arguments like "2db" or "4ds"
 	 */
 	Hooks.on("chatMessage", (_html, content, _msg) => {
-		const commandR = new RegExp("^\\/fblr(?:oll)?", "i");
+		const commandR = /^\/fblr(?:oll)?/i;
 		if (content.match(commandR)) {
-			const diceR = new RegExp("(\\d+d(?:[bsng]|8|10|12))", "gi");
+			const diceR = /(\d+d(?:[bsng]|8|10|12))/gi;
 			// eslint-disable-next-line no-unused-vars
 			const dice = content.match(diceR);
 			const data = {