@payloadcms/next 3.89.0-internal.95c9cba → 3.89.0

package/dist/routes/graphql/handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"handler.d.ts","sourceRoot":"","sources":["../../../src/routes/graphql/handler.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAqC,eAAe,EAAE,MAAM,SAAS,CAAA;AAqEjF,eAAO,MAAM,UAAU,WAAkB,OAAO,CAAC,eAAe,CAAC,GAAG,eAAe,iBAyBlF,CAAA;AAED,eAAO,MAAM,IAAI,WACN,OAAO,CAAC,eAAe,CAAC,GAAG,eAAe,eAAqB,OAAO,sBA6D9E,CAAA"}
+{"version":3,"file":"handler.d.ts","sourceRoot":"","sources":["../../../src/routes/graphql/handler.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAqC,eAAe,EAAE,MAAM,SAAS,CAAA;AAsEjF,eAAO,MAAM,UAAU,WAAkB,OAAO,CAAC,eAAe,CAAC,GAAG,eAAe,iBAyBlF,CAAA;AAED,eAAO,MAAM,IAAI,WACN,OAAO,CAAC,eAAe,CAAC,GAAG,eAAe,eAAqB,OAAO,sBAmE9E,CAAA"}

package/dist/routes/graphql/handler.js

@@ -1,7 +1,7 @@
 import { configToSchema } from '@payloadcms/graphql';
 import { createHandler } from 'graphql-http/lib/use/fetch';
 import { status as httpStatus } from 'http-status';
-import { addDataAndFileToRequest, addLocalesToRequestFromData, createPayloadRequest, headersWithCors, logError, mergeHeaders } from 'payload';
+import { addDataAndFileToRequest, addLocalesToRequestFromData, createPayloadRequest, headersWithCors, logError, mergeHeaders, unlinkClientUploadTempFile } from 'payload';
 const handleError = async ({
   err,
   payload,
@@ -90,53 +90,61 @@ export const POST = config => async request => {
       status: 404
     });
   }
-  await addDataAndFileToRequest(req);
-  addLocalesToRequestFromData(req);
-  const {
-    schema,
-    validationRules
-  } = await getGraphql(config);
-  const headers = {};
-  const apiResponse = await createHandler({
-    context: {
-      headers,
+  try {
+    await addDataAndFileToRequest(req);
+    addLocalesToRequestFromData(req);
+    const {
+      schema,
+      validationRules
+    } = await getGraphql(config);
+    const headers = {};
+    const apiResponse = await createHandler({
+      context: {
+        headers,
+        req
+      },
+      onOperation: async (request, args, result) => {
+        const response = typeof payload.extensions === 'function' ? await payload.extensions({
+          args,
+          req: request,
+          result
+        }) : result;
+        if (response.errors) {
+          const errors = await Promise.all(result.errors.map(error => {
+            return handleError({
+              err: error,
+              payload,
+              req
+            });
+          }));
+          // errors type should be FormattedGraphQLError[] but onOperation has a return type of ExecutionResult instead of FormattedExecutionResult
+          return {
+            ...response,
+            errors
+          };
+        }
+        return response;
+      },
+      schema,
+      validationRules: (_, args, defaultRules) => defaultRules.concat(validationRules(args))
+    })(originalRequest);
+    const resHeaders = headersWithCors({
+      headers: new Headers(apiResponse.headers),
       req
-    },
-    onOperation: async (request, args, result) => {
-      const response = typeof payload.extensions === 'function' ? await payload.extensions({
-        args,
-        req: request,
-        result
-      }) : result;
-      if (response.errors) {
-        const errors = await Promise.all(result.errors.map(error => {
-          return handleError({
-            err: error,
-            payload,
-            req
-          });
-        }));
-        // errors type should be FormattedGraphQLError[] but onOperation has a return type of ExecutionResult instead of FormattedExecutionResult
-        return {
-          ...response,
-          errors
-        };
-      }
-      return response;
-    },
-    schema,
-    validationRules: (_, args, defaultRules) => defaultRules.concat(validationRules(args))
-  })(originalRequest);
-  const resHeaders = headersWithCors({
-    headers: new Headers(apiResponse.headers),
-    req
-  });
-  for (const key in headers) {
-    resHeaders.append(key, headers[key]);
+    });
+    for (const key in headers) {
+      resHeaders.append(key, headers[key]);
+    }
+    return new Response(apiResponse.body, {
+      headers: req.responseHeaders ? mergeHeaders(req.responseHeaders, resHeaders) : resHeaders,
+      status: apiResponse.status
+    });
+  } finally {
+    // GraphQL parses the body itself instead of going through wrapInternalEndpoints, and an
+    // operation that writes no document never reaches the operation-level cleanup.
+    await unlinkClientUploadTempFile({
+      req
+    });
   }
-  return new Response(apiResponse.body, {
-    headers: req.responseHeaders ? mergeHeaders(req.responseHeaders, resHeaders) : resHeaders,
-    status: apiResponse.status
-  });
 };
 //# sourceMappingURL=handler.js.map

package/dist/routes/graphql/handler.js.map

@@ -1 +1 @@
-{"version":3,"file":"handler.js","names":["configToSchema","createHandler","status","httpStatus","addDataAndFileToRequest","addLocalesToRequestFromData","createPayloadRequest","headersWithCors","logError","mergeHeaders","handleError","err","payload","req","originalError","INTERNAL_SERVER_ERROR","errorMessage","message","config","debug","response","extensions","name","undefined","data","stack","statusCode","locations","path","hooks","afterError","reduce","promise","hook","result","context","error","graphqlResult","Promise","resolve","cached","global","_payload_graphql","graphql","getGraphql","process","env","NODE_ENV","resolvedConfig","schema","e","POST","request","originalRequest","clone","canSetHeaders","graphQL","disable","Response","validationRules","headers","apiResponse","onOperation","args","errors","all","map","_","defaultRules","concat","resHeaders","Headers","key","append","body","responseHeaders"],"sources":["../../../src/routes/graphql/handler.ts"],"sourcesContent":["import type { GraphQLError, GraphQLFormattedError } from 'graphql'\nimport type { APIError, Payload, PayloadRequest, SanitizedConfig } from 'payload'\n\nimport { configToSchema } from '@payloadcms/graphql'\nimport { createHandler } from 'graphql-http/lib/use/fetch'\nimport { status as httpStatus } from 'http-status'\nimport {\n  addDataAndFileToRequest,\n  addLocalesToRequestFromData,\n  createPayloadRequest,\n  headersWithCors,\n  logError,\n  mergeHeaders,\n} from 'payload'\n\nconst handleError = async ({\n  err,\n  payload,\n  req,\n}: {\n  err: GraphQLError\n  payload: Payload\n  req: PayloadRequest\n}): Promise<GraphQLFormattedError> => {\n  const status = (err.originalError as APIError).status || httpStatus.INTERNAL_SERVER_ERROR\n  let errorMessage = err.message\n  logError({ err, payload })\n\n  // Internal server errors can contain anything, including potentially sensitive data.\n  // Therefore, error details will be hidden from the response unless `config.debug` is `true`\n  if (!payload.config.debug && status === httpStatus.INTERNAL_SERVER_ERROR) {\n    errorMessage = 'Something went wrong.'\n  }\n\n  let response: GraphQLFormattedError = {\n    extensions: {\n      name: err?.originalError?.name || undefined,\n      data: (err && err.originalError && (err.originalError as APIError).data) || undefined,\n      stack: payload.config.debug ? err.stack : undefined,\n      statusCode: status,\n    },\n    locations: err.locations,\n    message: errorMessage,\n    path: err.path,\n  }\n\n  await payload.config.hooks.afterError?.reduce(async (promise, hook) => {\n    await promise\n\n    const result = await hook({\n      context: req.context,\n      error: err,\n      graphqlResult: response,\n      req,\n    })\n\n    if (result) {\n      response = result.graphqlResult || response\n    }\n  }, Promise.resolve())\n\n  return response\n}\n\nlet cached = global._payload_graphql\n\nif (!cached) {\n  cached = global._payload_graphql = { graphql: null, promise: null }\n}\n\nexport const getGraphql = async (config: Promise<SanitizedConfig> | SanitizedConfig) => {\n  if (process.env.NODE_ENV === 'development') {\n    cached = global._payload_graphql = { graphql: null, promise: null }\n  }\n\n  if (cached.graphql) {\n    return cached.graphql\n  }\n\n  if (!cached.promise) {\n    const resolvedConfig = await config\n    cached.promise = new Promise((resolve) => {\n      const schema = configToSchema(resolvedConfig)\n      resolve(cached.graphql || schema)\n    })\n  }\n\n  try {\n    cached.graphql = await cached.promise\n  } catch (e) {\n    cached.promise = null\n    throw e\n  }\n\n  return cached.graphql\n}\n\nexport const POST =\n  (config: Promise<SanitizedConfig> | SanitizedConfig) => async (request: Request) => {\n    const originalRequest = request.clone()\n    const req = await createPayloadRequest({\n      canSetHeaders: true,\n      config,\n      request,\n    })\n\n    const { payload } = req\n\n    if (payload.config.graphQL?.disable) {\n      return new Response(null, {\n        status: 404,\n      })\n    }\n\n    await addDataAndFileToRequest(req)\n    addLocalesToRequestFromData(req)\n\n    const { schema, validationRules } = await getGraphql(config)\n\n    const headers = {}\n    const apiResponse = await createHandler({\n      context: { headers, req },\n      onOperation: async (request, args, result) => {\n        const response =\n          typeof payload.extensions === 'function'\n            ? await payload.extensions({\n                args,\n                req: request,\n                result,\n              })\n            : result\n        if (response.errors) {\n          const errors = (await Promise.all(\n            result.errors.map((error) => {\n              return handleError({ err: error, payload, req })\n            }),\n          )) as GraphQLError[]\n          // errors type should be FormattedGraphQLError[] but onOperation has a return type of ExecutionResult instead of FormattedExecutionResult\n          return { ...response, errors }\n        }\n        return response\n      },\n      schema,\n      validationRules: (_, args, defaultRules) => defaultRules.concat(validationRules(args)),\n    })(originalRequest)\n\n    const resHeaders = headersWithCors({\n      headers: new Headers(apiResponse.headers),\n      req,\n    })\n\n    for (const key in headers) {\n      resHeaders.append(key, headers[key])\n    }\n\n    return new Response(apiResponse.body, {\n      headers: req.responseHeaders ? mergeHeaders(req.responseHeaders, resHeaders) : resHeaders,\n      status: apiResponse.status,\n    })\n  }\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"handler.js","names":["configToSchema","createHandler","status","httpStatus","addDataAndFileToRequest","addLocalesToRequestFromData","createPayloadRequest","headersWithCors","logError","mergeHeaders","unlinkClientUploadTempFile","handleError","err","payload","req","originalError","INTERNAL_SERVER_ERROR","errorMessage","message","config","debug","response","extensions","name","undefined","data","stack","statusCode","locations","path","hooks","afterError","reduce","promise","hook","result","context","error","graphqlResult","Promise","resolve","cached","global","_payload_graphql","graphql","getGraphql","process","env","NODE_ENV","resolvedConfig","schema","e","POST","request","originalRequest","clone","canSetHeaders","graphQL","disable","Response","validationRules","headers","apiResponse","onOperation","args","errors","all","map","_","defaultRules","concat","resHeaders","Headers","key","append","body","responseHeaders"],"sources":["../../../src/routes/graphql/handler.ts"],"sourcesContent":["import type { GraphQLError, GraphQLFormattedError } from 'graphql'\nimport type { APIError, Payload, PayloadRequest, SanitizedConfig } from 'payload'\n\nimport { configToSchema } from '@payloadcms/graphql'\nimport { createHandler } from 'graphql-http/lib/use/fetch'\nimport { status as httpStatus } from 'http-status'\nimport {\n  addDataAndFileToRequest,\n  addLocalesToRequestFromData,\n  createPayloadRequest,\n  headersWithCors,\n  logError,\n  mergeHeaders,\n  unlinkClientUploadTempFile,\n} from 'payload'\n\nconst handleError = async ({\n  err,\n  payload,\n  req,\n}: {\n  err: GraphQLError\n  payload: Payload\n  req: PayloadRequest\n}): Promise<GraphQLFormattedError> => {\n  const status = (err.originalError as APIError).status || httpStatus.INTERNAL_SERVER_ERROR\n  let errorMessage = err.message\n  logError({ err, payload })\n\n  // Internal server errors can contain anything, including potentially sensitive data.\n  // Therefore, error details will be hidden from the response unless `config.debug` is `true`\n  if (!payload.config.debug && status === httpStatus.INTERNAL_SERVER_ERROR) {\n    errorMessage = 'Something went wrong.'\n  }\n\n  let response: GraphQLFormattedError = {\n    extensions: {\n      name: err?.originalError?.name || undefined,\n      data: (err && err.originalError && (err.originalError as APIError).data) || undefined,\n      stack: payload.config.debug ? err.stack : undefined,\n      statusCode: status,\n    },\n    locations: err.locations,\n    message: errorMessage,\n    path: err.path,\n  }\n\n  await payload.config.hooks.afterError?.reduce(async (promise, hook) => {\n    await promise\n\n    const result = await hook({\n      context: req.context,\n      error: err,\n      graphqlResult: response,\n      req,\n    })\n\n    if (result) {\n      response = result.graphqlResult || response\n    }\n  }, Promise.resolve())\n\n  return response\n}\n\nlet cached = global._payload_graphql\n\nif (!cached) {\n  cached = global._payload_graphql = { graphql: null, promise: null }\n}\n\nexport const getGraphql = async (config: Promise<SanitizedConfig> | SanitizedConfig) => {\n  if (process.env.NODE_ENV === 'development') {\n    cached = global._payload_graphql = { graphql: null, promise: null }\n  }\n\n  if (cached.graphql) {\n    return cached.graphql\n  }\n\n  if (!cached.promise) {\n    const resolvedConfig = await config\n    cached.promise = new Promise((resolve) => {\n      const schema = configToSchema(resolvedConfig)\n      resolve(cached.graphql || schema)\n    })\n  }\n\n  try {\n    cached.graphql = await cached.promise\n  } catch (e) {\n    cached.promise = null\n    throw e\n  }\n\n  return cached.graphql\n}\n\nexport const POST =\n  (config: Promise<SanitizedConfig> | SanitizedConfig) => async (request: Request) => {\n    const originalRequest = request.clone()\n    const req = await createPayloadRequest({\n      canSetHeaders: true,\n      config,\n      request,\n    })\n\n    const { payload } = req\n\n    if (payload.config.graphQL?.disable) {\n      return new Response(null, {\n        status: 404,\n      })\n    }\n\n    try {\n      await addDataAndFileToRequest(req)\n      addLocalesToRequestFromData(req)\n\n      const { schema, validationRules } = await getGraphql(config)\n\n      const headers = {}\n      const apiResponse = await createHandler({\n        context: { headers, req },\n        onOperation: async (request, args, result) => {\n          const response =\n            typeof payload.extensions === 'function'\n              ? await payload.extensions({\n                  args,\n                  req: request,\n                  result,\n                })\n              : result\n          if (response.errors) {\n            const errors = (await Promise.all(\n              result.errors.map((error) => {\n                return handleError({ err: error, payload, req })\n              }),\n            )) as GraphQLError[]\n            // errors type should be FormattedGraphQLError[] but onOperation has a return type of ExecutionResult instead of FormattedExecutionResult\n            return { ...response, errors }\n          }\n          return response\n        },\n        schema,\n        validationRules: (_, args, defaultRules) => defaultRules.concat(validationRules(args)),\n      })(originalRequest)\n\n      const resHeaders = headersWithCors({\n        headers: new Headers(apiResponse.headers),\n        req,\n      })\n\n      for (const key in headers) {\n        resHeaders.append(key, headers[key])\n      }\n\n      return new Response(apiResponse.body, {\n        headers: req.responseHeaders ? mergeHeaders(req.responseHeaders, resHeaders) : resHeaders,\n        status: apiResponse.status,\n      })\n    } finally {\n      // GraphQL parses the body itself instead of going through wrapInternalEndpoints, and an\n      // operation that writes no document never reaches the operation-level cleanup.\n      await unlinkClientUploadTempFile({ req })\n    }\n  }\n"],"mappings":"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","ignoreList":[]}

package/dist/utilities/handleServerFunctions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"handleServerFunctions.d.ts","sourceRoot":"","sources":["../../src/utilities/handleServerFunctions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAA6C,qBAAqB,EAAE,MAAM,SAAS,CAAA;AA+B/F,eAAO,MAAM,qBAAqB,EAAE,qBA+BnC,CAAA"}
+{"version":3,"file":"handleServerFunctions.d.ts","sourceRoot":"","sources":["../../src/utilities/handleServerFunctions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAA6C,qBAAqB,EAAE,MAAM,SAAS,CAAA;AAmC/F,eAAO,MAAM,qBAAqB,EAAE,qBA+BnC,CAAA"}

package/dist/utilities/handleServerFunctions.js

@@ -2,7 +2,7 @@ import { _internal_renderFieldHandler, copyDataFromLocaleHandler } from '@payloa
 import { buildFormStateHandler } from '@payloadcms/ui/utilities/buildFormState';
 import { buildTableStateHandler } from '@payloadcms/ui/utilities/buildTableState';
 import { getFolderResultsComponentAndDataHandler } from '@payloadcms/ui/utilities/getFolderResultsComponentAndData';
-import { schedulePublishHandler } from '@payloadcms/ui/utilities/schedulePublishHandler';
+import { getUpcomingScheduledPublishHandler, schedulePublishHandler } from '@payloadcms/ui/utilities/schedulePublishHandler';
 import { getDefaultLayoutHandler } from '../views/Dashboard/Default/ModularDashboard/renderWidget/getDefaultLayoutServerFn.js';
 import { renderWidgetHandler } from '../views/Dashboard/Default/ModularDashboard/renderWidget/renderWidgetServerFn.js';
 import { renderDocumentHandler } from '../views/Document/handleServerFunction.js';
@@ -15,6 +15,7 @@ const baseServerFunctions = {
   'form-state': buildFormStateHandler,
   'get-default-layout': getDefaultLayoutHandler,
   'get-folder-results-component-and-data': getFolderResultsComponentAndDataHandler,
+  'get-upcoming-scheduled-publish': getUpcomingScheduledPublishHandler,
   'render-document': renderDocumentHandler,
   'render-document-slots': renderDocumentSlotsHandler,
   'render-field': _internal_renderFieldHandler,

package/dist/utilities/handleServerFunctions.js.map

@@ -1 +1 @@
-{"version":3,"file":"handleServerFunctions.js","names":["_internal_renderFieldHandler","copyDataFromLocaleHandler","buildFormStateHandler","buildTableStateHandler","getFolderResultsComponentAndDataHandler","schedulePublishHandler","getDefaultLayoutHandler","renderWidgetHandler","renderDocumentHandler","renderDocumentSlotsHandler","renderListHandler","initReq","slugifyHandler","baseServerFunctions","slugify","handleServerFunctions","args","name","fnKey","fnArgs","config","configPromise","importMap","serverFunctions","extraServerFunctions","cookies","locale","permissions","req","key","augmentedArgs","fn","Error"],"sources":["../../src/utilities/handleServerFunctions.ts"],"sourcesContent":["import type { DefaultServerFunctionArgs, ServerFunction, ServerFunctionHandler } from 'payload'\n\nimport { _internal_renderFieldHandler, copyDataFromLocaleHandler } from '@payloadcms/ui/rsc'\nimport { buildFormStateHandler } from '@payloadcms/ui/utilities/buildFormState'\nimport { buildTableStateHandler } from '@payloadcms/ui/utilities/buildTableState'\nimport { getFolderResultsComponentAndDataHandler } from '@payloadcms/ui/utilities/getFolderResultsComponentAndData'\nimport { schedulePublishHandler } from '@payloadcms/ui/utilities/schedulePublishHandler'\n\nimport { getDefaultLayoutHandler } from '../views/Dashboard/Default/ModularDashboard/renderWidget/getDefaultLayoutServerFn.js'\nimport { renderWidgetHandler } from '../views/Dashboard/Default/ModularDashboard/renderWidget/renderWidgetServerFn.js'\nimport { renderDocumentHandler } from '../views/Document/handleServerFunction.js'\nimport { renderDocumentSlotsHandler } from '../views/Document/renderDocumentSlots.js'\nimport { renderListHandler } from '../views/List/handleServerFunction.js'\nimport { initReq } from './initReq.js'\nimport { slugifyHandler } from './slugify.js'\n\nconst baseServerFunctions: Record<string, ServerFunction<any, any>> = {\n  'copy-data-from-locale': copyDataFromLocaleHandler,\n  'form-state': buildFormStateHandler,\n  'get-default-layout': getDefaultLayoutHandler,\n  'get-folder-results-component-and-data': getFolderResultsComponentAndDataHandler,\n  'render-document': renderDocumentHandler,\n  'render-document-slots': renderDocumentSlotsHandler,\n  'render-field': _internal_renderFieldHandler,\n  'render-list': renderListHandler,\n  'render-widget': renderWidgetHandler,\n  'schedule-publish': schedulePublishHandler,\n  slugify: slugifyHandler,\n  'table-state': buildTableStateHandler,\n}\n\nexport const handleServerFunctions: ServerFunctionHandler = async (args) => {\n  const {\n    name: fnKey,\n    args: fnArgs,\n    config: configPromise,\n    importMap,\n    serverFunctions: extraServerFunctions,\n  } = args\n\n  const { cookies, locale, permissions, req } = await initReq({\n    configPromise,\n    importMap,\n    key: 'RootLayout',\n  })\n\n  const augmentedArgs: DefaultServerFunctionArgs = {\n    ...fnArgs,\n    cookies,\n    importMap,\n    locale,\n    permissions,\n    req,\n  }\n\n  const fn = extraServerFunctions?.[fnKey] || baseServerFunctions[fnKey]\n\n  if (!fn) {\n    throw new Error(`Unknown Server Function: ${fnKey}`)\n  }\n\n  return fn(augmentedArgs)\n}\n"],"mappings":"AAEA,SAASA,4BAA4B,EAAEC,yBAAyB,QAAQ;AACxE,SAASC,qBAAqB,QAAQ;AACtC,SAASC,sBAAsB,QAAQ;AACvC,SAASC,uCAAuC,QAAQ;AACxD,SAASC,sBAAsB,QAAQ;AAEvC,SAASC,uBAAuB,QAAQ;AACxC,SAASC,mBAAmB,QAAQ;AACpC,SAASC,qBAAqB,QAAQ;AACtC,SAASC,0BAA0B,QAAQ;AAC3C,SAASC,iBAAiB,QAAQ;AAClC,SAASC,OAAO,QAAQ;AACxB,SAASC,cAAc,QAAQ;AAE/B,MAAMC,mBAAA,GAAgE;EACpE,yBAAyBZ,yBAAA;EACzB,cAAcC,qBAAA;EACd,sBAAsBI,uBAAA;EACtB,yCAAyCF,uCAAA;EACzC,mBAAmBI,qBAAA;EACnB,yBAAyBC,0BAAA;EACzB,gBAAgBT,4BAAA;EAChB,eAAeU,iBAAA;EACf,iBAAiBH,mBAAA;EACjB,oBAAoBF,sBAAA;EACpBS,OAAA,EAASF,cAAA;EACT,eAAeT;AACjB;AAEA,OAAO,MAAMY,qBAAA,GAA+C,MAAOC,IAAA;EACjE,MAAM;IACJC,IAAA,EAAMC,KAAK;IACXF,IAAA,EAAMG,MAAM;IACZC,MAAA,EAAQC,aAAa;IACrBC,SAAS;IACTC,eAAA,EAAiBC;EAAoB,CACtC,GAAGR,IAAA;EAEJ,MAAM;IAAES,OAAO;IAAEC,MAAM;IAAEC,WAAW;IAAEC;EAAG,CAAE,GAAG,MAAMjB,OAAA,CAAQ;IAC1DU,aAAA;IACAC,SAAA;IACAO,GAAA,EAAK;EACP;EAEA,MAAMC,aAAA,GAA2C;IAC/C,GAAGX,MAAM;IACTM,OAAA;IACAH,SAAA;IACAI,MAAA;IACAC,WAAA;IACAC;EACF;EAEA,MAAMG,EAAA,GAAKP,oBAAA,GAAuBN,KAAA,CAAM,IAAIL,mBAAmB,CAACK,KAAA,CAAM;EAEtE,IAAI,CAACa,EAAA,EAAI;IACP,MAAM,IAAIC,KAAA,CAAM,4BAA4Bd,KAAA,EAAO;EACrD;EAEA,OAAOa,EAAA,CAAGD,aAAA;AACZ","ignoreList":[]}
+{"version":3,"file":"handleServerFunctions.js","names":["_internal_renderFieldHandler","copyDataFromLocaleHandler","buildFormStateHandler","buildTableStateHandler","getFolderResultsComponentAndDataHandler","getUpcomingScheduledPublishHandler","schedulePublishHandler","getDefaultLayoutHandler","renderWidgetHandler","renderDocumentHandler","renderDocumentSlotsHandler","renderListHandler","initReq","slugifyHandler","baseServerFunctions","slugify","handleServerFunctions","args","name","fnKey","fnArgs","config","configPromise","importMap","serverFunctions","extraServerFunctions","cookies","locale","permissions","req","key","augmentedArgs","fn","Error"],"sources":["../../src/utilities/handleServerFunctions.ts"],"sourcesContent":["import type { DefaultServerFunctionArgs, ServerFunction, ServerFunctionHandler } from 'payload'\n\nimport { _internal_renderFieldHandler, copyDataFromLocaleHandler } from '@payloadcms/ui/rsc'\nimport { buildFormStateHandler } from '@payloadcms/ui/utilities/buildFormState'\nimport { buildTableStateHandler } from '@payloadcms/ui/utilities/buildTableState'\nimport { getFolderResultsComponentAndDataHandler } from '@payloadcms/ui/utilities/getFolderResultsComponentAndData'\nimport {\n  getUpcomingScheduledPublishHandler,\n  schedulePublishHandler,\n} from '@payloadcms/ui/utilities/schedulePublishHandler'\n\nimport { getDefaultLayoutHandler } from '../views/Dashboard/Default/ModularDashboard/renderWidget/getDefaultLayoutServerFn.js'\nimport { renderWidgetHandler } from '../views/Dashboard/Default/ModularDashboard/renderWidget/renderWidgetServerFn.js'\nimport { renderDocumentHandler } from '../views/Document/handleServerFunction.js'\nimport { renderDocumentSlotsHandler } from '../views/Document/renderDocumentSlots.js'\nimport { renderListHandler } from '../views/List/handleServerFunction.js'\nimport { initReq } from './initReq.js'\nimport { slugifyHandler } from './slugify.js'\n\nconst baseServerFunctions: Record<string, ServerFunction<any, any>> = {\n  'copy-data-from-locale': copyDataFromLocaleHandler,\n  'form-state': buildFormStateHandler,\n  'get-default-layout': getDefaultLayoutHandler,\n  'get-folder-results-component-and-data': getFolderResultsComponentAndDataHandler,\n  'get-upcoming-scheduled-publish': getUpcomingScheduledPublishHandler,\n  'render-document': renderDocumentHandler,\n  'render-document-slots': renderDocumentSlotsHandler,\n  'render-field': _internal_renderFieldHandler,\n  'render-list': renderListHandler,\n  'render-widget': renderWidgetHandler,\n  'schedule-publish': schedulePublishHandler,\n  slugify: slugifyHandler,\n  'table-state': buildTableStateHandler,\n}\n\nexport const handleServerFunctions: ServerFunctionHandler = async (args) => {\n  const {\n    name: fnKey,\n    args: fnArgs,\n    config: configPromise,\n    importMap,\n    serverFunctions: extraServerFunctions,\n  } = args\n\n  const { cookies, locale, permissions, req } = await initReq({\n    configPromise,\n    importMap,\n    key: 'RootLayout',\n  })\n\n  const augmentedArgs: DefaultServerFunctionArgs = {\n    ...fnArgs,\n    cookies,\n    importMap,\n    locale,\n    permissions,\n    req,\n  }\n\n  const fn = extraServerFunctions?.[fnKey] || baseServerFunctions[fnKey]\n\n  if (!fn) {\n    throw new Error(`Unknown Server Function: ${fnKey}`)\n  }\n\n  return fn(augmentedArgs)\n}\n"],"mappings":"AAEA,SAASA,4BAA4B,EAAEC,yBAAyB,QAAQ;AACxE,SAASC,qBAAqB,QAAQ;AACtC,SAASC,sBAAsB,QAAQ;AACvC,SAASC,uCAAuC,QAAQ;AACxD,SACEC,kCAAkC,EAClCC,sBAAsB,QACjB;AAEP,SAASC,uBAAuB,QAAQ;AACxC,SAASC,mBAAmB,QAAQ;AACpC,SAASC,qBAAqB,QAAQ;AACtC,SAASC,0BAA0B,QAAQ;AAC3C,SAASC,iBAAiB,QAAQ;AAClC,SAASC,OAAO,QAAQ;AACxB,SAASC,cAAc,QAAQ;AAE/B,MAAMC,mBAAA,GAAgE;EACpE,yBAAyBb,yBAAA;EACzB,cAAcC,qBAAA;EACd,sBAAsBK,uBAAA;EACtB,yCAAyCH,uCAAA;EACzC,kCAAkCC,kCAAA;EAClC,mBAAmBI,qBAAA;EACnB,yBAAyBC,0BAAA;EACzB,gBAAgBV,4BAAA;EAChB,eAAeW,iBAAA;EACf,iBAAiBH,mBAAA;EACjB,oBAAoBF,sBAAA;EACpBS,OAAA,EAASF,cAAA;EACT,eAAeV;AACjB;AAEA,OAAO,MAAMa,qBAAA,GAA+C,MAAOC,IAAA;EACjE,MAAM;IACJC,IAAA,EAAMC,KAAK;IACXF,IAAA,EAAMG,MAAM;IACZC,MAAA,EAAQC,aAAa;IACrBC,SAAS;IACTC,eAAA,EAAiBC;EAAoB,CACtC,GAAGR,IAAA;EAEJ,MAAM;IAAES,OAAO;IAAEC,MAAM;IAAEC,WAAW;IAAEC;EAAG,CAAE,GAAG,MAAMjB,OAAA,CAAQ;IAC1DU,aAAA;IACAC,SAAA;IACAO,GAAA,EAAK;EACP;EAEA,MAAMC,aAAA,GAA2C;IAC/C,GAAGX,MAAM;IACTM,OAAA;IACAH,SAAA;IACAI,MAAA;IACAC,WAAA;IACAC;EACF;EAEA,MAAMG,EAAA,GAAKP,oBAAA,GAAuBN,KAAA,CAAM,IAAIL,mBAAmB,CAACK,KAAA,CAAM;EAEtE,IAAI,CAACa,EAAA,EAAI;IACP,MAAM,IAAIC,KAAA,CAAM,4BAA4Bd,KAAA,EAAO;EACrD;EAEA,OAAOa,EAAA,CAAGD,aAAA;AACZ","ignoreList":[]}

package/dist/views/Version/RenderFieldsToDiff/DiffCollapser/index.d.ts

@@ -2,6 +2,7 @@ import type { ClientField } from 'payload';
 import React from 'react';
 import './index.scss';
 type Props = {
+    changeCount?: number;
     hideGutter?: boolean;
     initCollapsed?: boolean;
     Label: React.ReactNode;

package/dist/views/Version/RenderFieldsToDiff/DiffCollapser/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/views/Version/RenderFieldsToDiff/DiffCollapser/index.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AAI1C,OAAO,KAAmB,MAAM,OAAO,CAAA;AAEvC,OAAO,cAAc,CAAA;AAKrB,KAAK,KAAK,GAAG;IACX,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB,KAAK,EAAE,KAAK,CAAC,SAAS,CAAA;IACtB,OAAO,EAAE,MAAM,EAAE,GAAG,SAAS,CAAA;IAC7B,iBAAiB,EAAE,OAAO,CAAA;IAC1B,OAAO,EAAE,OAAO,CAAA;CACjB,GAAG,CACA;IAEE,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAA;IACzB,KAAK,CAAC,EAAE,KAAK,CAAA;IACb,MAAM,EAAE,WAAW,EAAE,CAAA;IACrB,UAAU,CAAC,EAAE,KAAK,CAAA;IAClB,SAAS,EAAE,OAAO,CAAA;CACnB,GACD;IAEE,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAA;IACzB,KAAK,EAAE,WAAW,CAAA;IAClB,MAAM,CAAC,EAAE,KAAK,CAAA;IACd,UAAU,EAAE,IAAI,CAAA;IAChB,SAAS,CAAC,EAAE,OAAO,CAAA;CACpB,CACJ,CAAA;AAED,eAAO,MAAM,aAAa,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,CAmFzC,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/views/Version/RenderFieldsToDiff/DiffCollapser/index.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AAI1C,OAAO,KAAmB,MAAM,OAAO,CAAA;AAEvC,OAAO,cAAc,CAAA;AAKrB,KAAK,KAAK,GAAG;IACX,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB,KAAK,EAAE,KAAK,CAAC,SAAS,CAAA;IACtB,OAAO,EAAE,MAAM,EAAE,GAAG,SAAS,CAAA;IAC7B,iBAAiB,EAAE,OAAO,CAAA;IAC1B,OAAO,EAAE,OAAO,CAAA;CACjB,GAAG,CACA;IAEE,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAA;IACzB,KAAK,CAAC,EAAE,KAAK,CAAA;IACb,MAAM,EAAE,WAAW,EAAE,CAAA;IACrB,UAAU,CAAC,EAAE,KAAK,CAAA;IAClB,SAAS,EAAE,OAAO,CAAA;CACnB,GACD;IAEE,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAA;IACzB,KAAK,EAAE,WAAW,CAAA;IAClB,MAAM,CAAC,EAAE,KAAK,CAAA;IACd,UAAU,EAAE,IAAI,CAAA;IAChB,SAAS,CAAC,EAAE,OAAO,CAAA;CACpB,CACJ,CAAA;AAED,eAAO,MAAM,aAAa,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,CAsFzC,CAAA"}

package/dist/views/Version/RenderFieldsToDiff/DiffCollapser/index.js

@@ -8,8 +8,9 @@ import React, { useState } from 'react';
 import { countChangedFields, countChangedFieldsInRows } from '../utilities/countChangedFields.js';
 const baseClass = 'diff-collapser';
 export const DiffCollapser = t0 => {
-  const $ = _c(19);
+  const $ = _c(20);
   const {
+    changeCount: changeCountFromProps,
     children,
     field,
     fields,
@@ -33,54 +34,58 @@ export const DiffCollapser = t0 => {
     config
   } = useConfig();
   let t4;
-  if ($[0] !== Label || $[1] !== children || $[2] !== config || $[3] !== field || $[4] !== fields || $[5] !== hideGutter || $[6] !== isCollapsed || $[7] !== isIterable || $[8] !== locales || $[9] !== parentIsLocalized || $[10] !== t || $[11] !== valueFrom || $[12] !== valueTo) {
+  if ($[0] !== Label || $[1] !== changeCountFromProps || $[2] !== children || $[3] !== config || $[4] !== field || $[5] !== fields || $[6] !== hideGutter || $[7] !== isCollapsed || $[8] !== isIterable || $[9] !== locales || $[10] !== parentIsLocalized || $[11] !== t || $[12] !== valueFrom || $[13] !== valueTo) {
     let changeCount;
-    if (isIterable) {
-      if (!fieldIsArrayType(field) && !fieldIsBlockType(field)) {
-        throw new Error("DiffCollapser: field must be an array or blocks field when isIterable is true");
-      }
-      const valueFromRows = valueFrom ?? [];
-      const valueToRows = valueTo ?? [];
-      if (!Array.isArray(valueFromRows) || !Array.isArray(valueToRows)) {
-        throw new Error("DiffCollapser: valueFrom and valueTro must be arrays when isIterable is true");
-      }
-      changeCount = countChangedFieldsInRows({
-        config,
-        field,
-        locales,
-        parentIsLocalized,
-        valueFromRows,
-        valueToRows
-      });
+    if (typeof changeCountFromProps === "number") {
+      changeCount = changeCountFromProps;
     } else {
-      changeCount = countChangedFields({
-        config,
-        fields,
-        locales,
-        parentIsLocalized,
-        valueFrom,
-        valueTo
-      });
+      if (isIterable) {
+        if (!fieldIsArrayType(field) && !fieldIsBlockType(field)) {
+          throw new Error("DiffCollapser: field must be an array or blocks field when isIterable is true");
+        }
+        const valueFromRows = valueFrom ?? [];
+        const valueToRows = valueTo ?? [];
+        if (!Array.isArray(valueFromRows) || !Array.isArray(valueToRows)) {
+          throw new Error("DiffCollapser: valueFrom and valueTro must be arrays when isIterable is true");
+        }
+        changeCount = countChangedFieldsInRows({
+          config,
+          field,
+          locales,
+          parentIsLocalized,
+          valueFromRows,
+          valueToRows
+        });
+      } else {
+        changeCount = countChangedFields({
+          config,
+          fields,
+          locales,
+          parentIsLocalized,
+          valueFrom,
+          valueTo
+        });
+      }
     }
     const t5 = isCollapsed && `${baseClass}__content--is-collapsed`;
     const t6 = hideGutter && `${baseClass}__content--hide-gutter`;
     let t7;
-    if ($[14] !== t5 || $[15] !== t6) {
+    if ($[15] !== t5 || $[16] !== t6) {
       t7 = [`${baseClass}__content`, t5, t6].filter(Boolean);
-      $[14] = t5;
-      $[15] = t6;
-      $[16] = t7;
+      $[15] = t5;
+      $[16] = t6;
+      $[17] = t7;
     } else {
-      t7 = $[16];
+      t7 = $[17];
     }
     const contentClassNames = t7.join(" ");
     let t8;
-    if ($[17] !== isCollapsed) {
+    if ($[18] !== isCollapsed) {
       t8 = () => setIsCollapsed(!isCollapsed);
-      $[17] = isCollapsed;
-      $[18] = t8;
+      $[18] = isCollapsed;
+      $[19] = t8;
     } else {
-      t8 = $[18];
+      t8 = $[19];
     }
     t4 = _jsxs("div", {
       className: baseClass,
@@ -109,21 +114,22 @@ export const DiffCollapser = t0 => {
       })]
     });
     $[0] = Label;
-    $[1] = children;
-    $[2] = config;
-    $[3] = field;
-    $[4] = fields;
-    $[5] = hideGutter;
-    $[6] = isCollapsed;
-    $[7] = isIterable;
-    $[8] = locales;
-    $[9] = parentIsLocalized;
-    $[10] = t;
-    $[11] = valueFrom;
-    $[12] = valueTo;
-    $[13] = t4;
+    $[1] = changeCountFromProps;
+    $[2] = children;
+    $[3] = config;
+    $[4] = field;
+    $[5] = fields;
+    $[6] = hideGutter;
+    $[7] = isCollapsed;
+    $[8] = isIterable;
+    $[9] = locales;
+    $[10] = parentIsLocalized;
+    $[11] = t;
+    $[12] = valueFrom;
+    $[13] = valueTo;
+    $[14] = t4;
   } else {
-    t4 = $[13];
+    t4 = $[14];
   }
   return t4;
 };

package/dist/views/Version/RenderFieldsToDiff/DiffCollapser/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["c","_c","ChevronIcon","FieldDiffLabel","useConfig","useTranslation","fieldIsArrayType","fieldIsBlockType","React","useState","countChangedFields","countChangedFieldsInRows","baseClass","DiffCollapser","t0","$","children","field","fields","hideGutter","t1","initCollapsed","t2","isIterable","t3","Label","locales","parentIsLocalized","valueFrom","valueTo","undefined","t","isCollapsed","setIsCollapsed","config","t4","changeCount","Error","valueFromRows","valueToRows","Array","isArray","t5","t6","t7","filter","Boolean","contentClassNames","join","t8","_jsxs","className","onClick","type","_jsx","direction","size","count"],"sources":["../../../../../src/views/Version/RenderFieldsToDiff/DiffCollapser/index.tsx"],"sourcesContent":["'use client'\nimport type { ClientField } from 'payload'\n\nimport { ChevronIcon, FieldDiffLabel, useConfig, useTranslation } from '@payloadcms/ui'\nimport { fieldIsArrayType, fieldIsBlockType } from 'payload/shared'\nimport React, { useState } from 'react'\n\nimport './index.scss'\nimport { countChangedFields, countChangedFieldsInRows } from '../utilities/countChangedFields.js'\n\nconst baseClass = 'diff-collapser'\n\ntype Props = {\n  hideGutter?: boolean\n  initCollapsed?: boolean\n  Label: React.ReactNode\n  locales: string[] | undefined\n  parentIsLocalized: boolean\n  valueTo: unknown\n} & (\n  | {\n      // fields collapser\n      children: React.ReactNode\n      field?: never\n      fields: ClientField[]\n      isIterable?: false\n      valueFrom: unknown\n    }\n  | {\n      // iterable collapser\n      children: React.ReactNode\n      field: ClientField\n      fields?: never\n      isIterable: true\n      valueFrom?: unknown\n    }\n)\n\nexport const DiffCollapser: React.FC<Props> = ({\n  children,\n  field,\n  fields,\n  hideGutter = false,\n  initCollapsed = false,\n  isIterable = false,\n  Label,\n  locales,\n  parentIsLocalized,\n  valueFrom,\n  valueTo,\n}) => {\n  const { t } = useTranslation()\n  const [isCollapsed, setIsCollapsed] = useState(initCollapsed)\n  const { config } = useConfig()\n\n  let changeCount = 0\n\n  if (isIterable) {\n    if (!fieldIsArrayType(field) && !fieldIsBlockType(field)) {\n      throw new Error(\n        'DiffCollapser: field must be an array or blocks field when isIterable is true',\n      )\n    }\n    const valueFromRows = valueFrom ?? []\n    const valueToRows = valueTo ?? []\n\n    if (!Array.isArray(valueFromRows) || !Array.isArray(valueToRows)) {\n      throw new Error(\n        'DiffCollapser: valueFrom and valueTro must be arrays when isIterable is true',\n      )\n    }\n\n    changeCount = countChangedFieldsInRows({\n      config,\n      field,\n      locales,\n      parentIsLocalized,\n      valueFromRows,\n      valueToRows,\n    })\n  } else {\n    changeCount = countChangedFields({\n      config,\n      fields,\n      locales,\n      parentIsLocalized,\n      valueFrom,\n      valueTo,\n    })\n  }\n\n  const contentClassNames = [\n    `${baseClass}__content`,\n    isCollapsed && `${baseClass}__content--is-collapsed`,\n    hideGutter && `${baseClass}__content--hide-gutter`,\n  ]\n    .filter(Boolean)\n    .join(' ')\n\n  return (\n    <div className={baseClass}>\n      <FieldDiffLabel>\n        <button\n          aria-label={isCollapsed ? 'Expand' : 'Collapse'}\n          className={`${baseClass}__toggle-button`}\n          onClick={() => setIsCollapsed(!isCollapsed)}\n          type=\"button\"\n        >\n          <div className={`${baseClass}__label`}>{Label}</div>\n\n          <ChevronIcon direction={isCollapsed ? 'right' : 'down'} size={'small'} />\n        </button>\n        {changeCount > 0 && isCollapsed && (\n          <span className={`${baseClass}__field-change-count`}>\n            {t('version:changedFieldsCount', { count: changeCount })}\n          </span>\n        )}\n      </FieldDiffLabel>\n      <div className={contentClassNames}>{children}</div>\n    </div>\n  )\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"index.js","names":["c","_c","ChevronIcon","FieldDiffLabel","useConfig","useTranslation","fieldIsArrayType","fieldIsBlockType","React","useState","countChangedFields","countChangedFieldsInRows","baseClass","DiffCollapser","t0","$","changeCount","changeCountFromProps","children","field","fields","hideGutter","t1","initCollapsed","t2","isIterable","t3","Label","locales","parentIsLocalized","valueFrom","valueTo","undefined","t","isCollapsed","setIsCollapsed","config","t4","Error","valueFromRows","valueToRows","Array","isArray","t5","t6","t7","filter","Boolean","contentClassNames","join","t8","_jsxs","className","onClick","type","_jsx","direction","size","count"],"sources":["../../../../../src/views/Version/RenderFieldsToDiff/DiffCollapser/index.tsx"],"sourcesContent":["'use client'\nimport type { ClientField } from 'payload'\n\nimport { ChevronIcon, FieldDiffLabel, useConfig, useTranslation } from '@payloadcms/ui'\nimport { fieldIsArrayType, fieldIsBlockType } from 'payload/shared'\nimport React, { useState } from 'react'\n\nimport './index.scss'\nimport { countChangedFields, countChangedFieldsInRows } from '../utilities/countChangedFields.js'\n\nconst baseClass = 'diff-collapser'\n\ntype Props = {\n  changeCount?: number\n  hideGutter?: boolean\n  initCollapsed?: boolean\n  Label: React.ReactNode\n  locales: string[] | undefined\n  parentIsLocalized: boolean\n  valueTo: unknown\n} & (\n  | {\n      // fields collapser\n      children: React.ReactNode\n      field?: never\n      fields: ClientField[]\n      isIterable?: false\n      valueFrom: unknown\n    }\n  | {\n      // iterable collapser\n      children: React.ReactNode\n      field: ClientField\n      fields?: never\n      isIterable: true\n      valueFrom?: unknown\n    }\n)\n\nexport const DiffCollapser: React.FC<Props> = ({\n  changeCount: changeCountFromProps,\n  children,\n  field,\n  fields,\n  hideGutter = false,\n  initCollapsed = false,\n  isIterable = false,\n  Label,\n  locales,\n  parentIsLocalized,\n  valueFrom,\n  valueTo,\n}) => {\n  const { t } = useTranslation()\n  const [isCollapsed, setIsCollapsed] = useState(initCollapsed)\n  const { config } = useConfig()\n\n  let changeCount: number\n\n  if (typeof changeCountFromProps === 'number') {\n    changeCount = changeCountFromProps\n  } else if (isIterable) {\n    if (!fieldIsArrayType(field) && !fieldIsBlockType(field)) {\n      throw new Error(\n        'DiffCollapser: field must be an array or blocks field when isIterable is true',\n      )\n    }\n    const valueFromRows = valueFrom ?? []\n    const valueToRows = valueTo ?? []\n\n    if (!Array.isArray(valueFromRows) || !Array.isArray(valueToRows)) {\n      throw new Error(\n        'DiffCollapser: valueFrom and valueTro must be arrays when isIterable is true',\n      )\n    }\n\n    changeCount = countChangedFieldsInRows({\n      config,\n      field,\n      locales,\n      parentIsLocalized,\n      valueFromRows,\n      valueToRows,\n    })\n  } else {\n    changeCount = countChangedFields({\n      config,\n      fields,\n      locales,\n      parentIsLocalized,\n      valueFrom,\n      valueTo,\n    })\n  }\n\n  const contentClassNames = [\n    `${baseClass}__content`,\n    isCollapsed && `${baseClass}__content--is-collapsed`,\n    hideGutter && `${baseClass}__content--hide-gutter`,\n  ]\n    .filter(Boolean)\n    .join(' ')\n\n  return (\n    <div className={baseClass}>\n      <FieldDiffLabel>\n        <button\n          aria-label={isCollapsed ? 'Expand' : 'Collapse'}\n          className={`${baseClass}__toggle-button`}\n          onClick={() => setIsCollapsed(!isCollapsed)}\n          type=\"button\"\n        >\n          <div className={`${baseClass}__label`}>{Label}</div>\n\n          <ChevronIcon direction={isCollapsed ? 'right' : 'down'} size={'small'} />\n        </button>\n        {changeCount > 0 && isCollapsed && (\n          <span className={`${baseClass}__field-change-count`}>\n            {t('version:changedFieldsCount', { count: changeCount })}\n          </span>\n        )}\n      </FieldDiffLabel>\n      <div className={contentClassNames}>{children}</div>\n    </div>\n  )\n}\n"],"mappings":"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","ignoreList":[]}

package/dist/views/Version/RenderFieldsToDiff/buildVersionFields.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"buildVersionFields.d.ts","sourceRoot":"","sources":["../../../../src/views/Version/RenderFieldsToDiff/buildVersionFields.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAA;AAI1D,OAAO,EAGL,KAAK,oBAAoB,EACzB,KAAK,KAAK,EACV,KAAK,oBAAoB,EACzB,KAAK,oBAAoB,EACzB,KAAK,UAAU,EAGf,KAAK,gBAAgB,EACrB,KAAK,cAAc,EAEnB,KAAK,0BAA0B,EAC/B,KAAK,YAAY,EAClB,MAAM,SAAS,CAAA;AAWhB,MAAM,MAAM,sBAAsB,GAAG;IACnC,eAAe,EAAE,oBAAoB,CAAA;IACrC,oBAAoB,EAAE,OAAO,CAC3B,MAAM,CAAC,UAAU,EAAE,gBAAgB,CAAC,oBAAoB,EAAE,oBAAoB,CAAC,CAAC,CACjF,CAAA;IACD,UAAU,EAAE,MAAM,CAAA;IAClB,MAAM,EAAE,KAAK,EAAE,CAAA;IACf,iBAAiB,EAAE,0BAA0B,CAAA;IAC7C,IAAI,EAAE,UAAU,CAAA;IAChB,YAAY,EAAE,OAAO,CAAA;IACrB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,eAAe,EAAE,MAAM,CAAA;IACvB,iBAAiB,EAAE,OAAO,CAAA;IAC1B,UAAU,EAAE,MAAM,CAAA;IAClB,gBAAgB,EAAE,MAAM,CAAA;IACxB,GAAG,EAAE,cAAc,CAAA;IACnB,eAAe,EAAE,MAAM,EAAE,CAAA;IACzB,sBAAsB,EAAE,MAAM,CAAA;IAC9B,oBAAoB,EAAE,MAAM,CAAA;CAC7B,CAAA;AAED;;;;;;GAMG;AACH,eAAO,MAAM,kBAAkB,8PAiB5B,sBAAsB,KAAG;IAC1B,aAAa,EAAE,YAAY,EAAE,CAAA;CAgH9B,CAAA"}
+{"version":3,"file":"buildVersionFields.d.ts","sourceRoot":"","sources":["../../../../src/views/Version/RenderFieldsToDiff/buildVersionFields.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAA;AAI1D,OAAO,EAGL,KAAK,oBAAoB,EACzB,KAAK,KAAK,EACV,KAAK,oBAAoB,EACzB,KAAK,oBAAoB,EACzB,KAAK,UAAU,EAGf,KAAK,gBAAgB,EACrB,KAAK,cAAc,EAEnB,KAAK,0BAA0B,EAC/B,KAAK,YAAY,EAClB,MAAM,SAAS,CAAA;AAKhB,MAAM,MAAM,sBAAsB,GAAG;IACnC,eAAe,EAAE,oBAAoB,CAAA;IACrC,oBAAoB,EAAE,OAAO,CAC3B,MAAM,CAAC,UAAU,EAAE,gBAAgB,CAAC,oBAAoB,EAAE,oBAAoB,CAAC,CAAC,CACjF,CAAA;IACD,UAAU,EAAE,MAAM,CAAA;IAClB,MAAM,EAAE,KAAK,EAAE,CAAA;IACf,iBAAiB,EAAE,0BAA0B,CAAA;IAC7C,IAAI,EAAE,UAAU,CAAA;IAChB,YAAY,EAAE,OAAO,CAAA;IACrB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,eAAe,EAAE,MAAM,CAAA;IACvB,iBAAiB,EAAE,OAAO,CAAA;IAC1B,UAAU,EAAE,MAAM,CAAA;IAClB,gBAAgB,EAAE,MAAM,CAAA;IACxB,GAAG,EAAE,cAAc,CAAA;IACnB,eAAe,EAAE,MAAM,EAAE,CAAA;IACzB,sBAAsB,EAAE,MAAM,CAAA;IAC9B,oBAAoB,EAAE,MAAM,CAAA;CAC7B,CAAA;AAED;;;;;;GAMG;AACH,eAAO,MAAM,kBAAkB,8PAiB5B,sBAAsB,KAAG;IAC1B,aAAa,EAAE,YAAY,EAAE,CAAA;CAgH9B,CAAA"}

package/dist/views/Version/RenderFieldsToDiff/buildVersionFields.js

@@ -1,7 +1,7 @@
 import { RenderServerComponent } from '@payloadcms/ui/elements/RenderServerComponent';
 import { dequal } from 'dequal/lite';
 import { MissingEditorProp } from 'payload';
-import { fieldIsID, fieldShouldBeLocalized, getFieldPaths, getUniqueListBy, tabHasName } from 'payload/shared';
+import { fieldIsID, fieldShouldBeLocalized, getFieldPaths, tabHasName } from 'payload/shared';
 import { diffComponents } from './fields/index.js';
 /**
  * Build up an object that contains rendered diff components for each field.
@@ -341,37 +341,22 @@ const buildVersionField = ({
       const toRow = Array.isArray(valueTo) && valueTo?.[i] || {};
       const blockSlugToMatch = toRow?.blockType ?? fromRow?.blockType;
       const toBlock = req.payload.blocks[blockSlugToMatch] ?? (field.blockReferences ?? field.blocks).find(block => typeof block !== 'string' && block.slug === blockSlugToMatch);
-      let fields = [];
-      if (toRow.blockType === fromRow.blockType) {
-        fields = toBlock.fields;
-      } else {
-        const fromBlockSlugToMatch = toRow?.blockType ?? fromRow?.blockType;
+      let replacedBlock = undefined;
+      if (toRow.blockType !== fromRow.blockType) {
+        const fromBlockSlugToMatch = fromRow?.blockType ?? toRow?.blockType;
         const fromBlock = req.payload.blocks[fromBlockSlugToMatch] ?? (field.blockReferences ?? field.blocks).find(block => typeof block !== 'string' && block.slug === fromBlockSlugToMatch);
-        if (fromBlock) {
-          fields = getUniqueListBy([...toBlock.fields, ...fromBlock.fields], 'name');
-        } else {
-          fields = toBlock.fields;
-        }
-      }
-      let blockFieldsPermissions = undefined;
-      // fieldPermissions will be set here, as the blocks field has a name
-      if (typeof fieldPermissions === 'boolean') {
-        blockFieldsPermissions = fieldPermissions;
-      } else if (typeof fieldPermissions?.blocks === 'boolean') {
-        blockFieldsPermissions = fieldPermissions.blocks;
-      } else {
-        const permissionsBlockSpecific = fieldPermissions?.blocks?.[blockSlugToMatch];
-        if (typeof permissionsBlockSpecific === 'boolean') {
-          blockFieldsPermissions = permissionsBlockSpecific;
-        } else {
-          blockFieldsPermissions = permissionsBlockSpecific?.fields;
+        if (fromBlock && fromBlock.slug !== toBlock.slug) {
+          replacedBlock = fromBlock;
         }
       }
-      const versionFields = buildVersionFields({
+      const blockFieldsPermissions = getBlockFieldsPermissions({
+        blockSlug: blockSlugToMatch,
+        fieldPermissions
+      });
+      const blockDiffArgs = {
         clientSchemaMap,
         customDiffComponents,
         entitySlug,
-        fields,
         fieldsPermissions: blockFieldsPermissions,
         i18n,
         modifiedOnly,
@@ -379,12 +364,28 @@ const buildVersionField = ({
         parentIndexPath: 'name' in field ? '' : indexPath,
         parentIsLocalized: parentIsLocalized || 'localized' in field && field.localized,
         parentPath: ('name' in field ? path : parentPath) + '.' + i,
-        parentSchemaPath: schemaPath + '.' + toBlock.slug,
         req,
-        selectedLocales,
+        selectedLocales
+      };
+      const oldBlockFields = replacedBlock ? buildVersionFields({
+        ...blockDiffArgs,
+        fields: replacedBlock.fields,
+        fieldsPermissions: getBlockFieldsPermissions({
+          blockSlug: replacedBlock.slug,
+          fieldPermissions
+        }),
+        parentSchemaPath: schemaPath + '.' + replacedBlock.slug,
         versionFromSiblingData: fromRow,
+        versionToSiblingData: {}
+      }).versionFields : [];
+      const newBlockFields = buildVersionFields({
+        ...blockDiffArgs,
+        fields: toBlock.fields,
+        parentSchemaPath: schemaPath + '.' + toBlock.slug,
+        versionFromSiblingData: replacedBlock ? {} : fromRow,
         versionToSiblingData: toRow
       }).versionFields;
+      const versionFields = [...oldBlockFields, ...newBlockFields];
       if (versionFields?.length) {
         baseVersionField.rows[i] = versionFields;
       }
@@ -436,4 +437,17 @@ const buildVersionField = ({
   });
   return baseVersionField;
 };
+const getBlockFieldsPermissions = ({
+  blockSlug,
+  fieldPermissions
+}) => {
+  if (typeof fieldPermissions === 'boolean') {
+    return fieldPermissions;
+  }
+  if (typeof fieldPermissions?.blocks === 'boolean') {
+    return fieldPermissions.blocks;
+  }
+  const blockPermissions = fieldPermissions?.blocks?.[blockSlug];
+  return typeof blockPermissions === 'boolean' ? blockPermissions : blockPermissions?.fields;
+};
 //# sourceMappingURL=buildVersionFields.js.map