Skip to content

Commit edd5952

Browse files
committed
merge
2 parents 22b4583 + 2b10973 commit edd5952

250 files changed

Lines changed: 6813 additions & 4003 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/actions/start-database/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ description: Starts the required database for tests
33

44
inputs:
55
database:
6-
description: 'Database type: mongodb, mongodb-atlas, cosmosdb, documentdb, firestore, postgres, postgres-custom-schema, postgres-uuid, postgres-read-replica, postgres-read-replicas, vercel-postgres-read-replica, sqlite, sqlite-uuid, supabase, d1'
6+
description: 'Database type: mongodb, mongodb-atlas, cosmosdb, documentdb, firestore, postgres, postgres-custom-schema, postgres-uuid, postgres-uuidv7, postgres-read-replica, postgres-read-replicas, vercel-postgres-read-replica, sqlite, sqlite-uuid, sqlite-uuidv7, supabase, d1'
77
required: true
88

99
outputs:

.github/workflows/int.config.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,12 @@ createIntConfig({
1010
'postgres',
1111
'postgres-custom-schema',
1212
'postgres-uuid',
13+
'postgres-uuidv7',
1314
'postgres-read-replica',
1415
'supabase',
1516
'sqlite',
1617
'sqlite-uuid',
18+
'sqlite-uuidv7',
1719
],
1820
shards: 3,
1921
})

CLAUDE.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,20 @@ Payload is a monorepo structured around Next.js, containing the core CMS platfor
7171
- Invalid: `payload.logger.error('message', err)` - don't pass error as second argument
7272
- Use `err` not `error`, use `msg` not `message` in object form
7373

74+
### React Component File Structure
75+
76+
Each React component should have its own named folder:
77+
78+
```
79+
ComponentName/
80+
├── index.tsx # Component implementation
81+
└── index.scss # Styles (if applicable)
82+
```
83+
84+
- **Do:** Create a folder per component with `index.tsx` and `index.scss`
85+
- **Don't:** Place multiple `ComponentName.tsx` files in a single folder with one shared `.scss` file
86+
- Re-export from barrel files (`index.ts`) when grouping related components in a parent directory
87+
7488
### Running Dev Server
7589

7690
- `pnpm run dev` - Start dev server with default config (`test/_community/config.ts`)

CONTRIBUTING.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,9 +134,11 @@ Set `PAYLOAD_DATABASE` in your `.env` file to choose the database adapter:
134134
- `postgres` - PostgreSQL with pgvector and PostGIS
135135
- `postgres-custom-schema` - PostgreSQL with custom schema
136136
- `postgres-uuid` - PostgreSQL with UUID primary keys
137+
- `postgres-uuidv7` - PostgreSQL with UUID V7 primary keys
137138
- `postgres-read-replica` - PostgreSQL with read replica
138139
- `sqlite` - SQLite
139140
- `sqlite-uuid` - SQLite with UUID primary keys
141+
- `sqlite-uuidv7` - SQLite with UUID V7 primary keys
140142
- `supabase` - Supabase (PostgreSQL)
141143
- `d1` - D1 (SQLite)
142144

docs/admin/react-hooks.mdx

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -348,6 +348,17 @@ The `useForm` hook returns an object with the following properties:
348348
value: '',
349349
},
350350
],
351+
[
352+
{
353+
value: "**`getDataByPath`**",
354+
},
355+
{
356+
value: 'Returns form field data for the given field path. Useful when dealing with arrays, blocks, or other form state.',
357+
},
358+
{
359+
value: '',
360+
},
361+
],
351362
[
352363
{
353364
value: "**`setModified`**",

docs/authentication/custom-strategies.mdx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ keywords: authentication, config, configuration, overview, documentation, Conten
1010
This is an advanced feature, so only attempt this if you are an experienced
1111
developer. Otherwise, just let Payload's built-in authentication handle user
1212
auth for you.
13+
14+
**Development Note:** Changes to custom authentication strategies require a full server restart to take effect. Auth strategies are not hot-reloaded during development. Consider using tools like `nodemon` for auto-restart functionality.
1315
</Banner>
1416

1517
### Creating a strategy

docs/configuration/collections.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Collections are also used to achieve [Authentication](../authentication/overview
1212

1313
Collections are the primary way to structure recurring data in your application, such as users, products, pages, posts, and other types of content that you might want to manage. Each Collection can have its own unique [Access Control](../access-control/overview), [Hooks](../hooks/overview), [Admin Options](#admin-options), and more.
1414

15-
To define a Collection Config, use the `collection` property in your [Payload Config](./overview):
15+
To define a Collection Config, use the `collections` property in your [Payload Config](./overview):
1616

1717
```ts
1818
import { buildConfig } from 'payload'

docs/custom-components/dashboard.mdx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,8 +176,6 @@ If you don't define a `defaultLayout`, the collections widget will be automatica
176176

177177
### User Customization
178178

179-
{/* TODO: maybe a good GIF here? */}
180-
181179
Users can customize their dashboard by:
182180

183181
1. Clicking the dashboard dropdown in the breadcrumb

docs/custom-components/root-components.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ The following options are available:
4545
| `header` | An array of Custom Components to be injected above the Payload header. [More details](#header). |
4646
| `logout.Button` | The button displayed in the sidebar that logs the user out. [More details](#logoutbutton). |
4747
| `Nav` | Contains the sidebar / mobile menu in its entirety. [More details](#nav). |
48-
| `settingsMenu` | An array of Custom Components to inject into a popup menu accessible via a gear icon above the logout button. [More details](#settingsMenu). |
48+
| `settingsMenu` | An array of Custom Components to inject into a popup menu accessible via a gear icon above the logout button. [More details](#settingsmenu). |
4949
| `providers` | Custom [React Context](https://react.dev/learn/scaling-up-with-reducer-and-context) providers that will wrap the entire Admin Panel. [More details](./custom-providers). |
5050
| `views` | Override or create new views within the Admin Panel. [More details](./custom-views). |
5151

docs/database/migrations.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ A common set of scripts in a `package.json`, set up to run migrations in CI, mig
245245
```js
246246
"scripts": {
247247
// For running in dev mode
248-
"dev": "next dev --turbo --no-server-fast-refresh",
248+
"dev": "next dev",
249249

250250
// To build your Next + Payload app for production
251251
"build": "next build",

0 commit comments

Comments
 (0)