Merge branch 'update-for-0.7.10' into 'master'

Update for 0.7.10

See merge request dungeonslayers/ds4!109

jest.config.js

@@ -1,6 +1,5 @@
 module.exports = {
     preset: "ts-jest",
-    testEnvironment: "node",
     globals: {
         "ts-jest": {
             tsconfig: "<rootDir>/spec/tsconfig.spec.json",

package.json

@@ -46,33 +46,33 @@
         "postinstall": "husky install"
     },
     "devDependencies": {
-        "@league-of-foundry-developers/foundry-vtt-types": "^0.7.9-6",
-        "@rollup/plugin-node-resolve": "^11.2.1",
+        "@league-of-foundry-developers/foundry-vtt-types": "^0.7.10-0",
+        "@rollup/plugin-node-resolve": "^13.0.0",
         "@types/fs-extra": "^9.0.11",
-        "@types/jest": "^26.0.22",
-        "@typescript-eslint/eslint-plugin": "^4.22.0",
-        "@typescript-eslint/parser": "^4.22.0",
+        "@types/jest": "^26.0.23",
+        "@typescript-eslint/eslint-plugin": "^4.25.0",
+        "@typescript-eslint/parser": "^4.25.0",
         "chalk": "^4.1.1",
-        "eslint": "^7.25.0",
+        "eslint": "^7.27.0",
         "eslint-config-prettier": "^8.3.0",
-        "eslint-plugin-jest": "^24.3.5",
+        "eslint-plugin-jest": "^24.3.6",
         "eslint-plugin-prettier": "^3.4.0",
-        "fs-extra": "^9.1.0",
+        "fs-extra": "^10.0.0",
         "gulp": "^4.0.2",
         "gulp-sass": "^4.1.0",
-        "husky": "^5.2.0",
-        "jest": "^26.6.3",
-        "jest-junit": "^12.0.0",
-        "lint-staged": "^10.5.4",
-        "prettier": "^2.2.1",
-        "rollup": "^2.45.2",
+        "husky": "^6.0.0",
+        "jest": "^27.0.3",
+        "jest-junit": "^12.1.0",
+        "lint-staged": "^11.0.0",
+        "prettier": "^2.3.0",
+        "rollup": "^2.50.4",
         "rollup-plugin-typescript2": "^0.30.0",
         "sass": "^1.32.8",
         "semver": "^7.3.5",
-        "ts-jest": "^26.5.5",
+        "ts-jest": "^27.0.1",
         "tslib": "^2.2.0",
         "typescript": "^4.2.4",
-        "yargs": "^16.2.0"
+        "yargs": "^17.0.1"
     },
     "lint-staged": {
         "*.ts": "eslint --cache --fix",

src/module/item/item.ts

@@ -94,7 +94,7 @@ export class DS4Item extends Item<DS4ItemData, DS4ItemPreparedData> {
             );
         }
 
-        const actor = (this.actor as unknown) as DS4Actor; // TODO(types): Improve so that the concrete Actor type is known here
+        const actor = this.actor as unknown as DS4Actor; // TODO(types): Improve so that the concrete Actor type is known here
         const ownerDataData = actor.data.data;
         const weaponBonus = this.data.data.weaponBonus;
         const combatValue = await this.getCombatValueKeyForAttackType(this.data.data.attackType);
@@ -130,7 +130,7 @@ export class DS4Item extends Item<DS4ItemData, DS4ItemPreparedData> {
             );
         }
 
-        const actor = (this.actor as unknown) as DS4Actor; // TODO(types): Improve so that the concrete Actor type is known here
+        const actor = this.actor as unknown as DS4Actor; // TODO(types): Improve so that the concrete Actor type is known here
         const ownerDataData = actor.data.data;
         const spellBonus = Number.isNumeric(this.data.data.bonus) ? parseInt(this.data.data.bonus) : undefined;
         if (spellBonus === undefined) {

src/module/migrations/002.ts

@@ -79,7 +79,7 @@ function getSceneUpdateData(sceneData: Scene.Data) {
         }
         const token = new Token(tokenData);
         if (!token.actor) {
-            tokenData.actorId = (null as unknown) as string;
+            tokenData.actorId = null as unknown as string;
             tokenData.actorData = {};
             hasTokenUpdates = true;
         } else if (!tokenData.actorLink) {

src/module/migrations/003.ts

@@ -83,7 +83,7 @@ function getSceneUpdateData(sceneData: Scene.Data) {
         }
         const token = new Token(tokenData);
         if (!token.actor) {
-            tokenData.actorId = (null as unknown) as string;
+            tokenData.actorId = null as unknown as string;
             tokenData.actorData = {};
             hasTokenUpdates = true;
         } else if (!tokenData.actorLink) {

src/module/migrations/004.ts

@@ -95,7 +95,7 @@ function getSceneUpdateData(sceneData: Scene.Data) {
         }
         const token = new Token(tokenData);
         if (!token.actor) {
-            tokenData.actorId = (null as unknown) as string;
+            tokenData.actorId = null as unknown as string;
             tokenData.actorData = {};
             hasTokenUpdates = true;
         } else if (!tokenData.actorLink) {

src/system.json

@@ -4,7 +4,7 @@
     "description": "The Dungeonslayers 4 system for FoundryVTT. Dungeonslayers (© Christian Kennig) is licensed under CC BY-NC-SA 3.0 (https://creativecommons.org/licenses/by-nc-sa/3.0/de/deed.en).",
     "version": "0.7.0",
     "minimumCoreVersion": "0.7.9",
-    "compatibleCoreVersion": "0.7.9",
+    "compatibleCoreVersion": "0.7.10",
     "templateVersion": 6,
     "author": "Johannes Loher, Gesina Schwalbe, Oliver Rümpelein, Siegfried Krug",
     "authors": [