Merge pull request #162 from TNG/update-deps

Update dependencies

.github/dependabot.yml

@@ -7,7 +7,12 @@ updates:
     versioning-strategy: "increase"
 
   - package-ecosystem: "docker"
-    directory: "/"
+    directory: "/apps/client"
+    schedule:
+      interval: "daily"
+
+  - package-ecosystem: "docker"
+    directory: "/apps/server"
     schedule:
       interval: "daily"
 

apps/client/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @eop/client
 
+## 1.1.2
+
+### Patch Changes
+
+- 17eecda: Update dependencies
+- Updated dependencies [17eecda]
+  - @eop/cornucopia-cards@1.1.2
+  - @eop/shared@1.1.2
+
 ## 1.1.1
 
 ### Patch Changes

apps/client/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:20-alpine AS base
+FROM node:22-alpine AS base
 
 FROM base AS pruner
 WORKDIR /app

apps/client/eslint.config.mjs

@@ -1,11 +1,12 @@
 import config from '@eop/eslint-config/type-checked';
-import react from 'eslint-plugin-react/configs/recommended.js';
+import react from 'eslint-plugin-react';
 import tseslint from 'typescript-eslint';
 
 export default tseslint.config(
   { ignores: ['build/'] },
   { languageOptions: { parserOptions: { project: './tsconfig.*.json' } } },
   { settings: { react: { version: 'detect' } } },
-  react,
+  react.configs.flat.recommended,
+  react.configs.flat['jsx-runtime'],
   ...config,
 );

apps/client/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@eop/client",
   "type": "module",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "main": "src/client/index.tsx",
   "scripts": {
     "build": "tsc -b tsconfig.app.json && vite build",
@@ -17,8 +17,8 @@
   "dependencies": {
     "@eop/cornucopia-cards": "*",
     "@eop/shared": "*",
-    "@fortawesome/fontawesome-svg-core": "^6.6.0",
-    "@fortawesome/free-solid-svg-icons": "^6.6.0",
+    "@fortawesome/fontawesome-svg-core": "^6.7.2",
+    "@fortawesome/free-solid-svg-icons": "^6.7.2",
     "@fortawesome/react-fontawesome": "^0.2.2",
     "bootstrap": "^5.3.3",
     "jointjs": "^3.7.7",
@@ -28,33 +28,32 @@
     "react-dom": "^18.3.1",
     "react-helmet": "^6.1.0",
     "react-map-interaction": "^2.1.0",
-    "react-nl2br": "^1.0.4",
-    "react-router-dom": "^6.26.1",
-    "reactstrap": "^9.2.2",
-    "superagent": "^10.0.2"
+    "react-router-dom": "^7.1.1",
+    "reactstrap": "^9.2.3",
+    "superagent": "^10.1.1"
   },
   "devDependencies": {
     "@eop/eslint-config": "*",
     "@eop/prettier-config": "*",
     "@eop/typescript-config": "*",
-    "@testing-library/jest-dom": "^6.4.8",
-    "@testing-library/react": "^16.0.1",
+    "@testing-library/jest-dom": "^6.6.3",
+    "@testing-library/react": "^16.1.0",
     "@testing-library/user-event": "^14.5.2",
-    "@types/backbone": "^1.4.19",
-    "@types/react": "^18.3.4",
+    "@types/backbone": "^1.4.22",
+    "@types/react": "^18.3.18",
     "@types/react-dom": "^18.3.0",
     "@types/react-helmet": "^6.1.11",
-    "@types/superagent": "^8.1.8",
-    "@vitejs/plugin-react-swc": "^3.7.0",
-    "eslint": "^9.9.0",
-    "eslint-plugin-react": "^7.35.0",
-    "jsdom": "^25.0.0",
-    "nock": "^13.5.5",
-    "prettier": "^3.3.3",
-    "typescript": "^5.7.2",
-    "typescript-eslint": "^8.2.0",
-    "vite": "^6.0.3",
-    "vitest": "^2.0.5"
+    "@types/superagent": "^8.1.9",
+    "@vitejs/plugin-react-swc": "^3.7.2",
+    "eslint": "^9.17.0",
+    "eslint-plugin-react": "^7.37.3",
+    "jsdom": "^26.0.0",
+    "nock": "^13.5.6",
+    "prettier": "^3.4.2",
+    "typescript": "^5.7.3",
+    "typescript-eslint": "^8.19.1",
+    "vite": "^6.0.7",
+    "vitest": "^2.1.8"
   },
   "private": true
 }

