From e987f2dadfdeb0369efaf769ebc19d6d66a77eb5 Mon Sep 17 00:00:00 2001
From: Andrei Luca <1881266+iamandrewluca@users.noreply.github.com>
Date: Thu, 17 Oct 2024 08:13:02 +0300
Subject: [PATCH] chore(lint): make eslint run, fix errors (#9361)

Co-authored-by: Daniel Cousens <dcousens@users.noreply.github.com>
---
 .../packages/core/src/components/Box.tsx      | 24 +++++-----
 .../packages/core/src/components/Link.tsx     |  2 +-
 .../packages/fields/src/FieldContainer.tsx    |  2 +-
 design-system/packages/fields/src/Switch.tsx  | 10 ++--
 design-system/packages/icons/src/Icon.tsx     |  2 +-
 .../packages/modals/src/DrawerBase.tsx        |  8 ++--
 .../packages/modals/src/DrawerController.tsx  |  2 +-
 .../packages/modals/src/drawer-context.tsx    |  6 +--
 .../packages/popover/src/Popover.tsx          |  8 ++--
 .../src/SegmentedControl.tsx                  |  4 +-
 design-system/packages/toast/src/Toast.tsx    |  4 +-
 .../website/pages/components/fields.tsx       |  2 +-
 .../website/pages/components/modals.tsx       |  6 +--
 .../website/pages/components/options.tsx      |  2 +-
 docs/components/ContactForm.tsx               |  7 ++-
 docs/components/Header.tsx                    |  4 +-
 docs/components/docs/DocumentEditorDemo.tsx   |  2 +-
 docs/components/docs/TableOfContents.tsx      | 10 ++--
 docs/components/primitives/Code.tsx           | 18 +++----
 docs/markdoc/index.ts                         |  8 ++--
 eslint.config.js => eslint.config.mjs         | 29 +++++------
 package.json                                  |  5 +-
 packages/auth/src/components/Icons.tsx        |  2 +-
 packages/auth/src/lib/emailHeuristics.ts      |  2 +-
 packages/auth/src/pages/InitPage.tsx          |  2 +-
 packages/auth/src/schema.ts                   |  4 +-
 packages/cloudinary/src/views/Field.tsx       |  4 +-
 .../admin-ui/id-field-view.tsx                |  2 +-
 .../admin-ui/pages/HomePage/index.tsx         |  2 +-
 .../admin-ui/pages/ItemPage/index.tsx         |  2 +-
 .../admin-ui/pages/ListPage/FilterAdd.tsx     |  4 +-
 .../admin-ui/pages/ListPage/index.tsx         |  6 +--
 .../admin-ui/pages/ListPage/useFilters.tsx    |  2 +-
 .../pages/ListPage/useSelectedFields.tsx      |  4 +-
 .../admin-ui/pages/ListPage/useSort.tsx       |  2 +-
 .../core/src/admin-ui/admin-meta-graphql.ts   |  2 +-
 packages/core/src/admin-ui/templates/app.ts   |  2 +-
 packages/core/src/admin-ui/utils/item-form.ts |  2 +-
 .../core/src/admin-ui/utils/useAdminMeta.tsx  |  4 +-
 packages/core/src/fields/non-null-graphql.ts  |  8 ++--
 packages/core/src/fields/resolve-hooks.ts     |  2 +-
 .../src/fields/types/bigInt/views/index.tsx   |  2 +-
 .../src/fields/types/calendarDay/index.ts     |  2 +-
 .../fields/types/calendarDay/views/index.tsx  |  2 +-
 .../src/fields/types/decimal/views/index.tsx  |  2 +-
 packages/core/src/fields/types/float/index.ts |  2 +-
 .../src/fields/types/float/views/index.tsx    |  8 ++--
 .../src/fields/types/image/views/Field.tsx    |  4 +-
 .../src/fields/types/integer/views/index.tsx  |  4 +-
 .../src/fields/types/integer/views/utils.tsx  |  2 +-
 .../src/fields/types/json/views/index.tsx     |  2 +-
 .../core/src/fields/types/password/index.ts   |  4 +-
 .../relationship/views/RelationshipSelect.tsx |  4 +-
 .../types/relationship/views/cards/index.tsx  |  6 +--
 .../relationship/views/cards/useItemState.tsx | 10 ++--
 .../fields/types/relationship/views/index.tsx | 16 +++----
 .../core/src/fields/types/select/index.ts     |  2 +-
 .../src/fields/types/select/views/index.tsx   |  4 +-
 .../src/fields/types/text/views/index.tsx     |  4 +-
 .../fields/types/timestamp/views/index.tsx    |  4 +-
 .../core/src/fields/types/virtual/index.ts    |  2 +-
 packages/core/src/lib/assets/utils.ts         |  2 +-
 .../core/src/lib/context/createContext.ts     |  2 +-
 .../core/src/lib/core/initialise-lists.ts     |  4 +-
 packages/core/src/lib/core/queries/index.ts   |  2 +-
 packages/core/src/lib/utils.ts                |  2 +-
 packages/core/src/scripts/dev.ts              |  6 +--
 packages/core/src/session.ts                  |  4 +-
 packages/core/src/types/admin-meta.ts         |  2 +-
 .../json-field-type-polyfill-for-sqlite.ts    |  3 +-
 packages/core/src/types/next-fields.ts        |  2 +-
 .../src/types/schema/graphql-ts-schema.ts     | 15 +++---
 packages/document-renderer/src/index.tsx      |  2 +-
 .../src/DocumentEditor/Toolbar.tsx            |  4 +-
 .../block-markdown-shortcuts.ts               |  2 +-
 .../src/DocumentEditor/blockquote.test.tsx    |  8 ++--
 .../src/DocumentEditor/code-block.test.tsx    | 10 ++--
 .../src/DocumentEditor/code-block.tsx         |  2 +-
 .../document-features-normalization.test.tsx  |  2 +-
 .../insert-break-and-delete.test.tsx          | 10 ++--
 .../insertion-and-preview-props.test.tsx      | 32 ++++++-------
 .../component-blocks/normalization.test.tsx   | 18 +++----
 .../component-blocks/preview-props.test.ts    |  4 +-
 .../component-blocks/utils.test.ts            |  2 +-
 .../with-component-blocks.tsx                 |  2 +-
 .../src/DocumentEditor/divider.test.tsx       |  2 +-
 .../src/DocumentEditor/heading.test.tsx       |  8 ++--
 .../src/DocumentEditor/index.tsx              |  2 +-
 .../src/DocumentEditor/insert-menu-shared.ts  |  2 +-
 .../src/DocumentEditor/insert-menu.test.tsx   | 24 +++++-----
 .../src/DocumentEditor/insert-menu.tsx        |  2 +-
 .../src/DocumentEditor/layouts.test.tsx       | 14 +++---
 .../src/DocumentEditor/link.tsx               |  4 +-
 .../src/DocumentEditor/lists.test.tsx         | 48 +++++++++----------
 .../markdown-link-shortcut.test.tsx           | 22 ++++-----
 .../src/DocumentEditor/marks.test.tsx         | 38 +++++++--------
 .../src/DocumentEditor/marks.tsx              |  2 +-
 .../src/DocumentEditor/paragraphs.ts          |  2 +-
 .../src/DocumentEditor/pasting/index.ts       |  2 +-
 .../DocumentEditor/pasting/markdown.test.tsx  |  2 +-
 .../src/DocumentEditor/pasting/test-utils.tsx |  2 +-
 .../primitives/inline-dialog.tsx              |  2 +-
 .../src/DocumentEditor/shortcuts.test.tsx     |  4 +-
 .../src/DocumentEditor/soft-breaks.test.tsx   |  4 +-
 .../DocumentEditor/tests/jsx/namespace.d.ts   |  6 +--
 .../DocumentEditor/tests/test-utils.test.tsx  | 10 ++--
 .../src/DocumentEditor/tests/utils.tsx        |  9 ++--
 .../DocumentEditor/toolbar-state-shared.ts    |  8 ++--
 .../src/structure-graphql-output.ts           |  2 +-
 packages/fields-document/src/validation.ts    |  2 +-
 pnpm-lock.yaml                                | 21 +++++++-
 tests/api-tests/db-enable-logging.test.ts     |  4 +-
 tests/api-tests/fields/files.test.ts          |  2 +-
 .../fields/images.crud.test.disabled.ts       |  4 +-
 tests/api-tests/fields/types/utils.ts         |  4 +-
 tests/api-tests/omit.test.ts                  |  2 +-
 tests/api-tests/queries/filters.test.ts       |  8 ++--
 tests/api-tests/queries/singletons.test.ts    |  2 +-
 .../many-to-many-one-sided.test.ts            |  2 +-
 .../crud-self-ref/many-to-many.test.ts        |  2 +-
 .../one-to-many-one-sided.test.ts             |  2 +-
 .../crud-self-ref/one-to-many.test.ts         |  2 +-
 .../crud-self-ref/one-to-one.test.ts          |  2 +-
 .../crud/many-to-many-one-sided.test.ts       |  2 +-
 .../relationships/crud/many-to-many.test.ts   |  2 +-
 .../crud/one-to-many-one-sided.test.ts        |  2 +-
 .../relationships/crud/one-to-many.test.ts    |  2 +-
 .../relationships/crud/one-to-one.test.ts     |  8 ++--
 .../nested-mutations/disconnect-many.test.ts  |  2 +-
 .../disconnect-singular.test.ts               |  2 +-
 .../two-way-backreference/to-many.test.ts     |  4 +-
 .../to-one-query-batching.test.ts             |  2 +-
 .../custom-prisma-project/keystone.ts         |  4 +-
 tests/cli-tests/prisma.test.ts                |  4 +-
 tests/cli-tests/utils.ts                      |  2 +-
 135 files changed, 394 insertions(+), 373 deletions(-)
 rename eslint.config.js => eslint.config.mjs (71%)

diff --git a/design-system/packages/core/src/components/Box.tsx b/design-system/packages/core/src/components/Box.tsx
index 68abdc3c192..998cc699523 100644
--- a/design-system/packages/core/src/components/Box.tsx
+++ b/design-system/packages/core/src/components/Box.tsx
@@ -181,10 +181,10 @@ function useRadii (
   { rounding, roundingTop, roundingRight, roundingBottom, roundingLeft }: RadiiProps,
   { radii }: Theme
 ) {
-  let borderBottomLeftRadius = roundingBottom || roundingLeft || rounding
-  let borderBottomRightRadius = roundingBottom || roundingRight || rounding
-  let borderTopLeftRadius = roundingTop || roundingLeft || rounding
-  let borderTopRightRadius = roundingTop || roundingRight || rounding
+  const borderBottomLeftRadius = roundingBottom || roundingLeft || rounding
+  const borderBottomRightRadius = roundingBottom || roundingRight || rounding
+  const borderTopLeftRadius = roundingTop || roundingLeft || rounding
+  const borderTopRightRadius = roundingTop || roundingRight || rounding
 
   return {
     borderBottomLeftRadius:
@@ -208,10 +208,10 @@ function usePadding (
   }: PaddingProps,
   { spacing }: Theme
 ) {
-  let pb = paddingBottom || paddingY || padding
-  let pt = paddingTop || paddingY || padding
-  let pl = paddingLeft || paddingX || padding
-  let pr = paddingRight || paddingX || padding
+  const pb = paddingBottom || paddingY || padding
+  const pt = paddingTop || paddingY || padding
+  const pl = paddingLeft || paddingX || padding
+  const pr = paddingRight || paddingX || padding
 
   return {
     paddingBottom: pb && mapResponsiveProp(pb, spacing),
@@ -225,10 +225,10 @@ function useMargin (
   { margin, marginTop, marginRight, marginBottom, marginLeft, marginY, marginX }: MarginProps,
   { spacing }: Theme
 ) {
-  let mb = marginBottom || marginY || margin
-  let mt = marginTop || marginY || margin
-  let ml = marginLeft || marginX || margin
-  let mr = marginRight || marginX || margin
+  const mb = marginBottom || marginY || margin
+  const mt = marginTop || marginY || margin
+  const ml = marginLeft || marginX || margin
+  const mr = marginRight || marginX || margin
 
   return {
     marginBottom: mb && mapResponsiveProp(mb, spacing),
diff --git a/design-system/packages/core/src/components/Link.tsx b/design-system/packages/core/src/components/Link.tsx
index df3321ffb89..d23cc6b032c 100644
--- a/design-system/packages/core/src/components/Link.tsx
+++ b/design-system/packages/core/src/components/Link.tsx
@@ -5,7 +5,7 @@ import { jsx } from '../emotion'
 import { useTheme } from '../theme'
 import { forwardRefWithAs } from '../utils'
 
-export const Link = forwardRefWithAs<'a', {}>(({ as: Tag = 'a', ...props }, ref) => {
+export const Link = forwardRefWithAs<'a', unknown>(({ as: Tag = 'a', ...props }, ref) => {
   const { typography, colors } = useTheme()
 
   const styles = {
diff --git a/design-system/packages/fields/src/FieldContainer.tsx b/design-system/packages/fields/src/FieldContainer.tsx
index a14e34b4061..6bef2fcf039 100644
--- a/design-system/packages/fields/src/FieldContainer.tsx
+++ b/design-system/packages/fields/src/FieldContainer.tsx
@@ -2,6 +2,6 @@
 /** @jsx jsx */
 import { jsx, forwardRefWithAs } from '@keystone-ui/core'
 
-export const FieldContainer = forwardRefWithAs<'div', {}>(({ as: Tag = 'div', ...props }, ref) => {
+export const FieldContainer = forwardRefWithAs<'div', unknown>(({ as: Tag = 'div', ...props }, ref) => {
   return <Tag ref={ref} {...props} />
 })
diff --git a/design-system/packages/fields/src/Switch.tsx b/design-system/packages/fields/src/Switch.tsx
index 290c331c8d9..ec790764768 100644
--- a/design-system/packages/fields/src/Switch.tsx
+++ b/design-system/packages/fields/src/Switch.tsx
@@ -47,7 +47,7 @@ type SwitchControlProps = {
 
 export const SwitchControl = forwardRef<HTMLButtonElement, SwitchControlProps>(
   ({ a11yLabels = { on: 'On', off: 'Off' }, checked = false, onChange, ...props }, ref) => {
-    let onClick = () => {
+    const onClick = () => {
       if (onChange) {
         onChange(!checked)
       }
@@ -64,10 +64,10 @@ export const SwitchControl = forwardRef<HTMLButtonElement, SwitchControlProps>(
 const Button = forwardRef<HTMLButtonElement, ButtonProps>((props, ref) => {
   const { animation, fields, sizing } = useTheme()
 
-  let gutter = 3
-  let trackHeight = sizing.xsmall + gutter
-  let trackWidth = trackHeight * 2 - 2 * gutter
-  let handleSize = trackHeight - gutter * 2
+  const gutter = 3
+  const trackHeight = sizing.xsmall + gutter
+  const trackWidth = trackHeight * 2 - 2 * gutter
+  const handleSize = trackHeight - gutter * 2
 
   return (
     <button
diff --git a/design-system/packages/icons/src/Icon.tsx b/design-system/packages/icons/src/Icon.tsx
index ee678a38139..785a0f2b1d1 100644
--- a/design-system/packages/icons/src/Icon.tsx
+++ b/design-system/packages/icons/src/Icon.tsx
@@ -21,7 +21,7 @@ const sizeMap = {
 }
 
 export const createIcon = (children: ReactNode, name: string) => {
-  let Icon = forwardRef<SVGSVGElement, IconProps>(
+  const Icon = forwardRef<SVGSVGElement, IconProps>(
     ({ size = 'medium', color, ...props }: IconProps, ref: any) => {
       const resolvedSize = typeof size === 'number' ? size : mapResponsiveProp(size, sizeMap)
 
diff --git a/design-system/packages/modals/src/DrawerBase.tsx b/design-system/packages/modals/src/DrawerBase.tsx
index 3bcfa181c72..64faa073b3b 100644
--- a/design-system/packages/modals/src/DrawerBase.tsx
+++ b/design-system/packages/modals/src/DrawerBase.tsx
@@ -51,7 +51,7 @@ export const DrawerBase = ({
   const uniqueKey = makeId('drawer', id)
 
   // sync drawer state
-  let drawerDepth = useDrawerManager(uniqueKey)
+  const drawerDepth = useDrawerManager(uniqueKey)
 
   const onKeyDown = (event: KeyboardEvent) => {
     if (event.key === 'Escape' && !event.defaultPrevented) {
@@ -71,7 +71,7 @@ export const DrawerBase = ({
   let Tag: 'div' | 'form' = 'div'
   if (onSubmit) {
     Tag = 'form'
-    let oldOnSubmit = onSubmit
+    const oldOnSubmit = onSubmit
     // @ts-expect-error
     onSubmit = (event: any) => {
       if (!event.defaultPrevented) {
@@ -134,8 +134,8 @@ export const DrawerBase = ({
 // ------------------------------
 
 function getDialogTransition (depth: number) {
-  let scaleInc = 0.05
-  let transformValue = `scale(${1 - scaleInc * depth}) translateX(-${depth * 40}px)`
+  const scaleInc = 0.05
+  const transformValue = `scale(${1 - scaleInc * depth}) translateX(-${depth * 40}px)`
 
   return {
     entering: { transform: 'translateX(100%)' },
diff --git a/design-system/packages/modals/src/DrawerController.tsx b/design-system/packages/modals/src/DrawerController.tsx
index 2f8be1a53be..f5958a57c15 100644
--- a/design-system/packages/modals/src/DrawerController.tsx
+++ b/design-system/packages/modals/src/DrawerController.tsx
@@ -13,7 +13,7 @@ const DrawerControllerContext = React.createContext<null | TransitionState>(null
 export const DrawerControllerContextProvider = DrawerControllerContext.Provider
 
 export const useDrawerControllerContext = () => {
-  let context = useContext(DrawerControllerContext)
+  const context = useContext(DrawerControllerContext)
   if (!context) {
     throw new Error(
       'Drawers must be wrapped in a <DrawerController>. You should generally do this outside of the component that renders the <Drawer> or <TabbedDrawer>.'
diff --git a/design-system/packages/modals/src/drawer-context.tsx b/design-system/packages/modals/src/drawer-context.tsx
index 243a5126f41..c751860ac40 100644
--- a/design-system/packages/modals/src/drawer-context.tsx
+++ b/design-system/packages/modals/src/drawer-context.tsx
@@ -9,14 +9,14 @@ export type ModalState = {
 const ModalContext = React.createContext<ModalState | null>(null)
 
 export const DrawerProvider = ({ children }: { children: ReactNode }) => {
-  let [drawerStack, setDrawerStack] = useState<string[]>([])
+  const [drawerStack, setDrawerStack] = useState<string[]>([])
 
   const pushToDrawerStack = useCallback((key: string) => {
     setDrawerStack(stack => [...stack, key])
   }, [])
   const popFromDrawerStack = useCallback(() => {
     setDrawerStack(stack => {
-      let less = stack.slice(0, -1)
+      const less = stack.slice(0, -1)
       return less
     })
   }, [])
@@ -50,7 +50,7 @@ export const useDrawerManager = (uniqueKey: string) => {
   }, [])
   // the last key in the array is the "top" modal visually, so the depth is the inverse index
   // be careful not to mutate the stack
-  let depth = modalState.drawerStack.slice().reverse().indexOf(uniqueKey)
+  const depth = modalState.drawerStack.slice().reverse().indexOf(uniqueKey)
   // if it's not in the stack already,
   // we know that it should be the last drawer in the stack but the effect hasn't happened yet
   // so we need to make the depth 0 so the depth is correct even though the effect hasn't happened yet
diff --git a/design-system/packages/popover/src/Popover.tsx b/design-system/packages/popover/src/Popover.tsx
index 4f6a235c8cd..78477004491 100644
--- a/design-system/packages/popover/src/Popover.tsx
+++ b/design-system/packages/popover/src/Popover.tsx
@@ -262,7 +262,7 @@ type UseClickOutsideProps = {
 const useClickOutside = ({ handler, elements, listenWhen }: UseClickOutsideProps) => {
   useEffect(() => {
     if (listenWhen) {
-      let handleMouseDown = (event: MouseEvent) => {
+      const handleMouseDown = (event: MouseEvent) => {
         // bail on mouse down "inside" any of the provided elements
         if (elements.some(el => el && el.contains(event.target as Node))) {
           return
@@ -300,8 +300,8 @@ const useKeyPress = ({
 
   // add event listeners
   useEffect(() => {
-    let target = targetElement || document.body
-    let onDown = (event: KeyboardEvent) => {
+    const target = targetElement || document.body
+    const onDown = (event: KeyboardEvent) => {
       if (event.key === targetKey) {
         setKeyPressed(true)
 
@@ -310,7 +310,7 @@ const useKeyPress = ({
         }
       }
     }
-    let onUp = (event: KeyboardEvent) => {
+    const onUp = (event: KeyboardEvent) => {
       if (event.key === targetKey) {
         setKeyPressed(false)
 
diff --git a/design-system/packages/segmented-control/src/SegmentedControl.tsx b/design-system/packages/segmented-control/src/SegmentedControl.tsx
index 0c78b4c1189..1a6b22ce812 100644
--- a/design-system/packages/segmented-control/src/SegmentedControl.tsx
+++ b/design-system/packages/segmented-control/src/SegmentedControl.tsx
@@ -82,8 +82,8 @@ export const SegmentedControl = ({
   // Animate the selected segment indicator
   useEffect(() => {
     if (animate && rootRef.current instanceof HTMLElement) {
-      let nodes = Array.from(rootRef.current.children)
-      let selected = selectedIndex !== undefined && nodes[selectedIndex]
+      const nodes = Array.from(rootRef.current.children)
+      const selected = selectedIndex !== undefined && nodes[selectedIndex]
       let rootRect
       let nodeRect = { height: 0, width: 0, left: 0, top: 0 }
       let offsetLeft
diff --git a/design-system/packages/toast/src/Toast.tsx b/design-system/packages/toast/src/Toast.tsx
index 6357cfc4cb4..5311ee39260 100644
--- a/design-system/packages/toast/src/Toast.tsx
+++ b/design-system/packages/toast/src/Toast.tsx
@@ -29,7 +29,7 @@ export function ToastProvider ({ children }: { children: ReactNode }) {
           }
 
           // populate defaults and update state
-          let toast = populateDefaults(options)
+          const toast = populateDefaults(options)
           return [...currentStack, toast]
         })
       },
@@ -68,7 +68,7 @@ export function ToastProvider ({ children }: { children: ReactNode }) {
 // ------------------------------
 
 let idCount = -1
-let genId = () => ++idCount
+const genId = () => ++idCount
 function populateDefaults (props: ToastProps): ToastPropsExact {
   return {
     title: props.title,
diff --git a/design-system/website/pages/components/fields.tsx b/design-system/website/pages/components/fields.tsx
index f1228b4ab94..13f6a18c47c 100644
--- a/design-system/website/pages/components/fields.tsx
+++ b/design-system/website/pages/components/fields.tsx
@@ -41,7 +41,7 @@ const StatefulSwitch = ({ children, ...props }: ComponentProps<typeof Switch>) =
 }
 
 const BasicDatePicker = () => {
-  let [value, setValue] = useState<DateType>('')
+  const [value, setValue] = useState<DateType>('')
   return (
     <Stack gap="small">
       <pre>{value || 'no value'}</pre>
diff --git a/design-system/website/pages/components/modals.tsx b/design-system/website/pages/components/modals.tsx
index 52f1469474d..a7b72fdb112 100644
--- a/design-system/website/pages/components/modals.tsx
+++ b/design-system/website/pages/components/modals.tsx
@@ -8,9 +8,9 @@ import { Drawer, DrawerController, AlertDialog } from '@keystone-ui/modals'
 import { Page } from '../../components/Page'
 
 export default function ModalsPage () {
-  let [isNarrowOpen, setIsNarrowOpen] = useState(false)
-  let [isWideOpen, setIsWideOpen] = useState(false)
-  let [isAlertDialogOpen, setIsAlertDialogOpen] = useState(false)
+  const [isNarrowOpen, setIsNarrowOpen] = useState(false)
+  const [isWideOpen, setIsWideOpen] = useState(false)
+  const [isAlertDialogOpen, setIsAlertDialogOpen] = useState(false)
 
   return (
     <Page>
diff --git a/design-system/website/pages/components/options.tsx b/design-system/website/pages/components/options.tsx
index 74e89b927c9..42fd94d88f0 100644
--- a/design-system/website/pages/components/options.tsx
+++ b/design-system/website/pages/components/options.tsx
@@ -17,7 +17,7 @@ const props: ComponentProps<typeof CheckMark>[] = [
 ]
 
 export default function OptionsPage () {
-  let [value, setValue] = useState<undefined | { label: string, value: string }>()
+  const [value, setValue] = useState<undefined | { label: string, value: string }>()
   return (
     <Page>
       <h1>Options</h1>
diff --git a/docs/components/ContactForm.tsx b/docs/components/ContactForm.tsx
index b03c410d563..5f08596283b 100644
--- a/docs/components/ContactForm.tsx
+++ b/docs/components/ContactForm.tsx
@@ -8,10 +8,9 @@ import { Field } from './primitives/Field'
 import { Stack } from './primitives/Stack'
 import { Type } from './primitives/Type'
 
-const validEmail = (email: string) =>
-  /^[a-zA-Z0-9.!#$%&'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$/.test(
-    email
-  )
+function validEmail (email: string) {
+  return /^[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$/.test(email)
+}
 
 const enquiryUrl = 'https://endpoints.thinkmill.com.au/enquiry'
 
diff --git a/docs/components/Header.tsx b/docs/components/Header.tsx
index ee541fdbb7b..3036c1e7b9c 100644
--- a/docs/components/Header.tsx
+++ b/docs/components/Header.tsx
@@ -272,7 +272,7 @@ export function Header () {
   useEffect(() => {
     document.body.style.overflow = 'auto'
     // search - init field
-    let searchAttempt = 0
+    const searchAttempt = 0
     // @ts-expect-error
     document.getElementById('search-field').disabled = true
     const loadSearch = (searchAttempt: number) => {
@@ -308,7 +308,7 @@ export function Header () {
     // yoo hooo
     loadSearch(searchAttempt)
     // search - keyboard shortcut
-    let keysPressed: { [key: KeyboardEvent['key']]: boolean } = {}
+    const keysPressed: { [key: KeyboardEvent['key']]: boolean } = {}
     document.body.addEventListener('keydown', (event) => {
       // If we're typing in an input, don't ever focus the search input
       if (
diff --git a/docs/components/docs/DocumentEditorDemo.tsx b/docs/components/docs/DocumentEditorDemo.tsx
index 4b75f1a3006..c72651873d4 100644
--- a/docs/components/docs/DocumentEditorDemo.tsx
+++ b/docs/components/docs/DocumentEditorDemo.tsx
@@ -177,7 +177,7 @@ function objToShorthand<
   Obj extends Record<string, undefined | true | readonly any[] | Record<string, any>>
 > (obj: Obj): Obj | true | undefined {
   const values = Object.values(obj)
-  let state: (typeof values)[number] = values[0]!
+  const state: (typeof values)[number] = values[0]!
   for (const val of values) {
     if (val !== state || (val !== undefined && val !== true)) {
       return obj
diff --git a/docs/components/docs/TableOfContents.tsx b/docs/components/docs/TableOfContents.tsx
index 3b3d2c756f8..67f04a98b0c 100644
--- a/docs/components/docs/TableOfContents.tsx
+++ b/docs/components/docs/TableOfContents.tsx
@@ -32,8 +32,8 @@ export function TableOfContents ({
   container: React.RefObject<HTMLElement | null>
   headings: Heading[]
 }) {
-  let [visibleIds, setVisibleIds] = useState<Array<string | null>>([])
-  let [lastVisibleId, setLastVisbleId] = useState<string | null>(null)
+  const [visibleIds, setVisibleIds] = useState<Array<string | null>>([])
+  const [lastVisibleId, setLastVisbleId] = useState<string | null>(null)
 
   const mq = useMediaQuery()
 
@@ -41,7 +41,7 @@ export function TableOfContents ({
 
   useEffect(() => {
     if (container.current) {
-      let allIds = headings.map(h => h.id)
+      const allIds = headings.map(h => h.id)
       const observer = new IntersectionObserver(entries => {
         entries.forEach(entry => {
           const targetId: string | null = entry.target.getAttribute('id')
@@ -62,7 +62,7 @@ export function TableOfContents ({
   }, [container, headings])
 
   // catch if we're in a long gap between headings and resolve to the last available.
-  let activeId = visibleIds[0] || lastVisibleId
+  const activeId = visibleIds[0] || lastVisibleId
 
   return (
     <div id="toc">
@@ -87,7 +87,7 @@ export function TableOfContents ({
         </Type>
         <ul css={{ listStyle: 'none', margin: 0, padding: 0 }}>
           {headings.map((h: Heading, i: number) => {
-            let isActive = activeId === h.id
+            const isActive = activeId === h.id
             const slug = `#${h.id}`
             return (
               <li
diff --git a/docs/components/primitives/Code.tsx b/docs/components/primitives/Code.tsx
index 85ef7ee72bf..138f04a7c03 100644
--- a/docs/components/primitives/Code.tsx
+++ b/docs/components/primitives/Code.tsx
@@ -11,14 +11,14 @@ type Range = { start: number, end: number }
 type CollapseRange = Range & { isCollapsed: boolean }
 
 const getRanges = (lines: string): Range[] => {
-  let ranges: Range[] = []
+  const ranges: Range[] = []
 
   lines.split(',').forEach((lineRange) => {
     if (lineRange.length) {
       const [range1, range2] = lineRange.split('-')
 
       let parsedRange1 = parseInt(range1)
-      let parsedRange2 = parseInt(range2)
+      const parsedRange2 = parseInt(range2)
 
       if (isNaN(parsedRange1)) {
         throw new Error(`When trying to do highlighting, error in {${lines}}`)
@@ -41,24 +41,24 @@ const getRanges = (lines: string): Range[] => {
 const parseClassName = (
   className?: string
 ): { highlightRanges: Range[], collapseRanges: CollapseRange[], language: string } => {
-  let trimmedLanguage = (className || '').replace(/language-/, '')
+  const trimmedLanguage = (className || '').replace(/language-/, '')
   let language, highlights, collapses
 
   if (
     !trimmedLanguage.includes('[') ||
     trimmedLanguage.indexOf('{') < trimmedLanguage.indexOf('[')
   ) {
-    let [scopedLanguage, modifiers = ''] = trimmedLanguage.split('{')
+    const [scopedLanguage, modifiers = ''] = trimmedLanguage.split('{')
 
-    let [scopedHighlights, scopedCollapses] = modifiers.split('[')
+    const [scopedHighlights, scopedCollapses] = modifiers.split('[')
 
     language = scopedLanguage
     highlights = scopedHighlights
     collapses = scopedCollapses
   } else {
-    let [scopedLanguage, modifiers = ''] = trimmedLanguage.split('[')
+    const [scopedLanguage, modifiers = ''] = trimmedLanguage.split('[')
 
-    let [scopedCollapses, scopedHighlights] = modifiers.split('{')
+    const [scopedCollapses, scopedHighlights] = modifiers.split('{')
 
     language = scopedLanguage
     highlights = scopedHighlights
@@ -92,7 +92,7 @@ export function CodeBlock (props: { children: string, className?: string }) {
 }
 
 export function Code ({ children, className }: { children: string, className?: string }) {
-  let { language, highlightRanges, collapseRanges } = useMemo(
+  const { language, highlightRanges, collapseRanges } = useMemo(
     () => parseClassName(className),
     [className]
   )
@@ -120,7 +120,7 @@ export function Code ({ children, className }: { children: string, className?: s
                   <button
                     key={i}
                     onClick={() => {
-                      let updated = collapseState.map((item) =>
+                      const updated = collapseState.map((item) =>
                         item.start === i ? { ...item, isCollapsed: false } : item
                       )
 
diff --git a/docs/markdoc/index.ts b/docs/markdoc/index.ts
index 476c2efb2d2..feb995b79e5 100644
--- a/docs/markdoc/index.ts
+++ b/docs/markdoc/index.ts
@@ -42,13 +42,13 @@ export type BlogContent = BlogFrontmatter & {
 }
 
 export async function readBlogContent (filepath: string): Promise<BlogContent> {
-  let content = await fs.readFile(filepath, 'utf8')
+  const content = await fs.readFile(filepath, 'utf8')
   const frontmatter = extractBlogFrontmatter(content)
   return { content: transformContent(`docs/${filepath}`, content), ...frontmatter }
 }
 
 export async function readDocsContent (filepath: string): Promise<DocsContent> {
-  let content = await fs.readFile(filepath, 'utf8')
+  const content = await fs.readFile(filepath, 'utf8')
   const frontmatter = extractDocsFrontmatter(content)
   return { content: transformContent(`docs/${filepath}`, content), ...frontmatter }
 }
@@ -96,7 +96,7 @@ export function extractDocsFrontmatter (content: string): {
       `Expected frontmatter yaml to be an object but found:\n${JSON.stringify(parsed)}`
     )
   }
-  let obj = parsed as Record<string, unknown>
+  const obj = parsed as Record<string, unknown>
   if (typeof obj.title !== 'string') {
     throw new Error(`Expected frontmatter to contain a title`)
   }
@@ -138,7 +138,7 @@ export function extractBlogFrontmatter (content: string): BlogFrontmatter {
       `Expected frontmatter yaml to be an object but found:\n${JSON.stringify(parsed)}`
     )
   }
-  let obj = parsed as Record<string, unknown>
+  const obj = parsed as Record<string, unknown>
   if (typeof obj.title !== 'string') {
     throw new Error(`Expected frontmatter to contain title`)
   }
diff --git a/eslint.config.js b/eslint.config.mjs
similarity index 71%
rename from eslint.config.js
rename to eslint.config.mjs
index 0f4f6d17b92..7cfea9e6796 100644
--- a/eslint.config.js
+++ b/eslint.config.mjs
@@ -1,42 +1,39 @@
 // @ts-check
 
-const eslint = require('@eslint/js')
-const tseslint = require('typescript-eslint')
+import eslint from '@eslint/js'
+import tseslint from 'typescript-eslint'
+import stylisticTs from '@stylistic/eslint-plugin-ts'
 
-module.exports = tseslint.config(
+export default tseslint.config(
   {
     ignores: [
       '**/.keystone/',
+      '**/.next/',
       '**/dist/',
+      '**/__generated__/',
       '**/node_modules/',
       '**/syntax-error.js',
       '**/public/',
-      'examples/extend-graphql-schema-nexus/nexus-types.ts'
+      'examples/',
     ],
   },
   eslint.configs.recommended,
   ...tseslint.configs.strict,
-//    ...tseslint.configs.stylistic,
   {
+    plugins: {
+      '@stylistic/ts': stylisticTs,
+    },
     rules: {
       // TODO: remove
       'no-empty': 'off',
-      'no-empty-pattern': ['error', { allowObjectPatternsAsParameters: true }],
-      'no-extra-boolean-cast': 'off',
-      'no-async-promise-executor': 'off',
-      '@typescript-eslint/no-non-null-asserted-optional-chain': 'off',
       'prefer-const': 'off',
-      'no-regex-spaces': 'off',
-      'no-useless-escape': 'off',
-      '@typescript-eslint/no-var-requires': 'off',
       '@typescript-eslint/no-non-null-assertion': 'off',
       '@typescript-eslint/no-unused-vars': 'off',
       '@typescript-eslint/ban-ts-comment': 'off',
-      '@typescript-eslint/ban-types': 'off',
       '@typescript-eslint/no-dynamic-delete': 'off',
       '@typescript-eslint/no-invalid-void-type': 'off',
       '@typescript-eslint/no-namespace': 'off',
-      'import/no-unresolved': 'off',
+      '@typescript-eslint/no-require-imports': 'off', // TODO: always
       // TODO: remove
 
       semi: ['error', 'never'],
@@ -50,7 +47,7 @@ module.exports = tseslint.config(
       'space-before-blocks': ['error', 'always'],
       'space-before-function-paren': ['error', 'always'],
       'space-in-parens': ['error', 'never'],
-      '@typescript-eslint/member-delimiter-style': [
+      '@stylistic/ts/member-delimiter-style': [
         'error',
         {
           multiline: { delimiter: 'none' },
@@ -64,7 +61,7 @@ module.exports = tseslint.config(
       }],
       '@typescript-eslint/no-explicit-any': 'off',
       '@typescript-eslint/prefer-ts-expect-error': 'error',
-      '@typescript-eslint/semi': ['error', 'never'],
+      '@stylistic/ts/semi': ['error', 'never'],
     }
   }
 )
diff --git a/package.json b/package.json
index 540e1d5d0cc..bf0a7ecdb81 100644
--- a/package.json
+++ b/package.json
@@ -15,6 +15,8 @@
     "test:types": "tsc",
     "test:debug": "node --inspect-brk ./node_modules/.bin/jest",
     "test:admin-ui": "jest tests/admin-ui-tests",
+    "lint": "eslint",
+    "lint:fix": "eslint --fix",
     "build": "preconstruct build",
     "prepare": "preconstruct dev"
   },
@@ -29,7 +31,8 @@
     "@changesets/get-github-info": "^0.6.0",
     "@changesets/get-release-plan": "^4.0.0",
     "@eslint/js": "^9.2.0",
-    "@preconstruct/cli": "2.8.9",
+    "@preconstruct/cli": "^2.8.9",
+    "@stylistic/eslint-plugin-ts": "^2.9.0",
     "@types/jest": "^29.0.0",
     "@types/node": "^20.0.0",
     "@types/node-fetch": "^2.5.12",
diff --git a/packages/auth/src/components/Icons.tsx b/packages/auth/src/components/Icons.tsx
index e9c48cd737e..19f2891e4bd 100644
--- a/packages/auth/src/components/Icons.tsx
+++ b/packages/auth/src/components/Icons.tsx
@@ -64,7 +64,7 @@ export const IconGithub = (props: any) => (
 // Misc
 // ==============================
 
-const A11yText = forwardRefWithAs<'span', {}>(({ as: Tag = 'span', ...props }, ref) => (
+const A11yText = forwardRefWithAs<'span', unknown>(({ as: Tag = 'span', ...props }, ref) => (
   <Tag
     ref={ref}
     css={{
diff --git a/packages/auth/src/lib/emailHeuristics.ts b/packages/auth/src/lib/emailHeuristics.ts
index 739d06a8c8e..55d01f483aa 100644
--- a/packages/auth/src/lib/emailHeuristics.ts
+++ b/packages/auth/src/lib/emailHeuristics.ts
@@ -10,6 +10,6 @@ export const guessEmailFromValue = (value: any) => {
 
 // email validation regex from https://html.spec.whatwg.org/multipage/input.html#email-state-(type=email)
 export const validEmail = (email: string) =>
-  /^[a-zA-Z0-9.!#$%&'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$/.test(
+  /^[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$/.test(
     email
   )
diff --git a/packages/auth/src/pages/InitPage.tsx b/packages/auth/src/pages/InitPage.tsx
index bdcbcdd7551..2b8a3317760 100644
--- a/packages/auth/src/pages/InitPage.tsx
+++ b/packages/auth/src/pages/InitPage.tsx
@@ -195,7 +195,7 @@ function InitPage ({
   }, [fieldPaths, adminMeta.lists, listKey])
 
   const [value, setValue] = useState(() => {
-    let state: Record<string, any> = {}
+    const state: Record<string, any> = {}
     Object.keys(fields).forEach(fieldPath => {
       state[fieldPath] = { kind: 'value', value: fields[fieldPath].controller.defaultValue }
     })
diff --git a/packages/auth/src/schema.ts b/packages/auth/src/schema.ts
index b4c65067ab5..a7b70ad82db 100644
--- a/packages/auth/src/schema.ts
+++ b/packages/auth/src/schema.ts
@@ -33,7 +33,7 @@ function assertSecretFieldImpl (
     typeof impl.generateHash !== 'function'
   ) {
     const s = JSON.stringify(secretField)
-    let msg = `A createAuth() invocation for the "${listKey}" list specifies ${s} as its secretField, but the field type doesn't implement the required functionality.`
+    const msg = `A createAuth() invocation for the "${listKey}" list specifies ${s} as its secretField, but the field type doesn't implement the required functionality.`
     throw new Error(msg)
   }
 }
@@ -101,7 +101,7 @@ export const getSchemaExtension = ({
     try {
       ast = parse(query)
     } catch (err) {
-      throw new Error( `The query to get session data has a syntax error, the sessionData option in your createAuth usage is likely incorrect\n${err}`)
+      throw new Error(`The query to get session data has a syntax error, the sessionData option in your createAuth usage is likely incorrect\n${err}`)
     }
 
     const errors = validate(base.schema, ast)
diff --git a/packages/cloudinary/src/views/Field.tsx b/packages/cloudinary/src/views/Field.tsx
index 1a911f5db2a..0200c7b1de8 100644
--- a/packages/cloudinary/src/views/Field.tsx
+++ b/packages/cloudinary/src/views/Field.tsx
@@ -11,10 +11,10 @@ import { type FieldProps } from '@keystone-6/core/types'
 import { type controller } from '.'
 
 function useObjectURL (fileData: File | undefined) {
-  let [objectURL, setObjectURL] = useState<string | undefined>(undefined)
+  const [objectURL, setObjectURL] = useState<string | undefined>(undefined)
   useEffect(() => {
     if (fileData) {
-      let url = URL.createObjectURL(fileData)
+      const url = URL.createObjectURL(fileData)
       setObjectURL(url)
       return () => {
         URL.revokeObjectURL(url)
diff --git a/packages/core/src/___internal-do-not-use-will-break-in-patch/admin-ui/id-field-view.tsx b/packages/core/src/___internal-do-not-use-will-break-in-patch/admin-ui/id-field-view.tsx
index 44c788f4ed5..dae6dfe031c 100644
--- a/packages/core/src/___internal-do-not-use-will-break-in-patch/admin-ui/id-field-view.tsx
+++ b/packages/core/src/___internal-do-not-use-will-break-in-patch/admin-ui/id-field-view.tsx
@@ -17,7 +17,7 @@ export function Field () {
 }
 
 export const Cell: CellComponent = ({ item, field, linkTo }) => {
-  let value = item[field.path] + ''
+  const value = item[field.path] + ''
   return linkTo ? <CellLink {...linkTo}>{value}</CellLink> : <CellContainer>{value}</CellContainer>
 }
 Cell.supportsLinkTo = true
diff --git a/packages/core/src/___internal-do-not-use-will-break-in-patch/admin-ui/pages/HomePage/index.tsx b/packages/core/src/___internal-do-not-use-will-break-in-patch/admin-ui/pages/HomePage/index.tsx
index c64ab913080..fa8cc5bda5b 100644
--- a/packages/core/src/___internal-do-not-use-will-break-in-patch/admin-ui/pages/HomePage/index.tsx
+++ b/packages/core/src/___internal-do-not-use-will-break-in-patch/admin-ui/pages/HomePage/index.tsx
@@ -127,7 +127,7 @@ export function HomePage () {
     }`,
     [lists]
   )
-  let { data, error } = useQuery(query, { errorPolicy: 'all' })
+  const { data, error } = useQuery(query, { errorPolicy: 'all' })
 
   const dataGetter = makeDataGetter(data, error?.graphQLErrors)
 
diff --git a/packages/core/src/___internal-do-not-use-will-break-in-patch/admin-ui/pages/ItemPage/index.tsx b/packages/core/src/___internal-do-not-use-will-break-in-patch/admin-ui/pages/ItemPage/index.tsx
index b5f3d46cd42..bdb67adf269 100644
--- a/packages/core/src/___internal-do-not-use-will-break-in-patch/admin-ui/pages/ItemPage/index.tsx
+++ b/packages/core/src/___internal-do-not-use-will-break-in-patch/admin-ui/pages/ItemPage/index.tsx
@@ -153,7 +153,7 @@ function ItemForm ({
       })
   })
   const labelFieldValue = list.isSingleton ? list.label : state.item.data?.[list.labelField]
-  const itemId = state.item.data?.id!
+  const itemId = state.item.data?.id
   const hasChangedFields = !!changedFields.size
   usePreventNavigation(useMemo(() => ({ current: hasChangedFields }), [hasChangedFields]))
   return (
diff --git a/packages/core/src/___internal-do-not-use-will-break-in-patch/admin-ui/pages/ListPage/FilterAdd.tsx b/packages/core/src/___internal-do-not-use-will-break-in-patch/admin-ui/pages/ListPage/FilterAdd.tsx
index 11af28ca051..6fb2180210e 100644
--- a/packages/core/src/___internal-do-not-use-will-break-in-patch/admin-ui/pages/ListPage/FilterAdd.tsx
+++ b/packages/core/src/___internal-do-not-use-will-break-in-patch/admin-ui/pages/ListPage/FilterAdd.tsx
@@ -21,8 +21,8 @@ type State =
 
 const fieldSelectComponents: ComponentProps<typeof Options>['components'] = {
   Option: ({ children, ...props }) => {
-    let theme = useTheme()
-    let iconColor = props.isFocused ? theme.colors.foreground : theme.colors.foregroundDim
+    const theme = useTheme()
+    const iconColor = props.isFocused ? theme.colors.foreground : theme.colors.foregroundDim
     return (
       <OptionPrimitive {...props}>
         <span>{children}</span>
diff --git a/packages/core/src/___internal-do-not-use-will-break-in-patch/admin-ui/pages/ListPage/index.tsx b/packages/core/src/___internal-do-not-use-will-break-in-patch/admin-ui/pages/ListPage/index.tsx
index 601028c0a8d..ed92bc8ef77 100644
--- a/packages/core/src/___internal-do-not-use-will-break-in-patch/admin-ui/pages/ListPage/index.tsx
+++ b/packages/core/src/___internal-do-not-use-will-break-in-patch/admin-ui/pages/ListPage/index.tsx
@@ -45,7 +45,7 @@ type FetchedFieldMeta = {
   listView: { fieldMode: 'read' | 'hidden' }
 }
 
-let listMetaGraphqlQuery: TypedDocumentNode<
+const listMetaGraphqlQuery: TypedDocumentNode<
   {
     keystone: {
       adminMeta: {
@@ -94,7 +94,7 @@ function useQueryParamsFromLocalStorage (listKey: string) {
   // MERGE QUERY PARAMS FROM CACHE WITH QUERY PARAMS FROM ROUTER
   useEffect(
     () => {
-      let hasSomeQueryParamsWhichAreAboutListPage = Object.keys(router.query).some(x => {
+      const hasSomeQueryParamsWhichAreAboutListPage = Object.keys(router.query).some(x => {
         return x.startsWith('!') || storeableQueries.includes(x)
       })
 
@@ -112,7 +112,7 @@ function useQueryParamsFromLocalStorage (listKey: string) {
     [localStorageKey, router.isReady]
   )
   useEffect(() => {
-    let queryParamsToSerialize: Record<string, string> = {}
+    const queryParamsToSerialize: Record<string, string> = {}
     Object.keys(router.query).forEach(key => {
       if (key.startsWith('!') || storeableQueries.includes(key)) {
         queryParamsToSerialize[key] = router.query[key] as string
diff --git a/packages/core/src/___internal-do-not-use-will-break-in-patch/admin-ui/pages/ListPage/useFilters.tsx b/packages/core/src/___internal-do-not-use-will-break-in-patch/admin-ui/pages/ListPage/useFilters.tsx
index a4f97aa55b9..06a080a1ab2 100644
--- a/packages/core/src/___internal-do-not-use-will-break-in-patch/admin-ui/pages/ListPage/useFilters.tsx
+++ b/packages/core/src/___internal-do-not-use-will-break-in-patch/admin-ui/pages/ListPage/useFilters.tsx
@@ -18,7 +18,7 @@ export function useFilters (list: ListMeta, filterableFields: Set<string>) {
     return possibleFilters
   }, [list, filterableFields])
   const filters = useMemo(() => {
-    let filters: Filter[] = []
+    const filters: Filter[] = []
     Object.keys(query).forEach(key => {
       const filter = possibleFilters[key]
       const val = query[key]
diff --git a/packages/core/src/___internal-do-not-use-will-break-in-patch/admin-ui/pages/ListPage/useSelectedFields.tsx b/packages/core/src/___internal-do-not-use-will-break-in-patch/admin-ui/pages/ListPage/useSelectedFields.tsx
index fd193c0e622..00bc8525faa 100644
--- a/packages/core/src/___internal-do-not-use-will-break-in-patch/admin-ui/pages/ListPage/useSelectedFields.tsx
+++ b/packages/core/src/___internal-do-not-use-will-break-in-patch/admin-ui/pages/ListPage/useSelectedFields.tsx
@@ -9,10 +9,10 @@ export function useSelectedFields (
   const { query } = useRouter()
   const selectedFieldsFromUrl = typeof query.fields === 'string' ? query.fields : ''
   return useMemo(() => {
-    let selectedFieldsArray = selectedFieldsFromUrl
+    const selectedFieldsArray = selectedFieldsFromUrl
       ? selectedFieldsFromUrl.split(',')
       : list.initialColumns
-    let fields = selectedFieldsArray.filter(field => {
+    const fields = selectedFieldsArray.filter(field => {
       return fieldModesByFieldPath[field] === 'read'
     })
 
diff --git a/packages/core/src/___internal-do-not-use-will-break-in-patch/admin-ui/pages/ListPage/useSort.tsx b/packages/core/src/___internal-do-not-use-will-break-in-patch/admin-ui/pages/ListPage/useSort.tsx
index a1a06b91b90..bf4eb71cb55 100644
--- a/packages/core/src/___internal-do-not-use-will-break-in-patch/admin-ui/pages/ListPage/useSort.tsx
+++ b/packages/core/src/___internal-do-not-use-will-break-in-patch/admin-ui/pages/ListPage/useSort.tsx
@@ -4,7 +4,7 @@ import { useRouter } from '../../../../admin-ui/router'
 
 export function useSort (list: ListMeta, orderableFields: Set<string>) {
   const { query } = useRouter()
-  let sortByFromUrl = typeof query.sortBy === 'string' ? query.sortBy : null
+  const sortByFromUrl = typeof query.sortBy === 'string' ? query.sortBy : null
 
   return useMemo(() => {
     if (sortByFromUrl === '') return null
diff --git a/packages/core/src/admin-ui/admin-meta-graphql.ts b/packages/core/src/admin-ui/admin-meta-graphql.ts
index c6a501b520d..52ab825d4b2 100644
--- a/packages/core/src/admin-ui/admin-meta-graphql.ts
+++ b/packages/core/src/admin-ui/admin-meta-graphql.ts
@@ -128,7 +128,7 @@ export type StaticAdminMetaQuery = {
         }>
         graphql: {
           names: GraphQLNames
-        },
+        }
 
         pageSize: number
         initialColumns: Array<string>
diff --git a/packages/core/src/admin-ui/templates/app.ts b/packages/core/src/admin-ui/templates/app.ts
index c0e3d15dc98..b77171aa8a9 100644
--- a/packages/core/src/admin-ui/templates/app.ts
+++ b/packages/core/src/admin-ui/templates/app.ts
@@ -112,7 +112,7 @@ function getLazyMetadataQuery (
             `All members of the AuthenticatedItem union must refer to Keystone lists but "${type.name}" is in the AuthenticatedItem union but is not a Keystone list`
           )
         }
-        let labelGraphQLField = fields[list.labelField]
+        const labelGraphQLField = fields[list.labelField]
         if (labelGraphQLField === undefined) {
           throw new Error(
             `The labelField for the list "${list.key}" is "${list.labelField}" but the GraphQL type does not have a field named "${list.labelField}"`
diff --git a/packages/core/src/admin-ui/utils/item-form.ts b/packages/core/src/admin-ui/utils/item-form.ts
index d3d11e16df7..0f10c33e6c0 100644
--- a/packages/core/src/admin-ui/utils/item-form.ts
+++ b/packages/core/src/admin-ui/utils/item-form.ts
@@ -27,7 +27,7 @@ export function useChangedFieldsAndDataForUpdate (
   return useMemo(() => {
     const changedFields = new Set<string>()
     Object.keys(serializedFieldValues).forEach(fieldKey => {
-      let isEqual = isDeepEqual(
+      const isEqual = isDeepEqual(
         serializedFieldValues[fieldKey],
         serializedValuesFromItem[fieldKey]
       )
diff --git a/packages/core/src/admin-ui/utils/useAdminMeta.tsx b/packages/core/src/admin-ui/utils/useAdminMeta.tsx
index acfc83e430e..4e3ad4aa80e 100644
--- a/packages/core/src/admin-ui/utils/useAdminMeta.tsx
+++ b/packages/core/src/admin-ui/utils/useAdminMeta.tsx
@@ -16,7 +16,7 @@ const adminMetaLocalStorageKey = 'keystone.adminMeta'
 let _mustRenderServerResult = true
 
 function useMustRenderServerResult () {
-  let [, forceUpdate] = useState(0)
+  const [, forceUpdate] = useState(0)
   useEffect(() => {
     _mustRenderServerResult = false
     forceUpdate(1)
@@ -35,7 +35,7 @@ export function useAdminMeta (adminMetaHash: string, fieldViews: FieldViews) {
     if (item === null) return
 
     try {
-      let parsed = JSON.parse(item)
+      const parsed = JSON.parse(item)
       if (parsed.hash === adminMetaHash) {
         return parsed.meta as StaticAdminMetaQuery['keystone']['adminMeta']
       }
diff --git a/packages/core/src/fields/non-null-graphql.ts b/packages/core/src/fields/non-null-graphql.ts
index f2438b7311b..7886569c836 100644
--- a/packages/core/src/fields/non-null-graphql.ts
+++ b/packages/core/src/fields/non-null-graphql.ts
@@ -20,19 +20,19 @@ export function resolveDbNullable (
 export function makeValidateHook <ListTypeInfo extends BaseListTypeInfo> (
   meta: FieldData,
   config: {
-    label?: string,
+    label?: string
     db?: {
       isNullable?: boolean
-    },
+    }
     graphql?: {
       isNonNull?: {
         read?: boolean
       }
-    },
+    }
     validation?: {
       isRequired?: boolean
       [key: string]: unknown
-    },
+    }
   },
   f?: ValidateFieldHook<ListTypeInfo, 'create' | 'update' | 'delete', ListTypeInfo['fields']>
 ) {
diff --git a/packages/core/src/fields/resolve-hooks.ts b/packages/core/src/fields/resolve-hooks.ts
index e093cfc081f..68b21281498 100644
--- a/packages/core/src/fields/resolve-hooks.ts
+++ b/packages/core/src/fields/resolve-hooks.ts
@@ -26,7 +26,7 @@ function resolveValidateHooks <ListTypeInfo extends BaseListTypeInfo> ({
   validate,
   validateInput,
   validateDelete
-}: FieldHooks<ListTypeInfo>): Exclude<FieldHooks<ListTypeInfo>["validate"], Function> | undefined {
+}: FieldHooks<ListTypeInfo>): Exclude<FieldHooks<ListTypeInfo>['validate'], (...args: any) => any> | undefined {
   if (!validate && !validateInput && !validateDelete) return
   return {
     create: merge(validateInput,  typeof validate === 'function' ? validate : validate?.create),
diff --git a/packages/core/src/fields/types/bigInt/views/index.tsx b/packages/core/src/fields/types/bigInt/views/index.tsx
index 9851c81f58a..294d4967551 100644
--- a/packages/core/src/fields/types/bigInt/views/index.tsx
+++ b/packages/core/src/fields/types/bigInt/views/index.tsx
@@ -126,7 +126,7 @@ export const Field = ({
 }
 
 export const Cell: CellComponent = ({ item, field, linkTo }) => {
-  let value = item[field.path] + ''
+  const value = item[field.path] + ''
   return linkTo ? <CellLink {...linkTo}>{value}</CellLink> : <CellContainer>{value}</CellContainer>
 }
 Cell.supportsLinkTo = true
diff --git a/packages/core/src/fields/types/calendarDay/index.ts b/packages/core/src/fields/types/calendarDay/index.ts
index 89e37f182c9..4e541516ca5 100644
--- a/packages/core/src/fields/types/calendarDay/index.ts
+++ b/packages/core/src/fields/types/calendarDay/index.ts
@@ -25,7 +25,7 @@ export type CalendarDayFieldConfig<ListTypeInfo extends BaseListTypeInfo> =
     }
   }
 
-export function calendarDay <ListTypeInfo extends BaseListTypeInfo>(config: CalendarDayFieldConfig<ListTypeInfo> = {}): FieldTypeFunc<ListTypeInfo> {
+export function calendarDay <ListTypeInfo extends BaseListTypeInfo> (config: CalendarDayFieldConfig<ListTypeInfo> = {}): FieldTypeFunc<ListTypeInfo> {
   const {
     isIndexed,
     validation,
diff --git a/packages/core/src/fields/types/calendarDay/views/index.tsx b/packages/core/src/fields/types/calendarDay/views/index.tsx
index be5fac3f837..bdef3c0d676 100644
--- a/packages/core/src/fields/types/calendarDay/views/index.tsx
+++ b/packages/core/src/fields/types/calendarDay/views/index.tsx
@@ -86,7 +86,7 @@ function validate (
 }
 
 export const Cell: CellComponent = ({ item, field, linkTo }) => {
-  let value = item[field.path]
+  const value = item[field.path]
   return linkTo ? (
     <CellLink {...linkTo}>{formatOutput(value)}</CellLink>
   ) : (
diff --git a/packages/core/src/fields/types/decimal/views/index.tsx b/packages/core/src/fields/types/decimal/views/index.tsx
index 4c3151edebe..c3bcb5589cd 100644
--- a/packages/core/src/fields/types/decimal/views/index.tsx
+++ b/packages/core/src/fields/types/decimal/views/index.tsx
@@ -79,7 +79,7 @@ export function Field ({
 }
 
 export const Cell: CellComponent = ({ item, field, linkTo }) => {
-  let value = item[field.path] || ''
+  const value = item[field.path] || ''
   return linkTo ? <CellLink {...linkTo}>{value}</CellLink> : <CellContainer>{value}</CellContainer>
 }
 Cell.supportsLinkTo = true
diff --git a/packages/core/src/fields/types/float/index.ts b/packages/core/src/fields/types/float/index.ts
index f77048b9051..400d3272cf4 100644
--- a/packages/core/src/fields/types/float/index.ts
+++ b/packages/core/src/fields/types/float/index.ts
@@ -27,7 +27,7 @@ export type FloatFieldConfig<ListTypeInfo extends BaseListTypeInfo> =
     }
   }
 
-export function float <ListTypeInfo extends BaseListTypeInfo>(config: FloatFieldConfig<ListTypeInfo> = {}): FieldTypeFunc<ListTypeInfo> {
+export function float <ListTypeInfo extends BaseListTypeInfo> (config: FloatFieldConfig<ListTypeInfo> = {}): FieldTypeFunc<ListTypeInfo> {
   const {
     defaultValue,
     isIndexed,
diff --git a/packages/core/src/fields/types/float/views/index.tsx b/packages/core/src/fields/types/float/views/index.tsx
index 0ab2c8c85f1..1ea8b2137fb 100644
--- a/packages/core/src/fields/types/float/views/index.tsx
+++ b/packages/core/src/fields/types/float/views/index.tsx
@@ -91,7 +91,7 @@ function FloatInput ({
         if (raw === '') {
           return null
         }
-        let parsed = parseFloat(raw)
+        const parsed = parseFloat(raw)
         if (Number.isFinite(parsed)) {
           return parsed
         }
@@ -157,7 +157,7 @@ export const Field = ({
 }
 
 export const Cell: CellComponent = ({ item, field, linkTo }) => {
-  let value = item[field.path] + ''
+  const value = item[field.path] + ''
   return linkTo ? <CellLink {...linkTo}>{value}</CellLink> : <CellContainer>{value}</CellContainer>
 }
 Cell.supportsLinkTo = true
@@ -199,10 +199,10 @@ export const controller = (
           <TextInput
             onChange={event => {
               if (type === 'in' || type === 'not_in') {
-                onChange(event.target.value.replace(/[^\d\.,\s-]/g, ''))
+                onChange(event.target.value.replace(/[^\d.,\s-]/g, ''))
                 return
               }
-              onChange(event.target.value.replace(/[^\d\.\s-]/g, ''))
+              onChange(event.target.value.replace(/[^\d.\s-]/g, ''))
             }}
             value={value}
             autoFocus={autoFocus}
diff --git a/packages/core/src/fields/types/image/views/Field.tsx b/packages/core/src/fields/types/image/views/Field.tsx
index 07df5b36297..cb61545679b 100644
--- a/packages/core/src/fields/types/image/views/Field.tsx
+++ b/packages/core/src/fields/types/image/views/Field.tsx
@@ -12,10 +12,10 @@ import { type ImageValue } from './index'
 import { type controller } from '.'
 
 function useObjectURL (fileData: File | undefined) {
-  let [objectURL, setObjectURL] = useState<string | undefined>(undefined)
+  const [objectURL, setObjectURL] = useState<string | undefined>(undefined)
   useEffect(() => {
     if (fileData) {
-      let url = URL.createObjectURL(fileData)
+      const url = URL.createObjectURL(fileData)
       setObjectURL(url)
       return () => {
         URL.revokeObjectURL(url)
diff --git a/packages/core/src/fields/types/integer/views/index.tsx b/packages/core/src/fields/types/integer/views/index.tsx
index d543940e066..2ddabf17e80 100644
--- a/packages/core/src/fields/types/integer/views/index.tsx
+++ b/packages/core/src/fields/types/integer/views/index.tsx
@@ -41,7 +41,7 @@ function IntegerInput ({
           return null
         }
         if (/^[+-]?\d+$/.test(raw)) {
-          let parsed = parseInt(raw)
+          const parsed = parseInt(raw)
           if (!Number.isSafeInteger(parsed)) {
             return raw
           }
@@ -114,7 +114,7 @@ export const Field = ({
 }
 
 export const Cell: CellComponent = ({ item, field, linkTo }) => {
-  let value = item[field.path] + ''
+  const value = item[field.path] + ''
   return linkTo ? <CellLink {...linkTo}>{value}</CellLink> : <CellContainer>{value}</CellContainer>
 }
 Cell.supportsLinkTo = true
diff --git a/packages/core/src/fields/types/integer/views/utils.tsx b/packages/core/src/fields/types/integer/views/utils.tsx
index 78a176164ee..63e8fc558cf 100644
--- a/packages/core/src/fields/types/integer/views/utils.tsx
+++ b/packages/core/src/fields/types/integer/views/utils.tsx
@@ -26,7 +26,7 @@ export function useFormattedInput<ParsedValue extends ParsedValueBase> (
   if (typeof value === 'string' && typeof config.parse(value) !== 'string') {
     throw new Error(`Expected ${typeof config.parse(value)}, got ${typeof value}`)
   }
-  let [internalValueState, setInternalValueState] = useState(() =>
+  const [internalValueState, setInternalValueState] = useState(() =>
     typeof value === 'string' ? value : config.format(value)
   )
   const [isFocused, setIsFocused] = useState(false)
diff --git a/packages/core/src/fields/types/json/views/index.tsx b/packages/core/src/fields/types/json/views/index.tsx
index 457afe9ba0a..f32da245310 100644
--- a/packages/core/src/fields/types/json/views/index.tsx
+++ b/packages/core/src/fields/types/json/views/index.tsx
@@ -57,7 +57,7 @@ export const Field = ({
 }
 
 export const Cell: CellComponent = ({ item, field, linkTo }) => {
-  let value = item[field.path] + ''
+  const value = item[field.path] + ''
   return linkTo ? <CellLink {...linkTo}>{value}</CellLink> : <CellContainer>{value}</CellContainer>
 }
 Cell.supportsLinkTo = true
diff --git a/packages/core/src/fields/types/password/index.ts b/packages/core/src/fields/types/password/index.ts
index 1324ca89136..3c189aa4900 100644
--- a/packages/core/src/fields/types/password/index.ts
+++ b/packages/core/src/fields/types/password/index.ts
@@ -51,9 +51,9 @@ const PasswordFilter = graphql.inputObject({
   },
 })
 
-const bcryptHashRegex = /^\$2[aby]?\$\d{1,2}\$[.\/A-Za-z0-9]{53}$/
+const bcryptHashRegex = /^\$2[aby]?\$\d{1,2}\$[./A-Za-z0-9]{53}$/
 
-export function password <ListTypeInfo extends BaseListTypeInfo>(config: PasswordFieldConfig<ListTypeInfo> = {}): FieldTypeFunc<ListTypeInfo> {
+export function password <ListTypeInfo extends BaseListTypeInfo> (config: PasswordFieldConfig<ListTypeInfo> = {}): FieldTypeFunc<ListTypeInfo> {
   const {
     bcrypt = bcryptjs,
     workFactor = 10,
diff --git a/packages/core/src/fields/types/relationship/views/RelationshipSelect.tsx b/packages/core/src/fields/types/relationship/views/RelationshipSelect.tsx
index b44519cd8af..7729fb9f18f 100644
--- a/packages/core/src/fields/types/relationship/views/RelationshipSelect.tsx
+++ b/packages/core/src/fields/types/relationship/views/RelationshipSelect.tsx
@@ -30,8 +30,8 @@ function useIntersectionObserver (cb: IntersectionObserverCallback, ref: RefObje
     cbRef.current = cb
   })
   useEffect(() => {
-    let observer = new IntersectionObserver((...args) => cbRef.current(...args), {})
-    let node = ref.current
+    const observer = new IntersectionObserver((...args) => cbRef.current(...args), {})
+    const node = ref.current
     if (node !== null) {
       observer.observe(node)
       return () => observer.unobserve(node)
diff --git a/packages/core/src/fields/types/relationship/views/cards/index.tsx b/packages/core/src/fields/types/relationship/views/cards/index.tsx
index c0f32010eeb..2e187e2d2c9 100644
--- a/packages/core/src/fields/types/relationship/views/cards/index.tsx
+++ b/packages/core/src/fields/types/relationship/views/cards/index.tsx
@@ -323,8 +323,8 @@ export function Cards ({
                       if (isMountedRef.current) {
                         const dataGetters = makeDataGetter(data, errors)
                         const itemsDataGetter = dataGetters.get('items')
-                        let newItems = { ...items }
-                        let newCurrentIds = field.many
+                        const newItems = { ...items }
+                        const newCurrentIds = field.many
                           ? new Set(value.currentIds)
                           : new Set<string>()
                         if (Array.isArray(itemsDataGetter.data)) {
@@ -352,7 +352,7 @@ export function Cards ({
                   }
                 },
                 value: (() => {
-                  let options: { label: string, id: string }[] = []
+                  const options: { label: string, id: string }[] = []
                   Object.keys(items).forEach(id => {
                     if (value.currentIds.has(id)) {
                       options.push({ id, label: id })
diff --git a/packages/core/src/fields/types/relationship/views/cards/useItemState.tsx b/packages/core/src/fields/types/relationship/views/cards/useItemState.tsx
index 27a1dc9e1d6..6576a41bc93 100644
--- a/packages/core/src/fields/types/relationship/views/cards/useItemState.tsx
+++ b/packages/core/src/fields/types/relationship/views/cards/useItemState.tsx
@@ -44,6 +44,7 @@ export function useItemState ({
     ).filter((x: DataGetter<any>) => x.data?.id != null)
     return { relationshipGetter, itemsArrFromData }
   }, [data, error])
+
   let [{ items, itemsArrFromData: itemsArrFromDataState }, setItemsState] = useState<{
     itemsArrFromData: DataGetter<any>[]
     items: Record<
@@ -56,7 +57,7 @@ export function useItemState ({
   }>({ itemsArrFromData: [], items: {} })
 
   if (itemsArrFromDataState !== itemsArrFromData) {
-    let newItems: Record<
+    const newItems: Record<
       string,
       {
         current: DataGetter<{ id: string, [key: string]: any }>
@@ -64,7 +65,7 @@ export function useItemState ({
       }
     > = {}
 
-    itemsArrFromData.forEach(item => {
+    for (const item of itemsArrFromData) {
       const initialItemInState = items[item.data.id]?.fromInitialQuery
       if (
         ((items[item.data.id] && initialItemInState) || !items[item.data.id]) &&
@@ -77,7 +78,8 @@ export function useItemState ({
       } else {
         newItems[item.data.id] = items[item.data.id]
       }
-    })
+    }
+
     items = newItems
     setItemsState({
       items: newItems,
@@ -96,7 +98,7 @@ export function useItemState ({
     setItems: useCallback(
       (items: Items) => {
         setItemsState(state => {
-          let itemsForState: (typeof state)['items'] = {}
+          const itemsForState: (typeof state)['items'] = {}
           Object.keys(items).forEach(id => {
             if (items[id] === state.items[id]?.current) {
               itemsForState[id] = state.items[id]
diff --git a/packages/core/src/fields/types/relationship/views/index.tsx b/packages/core/src/fields/types/relationship/views/index.tsx
index e094d555905..9513118867f 100644
--- a/packages/core/src/fields/types/relationship/views/index.tsx
+++ b/packages/core/src/fields/types/relationship/views/index.tsx
@@ -276,7 +276,7 @@ export const Cell: CellComponent<typeof controller> = ({ field, item }) => {
     <CellContainer>
       {displayItems.map((item, index) => (
         <Fragment key={item.id}>
-          {!!index ? ', ' : ''}
+          {index ? ', ' : ''}
           <Link href={`/${list.path}/[id]`} as={`/${list.path}/${item.id}`} css={styles}>
             {item.label || item.id}
           </Link>
@@ -297,7 +297,7 @@ export const CardValue: CardValueComponent<typeof controller> = ({ field, item }
         .filter(item => item)
         .map((item, index) => (
           <Fragment key={item.id}>
-            {!!index ? ', ' : ''}
+            {index ? ', ' : ''}
             <Link href={`/${list.path}/[id]`} as={`/${list.path}/${item.id}`}>
               {item.label || item.id}
             </Link>
@@ -465,7 +465,7 @@ export function controller (
         }
       }
       if (config.fieldMeta.many) {
-        let value = (data[config.path] || []).map((x: any) => ({
+        const value = (data[config.path] || []).map((x: any) => ({
           id: x.id,
           label: x.label || x.id,
         }))
@@ -575,12 +575,12 @@ export function controller (
       if (state.kind === 'many') {
         const newAllIds = new Set(state.value.map(x => x.id))
         const initialIds = new Set(state.initialValue.map(x => x.id))
-        let disconnect = state.initialValue
+        const disconnect = state.initialValue
           .filter(x => !newAllIds.has(x.id))
           .map(x => ({ id: x.id }))
-        let connect = state.value.filter(x => !initialIds.has(x.id)).map(x => ({ id: x.id }))
+        const connect = state.value.filter(x => !initialIds.has(x.id)).map(x => ({ id: x.id }))
         if (disconnect.length || connect.length) {
-          let output: any = {}
+          const output: any = {}
 
           if (disconnect.length) {
             output.disconnect = disconnect
@@ -607,10 +607,10 @@ export function controller (
           }
         }
       } else if (state.kind === 'cards-view') {
-        let disconnect = [...state.initialIds]
+        const disconnect = [...state.initialIds]
           .filter(id => !state.currentIds.has(id))
           .map(id => ({ id }))
-        let connect = [...state.currentIds]
+        const connect = [...state.currentIds]
           .filter(id => !state.initialIds.has(id))
           .map(id => ({ id }))
 
diff --git a/packages/core/src/fields/types/select/index.ts b/packages/core/src/fields/types/select/index.ts
index ad10c77c12f..eb3d14543a0 100644
--- a/packages/core/src/fields/types/select/index.ts
+++ b/packages/core/src/fields/types/select/index.ts
@@ -55,7 +55,7 @@ export type SelectFieldConfig<ListTypeInfo extends BaseListTypeInfo> =
 const MAX_INT = 2147483647
 const MIN_INT = -2147483648
 
-export function select <ListTypeInfo extends BaseListTypeInfo>(config: SelectFieldConfig<ListTypeInfo>): FieldTypeFunc<ListTypeInfo> {
+export function select <ListTypeInfo extends BaseListTypeInfo> (config: SelectFieldConfig<ListTypeInfo>): FieldTypeFunc<ListTypeInfo> {
   const {
     isIndexed,
     ui: { displayMode = 'select', ...ui } = {},
diff --git a/packages/core/src/fields/types/select/views/index.tsx b/packages/core/src/fields/types/select/views/index.tsx
index 3b2bd979d3d..f40b50862c0 100644
--- a/packages/core/src/fields/types/select/views/index.tsx
+++ b/packages/core/src/fields/types/select/views/index.tsx
@@ -129,14 +129,14 @@ export const Field = ({
 }
 
 export const Cell: CellComponent<typeof controller> = ({ item, field, linkTo }) => {
-  let value = item[field.path] + ''
+  const value = item[field.path] + ''
   const label = field.options.find(x => x.value === value)?.label
   return linkTo ? <CellLink {...linkTo}>{label}</CellLink> : <CellContainer>{label}</CellContainer>
 }
 Cell.supportsLinkTo = true
 
 export const CardValue: CardValueComponent<typeof controller> = ({ item, field }) => {
-  let value = item[field.path] + ''
+  const value = item[field.path] + ''
   const label = field.options.find(x => x.value === value)?.label
 
   return (
diff --git a/packages/core/src/fields/types/text/views/index.tsx b/packages/core/src/fields/types/text/views/index.tsx
index 4a95389a821..416a465397d 100644
--- a/packages/core/src/fields/types/text/views/index.tsx
+++ b/packages/core/src/fields/types/text/views/index.tsx
@@ -127,7 +127,7 @@ export function Field ({
 }
 
 export const Cell: CellComponent = ({ item, field, linkTo }) => {
-  let value = item[field.path] + ''
+  const value = item[field.path] + ''
   return linkTo ? <CellLink {...linkTo}>{value}</CellLink> : <CellContainer>{value}</CellContainer>
 }
 Cell.supportsLinkTo = true
@@ -173,7 +173,7 @@ function validate (value: TextValue, validation: Validation, fieldLabel: string)
 
   const val = value.inner.value
 
-  let messages: string[] = []
+  const messages: string[] = []
   if (validation.length.min !== null && val.length < validation.length.min) {
     if (validation.length.min === 1) {
       messages.push(`${fieldLabel} must not be empty`)
diff --git a/packages/core/src/fields/types/timestamp/views/index.tsx b/packages/core/src/fields/types/timestamp/views/index.tsx
index a08cf689091..9e65200c21c 100644
--- a/packages/core/src/fields/types/timestamp/views/index.tsx
+++ b/packages/core/src/fields/types/timestamp/views/index.tsx
@@ -204,7 +204,7 @@ function validate (
 }
 
 export const Cell: CellComponent = ({ item, field, linkTo }) => {
-  let value = item[field.path]
+  const value = item[field.path]
   return linkTo ? (
     <CellLink {...linkTo}>{formatOutput(value)}</CellLink>
   ) : (
@@ -255,7 +255,7 @@ export const controller = (
     },
     serialize: ({ value: { dateValue, timeValue } }) => {
       if (dateValue && typeof timeValue === 'object' && timeValue.value !== null) {
-        let formattedDate = constructTimestamp({ dateValue, timeValue: timeValue.value })
+        const formattedDate = constructTimestamp({ dateValue, timeValue: timeValue.value })
         return { [config.path]: formattedDate }
       }
       return { [config.path]: null }
diff --git a/packages/core/src/fields/types/virtual/index.ts b/packages/core/src/fields/types/virtual/index.ts
index d8b11971431..0de17bd1649 100644
--- a/packages/core/src/fields/types/virtual/index.ts
+++ b/packages/core/src/fields/types/virtual/index.ts
@@ -42,7 +42,7 @@ export type VirtualFieldConfig<ListTypeInfo extends BaseListTypeInfo> =
     }
   }
 
-export function virtual <ListTypeInfo extends BaseListTypeInfo>({
+export function virtual <ListTypeInfo extends BaseListTypeInfo> ({
   field,
   ...config
 }: VirtualFieldConfig<ListTypeInfo>): FieldTypeFunc<ListTypeInfo> {
diff --git a/packages/core/src/lib/assets/utils.ts b/packages/core/src/lib/assets/utils.ts
index 40c132e58b8..2501f92db86 100644
--- a/packages/core/src/lib/assets/utils.ts
+++ b/packages/core/src/lib/assets/utils.ts
@@ -3,7 +3,7 @@ import type { Readable } from 'stream'
 export async function streamToBuffer (stream: Readable): Promise<Buffer> {
   const chunks = []
 
-  for await (let chunk of stream) {
+  for await (const chunk of stream) {
     chunks.push(chunk)
   }
 
diff --git a/packages/core/src/lib/context/createContext.ts b/packages/core/src/lib/context/createContext.ts
index 138494c3e2d..53a858e5df9 100644
--- a/packages/core/src/lib/context/createContext.ts
+++ b/packages/core/src/lib/context/createContext.ts
@@ -68,7 +68,7 @@ export function createContext ({
   }: {
     prisma: any
     session?: unknown
-    sudo: Boolean
+    sudo: boolean
     req?: IncomingMessage
     res?: ServerResponse
   }) => {
diff --git a/packages/core/src/lib/core/initialise-lists.ts b/packages/core/src/lib/core/initialise-lists.ts
index 191e2ff2807..1e0b7fc2043 100644
--- a/packages/core/src/lib/core/initialise-lists.ts
+++ b/packages/core/src/lib/core/initialise-lists.ts
@@ -121,7 +121,7 @@ export type InitialisedList = {
   }
 
   prisma: {
-    types: GraphQLNames, // TODO: not completely appropriate, but what is used for now
+    types: GraphQLNames // TODO: not completely appropriate, but what is used for now
     listKey: string
     mapping: string | undefined
     extendPrismaSchema: ((schema: string) => string) | undefined
@@ -541,7 +541,7 @@ function getListsWithInitialisedFields (
     const findManyArgs: FindManyArgs = {
       where: graphql.arg({
         type: graphql.nonNull(where),
-        defaultValue: listConfig.isSingleton ? ({ id: { equals: '1' } } as {}) : {},
+        defaultValue: listConfig.isSingleton ? ({ id: { equals: '1' } } as object) : {},
       }),
       orderBy: graphql.arg({
         type: graphql.nonNull(graphql.list(graphql.nonNull(orderBy))),
diff --git a/packages/core/src/lib/core/queries/index.ts b/packages/core/src/lib/core/queries/index.ts
index 48b6dba3dfe..1de5e2bf99a 100644
--- a/packages/core/src/lib/core/queries/index.ts
+++ b/packages/core/src/lib/core/queries/index.ts
@@ -31,7 +31,7 @@ export function getQueriesForList (list: InitialisedList) {
     args: {
       where: graphql.arg({
         type: graphql.nonNull(list.graphql.types.where),
-        defaultValue: list.isSingleton ? ({ id: { equals: '1' } } as {}) : {},
+        defaultValue: list.isSingleton ? ({ id: { equals: '1' } } as object) : {},
       }),
     },
     async resolve (_rootVal, args, context, info) {
diff --git a/packages/core/src/lib/utils.ts b/packages/core/src/lib/utils.ts
index c7f02a32917..800d39ed3f3 100644
--- a/packages/core/src/lib/utils.ts
+++ b/packages/core/src/lib/utils.ts
@@ -7,7 +7,7 @@
 export function humanize (str: string) {
   return str
     .replace(/([a-z])([A-Z]+)/g, '$1 $2')
-    .split(/\s|_|\-/)
+    .split(/\s|_|-/)
     .filter(i => i)
     .map(x => x.charAt(0).toUpperCase() + x.slice(1))
     .join(' ')
diff --git a/packages/core/src/scripts/dev.ts b/packages/core/src/scripts/dev.ts
index 74c03b3c71f..414499a332b 100644
--- a/packages/core/src/scripts/dev.ts
+++ b/packages/core/src/scripts/dev.ts
@@ -102,7 +102,7 @@ export async function dev (
     //   WARNING: this is only actually required for tests
     // stop httpServer
     if (aHttpServer) {
-      await new Promise(async (resolve, reject) => {
+      await new Promise((resolve, reject) => {
         aHttpServer.close(async (err: any) => {
           if (err) {
             console.error('Error closing the server', err)
@@ -343,7 +343,7 @@ export async function dev (
               servers.expressServer.use(createAdminUIMiddlewareWithNextApp(newSystem.config, newContext, nextApp))
             }
             expressServer = servers.expressServer
-            let prevApolloServer = lastApolloServer
+            const prevApolloServer = lastApolloServer
             lastApolloServer = servers.apolloServer
             await prevApolloServer.stop()
           }
@@ -357,7 +357,7 @@ export async function dev (
   // Serve the dev status page for the Admin UI
   let initKeystonePromiseResolve: () => void | undefined
   let initKeystonePromiseReject: (err: any) => void | undefined
-  let initKeystonePromise = new Promise<void>((resolve, reject) => {
+  const initKeystonePromise = new Promise<void>((resolve, reject) => {
     initKeystonePromiseResolve = resolve
     initKeystonePromiseReject = reject
   })
diff --git a/packages/core/src/session.ts b/packages/core/src/session.ts
index 35930b190bd..e8a3d30b0fe 100644
--- a/packages/core/src/session.ts
+++ b/packages/core/src/session.ts
@@ -84,7 +84,9 @@ export function statelessSessions<Session> ({
       if (!token) return
       try {
         return await Iron.unseal(token, secret, ironOptions)
-      } catch (err) {}
+      } catch (err) {
+        // do nothing
+      }
     },
     async end ({ context }) {
       if (!context?.res) return
diff --git a/packages/core/src/types/admin-meta.ts b/packages/core/src/types/admin-meta.ts
index 170e0f72a09..f225dbc19c6 100644
--- a/packages/core/src/types/admin-meta.ts
+++ b/packages/core/src/types/admin-meta.ts
@@ -26,7 +26,7 @@ export type CreateViewFieldModes =
 
 export type AdminConfig = {
   components?: {
-    Logo?: (props: {}) => ReactElement
+    Logo?: (props: object) => ReactElement
     Navigation?: (props: NavigationProps) => ReactElement
   }
 }
diff --git a/packages/core/src/types/json-field-type-polyfill-for-sqlite.ts b/packages/core/src/types/json-field-type-polyfill-for-sqlite.ts
index 641763c76f6..4b7e664604b 100644
--- a/packages/core/src/types/json-field-type-polyfill-for-sqlite.ts
+++ b/packages/core/src/types/json-field-type-polyfill-for-sqlite.ts
@@ -10,9 +10,10 @@ import {
   type UpdateFieldInputArg,
   fieldType,
 } from '.'
+import { type InputType, type Arg } from '@graphql-ts/schema'
 
 function mapOutputFieldToSQLite (
-  field: graphql.Field<{ value: JSONValue, item: BaseItem }, {}, any, 'value'>
+  field: graphql.Field<{ value: JSONValue, item: BaseItem }, Record<string, Arg<InputType>>, any, 'value'>
 ) {
   const innerResolver = field.resolve || (({ value }) => value)
   return graphql.fields<{
diff --git a/packages/core/src/types/next-fields.ts b/packages/core/src/types/next-fields.ts
index f5153e42a3f..05149147e5e 100644
--- a/packages/core/src/types/next-fields.ts
+++ b/packages/core/src/types/next-fields.ts
@@ -182,7 +182,7 @@ type DBFieldToInputValue<TDBField extends DBField> = TDBField extends ScalarDBFi
       many: readonly ScalarPrismaTypes[Scalar][] | undefined
     }[Mode]
   : TDBField extends RelationDBField<'many' | 'one'>
-  ? { connect?: {}, disconnect?: boolean } | undefined
+  ? { connect?: object, disconnect?: boolean } | undefined
   : TDBField extends EnumDBField<infer Value, infer Mode>
   ? {
       optional: Value | null | undefined
diff --git a/packages/core/src/types/schema/graphql-ts-schema.ts b/packages/core/src/types/schema/graphql-ts-schema.ts
index c77f09103cc..d46571b71bc 100644
--- a/packages/core/src/types/schema/graphql-ts-schema.ts
+++ b/packages/core/src/types/schema/graphql-ts-schema.ts
@@ -40,6 +40,7 @@ export { bindGraphQLSchemaAPIToContext } from '@graphql-ts/schema'
 export type { BaseSchemaMeta, Extension } from '@graphql-ts/extend'
 export { extend, wrap } from '@graphql-ts/extend'
 import { field as fieldd } from './schema-api-with-context'
+import { type InputType, type Arg } from '@graphql-ts/schema'
 export { fields, interface, interfaceField, object, union } from './schema-api-with-context'
 
 // TODO: remove when we use { graphql } from '.keystone'
@@ -72,7 +73,7 @@ type FieldFuncResolve<
       ? {
           resolve?: graphqlTsSchema.FieldResolver<
             Source,
-            SomeTypeThatIsntARecordOfArgs extends Args ? {} : Args,
+            SomeTypeThatIsntARecordOfArgs extends Args ? Record<string, Arg<InputType>> : Args,
             Type,
             Context
           >
@@ -80,7 +81,7 @@ type FieldFuncResolve<
       : {
           resolve: graphqlTsSchema.FieldResolver<
             Source,
-            SomeTypeThatIsntARecordOfArgs extends Args ? {} : Args,
+            SomeTypeThatIsntARecordOfArgs extends Args ? Record<string, Arg<InputType>> : Args,
             Type,
             Context
           >
@@ -88,7 +89,7 @@ type FieldFuncResolve<
     : {
         resolve: graphqlTsSchema.FieldResolver<
           Source,
-          SomeTypeThatIsntARecordOfArgs extends Args ? {} : Args,
+          SomeTypeThatIsntARecordOfArgs extends Args ? Record<string, Arg<InputType>> : Args,
           Type,
           Context
         >
@@ -113,7 +114,7 @@ type FieldFunc = <
   Type extends OutputType,
   Key extends string,
   Context extends KeystoneContext<any>,
-  Args extends { [Key in keyof Args]: graphqlTsSchema.Arg<graphqlTsSchema.InputType> } = {}
+  Args extends { [Key in keyof Args]: graphqlTsSchema.Arg<graphqlTsSchema.InputType> } = object
 >(
   field: FieldFuncArgs<Source, Args, Type, Key, Context>
 ) => graphqlTsSchema.Field<Source, Args, Type, Key, Context>
@@ -161,7 +162,7 @@ export const Decimal = graphqlTsSchema.graphql.scalar<DecimalValue & { scaleToPr
       if (value.kind !== 'StringValue') {
         throw new GraphQLError('Decimal only accepts values as strings')
       }
-      let decimal = new DecimalValue(value.value)
+      const decimal = new DecimalValue(value.value)
       if (!decimal.isFinite()) {
         throw new GraphQLError('Decimal values must be finite')
       }
@@ -177,7 +178,7 @@ export const Decimal = graphqlTsSchema.graphql.scalar<DecimalValue & { scaleToPr
       if (typeof value !== 'string') {
         throw new GraphQLError('Decimal only accepts values as strings')
       }
-      let decimal = new DecimalValue(value)
+      const decimal = new DecimalValue(value)
       if (!decimal.isFinite()) {
         throw new GraphQLError('Decimal values must be finite')
       }
@@ -282,7 +283,7 @@ export const CalendarDay = graphqlTsSchema.graphql.scalar<string>(
   })
 )
 
-export const Empty = graphqlTsSchema.graphql.scalar<{}>(
+export const Empty = graphqlTsSchema.graphql.scalar(
   new GraphQLScalarType({
     name: 'Empty',
     serialize (value) { return null },
diff --git a/packages/document-renderer/src/index.tsx b/packages/document-renderer/src/index.tsx
index 39ee646736d..7a697ee0adb 100644
--- a/packages/document-renderer/src/index.tsx
+++ b/packages/document-renderer/src/index.tsx
@@ -42,7 +42,7 @@ interface Renderers {
     blockquote: OnlyChildrenComponent
     code: Component<{ children: string }> | keyof JSX.IntrinsicElements
     layout: Component<{ layout: [number, ...number[]], children: ReactElement[] }>
-    divider: Component<{}> | keyof JSX.IntrinsicElements
+    divider: Component<unknown> | keyof JSX.IntrinsicElements
     heading: Component<{
       level: 1 | 2 | 3 | 4 | 5 | 6
       children: ReactNode
diff --git a/packages/fields-document/src/DocumentEditor/Toolbar.tsx b/packages/fields-document/src/DocumentEditor/Toolbar.tsx
index 02aa8ffcf55..20f50a1c902 100644
--- a/packages/fields-document/src/DocumentEditor/Toolbar.tsx
+++ b/packages/fields-document/src/DocumentEditor/Toolbar.tsx
@@ -220,7 +220,7 @@ function HeadingButton ({
   onToggleShowMenu: () => void
 }) {
   const { textStyles } = useToolbarState()
-  let buttonLabel =
+  const buttonLabel =
     textStyles.selected === 'normal' ? 'Normal text' : 'Heading ' + textStyles.selected
   const isDisabled = textStyles.allowedHeadingLevels.length === 0
   return useMemo(
@@ -308,7 +308,7 @@ function HeadingDialog ({
   return (
     <ToolbarGroup direction="column">
       {headingLevels.map(hNum => {
-        let Tag = `h${hNum}` as const
+        const Tag = `h${hNum}` as const
         const isSelected = textStyles.selected === hNum
         return (
           <ToolbarButton
diff --git a/packages/fields-document/src/DocumentEditor/block-markdown-shortcuts.ts b/packages/fields-document/src/DocumentEditor/block-markdown-shortcuts.ts
index 7689ea0a11b..f7d1fbc489d 100644
--- a/packages/fields-document/src/DocumentEditor/block-markdown-shortcuts.ts
+++ b/packages/fields-document/src/DocumentEditor/block-markdown-shortcuts.ts
@@ -28,7 +28,7 @@ export function withBlockMarkdownShortcuts (
     ...documentFeatures,
     relationships: true,
   }
-  let addShortcut = (
+  const addShortcut = (
     text: string,
     insert: () => void,
     shouldBeEnabledInComponentBlock: (
diff --git a/packages/fields-document/src/DocumentEditor/blockquote.test.tsx b/packages/fields-document/src/DocumentEditor/blockquote.test.tsx
index d5806ce4f51..793f8fd6216 100644
--- a/packages/fields-document/src/DocumentEditor/blockquote.test.tsx
+++ b/packages/fields-document/src/DocumentEditor/blockquote.test.tsx
@@ -4,7 +4,7 @@
 import { jsx, makeEditor } from './tests/utils'
 
 test('inserting a blockquote with a shortcut works', () => {
-  let editor = makeEditor(
+  const editor = makeEditor(
     <editor>
       <paragraph>
         <text>
@@ -34,7 +34,7 @@ test('inserting a blockquote with a shortcut works', () => {
 })
 
 test('backspace at start of blockquote', () => {
-  let editor = makeEditor(
+  const editor = makeEditor(
     <editor>
       <blockquote>
         <paragraph>
@@ -67,7 +67,7 @@ test('backspace at start of blockquote', () => {
 })
 
 test('enter on empty line at end of blockquote exits blockquote', () => {
-  let editor = makeEditor(
+  const editor = makeEditor(
     <editor>
       <blockquote>
         <paragraph>
@@ -100,7 +100,7 @@ test('enter on empty line at end of blockquote exits blockquote', () => {
 })
 
 test('enter on empty line in middle splits the blockquote', () => {
-  let editor = makeEditor(
+  const editor = makeEditor(
     <editor>
       <blockquote>
         <paragraph>
diff --git a/packages/fields-document/src/DocumentEditor/code-block.test.tsx b/packages/fields-document/src/DocumentEditor/code-block.test.tsx
index 7f0d5bf488a..f1b7c16a5ba 100644
--- a/packages/fields-document/src/DocumentEditor/code-block.test.tsx
+++ b/packages/fields-document/src/DocumentEditor/code-block.test.tsx
@@ -5,7 +5,7 @@ import { Editor } from 'slate'
 import { jsx, makeEditor } from './tests/utils'
 
 test('inserting a code block with a shortcut works', () => {
-  let editor = makeEditor(
+  const editor = makeEditor(
     <editor>
       <paragraph>
         <text>
@@ -34,7 +34,7 @@ test('inserting a code block with a shortcut works', () => {
 })
 
 test('insertBreak inserts a soft break', () => {
-  let editor = makeEditor(
+  const editor = makeEditor(
     <editor>
       <code>
         <text>
@@ -70,7 +70,7 @@ test('insertBreak inserts a soft break', () => {
 })
 
 test('non-text is removed from code blocks', () => {
-  let editor = makeEditor(
+  const editor = makeEditor(
     <editor marks={{ bold: true }}>
       <code>
         <paragraph>
@@ -136,7 +136,7 @@ test('non-text is removed from code blocks', () => {
 })
 
 test('insertBreak when at end with \n as last character exits code block', () => {
-  let editor = makeEditor(
+  const editor = makeEditor(
     <editor>
       <code>
         <text>
@@ -173,7 +173,7 @@ test('insertBreak when at end with \n as last character exits code block', () =>
 })
 
 test('insertBreak in the middle of the text when there is a break at the end of the text', () => {
-  let editor = makeEditor(
+  const editor = makeEditor(
     <editor>
       <code>
         <text>
diff --git a/packages/fields-document/src/DocumentEditor/code-block.tsx b/packages/fields-document/src/DocumentEditor/code-block.tsx
index c0423188ba4..61be88c1a9a 100644
--- a/packages/fields-document/src/DocumentEditor/code-block.tsx
+++ b/packages/fields-document/src/DocumentEditor/code-block.tsx
@@ -10,7 +10,7 @@ import { useToolbarState } from './toolbar-state'
 
 export * from './code-block-shared'
 
-function CodeButton ({ attrs }: { attrs: {} }) {
+function CodeButton ({ attrs }: { attrs: object }) {
   const {
     editor,
     code: { isDisabled, isSelected },
diff --git a/packages/fields-document/src/DocumentEditor/component-blocks/document-features-normalization.test.tsx b/packages/fields-document/src/DocumentEditor/component-blocks/document-features-normalization.test.tsx
index f339b7eeca1..a5c6c1ee57b 100644
--- a/packages/fields-document/src/DocumentEditor/component-blocks/document-features-normalization.test.tsx
+++ b/packages/fields-document/src/DocumentEditor/component-blocks/document-features-normalization.test.tsx
@@ -256,7 +256,7 @@ Object.keys(cases).forEach(key => {
   const testCase = cases[key]
   test(key, () => {
     const Prop = `component-${testCase.schema.options.kind}-prop` as const
-    let editor = makeEditorWithChildField(
+    const editor = makeEditorWithChildField(
       testCase.schema,
       testCase.children,
       testCase.expectedNormalized === undefined ? 'disallow-non-normalized' : 'normalize'
diff --git a/packages/fields-document/src/DocumentEditor/component-blocks/insert-break-and-delete.test.tsx b/packages/fields-document/src/DocumentEditor/component-blocks/insert-break-and-delete.test.tsx
index 11727429857..9f3acfeefbd 100644
--- a/packages/fields-document/src/DocumentEditor/component-blocks/insert-break-and-delete.test.tsx
+++ b/packages/fields-document/src/DocumentEditor/component-blocks/insert-break-and-delete.test.tsx
@@ -44,7 +44,7 @@ const componentBlocks = {
 }
 
 test('delete backward at start', () => {
-  let editor = makeEditor(
+  const editor = makeEditor(
     <editor>
       <component-block
         component="withChildElements"
@@ -90,7 +90,7 @@ test('delete backward at start', () => {
 })
 
 test('insert break in last (inline) child prop', () => {
-  let editor = makeEditor(
+  const editor = makeEditor(
     <editor>
       <component-block
         component="withChildElements"
@@ -166,7 +166,7 @@ test('insert break in last (inline) child prop', () => {
 })
 
 test('insert break in first (block) child prop in empty paragraph', () => {
-  let editor = makeEditor(
+  const editor = makeEditor(
     <editor>
       <component-block
         component="withChildElements"
@@ -239,7 +239,7 @@ test('insert break in first (block) child prop in empty paragraph', () => {
 })
 
 test('insert break in last (block) child prop in empty paragraph', () => {
-  let editor = makeEditor(
+  const editor = makeEditor(
     <editor>
       <component-block
         component="withChildElementsBlockLast"
@@ -316,7 +316,7 @@ test('insert break in last (block) child prop in empty paragraph', () => {
 })
 
 test('insert break in first (inline) child prop', () => {
-  let editor = makeEditor(
+  const editor = makeEditor(
     <editor>
       <component-block
         component="withChildElementsBlockLast"
diff --git a/packages/fields-document/src/DocumentEditor/component-blocks/insertion-and-preview-props.test.tsx b/packages/fields-document/src/DocumentEditor/component-blocks/insertion-and-preview-props.test.tsx
index 4aef5c5f348..00eba885c71 100644
--- a/packages/fields-document/src/DocumentEditor/component-blocks/insertion-and-preview-props.test.tsx
+++ b/packages/fields-document/src/DocumentEditor/component-blocks/insertion-and-preview-props.test.tsx
@@ -67,7 +67,7 @@ const componentBlocks = {
 }
 
 test('inserting a void component block', () => {
-  let editor = makeEditor(
+  const editor = makeEditor(
     <editor>
       <paragraph>
         <text>
@@ -102,7 +102,7 @@ test('inserting a void component block', () => {
 })
 
 test('inserting a complex component block', () => {
-  let editor = makeEditor(
+  const editor = makeEditor(
     <editor>
       <paragraph>
         <text>
@@ -220,9 +220,9 @@ const makeEditorWithComplexComponentBlock = () =>
   )
 
 test('preview props api', () => {
-  let editor = makeEditorWithComplexComponentBlock()
+  const editor = makeEditorWithComplexComponentBlock()
 
-  let previewProps = getPreviewProps(editor)
+  const previewProps = getPreviewProps(editor)
   const expectedPreviewProps: typeof previewProps = {
     schema: {
       kind: 'object',
@@ -296,9 +296,9 @@ test('preview props api', () => {
 })
 
 test('preview props conditional change', () => {
-  let editor = makeEditorWithComplexComponentBlock()
+  const editor = makeEditorWithComplexComponentBlock()
 
-  let previewProps = getPreviewProps(editor)
+  const previewProps = getPreviewProps(editor)
   previewProps.fields.object.fields.conditional.onChange(true)
   expect(editor).toMatchInlineSnapshot(`
     <editor>
@@ -386,18 +386,18 @@ test('preview props conditional change', () => {
 })
 
 test('preview props form change', () => {
-  let editor = makeEditorWithComplexComponentBlock()
+  const editor = makeEditorWithComplexComponentBlock()
 
-  let previewProps = getPreviewProps(editor)
+  const previewProps = getPreviewProps(editor)
   previewProps.fields.object.fields.select.onChange('b')
   expect((editor.children[0] as any).props.object.select).toBe('b')
   expect(getPreviewProps(editor).fields.object.fields.select.value).toBe('b')
 })
 
 test('relationship many change', () => {
-  let editor = makeEditorWithComplexComponentBlock()
+  const editor = makeEditorWithComplexComponentBlock()
 
-  let previewProps = getPreviewProps(editor)
+  const previewProps = getPreviewProps(editor)
   const val = [{ data: {}, id: 'some-id', label: 'some-id' }]
   previewProps.fields.object.fields.many.onChange(val)
   expect((editor.children[0] as any).props.object.many).toEqual(val)
@@ -411,9 +411,9 @@ function assert (condition: boolean): asserts condition {
 }
 
 test('relationship single change', () => {
-  let editor = makeEditorWithComplexComponentBlock()
+  const editor = makeEditorWithComplexComponentBlock()
 
-  let previewProps = getPreviewProps(editor)
+  const previewProps = getPreviewProps(editor)
   assert(previewProps.fields.object.fields.conditional.discriminant === false)
   const val = { data: {}, id: 'some-id', label: 'some-id' }
   previewProps.fields.object.fields.conditional.value.onChange(val)
@@ -424,9 +424,9 @@ test('relationship single change', () => {
 })
 
 test('changing conditional with form inside', () => {
-  let editor = makeEditorWithComplexComponentBlock()
+  const editor = makeEditorWithComplexComponentBlock()
 
-  let previewProps = getPreviewProps(editor)
+  const previewProps = getPreviewProps(editor)
   assert(previewProps.fields.object.fields.conditional.discriminant === false)
   previewProps.fields.object.fields.conditionalSelect.onChange('b')
 
@@ -459,9 +459,9 @@ test('changing conditional with form inside', () => {
 })
 
 test('changing form inside conditional', () => {
-  let editor = makeEditorWithComplexComponentBlock()
+  const editor = makeEditorWithComplexComponentBlock()
 
-  let previewProps = getPreviewProps(editor)
+  const previewProps = getPreviewProps(editor)
   previewProps.fields.object.fields.conditionalSelect.value.onChange('Some content')
 
   expect((editor.children[0] as any).props.object.conditionalSelect).toMatchInlineSnapshot(`
diff --git a/packages/fields-document/src/DocumentEditor/component-blocks/normalization.test.tsx b/packages/fields-document/src/DocumentEditor/component-blocks/normalization.test.tsx
index e9e4a1d54ed..f900726f798 100644
--- a/packages/fields-document/src/DocumentEditor/component-blocks/normalization.test.tsx
+++ b/packages/fields-document/src/DocumentEditor/component-blocks/normalization.test.tsx
@@ -33,7 +33,7 @@ const componentBlocks = {
 }
 
 test('component-inline-prop and component-block-prop outside of component-block are unwrapped', () => {
-  let editor = makeEditor(
+  const editor = makeEditor(
     <editor>
       <paragraph>
         <component-inline-prop propPath={undefined as any}>
@@ -73,7 +73,7 @@ test('component-inline-prop and component-block-prop outside of component-block
 })
 
 test('non component block prop in component-block', () => {
-  let editor = makeEditor(
+  const editor = makeEditor(
     <editor>
       <component-block component={'basic'} props={{ prop: '' }}>
         <paragraph>
@@ -114,7 +114,7 @@ test('non component block prop in component-block', () => {
 })
 
 test('content inside of void child prop', () => {
-  let editor = makeEditor(
+  const editor = makeEditor(
     <editor>
       <component-block
         component="basic"
@@ -160,7 +160,7 @@ test('content inside of void child prop', () => {
 })
 
 test('prop path for old fake void prop is removed', () => {
-  let editor = makeEditor(
+  const editor = makeEditor(
     <editor>
       <component-block
         component="basic"
@@ -208,7 +208,7 @@ test('prop path for old fake void prop is removed', () => {
 })
 
 test('inserting a void component block', () => {
-  let editor = makeEditor(
+  const editor = makeEditor(
     <editor>
       <paragraph>
         <text>
@@ -243,7 +243,7 @@ test('inserting a void component block', () => {
 })
 
 test('extra component props are removed', () => {
-  let editor = makeEditor(
+  const editor = makeEditor(
     <editor>
       <paragraph>
         <text />
@@ -323,7 +323,7 @@ test('extra component props are removed', () => {
 })
 
 test('missing component props are added', () => {
-  let editor = makeEditor(
+  const editor = makeEditor(
     <editor>
       <component-block component="withChildElements" props={{ prop: '', block: null }}>
         <component-block-prop propPath={['block']}>
@@ -383,7 +383,7 @@ test('missing component props are added', () => {
 })
 
 test('prop with wrong type for a given prop path', () => {
-  let editor = makeEditor(
+  const editor = makeEditor(
     <editor>
       <component-block component="withChildElements" props={{ prop: '' }}>
         <component-inline-prop propPath={['block']}>
@@ -448,7 +448,7 @@ test('prop with wrong type for a given prop path', () => {
 })
 
 test('props in wrong order', () => {
-  let editor = makeEditor(
+  const editor = makeEditor(
     <editor>
       <component-block
         component="withLotsOfChildElements"
diff --git a/packages/fields-document/src/DocumentEditor/component-blocks/preview-props.test.ts b/packages/fields-document/src/DocumentEditor/component-blocks/preview-props.test.ts
index b99776cb70e..3eb3334bb54 100644
--- a/packages/fields-document/src/DocumentEditor/component-blocks/preview-props.test.ts
+++ b/packages/fields-document/src/DocumentEditor/component-blocks/preview-props.test.ts
@@ -65,7 +65,7 @@ test("array fields don't keep the props of an array item around after removing t
     { key: '2', value: 'blah2' },
   ])
 
-  let elementsBeforeChange = props.elements
+  const elementsBeforeChange = props.elements
   props.onChange([{ key: '2' }])
   expect(props.elements[0]).toBe(elementsBeforeChange[1])
   expect(props.elements[0]).toBe(elementsBeforeChange[1])
@@ -90,7 +90,7 @@ test('the props of two array fields in a conditional field change when the discr
   )
   let props = getPreviewProps(val)
   assert(props.discriminant === false)
-  let prevArrayOnChange = props.value.onChange
+  const prevArrayOnChange = props.value.onChange
   props.onChange(true)
   props = getPreviewProps(val)
   assert(props.discriminant === true)
diff --git a/packages/fields-document/src/DocumentEditor/component-blocks/utils.test.ts b/packages/fields-document/src/DocumentEditor/component-blocks/utils.test.ts
index e66eaec8a6b..ea7eff0b170 100644
--- a/packages/fields-document/src/DocumentEditor/component-blocks/utils.test.ts
+++ b/packages/fields-document/src/DocumentEditor/component-blocks/utils.test.ts
@@ -39,7 +39,7 @@ test('getChildFieldAtPath', () => {
 })
 
 test('getAncestorFields', () => {
-  let root = { kind: 'object' as const, fields: props }
+  const root = { kind: 'object' as const, fields: props }
   expect(getAncestorSchemas(root, ['something', 'blockChild'], falseVal)).toEqual([
     root,
     props.something,
diff --git a/packages/fields-document/src/DocumentEditor/component-blocks/with-component-blocks.tsx b/packages/fields-document/src/DocumentEditor/component-blocks/with-component-blocks.tsx
index 319004a7a6d..38cc952da1c 100644
--- a/packages/fields-document/src/DocumentEditor/component-blocks/with-component-blocks.tsx
+++ b/packages/fields-document/src/DocumentEditor/component-blocks/with-component-blocks.tsx
@@ -81,7 +81,7 @@ function normalizeNodeWithinComponentProp (
     )
   }
   if (Element.isElement(node)) {
-    let childrenHasChanged = node.children
+    const childrenHasChanged = node.children
       .map((node, i) =>
         normalizeNodeWithinComponentProp([node, [...path, i]], editor, fieldOptions, relationships)
       )
diff --git a/packages/fields-document/src/DocumentEditor/divider.test.tsx b/packages/fields-document/src/DocumentEditor/divider.test.tsx
index 87c4568844b..33b52a4d342 100644
--- a/packages/fields-document/src/DocumentEditor/divider.test.tsx
+++ b/packages/fields-document/src/DocumentEditor/divider.test.tsx
@@ -4,7 +4,7 @@
 import { jsx, makeEditor } from './tests/utils'
 
 test('inserting a divider with a shortcut works', () => {
-  let editor = makeEditor(
+  const editor = makeEditor(
     <editor>
       <paragraph>
         <text>
diff --git a/packages/fields-document/src/DocumentEditor/heading.test.tsx b/packages/fields-document/src/DocumentEditor/heading.test.tsx
index ef026b15969..0dc58488a08 100644
--- a/packages/fields-document/src/DocumentEditor/heading.test.tsx
+++ b/packages/fields-document/src/DocumentEditor/heading.test.tsx
@@ -4,7 +4,7 @@
 import { jsx, makeEditor } from './tests/utils'
 
 test('inserting a heading with a shortcut works', () => {
-  let editor = makeEditor(
+  const editor = makeEditor(
     <editor>
       <paragraph>
         <text>
@@ -33,7 +33,7 @@ test('inserting a heading with a shortcut works', () => {
 })
 
 test('inserting a break at the end of the heading exits the heading', () => {
-  let editor = makeEditor(
+  const editor = makeEditor(
     <editor>
       <heading level={1}>
         <text>
@@ -70,7 +70,7 @@ test('inserting a break at the end of the heading exits the heading', () => {
 })
 
 test('inserting a break in the middle of the heading splits the text and does not exit the heading', () => {
-  let editor = makeEditor(
+  const editor = makeEditor(
     <editor>
       <heading level={1}>
         <text>
@@ -110,7 +110,7 @@ test('inserting a break in the middle of the heading splits the text and does no
 })
 
 test('inserting a break at the start of the heading inserts a paragraph above the heading', () => {
-  let editor = makeEditor(
+  const editor = makeEditor(
     <editor>
       <heading level={1}>
         <text>
diff --git a/packages/fields-document/src/DocumentEditor/index.tsx b/packages/fields-document/src/DocumentEditor/index.tsx
index 5e6b0192844..2cea3a28967 100644
--- a/packages/fields-document/src/DocumentEditor/index.tsx
+++ b/packages/fields-document/src/DocumentEditor/index.tsx
@@ -279,7 +279,7 @@ export function DocumentEditorEditable (props: EditableProps) {
     <Editable
       decorate={useCallback(
         ([node, path]: NodeEntry<Node>) => {
-          let decorations: Range[] = []
+          const decorations: Range[] = []
           if (node.type === 'component-block') {
             if (
               node.children.length === 1 &&
diff --git a/packages/fields-document/src/DocumentEditor/insert-menu-shared.ts b/packages/fields-document/src/DocumentEditor/insert-menu-shared.ts
index 070f5dc5580..31706da401d 100644
--- a/packages/fields-document/src/DocumentEditor/insert-menu-shared.ts
+++ b/packages/fields-document/src/DocumentEditor/insert-menu-shared.ts
@@ -18,7 +18,7 @@ function findPathWithInsertMenu (node: Node, path: Path): Path | undefined {
 
   for (const [index, child] of node.children.entries()) {
     if (nodesWithoutInsertMenu.has(child)) continue
-    let maybePath = findPathWithInsertMenu(child, [...path, index])
+    const maybePath = findPathWithInsertMenu(child, [...path, index])
     if (maybePath) {
       return maybePath
     }
diff --git a/packages/fields-document/src/DocumentEditor/insert-menu.test.tsx b/packages/fields-document/src/DocumentEditor/insert-menu.test.tsx
index 84cf37e8353..fae980a58e8 100644
--- a/packages/fields-document/src/DocumentEditor/insert-menu.test.tsx
+++ b/packages/fields-document/src/DocumentEditor/insert-menu.test.tsx
@@ -5,7 +5,7 @@ import { Transforms } from 'slate'
 import { jsx, makeEditor } from './tests/utils'
 
 test('insertMenu mark is removed when cursor is outside with a forced normalize', () => {
-  let editor = makeEditor(
+  const editor = makeEditor(
     <editor>
       <paragraph>
         <text insertMenu>/something</text>
@@ -36,7 +36,7 @@ test('insertMenu mark is removed when cursor is outside with a forced normalize'
 })
 
 test('insertMenu mark is not removed when cursor is in the text', () => {
-  let editor = makeEditor(
+  const editor = makeEditor(
     <editor marks={{ insertMenu: true }}>
       <paragraph>
         <text insertMenu>
@@ -68,7 +68,7 @@ test('insertMenu mark is not removed when cursor is in the text', () => {
 })
 
 test('insertMenu mark is normalized away when / is not the first character', () => {
-  let editor = makeEditor(
+  const editor = makeEditor(
     <editor marks={{ insertMenu: true }}>
       <paragraph>
         <text insertMenu>
@@ -99,7 +99,7 @@ test('insertMenu mark is normalized away when / is not the first character', ()
 })
 
 test('insertMenu mark is normalized away when / is not the first character and then a character is inserted, the mark is removed from Editor.marks', () => {
-  let editor = makeEditor(
+  const editor = makeEditor(
     <editor marks={{ insertMenu: true }}>
       <paragraph>
         <text insertMenu>
@@ -126,7 +126,7 @@ test('insertMenu mark is normalized away when / is not the first character and t
 })
 
 test('insertMenu mark is removed when text is inserted else where in the document', () => {
-  let editor = makeEditor(
+  const editor = makeEditor(
     <editor>
       <paragraph>
         <text insertMenu>/something</text>
@@ -156,7 +156,7 @@ test('insertMenu mark is removed when text is inserted else where in the documen
 })
 
 test('insertMenu mark is removed when whitespace is inserted', () => {
-  let editor = makeEditor(
+  const editor = makeEditor(
     <editor marks={{ insertMenu: true }}>
       <paragraph>
         <text insertMenu>
@@ -183,7 +183,7 @@ test('insertMenu mark is removed when whitespace is inserted', () => {
 })
 
 test('insertMenu mark is removed when the cursor is moved outside of the text node', () => {
-  let editor = makeEditor(
+  const editor = makeEditor(
     <editor marks={{ insertMenu: true }}>
       <paragraph>
         <text insertMenu>
@@ -216,7 +216,7 @@ test('insertMenu mark is removed when the cursor is moved outside of the text no
 })
 
 test('insertMenu mark is added when inserting / at the start of a block', () => {
-  let editor = makeEditor(
+  const editor = makeEditor(
     <editor>
       <paragraph>
         <text>
@@ -248,7 +248,7 @@ test('insertMenu mark is added when inserting / at the start of a block', () =>
 })
 
 test('insertMenu mark is added when inserting / after whitespace', () => {
-  let editor = makeEditor(
+  const editor = makeEditor(
     <editor>
       <paragraph>
         <text>
@@ -283,7 +283,7 @@ test('insertMenu mark is added when inserting / after whitespace', () => {
 })
 
 test('insertMenu mark is added when inserting / after whitespace when there is content after the cursor', () => {
-  let editor = makeEditor(
+  const editor = makeEditor(
     <editor>
       <paragraph>
         <text>
@@ -322,7 +322,7 @@ test('insertMenu mark is added when inserting / after whitespace when there is c
 })
 
 test('insertMenu mark is added when inserting / after whitespace when there is content after the cursor in a different text node', () => {
-  let editor = makeEditor(
+  const editor = makeEditor(
     <editor>
       <paragraph>
         <text>
@@ -363,7 +363,7 @@ test('insertMenu mark is added when inserting / after whitespace when there is c
 })
 
 test('insertMenu thing typing', () => {
-  let editor = makeEditor(
+  const editor = makeEditor(
     <editor>
       <paragraph>
         <text>
diff --git a/packages/fields-document/src/DocumentEditor/insert-menu.tsx b/packages/fields-document/src/DocumentEditor/insert-menu.tsx
index 62acc336cf0..10998371f13 100644
--- a/packages/fields-document/src/DocumentEditor/insert-menu.tsx
+++ b/packages/fields-document/src/DocumentEditor/insert-menu.tsx
@@ -193,7 +193,7 @@ export function InsertMenu ({ children, text }: { children: ReactNode, text: Tex
 
   useEffect(() => {
     const domNode = ReactEditor.toDOMNode(editor, editor)
-    let listener = (event: KeyboardEvent) => {
+    const listener = (event: KeyboardEvent) => {
       if (event.defaultPrevented) return
       switch (event.key) {
         case 'ArrowDown': {
diff --git a/packages/fields-document/src/DocumentEditor/layouts.test.tsx b/packages/fields-document/src/DocumentEditor/layouts.test.tsx
index 86e45a2a63b..f6c26ee03c8 100644
--- a/packages/fields-document/src/DocumentEditor/layouts.test.tsx
+++ b/packages/fields-document/src/DocumentEditor/layouts.test.tsx
@@ -4,7 +4,7 @@
 import { jsx, makeEditor } from './tests/utils'
 
 test('layout with no layout are unwrapped', () => {
-  let editor = makeEditor(
+  const editor = makeEditor(
     <editor>
       <layout layout={undefined as any}>
         <layout-area>
@@ -31,7 +31,7 @@ test('layout with no layout are unwrapped', () => {
 })
 
 test('layout with not enough layout-area are added', () => {
-  let editor = makeEditor(
+  const editor = makeEditor(
     <editor>
       <layout layout={[1, 1]}>
         <layout-area>
@@ -77,7 +77,7 @@ test('layout with not enough layout-area are added', () => {
 })
 
 test('layout with extra layout-areas that are empty are removed', () => {
-  let editor = makeEditor(
+  const editor = makeEditor(
     <editor>
       <layout layout={[1, 1]}>
         <layout-area>
@@ -138,7 +138,7 @@ test('layout with extra layout-areas that are empty are removed', () => {
 })
 
 test('the content of extra layout-areas are merged into the last layout-area', () => {
-  let editor = makeEditor(
+  const editor = makeEditor(
     <editor>
       <layout layout={[1, 1]}>
         <layout-area>
@@ -226,7 +226,7 @@ test('the content of extra layout-areas are merged into the last layout-area', (
 })
 
 test('enter in layout area never exits layout area', () => {
-  let editor = makeEditor(
+  const editor = makeEditor(
     <editor>
       <layout layout={[1]}>
         <layout-area>
@@ -288,7 +288,7 @@ test('enter in layout area never exits layout area', () => {
 })
 
 test('delete backward never deletes or exits in first layout area', () => {
-  let editor = makeEditor(
+  const editor = makeEditor(
     <editor>
       <paragraph>
         <text />
@@ -341,7 +341,7 @@ test('delete backward never deletes or exits in first layout area', () => {
 })
 
 test('delete backward never deletes or exits in second layout area', () => {
-  let editor = makeEditor(
+  const editor = makeEditor(
     <editor>
       <paragraph>
         <text />
diff --git a/packages/fields-document/src/DocumentEditor/link.tsx b/packages/fields-document/src/DocumentEditor/link.tsx
index 4b4cf925ff0..0f924e24326 100644
--- a/packages/fields-document/src/DocumentEditor/link.tsx
+++ b/packages/fields-document/src/DocumentEditor/link.tsx
@@ -160,9 +160,9 @@ const UnlinkButton = memo(function UnlinkButton ({ onUnlink }: { onUnlink: () =>
   )
 })
 
-let linkIcon = <LinkIcon size="small" />
+const linkIcon = <LinkIcon size="small" />
 
-const LinkButton = forwardRef<HTMLButtonElement, {}>(function LinkButton (props, ref) {
+const LinkButton = forwardRef<HTMLButtonElement>(function LinkButton (props, ref) {
   const {
     editor,
     links: { isDisabled, isSelected },
diff --git a/packages/fields-document/src/DocumentEditor/lists.test.tsx b/packages/fields-document/src/DocumentEditor/lists.test.tsx
index 992de1d36d6..40afc99e22c 100644
--- a/packages/fields-document/src/DocumentEditor/lists.test.tsx
+++ b/packages/fields-document/src/DocumentEditor/lists.test.tsx
@@ -5,7 +5,7 @@ import { nestList, toggleList } from './lists-shared'
 import { jsx, makeEditor } from './tests/utils'
 
 test('ordered list shortcut', () => {
-  let editor = makeEditor(
+  const editor = makeEditor(
     <editor>
       <paragraph>
         <text>
@@ -36,7 +36,7 @@ test('ordered list shortcut', () => {
 })
 
 test('unordered list shortcut - ', () => {
-  let editor = makeEditor(
+  const editor = makeEditor(
     <editor>
       <paragraph>
         <text>
@@ -67,7 +67,7 @@ test('unordered list shortcut - ', () => {
 })
 
 test('unordered list shortcut * ', () => {
-  let editor = makeEditor(
+  const editor = makeEditor(
     <editor>
       <paragraph>
         <text>
@@ -98,7 +98,7 @@ test('unordered list shortcut * ', () => {
 })
 
 test('direct sibling lists of the same type are merged', () => {
-  let editor = makeEditor(
+  const editor = makeEditor(
     <editor>
       <unordered-list>
         <list-item>
@@ -167,7 +167,7 @@ test('direct sibling lists of the same type are merged', () => {
 })
 
 test('inserting a break on end of list in empty list item exits list', () => {
-  let editor = makeEditor(
+  const editor = makeEditor(
     <editor>
       <unordered-list>
         <list-item>
@@ -215,7 +215,7 @@ test('inserting a break on end of list in empty list item exits list', () => {
 })
 
 test('inserting a break in empty list item in the middle of a list splits and exits', () => {
-  let editor = makeEditor(
+  const editor = makeEditor(
     <editor>
       <unordered-list>
         <list-item>
@@ -277,7 +277,7 @@ test('inserting a break in empty list item in the middle of a list splits and ex
 })
 
 test('toggle list on empty line', () => {
-  let editor = makeEditor(
+  const editor = makeEditor(
     <editor>
       <paragraph>
         <text>
@@ -311,7 +311,7 @@ test('toggle list on empty line', () => {
 })
 
 test('toggle list on line with text', () => {
-  let editor = makeEditor(
+  const editor = makeEditor(
     <editor>
       <paragraph>
         <text>
@@ -347,7 +347,7 @@ test('toggle list on line with text', () => {
 })
 
 test('toggle list on line with text with marks', () => {
-  let editor = makeEditor(
+  const editor = makeEditor(
     <editor>
       <paragraph>
         <text>
@@ -392,7 +392,7 @@ test('toggle list on line with text with marks', () => {
 })
 
 test('toggle list on list with text with marks', () => {
-  let editor = makeEditor(
+  const editor = makeEditor(
     <editor>
       <ordered-list>
         <list-item>
@@ -438,7 +438,7 @@ test('toggle list on list with text with marks', () => {
 })
 
 test('toggle ordered-list inside of ordered-list', () => {
-  let editor = makeEditor(
+  const editor = makeEditor(
     <editor>
       <ordered-list>
         <list-item>
@@ -474,7 +474,7 @@ test('toggle ordered-list inside of ordered-list', () => {
 })
 
 test('toggle ordered-list inside of multi-item ordered-list', () => {
-  let editor = makeEditor(
+  const editor = makeEditor(
     <editor>
       <ordered-list>
         <list-item>
@@ -538,7 +538,7 @@ test('toggle ordered-list inside of multi-item ordered-list', () => {
 })
 
 test('toggle unordered-list inside of single item in multi-item ordered-list', () => {
-  let editor = makeEditor(
+  const editor = makeEditor(
     <editor>
       <ordered-list>
         <list-item>
@@ -606,7 +606,7 @@ test('toggle unordered-list inside of single item in multi-item ordered-list', (
 })
 
 test('toggle unordered-list for all items in multi-item ordered-list', () => {
-  let editor = makeEditor(
+  const editor = makeEditor(
     <editor>
       <ordered-list>
         <list-item>
@@ -674,7 +674,7 @@ test('toggle unordered-list for all items in multi-item ordered-list', () => {
 })
 
 test('backspace at start of list only unwraps the first item', () => {
-  let editor = makeEditor(
+  const editor = makeEditor(
     <editor>
       <ordered-list>
         <list-item>
@@ -736,7 +736,7 @@ test('backspace at start of list only unwraps the first item', () => {
 })
 
 test('nested list as direct child of list is moved to last list-item', () => {
-  let editor = makeEditor(
+  const editor = makeEditor(
     <editor>
       <ordered-list>
         <list-item>
@@ -787,7 +787,7 @@ test('nested list as direct child of list is moved to last list-item', () => {
 })
 
 test('nest list', () => {
-  let editor = makeEditor(
+  const editor = makeEditor(
     <editor>
       <unordered-list>
         <list-item>
@@ -848,7 +848,7 @@ test('nest list', () => {
 })
 
 test('nest list when previous thing is nested', () => {
-  let editor = makeEditor(
+  const editor = makeEditor(
     <editor>
       <unordered-list>
         <list-item>
@@ -916,7 +916,7 @@ test('nest list when previous thing is nested', () => {
 })
 
 test('inserting a break on end of list non-empty list item adds a new list item', () => {
-  let editor = makeEditor(
+  const editor = makeEditor(
     <editor>
       <unordered-list>
         <list-item>
@@ -962,7 +962,7 @@ test('inserting a break on end of list non-empty list item adds a new list item'
 })
 
 test('changing the type of a nested list', () => {
-  let editor = makeEditor(
+  const editor = makeEditor(
     <editor>
       <unordered-list>
         <list-item>
@@ -1017,7 +1017,7 @@ test('changing the type of a nested list', () => {
 })
 
 test('changing the type of a nested list to something which it is nested inside', () => {
-  let editor = makeEditor(
+  const editor = makeEditor(
     <editor>
       <unordered-list>
         <list-item>
@@ -1088,7 +1088,7 @@ test('changing the type of a nested list to something which it is nested inside'
 })
 
 test('nesting a list item in an ordered list into an unordered list makes the item unordered', () => {
-  let editor = makeEditor(
+  const editor = makeEditor(
     <editor>
       <unordered-list>
         <list-item>
@@ -1156,7 +1156,7 @@ test('nesting a list item in an ordered list into an unordered list makes the it
 
 // TODO: fix this(the snapshot shows the correct output)
 test.skip('toggling unordered-list in a nested unordered-list moves the list item out of the list', () => {
-  let editor = makeEditor(
+  const editor = makeEditor(
     <editor>
       <ordered-list>
         <list-item>
@@ -1210,7 +1210,7 @@ test.skip('toggling unordered-list in a nested unordered-list moves the list ite
 
 // TODO: fix this
 test.skip('nesting multiple items at the same time works', () => {
-  let editor = makeEditor(
+  const editor = makeEditor(
     <editor>
       <ordered-list>
         <list-item>
diff --git a/packages/fields-document/src/DocumentEditor/markdown-link-shortcut.test.tsx b/packages/fields-document/src/DocumentEditor/markdown-link-shortcut.test.tsx
index c9cc6216eb2..36336a201a0 100644
--- a/packages/fields-document/src/DocumentEditor/markdown-link-shortcut.test.tsx
+++ b/packages/fields-document/src/DocumentEditor/markdown-link-shortcut.test.tsx
@@ -6,7 +6,7 @@ import { component, fields } from './component-blocks/api'
 import { defaultDocumentFeatures, jsx, makeEditor } from './tests/utils'
 
 test('basic link shortcut', () => {
-  let editor = makeEditor(
+  const editor = makeEditor(
     <editor>
       <paragraph>
         <text>
@@ -38,7 +38,7 @@ test('basic link shortcut', () => {
 })
 
 test('link shortcut with content before it and whitespace directly before it works', () => {
-  let editor = makeEditor(
+  const editor = makeEditor(
     <editor>
       <paragraph>
         <text>
@@ -72,7 +72,7 @@ test('link shortcut with content before it and whitespace directly before it wor
 })
 
 test("link shortcut with content before it without whitespace directly before doesn't activate the shortcut", () => {
-  let editor = makeEditor(
+  const editor = makeEditor(
     <editor>
       <paragraph>
         <text>
@@ -96,7 +96,7 @@ test("link shortcut with content before it without whitespace directly before do
 })
 
 test('shortcut with whitespace in the middle of the content works', () => {
-  let editor = makeEditor(
+  const editor = makeEditor(
     <editor>
       <paragraph>
         <text>
@@ -128,7 +128,7 @@ test('shortcut with whitespace in the middle of the content works', () => {
 })
 
 test('link shortcut then typing inserts text outside of the link', () => {
-  let editor = makeEditor(
+  const editor = makeEditor(
     <editor>
       <paragraph>
         <text>
@@ -162,7 +162,7 @@ test('link shortcut then typing inserts text outside of the link', () => {
 })
 
 test('link shortcut with bold in some of the content works', () => {
-  let editor = makeEditor(
+  const editor = makeEditor(
     <editor>
       <paragraph>
         <text>[co</text>
@@ -204,7 +204,7 @@ test('link shortcut with bold in some of the content works', () => {
 })
 
 test("link shortcut doesn't do anything when links are disabled globally in the editor", () => {
-  let editor = makeEditor(
+  const editor = makeEditor(
     <editor>
       <paragraph>
         <text>[co</text>
@@ -239,7 +239,7 @@ test("link shortcut doesn't do anything when links are disabled globally in the
 })
 
 test("link shortcut doesn't do anything when inside of a component block with links disabled", () => {
-  let editor = makeEditor(
+  const editor = makeEditor(
     <editor>
       <component-block component="comp" props={{ child: null }}>
         <component-inline-prop propPath={['child']}>
@@ -294,7 +294,7 @@ test("link shortcut doesn't do anything when inside of a component block with li
   `)
 })
 test('link shortcut works when inside of a component block with links option inherited', () => {
-  let editor = makeEditor(
+  const editor = makeEditor(
     <editor>
       <component-block component="comp" props={{ child: null }}>
         <component-inline-prop propPath={['child']}>
@@ -358,7 +358,7 @@ test('link shortcut works when inside of a component block with links option inh
 })
 
 test('an undo only reverts to the whole shortcut text', () => {
-  let editor = makeEditor(
+  const editor = makeEditor(
     <editor>
       <paragraph>
         <text>
@@ -401,7 +401,7 @@ test('an undo only reverts to the whole shortcut text', () => {
 })
 
 test("text after the markdown shortcut isn't included in the link text", () => {
-  let editor = makeEditor(
+  const editor = makeEditor(
     <editor>
       <paragraph>
         <text>
diff --git a/packages/fields-document/src/DocumentEditor/marks.test.tsx b/packages/fields-document/src/DocumentEditor/marks.test.tsx
index c897140274c..d43b04b2394 100644
--- a/packages/fields-document/src/DocumentEditor/marks.test.tsx
+++ b/packages/fields-document/src/DocumentEditor/marks.test.tsx
@@ -10,7 +10,7 @@ describe.each(
     .flat() as [keyof typeof allMarkdownShortcuts, string][]
 )('%s with shortcut "%s"', (markName, shortcut) => {
   test('basic shortcut usage', () => {
-    let editor = makeEditor(
+    const editor = makeEditor(
       <editor>
         <paragraph>
           <text>
@@ -38,7 +38,7 @@ describe.each(
   })
 
   test('works when selection is not collapsed', () => {
-    let editor = makeEditor(
+    const editor = makeEditor(
       <editor>
         <paragraph>
           <text>
@@ -66,7 +66,7 @@ describe.each(
     )
   })
   test('works when the start and ends are in different text nodes', () => {
-    let editor = makeEditor(
+    const editor = makeEditor(
       <editor>
         <paragraph>
           <text>{shortcut}t</text>
@@ -98,7 +98,7 @@ describe.each(
     )
   })
   test('does match when start of shortcut is in a different text node', () => {
-    let editor = makeEditor(
+    const editor = makeEditor(
       <editor>
         <paragraph>
           <text keyboard>{shortcut}</text>
@@ -126,7 +126,7 @@ describe.each(
   })
   if (shortcut.length === 2) {
     test('matches when the end shortcut is in a different text node', () => {
-      let editor = makeEditor(
+      const editor = makeEditor(
         <editor marks={{ keyboard: true }}>
           <paragraph>
             <text>{shortcut}thing</text>
@@ -153,7 +153,7 @@ describe.each(
       )
     })
     test('does match when first and second characters in the start shortcut are in different text nodes', () => {
-      let editor = makeEditor(
+      const editor = makeEditor(
         <editor>
           <paragraph>
             <text keyboard>{shortcut[0]}</text>
@@ -181,7 +181,7 @@ describe.each(
     })
   }
   test('matches when the shortcut appears in an invalid position after the valid position in the same text node', () => {
-    let editor = makeEditor(
+    const editor = makeEditor(
       <editor>
         <paragraph>
           <text>
@@ -208,7 +208,7 @@ describe.each(
     )
   })
   test('matches when the shortcut appears in an invalid position before the valid position in the same text node', () => {
-    let editor = makeEditor(
+    const editor = makeEditor(
       <editor>
         <paragraph>
           <text>
@@ -235,7 +235,7 @@ describe.each(
     )
   })
   test("does not match when there is a different text node before the start of the shortcut that doesn't end in whitespace", () => {
-    let editor = makeEditor(
+    const editor = makeEditor(
       <editor>
         <paragraph>
           <text keyboard>some text</text>
@@ -263,7 +263,7 @@ describe.each(
     )
   })
   test('does not match when there is nothing between the start and end of the shortcut', () => {
-    let editor = makeEditor(
+    const editor = makeEditor(
       <editor>
         <paragraph>
           <text>
@@ -288,7 +288,7 @@ describe.each(
     )
   })
   test('does not match when there is whitespace immediately after the end of the start of the shortcut', () => {
-    let editor = makeEditor(
+    const editor = makeEditor(
       <editor>
         <paragraph>
           <text>
@@ -315,7 +315,7 @@ describe.each(
   })
 
   test('does not match when there is whitespace immediately before the start of the end shortcut', () => {
-    let editor = makeEditor(
+    const editor = makeEditor(
       <editor>
         <paragraph>
           <text>
@@ -341,7 +341,7 @@ describe.each(
     )
   })
   test('does not match if there is a non-whitespace character before the start of the shortcut', () => {
-    let editor = makeEditor(
+    const editor = makeEditor(
       <editor>
         <paragraph>
           <text>
@@ -367,7 +367,7 @@ describe.each(
     )
   })
   test('does match if there is content before the text but still whitespace before the shortcut', () => {
-    let editor = makeEditor(
+    const editor = makeEditor(
       <editor>
         <paragraph>
           <text>
@@ -394,7 +394,7 @@ describe.each(
     )
   })
   test("does match if there's text in the same block with marks and still whitespace before the new place", () => {
-    let editor = makeEditor(
+    const editor = makeEditor(
       <editor>
         <paragraph>
           <text bold>some text</text>
@@ -423,7 +423,7 @@ describe.each(
     )
   })
   test("does match if there's lots of text in the same block with marks and still whitespace before the new place", () => {
-    let editor = makeEditor(
+    const editor = makeEditor(
       <editor>
         <paragraph>
           <text keyboard>some text</text>
@@ -479,7 +479,7 @@ describe.each(
   })
 
   test('undo only undos adding the mark and removing the shortcut, keeps the inserted text', () => {
-    let editor = makeEditor(
+    const editor = makeEditor(
       <editor>
         <paragraph>
           <text>
@@ -508,7 +508,7 @@ describe.each(
 })
 
 test('inserting a break at the end of a block with a mark removes the mark', () => {
-  let editor = makeEditor(
+  const editor = makeEditor(
     <editor marks={{ bold: true }}>
       <paragraph>
         <text bold>
@@ -547,7 +547,7 @@ test('inserting a break at the end of a block with a mark removes the mark', ()
 })
 
 test("inserting a break in the middle of text doesn't remove the mark", () => {
-  let editor = makeEditor(
+  const editor = makeEditor(
     <editor marks={{ bold: true }}>
       <paragraph>
         <text bold>
diff --git a/packages/fields-document/src/DocumentEditor/marks.tsx b/packages/fields-document/src/DocumentEditor/marks.tsx
index 6ed810130f1..b45b94f79c4 100644
--- a/packages/fields-document/src/DocumentEditor/marks.tsx
+++ b/packages/fields-document/src/DocumentEditor/marks.tsx
@@ -104,7 +104,7 @@ export function withMarks (
             // https://github.com/swc-project/swc/issues/2622
             const startOfBlock = getStartOfBlock(editor)
 
-            let startOfBlockToEndOfShortcutString = Editor.string(editor, {
+            const startOfBlockToEndOfShortcutString = Editor.string(editor, {
               anchor: editor.selection.anchor,
               focus: startOfBlock,
             })
diff --git a/packages/fields-document/src/DocumentEditor/paragraphs.ts b/packages/fields-document/src/DocumentEditor/paragraphs.ts
index 0f36982c1e0..329981a325b 100644
--- a/packages/fields-document/src/DocumentEditor/paragraphs.ts
+++ b/packages/fields-document/src/DocumentEditor/paragraphs.ts
@@ -12,7 +12,7 @@ export function withParagraphs (editor: Editor): Editor {
     const [node, path] = entry
 
     if (Editor.isEditor(node)) {
-      let lastNode = node.children[node.children.length - 1]
+      const lastNode = node.children[node.children.length - 1]
       if (lastNode?.type !== 'paragraph') {
         Transforms.insertNodes(editor, paragraphElement(), {
           at: [...path, node.children.length],
diff --git a/packages/fields-document/src/DocumentEditor/pasting/index.ts b/packages/fields-document/src/DocumentEditor/pasting/index.ts
index 3abd17139d2..7509b574fde 100644
--- a/packages/fields-document/src/DocumentEditor/pasting/index.ts
+++ b/packages/fields-document/src/DocumentEditor/pasting/index.ts
@@ -58,7 +58,7 @@ export function withPasting (editor: Editor): Editor {
       editor.insertText(plain)
       return
     }
-    let vsCodeEditorData = data.getData('vscode-editor-data')
+    const vsCodeEditorData = data.getData('vscode-editor-data')
     if (vsCodeEditorData) {
       try {
         const vsCodeData = JSON.parse(vsCodeEditorData)
diff --git a/packages/fields-document/src/DocumentEditor/pasting/markdown.test.tsx b/packages/fields-document/src/DocumentEditor/pasting/markdown.test.tsx
index 69071c40597..4d5f6a825a5 100644
--- a/packages/fields-document/src/DocumentEditor/pasting/markdown.test.tsx
+++ b/packages/fields-document/src/DocumentEditor/pasting/markdown.test.tsx
@@ -6,7 +6,7 @@ import { makeEditor, jsx } from '../tests/utils'
 import { MyDataTransfer } from './data-transfer'
 
 const deserializeMarkdown = (markdown: string) => {
-  let editor = makeEditor(
+  const editor = makeEditor(
     <editor>
       <paragraph>
         <text>
diff --git a/packages/fields-document/src/DocumentEditor/pasting/test-utils.tsx b/packages/fields-document/src/DocumentEditor/pasting/test-utils.tsx
index f65d0e09128..acdc5b80308 100644
--- a/packages/fields-document/src/DocumentEditor/pasting/test-utils.tsx
+++ b/packages/fields-document/src/DocumentEditor/pasting/test-utils.tsx
@@ -4,7 +4,7 @@ import { makeEditor, jsx } from '../tests/utils'
 import { MyDataTransfer } from './data-transfer'
 
 export function htmlToEditor (html: string) {
-  let editor = makeEditor(
+  const editor = makeEditor(
     <editor>
       <paragraph>
         <text>
diff --git a/packages/fields-document/src/DocumentEditor/primitives/inline-dialog.tsx b/packages/fields-document/src/DocumentEditor/primitives/inline-dialog.tsx
index 37bee702d50..48c8c9f3a11 100644
--- a/packages/fields-document/src/DocumentEditor/primitives/inline-dialog.tsx
+++ b/packages/fields-document/src/DocumentEditor/primitives/inline-dialog.tsx
@@ -21,7 +21,7 @@ export const InlineDialog = forwardRef<HTMLDivElement, Props>(({ isRelative, ...
       }
     : {}
 
-  let dialog = (
+  const dialog = (
     <div
       ref={ref}
       contentEditable={false}
diff --git a/packages/fields-document/src/DocumentEditor/shortcuts.test.tsx b/packages/fields-document/src/DocumentEditor/shortcuts.test.tsx
index b1642020274..c447e344068 100644
--- a/packages/fields-document/src/DocumentEditor/shortcuts.test.tsx
+++ b/packages/fields-document/src/DocumentEditor/shortcuts.test.tsx
@@ -6,7 +6,7 @@ import { jsx, makeEditor } from './tests/utils'
 
 describe.each(Object.entries(shortcuts))('shortcut "%s" for "%s"', (shortcut, result) => {
   test('can be inserted', () => {
-    let editor = makeEditor(
+    const editor = makeEditor(
       <editor>
         <paragraph>
           <text>
@@ -32,7 +32,7 @@ describe.each(Object.entries(shortcuts))('shortcut "%s" for "%s"', (shortcut, re
     )
   })
   test('the replacement can be undone', () => {
-    let editor = makeEditor(
+    const editor = makeEditor(
       <editor>
         <paragraph>
           <text>
diff --git a/packages/fields-document/src/DocumentEditor/soft-breaks.test.tsx b/packages/fields-document/src/DocumentEditor/soft-breaks.test.tsx
index 32967b8e5d5..8b6604a490f 100644
--- a/packages/fields-document/src/DocumentEditor/soft-breaks.test.tsx
+++ b/packages/fields-document/src/DocumentEditor/soft-breaks.test.tsx
@@ -5,7 +5,7 @@ import { Editor } from 'slate'
 import { jsx, makeEditor } from './tests/utils'
 
 test('basic soft break', () => {
-  let editor = makeEditor(
+  const editor = makeEditor(
     <editor>
       <paragraph>
         <text>
@@ -31,7 +31,7 @@ test('basic soft break', () => {
 })
 
 test('soft break deletes selection', () => {
-  let editor = makeEditor(
+  const editor = makeEditor(
     <editor>
       <paragraph>
         <text>
diff --git a/packages/fields-document/src/DocumentEditor/tests/jsx/namespace.d.ts b/packages/fields-document/src/DocumentEditor/tests/jsx/namespace.d.ts
index c980dd039da..177cc5c9b25 100644
--- a/packages/fields-document/src/DocumentEditor/tests/jsx/namespace.d.ts
+++ b/packages/fields-document/src/DocumentEditor/tests/jsx/namespace.d.ts
@@ -51,7 +51,7 @@ declare namespace __jsx {
         data: {
           id: string
           label: string
-          data: {}
+          data: object
         }
 
         children: Children
@@ -59,10 +59,10 @@ declare namespace __jsx {
     }
     type Element = Node
     interface ElementAttributesProperty {
-      props: {}
+      props: object
     }
     interface ElementChildrenAttribute {
-      children: {}
+      children: object
     }
   }
 }
diff --git a/packages/fields-document/src/DocumentEditor/tests/test-utils.test.tsx b/packages/fields-document/src/DocumentEditor/tests/test-utils.test.tsx
index eb6c4d90c4c..e11c5d8af26 100644
--- a/packages/fields-document/src/DocumentEditor/tests/test-utils.test.tsx
+++ b/packages/fields-document/src/DocumentEditor/tests/test-utils.test.tsx
@@ -5,7 +5,7 @@ import { Editor } from 'slate'
 import { jsx, makeEditor } from './utils'
 
 test('basic cursor snapshot', () => {
-  let editor = makeEditor(
+  const editor = makeEditor(
     <editor>
       <paragraph>
         <text>
@@ -26,7 +26,7 @@ test('basic cursor snapshot', () => {
 })
 
 test('editor equality match', () => {
-  let editor = makeEditor(
+  const editor = makeEditor(
     <editor>
       <paragraph>
         <text>
@@ -250,7 +250,7 @@ test('throws on non-normalized input', () => {
 })
 
 test('allows non-normalized input when passed normalization: "skip"', () => {
-  let editor = makeEditor(
+  const editor = makeEditor(
     <editor>
       <paragraph>
         <paragraph>
@@ -292,7 +292,7 @@ test('allows non-normalized input when passed normalization: "skip"', () => {
 })
 
 test('delete backward', () => {
-  let editor = makeEditor(
+  const editor = makeEditor(
     <editor>
       <paragraph>
         <text>
@@ -334,7 +334,7 @@ test('marks that conflict with .marks', () => {
 })
 
 test('differing current marks', () => {
-  let editor = makeEditor(
+  const editor = makeEditor(
     <editor marks={{ bold: true }}>
       <paragraph>
         <text bold>
diff --git a/packages/fields-document/src/DocumentEditor/tests/utils.tsx b/packages/fields-document/src/DocumentEditor/tests/utils.tsx
index 18b649a524f..e3eb4026018 100644
--- a/packages/fields-document/src/DocumentEditor/tests/utils.tsx
+++ b/packages/fields-document/src/DocumentEditor/tests/utils.tsx
@@ -33,7 +33,7 @@ import { ToolbarStateProvider } from '../toolbar-state'
 import { createToolbarState } from '../toolbar-state-shared'
 import { validateAndNormalizeDocument } from '../../validation'
 
-let oldConsoleError = console.error
+const oldConsoleError = console.error
 
 console.error = (...stuff: any[]) => {
   if (typeof stuff[0] === 'string') {
@@ -346,9 +346,7 @@ function nodeToReactElement (
       ...marks,
     })
   }
-  let children = node.children.map((x, i) =>
-    nodeToReactElement(editor, x, selection, path.concat(i))
-  )
+  const children = node.children.map((x, i) => nodeToReactElement(editor, x, selection, path.concat(i)))
   if (Editor.isEditor(node)) {
     const config = (editor as any).__config
     validateAndNormalizeDocument(
@@ -364,7 +362,7 @@ function nodeToReactElement (
       ...(marks && Object.keys(marks).length ? { marks } : {}),
     })
   }
-  let { type, ...restNode } = node
+  const { type, ...restNode } = node
   const computedData: { '@@isVoid'?: true, '@@isInline'?: true } = {}
   if (editor.isVoid(node)) {
     computedData['@@isVoid'] = true
@@ -375,6 +373,7 @@ function nodeToReactElement (
   if (type !== undefined) {
     return createElement(type, { ...restNode, ...computedData, children })
   }
+  // @ts-ignore TODO: can `type` actually be undefined?
   return createElement('element', { ...node, ...computedData, children })
 }
 
diff --git a/packages/fields-document/src/DocumentEditor/toolbar-state-shared.ts b/packages/fields-document/src/DocumentEditor/toolbar-state-shared.ts
index 997df7eeb2e..b777eb7e3e3 100644
--- a/packages/fields-document/src/DocumentEditor/toolbar-state-shared.ts
+++ b/packages/fields-document/src/DocumentEditor/toolbar-state-shared.ts
@@ -102,7 +102,7 @@ export const createToolbarState = (
       softBreaks: true,
     }
 
-  let [maybeCodeBlockEntry] = Editor.nodes(editor, {
+  const [maybeCodeBlockEntry] = Editor.nodes(editor, {
     match: node => node.type !== 'code' && Element.isElement(node) && Editor.isBlock(editor, node),
   })
   const editorMarks = Editor.marks(editor) || {}
@@ -151,15 +151,15 @@ export const createToolbarState = (
     }
   }
 
-  let [headingEntry] = Editor.nodes(editor, {
+  const [headingEntry] = Editor.nodes(editor, {
     match: nodeTypeMatcher('heading'),
   })
 
-  let [listEntry] = Editor.nodes(editor, {
+  const [listEntry] = Editor.nodes(editor, {
     match: isListNode,
   })
 
-  let [alignableEntry] = Editor.nodes(editor, {
+  const [alignableEntry] = Editor.nodes(editor, {
     match: nodeTypeMatcher('paragraph', 'heading'),
   })
 
diff --git a/packages/fields-document/src/structure-graphql-output.ts b/packages/fields-document/src/structure-graphql-output.ts
index 0a207e2f90f..7d6f92d476e 100644
--- a/packages/fields-document/src/structure-graphql-output.ts
+++ b/packages/fields-document/src/structure-graphql-output.ts
@@ -71,7 +71,7 @@ function getOutputGraphQLFieldInner (
         fields: () =>
           Object.fromEntries(
             Object.entries(schema.fields).map(
-              ([key, val]): [string, graphql.Field<unknown, {}, graphql.OutputType, string>] => {
+              ([key, val]): [string, graphql.Field<unknown, Record<string, graphql.Arg<graphql.InputType>>, graphql.OutputType, string>] => {
                 const field = getOutputGraphQLField(
                   `${name}${key[0].toUpperCase()}${key.slice(1)}`,
                   val,
diff --git a/packages/fields-document/src/validation.ts b/packages/fields-document/src/validation.ts
index bc609c0d3b5..3d4bcfd3174 100644
--- a/packages/fields-document/src/validation.ts
+++ b/packages/fields-document/src/validation.ts
@@ -107,7 +107,7 @@ function validateComponentBlockProps (
         throw new PropValidationError(`Key on object value "${key}" is not allowed`, path)
       }
     }
-    let val: Record<string, any> = {}
+    const val: Record<string, any> = {}
     for (const key of Object.keys(schema.fields)) {
       const propVal = validateComponentBlockProps(
         schema.fields[key],
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 4ca794775ca..b74cbd0a6b4 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -39,8 +39,11 @@ importers:
         specifier: ^9.2.0
         version: 9.12.0
       '@preconstruct/cli':
-        specifier: 2.8.9
+        specifier: ^2.8.9
         version: 2.8.9
+      '@stylistic/eslint-plugin-ts':
+        specifier: ^2.9.0
+        version: 2.9.0(eslint@9.12.0)(typescript@5.6.3)
       '@types/jest':
         specifier: ^29.0.0
         version: 29.5.13
@@ -6098,6 +6101,12 @@ packages:
     resolution: {integrity: sha512-xs/KAwWOeCklq8aMlnpk25LgxEYHKOEodfjfKclDMLcBJEVEKzDLxZxBQyztcuPJ7F54213NJS8PxoiHNMdItQ==}
     engines: {node: '>=16.0.0'}
 
+  '@stylistic/eslint-plugin-ts@2.9.0':
+    resolution: {integrity: sha512-CxB73paAKlmaIDtOfKoIHlhNJVlyRMVobuBqdOc4wbVSqfhbgpCWuJYpBkV3ydGDKRfVWNJ9yg5b99lzZtrjhg==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+    peerDependencies:
+      eslint: '>=8.40.0'
+
   '@svgr/babel-plugin-add-jsx-attribute@8.0.0':
     resolution: {integrity: sha512-b9MIk7yhdS1pMCZM8VeNfUlSKVRhsHZNMl5O9SfaX0l0t5wjdgu4IDzGB8bpnGBBOjGST3rRFVsaaEtI4W6f7g==}
     engines: {node: '>=14'}
@@ -17363,6 +17372,16 @@ snapshots:
       '@smithy/types': 3.5.0
       tslib: 2.7.0
 
+  '@stylistic/eslint-plugin-ts@2.9.0(eslint@9.12.0)(typescript@5.6.3)':
+    dependencies:
+      '@typescript-eslint/utils': 8.8.1(eslint@9.12.0)(typescript@5.6.3)
+      eslint: 9.12.0
+      eslint-visitor-keys: 4.1.0
+      espree: 10.2.0
+    transitivePeerDependencies:
+      - supports-color
+      - typescript
+
   '@svgr/babel-plugin-add-jsx-attribute@8.0.0(@babel/core@7.25.8)':
     dependencies:
       '@babel/core': 7.25.8
diff --git a/tests/api-tests/db-enable-logging.test.ts b/tests/api-tests/db-enable-logging.test.ts
index 1bb4ef2b74a..55671af03ed 100644
--- a/tests/api-tests/db-enable-logging.test.ts
+++ b/tests/api-tests/db-enable-logging.test.ts
@@ -21,7 +21,7 @@ const runner = (enableLogging: boolean) =>
 test(
   'enableLogging: true enables logging',
   runner(true)(async ({ context }) => {
-    let prevConsoleLog = console.log
+    const prevConsoleLog = console.log
     const logs: unknown[][] = []
     console.log = (...args) => {
       logs.push(args.map(x => (typeof x === 'string' ? x.replace(/[^ -~]/g, '^') : x)))
@@ -43,7 +43,7 @@ test(
 test(
   'enableLogging: false does not enable logging',
   runner(false)(async ({ context }) => {
-    let prevConsoleLog = console.log
+    const prevConsoleLog = console.log
     let didLog = false
     console.log = () => {
       didLog = true
diff --git a/tests/api-tests/fields/files.test.ts b/tests/api-tests/fields/files.test.ts
index 2eee6f8eecb..ec0691fd1d4 100644
--- a/tests/api-tests/fields/files.test.ts
+++ b/tests/api-tests/fields/files.test.ts
@@ -111,7 +111,7 @@ describe('File - Crud special tests', () => {
     `,
     })
 
-  for (let matrixValue of testMatrix) {
+  for (const matrixValue of testMatrix) {
     const getConfig = (): StorageConfig => ({
       ...(matrixValue === 's3'
         ? { ...s3DefaultStorage, preserve: false, type: 'file' }
diff --git a/tests/api-tests/fields/images.crud.test.disabled.ts b/tests/api-tests/fields/images.crud.test.disabled.ts
index f95c5f3b142..f02d684abde 100644
--- a/tests/api-tests/fields/images.crud.test.disabled.ts
+++ b/tests/api-tests/fields/images.crud.test.disabled.ts
@@ -111,7 +111,7 @@ describe('Image - Crud special tests', () => {
     `,
     })
 
-  for (let matrixValue of testMatrix) {
+  for (const matrixValue of testMatrix) {
     const getConfig = (): StorageConfig => ({
       ...(matrixValue === 's3'
         ? { ...s3DefaultStorage, type: 'image', preserve: false }
@@ -133,7 +133,7 @@ describe('Image - Crud special tests', () => {
 
     describe(matrixValue, () => {
       describe('Create - upload', () => {
-        for (let matrixValue of testMatrix) {
+        for (const matrixValue of testMatrix) {
           test(
             'upload values should match expected',
             getRunner({ fields, storage: { test_image: config } })(async ({ context }) => {
diff --git a/tests/api-tests/fields/types/utils.ts b/tests/api-tests/fields/types/utils.ts
index ae66e01bacc..1cfd582a183 100644
--- a/tests/api-tests/fields/types/utils.ts
+++ b/tests/api-tests/fields/types/utils.ts
@@ -106,7 +106,7 @@ export function orderableFilterTests (
   isNullable: boolean
 ) {
   equalityFilterTests(match, valuesInAscendingOrder, isNullable)
-  let values = isNullable ? [...valuesInAscendingOrder, null] : valuesInAscendingOrder
+  const values = isNullable ? [...valuesInAscendingOrder, null] : valuesInAscendingOrder
 
   match(values, { gt: values[1] }, [2, 3, 4])
   match(values, { lt: values[2] }, [0, 1])
@@ -120,7 +120,7 @@ export function equalityFilterTests (
   inputValues: readonly [unknown, unknown, unknown, unknown, unknown],
   isNullable: boolean
 ) {
-  let values = isNullable ? [...inputValues, null] : inputValues
+  const values = isNullable ? [...inputValues, null] : inputValues
   const addExpectNull = isNullable ? [5] : []
   if (isNullable) {
     match(values, { equals: null }, [5])
diff --git a/tests/api-tests/omit.test.ts b/tests/api-tests/omit.test.ts
index 263cbf16e63..b3d06961d8f 100644
--- a/tests/api-tests/omit.test.ts
+++ b/tests/api-tests/omit.test.ts
@@ -74,7 +74,7 @@ function makeList ({
   isOrderable,
   omit,
 }: {
-  fields: typeof fieldsMatrix,
+  fields: typeof fieldsMatrix
   isFilterable: boolean
   isOrderable: boolean
   omit:
diff --git a/tests/api-tests/queries/filters.test.ts b/tests/api-tests/queries/filters.test.ts
index b3c23703b2c..64e0d865739 100644
--- a/tests/api-tests/queries/filters.test.ts
+++ b/tests/api-tests/queries/filters.test.ts
@@ -320,8 +320,7 @@ describe('isFilterable', () => {
       expectFilterDenied(errors, [
         {
           path: ['users'],
-          message:
-            'You do not have access to perform \'filter\' operations on the fields ["User.filterFunctionFalse"].',
+          message: `You do not have access to perform 'filter' operations on the fields ["User.filterFunctionFalse"].`,
         },
       ])
     })
@@ -386,7 +385,7 @@ describe('isFilterable', () => {
       expectFilterDenied(errors, [
         {
           path: ['secondaryLists'],
-          message: `You do not have access to perform 'filter' operations on the fields [\"SecondaryList.filterFunctionFalse\",\"SecondaryList.filterFunctionFalse\",\"User.filterFunctionFalse\"].`,
+          message: `You do not have access to perform 'filter' operations on the fields ["SecondaryList.filterFunctionFalse","SecondaryList.filterFunctionFalse","User.filterFunctionFalse"].`,
         },
       ])
     })
@@ -441,8 +440,7 @@ describe('defaultIsFilterable', () => {
       expectFilterDenied(errors, [
         {
           path: ['defaultFilterFunctionFalses'],
-          message:
-            'You do not have access to perform \'filter\' operations on the fields ["DefaultFilterFunctionFalse.a"].',
+          message: `You do not have access to perform 'filter' operations on the fields ["DefaultFilterFunctionFalse.a"].`,
         },
       ])
     })
diff --git a/tests/api-tests/queries/singletons.test.ts b/tests/api-tests/queries/singletons.test.ts
index a24f27d68ca..cf01d686580 100644
--- a/tests/api-tests/queries/singletons.test.ts
+++ b/tests/api-tests/queries/singletons.test.ts
@@ -149,7 +149,7 @@ describe('queries "work" on singletons', () => {
       })
 
       expect(errors?.[0].message).toEqual(
-        `Field \"id\" is not defined by type \"SingularCreateInput\".`
+        `Field "id" is not defined by type "SingularCreateInput".`
       )
     })
   )
diff --git a/tests/api-tests/relationships/crud-self-ref/many-to-many-one-sided.test.ts b/tests/api-tests/relationships/crud-self-ref/many-to-many-one-sided.test.ts
index 223d8ed2425..545c0ba7c6c 100644
--- a/tests/api-tests/relationships/crud-self-ref/many-to-many-one-sided.test.ts
+++ b/tests/api-tests/relationships/crud-self-ref/many-to-many-one-sided.test.ts
@@ -240,7 +240,7 @@ describe(`Many-to-many relationships`, () => {
       'With create',
       runner(async ({ context }) => {
         const { users } = await createInitialData(context)
-        let user = users[0]
+        const user = users[0]
         const friendName = sampleOne(alphanumGenerator)
         const _user = await context.query.User.updateOne({
           where: { id: user.id },
diff --git a/tests/api-tests/relationships/crud-self-ref/many-to-many.test.ts b/tests/api-tests/relationships/crud-self-ref/many-to-many.test.ts
index f8e974ce886..dd5d787dd66 100644
--- a/tests/api-tests/relationships/crud-self-ref/many-to-many.test.ts
+++ b/tests/api-tests/relationships/crud-self-ref/many-to-many.test.ts
@@ -322,7 +322,7 @@ describe(`Many-to-many relationships`, () => {
       'With create',
       runner(async ({ context }) => {
         const { users } = await createInitialData(context)
-        let user = users[0]
+        const user = users[0]
         const locationName = sampleOne(alphanumGenerator)
 
         const _user = await context.query.User.updateOne({
diff --git a/tests/api-tests/relationships/crud-self-ref/one-to-many-one-sided.test.ts b/tests/api-tests/relationships/crud-self-ref/one-to-many-one-sided.test.ts
index f2c0bece7ef..13a9b04c189 100644
--- a/tests/api-tests/relationships/crud-self-ref/one-to-many-one-sided.test.ts
+++ b/tests/api-tests/relationships/crud-self-ref/one-to-many-one-sided.test.ts
@@ -218,7 +218,7 @@ describe(`One-to-many relationships`, () => {
       'With create',
       runner(async ({ context }) => {
         const { users } = await createInitialData(context)
-        let user = users[0]
+        const user = users[0]
         const friendName = sampleOne(alphanumGenerator)
         const _user = await context.query.User.updateOne({
           where: { id: user.id },
diff --git a/tests/api-tests/relationships/crud-self-ref/one-to-many.test.ts b/tests/api-tests/relationships/crud-self-ref/one-to-many.test.ts
index 2153f3a2932..671b45f1bc8 100644
--- a/tests/api-tests/relationships/crud-self-ref/one-to-many.test.ts
+++ b/tests/api-tests/relationships/crud-self-ref/one-to-many.test.ts
@@ -356,7 +356,7 @@ describe(`One-to-many relationships`, () => {
       'With create',
       runner(async ({ context }) => {
         const { users } = await createInitialData(context)
-        let user = users[0]
+        const user = users[0]
         const friendName = sampleOne(alphanumGenerator)
         const _user = await context.query.User.updateOne({
           where: { id: user.id },
diff --git a/tests/api-tests/relationships/crud-self-ref/one-to-one.test.ts b/tests/api-tests/relationships/crud-self-ref/one-to-one.test.ts
index 4886165b55e..44048aede4a 100644
--- a/tests/api-tests/relationships/crud-self-ref/one-to-one.test.ts
+++ b/tests/api-tests/relationships/crud-self-ref/one-to-one.test.ts
@@ -338,7 +338,7 @@ describe(`One-to-one relationships`, () => {
       'With create',
       runner(async ({ context }) => {
         const { users } = await createInitialData(context)
-        let user = users[0]
+        const user = users[0]
         const friendName = sampleOne(alphanumGenerator)
         const _user = await context.query.User.updateOne({
           where: { id: user.id },
diff --git a/tests/api-tests/relationships/crud/many-to-many-one-sided.test.ts b/tests/api-tests/relationships/crud/many-to-many-one-sided.test.ts
index 01059f55190..04ed2efa468 100644
--- a/tests/api-tests/relationships/crud/many-to-many-one-sided.test.ts
+++ b/tests/api-tests/relationships/crud/many-to-many-one-sided.test.ts
@@ -314,7 +314,7 @@ describe(`Many-to-many relationships`, () => {
       'With create',
       runner(async ({ context }) => {
         const { companies } = await createInitialData(context)
-        let company = companies[0]
+        const company = companies[0]
         const locationName = sampleOne(alphanumGenerator)
         const _company = await context.query.Company.updateOne({
           where: { id: company.id },
diff --git a/tests/api-tests/relationships/crud/many-to-many.test.ts b/tests/api-tests/relationships/crud/many-to-many.test.ts
index cf59281a570..d324b391331 100644
--- a/tests/api-tests/relationships/crud/many-to-many.test.ts
+++ b/tests/api-tests/relationships/crud/many-to-many.test.ts
@@ -417,7 +417,7 @@ describe(`Many-to-many relationships`, () => {
       'With create',
       runner(async ({ context }) => {
         const { companies } = await createInitialData(context)
-        let company = companies[0]
+        const company = companies[0]
         const locationName = sampleOne(alphanumGenerator)
         const _company = await context.query.Company.updateOne({
           where: { id: company.id },
diff --git a/tests/api-tests/relationships/crud/one-to-many-one-sided.test.ts b/tests/api-tests/relationships/crud/one-to-many-one-sided.test.ts
index 4e1487e34a1..8c32c995420 100644
--- a/tests/api-tests/relationships/crud/one-to-many-one-sided.test.ts
+++ b/tests/api-tests/relationships/crud/one-to-many-one-sided.test.ts
@@ -228,7 +228,7 @@ describe(`One-to-many relationships`, () => {
 
     test('With create', runner(async ({ context }) => {
       const { companies } = await createInitialData(context)
-      let company = companies[0]
+      const company = companies[0]
       const locationName = sampleOne(alphanumGenerator)
       const _company = await context.query.Company.updateOne({
         where: { id: company.id },
diff --git a/tests/api-tests/relationships/crud/one-to-many.test.ts b/tests/api-tests/relationships/crud/one-to-many.test.ts
index 244d56cce2c..719b754c564 100644
--- a/tests/api-tests/relationships/crud/one-to-many.test.ts
+++ b/tests/api-tests/relationships/crud/one-to-many.test.ts
@@ -445,7 +445,7 @@ describe(`One-to-many relationships`, () => {
       'With create',
       runner(async ({ context }) => {
         const { companies } = await createInitialData(context)
-        let company = companies[0]
+        const company = companies[0]
         const locationName = sampleOne(alphanumGenerator)
         const _company = await context.query.Company.updateOne({
           where: { id: company.id },
diff --git a/tests/api-tests/relationships/crud/one-to-one.test.ts b/tests/api-tests/relationships/crud/one-to-one.test.ts
index 636a8800c5e..8993897d7f8 100644
--- a/tests/api-tests/relationships/crud/one-to-one.test.ts
+++ b/tests/api-tests/relationships/crud/one-to-one.test.ts
@@ -644,7 +644,7 @@ describe(`One-to-one relationships`, () => {
       'With create A',
       runner(async ({ context }) => {
         const { companies } = await createInitialData(context)
-        let company = companies[0]
+        const company = companies[0]
         const locationName = sampleOne(alphanumGenerator)
         const _company = await context.query.Company.updateOne({
           where: { id: company.id },
@@ -668,7 +668,7 @@ describe(`One-to-one relationships`, () => {
       'With create B',
       runner(async ({ context }) => {
         const { locations } = await createInitialData(context)
-        let location = locations[0]
+        const location = locations[0]
         const companyName = sampleOne(alphanumGenerator)
         const _location = await context.query.Location.updateOne({
           where: { id: location.id },
@@ -692,7 +692,7 @@ describe(`One-to-one relationships`, () => {
       runner(async ({ context }) => {
         // To begin with, nothing is linked
         const { companies } = await createInitialData(context)
-        let company = companies[0]
+        const company = companies[0]
 
         // Update company.location to be a new thing.
         const locationName = sampleOne(alphanumGenerator)
@@ -743,7 +743,7 @@ describe(`One-to-one relationships`, () => {
       'With recreate B',
       runner(async ({ context }) => {
         const { locations } = await createInitialData(context)
-        let location = locations[0]
+        const location = locations[0]
         const companyName = sampleOne(alphanumGenerator)
         const _location = await context.query.Location.updateOne({
           where: { id: location.id },
diff --git a/tests/api-tests/relationships/nested-mutations/disconnect-many.test.ts b/tests/api-tests/relationships/nested-mutations/disconnect-many.test.ts
index da75049cc18..06c290ce670 100644
--- a/tests/api-tests/relationships/nested-mutations/disconnect-many.test.ts
+++ b/tests/api-tests/relationships/nested-mutations/disconnect-many.test.ts
@@ -110,7 +110,7 @@ describe('no access control', () => {
       }).expect(400)
       expectGraphQLValidationError(body.errors, [
         {
-          message: `Field "disconnect" is not defined by type "NoteRelateToManyForCreateInput". Did you mean \"connect\"?`,
+          message: `Field "disconnect" is not defined by type "NoteRelateToManyForCreateInput". Did you mean "connect"?`,
         },
       ])
     })
diff --git a/tests/api-tests/relationships/nested-mutations/disconnect-singular.test.ts b/tests/api-tests/relationships/nested-mutations/disconnect-singular.test.ts
index 43c1f753929..75d43537766 100644
--- a/tests/api-tests/relationships/nested-mutations/disconnect-singular.test.ts
+++ b/tests/api-tests/relationships/nested-mutations/disconnect-singular.test.ts
@@ -97,7 +97,7 @@ describe('no access control', () => {
       }).expect(400)
       expectGraphQLValidationError(body.errors, [
         {
-          message: `Field "disconnect" is not defined by type "GroupRelateToOneForCreateInput". Did you mean \"connect\"?`,
+          message: `Field "disconnect" is not defined by type "GroupRelateToOneForCreateInput". Did you mean "connect"?`,
         },
       ])
     })
diff --git a/tests/api-tests/relationships/nested-mutations/two-way-backreference/to-many.test.ts b/tests/api-tests/relationships/nested-mutations/two-way-backreference/to-many.test.ts
index d8dc11675c2..232ded4d679 100644
--- a/tests/api-tests/relationships/nested-mutations/two-way-backreference/to-many.test.ts
+++ b/tests/api-tests/relationships/nested-mutations/two-way-backreference/to-many.test.ts
@@ -157,7 +157,7 @@ describe('update many to many relationship back reference', () => {
           query: 'id teachers(orderBy: { id: asc }) { id }',
         })
 
-        let newTeachers = newStudent.teachers
+        const newTeachers = newStudent.teachers
 
         // Check the link has been broken
         const teacher1 = await getTeacher(context, newTeachers[0].id)
@@ -184,7 +184,7 @@ describe('update many to many relationship back reference', () => {
           query: 'id teachers { id }',
         })
 
-        let newTeachers = _student.teachers
+        const newTeachers = _student.teachers
 
         // Check the link has been broken
         const teacher1 = await getTeacher(context, newTeachers[0].id)
diff --git a/tests/api-tests/relationships/to-one-query-batching.test.ts b/tests/api-tests/relationships/to-one-query-batching.test.ts
index 56f8da766a5..57bc16ef1ea 100644
--- a/tests/api-tests/relationships/to-one-query-batching.test.ts
+++ b/tests/api-tests/relationships/to-one-query-batching.test.ts
@@ -37,7 +37,7 @@ const runner = setupTestRunner({
 test(
   'to-one relationship query batching',
   runner(async ({ context }) => {
-    let prevConsoleLog = console.log
+    const prevConsoleLog = console.log
     console.log = () => {}
     try {
       await context.query.User.createMany({
diff --git a/tests/cli-tests/fixtures/custom-prisma-project/keystone.ts b/tests/cli-tests/fixtures/custom-prisma-project/keystone.ts
index d978b455dc9..80dbd62c50d 100644
--- a/tests/cli-tests/fixtures/custom-prisma-project/keystone.ts
+++ b/tests/cli-tests/fixtures/custom-prisma-project/keystone.ts
@@ -8,8 +8,8 @@ export default config({
     url: 'file:./app.db',
     extendPrismaSchema: schema =>
       schema
-        .replace(/(\ngenerator[^\n]+\{[^\}]+)}/, '$1  previewFeatures = ["multiSchema"]\n}')
-        .replace(/(datasource[^\n]+\{[^\}]+)}/, '$1  schemas = ["first", "second"]\n}'),
+        .replace(/(\ngenerator[^\n]+\{[^}]+)}/, '$1  previewFeatures = ["multiSchema"]\n}')
+        .replace(/(datasource[^\n]+\{[^}]+)}/, '$1  schemas = ["first", "second"]\n}'),
   },
   ui: { isDisabled: true },
   lists: {
diff --git a/tests/cli-tests/prisma.test.ts b/tests/cli-tests/prisma.test.ts
index 6e41e8d9c09..ab50128c9ff 100644
--- a/tests/cli-tests/prisma.test.ts
+++ b/tests/cli-tests/prisma.test.ts
@@ -20,7 +20,7 @@ test('keystone prisma exits with the same code as the prisma child process exits
   const { exitCode, output } = await spawnCommand2(cwd, ['prisma', 'foo'])
 
   expect(exitCode).toEqual(1)
-  expect(output.replace(/[^ -~\n]/g, '?').replace(/  \n/g, '\n')).toContain(`Unknown command "foo"`)
+  expect(output.replace(/[^ -~\n]/g, '?').replace(/ {2}\n/g, '\n')).toContain(`Unknown command "foo"`)
 })
 
 test('keystone prisma uses the db url in the keystone config', async () => {
@@ -34,5 +34,5 @@ test('keystone prisma uses the db url in the keystone config', async () => {
   const { exitCode, output } = await spawnCommand2(cwd, ['prisma', 'migrate', 'status'])
 
   expect(exitCode).toEqual(1)
-  expect(output.replace(/[^ -~\n]/g, '?').replace(/  \n/g, '\n')).toContain(`file:./app.db`)
+  expect(output.replace(/[^ -~\n]/g, '?').replace(/ {2}\n/g, '\n')).toContain(`file:./app.db`)
 })
diff --git a/tests/cli-tests/utils.ts b/tests/cli-tests/utils.ts
index 7a3008e1846..adb7b67065f 100644
--- a/tests/cli-tests/utils.ts
+++ b/tests/cli-tests/utils.ts
@@ -25,7 +25,7 @@ export const schemas = {
 }
 
 export function recordConsole () {
-  let oldConsole = { ...console }
+  const oldConsole = { ...console }
   const contents: string[] = []
   const log = (...args: any[]) => {
     contents.push(format(...args).replace(/[^ -~\n]+/g, '?'))