diff --git a/src/app/[locale]/(default)/doc/layout.tsx b/src/app/[locale]/(default)/doc/layout.tsx
index da1ac41..df15abc 100644
--- a/src/app/[locale]/(default)/doc/layout.tsx
+++ b/src/app/[locale]/(default)/doc/layout.tsx
@@ -1,19 +1,17 @@
import { cn } from '@/lib/utils'
-import { unstable_setRequestLocale } from 'next-intl/server'
+import { setRequestLocale } from 'next-intl/server'
import DocMenu from './DocMenu'
type Props = {
children: React.ReactNode
- params: {
+ params: Promise<{
locale: string
- }
+ }>
}
-export default async function DocLayout({
- children,
- params: { locale },
-}: Props) {
- unstable_setRequestLocale(locale)
+export default async function DocLayout({ children, params }: Props) {
+ const { locale } = await params
+ setRequestLocale(locale)
return (
<>
@@ -23,7 +21,7 @@ export default async function DocLayout({
diff --git a/src/app/[locale]/(default)/layout.tsx b/src/app/[locale]/(default)/layout.tsx
index e432619..3109605 100644
--- a/src/app/[locale]/(default)/layout.tsx
+++ b/src/app/[locale]/(default)/layout.tsx
@@ -1,19 +1,17 @@
-import { unstable_setRequestLocale } from 'next-intl/server'
+import { setRequestLocale } from 'next-intl/server'
import DefaultHeader from './DefaultHeader'
import DefaultFooter from './DefaultFooter'
type Props = {
children: React.ReactNode
- params: {
+ params: Promise<{
locale: string
- }
+ }>
}
-export default async function DefaultLayout({
- children,
- params: { locale },
-}: Props) {
- unstable_setRequestLocale(locale)
+export default async function DefaultLayout({ children, params }: Props) {
+ const { locale } = await params
+ setRequestLocale(locale)
return (
<>
diff --git a/src/app/[locale]/(default)/legal/[...slug]/page.tsx b/src/app/[locale]/(default)/legal/[...slug]/page.tsx
index ae5cddf..d7bf0f8 100644
--- a/src/app/[locale]/(default)/legal/[...slug]/page.tsx
+++ b/src/app/[locale]/(default)/legal/[...slug]/page.tsx
@@ -1,8 +1,8 @@
-import { unstable_setRequestLocale } from 'next-intl/server'
+import { setRequestLocale } from 'next-intl/server'
import {
ArticlePageProps,
getDataForArticlePageByFilename,
- getArticleBySlug,
+ getArticleBySlug
} from '@/lib/articles'
import ScrollSyncToc from '@/components/articles/ScrollSyncToc'
import ArticleContents from '@/components/articles/ArticleContents'
@@ -12,16 +12,15 @@ const { groupDir, generateMetadata, generateStaticParams } =
getDataForArticlePageByFilename(__filename)
export { generateMetadata, generateStaticParams }
-export default function LegalArticlePage({
- params: { locale, slug },
-}: ArticlePageProps) {
- unstable_setRequestLocale(locale)
+export default async function LegalArticlePage({ params }: ArticlePageProps) {
+ const { locale, slug } = await params
+ setRequestLocale(locale)
const articleData = getArticleBySlug(
slug,
['title', 'content'],
groupDir,
- locale,
+ locale
)
return (
@@ -38,7 +37,7 @@ export default function LegalArticlePage({
diff --git a/src/app/[locale]/(default)/news/[...slug]/page.tsx b/src/app/[locale]/(default)/news/[...slug]/page.tsx
index 0fa43f9..8af0fb2 100644
--- a/src/app/[locale]/(default)/news/[...slug]/page.tsx
+++ b/src/app/[locale]/(default)/news/[...slug]/page.tsx
@@ -1,9 +1,9 @@
-import { unstable_setRequestLocale } from 'next-intl/server'
+import { setRequestLocale } from 'next-intl/server'
import {
ArticlePageProps,
getDataForArticlePageByFilename,
getArticleBySlug,
- getArticleForIndex,
+ getArticleForIndex
} from '@/lib/articles'
import NewsMobileHeader from '../NewsMobileHeader'
import ScrollSyncToc from '@/components/articles/ScrollSyncToc'
@@ -11,39 +11,36 @@ import { cn } from '@/lib/utils'
import ArticleContents from '@/components/articles/ArticleContents'
import Image from 'next/image'
import { AspectRatio } from '@/components/ui/aspect-ratio'
-import { useTranslations } from 'next-intl'
import ArticleIndex from '@/components/articles/ArticleIndex'
-import { usePagerData } from '@/hooks/articles/usePagerData'
import ArticlePager from '@/components/articles/ArticlePager'
+import { getPagerData } from '@/lib/getPagerData'
const { groupDir, generateMetadata, generateStaticParams, getArticlePaths } =
getDataForArticlePageByFilename(__filename)
export { generateMetadata, generateStaticParams }
-export default function NewsArticlePage({
- params: { locale, slug },
-}: ArticlePageProps) {
- unstable_setRequestLocale(locale)
- const t = useTranslations()
+export default async function NewsArticlePage({ params }: ArticlePageProps) {
+ const { locale, slug } = await params
+ setRequestLocale(locale)
const articleData = getArticleBySlug(
slug,
['title', 'category', 'thumbnail', 'date', 'content'],
groupDir,
- locale,
+ locale
)
const articlesData = getArticleForIndex(
groupDir,
['title', 'thumbnail', 'date'],
- locale,
+ locale
)
- const pagerData = usePagerData({
+ const pagerData = getPagerData({
slug,
groupDir,
locale,
- articlePaths: getArticlePaths(),
+ articlePaths: getArticlePaths()
})
return (
@@ -88,7 +85,7 @@ export default function NewsArticlePage({
@@ -97,9 +94,6 @@ export default function NewsArticlePage({
-
- {t('news.latestNews')}
-
diff --git a/src/app/[locale]/(default)/news/page.tsx b/src/app/[locale]/(default)/news/page.tsx
index 038a6d5..2dba21b 100644
--- a/src/app/[locale]/(default)/news/page.tsx
+++ b/src/app/[locale]/(default)/news/page.tsx
@@ -1,6 +1,5 @@
-import { unstable_setRequestLocale } from 'next-intl/server'
+import { setRequestLocale } from 'next-intl/server'
import { getDataForPageByFilename, PageProps } from '@/lib/pages'
-import { useTranslations } from 'next-intl'
import { getArticleForIndex } from '@/lib/articles'
import ArticleIndex from '@/components/articles/ArticleIndex'
@@ -8,21 +7,17 @@ import ArticleIndex from '@/components/articles/ArticleIndex'
const { groupDir, generateMetadata } = getDataForPageByFilename(__filename)
export { generateMetadata }
-export default function NewsPage({ params: { locale } }: PageProps) {
- unstable_setRequestLocale(locale)
- const t = useTranslations()
-
+export default async function NewsPage({ params }: PageProps) {
+ const { locale } = await params
+ setRequestLocale(locale)
const articlesData = getArticleForIndex(
groupDir,
['title', 'thumbnail', 'date'],
- locale,
+ locale
)
return (
<>
-
- {t('news.title')}
-
)
diff --git a/src/app/[locale]/layout.tsx b/src/app/[locale]/layout.tsx
index 90d8873..d7c9e96 100644
--- a/src/app/[locale]/layout.tsx
+++ b/src/app/[locale]/layout.tsx
@@ -1,5 +1,5 @@
import { Inter, Noto_Sans_JP } from 'next/font/google'
-import { unstable_setRequestLocale, getMessages } from 'next-intl/server'
+import { setRequestLocale, getMessages } from 'next-intl/server'
import { NextIntlClientProvider } from 'next-intl'
import '../globals.css'
import '@dialectlabs/blinks/index.css'
@@ -23,20 +23,18 @@ const notoSansJP = Noto_Sans_JP({
type Props = {
children: React.ReactNode
- params: {
+ params: Promise<{
locale: string
- }
+ }>
}
export function generateStaticParams() {
return locales.map((locale) => ({ locale }))
}
-export default async function LocaleLayout({
- children,
- params: { locale }
-}: Props) {
- unstable_setRequestLocale(locale)
+export default async function LocaleLayout({ children, params }: Props) {
+ const { locale } = await params
+ setRequestLocale(locale)
const messages = await getMessages({ locale })
return (
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index bd5cece..bb4a286 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -2,51 +2,52 @@ import { getTranslations } from 'next-intl/server'
import { locales } from './config'
import appInfo from '@appInfo'
-export async function generateMetadata({ params: { locale } }: Props) {
+export async function generateMetadata({ params }: Props) {
+ const { locale } = await params
const t = await getTranslations({
locale: locale ? locale : locales[0],
- namespace: 'metadata',
+ namespace: 'metadata'
})
return {
metadataBase: new URL(
process.env.NODE_ENV === 'production'
? `https://${appInfo.domain}`
- : 'http://localhost:4242',
+ : 'http://localhost:4242'
),
generator: appInfo.copyright,
applicationName: t('appTitle'),
keywords: t('keywords'),
title: {
template: `%s | ${t('appTitle')}`,
- default: `${t('defaultTitle')} | ${t('appTitle')}`,
+ default: `${t('defaultTitle')} | ${t('appTitle')}`
},
description: t('defaultDescription'),
openGraph: {
locale,
- type: 'website',
+ type: 'website'
},
twitter: {
card: 'summary_large_image',
creator: appInfo.twitterId,
- site: appInfo.twitterId,
+ site: appInfo.twitterId
},
robots: {
index: true,
- follow: true,
- },
+ follow: true
+ }
}
}
type Props = {
children: React.ReactNode
- params: {
+ params: Promise<{
locale: string
- }
+ }>
}
export default function RootLayout({
- children,
+ children
}: Readonly<{
children: React.ReactNode
}>) {
diff --git a/src/app/not-found.tsx b/src/app/not-found.tsx
index 5555847..6643327 100644
--- a/src/app/not-found.tsx
+++ b/src/app/not-found.tsx
@@ -1,3 +1,5 @@
+import Link from 'next/link'
+
export default function NotFound() {
return (
<>
@@ -8,7 +10,7 @@ export default function NotFound() {
@@ -19,9 +21,9 @@ export default function NotFound() {