diff --git a/package.json b/package.json index a0052a60a..c57cf4c88 100644 --- a/package.json +++ b/package.json @@ -91,5 +91,9 @@ "prettier": "^2.7.1", "typescript": "^4.7.4" }, + "resolutions": { + "@types/react": "17.0.2", + "@types/react-dom": "17.0.2" + }, "packageManager": "yarn@3.2.1" } diff --git a/src/components/AppShelf/AppShelfMenu.tsx b/src/components/AppShelf/AppShelfMenu.tsx index 7c0bac36c..750a89227 100644 --- a/src/components/AppShelf/AppShelfMenu.tsx +++ b/src/components/AppShelf/AppShelfMenu.tsx @@ -1,4 +1,4 @@ -import { ActionIcon, Menu, Modal, Text, useMantineTheme } from '@mantine/core'; +import { ActionIcon, Menu, Modal, Text } from '@mantine/core'; import { showNotification } from '@mantine/notifications'; import { useState } from 'react'; import { IconCheck as Check, IconEdit as Edit, IconMenu, IconTrash as Trash } from '@tabler/icons'; diff --git a/src/components/ColorSchemeToggle/ColorSchemeSwitch.tsx b/src/components/ColorSchemeToggle/ColorSchemeSwitch.tsx index d91f10a46..076db44ee 100644 --- a/src/components/ColorSchemeToggle/ColorSchemeSwitch.tsx +++ b/src/components/ColorSchemeToggle/ColorSchemeSwitch.tsx @@ -1,8 +1,8 @@ import React from 'react'; import { createStyles, Switch, Group, useMantineColorScheme, Kbd } from '@mantine/core'; import { IconSun as Sun, IconMoonStars as MoonStars } from '@tabler/icons'; -import { useConfig } from '../../tools/state'; import { useTranslation } from 'next-i18next'; +import { useConfig } from '../../tools/state'; const useStyles = createStyles((theme) => ({ root: { diff --git a/src/pages/_app.tsx b/src/pages/_app.tsx index f5912a598..78f046777 100644 --- a/src/pages/_app.tsx +++ b/src/pages/_app.tsx @@ -4,7 +4,6 @@ import { AppProps } from 'next/app'; import { getCookie, setCookie } from 'cookies-next'; import Head from 'next/head'; import { MantineProvider, ColorScheme, ColorSchemeProvider, MantineTheme } from '@mantine/core'; -import { serverSideTranslations } from 'next-i18next/serverSideTranslations'; import { NotificationsProvider } from '@mantine/notifications'; import { useHotkeys } from '@mantine/hooks'; import { ModalsProvider } from '@mantine/modals'; diff --git a/yarn.lock b/yarn.lock index e841d41c3..be13b28de 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2119,24 +2119,13 @@ __metadata: languageName: node linkType: hard -"@types/react@npm:*": - version: 18.0.17 - resolution: "@types/react@npm:18.0.17" - dependencies: - "@types/prop-types": "*" - "@types/scheduler": "*" - csstype: ^3.0.2 - checksum: 18cae64f5bfd6bb58fbd8ee2ba52ec82de844f114254e26de7b513e4b86621f643f9b71d7066958cd571b0d78cb86cbceda449c5289f9349ca573df29ab69252 - languageName: node - linkType: hard - -"@types/react@npm:17.0.1": - version: 17.0.1 - resolution: "@types/react@npm:17.0.1" +"@types/react@npm:17.0.2": + version: 17.0.2 + resolution: "@types/react@npm:17.0.2" dependencies: "@types/prop-types": "*" csstype: ^3.0.2 - checksum: 592d7a33898550f2139e69c1bb21397ab6f351f406623397cd7f9a4aea20140c779dd23f2934789d40b0bd87995a86c766434ba07bdd1de9533045d0f3596b68 + checksum: a5198857165feddcbfc7d33e3322460ac62b8894d702414496a825b0c82272911ec33a42ef7c9d623a59308070eef4dfee6ff834b0674aa3f87eeb644196ee3b languageName: node linkType: hard @@ -2149,13 +2138,6 @@ __metadata: languageName: node linkType: hard -"@types/scheduler@npm:*": - version: 0.16.2 - resolution: "@types/scheduler@npm:0.16.2" - checksum: b6b4dcfeae6deba2e06a70941860fb1435730576d3689225a421280b7742318d1548b3d22c1f66ab68e414f346a9542f29240bc955b6332c5b11e561077583bc - languageName: node - linkType: hard - "@types/ssh2@npm:*": version: 1.11.5 resolution: "@types/ssh2@npm:1.11.5"