@@ -130,7 +129,7 @@ export default function CharacterBasicInfo({
= {};
+
export default getRequestConfig(async () => {
const store = await cookies();
const cookieLocale = store.get('locale')?.value || 'en';
+ // 如果缓存中没有这个语言，才去加载
+ if (!locales[cookieLocale]) {
+ locales[cookieLocale] = (
+ await import(`@/locales/${cookieLocale}.ts`)
+ ).default;
+ }
+
return {
locale: cookieLocale,
- messages: (await import(`@/locales/${cookieLocale}.ts`)).default,
+ messages: locales[cookieLocale], // 直接从缓存中读取
};
});
diff --git a/src/layouts/Providers/IntlProvider.tsx b/src/layouts/Providers/IntlProvider.tsx
index 9e6e6f8..28287b3 100644
--- a/src/layouts/Providers/IntlProvider.tsx
+++ b/src/layouts/Providers/IntlProvider.tsx
@@ -42,6 +42,7 @@ function getLocaleFromCookie(): Locale {
if (cookieLocale && (cookieLocale === 'zh' || cookieLocale === 'en')) {
return cookieLocale;
}
+ setLocaleToCookie('en');
return 'en';
}
@@ -58,8 +59,8 @@ export function IntlProvider({ children }: IntlProviderProps) {
useEffect(() => {
const cookieLocale = getLocaleFromCookie();
if (cookieLocale) {
- setLocaleState(cookieLocale);
loadLocale(cookieLocale);
+ setLocaleState(cookieLocale);
}
}, []);
@@ -76,7 +77,7 @@ export function IntlProvider({ children }: IntlProviderProps) {
{children}
diff --git a/src/middleware.ts b/src/proxy.ts
similarity index 89%
rename from src/middleware.ts
rename to src/proxy.ts
index cc4e31c..752e80a 100644
--- a/src/middleware.ts
+++ b/src/proxy.ts
@@ -1,6 +1,6 @@
import { NextRequest, NextResponse } from 'next/server';
-export function middleware(request: NextRequest) {
+export function proxy(request: NextRequest) {
const localeCookie = request.cookies.get('locale');
if (localeCookie?.value) {
diff --git a/tsconfig.json b/tsconfig.json
index 2ff581a..1d297c5 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,7 +1,11 @@
{
"compilerOptions": {
"target": "ES2017",
- "lib": ["dom", "dom.iterable", "esnext"],
+ "lib": [
+ "dom",
+ "dom.iterable",
+ "esnext"
+ ],
"allowJs": true,
"skipLibCheck": true,
"strict": true,
@@ -11,7 +15,7 @@
"moduleResolution": "bundler",
"resolveJsonModule": true,
"isolatedModules": true,
- "jsx": "preserve",
+ "jsx": "react-jsx",
"incremental": true,
"plugins": [
{
@@ -20,9 +24,19 @@
],
"baseUrl": ".",
"paths": {
- "@/*": ["./src/*"]
+ "@/*": [
+ "./src/*"
+ ]
}
},
- "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"],
- "exclude": ["node_modules"]
+ "include": [
+ "next-env.d.ts",
+ "**/*.ts",
+ "**/*.tsx",
+ ".next/types/**/*.ts",
+ ".next/dev/types/**/*.ts"
+ ],
+ "exclude": [
+ "node_modules"
+ ]
}