From 7818cb655cfdcbd95a1683531a64c3bd5d975cf0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Germ=C3=A1n=20Jablo=C3=B1ski?= <43938777+GermanJablo@users.noreply.github.com> Date: Mon, 12 May 2025 10:25:50 -0300 Subject: [PATCH] run pnpm lint:fix --- packages/drizzle/src/createGlobal.ts | 2 +- packages/drizzle/src/createGlobalVersion.ts | 4 ++-- packages/drizzle/src/createVersion.ts | 2 +- .../v2-v3/fetchAndResave/traverseFields.ts | 4 ++-- packages/drizzle/src/updateGlobal.ts | 4 ++-- packages/drizzle/src/updateGlobalVersion.ts | 4 ++-- packages/drizzle/src/updateVersion.ts | 4 ++-- packages/drizzle/src/upsertRow/types.ts | 2 +- packages/graphql/src/schema/recursivelyBuildNestedPaths.ts | 2 +- .../richtext-lexical/src/lexical/plugins/TextPlugin/index.tsx | 2 +- .../providers/TableColumns/buildPolymorphicColumnState.tsx | 2 +- 11 files changed, 16 insertions(+), 16 deletions(-) diff --git a/packages/drizzle/src/createGlobal.ts b/packages/drizzle/src/createGlobal.ts index 4b399ed2fe..8d1fd0c2d6 100644 --- a/packages/drizzle/src/createGlobal.ts +++ b/packages/drizzle/src/createGlobal.ts @@ -23,10 +23,10 @@ export async function createGlobal>( data, db, fields: globalConfig.flattenedFields, + ignoreResult: returning === false, operation: 'create', req, tableName, - ignoreResult: returning === false, }) if (returning === false) { diff --git a/packages/drizzle/src/createGlobalVersion.ts b/packages/drizzle/src/createGlobalVersion.ts index fb32a6dc94..5ac12fa8c2 100644 --- a/packages/drizzle/src/createGlobalVersion.ts +++ b/packages/drizzle/src/createGlobalVersion.ts @@ -17,11 +17,11 @@ export async function createGlobalVersion( globalSlug, publishedLocale, req, + returning, select, snapshot, updatedAt, versionData, - returning, }: CreateGlobalVersionArgs, ) { const db = await getTransaction(this, req) @@ -42,11 +42,11 @@ export async function createGlobalVersion( }, db, fields: buildVersionGlobalFields(this.payload.config, global, true), + ignoreResult: returning === false ? 'idOnly' : false, operation: 'create', req, select, tableName, - ignoreResult: returning === false ? 'idOnly' : false, }) const table = this.tables[tableName] diff --git a/packages/drizzle/src/createVersion.ts b/packages/drizzle/src/createVersion.ts index c5e2ce028c..cb612b85b4 100644 --- a/packages/drizzle/src/createVersion.ts +++ b/packages/drizzle/src/createVersion.ts @@ -18,11 +18,11 @@ export async function createVersion( parent, publishedLocale, req, + returning, select, snapshot, updatedAt, versionData, - returning, }: CreateVersionArgs, ) { const db = await getTransaction(this, req) diff --git a/packages/drizzle/src/postgres/predefinedMigrations/v2-v3/fetchAndResave/traverseFields.ts b/packages/drizzle/src/postgres/predefinedMigrations/v2-v3/fetchAndResave/traverseFields.ts index 4b9f6f1132..7b186de581 100644 --- a/packages/drizzle/src/postgres/predefinedMigrations/v2-v3/fetchAndResave/traverseFields.ts +++ b/packages/drizzle/src/postgres/predefinedMigrations/v2-v3/fetchAndResave/traverseFields.ts @@ -54,7 +54,7 @@ export const traverseFields = ({ doc, fields, locale, path, rows }: Args) => { // Can ignore string blocks, as those were added in v3 and don't need to be migrated const matchedBlock = field.blocks.find( (block) => typeof block !== 'string' && block.slug === row.blockType, - ) as FlattenedBlock | undefined + ) if (matchedBlock) { return traverseFields({ @@ -75,7 +75,7 @@ export const traverseFields = ({ doc, fields, locale, path, rows }: Args) => { // Can ignore string blocks, as those were added in v3 and don't need to be migrated const matchedBlock = field.blocks.find( (block) => typeof block !== 'string' && block.slug === row.blockType, - ) as FlattenedBlock | undefined + ) if (matchedBlock) { return traverseFields({ diff --git a/packages/drizzle/src/updateGlobal.ts b/packages/drizzle/src/updateGlobal.ts index 29039f83e4..e97bd15ea9 100644 --- a/packages/drizzle/src/updateGlobal.ts +++ b/packages/drizzle/src/updateGlobal.ts @@ -9,7 +9,7 @@ import { getTransaction } from './utilities/getTransaction.js' export async function updateGlobal>( this: DrizzleAdapter, - { slug, data, req, select, returning }: UpdateGlobalArgs, + { slug, data, req, returning, select }: UpdateGlobalArgs, ): Promise { const db = await getTransaction(this, req) const globalConfig = this.payload.globals.config.find((config) => config.slug === slug) @@ -23,10 +23,10 @@ export async function updateGlobal>( data, db, fields: globalConfig.flattenedFields, + ignoreResult: returning === false, req, select, tableName, - ignoreResult: returning === false, }) if (returning === false) { diff --git a/packages/drizzle/src/updateGlobalVersion.ts b/packages/drizzle/src/updateGlobalVersion.ts index 99b140ccec..c5257d4e18 100644 --- a/packages/drizzle/src/updateGlobalVersion.ts +++ b/packages/drizzle/src/updateGlobalVersion.ts @@ -21,10 +21,10 @@ export async function updateGlobalVersion( global, locale, req, + returning, select, versionData, where: whereArg, - returning, }: UpdateGlobalVersionArgs, ) { const db = await getTransaction(this, req) @@ -53,12 +53,12 @@ export async function updateGlobalVersion( data: versionData, db, fields, + ignoreResult: returning === false, operation: 'update', req, select, tableName, where, - ignoreResult: returning === false, }) if (returning === false) { diff --git a/packages/drizzle/src/updateVersion.ts b/packages/drizzle/src/updateVersion.ts index 1a05dee870..91191c7056 100644 --- a/packages/drizzle/src/updateVersion.ts +++ b/packages/drizzle/src/updateVersion.ts @@ -21,10 +21,10 @@ export async function updateVersion( collection, locale, req, + returning, select, versionData, where: whereArg, - returning, }: UpdateVersionArgs, ) { const db = await getTransaction(this, req) @@ -50,13 +50,13 @@ export async function updateVersion( data: versionData, db, fields, + ignoreResult: returning === false, joinQuery: false, operation: 'update', req, select, tableName, where, - ignoreResult: returning === false, }) if (returning === false) { diff --git a/packages/drizzle/src/upsertRow/types.ts b/packages/drizzle/src/upsertRow/types.ts index 9a0c4df0db..0df784f094 100644 --- a/packages/drizzle/src/upsertRow/types.ts +++ b/packages/drizzle/src/upsertRow/types.ts @@ -12,7 +12,7 @@ type BaseArgs = { * When true, skips reading the data back from the database and returns the input data * @default false */ - ignoreResult?: boolean | 'idOnly' + ignoreResult?: 'idOnly' | boolean joinQuery?: JoinQuery path?: string req?: Partial diff --git a/packages/graphql/src/schema/recursivelyBuildNestedPaths.ts b/packages/graphql/src/schema/recursivelyBuildNestedPaths.ts index bcb8bd7b3b..3415d23819 100644 --- a/packages/graphql/src/schema/recursivelyBuildNestedPaths.ts +++ b/packages/graphql/src/schema/recursivelyBuildNestedPaths.ts @@ -17,7 +17,7 @@ export const recursivelyBuildNestedPaths = ({ field, nestedFieldName2, parentNam if (field.type === 'tabs') { // if the tab has a name, treat it as a group // otherwise, treat it as a row - return (field.tabs as Tab[]).reduce((tabSchema, tab: any) => { + return field.tabs.reduce((tabSchema, tab: any) => { tabSchema.push( ...recursivelyBuildNestedPaths({ field: { diff --git a/packages/richtext-lexical/src/lexical/plugins/TextPlugin/index.tsx b/packages/richtext-lexical/src/lexical/plugins/TextPlugin/index.tsx index 651e6d2270..dbc844a932 100644 --- a/packages/richtext-lexical/src/lexical/plugins/TextPlugin/index.tsx +++ b/packages/richtext-lexical/src/lexical/plugins/TextPlugin/index.tsx @@ -11,7 +11,7 @@ export function TextPlugin({ features }: { features: SanitizedClientFeatures }) const [editor] = useLexicalComposerContext() useEffect(() => { - const disabledFormats = getDisabledFormats(features.enabledFormats as TextFormatType[]) + const disabledFormats = getDisabledFormats(features.enabledFormats) if (disabledFormats.length === 0) { return } diff --git a/packages/ui/src/providers/TableColumns/buildPolymorphicColumnState.tsx b/packages/ui/src/providers/TableColumns/buildPolymorphicColumnState.tsx index b4273394cb..f122aa1092 100644 --- a/packages/ui/src/providers/TableColumns/buildPolymorphicColumnState.tsx +++ b/packages/ui/src/providers/TableColumns/buildPolymorphicColumnState.tsx @@ -25,13 +25,13 @@ import React from 'react' import type { SortColumnProps } from '../../elements/SortColumn/index.js' +import { RenderServerComponent } from '../../elements/RenderServerComponent/index.js' import { RenderCustomComponent, RenderDefaultCell, SortColumn, // eslint-disable-next-line payload/no-imports-from-exports-dir } from '../../exports/client/index.js' -import { RenderServerComponent } from '../../elements/RenderServerComponent/index.js' import { filterFields } from './filterFields.js' type Args = {