Fix more random tsc errors

Author: doombubbles

.yarn/install-state.gz

@@ -15,6 +15,8 @@
     "blockly": "10.0.0",
     "graphql": "16.8.1",
     "@types/node": "22.10.5",
+    "@types/react": "18.3.18",
+    "@types/react-dom": "18.3.5",
     "typescript": "5.3.3",
     "postgraphile": "^5.0.0-beta.37"
   },

package.json

@@ -3,7 +3,7 @@ import React, { FunctionComponent, useContext, useEffect, useState } from "react
 import { CardType } from "../../__generated__/spellsource-game";
 import { CollectionCardFragment, CollectionCardsOrderBy, useGetCollectionCardsQuery } from "../../__generated__/client";
 import { CardDef } from "./card-display";
-import { Button, Dropdown, Form, Table } from "react-bootstrap";
+import { Button as RBButton, Dropdown, Form, Table } from "react-bootstrap";
 import { toTitleCaseCorrected } from "../../lib/blockly-spellsource-utils";
 import { clamp } from "lodash";
 import DropdownToggle from "react-bootstrap/DropdownToggle";
@@ -16,6 +16,8 @@ import Link from "next/link";
 import { useDrag, useDrop } from "react-dnd";
 import { CardCache } from "../../pages/collection";
 
+const Button = RBButton as React.ComponentType<any>;
+
 const ShowCardTypes: CardType[] = ["MINION", "SPELL", "WEAPON", "HERO", "HERO_POWER", "CLASS"];
 const DefaultShowCardTypes: CardType[] = ["MINION", "SPELL", "WEAPON"];
 const defaultLimit = 25;
@@ -43,7 +45,7 @@ const CardRow: FunctionComponent<{
 
   const { classes, setHeroClass, classColors, addToDeck } = collection;
 
-  const [, dragRef, dragPreview] = useDrag({
+  const [, dragRef, _] = useDrag({
     type: "collection-card",
     item: { id: cardScript.id },
     canDrag: () => !!collection.addToDeck,
@@ -88,8 +90,8 @@ interface CollectionProps {
 }
 
 const Collection: FunctionComponent<CollectionProps> = (props) => {
-  const { classes, classColors, heroClass, setHeroClass, offset, setOffset, mainHeroClass, addToDeck, removeFromDeck } = props;
-  const { data: session, status } = useSession();
+  const { classes, heroClass, setHeroClass, offset, setOffset, mainHeroClass, addToDeck, removeFromDeck } = props;
+  const { data: session } = useSession();
 
   const cache = useContext(CardCache);
 

spellsource-web/src/components/collection/collection.tsx

@@ -1,7 +1,9 @@
 import React, { FunctionComponent, useContext } from "react";
 import _, { isEqual } from "lodash";
 import { textDecorationStyle } from "./collection";
-import { Button } from "react-bootstrap";
+import { Button as RBButton } from "react-bootstrap";
+
+const Button = RBButton as React.ComponentType<any>;
 import { useDrag, useDrop } from "react-dnd";
 import { GetDeckQuery, GetDeckQueryVariables, GetDecksQuery, GetDecksQueryVariables, useCreateDeckMutation, useDeleteDeckMutation, useRenameDeckMutation, useSetCardsInDeckMutation } from "../../__generated__/client";
 import { ListActions } from "react-use/lib/useList";

spellsource-web/src/components/collection/deck.tsx

@@ -116,6 +116,8 @@
     "**/*.tsx"
   ],
   "exclude": [
-    "node_modules"
+    "node_modules",
+    "build",
+    ".next"
   ]
 }

spellsource-web/tsconfig.json

@@ -7147,7 +7147,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/react-dom@npm:^18.0.11":
+"@types/react-dom@npm:18.3.5":
   version: 18.3.5
   resolution: "@types/react-dom@npm:18.3.5"
   peerDependencies:
@@ -7193,16 +7193,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/react@npm:*, @types/react@npm:>=16.9.11":
-  version: 19.0.3
-  resolution: "@types/react@npm:19.0.3"
-  dependencies:
-    csstype: "npm:^3.0.2"
-  checksum: 10c0/90129c45f2f09154d9409964964d0ccbac7f04d5f7fcf73fc146d33887931fbfdfd1e2947514298f94f986cc264aff8ba3201e9a4ea207d3308f20a06d47c805
-  languageName: node
-  linkType: hard
-
-"@types/react@npm:^18.0.28":
+"@types/react@npm:18.3.18":
   version: 18.3.18
   resolution: "@types/react@npm:18.3.18"
   dependencies: