chore: migrate outdated @payloadcms/next/utilities imports (#10777)

This commit is contained in:
Alessio Gravili
2025-01-23 18:58:45 -07:00
committed by GitHub
parent 03f7bdf1ee
commit b9d3250117
11 changed files with 35 additions and 40 deletions

View File

@@ -1,8 +1,8 @@
import configPromise from '@payload-config' import configPromise from '@payload-config'
import { getPayloadHMR } from '@payloadcms/next/utilities' import { getPayload } from 'payload'
export const Page = async ({ params, searchParams }) => { export const Page = async ({ params, searchParams }) => {
const payload = await getPayloadHMR({ const payload = await getPayload({
config: configPromise, config: configPromise,
}) })
return <div>test ${payload?.config?.collections?.length}</div> return <div>test ${payload?.config?.collections?.length}</div>

View File

@@ -663,7 +663,7 @@ Data is not automatically appended to the request. You can read the body data by
Or you could use our helper function that mutates the request and appends data and file if found. Or you could use our helper function that mutates the request and appends data and file if found.
```ts ```ts
import { addDataAndFileToRequest } from '@payloadcms/next/utilities' import { addDataAndFileToRequest } from 'payload'
// custom endpoint example // custom endpoint example
{ {
@@ -689,7 +689,7 @@ import { addDataAndFileToRequest } from '@payloadcms/next/utilities'
The locale and the fallback locale are not automatically appended to custom endpoint requests. If you would like to add them you can use this helper function. The locale and the fallback locale are not automatically appended to custom endpoint requests. If you would like to add them you can use this helper function.
```ts ```ts
import { addLocalesToRequestFromData } from '@payloadcms/next/utilities' import { addLocalesToRequestFromData } from 'payload'
// custom endpoint example // custom endpoint example
{ {

View File

@@ -21,6 +21,7 @@ export const defaultESLintIgnores = [
'**/temp/', '**/temp/',
'**/*.spec.ts', '**/*.spec.ts',
'next-env.d.ts', 'next-env.d.ts',
'**/app',
] ]
/** @typedef {import('eslint').Linter.Config} Config */ /** @typedef {import('eslint').Linter.Config} Config */

View File

@@ -83,7 +83,7 @@ type PayloadRequestData = {
* use either: * use either:
* 1. `const data = await req.json()` * 1. `const data = await req.json()`
* *
* 2. import { addDataAndFileToRequest } from '@payloadcms/next/utilities' * 2. import { addDataAndFileToRequest } from 'payload'
* `await addDataAndFileToRequest(req)` * `await addDataAndFileToRequest(req)`
* */ * */
data?: JsonObject data?: JsonObject

View File

@@ -1,7 +1,13 @@
import type { PayloadHandler } from 'payload' import type { PayloadHandler } from 'payload'
import { addLocalesToRequestFromData, headersWithCors } from '@payloadcms/next/utilities' import {
import { commitTransaction, getAccessResults, initTransaction, killTransaction } from 'payload' addLocalesToRequestFromData,
commitTransaction,
getAccessResults,
headersWithCors,
initTransaction,
killTransaction,
} from 'payload'
import type { SearchPluginConfigWithLocales } from '../types.js' import type { SearchPluginConfigWithLocales } from '../types.js'

View File

@@ -1,7 +1,6 @@
import type { PayloadRequest } from 'payload' import type { PayloadRequest } from 'payload'
import { addDataAndFileToRequest } from '@payloadcms/next/utilities' import { addDataAndFileToRequest, Forbidden } from 'payload'
import { Forbidden } from 'payload'
import type { StripePluginConfig } from '../types.js' import type { StripePluginConfig } from '../types.js'

36
pnpm-lock.yaml generated
View File

@@ -45,7 +45,7 @@ importers:
version: 1.49.1 version: 1.49.1
'@sentry/nextjs': '@sentry/nextjs':
specifier: ^8.33.1 specifier: ^8.33.1
version: 8.37.1(@opentelemetry/core@1.27.0(@opentelemetry/api@1.9.0))(@opentelemetry/instrumentation@0.54.2(@opentelemetry/api@1.9.0))(@opentelemetry/sdk-trace-base@1.27.0(@opentelemetry/api@1.9.0))(next@15.1.5(@babel/core@7.26.0)(@opentelemetry/api@1.9.0)(@playwright/test@1.49.1)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@19.0.0-beta-df7b47d-20241124)(react-dom@19.0.0(react@19.0.0))(react@19.0.0)(sass@1.77.4))(react@19.0.0)(webpack@5.96.1(@swc/core@1.9.3(@swc/helpers@0.5.15))) version: 8.37.1(@opentelemetry/core@1.27.0(@opentelemetry/api@1.9.0))(@opentelemetry/instrumentation@0.54.2(@opentelemetry/api@1.9.0))(@opentelemetry/sdk-trace-base@1.27.0(@opentelemetry/api@1.9.0))(next@15.1.5(@opentelemetry/api@1.9.0)(@playwright/test@1.49.1)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@19.0.0-beta-df7b47d-20241124)(react-dom@19.0.0(react@19.0.0))(react@19.0.0)(sass@1.77.4))(react@19.0.0)(webpack@5.96.1(@swc/core@1.9.3(@swc/helpers@0.5.15)))
'@sentry/node': '@sentry/node':
specifier: ^8.33.1 specifier: ^8.33.1
version: 8.37.1 version: 8.37.1
@@ -135,7 +135,7 @@ importers:
version: 10.1.3(@aws-sdk/credential-providers@3.687.0(@aws-sdk/client-sso-oidc@3.687.0(@aws-sdk/client-sts@3.687.0)))(socks@2.8.3) version: 10.1.3(@aws-sdk/credential-providers@3.687.0(@aws-sdk/client-sso-oidc@3.687.0(@aws-sdk/client-sts@3.687.0)))(socks@2.8.3)
next: next:
specifier: 15.1.5 specifier: 15.1.5
version: 15.1.5(@babel/core@7.26.0)(@opentelemetry/api@1.9.0)(@playwright/test@1.49.1)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@19.0.0-beta-df7b47d-20241124)(react-dom@19.0.0(react@19.0.0))(react@19.0.0)(sass@1.77.4) version: 15.1.5(@opentelemetry/api@1.9.0)(@playwright/test@1.49.1)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@19.0.0-beta-df7b47d-20241124)(react-dom@19.0.0(react@19.0.0))(react@19.0.0)(sass@1.77.4)
open: open:
specifier: ^10.1.0 specifier: ^10.1.0
version: 10.1.0 version: 10.1.0
@@ -1005,7 +1005,7 @@ importers:
dependencies: dependencies:
next: next:
specifier: ^15.0.3 specifier: ^15.0.3
version: 15.1.3(@babel/core@7.26.0)(@opentelemetry/api@1.9.0)(@playwright/test@1.49.1)(babel-plugin-macros@3.1.0)(react-dom@19.0.0(react@19.0.0))(react@19.0.0)(sass@1.77.4) version: 15.1.3(@opentelemetry/api@1.9.0)(@playwright/test@1.49.1)(babel-plugin-macros@3.1.0)(react-dom@19.0.0(react@19.0.0))(react@19.0.0)(sass@1.77.4)
devDependencies: devDependencies:
'@payloadcms/eslint-config': '@payloadcms/eslint-config':
specifier: workspace:* specifier: workspace:*
@@ -1067,7 +1067,7 @@ importers:
dependencies: dependencies:
'@sentry/nextjs': '@sentry/nextjs':
specifier: ^8.33.1 specifier: ^8.33.1
version: 8.37.1(@opentelemetry/core@1.27.0(@opentelemetry/api@1.9.0))(@opentelemetry/instrumentation@0.54.2(@opentelemetry/api@1.9.0))(@opentelemetry/sdk-trace-base@1.27.0(@opentelemetry/api@1.9.0))(next@15.1.5(@babel/core@7.26.0)(@opentelemetry/api@1.9.0)(@playwright/test@1.49.1)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@19.0.0-beta-df7b47d-20241124)(react-dom@19.0.0(react@19.0.0))(react@19.0.0)(sass@1.77.4))(react@19.0.0)(webpack@5.96.1(@swc/core@1.9.3(@swc/helpers@0.5.15))) version: 8.37.1(@opentelemetry/core@1.27.0(@opentelemetry/api@1.9.0))(@opentelemetry/instrumentation@0.54.2(@opentelemetry/api@1.9.0))(@opentelemetry/sdk-trace-base@1.27.0(@opentelemetry/api@1.9.0))(next@15.1.5(@opentelemetry/api@1.9.0)(@playwright/test@1.49.1)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@19.0.0-beta-df7b47d-20241124)(react-dom@19.0.0(react@19.0.0))(react@19.0.0)(sass@1.77.4))(react@19.0.0)(webpack@5.96.1(@swc/core@1.9.3(@swc/helpers@0.5.15)))
'@sentry/types': '@sentry/types':
specifier: ^8.33.1 specifier: ^8.33.1
version: 8.37.1 version: 8.37.1
@@ -1417,7 +1417,7 @@ importers:
version: link:../plugin-cloud-storage version: link:../plugin-cloud-storage
uploadthing: uploadthing:
specifier: 7.3.0 specifier: 7.3.0
version: 7.3.0(next@15.1.5(@babel/core@7.26.0)(@opentelemetry/api@1.9.0)(@playwright/test@1.49.1)(babel-plugin-macros@3.1.0)(react-dom@19.0.0(react@19.0.0))(react@19.0.0)(sass@1.77.4)) version: 7.3.0(next@15.1.5(@opentelemetry/api@1.9.0)(@playwright/test@1.49.1)(babel-plugin-macros@3.1.0)(react-dom@19.0.0(react@19.0.0))(react@19.0.0)(sass@1.77.4))
devDependencies: devDependencies:
payload: payload:
specifier: workspace:* specifier: workspace:*
@@ -1697,7 +1697,7 @@ importers:
version: link:../packages/ui version: link:../packages/ui
'@sentry/nextjs': '@sentry/nextjs':
specifier: ^8.33.1 specifier: ^8.33.1
version: 8.37.1(@opentelemetry/core@1.27.0(@opentelemetry/api@1.9.0))(@opentelemetry/instrumentation@0.54.2(@opentelemetry/api@1.9.0))(@opentelemetry/sdk-trace-base@1.27.0(@opentelemetry/api@1.9.0))(next@15.1.5(@babel/core@7.26.0)(@opentelemetry/api@1.9.0)(@playwright/test@1.49.1)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@19.0.0-beta-df7b47d-20241124)(react-dom@19.0.0(react@19.0.0))(react@19.0.0)(sass@1.77.4))(react@19.0.0)(webpack@5.96.1(@swc/core@1.9.3(@swc/helpers@0.5.15))) version: 8.37.1(@opentelemetry/core@1.27.0(@opentelemetry/api@1.9.0))(@opentelemetry/instrumentation@0.54.2(@opentelemetry/api@1.9.0))(@opentelemetry/sdk-trace-base@1.27.0(@opentelemetry/api@1.9.0))(next@15.1.5(@opentelemetry/api@1.9.0)(@playwright/test@1.49.1)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@19.0.0-beta-df7b47d-20241124)(react-dom@19.0.0(react@19.0.0))(react@19.0.0)(sass@1.77.4))(react@19.0.0)(webpack@5.96.1(@swc/core@1.9.3(@swc/helpers@0.5.15)))
'@sentry/react': '@sentry/react':
specifier: ^7.77.0 specifier: ^7.77.0
version: 7.119.2(react@19.0.0) version: 7.119.2(react@19.0.0)
@@ -1735,8 +1735,8 @@ importers:
specifier: 19.3.0 specifier: 19.3.0
version: 19.3.0 version: 19.3.0
http-status: http-status:
specifier: 1.6.2 specifier: 2.1.0
version: 1.6.2 version: 2.1.0
jest: jest:
specifier: 29.7.0 specifier: 29.7.0
version: 29.7.0(@types/node@22.5.4)(babel-plugin-macros@3.1.0) version: 29.7.0(@types/node@22.5.4)(babel-plugin-macros@3.1.0)
@@ -1748,7 +1748,7 @@ importers:
version: 8.9.5(@aws-sdk/credential-providers@3.687.0(@aws-sdk/client-sso-oidc@3.687.0(@aws-sdk/client-sts@3.687.0)))(socks@2.8.3) version: 8.9.5(@aws-sdk/credential-providers@3.687.0(@aws-sdk/client-sso-oidc@3.687.0(@aws-sdk/client-sts@3.687.0)))(socks@2.8.3)
next: next:
specifier: 15.1.5 specifier: 15.1.5
version: 15.1.5(@babel/core@7.26.0)(@opentelemetry/api@1.9.0)(@playwright/test@1.49.1)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@19.0.0-beta-df7b47d-20241124)(react-dom@19.0.0(react@19.0.0))(react@19.0.0)(sass@1.77.4) version: 15.1.5(@opentelemetry/api@1.9.0)(@playwright/test@1.49.1)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@19.0.0-beta-df7b47d-20241124)(react-dom@19.0.0(react@19.0.0))(react@19.0.0)(sass@1.77.4)
nodemailer: nodemailer:
specifier: 6.9.16 specifier: 6.9.16
version: 6.9.16 version: 6.9.16
@@ -7212,10 +7212,6 @@ packages:
resolution: {integrity: sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==} resolution: {integrity: sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==}
engines: {node: '>= 14'} engines: {node: '>= 14'}
http-status@1.6.2:
resolution: {integrity: sha512-oUExvfNckrpTpDazph7kNG8sQi5au3BeTo0idaZFXEhTaJKu7GNJCLHI0rYY2wljm548MSTM+Ljj/c6anqu2zQ==}
engines: {node: '>= 0.4.0'}
http-status@2.1.0: http-status@2.1.0:
resolution: {integrity: sha512-O5kPr7AW7wYd/BBiOezTwnVAnmSNFY+J7hlZD2X5IOxVBetjcHAiTXhzj0gMrnojQlwy+UT1/Y3H3vJ3UlmvLA==} resolution: {integrity: sha512-O5kPr7AW7wYd/BBiOezTwnVAnmSNFY+J7hlZD2X5IOxVBetjcHAiTXhzj0gMrnojQlwy+UT1/Y3H3vJ3UlmvLA==}
engines: {node: '>= 0.4.0'} engines: {node: '>= 0.4.0'}
@@ -13521,7 +13517,7 @@ snapshots:
'@sentry/utils': 7.119.2 '@sentry/utils': 7.119.2
localforage: 1.10.0 localforage: 1.10.0
'@sentry/nextjs@8.37.1(@opentelemetry/core@1.27.0(@opentelemetry/api@1.9.0))(@opentelemetry/instrumentation@0.54.2(@opentelemetry/api@1.9.0))(@opentelemetry/sdk-trace-base@1.27.0(@opentelemetry/api@1.9.0))(next@15.1.5(@babel/core@7.26.0)(@opentelemetry/api@1.9.0)(@playwright/test@1.49.1)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@19.0.0-beta-df7b47d-20241124)(react-dom@19.0.0(react@19.0.0))(react@19.0.0)(sass@1.77.4))(react@19.0.0)(webpack@5.96.1(@swc/core@1.9.3(@swc/helpers@0.5.15)))': '@sentry/nextjs@8.37.1(@opentelemetry/core@1.27.0(@opentelemetry/api@1.9.0))(@opentelemetry/instrumentation@0.54.2(@opentelemetry/api@1.9.0))(@opentelemetry/sdk-trace-base@1.27.0(@opentelemetry/api@1.9.0))(next@15.1.5(@opentelemetry/api@1.9.0)(@playwright/test@1.49.1)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@19.0.0-beta-df7b47d-20241124)(react-dom@19.0.0(react@19.0.0))(react@19.0.0)(sass@1.77.4))(react@19.0.0)(webpack@5.96.1(@swc/core@1.9.3(@swc/helpers@0.5.15)))':
dependencies: dependencies:
'@opentelemetry/api': 1.9.0 '@opentelemetry/api': 1.9.0
'@opentelemetry/instrumentation-http': 0.53.0(@opentelemetry/api@1.9.0) '@opentelemetry/instrumentation-http': 0.53.0(@opentelemetry/api@1.9.0)
@@ -13537,7 +13533,7 @@ snapshots:
'@sentry/vercel-edge': 8.37.1 '@sentry/vercel-edge': 8.37.1
'@sentry/webpack-plugin': 2.22.6(webpack@5.96.1(@swc/core@1.9.3(@swc/helpers@0.5.15))) '@sentry/webpack-plugin': 2.22.6(webpack@5.96.1(@swc/core@1.9.3(@swc/helpers@0.5.15)))
chalk: 3.0.0 chalk: 3.0.0
next: 15.1.5(@babel/core@7.26.0)(@opentelemetry/api@1.9.0)(@playwright/test@1.49.1)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@19.0.0-beta-df7b47d-20241124)(react-dom@19.0.0(react@19.0.0))(react@19.0.0)(sass@1.77.4) next: 15.1.5(@opentelemetry/api@1.9.0)(@playwright/test@1.49.1)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@19.0.0-beta-df7b47d-20241124)(react-dom@19.0.0(react@19.0.0))(react@19.0.0)(sass@1.77.4)
resolve: 1.22.8 resolve: 1.22.8
rollup: 3.29.5 rollup: 3.29.5
stacktrace-parser: 0.1.10 stacktrace-parser: 0.1.10
@@ -16727,8 +16723,6 @@ snapshots:
transitivePeerDependencies: transitivePeerDependencies:
- supports-color - supports-color
http-status@1.6.2: {}
http-status@2.1.0: {} http-status@2.1.0: {}
http2-wrapper@2.2.1: http2-wrapper@2.2.1:
@@ -18036,7 +18030,7 @@ snapshots:
- '@babel/core' - '@babel/core'
- babel-plugin-macros - babel-plugin-macros
next@15.1.3(@babel/core@7.26.0)(@opentelemetry/api@1.9.0)(@playwright/test@1.49.1)(babel-plugin-macros@3.1.0)(react-dom@19.0.0(react@19.0.0))(react@19.0.0)(sass@1.77.4): next@15.1.3(@opentelemetry/api@1.9.0)(@playwright/test@1.49.1)(babel-plugin-macros@3.1.0)(react-dom@19.0.0(react@19.0.0))(react@19.0.0)(sass@1.77.4):
dependencies: dependencies:
'@next/env': 15.1.3 '@next/env': 15.1.3
'@swc/counter': 0.1.3 '@swc/counter': 0.1.3
@@ -18064,7 +18058,7 @@ snapshots:
- '@babel/core' - '@babel/core'
- babel-plugin-macros - babel-plugin-macros
next@15.1.5(@babel/core@7.26.0)(@opentelemetry/api@1.9.0)(@playwright/test@1.49.1)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@19.0.0-beta-df7b47d-20241124)(react-dom@19.0.0(react@19.0.0))(react@19.0.0)(sass@1.77.4): next@15.1.5(@opentelemetry/api@1.9.0)(@playwright/test@1.49.1)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@19.0.0-beta-df7b47d-20241124)(react-dom@19.0.0(react@19.0.0))(react@19.0.0)(sass@1.77.4):
dependencies: dependencies:
'@next/env': 15.1.5 '@next/env': 15.1.5
'@swc/counter': 0.1.3 '@swc/counter': 0.1.3
@@ -19730,14 +19724,14 @@ snapshots:
escalade: 3.2.0 escalade: 3.2.0
picocolors: 1.1.1 picocolors: 1.1.1
uploadthing@7.3.0(next@15.1.5(@babel/core@7.26.0)(@opentelemetry/api@1.9.0)(@playwright/test@1.49.1)(babel-plugin-macros@3.1.0)(react-dom@19.0.0(react@19.0.0))(react@19.0.0)(sass@1.77.4)): uploadthing@7.3.0(next@15.1.5(@opentelemetry/api@1.9.0)(@playwright/test@1.49.1)(babel-plugin-macros@3.1.0)(react-dom@19.0.0(react@19.0.0))(react@19.0.0)(sass@1.77.4)):
dependencies: dependencies:
'@effect/platform': 0.69.8(effect@3.10.3) '@effect/platform': 0.69.8(effect@3.10.3)
'@uploadthing/mime-types': 0.3.2 '@uploadthing/mime-types': 0.3.2
'@uploadthing/shared': 7.1.1 '@uploadthing/shared': 7.1.1
effect: 3.10.3 effect: 3.10.3
optionalDependencies: optionalDependencies:
next: 15.1.5(@babel/core@7.26.0)(@opentelemetry/api@1.9.0)(@playwright/test@1.49.1)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@19.0.0-beta-df7b47d-20241124)(react-dom@19.0.0(react@19.0.0))(react@19.0.0)(sass@1.77.4) next: 15.1.5(@opentelemetry/api@1.9.0)(@playwright/test@1.49.1)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@19.0.0-beta-df7b47d-20241124)(react-dom@19.0.0(react@19.0.0))(react@19.0.0)(sass@1.77.4)
uri-js@4.4.1: uri-js@4.4.1:
dependencies: dependencies:

