@payloadcms/next 3.73.0-internal.e61e2ce → 3.73.0-internal.ff401d9

package/dist/views/Version/RenderFieldsToDiff/fields/Relationship/generateLabelFromValue.d.ts

@@ -6,5 +6,5 @@ export declare const generateLabelFromValue: ({ field, locale, parentIsLocalized
     parentIsLocalized: boolean;
     req: PayloadRequest;
     value: RelationshipValue;
-}) => string;
+}) => Promise<string>;
 //# sourceMappingURL=generateLabelFromValue.d.ts.map

package/dist/views/Version/RenderFieldsToDiff/fields/Relationship/generateLabelFromValue.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generateLabelFromValue.d.ts","sourceRoot":"","sources":["../../../../../../src/views/Version/RenderFieldsToDiff/fields/Relationship/generateLabelFromValue.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,iBAAiB,EAAc,MAAM,SAAS,CAAA;AAS5E,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAA;AAEnD,eAAO,MAAM,sBAAsB,sDAMhC;IACD,KAAK,EAAE,iBAAiB,CAAA;IACxB,MAAM,EAAE,MAAM,CAAA;IACd,iBAAiB,EAAE,OAAO,CAAA;IAC1B,GAAG,EAAE,cAAc,CAAA;IACnB,KAAK,EAAE,iBAAiB,CAAA;CACzB,KAAG,MAyDH,CAAA"}
+{"version":3,"file":"generateLabelFromValue.d.ts","sourceRoot":"","sources":["../../../../../../src/views/Version/RenderFieldsToDiff/fields/Relationship/generateLabelFromValue.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,iBAAiB,EAAc,MAAM,SAAS,CAAA;AAS5E,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAA;AAEnD,eAAO,MAAM,sBAAsB,sDAMhC;IACD,KAAK,EAAE,iBAAiB,CAAA;IACxB,MAAM,EAAE,MAAM,CAAA;IACd,iBAAiB,EAAE,OAAO,CAAA;IAC1B,GAAG,EAAE,cAAc,CAAA;IACnB,KAAK,EAAE,iBAAiB,CAAA;CACzB,KAAG,OAAO,CAAC,MAAM,CA4EjB,CAAA"}

package/dist/views/Version/RenderFieldsToDiff/fields/Relationship/generateLabelFromValue.js

@@ -1,5 +1,5 @@
 import { fieldAffectsData, fieldIsPresentationalOnly, fieldShouldBeLocalized, flattenTopLevelFields } from 'payload/shared';
-export const generateLabelFromValue = ({
+export const generateLabelFromValue = async ({
   field,
   locale,
   parentIsLocalized,
@@ -31,8 +31,30 @@ export const generateLabelFromValue = ({
   }
   if (typeof relatedDoc?.[useAsTitle] !== 'undefined') {
     valueToReturn = relatedDoc[useAsTitle];
+  } else if (typeof relatedDoc === 'string' || typeof relatedDoc === 'number') {
+    // When relatedDoc is just an ID (due to maxDepth: 0), fetch the document to get the title
+    try {
+      const fetchedDoc = await req.payload.findByID({
+        id: relatedDoc,
+        collection: relationTo,
+        depth: 0,
+        locale: titleFieldIsLocalized ? locale : undefined,
+        req,
+        select: {
+          [useAsTitle]: true
+        }
+      });
+      if (fetchedDoc?.[useAsTitle]) {
+        valueToReturn = fetchedDoc[useAsTitle];
+      } else {
+        valueToReturn = `${req.i18n.t('general:untitled')} - ID: ${relatedDoc}`;
+      }
+    } catch (error) {
+      // Document might have been deleted or user doesn't have access
+      valueToReturn = `${req.i18n.t('general:untitled')} - ID: ${relatedDoc}`;
+    }
   } else {
-    valueToReturn = String(typeof relatedDoc === 'object' ? relatedDoc.id : `${req.i18n.t('general:untitled')} - ID: ${relatedDoc}`);
+    valueToReturn = String(typeof relatedDoc === 'object' ? relatedDoc.id : relatedDoc);
   }
   if (typeof valueToReturn === 'object' && valueToReturn && titleFieldIsLocalized && valueToReturn?.[locale]) {
     valueToReturn = valueToReturn[locale];

package/dist/views/Version/RenderFieldsToDiff/fields/Relationship/generateLabelFromValue.js.map

@@ -1 +1 @@
-{"version":3,"file":"generateLabelFromValue.js","names":["fieldAffectsData","fieldIsPresentationalOnly","fieldShouldBeLocalized","flattenTopLevelFields","generateLabelFromValue","field","locale","parentIsLocalized","req","value","relatedDoc","relationTo","valueToReturn","relatedCollection","payload","collections","config","useAsTitle","admin","flattenedRelatedCollectionFields","fields","moveSubFieldsToTop","useAsTitleField","find","f","name","titleFieldIsLocalized","String","id","i18n","t","JSON","stringify"],"sources":["../../../../../../src/views/Version/RenderFieldsToDiff/fields/Relationship/generateLabelFromValue.ts"],"sourcesContent":["import type { PayloadRequest, RelationshipField, TypeWithID } from 'payload'\n\nimport {\n  fieldAffectsData,\n  fieldIsPresentationalOnly,\n  fieldShouldBeLocalized,\n  flattenTopLevelFields,\n} from 'payload/shared'\n\nimport type { RelationshipValue } from './index.js'\n\nexport const generateLabelFromValue = ({\n  field,\n  locale,\n  parentIsLocalized,\n  req,\n  value,\n}: {\n  field: RelationshipField\n  locale: string\n  parentIsLocalized: boolean\n  req: PayloadRequest\n  value: RelationshipValue\n}): string => {\n  let relatedDoc: number | string | TypeWithID\n  let relationTo: string = field.relationTo as string\n  let valueToReturn: string = ''\n\n  if (typeof value === 'object' && 'relationTo' in value) {\n    relatedDoc = value.value\n    relationTo = value.relationTo\n  } else {\n    // Non-polymorphic relationship or deleted document\n    relatedDoc = value\n  }\n\n  const relatedCollection = req.payload.collections[relationTo].config\n\n  const useAsTitle = relatedCollection?.admin?.useAsTitle\n\n  const flattenedRelatedCollectionFields = flattenTopLevelFields(relatedCollection.fields, {\n    moveSubFieldsToTop: true,\n  })\n\n  const useAsTitleField = flattenedRelatedCollectionFields.find(\n    (f) => fieldAffectsData(f) && !fieldIsPresentationalOnly(f) && f.name === useAsTitle,\n  )\n  let titleFieldIsLocalized = false\n\n  if (useAsTitleField && fieldAffectsData(useAsTitleField)) {\n    titleFieldIsLocalized = fieldShouldBeLocalized({ field: useAsTitleField, parentIsLocalized })\n  }\n\n  if (typeof relatedDoc?.[useAsTitle] !== 'undefined') {\n    valueToReturn = relatedDoc[useAsTitle]\n  } else {\n    valueToReturn = String(\n      typeof relatedDoc === 'object'\n        ? relatedDoc.id\n        : `${req.i18n.t('general:untitled')} - ID: ${relatedDoc}`,\n    )\n  }\n\n  if (\n    typeof valueToReturn === 'object' &&\n    valueToReturn &&\n    titleFieldIsLocalized &&\n    valueToReturn?.[locale]\n  ) {\n    valueToReturn = valueToReturn[locale]\n  }\n\n  if (\n    (valueToReturn && typeof valueToReturn === 'object' && valueToReturn !== null) ||\n    typeof valueToReturn !== 'string'\n  ) {\n    valueToReturn = JSON.stringify(valueToReturn)\n  }\n\n  return valueToReturn\n}\n"],"mappings":"AAEA,SACEA,gBAAgB,EAChBC,yBAAyB,EACzBC,sBAAsB,EACtBC,qBAAqB,QAChB;AAIP,OAAO,MAAMC,sBAAA,GAAyBA,CAAC;EACrCC,KAAK;EACLC,MAAM;EACNC,iBAAiB;EACjBC,GAAG;EACHC;AAAK,CAON;EACC,IAAIC,UAAA;EACJ,IAAIC,UAAA,GAAqBN,KAAA,CAAMM,UAAU;EACzC,IAAIC,aAAA,GAAwB;EAE5B,IAAI,OAAOH,KAAA,KAAU,YAAY,gBAAgBA,KAAA,EAAO;IACtDC,UAAA,GAAaD,KAAA,CAAMA,KAAK;IACxBE,UAAA,GAAaF,KAAA,CAAME,UAAU;EAC/B,OAAO;IACL;IACAD,UAAA,GAAaD,KAAA;EACf;EAEA,MAAMI,iBAAA,GAAoBL,GAAA,CAAIM,OAAO,CAACC,WAAW,CAACJ,UAAA,CAAW,CAACK,MAAM;EAEpE,MAAMC,UAAA,GAAaJ,iBAAA,EAAmBK,KAAA,EAAOD,UAAA;EAE7C,MAAME,gCAAA,GAAmChB,qBAAA,CAAsBU,iBAAA,CAAkBO,MAAM,EAAE;IACvFC,kBAAA,EAAoB;EACtB;EAEA,MAAMC,eAAA,GAAkBH,gCAAA,CAAiCI,IAAI,CAC1DC,CAAA,IAAMxB,gBAAA,CAAiBwB,CAAA,KAAM,CAACvB,yBAAA,CAA0BuB,CAAA,KAAMA,CAAA,CAAEC,IAAI,KAAKR,UAAA;EAE5E,IAAIS,qBAAA,GAAwB;EAE5B,IAAIJ,eAAA,IAAmBtB,gBAAA,CAAiBsB,eAAA,GAAkB;IACxDI,qBAAA,GAAwBxB,sBAAA,CAAuB;MAAEG,KAAA,EAAOiB,eAAA;MAAiBf;IAAkB;EAC7F;EAEA,IAAI,OAAOG,UAAA,GAAaO,UAAA,CAAW,KAAK,aAAa;IACnDL,aAAA,GAAgBF,UAAU,CAACO,UAAA,CAAW;EACxC,OAAO;IACLL,aAAA,GAAgBe,MAAA,CACd,OAAOjB,UAAA,KAAe,WAClBA,UAAA,CAAWkB,EAAE,GACb,GAAGpB,GAAA,CAAIqB,IAAI,CAACC,CAAC,CAAC,6BAA6BpB,UAAA,EAAY;EAE/D;EAEA,IACE,OAAOE,aAAA,KAAkB,YACzBA,aAAA,IACAc,qBAAA,IACAd,aAAA,GAAgBN,MAAA,CAAO,EACvB;IACAM,aAAA,GAAgBA,aAAa,CAACN,MAAA,CAAO;EACvC;EAEA,IACEM,aAAC,IAAiB,OAAOA,aAAA,KAAkB,YAAYA,aAAA,KAAkB,QACzE,OAAOA,aAAA,KAAkB,UACzB;IACAA,aAAA,GAAgBmB,IAAA,CAAKC,SAAS,CAACpB,aAAA;EACjC;EAEA,OAAOA,aAAA;AACT","ignoreList":[]}
+{"version":3,"file":"generateLabelFromValue.js","names":["fieldAffectsData","fieldIsPresentationalOnly","fieldShouldBeLocalized","flattenTopLevelFields","generateLabelFromValue","field","locale","parentIsLocalized","req","value","relatedDoc","relationTo","valueToReturn","relatedCollection","payload","collections","config","useAsTitle","admin","flattenedRelatedCollectionFields","fields","moveSubFieldsToTop","useAsTitleField","find","f","name","titleFieldIsLocalized","fetchedDoc","findByID","id","collection","depth","undefined","select","i18n","t","error","String","JSON","stringify"],"sources":["../../../../../../src/views/Version/RenderFieldsToDiff/fields/Relationship/generateLabelFromValue.ts"],"sourcesContent":["import type { PayloadRequest, RelationshipField, TypeWithID } from 'payload'\n\nimport {\n  fieldAffectsData,\n  fieldIsPresentationalOnly,\n  fieldShouldBeLocalized,\n  flattenTopLevelFields,\n} from 'payload/shared'\n\nimport type { RelationshipValue } from './index.js'\n\nexport const generateLabelFromValue = async ({\n  field,\n  locale,\n  parentIsLocalized,\n  req,\n  value,\n}: {\n  field: RelationshipField\n  locale: string\n  parentIsLocalized: boolean\n  req: PayloadRequest\n  value: RelationshipValue\n}): Promise<string> => {\n  let relatedDoc: number | string | TypeWithID\n  let relationTo: string = field.relationTo as string\n  let valueToReturn: string = ''\n\n  if (typeof value === 'object' && 'relationTo' in value) {\n    relatedDoc = value.value\n    relationTo = value.relationTo\n  } else {\n    // Non-polymorphic relationship or deleted document\n    relatedDoc = value\n  }\n\n  const relatedCollection = req.payload.collections[relationTo].config\n\n  const useAsTitle = relatedCollection?.admin?.useAsTitle\n\n  const flattenedRelatedCollectionFields = flattenTopLevelFields(relatedCollection.fields, {\n    moveSubFieldsToTop: true,\n  })\n\n  const useAsTitleField = flattenedRelatedCollectionFields.find(\n    (f) => fieldAffectsData(f) && !fieldIsPresentationalOnly(f) && f.name === useAsTitle,\n  )\n  let titleFieldIsLocalized = false\n\n  if (useAsTitleField && fieldAffectsData(useAsTitleField)) {\n    titleFieldIsLocalized = fieldShouldBeLocalized({ field: useAsTitleField, parentIsLocalized })\n  }\n\n  if (typeof relatedDoc?.[useAsTitle] !== 'undefined') {\n    valueToReturn = relatedDoc[useAsTitle]\n  } else if (typeof relatedDoc === 'string' || typeof relatedDoc === 'number') {\n    // When relatedDoc is just an ID (due to maxDepth: 0), fetch the document to get the title\n    try {\n      const fetchedDoc = await req.payload.findByID({\n        id: relatedDoc,\n        collection: relationTo,\n        depth: 0,\n        locale: titleFieldIsLocalized ? locale : undefined,\n        req,\n        select: {\n          [useAsTitle]: true,\n        },\n      })\n\n      if (fetchedDoc?.[useAsTitle]) {\n        valueToReturn = fetchedDoc[useAsTitle]\n      } else {\n        valueToReturn = `${req.i18n.t('general:untitled')} - ID: ${relatedDoc}`\n      }\n    } catch (error) {\n      // Document might have been deleted or user doesn't have access\n      valueToReturn = `${req.i18n.t('general:untitled')} - ID: ${relatedDoc}`\n    }\n  } else {\n    valueToReturn = String(typeof relatedDoc === 'object' ? relatedDoc.id : relatedDoc)\n  }\n\n  if (\n    typeof valueToReturn === 'object' &&\n    valueToReturn &&\n    titleFieldIsLocalized &&\n    valueToReturn?.[locale]\n  ) {\n    valueToReturn = valueToReturn[locale]\n  }\n\n  if (\n    (valueToReturn && typeof valueToReturn === 'object' && valueToReturn !== null) ||\n    typeof valueToReturn !== 'string'\n  ) {\n    valueToReturn = JSON.stringify(valueToReturn)\n  }\n\n  return valueToReturn\n}\n"],"mappings":"AAEA,SACEA,gBAAgB,EAChBC,yBAAyB,EACzBC,sBAAsB,EACtBC,qBAAqB,QAChB;AAIP,OAAO,MAAMC,sBAAA,GAAyB,MAAAA,CAAO;EAC3CC,KAAK;EACLC,MAAM;EACNC,iBAAiB;EACjBC,GAAG;EACHC;AAAK,CAON;EACC,IAAIC,UAAA;EACJ,IAAIC,UAAA,GAAqBN,KAAA,CAAMM,UAAU;EACzC,IAAIC,aAAA,GAAwB;EAE5B,IAAI,OAAOH,KAAA,KAAU,YAAY,gBAAgBA,KAAA,EAAO;IACtDC,UAAA,GAAaD,KAAA,CAAMA,KAAK;IACxBE,UAAA,GAAaF,KAAA,CAAME,UAAU;EAC/B,OAAO;IACL;IACAD,UAAA,GAAaD,KAAA;EACf;EAEA,MAAMI,iBAAA,GAAoBL,GAAA,CAAIM,OAAO,CAACC,WAAW,CAACJ,UAAA,CAAW,CAACK,MAAM;EAEpE,MAAMC,UAAA,GAAaJ,iBAAA,EAAmBK,KAAA,EAAOD,UAAA;EAE7C,MAAME,gCAAA,GAAmChB,qBAAA,CAAsBU,iBAAA,CAAkBO,MAAM,EAAE;IACvFC,kBAAA,EAAoB;EACtB;EAEA,MAAMC,eAAA,GAAkBH,gCAAA,CAAiCI,IAAI,CAC1DC,CAAA,IAAMxB,gBAAA,CAAiBwB,CAAA,KAAM,CAACvB,yBAAA,CAA0BuB,CAAA,KAAMA,CAAA,CAAEC,IAAI,KAAKR,UAAA;EAE5E,IAAIS,qBAAA,GAAwB;EAE5B,IAAIJ,eAAA,IAAmBtB,gBAAA,CAAiBsB,eAAA,GAAkB;IACxDI,qBAAA,GAAwBxB,sBAAA,CAAuB;MAAEG,KAAA,EAAOiB,eAAA;MAAiBf;IAAkB;EAC7F;EAEA,IAAI,OAAOG,UAAA,GAAaO,UAAA,CAAW,KAAK,aAAa;IACnDL,aAAA,GAAgBF,UAAU,CAACO,UAAA,CAAW;EACxC,OAAO,IAAI,OAAOP,UAAA,KAAe,YAAY,OAAOA,UAAA,KAAe,UAAU;IAC3E;IACA,IAAI;MACF,MAAMiB,UAAA,GAAa,MAAMnB,GAAA,CAAIM,OAAO,CAACc,QAAQ,CAAC;QAC5CC,EAAA,EAAInB,UAAA;QACJoB,UAAA,EAAYnB,UAAA;QACZoB,KAAA,EAAO;QACPzB,MAAA,EAAQoB,qBAAA,GAAwBpB,MAAA,GAAS0B,SAAA;QACzCxB,GAAA;QACAyB,MAAA,EAAQ;UACN,CAAChB,UAAA,GAAa;QAChB;MACF;MAEA,IAAIU,UAAA,GAAaV,UAAA,CAAW,EAAE;QAC5BL,aAAA,GAAgBe,UAAU,CAACV,UAAA,CAAW;MACxC,OAAO;QACLL,aAAA,GAAgB,GAAGJ,GAAA,CAAI0B,IAAI,CAACC,CAAC,CAAC,6BAA6BzB,UAAA,EAAY;MACzE;IACF,EAAE,OAAO0B,KAAA,EAAO;MACd;MACAxB,aAAA,GAAgB,GAAGJ,GAAA,CAAI0B,IAAI,CAACC,CAAC,CAAC,6BAA6BzB,UAAA,EAAY;IACzE;EACF,OAAO;IACLE,aAAA,GAAgByB,MAAA,CAAO,OAAO3B,UAAA,KAAe,WAAWA,UAAA,CAAWmB,EAAE,GAAGnB,UAAA;EAC1E;EAEA,IACE,OAAOE,aAAA,KAAkB,YACzBA,aAAA,IACAc,qBAAA,IACAd,aAAA,GAAgBN,MAAA,CAAO,EACvB;IACAM,aAAA,GAAgBA,aAAa,CAACN,MAAA,CAAO;EACvC;EAEA,IACEM,aAAC,IAAiB,OAAOA,aAAA,KAAkB,YAAYA,aAAA,KAAkB,QACzE,OAAOA,aAAA,KAAkB,UACzB;IACAA,aAAA,GAAgB0B,IAAA,CAAKC,SAAS,CAAC3B,aAAA;EACjC;EAEA,OAAOA,aAAA;AACT","ignoreList":[]}

package/dist/views/Version/RenderFieldsToDiff/fields/Relationship/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/views/Version/RenderFieldsToDiff/fields/Relationship/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,cAAc,EACd,iBAAiB,EACjB,oCAAoC,EACpC,UAAU,EACX,MAAM,SAAS,CAAA;AAEhB,OAAO,EAAkB,KAAK,UAAU,EAAE,MAAM,0BAA0B,CAAA;AAG1E,OAAO,cAAc,CAAA;AAErB,OAAO,KAAK,MAAM,OAAO,CAAA;AAMzB,MAAM,MAAM,iBAAiB,GACzB;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,UAAU,CAAA;CAAE,GAC3D,CAAC,MAAM,GAAG,MAAM,GAAG,UAAU,CAAC,CAAA;AAElC,eAAO,MAAM,YAAY,EAAE,oCA0C1B,CAAA;AAED,eAAO,MAAM,sBAAsB,EAAE,KAAK,CAAC,EAAE,CAAC;IAC5C,KAAK,EAAE,iBAAiB,CAAA;IACxB,IAAI,EAAE,UAAU,CAAA;IAChB,MAAM,EAAE,MAAM,CAAA;IACd,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,iBAAiB,EAAE,OAAO,CAAA;IAC1B,WAAW,EAAE,OAAO,CAAA;IACpB,GAAG,EAAE,cAAc,CAAA;IACnB,SAAS,EAAE,iBAAiB,CAAA;IAC5B,OAAO,EAAE,iBAAiB,CAAA;CAC3B,CAqEA,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/views/Version/RenderFieldsToDiff/fields/Relationship/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,cAAc,EACd,iBAAiB,EACjB,oCAAoC,EACpC,UAAU,EACX,MAAM,SAAS,CAAA;AAEhB,OAAO,EAAkB,KAAK,UAAU,EAAE,MAAM,0BAA0B,CAAA;AAG1E,OAAO,cAAc,CAAA;AAErB,OAAO,KAAK,MAAM,OAAO,CAAA;AAMzB,MAAM,MAAM,iBAAiB,GACzB;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,UAAU,CAAA;CAAE,GAC3D,CAAC,MAAM,GAAG,MAAM,GAAG,UAAU,CAAC,CAAA;AAElC,eAAO,MAAM,YAAY,EAAE,oCA0C1B,CAAA;AAED,eAAO,MAAM,sBAAsB,EAAE,KAAK,CAAC,EAAE,CAAC;IAC5C,KAAK,EAAE,iBAAiB,CAAA;IACxB,IAAI,EAAE,UAAU,CAAA;IAChB,MAAM,EAAE,MAAM,CAAA;IACd,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,iBAAiB,EAAE,OAAO,CAAA;IAC1B,WAAW,EAAE,OAAO,CAAA;IACpB,GAAG,EAAE,cAAc,CAAA;IACnB,SAAS,EAAE,iBAAiB,CAAA;IAC5B,OAAO,EAAE,iBAAiB,CAAA;CAC3B,CAkGA,CAAA"}

package/dist/views/Version/RenderFieldsToDiff/fields/Relationship/index.js

@@ -54,6 +54,21 @@ export const SingleRelationshipDiff = async args => {
     valueTo
   } = args;
   const ReactDOMServer = (await import('react-dom/server')).default;
+  const localeToUse = locale ?? (req.payload.config?.localization && req.payload.config?.localization?.defaultLocale) ?? 'en';
+  // Generate titles asynchronously before creating components
+  const [titleFrom, titleTo] = await Promise.all([valueFrom ? generateLabelFromValue({
+    field,
+    locale: localeToUse,
+    parentIsLocalized,
+    req,
+    value: valueFrom
+  }) : Promise.resolve(null), valueTo ? generateLabelFromValue({
+    field,
+    locale: localeToUse,
+    parentIsLocalized,
+    req,
+    value: valueTo
+  }) : Promise.resolve(null)]);
   const FromComponent = valueFrom ? /*#__PURE__*/_jsx(RelationshipDocumentDiff, {
     field: field,
     i18n: i18n,
@@ -63,6 +78,7 @@ export const SingleRelationshipDiff = async args => {
     relationTo: polymorphic ? valueFrom.relationTo : field.relationTo,
     req: req,
     showPill: true,
+    title: titleFrom,
     value: valueFrom
   }) : null;
   const ToComponent = valueTo ? /*#__PURE__*/_jsx(RelationshipDocumentDiff, {
@@ -74,6 +90,7 @@ export const SingleRelationshipDiff = async args => {
     relationTo: polymorphic ? valueTo.relationTo : field.relationTo,
     req: req,
     showPill: true,
+    title: titleTo,
     value: valueTo
   }) : null;
   const fromHTML = FromComponent ? ReactDOMServer.renderToStaticMarkup(FromComponent) : `<p></p>`;
@@ -109,7 +126,22 @@ const ManyRelationshipDiff = async ({
   const ReactDOMServer = (await import('react-dom/server')).default;
   const fromArr = Array.isArray(valueFrom) ? valueFrom : [];
   const toArr = Array.isArray(valueTo) ? valueTo : [];
-  const makeNodes = list => list.map((val, idx) => /*#__PURE__*/_jsx(RelationshipDocumentDiff, {
+  const localeToUse = locale ?? (req.payload.config?.localization && req.payload.config?.localization?.defaultLocale) ?? 'en';
+  // Generate all titles asynchronously before creating components
+  const [titlesFrom, titlesTo] = await Promise.all([Promise.all(fromArr.map(val => generateLabelFromValue({
+    field,
+    locale: localeToUse,
+    parentIsLocalized,
+    req,
+    value: val
+  }))), Promise.all(toArr.map(val => generateLabelFromValue({
+    field,
+    locale: localeToUse,
+    parentIsLocalized,
+    req,
+    value: val
+  })))]);
+  const makeNodes = (list, titles) => list.map((val, idx) => /*#__PURE__*/_jsx(RelationshipDocumentDiff, {
     field: field,
     i18n: i18n,
     locale: locale,
@@ -118,12 +150,13 @@ const ManyRelationshipDiff = async ({
     relationTo: polymorphic ? val.relationTo : field.relationTo,
     req: req,
     showPill: polymorphic,
+    title: titles[idx],
     value: val
   }, idx));
-  const fromNodes = fromArr.length > 0 ? makeNodes(fromArr) : /*#__PURE__*/_jsx("p", {
+  const fromNodes = fromArr.length > 0 ? makeNodes(fromArr, titlesFrom) : /*#__PURE__*/_jsx("p", {
     className: `${baseClass}__empty`
   });
-  const toNodes = toArr.length > 0 ? makeNodes(toArr) : /*#__PURE__*/_jsx("p", {
+  const toNodes = toArr.length > 0 ? makeNodes(toArr, titlesTo) : /*#__PURE__*/_jsx("p", {
     className: `${baseClass}__empty`
   });
   const fromHTML = ReactDOMServer.renderToStaticMarkup(fromNodes);
@@ -154,16 +187,9 @@ const RelationshipDocumentDiff = ({
   relationTo,
   req,
   showPill = false,
+  title,
   value
 }) => {
-  const localeToUse = locale ?? (req.payload.config?.localization && req.payload.config?.localization?.defaultLocale) ?? 'en';
-  const title = generateLabelFromValue({
-    field,
-    locale: localeToUse,
-    parentIsLocalized,
-    req,
-    value
-  });
   let pillLabel = null;
   if (showPill) {
     const collectionConfig = req.payload.collections[relationTo].config;

package/dist/views/Version/RenderFieldsToDiff/fields/Relationship/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["getTranslation","FieldDiffContainer","getHTMLDiffComponents","React","generateLabelFromValue","baseClass","Relationship","comparisonValue","valueFrom","field","i18n","locale","nestingLevel","parentIsLocalized","req","versionValue","valueTo","hasMany","polymorphic","Array","isArray","relationTo","_jsx","ManyRelationshipDiff","SingleRelationshipDiff","args","ReactDOMServer","default","FromComponent","RelationshipDocumentDiff","showPill","value","ToComponent","fromHTML","renderToStaticMarkup","toHTML","diff","tokenizeByCharacter","className","From","label","To","fromArr","toArr","makeNodes","list","map","val","idx","fromNodes","length","toNodes","localeToUse","payload","config","localization","defaultLocale","title","pillLabel","collectionConfig","collections","labels","singular","slug","_jsxs","id"],"sources":["../../../../../../src/views/Version/RenderFieldsToDiff/fields/Relationship/index.tsx"],"sourcesContent":["import type {\n  PayloadRequest,\n  RelationshipField,\n  RelationshipFieldDiffServerComponent,\n  TypeWithID,\n} from 'payload'\n\nimport { getTranslation, type I18nClient } from '@payloadcms/translations'\nimport { FieldDiffContainer, getHTMLDiffComponents } from '@payloadcms/ui/rsc'\n\nimport './index.scss'\n\nimport React from 'react'\n\nimport { generateLabelFromValue } from './generateLabelFromValue.js'\n\nconst baseClass = 'relationship-diff'\n\nexport type RelationshipValue =\n  | { relationTo: string; value: number | string | TypeWithID }\n  | (number | string | TypeWithID)\n\nexport const Relationship: RelationshipFieldDiffServerComponent = ({\n  comparisonValue: valueFrom,\n  field,\n  i18n,\n  locale,\n  nestingLevel,\n  parentIsLocalized,\n  req,\n  versionValue: valueTo,\n}) => {\n  const hasMany = 'hasMany' in field && field.hasMany\n  const polymorphic = Array.isArray(field.relationTo)\n\n  if (hasMany) {\n    return (\n      <ManyRelationshipDiff\n        field={field}\n        i18n={i18n}\n        locale={locale}\n        nestingLevel={nestingLevel}\n        parentIsLocalized={parentIsLocalized}\n        polymorphic={polymorphic}\n        req={req}\n        valueFrom={valueFrom as RelationshipValue[] | undefined}\n        valueTo={valueTo as RelationshipValue[] | undefined}\n      />\n    )\n  }\n\n  return (\n    <SingleRelationshipDiff\n      field={field}\n      i18n={i18n}\n      locale={locale}\n      nestingLevel={nestingLevel}\n      parentIsLocalized={parentIsLocalized}\n      polymorphic={polymorphic}\n      req={req}\n      valueFrom={valueFrom as RelationshipValue}\n      valueTo={valueTo as RelationshipValue}\n    />\n  )\n}\n\nexport const SingleRelationshipDiff: React.FC<{\n  field: RelationshipField\n  i18n: I18nClient\n  locale: string\n  nestingLevel?: number\n  parentIsLocalized: boolean\n  polymorphic: boolean\n  req: PayloadRequest\n  valueFrom: RelationshipValue\n  valueTo: RelationshipValue\n}> = async (args) => {\n  const {\n    field,\n    i18n,\n    locale,\n    nestingLevel,\n    parentIsLocalized,\n    polymorphic,\n    req,\n    valueFrom,\n    valueTo,\n  } = args\n\n  const ReactDOMServer = (await import('react-dom/server')).default\n\n  const FromComponent = valueFrom ? (\n    <RelationshipDocumentDiff\n      field={field}\n      i18n={i18n}\n      locale={locale}\n      parentIsLocalized={parentIsLocalized}\n      polymorphic={polymorphic}\n      relationTo={\n        polymorphic\n          ? (valueFrom as { relationTo: string; value: TypeWithID }).relationTo\n          : (field.relationTo as string)\n      }\n      req={req}\n      showPill={true}\n      value={valueFrom}\n    />\n  ) : null\n  const ToComponent = valueTo ? (\n    <RelationshipDocumentDiff\n      field={field}\n      i18n={i18n}\n      locale={locale}\n      parentIsLocalized={parentIsLocalized}\n      polymorphic={polymorphic}\n      relationTo={\n        polymorphic\n          ? (valueTo as { relationTo: string; value: TypeWithID }).relationTo\n          : (field.relationTo as string)\n      }\n      req={req}\n      showPill={true}\n      value={valueTo}\n    />\n  ) : null\n\n  const fromHTML = FromComponent ? ReactDOMServer.renderToStaticMarkup(FromComponent) : `<p></p>`\n  const toHTML = ToComponent ? ReactDOMServer.renderToStaticMarkup(ToComponent) : `<p></p>`\n\n  const diff = getHTMLDiffComponents({\n    fromHTML,\n    toHTML,\n    tokenizeByCharacter: false,\n  })\n\n  return (\n    <FieldDiffContainer\n      className={`${baseClass}-container ${baseClass}-container--hasOne`}\n      From={diff.From}\n      i18n={i18n}\n      label={{ label: field.label, locale }}\n      nestingLevel={nestingLevel}\n      To={diff.To}\n    />\n  )\n}\n\nconst ManyRelationshipDiff: React.FC<{\n  field: RelationshipField\n  i18n: I18nClient\n  locale: string\n  nestingLevel?: number\n  parentIsLocalized: boolean\n  polymorphic: boolean\n  req: PayloadRequest\n  valueFrom: RelationshipValue[] | undefined\n  valueTo: RelationshipValue[] | undefined\n}> = async ({\n  field,\n  i18n,\n  locale,\n  nestingLevel,\n  parentIsLocalized,\n  polymorphic,\n  req,\n  valueFrom,\n  valueTo,\n}) => {\n  const ReactDOMServer = (await import('react-dom/server')).default\n\n  const fromArr = Array.isArray(valueFrom) ? valueFrom : []\n  const toArr = Array.isArray(valueTo) ? valueTo : []\n\n  const makeNodes = (list: RelationshipValue[]) =>\n    list.map((val, idx) => (\n      <RelationshipDocumentDiff\n        field={field}\n        i18n={i18n}\n        key={idx}\n        locale={locale}\n        parentIsLocalized={parentIsLocalized}\n        polymorphic={polymorphic}\n        relationTo={\n          polymorphic\n            ? (val as { relationTo: string; value: TypeWithID }).relationTo\n            : (field.relationTo as string)\n        }\n        req={req}\n        showPill={polymorphic}\n        value={val}\n      />\n    ))\n\n  const fromNodes =\n    fromArr.length > 0 ? makeNodes(fromArr) : <p className={`${baseClass}__empty`}></p>\n\n  const toNodes = toArr.length > 0 ? makeNodes(toArr) : <p className={`${baseClass}__empty`}></p>\n\n  const fromHTML = ReactDOMServer.renderToStaticMarkup(fromNodes)\n  const toHTML = ReactDOMServer.renderToStaticMarkup(toNodes)\n\n  const diff = getHTMLDiffComponents({\n    fromHTML,\n    toHTML,\n    tokenizeByCharacter: false,\n  })\n\n  return (\n    <FieldDiffContainer\n      className={`${baseClass}-container ${baseClass}-container--hasMany`}\n      From={diff.From}\n      i18n={i18n}\n      label={{ label: field.label, locale }}\n      nestingLevel={nestingLevel}\n      To={diff.To}\n    />\n  )\n}\n\nconst RelationshipDocumentDiff = ({\n  field,\n  i18n,\n  locale,\n  parentIsLocalized,\n  polymorphic,\n  relationTo,\n  req,\n  showPill = false,\n  value,\n}: {\n  field: RelationshipField\n  i18n: I18nClient\n  locale: string\n  parentIsLocalized: boolean\n  polymorphic: boolean\n  relationTo: string\n  req: PayloadRequest\n  showPill?: boolean\n  value: RelationshipValue\n}) => {\n  const localeToUse =\n    locale ??\n    (req.payload.config?.localization && req.payload.config?.localization?.defaultLocale) ??\n    'en'\n\n  const title = generateLabelFromValue({\n    field,\n    locale: localeToUse,\n    parentIsLocalized,\n    req,\n    value,\n  })\n\n  let pillLabel: null | string = null\n  if (showPill) {\n    const collectionConfig = req.payload.collections[relationTo].config\n    pillLabel = collectionConfig.labels?.singular\n      ? getTranslation(collectionConfig.labels.singular, i18n)\n      : collectionConfig.slug\n  }\n\n  return (\n    <div\n      className={`${baseClass}`}\n      data-enable-match=\"true\"\n      data-id={\n        polymorphic\n          ? (value as { relationTo: string; value: TypeWithID }).value.id\n          : (value as TypeWithID).id\n      }\n      data-relation-to={relationTo}\n    >\n      {pillLabel && (\n        <span className={`${baseClass}__pill`} data-enable-match=\"false\">\n          {pillLabel}\n        </span>\n      )}\n      <strong className={`${baseClass}__info`} data-enable-match=\"false\">\n        {title}\n      </strong>\n    </div>\n  )\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"index.js","names":["getTranslation","FieldDiffContainer","getHTMLDiffComponents","React","generateLabelFromValue","baseClass","Relationship","comparisonValue","valueFrom","field","i18n","locale","nestingLevel","parentIsLocalized","req","versionValue","valueTo","hasMany","polymorphic","Array","isArray","relationTo","_jsx","ManyRelationshipDiff","SingleRelationshipDiff","args","ReactDOMServer","default","localeToUse","payload","config","localization","defaultLocale","titleFrom","titleTo","Promise","all","value","resolve","FromComponent","RelationshipDocumentDiff","showPill","title","ToComponent","fromHTML","renderToStaticMarkup","toHTML","diff","tokenizeByCharacter","className","From","label","To","fromArr","toArr","titlesFrom","titlesTo","map","val","makeNodes","list","titles","idx","fromNodes","length","toNodes","pillLabel","collectionConfig","collections","labels","singular","slug","_jsxs","id"],"sources":["../../../../../../src/views/Version/RenderFieldsToDiff/fields/Relationship/index.tsx"],"sourcesContent":["import type {\n  PayloadRequest,\n  RelationshipField,\n  RelationshipFieldDiffServerComponent,\n  TypeWithID,\n} from 'payload'\n\nimport { getTranslation, type I18nClient } from '@payloadcms/translations'\nimport { FieldDiffContainer, getHTMLDiffComponents } from '@payloadcms/ui/rsc'\n\nimport './index.scss'\n\nimport React from 'react'\n\nimport { generateLabelFromValue } from './generateLabelFromValue.js'\n\nconst baseClass = 'relationship-diff'\n\nexport type RelationshipValue =\n  | { relationTo: string; value: number | string | TypeWithID }\n  | (number | string | TypeWithID)\n\nexport const Relationship: RelationshipFieldDiffServerComponent = ({\n  comparisonValue: valueFrom,\n  field,\n  i18n,\n  locale,\n  nestingLevel,\n  parentIsLocalized,\n  req,\n  versionValue: valueTo,\n}) => {\n  const hasMany = 'hasMany' in field && field.hasMany\n  const polymorphic = Array.isArray(field.relationTo)\n\n  if (hasMany) {\n    return (\n      <ManyRelationshipDiff\n        field={field}\n        i18n={i18n}\n        locale={locale}\n        nestingLevel={nestingLevel}\n        parentIsLocalized={parentIsLocalized}\n        polymorphic={polymorphic}\n        req={req}\n        valueFrom={valueFrom as RelationshipValue[] | undefined}\n        valueTo={valueTo as RelationshipValue[] | undefined}\n      />\n    )\n  }\n\n  return (\n    <SingleRelationshipDiff\n      field={field}\n      i18n={i18n}\n      locale={locale}\n      nestingLevel={nestingLevel}\n      parentIsLocalized={parentIsLocalized}\n      polymorphic={polymorphic}\n      req={req}\n      valueFrom={valueFrom as RelationshipValue}\n      valueTo={valueTo as RelationshipValue}\n    />\n  )\n}\n\nexport const SingleRelationshipDiff: React.FC<{\n  field: RelationshipField\n  i18n: I18nClient\n  locale: string\n  nestingLevel?: number\n  parentIsLocalized: boolean\n  polymorphic: boolean\n  req: PayloadRequest\n  valueFrom: RelationshipValue\n  valueTo: RelationshipValue\n}> = async (args) => {\n  const {\n    field,\n    i18n,\n    locale,\n    nestingLevel,\n    parentIsLocalized,\n    polymorphic,\n    req,\n    valueFrom,\n    valueTo,\n  } = args\n\n  const ReactDOMServer = (await import('react-dom/server')).default\n\n  const localeToUse =\n    locale ??\n    (req.payload.config?.localization && req.payload.config?.localization?.defaultLocale) ??\n    'en'\n\n  // Generate titles asynchronously before creating components\n  const [titleFrom, titleTo] = await Promise.all([\n    valueFrom\n      ? generateLabelFromValue({\n          field,\n          locale: localeToUse,\n          parentIsLocalized,\n          req,\n          value: valueFrom,\n        })\n      : Promise.resolve(null),\n    valueTo\n      ? generateLabelFromValue({\n          field,\n          locale: localeToUse,\n          parentIsLocalized,\n          req,\n          value: valueTo,\n        })\n      : Promise.resolve(null),\n  ])\n\n  const FromComponent = valueFrom ? (\n    <RelationshipDocumentDiff\n      field={field}\n      i18n={i18n}\n      locale={locale}\n      parentIsLocalized={parentIsLocalized}\n      polymorphic={polymorphic}\n      relationTo={\n        polymorphic\n          ? (valueFrom as { relationTo: string; value: TypeWithID }).relationTo\n          : (field.relationTo as string)\n      }\n      req={req}\n      showPill={true}\n      title={titleFrom}\n      value={valueFrom}\n    />\n  ) : null\n  const ToComponent = valueTo ? (\n    <RelationshipDocumentDiff\n      field={field}\n      i18n={i18n}\n      locale={locale}\n      parentIsLocalized={parentIsLocalized}\n      polymorphic={polymorphic}\n      relationTo={\n        polymorphic\n          ? (valueTo as { relationTo: string; value: TypeWithID }).relationTo\n          : (field.relationTo as string)\n      }\n      req={req}\n      showPill={true}\n      title={titleTo}\n      value={valueTo}\n    />\n  ) : null\n\n  const fromHTML = FromComponent ? ReactDOMServer.renderToStaticMarkup(FromComponent) : `<p></p>`\n  const toHTML = ToComponent ? ReactDOMServer.renderToStaticMarkup(ToComponent) : `<p></p>`\n\n  const diff = getHTMLDiffComponents({\n    fromHTML,\n    toHTML,\n    tokenizeByCharacter: false,\n  })\n\n  return (\n    <FieldDiffContainer\n      className={`${baseClass}-container ${baseClass}-container--hasOne`}\n      From={diff.From}\n      i18n={i18n}\n      label={{ label: field.label, locale }}\n      nestingLevel={nestingLevel}\n      To={diff.To}\n    />\n  )\n}\n\nconst ManyRelationshipDiff: React.FC<{\n  field: RelationshipField\n  i18n: I18nClient\n  locale: string\n  nestingLevel?: number\n  parentIsLocalized: boolean\n  polymorphic: boolean\n  req: PayloadRequest\n  valueFrom: RelationshipValue[] | undefined\n  valueTo: RelationshipValue[] | undefined\n}> = async ({\n  field,\n  i18n,\n  locale,\n  nestingLevel,\n  parentIsLocalized,\n  polymorphic,\n  req,\n  valueFrom,\n  valueTo,\n}) => {\n  const ReactDOMServer = (await import('react-dom/server')).default\n\n  const fromArr = Array.isArray(valueFrom) ? valueFrom : []\n  const toArr = Array.isArray(valueTo) ? valueTo : []\n\n  const localeToUse =\n    locale ??\n    (req.payload.config?.localization && req.payload.config?.localization?.defaultLocale) ??\n    'en'\n\n  // Generate all titles asynchronously before creating components\n  const [titlesFrom, titlesTo] = await Promise.all([\n    Promise.all(\n      fromArr.map((val) =>\n        generateLabelFromValue({\n          field,\n          locale: localeToUse,\n          parentIsLocalized,\n          req,\n          value: val,\n        }),\n      ),\n    ),\n    Promise.all(\n      toArr.map((val) =>\n        generateLabelFromValue({\n          field,\n          locale: localeToUse,\n          parentIsLocalized,\n          req,\n          value: val,\n        }),\n      ),\n    ),\n  ])\n\n  const makeNodes = (list: RelationshipValue[], titles: string[]) =>\n    list.map((val, idx) => (\n      <RelationshipDocumentDiff\n        field={field}\n        i18n={i18n}\n        key={idx}\n        locale={locale}\n        parentIsLocalized={parentIsLocalized}\n        polymorphic={polymorphic}\n        relationTo={\n          polymorphic\n            ? (val as { relationTo: string; value: TypeWithID }).relationTo\n            : (field.relationTo as string)\n        }\n        req={req}\n        showPill={polymorphic}\n        title={titles[idx]}\n        value={val}\n      />\n    ))\n\n  const fromNodes =\n    fromArr.length > 0 ? makeNodes(fromArr, titlesFrom) : <p className={`${baseClass}__empty`}></p>\n\n  const toNodes =\n    toArr.length > 0 ? makeNodes(toArr, titlesTo) : <p className={`${baseClass}__empty`}></p>\n\n  const fromHTML = ReactDOMServer.renderToStaticMarkup(fromNodes)\n  const toHTML = ReactDOMServer.renderToStaticMarkup(toNodes)\n\n  const diff = getHTMLDiffComponents({\n    fromHTML,\n    toHTML,\n    tokenizeByCharacter: false,\n  })\n\n  return (\n    <FieldDiffContainer\n      className={`${baseClass}-container ${baseClass}-container--hasMany`}\n      From={diff.From}\n      i18n={i18n}\n      label={{ label: field.label, locale }}\n      nestingLevel={nestingLevel}\n      To={diff.To}\n    />\n  )\n}\n\nconst RelationshipDocumentDiff = ({\n  field,\n  i18n,\n  locale,\n  parentIsLocalized,\n  polymorphic,\n  relationTo,\n  req,\n  showPill = false,\n  title,\n  value,\n}: {\n  field: RelationshipField\n  i18n: I18nClient\n  locale: string\n  parentIsLocalized: boolean\n  polymorphic: boolean\n  relationTo: string\n  req: PayloadRequest\n  showPill?: boolean\n  title: null | string\n  value: RelationshipValue\n}) => {\n  let pillLabel: null | string = null\n  if (showPill) {\n    const collectionConfig = req.payload.collections[relationTo].config\n    pillLabel = collectionConfig.labels?.singular\n      ? getTranslation(collectionConfig.labels.singular, i18n)\n      : collectionConfig.slug\n  }\n\n  return (\n    <div\n      className={`${baseClass}`}\n      data-enable-match=\"true\"\n      data-id={\n        polymorphic\n          ? (value as { relationTo: string; value: TypeWithID }).value.id\n          : (value as TypeWithID).id\n      }\n      data-relation-to={relationTo}\n    >\n      {pillLabel && (\n        <span className={`${baseClass}__pill`} data-enable-match=\"false\">\n          {pillLabel}\n        </span>\n      )}\n      <strong className={`${baseClass}__info`} data-enable-match=\"false\">\n        {title}\n      </strong>\n    </div>\n  )\n}\n"],"mappings":";AAOA,SAASA,cAAc,QAAyB;AAChD,SAASC,kBAAkB,EAAEC,qBAAqB,QAAQ;AAI1D,OAAOC,KAAA,MAAW;AAElB,SAASC,sBAAsB,QAAQ;AAEvC,MAAMC,SAAA,GAAY;AAMlB,OAAO,MAAMC,YAAA,GAAqDA,CAAC;EACjEC,eAAA,EAAiBC,SAAS;EAC1BC,KAAK;EACLC,IAAI;EACJC,MAAM;EACNC,YAAY;EACZC,iBAAiB;EACjBC,GAAG;EACHC,YAAA,EAAcC;AAAO,CACtB;EACC,MAAMC,OAAA,GAAU,aAAaR,KAAA,IAASA,KAAA,CAAMQ,OAAO;EACnD,MAAMC,WAAA,GAAcC,KAAA,CAAMC,OAAO,CAACX,KAAA,CAAMY,UAAU;EAElD,IAAIJ,OAAA,EAAS;IACX,oBACEK,IAAA,CAACC,oBAAA;MACCd,KAAA,EAAOA,KAAA;MACPC,IAAA,EAAMA,IAAA;MACNC,MAAA,EAAQA,MAAA;MACRC,YAAA,EAAcA,YAAA;MACdC,iBAAA,EAAmBA,iBAAA;MACnBK,WAAA,EAAaA,WAAA;MACbJ,GAAA,EAAKA,GAAA;MACLN,SAAA,EAAWA,SAAA;MACXQ,OAAA,EAASA;;EAGf;EAEA,oBACEM,IAAA,CAACE,sBAAA;IACCf,KAAA,EAAOA,KAAA;IACPC,IAAA,EAAMA,IAAA;IACNC,MAAA,EAAQA,MAAA;IACRC,YAAA,EAAcA,YAAA;IACdC,iBAAA,EAAmBA,iBAAA;IACnBK,WAAA,EAAaA,WAAA;IACbJ,GAAA,EAAKA,GAAA;IACLN,SAAA,EAAWA,SAAA;IACXQ,OAAA,EAASA;;AAGf;AAEA,OAAO,MAAMQ,sBAAA,GAUR,MAAOC,IAAA;EACV,MAAM;IACJhB,KAAK;IACLC,IAAI;IACJC,MAAM;IACNC,YAAY;IACZC,iBAAiB;IACjBK,WAAW;IACXJ,GAAG;IACHN,SAAS;IACTQ;EAAO,CACR,GAAGS,IAAA;EAEJ,MAAMC,cAAA,GAAiB,CAAC,MAAM,MAAM,CAAC,mBAAkB,EAAGC,OAAO;EAEjE,MAAMC,WAAA,GACJjB,MAAA,KACCG,GAAA,CAAIe,OAAO,CAACC,MAAM,EAAEC,YAAA,IAAgBjB,GAAA,CAAIe,OAAO,CAACC,MAAM,EAAEC,YAAA,EAAcC,aAAY,KACnF;EAEF;EACA,MAAM,CAACC,SAAA,EAAWC,OAAA,CAAQ,GAAG,MAAMC,OAAA,CAAQC,GAAG,CAAC,CAC7C5B,SAAA,GACIJ,sBAAA,CAAuB;IACrBK,KAAA;IACAE,MAAA,EAAQiB,WAAA;IACRf,iBAAA;IACAC,GAAA;IACAuB,KAAA,EAAO7B;EACT,KACA2B,OAAA,CAAQG,OAAO,CAAC,OACpBtB,OAAA,GACIZ,sBAAA,CAAuB;IACrBK,KAAA;IACAE,MAAA,EAAQiB,WAAA;IACRf,iBAAA;IACAC,GAAA;IACAuB,KAAA,EAAOrB;EACT,KACAmB,OAAA,CAAQG,OAAO,CAAC,MACrB;EAED,MAAMC,aAAA,GAAgB/B,SAAA,gBACpBc,IAAA,CAACkB,wBAAA;IACC/B,KAAA,EAAOA,KAAA;IACPC,IAAA,EAAMA,IAAA;IACNC,MAAA,EAAQA,MAAA;IACRE,iBAAA,EAAmBA,iBAAA;IACnBK,WAAA,EAAaA,WAAA;IACbG,UAAA,EACEH,WAAA,GACIV,SAAC,CAAwDa,UAAU,GAClEZ,KAAA,CAAMY,UAAU;IAEvBP,GAAA,EAAKA,GAAA;IACL2B,QAAA,EAAU;IACVC,KAAA,EAAOT,SAAA;IACPI,KAAA,EAAO7B;OAEP;EACJ,MAAMmC,WAAA,GAAc3B,OAAA,gBAClBM,IAAA,CAACkB,wBAAA;IACC/B,KAAA,EAAOA,KAAA;IACPC,IAAA,EAAMA,IAAA;IACNC,MAAA,EAAQA,MAAA;IACRE,iBAAA,EAAmBA,iBAAA;IACnBK,WAAA,EAAaA,WAAA;IACbG,UAAA,EACEH,WAAA,GACIF,OAAC,CAAsDK,UAAU,GAChEZ,KAAA,CAAMY,UAAU;IAEvBP,GAAA,EAAKA,GAAA;IACL2B,QAAA,EAAU;IACVC,KAAA,EAAOR,OAAA;IACPG,KAAA,EAAOrB;OAEP;EAEJ,MAAM4B,QAAA,GAAWL,aAAA,GAAgBb,cAAA,CAAemB,oBAAoB,CAACN,aAAA,IAAiB,SAAS;EAC/F,MAAMO,MAAA,GAASH,WAAA,GAAcjB,cAAA,CAAemB,oBAAoB,CAACF,WAAA,IAAe,SAAS;EAEzF,MAAMI,IAAA,GAAO7C,qBAAA,CAAsB;IACjC0C,QAAA;IACAE,MAAA;IACAE,mBAAA,EAAqB;EACvB;EAEA,oBACE1B,IAAA,CAACrB,kBAAA;IACCgD,SAAA,EAAW,GAAG5C,SAAA,cAAuBA,SAAA,oBAA6B;IAClE6C,IAAA,EAAMH,IAAA,CAAKG,IAAI;IACfxC,IAAA,EAAMA,IAAA;IACNyC,KAAA,EAAO;MAAEA,KAAA,EAAO1C,KAAA,CAAM0C,KAAK;MAAExC;IAAO;IACpCC,YAAA,EAAcA,YAAA;IACdwC,EAAA,EAAIL,IAAA,CAAKK;;AAGf;AAEA,MAAM7B,oBAAA,GAUD,MAAAA,CAAO;EACVd,KAAK;EACLC,IAAI;EACJC,MAAM;EACNC,YAAY;EACZC,iBAAiB;EACjBK,WAAW;EACXJ,GAAG;EACHN,SAAS;EACTQ;AAAO,CACR;EACC,MAAMU,cAAA,GAAiB,CAAC,MAAM,MAAM,CAAC,mBAAkB,EAAGC,OAAO;EAEjE,MAAM0B,OAAA,GAAUlC,KAAA,CAAMC,OAAO,CAACZ,SAAA,IAAaA,SAAA,GAAY,EAAE;EACzD,MAAM8C,KAAA,GAAQnC,KAAA,CAAMC,OAAO,CAACJ,OAAA,IAAWA,OAAA,GAAU,EAAE;EAEnD,MAAMY,WAAA,GACJjB,MAAA,KACCG,GAAA,CAAIe,OAAO,CAACC,MAAM,EAAEC,YAAA,IAAgBjB,GAAA,CAAIe,OAAO,CAACC,MAAM,EAAEC,YAAA,EAAcC,aAAY,KACnF;EAEF;EACA,MAAM,CAACuB,UAAA,EAAYC,QAAA,CAAS,GAAG,MAAMrB,OAAA,CAAQC,GAAG,CAAC,CAC/CD,OAAA,CAAQC,GAAG,CACTiB,OAAA,CAAQI,GAAG,CAAEC,GAAA,IACXtD,sBAAA,CAAuB;IACrBK,KAAA;IACAE,MAAA,EAAQiB,WAAA;IACRf,iBAAA;IACAC,GAAA;IACAuB,KAAA,EAAOqB;EACT,MAGJvB,OAAA,CAAQC,GAAG,CACTkB,KAAA,CAAMG,GAAG,CAAEC,GAAA,IACTtD,sBAAA,CAAuB;IACrBK,KAAA;IACAE,MAAA,EAAQiB,WAAA;IACRf,iBAAA;IACAC,GAAA;IACAuB,KAAA,EAAOqB;EACT,KAGL;EAED,MAAMC,SAAA,GAAYA,CAACC,IAAA,EAA2BC,MAAA,KAC5CD,IAAA,CAAKH,GAAG,CAAC,CAACC,GAAA,EAAKI,GAAA,kBACbxC,IAAA,CAACkB,wBAAA;IACC/B,KAAA,EAAOA,KAAA;IACPC,IAAA,EAAMA,IAAA;IAENC,MAAA,EAAQA,MAAA;IACRE,iBAAA,EAAmBA,iBAAA;IACnBK,WAAA,EAAaA,WAAA;IACbG,UAAA,EACEH,WAAA,GACIwC,GAAC,CAAkDrC,UAAU,GAC5DZ,KAAA,CAAMY,UAAU;IAEvBP,GAAA,EAAKA,GAAA;IACL2B,QAAA,EAAUvB,WAAA;IACVwB,KAAA,EAAOmB,MAAM,CAACC,GAAA,CAAI;IAClBzB,KAAA,EAAOqB;KAZFI,GAAA;EAgBX,MAAMC,SAAA,GACJV,OAAA,CAAQW,MAAM,GAAG,IAAIL,SAAA,CAAUN,OAAA,EAASE,UAAA,iBAAcjC,IAAA,CAAC;IAAE2B,SAAA,EAAW,GAAG5C,SAAA;;EAEzE,MAAM4D,OAAA,GACJX,KAAA,CAAMU,MAAM,GAAG,IAAIL,SAAA,CAAUL,KAAA,EAAOE,QAAA,iBAAYlC,IAAA,CAAC;IAAE2B,SAAA,EAAW,GAAG5C,SAAA;;EAEnE,MAAMuC,QAAA,GAAWlB,cAAA,CAAemB,oBAAoB,CAACkB,SAAA;EACrD,MAAMjB,MAAA,GAASpB,cAAA,CAAemB,oBAAoB,CAACoB,OAAA;EAEnD,MAAMlB,IAAA,GAAO7C,qBAAA,CAAsB;IACjC0C,QAAA;IACAE,MAAA;IACAE,mBAAA,EAAqB;EACvB;EAEA,oBACE1B,IAAA,CAACrB,kBAAA;IACCgD,SAAA,EAAW,GAAG5C,SAAA,cAAuBA,SAAA,qBAA8B;IACnE6C,IAAA,EAAMH,IAAA,CAAKG,IAAI;IACfxC,IAAA,EAAMA,IAAA;IACNyC,KAAA,EAAO;MAAEA,KAAA,EAAO1C,KAAA,CAAM0C,KAAK;MAAExC;IAAO;IACpCC,YAAA,EAAcA,YAAA;IACdwC,EAAA,EAAIL,IAAA,CAAKK;;AAGf;AAEA,MAAMZ,wBAAA,GAA2BA,CAAC;EAChC/B,KAAK;EACLC,IAAI;EACJC,MAAM;EACNE,iBAAiB;EACjBK,WAAW;EACXG,UAAU;EACVP,GAAG;EACH2B,QAAA,GAAW,KAAK;EAChBC,KAAK;EACLL;AAAK,CAYN;EACC,IAAI6B,SAAA,GAA2B;EAC/B,IAAIzB,QAAA,EAAU;IACZ,MAAM0B,gBAAA,GAAmBrD,GAAA,CAAIe,OAAO,CAACuC,WAAW,CAAC/C,UAAA,CAAW,CAACS,MAAM;IACnEoC,SAAA,GAAYC,gBAAA,CAAiBE,MAAM,EAAEC,QAAA,GACjCtE,cAAA,CAAemE,gBAAA,CAAiBE,MAAM,CAACC,QAAQ,EAAE5D,IAAA,IACjDyD,gBAAA,CAAiBI,IAAI;EAC3B;EAEA,oBACEC,KAAA,CAAC;IACCvB,SAAA,EAAW,GAAG5C,SAAA,EAAW;IACzB,qBAAkB;IAClB,WACEa,WAAA,GACImB,KAAC,CAAoDA,KAAK,CAACoC,EAAE,GAC7DpC,KAAC,CAAqBoC,EAAE;IAE9B,oBAAkBpD,UAAA;eAEjB6C,SAAA,iBACC5C,IAAA,CAAC;MAAK2B,SAAA,EAAW,GAAG5C,SAAA,QAAiB;MAAE,qBAAkB;gBACtD6D;qBAGL5C,IAAA,CAAC;MAAO2B,SAAA,EAAW,GAAG5C,SAAA,QAAiB;MAAE,qBAAkB;gBACxDqC;;;AAIT","ignoreList":[]}

package/dist/withPayload/withPayload.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"withPayload.d.ts","sourceRoot":"","sources":["../../src/withPayload/withPayload.js"],"names":[],"mappings":"AAsBO,yCAJI,OAAO,MAAM,EAAE,UAAU,YAEjC;IAA0B,uBAAuB,GAAzC,OAAO;CAA6F,6BAqN9G"}
+{"version":3,"file":"withPayload.d.ts","sourceRoot":"","sources":["../../src/withPayload/withPayload.js"],"names":[],"mappings":"AAsBO,yCAJI,OAAO,MAAM,EAAE,UAAU,YAEjC;IAA0B,uBAAuB,GAAzC,OAAO;CAA6F,6BAuP9G"}

package/dist/withPayload/withPayload.js

@@ -22,10 +22,40 @@ export const withPayload = (nextConfig = {}, options = {}) => {
     console.warn('Payload detected a non-zero value for the `staleTimes.dynamic` option in your Next.js config. This will slow down page transitions and may cause stale data to load within the Admin panel. To clear this warning, remove the `staleTimes.dynamic` option from your Next.js config or set it to 0. In the future, Next.js may support scoping this option to specific routes.');
     env.NEXT_PUBLIC_ENABLE_ROUTER_CACHE_REFRESH = 'true';
   }
+  const consoleWarn = console.warn;
+  const sassWarningText = 'SassWarning: Future import deprecation is not yet active, so silencing it is unnecessary';
+  console.warn = (...args) => {
+    if (typeof args[1] === 'string' && args[1].includes(sassWarningText) || typeof args[0] === 'string' && args[0].includes(sassWarningText)) {
+      // This warning is a lie - without silencing import deprecation warnings, sass will spam the console with deprecation warnings
+      return;
+    }
+    consoleWarn(...args);
+  };
   /** @type {import('next').NextConfig} */
   const baseConfig = {
     ...nextConfig,
     env,
+    sassOptions: {
+      ...(nextConfig.sassOptions || {}),
+      /**
+      * This prevents scss warning spam during pnpm dev that looks like this:
+      * ⚠ ./test/admin/components/views/CustomMinimal/index.scss
+      * Issue while running loader
+      * SassWarning: Deprecation Warning on line 8, column 8 of file:///Users/alessio/Documents/GitHub/ payload/packages/ui/src/scss/styles.scss:8:8:
+      * Sass @import rules are deprecated and will be removed in Dart Sass 3.0.0.
+      *
+      * More info and automated migrator: https://sass-lang.com/d/import
+      *
+      * 8 | @import 'queries';
+      *
+      *
+      * packages/ui/src/scss/styles.scss 9:9                      @import
+      * test/admin/components/views/CustomMinimal/index.scss 1:9  root stylesheet
+      *
+      * @todo: update all outdated scss imports to use @use instead of @import. Then, we can remove this.
+      */
+      silenceDeprecations: [...(nextConfig.sassOptions?.silenceDeprecations || []), 'import']
+    },
     outputFileTracingExcludes: {
       ...(nextConfig.outputFileTracingExcludes || {}),
       '**/*': [...(nextConfig.outputFileTracingExcludes?.['**/*'] || []), 'drizzle-kit', 'drizzle-kit/api']
@@ -105,7 +135,7 @@ export const withPayload = (nextConfig = {}, options = {}) => {
         * This is the only way to get Webpack Build to work, without the bundle size caveats of externalizing the
         * entry point packages, as explained in the serverExternalPackages section above.
         */
-        'drizzle-kit', 'drizzle-kit/api', 'sharp', 'libsql', 'require-in-the-middle', 'json-schema-to-typescript'],
+        'drizzle-kit', 'drizzle-kit/api', 'sharp', 'libsql', 'require-in-the-middle'],
         plugins: [...(incomingWebpackConfig?.plugins || []),
         // Fix cloudflare:sockets error: https://github.com/vercel/next.js/discussions/50177
         new webpackOptions.webpack.IgnorePlugin({
@@ -152,7 +182,7 @@ export const withPayload = (nextConfig = {}, options = {}) => {
   } else {
     return {
       ...baseConfig,
-      serverExternalPackages: [...(baseConfig.serverExternalPackages || []), 'drizzle-kit', 'drizzle-kit/api', 'sharp', 'libsql', 'require-in-the-middle', 'json-schema-to-typescript',
+      serverExternalPackages: [...(baseConfig.serverExternalPackages || []), 'drizzle-kit', 'drizzle-kit/api', 'sharp', 'libsql', 'require-in-the-middle',
       // Prevents turbopack build errors by the thread-stream package which is installed by pino
       'pino']
     };

package/dist/withPayload/withPayload.js.map

@@ -1 +1 @@
-{"version":3,"file":"withPayload.js","names":["getNextjsVersion","supportsTurbopackExternalizeTransitiveDependencies","withPayloadLegacy","poweredByHeader","key","value","withPayload","nextConfig","options","nextjsVersion","supportsTurbopackBuild","env","experimental","staleTimes","dynamic","console","warn","NEXT_PUBLIC_ENABLE_ROUTER_CACHE_REFRESH","baseConfig","outputFileTracingExcludes","outputFileTracingIncludes","turbopack","headers","headersFromConfig","source","serverExternalPackages","process","NODE_ENV","devBundleServerPackages","webpack","webpackConfig","webpackOptions","incomingWebpackConfig","externals","plugins","IgnorePlugin","resourceRegExp","resolve","alias","fallback","aws4","basePath","NEXT_BASE_PATH"],"sources":["../../src/withPayload/withPayload.js"],"sourcesContent":["/**\n * These files must remain as plain JavaScript (.js) rather than TypeScript (.ts) because they are\n * imported directly in next.config.mjs files. Since next.config files run before the build process,\n * TypeScript compilation is not available. This ensures compatibility with all templates and\n * user projects regardless of their TypeScript setup.\n */\nimport {\n  getNextjsVersion,\n  supportsTurbopackExternalizeTransitiveDependencies,\n} from './withPayload.utils.js'\nimport { withPayloadLegacy } from './withPayloadLegacy.js'\n\nconst poweredByHeader = {\n  key: 'X-Powered-By',\n  value: 'Next.js, Payload',\n}\n\n/**\n * @param {import('next').NextConfig} nextConfig\n * @param {Object} [options] - Optional configuration options\n * @param {boolean} [options.devBundleServerPackages] - Whether to bundle server packages in development mode. @default false\n * */\nexport const withPayload = (nextConfig = {}, options = {}) => {\n  const nextjsVersion = getNextjsVersion()\n\n  const supportsTurbopackBuild = supportsTurbopackExternalizeTransitiveDependencies(nextjsVersion)\n\n  const env = nextConfig.env || {}\n\n  if (nextConfig.experimental?.staleTimes?.dynamic) {\n    console.warn(\n      'Payload detected a non-zero value for the `staleTimes.dynamic` option in your Next.js config. This will slow down page transitions and may cause stale data to load within the Admin panel. To clear this warning, remove the `staleTimes.dynamic` option from your Next.js config or set it to 0. In the future, Next.js may support scoping this option to specific routes.',\n    )\n    env.NEXT_PUBLIC_ENABLE_ROUTER_CACHE_REFRESH = 'true'\n  }\n\n  /** @type {import('next').NextConfig} */\n  const baseConfig = {\n    ...nextConfig,\n    env,\n    outputFileTracingExcludes: {\n      ...(nextConfig.outputFileTracingExcludes || {}),\n      '**/*': [\n        ...(nextConfig.outputFileTracingExcludes?.['**/*'] || []),\n        'drizzle-kit',\n        'drizzle-kit/api',\n      ],\n    },\n    outputFileTracingIncludes: {\n      ...(nextConfig.outputFileTracingIncludes || {}),\n      '**/*': [...(nextConfig.outputFileTracingIncludes?.['**/*'] || []), '@libsql/client'],\n    },\n    turbopack: {\n      ...(nextConfig.turbopack || {}),\n    },\n    // We disable the poweredByHeader here because we add it manually in the headers function below\n    ...(nextConfig.poweredByHeader !== false ? { poweredByHeader: false } : {}),\n    headers: async () => {\n      const headersFromConfig = 'headers' in nextConfig ? await nextConfig.headers() : []\n\n      return [\n        ...(headersFromConfig || []),\n        {\n          headers: [\n            {\n              key: 'Accept-CH',\n              value: 'Sec-CH-Prefers-Color-Scheme',\n            },\n            {\n              key: 'Vary',\n              value: 'Sec-CH-Prefers-Color-Scheme',\n            },\n            {\n              key: 'Critical-CH',\n              value: 'Sec-CH-Prefers-Color-Scheme',\n            },\n            ...(nextConfig.poweredByHeader !== false ? [poweredByHeader] : []),\n          ],\n          source: '/:path*',\n        },\n      ]\n    },\n    serverExternalPackages: [\n      ...(nextConfig.serverExternalPackages || []),\n      // WHY: without externalizing graphql, a graphql version error will be thrown\n      // during runtime (\"Ensure that there is only one instance of \\\"graphql\\\" in the node_modules\\ndirectory.\")\n      'graphql',\n      ...(process.env.NODE_ENV === 'development' && options.devBundleServerPackages !== true\n        ? /**\n           * Unless explicitly disabled by the user, by passing `devBundleServerPackages: true` to withPayload, we\n           * do not bundle server-only packages during dev for two reasons:\n           *\n           * 1. Performance: Fewer files to compile means faster compilation speeds.\n           * 2. Turbopack support: Webpack's externals are not supported by Turbopack.\n           *\n           * Regarding Turbopack support: Unlike webpack.externals, we cannot use serverExternalPackages to\n           * externalized packages that are not resolvable from the project root. So including a package like\n           * \"drizzle-kit\" in here would do nothing - Next.js will ignore the rule and still bundle the package -\n           * because it detects that the package is not resolvable from the project root (= not directly installed\n           * by the user in their own package.json).\n           *\n           * Instead, we can use serverExternalPackages for the entry-point packages that *are* installed directly\n           * by the user (e.g. db-postgres, which then installs drizzle-kit as a dependency).\n           *\n           *\n           *\n           * We should only do this during development, not build, because externalizing these packages can hurt\n           * the bundle size. Not only does it disable tree-shaking, it also risks installing duplicate copies of the\n           * same package.\n           *\n           * Example:\n           * - @payloadcms/richtext-lexical (in bundle) -> installs qs-esm (bundled because of importer)\n           * - payload (not in bundle, external) -> installs qs-esm (external because of importer)\n           * Result: we have two copies of qs-esm installed - one in the bundle, and one in node_modules.\n           *\n           * During development, these bundle size difference do not matter much, and development speed /\n           * turbopack support are more important.\n           */\n          [\n            'payload',\n            '@payloadcms/db-mongodb',\n            '@payloadcms/db-postgres',\n            '@payloadcms/db-sqlite',\n            '@payloadcms/db-vercel-postgres',\n            '@payloadcms/db-d1-sqlite',\n            '@payloadcms/drizzle',\n            '@payloadcms/email-nodemailer',\n            '@payloadcms/email-resend',\n            '@payloadcms/graphql',\n            '@payloadcms/payload-cloud',\n            '@payloadcms/plugin-redirects',\n            // TODO: Add the following packages, excluding their /client subpath exports, once Next.js supports it\n            // see: https://github.com/vercel/next.js/discussions/76991\n            //'@payloadcms/plugin-cloud-storage',\n            //'@payloadcms/plugin-sentry',\n            //'@payloadcms/plugin-stripe',\n            // @payloadcms/richtext-lexical\n            //'@payloadcms/storage-azure',\n            //'@payloadcms/storage-gcs',\n            //'@payloadcms/storage-s3',\n            //'@payloadcms/storage-uploadthing',\n            //'@payloadcms/storage-vercel-blob',\n          ]\n        : []),\n    ],\n    webpack: (webpackConfig, webpackOptions) => {\n      const incomingWebpackConfig =\n        typeof nextConfig.webpack === 'function'\n          ? nextConfig.webpack(webpackConfig, webpackOptions)\n          : webpackConfig\n\n      return {\n        ...incomingWebpackConfig,\n        externals: [\n          ...(incomingWebpackConfig?.externals || []),\n          /**\n           * See the explanation in the serverExternalPackages section above.\n           * We need to force Webpack to emit require() calls for these packages, even though they are not\n           * resolvable from the project root. You would expect this to error during runtime, but Next.js seems to be able to require these just fine.\n           *\n           * This is the only way to get Webpack Build to work, without the bundle size caveats of externalizing the\n           * entry point packages, as explained in the serverExternalPackages section above.\n           */\n          'drizzle-kit',\n          'drizzle-kit/api',\n          'sharp',\n          'libsql',\n          'require-in-the-middle',\n          'json-schema-to-typescript',\n        ],\n        plugins: [\n          ...(incomingWebpackConfig?.plugins || []),\n          // Fix cloudflare:sockets error: https://github.com/vercel/next.js/discussions/50177\n          new webpackOptions.webpack.IgnorePlugin({\n            resourceRegExp: /^pg-native$|^cloudflare:sockets$/,\n          }),\n        ],\n        resolve: {\n          ...(incomingWebpackConfig?.resolve || {}),\n          alias: {\n            ...(incomingWebpackConfig?.resolve?.alias || {}),\n          },\n          fallback: {\n            ...(incomingWebpackConfig?.resolve?.fallback || {}),\n            /*\n             * This fixes the following warning when running next build with webpack (tested on Next.js 16.0.3 with Payload 3.64.0):\n             *\n             * ⚠ Compiled with warnings in 8.7s\n             *\n             * ./node_modules/.pnpm/mongodb@6.16.0/node_modules/mongodb/lib/deps.js\n             * Module not found: Can't resolve 'aws4' in '/Users/alessio/Documents/temp/next16p/node_modules/.pnpm/mongodb@6.16.0/node_modules/mongodb/lib'\n             *\n             * Import trace for requested module:\n             * ./node_modules/.pnpm/mongodb@6.16.0/node_modules/mongodb/lib/deps.js\n             * ./node_modules/.pnpm/mongodb@6.16.0/node_modules/mongodb/lib/client-side-encryption/client_encryption.js\n             * ./node_modules/.pnpm/mongodb@6.16.0/node_modules/mongodb/lib/index.js\n             * ./node_modules/.pnpm/mongoose@8.15.1/node_modules/mongoose/lib/index.js\n             * ./node_modules/.pnpm/mongoose@8.15.1/node_modules/mongoose/index.js\n             * ./node_modules/.pnpm/@payloadcms+db-mongodb@3.64.0_payload@3.64.0_graphql@16.12.0_typescript@5.7.3_/node_modules/@payloadcms/db-mongodb/dist/index.js\n             * ./src/payload.config.ts\n             * ./src/app/my-route/route.ts\n             *\n             **/\n            aws4: false,\n          },\n        },\n      }\n    },\n  }\n\n  if (nextConfig.basePath) {\n    process.env.NEXT_BASE_PATH = nextConfig.basePath\n    baseConfig.env.NEXT_BASE_PATH = nextConfig.basePath\n  }\n\n  if (!supportsTurbopackBuild) {\n    return withPayloadLegacy(baseConfig)\n  } else {\n    return {\n      ...baseConfig,\n      serverExternalPackages: [\n        ...(baseConfig.serverExternalPackages || []),\n        'drizzle-kit',\n        'drizzle-kit/api',\n        'sharp',\n        'libsql',\n        'require-in-the-middle',\n        'json-schema-to-typescript',\n        // Prevents turbopack build errors by the thread-stream package which is installed by pino\n        'pino',\n      ],\n    }\n  }\n}\n\nexport default withPayload\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"withPayload.js","names":["getNextjsVersion","supportsTurbopackExternalizeTransitiveDependencies","withPayloadLegacy","poweredByHeader","key","value","withPayload","nextConfig","options","nextjsVersion","supportsTurbopackBuild","env","experimental","staleTimes","dynamic","console","warn","NEXT_PUBLIC_ENABLE_ROUTER_CACHE_REFRESH","consoleWarn","sassWarningText","args","includes","baseConfig","sassOptions","silenceDeprecations","outputFileTracingExcludes","outputFileTracingIncludes","turbopack","headers","headersFromConfig","source","serverExternalPackages","process","NODE_ENV","devBundleServerPackages","webpack","webpackConfig","webpackOptions","incomingWebpackConfig","externals","plugins","IgnorePlugin","resourceRegExp","resolve","alias","fallback","aws4","basePath","NEXT_BASE_PATH"],"sources":["../../src/withPayload/withPayload.js"],"sourcesContent":["/**\n * These files must remain as plain JavaScript (.js) rather than TypeScript (.ts) because they are\n * imported directly in next.config.mjs files. Since next.config files run before the build process,\n * TypeScript compilation is not available. This ensures compatibility with all templates and\n * user projects regardless of their TypeScript setup.\n */\nimport {\n  getNextjsVersion,\n  supportsTurbopackExternalizeTransitiveDependencies,\n} from './withPayload.utils.js'\nimport { withPayloadLegacy } from './withPayloadLegacy.js'\n\nconst poweredByHeader = {\n  key: 'X-Powered-By',\n  value: 'Next.js, Payload',\n}\n\n/**\n * @param {import('next').NextConfig} nextConfig\n * @param {Object} [options] - Optional configuration options\n * @param {boolean} [options.devBundleServerPackages] - Whether to bundle server packages in development mode. @default false\n * */\nexport const withPayload = (nextConfig = {}, options = {}) => {\n  const nextjsVersion = getNextjsVersion()\n\n  const supportsTurbopackBuild = supportsTurbopackExternalizeTransitiveDependencies(nextjsVersion)\n\n  const env = nextConfig.env || {}\n\n  if (nextConfig.experimental?.staleTimes?.dynamic) {\n    console.warn(\n      'Payload detected a non-zero value for the `staleTimes.dynamic` option in your Next.js config. This will slow down page transitions and may cause stale data to load within the Admin panel. To clear this warning, remove the `staleTimes.dynamic` option from your Next.js config or set it to 0. In the future, Next.js may support scoping this option to specific routes.',\n    )\n    env.NEXT_PUBLIC_ENABLE_ROUTER_CACHE_REFRESH = 'true'\n  }\n\n  const consoleWarn = console.warn\n  const sassWarningText =\n    'SassWarning: Future import deprecation is not yet active, so silencing it is unnecessary'\n  console.warn = (...args) => {\n    if (\n      (typeof args[1] === 'string' && args[1].includes(sassWarningText)) ||\n      (typeof args[0] === 'string' && args[0].includes(sassWarningText))\n    ) {\n      // This warning is a lie - without silencing import deprecation warnings, sass will spam the console with deprecation warnings\n      return\n    }\n\n    consoleWarn(...args)\n  }\n\n  /** @type {import('next').NextConfig} */\n  const baseConfig = {\n    ...nextConfig,\n    env,\n    sassOptions: {\n      ...(nextConfig.sassOptions || {}),\n      /**\n       * This prevents scss warning spam during pnpm dev that looks like this:\n       * ⚠ ./test/admin/components/views/CustomMinimal/index.scss\n       * Issue while running loader\n       * SassWarning: Deprecation Warning on line 8, column 8 of file:///Users/alessio/Documents/GitHub/ payload/packages/ui/src/scss/styles.scss:8:8:\n       * Sass @import rules are deprecated and will be removed in Dart Sass 3.0.0.\n       *\n       * More info and automated migrator: https://sass-lang.com/d/import\n       *\n       * 8 | @import 'queries';\n       *\n       *\n       * packages/ui/src/scss/styles.scss 9:9                      @import\n       * test/admin/components/views/CustomMinimal/index.scss 1:9  root stylesheet\n       *\n       * @todo: update all outdated scss imports to use @use instead of @import. Then, we can remove this.\n       */\n      silenceDeprecations: [...(nextConfig.sassOptions?.silenceDeprecations || []), 'import'],\n    },\n    outputFileTracingExcludes: {\n      ...(nextConfig.outputFileTracingExcludes || {}),\n      '**/*': [\n        ...(nextConfig.outputFileTracingExcludes?.['**/*'] || []),\n        'drizzle-kit',\n        'drizzle-kit/api',\n      ],\n    },\n    outputFileTracingIncludes: {\n      ...(nextConfig.outputFileTracingIncludes || {}),\n      '**/*': [...(nextConfig.outputFileTracingIncludes?.['**/*'] || []), '@libsql/client'],\n    },\n    turbopack: {\n      ...(nextConfig.turbopack || {}),\n    },\n    // We disable the poweredByHeader here because we add it manually in the headers function below\n    ...(nextConfig.poweredByHeader !== false ? { poweredByHeader: false } : {}),\n    headers: async () => {\n      const headersFromConfig = 'headers' in nextConfig ? await nextConfig.headers() : []\n\n      return [\n        ...(headersFromConfig || []),\n        {\n          headers: [\n            {\n              key: 'Accept-CH',\n              value: 'Sec-CH-Prefers-Color-Scheme',\n            },\n            {\n              key: 'Vary',\n              value: 'Sec-CH-Prefers-Color-Scheme',\n            },\n            {\n              key: 'Critical-CH',\n              value: 'Sec-CH-Prefers-Color-Scheme',\n            },\n            ...(nextConfig.poweredByHeader !== false ? [poweredByHeader] : []),\n          ],\n          source: '/:path*',\n        },\n      ]\n    },\n    serverExternalPackages: [\n      ...(nextConfig.serverExternalPackages || []),\n      // WHY: without externalizing graphql, a graphql version error will be thrown\n      // during runtime (\"Ensure that there is only one instance of \\\"graphql\\\" in the node_modules\\ndirectory.\")\n      'graphql',\n      ...(process.env.NODE_ENV === 'development' && options.devBundleServerPackages !== true\n        ? /**\n           * Unless explicitly disabled by the user, by passing `devBundleServerPackages: true` to withPayload, we\n           * do not bundle server-only packages during dev for two reasons:\n           *\n           * 1. Performance: Fewer files to compile means faster compilation speeds.\n           * 2. Turbopack support: Webpack's externals are not supported by Turbopack.\n           *\n           * Regarding Turbopack support: Unlike webpack.externals, we cannot use serverExternalPackages to\n           * externalized packages that are not resolvable from the project root. So including a package like\n           * \"drizzle-kit\" in here would do nothing - Next.js will ignore the rule and still bundle the package -\n           * because it detects that the package is not resolvable from the project root (= not directly installed\n           * by the user in their own package.json).\n           *\n           * Instead, we can use serverExternalPackages for the entry-point packages that *are* installed directly\n           * by the user (e.g. db-postgres, which then installs drizzle-kit as a dependency).\n           *\n           *\n           *\n           * We should only do this during development, not build, because externalizing these packages can hurt\n           * the bundle size. Not only does it disable tree-shaking, it also risks installing duplicate copies of the\n           * same package.\n           *\n           * Example:\n           * - @payloadcms/richtext-lexical (in bundle) -> installs qs-esm (bundled because of importer)\n           * - payload (not in bundle, external) -> installs qs-esm (external because of importer)\n           * Result: we have two copies of qs-esm installed - one in the bundle, and one in node_modules.\n           *\n           * During development, these bundle size difference do not matter much, and development speed /\n           * turbopack support are more important.\n           */\n          [\n            'payload',\n            '@payloadcms/db-mongodb',\n            '@payloadcms/db-postgres',\n            '@payloadcms/db-sqlite',\n            '@payloadcms/db-vercel-postgres',\n            '@payloadcms/db-d1-sqlite',\n            '@payloadcms/drizzle',\n            '@payloadcms/email-nodemailer',\n            '@payloadcms/email-resend',\n            '@payloadcms/graphql',\n            '@payloadcms/payload-cloud',\n            '@payloadcms/plugin-redirects',\n            // TODO: Add the following packages, excluding their /client subpath exports, once Next.js supports it\n            // see: https://github.com/vercel/next.js/discussions/76991\n            //'@payloadcms/plugin-cloud-storage',\n            //'@payloadcms/plugin-sentry',\n            //'@payloadcms/plugin-stripe',\n            // @payloadcms/richtext-lexical\n            //'@payloadcms/storage-azure',\n            //'@payloadcms/storage-gcs',\n            //'@payloadcms/storage-s3',\n            //'@payloadcms/storage-uploadthing',\n            //'@payloadcms/storage-vercel-blob',\n          ]\n        : []),\n    ],\n    webpack: (webpackConfig, webpackOptions) => {\n      const incomingWebpackConfig =\n        typeof nextConfig.webpack === 'function'\n          ? nextConfig.webpack(webpackConfig, webpackOptions)\n          : webpackConfig\n\n      return {\n        ...incomingWebpackConfig,\n        externals: [\n          ...(incomingWebpackConfig?.externals || []),\n          /**\n           * See the explanation in the serverExternalPackages section above.\n           * We need to force Webpack to emit require() calls for these packages, even though they are not\n           * resolvable from the project root. You would expect this to error during runtime, but Next.js seems to be able to require these just fine.\n           *\n           * This is the only way to get Webpack Build to work, without the bundle size caveats of externalizing the\n           * entry point packages, as explained in the serverExternalPackages section above.\n           */\n          'drizzle-kit',\n          'drizzle-kit/api',\n          'sharp',\n          'libsql',\n          'require-in-the-middle',\n        ],\n        plugins: [\n          ...(incomingWebpackConfig?.plugins || []),\n          // Fix cloudflare:sockets error: https://github.com/vercel/next.js/discussions/50177\n          new webpackOptions.webpack.IgnorePlugin({\n            resourceRegExp: /^pg-native$|^cloudflare:sockets$/,\n          }),\n        ],\n        resolve: {\n          ...(incomingWebpackConfig?.resolve || {}),\n          alias: {\n            ...(incomingWebpackConfig?.resolve?.alias || {}),\n          },\n          fallback: {\n            ...(incomingWebpackConfig?.resolve?.fallback || {}),\n            /*\n             * This fixes the following warning when running next build with webpack (tested on Next.js 16.0.3 with Payload 3.64.0):\n             *\n             * ⚠ Compiled with warnings in 8.7s\n             *\n             * ./node_modules/.pnpm/mongodb@6.16.0/node_modules/mongodb/lib/deps.js\n             * Module not found: Can't resolve 'aws4' in '/Users/alessio/Documents/temp/next16p/node_modules/.pnpm/mongodb@6.16.0/node_modules/mongodb/lib'\n             *\n             * Import trace for requested module:\n             * ./node_modules/.pnpm/mongodb@6.16.0/node_modules/mongodb/lib/deps.js\n             * ./node_modules/.pnpm/mongodb@6.16.0/node_modules/mongodb/lib/client-side-encryption/client_encryption.js\n             * ./node_modules/.pnpm/mongodb@6.16.0/node_modules/mongodb/lib/index.js\n             * ./node_modules/.pnpm/mongoose@8.15.1/node_modules/mongoose/lib/index.js\n             * ./node_modules/.pnpm/mongoose@8.15.1/node_modules/mongoose/index.js\n             * ./node_modules/.pnpm/@payloadcms+db-mongodb@3.64.0_payload@3.64.0_graphql@16.12.0_typescript@5.7.3_/node_modules/@payloadcms/db-mongodb/dist/index.js\n             * ./src/payload.config.ts\n             * ./src/app/my-route/route.ts\n             *\n             **/\n            aws4: false,\n          },\n        },\n      }\n    },\n  }\n\n  if (nextConfig.basePath) {\n    process.env.NEXT_BASE_PATH = nextConfig.basePath\n    baseConfig.env.NEXT_BASE_PATH = nextConfig.basePath\n  }\n\n  if (!supportsTurbopackBuild) {\n    return withPayloadLegacy(baseConfig)\n  } else {\n    return {\n      ...baseConfig,\n      serverExternalPackages: [\n        ...(baseConfig.serverExternalPackages || []),\n        'drizzle-kit',\n        'drizzle-kit/api',\n        'sharp',\n        'libsql',\n        'require-in-the-middle',\n        // Prevents turbopack build errors by the thread-stream package which is installed by pino\n        'pino',\n      ],\n    }\n  }\n}\n\nexport default withPayload\n"],"mappings":"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","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/next",
-  "version": "3.73.0-internal.e61e2ce",
+  "version": "3.73.0-internal.ff401d9",
   "homepage": "https://payloadcms.com",
   "repository": {
     "type": "git",
@@ -99,9 +99,9 @@
     "qs-esm": "7.0.2",
     "sass": "1.77.4",
     "uuid": "10.0.0",
-    "@payloadcms/graphql": "3.73.0-internal.e61e2ce",
-    "@payloadcms/translations": "3.73.0-internal.e61e2ce",
-    "@payloadcms/ui": "3.73.0-internal.e61e2ce"
+    "@payloadcms/graphql": "3.73.0-internal.ff401d9",
+    "@payloadcms/translations": "3.73.0-internal.ff401d9",
+    "@payloadcms/ui": "3.73.0-internal.ff401d9"
   },
   "devDependencies": {
     "@babel/cli": "7.27.2",
@@ -109,22 +109,22 @@
     "@babel/preset-env": "7.27.2",
     "@babel/preset-react": "7.27.1",
     "@babel/preset-typescript": "7.27.1",
-    "@next/eslint-plugin-next": "15.4.7",
+    "@next/eslint-plugin-next": "16.1.1-canary.35",
     "@types/busboy": "1.5.4",
-    "@types/react": "19.2.1",
-    "@types/react-dom": "19.2.1",
+    "@types/react": "19.2.8",
+    "@types/react-dom": "19.2.3",
     "@types/uuid": "10.0.0",
     "babel-plugin-react-compiler": "19.1.0-rc.3",
-    "esbuild": "0.25.5",
+    "esbuild": "0.27.1",
     "esbuild-sass-plugin": "3.3.1",
     "swc-plugin-transform-remove-imports": "8.3.0",
-    "@payloadcms/eslint-config": "3.28.0",
-    "payload": "3.73.0-internal.e61e2ce"
+    "payload": "3.73.0-internal.ff401d9",
+    "@payloadcms/eslint-config": "3.28.0"
   },
   "peerDependencies": {
     "graphql": "^16.8.1",
-    "next": "^15.4.10",
-    "payload": "3.73.0-internal.e61e2ce"
+    "next": "^15.4.10 || >=16.1.1-canary.35 <16.2.0 || ^16.2.0",
+    "payload": "3.73.0-internal.ff401d9"
   },
   "engines": {
     "node": "^18.20.2 || >=20.9.0"