apps/client/src/components/banner/banner.test.tsx

@@ -1,5 +1,4 @@
 import { render, screen } from '@testing-library/react';
-import React from 'react';
 import { vi, describe, it, afterEach, expect } from 'vitest';
 
 import Banner from './banner';

apps/client/src/components/banner/banner.tsx

@@ -1,4 +1,3 @@
-import React from 'react';
 import type { FC } from 'react';
 import './banner.css';
 

apps/client/src/components/board/board.test.tsx

@@ -5,7 +5,6 @@ import {
 } from '@eop/shared';
 import { render, screen } from '@testing-library/react';
 import nock from 'nock';
-import React from 'react';
 import { describe, it, expect, beforeAll, vi, afterEach } from 'vitest';
 
 import Board from './board';

apps/client/src/components/board/board.tsx

@@ -1,6 +1,6 @@
 import { getDealtCard, ModelType, SPECTATOR } from '@eop/shared';
 import type { BoardProps as BoardgameIOBoardProps } from 'boardgame.io/react';
-import React, { FC, useCallback, useEffect, useState } from 'react';
+import { FC, useCallback, useEffect, useState } from 'react';
 import request from 'superagent';
 
 import Banner from '../banner/banner';

apps/client/src/components/confirmmodal/confirmmodal.test.tsx

@@ -1,6 +1,5 @@
 import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
-import React from 'react';
 import { describe, it, expect, vi } from 'vitest';
 
 import ConfirmModal from './confirmmodal';

apps/client/src/components/confirmmodal/confirmmodal.tsx