View File

@@ -156,11 +156,6 @@ export async function buildConfigWithDefaults(
config.admin = {} config.admin = {}
} }
config.admin.experimental = {
...(config.admin.experimental || {}),
optimizeFormState: true,
}
if (config.admin.autoLogin === undefined) { if (config.admin.autoLogin === undefined) {
config.admin.autoLogin = config.admin.autoLogin =
process.env.PAYLOAD_PUBLIC_DISABLE_AUTO_LOGIN === 'true' || options?.disableAutoLogin process.env.PAYLOAD_PUBLIC_DISABLE_AUTO_LOGIN === 'true' || options?.disableAutoLogin

View File

@@ -1,7 +1,7 @@
import type { Endpoint, PayloadHandler } from 'payload' import type { Endpoint, PayloadHandler } from 'payload'
import { addDataAndFileToRequest } from '@payloadcms/next/utilities' import { status as httpStatus } from 'http-status'
import httpStatus from 'http-status' import { addDataAndFileToRequest } from 'payload'
import { path } from './reInitializeDB.js' import { path } from './reInitializeDB.js'
import { seedDB } from './seed.js' import { seedDB } from './seed.js'

View File

@@ -1,7 +1,7 @@
import type { Endpoint, PayloadHandler } from 'payload' import type { Endpoint, PayloadHandler } from 'payload'
import { addDataAndFileToRequest } from '@payloadcms/next/utilities' import { status as httpStatus } from 'http-status'
import httpStatus from 'http-status' import { addDataAndFileToRequest } from 'payload'
export const handler: PayloadHandler = async (req) => { export const handler: PayloadHandler = async (req) => {
await addDataAndFileToRequest(req) await addDataAndFileToRequest(req)

View File

@@ -69,7 +69,7 @@
"eslint-plugin-playwright": "2.1.0", "eslint-plugin-playwright": "2.1.0",
"execa": "5.1.1", "execa": "5.1.1",
"file-type": "19.3.0", "file-type": "19.3.0",
"http-status": "1.6.2", "http-status": "2.1.0",
"jest": "29.7.0", "jest": "29.7.0",
"jwt-decode": "4.0.0", "jwt-decode": "4.0.0",
"mongoose": "8.9.5", "mongoose": "8.9.5",