Feat/next/translation memoization

packages/next/src/pages/CreateFirstUser/index.tsx

@@ -24,7 +24,7 @@ export const generateMetadata = async ({
 }: {
   config: Promise<SanitizedConfig>
 }): Promise<Metadata> => {
-  const t = getNextT({
+  const t = await getNextT({
     config: await config,
   })
 

packages/next/src/pages/ForgotPassword/index.tsx

@@ -15,7 +15,7 @@ export const generateMetadata = async ({
 }: {
   config: Promise<SanitizedConfig>
 }): Promise<Metadata> => {
-  const t = getNextT({
+  const t = await getNextT({
     config: await config,
   })
 

packages/next/src/pages/Login/index.tsx

@@ -18,7 +18,7 @@ export const generateMetadata = async ({
 }: {
   config: Promise<SanitizedConfig>
 }): Promise<Metadata> => {
-  const t = getNextT({
+  const t = await getNextT({
     config: await config,
   })
 

packages/next/src/pages/Logout/index.tsx

@@ -15,7 +15,7 @@ export const generateMetadata = async ({
 }: {
   config: Promise<SanitizedConfig>
 }): Promise<Metadata> => {
-  const t = getNextT({
+  const t = await getNextT({
     config: await config,
   })
 

packages/next/src/pages/ResetPassword/index.tsx

@@ -25,7 +25,7 @@ export const generateMetadata = async ({
 }: {
   config: Promise<SanitizedConfig>
 }): Promise<Metadata> => {
-  const t = getNextT({
+  const t = await getNextT({
     config: await config,
   })
 

packages/next/src/pages/Unauthorized/index.tsx

@@ -12,7 +12,7 @@ export const generateMetadata = async ({
 }: {
   config: Promise<SanitizedConfig>
 }): Promise<Metadata> => {
-  const t = getNextT({
+  const t = await getNextT({
     config: await config,
   })
 

packages/next/src/pages/Verify/index.tsx

@@ -16,7 +16,7 @@ export const generateMetadata = async ({
 }: {
   config: Promise<SanitizedConfig>
 }): Promise<Metadata> => {
-  const t = getNextT({
+  const t = await getNextT({
     config: await config,
   })
 

packages/next/src/routes/index.ts

@@ -1,7 +1,10 @@
 import config from 'payload-config'
-import { createPayloadRequest } from '../utilities/createPayloadRequest'
+import type { PayloadRequest } from 'payload/types'
+import type { Endpoint } from 'payload/config'
 import { match } from 'path-to-regexp'
 
+import { createPayloadRequest } from '../utilities/createPayloadRequest'
+
 import { me } from './auth/me'
 import { init } from './auth/init'
 import { login } from './auth/login'
@@ -32,8 +35,6 @@ import { docAccess as docAccessGlobal } from './globals/docAccess'
 import { findVersions as findVersionsGlobal } from './globals/findVersions'
 import { restoreVersion as restoreVersionGlobal } from './globals/restoreVersion'
 import { findVersionByID as findVersionByIdGlobal } from './globals/findVersionByID'
-import { PayloadRequest } from 'payload/types'
-import { Endpoint } from 'payload/config'
 
 const endpoints = {
   root: {

packages/next/src/utilities/createPayloadRequest.ts

@@ -8,9 +8,9 @@ import { getAuthenticatedUser } from 'payload/auth'
 import { getPayload } from 'payload'
 import { URL } from 'url'
 import { parseCookies } from 'payload/auth'
+import { initI18n } from '@payloadcms/translations'
 import { getRequestLanguage } from './getRequestLanguage'
 import { getRequestLocales } from './getRequestLocales'
-import { getNextI18n } from './getNextI18n'
 import { getDataAndFile } from './getDataAndFile'
 
 type Args = {
@@ -61,10 +61,10 @@ export const createPayloadRequest = async ({
     cookies,
   })
 
-  const i18n = getNextI18n({
-    config,
+  const i18n = await initI18n({
+    config: config.i18n,
     language,
-    translationContext: 'api',
+    translationsContext: 'api',
   })
 
   const customRequest: CustomPayloadRequest = {

packages/next/src/utilities/getNextT.ts

@@ -1,24 +1,23 @@
-import { translations } from '@payloadcms/translations/client'
 import type { TFunction } from '@payloadcms/translations'
 
 import type { SanitizedConfig } from 'payload/types'
 
-import { initTFunction } from '@payloadcms/translations'
+import { initI18n } from '@payloadcms/translations'
 import { cookies, headers } from 'next/headers'
 import { getRequestLanguage } from './getRequestLanguage'
 
-export const getNextT = ({
+export const getNextT = async ({
   config,
   language,
 }: {
   config: SanitizedConfig
   language?: string
-}): TFunction => {
-  const lang = language || getRequestLanguage({ cookies: cookies(), headers: headers() })
-
-  return initTFunction({
-    language: lang,
+}): Promise<TFunction> => {
+  const i18n = await initI18n({
+    translationsContext: 'client',
+    language: language || getRequestLanguage({ cookies: cookies(), headers: headers() }),
     config: config.i18n,
-    translations,
   })
+
+  return i18n.t
 }

packages/next/src/utilities/initPage.ts

@@ -10,9 +10,10 @@ import type {
 } from 'payload/types'
 import { redirect } from 'next/navigation'
 import { parseCookies } from 'payload/auth'
-import { getNextI18n } from './getNextI18n'
 import { getRequestLanguage } from './getRequestLanguage'
 import { findLocaleFromCode } from '../../../ui/src/utilities/findLocaleFromCode'
+import { I18n } from '@payloadcms/translations/types'
+import { initI18n } from '@payloadcms/translations'
 
 export const initPage = async ({
   configPromise,
@@ -31,7 +32,7 @@ export const initPage = async ({
   permissions: Awaited<ReturnType<typeof auth>>['permissions']
   user: Awaited<ReturnType<typeof auth>>['user']
   config: SanitizedConfig
-  i18n: ReturnType<typeof getNextI18n>
+  i18n: I18n
   collectionConfig?: SanitizedCollectionConfig
   globalConfig?: SanitizedGlobalConfig
   locale: ReturnType<typeof findLocaleFromCode>
@@ -59,7 +60,11 @@ export const initPage = async ({
     config: configPromise,
   })
 
-  const i18n = getNextI18n({ config, language })
+  const i18n = await initI18n({
+    config: config.i18n,
+    language,
+    translationsContext: 'client',
+  })
   let collectionConfig: SanitizedCollectionConfig
   let globalConfig: SanitizedGlobalConfig
 

packages/payload/src/auth/operations/local/forgotPassword.ts

@@ -38,7 +38,7 @@ async function localForgotPassword<T extends keyof GeneratedTypes['collections']
     data,
     disableEmail,
     expiration,
-    req: createLocalReq(options, payload),
+    req: await createLocalReq(options, payload),
   })
 }
 

packages/payload/src/auth/operations/local/login.ts

@@ -47,7 +47,7 @@ async function localLogin<TSlug extends keyof GeneratedTypes['collections']>(
     data,
     depth,
     overrideAccess,
-    req: createLocalReq(options, payload),
+    req: await createLocalReq(options, payload),
     showHiddenFields,
   }
 

packages/payload/src/auth/operations/local/resetPassword.ts

@@ -38,7 +38,7 @@ async function localResetPassword<T extends keyof GeneratedTypes['collections']>
     collection,
     data,
     overrideAccess,
-    req: createLocalReq(options, payload),
+    req: await createLocalReq(options, payload),
   })
 }
 

packages/payload/src/auth/operations/local/unlock.ts

@@ -34,7 +34,7 @@ async function localUnlock<T extends keyof GeneratedTypes['collections']>(
     collection,
     data,
     overrideAccess,
-    req: createLocalReq(options, payload),
+    req: await createLocalReq(options, payload),
   })
 }
 

packages/payload/src/auth/operations/local/verifyEmail.ts

@@ -29,7 +29,7 @@ async function localVerifyEmail<T extends keyof GeneratedTypes['collections']>(
 
   return verifyEmailOperation({
     collection,
-    req: createLocalReq(options, payload),
+    req: await createLocalReq(options, payload),
     token,
   })
 }

packages/payload/src/collections/operations/local/create.ts

@@ -59,7 +59,7 @@ export default async function createLocal<TSlug extends keyof GeneratedTypes['co
     )
   }
 
-  const req = createLocalReq(options, payload)
+  const req = await createLocalReq(options, payload)
   req.file = file ?? (await getFileByPath(filePath))
 
   return createOperation<TSlug>({

packages/payload/src/collections/operations/local/delete.ts

@@ -76,7 +76,7 @@ async function deleteLocal<TSlug extends keyof GeneratedTypes['collections']>(
     collection,
     depth,
     overrideAccess,
-    req: createLocalReq(options, payload),
+    req: await createLocalReq(options, payload),
     showHiddenFields,
     where,
   }

packages/payload/src/collections/operations/local/find.ts

@@ -67,7 +67,7 @@ export default async function findLocal<T extends keyof GeneratedTypes['collecti
     overrideAccess,
     page,
     pagination,
-    req: createLocalReq(options, payload),
+    req: await createLocalReq(options, payload),
     showHiddenFields,
     sort,
     where,

packages/payload/src/collections/operations/local/findByID.ts

@@ -57,7 +57,7 @@ export default async function findByIDLocal<T extends keyof GeneratedTypes['coll
     disableErrors,
     draft,
     overrideAccess,
-    req: createLocalReq(options, payload),
+    req: await createLocalReq(options, payload),
     showHiddenFields,
   })
 }

packages/payload/src/collections/operations/local/findVersionByID.ts

@@ -54,7 +54,7 @@ export default async function findVersionByIDLocal<T extends keyof GeneratedType
     depth,
     disableErrors,
     overrideAccess,
-    req: createLocalReq(options, payload),
+    req: await createLocalReq(options, payload),
     showHiddenFields,
   })
 }

packages/payload/src/collections/operations/local/findVersions.ts

@@ -57,7 +57,7 @@ export default async function findVersionsLocal<T extends keyof GeneratedTypes['
     limit,
     overrideAccess,
     page,
-    req: createLocalReq(options, payload),
+    req: await createLocalReq(options, payload),
     showHiddenFields,
     sort,
     where,

packages/payload/src/collections/operations/local/restoreVersion.ts

@@ -45,7 +45,7 @@ export default async function restoreVersionLocal<T extends keyof GeneratedTypes
     depth,
     overrideAccess,
     payload,
-    req: createLocalReq(options, payload),
+    req: await createLocalReq(options, payload),
     showHiddenFields,
   }
 

packages/payload/src/collections/operations/local/update.ts

@@ -86,7 +86,7 @@ async function updateLocal<TSlug extends keyof GeneratedTypes['collections']>(
     )
   }
 
-  const req = createLocalReq(options, payload)
+  const req = await createLocalReq(options, payload)
   req.file = file ?? (await getFileByPath(filePath))
 
   const args = {

packages/payload/src/globals/operations/local/findOne.ts

@@ -43,7 +43,7 @@ export default async function findOneLocal<T extends keyof GeneratedTypes['globa
     draft,
     globalConfig,
     overrideAccess,
-    req: createLocalReq(options, payload),
+    req: await createLocalReq(options, payload),
     showHiddenFields,
     slug: globalSlug as string,
   })

packages/payload/src/globals/operations/local/findVersionByID.ts

@@ -47,7 +47,7 @@ export default async function findVersionByIDLocal<T extends keyof GeneratedType
     disableErrors,
     globalConfig,
     overrideAccess,
-    req: createLocalReq(options, payload),
+    req: await createLocalReq(options, payload),
     showHiddenFields,
   })
 }

packages/payload/src/globals/operations/local/findVersions.ts

@@ -52,7 +52,7 @@ export default async function findVersionsLocal<T extends keyof GeneratedTypes['
     limit,
     overrideAccess,
     page,
-    req: createLocalReq(options, payload),
+    req: await createLocalReq(options, payload),
     showHiddenFields,
     sort,
     where,

packages/payload/src/globals/operations/local/restoreVersion.ts

@@ -37,7 +37,7 @@ export default async function restoreVersionLocal<T extends keyof GeneratedTypes
     depth,
     globalConfig,
     overrideAccess,
-    req: createLocalReq(options, payload),
+    req: await createLocalReq(options, payload),
     showHiddenFields,
   })
 }

packages/payload/src/globals/operations/local/update.ts

@@ -41,7 +41,7 @@ export default async function updateLocal<TSlug extends keyof GeneratedTypes['gl
     draft,
     globalConfig,
     overrideAccess,
-    req: createLocalReq(options, payload),
+    req: await createLocalReq(options, payload),
     showHiddenFields,
     slug: globalSlug as string,
   })

packages/payload/src/translations/getLocalI18n.ts

@@ -1,17 +1,16 @@
 import { initI18n } from '@payloadcms/translations'
-import { translations } from '@payloadcms/translations/api'
 
 import type { SanitizedConfig } from '../exports/types'
 
-export const getLocalI18n = ({
+export const getLocalI18n = async ({
   config,
   language = 'en',
 }: {
   config: SanitizedConfig
   language?: string
-}): ReturnType<typeof initI18n> =>
+}) =>
   initI18n({
     config: config.i18n,
     language,
-    translations,
+    translationsContext: 'api',
   })

packages/payload/src/utilities/createLocalReq.ts

@@ -29,12 +29,12 @@ type CreateLocalReq = (
     user?: Document
   },
   payload: Payload,
-) => PayloadRequest
-export const createLocalReq: CreateLocalReq = (
+) => Promise<PayloadRequest>
+export const createLocalReq: CreateLocalReq = async (
   { context, fallbackLocale, locale, req = {} as PayloadRequest, user },
   payload,
 ) => {
-  const i18n = req?.i18n || getLocalI18n({ config: payload.config })
+  const i18n = req?.i18n || (await getLocalI18n({ config: payload.config }))
 
   if (payload.config?.localization) {
     const defaultLocale = payload.config.localization.defaultLocale