@@ -1,4 +1,4 @@
-import React, { FC } from 'react';
+import { FC } from 'react';
 import { Button, Modal, ModalBody, ModalFooter, ModalHeader } from 'reactstrap';
 
 export type ConfirmModalProps = {

apps/client/src/components/copybutton/copybutton.test.tsx

@@ -1,4 +1,3 @@
-import React from 'react';
 import { render, screen, waitFor, within } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { describe, it, expect, afterEach, vi } from 'vitest';

apps/client/src/components/copybutton/copybutton.tsx

@@ -1,4 +1,4 @@
-import React, { FC, PropsWithChildren, useState } from 'react';
+import { FC, PropsWithChildren, useState } from 'react';
 import { Button, ButtonProps } from 'reactstrap';
 import { copyToClipboard } from '../../utils/utils';
 import { faCopy, faCheck, faTimes } from '@fortawesome/free-solid-svg-icons';

apps/client/src/components/dealtcard/dealtcard.test.tsx

@@ -1,6 +1,5 @@
 import { DEFAULT_GAME_MODE } from '@eop/shared';
 import { render } from '@testing-library/react';
-import React from 'react';
 import { describe, it } from 'vitest';
 
 import DealtCard from './dealtcard';

apps/client/src/components/deck/deck.test.tsx

@@ -1,6 +1,5 @@
 import { DEFAULT_START_SUIT, GameMode } from '@eop/shared';
 import { render } from '@testing-library/react';
-import React from 'react';
 import { describe, it } from 'vitest';
 
 import Deck from './deck';

apps/client/src/components/downloadbutton/downloadbutton.test.tsx

@@ -1,4 +1,3 @@
-import React from 'react';
 import { render, screen } from '@testing-library/react';
 import { describe, it, expect } from 'vitest';
 

apps/client/src/components/downloadbutton/downloadbutton.tsx

@@ -1,6 +1,6 @@
 import { faDownload, faTimes } from '@fortawesome/free-solid-svg-icons';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
-import React, { FC, ReactNode, useState } from 'react';
+import { FC, ReactNode, useState } from 'react';
 import { Button } from 'reactstrap';
 import type { PlayerID } from 'boardgame.io';
 

apps/client/src/components/footer/footer.test.tsx

@@ -1,4 +1,3 @@
-import React from 'react';
 import { render, screen } from '@testing-library/react';
 import { describe, it, expect } from 'vitest';
 

apps/client/src/components/footer/footer.tsx

@@ -1,4 +1,3 @@
-import React from 'react';
 import type { FC } from 'react';
 import packageJson from '../../../package.json';
 import { faHeart } from '@fortawesome/free-solid-svg-icons';

apps/client/src/components/footer/imprint.test.tsx

@@ -1,4 +1,3 @@
-import React from 'react';
 import { render, screen } from '@testing-library/react';
 import { describe, it, expect, vi, afterEach } from 'vitest';
 

apps/client/src/components/footer/imprint.tsx

@@ -1,4 +1,3 @@
-import React from 'react';
 import type { FC } from 'react';
 
 const Imprint: FC = () => {

apps/client/src/components/footer/privacy.test.tsx

@@ -1,4 +1,3 @@
-import React from 'react';
 import { render, screen } from '@testing-library/react';
 import { describe, it, expect, vi, afterEach } from 'vitest';
 

apps/client/src/components/footer/privacy.tsx

@@ -1,4 +1,3 @@
-import React from 'react';
 import type { FC } from 'react';
 
 const Privacy: FC = () => {

apps/client/src/components/imagemodel/imagemodel.tsx

@@ -1,4 +1,4 @@
-import React, { FC, useCallback, useEffect, useState } from 'react';
+import { FC, useCallback, useEffect, useState } from 'react';
 import './imagemodel.css';
 import { MapInteractionCSS } from 'react-map-interaction';
 import { asyncSetTimeout } from '@eop/shared';

apps/client/src/components/leaderboard/leaderboard.test.tsx

@@ -1,6 +1,5 @@
 import { DEFAULT_GAME_MODE } from '@eop/shared';
 import { render, screen } from '@testing-library/react';
-import React from 'react';
 import { describe, it, expect } from 'vitest';
 
 import Leaderboard from './leaderboard';

apps/client/src/components/leaderboard/leaderboard.tsx

@@ -1,6 +1,5 @@
 import { getCardDisplayName, Card as EOPCard } from '@eop/shared';
 import type { PlayerID } from 'boardgame.io';
-import React from 'react';
 import type { FC } from 'react';
 import { Badge, Card, CardHeader, Table } from 'reactstrap';
 

apps/client/src/components/license/licenseAttribution.test.tsx

@@ -1,6 +1,5 @@
 import { GameMode } from '@eop/shared';
 import { render, screen } from '@testing-library/react';
-import React from 'react';
 import { describe, it, expect } from 'vitest';
 
 import LicenseAttribution from './licenseAttribution';

apps/client/src/components/logo/logo.test.tsx

@@ -1,4 +1,3 @@
-import React from 'react';
 import { BrowserRouter as Router } from 'react-router-dom';
 import { render, screen } from '@testing-library/react';
 import { describe, it, expect } from 'vitest';

apps/client/src/components/model/model.tsx

@@ -1,6 +1,6 @@
 import classnames from 'classnames';
 import * as joint from 'jointjs';
-import React, { FC, useCallback, useEffect, useState } from 'react';
+import { FC, useCallback, useEffect, useState } from 'react';
 import { Nav, NavItem, NavLink } from 'reactstrap';
 import Helmet from 'react-helmet';
 

apps/client/src/components/privacyEnhancedModel/privacyEnhancedModel.test.tsx

@@ -1,5 +1,4 @@
 import { render, screen } from '@testing-library/react';
-import React from 'react';
 import { describe, it, expect } from 'vitest';
 
 import PrivacyEnhancedModel from './privacyEnhancedModel';

apps/client/src/components/randomcarddisplay/randomCardDisplay.tsx

@@ -1,4 +1,3 @@
-import React from 'react';
 import { CARD_DECKS, GameMode, SUITS } from '@eop/shared';
 import { FC, useState } from 'react';
 import DealtCard from '../dealtcard/dealtcard';

apps/client/src/components/sidebar/sidebar.test.tsx

@@ -1,6 +1,5 @@
 import { DEFAULT_GAME_MODE, GameState, ModelType } from '@eop/shared';
 import { render, screen } from '@testing-library/react';
-import React from 'react';
 import { describe, it, expect } from 'vitest';
 
 import Sidebar from './sidebar';

apps/client/src/components/sidebar/sidebar.tsx

@@ -1,5 +1,4 @@
 import { getDealtCard, ModelType, SPECTATOR } from '@eop/shared';
-import React from 'react';
 import { Button } from 'reactstrap';
 
 import DealtCard from '../dealtcard/dealtcard';

apps/client/src/components/status/status.test.tsx

@@ -1,6 +1,5 @@
 import { DEFAULT_GAME_MODE, ModelType } from '@eop/shared';
 import { render, screen } from '@testing-library/react';
-import React from 'react';
 import { describe, it, expect } from 'vitest';
 
 import Status from './status';

apps/client/src/components/status/status.tsx

@@ -5,7 +5,6 @@ import {
   resolvePlayerName,
   resolvePlayerNames,
 } from '@eop/shared';
-import React from 'react';
 
 import './status.css';
 

apps/client/src/components/threatbar/threatbar.test.tsx

@@ -1,6 +1,5 @@
 import { GameMode, ModelType } from '@eop/shared';
 import { render, screen } from '@testing-library/react';
-import React from 'react';
 import { describe, it, expect } from 'vitest';
 
 import Threatbar from './threatbar';

apps/client/src/components/threatbar/threatbar.tsx

@@ -6,8 +6,7 @@ import {
   faTrash,
 } from '@fortawesome/free-solid-svg-icons';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
-import React, { useState } from 'react';
-import nl2br from 'react-nl2br';
+import { useState } from 'react';
 import {
   Button,
   Card,
@@ -33,6 +32,7 @@ import type {
 import type { BoardProps } from 'boardgame.io/react';
 import type { FC } from 'react';
 import { Threat } from '../../../../../packages/shared/dist/types/game/threat';
+import { nl2br } from '../../utils/nl2br';
 
 type ThreatbarProps = {
   model?: ThreatDragonModel;

apps/client/src/components/threatmodal/threatmodal.test.tsx

@@ -1,7 +1,6 @@
 import { DEFAULT_GAME_MODE, ModelType } from '@eop/shared';
 import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
-import React from 'react';
 import { describe, it, expect, vi } from 'vitest';
 
 import ThreatModal from './threatmodal';

apps/client/src/components/threatmodal/threatmodal.tsx

@@ -1,6 +1,6 @@
 import type { BoardProps } from 'boardgame.io/react';
 import _ from 'lodash';
-import React, { FC, useCallback, useEffect, useState } from 'react';
+import { FC, useCallback, useEffect, useState } from 'react';
 import {
   Button,
   Form,

apps/client/src/components/timer/timer.test.tsx

@@ -1,4 +1,3 @@
-import React from 'react';
 import { render, screen } from '@testing-library/react';
 import { describe, it, expect } from 'vitest';
 

apps/client/src/components/timer/timer.tsx

@@ -1,4 +1,4 @@
-import React, { FC, useEffect, useState } from 'react';
+import { FC, useEffect, useState } from 'react';
 import { CountdownCircleTimer } from 'react-countdown-circle-timer';
 
 import './timer.css';

apps/client/src/index.tsx

@@ -1,4 +1,3 @@
-import React from 'react';
 import { createRoot } from 'react-dom/client';
 import { createBrowserRouter, RouterProvider } from 'react-router-dom';
 import About from './pages/about';

apps/client/src/pages/__tests__/about.test.tsx

@@ -1,5 +1,4 @@
 import { render } from '@testing-library/react';
-import React from 'react';
 import { BrowserRouter as Router } from 'react-router-dom';
 import { describe, it } from 'vitest';
 

apps/client/src/pages/__tests__/app.test.tsx

@@ -1,5 +1,4 @@
-/* import React from 'react';
- import ReactDOM from 'react-dom';
+/*  import ReactDOM from 'react-dom';
  import App from '../app'; */
 
 import { it } from 'vitest';

apps/client/src/pages/__tests__/create.test.tsx

@@ -1,4 +1,3 @@
-import React from 'react';
 import { render, screen } from '@testing-library/react';
 import { describe, it, expect, vi, afterEach } from 'vitest';
 

apps/client/src/pages/about.tsx

@@ -1,4 +1,3 @@
-import type React from 'react';
 import type { FC } from 'react';
 import { Card, CardBody, CardHeader, Col, Container, Row } from 'reactstrap';
 

apps/client/src/pages/app.tsx

@@ -1,7 +1,6 @@
 import { ElevationOfPrivilege, SPECTATOR } from '@eop/shared';
 import { SocketIO } from 'boardgame.io/multiplayer';
 import { Client } from 'boardgame.io/react';
-import React from 'react';
 import { useParams } from 'react-router-dom';
 
 import '@eop/cornucopia-cards/style.css';