From b9347ba20e3bee0d4ee7522bb9edc3d6a5a6d71a Mon Sep 17 00:00:00 2001 From: Johannes Loher Date: Thu, 15 Jul 2021 20:09:57 +0200 Subject: [PATCH 01/61] Remove @rollup/plugin-node-resolve It's not needed and adds about 2 seconds build time. Additionally, update all dependencies. --- package.json | 11 ++- rollup.config.js | 3 +- yarn.lock | 201 ++++++++++++++++------------------------------- 3 files changed, 73 insertions(+), 142 deletions(-) diff --git a/package.json b/package.json index dac4c6bf..8306f783 100644 --- a/package.json +++ b/package.json @@ -52,12 +52,11 @@ "postinstall": "husky install" }, "devDependencies": { - "@league-of-foundry-developers/foundry-vtt-types": "^0.8.8-5", - "@rollup/plugin-node-resolve": "^13.0.0", + "@league-of-foundry-developers/foundry-vtt-types": "^0.8.8-7", "@types/fs-extra": "^9.0.12", "@types/jest": "^26.0.24", - "@typescript-eslint/eslint-plugin": "^4.28.2", - "@typescript-eslint/parser": "^4.28.2", + "@typescript-eslint/eslint-plugin": "^4.28.3", + "@typescript-eslint/parser": "^4.28.3", "chalk": "^4.1.1", "eslint": "^7.30.0", "eslint-config-prettier": "^8.3.0", @@ -69,9 +68,9 @@ "husky": "^7.0.1", "jest": "^27.0.6", "jest-junit": "^12.2.0", - "lint-staged": "^11.0.0", + "lint-staged": "^11.0.1", "prettier": "^2.3.2", - "rollup": "^2.53.1", + "rollup": "^2.53.2", "rollup-plugin-typescript2": "^0.30.0", "sass": "1.35.2", "semver": "^7.3.5", diff --git a/rollup.config.js b/rollup.config.js index f57de335..3594effa 100644 --- a/rollup.config.js +++ b/rollup.config.js @@ -3,7 +3,6 @@ // SPDX-License-Identifier: MIT const typescript = require("rollup-plugin-typescript2"); -const { nodeResolve } = require("@rollup/plugin-node-resolve"); module.exports = { input: "src/module/ds4.ts", @@ -12,5 +11,5 @@ module.exports = { format: "es", sourcemap: true, }, - plugins: [nodeResolve(), typescript({})], + plugins: [typescript({})], }; diff --git a/yarn.lock b/yarn.lock index 179c75a5..7df20817 100644 --- a/yarn.lock +++ b/yarn.lock @@ -689,19 +689,19 @@ __metadata: languageName: node linkType: hard -"@league-of-foundry-developers/foundry-vtt-types@npm:^0.8.8-5": - version: 0.8.8-5 - resolution: "@league-of-foundry-developers/foundry-vtt-types@npm:0.8.8-5" +"@league-of-foundry-developers/foundry-vtt-types@npm:^0.8.8-7": + version: 0.8.8-7 + resolution: "@league-of-foundry-developers/foundry-vtt-types@npm:0.8.8-7" dependencies: - "@types/jquery": ~3.5.5 - "@types/simple-peer": ~9.11.0 + "@types/jquery": ~3.5.6 + "@types/simple-peer": ~9.11.1 handlebars: 4.7.7 pixi-particles: 4.3.1 pixi.js: 5.3.4 socket.io-client: 4.1.2 tinymce: 5.8.1 - typescript: ^4.1.6 - checksum: e5f06d5bd68403cf79ed367bcfcc2eade250dc00800e1ede33357515ba9cd437336e0c1388c316501087ac5bce8b36731782e2509683d9186e1387283ed83e35 + typescript: ^4.3.5 + checksum: b166266390a70937dad8cb440cf4cbf5bfca031efa73179bd83cee79005589c493d3e151718b192c53a86a112801a5663ea103bf5aaa078b42e35dcb9dbcb5df languageName: node linkType: hard @@ -1122,35 +1122,6 @@ __metadata: languageName: node linkType: hard -"@rollup/plugin-node-resolve@npm:^13.0.0": - version: 13.0.0 - resolution: "@rollup/plugin-node-resolve@npm:13.0.0" - dependencies: - "@rollup/pluginutils": ^3.1.0 - "@types/resolve": 1.17.1 - builtin-modules: ^3.1.0 - deepmerge: ^4.2.2 - is-module: ^1.0.0 - resolve: ^1.19.0 - peerDependencies: - rollup: ^2.42.0 - checksum: 4b323e8ad5f1245449cd44b4857ed94a8dd3b998178ce139e74542c216a5abeb5a9e44885f3809ac747296a108f0562f986f9561055e76d1b0b268cf788a5c83 - languageName: node - linkType: hard - -"@rollup/pluginutils@npm:^3.1.0": - version: 3.1.0 - resolution: "@rollup/pluginutils@npm:3.1.0" - dependencies: - "@types/estree": 0.0.39 - estree-walker: ^1.0.1 - picomatch: ^2.2.2 - peerDependencies: - rollup: ^1.20.0||^2.0.0 - checksum: 45da6411e045d1b034242a8144f4a5e8c02ff1b68a2e0857807f5bb4b091c416f2015e075057f0f0dec200e7b35efe6ed4e301b43e365cedea09192f01a6839b - languageName: node - linkType: hard - "@rollup/pluginutils@npm:^4.1.0": version: 4.1.0 resolution: "@rollup/pluginutils@npm:4.1.0" @@ -1236,13 +1207,6 @@ __metadata: languageName: node linkType: hard -"@types/estree@npm:0.0.39": - version: 0.0.39 - resolution: "@types/estree@npm:0.0.39" - checksum: 43e5361de39969def145f32f4599391ab13055ec94841f1633a7cfe10f0e8a940ebf0e9a4b2770454a6bddd034b57e7e0d51a4d565cb2714ee2accf10a7718be - languageName: node - linkType: hard - "@types/fs-extra@npm:^9.0.12": version: 9.0.12 resolution: "@types/fs-extra@npm:9.0.12" @@ -1296,7 +1260,7 @@ __metadata: languageName: node linkType: hard -"@types/jquery@npm:~3.5.5": +"@types/jquery@npm:~3.5.6": version: 3.5.6 resolution: "@types/jquery@npm:3.5.6" dependencies: @@ -1333,16 +1297,7 @@ __metadata: languageName: node linkType: hard -"@types/resolve@npm:1.17.1": - version: 1.17.1 - resolution: "@types/resolve@npm:1.17.1" - dependencies: - "@types/node": "*" - checksum: 8e72a73574f9489760662498c1ad512a8d4084a5db15f327e0d785cb277bb0a3146cd049241a8e3268bd0ed204ad3ee7b4a6b4622ef681e70547be9af258ca6a - languageName: node - linkType: hard - -"@types/simple-peer@npm:~9.11.0": +"@types/simple-peer@npm:~9.11.1": version: 9.11.1 resolution: "@types/simple-peer@npm:9.11.1" dependencies: @@ -1390,12 +1345,12 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/eslint-plugin@npm:^4.28.2": - version: 4.28.2 - resolution: "@typescript-eslint/eslint-plugin@npm:4.28.2" +"@typescript-eslint/eslint-plugin@npm:^4.28.3": + version: 4.28.3 + resolution: "@typescript-eslint/eslint-plugin@npm:4.28.3" dependencies: - "@typescript-eslint/experimental-utils": 4.28.2 - "@typescript-eslint/scope-manager": 4.28.2 + "@typescript-eslint/experimental-utils": 4.28.3 + "@typescript-eslint/scope-manager": 4.28.3 debug: ^4.3.1 functional-red-black-tree: ^1.0.1 regexpp: ^3.1.0 @@ -1407,23 +1362,23 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 6af8ea7665d5eaf0bafe241d71e3a85df07c0c82e59f530bd6627e0371e66a2d4a517cacd00d030680fe13d423b065c53185d3f48daa174fea316f024b1ab545 + checksum: 791adc8261d43d2556f367fc917a64b7fde4f735735120f0132f5007f1fe05b141314d18aa2e64bfdbbd04d33240d660216e7c8dde1b246f58f6ad2e17d0ca2c languageName: node linkType: hard -"@typescript-eslint/experimental-utils@npm:4.28.2": - version: 4.28.2 - resolution: "@typescript-eslint/experimental-utils@npm:4.28.2" +"@typescript-eslint/experimental-utils@npm:4.28.3": + version: 4.28.3 + resolution: "@typescript-eslint/experimental-utils@npm:4.28.3" dependencies: "@types/json-schema": ^7.0.7 - "@typescript-eslint/scope-manager": 4.28.2 - "@typescript-eslint/types": 4.28.2 - "@typescript-eslint/typescript-estree": 4.28.2 + "@typescript-eslint/scope-manager": 4.28.3 + "@typescript-eslint/types": 4.28.3 + "@typescript-eslint/typescript-estree": 4.28.3 eslint-scope: ^5.1.1 eslint-utils: ^3.0.0 peerDependencies: eslint: "*" - checksum: 5b3fed818af9882ae54bf258351c2740a92aa0bb5a85478ce1d4d957e594882ece42048149b1a1a8500023c1d334d9846048bc96f309ed60715232be8ef5d1a8 + checksum: 3b2a8ede773ed6929f1c2a680608a11003bfd44cf5c8f8cc7409d167374c543d876f97e67533566ec91eaf17ad514d7eee20e611e5f78b0b3ac18b5bc99af865 languageName: node linkType: hard @@ -1443,20 +1398,20 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/parser@npm:^4.28.2": - version: 4.28.2 - resolution: "@typescript-eslint/parser@npm:4.28.2" +"@typescript-eslint/parser@npm:^4.28.3": + version: 4.28.3 + resolution: "@typescript-eslint/parser@npm:4.28.3" dependencies: - "@typescript-eslint/scope-manager": 4.28.2 - "@typescript-eslint/types": 4.28.2 - "@typescript-eslint/typescript-estree": 4.28.2 + "@typescript-eslint/scope-manager": 4.28.3 + "@typescript-eslint/types": 4.28.3 + "@typescript-eslint/typescript-estree": 4.28.3 debug: ^4.3.1 peerDependencies: eslint: ^5.0.0 || ^6.0.0 || ^7.0.0 peerDependenciesMeta: typescript: optional: true - checksum: 4d71ddbe039007f366b6e9deca12183e45ea165053a29b64e8e4534451a134fe664fd3bf8ec06951e2afe8b5fd14143fb2ef3182a9ee8d2b20a89a3c0f4f2529 + checksum: 107c6b6176343dc2e82a372bd240a762c1d254b7b30f91560012b68857d25fd18cc4517e4f691c67ff3bdffd4150d89bd8318e4741ca7aa70b50a3ca74e36ad6 languageName: node linkType: hard @@ -1470,13 +1425,13 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/scope-manager@npm:4.28.2": - version: 4.28.2 - resolution: "@typescript-eslint/scope-manager@npm:4.28.2" +"@typescript-eslint/scope-manager@npm:4.28.3": + version: 4.28.3 + resolution: "@typescript-eslint/scope-manager@npm:4.28.3" dependencies: - "@typescript-eslint/types": 4.28.2 - "@typescript-eslint/visitor-keys": 4.28.2 - checksum: 31c30f428ba50087fc6a8dacc00b4d007d6653f1ea261a468e0a5425d730c5bf1e87bea581494862687c294d1f2ace30813f919800a05190fa332db6cd192bef + "@typescript-eslint/types": 4.28.3 + "@typescript-eslint/visitor-keys": 4.28.3 + checksum: 6f6a821e595c1cb8045a6820e9553d52f1588e9c512fd74ae7b2529d2337e4e57884c77039195d51d3a62443ef940f955e13c7e15a41822ecc20b210ebe604fd languageName: node linkType: hard @@ -1487,10 +1442,10 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/types@npm:4.28.2": - version: 4.28.2 - resolution: "@typescript-eslint/types@npm:4.28.2" - checksum: 9f5e6bf3df4540adf8eb1f83909bac778257f60a6ef7fcafa7df5224949839a63dba61fe4b58de538ffe17517e88ff6b29f691209f80a55df87935bac6349f69 +"@typescript-eslint/types@npm:4.28.3": + version: 4.28.3 + resolution: "@typescript-eslint/types@npm:4.28.3" + checksum: b5b394c68b44962a8c58406e0f4c90bad9be480e725a6c5eb7dd692ad01b1ed65eb0b69fd4f77b4b9c9221967c72e93f5a4e6ff962824d3a1faea2a32256c5af languageName: node linkType: hard @@ -1512,12 +1467,12 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/typescript-estree@npm:4.28.2": - version: 4.28.2 - resolution: "@typescript-eslint/typescript-estree@npm:4.28.2" +"@typescript-eslint/typescript-estree@npm:4.28.3": + version: 4.28.3 + resolution: "@typescript-eslint/typescript-estree@npm:4.28.3" dependencies: - "@typescript-eslint/types": 4.28.2 - "@typescript-eslint/visitor-keys": 4.28.2 + "@typescript-eslint/types": 4.28.3 + "@typescript-eslint/visitor-keys": 4.28.3 debug: ^4.3.1 globby: ^11.0.3 is-glob: ^4.0.1 @@ -1526,7 +1481,7 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 4fe36863b8af9808ee86b3cf64d6076a8b9a3224f9e1c17650d06ea46d80225b7e94903f71e7330a682b84eb1045189f1f09dc896165e9cab36714d24992ee84 + checksum: ec3b3abecef54d608921e29499f6c9cd1af45fafded47b5b5a6d32b93870ab048cb0636efb10936219b47945a17772c935df0acf1c8ff5188417cdcbf775b70c languageName: node linkType: hard @@ -1540,13 +1495,13 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/visitor-keys@npm:4.28.2": - version: 4.28.2 - resolution: "@typescript-eslint/visitor-keys@npm:4.28.2" +"@typescript-eslint/visitor-keys@npm:4.28.3": + version: 4.28.3 + resolution: "@typescript-eslint/visitor-keys@npm:4.28.3" dependencies: - "@typescript-eslint/types": 4.28.2 + "@typescript-eslint/types": 4.28.3 eslint-visitor-keys: ^2.0.0 - checksum: cec563831f563bb057f00045104db7ed92576755065d7563607c5f3581e5588fe8b83229767cd81763136aeb663dd49b99e7ee24decfbfc5fc7bd7b36bb1a525 + checksum: 37410d60074f255ac78b5af5d189c61ff219d0ff096f0d4984d7bc9ed9b42932d338b1efa97a99e0144820ef9a0fb2801c3ee6106dbc577901cc09ce02b75c9e languageName: node linkType: hard @@ -2217,13 +2172,6 @@ __metadata: languageName: node linkType: hard -"builtin-modules@npm:^3.1.0": - version: 3.2.0 - resolution: "builtin-modules@npm:3.2.0" - checksum: f0e7240f70ae472a0a0167bf76d2e828c73028fe60be8cd229939c38a27527ea68c92f700553dac1316fa124af3037bc7a765ca0e029a03d2e9201dfb372ea24 - languageName: node - linkType: hard - "cacache@npm:^15.0.5": version: 15.2.0 resolution: "cacache@npm:15.2.0" @@ -2949,12 +2897,11 @@ __metadata: version: 0.0.0-use.local resolution: "dungeonslayers4@workspace:." dependencies: - "@league-of-foundry-developers/foundry-vtt-types": ^0.8.8-5 - "@rollup/plugin-node-resolve": ^13.0.0 + "@league-of-foundry-developers/foundry-vtt-types": ^0.8.8-7 "@types/fs-extra": ^9.0.12 "@types/jest": ^26.0.24 - "@typescript-eslint/eslint-plugin": ^4.28.2 - "@typescript-eslint/parser": ^4.28.2 + "@typescript-eslint/eslint-plugin": ^4.28.3 + "@typescript-eslint/parser": ^4.28.3 chalk: ^4.1.1 eslint: ^7.30.0 eslint-config-prettier: ^8.3.0 @@ -2966,9 +2913,9 @@ __metadata: husky: ^7.0.1 jest: ^27.0.6 jest-junit: ^12.2.0 - lint-staged: ^11.0.0 + lint-staged: ^11.0.1 prettier: ^2.3.2 - rollup: ^2.53.1 + rollup: ^2.53.2 rollup-plugin-typescript2: ^0.30.0 sass: 1.35.2 semver: ^7.3.5 @@ -3391,13 +3338,6 @@ __metadata: languageName: node linkType: hard -"estree-walker@npm:^1.0.1": - version: 1.0.1 - resolution: "estree-walker@npm:1.0.1" - checksum: 85e7cee763e9125a7d8a947b3a06a8b9282873936df220dd0d791d9b3315e45e40ab096b43ba71bdc99140c11a6d23fdcf686642dc119a7b2d6181004fdb24d2 - languageName: node - linkType: hard - "estree-walker@npm:^2.0.1": version: 2.0.2 resolution: "estree-walker@npm:2.0.2" @@ -4667,13 +4607,6 @@ fsevents@^1.2.7: languageName: node linkType: hard -"is-module@npm:^1.0.0": - version: 1.0.0 - resolution: "is-module@npm:1.0.0" - checksum: 2cbd41e2760874130b76aee84cc53120c4feef0d0f196fa665326857b444c8549909cc840f3f3a59652a7e8df46146a77f6c0f3f70a578704e03670975843e74 - languageName: node - linkType: hard - "is-negated-glob@npm:^1.0.0": version: 1.0.0 resolution: "is-negated-glob@npm:1.0.0" @@ -5678,9 +5611,9 @@ fsevents@^1.2.7: languageName: node linkType: hard -"lint-staged@npm:^11.0.0": - version: 11.0.0 - resolution: "lint-staged@npm:11.0.0" +"lint-staged@npm:^11.0.1": + version: 11.0.1 + resolution: "lint-staged@npm:11.0.1" dependencies: chalk: ^4.1.1 cli-truncate: ^2.1.0 @@ -5699,7 +5632,7 @@ fsevents@^1.2.7: stringify-object: ^3.3.0 bin: lint-staged: bin/lint-staged.js - checksum: e5d9c38f468fae090939d150f8a1676ca208e50c714f20c9957a16833eeae20ca9676c8679883d0a005fda58375581c26352e18a2227d6449a29adaca650f957 + checksum: 2b90d18a40acb26c61df224844040843f4533b874cf5a5b6be9d7641d60c2799b4acf7e1f73cea4ab1c3630f26ab3c4553a42935850b6a7683e0500e5af7b3ec languageName: node linkType: hard @@ -7140,7 +7073,7 @@ fsevents@^1.2.7: languageName: node linkType: hard -"resolve@1.20.0, resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.19.0, resolve@^1.20.0, resolve@^1.4.0": +"resolve@1.20.0, resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.20.0, resolve@^1.4.0": version: 1.20.0 resolution: "resolve@npm:1.20.0" dependencies: @@ -7150,7 +7083,7 @@ fsevents@^1.2.7: languageName: node linkType: hard -"resolve@patch:resolve@1.20.0#builtin, resolve@patch:resolve@^1.1.6#builtin, resolve@patch:resolve@^1.1.7#builtin, resolve@patch:resolve@^1.10.0#builtin, resolve@patch:resolve@^1.19.0#builtin, resolve@patch:resolve@^1.20.0#builtin, resolve@patch:resolve@^1.4.0#builtin": +"resolve@patch:resolve@1.20.0#builtin, resolve@patch:resolve@^1.1.6#builtin, resolve@patch:resolve@^1.1.7#builtin, resolve@patch:resolve@^1.10.0#builtin, resolve@patch:resolve@^1.20.0#builtin, resolve@patch:resolve@^1.4.0#builtin": version: 1.20.0 resolution: "resolve@patch:resolve@npm%3A1.20.0#builtin::version=1.20.0&hash=3388aa" dependencies: @@ -7228,9 +7161,9 @@ fsevents@^1.2.7: languageName: node linkType: hard -"rollup@npm:^2.53.1": - version: 2.53.1 - resolution: "rollup@npm:2.53.1" +"rollup@npm:^2.53.2": + version: 2.53.2 + resolution: "rollup@npm:2.53.2" dependencies: fsevents: ~2.3.2 dependenciesMeta: @@ -7238,7 +7171,7 @@ fsevents@^1.2.7: optional: true bin: rollup: dist/bin/rollup - checksum: 7c63a7251e87715795a4141371f4f7b31ce46c7dd8273a0f4b5240977eb7ecaddd1e8d0fdaf8eabfc7cf73075cc9d83e03c67b89e56f31a2e85cf1089e9fc34f + checksum: 41d32b1d44066f3e8eeb5239013397e3df74dbb37489aaa77f8357059b5998cb4af0108fb72b048d265ae5d88de933b0732007c07e5d5687f5ee3ae44fab9eee languageName: node linkType: hard @@ -8190,7 +8123,7 @@ fsevents@^1.2.7: languageName: node linkType: hard -"typescript@^4.1.6, typescript@^4.3.5": +typescript@^4.3.5: version: 4.3.5 resolution: "typescript@npm:4.3.5" bin: @@ -8200,7 +8133,7 @@ fsevents@^1.2.7: languageName: node linkType: hard -"typescript@patch:typescript@^4.1.6#builtin, typescript@patch:typescript@^4.3.5#builtin": +"typescript@patch:typescript@^4.3.5#builtin": version: 4.3.5 resolution: "typescript@patch:typescript@npm%3A4.3.5#builtin::version=4.3.5&hash=ddfc1b" bin: From e39d245affa22ea97c61f9961dd47209034afd8e Mon Sep 17 00:00:00 2001 From: Johannes Loher Date: Tue, 20 Jul 2021 02:16:43 +0200 Subject: [PATCH 02/61] WIP: Add effects tab to actor sheets --- src/lang/de.json | 17 +++-- src/lang/en.json | 17 +++-- src/module/actor/sheets/actor-sheet.ts | 40 ++++++++++- src/module/handlebars/handlebars-partials.ts | 5 +- src/module/item/item-sheet.ts | 1 + src/scss/components/_effect_list.scss | 68 +++++++++++++++++++ src/scss/ds4.scss | 1 + .../sheets/actor/character-sheet.hbs | 4 ++ .../sheets/actor/components/add-button.hbs | 19 ++++++ .../actor/components/effect-list-entry.hbs | 31 +++++++++ .../actor/components/effect-list-header.hbs | 26 +++++++ .../actor/components/items-overview.hbs | 15 ++-- .../actor/components/overview-add-button.hbs | 17 ----- .../components/overview-control-buttons.hbs | 5 +- src/templates/sheets/actor/creature-sheet.hbs | 4 ++ src/templates/sheets/actor/tabs/abilities.hbs | 12 ++-- src/templates/sheets/actor/tabs/effects.hbs | 19 ++++++ .../actor/tabs/special-creature-abilities.hbs | 3 +- src/templates/sheets/actor/tabs/spells.hbs | 3 +- src/templates/sheets/item/tabs/effects.hbs | 9 +-- 20 files changed, 267 insertions(+), 49 deletions(-) create mode 100644 src/scss/components/_effect_list.scss create mode 100644 src/templates/sheets/actor/components/add-button.hbs create mode 100644 src/templates/sheets/actor/components/effect-list-entry.hbs create mode 100644 src/templates/sheets/actor/components/effect-list-header.hbs delete mode 100644 src/templates/sheets/actor/components/overview-add-button.hbs create mode 100644 src/templates/sheets/actor/tabs/effects.hbs diff --git a/src/lang/de.json b/src/lang/de.json index 2d37befb..a268faa3 100644 --- a/src/lang/de.json +++ b/src/lang/de.json @@ -1,10 +1,11 @@ { - "DS4.UserInteractionAddItem": "Neu", - "DS4.UserInteractionEditItem": "Bearbeiten", - "DS4.UserInteractionDeleteItem": "Löschen", - "DS4.UserInteractionAddEffect": "Neuer Effekt", - "DS4.UserInteractionEditEffect": "Effekt bearbeiten", - "DS4.UserInteractionDeleteEffect": "Effekt löschen", + "DS4.UserInteractionAdd": "Neu", + "DS4.UserInteractionAddItemTitle": "Item Erstellen", + "DS4.UserInteractionEditItemTitle": "Item Bearbeiten", + "DS4.UserInteractionDeleteItemTitle": "Item Löschen", + "DS4.UserInteractionAddEffectTitle": "Effekt Erstellen", + "DS4.UserInteractionEditEffectTitle": "Effekt Bearbeiten", + "DS4.UserInteractionDeleteEffectTitle": "Effekt Löschen", "DS4.DocumentImageAltText": "Bild von {name}", "DS4.RollableImageRollableTitle": "Für {name} würfeln", "DS4.DiceOverlayImageAltText": "Bild eines W20", @@ -121,6 +122,10 @@ "DS4.SpellMinimumLevelsSorcerer": "Zugangsstufe für Schwarzmagier", "DS4.SpellMinimumLevelsSorcererAbbr": "Zugangsstufe Sch", "DS4.SpellPrice": "Preis (Gold)", + "DS4.EffectEnabled": "Aktiv", + "DS4.EffectEnabledAbbr": "A", + "DS4.EffectLabel": "Bezeichnung", + "DS4.EffectSource": "Quelle", "DS4.ActorName": "Name", "DS4.ActorImageAltText": "Bild des Aktors", "DS4.ActorTypeCharacter": "Charakter", diff --git a/src/lang/en.json b/src/lang/en.json index 60f638ac..1b94e0cc 100644 --- a/src/lang/en.json +++ b/src/lang/en.json @@ -1,10 +1,11 @@ { - "DS4.UserInteractionAddItem": "Add item", - "DS4.UserInteractionEditItem": "Edit item", - "DS4.UserInteractionDeleteItem": "Delete item", - "DS4.UserInteractionAddEffect": "Add Effect", - "DS4.UserInteractionEditEffect": "Edit Effect", - "DS4.UserInteractionDeleteEffect": "Delete Effect", + "DS4.UserInteractionAdd": "Add", + "DS4.UserInteractionAddItemTitle": "Create Item", + "DS4.UserInteractionEditItemTitle": "Edit Item", + "DS4.UserInteractionDeleteItemTitle": "Delete Item", + "DS4.UserInteractionAddEffectTitle": "Create Effect", + "DS4.UserInteractionEditEffectTitle": "Edit Effect", + "DS4.UserInteractionDeleteEffectTitle": "Delete Effect", "DS4.DocumentImageAltText": "Image of {name}", "DS4.RollableImageRollableTitle": "Roll for {name}", "DS4.DiceOverlayImageAltText": "Image of a d20", @@ -121,6 +122,10 @@ "DS4.SpellMinimumLevelsSorcerer": "Minimum level for Sorcerers", "DS4.SpellMinimumLevelsSorcererAbbr": "Min lvl SRC", "DS4.SpellPrice": "Price (Gold)", + "DS4.EffectEnabled": "Enabled", + "DS4.EffectEnabledAbbr": "E", + "DS4.EffectLabel": "Label", + "DS4.EffectSource": "Source", "DS4.ActorName": "Name", "DS4.ActorImageAltText": "Image of the Actor", "DS4.ActorTypeCharacter": "Character", diff --git a/src/module/actor/sheets/actor-sheet.ts b/src/module/actor/sheets/actor-sheet.ts index c254ee97..859c3821 100644 --- a/src/module/actor/sheets/actor-sheet.ts +++ b/src/module/actor/sheets/actor-sheet.ts @@ -11,6 +11,7 @@ import { getCanvas, getGame } from "../../helpers"; import { DS4Item } from "../../item/item"; import { DS4Settings, getDS4Settings } from "../../settings"; import notifications from "../../ui/notifications"; +import { DS4Actor } from "../actor"; import { isCheck } from "../actor-data-properties"; /** @@ -30,6 +31,7 @@ export class DS4ActorSheet extends ActorSheet item.data).sort((a, b) => (a.sort || 0) - (b.sort || 0))]; }), ); + + const enrichedEffectPromises = this.actor.effects.toObject().map(async (effect) => { + const originatingDocument = effect.origin !== undefined ? await fromUuid(effect.origin) : undefined; + const source = + (originatingDocument instanceof DS4Actor || originatingDocument instanceof DS4Item + ? originatingDocument.name + : null) ?? undefined; + + return { + ...effect, + source, + }; + }); + const enrichedEffects = await Promise.all(enrichedEffectPromises); + const data = { ...this.addTooltipsToData(await super.getData()), - // Add the localization config to the data: config: DS4, - // Add the items explicitly sorted by type to the data: itemsByType, + enrichedEffects, settings: getDS4Settings(), }; return data; @@ -121,6 +137,8 @@ export class DS4ActorSheet extends ActorSheet { config: typeof DS4; itemsByType: Record; + enrichedEffects: EnrichedActiveEffectDataSource[]; settings: DS4Settings; } + +type ActiveEffectDataSource = foundry.data.ActiveEffectData["_source"]; + +interface EnrichedActiveEffectDataSource extends ActiveEffectDataSource { + source?: string; +} diff --git a/src/module/handlebars/handlebars-partials.ts b/src/module/handlebars/handlebars-partials.ts index 738cf21b..3215a7e6 100644 --- a/src/module/handlebars/handlebars-partials.ts +++ b/src/module/handlebars/handlebars-partials.ts @@ -8,6 +8,7 @@ export default async function registerHandlebarsPartials(): Promise { const templatePaths = [ "systems/ds4/templates/sheets/actor/components/actor-header.hbs", "systems/ds4/templates/sheets/actor/components/actor-progression.hbs", + "systems/ds4/templates/sheets/actor/components/add-button.hbs", "systems/ds4/templates/sheets/actor/components/biography.hbs", "systems/ds4/templates/sheets/actor/components/character-properties.hbs", "systems/ds4/templates/sheets/actor/components/check.hbs", @@ -18,10 +19,11 @@ export default async function registerHandlebarsPartials(): Promise { "systems/ds4/templates/sheets/actor/components/core-values.hbs", "systems/ds4/templates/sheets/actor/components/creature-properties.hbs", "systems/ds4/templates/sheets/actor/components/currency.hbs", + "systems/ds4/templates/sheets/actor/components/effect-list-entry.hbs", + "systems/ds4/templates/sheets/actor/components/effect-list-header.hbs", "systems/ds4/templates/sheets/actor/components/item-list-entry.hbs", "systems/ds4/templates/sheets/actor/components/item-list-header.hbs", "systems/ds4/templates/sheets/actor/components/items-overview.hbs", - "systems/ds4/templates/sheets/actor/components/overview-add-button.hbs", "systems/ds4/templates/sheets/actor/components/overview-control-buttons.hbs", "systems/ds4/templates/sheets/actor/components/profile.hbs", "systems/ds4/templates/sheets/actor/components/rollable-image.hbs", @@ -31,6 +33,7 @@ export default async function registerHandlebarsPartials(): Promise { "systems/ds4/templates/sheets/actor/tabs/character-inventory.hbs", "systems/ds4/templates/sheets/actor/tabs/creature-inventory.hbs", "systems/ds4/templates/sheets/actor/tabs/description.hbs", + "systems/ds4/templates/sheets/actor/tabs/effects.hbs", "systems/ds4/templates/sheets/actor/tabs/special-creature-abilities.hbs", "systems/ds4/templates/sheets/actor/tabs/spells.hbs", "systems/ds4/templates/sheets/actor/tabs/values.hbs", diff --git a/src/module/item/item-sheet.ts b/src/module/item/item-sheet.ts index d604df7f..7fc5f8e5 100644 --- a/src/module/item/item-sheet.ts +++ b/src/module/item/item-sheet.ts @@ -101,6 +101,7 @@ export class DS4ItemSheet extends ItemSheet const createData = { label: "New Effect", icon: "icons/svg/aura.svg", + origin: this.item.uuid, }; return ActiveEffect.create(createData, { parent: this.item }); diff --git a/src/scss/components/_effect_list.scss b/src/scss/components/_effect_list.scss new file mode 100644 index 00000000..06e18d36 --- /dev/null +++ b/src/scss/components/_effect_list.scss @@ -0,0 +1,68 @@ +/* + * SPDX-FileCopyrightText: 2021 Johannes Loher + * SPDX-FileCopyrightText: 2021 Gesina Schwalbe + * + * SPDX-License-Identifier: MIT + */ + +@use "../utils/mixins"; +@use "../utils/variables"; + +.ds4-effect-list { + @include mixins.mark-invalid-or-disabled-input; + + $row-height: 1.75em; + + align-items: center; + display: grid; + grid-column-gap: 0.5em; + grid-row-gap: 0.2em; + grid-template-columns: $row-height $row-height 3fr 2fr 5ch; + margin: 0.5em 0; + overflow-y: auto; + padding: 0; + + :nth-child(5n + 1) { + justify-self: center; + } + + &__row { + display: contents; // TODO: Once chromium supports `grid-template-columns: subgrid` (https://bugs.chromium.org/p/chromium/issues/detail?id=618969), switch to `display: grid; grid: 1/-1; grid-template-columns: subgrid` + + &--header { + font-weight: bold; + } + + > * { + height: $row-height; + line-height: $row-height; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + } + } + + &__image { + border: none; + } + + &__editable { + background-color: transparent; + border: 0; + padding: 0; + + &--checkbox { + width: 100%; + height: 100%; + margin: 0px; + } + } + + &__control-buttons { + display: grid; + grid-template-columns: 1fr 1fr; + text-align: center; + width: 100%; + padding: 0 calc(1em / 3); + } +} diff --git a/src/scss/ds4.scss b/src/scss/ds4.scss index a6afe386..c49150b5 100644 --- a/src/scss/ds4.scss +++ b/src/scss/ds4.scss @@ -33,6 +33,7 @@ @include meta.load-css("components/core_values"); @include meta.load-css("components/currency"); @include meta.load-css("components/description"); + @include meta.load-css("components/effect_list"); @include meta.load-css("components/forms"); @include meta.load-css("components/item_list"); @include meta.load-css("components/profile"); diff --git a/src/templates/sheets/actor/character-sheet.hbs b/src/templates/sheets/actor/character-sheet.hbs index 99ff588c..8dcc5a2a 100644 --- a/src/templates/sheets/actor/character-sheet.hbs +++ b/src/templates/sheets/actor/character-sheet.hbs @@ -18,6 +18,7 @@ SPDX-License-Identifier: MIT {{localize 'DS4.HeadingInventory'}} {{localize 'DS4.HeadingSpells'}} {{localize 'DS4.HeadingAbilities'}} + {{localize 'DS4.HeadingEffects'}} {{localize 'DS4.HeadingBiography'}} @@ -37,6 +38,9 @@ SPDX-License-Identifier: MIT {{!-- Abilities Tab --}} {{> systems/ds4/templates/sheets/actor/tabs/abilities.hbs}} +{{!-- Effects Tab --}} +{{> systems/ds4/templates/sheets/actor/tabs/effects.hbs}} + {{!-- Biography Tab --}} {{> systems/ds4/templates/sheets/actor/tabs/biography.hbs}} diff --git a/src/templates/sheets/actor/components/add-button.hbs b/src/templates/sheets/actor/components/add-button.hbs new file mode 100644 index 00000000..916a0eee --- /dev/null +++ b/src/templates/sheets/actor/components/add-button.hbs @@ -0,0 +1,19 @@ +{{!-- +SPDX-FileCopyrightText: 2021 Johannes Loher +SPDX-FileCopyrightText: 2021 Gesina Schwalbe + +SPDX-License-Identifier: MIT +--}} + +{{! +!-- Render an "add" button. +!-- @param class: The css class to use for the link element +!-- @param title: The title to use for the link element (will be localized) +!-- @param type: An optional property to use as data-type attribute +}} + diff --git a/src/templates/sheets/actor/components/effect-list-entry.hbs b/src/templates/sheets/actor/components/effect-list-entry.hbs new file mode 100644 index 00000000..2fa4f334 --- /dev/null +++ b/src/templates/sheets/actor/components/effect-list-entry.hbs @@ -0,0 +1,31 @@ +{{!-- +SPDX-FileCopyrightText: 2021 Johannes Loher +SPDX-FileCopyrightText: 2021 Gesina Schwalbe + +SPDX-License-Identifier: MIT +--}} + +{{!-- +!-- Render an effect list entry row. +!-- @param effectData: The data of the item. +--}} +
  • + {{!-- enabled --}} + + + {{!-- icon --}} + {{> systems/ds4/templates/sheets/actor/components/rollable-image.hbs rollable=false src=effectData.icon + alt=(localize "DS4.EffectIconAltText" label=effectData.label) title=effectData.label}} + + {{!-- label --}} +
    {{effectData.label}}
    + + {{!-- source --}} +
    {{effectData.source}}
    + + {{!-- control buttons --}} + {{> systems/ds4/templates/sheets/actor/components/overview-control-buttons.hbs + class="ds4-effect-list__control-buttons" }} +
    • diff --git a/src/templates/sheets/actor/components/effect-list-header.hbs b/src/templates/sheets/actor/components/effect-list-header.hbs new file mode 100644 index 00000000..3256c9b2 --- /dev/null +++ b/src/templates/sheets/actor/components/effect-list-header.hbs @@ -0,0 +1,26 @@ +{{!-- +SPDX-FileCopyrightText: 2021 Johannes Loher +SPDX-FileCopyrightText: 2021 Gesina Schwalbe + +SPDX-License-Identifier: MIT +--}} + +{{!-- +!-- Render an effect list header row. +--}} +
  • + {{!-- enabled --}} +
    {{localize 'DS4.EffectEnabledAbbr'}}
    + + {{!-- icon --}} +
    + + {{!-- label --}} +
    {{localize 'DS4.EffectLabel'}}
    + + {{!-- origin --}} +
    {{localize 'DS4.EffectSource'}}
    + + {{!-- control buttons placeholder --}} +
    +
    • diff --git a/src/templates/sheets/actor/components/items-overview.hbs b/src/templates/sheets/actor/components/items-overview.hbs index e3d4d292..ce44395a 100644 --- a/src/templates/sheets/actor/components/items-overview.hbs +++ b/src/templates/sheets/actor/components/items-overview.hbs @@ -41,7 +41,8 @@ SPDX-License-Identifier: MIT {{/each}} {{/unless}} -{{> systems/ds4/templates/sheets/actor/components/overview-add-button.hbs dataType='weapon'}} +{{> systems/ds4/templates/sheets/actor/components/add-button.hbs title='DS4.UserInteractionAddItemTitle' +class='item-create' type='weapon'}} {{!-- ARMOR --}}

    {{localize 'DS4.ItemTypeArmorPlural'}}

    @@ -79,7 +80,8 @@ SPDX-License-Identifier: MIT {{/each}} {{/unless}} -{{> systems/ds4/templates/sheets/actor/components/overview-add-button.hbs dataType='armor'}} +{{> systems/ds4/templates/sheets/actor/components/add-button.hbs title='DS4.UserInteractionAddItemTitle' +class='item-create' type='armor'}} {{!-- SHIELD --}}

    {{localize 'DS4.ItemTypeShieldPlural'}}

    @@ -100,7 +102,8 @@ SPDX-License-Identifier: MIT {{/each}} {{/unless}} -{{> systems/ds4/templates/sheets/actor/components/overview-add-button.hbs dataType='shield'}} +{{> systems/ds4/templates/sheets/actor/components/add-button.hbs title='DS4.UserInteractionAddItemTitle' +class='item-create' type='shield'}} {{!-- EQUIPMENT --}}

    {{localize 'DS4.ItemTypeEquipmentPlural'}}

    @@ -120,7 +123,8 @@ SPDX-License-Identifier: MIT {{/each}} {{/unless}} -{{> systems/ds4/templates/sheets/actor/components/overview-add-button.hbs dataType='equipment'}} +{{> systems/ds4/templates/sheets/actor/components/add-button.hbs title='DS4.UserInteractionAddItemTitle' +class='item-create' type='equipment'}} {{!-- LOOT --}}

    {{localize 'DS4.ItemTypeLootPlural'}}

    @@ -139,4 +143,5 @@ SPDX-License-Identifier: MIT {{/each}} {{/unless}} -{{> systems/ds4/templates/sheets/actor/components/overview-add-button.hbs dataType='loot'}} +{{> systems/ds4/templates/sheets/actor/components/add-button.hbs title='DS4.UserInteractionAddItemTitle' +class='item-create' type='loot'}} diff --git a/src/templates/sheets/actor/components/overview-add-button.hbs b/src/templates/sheets/actor/components/overview-add-button.hbs deleted file mode 100644 index a041ac9b..00000000 --- a/src/templates/sheets/actor/components/overview-add-button.hbs +++ /dev/null @@ -1,17 +0,0 @@ -{{!-- -SPDX-FileCopyrightText: 2021 Johannes Loher -SPDX-FileCopyrightText: 2021 Gesina Schwalbe - -SPDX-License-Identifier: MIT ---}} - -{{! -!-- Render an "add" button for adding an item of given data type. -!-- @param dataType: hand over the dataType to the partial as hash parameter -}} -
    - - - {{localize "DS4.UserInteractionAddItem"}} - -
    diff --git a/src/templates/sheets/actor/components/overview-control-buttons.hbs b/src/templates/sheets/actor/components/overview-control-buttons.hbs index e3078224..07c3b8d5 100644 --- a/src/templates/sheets/actor/components/overview-control-buttons.hbs +++ b/src/templates/sheets/actor/components/overview-control-buttons.hbs @@ -11,7 +11,8 @@ SPDX-License-Identifier: MIT !-- @param class: Additional CSS class(es) for the controls --}}
    - - +
    diff --git a/src/templates/sheets/actor/creature-sheet.hbs b/src/templates/sheets/actor/creature-sheet.hbs index 12e78d61..de12472b 100644 --- a/src/templates/sheets/actor/creature-sheet.hbs +++ b/src/templates/sheets/actor/creature-sheet.hbs @@ -20,6 +20,7 @@ SPDX-License-Identifier: MIT {{localize 'DS4.HeadingSpecialCreatureAbilities'}} {{localize 'DS4.HeadingSpells'}} + {{localize 'DS4.HeadingEffects'}} {{localize 'DS4.HeadingDescription'}} @@ -37,6 +38,9 @@ SPDX-License-Identifier: MIT {{!-- Spells Tab --}} {{> systems/ds4/templates/sheets/actor/tabs/spells.hbs}} + {{!-- Effects Tab --}} + {{> systems/ds4/templates/sheets/actor/tabs/effects.hbs}} + {{!-- Description Tab --}} {{> systems/ds4/templates/sheets/actor/tabs/description.hbs}} diff --git a/src/templates/sheets/actor/tabs/abilities.hbs b/src/templates/sheets/actor/tabs/abilities.hbs index 99217df6..5163fb94 100644 --- a/src/templates/sheets/actor/tabs/abilities.hbs +++ b/src/templates/sheets/actor/tabs/abilities.hbs @@ -22,7 +22,8 @@ SPDX-License-Identifier: MIT {{/each}} {{/unless}} - {{> systems/ds4/templates/sheets/actor/components/overview-add-button.hbs dataType='talent'}} + {{> systems/ds4/templates/sheets/actor/components/add-button.hbs title='DS4.UserInteractionAddItemTitle' + class='item-create' type='talent'}} {{!-- RACIAL ABILITY --}}

    {{localize 'DS4.ItemTypeRacialAbilityPlural'}}

    @@ -34,7 +35,8 @@ SPDX-License-Identifier: MIT {{/each}} {{/unless}} - {{> systems/ds4/templates/sheets/actor/components/overview-add-button.hbs dataType='racialAbility'}} + {{> systems/ds4/templates/sheets/actor/components/add-button.hbs title='DS4.UserInteractionAddItemTitle' + class='item-create' type='racialAbility'}} {{!-- LANGUAGE --}}

    {{localize 'DS4.ItemTypeLanguagePlural'}}

    @@ -46,7 +48,8 @@ SPDX-License-Identifier: MIT {{/each}} {{/unless}} - {{> systems/ds4/templates/sheets/actor/components/overview-add-button.hbs dataType='language'}} + {{> systems/ds4/templates/sheets/actor/components/add-button.hbs title='DS4.UserInteractionAddItemTitle' + class='item-create' type='language'}} {{!-- ALPHABET --}}

    {{localize 'DS4.ItemTypeAlphabetPlural'}}

    @@ -58,5 +61,6 @@ SPDX-License-Identifier: MIT {{/each}} {{/unless}} - {{> systems/ds4/templates/sheets/actor/components/overview-add-button.hbs dataType='alphabet'}} + {{> systems/ds4/templates/sheets/actor/components/add-button.hbs title='DS4.UserInteractionAddItemTitle' + class='item-create' type='alphabet'}} diff --git a/src/templates/sheets/actor/tabs/effects.hbs b/src/templates/sheets/actor/tabs/effects.hbs new file mode 100644 index 00000000..8e3e4353 --- /dev/null +++ b/src/templates/sheets/actor/tabs/effects.hbs @@ -0,0 +1,19 @@ +{{!-- +SPDX-FileCopyrightText: 2021 Johannes Loher +SPDX-FileCopyrightText: 2021 Gesina Schwalbe + +SPDX-License-Identifier: MIT +--}} + +
    + {{#unless (isEmpty data.effects)}} +
      + {{> systems/ds4/templates/sheets/actor/components/effect-list-header.hbs}} + {{#each enrichedEffects as |effectData id| }} + {{> systems/ds4/templates/sheets/actor/components/effect-list-entry.hbs effectData=effectData}} + {{/each}} +
    + {{/unless}} + {{> systems/ds4/templates/sheets/actor/components/add-button.hbs title='DS4.UserInteractionAddEffectTitle' + class='effect-create'}} +
    diff --git a/src/templates/sheets/actor/tabs/special-creature-abilities.hbs b/src/templates/sheets/actor/tabs/special-creature-abilities.hbs index 6782d481..15d52d56 100644 --- a/src/templates/sheets/actor/tabs/special-creature-abilities.hbs +++ b/src/templates/sheets/actor/tabs/special-creature-abilities.hbs @@ -14,5 +14,6 @@ SPDX-License-Identifier: MIT {{/each}} {{/unless}} - {{> systems/ds4/templates/sheets/actor/components/overview-add-button.hbs dataType='specialCreatureAbility'}} + {{> systems/ds4/templates/sheets/actor/components/add-button.hbs title='DS4.UserInteractionAddItemTitle' + class='item-create' type='specialCreatureAbility'}} diff --git a/src/templates/sheets/actor/tabs/spells.hbs b/src/templates/sheets/actor/tabs/spells.hbs index 4dac5d28..5b5b44e4 100644 --- a/src/templates/sheets/actor/tabs/spells.hbs +++ b/src/templates/sheets/actor/tabs/spells.hbs @@ -93,5 +93,6 @@ titleKey=titleKey}} {{/each}} {{/unless}} - {{> systems/ds4/templates/sheets/actor/components/overview-add-button.hbs dataType='spell' }} + {{> systems/ds4/templates/sheets/actor/components/add-button.hbs title='DS4.UserInteractionAddItemTitle' + class='item-create' type='spell'}} diff --git a/src/templates/sheets/item/tabs/effects.hbs b/src/templates/sheets/item/tabs/effects.hbs index 2fd894a1..0404d749 100644 --- a/src/templates/sheets/item/tabs/effects.hbs +++ b/src/templates/sheets/item/tabs/effects.hbs @@ -12,17 +12,18 @@ SPDX-License-Identifier: MIT
    Name
    - - {{localize 'DS4.UserInteractionAddEffect'}} + + {{localize 'DS4.UserInteractionAdd'}}
    {{#each item.effects as |effect id|}}

  • {{effect.data.label}}

    - + - +
    • From 4d2a7d1686b657346b7304af7d0141972b7c2d4f Mon Sep 17 00:00:00 2001 From: Johannes Loher Date: Tue, 20 Jul 2021 02:35:55 +0200 Subject: [PATCH 03/61] Simplify getting the source name of effects --- src/lang/de.json | 2 +- src/lang/en.json | 2 +- src/module/active-effect.ts | 7 +++++++ src/module/actor/sheets/actor-sheet.ts | 15 ++++----------- .../sheets/actor/components/effect-list-entry.hbs | 4 ++-- .../actor/components/effect-list-header.hbs | 4 ++-- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/lang/de.json b/src/lang/de.json index a268faa3..5a6b293c 100644 --- a/src/lang/de.json +++ b/src/lang/de.json @@ -125,7 +125,7 @@ "DS4.EffectEnabled": "Aktiv", "DS4.EffectEnabledAbbr": "A", "DS4.EffectLabel": "Bezeichnung", - "DS4.EffectSource": "Quelle", + "DS4.EffectSourceName": "Quelle", "DS4.ActorName": "Name", "DS4.ActorImageAltText": "Bild des Aktors", "DS4.ActorTypeCharacter": "Charakter", diff --git a/src/lang/en.json b/src/lang/en.json index 1b94e0cc..9ce4238a 100644 --- a/src/lang/en.json +++ b/src/lang/en.json @@ -125,7 +125,7 @@ "DS4.EffectEnabled": "Enabled", "DS4.EffectEnabledAbbr": "E", "DS4.EffectLabel": "Label", - "DS4.EffectSource": "Source", + "DS4.EffectSourceName": "Source", "DS4.ActorName": "Name", "DS4.ActorImageAltText": "Image of the Actor", "DS4.ActorTypeCharacter": "Character", diff --git a/src/module/active-effect.ts b/src/module/active-effect.ts index 1ae6eccc..6ae292d6 100644 --- a/src/module/active-effect.ts +++ b/src/module/active-effect.ts @@ -21,4 +21,11 @@ export class DS4ActiveEffect extends ActiveEffect { } return super.apply(actor, change); } + + /** + * A public wrapper for {@link ActiveEffect#_getSourceName}. + */ + async getSourceName(): Promise { + return this._getSourceName(); + } } diff --git a/src/module/actor/sheets/actor-sheet.ts b/src/module/actor/sheets/actor-sheet.ts index 859c3821..7f111cdc 100644 --- a/src/module/actor/sheets/actor-sheet.ts +++ b/src/module/actor/sheets/actor-sheet.ts @@ -11,7 +11,6 @@ import { getCanvas, getGame } from "../../helpers"; import { DS4Item } from "../../item/item"; import { DS4Settings, getDS4Settings } from "../../settings"; import notifications from "../../ui/notifications"; -import { DS4Actor } from "../actor"; import { isCheck } from "../actor-data-properties"; /** @@ -61,16 +60,10 @@ export class DS4ActorSheet extends ActorSheet { - const originatingDocument = effect.origin !== undefined ? await fromUuid(effect.origin) : undefined; - const source = - (originatingDocument instanceof DS4Actor || originatingDocument instanceof DS4Item - ? originatingDocument.name - : null) ?? undefined; - + const enrichedEffectPromises = this.actor.effects.map(async (effect) => { return { - ...effect, - source, + ...effect.toObject(), + sourceName: await effect.getSourceName(), }; }); const enrichedEffects = await Promise.all(enrichedEffectPromises); @@ -335,5 +328,5 @@ interface DS4ActorSheetData extends ActorSheet.Data { type ActiveEffectDataSource = foundry.data.ActiveEffectData["_source"]; interface EnrichedActiveEffectDataSource extends ActiveEffectDataSource { - source?: string; + sourceName: string; } diff --git a/src/templates/sheets/actor/components/effect-list-entry.hbs b/src/templates/sheets/actor/components/effect-list-entry.hbs index 2fa4f334..99419a5b 100644 --- a/src/templates/sheets/actor/components/effect-list-entry.hbs +++ b/src/templates/sheets/actor/components/effect-list-entry.hbs @@ -22,8 +22,8 @@ SPDX-License-Identifier: MIT {{!-- label --}}
    {{effectData.label}}
    - {{!-- source --}} -
    {{effectData.source}}
    + {{!-- source name --}} +
    {{effectData.sourceName}}
    {{!-- control buttons --}} {{> systems/ds4/templates/sheets/actor/components/overview-control-buttons.hbs diff --git a/src/templates/sheets/actor/components/effect-list-header.hbs b/src/templates/sheets/actor/components/effect-list-header.hbs index 3256c9b2..87ef2326 100644 --- a/src/templates/sheets/actor/components/effect-list-header.hbs +++ b/src/templates/sheets/actor/components/effect-list-header.hbs @@ -18,8 +18,8 @@ SPDX-License-Identifier: MIT {{!-- label --}}
    {{localize 'DS4.EffectLabel'}}
    - {{!-- origin --}} -
    {{localize 'DS4.EffectSource'}}
    + {{!-- source name --}} +
    {{localize 'DS4.EffectSourceName'}}
    {{!-- control buttons placeholder --}}
    From 808dab7f5ad72cf9a5ff819d7353c66f68a5e683 Mon Sep 17 00:00:00 2001 From: Johannes Loher Date: Thu, 22 Jul 2021 02:02:35 +0200 Subject: [PATCH 04/61] Add possibility to delete and edit effects in the actor sheet --- src/module/actor/sheets/actor-sheet.ts | 33 +++++++++++++++++-- src/module/handlebars/handlebars-partials.ts | 2 +- .../components/_control_button_group.scss | 17 ++++++++++ src/scss/components/_item_list.scss | 8 ----- src/scss/ds4.scss | 1 + .../sheets/actor/components/add-button.hbs | 5 +-- .../actor/components/control-button-group.hbs | 20 +++++++++++ .../actor/components/effect-list-entry.hbs | 8 ++--- .../actor/components/item-list-entry.hbs | 6 ++-- .../actor/components/items-overview.hbs | 10 +++--- .../components/overview-control-buttons.hbs | 18 ---------- src/templates/sheets/actor/tabs/abilities.hbs | 8 ++--- src/templates/sheets/actor/tabs/effects.hbs | 2 +- .../actor/tabs/special-creature-abilities.hbs | 2 +- src/templates/sheets/actor/tabs/spells.hbs | 2 +- 15 files changed, 91 insertions(+), 51 deletions(-) create mode 100644 src/scss/components/_control_button_group.scss create mode 100644 src/templates/sheets/actor/components/control-button-group.hbs delete mode 100644 src/templates/sheets/actor/components/overview-control-buttons.hbs diff --git a/src/module/actor/sheets/actor-sheet.ts b/src/module/actor/sheets/actor-sheet.ts index 7f111cdc..d68d29e2 100644 --- a/src/module/actor/sheets/actor-sheet.ts +++ b/src/module/actor/sheets/actor-sheet.ts @@ -130,7 +130,7 @@ export class DS4ActorSheet extends ActorSheet this.render(false)); + } + /** * Handle clickable item rolls. * @param event - The originating click event diff --git a/src/module/handlebars/handlebars-partials.ts b/src/module/handlebars/handlebars-partials.ts index 3215a7e6..478c4a5a 100644 --- a/src/module/handlebars/handlebars-partials.ts +++ b/src/module/handlebars/handlebars-partials.ts @@ -15,6 +15,7 @@ export default async function registerHandlebarsPartials(): Promise { "systems/ds4/templates/sheets/actor/components/checks.hbs", "systems/ds4/templates/sheets/actor/components/combat-value.hbs", "systems/ds4/templates/sheets/actor/components/combat-values.hbs", + "systems/ds4/templates/sheets/actor/components/control-button-group.hbs", "systems/ds4/templates/sheets/actor/components/core-value.hbs", "systems/ds4/templates/sheets/actor/components/core-values.hbs", "systems/ds4/templates/sheets/actor/components/creature-properties.hbs", @@ -24,7 +25,6 @@ export default async function registerHandlebarsPartials(): Promise { "systems/ds4/templates/sheets/actor/components/item-list-entry.hbs", "systems/ds4/templates/sheets/actor/components/item-list-header.hbs", "systems/ds4/templates/sheets/actor/components/items-overview.hbs", - "systems/ds4/templates/sheets/actor/components/overview-control-buttons.hbs", "systems/ds4/templates/sheets/actor/components/profile.hbs", "systems/ds4/templates/sheets/actor/components/rollable-image.hbs", "systems/ds4/templates/sheets/actor/components/talent-rank-equation.hbs", diff --git a/src/scss/components/_control_button_group.scss b/src/scss/components/_control_button_group.scss new file mode 100644 index 00000000..e38c2e48 --- /dev/null +++ b/src/scss/components/_control_button_group.scss @@ -0,0 +1,17 @@ +/* + * SPDX-FileCopyrightText: 2021 Johannes Loher + * + * SPDX-License-Identifier: MIT + */ +@use "../utils/variables"; + +.ds4-control-button-group { + display: flex; + text-align: center; + width: 100%; + padding: 0 calc(1em / 3); + + &__button { + flex: 1; + } +} diff --git a/src/scss/components/_item_list.scss b/src/scss/components/_item_list.scss index 7c16a34f..0b7700a3 100644 --- a/src/scss/components/_item_list.scss +++ b/src/scss/components/_item_list.scss @@ -96,14 +96,6 @@ text-overflow: ellipsis; } } - - &__control-buttons { - display: grid; - grid-template-columns: 1fr 1fr; - text-align: center; - width: 100%; - padding: 0 calc(1em / 3); - } } .ds4-item-list-title { diff --git a/src/scss/ds4.scss b/src/scss/ds4.scss index c49150b5..8203eb62 100644 --- a/src/scss/ds4.scss +++ b/src/scss/ds4.scss @@ -29,6 +29,7 @@ @include meta.load-css("components/checks"); @include meta.load-css("components/combat_value"); @include meta.load-css("components/combat_values"); + @include meta.load-css("components/control_button_group"); @include meta.load-css("components/core_value"); @include meta.load-css("components/core_values"); @include meta.load-css("components/currency"); diff --git a/src/templates/sheets/actor/components/add-button.hbs b/src/templates/sheets/actor/components/add-button.hbs index 916a0eee..61dd303f 100644 --- a/src/templates/sheets/actor/components/add-button.hbs +++ b/src/templates/sheets/actor/components/add-button.hbs @@ -7,12 +7,13 @@ SPDX-License-Identifier: MIT {{! !-- Render an "add" button. -!-- @param class: The css class to use for the link element +!-- @param documentType: The type of document this button controls, item or effect !-- @param title: The title to use for the link element (will be localized) !-- @param type: An optional property to use as data-type attribute }}
    - + {{localize "DS4.UserInteractionAdd"}} diff --git a/src/templates/sheets/actor/components/control-button-group.hbs b/src/templates/sheets/actor/components/control-button-group.hbs new file mode 100644 index 00000000..263a028e --- /dev/null +++ b/src/templates/sheets/actor/components/control-button-group.hbs @@ -0,0 +1,20 @@ +{{!-- +SPDX-FileCopyrightText: 2021 Johannes Loher +SPDX-FileCopyrightText: 2021 Gesina Schwalbe + +SPDX-License-Identifier: MIT +--}} + +{{!-- +!-- Render a group of an "edit" and a "delete" button. +!-- The current item is defined by the data-item-id HTML property of the parent li element. +!-- @param documentType: The type of document that is controlled by this button group, item or effect +!-- @param editTitle: The title to use for the edit link element (will be localized) +!-- @param deleteTitle: The title to use for the delete link element (will be localized) +--}} +
    + + +
    diff --git a/src/templates/sheets/actor/components/effect-list-entry.hbs b/src/templates/sheets/actor/components/effect-list-entry.hbs index 99419a5b..e43b832a 100644 --- a/src/templates/sheets/actor/components/effect-list-entry.hbs +++ b/src/templates/sheets/actor/components/effect-list-entry.hbs @@ -9,7 +9,7 @@ SPDX-License-Identifier: MIT !-- Render an effect list entry row. !-- @param effectData: The data of the item. --}} -
  • +
  • {{!-- enabled --}} {{effectData.sourceName}}
    • - {{!-- control buttons --}} - {{> systems/ds4/templates/sheets/actor/components/overview-control-buttons.hbs - class="ds4-effect-list__control-buttons" }} + {{!-- control button group --}} + {{> systems/ds4/templates/sheets/actor/components/control-button-group.hbs documentType="effect" + editTitle="DS4.UserInteractionEditEffectTitle" deleteTitle="DS4.UserInteractionDeleteEffectTitle"}} diff --git a/src/templates/sheets/actor/components/item-list-entry.hbs b/src/templates/sheets/actor/components/item-list-entry.hbs index 0992d45c..d4331243 100644 --- a/src/templates/sheets/actor/components/item-list-entry.hbs +++ b/src/templates/sheets/actor/components/item-list-entry.hbs @@ -49,7 +49,7 @@ SPDX-License-Identifier: MIT {{{itemData.data.description}}} {{/unless}} - {{!-- control buttons --}} - {{> systems/ds4/templates/sheets/actor/components/overview-control-buttons.hbs - class="ds4-item-list__control-buttons" }} + {{!-- control button group --}} + {{> systems/ds4/templates/sheets/actor/components/control-button-group.hbs documentType="item" + editTitle="DS4.UserInteractionEditItemTitle" deleteTitle="DS4.UserInteractionDeleteItemTitle"}} diff --git a/src/templates/sheets/actor/components/items-overview.hbs b/src/templates/sheets/actor/components/items-overview.hbs index ce44395a..cdabde8f 100644 --- a/src/templates/sheets/actor/components/items-overview.hbs +++ b/src/templates/sheets/actor/components/items-overview.hbs @@ -42,7 +42,7 @@ SPDX-License-Identifier: MIT {{/unless}} {{> systems/ds4/templates/sheets/actor/components/add-button.hbs title='DS4.UserInteractionAddItemTitle' -class='item-create' type='weapon'}} +documentType='item' type='weapon'}} {{!-- ARMOR --}}

    {{localize 'DS4.ItemTypeArmorPlural'}}

    @@ -81,7 +81,7 @@ class='item-create' type='weapon'}} {{/unless}} {{> systems/ds4/templates/sheets/actor/components/add-button.hbs title='DS4.UserInteractionAddItemTitle' -class='item-create' type='armor'}} +documentType='item' type='armor'}} {{!-- SHIELD --}}

    {{localize 'DS4.ItemTypeShieldPlural'}}

    @@ -103,7 +103,7 @@ class='item-create' type='armor'}} {{/unless}} {{> systems/ds4/templates/sheets/actor/components/add-button.hbs title='DS4.UserInteractionAddItemTitle' -class='item-create' type='shield'}} +documentType='item' type='shield'}} {{!-- EQUIPMENT --}}

    {{localize 'DS4.ItemTypeEquipmentPlural'}}

    @@ -124,7 +124,7 @@ class='item-create' type='shield'}} {{/unless}} {{> systems/ds4/templates/sheets/actor/components/add-button.hbs title='DS4.UserInteractionAddItemTitle' -class='item-create' type='equipment'}} +documentType='item' type='equipment'}} {{!-- LOOT --}}

    {{localize 'DS4.ItemTypeLootPlural'}}

    @@ -144,4 +144,4 @@ class='item-create' type='equipment'}} {{/unless}} {{> systems/ds4/templates/sheets/actor/components/add-button.hbs title='DS4.UserInteractionAddItemTitle' -class='item-create' type='loot'}} +documentType='item' type='loot'}} diff --git a/src/templates/sheets/actor/components/overview-control-buttons.hbs b/src/templates/sheets/actor/components/overview-control-buttons.hbs deleted file mode 100644 index 07c3b8d5..00000000 --- a/src/templates/sheets/actor/components/overview-control-buttons.hbs +++ /dev/null @@ -1,18 +0,0 @@ -{{!-- -SPDX-FileCopyrightText: 2021 Johannes Loher -SPDX-FileCopyrightText: 2021 Gesina Schwalbe - -SPDX-License-Identifier: MIT ---}} - -{{!-- -!-- Render a group of an "edit" and a "delete" button for the current item. -!-- The current item is defined by the data-item-id HTML property of the parent li element. -!-- @param class: Additional CSS class(es) for the controls ---}} -
    - - -
    diff --git a/src/templates/sheets/actor/tabs/abilities.hbs b/src/templates/sheets/actor/tabs/abilities.hbs index 5163fb94..699bc704 100644 --- a/src/templates/sheets/actor/tabs/abilities.hbs +++ b/src/templates/sheets/actor/tabs/abilities.hbs @@ -23,7 +23,7 @@ SPDX-License-Identifier: MIT {{/unless}} {{> systems/ds4/templates/sheets/actor/components/add-button.hbs title='DS4.UserInteractionAddItemTitle' - class='item-create' type='talent'}} + documentType='item' type='talent'}} {{!-- RACIAL ABILITY --}}

    {{localize 'DS4.ItemTypeRacialAbilityPlural'}}

    @@ -36,7 +36,7 @@ SPDX-License-Identifier: MIT {{/unless}} {{> systems/ds4/templates/sheets/actor/components/add-button.hbs title='DS4.UserInteractionAddItemTitle' - class='item-create' type='racialAbility'}} + documentType='item' type='racialAbility'}} {{!-- LANGUAGE --}}

    {{localize 'DS4.ItemTypeLanguagePlural'}}

    @@ -49,7 +49,7 @@ SPDX-License-Identifier: MIT {{/unless}} {{> systems/ds4/templates/sheets/actor/components/add-button.hbs title='DS4.UserInteractionAddItemTitle' - class='item-create' type='language'}} + documentType='item' type='language'}} {{!-- ALPHABET --}}

    {{localize 'DS4.ItemTypeAlphabetPlural'}}

    @@ -62,5 +62,5 @@ SPDX-License-Identifier: MIT {{/unless}} {{> systems/ds4/templates/sheets/actor/components/add-button.hbs title='DS4.UserInteractionAddItemTitle' - class='item-create' type='alphabet'}} + documentType='item' type='alphabet'}} diff --git a/src/templates/sheets/actor/tabs/effects.hbs b/src/templates/sheets/actor/tabs/effects.hbs index 8e3e4353..8b2320eb 100644 --- a/src/templates/sheets/actor/tabs/effects.hbs +++ b/src/templates/sheets/actor/tabs/effects.hbs @@ -15,5 +15,5 @@ SPDX-License-Identifier: MIT {{/unless}} {{> systems/ds4/templates/sheets/actor/components/add-button.hbs title='DS4.UserInteractionAddEffectTitle' - class='effect-create'}} + documentType='effect'}} diff --git a/src/templates/sheets/actor/tabs/special-creature-abilities.hbs b/src/templates/sheets/actor/tabs/special-creature-abilities.hbs index 15d52d56..81c627f0 100644 --- a/src/templates/sheets/actor/tabs/special-creature-abilities.hbs +++ b/src/templates/sheets/actor/tabs/special-creature-abilities.hbs @@ -15,5 +15,5 @@ SPDX-License-Identifier: MIT {{/unless}} {{> systems/ds4/templates/sheets/actor/components/add-button.hbs title='DS4.UserInteractionAddItemTitle' - class='item-create' type='specialCreatureAbility'}} + documentType='item' type='specialCreatureAbility'}} diff --git a/src/templates/sheets/actor/tabs/spells.hbs b/src/templates/sheets/actor/tabs/spells.hbs index 5b5b44e4..d683f340 100644 --- a/src/templates/sheets/actor/tabs/spells.hbs +++ b/src/templates/sheets/actor/tabs/spells.hbs @@ -94,5 +94,5 @@ titleKey=titleKey}} {{/unless}} {{> systems/ds4/templates/sheets/actor/components/add-button.hbs title='DS4.UserInteractionAddItemTitle' - class='item-create' type='spell'}} + documentType='item' type='spell'}} From bb67788abcb14ca9fc1dae2eb8c84dede4edffa5 Mon Sep 17 00:00:00 2001 From: Johannes Loher Date: Thu, 22 Jul 2021 02:20:17 +0200 Subject: [PATCH 05/61] Localize names / labels of newly created embedded items / effects --- src/lang/de.json | 15 ++++++++++++++- src/lang/en.json | 15 ++++++++++++++- src/module/actor/sheets/actor-sheet.ts | 4 ++-- src/module/item/item-sheet.ts | 2 +- 4 files changed, 31 insertions(+), 5 deletions(-) diff --git a/src/lang/de.json b/src/lang/de.json index 5a6b293c..62b6bd36 100644 --- a/src/lang/de.json +++ b/src/lang/de.json @@ -258,6 +258,7 @@ "DS4.ErrorActorDoesNotHaveItem": "Der Aktor '{actor}' hat kein Item mit der ID '{id}'.", "DS4.ErrorUnexpectedError": "Es gab einen unerwarteten Fehler im Dungeonslayers 4 System. Für mehr Details schauen Sie bitte in die Konsole (F12).", "DS4.ErrorItemDoesNotHaveEffect": "Das Item '{item}' hat keinen Effekt mit der ID '{id}'.", + "DS4.ErrorActorDoesNotHaveEffect": "Der Aktor '{actor}' hat keinen Effekt mit der ID '{id}'.", "DS4.DialogRollOptionsCheckTargetNumberLabel": "Probenwert", "DS4.DialogRollOptionsGMModifierLabel": "SL-Modifikator", "DS4.DialogRollOptionsMaximumCoupResultLabel": "Immersieg bis", @@ -300,5 +301,17 @@ "DS4.ChecksWorkMechanism": "Mechanismus Öffnen", "DS4.ActorCheckFlavor": "{actor} würfelt eine {check} Probe.", "DS4.ActorGenericCheckFlavor": "{actor} würfelt eine Probe gegen {attribute} + {trait}.", - "DS4.CheckTooltip": "{check} Probe würfeln" + "DS4.CheckTooltip": "{check} Probe würfeln", + "DS4.NewWeaponName": "Neue Waffe", + "DS4.NewArmorName": "Neue Panzerung", + "DS4.NewShieldName": "Neuer Schild", + "DS4.NewSpellName": "Neuer Zauberspruch", + "DS4.NewEquipmentName": "Neue Ausrüstung", + "DS4.NewLootName": "Neue Beute", + "DS4.NewTalentName": "Neues Talent", + "DS4.NewRacialAbilityName": "Neue Volksfähigkeit", + "DS4.NewLanguageName": "Neue Sprache", + "DS4.NewAlphabetName": "Neue Schriftzeichen", + "DS4.NewSpecialCreatureAbilityName": "Neue Besondere Kreaturenfähigkeit", + "DS4.NewEffectLabel": "Neuer Effekt" } diff --git a/src/lang/en.json b/src/lang/en.json index 9ce4238a..c68a490b 100644 --- a/src/lang/en.json +++ b/src/lang/en.json @@ -258,6 +258,7 @@ "DS4.ErrorActorDoesNotHaveItem": "The actor '{actor}' does not have any item with the id '{id}'.", "DS4.ErrorUnexpectedError": "There was an unexpected error in the Dungeonslayers 4 system. For more details, please take a look at the console (F12).", "DS4.ErrorItemDoesNotHaveEffect": "The item '{item}' does not have any effect with the id '{id}'.", + "DS4.ErrorActorDoesNotHaveEffect": "The actor '{actor}' does not have any effect with the id '{id}'.", "DS4.DialogRollOptionsCheckTargetNumberLabel": "Check Target Number", "DS4.DialogRollOptionsGMModifierLabel": "Game Master Modifier", "DS4.DialogRollOptionsMaximumCoupResultLabel": "Coup to", @@ -300,5 +301,17 @@ "DS4.ChecksWorkMechanism": "Work Mechanism", "DS4.ActorCheckFlavor": "{actor} rolls a {check} check.", "DS4.ActorGenericCheckFlavor": "{actor} rolls a check against {attribute} + {trait}.", - "DS4.CheckTooltip": "Roll a {check} check" + "DS4.CheckTooltip": "Roll a {check} check", + "DS4.NewWeaponName": "New Weapon", + "DS4.NewArmorName": "New Armor", + "DS4.NewShieldName": "New Shield", + "DS4.NewSpellName": "New Spell", + "DS4.NewEquipmentName": "New Equipment", + "DS4.NewLootName": "New Loot", + "DS4.NewTalentName": "News Talent", + "DS4.NewRacialAbilityName": "New Racial Ability", + "DS4.NewLanguageName": "New Language", + "DS4.NewAlphabetName": "New Alphabet", + "DS4.NewSpecialCreatureAbilityName": "New Special Creature Ability", + "DS4.NewEffectLabel": "New Effect" } diff --git a/src/module/actor/sheets/actor-sheet.ts b/src/module/actor/sheets/actor-sheet.ts index d68d29e2..373f755f 100644 --- a/src/module/actor/sheets/actor-sheet.ts +++ b/src/module/actor/sheets/actor-sheet.ts @@ -147,7 +147,7 @@ export class DS4ActorSheet extends ActorSheet */ protected async createActiveEffect(): Promise { const createData = { - label: "New Effect", + label: getGame().i18n.localize(`DS4.NewEffectLabel`), icon: "icons/svg/aura.svg", origin: this.item.uuid, }; From 2ef58012c6174629ff67e6095086255b899ef5a2 Mon Sep 17 00:00:00 2001 From: Johannes Loher Date: Thu, 22 Jul 2021 02:50:16 +0200 Subject: [PATCH 06/61] Add possibility to enable / disable effects in the actor sheet --- src/module/actor/sheets/actor-sheet.ts | 22 +++++++++++++++++-- .../actor/components/effect-list-entry.hbs | 4 ++-- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/src/module/actor/sheets/actor-sheet.ts b/src/module/actor/sheets/actor-sheet.ts index 373f755f..fed07c40 100644 --- a/src/module/actor/sheets/actor-sheet.ts +++ b/src/module/actor/sheets/actor-sheet.ts @@ -131,6 +131,7 @@ export class DS4ActorSheet extends ActorSheet this.render(false)); } + protected onChangeEffect(event: JQuery.ChangeEvent): void { + event.preventDefault(); + const currentTarget = $(event.currentTarget); + const element: HTMLFormElement = currentTarget.get(0); + const id = currentTarget.parents(".effect").data("effectId"); + const property: string | undefined = currentTarget.data("property"); + const inverted = Boolean(currentTarget.data("inverted")); + + if (element.disabled || element.getAttribute("disabled")) return; + if (property === undefined) { + throw TypeError("HTML element does not provide 'data-property' attribute"); + } + const newValue = this.getValue(element, inverted); + this.actor.updateEmbeddedDocuments("ActiveEffect", [{ _id: id, [property]: newValue }]); + } + /** * Handle clickable item rolls. * @param event - The originating click event diff --git a/src/templates/sheets/actor/components/effect-list-entry.hbs b/src/templates/sheets/actor/components/effect-list-entry.hbs index e43b832a..4d7243eb 100644 --- a/src/templates/sheets/actor/components/effect-list-entry.hbs +++ b/src/templates/sheets/actor/components/effect-list-entry.hbs @@ -11,8 +11,8 @@ SPDX-License-Identifier: MIT --}}
  • {{!-- enabled --}} - {{!-- icon --}} From 1f629f3468b9f1421b55a67d5dae852040052927 Mon Sep 17 00:00:00 2001 From: Johannes Loher Date: Thu, 22 Jul 2021 04:06:29 +0200 Subject: [PATCH 07/61] Rename "Special Creature Abilities" tab to "Abilities" --- src/lang/de.json | 1 - src/lang/en.json | 1 - src/module/actor/sheets/actor-sheet.ts | 11 +---------- src/module/handlebars/handlebars-partials.ts | 4 ++-- src/templates/sheets/actor/character-sheet.hbs | 2 +- src/templates/sheets/actor/creature-sheet.hbs | 9 ++++----- .../tabs/{abilities.hbs => character-abilities.hbs} | 0 ...-creature-abilities.hbs => creature-abilities.hbs} | 2 +- 8 files changed, 9 insertions(+), 21 deletions(-) rename src/templates/sheets/actor/tabs/{abilities.hbs => character-abilities.hbs} (100%) rename src/templates/sheets/actor/tabs/{special-creature-abilities.hbs => creature-abilities.hbs} (87%) diff --git a/src/lang/de.json b/src/lang/de.json index 62b6bd36..e18c8ac8 100644 --- a/src/lang/de.json +++ b/src/lang/de.json @@ -19,7 +19,6 @@ "DS4.HeadingAbilities": "Fähigkeiten", "DS4.HeadingSpells": "Zaubersprüche", "DS4.HeadingDescription": "Beschreibung", - "DS4.HeadingSpecialCreatureAbilities": "Besondere Fähigkeiten", "DS4.AttackType": "Angriffsart", "DS4.AttackTypeAbbr": "AA", "DS4.DialogAttackTypeSelection": "Welche Angriffsart?", diff --git a/src/lang/en.json b/src/lang/en.json index c68a490b..97158336 100644 --- a/src/lang/en.json +++ b/src/lang/en.json @@ -19,7 +19,6 @@ "DS4.HeadingAbilities": "Abilities", "DS4.HeadingSpells": "Spells", "DS4.HeadingDescription": "Description", - "DS4.HeadingSpecialCreatureAbilities": "Special Abilities", "DS4.AttackType": "Attack Type", "DS4.AttackTypeAbbr": "AT", "DS4.DialogAttackTypeSelection": "Which Attack Type?", diff --git a/src/module/actor/sheets/actor-sheet.ts b/src/module/actor/sheets/actor-sheet.ts index fed07c40..4ec6878e 100644 --- a/src/module/actor/sheets/actor-sheet.ts +++ b/src/module/actor/sheets/actor-sheet.ts @@ -22,16 +22,7 @@ export class DS4ActorSheet extends ActorSheet { "systems/ds4/templates/sheets/actor/components/profile.hbs", "systems/ds4/templates/sheets/actor/components/rollable-image.hbs", "systems/ds4/templates/sheets/actor/components/talent-rank-equation.hbs", - "systems/ds4/templates/sheets/actor/tabs/abilities.hbs", "systems/ds4/templates/sheets/actor/tabs/biography.hbs", + "systems/ds4/templates/sheets/actor/tabs/character-abilities.hbs", "systems/ds4/templates/sheets/actor/tabs/character-inventory.hbs", + "systems/ds4/templates/sheets/actor/tabs/creature-abilities.hbs", "systems/ds4/templates/sheets/actor/tabs/creature-inventory.hbs", "systems/ds4/templates/sheets/actor/tabs/description.hbs", "systems/ds4/templates/sheets/actor/tabs/effects.hbs", - "systems/ds4/templates/sheets/actor/tabs/special-creature-abilities.hbs", "systems/ds4/templates/sheets/actor/tabs/spells.hbs", "systems/ds4/templates/sheets/actor/tabs/values.hbs", "systems/ds4/templates/sheets/item/components/body.hbs", diff --git a/src/templates/sheets/actor/character-sheet.hbs b/src/templates/sheets/actor/character-sheet.hbs index 8dcc5a2a..70455a92 100644 --- a/src/templates/sheets/actor/character-sheet.hbs +++ b/src/templates/sheets/actor/character-sheet.hbs @@ -36,7 +36,7 @@ SPDX-License-Identifier: MIT {{> systems/ds4/templates/sheets/actor/tabs/spells.hbs}} {{!-- Abilities Tab --}} -{{> systems/ds4/templates/sheets/actor/tabs/abilities.hbs}} +{{> systems/ds4/templates/sheets/actor/tabs/character-abilities.hbs}} {{!-- Effects Tab --}} {{> systems/ds4/templates/sheets/actor/tabs/effects.hbs}} diff --git a/src/templates/sheets/actor/creature-sheet.hbs b/src/templates/sheets/actor/creature-sheet.hbs index de12472b..ebd9f437 100644 --- a/src/templates/sheets/actor/creature-sheet.hbs +++ b/src/templates/sheets/actor/creature-sheet.hbs @@ -17,9 +17,8 @@ SPDX-License-Identifier: MIT @@ -32,12 +31,12 @@ SPDX-License-Identifier: MIT {{!-- Inventory Tab --}} {{> systems/ds4/templates/sheets/actor/tabs/creature-inventory.hbs}} - {{!-- Special Creature Abilities Tab --}} - {{> systems/ds4/templates/sheets/actor/tabs/special-creature-abilities.hbs}} - {{!-- Spells Tab --}} {{> systems/ds4/templates/sheets/actor/tabs/spells.hbs}} + {{!-- Abilities Tab --}} + {{> systems/ds4/templates/sheets/actor/tabs/creature-abilities.hbs}} + {{!-- Effects Tab --}} {{> systems/ds4/templates/sheets/actor/tabs/effects.hbs}} diff --git a/src/templates/sheets/actor/tabs/abilities.hbs b/src/templates/sheets/actor/tabs/character-abilities.hbs similarity index 100% rename from src/templates/sheets/actor/tabs/abilities.hbs rename to src/templates/sheets/actor/tabs/character-abilities.hbs diff --git a/src/templates/sheets/actor/tabs/special-creature-abilities.hbs b/src/templates/sheets/actor/tabs/creature-abilities.hbs similarity index 87% rename from src/templates/sheets/actor/tabs/special-creature-abilities.hbs rename to src/templates/sheets/actor/tabs/creature-abilities.hbs index 81c627f0..ef9c81bc 100644 --- a/src/templates/sheets/actor/tabs/special-creature-abilities.hbs +++ b/src/templates/sheets/actor/tabs/creature-abilities.hbs @@ -5,7 +5,7 @@ SPDX-FileCopyrightText: 2021 Gesina Schwalbe SPDX-License-Identifier: MIT --}} -
    +
    {{#unless (isEmpty itemsByType.specialCreatureAbility)}}
      {{> systems/ds4/templates/sheets/actor/components/item-list-header.hbs}} From 48620636dff8baca719ca336e3a5f008f47bc989 Mon Sep 17 00:00:00 2001 From: Johannes Loher Date: Fri, 23 Jul 2021 00:43:15 +0200 Subject: [PATCH 08/61] Clean up actor sheet --- src/module/actor/sheets/actor-sheet.ts | 298 +++++++++--------- src/module/settings.ts | 15 +- src/module/utils.ts | 10 + .../sheets/actor/components/add-button.hbs | 4 +- .../actor/components/control-button-group.hbs | 6 +- .../sheets/actor/components/currency.hbs | 2 +- .../actor/components/effect-list-entry.hbs | 2 +- .../actor/components/effect-list-header.hbs | 2 +- .../actor/components/item-list-entry.hbs | 8 +- .../actor/components/items-overview.hbs | 4 +- .../actor/components/talent-rank-equation.hbs | 2 +- src/templates/sheets/actor/tabs/spells.hbs | 2 +- 12 files changed, 189 insertions(+), 166 deletions(-) create mode 100644 src/module/utils.ts diff --git a/src/module/actor/sheets/actor-sheet.ts b/src/module/actor/sheets/actor-sheet.ts index 4ec6878e..9122a8d8 100644 --- a/src/module/actor/sheets/actor-sheet.ts +++ b/src/module/actor/sheets/actor-sheet.ts @@ -8,13 +8,13 @@ import { ModifiableDataBaseTotal } from "../../common/common-data"; import { DS4 } from "../../config"; import { getCanvas, getGame } from "../../helpers"; -import { DS4Item } from "../../item/item"; import { DS4Settings, getDS4Settings } from "../../settings"; import notifications from "../../ui/notifications"; +import { enforce } from "../../utils"; import { isCheck } from "../actor-data-properties"; /** - * The base Sheet class for all DS4 Actors + * The base sheet class for all {@link DS4Actor}s. */ export class DS4ActorSheet extends ActorSheet { /** @override */ @@ -38,12 +38,7 @@ export class DS4ActorSheet extends ActorSheet { const itemsByType = Object.fromEntries( Object.entries(this.actor.itemTypes).map(([itemType, items]) => { @@ -69,6 +64,9 @@ export class DS4ActorSheet extends ActorSheet): string { return `${value.base} (${getGame().i18n.localize("DS4.TooltipBaseValue")}) + ${ value.mod @@ -92,151 +93,92 @@ export class DS4ActorSheet extends ActorSheet { - const li = $(ev.currentTarget).parents(".item"); - const id = li.data("itemId"); - const item = this.actor.items.get(id); - if (!item) { - throw new Error(getGame().i18n.format("DS4.ErrorActorDoesNotHaveItem", { id, actor: this.actor.name })); - } - if (!item.sheet) { - throw new Error(getGame().i18n.localize("DS4.ErrorUnexpectedError")); - } - item.sheet.render(true); - }); - - // Delete Inventory Item - html.find(".item-delete").on("click", (ev) => { - const li = $(ev.currentTarget).parents(".item"); - this.actor.deleteEmbeddedDocuments("Item", [li.data("itemId")]); - li.slideUp(200, () => this.render(false)); - }); - - html.find(".item-change").on("change", this.onItemChange.bind(this)); + html.find(".control-item").on("click", this.onControlItem.bind(this)); + html.find(".change-item").on("change", this.onChangeItem.bind(this)); html.find(".control-effect").on("click", this.onControlEffect.bind(this)); html.find(".change-effect").on("change", this.onChangeEffect.bind(this)); html.find(".rollable-item").on("click", this.onRollItem.bind(this)); - html.find(".rollable-check").on("click", this.onRollCheck.bind(this)); } /** - * Handle creating a new embedded Item for the actor using initial data defined in the HTML dataset + * Handles a click on an element of this sheet to control an embedded item of the actor corresponding to this sheet. + * * @param event - The originating click event */ - protected onItemCreate(event: JQuery.ClickEvent): void { + protected onControlItem(event: JQuery.ClickEvent): void { event.preventDefault(); - const header = event.currentTarget; - - const { type, ...data } = foundry.utils.deepClone(header.dataset); + const a = event.currentTarget; + switch (a.dataset["action"]) { + case "create": + return this.onCreateItem(event); + case "edit": + return this.onEditItem(event); + case "delete": + return this.onDeleteItem(event); + } + } + /** + * Creates a new embedded item using the initial data defined in the HTML dataset of the clicked element. + * + * @param event - The originating click event + */ + protected onCreateItem(event: JQuery.ClickEvent): void { + const { type, ...data } = foundry.utils.deepClone(event.currentTarget.dataset); const name = getGame().i18n.localize(`DS4.New${type.capitalize()}Name`); - const itemData = { name: name, type: type, data: data, }; - - DS4Item.create(itemData, { parent: this.actor }); + Item.create(itemData, { parent: this.actor }); } /** - * Handle changes to properties of an Owned Item from within character sheet. - * Can currently properly bind: see getValue(). - * Assumes the item property is given as the value of the HTML element property 'data-property'. - * @param ev - The originating change event + * Opens the sheet of the embedded item corresponding to the clicked element. + * + * @param event - The originating click event */ - protected onItemChange(ev: JQuery.ChangeEvent): void { - ev.preventDefault(); - const el: HTMLFormElement = $(ev.currentTarget).get(0); - const id = $(ev.currentTarget).parents(".item").data("itemId"); + protected onEditItem(event: JQuery.ClickEvent): void { + const id = $(event.currentTarget).parents(".item").data("id"); const item = this.actor.items.get(id); - if (!item) { - throw new Error(getGame().i18n.format("DS4.ErrorActorDoesNotHaveItem", { id, actor: this.actor.name })); - } - const itemObject = item.toObject(); - const property: string | undefined = $(ev.currentTarget).data("property"); - - // Early return: - // Disabled => do nothing - if (el.disabled || el.getAttribute("disabled")) return; - // name not given => raise - if (property === undefined) { - throw TypeError("HTML element does not provide 'data-property' attribute"); - } - - // Set new value - const newValue = this.getValue(el); - foundry.utils.setProperty(itemObject, property, newValue); - item.update(itemObject); + enforce(item, getGame().i18n.format("DS4.ErrorActorDoesNotHaveItem", { id, actor: this.actor.name })); + enforce(item.sheet); + item.sheet.render(true); } /** - * Collect the value of a form element depending on the element's type - * The value is parsed to: - * - Checkbox: boolean - * - Text input: string - * - Number: number - * @param el - The input element to collect the value of - * @param inverted - Whether or not the value should be inverted + * Deletes the embedded item corresponding to the clicked element. + * + * @param event - The originating click event */ - private getValue(el: HTMLFormElement, inverted = false): boolean | string | number { - // One needs to differentiate between e.g. checkboxes (value="on") and select boxes etc. - // Checkbox: - if (el.type === "checkbox") { - const value: boolean = el.checked; - return inverted ? !value : value; - } - - // Text input: - else if (el.type === "text") { - const value: string = el.value; - return value; - } - - // Numbers: - else if (el.type === "number") { - const value = Number(el.value.trim()); - return value; - } - - // // Ranges: - // else if (el.type === "range") { - // const value: string = el.value.trim(); - // return value; - // } - - // // Radio Checkboxes (untested, cf. FormDataExtended.process) - // else if (el.type === "radio") { - // const chosen: HTMLFormElement = el.find((r: HTMLFormElement) => r["checked"]); - // const value: string = chosen ? chosen.value : null; - // return value; - // } - - // // Multi-Select (untested, cf. FormDataExtended.process) - // else if (el.type === "select-multiple") { - // const value: Array = []; - // el.options.array.forEach((opt: HTMLOptionElement) => { - // if (opt.selected) value.push(opt.value); - // }); - // return value; - - // unsupported: - else { - throw new TypeError("Binding of item property to this type of HTML element not supported; given: " + el); - } + protected onDeleteItem(event: JQuery.ClickEvent): void { + const li = $(event.currentTarget).parents(".item"); + this.actor.deleteEmbeddedDocuments("Item", [li.data("id")]); + li.slideUp(200, () => this.render(false)); } + /** + * Applies a change to a property of an embedded item depending on the `data-property` attribute of the + * {@link HTMLInputElement} that has been changed and its new value. + * + * @param event - The originating change event + */ + protected onChangeItem(event: JQuery.ChangeEvent): void { + return this.onChangeEmbeddedDocument(event, ".item", "Item"); + } + + /** + * Handles a click on an element of this sheet to control an embedded effect of the actor corresponding to this + * sheet. + * + * @param event - The originating click event + */ protected onControlEffect(event: JQuery.ClickEvent): void { event.preventDefault(); const a = event.currentTarget; @@ -250,45 +192,115 @@ export class DS4ActorSheet extends ActorSheet this.render(false)); } + /** + * Applies a change to a property of an embedded effect depending on the `data-property` attribute of the + * {@link HTMLInputElement} that has been changed and its new value. + * + * @param event - The originating change event + */ protected onChangeEffect(event: JQuery.ChangeEvent): void { - event.preventDefault(); - const currentTarget = $(event.currentTarget); - const element: HTMLFormElement = currentTarget.get(0); - const id = currentTarget.parents(".effect").data("effectId"); - const property: string | undefined = currentTarget.data("property"); - const inverted = Boolean(currentTarget.data("inverted")); + return this.onChangeEmbeddedDocument(event, ".effect", "ActiveEffect"); + } - if (element.disabled || element.getAttribute("disabled")) return; - if (property === undefined) { - throw TypeError("HTML element does not provide 'data-property' attribute"); + /** + * Applies a change to a property of an embedded document of the actor belonging to this sheet. The change depends + * on the `data-property` attribute of the {@link HTMLInputElement} that has been changed and its new value. + * + * @param event - The originating change event + * @param documentSelector - The selector for the closest parent of the changed {@link HTMLInputElement}, which + * contains the `data-id` attribute providing the `id` of the embedded document to be + * changed. + * @param documentName - The name of the embedded document to be changed. + */ + protected onChangeEmbeddedDocument( + event: JQuery.ChangeEvent, + documentSelector: string, + documentName: "Item" | "ActiveEffect", + ): void { + event.preventDefault(); + const element = $(event.currentTarget).get(0); + enforce(element instanceof HTMLInputElement); + if (element.disabled) return; + + const effectElement = element.closest(documentSelector); + enforce(effectElement instanceof HTMLElement); + const id = effectElement.dataset["id"]; + const property = element.dataset["property"]; + const inverted = Boolean(element.dataset["inverted"]); + enforce(property !== undefined, TypeError("HTML element does not provide 'data-property' attribute")); + + const newValue = this.parseValue(element, inverted); + this.actor.updateEmbeddedDocuments(documentName, [{ _id: id, [property]: newValue }]); + } + + /** + * Parses the value of the given {@link HTMLInputElement} depending on the element's type + * The value is parsed to: + * - checkbox: `boolean` + * - text input: `string` + * - number: `number` + * + * @param element - The input element to parse the value from + * @param inverted - Whether or not the value should be inverted + */ + protected parseValue(element: HTMLInputElement, inverted = false): boolean | string | number { + switch (element.type) { + case "checkbox": { + const value: boolean = element.checked; + return inverted ? !value : value; + } + case "text": { + const value: string = element.value; + return value; + } + case "number": { + const value = Number(element.value.trim()); + return value; + } + default: { + throw new TypeError( + "Binding of item property to this type of HTML element not supported; given: " + element, + ); + } } - const newValue = this.getValue(element, inverted); - this.actor.updateEmbeddedDocuments("ActiveEffect", [{ _id: id, [property]: newValue }]); } /** @@ -299,9 +311,7 @@ export class DS4ActorSheet extends ActorSheet notifications.error(e, { log: true })); } @@ -323,7 +333,7 @@ export class DS4ActorSheet extends ActorSheet { - const item = await DS4Item.fromDropData(data); + const item = await Item.fromDropData(data); if (item && !this.actor.canOwnItemType(item.data.type)) { notifications.warn( getGame().i18n.format("DS4.WarningActorCannotOwnItem", { diff --git a/src/module/settings.ts b/src/module/settings.ts index 96a86481..a2d1017e 100644 --- a/src/module/settings.ts +++ b/src/module/settings.ts @@ -5,10 +5,12 @@ import { getGame } from "./helpers"; export function registerSystemSettings(): void { + const game = getGame(); + /** * Track the migrations version of the latest migration that has been applied */ - getGame().settings.register("ds4", "systemMigrationVersion", { + game.settings.register("ds4", "systemMigrationVersion", { name: "System Migration Version", scope: "world", config: false, @@ -16,7 +18,7 @@ export function registerSystemSettings(): void { default: -1, }); - getGame().settings.register("ds4", "useSlayingDiceForAutomatedChecks", { + game.settings.register("ds4", "useSlayingDiceForAutomatedChecks", { name: "DS4.SettingUseSlayingDiceForAutomatedChecksName", hint: "DS4.SettingUseSlayingDiceForAutomatedChecksHint", scope: "world", @@ -25,7 +27,7 @@ export function registerSystemSettings(): void { default: false, }); - getGame().settings.register("ds4", "showSlayerPoints", { + game.settings.register("ds4", "showSlayerPoints", { name: "DS4.SettingShowSlayerPointsName", hint: "DS4.SettingShowSlayerPointsHint", scope: "world", @@ -42,9 +44,10 @@ export interface DS4Settings { } export function getDS4Settings(): DS4Settings { + const game = getGame(); return { - systemMigrationVersion: getGame().settings.get("ds4", "systemMigrationVersion"), - useSlayingDiceForAutomatedChecks: getGame().settings.get("ds4", "useSlayingDiceForAutomatedChecks"), - showSlayerPoints: getGame().settings.get("ds4", "showSlayerPoints"), + systemMigrationVersion: game.settings.get("ds4", "systemMigrationVersion"), + useSlayingDiceForAutomatedChecks: game.settings.get("ds4", "useSlayingDiceForAutomatedChecks"), + showSlayerPoints: game.settings.get("ds4", "showSlayerPoints"), }; } diff --git a/src/module/utils.ts b/src/module/utils.ts new file mode 100644 index 00000000..7c9c184e --- /dev/null +++ b/src/module/utils.ts @@ -0,0 +1,10 @@ +import { getGame } from "./helpers"; + +export function enforce(value: unknown, message?: string | Error): asserts value { + if (!value) { + if (!message) { + message = getGame().i18n.localize("DS4.ErrorUnexpectedError"); + } + throw message instanceof Error ? message : new Error(message); + } +} diff --git a/src/templates/sheets/actor/components/add-button.hbs b/src/templates/sheets/actor/components/add-button.hbs index 61dd303f..1fc86419 100644 --- a/src/templates/sheets/actor/components/add-button.hbs +++ b/src/templates/sheets/actor/components/add-button.hbs @@ -12,8 +12,8 @@ SPDX-License-Identifier: MIT !-- @param type: An optional property to use as data-type attribute }}
      - + {{localize "DS4.UserInteractionAdd"}} diff --git a/src/templates/sheets/actor/components/control-button-group.hbs b/src/templates/sheets/actor/components/control-button-group.hbs index 263a028e..89713898 100644 --- a/src/templates/sheets/actor/components/control-button-group.hbs +++ b/src/templates/sheets/actor/components/control-button-group.hbs @@ -7,14 +7,14 @@ SPDX-License-Identifier: MIT {{!-- !-- Render a group of an "edit" and a "delete" button. -!-- The current item is defined by the data-item-id HTML property of the parent li element. +!-- The current item is defined by the data-id attribute of the parent li element. !-- @param documentType: The type of document that is controlled by this button group, item or effect !-- @param editTitle: The title to use for the edit link element (will be localized) !-- @param deleteTitle: The title to use for the delete link element (will be localized) --}}
      - -
      diff --git a/src/templates/sheets/actor/components/currency.hbs b/src/templates/sheets/actor/components/currency.hbs index 99e70195..7635f91e 100644 --- a/src/templates/sheets/actor/components/currency.hbs +++ b/src/templates/sheets/actor/components/currency.hbs @@ -10,7 +10,7 @@ SPDX-License-Identifier: MIT
      {{#each data.data.currency as |value key|}} - {{/each}}
      diff --git a/src/templates/sheets/actor/components/effect-list-entry.hbs b/src/templates/sheets/actor/components/effect-list-entry.hbs index 4d7243eb..9106ddfe 100644 --- a/src/templates/sheets/actor/components/effect-list-entry.hbs +++ b/src/templates/sheets/actor/components/effect-list-entry.hbs @@ -9,7 +9,7 @@ SPDX-License-Identifier: MIT !-- Render an effect list entry row. !-- @param effectData: The data of the item. --}} -
    1. +
    2. {{!-- enabled --}} +
    3. {{!-- enabled --}}
      {{localize 'DS4.EffectEnabledAbbr'}}
      diff --git a/src/templates/sheets/actor/components/item-list-entry.hbs b/src/templates/sheets/actor/components/item-list-entry.hbs index d4331243..01adc41d 100644 --- a/src/templates/sheets/actor/components/item-list-entry.hbs +++ b/src/templates/sheets/actor/components/item-list-entry.hbs @@ -15,10 +15,10 @@ SPDX-License-Identifier: MIT !-- @param hideDescription: A flag to disable the description column. !-- @param @partial-block: Custom column headers can be passed using the partial block. --}} -
    4. +
    5. {{!-- equipped --}} {{#if isEquipable}} - {{/if}} @@ -30,12 +30,12 @@ SPDX-License-Identifier: MIT {{!-- amount --}} {{#if hasQuantity}} - {{/if}} {{!-- name --}} - {{!-- item type specifics --}} diff --git a/src/templates/sheets/actor/components/items-overview.hbs b/src/templates/sheets/actor/components/items-overview.hbs index cdabde8f..049a1792 100644 --- a/src/templates/sheets/actor/components/items-overview.hbs +++ b/src/templates/sheets/actor/components/items-overview.hbs @@ -117,7 +117,7 @@ documentType='item' type='shield'}} {{#> systems/ds4/templates/sheets/actor/components/item-list-entry.hbs itemData=itemData isEquipable=true hasQuantity=true}} {{!-- storage location --}} - {{/systems/ds4/templates/sheets/actor/components/item-list-entry.hbs}} {{/each}} @@ -137,7 +137,7 @@ documentType='item' type='equipment'}} {{#each itemsByType.loot as |itemData id|}} {{#> systems/ds4/templates/sheets/actor/components/item-list-entry.hbs itemData=itemData hasQuantity=true}} {{!-- storage location --}} - {{/systems/ds4/templates/sheets/actor/components/item-list-entry.hbs}} {{/each}} diff --git a/src/templates/sheets/actor/components/talent-rank-equation.hbs b/src/templates/sheets/actor/components/talent-rank-equation.hbs index ce91c8b9..3480b5f1 100644 --- a/src/templates/sheets/actor/components/talent-rank-equation.hbs +++ b/src/templates/sheets/actor/components/talent-rank-equation.hbs @@ -18,7 +18,7 @@ disable the input element !-- @param localizeString: The string to use as key for the localized tooltip --}} {{#*inline "talentRankValue"}} - {{/inline}} diff --git a/src/templates/sheets/actor/tabs/spells.hbs b/src/templates/sheets/actor/tabs/spells.hbs index d683f340..c3b5314f 100644 --- a/src/templates/sheets/actor/tabs/spells.hbs +++ b/src/templates/sheets/actor/tabs/spells.hbs @@ -76,7 +76,7 @@ titleKey=titleKey}} title="{{lookup ../../config.i18n.spellTypes itemData.data.spellType}}" /> {{!-- spell bonus --}} - {{!-- max. distance --}} From 8d47c3d87b61c29c5f14b876146354be321972dc Mon Sep 17 00:00:00 2001 From: Johannes Loher Date: Fri, 23 Jul 2021 00:47:49 +0200 Subject: [PATCH 09/61] remove unused property systemVersion from system.json --- src/system.json | 1 - 1 file changed, 1 deletion(-) diff --git a/src/system.json b/src/system.json index 00b2f6ad..f59e1215 100644 --- a/src/system.json +++ b/src/system.json @@ -5,7 +5,6 @@ "version": "1.1.3", "minimumCoreVersion": "0.8.8", "compatibleCoreVersion": "0.8.8", - "templateVersion": 6, "author": "Johannes Loher, Gesina Schwalbe, Oliver Rümpelein, Siegfried Krug, Max Tharr, Sascha Martens", "authors": [ { From bac53c4828fd543fe8c0a95b62a034fa5d00096a Mon Sep 17 00:00:00 2001 From: Johannes Loher Date: Fri, 23 Jul 2021 01:11:42 +0200 Subject: [PATCH 10/61] Use same styling class for effect-list and item-list Also center some columns in those lists --- src/scss/components/_effect_list.scss | 68 ------------------- ...list.scss => _embedded_document_list.scss} | 38 ++++++++++- src/scss/ds4.scss | 3 +- .../actor/components/effect-list-entry.hbs | 4 +- .../actor/components/effect-list-header.hbs | 2 +- .../actor/components/item-list-entry.hbs | 10 +-- .../actor/components/item-list-header.hbs | 2 +- .../actor/components/items-overview.hbs | 28 ++++---- .../sheets/actor/tabs/character-abilities.hbs | 16 ++--- .../sheets/actor/tabs/creature-abilities.hbs | 2 +- src/templates/sheets/actor/tabs/effects.hbs | 2 +- src/templates/sheets/actor/tabs/spells.hbs | 6 +- 12 files changed, 73 insertions(+), 108 deletions(-) delete mode 100644 src/scss/components/_effect_list.scss rename src/scss/components/{_item_list.scss => _embedded_document_list.scss} (72%) diff --git a/src/scss/components/_effect_list.scss b/src/scss/components/_effect_list.scss deleted file mode 100644 index 06e18d36..00000000 --- a/src/scss/components/_effect_list.scss +++ /dev/null @@ -1,68 +0,0 @@ -/* - * SPDX-FileCopyrightText: 2021 Johannes Loher - * SPDX-FileCopyrightText: 2021 Gesina Schwalbe - * - * SPDX-License-Identifier: MIT - */ - -@use "../utils/mixins"; -@use "../utils/variables"; - -.ds4-effect-list { - @include mixins.mark-invalid-or-disabled-input; - - $row-height: 1.75em; - - align-items: center; - display: grid; - grid-column-gap: 0.5em; - grid-row-gap: 0.2em; - grid-template-columns: $row-height $row-height 3fr 2fr 5ch; - margin: 0.5em 0; - overflow-y: auto; - padding: 0; - - :nth-child(5n + 1) { - justify-self: center; - } - - &__row { - display: contents; // TODO: Once chromium supports `grid-template-columns: subgrid` (https://bugs.chromium.org/p/chromium/issues/detail?id=618969), switch to `display: grid; grid: 1/-1; grid-template-columns: subgrid` - - &--header { - font-weight: bold; - } - - > * { - height: $row-height; - line-height: $row-height; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; - } - } - - &__image { - border: none; - } - - &__editable { - background-color: transparent; - border: 0; - padding: 0; - - &--checkbox { - width: 100%; - height: 100%; - margin: 0px; - } - } - - &__control-buttons { - display: grid; - grid-template-columns: 1fr 1fr; - text-align: center; - width: 100%; - padding: 0 calc(1em / 3); - } -} diff --git a/src/scss/components/_item_list.scss b/src/scss/components/_embedded_document_list.scss similarity index 72% rename from src/scss/components/_item_list.scss rename to src/scss/components/_embedded_document_list.scss index 0b7700a3..e459e8d4 100644 --- a/src/scss/components/_item_list.scss +++ b/src/scss/components/_embedded_document_list.scss @@ -8,7 +8,7 @@ @use "../utils/mixins"; @use "../utils/variables"; -.ds4-item-list { +.ds4-embedded-document-list { @include mixins.mark-invalid-or-disabled-input; $row-height: 1.75em; @@ -23,24 +23,51 @@ &--weapon { grid-template-columns: $row-height $row-height 3ch 3fr $row-height 1fr 3ch 5fr 5ch; + :nth-child(9n + 1), + :nth-child(9n + 5), + :nth-child(9n + 6), + :nth-child(9n + 7) { + justify-self: center; + } } &--armor { grid-template-columns: $row-height $row-height 3ch 3fr 1fr 1fr 3ch 5fr 5ch; + :nth-child(9n + 1), + :nth-child(9n + 7) { + justify-self: center; + } } &--shield { grid-template-columns: $row-height $row-height 3ch 1fr 3ch 3fr 5ch; + :nth-child(7n + 1), + :nth-child(7n + 5) { + justify-self: center; + } } &--equipment { grid-template-columns: $row-height $row-height 3ch 1fr 10ch 3fr 5ch; + :nth-child(7n + 1) { + justify-self: center; + } } &--loot { grid-template-columns: $row-height 3ch 1fr 10ch 3fr 5ch; } &--spell { grid-template-columns: $row-height $row-height 2fr $row-height 1fr 1fr 1fr 1fr 5ch; + :nth-child(9n + 1), + :nth-child(9n + 4), + :nth-child(9n + 6), + :nth-child(9n + 7), + :nth-child(9n + 8) { + justify-self: center; + } } &--talent { grid-template-columns: $row-height 1fr 21ch 3fr 5ch; + :nth-child(9n + 3) { + justify-self: center; + } } &--racial-ability, &--language, @@ -49,6 +76,13 @@ grid-template-columns: $row-height 1fr 3fr 5ch; } + &--effect { + grid-template-columns: $row-height $row-height 3fr 2fr 5ch; + :nth-child(5n + 1) { + justify-self: center; + } + } + &__row { display: contents; // TODO: Once chromium supports `grid-template-columns: subgrid` (https://bugs.chromium.org/p/chromium/issues/detail?id=618969), switch to `display: grid; grid: 1/-1; grid-template-columns: subgrid` @@ -98,7 +132,7 @@ } } -.ds4-item-list-title { +.ds4-embedded-document-list-title { border-bottom: variables.$border-groove; font-weight: bold; margin-bottom: 0; diff --git a/src/scss/ds4.scss b/src/scss/ds4.scss index 8203eb62..79fb8a1d 100644 --- a/src/scss/ds4.scss +++ b/src/scss/ds4.scss @@ -34,9 +34,8 @@ @include meta.load-css("components/core_values"); @include meta.load-css("components/currency"); @include meta.load-css("components/description"); - @include meta.load-css("components/effect_list"); + @include meta.load-css("components/embedded_document_list"); @include meta.load-css("components/forms"); - @include meta.load-css("components/item_list"); @include meta.load-css("components/profile"); @include meta.load-css("components/rollable_image"); @include meta.load-css("components/sheet_tab_nav"); diff --git a/src/templates/sheets/actor/components/effect-list-entry.hbs b/src/templates/sheets/actor/components/effect-list-entry.hbs index 9106ddfe..4fbb0a95 100644 --- a/src/templates/sheets/actor/components/effect-list-entry.hbs +++ b/src/templates/sheets/actor/components/effect-list-entry.hbs @@ -9,9 +9,9 @@ SPDX-License-Identifier: MIT !-- Render an effect list entry row. !-- @param effectData: The data of the item. --}} -
    6. +
    7. {{!-- enabled --}} - diff --git a/src/templates/sheets/actor/components/effect-list-header.hbs b/src/templates/sheets/actor/components/effect-list-header.hbs index fdac8824..91311fe5 100644 --- a/src/templates/sheets/actor/components/effect-list-header.hbs +++ b/src/templates/sheets/actor/components/effect-list-header.hbs @@ -8,7 +8,7 @@ SPDX-License-Identifier: MIT {{!-- !-- Render an effect list header row. --}} -
    8. +
    9. {{!-- enabled --}}
      {{localize 'DS4.EffectEnabledAbbr'}}
      diff --git a/src/templates/sheets/actor/components/item-list-entry.hbs b/src/templates/sheets/actor/components/item-list-entry.hbs index 01adc41d..29a6d00a 100644 --- a/src/templates/sheets/actor/components/item-list-entry.hbs +++ b/src/templates/sheets/actor/components/item-list-entry.hbs @@ -15,10 +15,10 @@ SPDX-License-Identifier: MIT !-- @param hideDescription: A flag to disable the description column. !-- @param @partial-block: Custom column headers can be passed using the partial block. --}} -
    10. +
    11. {{!-- equipped --}} {{#if isEquipable}} - {{/if}} @@ -30,12 +30,12 @@ SPDX-License-Identifier: MIT {{!-- amount --}} {{#if hasQuantity}} - {{/if}} {{!-- name --}} - {{!-- item type specifics --}} @@ -45,7 +45,7 @@ SPDX-License-Identifier: MIT {{!-- description --}} {{#unless hideDescription}} -
      +
      {{{itemData.data.description}}}
      {{/unless}} diff --git a/src/templates/sheets/actor/components/item-list-header.hbs b/src/templates/sheets/actor/components/item-list-header.hbs index c2ebdb99..54229ade 100644 --- a/src/templates/sheets/actor/components/item-list-header.hbs +++ b/src/templates/sheets/actor/components/item-list-header.hbs @@ -14,7 +14,7 @@ SPDX-License-Identifier: MIT !-- @param hideDescription: A flag to disable the description column. !-- @param @partial-block: Custom column headers can be passed using the partial block. --}} -
    12. +
    13. {{!-- equipped --}} {{#if isEquipable}}
      {{localize 'DS4.ItemEquippedAbbr'}}
      diff --git a/src/templates/sheets/actor/components/items-overview.hbs b/src/templates/sheets/actor/components/items-overview.hbs index 049a1792..c9e25bf5 100644 --- a/src/templates/sheets/actor/components/items-overview.hbs +++ b/src/templates/sheets/actor/components/items-overview.hbs @@ -7,12 +7,12 @@ SPDX-License-Identifier: MIT --}} {{!-- WEAPONS --}} -

      {{localize 'DS4.ItemTypeWeaponPlural'}}

      +

      {{localize 'DS4.ItemTypeWeaponPlural'}}

      {{#unless (isEmpty itemsByType.weapon)}} -
        +
          {{#> systems/ds4/templates/sheets/actor/components/item-list-header.hbs isEquipable=true hasQuantity=true}} {{!-- attack type --}} -
          {{localize 'DS4.AttackTypeAbbr'}}
          +
          {{localize 'DS4.AttackTypeAbbr'}}
          {{!-- weapon bonus --}}
          @@ -29,7 +29,7 @@ SPDX-License-Identifier: MIT {{#> systems/ds4/templates/sheets/actor/components/item-list-entry.hbs itemData=itemData isEquipable=true hasQuantity=true}} {{!-- attack type --}} - {{!-- weapon bonus --}} @@ -45,9 +45,9 @@ SPDX-License-Identifier: MIT documentType='item' type='weapon'}} {{!-- ARMOR --}} -

          {{localize 'DS4.ItemTypeArmorPlural'}}

          +

          {{localize 'DS4.ItemTypeArmorPlural'}}

          {{#unless (isEmpty itemsByType.armor)}} -
            +
              {{#> systems/ds4/templates/sheets/actor/components/item-list-header.hbs isEquipable=true hasQuantity=true}} {{!-- armor material type --}}
              {{localize 'DS4.ArmorMaterialTypeAbbr'}}
              @@ -84,9 +84,9 @@ documentType='item' type='weapon'}} documentType='item' type='armor'}} {{!-- SHIELD --}} -

              {{localize 'DS4.ItemTypeShieldPlural'}}

              +

              {{localize 'DS4.ItemTypeShieldPlural'}}

              {{#unless (isEmpty itemsByType.shield)}} -
                +
                  {{#> systems/ds4/templates/sheets/actor/components/item-list-header.hbs isEquipable=true hasQuantity=true}} {{!-- armor value --}}
                  @@ -106,9 +106,9 @@ documentType='item' type='armor'}} documentType='item' type='shield'}} {{!-- EQUIPMENT --}} -

                  {{localize 'DS4.ItemTypeEquipmentPlural'}}

                  +

                  {{localize 'DS4.ItemTypeEquipmentPlural'}}

                  {{#unless (isEmpty itemsByType.equipment)}} -
                    +
                      {{#> systems/ds4/templates/sheets/actor/components/item-list-header.hbs isEquipable=true hasQuantity=true}} {{!-- storage location --}}
                      {{localize 'DS4.StorageLocation'}}
                      @@ -117,7 +117,7 @@ documentType='item' type='shield'}} {{#> systems/ds4/templates/sheets/actor/components/item-list-entry.hbs itemData=itemData isEquipable=true hasQuantity=true}} {{!-- storage location --}} - {{/systems/ds4/templates/sheets/actor/components/item-list-entry.hbs}} {{/each}} @@ -127,9 +127,9 @@ documentType='item' type='shield'}} documentType='item' type='equipment'}} {{!-- LOOT --}} -

                      {{localize 'DS4.ItemTypeLootPlural'}}

                      +

                      {{localize 'DS4.ItemTypeLootPlural'}}

                      {{#unless (isEmpty itemsByType.loot)}} -
                        +
                          {{#> systems/ds4/templates/sheets/actor/components/item-list-header.hbs hasQuantity=true}} {{!-- storage location --}}
                          {{localize 'DS4.StorageLocation'}}
                          @@ -137,7 +137,7 @@ documentType='item' type='equipment'}} {{#each itemsByType.loot as |itemData id|}} {{#> systems/ds4/templates/sheets/actor/components/item-list-entry.hbs itemData=itemData hasQuantity=true}} {{!-- storage location --}} - {{/systems/ds4/templates/sheets/actor/components/item-list-entry.hbs}} {{/each}} diff --git a/src/templates/sheets/actor/tabs/character-abilities.hbs b/src/templates/sheets/actor/tabs/character-abilities.hbs index 699bc704..0fdb1dc2 100644 --- a/src/templates/sheets/actor/tabs/character-abilities.hbs +++ b/src/templates/sheets/actor/tabs/character-abilities.hbs @@ -7,9 +7,9 @@ SPDX-License-Identifier: MIT
                          {{!-- TALENT --}} -

                          {{localize 'DS4.ItemTypeTalentPlural'}}

                          +

                          {{localize 'DS4.ItemTypeTalentPlural'}}

                          {{#unless (isEmpty itemsByType.talent)}} -
                            +
                              {{#> systems/ds4/templates/sheets/actor/components/item-list-header.hbs}} {{!-- rank --}}
                              {{localize 'DS4.TalentRank'}}
                              @@ -26,9 +26,9 @@ SPDX-License-Identifier: MIT documentType='item' type='talent'}} {{!-- RACIAL ABILITY --}} -

                              {{localize 'DS4.ItemTypeRacialAbilityPlural'}}

                              +

                              {{localize 'DS4.ItemTypeRacialAbilityPlural'}}

                              {{#unless (isEmpty itemsByType.racialAbility)}} -
                                +
                                  {{> systems/ds4/templates/sheets/actor/components/item-list-header.hbs}} {{#each itemsByType.racialAbility as |itemData id|}} {{> systems/ds4/templates/sheets/actor/components/item-list-entry.hbs itemData=itemData}} @@ -39,9 +39,9 @@ SPDX-License-Identifier: MIT documentType='item' type='racialAbility'}} {{!-- LANGUAGE --}} -

                                  {{localize 'DS4.ItemTypeLanguagePlural'}}

                                  +

                                  {{localize 'DS4.ItemTypeLanguagePlural'}}

                                  {{#unless (isEmpty itemsByType.language)}} -
                                    +
                                      {{> systems/ds4/templates/sheets/actor/components/item-list-header.hbs}} {{#each itemsByType.language as |itemData id|}} {{> systems/ds4/templates/sheets/actor/components/item-list-entry.hbs itemData=itemData}} @@ -52,9 +52,9 @@ SPDX-License-Identifier: MIT documentType='item' type='language'}} {{!-- ALPHABET --}} -

                                      {{localize 'DS4.ItemTypeAlphabetPlural'}}

                                      +

                                      {{localize 'DS4.ItemTypeAlphabetPlural'}}

                                      {{#unless (isEmpty itemsByType.alphabet)}} -
                                        +
                                          {{> systems/ds4/templates/sheets/actor/components/item-list-header.hbs}} {{#each itemsByType.alphabet as |itemData id|}} {{> systems/ds4/templates/sheets/actor/components/item-list-entry.hbs itemData=itemData}} diff --git a/src/templates/sheets/actor/tabs/creature-abilities.hbs b/src/templates/sheets/actor/tabs/creature-abilities.hbs index ef9c81bc..ab62882d 100644 --- a/src/templates/sheets/actor/tabs/creature-abilities.hbs +++ b/src/templates/sheets/actor/tabs/creature-abilities.hbs @@ -7,7 +7,7 @@ SPDX-License-Identifier: MIT
                                          {{#unless (isEmpty itemsByType.specialCreatureAbility)}} -
                                            +
                                              {{> systems/ds4/templates/sheets/actor/components/item-list-header.hbs}} {{#each itemsByType.specialCreatureAbility as |itemData id|}} {{> systems/ds4/templates/sheets/actor/components/item-list-entry.hbs itemData=itemData}} diff --git a/src/templates/sheets/actor/tabs/effects.hbs b/src/templates/sheets/actor/tabs/effects.hbs index 8b2320eb..67ed0a36 100644 --- a/src/templates/sheets/actor/tabs/effects.hbs +++ b/src/templates/sheets/actor/tabs/effects.hbs @@ -7,7 +7,7 @@ SPDX-License-Identifier: MIT
                                              {{#unless (isEmpty data.effects)}} -
                                                +
                                                  {{> systems/ds4/templates/sheets/actor/components/effect-list-header.hbs}} {{#each enrichedEffects as |effectData id| }} {{> systems/ds4/templates/sheets/actor/components/effect-list-entry.hbs effectData=effectData}} diff --git a/src/templates/sheets/actor/tabs/spells.hbs b/src/templates/sheets/actor/tabs/spells.hbs index c3b5314f..64e6eac9 100644 --- a/src/templates/sheets/actor/tabs/spells.hbs +++ b/src/templates/sheets/actor/tabs/spells.hbs @@ -51,7 +51,7 @@ titleKey=titleKey}}
                                                  {{#unless (isEmpty itemsByType.spell)}} -
                                                    +
                                                      {{#> systems/ds4/templates/sheets/actor/components/item-list-header.hbs isEquipable=true hideDescription=true}} {{!-- spell type --}}
                                                      {{localize 'DS4.SpellTypeAbbr'}}
                                                      @@ -72,11 +72,11 @@ titleKey=titleKey}} {{#> systems/ds4/templates/sheets/actor/components/item-list-entry.hbs itemData=itemData isEquipable=true hideDescription=true}} {{!-- spell type --}} - {{!-- spell bonus --}} - {{!-- max. distance --}} From f92bbff902fb06f7093b1ab5059ee46434f3169d Mon Sep 17 00:00:00 2001 From: Johannes Loher Date: Fri, 23 Jul 2021 01:13:45 +0200 Subject: [PATCH 11/61] Fix a localization typo --- src/lang/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lang/en.json b/src/lang/en.json index 97158336..694c45f4 100644 --- a/src/lang/en.json +++ b/src/lang/en.json @@ -307,7 +307,7 @@ "DS4.NewSpellName": "New Spell", "DS4.NewEquipmentName": "New Equipment", "DS4.NewLootName": "New Loot", - "DS4.NewTalentName": "News Talent", + "DS4.NewTalentName": "New Talent", "DS4.NewRacialAbilityName": "New Racial Ability", "DS4.NewLanguageName": "New Language", "DS4.NewAlphabetName": "New Alphabet", From 14f87163ff582b5a96ab2c59aadf5be73e3ad3ec Mon Sep 17 00:00:00 2001 From: Johannes Loher Date: Fri, 23 Jul 2021 12:29:01 +0200 Subject: [PATCH 12/61] Keep the source name od effects up to date in the actor sheet. --- src/module/active-effect.ts | 27 +++++++++++++++++++++++--- src/module/actor/sheets/actor-sheet.ts | 2 +- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/src/module/active-effect.ts b/src/module/active-effect.ts index 6ae292d6..d4ace9c4 100644 --- a/src/module/active-effect.ts +++ b/src/module/active-effect.ts @@ -3,6 +3,7 @@ // SPDX-License-Identifier: MIT import { DS4Actor } from "./actor/actor"; +import { getGame } from "./helpers"; declare global { interface DocumentClassConfig { @@ -10,7 +11,13 @@ declare global { } } +type PromisedType = T extends Promise ? U : T; export class DS4ActiveEffect extends ActiveEffect { + /** + * A cached reference to the source document to avoid recurring database lookups + */ + protected source: PromisedType> | undefined = undefined; + /** @override */ apply(actor: DS4Actor, change: foundry.data.ActiveEffectData["changes"][number]): unknown { change.value = Roll.replaceFormulaData(change.value, actor.data); @@ -23,9 +30,23 @@ export class DS4ActiveEffect extends ActiveEffect { } /** - * A public wrapper for {@link ActiveEffect#_getSourceName}. + * Gets the current source name based on the cached source object. */ - async getSourceName(): Promise { - return this._getSourceName(); + async getCurrentSourceName(): Promise { + const game = getGame(); + const origin = await this.getSource(); + if (origin === null) return game.i18n.localize("None"); + return origin.name ?? game.i18n.localize("Unknown"); + } + + /** + * Gets the source document for this effect. Uses the cached {@link DS4ActiveEffect#origin} if it has already been + * set. + */ + protected async getSource(): ReturnType { + if (this.source === undefined) { + this.source = this.data.origin !== undefined ? await fromUuid(this.data.origin) : null; + } + return this.source; } } diff --git a/src/module/actor/sheets/actor-sheet.ts b/src/module/actor/sheets/actor-sheet.ts index 9122a8d8..c11ec973 100644 --- a/src/module/actor/sheets/actor-sheet.ts +++ b/src/module/actor/sheets/actor-sheet.ts @@ -49,7 +49,7 @@ export class DS4ActorSheet extends ActorSheet { return { ...effect.toObject(), - sourceName: await effect.getSourceName(), + sourceName: await effect.getCurrentSourceName(), }; }); const enrichedEffects = await Promise.all(enrichedEffectPromises); From 20226e30b10a249de0df02402cc81e08b75fd7f2 Mon Sep 17 00:00:00 2001 From: Johannes Loher Date: Fri, 23 Jul 2021 12:33:52 +0200 Subject: [PATCH 13/61] Add missing licensing information --- src/module/utils.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/module/utils.ts b/src/module/utils.ts index 7c9c184e..5081ba25 100644 --- a/src/module/utils.ts +++ b/src/module/utils.ts @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Johannes Loher +// +// SPDX-License-Identifier: MIT + import { getGame } from "./helpers"; export function enforce(value: unknown, message?: string | Error): asserts value { From 2b3dd9b859b961861b66e9ee21a4ca111ab404c4 Mon Sep 17 00:00:00 2001 From: Johannes Loher Date: Fri, 23 Jul 2021 12:39:01 +0200 Subject: [PATCH 14/61] Improve `enforce` to also work before initialization of `game` --- src/module/helpers.ts | 4 ++++ src/module/utils.ts | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/module/helpers.ts b/src/module/helpers.ts index edfc28d3..e96322e4 100644 --- a/src/module/helpers.ts +++ b/src/module/helpers.ts @@ -15,3 +15,7 @@ export function getGame(): Game { } return game; } + +export function getGameSafe(): Game | undefined { + return game instanceof Game ? game : undefined; +} diff --git a/src/module/utils.ts b/src/module/utils.ts index 5081ba25..668a9bff 100644 --- a/src/module/utils.ts +++ b/src/module/utils.ts @@ -2,12 +2,14 @@ // // SPDX-License-Identifier: MIT -import { getGame } from "./helpers"; +import { getGameSafe } from "./helpers"; export function enforce(value: unknown, message?: string | Error): asserts value { if (!value) { if (!message) { - message = getGame().i18n.localize("DS4.ErrorUnexpectedError"); + message = + getGameSafe()?.i18n.localize("DS4.ErrorUnexpectedError") ?? + "There was an unexpected error in the Dungeonslayers 4 system. For more details, please take a look at the console (F12)."; } throw message instanceof Error ? message : new Error(message); } From 22923855f96fcb301f041d1cef2ce5578cb1449b Mon Sep 17 00:00:00 2001 From: Johannes Loher Date: Fri, 23 Jul 2021 12:48:11 +0200 Subject: [PATCH 15/61] Ad documentation for `enforce` --- src/module/utils.ts | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/module/utils.ts b/src/module/utils.ts index 668a9bff..a3038fe1 100644 --- a/src/module/utils.ts +++ b/src/module/utils.ts @@ -4,6 +4,14 @@ import { getGameSafe } from "./helpers"; +/** + * Tests if the given `value` is truthy. + * + * If it is not truthy, an {@link Error} is thrown, which depends on the given `message` parameter: + * - If `message` is a string`, it is used to construct a new {@link Error} which then is thrown. + * - If `message` is an instance of {@link Error}, it is thrown. + * - If `message` is `undefined`, an {@link Error} with a default message is thrown. + */ export function enforce(value: unknown, message?: string | Error): asserts value { if (!value) { if (!message) { From cada51877d1bd63ecab140e008355ddf0d868a08 Mon Sep 17 00:00:00 2001 From: Johannes Loher Date: Fri, 23 Jul 2021 12:50:13 +0200 Subject: [PATCH 16/61] Remove unused @use --- src/scss/components/_control_button_group.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/src/scss/components/_control_button_group.scss b/src/scss/components/_control_button_group.scss index e38c2e48..6fa87150 100644 --- a/src/scss/components/_control_button_group.scss +++ b/src/scss/components/_control_button_group.scss @@ -3,7 +3,6 @@ * * SPDX-License-Identifier: MIT */ -@use "../utils/variables"; .ds4-control-button-group { display: flex; From 710659510e4e66d8a5069260b5e9a3ff79a05a7a Mon Sep 17 00:00:00 2001 From: Johannes Loher Date: Fri, 23 Jul 2021 17:08:07 +0200 Subject: [PATCH 17/61] Fix items not being rollable in the char sheet --- src/module/actor/sheets/actor-sheet.ts | 2 +- src/module/macros/roll-item.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/module/actor/sheets/actor-sheet.ts b/src/module/actor/sheets/actor-sheet.ts index c11ec973..3dbd267a 100644 --- a/src/module/actor/sheets/actor-sheet.ts +++ b/src/module/actor/sheets/actor-sheet.ts @@ -309,7 +309,7 @@ export class DS4ActorSheet extends ActorSheet notifications.error(e, { log: true })); diff --git a/src/module/macros/roll-item.ts b/src/module/macros/roll-item.ts index 751a7e99..92c59b59 100644 --- a/src/module/macros/roll-item.ts +++ b/src/module/macros/roll-item.ts @@ -38,7 +38,7 @@ async function getOrCreateRollItemMacro(itemData: foundry.data.ItemData["_source } /** - * Executes the roll item macro for the given itemId. + * Executes the roll item macro for the item associated to the given `itemId`. */ export async function rollItem(itemId: string): Promise { const actor = getActiveActor(); From e10a3f17ac8c902c09c8624ab062af12f083eab4 Mon Sep 17 00:00:00 2001 From: Johannes Loher Date: Fri, 23 Jul 2021 17:32:26 +0200 Subject: [PATCH 18/61] Display fallback icon iin the effects tab if no icon is available --- src/lang/de.json | 2 +- src/lang/en.json | 2 +- src/module/active-effect.ts | 5 +++++ src/module/actor/sheets/actor-sheet.ts | 2 ++ 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/lang/de.json b/src/lang/de.json index e18c8ac8..e1dde04a 100644 --- a/src/lang/de.json +++ b/src/lang/de.json @@ -211,7 +211,7 @@ "DS4.CreatureBaseInfoSizeCategory": "Größenkategorie", "DS4.CreatureBaseInfoExperiencePoints": "Erfahrungspunkte", "DS4.CreatureBaseInfoDescription": "Beschreibung", - "DS4.WarningManageActiveEffectOnOwnedItem": "Das Verwalten von aktiven Effekten innerhalb eines besessen Items wird derzeit nicht unterstützt und wird in einem nachfolgenden Update hinzugefügt.", + "DS4.WarningManageActiveEffectOnOwnedItem": "Das Verwalten von aktiven Effekten innerhalb eines besessen Items wird derzeit nicht unterstützt und wird in einem nachfolgenden Update hinzugefügt. Falls Sie eigentlich den auf den Aktor übertragenen Effekt verwalten wollen, können Sie dies im 'Effekte'-Tab des Aktorbogens tun.", "DS4.WarningActorCannotOwnItem": "Der Aktor '{actorName}' vom Typ '{actorType}' kann das Item '{itemName}' vom Typ '{itemType}' nicht besitzen.", "DS4.ErrorDiceCoupFumbleOverlap": "Es gibt eine Überlappung zwischen Patzern und Immersiegen.", "DS4.ErrorSlayingDiceRecursionLimitExceeded": "Die maximale Rekursionstiefe für slayende Würfelwürfe wurde überschritten.", diff --git a/src/lang/en.json b/src/lang/en.json index 694c45f4..d1042021 100644 --- a/src/lang/en.json +++ b/src/lang/en.json @@ -211,7 +211,7 @@ "DS4.CreatureBaseInfoSizeCategory": "Size Category", "DS4.CreatureBaseInfoExperiencePoints": "Experience Points", "DS4.CreatureBaseInfoDescription": "Description", - "DS4.WarningManageActiveEffectOnOwnedItem": "Managing Active Effects within an Owned Item is not currently supported and will be added in a subsequent update.", + "DS4.WarningManageActiveEffectOnOwnedItem": "Managing Active Effects within an Owned Item is not currently supported and will be added in a subsequent update. If you actually want to manage the effect that has been transferred to the actor, you can do so in the 'Effects' tab in the actor sheet.", "DS4.WarningActorCannotOwnItem": "The actor '{actorName}' of type '{actorType}' cannot own the item '{itemName}' of type '{itemType}'.", "DS4.ErrorDiceCoupFumbleOverlap": "There is an overlap between Fumbles and Coups.", "DS4.ErrorSlayingDiceRecursionLimitExceeded": "Maximum recursion depth for slaying dice roll exceeded.", diff --git a/src/module/active-effect.ts b/src/module/active-effect.ts index d4ace9c4..8d53ba28 100644 --- a/src/module/active-effect.ts +++ b/src/module/active-effect.ts @@ -13,6 +13,11 @@ declare global { type PromisedType = T extends Promise ? U : T; export class DS4ActiveEffect extends ActiveEffect { + /** + * A fallback icon that can be used if no icon is defined for the effect. + */ + static FALLBACK_ICON = "icons/svg/aura.svg"; + /** * A cached reference to the source document to avoid recurring database lookups */ diff --git a/src/module/actor/sheets/actor-sheet.ts b/src/module/actor/sheets/actor-sheet.ts index 3dbd267a..9f101e17 100644 --- a/src/module/actor/sheets/actor-sheet.ts +++ b/src/module/actor/sheets/actor-sheet.ts @@ -5,6 +5,7 @@ // // SPDX-License-Identifier: MIT +import { DS4ActiveEffect } from "../../active-effect"; import { ModifiableDataBaseTotal } from "../../common/common-data"; import { DS4 } from "../../config"; import { getCanvas, getGame } from "../../helpers"; @@ -49,6 +50,7 @@ export class DS4ActorSheet extends ActorSheet { return { ...effect.toObject(), + icon: effect.data.icon ?? DS4ActiveEffect.FALLBACK_ICON, sourceName: await effect.getCurrentSourceName(), }; }); From cbc46b7c06e0c4d1b9b9ee59a3238f59b99897e5 Mon Sep 17 00:00:00 2001 From: Johannes Loher Date: Fri, 23 Jul 2021 17:34:52 +0200 Subject: [PATCH 19/61] Make `icon` required in EnrichedActiveEffectDataSource --- src/module/actor/sheets/actor-sheet.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/module/actor/sheets/actor-sheet.ts b/src/module/actor/sheets/actor-sheet.ts index 9f101e17..72d75a81 100644 --- a/src/module/actor/sheets/actor-sheet.ts +++ b/src/module/actor/sheets/actor-sheet.ts @@ -376,5 +376,6 @@ interface DS4ActorSheetData extends ActorSheet.Data { type ActiveEffectDataSource = foundry.data.ActiveEffectData["_source"]; interface EnrichedActiveEffectDataSource extends ActiveEffectDataSource { + icon: string; sourceName: string; } From 23b7cb34d2cd4475838649a8b5756d36d282719b Mon Sep 17 00:00:00 2001 From: ghost Date: Fri, 23 Jul 2021 15:53:37 +0000 Subject: [PATCH 20/61] release version 1.2.0 --- package.json | 2 +- src/system.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 8306f783..09be634c 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "private": true, "name": "dungeonslayers4", "description": "An implementation of the Dungeonslayers 4 game system for Foundry Virtual Tabletop.", - "version": "1.1.3", + "version": "1.2.0", "license": "https://git.f3l.de/dungeonslayers/ds4#licensing", "homepage": "https://git.f3l.de/dungeonslayers/ds4", "repository": { diff --git a/src/system.json b/src/system.json index f59e1215..78257461 100644 --- a/src/system.json +++ b/src/system.json @@ -2,7 +2,7 @@ "name": "ds4", "title": "Dungeonslayers 4", "description": "The Dungeonslayers 4 system for FoundryVTT. Dungeonslayers by Christian Kennig is licensed under CC BY-NC-SA 3.0 (https://creativecommons.org/licenses/by-nc-sa/3.0/). The icons by the authors of Game-icons.net are licensed under CC BY 3.0 (https://creativecommons.org/licenses/by/3.0/).", - "version": "1.1.3", + "version": "1.2.0", "minimumCoreVersion": "0.8.8", "compatibleCoreVersion": "0.8.8", "author": "Johannes Loher, Gesina Schwalbe, Oliver Rümpelein, Siegfried Krug, Max Tharr, Sascha Martens", @@ -84,7 +84,7 @@ "primaryTokenAttribute": "combatValues.hitPoints", "url": "https://git.f3l.de/dungeonslayers/ds4", "manifest": "https://git.f3l.de/dungeonslayers/ds4/-/raw/latest/src/system.json?inline=false", - "download": "https://git.f3l.de/dungeonslayers/ds4/-/jobs/artifacts/1.1.3/download?job=build", + "download": "https://git.f3l.de/dungeonslayers/ds4/-/jobs/artifacts/1.2.0/download?job=build", "license": "https://git.f3l.de/dungeonslayers/ds4#licensing", "initiative": "@combatValues.initiative.total", "manifestPlusVersion": "1.0.0", From 1210d8b5106c2df6967e997f27200fda8aed061d Mon Sep 17 00:00:00 2001 From: Johannes Loher Date: Fri, 23 Jul 2021 23:46:16 +0200 Subject: [PATCH 21/61] Add renovate.json --- renovate.json | 4 ++++ renovate.json.license | 3 +++ 2 files changed, 7 insertions(+) create mode 100644 renovate.json create mode 100644 renovate.json.license diff --git a/renovate.json b/renovate.json new file mode 100644 index 00000000..f9ff6db6 --- /dev/null +++ b/renovate.json @@ -0,0 +1,4 @@ +{ + "$schema": "https://docs.renovatebot.com/renovate-schema.json", + "extends": ["config:base", ":automergeAll", ":automergeBranch", ":prHourlyLimitNone", ":prConcurrentLimitNone"] +} diff --git a/renovate.json.license b/renovate.json.license new file mode 100644 index 00000000..31803f36 --- /dev/null +++ b/renovate.json.license @@ -0,0 +1,3 @@ +SPDX-FileCopyrightText: 2021 Johannes Loher + +SPDX-License-Identifier: MIT \ No newline at end of file From 16f83e130d9b7b2e7df97e22c1ec9f08d7064708 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 23 Jul 2021 21:58:28 +0000 Subject: [PATCH 22/61] Pin dependencies --- package.json | 44 +++++++------- yarn.lock | 168 +++++++++++++++++++++++++-------------------------- 2 files changed, 106 insertions(+), 106 deletions(-) diff --git a/package.json b/package.json index 09be634c..4844969b 100644 --- a/package.json +++ b/package.json @@ -52,32 +52,32 @@ "postinstall": "husky install" }, "devDependencies": { - "@league-of-foundry-developers/foundry-vtt-types": "^0.8.8-7", - "@types/fs-extra": "^9.0.12", - "@types/jest": "^26.0.24", + "@league-of-foundry-developers/foundry-vtt-types": "0.8.8-7", + "@types/fs-extra": "9.0.12", + "@types/jest": "26.0.24", "@typescript-eslint/eslint-plugin": "^4.28.3", "@typescript-eslint/parser": "^4.28.3", - "chalk": "^4.1.1", - "eslint": "^7.30.0", - "eslint-config-prettier": "^8.3.0", - "eslint-plugin-jest": "^24.3.6", - "eslint-plugin-prettier": "^3.4.0", - "fs-extra": "^10.0.0", - "gulp": "^4.0.2", - "gulp-sass": "^5.0.0", - "husky": "^7.0.1", + "chalk": "4.1.1", + "eslint": "7.30.0", + "eslint-config-prettier": "8.3.0", + "eslint-plugin-jest": "24.3.6", + "eslint-plugin-prettier": "3.4.0", + "fs-extra": "10.0.0", + "gulp": "4.0.2", + "gulp-sass": "5.0.0", + "husky": "7.0.1", "jest": "^27.0.6", - "jest-junit": "^12.2.0", - "lint-staged": "^11.0.1", - "prettier": "^2.3.2", - "rollup": "^2.53.2", - "rollup-plugin-typescript2": "^0.30.0", + "jest-junit": "12.2.0", + "lint-staged": "11.0.1", + "prettier": "2.3.2", + "rollup": "2.53.2", + "rollup-plugin-typescript2": "0.30.0", "sass": "1.35.2", - "semver": "^7.3.5", - "ts-jest": "^27.0.3", - "tslib": "^2.3.0", - "typescript": "^4.3.5", - "yargs": "^17.0.1" + "semver": "7.3.5", + "ts-jest": "27.0.3", + "tslib": "2.3.0", + "typescript": "4.3.5", + "yargs": "17.0.1" }, "lint-staged": { "*.ts": "eslint --cache --fix", diff --git a/yarn.lock b/yarn.lock index 7df20817..38ea73bc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -689,7 +689,7 @@ __metadata: languageName: node linkType: hard -"@league-of-foundry-developers/foundry-vtt-types@npm:^0.8.8-7": +"@league-of-foundry-developers/foundry-vtt-types@npm:0.8.8-7": version: 0.8.8-7 resolution: "@league-of-foundry-developers/foundry-vtt-types@npm:0.8.8-7" dependencies: @@ -1207,7 +1207,7 @@ __metadata: languageName: node linkType: hard -"@types/fs-extra@npm:^9.0.12": +"@types/fs-extra@npm:9.0.12": version: 9.0.12 resolution: "@types/fs-extra@npm:9.0.12" dependencies: @@ -1250,7 +1250,7 @@ __metadata: languageName: node linkType: hard -"@types/jest@npm:^26.0.24": +"@types/jest@npm:26.0.24": version: 26.0.24 resolution: "@types/jest@npm:26.0.24" dependencies: @@ -2259,6 +2259,16 @@ __metadata: languageName: node linkType: hard +"chalk@npm:4.1.1, chalk@npm:^4.0.0, chalk@npm:^4.1.0, chalk@npm:^4.1.1": + version: 4.1.1 + resolution: "chalk@npm:4.1.1" + dependencies: + ansi-styles: ^4.1.0 + supports-color: ^7.1.0 + checksum: 445c12db7aeed0046500a1e4184d31209a77d165654c885a789c41c8598a6a95bd2392180987cac572c967b93a2a730dda778bb7f87fa06ca63fd8592f8cc59f + languageName: node + linkType: hard + "chalk@npm:^2.0.0": version: 2.4.2 resolution: "chalk@npm:2.4.2" @@ -2270,16 +2280,6 @@ __metadata: languageName: node linkType: hard -"chalk@npm:^4.0.0, chalk@npm:^4.1.0, chalk@npm:^4.1.1": - version: 4.1.1 - resolution: "chalk@npm:4.1.1" - dependencies: - ansi-styles: ^4.1.0 - supports-color: ^7.1.0 - checksum: 445c12db7aeed0046500a1e4184d31209a77d165654c885a789c41c8598a6a95bd2392180987cac572c967b93a2a730dda778bb7f87fa06ca63fd8592f8cc59f - languageName: node - linkType: hard - "char-regex@npm:^1.0.2": version: 1.0.2 resolution: "char-regex@npm:1.0.2" @@ -2897,32 +2897,32 @@ __metadata: version: 0.0.0-use.local resolution: "dungeonslayers4@workspace:." dependencies: - "@league-of-foundry-developers/foundry-vtt-types": ^0.8.8-7 - "@types/fs-extra": ^9.0.12 - "@types/jest": ^26.0.24 + "@league-of-foundry-developers/foundry-vtt-types": 0.8.8-7 + "@types/fs-extra": 9.0.12 + "@types/jest": 26.0.24 "@typescript-eslint/eslint-plugin": ^4.28.3 "@typescript-eslint/parser": ^4.28.3 - chalk: ^4.1.1 - eslint: ^7.30.0 - eslint-config-prettier: ^8.3.0 - eslint-plugin-jest: ^24.3.6 - eslint-plugin-prettier: ^3.4.0 - fs-extra: ^10.0.0 - gulp: ^4.0.2 - gulp-sass: ^5.0.0 - husky: ^7.0.1 + chalk: 4.1.1 + eslint: 7.30.0 + eslint-config-prettier: 8.3.0 + eslint-plugin-jest: 24.3.6 + eslint-plugin-prettier: 3.4.0 + fs-extra: 10.0.0 + gulp: 4.0.2 + gulp-sass: 5.0.0 + husky: 7.0.1 jest: ^27.0.6 - jest-junit: ^12.2.0 - lint-staged: ^11.0.1 - prettier: ^2.3.2 - rollup: ^2.53.2 - rollup-plugin-typescript2: ^0.30.0 + jest-junit: 12.2.0 + lint-staged: 11.0.1 + prettier: 2.3.2 + rollup: 2.53.2 + rollup-plugin-typescript2: 0.30.0 sass: 1.35.2 - semver: ^7.3.5 - ts-jest: ^27.0.3 - tslib: ^2.3.0 - typescript: ^4.3.5 - yargs: ^17.0.1 + semver: 7.3.5 + ts-jest: 27.0.3 + tslib: 2.3.0 + typescript: 4.3.5 + yargs: 17.0.1 languageName: unknown linkType: soft @@ -3150,7 +3150,7 @@ __metadata: languageName: node linkType: hard -"eslint-config-prettier@npm:^8.3.0": +"eslint-config-prettier@npm:8.3.0": version: 8.3.0 resolution: "eslint-config-prettier@npm:8.3.0" peerDependencies: @@ -3161,7 +3161,7 @@ __metadata: languageName: node linkType: hard -"eslint-plugin-jest@npm:^24.3.6": +"eslint-plugin-jest@npm:24.3.6": version: 24.3.6 resolution: "eslint-plugin-jest@npm:24.3.6" dependencies: @@ -3176,7 +3176,7 @@ __metadata: languageName: node linkType: hard -"eslint-plugin-prettier@npm:^3.4.0": +"eslint-plugin-prettier@npm:3.4.0": version: 3.4.0 resolution: "eslint-plugin-prettier@npm:3.4.0" dependencies: @@ -3235,7 +3235,7 @@ __metadata: languageName: node linkType: hard -"eslint@npm:^7.30.0": +"eslint@npm:7.30.0": version: 7.30.0 resolution: "eslint@npm:7.30.0" dependencies: @@ -3725,6 +3725,17 @@ __metadata: languageName: node linkType: hard +"fs-extra@npm:10.0.0": + version: 10.0.0 + resolution: "fs-extra@npm:10.0.0" + dependencies: + graceful-fs: ^4.2.0 + jsonfile: ^6.0.1 + universalify: ^2.0.0 + checksum: 84632d143fe3125b8c3c2b1fedbbdfcfb84fc3e087522b4e138cc07edf574619925713a6609f6d5e53ede2e31ab319c7d528ea4a4a770ba6622a16bf4447cd8b + languageName: node + linkType: hard + "fs-extra@npm:8.1.0": version: 8.1.0 resolution: "fs-extra@npm:8.1.0" @@ -3736,17 +3747,6 @@ __metadata: languageName: node linkType: hard -"fs-extra@npm:^10.0.0": - version: 10.0.0 - resolution: "fs-extra@npm:10.0.0" - dependencies: - graceful-fs: ^4.2.0 - jsonfile: ^6.0.1 - universalify: ^2.0.0 - checksum: 84632d143fe3125b8c3c2b1fedbbdfcfb84fc3e087522b4e138cc07edf574619925713a6609f6d5e53ede2e31ab319c7d528ea4a4a770ba6622a16bf4447cd8b - languageName: node - linkType: hard - "fs-minipass@npm:^2.0.0": version: 2.1.0 resolution: "fs-minipass@npm:2.1.0" @@ -4065,7 +4065,7 @@ fsevents@^1.2.7: languageName: node linkType: hard -"gulp-sass@npm:^5.0.0": +"gulp-sass@npm:5.0.0": version: 5.0.0 resolution: "gulp-sass@npm:5.0.0" dependencies: @@ -4080,7 +4080,7 @@ fsevents@^1.2.7: languageName: node linkType: hard -"gulp@npm:^4.0.2": +"gulp@npm:4.0.2": version: 4.0.2 resolution: "gulp@npm:4.0.2" dependencies: @@ -4280,7 +4280,7 @@ fsevents@^1.2.7: languageName: node linkType: hard -"husky@npm:^7.0.1": +"husky@npm:7.0.1": version: 7.0.1 resolution: "husky@npm:7.0.1" bin: @@ -5060,7 +5060,7 @@ fsevents@^1.2.7: languageName: node linkType: hard -"jest-junit@npm:^12.2.0": +"jest-junit@npm:12.2.0": version: 12.2.0 resolution: "jest-junit@npm:12.2.0" dependencies: @@ -5611,7 +5611,7 @@ fsevents@^1.2.7: languageName: node linkType: hard -"lint-staged@npm:^11.0.1": +"lint-staged@npm:11.0.1": version: 11.0.1 resolution: "lint-staged@npm:11.0.1" dependencies: @@ -6710,7 +6710,7 @@ fsevents@^1.2.7: languageName: node linkType: hard -"prettier@npm:^2.3.2": +"prettier@npm:2.3.2": version: 2.3.2 resolution: "prettier@npm:2.3.2" bin: @@ -7145,7 +7145,7 @@ fsevents@^1.2.7: languageName: node linkType: hard -"rollup-plugin-typescript2@npm:^0.30.0": +"rollup-plugin-typescript2@npm:0.30.0": version: 0.30.0 resolution: "rollup-plugin-typescript2@npm:0.30.0" dependencies: @@ -7161,7 +7161,7 @@ fsevents@^1.2.7: languageName: node linkType: hard -"rollup@npm:^2.53.2": +"rollup@npm:2.53.2": version: 2.53.2 resolution: "rollup@npm:2.53.2" dependencies: @@ -7261,7 +7261,7 @@ fsevents@^1.2.7: languageName: node linkType: hard -"semver@npm:7.x, semver@npm:^7.2.1, semver@npm:^7.3.2, semver@npm:^7.3.5": +"semver@npm:7.3.5, semver@npm:7.x, semver@npm:^7.2.1, semver@npm:^7.3.2, semver@npm:^7.3.5": version: 7.3.5 resolution: "semver@npm:7.3.5" dependencies: @@ -7999,7 +7999,7 @@ fsevents@^1.2.7: languageName: node linkType: hard -"ts-jest@npm:^27.0.3": +"ts-jest@npm:27.0.3": version: 27.0.3 resolution: "ts-jest@npm:27.0.3" dependencies: @@ -8029,6 +8029,13 @@ fsevents@^1.2.7: languageName: node linkType: hard +"tslib@npm:2.3.0": + version: 2.3.0 + resolution: "tslib@npm:2.3.0" + checksum: 7b4fc9feff0f704743c3760f5d8d708f6417fac6458159e63df3a6b1100f0736e3b99edb9fe370f274ad15160a1f49ff05cb49402534c818ff552c48e38c3e6e + languageName: node + linkType: hard + "tslib@npm:^1.8.1, tslib@npm:^1.9.0": version: 1.14.1 resolution: "tslib@npm:1.14.1" @@ -8036,13 +8043,6 @@ fsevents@^1.2.7: languageName: node linkType: hard -"tslib@npm:^2.3.0": - version: 2.3.0 - resolution: "tslib@npm:2.3.0" - checksum: 7b4fc9feff0f704743c3760f5d8d708f6417fac6458159e63df3a6b1100f0736e3b99edb9fe370f274ad15160a1f49ff05cb49402534c818ff552c48e38c3e6e - languageName: node - linkType: hard - "tsutils@npm:^3.21.0": version: 3.21.0 resolution: "tsutils@npm:3.21.0" @@ -8123,7 +8123,7 @@ fsevents@^1.2.7: languageName: node linkType: hard -typescript@^4.3.5: +"typescript@4.3.5, typescript@^4.3.5": version: 4.3.5 resolution: "typescript@npm:4.3.5" bin: @@ -8133,7 +8133,7 @@ typescript@^4.3.5: languageName: node linkType: hard -"typescript@patch:typescript@^4.3.5#builtin": +"typescript@patch:typescript@4.3.5#builtin, typescript@patch:typescript@^4.3.5#builtin": version: 4.3.5 resolution: "typescript@patch:typescript@npm%3A4.3.5#builtin::version=4.3.5&hash=ddfc1b" bin: @@ -8685,6 +8685,21 @@ typescript@^4.3.5: languageName: node linkType: hard +"yargs@npm:17.0.1": + version: 17.0.1 + resolution: "yargs@npm:17.0.1" + dependencies: + cliui: ^7.0.2 + escalade: ^3.1.1 + get-caller-file: ^2.0.5 + require-directory: ^2.1.1 + string-width: ^4.2.0 + y18n: ^5.0.5 + yargs-parser: ^20.2.2 + checksum: a7969b48d2dea129a7d4fcc3f13e88d4f94bacbd24f720b2ce19946fa9facc42cfed89c059d953091241f4e9e9000ed9dbf86e4bb4b6ceb3a26af10ddebdd0b2 + languageName: node + linkType: hard + "yargs@npm:^16.0.3": version: 16.2.0 resolution: "yargs@npm:16.2.0" @@ -8700,21 +8715,6 @@ typescript@^4.3.5: languageName: node linkType: hard -"yargs@npm:^17.0.1": - version: 17.0.1 - resolution: "yargs@npm:17.0.1" - dependencies: - cliui: ^7.0.2 - escalade: ^3.1.1 - get-caller-file: ^2.0.5 - require-directory: ^2.1.1 - string-width: ^4.2.0 - y18n: ^5.0.5 - yargs-parser: ^20.2.2 - checksum: a7969b48d2dea129a7d4fcc3f13e88d4f94bacbd24f720b2ce19946fa9facc42cfed89c059d953091241f4e9e9000ed9dbf86e4bb4b6ceb3a26af10ddebdd0b2 - languageName: node - linkType: hard - "yargs@npm:^7.1.0": version: 7.1.2 resolution: "yargs@npm:7.1.2" From 1b72657cabd67647c71faf160bfb1a556f765bd9 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 23 Jul 2021 22:24:27 +0000 Subject: [PATCH 23/61] Pin dependencies --- package.json | 4 ++-- yarn.lock | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 4844969b..a87ba129 100644 --- a/package.json +++ b/package.json @@ -55,8 +55,8 @@ "@league-of-foundry-developers/foundry-vtt-types": "0.8.8-7", "@types/fs-extra": "9.0.12", "@types/jest": "26.0.24", - "@typescript-eslint/eslint-plugin": "^4.28.3", - "@typescript-eslint/parser": "^4.28.3", + "@typescript-eslint/eslint-plugin": "4.28.3", + "@typescript-eslint/parser": "4.28.3", "chalk": "4.1.1", "eslint": "7.30.0", "eslint-config-prettier": "8.3.0", diff --git a/yarn.lock b/yarn.lock index 38ea73bc..5457b301 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1345,7 +1345,7 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/eslint-plugin@npm:^4.28.3": +"@typescript-eslint/eslint-plugin@npm:4.28.3": version: 4.28.3 resolution: "@typescript-eslint/eslint-plugin@npm:4.28.3" dependencies: @@ -1398,7 +1398,7 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/parser@npm:^4.28.3": +"@typescript-eslint/parser@npm:4.28.3": version: 4.28.3 resolution: "@typescript-eslint/parser@npm:4.28.3" dependencies: @@ -2900,8 +2900,8 @@ __metadata: "@league-of-foundry-developers/foundry-vtt-types": 0.8.8-7 "@types/fs-extra": 9.0.12 "@types/jest": 26.0.24 - "@typescript-eslint/eslint-plugin": ^4.28.3 - "@typescript-eslint/parser": ^4.28.3 + "@typescript-eslint/eslint-plugin": 4.28.3 + "@typescript-eslint/parser": 4.28.3 chalk: 4.1.1 eslint: 7.30.0 eslint-config-prettier: 8.3.0 From 6e04772c7bf447ad9b7741f83d13fa29ff7c2284 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 23 Jul 2021 23:15:36 +0000 Subject: [PATCH 24/61] Pin dependency jest to 27.0.6 --- package.json | 2 +- yarn.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index a87ba129..5d8c2363 100644 --- a/package.json +++ b/package.json @@ -66,7 +66,7 @@ "gulp": "4.0.2", "gulp-sass": "5.0.0", "husky": "7.0.1", - "jest": "^27.0.6", + "jest": "27.0.6", "jest-junit": "12.2.0", "lint-staged": "11.0.1", "prettier": "2.3.2", diff --git a/yarn.lock b/yarn.lock index 5457b301..e46509ad 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2911,7 +2911,7 @@ __metadata: gulp: 4.0.2 gulp-sass: 5.0.0 husky: 7.0.1 - jest: ^27.0.6 + jest: 27.0.6 jest-junit: 12.2.0 lint-staged: 11.0.1 prettier: 2.3.2 @@ -5328,7 +5328,7 @@ fsevents@^1.2.7: languageName: node linkType: hard -"jest@npm:^27.0.6": +"jest@npm:27.0.6": version: 27.0.6 resolution: "jest@npm:27.0.6" dependencies: From 1219600cb3eede02bddb3c885e4a5090c4a8b836 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sat, 24 Jul 2021 00:15:55 +0000 Subject: [PATCH 25/61] Update dependency rollup to v2.53.3 --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 5d8c2363..59dac6ff 100644 --- a/package.json +++ b/package.json @@ -70,7 +70,7 @@ "jest-junit": "12.2.0", "lint-staged": "11.0.1", "prettier": "2.3.2", - "rollup": "2.53.2", + "rollup": "2.53.3", "rollup-plugin-typescript2": "0.30.0", "sass": "1.35.2", "semver": "7.3.5", diff --git a/yarn.lock b/yarn.lock index e46509ad..debeb9f4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2915,7 +2915,7 @@ __metadata: jest-junit: 12.2.0 lint-staged: 11.0.1 prettier: 2.3.2 - rollup: 2.53.2 + rollup: 2.53.3 rollup-plugin-typescript2: 0.30.0 sass: 1.35.2 semver: 7.3.5 @@ -7161,9 +7161,9 @@ fsevents@^1.2.7: languageName: node linkType: hard -"rollup@npm:2.53.2": - version: 2.53.2 - resolution: "rollup@npm:2.53.2" +"rollup@npm:2.53.3": + version: 2.53.3 + resolution: "rollup@npm:2.53.3" dependencies: fsevents: ~2.3.2 dependenciesMeta: @@ -7171,7 +7171,7 @@ fsevents@^1.2.7: optional: true bin: rollup: dist/bin/rollup - checksum: 41d32b1d44066f3e8eeb5239013397e3df74dbb37489aaa77f8357059b5998cb4af0108fb72b048d265ae5d88de933b0732007c07e5d5687f5ee3ae44fab9eee + checksum: 6734aa795875ae0add3e11b5b03bbcc391bb2a6b7c7393274e1cb21edc05c481b68b75a9a3fddc99e0cd8a201c4cd520449ffbf04d2861f82661d16b8d03ced0 languageName: node linkType: hard From dde1df41c64c9a922f51a5d17fc4c79be998bf4c Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sat, 24 Jul 2021 01:15:26 +0000 Subject: [PATCH 26/61] Update dependency ts-jest to v27.0.4 --- package.json | 2 +- yarn.lock | 20 +++++++++++++++----- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 59dac6ff..613cec24 100644 --- a/package.json +++ b/package.json @@ -74,7 +74,7 @@ "rollup-plugin-typescript2": "0.30.0", "sass": "1.35.2", "semver": "7.3.5", - "ts-jest": "27.0.3", + "ts-jest": "27.0.4", "tslib": "2.3.0", "typescript": "4.3.5", "yargs": "17.0.1" diff --git a/yarn.lock b/yarn.lock index debeb9f4..734bbbca 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2919,7 +2919,7 @@ __metadata: rollup-plugin-typescript2: 0.30.0 sass: 1.35.2 semver: 7.3.5 - ts-jest: 27.0.3 + ts-jest: 27.0.4 tslib: 2.3.0 typescript: 4.3.5 yargs: 17.0.1 @@ -7999,9 +7999,9 @@ fsevents@^1.2.7: languageName: node linkType: hard -"ts-jest@npm:27.0.3": - version: 27.0.3 - resolution: "ts-jest@npm:27.0.3" +"ts-jest@npm:27.0.4": + version: 27.0.4 + resolution: "ts-jest@npm:27.0.4" dependencies: bs-logger: 0.x buffer-from: 1.x @@ -8014,11 +8014,21 @@ fsevents@^1.2.7: semver: 7.x yargs-parser: 20.x peerDependencies: + "@babel/core": ">=7.0.0-beta.0 <8" + "@types/jest": ^26.0.0 + babel-jest: ">=27.0.0 <28" jest: ^27.0.0 typescript: ">=3.8 <5.0" + peerDependenciesMeta: + "@babel/core": + optional: true + "@types/jest": + optional: true + babel-jest: + optional: true bin: ts-jest: cli.js - checksum: a63f3a8620a16335d745f22377a9cc118129d28a5b122c609a7c6aabbb8048c85733c771a0dd39b136e8a75401473409452bdd3c5b9e3b85317c2e3f3ac03267 + checksum: 2891c2052f881e9350367ec0f978193d4268485496aa2613e45d6208f5809e7a04932105be38f3d1c016ff43d7699b7c7728728df6864ce22bc054aa0954af2f languageName: node linkType: hard From 2e57155a758f7c2cef4276fd56c97a3bb70cbbfb Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sat, 24 Jul 2021 02:15:11 +0000 Subject: [PATCH 27/61] Update typescript-eslint monorepo to v4.28.4 --- package.json | 4 +-- yarn.lock | 86 ++++++++++++++++++++++++++-------------------------- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/package.json b/package.json index 613cec24..3f68c577 100644 --- a/package.json +++ b/package.json @@ -55,8 +55,8 @@ "@league-of-foundry-developers/foundry-vtt-types": "0.8.8-7", "@types/fs-extra": "9.0.12", "@types/jest": "26.0.24", - "@typescript-eslint/eslint-plugin": "4.28.3", - "@typescript-eslint/parser": "4.28.3", + "@typescript-eslint/eslint-plugin": "4.28.4", + "@typescript-eslint/parser": "4.28.4", "chalk": "4.1.1", "eslint": "7.30.0", "eslint-config-prettier": "8.3.0", diff --git a/yarn.lock b/yarn.lock index 734bbbca..fbc9f299 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1345,12 +1345,12 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/eslint-plugin@npm:4.28.3": - version: 4.28.3 - resolution: "@typescript-eslint/eslint-plugin@npm:4.28.3" +"@typescript-eslint/eslint-plugin@npm:4.28.4": + version: 4.28.4 + resolution: "@typescript-eslint/eslint-plugin@npm:4.28.4" dependencies: - "@typescript-eslint/experimental-utils": 4.28.3 - "@typescript-eslint/scope-manager": 4.28.3 + "@typescript-eslint/experimental-utils": 4.28.4 + "@typescript-eslint/scope-manager": 4.28.4 debug: ^4.3.1 functional-red-black-tree: ^1.0.1 regexpp: ^3.1.0 @@ -1362,23 +1362,23 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 791adc8261d43d2556f367fc917a64b7fde4f735735120f0132f5007f1fe05b141314d18aa2e64bfdbbd04d33240d660216e7c8dde1b246f58f6ad2e17d0ca2c + checksum: 363b989839e88c16f0c46adc7fefb523730a979d7534252091eef902a7a9b9e2ef801916898cc0cf88d4a3608a754bbd7bd7f01141d9cdf823a5cefc4f03d6af languageName: node linkType: hard -"@typescript-eslint/experimental-utils@npm:4.28.3": - version: 4.28.3 - resolution: "@typescript-eslint/experimental-utils@npm:4.28.3" +"@typescript-eslint/experimental-utils@npm:4.28.4": + version: 4.28.4 + resolution: "@typescript-eslint/experimental-utils@npm:4.28.4" dependencies: "@types/json-schema": ^7.0.7 - "@typescript-eslint/scope-manager": 4.28.3 - "@typescript-eslint/types": 4.28.3 - "@typescript-eslint/typescript-estree": 4.28.3 + "@typescript-eslint/scope-manager": 4.28.4 + "@typescript-eslint/types": 4.28.4 + "@typescript-eslint/typescript-estree": 4.28.4 eslint-scope: ^5.1.1 eslint-utils: ^3.0.0 peerDependencies: eslint: "*" - checksum: 3b2a8ede773ed6929f1c2a680608a11003bfd44cf5c8f8cc7409d167374c543d876f97e67533566ec91eaf17ad514d7eee20e611e5f78b0b3ac18b5bc99af865 + checksum: 8bb463ae1dcfd18417237abe4a1716fa6a7b459fc9cb131fdd6ba820e48bb60614a47d0cbd3693b08a12e5fed60dfafe872eb6bfdc23c42da9dbe627f24f9b54 languageName: node linkType: hard @@ -1398,20 +1398,20 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/parser@npm:4.28.3": - version: 4.28.3 - resolution: "@typescript-eslint/parser@npm:4.28.3" +"@typescript-eslint/parser@npm:4.28.4": + version: 4.28.4 + resolution: "@typescript-eslint/parser@npm:4.28.4" dependencies: - "@typescript-eslint/scope-manager": 4.28.3 - "@typescript-eslint/types": 4.28.3 - "@typescript-eslint/typescript-estree": 4.28.3 + "@typescript-eslint/scope-manager": 4.28.4 + "@typescript-eslint/types": 4.28.4 + "@typescript-eslint/typescript-estree": 4.28.4 debug: ^4.3.1 peerDependencies: eslint: ^5.0.0 || ^6.0.0 || ^7.0.0 peerDependenciesMeta: typescript: optional: true - checksum: 107c6b6176343dc2e82a372bd240a762c1d254b7b30f91560012b68857d25fd18cc4517e4f691c67ff3bdffd4150d89bd8318e4741ca7aa70b50a3ca74e36ad6 + checksum: 98eb4dcc86df20cc04d9b1e8669a2216f0e9846d1861a4b1909276c885882d516b9dbeab46bd9cb4e1505f45d8181d45e2b6465e2a9e7dc84f7b8aead42f3c26 languageName: node linkType: hard @@ -1425,13 +1425,13 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/scope-manager@npm:4.28.3": - version: 4.28.3 - resolution: "@typescript-eslint/scope-manager@npm:4.28.3" +"@typescript-eslint/scope-manager@npm:4.28.4": + version: 4.28.4 + resolution: "@typescript-eslint/scope-manager@npm:4.28.4" dependencies: - "@typescript-eslint/types": 4.28.3 - "@typescript-eslint/visitor-keys": 4.28.3 - checksum: 6f6a821e595c1cb8045a6820e9553d52f1588e9c512fd74ae7b2529d2337e4e57884c77039195d51d3a62443ef940f955e13c7e15a41822ecc20b210ebe604fd + "@typescript-eslint/types": 4.28.4 + "@typescript-eslint/visitor-keys": 4.28.4 + checksum: 13d09245c004f5f8d57b910e282d1b1d5efa66e5eca97468e900fd80d5bea5e9f0ad2942270fbcffbfdfeaa1daff7520812151ca0a680c3c0d231fef9a2fcc95 languageName: node linkType: hard @@ -1442,10 +1442,10 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/types@npm:4.28.3": - version: 4.28.3 - resolution: "@typescript-eslint/types@npm:4.28.3" - checksum: b5b394c68b44962a8c58406e0f4c90bad9be480e725a6c5eb7dd692ad01b1ed65eb0b69fd4f77b4b9c9221967c72e93f5a4e6ff962824d3a1faea2a32256c5af +"@typescript-eslint/types@npm:4.28.4": + version: 4.28.4 + resolution: "@typescript-eslint/types@npm:4.28.4" + checksum: 6901f6bc7438234455a348e4a5f6573c870f66c7007a936b5f0703a1bce2c7da1b95f4e1b1538bc177403b1624064a040ebce60a85a940ffecd76499a1e18819 languageName: node linkType: hard @@ -1467,12 +1467,12 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/typescript-estree@npm:4.28.3": - version: 4.28.3 - resolution: "@typescript-eslint/typescript-estree@npm:4.28.3" +"@typescript-eslint/typescript-estree@npm:4.28.4": + version: 4.28.4 + resolution: "@typescript-eslint/typescript-estree@npm:4.28.4" dependencies: - "@typescript-eslint/types": 4.28.3 - "@typescript-eslint/visitor-keys": 4.28.3 + "@typescript-eslint/types": 4.28.4 + "@typescript-eslint/visitor-keys": 4.28.4 debug: ^4.3.1 globby: ^11.0.3 is-glob: ^4.0.1 @@ -1481,7 +1481,7 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: ec3b3abecef54d608921e29499f6c9cd1af45fafded47b5b5a6d32b93870ab048cb0636efb10936219b47945a17772c935df0acf1c8ff5188417cdcbf775b70c + checksum: 8829b79e56752aca34265ac90c08a11d49732d18063551e4729b05f0c275fc84275a4091b1e34035713004e1a6cebc69089b901aa6ff7fae87f36d4ad835f101 languageName: node linkType: hard @@ -1495,13 +1495,13 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/visitor-keys@npm:4.28.3": - version: 4.28.3 - resolution: "@typescript-eslint/visitor-keys@npm:4.28.3" +"@typescript-eslint/visitor-keys@npm:4.28.4": + version: 4.28.4 + resolution: "@typescript-eslint/visitor-keys@npm:4.28.4" dependencies: - "@typescript-eslint/types": 4.28.3 + "@typescript-eslint/types": 4.28.4 eslint-visitor-keys: ^2.0.0 - checksum: 37410d60074f255ac78b5af5d189c61ff219d0ff096f0d4984d7bc9ed9b42932d338b1efa97a99e0144820ef9a0fb2801c3ee6106dbc577901cc09ce02b75c9e + checksum: 49696c0a4195bd69a4a0a2024367efc9ee0e0ec2e55e2fda0d82b936f73f2399f965a15e2d088529c178194b6e02748c05bbab64f1550657c4ae6c0255703d09 languageName: node linkType: hard @@ -2900,8 +2900,8 @@ __metadata: "@league-of-foundry-developers/foundry-vtt-types": 0.8.8-7 "@types/fs-extra": 9.0.12 "@types/jest": 26.0.24 - "@typescript-eslint/eslint-plugin": 4.28.3 - "@typescript-eslint/parser": 4.28.3 + "@typescript-eslint/eslint-plugin": 4.28.4 + "@typescript-eslint/parser": 4.28.4 chalk: 4.1.1 eslint: 7.30.0 eslint-config-prettier: 8.3.0 From f965d7b48db89f014320ee136098d970d0b742c8 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sat, 24 Jul 2021 03:15:22 +0000 Subject: [PATCH 28/61] Update dependency eslint to v7.31.0 --- package.json | 2 +- yarn.lock | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index 3f68c577..7cbec148 100644 --- a/package.json +++ b/package.json @@ -58,7 +58,7 @@ "@typescript-eslint/eslint-plugin": "4.28.4", "@typescript-eslint/parser": "4.28.4", "chalk": "4.1.1", - "eslint": "7.30.0", + "eslint": "7.31.0", "eslint-config-prettier": "8.3.0", "eslint-plugin-jest": "24.3.6", "eslint-plugin-prettier": "3.4.0", diff --git a/yarn.lock b/yarn.lock index fbc9f299..d377a62e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -420,9 +420,9 @@ __metadata: languageName: node linkType: hard -"@eslint/eslintrc@npm:^0.4.2": - version: 0.4.2 - resolution: "@eslint/eslintrc@npm:0.4.2" +"@eslint/eslintrc@npm:^0.4.3": + version: 0.4.3 + resolution: "@eslint/eslintrc@npm:0.4.3" dependencies: ajv: ^6.12.4 debug: ^4.1.1 @@ -433,7 +433,7 @@ __metadata: js-yaml: ^3.13.1 minimatch: ^3.0.4 strip-json-comments: ^3.1.1 - checksum: 60b66ce4257bf5c36a920dea83a056102fef746e7afd7100a6fe245a126ff455f67f4948e75d28ed73090bff8f8556b6a996e74a124911ca703440bc245dbc23 + checksum: fa916db689fac96c749571f03f931448d896ce07c3da40079082f28621f52defa36cc0c88bfcdd8d19b9981a6549c3a9a3977953db2f6945aba1135bb83a3d35 languageName: node linkType: hard @@ -2903,7 +2903,7 @@ __metadata: "@typescript-eslint/eslint-plugin": 4.28.4 "@typescript-eslint/parser": 4.28.4 chalk: 4.1.1 - eslint: 7.30.0 + eslint: 7.31.0 eslint-config-prettier: 8.3.0 eslint-plugin-jest: 24.3.6 eslint-plugin-prettier: 3.4.0 @@ -3235,12 +3235,12 @@ __metadata: languageName: node linkType: hard -"eslint@npm:7.30.0": - version: 7.30.0 - resolution: "eslint@npm:7.30.0" +"eslint@npm:7.31.0": + version: 7.31.0 + resolution: "eslint@npm:7.31.0" dependencies: "@babel/code-frame": 7.12.11 - "@eslint/eslintrc": ^0.4.2 + "@eslint/eslintrc": ^0.4.3 "@humanwhocodes/config-array": ^0.5.0 ajv: ^6.10.0 chalk: ^4.0.0 @@ -3281,7 +3281,7 @@ __metadata: v8-compile-cache: ^2.0.3 bin: eslint: bin/eslint.js - checksum: 028048847e0252d6c972ac612fe37be55822ae2255d10d1bf68255749f7ae1364b2aa538cd95f3bc4d951fc7d36195e46b62fe8d215297ef9a6a8aeb8ca28a90 + checksum: 38c000372bfafc3715da2d2b6db2a75d4b3b95ac2c20696d774185aa5b6118065a37d0a1292eaa91292e07f86d53a0993cf9bfb838a7a9b935524a125e21af98 languageName: node linkType: hard From fee999e8916494fedb5b8457d3972f02eabeeb61 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sat, 24 Jul 2021 04:14:50 +0000 Subject: [PATCH 29/61] Update dependency eslint-plugin-jest to v24.4.0 --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 7cbec148..ce3d4862 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "chalk": "4.1.1", "eslint": "7.31.0", "eslint-config-prettier": "8.3.0", - "eslint-plugin-jest": "24.3.6", + "eslint-plugin-jest": "24.4.0", "eslint-plugin-prettier": "3.4.0", "fs-extra": "10.0.0", "gulp": "4.0.2", diff --git a/yarn.lock b/yarn.lock index d377a62e..9a71a87f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2905,7 +2905,7 @@ __metadata: chalk: 4.1.1 eslint: 7.31.0 eslint-config-prettier: 8.3.0 - eslint-plugin-jest: 24.3.6 + eslint-plugin-jest: 24.4.0 eslint-plugin-prettier: 3.4.0 fs-extra: 10.0.0 gulp: 4.0.2 @@ -3161,9 +3161,9 @@ __metadata: languageName: node linkType: hard -"eslint-plugin-jest@npm:24.3.6": - version: 24.3.6 - resolution: "eslint-plugin-jest@npm:24.3.6" +"eslint-plugin-jest@npm:24.4.0": + version: 24.4.0 + resolution: "eslint-plugin-jest@npm:24.4.0" dependencies: "@typescript-eslint/experimental-utils": ^4.0.1 peerDependencies: @@ -3172,7 +3172,7 @@ __metadata: peerDependenciesMeta: "@typescript-eslint/eslint-plugin": optional: true - checksum: 13f4522cd838a6a356a080f76424579a58aa2f9b4f4b3fdd3713278718496c62ba3d8f53c0fb6ad6fd96ca6cfd6ee728f7dd51893b91eccfb4396b832f757afb + checksum: 189a78413943822ad3b58e13906960815dca790035ed00eab796fe465b6f48855b7e2f40a1d30c5fa34bf205d9baa27fdf47cc58c9f402f7d7c358cd3dea8698 languageName: node linkType: hard From aab8f8d04453dbead57438092b4fdfa50100c322 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sat, 24 Jul 2021 05:15:11 +0000 Subject: [PATCH 30/61] Update dependency lint-staged to v11.1.0 --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index ce3d4862..742565e1 100644 --- a/package.json +++ b/package.json @@ -68,7 +68,7 @@ "husky": "7.0.1", "jest": "27.0.6", "jest-junit": "12.2.0", - "lint-staged": "11.0.1", + "lint-staged": "11.1.0", "prettier": "2.3.2", "rollup": "2.53.3", "rollup-plugin-typescript2": "0.30.0", diff --git a/yarn.lock b/yarn.lock index 9a71a87f..95b7154a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2913,7 +2913,7 @@ __metadata: husky: 7.0.1 jest: 27.0.6 jest-junit: 12.2.0 - lint-staged: 11.0.1 + lint-staged: 11.1.0 prettier: 2.3.2 rollup: 2.53.3 rollup-plugin-typescript2: 0.30.0 @@ -5611,9 +5611,9 @@ fsevents@^1.2.7: languageName: node linkType: hard -"lint-staged@npm:11.0.1": - version: 11.0.1 - resolution: "lint-staged@npm:11.0.1" +"lint-staged@npm:11.1.0": + version: 11.1.0 + resolution: "lint-staged@npm:11.1.0" dependencies: chalk: ^4.1.1 cli-truncate: ^2.1.0 @@ -5632,7 +5632,7 @@ fsevents@^1.2.7: stringify-object: ^3.3.0 bin: lint-staged: bin/lint-staged.js - checksum: 2b90d18a40acb26c61df224844040843f4533b874cf5a5b6be9d7641d60c2799b4acf7e1f73cea4ab1c3630f26ab3c4553a42935850b6a7683e0500e5af7b3ec + checksum: 2f4a951fe24b6359ca32fbe5399fef55b83f3cbdfede478ba3bc6e9adc3230a64f6f33cf51b332cf165d01b464bd6683a64234e3730239c4a0391a789566a909 languageName: node linkType: hard From 51116a3da56b70fd2150e311df4bc5198f398a5a Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sat, 24 Jul 2021 06:15:01 +0000 Subject: [PATCH 31/61] Update dependency sass to v1.36.0 --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 742565e1..9448a69d 100644 --- a/package.json +++ b/package.json @@ -72,7 +72,7 @@ "prettier": "2.3.2", "rollup": "2.53.3", "rollup-plugin-typescript2": "0.30.0", - "sass": "1.35.2", + "sass": "1.36.0", "semver": "7.3.5", "ts-jest": "27.0.4", "tslib": "2.3.0", diff --git a/yarn.lock b/yarn.lock index 95b7154a..e95095cd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2917,7 +2917,7 @@ __metadata: prettier: 2.3.2 rollup: 2.53.3 rollup-plugin-typescript2: 0.30.0 - sass: 1.35.2 + sass: 1.36.0 semver: 7.3.5 ts-jest: 27.0.4 tslib: 2.3.0 @@ -7216,14 +7216,14 @@ fsevents@^1.2.7: languageName: node linkType: hard -"sass@npm:1.35.2": - version: 1.35.2 - resolution: "sass@npm:1.35.2" +"sass@npm:1.36.0": + version: 1.36.0 + resolution: "sass@npm:1.36.0" dependencies: chokidar: ">=3.0.0 <4.0.0" bin: sass: sass.js - checksum: d102e3fd6e6aa1a61f9c765fb31ff701d78ef05cf256ebb9ed80994c86638dcc8cc71832df1a1f71edce427cf823449c2fc43618b29ad51a8ca5bf93349ccaf4 + checksum: e72aa7d49d7a65f37253b5b762925e260c7aaed06f404876fd11e5b2ac0a8d13995f7fae6e02f8098f53d3046150f8aaf3faaaf248216e313622252cbc4b46b7 languageName: node linkType: hard From 4d4a1aa06e0c01887262dd1d44634b70d4aaae67 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sat, 24 Jul 2021 11:15:09 +0000 Subject: [PATCH 32/61] Update dependency lint-staged to v11.1.1 --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 9448a69d..f219baaa 100644 --- a/package.json +++ b/package.json @@ -68,7 +68,7 @@ "husky": "7.0.1", "jest": "27.0.6", "jest-junit": "12.2.0", - "lint-staged": "11.1.0", + "lint-staged": "11.1.1", "prettier": "2.3.2", "rollup": "2.53.3", "rollup-plugin-typescript2": "0.30.0", diff --git a/yarn.lock b/yarn.lock index e95095cd..a79606ae 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2913,7 +2913,7 @@ __metadata: husky: 7.0.1 jest: 27.0.6 jest-junit: 12.2.0 - lint-staged: 11.1.0 + lint-staged: 11.1.1 prettier: 2.3.2 rollup: 2.53.3 rollup-plugin-typescript2: 0.30.0 @@ -5611,9 +5611,9 @@ fsevents@^1.2.7: languageName: node linkType: hard -"lint-staged@npm:11.1.0": - version: 11.1.0 - resolution: "lint-staged@npm:11.1.0" +"lint-staged@npm:11.1.1": + version: 11.1.1 + resolution: "lint-staged@npm:11.1.1" dependencies: chalk: ^4.1.1 cli-truncate: ^2.1.0 @@ -5632,7 +5632,7 @@ fsevents@^1.2.7: stringify-object: ^3.3.0 bin: lint-staged: bin/lint-staged.js - checksum: 2f4a951fe24b6359ca32fbe5399fef55b83f3cbdfede478ba3bc6e9adc3230a64f6f33cf51b332cf165d01b464bd6683a64234e3730239c4a0391a789566a909 + checksum: 1a3100748c60f0ca28635923229ad4e2415681a192fcf40b453b05f6aa053ac87f70328d07374655b55009e4f3b3a6774b132f72ec54a7b1c540d0664ec52c5e languageName: node linkType: hard From dd0c5773241795d5a04991b1138f9e97e3e08c36 Mon Sep 17 00:00:00 2001 From: Johannes Loher Date: Sun, 25 Jul 2021 02:40:28 +0200 Subject: [PATCH 33/61] Fix drag & drop of items --- src/module/actor/sheets/actor-sheet.ts | 60 +++++++++++-------- .../actor/components/control-button-group.hbs | 2 +- .../actor/components/effect-list-entry.hbs | 2 +- .../actor/components/item-list-entry.hbs | 2 +- 4 files changed, 39 insertions(+), 27 deletions(-) diff --git a/src/module/actor/sheets/actor-sheet.ts b/src/module/actor/sheets/actor-sheet.ts index 72d75a81..99e8829f 100644 --- a/src/module/actor/sheets/actor-sheet.ts +++ b/src/module/actor/sheets/actor-sheet.ts @@ -147,7 +147,9 @@ export class DS4ActorSheet extends ActorSheet this.render(false)); } @@ -172,7 +174,7 @@ export class DS4ActorSheet extends ActorSheet this.render(false)); } @@ -239,7 +243,7 @@ export class DS4ActorSheet extends ActorSheet notifications.error(e, { log: true })); @@ -379,3 +377,17 @@ interface EnrichedActiveEffectDataSource extends ActiveEffectDataSource { icon: string; sourceName: string; } + +/** + * This object contains information about specific properties embedded document list entries for each different type. + */ +const embeddedDocumentListEntryProperties = Object.freeze({ + ActiveEffect: { + selector: ".effect", + idDataAttribute: "effectId", + }, + Item: { + selector: ".item", + idDataAttribute: "itemId", + }, +}); diff --git a/src/templates/sheets/actor/components/control-button-group.hbs b/src/templates/sheets/actor/components/control-button-group.hbs index 89713898..dffef3e0 100644 --- a/src/templates/sheets/actor/components/control-button-group.hbs +++ b/src/templates/sheets/actor/components/control-button-group.hbs @@ -7,7 +7,7 @@ SPDX-License-Identifier: MIT {{!-- !-- Render a group of an "edit" and a "delete" button. -!-- The current item is defined by the data-id attribute of the parent li element. +!-- The current item is defined by the a corresponding id attribute of the parent li element. !-- @param documentType: The type of document that is controlled by this button group, item or effect !-- @param editTitle: The title to use for the edit link element (will be localized) !-- @param deleteTitle: The title to use for the delete link element (will be localized) diff --git a/src/templates/sheets/actor/components/effect-list-entry.hbs b/src/templates/sheets/actor/components/effect-list-entry.hbs index 4fbb0a95..f9c9d908 100644 --- a/src/templates/sheets/actor/components/effect-list-entry.hbs +++ b/src/templates/sheets/actor/components/effect-list-entry.hbs @@ -9,7 +9,7 @@ SPDX-License-Identifier: MIT !-- Render an effect list entry row. !-- @param effectData: The data of the item. --}} -
                                                    1. +
                                                    2. {{!-- enabled --}} +
                                                    3. {{!-- equipped --}} {{#if isEquipable}} Date: Sun, 25 Jul 2021 01:00:52 +0000 Subject: [PATCH 34/61] release version 1.2.1 --- package.json | 2 +- src/system.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index f219baaa..1392bb5f 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "private": true, "name": "dungeonslayers4", "description": "An implementation of the Dungeonslayers 4 game system for Foundry Virtual Tabletop.", - "version": "1.2.0", + "version": "1.2.1", "license": "https://git.f3l.de/dungeonslayers/ds4#licensing", "homepage": "https://git.f3l.de/dungeonslayers/ds4", "repository": { diff --git a/src/system.json b/src/system.json index 78257461..fdd4142b 100644 --- a/src/system.json +++ b/src/system.json @@ -2,7 +2,7 @@ "name": "ds4", "title": "Dungeonslayers 4", "description": "The Dungeonslayers 4 system for FoundryVTT. Dungeonslayers by Christian Kennig is licensed under CC BY-NC-SA 3.0 (https://creativecommons.org/licenses/by-nc-sa/3.0/). The icons by the authors of Game-icons.net are licensed under CC BY 3.0 (https://creativecommons.org/licenses/by/3.0/).", - "version": "1.2.0", + "version": "1.2.1", "minimumCoreVersion": "0.8.8", "compatibleCoreVersion": "0.8.8", "author": "Johannes Loher, Gesina Schwalbe, Oliver Rümpelein, Siegfried Krug, Max Tharr, Sascha Martens", @@ -84,7 +84,7 @@ "primaryTokenAttribute": "combatValues.hitPoints", "url": "https://git.f3l.de/dungeonslayers/ds4", "manifest": "https://git.f3l.de/dungeonslayers/ds4/-/raw/latest/src/system.json?inline=false", - "download": "https://git.f3l.de/dungeonslayers/ds4/-/jobs/artifacts/1.2.0/download?job=build", + "download": "https://git.f3l.de/dungeonslayers/ds4/-/jobs/artifacts/1.2.1/download?job=build", "license": "https://git.f3l.de/dungeonslayers/ds4#licensing", "initiative": "@combatValues.initiative.total", "manifestPlusVersion": "1.0.0", From 14be917280ef53c6f0472aa4c68dc65302a160f1 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sun, 25 Jul 2021 02:15:21 +0000 Subject: [PATCH 35/61] Update dependency @league-of-foundry-developers/foundry-vtt-types to v0.8.8-8 --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 1392bb5f..009c6df9 100644 --- a/package.json +++ b/package.json @@ -52,7 +52,7 @@ "postinstall": "husky install" }, "devDependencies": { - "@league-of-foundry-developers/foundry-vtt-types": "0.8.8-7", + "@league-of-foundry-developers/foundry-vtt-types": "0.8.8-8", "@types/fs-extra": "9.0.12", "@types/jest": "26.0.24", "@typescript-eslint/eslint-plugin": "4.28.4", diff --git a/yarn.lock b/yarn.lock index a79606ae..267d403f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -689,9 +689,9 @@ __metadata: languageName: node linkType: hard -"@league-of-foundry-developers/foundry-vtt-types@npm:0.8.8-7": - version: 0.8.8-7 - resolution: "@league-of-foundry-developers/foundry-vtt-types@npm:0.8.8-7" +"@league-of-foundry-developers/foundry-vtt-types@npm:0.8.8-8": + version: 0.8.8-8 + resolution: "@league-of-foundry-developers/foundry-vtt-types@npm:0.8.8-8" dependencies: "@types/jquery": ~3.5.6 "@types/simple-peer": ~9.11.1 @@ -701,7 +701,7 @@ __metadata: socket.io-client: 4.1.2 tinymce: 5.8.1 typescript: ^4.3.5 - checksum: b166266390a70937dad8cb440cf4cbf5bfca031efa73179bd83cee79005589c493d3e151718b192c53a86a112801a5663ea103bf5aaa078b42e35dcb9dbcb5df + checksum: e327a47b2f0a18ab05bbc8703c596aed4d35f3b12aff3252b5facbcc6b993a88034f233fcf446d0925176c7e8d5b15546ec97e0df10d1e9689e11b4e19ab1e3a languageName: node linkType: hard @@ -2897,7 +2897,7 @@ __metadata: version: 0.0.0-use.local resolution: "dungeonslayers4@workspace:." dependencies: - "@league-of-foundry-developers/foundry-vtt-types": 0.8.8-7 + "@league-of-foundry-developers/foundry-vtt-types": 0.8.8-8 "@types/fs-extra": 9.0.12 "@types/jest": 26.0.24 "@typescript-eslint/eslint-plugin": 4.28.4 From 3f794d92c0cc0dbe41cef942c335d79001d47d2c Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sun, 25 Jul 2021 06:15:41 +0000 Subject: [PATCH 36/61] Update dependency rollup to v2.54.0 --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 009c6df9..f98877ae 100644 --- a/package.json +++ b/package.json @@ -70,7 +70,7 @@ "jest-junit": "12.2.0", "lint-staged": "11.1.1", "prettier": "2.3.2", - "rollup": "2.53.3", + "rollup": "2.54.0", "rollup-plugin-typescript2": "0.30.0", "sass": "1.36.0", "semver": "7.3.5", diff --git a/yarn.lock b/yarn.lock index 267d403f..d4a276d7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2915,7 +2915,7 @@ __metadata: jest-junit: 12.2.0 lint-staged: 11.1.1 prettier: 2.3.2 - rollup: 2.53.3 + rollup: 2.54.0 rollup-plugin-typescript2: 0.30.0 sass: 1.36.0 semver: 7.3.5 @@ -7161,9 +7161,9 @@ fsevents@^1.2.7: languageName: node linkType: hard -"rollup@npm:2.53.3": - version: 2.53.3 - resolution: "rollup@npm:2.53.3" +"rollup@npm:2.54.0": + version: 2.54.0 + resolution: "rollup@npm:2.54.0" dependencies: fsevents: ~2.3.2 dependenciesMeta: @@ -7171,7 +7171,7 @@ fsevents@^1.2.7: optional: true bin: rollup: dist/bin/rollup - checksum: 6734aa795875ae0add3e11b5b03bbcc391bb2a6b7c7393274e1cb21edc05c481b68b75a9a3fddc99e0cd8a201c4cd520449ffbf04d2861f82661d16b8d03ced0 + checksum: caf0de927d472ba085f2b313c70eb3412af4f0aba24e7abce5b4bc3f896cee0076a06c7172f1fcf0b58f1413c938f8f2987f17af746dcc144df97f7148ddeb2d languageName: node linkType: hard From d91eabd0f8ce8b6565446b502e71e54004602c99 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 26 Jul 2021 17:15:21 +0000 Subject: [PATCH 37/61] Update typescript-eslint monorepo to v4.28.5 --- package.json | 4 +-- yarn.lock | 86 ++++++++++++++++++++++++++-------------------------- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/package.json b/package.json index f98877ae..e61dd1d0 100644 --- a/package.json +++ b/package.json @@ -55,8 +55,8 @@ "@league-of-foundry-developers/foundry-vtt-types": "0.8.8-8", "@types/fs-extra": "9.0.12", "@types/jest": "26.0.24", - "@typescript-eslint/eslint-plugin": "4.28.4", - "@typescript-eslint/parser": "4.28.4", + "@typescript-eslint/eslint-plugin": "4.28.5", + "@typescript-eslint/parser": "4.28.5", "chalk": "4.1.1", "eslint": "7.31.0", "eslint-config-prettier": "8.3.0", diff --git a/yarn.lock b/yarn.lock index d4a276d7..18b515e8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1345,12 +1345,12 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/eslint-plugin@npm:4.28.4": - version: 4.28.4 - resolution: "@typescript-eslint/eslint-plugin@npm:4.28.4" +"@typescript-eslint/eslint-plugin@npm:4.28.5": + version: 4.28.5 + resolution: "@typescript-eslint/eslint-plugin@npm:4.28.5" dependencies: - "@typescript-eslint/experimental-utils": 4.28.4 - "@typescript-eslint/scope-manager": 4.28.4 + "@typescript-eslint/experimental-utils": 4.28.5 + "@typescript-eslint/scope-manager": 4.28.5 debug: ^4.3.1 functional-red-black-tree: ^1.0.1 regexpp: ^3.1.0 @@ -1362,23 +1362,23 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 363b989839e88c16f0c46adc7fefb523730a979d7534252091eef902a7a9b9e2ef801916898cc0cf88d4a3608a754bbd7bd7f01141d9cdf823a5cefc4f03d6af + checksum: 1ef8adf5db302f468e81983aead2b8b1d04112256068043b15cf1e1f4512a81e1533675cdeb954d4846ea1262ae74c7f322e88a39071b242f4403c963f90d525 languageName: node linkType: hard -"@typescript-eslint/experimental-utils@npm:4.28.4": - version: 4.28.4 - resolution: "@typescript-eslint/experimental-utils@npm:4.28.4" +"@typescript-eslint/experimental-utils@npm:4.28.5": + version: 4.28.5 + resolution: "@typescript-eslint/experimental-utils@npm:4.28.5" dependencies: "@types/json-schema": ^7.0.7 - "@typescript-eslint/scope-manager": 4.28.4 - "@typescript-eslint/types": 4.28.4 - "@typescript-eslint/typescript-estree": 4.28.4 + "@typescript-eslint/scope-manager": 4.28.5 + "@typescript-eslint/types": 4.28.5 + "@typescript-eslint/typescript-estree": 4.28.5 eslint-scope: ^5.1.1 eslint-utils: ^3.0.0 peerDependencies: eslint: "*" - checksum: 8bb463ae1dcfd18417237abe4a1716fa6a7b459fc9cb131fdd6ba820e48bb60614a47d0cbd3693b08a12e5fed60dfafe872eb6bfdc23c42da9dbe627f24f9b54 + checksum: 558a49aae06341581a2dac9112a9d9f9ffde0eb5c50b6eb09f7b88954ca9ef30780c4f7739fbc084407d2571c82278cfabbc2bd0d17f19443910a8776430fb7f languageName: node linkType: hard @@ -1398,20 +1398,20 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/parser@npm:4.28.4": - version: 4.28.4 - resolution: "@typescript-eslint/parser@npm:4.28.4" +"@typescript-eslint/parser@npm:4.28.5": + version: 4.28.5 + resolution: "@typescript-eslint/parser@npm:4.28.5" dependencies: - "@typescript-eslint/scope-manager": 4.28.4 - "@typescript-eslint/types": 4.28.4 - "@typescript-eslint/typescript-estree": 4.28.4 + "@typescript-eslint/scope-manager": 4.28.5 + "@typescript-eslint/types": 4.28.5 + "@typescript-eslint/typescript-estree": 4.28.5 debug: ^4.3.1 peerDependencies: eslint: ^5.0.0 || ^6.0.0 || ^7.0.0 peerDependenciesMeta: typescript: optional: true - checksum: 98eb4dcc86df20cc04d9b1e8669a2216f0e9846d1861a4b1909276c885882d516b9dbeab46bd9cb4e1505f45d8181d45e2b6465e2a9e7dc84f7b8aead42f3c26 + checksum: 4c44a3fbbb7071ca2a0844e253de325dbbb5be21a0f193d3bdad2be93731137da686dbb91e6c9786ba38a5a64946344af381cd00615f8d62ff7a040e8f8f3b02 languageName: node linkType: hard @@ -1425,13 +1425,13 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/scope-manager@npm:4.28.4": - version: 4.28.4 - resolution: "@typescript-eslint/scope-manager@npm:4.28.4" +"@typescript-eslint/scope-manager@npm:4.28.5": + version: 4.28.5 + resolution: "@typescript-eslint/scope-manager@npm:4.28.5" dependencies: - "@typescript-eslint/types": 4.28.4 - "@typescript-eslint/visitor-keys": 4.28.4 - checksum: 13d09245c004f5f8d57b910e282d1b1d5efa66e5eca97468e900fd80d5bea5e9f0ad2942270fbcffbfdfeaa1daff7520812151ca0a680c3c0d231fef9a2fcc95 + "@typescript-eslint/types": 4.28.5 + "@typescript-eslint/visitor-keys": 4.28.5 + checksum: d18e0e4736486517fabe0e5dfa760402e1c753b0cb147b9a85d7c00b5649630c29b5ed558ce02a8653b6806983eaf83da192f1c21c77ce14e260c48e63e821ce languageName: node linkType: hard @@ -1442,10 +1442,10 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/types@npm:4.28.4": - version: 4.28.4 - resolution: "@typescript-eslint/types@npm:4.28.4" - checksum: 6901f6bc7438234455a348e4a5f6573c870f66c7007a936b5f0703a1bce2c7da1b95f4e1b1538bc177403b1624064a040ebce60a85a940ffecd76499a1e18819 +"@typescript-eslint/types@npm:4.28.5": + version: 4.28.5 + resolution: "@typescript-eslint/types@npm:4.28.5" + checksum: 243b8b70c9b57df03e1f18037a5ea98cbd0aef1212fe2964eab6eaee4533a584d1fefec99be05b951f9612d7a7712c57570a5be5b0991a92f6f42c3ccd1dc877 languageName: node linkType: hard @@ -1467,12 +1467,12 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/typescript-estree@npm:4.28.4": - version: 4.28.4 - resolution: "@typescript-eslint/typescript-estree@npm:4.28.4" +"@typescript-eslint/typescript-estree@npm:4.28.5": + version: 4.28.5 + resolution: "@typescript-eslint/typescript-estree@npm:4.28.5" dependencies: - "@typescript-eslint/types": 4.28.4 - "@typescript-eslint/visitor-keys": 4.28.4 + "@typescript-eslint/types": 4.28.5 + "@typescript-eslint/visitor-keys": 4.28.5 debug: ^4.3.1 globby: ^11.0.3 is-glob: ^4.0.1 @@ -1481,7 +1481,7 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 8829b79e56752aca34265ac90c08a11d49732d18063551e4729b05f0c275fc84275a4091b1e34035713004e1a6cebc69089b901aa6ff7fae87f36d4ad835f101 + checksum: 0483a9b8d163929fe46f780a5a8b82bf26483aae4d7f2887265d13719eb83afaf3dc68616dd6eb21eca2e451582d44a46bbc7ac0a4f7bae9193bbf5860619fc6 languageName: node linkType: hard @@ -1495,13 +1495,13 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/visitor-keys@npm:4.28.4": - version: 4.28.4 - resolution: "@typescript-eslint/visitor-keys@npm:4.28.4" +"@typescript-eslint/visitor-keys@npm:4.28.5": + version: 4.28.5 + resolution: "@typescript-eslint/visitor-keys@npm:4.28.5" dependencies: - "@typescript-eslint/types": 4.28.4 + "@typescript-eslint/types": 4.28.5 eslint-visitor-keys: ^2.0.0 - checksum: 49696c0a4195bd69a4a0a2024367efc9ee0e0ec2e55e2fda0d82b936f73f2399f965a15e2d088529c178194b6e02748c05bbab64f1550657c4ae6c0255703d09 + checksum: a32b7c549a70b33f2e973a14c8ecc007b029d2f6e6ff4fa47cbd0edad6edaac5c36df85a2a622d230f64b1f3ab2eef6da423d2b7c35f8020f06a7869d3f2662e languageName: node linkType: hard @@ -2900,8 +2900,8 @@ __metadata: "@league-of-foundry-developers/foundry-vtt-types": 0.8.8-8 "@types/fs-extra": 9.0.12 "@types/jest": 26.0.24 - "@typescript-eslint/eslint-plugin": 4.28.4 - "@typescript-eslint/parser": 4.28.4 + "@typescript-eslint/eslint-plugin": 4.28.5 + "@typescript-eslint/parser": 4.28.5 chalk: 4.1.1 eslint: 7.31.0 eslint-config-prettier: 8.3.0 From 2131d9a96f92e856c4446c7ba840fa88aa7c84e5 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 28 Jul 2021 05:16:13 +0000 Subject: [PATCH 38/61] Update dependency rollup to v2.55.0 --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index e61dd1d0..41feb309 100644 --- a/package.json +++ b/package.json @@ -70,7 +70,7 @@ "jest-junit": "12.2.0", "lint-staged": "11.1.1", "prettier": "2.3.2", - "rollup": "2.54.0", + "rollup": "2.55.0", "rollup-plugin-typescript2": "0.30.0", "sass": "1.36.0", "semver": "7.3.5", diff --git a/yarn.lock b/yarn.lock index 18b515e8..0f85b2d9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2915,7 +2915,7 @@ __metadata: jest-junit: 12.2.0 lint-staged: 11.1.1 prettier: 2.3.2 - rollup: 2.54.0 + rollup: 2.55.0 rollup-plugin-typescript2: 0.30.0 sass: 1.36.0 semver: 7.3.5 @@ -7161,9 +7161,9 @@ fsevents@^1.2.7: languageName: node linkType: hard -"rollup@npm:2.54.0": - version: 2.54.0 - resolution: "rollup@npm:2.54.0" +"rollup@npm:2.55.0": + version: 2.55.0 + resolution: "rollup@npm:2.55.0" dependencies: fsevents: ~2.3.2 dependenciesMeta: @@ -7171,7 +7171,7 @@ fsevents@^1.2.7: optional: true bin: rollup: dist/bin/rollup - checksum: caf0de927d472ba085f2b313c70eb3412af4f0aba24e7abce5b4bc3f896cee0076a06c7172f1fcf0b58f1413c938f8f2987f17af746dcc144df97f7148ddeb2d + checksum: 9269671325aff6e887419838326a9d5e86f725ddc89d114c20fc4942d25eca8fcdd8869a566d8b6636fd62942d23873b9e0384d07db8ec829000581ea7986bdb languageName: node linkType: hard From e2ea3085019c3d406434c40555c9ad2fb9039739 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Thu, 29 Jul 2021 16:15:37 +0000 Subject: [PATCH 39/61] Update dependency rollup to v2.55.1 --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 41feb309..283279a8 100644 --- a/package.json +++ b/package.json @@ -70,7 +70,7 @@ "jest-junit": "12.2.0", "lint-staged": "11.1.1", "prettier": "2.3.2", - "rollup": "2.55.0", + "rollup": "2.55.1", "rollup-plugin-typescript2": "0.30.0", "sass": "1.36.0", "semver": "7.3.5", diff --git a/yarn.lock b/yarn.lock index 0f85b2d9..9d7d7310 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2915,7 +2915,7 @@ __metadata: jest-junit: 12.2.0 lint-staged: 11.1.1 prettier: 2.3.2 - rollup: 2.55.0 + rollup: 2.55.1 rollup-plugin-typescript2: 0.30.0 sass: 1.36.0 semver: 7.3.5 @@ -7161,9 +7161,9 @@ fsevents@^1.2.7: languageName: node linkType: hard -"rollup@npm:2.55.0": - version: 2.55.0 - resolution: "rollup@npm:2.55.0" +"rollup@npm:2.55.1": + version: 2.55.1 + resolution: "rollup@npm:2.55.1" dependencies: fsevents: ~2.3.2 dependenciesMeta: @@ -7171,7 +7171,7 @@ fsevents@^1.2.7: optional: true bin: rollup: dist/bin/rollup - checksum: 9269671325aff6e887419838326a9d5e86f725ddc89d114c20fc4942d25eca8fcdd8869a566d8b6636fd62942d23873b9e0384d07db8ec829000581ea7986bdb + checksum: 798aa251572263d52b3ed4c77e2744817baf296688393d2e80d8f51ff885494232f3b32dcc23f42bc68704f66732f9015abc10aad3d16acf567013ae2512ccb1 languageName: node linkType: hard From 9684c3c7e2cf1033e23b5e2a78c0659ec7ba4c1f Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 30 Jul 2021 12:15:25 +0000 Subject: [PATCH 40/61] Update dependency chalk to v4.1.2 --- package.json | 2 +- yarn.lock | 20 +++++++++++++++----- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 283279a8..f71423ff 100644 --- a/package.json +++ b/package.json @@ -57,7 +57,7 @@ "@types/jest": "26.0.24", "@typescript-eslint/eslint-plugin": "4.28.5", "@typescript-eslint/parser": "4.28.5", - "chalk": "4.1.1", + "chalk": "4.1.2", "eslint": "7.31.0", "eslint-config-prettier": "8.3.0", "eslint-plugin-jest": "24.4.0", diff --git a/yarn.lock b/yarn.lock index 9d7d7310..620e9899 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2259,13 +2259,13 @@ __metadata: languageName: node linkType: hard -"chalk@npm:4.1.1, chalk@npm:^4.0.0, chalk@npm:^4.1.0, chalk@npm:^4.1.1": - version: 4.1.1 - resolution: "chalk@npm:4.1.1" +"chalk@npm:4.1.2": + version: 4.1.2 + resolution: "chalk@npm:4.1.2" dependencies: ansi-styles: ^4.1.0 supports-color: ^7.1.0 - checksum: 445c12db7aeed0046500a1e4184d31209a77d165654c885a789c41c8598a6a95bd2392180987cac572c967b93a2a730dda778bb7f87fa06ca63fd8592f8cc59f + checksum: e3901b97d953991712bf0b941d586175be7ca5da56a97d25187e07453c6b26cae0ac8d9c7aa9e87e7c5c986fff870771b3a8e2705b3becda868829e2e12c2a65 languageName: node linkType: hard @@ -2280,6 +2280,16 @@ __metadata: languageName: node linkType: hard +"chalk@npm:^4.0.0, chalk@npm:^4.1.0, chalk@npm:^4.1.1": + version: 4.1.1 + resolution: "chalk@npm:4.1.1" + dependencies: + ansi-styles: ^4.1.0 + supports-color: ^7.1.0 + checksum: 445c12db7aeed0046500a1e4184d31209a77d165654c885a789c41c8598a6a95bd2392180987cac572c967b93a2a730dda778bb7f87fa06ca63fd8592f8cc59f + languageName: node + linkType: hard + "char-regex@npm:^1.0.2": version: 1.0.2 resolution: "char-regex@npm:1.0.2" @@ -2902,7 +2912,7 @@ __metadata: "@types/jest": 26.0.24 "@typescript-eslint/eslint-plugin": 4.28.5 "@typescript-eslint/parser": 4.28.5 - chalk: 4.1.1 + chalk: 4.1.2 eslint: 7.31.0 eslint-config-prettier: 8.3.0 eslint-plugin-jest: 24.4.0 From a601b61f72e6a680a0938f7ae1e7bedf4ac6c4e2 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 30 Jul 2021 23:15:54 +0000 Subject: [PATCH 41/61] Update dependency eslint to v7.32.0 --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index f71423ff..0561eb09 100644 --- a/package.json +++ b/package.json @@ -58,7 +58,7 @@ "@typescript-eslint/eslint-plugin": "4.28.5", "@typescript-eslint/parser": "4.28.5", "chalk": "4.1.2", - "eslint": "7.31.0", + "eslint": "7.32.0", "eslint-config-prettier": "8.3.0", "eslint-plugin-jest": "24.4.0", "eslint-plugin-prettier": "3.4.0", diff --git a/yarn.lock b/yarn.lock index 620e9899..44ad7b96 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2913,7 +2913,7 @@ __metadata: "@typescript-eslint/eslint-plugin": 4.28.5 "@typescript-eslint/parser": 4.28.5 chalk: 4.1.2 - eslint: 7.31.0 + eslint: 7.32.0 eslint-config-prettier: 8.3.0 eslint-plugin-jest: 24.4.0 eslint-plugin-prettier: 3.4.0 @@ -3245,9 +3245,9 @@ __metadata: languageName: node linkType: hard -"eslint@npm:7.31.0": - version: 7.31.0 - resolution: "eslint@npm:7.31.0" +"eslint@npm:7.32.0": + version: 7.32.0 + resolution: "eslint@npm:7.32.0" dependencies: "@babel/code-frame": 7.12.11 "@eslint/eslintrc": ^0.4.3 @@ -3291,7 +3291,7 @@ __metadata: v8-compile-cache: ^2.0.3 bin: eslint: bin/eslint.js - checksum: 38c000372bfafc3715da2d2b6db2a75d4b3b95ac2c20696d774185aa5b6118065a37d0a1292eaa91292e07f86d53a0993cf9bfb838a7a9b935524a125e21af98 + checksum: e25f9159d3b6b7e826b190ebb38accf3ec1513e1811bd7df2e8de83313370d266b8b6a571491a9f092d254fc53b2c5cde14dd2196cf046e22970ef037a4c7f3d languageName: node linkType: hard From 4cd9fe0e6179cf02890a9d408c5c1fd85b311d37 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sat, 31 Jul 2021 00:15:57 +0000 Subject: [PATCH 42/61] Update dependency sass to v1.37.0 --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 0561eb09..1edcf474 100644 --- a/package.json +++ b/package.json @@ -72,7 +72,7 @@ "prettier": "2.3.2", "rollup": "2.55.1", "rollup-plugin-typescript2": "0.30.0", - "sass": "1.36.0", + "sass": "1.37.0", "semver": "7.3.5", "ts-jest": "27.0.4", "tslib": "2.3.0", diff --git a/yarn.lock b/yarn.lock index 44ad7b96..9004eb08 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2927,7 +2927,7 @@ __metadata: prettier: 2.3.2 rollup: 2.55.1 rollup-plugin-typescript2: 0.30.0 - sass: 1.36.0 + sass: 1.37.0 semver: 7.3.5 ts-jest: 27.0.4 tslib: 2.3.0 @@ -7226,14 +7226,14 @@ fsevents@^1.2.7: languageName: node linkType: hard -"sass@npm:1.36.0": - version: 1.36.0 - resolution: "sass@npm:1.36.0" +"sass@npm:1.37.0": + version: 1.37.0 + resolution: "sass@npm:1.37.0" dependencies: chokidar: ">=3.0.0 <4.0.0" bin: sass: sass.js - checksum: e72aa7d49d7a65f37253b5b762925e260c7aaed06f404876fd11e5b2ac0a8d13995f7fae6e02f8098f53d3046150f8aaf3faaaf248216e313622252cbc4b46b7 + checksum: 967cdd4293d88b4c7165ca52e4dd89f123f15c821a15023a93e297acd43c18ea34773c93317e10df34d3bd44428b3cbcaab064f60e2df1a0811c5951d26689a1 languageName: node linkType: hard From acfc1f584268c214814446211f7b30fa819c6320 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 2 Aug 2021 17:16:24 +0000 Subject: [PATCH 43/61] Update typescript-eslint monorepo to v4.29.0 --- package.json | 4 +-- yarn.lock | 86 ++++++++++++++++++++++++++-------------------------- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/package.json b/package.json index 1edcf474..6747e655 100644 --- a/package.json +++ b/package.json @@ -55,8 +55,8 @@ "@league-of-foundry-developers/foundry-vtt-types": "0.8.8-8", "@types/fs-extra": "9.0.12", "@types/jest": "26.0.24", - "@typescript-eslint/eslint-plugin": "4.28.5", - "@typescript-eslint/parser": "4.28.5", + "@typescript-eslint/eslint-plugin": "4.29.0", + "@typescript-eslint/parser": "4.29.0", "chalk": "4.1.2", "eslint": "7.32.0", "eslint-config-prettier": "8.3.0", diff --git a/yarn.lock b/yarn.lock index 9004eb08..953a5d2f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1345,12 +1345,12 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/eslint-plugin@npm:4.28.5": - version: 4.28.5 - resolution: "@typescript-eslint/eslint-plugin@npm:4.28.5" +"@typescript-eslint/eslint-plugin@npm:4.29.0": + version: 4.29.0 + resolution: "@typescript-eslint/eslint-plugin@npm:4.29.0" dependencies: - "@typescript-eslint/experimental-utils": 4.28.5 - "@typescript-eslint/scope-manager": 4.28.5 + "@typescript-eslint/experimental-utils": 4.29.0 + "@typescript-eslint/scope-manager": 4.29.0 debug: ^4.3.1 functional-red-black-tree: ^1.0.1 regexpp: ^3.1.0 @@ -1362,23 +1362,23 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 1ef8adf5db302f468e81983aead2b8b1d04112256068043b15cf1e1f4512a81e1533675cdeb954d4846ea1262ae74c7f322e88a39071b242f4403c963f90d525 + checksum: c8153c8838ea9e37eb7c7c93c74639184487d6ee7593e837ccb27dae2fedd3595344a66bf8bdeaa9c297f0cf94751b3ff2f8a7866ab4ef9c62d2beea0f5451c3 languageName: node linkType: hard -"@typescript-eslint/experimental-utils@npm:4.28.5": - version: 4.28.5 - resolution: "@typescript-eslint/experimental-utils@npm:4.28.5" +"@typescript-eslint/experimental-utils@npm:4.29.0": + version: 4.29.0 + resolution: "@typescript-eslint/experimental-utils@npm:4.29.0" dependencies: "@types/json-schema": ^7.0.7 - "@typescript-eslint/scope-manager": 4.28.5 - "@typescript-eslint/types": 4.28.5 - "@typescript-eslint/typescript-estree": 4.28.5 + "@typescript-eslint/scope-manager": 4.29.0 + "@typescript-eslint/types": 4.29.0 + "@typescript-eslint/typescript-estree": 4.29.0 eslint-scope: ^5.1.1 eslint-utils: ^3.0.0 peerDependencies: eslint: "*" - checksum: 558a49aae06341581a2dac9112a9d9f9ffde0eb5c50b6eb09f7b88954ca9ef30780c4f7739fbc084407d2571c82278cfabbc2bd0d17f19443910a8776430fb7f + checksum: 7be31d6326f72e6515089e96ae27c9b315b5b902a82a3882c605a6394c9c11a61de970818fd46406a26abe1c1751d0bcdc95f88362befc46f26a9429d415c9f7 languageName: node linkType: hard @@ -1398,20 +1398,20 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/parser@npm:4.28.5": - version: 4.28.5 - resolution: "@typescript-eslint/parser@npm:4.28.5" +"@typescript-eslint/parser@npm:4.29.0": + version: 4.29.0 + resolution: "@typescript-eslint/parser@npm:4.29.0" dependencies: - "@typescript-eslint/scope-manager": 4.28.5 - "@typescript-eslint/types": 4.28.5 - "@typescript-eslint/typescript-estree": 4.28.5 + "@typescript-eslint/scope-manager": 4.29.0 + "@typescript-eslint/types": 4.29.0 + "@typescript-eslint/typescript-estree": 4.29.0 debug: ^4.3.1 peerDependencies: eslint: ^5.0.0 || ^6.0.0 || ^7.0.0 peerDependenciesMeta: typescript: optional: true - checksum: 4c44a3fbbb7071ca2a0844e253de325dbbb5be21a0f193d3bdad2be93731137da686dbb91e6c9786ba38a5a64946344af381cd00615f8d62ff7a040e8f8f3b02 + checksum: 4e3286bd9737d349e9443995a6a829919ab3be4c5065587f66e761cd877738724675973893a1b412394c49e20b3e29a608d9fd27b361dda6d9cb1a00b67af0cd languageName: node linkType: hard @@ -1425,13 +1425,13 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/scope-manager@npm:4.28.5": - version: 4.28.5 - resolution: "@typescript-eslint/scope-manager@npm:4.28.5" +"@typescript-eslint/scope-manager@npm:4.29.0": + version: 4.29.0 + resolution: "@typescript-eslint/scope-manager@npm:4.29.0" dependencies: - "@typescript-eslint/types": 4.28.5 - "@typescript-eslint/visitor-keys": 4.28.5 - checksum: d18e0e4736486517fabe0e5dfa760402e1c753b0cb147b9a85d7c00b5649630c29b5ed558ce02a8653b6806983eaf83da192f1c21c77ce14e260c48e63e821ce + "@typescript-eslint/types": 4.29.0 + "@typescript-eslint/visitor-keys": 4.29.0 + checksum: 10a9ac37775da0141e403b8a71a61f7783a0b12fbd2e72f94a5249981b8d90c5ea3b52871911c5a222b2850b7f3a8c39d5aeb062b4fb9bd74fd0a1fbb184889b languageName: node linkType: hard @@ -1442,10 +1442,10 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/types@npm:4.28.5": - version: 4.28.5 - resolution: "@typescript-eslint/types@npm:4.28.5" - checksum: 243b8b70c9b57df03e1f18037a5ea98cbd0aef1212fe2964eab6eaee4533a584d1fefec99be05b951f9612d7a7712c57570a5be5b0991a92f6f42c3ccd1dc877 +"@typescript-eslint/types@npm:4.29.0": + version: 4.29.0 + resolution: "@typescript-eslint/types@npm:4.29.0" + checksum: 020d2a20475db082a3268a02af5c977cbfb3611869ebdccd6d23193ab47b723a415d62271205e3a0249af1683f4815e955cbeca917b16d0f67c66ffff47ce71e languageName: node linkType: hard @@ -1467,12 +1467,12 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/typescript-estree@npm:4.28.5": - version: 4.28.5 - resolution: "@typescript-eslint/typescript-estree@npm:4.28.5" +"@typescript-eslint/typescript-estree@npm:4.29.0": + version: 4.29.0 + resolution: "@typescript-eslint/typescript-estree@npm:4.29.0" dependencies: - "@typescript-eslint/types": 4.28.5 - "@typescript-eslint/visitor-keys": 4.28.5 + "@typescript-eslint/types": 4.29.0 + "@typescript-eslint/visitor-keys": 4.29.0 debug: ^4.3.1 globby: ^11.0.3 is-glob: ^4.0.1 @@ -1481,7 +1481,7 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 0483a9b8d163929fe46f780a5a8b82bf26483aae4d7f2887265d13719eb83afaf3dc68616dd6eb21eca2e451582d44a46bbc7ac0a4f7bae9193bbf5860619fc6 + checksum: 6d2568dae2cc60394be8dd08bdc99c050ebb7e51bac9d4d8273158a298b9da930207d60afdbf6788ef180eaea6a527d047a776019db0fc377e8ffc9f317f06c0 languageName: node linkType: hard @@ -1495,13 +1495,13 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/visitor-keys@npm:4.28.5": - version: 4.28.5 - resolution: "@typescript-eslint/visitor-keys@npm:4.28.5" +"@typescript-eslint/visitor-keys@npm:4.29.0": + version: 4.29.0 + resolution: "@typescript-eslint/visitor-keys@npm:4.29.0" dependencies: - "@typescript-eslint/types": 4.28.5 + "@typescript-eslint/types": 4.29.0 eslint-visitor-keys: ^2.0.0 - checksum: a32b7c549a70b33f2e973a14c8ecc007b029d2f6e6ff4fa47cbd0edad6edaac5c36df85a2a622d230f64b1f3ab2eef6da423d2b7c35f8020f06a7869d3f2662e + checksum: 4f17e69a3ae3a95bbe905f52eb75f3ca661937b4557e64cc272f8d73ffc6ad5efc57e28d5f6f7c74932f44c01eb317a2975da98409a221582edb203cdbf4270e languageName: node linkType: hard @@ -2910,8 +2910,8 @@ __metadata: "@league-of-foundry-developers/foundry-vtt-types": 0.8.8-8 "@types/fs-extra": 9.0.12 "@types/jest": 26.0.24 - "@typescript-eslint/eslint-plugin": 4.28.5 - "@typescript-eslint/parser": 4.28.5 + "@typescript-eslint/eslint-plugin": 4.29.0 + "@typescript-eslint/parser": 4.29.0 chalk: 4.1.2 eslint: 7.32.0 eslint-config-prettier: 8.3.0 From 4dd970cfb714155412df617de73289daf9092ea2 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 2 Aug 2021 22:15:35 +0000 Subject: [PATCH 44/61] Update dependency sass to v1.37.1 --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 6747e655..d6588a82 100644 --- a/package.json +++ b/package.json @@ -72,7 +72,7 @@ "prettier": "2.3.2", "rollup": "2.55.1", "rollup-plugin-typescript2": "0.30.0", - "sass": "1.37.0", + "sass": "1.37.1", "semver": "7.3.5", "ts-jest": "27.0.4", "tslib": "2.3.0", diff --git a/yarn.lock b/yarn.lock index 953a5d2f..9e1c0a3d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2927,7 +2927,7 @@ __metadata: prettier: 2.3.2 rollup: 2.55.1 rollup-plugin-typescript2: 0.30.0 - sass: 1.37.0 + sass: 1.37.1 semver: 7.3.5 ts-jest: 27.0.4 tslib: 2.3.0 @@ -7226,14 +7226,14 @@ fsevents@^1.2.7: languageName: node linkType: hard -"sass@npm:1.37.0": - version: 1.37.0 - resolution: "sass@npm:1.37.0" +"sass@npm:1.37.1": + version: 1.37.1 + resolution: "sass@npm:1.37.1" dependencies: chokidar: ">=3.0.0 <4.0.0" bin: sass: sass.js - checksum: 967cdd4293d88b4c7165ca52e4dd89f123f15c821a15023a93e297acd43c18ea34773c93317e10df34d3bd44428b3cbcaab064f60e2df1a0811c5951d26689a1 + checksum: 634681dc3a08884c71daeef202cee748b7af5c29d41a192b8fc0143cf2b480ca3819f2aca73dda9a005c8968403b62fb9414ab432d797294fd00a2450ab0c8b4 languageName: node linkType: hard From 25eeab84823d434468cc62dd45a0e123c10e4ad6 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 3 Aug 2021 01:15:47 +0000 Subject: [PATCH 45/61] Update dependency sass to v1.37.2 --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index d6588a82..87b0cc25 100644 --- a/package.json +++ b/package.json @@ -72,7 +72,7 @@ "prettier": "2.3.2", "rollup": "2.55.1", "rollup-plugin-typescript2": "0.30.0", - "sass": "1.37.1", + "sass": "1.37.2", "semver": "7.3.5", "ts-jest": "27.0.4", "tslib": "2.3.0", diff --git a/yarn.lock b/yarn.lock index 9e1c0a3d..3bc4f4e1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2927,7 +2927,7 @@ __metadata: prettier: 2.3.2 rollup: 2.55.1 rollup-plugin-typescript2: 0.30.0 - sass: 1.37.1 + sass: 1.37.2 semver: 7.3.5 ts-jest: 27.0.4 tslib: 2.3.0 @@ -7226,14 +7226,14 @@ fsevents@^1.2.7: languageName: node linkType: hard -"sass@npm:1.37.1": - version: 1.37.1 - resolution: "sass@npm:1.37.1" +"sass@npm:1.37.2": + version: 1.37.2 + resolution: "sass@npm:1.37.2" dependencies: chokidar: ">=3.0.0 <4.0.0" bin: sass: sass.js - checksum: 634681dc3a08884c71daeef202cee748b7af5c29d41a192b8fc0143cf2b480ca3819f2aca73dda9a005c8968403b62fb9414ab432d797294fd00a2450ab0c8b4 + checksum: dbeb640565442badb54e4a79a85f3db3a0493409ad5e44e6dd6133d37ccc2bd53af1c8022a1573aa81e94b00b639849fb8cc5da1c978e9c746799d04bde1b639 languageName: node linkType: hard From 6ba137a6bf7b56263abb3dd0fd648812b8eed0a3 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 3 Aug 2021 22:16:03 +0000 Subject: [PATCH 46/61] Update dependency sass to v1.37.3 --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 87b0cc25..86f1bd5f 100644 --- a/package.json +++ b/package.json @@ -72,7 +72,7 @@ "prettier": "2.3.2", "rollup": "2.55.1", "rollup-plugin-typescript2": "0.30.0", - "sass": "1.37.2", + "sass": "1.37.3", "semver": "7.3.5", "ts-jest": "27.0.4", "tslib": "2.3.0", diff --git a/yarn.lock b/yarn.lock index 3bc4f4e1..fdcdb09a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2927,7 +2927,7 @@ __metadata: prettier: 2.3.2 rollup: 2.55.1 rollup-plugin-typescript2: 0.30.0 - sass: 1.37.2 + sass: 1.37.3 semver: 7.3.5 ts-jest: 27.0.4 tslib: 2.3.0 @@ -7226,14 +7226,14 @@ fsevents@^1.2.7: languageName: node linkType: hard -"sass@npm:1.37.2": - version: 1.37.2 - resolution: "sass@npm:1.37.2" +"sass@npm:1.37.3": + version: 1.37.3 + resolution: "sass@npm:1.37.3" dependencies: chokidar: ">=3.0.0 <4.0.0" bin: sass: sass.js - checksum: dbeb640565442badb54e4a79a85f3db3a0493409ad5e44e6dd6133d37ccc2bd53af1c8022a1573aa81e94b00b639849fb8cc5da1c978e9c746799d04bde1b639 + checksum: d1a9f6a25e807ecab0611258e7d3d8b085e947988c735d72746efface7d5aa3ae69f5b301cb5453ba923e4e942bd4b968fbe2ecb96e8d91bc60e8bc5535c373c languageName: node linkType: hard From 213a472d2ccbb14e60bfe717c59c7ef28996b8a2 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 4 Aug 2021 00:15:37 +0000 Subject: [PATCH 47/61] Update dependency sass to v1.37.4 --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 86f1bd5f..563f62e9 100644 --- a/package.json +++ b/package.json @@ -72,7 +72,7 @@ "prettier": "2.3.2", "rollup": "2.55.1", "rollup-plugin-typescript2": "0.30.0", - "sass": "1.37.3", + "sass": "1.37.4", "semver": "7.3.5", "ts-jest": "27.0.4", "tslib": "2.3.0", diff --git a/yarn.lock b/yarn.lock index fdcdb09a..8d48f41c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2927,7 +2927,7 @@ __metadata: prettier: 2.3.2 rollup: 2.55.1 rollup-plugin-typescript2: 0.30.0 - sass: 1.37.3 + sass: 1.37.4 semver: 7.3.5 ts-jest: 27.0.4 tslib: 2.3.0 @@ -7226,14 +7226,14 @@ fsevents@^1.2.7: languageName: node linkType: hard -"sass@npm:1.37.3": - version: 1.37.3 - resolution: "sass@npm:1.37.3" +"sass@npm:1.37.4": + version: 1.37.4 + resolution: "sass@npm:1.37.4" dependencies: chokidar: ">=3.0.0 <4.0.0" bin: sass: sass.js - checksum: d1a9f6a25e807ecab0611258e7d3d8b085e947988c735d72746efface7d5aa3ae69f5b301cb5453ba923e4e942bd4b968fbe2ecb96e8d91bc60e8bc5535c373c + checksum: 4a6f1634514e1768212971369899f4915d8caf79c1561d2a40cc3c059029be2376f626f4cfa92934f457317fee384f19a68c7d1f58644b00ba686918a8997f6f languageName: node linkType: hard From 282ae5b99216eebbeba124fba96bcfb84a188287 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 4 Aug 2021 02:15:31 +0000 Subject: [PATCH 48/61] Update dependency sass to v1.37.5 --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 563f62e9..67f73829 100644 --- a/package.json +++ b/package.json @@ -72,7 +72,7 @@ "prettier": "2.3.2", "rollup": "2.55.1", "rollup-plugin-typescript2": "0.30.0", - "sass": "1.37.4", + "sass": "1.37.5", "semver": "7.3.5", "ts-jest": "27.0.4", "tslib": "2.3.0", diff --git a/yarn.lock b/yarn.lock index 8d48f41c..d177b3d3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2927,7 +2927,7 @@ __metadata: prettier: 2.3.2 rollup: 2.55.1 rollup-plugin-typescript2: 0.30.0 - sass: 1.37.4 + sass: 1.37.5 semver: 7.3.5 ts-jest: 27.0.4 tslib: 2.3.0 @@ -7226,14 +7226,14 @@ fsevents@^1.2.7: languageName: node linkType: hard -"sass@npm:1.37.4": - version: 1.37.4 - resolution: "sass@npm:1.37.4" +"sass@npm:1.37.5": + version: 1.37.5 + resolution: "sass@npm:1.37.5" dependencies: chokidar: ">=3.0.0 <4.0.0" bin: sass: sass.js - checksum: 4a6f1634514e1768212971369899f4915d8caf79c1561d2a40cc3c059029be2376f626f4cfa92934f457317fee384f19a68c7d1f58644b00ba686918a8997f6f + checksum: f7751f481cee57b075b49d5e992bcda66f353098a2fc6e6a906e7732fd5dc4544ce7cba0efdbd3d6c5734ebff792026a462f6fa36e99359b475e9094418a2373 languageName: node linkType: hard From 5d9600cd313f962cdefd1bd01218767bcc5dc035 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 4 Aug 2021 22:17:18 +0000 Subject: [PATCH 49/61] Update dependency yargs to v17.1.0 --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 67f73829..e1fd5496 100644 --- a/package.json +++ b/package.json @@ -77,7 +77,7 @@ "ts-jest": "27.0.4", "tslib": "2.3.0", "typescript": "4.3.5", - "yargs": "17.0.1" + "yargs": "17.1.0" }, "lint-staged": { "*.ts": "eslint --cache --fix", diff --git a/yarn.lock b/yarn.lock index d177b3d3..cc7d2a47 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2932,7 +2932,7 @@ __metadata: ts-jest: 27.0.4 tslib: 2.3.0 typescript: 4.3.5 - yargs: 17.0.1 + yargs: 17.1.0 languageName: unknown linkType: soft @@ -8705,9 +8705,9 @@ fsevents@^1.2.7: languageName: node linkType: hard -"yargs@npm:17.0.1": - version: 17.0.1 - resolution: "yargs@npm:17.0.1" +"yargs@npm:17.1.0": + version: 17.1.0 + resolution: "yargs@npm:17.1.0" dependencies: cliui: ^7.0.2 escalade: ^3.1.1 @@ -8716,7 +8716,7 @@ fsevents@^1.2.7: string-width: ^4.2.0 y18n: ^5.0.5 yargs-parser: ^20.2.2 - checksum: a7969b48d2dea129a7d4fcc3f13e88d4f94bacbd24f720b2ce19946fa9facc42cfed89c059d953091241f4e9e9000ed9dbf86e4bb4b6ceb3a26af10ddebdd0b2 + checksum: 3f39f16213bec069b18e744dee8d6de2a2e4396e7fa81578c83625b881ba04ace37a32a3e4090ed10392e3db83819502e818eb3bbd0f3bf4a9460fd0b5c19247 languageName: node linkType: hard From 262632d6f53c4b0c054125ad82a76ebc71a75bde Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Thu, 5 Aug 2021 06:16:13 +0000 Subject: [PATCH 50/61] Update dependency rollup to v2.56.0 --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index e1fd5496..e852b0be 100644 --- a/package.json +++ b/package.json @@ -70,7 +70,7 @@ "jest-junit": "12.2.0", "lint-staged": "11.1.1", "prettier": "2.3.2", - "rollup": "2.55.1", + "rollup": "2.56.0", "rollup-plugin-typescript2": "0.30.0", "sass": "1.37.5", "semver": "7.3.5", diff --git a/yarn.lock b/yarn.lock index cc7d2a47..ad81c143 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2925,7 +2925,7 @@ __metadata: jest-junit: 12.2.0 lint-staged: 11.1.1 prettier: 2.3.2 - rollup: 2.55.1 + rollup: 2.56.0 rollup-plugin-typescript2: 0.30.0 sass: 1.37.5 semver: 7.3.5 @@ -7171,9 +7171,9 @@ fsevents@^1.2.7: languageName: node linkType: hard -"rollup@npm:2.55.1": - version: 2.55.1 - resolution: "rollup@npm:2.55.1" +"rollup@npm:2.56.0": + version: 2.56.0 + resolution: "rollup@npm:2.56.0" dependencies: fsevents: ~2.3.2 dependenciesMeta: @@ -7181,7 +7181,7 @@ fsevents@^1.2.7: optional: true bin: rollup: dist/bin/rollup - checksum: 798aa251572263d52b3ed4c77e2744817baf296688393d2e80d8f51ff885494232f3b32dcc23f42bc68704f66732f9015abc10aad3d16acf567013ae2512ccb1 + checksum: ce2c3eab461db5977391d51fbded687f15a28e120c3aaf3050855f3909c0daddbc65e421495a053cc0632e67ed7d23160e716cc4b95da707eb31ec00d0551016 languageName: node linkType: hard From 687c724b801ecd5efd657bc4161abc79fc6f841d Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 6 Aug 2021 05:16:32 +0000 Subject: [PATCH 51/61] Update dependency lint-staged to v11.1.2 --- package.json | 2 +- yarn.lock | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index e852b0be..d7b43dd6 100644 --- a/package.json +++ b/package.json @@ -68,7 +68,7 @@ "husky": "7.0.1", "jest": "27.0.6", "jest-junit": "12.2.0", - "lint-staged": "11.1.1", + "lint-staged": "11.1.2", "prettier": "2.3.2", "rollup": "2.56.0", "rollup-plugin-typescript2": "0.30.0", diff --git a/yarn.lock b/yarn.lock index ad81c143..148acf21 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2923,7 +2923,7 @@ __metadata: husky: 7.0.1 jest: 27.0.6 jest-junit: 12.2.0 - lint-staged: 11.1.1 + lint-staged: 11.1.2 prettier: 2.3.2 rollup: 2.56.0 rollup-plugin-typescript2: 0.30.0 @@ -5621,16 +5621,15 @@ fsevents@^1.2.7: languageName: node linkType: hard -"lint-staged@npm:11.1.1": - version: 11.1.1 - resolution: "lint-staged@npm:11.1.1" +"lint-staged@npm:11.1.2": + version: 11.1.2 + resolution: "lint-staged@npm:11.1.2" dependencies: chalk: ^4.1.1 cli-truncate: ^2.1.0 commander: ^7.2.0 cosmiconfig: ^7.0.0 debug: ^4.3.1 - dedent: ^0.7.0 enquirer: ^2.3.6 execa: ^5.0.0 listr2: ^3.8.2 @@ -5642,7 +5641,7 @@ fsevents@^1.2.7: stringify-object: ^3.3.0 bin: lint-staged: bin/lint-staged.js - checksum: 1a3100748c60f0ca28635923229ad4e2415681a192fcf40b453b05f6aa053ac87f70328d07374655b55009e4f3b3a6774b132f72ec54a7b1c540d0664ec52c5e + checksum: 0c44f4fbd9360cb68a7c80475a2c37c01adc60c3598cc0beafc27d48f49be7d696e01f2a4b96eef0d6aba3fbe547861a434910ba80ec96fda30b6b21375ae937 languageName: node linkType: hard From b181670281e3a5804ccc5f679da8e0aee65f0e0d Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sun, 8 Aug 2021 12:15:58 +0000 Subject: [PATCH 52/61] Update dependency rollup to v2.56.1 --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index d7b43dd6..c0254fde 100644 --- a/package.json +++ b/package.json @@ -70,7 +70,7 @@ "jest-junit": "12.2.0", "lint-staged": "11.1.2", "prettier": "2.3.2", - "rollup": "2.56.0", + "rollup": "2.56.1", "rollup-plugin-typescript2": "0.30.0", "sass": "1.37.5", "semver": "7.3.5", diff --git a/yarn.lock b/yarn.lock index 148acf21..512cdc36 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2925,7 +2925,7 @@ __metadata: jest-junit: 12.2.0 lint-staged: 11.1.2 prettier: 2.3.2 - rollup: 2.56.0 + rollup: 2.56.1 rollup-plugin-typescript2: 0.30.0 sass: 1.37.5 semver: 7.3.5 @@ -7170,9 +7170,9 @@ fsevents@^1.2.7: languageName: node linkType: hard -"rollup@npm:2.56.0": - version: 2.56.0 - resolution: "rollup@npm:2.56.0" +"rollup@npm:2.56.1": + version: 2.56.1 + resolution: "rollup@npm:2.56.1" dependencies: fsevents: ~2.3.2 dependenciesMeta: @@ -7180,7 +7180,7 @@ fsevents@^1.2.7: optional: true bin: rollup: dist/bin/rollup - checksum: ce2c3eab461db5977391d51fbded687f15a28e120c3aaf3050855f3909c0daddbc65e421495a053cc0632e67ed7d23160e716cc4b95da707eb31ec00d0551016 + checksum: 7ba1b872bd0978e395b294a63e5e9f1ad0031ae7718e91b207f0d21c0eef01c612f4c11458e65bffb636faf0a1a530f0c0c3ff882542f398acd6564e2f99e1eb languageName: node linkType: hard From 7dd3db1e3427d064a097409b4ef2aab1a07dfa97 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 9 Aug 2021 17:16:00 +0000 Subject: [PATCH 53/61] Update typescript-eslint monorepo to v4.29.1 --- package.json | 4 +-- yarn.lock | 86 ++++++++++++++++++++++++++-------------------------- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/package.json b/package.json index c0254fde..82cd8afb 100644 --- a/package.json +++ b/package.json @@ -55,8 +55,8 @@ "@league-of-foundry-developers/foundry-vtt-types": "0.8.8-8", "@types/fs-extra": "9.0.12", "@types/jest": "26.0.24", - "@typescript-eslint/eslint-plugin": "4.29.0", - "@typescript-eslint/parser": "4.29.0", + "@typescript-eslint/eslint-plugin": "4.29.1", + "@typescript-eslint/parser": "4.29.1", "chalk": "4.1.2", "eslint": "7.32.0", "eslint-config-prettier": "8.3.0", diff --git a/yarn.lock b/yarn.lock index 512cdc36..3c1ae410 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1345,12 +1345,12 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/eslint-plugin@npm:4.29.0": - version: 4.29.0 - resolution: "@typescript-eslint/eslint-plugin@npm:4.29.0" +"@typescript-eslint/eslint-plugin@npm:4.29.1": + version: 4.29.1 + resolution: "@typescript-eslint/eslint-plugin@npm:4.29.1" dependencies: - "@typescript-eslint/experimental-utils": 4.29.0 - "@typescript-eslint/scope-manager": 4.29.0 + "@typescript-eslint/experimental-utils": 4.29.1 + "@typescript-eslint/scope-manager": 4.29.1 debug: ^4.3.1 functional-red-black-tree: ^1.0.1 regexpp: ^3.1.0 @@ -1362,23 +1362,23 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: c8153c8838ea9e37eb7c7c93c74639184487d6ee7593e837ccb27dae2fedd3595344a66bf8bdeaa9c297f0cf94751b3ff2f8a7866ab4ef9c62d2beea0f5451c3 + checksum: 2397e2276cd7f85eea7648787350b8ea8caf8cd4390feae2c6b61d207a76e96112e6fe5aa47ea94e10e782aa57980e8a983b591417e6343c01db4672f0d30f40 languageName: node linkType: hard -"@typescript-eslint/experimental-utils@npm:4.29.0": - version: 4.29.0 - resolution: "@typescript-eslint/experimental-utils@npm:4.29.0" +"@typescript-eslint/experimental-utils@npm:4.29.1": + version: 4.29.1 + resolution: "@typescript-eslint/experimental-utils@npm:4.29.1" dependencies: "@types/json-schema": ^7.0.7 - "@typescript-eslint/scope-manager": 4.29.0 - "@typescript-eslint/types": 4.29.0 - "@typescript-eslint/typescript-estree": 4.29.0 + "@typescript-eslint/scope-manager": 4.29.1 + "@typescript-eslint/types": 4.29.1 + "@typescript-eslint/typescript-estree": 4.29.1 eslint-scope: ^5.1.1 eslint-utils: ^3.0.0 peerDependencies: eslint: "*" - checksum: 7be31d6326f72e6515089e96ae27c9b315b5b902a82a3882c605a6394c9c11a61de970818fd46406a26abe1c1751d0bcdc95f88362befc46f26a9429d415c9f7 + checksum: de6766b1b9a6db18525abf7e46cbcab27f2ecaf4ca6f236d3281a1e91ea2bd38693a635d793fa39189e30381f2bfc80fdd1641bbd783e08d00593e3e2024ef4a languageName: node linkType: hard @@ -1398,20 +1398,20 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/parser@npm:4.29.0": - version: 4.29.0 - resolution: "@typescript-eslint/parser@npm:4.29.0" +"@typescript-eslint/parser@npm:4.29.1": + version: 4.29.1 + resolution: "@typescript-eslint/parser@npm:4.29.1" dependencies: - "@typescript-eslint/scope-manager": 4.29.0 - "@typescript-eslint/types": 4.29.0 - "@typescript-eslint/typescript-estree": 4.29.0 + "@typescript-eslint/scope-manager": 4.29.1 + "@typescript-eslint/types": 4.29.1 + "@typescript-eslint/typescript-estree": 4.29.1 debug: ^4.3.1 peerDependencies: eslint: ^5.0.0 || ^6.0.0 || ^7.0.0 peerDependenciesMeta: typescript: optional: true - checksum: 4e3286bd9737d349e9443995a6a829919ab3be4c5065587f66e761cd877738724675973893a1b412394c49e20b3e29a608d9fd27b361dda6d9cb1a00b67af0cd + checksum: 669983b43a854116a20985bf790b52a47357e9542a32a0e26715169ecafee84b93b6a312799e35a8dd7b2ca94b2726408af3bba051b2e003d9c79704f76c5644 languageName: node linkType: hard @@ -1425,13 +1425,13 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/scope-manager@npm:4.29.0": - version: 4.29.0 - resolution: "@typescript-eslint/scope-manager@npm:4.29.0" +"@typescript-eslint/scope-manager@npm:4.29.1": + version: 4.29.1 + resolution: "@typescript-eslint/scope-manager@npm:4.29.1" dependencies: - "@typescript-eslint/types": 4.29.0 - "@typescript-eslint/visitor-keys": 4.29.0 - checksum: 10a9ac37775da0141e403b8a71a61f7783a0b12fbd2e72f94a5249981b8d90c5ea3b52871911c5a222b2850b7f3a8c39d5aeb062b4fb9bd74fd0a1fbb184889b + "@typescript-eslint/types": 4.29.1 + "@typescript-eslint/visitor-keys": 4.29.1 + checksum: 06c0c3138ba20bde8a142a5a1e71bcd5ba8be77c74f7a062dbcead68f4abc501bc7563cb6e3d8b8980e4d6cddf529688ceabb413dc18047720e8a9a98b08f7fb languageName: node linkType: hard @@ -1442,10 +1442,10 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/types@npm:4.29.0": - version: 4.29.0 - resolution: "@typescript-eslint/types@npm:4.29.0" - checksum: 020d2a20475db082a3268a02af5c977cbfb3611869ebdccd6d23193ab47b723a415d62271205e3a0249af1683f4815e955cbeca917b16d0f67c66ffff47ce71e +"@typescript-eslint/types@npm:4.29.1": + version: 4.29.1 + resolution: "@typescript-eslint/types@npm:4.29.1" + checksum: 9a3c89c751c5cdb72cb569f778717f0869c4b5230640f68f27735d0bffbe1bfb2920dc1ea2b0070472812d6455b12d44b6349430d7c52f7bc85622e7d6844466 languageName: node linkType: hard @@ -1467,12 +1467,12 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/typescript-estree@npm:4.29.0": - version: 4.29.0 - resolution: "@typescript-eslint/typescript-estree@npm:4.29.0" +"@typescript-eslint/typescript-estree@npm:4.29.1": + version: 4.29.1 + resolution: "@typescript-eslint/typescript-estree@npm:4.29.1" dependencies: - "@typescript-eslint/types": 4.29.0 - "@typescript-eslint/visitor-keys": 4.29.0 + "@typescript-eslint/types": 4.29.1 + "@typescript-eslint/visitor-keys": 4.29.1 debug: ^4.3.1 globby: ^11.0.3 is-glob: ^4.0.1 @@ -1481,7 +1481,7 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 6d2568dae2cc60394be8dd08bdc99c050ebb7e51bac9d4d8273158a298b9da930207d60afdbf6788ef180eaea6a527d047a776019db0fc377e8ffc9f317f06c0 + checksum: cb42fea8386aa603d534c3283d4055b392cd5ed6b2502eebfefeb3ee7e7252353b5d8ce997dabb5e94ccde90626f849522c1ecd5cbe08e077c3495cbda3818da languageName: node linkType: hard @@ -1495,13 +1495,13 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/visitor-keys@npm:4.29.0": - version: 4.29.0 - resolution: "@typescript-eslint/visitor-keys@npm:4.29.0" +"@typescript-eslint/visitor-keys@npm:4.29.1": + version: 4.29.1 + resolution: "@typescript-eslint/visitor-keys@npm:4.29.1" dependencies: - "@typescript-eslint/types": 4.29.0 + "@typescript-eslint/types": 4.29.1 eslint-visitor-keys: ^2.0.0 - checksum: 4f17e69a3ae3a95bbe905f52eb75f3ca661937b4557e64cc272f8d73ffc6ad5efc57e28d5f6f7c74932f44c01eb317a2975da98409a221582edb203cdbf4270e + checksum: ff30d97feaa968abcb9f87aeeab59f098744f554749e85649dfcf0d565a6bbb30f92d83dc08c1b05d080bdc900ea5325dd8a52bc0840df2207c2f336cd70afdb languageName: node linkType: hard @@ -2910,8 +2910,8 @@ __metadata: "@league-of-foundry-developers/foundry-vtt-types": 0.8.8-8 "@types/fs-extra": 9.0.12 "@types/jest": 26.0.24 - "@typescript-eslint/eslint-plugin": 4.29.0 - "@typescript-eslint/parser": 4.29.0 + "@typescript-eslint/eslint-plugin": 4.29.1 + "@typescript-eslint/parser": 4.29.1 chalk: 4.1.2 eslint: 7.32.0 eslint-config-prettier: 8.3.0 From 64e4ed9bf55b2f54e86649efbca6cb03cb01e7e9 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 10 Aug 2021 06:16:22 +0000 Subject: [PATCH 54/61] Update dependency rollup to v2.56.2 --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 82cd8afb..36b1c5e3 100644 --- a/package.json +++ b/package.json @@ -70,7 +70,7 @@ "jest-junit": "12.2.0", "lint-staged": "11.1.2", "prettier": "2.3.2", - "rollup": "2.56.1", + "rollup": "2.56.2", "rollup-plugin-typescript2": "0.30.0", "sass": "1.37.5", "semver": "7.3.5", diff --git a/yarn.lock b/yarn.lock index 3c1ae410..15f6c68c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2925,7 +2925,7 @@ __metadata: jest-junit: 12.2.0 lint-staged: 11.1.2 prettier: 2.3.2 - rollup: 2.56.1 + rollup: 2.56.2 rollup-plugin-typescript2: 0.30.0 sass: 1.37.5 semver: 7.3.5 @@ -7170,9 +7170,9 @@ fsevents@^1.2.7: languageName: node linkType: hard -"rollup@npm:2.56.1": - version: 2.56.1 - resolution: "rollup@npm:2.56.1" +"rollup@npm:2.56.2": + version: 2.56.2 + resolution: "rollup@npm:2.56.2" dependencies: fsevents: ~2.3.2 dependenciesMeta: @@ -7180,7 +7180,7 @@ fsevents@^1.2.7: optional: true bin: rollup: dist/bin/rollup - checksum: 7ba1b872bd0978e395b294a63e5e9f1ad0031ae7718e91b207f0d21c0eef01c612f4c11458e65bffb636faf0a1a530f0c0c3ff882542f398acd6564e2f99e1eb + checksum: babe2dce8eec8c130915baa54b0d62260fa4691ca9f2a989a2685b4e72761e701d53c374efa51a59a4c3f59a3c667ca5c8ac0e0de9a294ad50d1c1271d2d5199 languageName: node linkType: hard From dbc1ad571c62227519b847146344b70d3c187a36 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 10 Aug 2021 19:15:18 +0000 Subject: [PATCH 55/61] Update dependency @types/jest to v27 --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 36b1c5e3..23bbd6ae 100644 --- a/package.json +++ b/package.json @@ -54,7 +54,7 @@ "devDependencies": { "@league-of-foundry-developers/foundry-vtt-types": "0.8.8-8", "@types/fs-extra": "9.0.12", - "@types/jest": "26.0.24", + "@types/jest": "27.0.0", "@typescript-eslint/eslint-plugin": "4.29.1", "@typescript-eslint/parser": "4.29.1", "chalk": "4.1.2", diff --git a/yarn.lock b/yarn.lock index 15f6c68c..c4c07c49 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1250,13 +1250,13 @@ __metadata: languageName: node linkType: hard -"@types/jest@npm:26.0.24": - version: 26.0.24 - resolution: "@types/jest@npm:26.0.24" +"@types/jest@npm:27.0.0": + version: 27.0.0 + resolution: "@types/jest@npm:27.0.0" dependencies: jest-diff: ^26.0.0 pretty-format: ^26.0.0 - checksum: e5d3651c1edf197011d19ee8f4bacd52667fa673d1b2ffbfbce624208d643fd4372ebb31fa8a1d89843a7705f142e38076e25e1e7b67f3aacafd6ae8bc77cbcf + checksum: 4cfc87d4538f75ed804ab11bffa2a78b80c9aed2896904d45172a9447ded52a697f2ef0c4c4d9762057f0d3592a3773fa9fdb98cde0fc12f3ec4a2e4b0d512db languageName: node linkType: hard @@ -2909,7 +2909,7 @@ __metadata: dependencies: "@league-of-foundry-developers/foundry-vtt-types": 0.8.8-8 "@types/fs-extra": 9.0.12 - "@types/jest": 26.0.24 + "@types/jest": 27.0.0 "@typescript-eslint/eslint-plugin": 4.29.1 "@typescript-eslint/parser": 4.29.1 chalk: 4.1.2 From dca746a531b323f984b953d487a4de0b45238fa8 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 11 Aug 2021 23:16:02 +0000 Subject: [PATCH 56/61] Update dependency tslib to v2.3.1 --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 23bbd6ae..e0c525b1 100644 --- a/package.json +++ b/package.json @@ -75,7 +75,7 @@ "sass": "1.37.5", "semver": "7.3.5", "ts-jest": "27.0.4", - "tslib": "2.3.0", + "tslib": "2.3.1", "typescript": "4.3.5", "yargs": "17.1.0" }, diff --git a/yarn.lock b/yarn.lock index c4c07c49..b6661453 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2930,7 +2930,7 @@ __metadata: sass: 1.37.5 semver: 7.3.5 ts-jest: 27.0.4 - tslib: 2.3.0 + tslib: 2.3.1 typescript: 4.3.5 yargs: 17.1.0 languageName: unknown @@ -8048,10 +8048,10 @@ fsevents@^1.2.7: languageName: node linkType: hard -"tslib@npm:2.3.0": - version: 2.3.0 - resolution: "tslib@npm:2.3.0" - checksum: 7b4fc9feff0f704743c3760f5d8d708f6417fac6458159e63df3a6b1100f0736e3b99edb9fe370f274ad15160a1f49ff05cb49402534c818ff552c48e38c3e6e +"tslib@npm:2.3.1": + version: 2.3.1 + resolution: "tslib@npm:2.3.1" + checksum: 5ae2f209c5127bad284974c78916f02c72082615f65889a7ed0c7ca6d5f935c30338a0ee7310e1d9652dabc7b7507fd2905035487446d09d45fc1f19de71cf05 languageName: node linkType: hard From 224feb5d67e392524ebe4bb618aa803c8690ff53 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Thu, 12 Aug 2021 21:15:29 +0000 Subject: [PATCH 57/61] Update dependency @types/jest to v27.0.1 --- package.json | 2 +- yarn.lock | 78 ++++++---------------------------------------------- 2 files changed, 10 insertions(+), 70 deletions(-) diff --git a/package.json b/package.json index e0c525b1..0eb68fa6 100644 --- a/package.json +++ b/package.json @@ -54,7 +54,7 @@ "devDependencies": { "@league-of-foundry-developers/foundry-vtt-types": "0.8.8-8", "@types/fs-extra": "9.0.12", - "@types/jest": "27.0.0", + "@types/jest": "27.0.1", "@typescript-eslint/eslint-plugin": "4.29.1", "@typescript-eslint/parser": "4.29.1", "chalk": "4.1.2", diff --git a/yarn.lock b/yarn.lock index b6661453..ab1299f6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -663,19 +663,6 @@ __metadata: languageName: node linkType: hard -"@jest/types@npm:^26.6.2": - version: 26.6.2 - resolution: "@jest/types@npm:26.6.2" - dependencies: - "@types/istanbul-lib-coverage": ^2.0.0 - "@types/istanbul-reports": ^3.0.0 - "@types/node": "*" - "@types/yargs": ^15.0.0 - chalk: ^4.0.0 - checksum: 5c511d7807f414b298299ae4a053abf265f39984942e0eefdfb17a7986a36f1047e0fd9a6f785bdddbf7343a5737595dfabe148719a80e118dd77486502009cc - languageName: node - linkType: hard - "@jest/types@npm:^27.0.6": version: 27.0.6 resolution: "@jest/types@npm:27.0.6" @@ -1250,13 +1237,13 @@ __metadata: languageName: node linkType: hard -"@types/jest@npm:27.0.0": - version: 27.0.0 - resolution: "@types/jest@npm:27.0.0" +"@types/jest@npm:27.0.1": + version: 27.0.1 + resolution: "@types/jest@npm:27.0.1" dependencies: - jest-diff: ^26.0.0 - pretty-format: ^26.0.0 - checksum: 4cfc87d4538f75ed804ab11bffa2a78b80c9aed2896904d45172a9447ded52a697f2ef0c4c4d9762057f0d3592a3773fa9fdb98cde0fc12f3ec4a2e4b0d512db + jest-diff: ^27.0.0 + pretty-format: ^27.0.0 + checksum: 5f2382b5800e736a1fb805b5ce35dc9276b978ab24225f3d3da0c5f74789a528cd8e2b085e3a157a12b1395038f137f7e1babd18c4b55c54c25f5db1d4ea3153 languageName: node linkType: hard @@ -1327,15 +1314,6 @@ __metadata: languageName: node linkType: hard -"@types/yargs@npm:^15.0.0": - version: 15.0.13 - resolution: "@types/yargs@npm:15.0.13" - dependencies: - "@types/yargs-parser": "*" - checksum: fa1a5b0a07dbbff1657a27d1191d586632412d170321000f6f417f279547a8c191d7058dbf4d4187c188a5a1aeb2473ddb25fe316b206fccdfe1de6fad976619 - languageName: node - linkType: hard - "@types/yargs@npm:^16.0.0": version: 16.0.3 resolution: "@types/yargs@npm:16.0.3" @@ -2862,13 +2840,6 @@ __metadata: languageName: node linkType: hard -"diff-sequences@npm:^26.6.2": - version: 26.6.2 - resolution: "diff-sequences@npm:26.6.2" - checksum: dd1eb6e52f0a200228b836876a69c90690003b8991cf7d9264d6e6063acde8fe852084b6a196f2a13f169d309e30c24c457e9c8db617aed186c665efb50af1d8 - languageName: node - linkType: hard - "diff-sequences@npm:^27.0.6": version: 27.0.6 resolution: "diff-sequences@npm:27.0.6" @@ -2909,7 +2880,7 @@ __metadata: dependencies: "@league-of-foundry-developers/foundry-vtt-types": 0.8.8-8 "@types/fs-extra": 9.0.12 - "@types/jest": 27.0.0 + "@types/jest": 27.0.1 "@typescript-eslint/eslint-plugin": 4.29.1 "@typescript-eslint/parser": 4.29.1 chalk: 4.1.2 @@ -4931,19 +4902,7 @@ fsevents@^1.2.7: languageName: node linkType: hard -"jest-diff@npm:^26.0.0": - version: 26.6.2 - resolution: "jest-diff@npm:26.6.2" - dependencies: - chalk: ^4.0.0 - diff-sequences: ^26.6.2 - jest-get-type: ^26.3.0 - pretty-format: ^26.6.2 - checksum: 05d0f1bdba147a026eab4121a73a69ee3df21aec59ecd34659d665ee0663e518636650b435d248974ab5aceb345de9bfcc035efd01df723fe788756a07c8d046 - languageName: node - linkType: hard - -"jest-diff@npm:^27.0.6": +"jest-diff@npm:^27.0.0, jest-diff@npm:^27.0.6": version: 27.0.6 resolution: "jest-diff@npm:27.0.6" dependencies: @@ -5006,13 +4965,6 @@ fsevents@^1.2.7: languageName: node linkType: hard -"jest-get-type@npm:^26.3.0": - version: 26.3.0 - resolution: "jest-get-type@npm:26.3.0" - checksum: fc3e2d2b90cca74597c4ad6234c2fcc2ccb62894d0f7afe22fc55b5d93a2f02d3080ccef50f09c979d4b5a060bc76c4343911556d75ed9e892e0ebda6d54c44b - languageName: node - linkType: hard - "jest-get-type@npm:^27.0.6": version: 27.0.6 resolution: "jest-get-type@npm:27.0.6" @@ -6728,19 +6680,7 @@ fsevents@^1.2.7: languageName: node linkType: hard -"pretty-format@npm:^26.0.0, pretty-format@npm:^26.6.2": - version: 26.6.2 - resolution: "pretty-format@npm:26.6.2" - dependencies: - "@jest/types": ^26.6.2 - ansi-regex: ^5.0.0 - ansi-styles: ^4.0.0 - react-is: ^17.0.1 - checksum: 5ad34fc128218485732cf0271d396158a00584708fc97bf063c1c3c000fe14da572e9a1d3d7b92d95c5e24965434656c56ed0e45804dea2435ca59a1f86f1b07 - languageName: node - linkType: hard - -"pretty-format@npm:^27.0.6": +"pretty-format@npm:^27.0.0, pretty-format@npm:^27.0.6": version: 27.0.6 resolution: "pretty-format@npm:27.0.6" dependencies: From fe5c99a9f003a20472d291e1ffabc77660e81713 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 13 Aug 2021 21:16:28 +0000 Subject: [PATCH 58/61] Update dependency yargs to v17.1.1 --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 0eb68fa6..ad186351 100644 --- a/package.json +++ b/package.json @@ -77,7 +77,7 @@ "ts-jest": "27.0.4", "tslib": "2.3.1", "typescript": "4.3.5", - "yargs": "17.1.0" + "yargs": "17.1.1" }, "lint-staged": { "*.ts": "eslint --cache --fix", diff --git a/yarn.lock b/yarn.lock index ab1299f6..f84061f3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2903,7 +2903,7 @@ __metadata: ts-jest: 27.0.4 tslib: 2.3.1 typescript: 4.3.5 - yargs: 17.1.0 + yargs: 17.1.1 languageName: unknown linkType: soft @@ -8644,9 +8644,9 @@ fsevents@^1.2.7: languageName: node linkType: hard -"yargs@npm:17.1.0": - version: 17.1.0 - resolution: "yargs@npm:17.1.0" +"yargs@npm:17.1.1": + version: 17.1.1 + resolution: "yargs@npm:17.1.1" dependencies: cliui: ^7.0.2 escalade: ^3.1.1 @@ -8655,7 +8655,7 @@ fsevents@^1.2.7: string-width: ^4.2.0 y18n: ^5.0.5 yargs-parser: ^20.2.2 - checksum: 3f39f16213bec069b18e744dee8d6de2a2e4396e7fa81578c83625b881ba04ace37a32a3e4090ed10392e3db83819502e818eb3bbd0f3bf4a9460fd0b5c19247 + checksum: c2a16b61eb0db8882becd0aa382a5c59b87afcd17b35dd7077b3c9d83f77a3ad3de1526e4f1cf940f9481d7ce537e883af7c16879c33258724a09bc43a04e8ea languageName: node linkType: hard From 47d2709a6f63a70fc7e73e5e724c61f0322d6ef6 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 16 Aug 2021 17:16:44 +0000 Subject: [PATCH 59/61] Update typescript-eslint monorepo to v4.29.2 --- package.json | 4 +-- yarn.lock | 86 ++++++++++++++++++++++++++-------------------------- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/package.json b/package.json index ad186351..369ed4b7 100644 --- a/package.json +++ b/package.json @@ -55,8 +55,8 @@ "@league-of-foundry-developers/foundry-vtt-types": "0.8.8-8", "@types/fs-extra": "9.0.12", "@types/jest": "27.0.1", - "@typescript-eslint/eslint-plugin": "4.29.1", - "@typescript-eslint/parser": "4.29.1", + "@typescript-eslint/eslint-plugin": "4.29.2", + "@typescript-eslint/parser": "4.29.2", "chalk": "4.1.2", "eslint": "7.32.0", "eslint-config-prettier": "8.3.0", diff --git a/yarn.lock b/yarn.lock index f84061f3..aea47539 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1323,12 +1323,12 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/eslint-plugin@npm:4.29.1": - version: 4.29.1 - resolution: "@typescript-eslint/eslint-plugin@npm:4.29.1" +"@typescript-eslint/eslint-plugin@npm:4.29.2": + version: 4.29.2 + resolution: "@typescript-eslint/eslint-plugin@npm:4.29.2" dependencies: - "@typescript-eslint/experimental-utils": 4.29.1 - "@typescript-eslint/scope-manager": 4.29.1 + "@typescript-eslint/experimental-utils": 4.29.2 + "@typescript-eslint/scope-manager": 4.29.2 debug: ^4.3.1 functional-red-black-tree: ^1.0.1 regexpp: ^3.1.0 @@ -1340,23 +1340,23 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 2397e2276cd7f85eea7648787350b8ea8caf8cd4390feae2c6b61d207a76e96112e6fe5aa47ea94e10e782aa57980e8a983b591417e6343c01db4672f0d30f40 + checksum: 5ea5fc49a7569cb4a636ae71c5521908e74d3e504a6898977a67bba0a50756ebff63446f81424a8c427629095b6fa1bd014fdf8bd541a459bf5e6461890bfb2c languageName: node linkType: hard -"@typescript-eslint/experimental-utils@npm:4.29.1": - version: 4.29.1 - resolution: "@typescript-eslint/experimental-utils@npm:4.29.1" +"@typescript-eslint/experimental-utils@npm:4.29.2": + version: 4.29.2 + resolution: "@typescript-eslint/experimental-utils@npm:4.29.2" dependencies: "@types/json-schema": ^7.0.7 - "@typescript-eslint/scope-manager": 4.29.1 - "@typescript-eslint/types": 4.29.1 - "@typescript-eslint/typescript-estree": 4.29.1 + "@typescript-eslint/scope-manager": 4.29.2 + "@typescript-eslint/types": 4.29.2 + "@typescript-eslint/typescript-estree": 4.29.2 eslint-scope: ^5.1.1 eslint-utils: ^3.0.0 peerDependencies: eslint: "*" - checksum: de6766b1b9a6db18525abf7e46cbcab27f2ecaf4ca6f236d3281a1e91ea2bd38693a635d793fa39189e30381f2bfc80fdd1641bbd783e08d00593e3e2024ef4a + checksum: c92c7ae0c8395f06f77367b73c2a65de4f703d1fea54372ba7792eba0356e2e1f4d2102ca1a03f27ecad6e43e414d3b67cc227931a28c341d92a039a6e0ffd7d languageName: node linkType: hard @@ -1376,20 +1376,20 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/parser@npm:4.29.1": - version: 4.29.1 - resolution: "@typescript-eslint/parser@npm:4.29.1" +"@typescript-eslint/parser@npm:4.29.2": + version: 4.29.2 + resolution: "@typescript-eslint/parser@npm:4.29.2" dependencies: - "@typescript-eslint/scope-manager": 4.29.1 - "@typescript-eslint/types": 4.29.1 - "@typescript-eslint/typescript-estree": 4.29.1 + "@typescript-eslint/scope-manager": 4.29.2 + "@typescript-eslint/types": 4.29.2 + "@typescript-eslint/typescript-estree": 4.29.2 debug: ^4.3.1 peerDependencies: eslint: ^5.0.0 || ^6.0.0 || ^7.0.0 peerDependenciesMeta: typescript: optional: true - checksum: 669983b43a854116a20985bf790b52a47357e9542a32a0e26715169ecafee84b93b6a312799e35a8dd7b2ca94b2726408af3bba051b2e003d9c79704f76c5644 + checksum: a836810bf6611cc1d66aa8d99fefd865e56f75d1bd49387f36d90c339f43c236894d7f7b7cdb343d389f95d592a1db3f4f0b096f8be9641d4164f1ccb0046212 languageName: node linkType: hard @@ -1403,13 +1403,13 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/scope-manager@npm:4.29.1": - version: 4.29.1 - resolution: "@typescript-eslint/scope-manager@npm:4.29.1" +"@typescript-eslint/scope-manager@npm:4.29.2": + version: 4.29.2 + resolution: "@typescript-eslint/scope-manager@npm:4.29.2" dependencies: - "@typescript-eslint/types": 4.29.1 - "@typescript-eslint/visitor-keys": 4.29.1 - checksum: 06c0c3138ba20bde8a142a5a1e71bcd5ba8be77c74f7a062dbcead68f4abc501bc7563cb6e3d8b8980e4d6cddf529688ceabb413dc18047720e8a9a98b08f7fb + "@typescript-eslint/types": 4.29.2 + "@typescript-eslint/visitor-keys": 4.29.2 + checksum: 136c22579df2a3ad550f0e8b92d0b18b61facda27364715d1db9721c12aa079191f7917396eeb89fe72f98c17a4d2ec6494fee4dc95bffbc91d6f93df06f1efe languageName: node linkType: hard @@ -1420,10 +1420,10 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/types@npm:4.29.1": - version: 4.29.1 - resolution: "@typescript-eslint/types@npm:4.29.1" - checksum: 9a3c89c751c5cdb72cb569f778717f0869c4b5230640f68f27735d0bffbe1bfb2920dc1ea2b0070472812d6455b12d44b6349430d7c52f7bc85622e7d6844466 +"@typescript-eslint/types@npm:4.29.2": + version: 4.29.2 + resolution: "@typescript-eslint/types@npm:4.29.2" + checksum: 31e4438afcb2aed8c24d9aeb8d65f46ea2bea6b35f796b77de399977b39516a515f8307f8596fff3568b9852664d72d03fd58f55cc346c66d5841c10f230fa5a languageName: node linkType: hard @@ -1445,12 +1445,12 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/typescript-estree@npm:4.29.1": - version: 4.29.1 - resolution: "@typescript-eslint/typescript-estree@npm:4.29.1" +"@typescript-eslint/typescript-estree@npm:4.29.2": + version: 4.29.2 + resolution: "@typescript-eslint/typescript-estree@npm:4.29.2" dependencies: - "@typescript-eslint/types": 4.29.1 - "@typescript-eslint/visitor-keys": 4.29.1 + "@typescript-eslint/types": 4.29.2 + "@typescript-eslint/visitor-keys": 4.29.2 debug: ^4.3.1 globby: ^11.0.3 is-glob: ^4.0.1 @@ -1459,7 +1459,7 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: cb42fea8386aa603d534c3283d4055b392cd5ed6b2502eebfefeb3ee7e7252353b5d8ce997dabb5e94ccde90626f849522c1ecd5cbe08e077c3495cbda3818da + checksum: 74cc09a05ee5b26948ec0f8054397b8f6f43b57169e04ae404a6573a48f58ca321cabb4332f9779a294890b623802b4fa8d9c637771652ef1f9c57aa95157508 languageName: node linkType: hard @@ -1473,13 +1473,13 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/visitor-keys@npm:4.29.1": - version: 4.29.1 - resolution: "@typescript-eslint/visitor-keys@npm:4.29.1" +"@typescript-eslint/visitor-keys@npm:4.29.2": + version: 4.29.2 + resolution: "@typescript-eslint/visitor-keys@npm:4.29.2" dependencies: - "@typescript-eslint/types": 4.29.1 + "@typescript-eslint/types": 4.29.2 eslint-visitor-keys: ^2.0.0 - checksum: ff30d97feaa968abcb9f87aeeab59f098744f554749e85649dfcf0d565a6bbb30f92d83dc08c1b05d080bdc900ea5325dd8a52bc0840df2207c2f336cd70afdb + checksum: 30e1eef4f29e52193441240c2dfcc583d19691657bda4c93494cac7c728db47182b76d742239ad36323b5d5289073aaf88defd0e309c01405abd422ef272c53b languageName: node linkType: hard @@ -2881,8 +2881,8 @@ __metadata: "@league-of-foundry-developers/foundry-vtt-types": 0.8.8-8 "@types/fs-extra": 9.0.12 "@types/jest": 27.0.1 - "@typescript-eslint/eslint-plugin": 4.29.1 - "@typescript-eslint/parser": 4.29.1 + "@typescript-eslint/eslint-plugin": 4.29.2 + "@typescript-eslint/parser": 4.29.2 chalk: 4.1.2 eslint: 7.32.0 eslint-config-prettier: 8.3.0 From 569d6d030a4238a8548f2f8e657040cc747266c5 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 17 Aug 2021 01:16:05 +0000 Subject: [PATCH 60/61] Update dependency sass to v1.38.0 --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 369ed4b7..50c31a41 100644 --- a/package.json +++ b/package.json @@ -72,7 +72,7 @@ "prettier": "2.3.2", "rollup": "2.56.2", "rollup-plugin-typescript2": "0.30.0", - "sass": "1.37.5", + "sass": "1.38.0", "semver": "7.3.5", "ts-jest": "27.0.4", "tslib": "2.3.1", diff --git a/yarn.lock b/yarn.lock index aea47539..32960e30 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2898,7 +2898,7 @@ __metadata: prettier: 2.3.2 rollup: 2.56.2 rollup-plugin-typescript2: 0.30.0 - sass: 1.37.5 + sass: 1.38.0 semver: 7.3.5 ts-jest: 27.0.4 tslib: 2.3.1 @@ -7165,14 +7165,14 @@ fsevents@^1.2.7: languageName: node linkType: hard -"sass@npm:1.37.5": - version: 1.37.5 - resolution: "sass@npm:1.37.5" +"sass@npm:1.38.0": + version: 1.38.0 + resolution: "sass@npm:1.38.0" dependencies: chokidar: ">=3.0.0 <4.0.0" bin: sass: sass.js - checksum: f7751f481cee57b075b49d5e992bcda66f353098a2fc6e6a906e7732fd5dc4544ce7cba0efdbd3d6c5734ebff792026a462f6fa36e99359b475e9094418a2373 + checksum: ce6da83497f56daab29bc9ed316cbfd18111c1c0afa466912e8c7815c8f006620595b8d3c5db632e9f09366691c2d8fc5f8faa8eb9532ae3bd0364c2ae7c6a93 languageName: node linkType: hard From 58f584f9e5b63e66e83e44612f18958dfb0388e1 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 17 Aug 2021 05:16:43 +0000 Subject: [PATCH 61/61] Update dependency ts-jest to v27.0.5 --- package.json | 2 +- yarn.lock | 18 ++++++++---------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index 50c31a41..63000169 100644 --- a/package.json +++ b/package.json @@ -74,7 +74,7 @@ "rollup-plugin-typescript2": "0.30.0", "sass": "1.38.0", "semver": "7.3.5", - "ts-jest": "27.0.4", + "ts-jest": "27.0.5", "tslib": "2.3.1", "typescript": "4.3.5", "yargs": "17.1.1" diff --git a/yarn.lock b/yarn.lock index 32960e30..de15bc27 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2143,7 +2143,7 @@ __metadata: languageName: node linkType: hard -"buffer-from@npm:1.x, buffer-from@npm:^1.0.0": +"buffer-from@npm:^1.0.0": version: 1.1.1 resolution: "buffer-from@npm:1.1.1" checksum: 540ceb79c4f5bfcadaabbc18324fa84c50dc52905084be7c03596a339cf5a88513bee6831ce9b36ddd046fab09257a7c80686e129d0559a0cfd141da196ad956 @@ -2900,7 +2900,7 @@ __metadata: rollup-plugin-typescript2: 0.30.0 sass: 1.38.0 semver: 7.3.5 - ts-jest: 27.0.4 + ts-jest: 27.0.5 tslib: 2.3.1 typescript: 4.3.5 yargs: 17.1.1 @@ -5951,7 +5951,7 @@ fsevents@^1.2.7: languageName: node linkType: hard -"mkdirp@npm:1.x, mkdirp@npm:^1.0.3, mkdirp@npm:^1.0.4": +"mkdirp@npm:^1.0.3, mkdirp@npm:^1.0.4": version: 1.0.4 resolution: "mkdirp@npm:1.0.4" bin: @@ -7948,23 +7948,21 @@ fsevents@^1.2.7: languageName: node linkType: hard -"ts-jest@npm:27.0.4": - version: 27.0.4 - resolution: "ts-jest@npm:27.0.4" +"ts-jest@npm:27.0.5": + version: 27.0.5 + resolution: "ts-jest@npm:27.0.5" dependencies: bs-logger: 0.x - buffer-from: 1.x fast-json-stable-stringify: 2.x jest-util: ^27.0.0 json5: 2.x lodash: 4.x make-error: 1.x - mkdirp: 1.x semver: 7.x yargs-parser: 20.x peerDependencies: "@babel/core": ">=7.0.0-beta.0 <8" - "@types/jest": ^26.0.0 + "@types/jest": ^27.0.0 babel-jest: ">=27.0.0 <28" jest: ^27.0.0 typescript: ">=3.8 <5.0" @@ -7977,7 +7975,7 @@ fsevents@^1.2.7: optional: true bin: ts-jest: cli.js - checksum: 2891c2052f881e9350367ec0f978193d4268485496aa2613e45d6208f5809e7a04932105be38f3d1c016ff43d7699b7c7728728df6864ce22bc054aa0954af2f + checksum: 0f7479a6c967f192d9be8bf8ac75498f41cc03964ed7fa6f3ae826080bf8ddb1e2f1e59cda34342a99c44c2fff4b7350019dd4f963fa059af694de4196054576 languageName: node linkType: hard