@payloadcms/next 3.0.0-canary.98cbdb9 → 3.0.0-canary.9beaa28

package/dist/views/Versions/meta.js

@@ -3,34 +3,39 @@ import { meta } from '../../utilities/meta.js';
 export const generateMetadata = async ({ collectionConfig, config, globalConfig, i18n })=>{
     const { t } = i18n;
     const entityLabel = collectionConfig ? getTranslation(collectionConfig.labels.singular, i18n) : globalConfig ? getTranslation(globalConfig.label, i18n) : '';
-    let title = '';
-    let description = '';
-    const keywords = '';
+    let metaToUse = {
+        ...config.admin.meta || {}
+    };
     const data = {} // TODO: figure this out
     ;
     if (collectionConfig) {
         const useAsTitle = collectionConfig?.admin?.useAsTitle || 'id';
         const titleFromData = data?.[useAsTitle];
-        title = `${t('version:versions')}${titleFromData ? ` - ${titleFromData}` : ''} - ${entityLabel}`;
-        description = t('version:viewingVersions', {
-            documentTitle: data?.[useAsTitle],
-            entitySlug: collectionConfig.slug
-        });
+        metaToUse = {
+            ...config.admin.meta || {},
+            description: t('version:viewingVersions', {
+                documentTitle: data?.[useAsTitle],
+                entitySlug: collectionConfig.slug
+            }),
+            title: `${t('version:versions')}${titleFromData ? ` - ${titleFromData}` : ''} - ${entityLabel}`,
+            ...collectionConfig?.admin.meta || {},
+            ...collectionConfig?.admin?.components?.views?.edit?.versions?.meta || {}
+        };
     }
     if (globalConfig) {
-        title = `${t('version:versions')} - ${entityLabel}`;
-        description = t('version:viewingVersionsGlobal', {
-            entitySlug: globalConfig.slug
-        });
+        metaToUse = {
+            ...config.admin.meta || {},
+            description: t('version:viewingVersionsGlobal', {
+                entitySlug: globalConfig.slug
+            }),
+            title: `${t('version:versions')} - ${entityLabel}`,
+            ...globalConfig?.admin.meta || {},
+            ...globalConfig?.admin?.components?.views?.edit?.versions?.meta || {}
+        };
     }
     return meta({
-        ...config.admin.meta || {},
-        description,
-        keywords,
-        serverURL: config.serverURL,
-        title,
-        ...collectionConfig?.admin.meta || {},
-        ...globalConfig?.admin.meta || {}
+        ...metaToUse,
+        serverURL: config.serverURL
     });
 };
 

