Merge pull request #691 from danactive/lint

Upgrade Next.js to v16

Author: danactive

.gitignore

@@ -5,15 +5,16 @@ node_modules
 /test-results/
 playwright-report/
 /playwright/.cache/
+coverage
+.nyc_output
 
 # next.js
 /.next/
-/out/
+next-env.d.ts
 
 # production
 /build
 
-
 # misc
 .DS_Store
 *.pem
@@ -23,7 +24,6 @@ npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
 
-
 # vercel
 .vercel
 
@@ -34,10 +34,10 @@ generated.ts
 # IDE
 .vscode
 
-coverage
-.nyc_output
-tmp
-public/resized
+# Python
 models
 weights.log
 api.log
+
+# Images
+public/resized

app/[gallery]/[album]/page.tsx

@@ -1,17 +1,16 @@
-import type { Metadata, ResolvingMetadata } from 'next'
+import type { Metadata } from 'next'
 import { Suspense } from 'react'
 
 import AlbumPageComponent from '../../../src/components/Album/AlbumClient'
 import getAlbum from '../../../src/lib/album'
 import getAlbums from '../../../src/lib/albums'
 import getGalleries from '../../../src/lib/galleries'
+import { generateClusters } from '../../../src/lib/generate-clusters'
 import indexKeywords, { addGeographyToSearch } from '../../../src/lib/search'
 import type { Album } from '../../../src/types/pages'
-import { generateClusters } from '../../../src/lib/generate-clusters'
 
 export async function generateMetadata(
   { params }: { params: Promise<Album.Params> },
-  parent: ResolvingMetadata,
 ): Promise<Metadata> {
   const album = (await params).album
   return { title: `Album ${album} - History App` }

app/[gallery]/page.tsx

@@ -31,12 +31,10 @@ async function getAlbumsData(gallery: GalleryName): Promise<Gallery.ComponentPro
   }
 }
 
-export default async function GalleryServer(props: { params: Promise<Gallery.Params> }) {
-  const params = await props.params
-
+export default async function GalleryServer({ params }: { params: Promise<Gallery.Params> }) {
   const {
     gallery,
-  } = params
+  } = await params
 
   const { albums, indexedKeywords } = await getAlbumsData(gallery)
 

app/admin/walk/[...path]/page.tsx

@@ -2,6 +2,7 @@ import type { Metadata } from 'next'
 
 import WalkClient from '../../../../src/components/Walk/WalkClient'
 import getFilesystems from '../../../../src/lib/filesystems'
+import type { Walk } from '../../../../src/types/pages'
 
 export const metadata: Metadata = {
   title: 'Admin > Walk - History App',
@@ -31,11 +32,7 @@ async function getAllFolderPaths(path = '/') {
   return paths
 }
 
-export default async function Page({
-  params,
-}: {
-  params: Promise<{ path?: string[] }>
-}) {
+export default async function Page({ params }: { params: Promise<Walk.Params> }) {
   const { path: nextRoutePath = [] } = await params
   const path = nextRoutePath.join('/')
   const fsPath = path ? `/${path}` : '/'

app/api/galleries/route.ts

@@ -2,7 +2,7 @@ import { NextResponse } from 'next/server'
 
 import get, { errorSchema } from '../../../src/lib/galleries'
 
-async function GET(req: Request) {
+async function GET() {
   const out = await get(true)
   return NextResponse.json(out.body, { status: out.status })
 }

jest.config.mjs

@@ -11,7 +11,7 @@ const customJestConfig = {
   setupFilesAfterEnv: ['<rootDir>/jest.setup.ts'],
   moduleDirectories: ['node_modules', '<rootDir>/'],
   testEnvironment: 'jest-environment-jsdom',
-  testMatch: ['**/__tests__/**/*.(j|t)s?(x)', '!**/*.vitest.(j|t)s', '!**/*.e2e.spec.(j|t)s'],
+  testMatch: ['**/__tests__/**/*.(j|t)s?(x)', '!**/*.vitest.(j|t)s?(x)', '!**/*.e2e.spec.(j|t)s'],
 }
 
 // createJestConfig is exported this way to ensure that next/jest can load the Next.js config which is async

next-env.d.ts

@@ -1,10 +1,12 @@
+/** @type {import('next').NextConfig} */
 const nextConfig = {
   reactStrictMode: true,
   compiler: {
     styledComponents: true,
   },
-  eslint: {
-    dirs: ['pages', 'src', '__tests__', 'app'],
-  },
+  reactCompiler: true,
+  // images: {
+  //   localPatterns: [{ pathname: '/galleries/*/media/**', search: '' }],
+  // },
 }
 export default nextConfig