From abf0f7111d14918e0c3d9a4320f941906dcaf295 Mon Sep 17 00:00:00 2001
From: James <james@trbl.design>
Date: Thu, 15 Feb 2024 14:12:59 -0500
Subject: [PATCH] chore: type fixes

---
 app/(payload)/api/graphql-playground/route.ts | 3 ++-
 app/(payload)/page.tsx                        | 2 --
 packages/db-mongodb/src/index.ts              | 2 +-
 packages/db-mongodb/src/init.ts               | 8 +++-----
 packages/db-mongodb/src/types.ts              | 8 +-------
 packages/db-postgres/src/migrate.ts           | 2 +-
 packages/db-postgres/src/upsertRow/index.ts   | 1 -
 tsconfig.json                                 | 2 +-
 8 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/app/(payload)/api/graphql-playground/route.ts b/app/(payload)/api/graphql-playground/route.ts
index 0c03d920a..106c50705 100644
--- a/app/(payload)/api/graphql-playground/route.ts
+++ b/app/(payload)/api/graphql-playground/route.ts
@@ -1,5 +1,6 @@
 /* THIS FILE WAS GENERATED AUTOMATICALLY BY PAYLOAD. */
 /* DO NOT MODIFY it because it could be re-written at any time. */
+import config from 'payload-config'
 import { GRAPHQL_PLAYGROUND_GET } from '@payloadcms/next/routes'
 
-export const GET = GRAPHQL_PLAYGROUND_GET
+export const GET = GRAPHQL_PLAYGROUND_GET(config)
diff --git a/app/(payload)/page.tsx b/app/(payload)/page.tsx
index d5f9e03fc..7bc8d9b0f 100644
--- a/app/(payload)/page.tsx
+++ b/app/(payload)/page.tsx
@@ -3,6 +3,4 @@
 import { RootPage } from '@payloadcms/next/pages/Root'
 import config from 'payload-config'
 
-import './test.scss'
-
 export default () => RootPage({ config })
diff --git a/packages/db-mongodb/src/index.ts b/packages/db-mongodb/src/index.ts
index b906fcc5d..d211a4c5d 100644
--- a/packages/db-mongodb/src/index.ts
+++ b/packages/db-mongodb/src/index.ts
@@ -76,7 +76,7 @@ declare module 'payload' {
     connection: Connection
     globals: GlobalModel
     mongoMemoryServer: any
-    sessions: Record<number | string, ClientSession>
+    // sessions: Record<number | string, ClientSession>
     versions: {
       [slug: string]: CollectionModel
     }
diff --git a/packages/db-mongodb/src/init.ts b/packages/db-mongodb/src/init.ts
index d74a4361e..1e74267ef 100644
--- a/packages/db-mongodb/src/init.ts
+++ b/packages/db-mongodb/src/init.ts
@@ -48,7 +48,7 @@ export const init: Init = async function init(this: MongooseAdapter) {
         versionModelName,
         versionSchema,
         this.autoPluralization === true ? undefined : versionModelName,
-      ) as CollectionModel
+      ) as unknown as CollectionModel
       // this.payload.versions[collection.slug] = model;
       this.versions[collection.slug] = model
     }
@@ -57,11 +57,9 @@ export const init: Init = async function init(this: MongooseAdapter) {
       collection.slug,
       schema,
       this.autoPluralization === true ? undefined : collection.slug,
-    ) as CollectionModel
+    ) as unknown as CollectionModel
     this.collections[collection.slug] = model
 
-    // TS expect error only needed until we launch 2.0.0
-    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
     this.payload.collections[collection.slug] = {
       config: collection,
     }
@@ -94,7 +92,7 @@ export const init: Init = async function init(this: MongooseAdapter) {
         versionModelName,
         versionSchema,
         versionModelName,
-      ) as CollectionModel
+      ) as unknown as CollectionModel
       this.versions[global.slug] = versionsModel
     }
   })
diff --git a/packages/db-mongodb/src/types.ts b/packages/db-mongodb/src/types.ts
index e5dcc866e..211b67260 100644
--- a/packages/db-mongodb/src/types.ts
+++ b/packages/db-mongodb/src/types.ts
@@ -27,16 +27,10 @@ import type {
 
 import type { BuildQueryArgs } from './queries/buildQuery'
 
-export interface CollectionModel extends Model<any>, PaginateModel<any>, PassportLocalModel {
+export interface CollectionModel extends Model<any>, PaginateModel<any> {
   /** buildQuery is used to transform payload's where operator into what can be used by mongoose (e.g. id => _id) */
   buildQuery: (args: BuildQueryArgs) => Promise<Record<string, unknown>> // TODO: Delete this
 }
-type Register<T = any> = (doc: T, password: string) => T
-
-interface PassportLocalModel {
-  authenticate: any
-  register: Register
-}
 
 export interface AuthCollectionModel extends CollectionModel {
   resetPasswordExpiration: Date
diff --git a/packages/db-postgres/src/migrate.ts b/packages/db-postgres/src/migrate.ts
index bcf835c9b..0fe67af2e 100644
--- a/packages/db-postgres/src/migrate.ts
+++ b/packages/db-postgres/src/migrate.ts
@@ -82,7 +82,7 @@ async function runMigrationFile(payload: Payload, migration: Migration, batch: n
 
   payload.logger.info({ msg: `Migrating: ${migration.name}` })
 
-  const pgAdapter = payload.db
+  const pgAdapter = payload.db as PostgresAdapter
   const drizzleJSON = generateDrizzleJson(pgAdapter.schema)
 
   try {
diff --git a/packages/db-postgres/src/upsertRow/index.ts b/packages/db-postgres/src/upsertRow/index.ts
index 3ac755ab5..6db84fbfb 100644
--- a/packages/db-postgres/src/upsertRow/index.ts
+++ b/packages/db-postgres/src/upsertRow/index.ts
@@ -3,7 +3,6 @@ import type { TypeWithID } from 'payload/types'
 
 import { eq } from 'drizzle-orm'
 import { ValidationError } from 'payload/errors'
-import { i18nInit } from 'payload/utilities'
 
 import type { BlockRowToInsert } from '../transform/write/types'
 import type { Args } from './types'
diff --git a/tsconfig.json b/tsconfig.json
index 4aa42941b..585868bd5 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -107,5 +107,5 @@
       "path": "./packages/ui"
     }
   ],
-  "include": ["next-env.d.ts", ".next/types/**/*.ts", "**/*.ts", "**/*.tsx"]
+  "include": ["next-env.d.ts", ".next/types/**/*.ts", "app/**/*.ts", "app/**/*.tsx"]
 }