package/dist/views/Versions/meta.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/views/Versions/meta.ts"],"sourcesContent":["import type { Metadata } from 'next'\n\nimport { getTranslation } from '@payloadcms/translations'\n\nimport type { GenerateEditViewMetadata } from '../Document/getMetaBySegment.js'\n\nimport { meta } from '../../utilities/meta.js'\n\nexport const generateMetadata: GenerateEditViewMetadata = async ({\n  collectionConfig,\n  config,\n  globalConfig,\n  i18n,\n}): Promise<Metadata> => {\n  const { t } = i18n\n\n  const entityLabel = collectionConfig\n    ? getTranslation(collectionConfig.labels.singular, i18n)\n    : globalConfig\n      ? getTranslation(globalConfig.label, i18n)\n      : ''\n\n  let title: string = ''\n  let description: string = ''\n  const keywords: string = ''\n\n  const data: any = {} // TODO: figure this out\n\n  if (collectionConfig) {\n    const useAsTitle = collectionConfig?.admin?.useAsTitle || 'id'\n    const titleFromData = data?.[useAsTitle]\n    title = `${t('version:versions')}${titleFromData ? ` - ${titleFromData}` : ''} - ${entityLabel}`\n    description = t('version:viewingVersions', {\n      documentTitle: data?.[useAsTitle],\n      entitySlug: collectionConfig.slug,\n    })\n  }\n\n  if (globalConfig) {\n    title = `${t('version:versions')} - ${entityLabel}`\n    description = t('version:viewingVersionsGlobal', { entitySlug: globalConfig.slug })\n  }\n\n  return meta({\n    ...(config.admin.meta || {}),\n    description,\n    keywords,\n    serverURL: config.serverURL,\n    title,\n    ...(collectionConfig?.admin.meta || {}),\n    ...(globalConfig?.admin.meta || {}),\n  })\n}\n"],"names":["getTranslation","meta","generateMetadata","collectionConfig","config","globalConfig","i18n","t","entityLabel","labels","singular","label","title","description","keywords","data","useAsTitle","admin","titleFromData","documentTitle","entitySlug","slug","serverURL"],"mappings":"AAEA,SAASA,cAAc,QAAQ,2BAA0B;AAIzD,SAASC,IAAI,QAAQ,0BAAyB;AAE9C,OAAO,MAAMC,mBAA6C,OAAO,EAC/DC,gBAAgB,EAChBC,MAAM,EACNC,YAAY,EACZC,IAAI,EACL;IACC,MAAM,EAAEC,CAAC,EAAE,GAAGD;IAEd,MAAME,cAAcL,mBAChBH,eAAeG,iBAAiBM,MAAM,CAACC,QAAQ,EAAEJ,QACjDD,eACEL,eAAeK,aAAaM,KAAK,EAAEL,QACnC;IAEN,IAAIM,QAAgB;IACpB,IAAIC,cAAsB;IAC1B,MAAMC,WAAmB;IAEzB,MAAMC,OAAY,CAAC,EAAE,wBAAwB;;IAE7C,IAAIZ,kBAAkB;QACpB,MAAMa,aAAab,kBAAkBc,OAAOD,cAAc;QAC1D,MAAME,gBAAgBH,MAAM,CAACC,WAAW;QACxCJ,QAAQ,CAAC,EAAEL,EAAE,oBAAoB,EAAEW,gBAAgB,CAAC,GAAG,EAAEA,cAAc,CAAC,GAAG,GAAG,GAAG,EAAEV,YAAY,CAAC;QAChGK,cAAcN,EAAE,2BAA2B;YACzCY,eAAeJ,MAAM,CAACC,WAAW;YACjCI,YAAYjB,iBAAiBkB,IAAI;QACnC;IACF;IAEA,IAAIhB,cAAc;QAChBO,QAAQ,CAAC,EAAEL,EAAE,oBAAoB,GAAG,EAAEC,YAAY,CAAC;QACnDK,cAAcN,EAAE,iCAAiC;YAAEa,YAAYf,aAAagB,IAAI;QAAC;IACnF;IAEA,OAAOpB,KAAK;QACV,GAAIG,OAAOa,KAAK,CAAChB,IAAI,IAAI,CAAC,CAAC;QAC3BY;QACAC;QACAQ,WAAWlB,OAAOkB,SAAS;QAC3BV;QACA,GAAIT,kBAAkBc,MAAMhB,QAAQ,CAAC,CAAC;QACtC,GAAII,cAAcY,MAAMhB,QAAQ,CAAC,CAAC;IACpC;AACF,EAAC"}
+{"version":3,"sources":["../../../src/views/Versions/meta.ts"],"sourcesContent":["import type { Metadata } from 'next'\nimport type { MetaConfig } from 'payload'\n\nimport { getTranslation } from '@payloadcms/translations'\n\nimport type { GenerateEditViewMetadata } from '../Document/getMetaBySegment.js'\n\nimport { meta } from '../../utilities/meta.js'\n\nexport const generateMetadata: GenerateEditViewMetadata = async ({\n  collectionConfig,\n  config,\n  globalConfig,\n  i18n,\n}): Promise<Metadata> => {\n  const { t } = i18n\n\n  const entityLabel = collectionConfig\n    ? getTranslation(collectionConfig.labels.singular, i18n)\n    : globalConfig\n      ? getTranslation(globalConfig.label, i18n)\n      : ''\n\n  let metaToUse: MetaConfig = {\n    ...(config.admin.meta || {}),\n  }\n\n  const data: any = {} // TODO: figure this out\n\n  if (collectionConfig) {\n    const useAsTitle = collectionConfig?.admin?.useAsTitle || 'id'\n    const titleFromData = data?.[useAsTitle]\n\n    metaToUse = {\n      ...(config.admin.meta || {}),\n      description: t('version:viewingVersions', {\n        documentTitle: data?.[useAsTitle],\n        entitySlug: collectionConfig.slug,\n      }),\n      title: `${t('version:versions')}${titleFromData ? ` - ${titleFromData}` : ''} - ${entityLabel}`,\n      ...(collectionConfig?.admin.meta || {}),\n      ...(collectionConfig?.admin?.components?.views?.edit?.versions?.meta || {}),\n    }\n  }\n\n  if (globalConfig) {\n    metaToUse = {\n      ...(config.admin.meta || {}),\n      description: t('version:viewingVersionsGlobal', { entitySlug: globalConfig.slug }),\n      title: `${t('version:versions')} - ${entityLabel}`,\n      ...(globalConfig?.admin.meta || {}),\n      ...(globalConfig?.admin?.components?.views?.edit?.versions?.meta || {}),\n    }\n  }\n\n  return meta({\n    ...metaToUse,\n    serverURL: config.serverURL,\n  })\n}\n"],"names":["getTranslation","meta","generateMetadata","collectionConfig","config","globalConfig","i18n","t","entityLabel","labels","singular","label","metaToUse","admin","data","useAsTitle","titleFromData","description","documentTitle","entitySlug","slug","title","components","views","edit","versions","serverURL"],"mappings":"AAGA,SAASA,cAAc,QAAQ,2BAA0B;AAIzD,SAASC,IAAI,QAAQ,0BAAyB;AAE9C,OAAO,MAAMC,mBAA6C,OAAO,EAC/DC,gBAAgB,EAChBC,MAAM,EACNC,YAAY,EACZC,IAAI,EACL;IACC,MAAM,EAAEC,CAAC,EAAE,GAAGD;IAEd,MAAME,cAAcL,mBAChBH,eAAeG,iBAAiBM,MAAM,CAACC,QAAQ,EAAEJ,QACjDD,eACEL,eAAeK,aAAaM,KAAK,EAAEL,QACnC;IAEN,IAAIM,YAAwB;QAC1B,GAAIR,OAAOS,KAAK,CAACZ,IAAI,IAAI,CAAC,CAAC;IAC7B;IAEA,MAAMa,OAAY,CAAC,EAAE,wBAAwB;;IAE7C,IAAIX,kBAAkB;QACpB,MAAMY,aAAaZ,kBAAkBU,OAAOE,cAAc;QAC1D,MAAMC,gBAAgBF,MAAM,CAACC,WAAW;QAExCH,YAAY;YACV,GAAIR,OAAOS,KAAK,CAACZ,IAAI,IAAI,CAAC,CAAC;YAC3BgB,aAAaV,EAAE,2BAA2B;gBACxCW,eAAeJ,MAAM,CAACC,WAAW;gBACjCI,YAAYhB,iBAAiBiB,IAAI;YACnC;YACAC,OAAO,CAAC,EAAEd,EAAE,oBAAoB,EAAES,gBAAgB,CAAC,GAAG,EAAEA,cAAc,CAAC,GAAG,GAAG,GAAG,EAAER,YAAY,CAAC;YAC/F,GAAIL,kBAAkBU,MAAMZ,QAAQ,CAAC,CAAC;YACtC,GAAIE,kBAAkBU,OAAOS,YAAYC,OAAOC,MAAMC,UAAUxB,QAAQ,CAAC,CAAC;QAC5E;IACF;IAEA,IAAII,cAAc;QAChBO,YAAY;YACV,GAAIR,OAAOS,KAAK,CAACZ,IAAI,IAAI,CAAC,CAAC;YAC3BgB,aAAaV,EAAE,iCAAiC;gBAAEY,YAAYd,aAAae,IAAI;YAAC;YAChFC,OAAO,CAAC,EAAEd,EAAE,oBAAoB,GAAG,EAAEC,YAAY,CAAC;YAClD,GAAIH,cAAcQ,MAAMZ,QAAQ,CAAC,CAAC;YAClC,GAAII,cAAcQ,OAAOS,YAAYC,OAAOC,MAAMC,UAAUxB,QAAQ,CAAC,CAAC;QACxE;IACF;IAEA,OAAOA,KAAK;QACV,GAAGW,SAAS;QACZc,WAAWtB,OAAOsB,SAAS;IAC7B;AACF,EAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/next",
-  "version": "3.0.0-canary.98cbdb9",
+  "version": "3.0.0-canary.9beaa28",
   "homepage": "https://payloadcms.com",
   "repository": {
     "type": "git",
@@ -63,9 +63,9 @@
     "sonner": "^1.5.0",
     "uuid": "10.0.0",
     "ws": "^8.16.0",
-    "@payloadcms/graphql": "3.0.0-canary.98cbdb9",
-    "@payloadcms/translations": "3.0.0-canary.98cbdb9",
-    "@payloadcms/ui": "3.0.0-canary.98cbdb9"
+    "@payloadcms/graphql": "3.0.0-canary.9beaa28",
+    "@payloadcms/ui": "3.0.0-canary.9beaa28",
+    "@payloadcms/translations": "3.0.0-canary.9beaa28"
   },
   "devDependencies": {
     "@next/eslint-plugin-next": "^14.1.0",
@@ -77,13 +77,13 @@
     "esbuild": "0.23.0",
     "esbuild-sass-plugin": "3.3.1",
     "swc-plugin-transform-remove-imports": "1.15.0",
-    "@payloadcms/eslint-config": "3.0.0-beta.59",
-    "payload": "3.0.0-canary.98cbdb9"
+    "payload": "3.0.0-canary.9beaa28",
+    "@payloadcms/eslint-config": "3.0.0-beta.59"
   },
   "peerDependencies": {
     "graphql": "^16.8.1",
     "next": "^15.0.0-canary.104",
-    "payload": "3.0.0-canary.98cbdb9"
+    "payload": "3.0.0-canary.9beaa28"
   },
   "engines": {
     "node": "^18.20.2 || >=20.9.0"