ci: template errors not being caught due. fix: error due to updated generated-types User type (#12973)

This PR consists of two separate changes. One change cannot pass CI
without the other, so both are included in this single PR.


## CI - ensure types are generated

Our website template is currently failing to build due to a type error.
This error was introduced by a change in our generated types.

Our CI did not catch this issue because it wasn't generating types /
import map before attempting to build the templates. This PR updates the
CI to generate types first.

It also updates some CI step names for improved clarity.

## Fix: type error

![Screenshot 2025-06-29 at 12 53
49@2x](https://github.com/user-attachments/assets/962f1513-bc6c-4e12-9b74-9b891c49900b)


This fixes the type error by ensuring we consistently use the _same_
generated `TypedUser` object within payload, instead of `BaseUser`.
Previously, we sometimes used the generated-types user and sometimes the
base user, which was causing type conflicts depending on what the
generated user type was.

It also deprecates the `User` type (which was essentially just
`BaseUser`), as consumers should use `TypedUser` instead. `TypedUser`
will automatically fall back to `BaseUser` if no generated types exists,
but will accept passing it a generated-types User.

Without this change, additional properties added to the user via
generated-types may cause the user object to not be accepted by
functions that only accept a `User` instead of a `TypedUser`, which is
what failed here.

## Templates: re-generate templates to update generated types

---
- To see the specific tasks where the Asana app for GitHub is being
used, see below:
  - https://app.asana.com/0/0/1210668927737258

Author: AlessioGr

.github/workflows/main.yml

@@ -1,4 +1,4 @@
-name: build
+name: ci
 
 on:
   pull_request:
@@ -528,7 +528,9 @@ jobs:
   # Build listed templates with packed local packages and then runs their int and e2e tests
   build-and-test-templates:
     runs-on: ubuntu-24.04
-    needs: build
+    needs: [changes, build]
+    if: ${{ needs.changes.outputs.needs_build == 'true' }}
+    name: build-template-${{ matrix.template }}-${{ matrix.database }}
     strategy:
       fail-fast: false
       matrix:
@@ -558,8 +560,6 @@ jobs:
           # - template: with-vercel-website
           #   database: postgres
 
-    name: ${{ matrix.template }}-${{ matrix.database }}
-
     env:
       POSTGRES_USER: postgres
       POSTGRES_PASSWORD: postgres

packages/next/src/utilities/initPage/handleAuthRedirect.ts

@@ -1,4 +1,4 @@
-import type { User } from 'payload'
+import type { TypedUser } from 'payload'
 
 import { formatAdminURL } from 'payload/shared'
 import * as qs from 'qs-esm'
@@ -7,7 +7,7 @@ type Args = {
   config
   route: string
   searchParams: { [key: string]: string | string[] }
-  user?: User
+  user?: TypedUser
 }
 
 export const handleAuthRedirect = ({ config, route, searchParams, user }: Args): string => {

packages/next/src/utilities/initReq.ts

@@ -6,7 +6,7 @@ import type {
   PayloadRequest,
   SanitizedConfig,
   SanitizedPermissions,
-  User,
+  TypedUser,
 } from 'payload'
 
 import { initI18n } from '@payloadcms/translations'
@@ -37,7 +37,7 @@ type PartialResult = {
   languageCode: AcceptedLanguages
   payload: Payload
   responseHeaders: Headers
-  user: null | User
+  user: null | TypedUser
 }
 
 // Create cache instances for different parts of our application

packages/next/src/views/Account/ResetPreferences/index.tsx

@@ -1,5 +1,5 @@
 'use client'
-import type { User } from 'payload'
+import type { TypedUser } from 'payload'
 
 import { Button, ConfirmationModal, toast, useModal, useTranslation } from '@payloadcms/ui'
 import * as qs from 'qs-esm'
@@ -9,7 +9,7 @@ const confirmResetModalSlug = 'confirm-reset-modal'
 
 export const ResetPreferences: React.FC<{
   readonly apiRoute: string
-  readonly user?: User
+  readonly user?: TypedUser
 }> = ({ apiRoute, user }) => {
   const { openModal } = useModal()
   const { t } = useTranslation()

packages/next/src/views/Account/Settings/index.tsx

@@ -1,5 +1,5 @@
 import type { I18n } from '@payloadcms/translations'
-import type { BasePayload, Config, LanguageOptions, User } from 'payload'
+import type { BasePayload, Config, LanguageOptions, TypedUser } from 'payload'
 
 import { FieldLabel } from '@payloadcms/ui'
 import React from 'react'
@@ -17,7 +17,7 @@ export const Settings: React.FC<{
   readonly languageOptions: LanguageOptions
   readonly payload: BasePayload
   readonly theme: Config['admin']['theme']
-  readonly user?: User
+  readonly user?: TypedUser
 }> = (props) => {
   const { className, i18n, languageOptions, payload, theme, user } = props
 

packages/next/src/views/Version/fetchVersions.ts

@@ -4,8 +4,8 @@ import {
   type PayloadRequest,
   type SelectType,
   type Sort,
+  type TypedUser,
   type TypeWithVersion,
-  type User,
   type Where,
 } from 'payload'
 
@@ -28,7 +28,7 @@ export const fetchVersion = async <TVersionData extends object = object>({
   overrideAccess?: boolean
   req: PayloadRequest
   select?: SelectType
-  user?: User
+  user?: TypedUser
 }): Promise<null | TypeWithVersion<TVersionData>> => {
   try {
     if (collectionSlug) {
@@ -88,7 +88,7 @@ export const fetchVersions = async <TVersionData extends object = object>({
   req: PayloadRequest
   select?: SelectType
   sort?: Sort
-  user?: User
+  user?: TypedUser
   where?: Where
 }): Promise<null | PaginatedDocs<TypeWithVersion<TVersionData>>> => {
   const where: Where = { and: [...(whereFromArgs ? [whereFromArgs] : [])] }
@@ -160,7 +160,7 @@ export const fetchLatestVersion = async <TVersionData extends object = object>({
   req: PayloadRequest
   select?: SelectType
   status: 'draft' | 'published'
-  user?: User
+  user?: TypedUser
   where?: Where
 }): Promise<null | TypeWithVersion<TVersionData>> => {
   const and: Where[] = [

packages/next/src/views/Versions/types.ts

@@ -4,7 +4,7 @@ import type {
   SanitizedCollectionConfig,
   SanitizedConfig,
   SanitizedGlobalConfig,
-  User,
+  TypedUser,
 } from 'payload'
 
 export type DefaultVersionsViewProps = {
@@ -18,6 +18,6 @@ export type DefaultVersionsViewProps = {
   i18n: I18n
   id: number | string
   limit: number
-  user: User
+  user: TypedUser
   versionsData: PaginatedDocs<Document>
 }

packages/payload/src/admin/forms/Field.ts

@@ -1,8 +1,9 @@
 import type { I18nClient } from '@payloadcms/translations'
 import type { MarkOptional } from 'ts-essentials'
 
-import type { SanitizedFieldPermissions, User } from '../../auth/types.js'
+import type { SanitizedFieldPermissions } from '../../auth/types.js'
 import type { ClientBlock, ClientField, Field } from '../../fields/config/types.js'
+import type { TypedUser } from '../../index.js'
 import type { DocumentPreferences } from '../../preferences/types.js'
 import type { Operation, Payload, PayloadRequest } from '../../types/index.js'
 import type {
@@ -90,7 +91,7 @@ export type ServerComponentProps = {
   preferences: DocumentPreferences
   req: PayloadRequest
   siblingData: Data
-  user: User
+  user: TypedUser
   value?: unknown
 }
 

packages/payload/src/auth/operations/login.ts

@@ -5,9 +5,8 @@ import type {
   Collection,
   DataFromCollectionSlug,
 } from '../../collections/config/types.js'
-import type { CollectionSlug } from '../../index.js'
+import type { CollectionSlug, TypedUser } from '../../index.js'
 import type { PayloadRequest, Where } from '../../types/index.js'
-import type { User } from '../types.js'
 
 import { buildAfterOperation } from '../../collections/operations/utils.js'
 import {
@@ -32,7 +31,7 @@ import { resetLoginAttempts } from '../strategies/local/resetLoginAttempts.js'
 export type Result = {
   exp?: number
   token?: string
-  user?: User
+  user?: TypedUser
 }
 
 export type Arguments<TSlug extends CollectionSlug> = {

packages/payload/src/auth/operations/me.ts

@@ -1,8 +1,9 @@
 import { decodeJwt } from 'jose'
 
 import type { Collection } from '../../collections/config/types.js'
+import type { TypedUser } from '../../index.js'
 import type { PayloadRequest } from '../../types/index.js'
-import type { ClientUser, User } from '../types.js'
+import type { ClientUser } from '../types.js'
 
 export type MeOperationResult = {
   collection?: string
@@ -42,7 +43,7 @@ export const meOperation = async (args: Arguments): Promise<MeOperationResult> =
       overrideAccess: false,
       req,
       showHiddenFields: false,
-    })) as User
+    })) as TypedUser
 
     if (user) {
       user.collection = collection.config.slug