diff --git a/packages/bundler-vite/src/scripts/build.ts b/packages/bundler-vite/src/scripts/build.ts index 8d0946b2d..942dac124 100644 --- a/packages/bundler-vite/src/scripts/build.ts +++ b/packages/bundler-vite/src/scripts/build.ts @@ -1,4 +1,5 @@ import type { SanitizedConfig } from 'payload/config' +// @ts-expect-error import type { InlineConfig } from 'vite' import { getViteConfig } from '../configs/vite' diff --git a/packages/bundler-vite/src/scripts/dev.ts b/packages/bundler-vite/src/scripts/dev.ts index d08b1779f..5d7b38fef 100644 --- a/packages/bundler-vite/src/scripts/dev.ts +++ b/packages/bundler-vite/src/scripts/dev.ts @@ -1,4 +1,5 @@ import type { PayloadHandler } from 'payload/config' +// @ts-expect-error import type { InlineConfig } from 'vite' import express from 'express' diff --git a/packages/db-mongodb/src/queryDrafts.ts b/packages/db-mongodb/src/queryDrafts.ts index e26dfb45e..1ca6e9f95 100644 --- a/packages/db-mongodb/src/queryDrafts.ts +++ b/packages/db-mongodb/src/queryDrafts.ts @@ -10,7 +10,7 @@ import { buildSortParam } from './queries/buildSortParam' import sanitizeInternalFields from './utilities/sanitizeInternalFields' import { withSession } from './withSession' -export const queryDrafts: QueryDrafts = async function queryDrafts( +export const queryDrafts: QueryDrafts = async function queryDrafts( this: MongooseAdapter, { collection, limit, locale, page, pagination, req = {} as PayloadRequest, sort: sortArg, where }, ) { diff --git a/packages/db-mongodb/src/updateGlobalVersion.ts b/packages/db-mongodb/src/updateGlobalVersion.ts index 5f13ccb24..4dd7dbb03 100644 --- a/packages/db-mongodb/src/updateGlobalVersion.ts +++ b/packages/db-mongodb/src/updateGlobalVersion.ts @@ -1,13 +1,13 @@ -import type { UpdateGlobalVersion } from 'payload/database' -import type { PayloadRequest } from 'payload/types' +import type { UpdateGlobalVersionArgs } from 'payload/database' +import type { PayloadRequest, TypeWithID } from 'payload/types' import type { MongooseAdapter } from '.' import { withSession } from './withSession' -export const updateGlobalVersion: UpdateGlobalVersion = async function updateGlobalVersion( +export async function updateGlobalVersion( this: MongooseAdapter, - { global, locale, req = {} as PayloadRequest, versionData, where }, + { global, locale, req = {} as PayloadRequest, versionData, where }: UpdateGlobalVersionArgs, ) { const VersionModel = this.versions[global] const options = { diff --git a/packages/db-postgres/src/deleteMany.ts b/packages/db-postgres/src/deleteMany.ts index 37158802c..cb571d613 100644 --- a/packages/db-postgres/src/deleteMany.ts +++ b/packages/db-postgres/src/deleteMany.ts @@ -37,6 +37,4 @@ export const deleteMany: DeleteMany = async function deleteMany( if (ids.length > 0) { await db.delete(this.tables[tableName]).where(inArray(this.tables[tableName].id, ids)) } - - return result } diff --git a/packages/payload/package.json b/packages/payload/package.json index b9f774fc8..ab686d741 100644 --- a/packages/payload/package.json +++ b/packages/payload/package.json @@ -56,7 +56,6 @@ "@monaco-editor/react": "4.5.1", "@swc/core": "1.3.76", "@swc/register": "0.1.10", - "@types/sharp": "0.31.1", "body-parser": "1.20.2", "body-scroll-lock": "4.0.0-beta.0", "bson-objectid": "2.0.4", @@ -140,6 +139,8 @@ "devDependencies": { "@payloadcms/eslint-config": "workspace:*", "@release-it/conventional-changelog": "7.0.0", + "@types/body-scroll-lock": "^3.1.0", + "@types/sharp": "0.31.1", "@types/asap": "2.0.0", "@types/body-parser": "1.19.2", "@types/compression": "1.7.2", diff --git a/packages/payload/src/database/types.ts b/packages/payload/src/database/types.ts index 8eda34959..015d8ef9f 100644 --- a/packages/payload/src/database/types.ts +++ b/packages/payload/src/database/types.ts @@ -388,7 +388,7 @@ export type DeleteManyArgs = { where: Where } -export type DeleteMany = (args: DeleteManyArgs) => Promise +export type DeleteMany = (args: DeleteManyArgs) => Promise export type Migration = MigrationData & { down: ({ payload }: { payload }) => Promise diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 8e67a336e..d282cce2f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -415,9 +415,6 @@ importers: '@swc/register': specifier: 0.1.10 version: 0.1.10(@swc/core@1.3.76) - '@types/sharp': - specifier: 0.31.1 - version: 0.31.1 body-parser: specifier: 1.20.2 version: 1.20.2 @@ -668,6 +665,9 @@ importers: '@types/body-parser': specifier: 1.19.2 version: 1.19.2 + '@types/body-scroll-lock': + specifier: ^3.1.0 + version: 3.1.0 '@types/compression': specifier: 1.7.2 version: 1.7.2 @@ -767,6 +767,9 @@ importers: '@types/react-router-dom': specifier: 5.3.3 version: 5.3.3 + '@types/sharp': + specifier: 0.31.1 + version: 0.31.1 '@types/shelljs': specifier: 0.8.12 version: 0.8.12 @@ -3863,6 +3866,10 @@ packages: '@types/node': 20.5.7 dev: true + /@types/body-scroll-lock@3.1.0: + resolution: {integrity: sha512-3owAC4iJub5WPqRhxd8INarF2bWeQq1yQHBgYhN0XLBJMpd5ED10RrJ3aKiAwlTyL5wK7RkBD4SZUQz2AAAMdA==} + dev: true + /@types/busboy@1.5.1: resolution: {integrity: sha512-JAymE2skNionWnBUwby3MatzPUw4D/6/7FX1qxBXLzmRnFxmqU0luIof7om0I8R3B/rSr9FKUnFCqxZ/NeGbrw==} dependencies: @@ -4314,7 +4321,7 @@ packages: resolution: {integrity: sha512-5nWwamN9ZFHXaYEincMSuza8nNfOof8nmO+mcI+Agx1uMUk4/pQnNIcix+9rLPXzKrm1pS34+6WRDbDV0Jn7ag==} dependencies: '@types/node': 20.5.7 - dev: false + dev: true /@types/shelljs@0.8.12: resolution: {integrity: sha512-ZA8U81/gldY+rR5zl/7HSHrG2KDfEb3lzG6uCUDhW1DTQE9yC/VBQ45fXnXq8f3CgInfhZmjtdu/WOUlrXRQUg==}