From d5cbc9faff4c63791f5c6fa22357279576bacb9c Mon Sep 17 00:00:00 2001 From: Refactoring Agent <[email protected]> Date: Sat, 2 May 2026 18:36:36 +0200 Subject: [PATCH] Fix build errors: update imports and re-exports - Fixed equipment/index.ts imports (use correct export names: ACCESSORIES_EQUIPMENT, CASTER_EQUIPMENT, etc.) - Fixed page.tsx: added lazy, Suspense imports from react - Fixed page.tsx: updated getUnifiedEffects import from @/lib/game/effects - Fixed ManaTypeBreakdown.tsx: updated computeEffectiveRegenForDisplay import - Fixed SpireTab.tsx: updated getEnemyName import from enemy-utils - Fixed LeftPanel.tsx: updated getUnifiedEffects import from @/lib/game/effects - Build now succeeds with all tabs working --- src/app/components/LeftPanel.tsx | 3 ++- src/app/page.tsx | 5 ++-- .../game/stats/ManaTypeBreakdown.tsx | 3 ++- src/components/game/tabs/SpireTab.tsx | 3 ++- .../data/enchantments/spell-effects/index.ts | 21 ++++++++++++--- src/lib/game/data/equipment/index.ts | 27 ++++++++++++++++--- src/lib/game/data/golems/index.ts | 15 ++++++++--- 7 files changed, 63 insertions(+), 14 deletions(-) diff --git a/src/app/components/LeftPanel.tsx b/src/app/components/LeftPanel.tsx index e6d2a7e..74a51cc 100644 --- a/src/app/components/LeftPanel.tsx +++ b/src/app/components/LeftPanel.tsx @@ -8,7 +8,8 @@ import { ActionButtons } from '@/components/game'; import { CalendarDisplay } from '@/components/game'; import { DebugName } from '@/lib/game/debug-context'; import type { GameStore } from '@/lib/game/store'; -import { computeMaxMana, computeClickMana, getMeditationBonus, getUnifiedEffects } from '@/lib/game/store'; +import { computeMaxMana, computeClickMana, getMeditationBonus } from '@/lib/game/store'; +import { getUnifiedEffects } from '@/lib/game/effects'; import { useGameLoop } from '@/lib/game/stores/gameHooks'; interface LeftPanelProps { diff --git a/src/app/page.tsx b/src/app/page.tsx index 6d5bf8e..85b8128 100644 --- a/src/app/page.tsx +++ b/src/app/page.tsx @@ -1,8 +1,9 @@ 'use client'; -import { useEffect, useState } from 'react'; +import { useEffect, useState, lazy, Suspense } from 'react'; import type { JSX } from 'react'; -import { useGameStore, fmt, computeMaxMana, computeRegen, computeClickMana, getMeditationBonus, getIncursionStrength, canAffordSpellCost, getUnifiedEffects } from '@/lib/game/store'; +import { useGameStore, fmt, computeMaxMana, computeRegen, computeClickMana, getMeditationBonus, getIncursionStrength, canAffordSpellCost } from '@/lib/game/store'; +import { getUnifiedEffects } from '@/lib/game/effects'; import { useGameLoop } from '@/lib/game/stores/gameHooks'; import { ELEMENTS, GUARDIANS, SPELLS_DEF, PRESTIGE_DEF, getStudySpeedMultiplier, getStudyCostMultiplier } from '@/lib/game/constants'; import { getActiveEquipmentSpells, getTotalDPS } from '@/lib/game/computed-stats'; diff --git a/src/components/game/stats/ManaTypeBreakdown.tsx b/src/components/game/stats/ManaTypeBreakdown.tsx index 5ffd9bb..5e6b716 100644 --- a/src/components/game/stats/ManaTypeBreakdown.tsx +++ b/src/components/game/stats/ManaTypeBreakdown.tsx @@ -5,7 +5,8 @@ import { fmt, fmtDec } from '@/lib/game/store'; import type { GameStore } from '@/lib/game/types'; import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card'; import { ATTUNEMENTS_DEF, getAttunementConversionRate } from '@/lib/game/data/attunements'; -import { computeEffectiveRegenForDisplay, computeMaxMana, computeElementMax } from '@/lib/game/store'; +import { computeMaxMana, computeElementMax } from '@/lib/game/store'; +import { computeEffectiveRegenForDisplay } from '@/lib/game/store-modules/computed-stats'; import { getUnifiedEffects } from '@/lib/game/effects'; import { Droplet } from 'lucide-react'; import { Separator } from '@/components/ui/separator'; diff --git a/src/components/game/tabs/SpireTab.tsx b/src/components/game/tabs/SpireTab.tsx index 76abc24..db94af4 100755 --- a/src/components/game/tabs/SpireTab.tsx +++ b/src/components/game/tabs/SpireTab.tsx @@ -6,7 +6,8 @@ import { Mountain } from 'lucide-react'; import type { ActivityLogEntry } from '@/lib/game/types'; import type { GameStore } from '@/lib/game/store'; import { ELEMENTS, GUARDIANS, SPELLS_DEF } from '@/lib/game/constants'; -import { getEnemyName, calcDamage } from '@/lib/game/store'; +import { calcDamage } from '@/lib/game/store'; +import { getEnemyName } from '@/lib/game/store-modules/enemy-utils'; import { getActiveEquipmentSpells, getTotalDPS } from '@/lib/game/computed-stats'; import { getUnifiedEffects } from '@/lib/game/effects'; import { formatSpellCost, getSpellCostColor } from '@/lib/game/formatting'; diff --git a/src/lib/game/data/enchantments/spell-effects/index.ts b/src/lib/game/data/enchantments/spell-effects/index.ts index 45a8635..f60fdbf 100644 --- a/src/lib/game/data/enchantments/spell-effects/index.ts +++ b/src/lib/game/data/enchantments/spell-effects/index.ts @@ -1,8 +1,23 @@ -// ─── Spell Enchantment Effects Index ─────────────────────────────── +// ─── Spell Enchantment Effects Index ─────────────────────── // Re-exports all spell effects from modular files // Re-export types export type { EnchantmentEffectDef, ALL_CASTER } from './types'; -// Re-export data -export { SPELL_EFFECTS } from './data'; +// Import all spell effect groups +import { BASIC_SPELL_EFFECTS } from './basic-spells'; +import { LIGHTNING_SPELL_EFFECTS } from './lightning-spells'; +import { METAL_SPELL_EFFECTS } from './metal-spells'; +import { SAND_SPELL_EFFECTS } from './sand-spells'; +import { TIER2_SPELL_EFFECTS } from './tier2-spells'; +import { TIER3_SPELL_EFFECTS } from './tier3-spells'; + +// Combine all spell effects into SPELL_EFFECTS +export const SPELL_EFFECTS = { + ...BASIC_SPELL_EFFECTS, + ...LIGHTNING_SPELL_EFFECTS, + ...METAL_SPELL_EFFECTS, + ...SAND_SPELL_EFFECTS, + ...TIER2_SPELL_EFFECTS, + ...TIER3_SPELL_EFFECTS, +}; diff --git a/src/lib/game/data/equipment/index.ts b/src/lib/game/data/equipment/index.ts index e7c939d..b1c473a 100644 --- a/src/lib/game/data/equipment/index.ts +++ b/src/lib/game/data/equipment/index.ts @@ -1,4 +1,4 @@ -// ─── Equipment Types Index ─────────────────────────────── +// ─── Equipment Types Index ─────────────────────── // Re-exports from all equipment type modules // Re-export types @@ -13,8 +13,29 @@ export { SLOT_NAMES } from './types'; -// Re-export data -export { EQUIPMENT_TYPES } from './data'; +// Import all equipment type groups +import { ACCESSORIES_EQUIPMENT } from './accessories'; +import { BODY_EQUIPMENT } from './body'; +import { CASTER_EQUIPMENT } from './casters'; +import { CATALYST_EQUIPMENT } from './catalysts'; +import { FEET_EQUIPMENT } from './feet'; +import { HANDS_EQUIPMENT } from './hands'; +import { HEAD_EQUIPMENT } from './head'; +import { SHIELD_EQUIPMENT } from './shields'; +import { SWORD_EQUIPMENT } from './swords'; + +// Combine all equipment types into EQUIPMENT_TYPES +export const EQUIPMENT_TYPES = { + ...ACCESSORIES_EQUIPMENT, + ...BODY_EQUIPMENT, + ...CASTER_EQUIPMENT, + ...CATALYST_EQUIPMENT, + ...FEET_EQUIPMENT, + ...HANDS_EQUIPMENT, + ...HEAD_EQUIPMENT, + ...SHIELD_EQUIPMENT, + ...SWORD_EQUIPMENT, +}; // Re-export utility functions export { diff --git a/src/lib/game/data/golems/index.ts b/src/lib/game/data/golems/index.ts index be84659..ee4543b 100644 --- a/src/lib/game/data/golems/index.ts +++ b/src/lib/game/data/golems/index.ts @@ -1,11 +1,20 @@ -// ─── Golem Definitions Index ───────────────────────────────── +// ─── Golem Definitions Index ─────────────────────── // Re-exports from all golem modules // Re-export types export type { GolemDef, GolemManaCost } from './types'; -// Re-export data -export { GOLEMS_DEF } from './data'; +// Import all golem groups +import { BASE_GOLEMS } from './base-golems'; +import { ELEMENTAL_GOLEMS } from './elemental-golems'; +import { HYBRID_GOLEMS } from './hybrid-golems'; + +// Combine all golems into GOLEMS_DEF +export const GOLEMS_DEF = { + ...BASE_GOLEMS, + ...ELEMENTAL_GOLEMS, + ...HYBRID_GOLEMS, +}; // Re-export utility functions export {