feat: reorganise locale files

next.config.js

@@ -5,7 +5,7 @@ import nextIntl from 'next-intl/plugin';
  * for Docker builds.
  */
 await import('./src/env.js');
-const withNextIntl = nextIntl('./src/i18n.ts');
+const withNextIntl = nextIntl('./src/lib/locale/i18n.ts');
 
 /** @type {import("next").NextConfig} */
 const config = {};

src/app/[locale]/(default)/news/(header)/layout.tsx

@@ -2,7 +2,7 @@ import { SquarePen } from 'lucide-react';
 import { useTranslations } from 'next-intl';
 import { unstable_setRequestLocale } from 'next-intl/server';
 
-import { Link } from '@/lib/navigation';
+import { Link } from '@/lib/locale/navigation';
 
 import { Button } from '@/components/ui/Button';
 

src/app/[locale]/layout.tsx

@@ -2,7 +2,7 @@ import { getTranslations, unstable_setRequestLocale } from 'next-intl/server';
 import { Inter, Montserrat } from 'next/font/google';
 import { notFound } from 'next/navigation';
 
-import { locales } from '@/lib/config';
+import { locales } from '@/lib/locale/config';
 import { cx } from '@/lib/utils';
 
 import { RootProviders } from '@/components/providers/RootProviders';

src/app/not-found.tsx

@@ -2,7 +2,7 @@
 
 import { redirect, usePathname } from 'next/navigation';
 
-import { defaultLocale } from '@/lib/config';
+import { defaultLocale } from '@/lib/locale/config';
 
 export default function NotFound() {
   const pathname = usePathname();

src/components/layout/Footer.tsx

@@ -2,7 +2,7 @@ import { Bug, Mail } from 'lucide-react';
 import { useTranslations } from 'next-intl';
 import ExternalLink from 'next/link';
 
-import { Link } from '@/lib/navigation';
+import { Link } from '@/lib/locale/navigation';
 
 import { Facebook } from '@/components/assets/icons/Facebook';
 import { Github } from '@/components/assets/icons/Github';

src/components/layout/LogoLink.tsx

@@ -1,6 +1,6 @@
 import { useTranslations } from 'next-intl';
 
-import { Link } from '@/lib/navigation';
+import { Link } from '@/lib/locale/navigation';
 import { cx } from '@/lib/utils';
 
 import { Logo } from '@/components/assets/Logo';

src/components/layout/Nav.tsx

@@ -1,4 +1,4 @@
-import { Link } from '@/lib/navigation';
+import { Link } from '@/lib/locale/navigation';
 
 import { Button } from '@/components/ui/Button';
 

src/components/news/ArticleCard.tsx

@@ -1,6 +1,6 @@
 import Image from 'next/image';
 
-import { Link } from '@/lib/navigation';
+import { Link } from '@/lib/locale/navigation';
 import { cx } from '@/lib/utils';
 
 import { InternalBadge } from '@/components/news/InternalBadge';

src/components/news/ArticleItem.tsx

@@ -1,6 +1,6 @@
 import Image from 'next/image';
 
-import { Link } from '@/lib/navigation';
+import { Link } from '@/lib/locale/navigation';
 import { cx } from '@/lib/utils';
 
 import { InternalBadge } from '@/components/news/InternalBadge';

src/components/settings/LocaleMenu.tsx

@@ -4,8 +4,8 @@ import { Globe2 } from 'lucide-react';
 import { useParams } from 'next/navigation';
 import * as React from 'react';
 
-import { flagIcons, locales } from '@/lib/config';
-import { usePathname, useRouter } from '@/lib/navigation';
+import { flagIcons, locales } from '@/lib/locale/config';
+import { usePathname, useRouter } from '@/lib/locale/navigation';
 
 import { Button } from '@/components/ui/Button';
 import {

src/lib/config.ts → src/lib/locale/config.ts

@@ -1,6 +1,6 @@
 import GBflagIcon from 'country-flag-icons/react/1x1/GB';
 import NOflagIcon from 'country-flag-icons/react/1x1/NO';
-import type { Pathnames } from 'next-intl/navigation';
+import type { Pathnames } from 'next-intl/routing';
 
 const flagIcons = { en: GBflagIcon, no: NOflagIcon };
 

src/i18n.ts → src/lib/locale/i18n.ts

@@ -2,5 +2,6 @@ import { getRequestConfig } from 'next-intl/server';
 
 export default getRequestConfig(async ({ locale }) => ({
   // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-  messages: (await import(`../messages/${locale}.json`)).default as Messages,
+  messages: (await import(`../../../messages/${locale}.json`))
+    .default as Messages,
 }));

src/lib/navigation.ts → src/lib/locale/navigation.ts

@@ -1,6 +1,6 @@
 import { createLocalizedPathnamesNavigation } from 'next-intl/navigation';
 
-import { localePrefix, locales, pathnames } from '@/lib/config';
+import { localePrefix, locales, pathnames } from '@/lib/locale/config';
 
 export const { Link, redirect, usePathname, useRouter, getPathname } =
   createLocalizedPathnamesNavigation({ locales, localePrefix, pathnames });

src/middleware.ts

@@ -1,6 +1,11 @@
 import createMiddleware from 'next-intl/middleware';
 
-import { defaultLocale, localePrefix, locales, pathnames } from '@/lib/config';
+import {
+  defaultLocale,
+  localePrefix,
+  locales,
+  pathnames,
+} from '@/lib/locale/config';
 
 export default createMiddleware({
   defaultLocale,