perf(frontend)!: Update to next-intl v4

VitNode · Dec 23, 2024 · ecdbe73 · ecdbe73
1 parent 4a56616
commit ecdbe73
Show file tree

Hide file tree

Showing 10 changed files with 51 additions and 57 deletions.
diff --git a/apps/frontend/global.d.ts b/apps/frontend/global.d.ts
@@ -4,6 +4,8 @@ import type welcome from '@/plugins/welcome/langs/en.json';
 
 type Messages = typeof core & typeof admin & typeof welcome;
 
-declare global {
-  interface IntlMessages extends Messages {}
+declare module 'next-intl' {
+  interface AppConfig {
+    Messages: Messages;
+  }
 }
diff --git a/apps/frontend/package.json b/apps/frontend/package.json
@@ -18,7 +18,7 @@
     "geist": "^1.3.1",
     "lucide-react": "^0.468.0",
     "next": "^15.1.2",
-    "next-intl": "^3.26.2",
+    "next-intl": "4.0.0-beta-ddd5ae5",
     "react": "^19.0.0",
     "react-dom": "^19.0.0",
     "react-hook-form": "^7.54.1",

diff --git a/packages/create-vitnode-app/helpers/create-packages-json.ts b/packages/create-vitnode-app/helpers/create-packages-json.ts
@@ -85,7 +85,7 @@ export const createPackagesJSON = async ({
       geist: '^1.3.1',
       'lucide-react': '^0.469.0',
       next: '^15.1.2',
-      'next-intl': '^3.26.2',
+      'next-intl': '4.0.0-beta-ddd5ae5',
       react: '^19.0.0',
       'react-dom': '^19.0.0',
       'react-hook-form': '^7.54.1',

diff --git a/packages/create-vitnode-app/templates/basic/apps/frontend/global.d.ts b/packages/create-vitnode-app/templates/basic/apps/frontend/global.d.ts
@@ -4,6 +4,8 @@ import type welcome from '@/plugins/welcome/langs/en.json';
 
 type Messages = typeof core & typeof admin & typeof welcome;
 
-declare global {
-  interface IntlMessages extends Messages {}
+declare module 'next-intl' {
+  interface AppConfig {
+    Messages: Messages;
+  }
 }
diff --git a/packages/frontend/global.d.ts b/packages/frontend/global.d.ts
@@ -4,6 +4,8 @@ import type welcome from '../../apps/frontend/src/plugins/welcome/langs/en.json'
 
 type Messages = typeof core & typeof admin & typeof welcome;
 
-declare global {
-  interface IntlMessages extends Messages {}
+declare module 'next-intl' {
+  interface AppConfig {
+    Messages: Messages;
+  }
 }
diff --git a/packages/frontend/package.json b/packages/frontend/package.json
@@ -95,7 +95,7 @@
     "@hookform/resolvers": "^3.9.1",
     "lucide-react": "*",
     "next": "^15.1.2",
-    "next-intl": "^3.26.2",
+    "next-intl": "4.0.0-beta-ddd5ae5",
     "react": "^19.0.0",
     "react-dom": "^19.0.0",
     "react-hook-form": "^7.54.1",
@@ -119,7 +119,7 @@
     "eslint-config-typescript-vitnode": "workspace:*",
     "lucide-react": "^0.469.0",
     "next": "^15.1.2",
-    "next-intl": "^3.26.3",
+    "next-intl": "4.0.0-beta-ddd5ae5",
     "react": "^19.0.0",
     "react-dom": "^19.0.0",
     "react-hook-form": "^7.54.2",

diff --git a/packages/frontend/src/components/translations-provider.tsx b/packages/frontend/src/components/translations-provider.tsx
@@ -1,4 +1,9 @@
-import { NamespaceKeys, NestedKeyOf, NextIntlClientProvider } from 'next-intl';
+import {
+  Messages,
+  NamespaceKeys,
+  NestedKeyOf,
+  NextIntlClientProvider,
+} from 'next-intl';
 import { getLocale, getMessages } from 'next-intl/server';
 import 'server-only';
 
@@ -30,10 +35,7 @@ const pick = (obj: object, paths: string[]) => {
 };
 
 export async function TranslationsProvider<
-  NestedKey extends NamespaceKeys<
-    IntlMessages,
-    NestedKeyOf<IntlMessages>
-  > = never,
+  NestedKey extends NamespaceKeys<Messages, NestedKeyOf<Messages>> = never,
 >({
   children,
   namespaces,

diff --git a/packages/frontend/src/i18n.ts b/packages/frontend/src/i18n.ts
@@ -13,8 +13,8 @@ export const i18nConfigVitNode = async ({
   }) => Promise<{ default: object }>;
   requestLocale: Promise<string | undefined>;
 }) => {
-  let locale = await requestLocale;
   let defaultLocale = 'en';
+  let locale = (await requestLocale) ?? 'en';
 
   if (!locale) {
     locale = 'en';
@@ -28,7 +28,7 @@ export const i18nConfigVitNode = async ({
     const defaultLanguage = data.languages.find(lang => lang.default);
     defaultLocale = defaultLanguage?.code ?? 'en';
     if (!data.languages.find(lang => lang.code === locale)) {
-      locale = defaultLanguage?.code;
+      locale = defaultLanguage?.code ?? defaultLocale;
     }
   } catch (_) {
     // If the request fails, we will use the default plugins

diff --git a/packages/frontend/src/navigation/index.tsx b/packages/frontend/src/navigation/index.tsx
@@ -1,7 +1,6 @@
-import { createNavigation } from 'next-intl/navigation';
+import { createNavigation, QueryParams } from 'next-intl/navigation';
 import { getLocale } from 'next-intl/server';
 import { RedirectType } from 'next/navigation';
-import { QueryParams } from 'node_modules/next-intl/dist/types/src/navigation/shared/utils';
 import React from 'react';
 
 import { usePathname, useRouter } from './router';

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml