Skip to content

Commit 9eb5358

Browse files
committed
Merge branch 'hotfix/1.41.1'
2 parents a060a66 + f7417df commit 9eb5358

3 files changed

Lines changed: 10 additions & 13 deletions

File tree

CLAUDE.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@ npm run lint # ESLint
2323
- **Always use the `Edit` or `Write` tools** to modify files — never use Bash, `sed`, `awk`, `python`, or `node` for file editing
2424
- If the `Edit` tool fails due to whitespace mismatches, investigate the exact characters with `cat -A` and adjust the match — do not fall back to shell scripts
2525

26+
## Vue Component Rules
27+
28+
- `computed`, `data`, `methods`, `watch`, `props` and all other component options can only appear **once** per Vue component — JavaScript silently discards the first when two keys share the same name. Always merge into a single block rather than adding a second one.
29+
2630
## Key Constraints
2731

2832
- **Firebase v8 namespaced API** is used across 63+ files — do not switch to modular API

src/components/trackCampaign/live/Health.vue

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -121,17 +121,15 @@ export default {
121121
"players",
122122
"displaySettings",
123123
],
124-
computed: {
125-
playerSettings() { return this.displaySettings?.player || {}; },
126-
npcSettings() { return this.displaySettings?.npc; },
127-
allySettings() { return this.displaySettings?.ally; },
128-
},
129124
data() {
130125
return {
131126
userId: this.$route.params.userid,
132127
};
133128
},
134129
computed: {
130+
playerSettings() { return this.displaySettings?.player || {}; },
131+
npcSettings() { return this.displaySettings?.npc; },
132+
allySettings() { return this.displaySettings?.ally; },
135133
camp_data: function () {
136134
const key = this.entity.key;
137135

src/components/trackCampaign/live/Initiative.vue

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -301,11 +301,6 @@ export default {
301301
"displaySettings",
302302
"screenWidth",
303303
],
304-
computed: {
305-
playerSettings() { return this.displaySettings?.player || {}; },
306-
npcSettings() { return this.displaySettings?.npc; },
307-
allySettings() { return this.displaySettings?.ally; },
308-
},
309304
data() {
310305
return {
311306
dmId: this.$route.params.userid,
@@ -316,9 +311,9 @@ export default {
316311
};
317312
},
318313
computed: {
319-
/**
320-
* Returns how many conditions can be shown
321-
*/
314+
playerSettings() { return this.displaySettings?.player || {}; },
315+
npcSettings() { return this.displaySettings?.npc; },
316+
allySettings() { return this.displaySettings?.ally; },
322317
conditionCount() {
323318
if (this.width < 400) return 1;
324319
if (this.width < 450) return 2;

0 commit comments

Comments
 (0)