Merge branch 'main' into v11-compat

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 2.8.7 - 2023-05-01
+
+### Bug fixes
+
+- Enable adding new combatants to Encounter Journal for DND5e system
+
 ## 2.8.6 - 2023-05-01
 
 ### Translations

package.json

@@ -18,29 +18,29 @@
   },
   "dependencies": {},
   "devDependencies": {
-    "@babel/eslint-parser": "7.21.3",
-    "@babel/preset-env": "7.21.4",
+    "@babel/eslint-parser": "7.21.8",
+    "@babel/preset-env": "7.22.4",
     "@jest/types": "29.5.0",
     "@league-of-foundry-developers/foundry-vtt-types": "9.280.0",
-    "@types/jest": "29.5.1",
-    "@types/node": "18.16.2",
-    "@typescript-eslint/eslint-plugin": "5.59.1",
-    "@typescript-eslint/parser": "5.59.1",
+    "@types/jest": "29.5.2",
+    "@types/node": "18.16.16",
+    "@typescript-eslint/eslint-plugin": "5.59.9",
+    "@typescript-eslint/parser": "5.59.9",
     "@typhonjs-fvtt/eslint-config-foundry.js": "0.8.0",
     "babel-jest": "29.5.0",
-    "dayjs": "1.11.7",
-    "esbuild": "0.17.18",
+    "dayjs": "1.11.8",
+    "esbuild": "0.17.19",
     "esbuild-sass-plugin": "2.9.0",
-    "eslint": "8.39.0",
+    "eslint": "8.42.0",
     "eslint-config-prettier": "8.8.0",
     "eslint-plugin-prettier": "4.2.1",
-    "foundryvtt-simple-calendar": "2.1.80",
+    "foundryvtt-simple-calendar": "2.2.0",
     "jest": "29.5.0",
     "jest-junit": "16.0.0",
     "prettier": "2.8.8",
-    "sass": "1.62.1",
+    "sass": "1.63.2",
     "ts-jest": "29.1.0",
-    "typescript": "5.0.4"
+    "typescript": "5.1.3"
   },
   "jest-junit": {
     "outputDirectory": "./test-results/junit",

scripts/SetupHooksDND5e.ts

@@ -39,8 +39,8 @@ export default class SetupHooksDND5e {
       });
       window.Hooks.on(
         "updateCombat",
-        async function (_combat: Combat, data: HookUpdateCombatRound) {
-          OnUpdateCombat(data.round);
+        async function (combat: Combat, data: HookUpdateCombatRound) {
+          OnUpdateCombat(data.round, combat);
         }
       );