diff --git a/.eslintrc.json b/.eslintrc.json index 4b11d9a..fb761d9 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -1,28 +1,33 @@ { "env": { "browser": true, - "es2021": true + "es2021": true, + "node": true }, "extends": [ - "plugin:react/recommended", - "standard", - "plugin:@next/next/recommended" + "next/core-web-vitals", + "standard-with-typescript", + "plugin:react/recommended" ], - "parser": "@typescript-eslint/parser", "parserOptions": { - "ecmaFeatures": { - "jsx": true - }, "ecmaVersion": "latest", "sourceType": "module" }, "plugins": [ - "react", - "@emotion", - "@typescript-eslint" + "react" ], "rules": { - "indent": [ + "react/react-in-jsx-scope": "off", + "react/jsx-uses-react": "off", + "indent": "off", + "@typescript-eslint/indent": [ + "error", + 2, + { + "SwitchCase": 1 + } + ], + "react/jsx-indent": [ "error", 2 ], @@ -30,23 +35,21 @@ "@typescript-eslint/no-use-before-define": [ "error" ], - "react/react-in-jsx-scope": "off", - "react/jsx-filename-extension": [ - "warn", + "no-unused-vars": "off", + "@typescript-eslint/no-unused-vars": [ + "error", { - "extensions": [ - ".tsx" - ] + "argsIgnorePattern": "^_" } ], - "no-unused-vars": "off", - "@typescript-eslint/no-unused-vars": "error", - "@emotion/pkg-renaming": "error", - "react/no-unknown-property": ["error", { "ignore": ["css"] }] - }, - "settings": { - "react": { - "version": "detect" - } + "react-hooks/exhaustive-deps": "off", + "react/no-unknown-property": [ + "error", + { + "ignore": [ + "css" + ] + } + ] } } \ No newline at end of file diff --git a/bun.lockb b/bun.lockb index 74b899b..53625d8 100755 Binary files a/bun.lockb and b/bun.lockb differ diff --git a/next-env.d.ts b/next-env.d.ts index 4f11a03..fd36f94 100644 --- a/next-env.d.ts +++ b/next-env.d.ts @@ -1,5 +1,6 @@ /// /// +/// // NOTE: This file should not be edited // see https://nextjs.org/docs/basic-features/typescript for more information. diff --git a/package.json b/package.json index 9f2f1d8..3416ba9 100644 --- a/package.json +++ b/package.json @@ -36,17 +36,18 @@ "@types/isomorphic-fetch": "^0.0.36", "@types/node": "20.6.0", "@types/react": "18.2.21", - "@typescript-eslint/eslint-plugin": "^5.38.0", + "@typescript-eslint/eslint-plugin": "^6.4.0", "@typescript-eslint/parser": "^5.38.0", - "eslint": "^8.23.1", + "eslint": "^8.0.1", "eslint-config-next": "latest", "eslint-config-standard": "^17.0.0", + "eslint-config-standard-with-typescript": "latest", "eslint-plugin-import": "^2.25.2", - "eslint-plugin-n": "^15.2.5", + "eslint-plugin-n": "^15.0.0 || ^16.0.0 ", "eslint-plugin-node": "^11.1.0", - "eslint-plugin-promise": "^6.0.1", - "eslint-plugin-react": "^7.31.8", + "eslint-plugin-promise": "^6.0.0", + "eslint-plugin-react": "latest", "husky": "^8.0.3", - "typescript": "5.2.2" + "typescript": "*" } } diff --git a/src/adapters/.gitkeep b/src/adapters/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/src/app/layout.tsx b/src/app/layout.tsx new file mode 100644 index 0000000..d56caf9 --- /dev/null +++ b/src/app/layout.tsx @@ -0,0 +1,8 @@ +import { type FC } from 'react' + +const RootLayout: FC = () => { + return ( +
RootLayout
+ ) +} +export default RootLayout diff --git a/src/assets/.gitkeep b/src/assets/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/src/assets/logos/EntGamers.tsx b/src/assets/logos/EntGamers.tsx index 340b578..4113dbb 100644 --- a/src/assets/logos/EntGamers.tsx +++ b/src/assets/logos/EntGamers.tsx @@ -1,6 +1,6 @@ -import { FC, SVGProps } from 'react' +import { type FC, type SVGProps } from 'react' -const SvgComponent:FC> = (props) => ( +const SvgComponent: FC> = (props) => ( = ({ title, description, image }) => { return ( - {!!title && ( + {title !== undefined && ( <> {`${title} - ${SITE_NAME}`} )} - {!!description && ( + {description !== undefined && ( <> )} - {!!image && ( + {image !== undefined && ( <> diff --git a/src/components/layouts/Contained.tsx b/src/components/layouts/Contained.tsx index 7a7e69a..e11add7 100644 --- a/src/components/layouts/Contained.tsx +++ b/src/components/layouts/Contained.tsx @@ -1,10 +1,10 @@ import { Container } from '@mui/material' -import { FC } from 'react' +import { type FC } from 'react' import Header from '@components/layouts/Header' import Footer from '@components/layouts/Footer' -import { ContainedProps } from '@interfaces' +import { type ContainedProps } from '@interfaces' const Contained: FC = ({ children }) => { return ( diff --git a/src/components/layouts/Footer/Footer.tsx b/src/components/layouts/Footer/Footer.tsx index 2417417..140bca3 100644 --- a/src/components/layouts/Footer/Footer.tsx +++ b/src/components/layouts/Footer/Footer.tsx @@ -1,12 +1,12 @@ +import { faAngleRight } from '@fortawesome/free-solid-svg-icons' +import { FontAwesomeIcon } from '@fortawesome/react-fontawesome' +import { type FooterColumn } from '@interfaces' import { Container, Paper, Typography } from '@mui/material' import MuiLink from '@mui/material/Link' import NextLink from 'next/link' +import { type FC } from 'react' -import { faAngleRight } from '@fortawesome/free-solid-svg-icons' -import { FontAwesomeIcon } from '@fortawesome/react-fontawesome' -import { FooterColumn } from '@interfaces' - -const Footer = () => { +const Footer: FC = () => { const columns: FooterColumn[] = [ { title: 'Acerca de', diff --git a/src/components/layouts/Header/Header.tsx b/src/components/layouts/Header/Header.tsx index 019110e..7e77b7b 100644 --- a/src/components/layouts/Header/Header.tsx +++ b/src/components/layouts/Header/Header.tsx @@ -1,31 +1,29 @@ +import EntGamers from '@assets/logos/EntGamers' import { faBars } from '@fortawesome/free-solid-svg-icons' import { FontAwesomeIcon } from '@fortawesome/react-fontawesome' +import { type Link } from '@interfaces' import { AppBar, Box, Container, Divider, IconButton, ListItemButton, NoSsr } from '@mui/material' import dynamic from 'next/dynamic' import NextLink from 'next/link' import { useRouter } from 'next/router' -import { useEffect, useState } from 'react' +import { useEffect, useState, type FC } from 'react' -import EntGamers from '@assets/logos/EntGamers' - -import { Link } from '@interfaces' - -const Drawer = dynamic(() => import('@mui/material/Drawer'), { ssr: false }) -const List = dynamic(() => import('@mui/material/List'), { ssr: false }) -const ListItemText = dynamic(() => import('@mui/material/ListItemText'), { ssr: false }) +const Drawer = dynamic(async () => await import('@mui/material/Drawer'), { ssr: false }) +const List = dynamic(async () => await import('@mui/material/List'), { ssr: false }) +const ListItemText = dynamic(async () => await import('@mui/material/ListItemText'), { ssr: false }) const MenuItems: Link[] = [ { label: 'Home', url: '/' }, { label: 'Clanes', url: '/clanes' } ] -const Header = () => { +const Header: FC = () => { const [scrolled, setScrolled] = useState(false) const [openMenu, setOpenMenu] = useState(false) const router = useRouter() - const handleScroll = () => { + const handleScroll = (): void => { if (window.scrollY > 15) { setScrolled(true) } else { @@ -86,7 +84,7 @@ const Header = () => { alignItems: 'center', aspectRatio: '1' }} - onClick={() => setOpenMenu(true)} + onClick={() => { setOpenMenu(true) }} > @@ -96,7 +94,7 @@ const Header = () => { setOpenMenu(false)} + onClose={() => { setOpenMenu(false) }} anchor="right" > import('@components/pages/equipo/unirse/UnirseForm'), { +const UnirseForm = dynamic(async () => await import('@components/pages/equipo/unirse/UnirseForm'), { ssr: false, suspense: false }) -const PositionJoinTeam:FC = ( +const PositionJoinTeam: FC = ( { benefits, description, requirements, title } ) => { return ( diff --git a/src/components/pages/equipo/unirse/UnirseForm.tsx b/src/components/pages/equipo/unirse/UnirseForm.tsx index e0e572c..7bccb0b 100644 --- a/src/components/pages/equipo/unirse/UnirseForm.tsx +++ b/src/components/pages/equipo/unirse/UnirseForm.tsx @@ -1,11 +1,11 @@ -import { useFormik } from 'formik' import { Box, Button, TextField, Typography } from '@mui/material' -import { FC, useState } from 'react' +import { useFormik } from 'formik' +import { useState, type FC } from 'react' import { object, string } from 'yup' -import { UnirseFormData, UnirseFormProps } from '@interfaces' -import { FontAwesomeIcon } from '@fortawesome/react-fontawesome' import { faSpinner } from '@fortawesome/free-solid-svg-icons' +import { FontAwesomeIcon } from '@fortawesome/react-fontawesome' +import { type UnirseFormData, type UnirseFormProps } from '@interfaces' const unirseFormSchema = object({ name: string().required('El nombre es requerido'), @@ -21,7 +21,7 @@ const UnirseForm: FC = ({ role }) => { initialValues: { name: '', email: '', - role: role || '', + role: role ?? '', discordUserName: '', experience: '' }, @@ -73,8 +73,8 @@ const UnirseForm: FC = ({ role }) => { placeholder="Escribe tu nombre" value={formik.values.name} onChange={formik.handleChange} - error={formik.touched.name && !!formik.errors.name} - helperText={formik.touched.name && formik.errors.name} + error={formik.touched.name !== undefined && formik.errors.name !== undefined } + helperText={formik.touched.name !== undefined && formik.errors.name} fullWidth margin="normal" /> @@ -84,8 +84,8 @@ const UnirseForm: FC = ({ role }) => { placeholder="Usaremos este correo para contactarte" value={formik.values.email} onChange={formik.handleChange} - error={formik.touched.email && !!formik.errors.email} - helperText={formik.touched.email && formik.errors.email} + error={formik.touched.email !== undefined && formik.errors.email !== undefined } + helperText={formik.touched.email !== undefined && formik.errors.email} fullWidth margin="normal" /> @@ -95,8 +95,8 @@ const UnirseForm: FC = ({ role }) => { placeholder="userName#0000" value={formik.values.discordUserName} onChange={formik.handleChange} - error={formik.touched.discordUserName && !!formik.errors.discordUserName} - helperText={formik.touched.discordUserName && formik.errors.discordUserName} + error={formik.touched.discordUserName !== undefined && formik.errors.discordUserName !== undefined } + helperText={formik.touched.discordUserName !== undefined && formik.errors.discordUserName} fullWidth margin="normal" /> @@ -106,8 +106,8 @@ const UnirseForm: FC = ({ role }) => { placeholder="¿Tienes experiencia en el área? ¿Qué conocimientos tienes?" value={formik.values.experience} onChange={formik.handleChange} - error={formik.touched.experience && !!formik.errors.experience} - helperText={formik.touched.experience && formik.errors.experience} + error={formik.touched.experience !== undefined && formik.errors.experience !== undefined } + helperText={formik.touched.experience !== undefined && formik.errors.experience} fullWidth margin="normal" multiline @@ -124,7 +124,7 @@ const UnirseForm: FC = ({ role }) => { type="submit" endIcon={formik.isSubmitting ? : undefined} > - Enviar + Enviar diff --git a/src/components/pages/home/Clanes.tsx b/src/components/pages/home/Clanes.tsx index b566f5b..261b45f 100644 --- a/src/components/pages/home/Clanes.tsx +++ b/src/components/pages/home/Clanes.tsx @@ -1,7 +1,7 @@ import { Box, Button, Container, Paper, Typography } from '@mui/material' import Image from 'next/image' import Link from 'next/link' -import { FC } from 'react' +import { type FC } from 'react' import ClanesImage from '@assets/images/Clanes.png' diff --git a/src/components/pages/home/Hero.tsx b/src/components/pages/home/Hero.tsx index aa66a0c..2d3b6f0 100644 --- a/src/components/pages/home/Hero.tsx +++ b/src/components/pages/home/Hero.tsx @@ -5,7 +5,7 @@ import gsap, { Elastic, Linear } from 'gsap' import ScrollTrigger from 'gsap/dist/ScrollTrigger' import ScrollToPlugin from 'gsap/dist/ScrollToPlugin' import Image from 'next/image' -import { FC, useEffect, useRef } from 'react' +import { type FC, useEffect, useRef } from 'react' import EntGamers from '@assets/images/EntGamers.png' @@ -17,13 +17,13 @@ export interface HeroProps { } const Hero: FC = ({ subtitle, title }) => { - const layer01 = useRef(null) - const layer02 = useRef(null) - const layer03 = useRef(null) - const layer04 = useRef(null) - const layer05 = useRef(null) - const layer06 = useRef(null) - const verMasButton = useRef(null) + const layer01 = useRef(null) + const layer02 = useRef(null) + const layer03 = useRef(null) + const layer04 = useRef(null) + const layer05 = useRef(null) + const layer06 = useRef(null) + const verMasButton = useRef(null) useEffect(() => { const scrollTrigger = { trigger: layer01.current, diff --git a/src/components/pages/home/SocialNetworks.tsx b/src/components/pages/home/SocialNetworks.tsx index 219db8b..65ad624 100644 --- a/src/components/pages/home/SocialNetworks.tsx +++ b/src/components/pages/home/SocialNetworks.tsx @@ -3,15 +3,15 @@ import { Container, Paper } from '@mui/material' import gsap, { Linear } from 'gsap' import ScrollToPlugin from 'gsap/dist/ScrollToPlugin' import ScrollTrigger from 'gsap/dist/ScrollTrigger' -import { FC, useEffect, useRef } from 'react' +import { type FC, useEffect, useRef } from 'react' gsap.registerPlugin(ScrollTrigger, ScrollToPlugin) const SocialNetworks: FC = () => { - const layer01 = useRef(null) - const layer02 = useRef(null) - const layer03 = useRef(null) - const layer04 = useRef(null) + const layer01 = useRef(null) + const layer02 = useRef(null) + const layer03 = useRef(null) + const layer04 = useRef(null) useEffect(() => { const scrollTrigger = { diff --git a/src/components/pages/home/Team.tsx b/src/components/pages/home/Team.tsx index 9c33197..dc8da46 100644 --- a/src/components/pages/home/Team.tsx +++ b/src/components/pages/home/Team.tsx @@ -1,8 +1,8 @@ import { Button, Container, Typography } from '@mui/material' import NextLink from 'next/link' -import { FC } from 'react' +import { type FC } from 'react' -import ProfileCard, { ProfileCardProps } from '@components/profiles/ProfileCard' +import ProfileCard, { type ProfileCardProps } from '@components/profiles/ProfileCard' export interface TeamProps { title: string diff --git a/src/components/profiles/ProfileCard.tsx b/src/components/profiles/ProfileCard.tsx index 9ba8a1e..dc921fb 100644 --- a/src/components/profiles/ProfileCard.tsx +++ b/src/components/profiles/ProfileCard.tsx @@ -2,21 +2,21 @@ import { faFacebook, faInstagram, faTiktok, faTwitch, faTwitter, faYoutube } fro import { FontAwesomeIcon } from '@fortawesome/react-fontawesome' import { Avatar, Card, CardContent, IconButton, Tooltip, Typography } from '@mui/material' import NextImage from 'next/image' -import { FC } from 'react' +import { type FC } from 'react' import BadgeBook from '@assets/images/gaming/BadgeBook.png' import BadgeShield from '@assets/images/gaming/BadgeShield.png' import BadgeSword from '@assets/images/gaming/BadgeSword.png' import ButtonA from '@assets/images/gaming/ButtonA.png' import { faGlobe } from '@fortawesome/free-solid-svg-icons' -import { SocialLink } from '@interfaces' +import { type SocialLink } from '@interfaces' export interface ProfileCardProps { userName: string biography: string avatar: string socialNetworks: SocialLink[] - role: 'user'| 'moderator'| 'collaborator' | 'admin' + role: 'user' | 'moderator' | 'collaborator' | 'admin' } const ProfileCard: FC = ({ avatar, biography, socialNetworks, userName, role }) => { @@ -136,20 +136,20 @@ const ProfileCard: FC = ({ avatar, biography, socialNetworks, > {((socialNetwork) => { switch (socialNetwork) { - case 'facebook': - return - case 'twitter': - return - case 'instagram': - return - case 'twitch': - return - case 'youtube': - return - case 'tiktok': - return - default: - return + case 'facebook': + return + case 'twitter': + return + case 'instagram': + return + case 'twitch': + return + case 'youtube': + return + case 'tiktok': + return + default: + return } })(socialNetwork)} diff --git a/src/interfaces/common.ts b/src/interfaces/common.ts index d39aecf..732d214 100644 --- a/src/interfaces/common.ts +++ b/src/interfaces/common.ts @@ -1,4 +1,4 @@ -import { ButtonProps } from '@mui/material' +import { type ButtonProps } from '@mui/material' export interface Link { url: string @@ -11,5 +11,5 @@ export interface Button extends Link { } export interface SocialLink extends Link { - socialNetwork: 'facebook' | 'twitter' | 'instagram' | 'twitch'| 'youtube' | 'tiktok'| string + socialNetwork: 'facebook' | 'twitter' | 'instagram' | 'twitch' | 'youtube' | 'tiktok' | string } diff --git a/src/interfaces/components/index.ts b/src/interfaces/components/index.ts index 46c668f..6e667b1 100644 --- a/src/interfaces/components/index.ts +++ b/src/interfaces/components/index.ts @@ -1,5 +1,3 @@ export * from './layouts' -export * from './pages/equipo' -export * from './pages/equipo/unirse' export * from './pages' export * from './seo' diff --git a/src/interfaces/components/layouts/Footer.ts b/src/interfaces/components/layouts/Footer.ts index c447029..56a14ac 100644 --- a/src/interfaces/components/layouts/Footer.ts +++ b/src/interfaces/components/layouts/Footer.ts @@ -1,4 +1,4 @@ -import { Link } from '@interfaces' +import { type Link } from '@interfaces' export interface FooterColumn { title: string diff --git a/src/interfaces/components/layouts/contained.ts b/src/interfaces/components/layouts/contained.ts index 84f3ad5..8418ebb 100644 --- a/src/interfaces/components/layouts/contained.ts +++ b/src/interfaces/components/layouts/contained.ts @@ -1,4 +1,4 @@ -import { ReactNode } from 'react' +import { type ReactNode } from 'react' export interface ContainedProps { children: ReactNode diff --git a/src/interfaces/components/pages/equipo/unirse/positionJoinTeam.ts b/src/interfaces/components/pages/equipo/unirse/positionJoinTeam.ts index be5b143..182e3a7 100644 --- a/src/interfaces/components/pages/equipo/unirse/positionJoinTeam.ts +++ b/src/interfaces/components/pages/equipo/unirse/positionJoinTeam.ts @@ -1,4 +1,4 @@ -import { EquipoUnirsePageProps } from '@interfaces' +import { type EquipoUnirsePageProps } from '@interfaces' export interface PositionJoinTeamProps { title: EquipoUnirsePageProps['teamPositions'][number]['title'] diff --git a/src/interfaces/components/pages/index.ts b/src/interfaces/components/pages/index.ts index 33b709a..c6e6be3 100644 --- a/src/interfaces/components/pages/index.ts +++ b/src/interfaces/components/pages/index.ts @@ -1,2 +1 @@ -export * from './equipo' export * from './equipo/unirse' diff --git a/src/interfaces/index.ts b/src/interfaces/index.ts index d3391b1..0eb2c31 100644 --- a/src/interfaces/index.ts +++ b/src/interfaces/index.ts @@ -1,7 +1,4 @@ export * from './common' export * from './components' -export * from './components/layouts' -export * from './models/profile' +export * from './models' export * from './pages' -export * from './pages/clanes' -export * from './pages/equipo' diff --git a/src/interfaces/models/index.ts b/src/interfaces/models/index.ts new file mode 100644 index 0000000..060535f --- /dev/null +++ b/src/interfaces/models/index.ts @@ -0,0 +1 @@ +export * from './profile' diff --git a/src/interfaces/models/profile.ts b/src/interfaces/models/profile.ts index f1fb171..27a2e15 100644 --- a/src/interfaces/models/profile.ts +++ b/src/interfaces/models/profile.ts @@ -1,4 +1,4 @@ -import { SocialLink } from '@interfaces' +import { type SocialLink } from '@interfaces' export interface Profile { id: string diff --git a/src/interfaces/pages/clanes.ts b/src/interfaces/pages/clanes.ts index 6cc4eb5..99c6f5b 100644 --- a/src/interfaces/pages/clanes.ts +++ b/src/interfaces/pages/clanes.ts @@ -1,4 +1,4 @@ -import { SeoProps as Seo } from '@components/Seo' // Temporary taken from components to later implement it in the interfaces folder +import { type SeoProps as Seo } from '@components/Seo' // Temporary taken from components to later implement it in the interfaces folder export interface ClanesPageProps { seo?: Seo diff --git a/src/interfaces/pages/equipo.ts b/src/interfaces/pages/equipo.ts index cec5aaa..292a2f6 100644 --- a/src/interfaces/pages/equipo.ts +++ b/src/interfaces/pages/equipo.ts @@ -1,4 +1,4 @@ -import { SeoProps as Seo } from '@components/Seo' // Temporary taken from components to later implement it in the interfaces folder +import { type SeoProps as Seo } from '@components/Seo' // Temporary taken from components to later implement it in the interfaces folder export interface EquipoPageProps { seo?: Seo diff --git a/src/interfaces/pages/equipo/unirse.ts b/src/interfaces/pages/equipo/unirse.ts index 25c1e4f..64bde86 100644 --- a/src/interfaces/pages/equipo/unirse.ts +++ b/src/interfaces/pages/equipo/unirse.ts @@ -1,4 +1,4 @@ -import { SeoProps as Seo } from '@components/Seo' // Temporary taken from components to later implement it in the interfaces folder +import { type SeoProps as Seo } from '@components/Seo' // Temporary taken from components to later implement it in the interfaces folder export interface TeamPositionRequirements { title: string diff --git a/src/interfaces/pages/index.ts b/src/interfaces/pages/index.ts index 10638a9..ce6722c 100644 --- a/src/interfaces/pages/index.ts +++ b/src/interfaces/pages/index.ts @@ -1,4 +1,2 @@ export * from './clanes' export * from './equipo' -export * from './equipo/index' -export * from './equipo' diff --git a/src/pages/404.tsx b/src/pages/404.tsx index de5591c..5ec1e87 100644 --- a/src/pages/404.tsx +++ b/src/pages/404.tsx @@ -1,9 +1,9 @@ +import Contained from '@components/layouts/Contained' import { Box, Button, Typography } from '@mui/material' import NextLink from 'next/link' +import { type FC } from 'react' -import Contained from '@components/layouts/Contained' - -const Page404 = () => { +const Page404: FC = () => { return ( { component={NextLink} variant="contained" > - Volver al inicio + Volver al inicio diff --git a/src/pages/_app.tsx b/src/pages/_app.tsx index 062db8b..2e04e96 100644 --- a/src/pages/_app.tsx +++ b/src/pages/_app.tsx @@ -1,15 +1,14 @@ -import { config } from '@fortawesome/fontawesome-svg-core' -import { CssBaseline, ThemeProvider } from '@mui/material' -import type { AppProps } from 'next/app' - import Seo from '@components/Seo' -import theme from '@styles/muiTheme' - +import { config } from '@fortawesome/fontawesome-svg-core' import '@fortawesome/fontawesome-svg-core/styles.css' +import { CssBaseline, ThemeProvider } from '@mui/material' +import theme from '@styles/muiTheme' +import type { AppProps } from 'next/app' +import { type FC } from 'react' config.autoAddCss = false -const MyApp = ({ Component, pageProps }: AppProps) => { +const MyApp: FC = ({ Component, pageProps }) => { return ( diff --git a/src/pages/about.tsx b/src/pages/about.tsx index bcf87ae..ae9912f 100644 --- a/src/pages/about.tsx +++ b/src/pages/about.tsx @@ -1,8 +1,8 @@ -import { Typography } from '@mui/material' - import Contained from '@components/layouts/Contained' +import { Typography } from '@mui/material' +import { type FC } from 'react' -const About = () => { +const About: FC = () => { return ( Sobre EntGamers diff --git a/src/pages/clanes.tsx b/src/pages/clanes.tsx index 30972fc..3bc6a9c 100644 --- a/src/pages/clanes.tsx +++ b/src/pages/clanes.tsx @@ -2,10 +2,10 @@ import { faChevronRight } from '@fortawesome/free-solid-svg-icons' import { FontAwesomeIcon } from '@fortawesome/react-fontawesome' import { Box, Typography } from '@mui/material' import type { GetStaticProps, InferGetStaticPropsType } from 'next' -import { FC } from 'react' +import { type FC } from 'react' import Contained from '@components/layouts/Contained' -import { ClanesPageProps } from '@interfaces' +import { type ClanesPageProps } from '@interfaces' import Seo from '@components/Seo' export const getStaticProps: GetStaticProps = async () => { diff --git a/src/pages/equipo.tsx b/src/pages/equipo.tsx index 8cfc9c4..d286310 100644 --- a/src/pages/equipo.tsx +++ b/src/pages/equipo.tsx @@ -1,12 +1,12 @@ import { Box, Button, Typography } from '@mui/material' -import { GetStaticProps, InferGetStaticPropsType } from 'next' +import { type GetStaticProps, type InferGetStaticPropsType } from 'next' import NextLink from 'next/link' -import { FC } from 'react' +import { type FC } from 'react' import Seo from '@components/Seo' import Contained from '@components/layouts/Contained' -import ProfileCard, { ProfileCardProps } from '@components/profiles/ProfileCard' -import { EquipoPageProps } from '@interfaces' +import ProfileCard, { type ProfileCardProps } from '@components/profiles/ProfileCard' +import { type EquipoPageProps } from '@interfaces' export const getStaticProps: GetStaticProps = async () => { return { @@ -109,7 +109,7 @@ const Equipo: FC> = ( color="primary" component={NextLink} > - Quiero ser administrador + Quiero ser administrador @@ -162,7 +162,7 @@ const Equipo: FC> = ( color="primary" component={NextLink} > - Quiero ser moderador + Quiero ser moderador @@ -215,7 +215,7 @@ const Equipo: FC> = ( color="primary" component={NextLink} > - Quiero ser colaborador + Quiero ser colaborador diff --git a/src/pages/equipo/unirse.tsx b/src/pages/equipo/unirse.tsx index de3a9cb..05f8bd3 100644 --- a/src/pages/equipo/unirse.tsx +++ b/src/pages/equipo/unirse.tsx @@ -1,10 +1,10 @@ -import { Paper, Tab, Tabs, Theme, Typography, useMediaQuery } from '@mui/material' -import { GetStaticProps, GetStaticPropsResult, InferGetStaticPropsType } from 'next' -import { FC, useState } from 'react' +import { Paper, Tab, Tabs, type Theme, Typography, useMediaQuery } from '@mui/material' +import { type GetStaticProps, type GetStaticPropsResult, type InferGetStaticPropsType } from 'next' +import { type FC, useState } from 'react' import Contained from '@components/layouts/Contained' import Seo from '@components/Seo' -import { EquipoUnirsePageProps } from '@interfaces' +import { type EquipoUnirsePageProps } from '@interfaces' import 'swiper/css' import 'swiper/css/virtual' @@ -115,7 +115,7 @@ const Unirse: FC> = ({ title, seo > setCurrentTab(value)} + onChange={(_, value) => { setCurrentTab(value) }} variant={isMediumOrBigger ? 'fullWidth' : 'scrollable'} scrollButtons allowScrollButtonsMobile diff --git a/src/pages/index.tsx b/src/pages/index.tsx index d17a69b..31f70ab 100644 --- a/src/pages/index.tsx +++ b/src/pages/index.tsx @@ -1,11 +1,10 @@ -import type { NextPage } from 'next' - import Seo from '@components/Seo' import Footer from '@components/layouts/Footer' import Header from '@components/layouts/Header' import Clanes from '@components/pages/home/Clanes' import Hero from '@components/pages/home/Hero' import Team from '@components/pages/home/Team' +import type { NextPage } from 'next' const Home: NextPage = () => { return ( diff --git a/src/styles/muiTheme.ts b/src/styles/muiTheme.ts index dbe30f9..f8ce1cf 100644 --- a/src/styles/muiTheme.ts +++ b/src/styles/muiTheme.ts @@ -1,4 +1,4 @@ -import { createTheme, Interpolation, Theme } from '@mui/material' +import { createTheme, type Interpolation, type Theme } from '@mui/material' const glassStyle: Interpolation<{ theme: Theme }> = { background: 'rgba( 28, 30, 33, 0.45 )', diff --git a/tsconfig.json b/tsconfig.json index e5b4bda..7ebdf06 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -58,12 +58,18 @@ "typeRoots": [ "node_modules/@types", "./types" + ], + "plugins": [ + { + "name": "next" + } ] }, "include": [ "next-env.d.ts", "**/*.ts", - "**/*.tsx" + "**/*.tsx", + ".next/types/**/*.ts" ], "exclude": [ "node_modules" diff --git a/types/mui.d.ts b/types/mui.d.ts index 1c35ee2..a80fe63 100644 --- a/types/mui.d.ts +++ b/types/mui.d.ts @@ -1,4 +1,4 @@ -import { CSSProperties } from 'react' +import { type CSSProperties } from 'react' declare module '@mui/material/styles' { interface PaperVariants { diff --git a/yarn.lock b/yarn.lock index f8a1787..b293585 100644 --- a/yarn.lock +++ b/yarn.lock @@ -437,7 +437,7 @@ __metadata: languageName: node linkType: hard -"@eslint-community/eslint-utils@npm:^4.2.0": +"@eslint-community/eslint-utils@npm:^4.1.2, @eslint-community/eslint-utils@npm:^4.2.0, @eslint-community/eslint-utils@npm:^4.4.0": version: 4.4.0 resolution: "@eslint-community/eslint-utils@npm:4.4.0" dependencies: @@ -448,7 +448,7 @@ __metadata: languageName: node linkType: hard -"@eslint-community/regexpp@npm:^4.4.0, @eslint-community/regexpp@npm:^4.6.1": +"@eslint-community/regexpp@npm:^4.5.1, @eslint-community/regexpp@npm:^4.6.0, @eslint-community/regexpp@npm:^4.6.1": version: 4.8.1 resolution: "@eslint-community/regexpp@npm:4.8.1" checksum: 82d62c845ef42b810f268cfdc84d803a2da01735fb52e902fd34bdc09f92464a094fd8e4802839874b000b2f73f67c972859e813ba705233515d3e954f234bf2 @@ -972,7 +972,7 @@ __metadata: languageName: node linkType: hard -"@types/json-schema@npm:^7.0.9": +"@types/json-schema@npm:^7.0.12": version: 7.0.12 resolution: "@types/json-schema@npm:7.0.12" checksum: 00239e97234eeb5ceefb0c1875d98ade6e922bfec39dd365ec6bd360b5c2f825e612ac4f6e5f1d13601b8b30f378f15e6faa805a3a732f4a1bbe61915163d293 @@ -1055,34 +1055,35 @@ __metadata: languageName: node linkType: hard -"@types/semver@npm:^7.3.12": +"@types/semver@npm:^7.5.0": version: 7.5.2 resolution: "@types/semver@npm:7.5.2" checksum: 743aa8a2b58e20b329c19bd2459152cb049d12fafab7279b90ac11e0f268c97efbcb606ea0c681cca03f79015381b40d9b1244349b354270bec3f939ed49f6e9 languageName: node linkType: hard -"@typescript-eslint/eslint-plugin@npm:^5.38.0": - version: 5.62.0 - resolution: "@typescript-eslint/eslint-plugin@npm:5.62.0" +"@typescript-eslint/eslint-plugin@npm:^6.4.0": + version: 6.7.0 + resolution: "@typescript-eslint/eslint-plugin@npm:6.7.0" dependencies: - "@eslint-community/regexpp": ^4.4.0 - "@typescript-eslint/scope-manager": 5.62.0 - "@typescript-eslint/type-utils": 5.62.0 - "@typescript-eslint/utils": 5.62.0 + "@eslint-community/regexpp": ^4.5.1 + "@typescript-eslint/scope-manager": 6.7.0 + "@typescript-eslint/type-utils": 6.7.0 + "@typescript-eslint/utils": 6.7.0 + "@typescript-eslint/visitor-keys": 6.7.0 debug: ^4.3.4 graphemer: ^1.4.0 - ignore: ^5.2.0 - natural-compare-lite: ^1.4.0 - semver: ^7.3.7 - tsutils: ^3.21.0 + ignore: ^5.2.4 + natural-compare: ^1.4.0 + semver: ^7.5.4 + ts-api-utils: ^1.0.1 peerDependencies: - "@typescript-eslint/parser": ^5.0.0 - eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 + "@typescript-eslint/parser": ^6.0.0 || ^6.0.0-alpha + eslint: ^7.0.0 || ^8.0.0 peerDependenciesMeta: typescript: optional: true - checksum: fc104b389c768f9fa7d45a48c86d5c1ad522c1d0512943e782a56b1e3096b2cbcc1eea3fcc590647bf0658eef61aac35120a9c6daf979bf629ad2956deb516a1 + checksum: 48393749c5c1f67acf71795551c6065586198530006189c48636e32caea4d1285624c16c047164f9d29055e26c4f90fca964c5a2b5c0e9b6d9ed87acd74ca0d6 languageName: node linkType: hard @@ -1103,7 +1104,7 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/parser@npm:^5.4.2 || ^6.0.0": +"@typescript-eslint/parser@npm:^5.4.2 || ^6.0.0, @typescript-eslint/parser@npm:^6.4.0": version: 6.7.0 resolution: "@typescript-eslint/parser@npm:6.7.0" dependencies: @@ -1141,20 +1142,20 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/type-utils@npm:5.62.0": - version: 5.62.0 - resolution: "@typescript-eslint/type-utils@npm:5.62.0" +"@typescript-eslint/type-utils@npm:6.7.0": + version: 6.7.0 + resolution: "@typescript-eslint/type-utils@npm:6.7.0" dependencies: - "@typescript-eslint/typescript-estree": 5.62.0 - "@typescript-eslint/utils": 5.62.0 + "@typescript-eslint/typescript-estree": 6.7.0 + "@typescript-eslint/utils": 6.7.0 debug: ^4.3.4 - tsutils: ^3.21.0 + ts-api-utils: ^1.0.1 peerDependencies: - eslint: "*" + eslint: ^7.0.0 || ^8.0.0 peerDependenciesMeta: typescript: optional: true - checksum: fc41eece5f315dfda14320be0da78d3a971d650ea41300be7196934b9715f3fe1120a80207551eb71d39568275dbbcf359bde540d1ca1439d8be15e9885d2739 + checksum: 15ae33a6981721f83b2ac612a7597a4fcb2d9d9bfedce54707e5228bec2774fd99ba54ffce89924ae36b61488c7b6c0c2165a6d361be5cd4cefebefad8b02a01 languageName: node linkType: hard @@ -1208,21 +1209,20 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/utils@npm:5.62.0": - version: 5.62.0 - resolution: "@typescript-eslint/utils@npm:5.62.0" +"@typescript-eslint/utils@npm:6.7.0": + version: 6.7.0 + resolution: "@typescript-eslint/utils@npm:6.7.0" dependencies: - "@eslint-community/eslint-utils": ^4.2.0 - "@types/json-schema": ^7.0.9 - "@types/semver": ^7.3.12 - "@typescript-eslint/scope-manager": 5.62.0 - "@typescript-eslint/types": 5.62.0 - "@typescript-eslint/typescript-estree": 5.62.0 - eslint-scope: ^5.1.1 - semver: ^7.3.7 + "@eslint-community/eslint-utils": ^4.4.0 + "@types/json-schema": ^7.0.12 + "@types/semver": ^7.5.0 + "@typescript-eslint/scope-manager": 6.7.0 + "@typescript-eslint/types": 6.7.0 + "@typescript-eslint/typescript-estree": 6.7.0 + semver: ^7.5.4 peerDependencies: - eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 - checksum: ee9398c8c5db6d1da09463ca7bf36ed134361e20131ea354b2da16a5fdb6df9ba70c62a388d19f6eebb421af1786dbbd79ba95ddd6ab287324fc171c3e28d931 + eslint: ^7.0.0 || ^8.0.0 + checksum: b2a2857ec856d1752e77c2a274a12513372311c300f9ec57ed7bf7411eb9ea34b85a8e7810a5c48fff0e3966b71d63d77e38c5c7bca1d5c004bede5638619a00 languageName: node linkType: hard @@ -2382,7 +2382,24 @@ __metadata: languageName: node linkType: hard -"eslint-config-standard@npm:^17.0.0": +"eslint-config-standard-with-typescript@npm:latest": + version: 39.0.0 + resolution: "eslint-config-standard-with-typescript@npm:39.0.0" + dependencies: + "@typescript-eslint/parser": ^6.4.0 + eslint-config-standard: 17.1.0 + peerDependencies: + "@typescript-eslint/eslint-plugin": ^6.4.0 + eslint: ^8.0.1 + eslint-plugin-import: ^2.25.2 + eslint-plugin-n: "^15.0.0 || ^16.0.0 " + eslint-plugin-promise: ^6.0.0 + typescript: "*" + checksum: a5d76edd09b62b63b5b0d9faaaf210f1e8338332f094fb26519f50f298e010aca4ac0ebceef28bc5de31995cc7055a8a8bec9e3477d331b29cd28d9744fed0da + languageName: node + linkType: hard + +"eslint-config-standard@npm:17.1.0, eslint-config-standard@npm:^17.0.0": version: 17.1.0 resolution: "eslint-config-standard@npm:17.1.0" peerDependencies: @@ -2435,6 +2452,18 @@ __metadata: languageName: node linkType: hard +"eslint-plugin-es-x@npm:^7.1.0": + version: 7.2.0 + resolution: "eslint-plugin-es-x@npm:7.2.0" + dependencies: + "@eslint-community/eslint-utils": ^4.1.2 + "@eslint-community/regexpp": ^4.6.0 + peerDependencies: + eslint: ">=8" + checksum: eece76ef6bcfce463659338b487e516e962ddf3ae34a8a65240ebd318fc991cabfe3573b1c3af5226474193b9c83f030c7900a8e5ffdbe731a3928ca8f2799c9 + languageName: node + linkType: hard + "eslint-plugin-es@npm:^3.0.0": version: 3.0.1 resolution: "eslint-plugin-es@npm:3.0.1" @@ -2447,18 +2476,6 @@ __metadata: languageName: node linkType: hard -"eslint-plugin-es@npm:^4.1.0": - version: 4.1.0 - resolution: "eslint-plugin-es@npm:4.1.0" - dependencies: - eslint-utils: ^2.0.0 - regexpp: ^3.0.0 - peerDependencies: - eslint: ">=4.19.1" - checksum: 26b87a216d3625612b1d3ca8653ac8a1d261046d2a973bb0eb2759070267d2bfb0509051facdeb5ae03dc8dfb51a434be23aff7309a752ca901d637da535677f - languageName: node - linkType: hard - "eslint-plugin-import@npm:^2.25.2, eslint-plugin-import@npm:^2.26.0": version: 2.28.1 resolution: "eslint-plugin-import@npm:2.28.1" @@ -2512,21 +2529,22 @@ __metadata: languageName: node linkType: hard -"eslint-plugin-n@npm:^15.2.5": - version: 15.7.0 - resolution: "eslint-plugin-n@npm:15.7.0" +"eslint-plugin-n@npm:^15.0.0 || ^16.0.0 ": + version: 16.1.0 + resolution: "eslint-plugin-n@npm:16.1.0" dependencies: + "@eslint-community/eslint-utils": ^4.4.0 builtins: ^5.0.1 - eslint-plugin-es: ^4.1.0 - eslint-utils: ^3.0.0 - ignore: ^5.1.1 - is-core-module: ^2.11.0 + eslint-plugin-es-x: ^7.1.0 + get-tsconfig: ^4.7.0 + ignore: ^5.2.4 + is-core-module: ^2.12.1 minimatch: ^3.1.2 - resolve: ^1.22.1 - semver: ^7.3.8 + resolve: ^1.22.2 + semver: ^7.5.3 peerDependencies: eslint: ">=7.0.0" - checksum: cfbcc67e62adf27712afdeadf13223cb9717f95d4af8442056d9d4c97a8b88af76b7969f75deaac26fa98481023d6b7c9e43a28909e7f0468f40b3024b7bcfae + checksum: 6b70bf8eec74395a440ca585745eb19aba143ee00513f76893c44944675630bd898227d1b4e0ebef66fd0c84cdcf223d6613b2beee0727b5c572cd705fb50d3a languageName: node linkType: hard @@ -2546,7 +2564,7 @@ __metadata: languageName: node linkType: hard -"eslint-plugin-promise@npm:^6.0.1": +"eslint-plugin-promise@npm:^6.0.0": version: 6.1.1 resolution: "eslint-plugin-promise@npm:6.1.1" peerDependencies: @@ -2564,7 +2582,7 @@ __metadata: languageName: node linkType: hard -"eslint-plugin-react@npm:^7.31.7, eslint-plugin-react@npm:^7.31.8": +"eslint-plugin-react@npm:^7.31.7, eslint-plugin-react@npm:latest": version: 7.33.2 resolution: "eslint-plugin-react@npm:7.33.2" dependencies: @@ -2590,16 +2608,6 @@ __metadata: languageName: node linkType: hard -"eslint-scope@npm:^5.1.1": - version: 5.1.1 - resolution: "eslint-scope@npm:5.1.1" - dependencies: - esrecurse: ^4.3.0 - estraverse: ^4.1.1 - checksum: 47e4b6a3f0cc29c7feedee6c67b225a2da7e155802c6ea13bbef4ac6b9e10c66cd2dcb987867ef176292bf4e64eccc680a49e35e9e9c669f4a02bac17e86abdb - languageName: node - linkType: hard - "eslint-scope@npm:^7.2.2": version: 7.2.2 resolution: "eslint-scope@npm:7.2.2" @@ -2619,17 +2627,6 @@ __metadata: languageName: node linkType: hard -"eslint-utils@npm:^3.0.0": - version: 3.0.0 - resolution: "eslint-utils@npm:3.0.0" - dependencies: - eslint-visitor-keys: ^2.0.0 - peerDependencies: - eslint: ">=5" - checksum: 0668fe02f5adab2e5a367eee5089f4c39033af20499df88fe4e6aba2015c20720404d8c3d6349b6f716b08fdf91b9da4e5d5481f265049278099c4c836ccb619 - languageName: node - linkType: hard - "eslint-visitor-keys@npm:^1.1.0": version: 1.3.0 resolution: "eslint-visitor-keys@npm:1.3.0" @@ -2637,13 +2634,6 @@ __metadata: languageName: node linkType: hard -"eslint-visitor-keys@npm:^2.0.0": - version: 2.1.0 - resolution: "eslint-visitor-keys@npm:2.1.0" - checksum: e3081d7dd2611a35f0388bbdc2f5da60b3a3c5b8b6e928daffff7391146b434d691577aa95064c8b7faad0b8a680266bcda0a42439c18c717b80e6718d7e267d - languageName: node - linkType: hard - "eslint-visitor-keys@npm:^3.3.0, eslint-visitor-keys@npm:^3.4.1, eslint-visitor-keys@npm:^3.4.3": version: 3.4.3 resolution: "eslint-visitor-keys@npm:3.4.3" @@ -2651,7 +2641,7 @@ __metadata: languageName: node linkType: hard -"eslint@npm:^8.23.1": +"eslint@npm:^8.0.1": version: 8.49.0 resolution: "eslint@npm:8.49.0" dependencies: @@ -2727,13 +2717,6 @@ __metadata: languageName: node linkType: hard -"estraverse@npm:^4.1.1": - version: 4.3.0 - resolution: "estraverse@npm:4.3.0" - checksum: a6299491f9940bb246124a8d44b7b7a413a8336f5436f9837aaa9330209bd9ee8af7e91a654a3545aee9c54b3308e78ee360cef1d777d37cfef77d2fa33b5827 - languageName: node - linkType: hard - "estraverse@npm:^5.1.0, estraverse@npm:^5.2.0, estraverse@npm:^5.3.0": version: 5.3.0 resolution: "estraverse@npm:5.3.0" @@ -3049,7 +3032,7 @@ __metadata: languageName: node linkType: hard -"get-tsconfig@npm:^4.5.0": +"get-tsconfig@npm:^4.5.0, get-tsconfig@npm:^4.7.0": version: 4.7.0 resolution: "get-tsconfig@npm:4.7.0" dependencies: @@ -3389,7 +3372,7 @@ __metadata: languageName: node linkType: hard -"ignore@npm:^5.1.1, ignore@npm:^5.2.0": +"ignore@npm:^5.1.1, ignore@npm:^5.2.0, ignore@npm:^5.2.4": version: 5.2.4 resolution: "ignore@npm:5.2.4" checksum: 3d4c309c6006e2621659311783eaea7ebcd41fe4ca1d78c91c473157ad6666a57a2df790fe0d07a12300d9aac2888204d7be8d59f9aaf665b1c7fcdb432517ef @@ -3522,7 +3505,7 @@ __metadata: languageName: node linkType: hard -"is-core-module@npm:^2.11.0, is-core-module@npm:^2.13.0, is-core-module@npm:^2.5.0, is-core-module@npm:^2.9.0": +"is-core-module@npm:^2.11.0, is-core-module@npm:^2.12.1, is-core-module@npm:^2.13.0, is-core-module@npm:^2.5.0, is-core-module@npm:^2.9.0": version: 2.13.0 resolution: "is-core-module@npm:2.13.0" dependencies: @@ -4339,13 +4322,6 @@ __metadata: languageName: node linkType: hard -"natural-compare-lite@npm:^1.4.0": - version: 1.4.0 - resolution: "natural-compare-lite@npm:1.4.0" - checksum: 5222ac3986a2b78dd6069ac62cbb52a7bf8ffc90d972ab76dfe7b01892485d229530ed20d0c62e79a6b363a663b273db3bde195a1358ce9e5f779d4453887225 - languageName: node - linkType: hard - "natural-compare@npm:^1.4.0": version: 1.4.0 resolution: "natural-compare@npm:1.4.0" @@ -4387,16 +4363,17 @@ __metadata: "@types/isomorphic-fetch": ^0.0.36 "@types/node": 20.6.0 "@types/react": 18.2.21 - "@typescript-eslint/eslint-plugin": ^5.38.0 + "@typescript-eslint/eslint-plugin": ^6.4.0 "@typescript-eslint/parser": ^5.38.0 - eslint: ^8.23.1 + eslint: ^8.0.1 eslint-config-next: latest eslint-config-standard: ^17.0.0 + eslint-config-standard-with-typescript: latest eslint-plugin-import: ^2.25.2 - eslint-plugin-n: ^15.2.5 + eslint-plugin-n: "^15.0.0 || ^16.0.0 " eslint-plugin-node: ^11.1.0 - eslint-plugin-promise: ^6.0.1 - eslint-plugin-react: ^7.31.8 + eslint-plugin-promise: ^6.0.0 + eslint-plugin-react: latest formik: ^2.4.4 gsap: ^3.12.2 husky: ^8.0.3 @@ -4407,7 +4384,7 @@ __metadata: react-dom: 18.2.0 sharp: ^0.32.5 swiper: ^10.2.0 - typescript: 5.2.2 + typescript: "*" yup: ^1.2.0 languageName: unknown linkType: soft @@ -5140,7 +5117,7 @@ __metadata: languageName: node linkType: hard -"resolve@npm:^1.10.0, resolve@npm:^1.10.1, resolve@npm:^1.19.0, resolve@npm:^1.22.1, resolve@npm:^1.22.4": +"resolve@npm:^1.10.0, resolve@npm:^1.10.1, resolve@npm:^1.19.0, resolve@npm:^1.22.2, resolve@npm:^1.22.4": version: 1.22.5 resolution: "resolve@npm:1.22.5" dependencies: @@ -5166,7 +5143,7 @@ __metadata: languageName: node linkType: hard -"resolve@patch:resolve@^1.10.0#~builtin, resolve@patch:resolve@^1.10.1#~builtin, resolve@patch:resolve@^1.19.0#~builtin, resolve@patch:resolve@^1.22.1#~builtin, resolve@patch:resolve@^1.22.4#~builtin": +"resolve@patch:resolve@^1.10.0#~builtin, resolve@patch:resolve@^1.10.1#~builtin, resolve@patch:resolve@^1.19.0#~builtin, resolve@patch:resolve@^1.22.2#~builtin, resolve@patch:resolve@^1.22.4#~builtin": version: 1.22.5 resolution: "resolve@patch:resolve@npm%3A1.22.5#~builtin::version=1.22.5&hash=c3c19d" dependencies: @@ -5281,7 +5258,7 @@ __metadata: languageName: node linkType: hard -"semver@npm:7.5.4, semver@npm:^7.0.0, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.3.7, semver@npm:^7.3.8, semver@npm:^7.5.4": +"semver@npm:7.5.4, semver@npm:^7.0.0, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.3.7, semver@npm:^7.5.3, semver@npm:^7.5.4": version: 7.5.4 resolution: "semver@npm:7.5.4" dependencies: @@ -6046,7 +6023,7 @@ __metadata: languageName: node linkType: hard -"typescript@npm:5.2.2, typescript@npm:^4.6.4 || ^5.0.0": +"typescript@npm:*, typescript@npm:^4.6.4 || ^5.0.0": version: 5.2.2 resolution: "typescript@npm:5.2.2" bin: @@ -6056,7 +6033,7 @@ __metadata: languageName: node linkType: hard -"typescript@patch:typescript@5.2.2#~builtin, typescript@patch:typescript@^4.6.4 || ^5.0.0#~builtin": +"typescript@patch:typescript@*#~builtin, typescript@patch:typescript@^4.6.4 || ^5.0.0#~builtin": version: 5.2.2 resolution: "typescript@patch:typescript@npm%3A5.2.2#~builtin::version=5.2.2&hash=f3b441" bin: