Merge branch 'main' of github.com:payloadcms/payload into fix/mime-validation-tempfiles

Author: PatrikKozak

docs/configuration/globals.mdx

@@ -36,7 +36,7 @@ It's often best practice to write your Globals in separate files and then import
 Here is what a simple Global Config might look like:
 
 ```ts
-import { GlobalConfig } from 'payload'
+import type { GlobalConfig } from 'payload'
 
 export const Nav: GlobalConfig = {
   slug: 'nav',
@@ -107,7 +107,7 @@ The behavior of Globals within the [Admin Panel](../admin/overview) can be fully
 To configure Admin Options for Globals, use the `admin` property in your Global Config:
 
 ```ts
-import { GlobalConfig } from 'payload'
+import type { GlobalConfig } from 'payload'
 
 export const MyGlobal: GlobalConfig = {
   // ...

examples/remix/website/Dockerfile

@@ -0,0 +1,41 @@
+FROM node:22.14.0-alpine AS base
+
+FROM base AS builder
+RUN apk add --no-cache libc6-compat
+WORKDIR /app
+
+RUN npm install -g pnpm@latest-10
+
+COPY . .
+
+RUN apk update \
+  apk add --no-cache libc6-compat
+
+WORKDIR /app
+
+ENV NODE_ENV=production
+RUN pnpm install --no-frozen-lockfile
+RUN pnpm --filter website build
+
+FROM base AS runner
+
+RUN npm install -g @remix-run/serve@latest
+WORKDIR /app
+COPY --from=builder /app/website/build/ ./build
+
+# We need to install sharp again to avoid copying node_modules into the final image.
+# Sharp can't be bundled into the server file since it will throw an
+# __dirname is not defined error
+RUN npm install sharp@0.32.6
+
+# These files are required by Payload to avoid file opening errors
+# https://github.com/payloadcms/payload/issues/11276
+COPY --from=builder /app/website/package.json ./package.json
+COPY --from=builder /app/payload/src/payload.config.ts ./payload.config.ts
+ENV PAYLOAD_CONFIG_PATH=./payload.config.ts
+
+EXPOSE 3000
+ENV PORT=3000
+ENV NODE_ENV=production
+
+CMD HOSTNAME="0.0.0.0" remix-serve build/server/index.js

examples/remix/website/vite.config.ts

@@ -21,6 +21,12 @@ export default defineConfig({
     }),
     tsconfigPaths(),
   ],
+  ssr: {
+    external: ['sharp'],
+    // Reduces Docker image size
+    // https://github.com/remix-run/remix/discussions/8878
+    noExternal: process.env.NODE_ENV === 'production' ? [/.*/] : [],
+  },
   optimizeDeps: {
     exclude: ['sharp', 'file-type'],
   },

packages/payload/src/queues/config/collection.ts

@@ -296,6 +296,5 @@ export function jobAfterRead({ config, doc }: { config: SanitizedConfig; doc: Jo
     jobLog: doc.log || [],
   })
   doc.input = doc.input || {}
-  doc.taskStatus = doc.taskStatus || {}
   return doc
 }

packages/payload/src/queues/endpoints/run.ts

@@ -68,10 +68,6 @@ export const runJobsEndpoint: Endpoint = {
       silent,
     }
 
-    if (typeof queue === 'string') {
-      runJobsArgs.queue = queue
-    }
-
     const parsedLimit = Number(limit)
     if (!isNaN(parsedLimit)) {
       runJobsArgs.limit = parsedLimit

packages/payload/src/queues/errors/calculateBackoffWaitUntil.ts

@@ -9,30 +9,22 @@ export function calculateBackoffWaitUntil({
   retriesConfig: number | RetryConfig
   totalTried: number
 }): Date {
-  let waitUntil: Date = getCurrentDate()
+  const now = getCurrentDate()
+  let waitUntil: Date = now
+
   if (typeof retriesConfig === 'object') {
     if (retriesConfig.backoff) {
       if (retriesConfig.backoff.type === 'fixed') {
         waitUntil = retriesConfig.backoff.delay
-          ? new Date(getCurrentDate().getTime() + retriesConfig.backoff.delay)
-          : getCurrentDate()
+          ? new Date(now.getTime() + retriesConfig.backoff.delay)
+          : now
       } else if (retriesConfig.backoff.type === 'exponential') {
         // 2 ^ (attempts - 1) * delay (current attempt is not included in totalTried, thus no need for -1)
         const delay = retriesConfig.backoff.delay ? retriesConfig.backoff.delay : 0
-        waitUntil = new Date(getCurrentDate().getTime() + Math.pow(2, totalTried) * delay)
+        waitUntil = new Date(now.getTime() + Math.pow(2, totalTried) * delay)
       }
     }
   }
 
-  /*
-  const differenceInMSBetweenNowAndWaitUntil = waitUntil.getTime() - getCurrentDate().getTime()
-
-  const differenceInSBetweenNowAndWaitUntil = differenceInMSBetweenNowAndWaitUntil / 1000
-  console.log('Calculated backoff', {
-    differenceInMSBetweenNowAndWaitUntil,
-    differenceInSBetweenNowAndWaitUntil,
-    retriesConfig,
-    totalTried,
-  })*/
   return waitUntil
 }

packages/payload/src/queues/operations/handleSchedules/countRunnableOrActiveJobsForQueue.ts

@@ -2,6 +2,8 @@ import type { PayloadRequest, Where } from '../../../types/index.js'
 import type { TaskType } from '../../config/types/taskTypes.js'
 import type { WorkflowTypes } from '../../config/types/workflowTypes.js'
 
+import { jobsCollectionSlug } from '../../config/collection.js'
+
 /**
  * Gets all queued jobs that can be run. This means they either:
  * - failed but do not have a definitive error => can be retried
@@ -63,7 +65,7 @@ export async function countRunnableOrActiveJobsForQueue({
   }
 
   const runnableOrActiveJobsForQueue = await req.payload.db.count({
-    collection: 'payload-jobs',
+    collection: jobsCollectionSlug,
     req,
     where: {
       and,

packages/payload/src/queues/operations/handleSchedules/defaultAfterSchedule.ts

@@ -40,7 +40,7 @@ export const defaultAfterSchedule: AfterScheduleFn = async ({ jobStats, queueabl
             },
           },
         },
-        updatedAt: new Date().toISOString(),
+        updatedAt: getCurrentDate().toISOString(),
       } as JobStats,
       req,
       returning: false,

packages/payload/src/queues/operations/runJobs/index.ts

@@ -303,27 +303,22 @@ export const runJobs = async (args: RunJobsArgs): Promise<RunJobsResult> => {
     }
   }
 
-  /**
-   * Just for logging purposes, we want to know how many jobs are new and how many are existing (= already been tried).
-   * This is only for logs - in the end we still want to run all jobs, regardless of whether they are new or existing.
-   */
-  const { existingJobs, newJobs } = jobs.reduce(
-    (acc, job) => {
+  if (!silent || (typeof silent === 'object' && !silent.info)) {
+    let newCount = 0
+    let retryCount = 0
+
+    for (const job of jobs) {
       if (job.totalTried > 0) {
-        acc.existingJobs.push(job)
+        retryCount++
       } else {
-        acc.newJobs.push(job)
+        newCount++
       }
-      return acc
-    },
-    { existingJobs: [] as Job[], newJobs: [] as Job[] },
-  )
+    }
 
-  if (!silent || (typeof silent === 'object' && !silent.info)) {
     payload.logger.info({
       msg: `Running ${jobs.length} jobs.`,
-      new: newJobs?.length,
-      retrying: existingJobs?.length,
+      new: newCount,
+      retrying: retryCount,
     })
   }
 

packages/payload/src/queues/operations/runJobs/runJSONJob/index.ts

@@ -137,6 +137,7 @@ export const runJSONJob = async ({
     return await runJSONJob({
       job,
       req,
+      silent,
       updateJob,
       workflowConfig,
       workflowHandler,