diff --git a/apps/client/package.json b/apps/client/package.json index 77f54fc92..b2bc0da3c 100644 --- a/apps/client/package.json +++ b/apps/client/package.json @@ -20,7 +20,7 @@ "@casper124578/use-socket.io": "4.1.3", "@casper124578/useful": "^2.0.5", "@headlessui/react": "^1.7.3", - "@next/bundle-analyzer": "^12.3.1", + "@next/bundle-analyzer": "^13.0.0", "@radix-ui/react-accordion": "^1.0.1", "@radix-ui/react-context-menu": "^2.0.1", "@radix-ui/react-dropdown-menu": "^2.0.1", @@ -33,8 +33,8 @@ "@react-aria/interactions": "^3.12.0", "@react-aria/label": "^3.4.2", "@react-aria/ssr": "^3.3.0", - "@sentry/nextjs": "^7.16.0", - "@sentry/tracing": "^7.16.0", + "@sentry/nextjs": "^7.17.2", + "@sentry/tracing": "^7.17.2", "@snailycad/config": "1.29.2", "@snailycad/permissions": "1.29.2", "@snailycad/schemas": "1.29.2", @@ -43,23 +43,24 @@ "@snailycad/utils": "1.29.2", "@tailwindcss/typography": "^0.5.7", "@tanstack/match-sorter-utils": "^8.5.14", - "@tanstack/react-table": "^8.5.15", + "@tanstack/react-table": "^8.5.21", "@tanstack/react-virtual": "^3.0.0-alpha.0", "@tanstack/virtual-core": "^3.0.0-alpha.1", "axios": "^1.1.3", "bignumber.js": "^9.1.0", "date-fns": "^2.29.3", + "eslint-config-next": "latest", "formik": "^2.2.9", "hex-color-regex": "^1.1.0", "is-hotkey": "^0.2.0", "is-mobile": "^3.1.1", "leaflet": "^1.9.2", "mdast-util-find-and-replace": "^2.2.1", - "next": "^12.3.1", - "next-intl": "2.8.0", + "next": "latest", + "next-intl": "2.9.0", "nookies": "^2.5.2", "pretty-bytes": "^6.0.0", - "react": "^18.2.0", + "react": "latest", "react-bootstrap-icons": "^1.9.1", "react-colorful": "^5.6.1", "react-cool-onclickoutside": "^1.7.0", @@ -67,12 +68,12 @@ "react-digit-input": "^2.1.0", "react-dnd": "16.0.1", "react-dnd-html5-backend": "16.0.1", - "react-dom": "^18.2.0", + "react-dom": "latest", "react-google-recaptcha-v3": "^1.10.0", "react-hot-toast": "^2.4.0", "react-leaflet": "^4.1.0", "react-markdown": "^8.0.3", - "react-select": "^5.5.4", + "react-select": "^5.5.7", "react-sortablejs": "^6.1.4", "react-use": "^17.4.0", "remark-emoji": "^3.0.2", @@ -83,24 +84,24 @@ "slate-react": "^0.83.2", "socket.io-client": "^4.5.3", "sortablejs": "^1.15.0", - "use-intl": "^2.8.0", + "use-intl": "^2.9.0", "uuid": "^9.0.0", "zod": "^3.19.1", - "zustand": "^4.1.2" + "zustand": "^4.1.3" }, "devDependencies": { "@types/leaflet": "^1.9.0", - "@types/react": "^18.0.21", - "@types/react-dom": "^18.0.6", + "@types/react": "^18.0.24", + "@types/react-dom": "^18.0.8", "@types/sortablejs": "^1.15.0", "@types/uuid": "^8.3.4", - "autoprefixer": "^10.4.12", + "autoprefixer": "^10.4.13", "postcss": "^8.4.18", "rimraf": "^3.0.2", "sass": "^1.55.0", - "tailwindcss": "^3.2.0", + "tailwindcss": "^3.2.1", "typescript": "^4.8.4", - "vite": "^3.1.8", + "vite": "^3.2.1", "vitest": "^0.24.3" } } diff --git a/apps/client/src/components/Dropdown.tsx b/apps/client/src/components/Dropdown.tsx index 4956081c6..75dc97295 100644 --- a/apps/client/src/components/Dropdown.tsx +++ b/apps/client/src/components/Dropdown.tsx @@ -54,22 +54,24 @@ Dropdown.Item = function DropdownItem({ children, ...rest }: Omit) { return ( - - - {children} - + + {children} ); diff --git a/apps/client/src/components/active-bolos/ManageBoloModal.tsx b/apps/client/src/components/active-bolos/ManageBoloModal.tsx index 22ebe80cc..47dfb83b2 100644 --- a/apps/client/src/components/active-bolos/ManageBoloModal.tsx +++ b/apps/client/src/components/active-bolos/ManageBoloModal.tsx @@ -18,7 +18,7 @@ import { useImageUrl } from "hooks/useImageUrl"; import { useSSRSafeId } from "@react-aria/ssr"; import type { NameSearchResult } from "state/search/nameSearchState"; import type { PostBolosData, PutBolosData } from "@snailycad/types/api"; -import Image from "next/future/image"; +import Image from "next/image"; interface Props { onClose?(): void; diff --git a/apps/client/src/components/admin/AdminLayout.tsx b/apps/client/src/components/admin/AdminLayout.tsx index d142b2016..d074b036b 100644 --- a/apps/client/src/components/admin/AdminLayout.tsx +++ b/apps/client/src/components/admin/AdminLayout.tsx @@ -1,4 +1,4 @@ -import * as React from "react"; +import type * as React from "react"; import { Nav } from "components/nav/Nav"; import { useRoleplayStopped } from "hooks/global/useRoleplayStopped"; import { classNames } from "lib/classNames"; diff --git a/apps/client/src/components/admin/manage/citizens/AllCitizensTab.tsx b/apps/client/src/components/admin/manage/citizens/AllCitizensTab.tsx index 8bbfadfb5..b658f6829 100644 --- a/apps/client/src/components/admin/manage/citizens/AllCitizensTab.tsx +++ b/apps/client/src/components/admin/manage/citizens/AllCitizensTab.tsx @@ -141,13 +141,11 @@ export function AllCitizensTab({ citizens: initialData, totalCount, setCitizens actions: ( <> {hasPermissions([Permissions.ManageCitizens], true) ? ( - - - {common("edit")} - + + {common("edit")} ) : null} {hasPermissions([Permissions.DeleteCitizens], true) ? ( diff --git a/apps/client/src/components/admin/manage/units/CallsignsTab.tsx b/apps/client/src/components/admin/manage/units/CallsignsTab.tsx index 59dcf3eb5..b54bea64b 100644 --- a/apps/client/src/components/admin/manage/units/CallsignsTab.tsx +++ b/apps/client/src/components/admin/manage/units/CallsignsTab.tsx @@ -1,4 +1,3 @@ -import * as React from "react"; import type { Unit } from "src/pages/admin/manage/units"; import Link from "next/link"; import { formatOfficerDepartment, makeUnitName } from "lib/utils"; @@ -52,13 +51,11 @@ export function CallsignsTab({ search, units }: Props) { unit: LABELS[unit.type], name: makeUnitName(unit), user: hasViewUsersPermissions ? ( - - - {unit.user.username} - + + {unit.user.username} ) : ( unit.user.username diff --git a/apps/client/src/components/admin/manage/units/DepartmentWhitelistingTab.tsx b/apps/client/src/components/admin/manage/units/DepartmentWhitelistingTab.tsx index d04dba7ed..49c4091f5 100644 --- a/apps/client/src/components/admin/manage/units/DepartmentWhitelistingTab.tsx +++ b/apps/client/src/components/admin/manage/units/DepartmentWhitelistingTab.tsx @@ -1,4 +1,3 @@ -import * as React from "react"; import type { Unit } from "src/pages/admin/manage/units"; import useFetch from "lib/useFetch"; import { formatUnitDivisions, makeUnitName, formatOfficerDepartment } from "lib/utils"; @@ -70,13 +69,11 @@ export function DepartmentWhitelistingTab({ search, pendingOfficers }: Props) { department: formatOfficerDepartment(officer) ?? common("none"), division: formatUnitDivisions(officer), user: hasViewUsersPermissions ? ( - - - {officer.user.username} - + + {officer.user.username} ) : ( officer.user.username diff --git a/apps/client/src/components/admin/manage/units/QualificationHoverCard.tsx b/apps/client/src/components/admin/manage/units/QualificationHoverCard.tsx index 58654a408..1bc4ce212 100644 --- a/apps/client/src/components/admin/manage/units/QualificationHoverCard.tsx +++ b/apps/client/src/components/admin/manage/units/QualificationHoverCard.tsx @@ -1,7 +1,7 @@ import type { UnitQualification } from "@snailycad/types"; import { HoverCard } from "components/shared/HoverCard"; import { useImageUrl } from "hooks/useImageUrl"; -import Image from "next/future/image"; +import Image from "next/image"; interface Props { qualification: UnitQualification; diff --git a/apps/client/src/components/admin/manage/units/tabs/all-units-tab/AllUnitsTab.tsx b/apps/client/src/components/admin/manage/units/tabs/all-units-tab/AllUnitsTab.tsx index f31abf511..6b11acbd0 100644 --- a/apps/client/src/components/admin/manage/units/tabs/all-units-tab/AllUnitsTab.tsx +++ b/apps/client/src/components/admin/manage/units/tabs/all-units-tab/AllUnitsTab.tsx @@ -1,4 +1,3 @@ -import * as React from "react"; import type { Unit } from "src/pages/admin/manage/units"; import Link from "next/link"; import { @@ -136,13 +135,11 @@ export function AllUnitsTab({ search, units }: Props) { unit: LABELS[unit.type], name: makeUnitName(unit), user: hasViewUsersPermissions ? ( - - - {unit.user.username} - + + {unit.user.username} ) : ( unit.user.username @@ -161,13 +158,11 @@ export function AllUnitsTab({ search, units }: Props) { actions: ( <> {hasManagePermissions ? ( - - - {common("manage")} - + + {common("manage")} ) : null} {hasDeletePermissions ? ( diff --git a/apps/client/src/components/admin/manage/units/tabs/manage-unit-tab/ManageUnitTab.tsx b/apps/client/src/components/admin/manage/units/tabs/manage-unit-tab/ManageUnitTab.tsx index c9f985958..7411b7081 100644 --- a/apps/client/src/components/admin/manage/units/tabs/manage-unit-tab/ManageUnitTab.tsx +++ b/apps/client/src/components/admin/manage/units/tabs/manage-unit-tab/ManageUnitTab.tsx @@ -204,13 +204,11 @@ export function ManageUnitTab({ unit: data }: Props) {