Merge pull request #139 from tmshv/upd/maintenance-004

maintenance 4

next.config.js

@@ -1,9 +0,0 @@
-module.exports = {
-    trailingSlash: false,
-    images: {
-        domains: [
-            'hudozkacdn.tmshv.com',
-            'images.weserv.nl',
-        ],
-    }
-}

next.config.mjs

@@ -0,0 +1,15 @@
+/**
+ * @type {import('next').NextConfig}
+ */
+const nextConfig = {
+    trailingSlash: false,
+    images: {
+        domains: [
+            "hudozkacdn.tmshv.com",
+            "images.weserv.nl",
+        ],
+    },
+    /* config options here */
+}
+
+export default nextConfig

package.json

@@ -24,8 +24,8 @@
         "date-fns": "^2.29.0",
         "lodash": "^4.17.21",
         "markdown-it": "^13.0.1",
-        "next": "^12.3.0",
-        "next-seo": "^5.5.0",
+        "next": "^13.1.0",
+        "next-seo": "^5.15.0",
         "react": "^18.2.0",
         "react-dom": "^18.2.0",
         "react-icons": "^4.2.0",
@@ -39,13 +39,12 @@
         "@types/classnames": "^2.2.10",
         "@types/lodash": "^4.14.149",
         "@types/markdown-it": "^12.2.3",
-        "@types/node": "^12.12.34",
+        "@types/node": "^18.13.0",
         "@types/react": "^18.0.18",
         "@types/sharp": "^0.29.2",
-        "eslint": "^8.25.0",
-        "eslint-config-next": "^12.3.0",
+        "eslint": "^8.33.0",
+        "eslint-config-next": "^13.1.0",
         "feed": "^4.1.0",
-        "should": "^8.2.2",
-        "typescript": "^4.8.2"
+        "typescript": "^4.9.0"
     }
 }

src/components/Card/index.tsx

@@ -20,15 +20,13 @@ export type CardProps = {
 export const Card: React.FC<CardProps> = props => (
     <div className={cx(s.card, layoutClass[props.layout])} style={props.style}>
         <Link href={props.href}>
-            <a>
-                <div className={s.image}>
-                    {props.cover}
-                </div>
+            <div className={s.image}>
+                {props.cover}
+            </div>
 
-                <div className={s.body}>
-                    {props.children}
-                </div>
-            </a>
+            <div className={s.body}>
+                {props.children}
+            </div>
         </Link>
     </div>
 )

src/components/Contacts/index.tsx

@@ -15,7 +15,7 @@ export const Contacts: React.FC = props => {
             {contacts.map((x, i) => (
                 <p key={i} className={s.link}>
                     <Link href={x.value}>
-                        <a >{x.title}</a>
+                        {x.title}
                     </Link>
                 </p>
             ))}

src/components/FIleCard/index.tsx

@@ -50,16 +50,14 @@ export const FileCard: React.FC<FileCardProps> = props => {
                         />
                     )}
                     <Link href={props.url}>
-                        <a>{props.title}</a>
+                        {props.title}
                     </Link>
                 </Box>
             </div>
 
             <div className={s.info}>
-                <Link href={props.file_url}>
-                    <a target="_blank" rel="noreferrer">
-                        {format} ({fileSize})
-                    </a>
+                <Link href={props.file_url} target="_blank" rel="noreferrer">
+                    {format} ({fileSize})
                 </Link>
             </div>
         </div>

src/components/File/index.tsx

@@ -12,20 +12,16 @@ export const File: React.FC<FileProps> = props => (
     <div className={s.file} style={props.style}>
         {!props.cover?.src ? null : (
             <div className={s.image}>
-                <Link href={props.file.src} >
-                    <a target="_blank" rel="noreferrer" className="invisible">
-                        <img src={props.cover.src} alt={props.name} />
-                    </a>
+                <Link href={props.file.src} target="_blank" rel="noreferrer" className="invisible">
+                    <img src={props.cover.src} alt={props.name} />
                 </Link>
             </div>
         )}
 
         <div className={s.info}>
             <span>{props.name}</span>
-            <Link href={props.file.src} >
-                <a target="_blank" rel="noreferrer">
-                    {ext(props.file.type)} ({size(props.file.size)})
-                </a>
+            <Link href={props.file.src} target={"_blank"} rel={"noreferrer"}>
+                {ext(props.file.type)} ({size(props.file.size)})
             </Link>
         </div>
     </div>

src/components/HudozkaLogo/index.tsx

@@ -1,6 +1,6 @@
 import s from "./logo.module.css"
 
-import Image from "next/future/image"
+import Image from "next/image"
 import image from "src/assets/hudozka-logo.png"
 
 export type HudozkaLogoProps = {

src/components/Menu/ActiveLink.tsx

@@ -9,7 +9,7 @@ export type ActiveLinkProps = {
 export const ActiveLink: React.FC<ActiveLinkProps> = props => props.href
     ? (
         <Link href={props.href}>
-            <a>{props.children}</a>
+            {props.children}
         </Link>
     ) : (
         <span style={props.activeStyle}>{props.children}</span>

src/components/Navigation/DesktopNavigation.tsx

@@ -17,9 +17,7 @@ export const DesktopNavigation: React.FC<DesktopNavigationProps> = ({ style }) =
     return (
         <Box wrap gap={"var(--size-s)"} style={style}>
             <Link href="/">
-                <a>
-                    <HudozkaLogo dark={dark} />
-                </a>
+                <HudozkaLogo dark={dark} />
             </Link>
 
             <Menu

src/components/Navigation/MobileNavigation.tsx

@@ -48,9 +48,7 @@ export const MobileNavigation: React.FC<MobileNavigationProps> = ({ style }) =>
 
             <Box wrap gap={"var(--size-s)"} style={style}>
                 <Link href="/">
-                    <a>
-                        <HudozkaLogo dark={dark} />
-                    </a>
+                    <HudozkaLogo dark={dark} />
                 </Link>
                 <HudozkaTitle compact />
                 <Spacer />

src/components/NotFound/index.tsx

@@ -11,7 +11,7 @@ export const NotFound: React.FC = () => (
 
         <div>
             <Link href={"/"}>
-                <a>На главную</a>
+                На главную
             </Link>
         </div>
     </section>

src/components/PageGrid/index.tsx

@@ -45,7 +45,7 @@ export const PageGrid: React.FC<PageGridProps> = props => {
                                 layout={"fill"}
                                 objectFit={"cover"}
                                 src={item.cover.src}
-                                alt={item.cover.alt}
+                                alt={item.cover.alt ?? ""}
                                 placeholder={item.cover.blur ? "blur" : "empty"}
                                 blurDataURL={item.cover.blur}
                             />

src/ui/Button/index.tsx

@@ -39,10 +39,8 @@ export const Button: React.FC<ButtonProps> = ({ size = "default", theme = "defau
 
     if (props.href) {
         return (
-            <Link href={props.href}>
-                <a className={className} style={props.style}>
-                    {props.children}
-                </a>
+            <Link href={props.href} className={className} style={props.style}>
+                {props.children}
             </Link>
         )
     }

src/ui/Picture/index.tsx

@@ -38,7 +38,7 @@ export const Picture: React.FC<PictureProps> = memo(({
             <Image
                 className={s.img}
                 src={src}
-                alt={alt}
+                alt={alt ?? ""}
                 width={width}
                 height={height}
                 layout={"responsive"}