hash
stringlengths 40
40
| date
stringdate 2020-04-17 22:01:00
2025-03-21 18:34:11
| author
stringclasses 90
values | commit_message
stringlengths 9
197
| is_merge
bool 1
class | masked_commit_message
stringlengths 4
170
| type
stringclasses 8
values | git_diff
stringlengths 160
5.96M
⌀ |
|---|---|---|---|---|---|---|---|
f7ce0c615d76035ee48ef32047613ab1415deb44
|
2022-12-01 08:48:37
|
Jarrod Flesch
|
feat: decouples limit from pagination, allows for no limit query
| false
|
decouples limit from pagination, allows for no limit query
|
feat
|
diff --git a/src/collections/operations/find.ts b/src/collections/operations/find.ts
index 7867d7e713f..3ba04c4a7f0 100644
--- a/src/collections/operations/find.ts
+++ b/src/collections/operations/find.ts
@@ -10,6 +10,7 @@ import { buildSortParam } from '../../mongoose/buildSortParam';
import replaceWithDraftIfAvailable from '../../versions/drafts/replaceWithDraftIfAvailable';
import { AccessResult } from '../../config/types';
import { afterRead } from '../../fields/hooks/afterRead';
+import { findDocs } from './helpers/findDocs';
export type Arguments = {
collection: Collection
@@ -136,7 +137,7 @@ async function find<T extends TypeWithID = any>(incomingArgs: Arguments): Promis
locale,
});
- const optionsToExecute = {
+ const paginatedDocs = await findDocs<T>(Model, query, {
page: page || 1,
limit: limit || 10,
sort: {
@@ -147,18 +148,16 @@ async function find<T extends TypeWithID = any>(incomingArgs: Arguments): Promis
useEstimatedCount,
pagination,
useCustomCountFn: pagination ? undefined : () => Promise.resolve(1),
- };
-
- const paginatedDocs = await Model.paginate(query, optionsToExecute);
+ });
- let result = {
+ let result: PaginatedDocs<T> = {
...paginatedDocs,
docs: paginatedDocs.docs.map((doc) => {
const sanitizedDoc = JSON.parse(JSON.stringify(doc));
sanitizedDoc.id = sanitizedDoc._id;
return sanitizeInternalFields(sanitizedDoc);
}),
- } as PaginatedDocs<T>;
+ };
// /////////////////////////////////////
// Replace documents with drafts if available
diff --git a/src/collections/operations/findVersions.ts b/src/collections/operations/findVersions.ts
index 6b6ed8ac424..9005f49c23b 100644
--- a/src/collections/operations/findVersions.ts
+++ b/src/collections/operations/findVersions.ts
@@ -10,6 +10,7 @@ import { PaginatedDocs } from '../../mongoose/types';
import { TypeWithVersion } from '../../versions/types';
import { afterRead } from '../../fields/hooks/afterRead';
import { buildVersionCollectionFields } from '../../versions/buildCollectionFields';
+import { findDocs } from './helpers/findDocs';
export type Arguments = {
collection: Collection
@@ -98,7 +99,7 @@ async function findVersions<T extends TypeWithVersion<T> = any>(args: Arguments)
locale,
});
- const optionsToExecute = {
+ const paginatedDocs = await findDocs<T>(VersionsModel, query, {
page: page || 1,
limit: limit || 10,
sort: {
@@ -107,9 +108,7 @@ async function findVersions<T extends TypeWithVersion<T> = any>(args: Arguments)
lean: true,
leanWithId: true,
useEstimatedCount,
- };
-
- const paginatedDocs = await VersionsModel.paginate(query, optionsToExecute);
+ });
// /////////////////////////////////////
// beforeRead - Collection
diff --git a/src/collections/operations/helpers/findDocs.ts b/src/collections/operations/helpers/findDocs.ts
new file mode 100644
index 00000000000..4bb0a19d645
--- /dev/null
+++ b/src/collections/operations/helpers/findDocs.ts
@@ -0,0 +1,44 @@
+import { PaginatedDocs } from '../../../mongoose/types';
+import { CollectionModel } from '../../config/types';
+import { Arguments } from '../find';
+
+type FindDocsArguments = ({
+ page: Arguments['page']
+ limit: Arguments['limit']
+ sort: {
+ [key: string]: string,
+ }
+}) & ({
+ pagination?: false
+} | {
+ pagination: true
+ lean?: boolean
+ leanWithId?: boolean
+ useEstimatedCount?: boolean
+ useCustomCountFn?: (() => Promise<number>) | undefined;
+})
+
+export async function findDocs<T>(Model: CollectionModel, query: Record<string, unknown>, args: FindDocsArguments): Promise<PaginatedDocs<T>> {
+ // /////////////////////////////////////
+ // Model.paginate ignores limit when paginate is true
+ // pass limit=0 or pagination=false to skip
+ // /////////////////////////////////////
+ if (args.limit !== 0 && args.pagination) {
+ return Model.paginate(query, args);
+ }
+
+ const docs = await Model.find(query, undefined, args);
+
+ return {
+ docs,
+ totalDocs: docs.length,
+ totalPages: 1,
+ page: undefined,
+ nextPage: null,
+ prevPage: null,
+ pagingCounter: 0,
+ hasNextPage: null,
+ hasPrevPage: null,
+ limit: args.limit || null,
+ };
+}
diff --git a/src/globals/operations/findVersions.ts b/src/globals/operations/findVersions.ts
index 3feb2bce28a..96a883185ea 100644
--- a/src/globals/operations/findVersions.ts
+++ b/src/globals/operations/findVersions.ts
@@ -10,6 +10,7 @@ import { TypeWithVersion } from '../../versions/types';
import { SanitizedGlobalConfig } from '../config/types';
import { afterRead } from '../../fields/hooks/afterRead';
import { buildVersionGlobalFields } from '../../versions/buildGlobalFields';
+import { findDocs } from '../../collections/operations/helpers/findDocs';
export type Arguments = {
globalConfig: SanitizedGlobalConfig
@@ -96,7 +97,7 @@ async function findVersions<T extends TypeWithVersion<T> = any>(args: Arguments)
locale,
});
- const optionsToExecute = {
+ const paginatedDocs = await findDocs<T>(VersionsModel, query, {
page: page || 1,
limit: limit || 10,
sort: {
@@ -105,9 +106,7 @@ async function findVersions<T extends TypeWithVersion<T> = any>(args: Arguments)
lean: true,
leanWithId: true,
useEstimatedCount,
- };
-
- const paginatedDocs = await VersionsModel.paginate(query, optionsToExecute);
+ });
// /////////////////////////////////////
// afterRead - Fields
|
5ef2e35685aaf1abdd23c0b1eccfb602bb5acdfa
|
2024-03-16 00:41:04
|
Elliot DeNolf
|
test: fix mongodb destroy
| false
|
fix mongodb destroy
|
test
|
diff --git a/packages/db-mongodb/package.json b/packages/db-mongodb/package.json
index 17ff7e3014d..9113471a710 100644
--- a/packages/db-mongodb/package.json
+++ b/packages/db-mongodb/package.json
@@ -35,7 +35,7 @@
"@payloadcms/eslint-config": "workspace:*",
"@types/mongoose-aggregate-paginate-v2": "1.0.9",
"mongodb": "4.17.1",
- "mongodb-memory-server": "8.13.0",
+ "mongodb-memory-server": "^9",
"payload": "workspace:*"
},
"peerDependencies": {
diff --git a/packages/db-mongodb/src/destroy.ts b/packages/db-mongodb/src/destroy.ts
index fc62ce08a37..9e9888ae5b1 100644
--- a/packages/db-mongodb/src/destroy.ts
+++ b/packages/db-mongodb/src/destroy.ts
@@ -6,9 +6,10 @@ import type { MongooseAdapter } from './index.js'
export const destroy: Destroy = async function destroy(this: MongooseAdapter) {
if (this.mongoMemoryServer) {
- this.mongoMemoryServer.stop()
+ await this.mongoMemoryServer.stop()
+ } else {
+ await mongoose.disconnect()
}
- await mongoose.disconnect()
Object.keys(mongoose.models).map((model) => mongoose.deleteModel(model))
}
diff --git a/packages/db-mongodb/src/index.ts b/packages/db-mongodb/src/index.ts
index dad0ef9a0cc..cfe7f122734 100644
--- a/packages/db-mongodb/src/index.ts
+++ b/packages/db-mongodb/src/index.ts
@@ -1,4 +1,5 @@
import type { TransactionOptions } from 'mongodb'
+import type { MongoMemoryReplSet } from 'mongodb-memory-server'
import type { ClientSession, ConnectOptions, Connection } from 'mongoose'
import type { Payload } from 'payload'
import type { BaseDatabaseAdapter, DatabaseAdapterObj } from 'payload/database'
@@ -52,7 +53,7 @@ export interface Args {
/**
* typed as any to avoid dependency
*/
- mongoMemoryServer?: any
+ mongoMemoryServer?: MongoMemoryReplSet
transactionOptions?: TransactionOptions | false
/** The URL to connect to MongoDB or false to start payload and prevent connecting */
url: false | string
@@ -65,7 +66,7 @@ export type MongooseAdapter = BaseDatabaseAdapter &
}
connection: Connection
globals: GlobalModel
- mongoMemoryServer: any
+ mongoMemoryServer: MongoMemoryReplSet
sessions: Record<number | string, ClientSession>
versions: {
[slug: string]: CollectionModel
@@ -81,7 +82,7 @@ declare module 'payload' {
}
connection: Connection
globals: GlobalModel
- mongoMemoryServer: any
+ mongoMemoryServer: MongoMemoryReplSet
sessions: Record<number | string, ClientSession>
transactionOptions: TransactionOptions
versions: {
|
4bb5e4ecbc60e00edd502eed7b3b37b84dc5236b
|
2024-12-04 01:08:27
|
Paul
|
fix(templates): vercel website template migrations wrong adapter import (#9708)
| false
|
vercel website template migrations wrong adapter import (#9708)
|
fix
| null |
aad2389a2012f89d82eb74754a0f3742f9534f76
|
2023-09-12 02:48:49
|
Alessio Gravili
|
chore: add back missing 'utf-8' flag for exportPointerFiles script
| false
|
add back missing 'utf-8' flag for exportPointerFiles script
|
chore
|
diff --git a/packages/payload/scripts/exportPointerFiles.ts b/packages/payload/scripts/exportPointerFiles.ts
index 45978a58459..6432de6bd0d 100644
--- a/packages/payload/scripts/exportPointerFiles.ts
+++ b/packages/payload/scripts/exportPointerFiles.ts
@@ -97,7 +97,7 @@ getFiles(sourceDir).forEach((filePath) => {
fs.mkdirSync(dir, { recursive: true })
}
- fs.writeFileSync(targetPath, fixImports(path.extname(filePath), fileContent, depth))
+ fs.writeFileSync(targetPath, fixImports(path.extname(filePath), fileContent, depth), 'utf-8')
})
console.log('Export pointer files moved and paths adjusted successfully.')
|
18ee6e88674417250ef995a40df1c397ac936831
|
2024-04-25 22:38:18
|
Elliot DeNolf
|
docs: add docs for email-nodemailer
| false
|
add docs for email-nodemailer
|
docs
|
diff --git a/packages/email-nodemailer/README.md b/packages/email-nodemailer/README.md
index 1740cad35a7..af80e21c7c4 100644
--- a/packages/email-nodemailer/README.md
+++ b/packages/email-nodemailer/README.md
@@ -1 +1,72 @@
-# Nodemailer Email Adapter
+# Nodemailer Email Adapter for Payload
+
+This adapter allows you to send emails using the [Nodemailer](https://nodemailer.com/) library.
+
+It abstracts all of the email functionality that was in Payload by default in 2.x into a separate package.
+
+**NOTE:** Configuring email in Payload 3.0 is now completely optional. However, you will receive a startup warning that email is not configured and also a message if you attempt to send an email.
+
+## Installation
+
+```sh
+pnpm add @payloadcms/email-nodemailer` nodemailer
+```
+
+## Usage
+
+### Using nodemailer.createTransport
+
+```ts
+import { nodemailerAdapter } from '@payloadcms/email-nodemailer'
+import nodemailer from 'nodemailer'
+
+export default buildConfig({
+ email: nodemailerAdapter({
+ defaultFromAddress: '[email protected]',
+ defaultFromName: 'Payload',
+ // Any Nodemailer transport
+ transport: await nodemailer.createTransport({
+ host: process.env.SMTP_HOST,
+ port: 587,
+ auth: {
+ user: process.env.SMTP_USER,
+ pass: process.env.SMTP_PASS,
+ },
+ }),
+ }),
+})
+```
+
+### Using transportOptions
+
+```ts
+import { nodemailerAdapter } from '@payloadcms/email-nodemailer'
+
+export default buildConfig({
+ email: nodemailerAdapter({
+ defaultFromAddress: '[email protected]',
+ defaultFromName: 'Payload',
+ // Nodemailer transportOptions
+ transportOptions: {
+ host: process.env.SMTP_HOST,
+ port: 587,
+ auth: {
+ user: process.env.SMTP_USER,
+ pass: process.env.SMTP_PASS,
+ },
+ },
+ }),
+})
+```
+
+During development, if you pass nothing to `nodemailerAdapter`, it will use the [ethereal.email](https://ethereal.email) service.
+
+This will log the ethereal.email details to console on startup.
+
+```ts
+import { nodemailerAdapter } from '@payloadcms/email-nodemailer'
+
+export default buildConfig({
+ email: nodemailerAdapter(), // This will be the old ethereal.email functionality
+})
+```
|
988c8848e9195f5b5d845fe397b41c2b1d6b8726
|
2024-08-21 02:11:10
|
Elliot DeNolf
|
chore(release): v3.0.0-beta.88 [skip ci]
| false
|
v3.0.0-beta.88 [skip ci]
|
chore
|
diff --git a/package.json b/package.json
index d63e82938b6..e57ac5bedcc 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "payload-monorepo",
- "version": "3.0.0-beta.87",
+ "version": "3.0.0-beta.88",
"private": true,
"type": "module",
"scripts": {
diff --git a/packages/create-payload-app/package.json b/packages/create-payload-app/package.json
index 2205b448d8b..8e6ed623c0b 100644
--- a/packages/create-payload-app/package.json
+++ b/packages/create-payload-app/package.json
@@ -1,6 +1,6 @@
{
"name": "create-payload-app",
- "version": "3.0.0-beta.87",
+ "version": "3.0.0-beta.88",
"homepage": "https://payloadcms.com",
"repository": {
"type": "git",
diff --git a/packages/db-mongodb/package.json b/packages/db-mongodb/package.json
index eb587337cba..c7b2c61840b 100644
--- a/packages/db-mongodb/package.json
+++ b/packages/db-mongodb/package.json
@@ -1,6 +1,6 @@
{
"name": "@payloadcms/db-mongodb",
- "version": "3.0.0-beta.87",
+ "version": "3.0.0-beta.88",
"description": "The officially supported MongoDB database adapter for Payload",
"homepage": "https://payloadcms.com",
"repository": {
diff --git a/packages/db-postgres/package.json b/packages/db-postgres/package.json
index 6d6a91a1506..e6eb01f76f7 100644
--- a/packages/db-postgres/package.json
+++ b/packages/db-postgres/package.json
@@ -1,6 +1,6 @@
{
"name": "@payloadcms/db-postgres",
- "version": "3.0.0-beta.87",
+ "version": "3.0.0-beta.88",
"description": "The officially supported Postgres database adapter for Payload",
"homepage": "https://payloadcms.com",
"repository": {
diff --git a/packages/db-sqlite/package.json b/packages/db-sqlite/package.json
index 2c1b341afef..1fb08f6b38f 100644
--- a/packages/db-sqlite/package.json
+++ b/packages/db-sqlite/package.json
@@ -1,6 +1,6 @@
{
"name": "@payloadcms/db-sqlite",
- "version": "3.0.0-beta.87",
+ "version": "3.0.0-beta.88",
"description": "The officially supported SQLite database adapter for Payload",
"homepage": "https://payloadcms.com",
"repository": {
diff --git a/packages/drizzle/package.json b/packages/drizzle/package.json
index 7c9005e61b7..8c09df7bb9b 100644
--- a/packages/drizzle/package.json
+++ b/packages/drizzle/package.json
@@ -1,6 +1,6 @@
{
"name": "@payloadcms/drizzle",
- "version": "3.0.0-beta.87",
+ "version": "3.0.0-beta.88",
"description": "A library of shared functions used by different payload database adapters",
"homepage": "https://payloadcms.com",
"repository": {
diff --git a/packages/email-nodemailer/package.json b/packages/email-nodemailer/package.json
index 80cbb02e0b3..7a09ed9e890 100644
--- a/packages/email-nodemailer/package.json
+++ b/packages/email-nodemailer/package.json
@@ -1,6 +1,6 @@
{
"name": "@payloadcms/email-nodemailer",
- "version": "3.0.0-beta.87",
+ "version": "3.0.0-beta.88",
"description": "Payload Nodemailer Email Adapter",
"homepage": "https://payloadcms.com",
"repository": {
diff --git a/packages/email-resend/package.json b/packages/email-resend/package.json
index a151547ab2d..c68494adb9e 100644
--- a/packages/email-resend/package.json
+++ b/packages/email-resend/package.json
@@ -1,6 +1,6 @@
{
"name": "@payloadcms/email-resend",
- "version": "3.0.0-beta.87",
+ "version": "3.0.0-beta.88",
"description": "Payload Resend Email Adapter",
"homepage": "https://payloadcms.com",
"repository": {
diff --git a/packages/graphql/package.json b/packages/graphql/package.json
index dbae19a946c..8dbfb6ae24a 100644
--- a/packages/graphql/package.json
+++ b/packages/graphql/package.json
@@ -1,6 +1,6 @@
{
"name": "@payloadcms/graphql",
- "version": "3.0.0-beta.87",
+ "version": "3.0.0-beta.88",
"homepage": "https://payloadcms.com",
"repository": {
"type": "git",
diff --git a/packages/live-preview-react/package.json b/packages/live-preview-react/package.json
index 50feb2771b5..dbda33e6484 100644
--- a/packages/live-preview-react/package.json
+++ b/packages/live-preview-react/package.json
@@ -1,6 +1,6 @@
{
"name": "@payloadcms/live-preview-react",
- "version": "3.0.0-beta.87",
+ "version": "3.0.0-beta.88",
"description": "The official React SDK for Payload Live Preview",
"homepage": "https://payloadcms.com",
"repository": {
diff --git a/packages/live-preview-vue/package.json b/packages/live-preview-vue/package.json
index c0102ce14eb..30b4bd617a2 100644
--- a/packages/live-preview-vue/package.json
+++ b/packages/live-preview-vue/package.json
@@ -1,6 +1,6 @@
{
"name": "@payloadcms/live-preview-vue",
- "version": "3.0.0-beta.87",
+ "version": "3.0.0-beta.88",
"description": "The official Vue SDK for Payload Live Preview",
"homepage": "https://payloadcms.com",
"repository": {
diff --git a/packages/live-preview/package.json b/packages/live-preview/package.json
index b5deacef1b3..a077f491063 100644
--- a/packages/live-preview/package.json
+++ b/packages/live-preview/package.json
@@ -1,6 +1,6 @@
{
"name": "@payloadcms/live-preview",
- "version": "3.0.0-beta.87",
+ "version": "3.0.0-beta.88",
"description": "The official live preview JavaScript SDK for Payload",
"homepage": "https://payloadcms.com",
"repository": {
diff --git a/packages/next/package.json b/packages/next/package.json
index 05371a6de47..50c6e461be2 100644
--- a/packages/next/package.json
+++ b/packages/next/package.json
@@ -1,6 +1,6 @@
{
"name": "@payloadcms/next",
- "version": "3.0.0-beta.87",
+ "version": "3.0.0-beta.88",
"homepage": "https://payloadcms.com",
"repository": {
"type": "git",
diff --git a/packages/payload/package.json b/packages/payload/package.json
index c89c1dcac78..bad49b1a472 100644
--- a/packages/payload/package.json
+++ b/packages/payload/package.json
@@ -1,6 +1,6 @@
{
"name": "payload",
- "version": "3.0.0-beta.87",
+ "version": "3.0.0-beta.88",
"description": "Node, React, Headless CMS and Application Framework built on Next.js",
"keywords": [
"admin panel",
diff --git a/packages/plugin-cloud-storage/package.json b/packages/plugin-cloud-storage/package.json
index 742523c35be..ab2109f487b 100644
--- a/packages/plugin-cloud-storage/package.json
+++ b/packages/plugin-cloud-storage/package.json
@@ -1,6 +1,6 @@
{
"name": "@payloadcms/plugin-cloud-storage",
- "version": "3.0.0-beta.87",
+ "version": "3.0.0-beta.88",
"description": "The official cloud storage plugin for Payload CMS",
"homepage": "https://payloadcms.com",
"repository": {
diff --git a/packages/plugin-cloud/package.json b/packages/plugin-cloud/package.json
index 292aed04cdc..2bb34731da0 100644
--- a/packages/plugin-cloud/package.json
+++ b/packages/plugin-cloud/package.json
@@ -1,6 +1,6 @@
{
"name": "@payloadcms/plugin-cloud",
- "version": "3.0.0-beta.87",
+ "version": "3.0.0-beta.88",
"description": "The official Payload Cloud plugin",
"homepage": "https://payloadcms.com",
"repository": {
diff --git a/packages/plugin-form-builder/package.json b/packages/plugin-form-builder/package.json
index 8a3f8150e0b..ce41a04bd08 100644
--- a/packages/plugin-form-builder/package.json
+++ b/packages/plugin-form-builder/package.json
@@ -1,6 +1,6 @@
{
"name": "@payloadcms/plugin-form-builder",
- "version": "3.0.0-beta.87",
+ "version": "3.0.0-beta.88",
"description": "Form builder plugin for Payload CMS",
"keywords": [
"payload",
diff --git a/packages/plugin-nested-docs/package.json b/packages/plugin-nested-docs/package.json
index ef190fcc6ac..23f0c336e83 100644
--- a/packages/plugin-nested-docs/package.json
+++ b/packages/plugin-nested-docs/package.json
@@ -1,6 +1,6 @@
{
"name": "@payloadcms/plugin-nested-docs",
- "version": "3.0.0-beta.87",
+ "version": "3.0.0-beta.88",
"description": "The official Nested Docs plugin for Payload",
"homepage": "https://payloadcms.com",
"repository": {
diff --git a/packages/plugin-redirects/package.json b/packages/plugin-redirects/package.json
index ce6c52c751c..ff7d93c70ce 100644
--- a/packages/plugin-redirects/package.json
+++ b/packages/plugin-redirects/package.json
@@ -1,6 +1,6 @@
{
"name": "@payloadcms/plugin-redirects",
- "version": "3.0.0-beta.87",
+ "version": "3.0.0-beta.88",
"description": "Redirects plugin for Payload",
"keywords": [
"payload",
diff --git a/packages/plugin-relationship-object-ids/package.json b/packages/plugin-relationship-object-ids/package.json
index d57a9983374..faad1017359 100644
--- a/packages/plugin-relationship-object-ids/package.json
+++ b/packages/plugin-relationship-object-ids/package.json
@@ -1,6 +1,6 @@
{
"name": "@payloadcms/plugin-relationship-object-ids",
- "version": "3.0.0-beta.87",
+ "version": "3.0.0-beta.88",
"description": "A Payload plugin to store all relationship IDs as ObjectIDs",
"repository": {
"type": "git",
diff --git a/packages/plugin-search/package.json b/packages/plugin-search/package.json
index c2e115a7215..491499a4224 100644
--- a/packages/plugin-search/package.json
+++ b/packages/plugin-search/package.json
@@ -1,6 +1,6 @@
{
"name": "@payloadcms/plugin-search",
- "version": "3.0.0-beta.87",
+ "version": "3.0.0-beta.88",
"description": "Search plugin for Payload",
"keywords": [
"payload",
diff --git a/packages/plugin-seo/package.json b/packages/plugin-seo/package.json
index 547ce5f37cd..94f8b48988d 100644
--- a/packages/plugin-seo/package.json
+++ b/packages/plugin-seo/package.json
@@ -1,6 +1,6 @@
{
"name": "@payloadcms/plugin-seo",
- "version": "3.0.0-beta.87",
+ "version": "3.0.0-beta.88",
"description": "SEO plugin for Payload",
"keywords": [
"payload",
diff --git a/packages/plugin-stripe/package.json b/packages/plugin-stripe/package.json
index 47227e677a5..ab90463e7f5 100644
--- a/packages/plugin-stripe/package.json
+++ b/packages/plugin-stripe/package.json
@@ -1,6 +1,6 @@
{
"name": "@payloadcms/plugin-stripe",
- "version": "3.0.0-beta.87",
+ "version": "3.0.0-beta.88",
"description": "Stripe plugin for Payload",
"keywords": [
"payload",
diff --git a/packages/richtext-lexical/package.json b/packages/richtext-lexical/package.json
index 3ceb116d6e7..e41c429353c 100644
--- a/packages/richtext-lexical/package.json
+++ b/packages/richtext-lexical/package.json
@@ -1,6 +1,6 @@
{
"name": "@payloadcms/richtext-lexical",
- "version": "3.0.0-beta.87",
+ "version": "3.0.0-beta.88",
"description": "The officially supported Lexical richtext adapter for Payload",
"homepage": "https://payloadcms.com",
"repository": {
diff --git a/packages/richtext-slate/package.json b/packages/richtext-slate/package.json
index 794c28b1bd3..2f4aafab755 100644
--- a/packages/richtext-slate/package.json
+++ b/packages/richtext-slate/package.json
@@ -1,6 +1,6 @@
{
"name": "@payloadcms/richtext-slate",
- "version": "3.0.0-beta.87",
+ "version": "3.0.0-beta.88",
"description": "The officially supported Slate richtext adapter for Payload",
"homepage": "https://payloadcms.com",
"repository": {
diff --git a/packages/storage-azure/package.json b/packages/storage-azure/package.json
index ad1c02472b1..ed9ae110b8c 100644
--- a/packages/storage-azure/package.json
+++ b/packages/storage-azure/package.json
@@ -1,6 +1,6 @@
{
"name": "@payloadcms/storage-azure",
- "version": "3.0.0-beta.87",
+ "version": "3.0.0-beta.88",
"description": "Payload storage adapter for Azure Blob Storage",
"homepage": "https://payloadcms.com",
"repository": {
diff --git a/packages/storage-gcs/package.json b/packages/storage-gcs/package.json
index f551c0b2cf8..28ff8fadb20 100644
--- a/packages/storage-gcs/package.json
+++ b/packages/storage-gcs/package.json
@@ -1,6 +1,6 @@
{
"name": "@payloadcms/storage-gcs",
- "version": "3.0.0-beta.87",
+ "version": "3.0.0-beta.88",
"description": "Payload storage adapter for Google Cloud Storage",
"homepage": "https://payloadcms.com",
"repository": {
diff --git a/packages/storage-s3/package.json b/packages/storage-s3/package.json
index a47c14b9062..2681c6533a3 100644
--- a/packages/storage-s3/package.json
+++ b/packages/storage-s3/package.json
@@ -1,6 +1,6 @@
{
"name": "@payloadcms/storage-s3",
- "version": "3.0.0-beta.87",
+ "version": "3.0.0-beta.88",
"description": "Payload storage adapter for Amazon S3",
"homepage": "https://payloadcms.com",
"repository": {
diff --git a/packages/storage-uploadthing/package.json b/packages/storage-uploadthing/package.json
index 776d120b3ac..cab616840b4 100644
--- a/packages/storage-uploadthing/package.json
+++ b/packages/storage-uploadthing/package.json
@@ -1,6 +1,6 @@
{
"name": "@payloadcms/storage-uploadthing",
- "version": "3.0.0-beta.87",
+ "version": "3.0.0-beta.88",
"description": "Payload storage adapter for uploadthing",
"homepage": "https://payloadcms.com",
"repository": {
diff --git a/packages/storage-vercel-blob/package.json b/packages/storage-vercel-blob/package.json
index c4063110b01..84303ea74ac 100644
--- a/packages/storage-vercel-blob/package.json
+++ b/packages/storage-vercel-blob/package.json
@@ -1,6 +1,6 @@
{
"name": "@payloadcms/storage-vercel-blob",
- "version": "3.0.0-beta.87",
+ "version": "3.0.0-beta.88",
"description": "Payload storage adapter for Vercel Blob Storage",
"homepage": "https://payloadcms.com",
"repository": {
diff --git a/packages/translations/package.json b/packages/translations/package.json
index 9ec9533ca7d..ed8b3a8dfdb 100644
--- a/packages/translations/package.json
+++ b/packages/translations/package.json
@@ -1,6 +1,6 @@
{
"name": "@payloadcms/translations",
- "version": "3.0.0-beta.87",
+ "version": "3.0.0-beta.88",
"homepage": "https://payloadcms.com",
"repository": {
"type": "git",
diff --git a/packages/ui/package.json b/packages/ui/package.json
index 904a47ca730..cb7bd095cc2 100644
--- a/packages/ui/package.json
+++ b/packages/ui/package.json
@@ -1,6 +1,6 @@
{
"name": "@payloadcms/ui",
- "version": "3.0.0-beta.87",
+ "version": "3.0.0-beta.88",
"homepage": "https://payloadcms.com",
"repository": {
"type": "git",
|
c661ac2e8a26251e77c558e00ed3c32741d2d385
|
2023-03-02 21:35:25
|
Richard van Heuven van Staereling
|
fix: pass result of previous hook into next hook
| false
|
pass result of previous hook into next hook
|
fix
|
diff --git a/src/collections/operations/find.ts b/src/collections/operations/find.ts
index aac81334425..d2a3f6a320c 100644
--- a/src/collections/operations/find.ts
+++ b/src/collections/operations/find.ts
@@ -233,7 +233,7 @@ async function find<T extends TypeWithID & Record<string, unknown>>(
await collectionConfig.hooks.afterRead.reduce(async (priorHook, hook) => {
await priorHook;
- docRef = await hook({ req, query, doc, findMany: true }) || doc;
+ docRef = await hook({ req, query, doc: docRef, findMany: true }) || doc;
}, Promise.resolve());
return docRef;
|
682e96141635f29bdb4c38932888981e344fd7cd
|
2024-03-26 02:47:13
|
Alessio Gravili
|
chore: run lexical e2e's in CI, adjust runE2E to allow running just the fields/lexical.e2e.spec.ts
| false
|
run lexical e2e's in CI, adjust runE2E to allow running just the fields/lexical.e2e.spec.ts
|
chore
|
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 985be41b19e..f876ec819d6 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -223,6 +223,7 @@ jobs:
# - field-error-states
# - fields-relationship
# - fields
+ - fields/lexical
- live-preview
# - localization
# - plugin-nested-docs
diff --git a/test/runE2E.ts b/test/runE2E.ts
index af5faf8b892..81dba165e3d 100644
--- a/test/runE2E.ts
+++ b/test/runE2E.ts
@@ -53,7 +53,14 @@ if (!suiteName) {
} else {
// Run specific suite
clearWebpackCache()
- const suitePath = path.resolve(dirname, suiteName, 'e2e.spec.ts')
+ let suitePath: string
+ if (suiteName.includes('/')) {
+ // Used for fields/lexical.e2e.spec.ts which is run from CI as fields/lexical
+ const suiteNameSplit = suiteName.split('/')
+ suitePath = path.resolve(dirname, suiteNameSplit[0], suiteNameSplit[1] + '.e2e.spec.ts')
+ } else {
+ suitePath = path.resolve(dirname, suiteName, 'e2e.spec.ts')
+ }
executePlaywright(suitePath)
}
|
99d9e193cec0038bca6bc9207a5291ca4368a637
|
2021-07-02 00:18:02
|
James
|
chore(release): v0.7.3
| false
|
v0.7.3
|
chore
|
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3d263ec8452..0facef5f1c1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,15 @@
+## [0.7.3](https://github.com/payloadcms/payload/compare/v0.7.2...v0.7.3) (2021-07-01)
+
+
+### Bug Fixes
+
+* changes scss imports to allow vars imports to payload projects ([ea80fd6](https://github.com/payloadcms/payload/commit/ea80fd68b14139cb01259a47ea597d33526d0c76))
+
+
+### Features
+
+* export all field prop types for custom components ([5bea9ae](https://github.com/payloadcms/payload/commit/5bea9ae1263f1d93e8b011ae97bb067a8c9bb4e1))
+
## [0.7.2](https://github.com/payloadcms/payload/compare/v0.7.1...v0.7.2) (2021-06-22)
diff --git a/package.json b/package.json
index fe9e89b4913..00c8ed7f0ce 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "payload",
- "version": "0.7.2",
+ "version": "0.7.3",
"description": "Node, React and MongoDB Headless CMS and Application Framework",
"license": "SEE LICENSE IN license.md",
"author": {
|
f5a63998cefe9e095362febbed698814988937a5
|
2023-12-22 18:30:58
|
Jarrod Flesch
|
chore: removes old files
| false
|
removes old files
|
chore
|
diff --git a/packages/dev/src/app/(payload)/api/[collection]/access/route.ts b/packages/dev/src/app/(payload)/api/[collection]/access/route.ts
deleted file mode 100644
index d68b69d2cbb..00000000000
--- a/packages/dev/src/app/(payload)/api/[collection]/access/route.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-/* THIS FILE WAS GENERATED AUTOMATICALLY BY PAYLOAD. */
-/* DO NOT MODIFY it because it could be re-written at any time. */
-import { access } from '@payloadcms/next/routes/[collection]/access'
-import config from 'payload-config'
-
-export const GET = (request, context) => access({ config, collection: context.params.collection })
diff --git a/packages/dev/src/app/(payload)/api/access/route.ts b/packages/dev/src/app/(payload)/api/access/route.ts
deleted file mode 100644
index 7dd34bd2923..00000000000
--- a/packages/dev/src/app/(payload)/api/access/route.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-/* THIS FILE WAS GENERATED AUTOMATICALLY BY PAYLOAD. */
-/* DO NOT MODIFY it because it could be re-written at any time. */
-import { access } from '@payloadcms/next/routes/access'
-import config from 'payload-config'
-
-export const GET = access({ config })
diff --git a/packages/dev/src/app/(payload)/api/globals/[global]/access/route.ts b/packages/dev/src/app/(payload)/api/globals/[global]/access/route.ts
deleted file mode 100644
index 09f2e305d1a..00000000000
--- a/packages/dev/src/app/(payload)/api/globals/[global]/access/route.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-/* THIS FILE WAS GENERATED AUTOMATICALLY BY PAYLOAD. */
-/* DO NOT MODIFY it because it could be re-written at any time. */
-import { access } from '@payloadcms/next/routes/globals/[global]/access'
-import config from 'payload-config'
-
-export const GET = (request, context) => access({ config, global: context.params.global })
diff --git a/packages/next/src/routes/[collection]/access.ts b/packages/next/src/routes/[collection]/access.ts
deleted file mode 100644
index 1df26ac80cd..00000000000
--- a/packages/next/src/routes/[collection]/access.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import type { SanitizedConfig } from 'payload/types'
-import { createPayloadRequest } from '../../createPayloadRequest'
-import { docAccess } from 'payload/dist/collections/operations/docAccess'
-
-export const access = ({ config }: { config: Promise<SanitizedConfig>; collection?: string }) =>
- async function (request: Request, { params }: { params: { collection: string } }) {
- const req = await createPayloadRequest({ request, config })
- const collectionConfig = await config.then((config) =>
- config.collections.find((collection) => collection.slug === params.collection),
- )
- const accessRes = await docAccess({
- id: params.collection,
- req: {
- ...req,
- collection: {
- config: collectionConfig,
- },
- },
- })
-
- return Response.json(accessRes)
- }
diff --git a/packages/next/src/routes/access.ts b/packages/next/src/routes/access.ts
deleted file mode 100644
index b84d3c819d9..00000000000
--- a/packages/next/src/routes/access.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import type { SanitizedConfig } from 'payload/types'
-import { getAccessResults } from 'payload/auth'
-import { createPayloadRequest } from '../utilities/createPayloadRequest'
-
-export const access = ({
- config,
-}: {
- config: Promise<SanitizedConfig>
- collection?: string
- global?: string
-}) =>
- async function (
- request: Request,
- { params }: { params: { collection: string; global: string } },
- ) {
- const req = await createPayloadRequest({ request, config })
- const accessRes = await getAccessResults({ req })
- return Response.json(accessRes)
- }
|
60cf803e8d8289761e2abf3680c1bb53456645e9
|
2023-04-28 01:58:16
|
James
|
fix: #43, not deleting old files
| false
|
#43, not deleting old files
|
fix
|
diff --git a/dev/package.json b/dev/package.json
index d682ef04b01..a9f5cdf8876 100644
--- a/dev/package.json
+++ b/dev/package.json
@@ -21,7 +21,7 @@
"dotenv": "^8.2.0",
"express": "^4.17.1",
"image-size": "^1.0.2",
- "payload": "^1.6.6",
+ "payload": "^1.7.2",
"probe-image-size": "^7.2.3"
},
"devDependencies": {
diff --git a/package.json b/package.json
index 1f62aef0d1a..1c69744bfb8 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,7 @@
"@aws-sdk/lib-storage": "^3.267.0",
"@azure/storage-blob": "^12.11.0",
"@google-cloud/storage": "^6.4.1",
- "payload": "^1.0.27"
+ "payload": "^1.7.2"
},
"peerDependenciesMeta": {
"@aws-sdk/client-s3": {
@@ -55,7 +55,7 @@
"eslint-plugin-import": "2.25.4",
"eslint-plugin-prettier": "^4.0.0",
"nodemon": "^2.0.6",
- "payload": "^1.6.6",
+ "payload": "^1.7.2",
"prettier": "^2.7.1",
"rimraf": "^4.1.2",
"ts-node": "^9.1.1",
@@ -64,4 +64,4 @@
"dependencies": {
"range-parser": "^1.2.1"
}
-}
+}
\ No newline at end of file
diff --git a/src/hooks/beforeChange.ts b/src/hooks/beforeChange.ts
index 71779a0dac7..829d168de61 100644
--- a/src/hooks/beforeChange.ts
+++ b/src/hooks/beforeChange.ts
@@ -11,15 +11,44 @@ interface Args {
export const getBeforeChangeHook =
({ collection, adapter }: Args): CollectionBeforeChangeHook<FileData & TypeWithID> =>
- async ({ req, data }) => {
+ async ({ req, data, originalDoc }) => {
try {
const files = getIncomingFiles({ req, data })
- const promises = files.map(async file => {
- await adapter.handleUpload({ collection, data, req, file })
- })
+ if (files.length > 0) {
+ // If there is an original doc,
+ // And we have new files,
+ // We need to delete the old files before uploading new
+ if (originalDoc) {
+ let filesToDelete: string[] = []
- await Promise.all(promises)
+ if (typeof originalDoc?.filename === 'string') {
+ filesToDelete.push(originalDoc.filename)
+ }
+
+ if (typeof originalDoc.sizes === 'object') {
+ filesToDelete = filesToDelete.concat(
+ Object.values(originalDoc?.sizes || []).map(
+ resizedFileData => resizedFileData?.filename,
+ ),
+ )
+ }
+
+ const deletionPromises = filesToDelete.map(async filename => {
+ if (filename) {
+ await adapter.handleDelete({ collection, doc: originalDoc, req, filename })
+ }
+ })
+
+ await Promise.all(deletionPromises)
+ }
+
+ const promises = files.map(async file => {
+ await adapter.handleUpload({ collection, data, req, file })
+ })
+
+ await Promise.all(promises)
+ }
} catch (err: unknown) {
req.payload.logger.error(
`There was an error while uploading files corresponding to the collection ${collection.slug} with filename ${data.filename}:`,
diff --git a/yarn.lock b/yarn.lock
index cd2b208054d..af292540d65 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1093,7 +1093,7 @@
chalk "^2.0.0"
js-tokens "^4.0.0"
-"@babel/runtime@^7.1.2", "@babel/runtime@^7.12.13", "@babel/runtime@^7.14.5", "@babel/runtime@^7.15.4", "@babel/runtime@^7.19.0", "@babel/runtime@^7.20.6", "@babel/runtime@^7.4.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
+"@babel/runtime@^7.1.2", "@babel/runtime@^7.12.13", "@babel/runtime@^7.14.5", "@babel/runtime@^7.19.0", "@babel/runtime@^7.20.6", "@babel/runtime@^7.4.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.7":
version "7.20.13"
resolved "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.13.tgz#7055ab8a7cff2b8f6058bf6ae45ff84ad2aded4b"
integrity sha512-gt3PKXs0DBoL9xCvOIIZ2NEqAGZqHjAnmVbfQtB620V0uReIQutpel14KcneZuer7UioY8ALKZ7iocavvzTNFA==
@@ -1237,7 +1237,7 @@
dependencies:
"@date-io/core" "^2.16.0"
-"@discoveryjs/json-ext@^0.5.0":
+"@discoveryjs/[email protected]", "@discoveryjs/json-ext@^0.5.0":
version "0.5.7"
resolved "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz#1d572bfbbe14b7704e0ba0f39b74815b84870d70"
integrity sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==
@@ -1497,11 +1497,24 @@
"@jridgewell/resolve-uri" "3.1.0"
"@jridgewell/sourcemap-codec" "1.4.14"
+"@jridgewell/trace-mapping@^0.3.17":
+ version "0.3.18"
+ resolved "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.18.tgz#25783b2086daf6ff1dcb53c9249ae480e4dd4cd6"
+ integrity sha512-w+niJYzMHdd7USdiH2U6869nqhD2nbfZXND5Yp93qIbEmnDNk7PD48o+YchRVpzMU7M6jVCbenTR7PA1FLQ9pA==
+ dependencies:
+ "@jridgewell/resolve-uri" "3.1.0"
+ "@jridgewell/sourcemap-codec" "1.4.14"
+
"@jsdevtools/ono@^7.1.3":
version "7.1.3"
resolved "https://registry.npmjs.org/@jsdevtools/ono/-/ono-7.1.3.tgz#9df03bbd7c696a5c58885c34aa06da41c8543796"
integrity sha512-4JQNk+3mVzK3xh2rqd6RB4J46qUR19azEHBneZyTZM+c456qOrbbM/5xcR8huNCCcbVt7+UmizG6GuUvPvKUYg==
+"@juggle/resize-observer@^3.4.0":
+ version "3.4.0"
+ resolved "https://registry.npmjs.org/@juggle/resize-observer/-/resize-observer-3.4.0.tgz#08d6c5e20cf7e4cc02fd181c4b0c225cd31dbb60"
+ integrity sha512-dfLbk+PwWvFzSxwk3n5ySL0hfBog779o8h68wK/7/APo/7cgyWp5jcXockbxdk5kFRkbeXWm4Fbi9FrdN381sA==
+
"@monaco-editor/loader@^1.3.2":
version "1.3.2"
resolved "https://registry.npmjs.org/@monaco-editor/loader/-/loader-1.3.2.tgz#04effbb87052d19cd7d3c9d81c0635490f9bb6d8"
@@ -1696,10 +1709,10 @@
resolved "https://registry.npmjs.org/@types/estree/-/estree-1.0.0.tgz#5fb2e536c1ae9bf35366eed879e827fa59ca41c2"
integrity sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==
-"@types/estree@^0.0.51":
- version "0.0.51"
- resolved "https://registry.npmjs.org/@types/estree/-/estree-0.0.51.tgz#cfd70924a25a3fd32b218e5e420e6897e1ac4f40"
- integrity sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==
+"@types/estree@^1.0.0":
+ version "1.0.1"
+ resolved "https://registry.npmjs.org/@types/estree/-/estree-1.0.1.tgz#aa22750962f3bf0e79d753d3cc067f010c95f194"
+ integrity sha512-LG4opVs2ANWZ1TJoKc937iMmNstM/d0ae1vNbnBvBhqCSezgVUOzcLCqbI5elV8Vy6WKwKjaqR+zO9VKirBBCA==
"@types/express-serve-static-core@^4.17.33":
version "4.17.33"
@@ -1728,14 +1741,6 @@
"@types/minimatch" "*"
"@types/node" "*"
-"@types/hoist-non-react-statics@^3.3.0":
- version "3.3.1"
- resolved "https://registry.npmjs.org/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.1.tgz#1124aafe5118cb591977aeb1ceaaed1070eb039f"
- integrity sha512-iMIqiko6ooLrTh1joXodJK5X9xeEALT1kM5G3ZLhD3hszxBdIEd5C75U834D9mLcINgD4OyZf5uQXjkuYydWvA==
- dependencies:
- "@types/react" "*"
- hoist-non-react-statics "^3.3.0"
-
"@types/html-minifier-terser@^6.0.0":
version "6.1.0"
resolved "https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz#4fc33a00c1d0c16987b1a20cf92d20614c55ac35"
@@ -1794,11 +1799,6 @@
resolved "https://registry.npmjs.org/@types/prettier/-/prettier-2.7.2.tgz#6c2324641cc4ba050a8c710b2b251b377581fbf0"
integrity sha512-KufADq8uQqo1pYKVIYzfKbJfBAc0sOeXqGbFaSpv8MRmC/zXgowNZmFcbngndGk922QDmOASEXUZCaY48gs4cg==
-"@types/prop-types@*":
- version "15.7.5"
- resolved "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.5.tgz#5f19d2b85a98e9558036f6a3cacc8819420f05cf"
- integrity sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w==
-
"@types/qs@*":
version "6.9.7"
resolved "https://registry.npmjs.org/@types/qs/-/qs-6.9.7.tgz#63bb7d067db107cc1e457c303bc25d511febf6cb"
@@ -1809,30 +1809,6 @@
resolved "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.4.tgz#cd667bcfdd025213aafb7ca5915a932590acdcdc"
integrity sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==
-"@types/react-redux@^7.1.20":
- version "7.1.25"
- resolved "https://registry.npmjs.org/@types/react-redux/-/react-redux-7.1.25.tgz#de841631205b24f9dfb4967dd4a7901e048f9a88"
- integrity sha512-bAGh4e+w5D8dajd6InASVIyCo4pZLJ66oLb80F9OBLO1gKESbZcRCJpTT6uLXX+HAB57zw1WTdwJdAsewuTweg==
- dependencies:
- "@types/hoist-non-react-statics" "^3.3.0"
- "@types/react" "*"
- hoist-non-react-statics "^3.3.0"
- redux "^4.0.0"
-
-"@types/react@*":
- version "18.0.27"
- resolved "https://registry.npmjs.org/@types/react/-/react-18.0.27.tgz#d9425abe187a00f8a5ec182b010d4fd9da703b71"
- integrity sha512-3vtRKHgVxu3Jp9t718R9BuzoD4NcQ8YJ5XRzsSKxNDiDonD2MXIT1TmSkenxuCycZJoQT5d2vE8LwWJxBC1gmA==
- dependencies:
- "@types/prop-types" "*"
- "@types/scheduler" "*"
- csstype "^3.0.2"
-
-"@types/scheduler@*":
- version "0.16.2"
- resolved "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.2.tgz#1a62f89525723dde24ba1b01b092bf5df8ad4d39"
- integrity sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew==
-
"@types/serve-static@*":
version "1.15.0"
resolved "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.0.tgz#c7930ff61afb334e121a9da780aac0d9b8f34155"
@@ -1948,125 +1924,125 @@
"@typescript-eslint/types" "5.12.1"
eslint-visitor-keys "^3.0.0"
-"@webassemblyjs/[email protected]":
- version "1.11.1"
- resolved "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz#2bfd767eae1a6996f432ff7e8d7fc75679c0b6a7"
- integrity sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==
+"@webassemblyjs/[email protected]", "@webassemblyjs/ast@^1.11.5":
+ version "1.11.5"
+ resolved "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.5.tgz#6e818036b94548c1fb53b754b5cae3c9b208281c"
+ integrity sha512-LHY/GSAZZRpsNQH+/oHqhRQ5FT7eoULcBqgfyTB5nQHogFnK3/7QoN7dLnwSE/JkUAF0SrRuclT7ODqMFtWxxQ==
dependencies:
- "@webassemblyjs/helper-numbers" "1.11.1"
- "@webassemblyjs/helper-wasm-bytecode" "1.11.1"
+ "@webassemblyjs/helper-numbers" "1.11.5"
+ "@webassemblyjs/helper-wasm-bytecode" "1.11.5"
-"@webassemblyjs/[email protected]":
- version "1.11.1"
- resolved "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz#f6c61a705f0fd7a6aecaa4e8198f23d9dc179e4f"
- integrity sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ==
+"@webassemblyjs/[email protected]":
+ version "1.11.5"
+ resolved "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.5.tgz#e85dfdb01cad16b812ff166b96806c050555f1b4"
+ integrity sha512-1j1zTIC5EZOtCplMBG/IEwLtUojtwFVwdyVMbL/hwWqbzlQoJsWCOavrdnLkemwNoC/EOwtUFch3fuo+cbcXYQ==
-"@webassemblyjs/[email protected]":
- version "1.11.1"
- resolved "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz#1a63192d8788e5c012800ba6a7a46c705288fd16"
- integrity sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg==
+"@webassemblyjs/[email protected]":
+ version "1.11.5"
+ resolved "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.5.tgz#1e82fa7958c681ddcf4eabef756ce09d49d442d1"
+ integrity sha512-L65bDPmfpY0+yFrsgz8b6LhXmbbs38OnwDCf6NpnMUYqa+ENfE5Dq9E42ny0qz/PdR0LJyq/T5YijPnU8AXEpA==
-"@webassemblyjs/[email protected]":
- version "1.11.1"
- resolved "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz#832a900eb444884cde9a7cad467f81500f5e5ab5"
- integrity sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA==
+"@webassemblyjs/[email protected]":
+ version "1.11.5"
+ resolved "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.5.tgz#91381652ea95bb38bbfd270702351c0c89d69fba"
+ integrity sha512-fDKo1gstwFFSfacIeH5KfwzjykIE6ldh1iH9Y/8YkAZrhmu4TctqYjSh7t0K2VyDSXOZJ1MLhht/k9IvYGcIxg==
-"@webassemblyjs/[email protected]":
- version "1.11.1"
- resolved "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz#64d81da219fbbba1e3bd1bfc74f6e8c4e10a62ae"
- integrity sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ==
+"@webassemblyjs/[email protected]":
+ version "1.11.5"
+ resolved "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.5.tgz#23380c910d56764957292839006fecbe05e135a9"
+ integrity sha512-DhykHXM0ZABqfIGYNv93A5KKDw/+ywBFnuWybZZWcuzWHfbp21wUfRkbtz7dMGwGgT4iXjWuhRMA2Mzod6W4WA==
dependencies:
- "@webassemblyjs/floating-point-hex-parser" "1.11.1"
- "@webassemblyjs/helper-api-error" "1.11.1"
+ "@webassemblyjs/floating-point-hex-parser" "1.11.5"
+ "@webassemblyjs/helper-api-error" "1.11.5"
"@xtuc/long" "4.2.2"
-"@webassemblyjs/[email protected]":
- version "1.11.1"
- resolved "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz#f328241e41e7b199d0b20c18e88429c4433295e1"
- integrity sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q==
+"@webassemblyjs/[email protected]":
+ version "1.11.5"
+ resolved "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.5.tgz#e258a25251bc69a52ef817da3001863cc1c24b9f"
+ integrity sha512-oC4Qa0bNcqnjAowFn7MPCETQgDYytpsfvz4ujZz63Zu/a/v71HeCAAmZsgZ3YVKec3zSPYytG3/PrRCqbtcAvA==
-"@webassemblyjs/[email protected]":
- version "1.11.1"
- resolved "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz#21ee065a7b635f319e738f0dd73bfbda281c097a"
- integrity sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg==
+"@webassemblyjs/[email protected]":
+ version "1.11.5"
+ resolved "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.5.tgz#966e855a6fae04d5570ad4ec87fbcf29b42ba78e"
+ integrity sha512-uEoThA1LN2NA+K3B9wDo3yKlBfVtC6rh0i4/6hvbz071E8gTNZD/pT0MsBf7MeD6KbApMSkaAK0XeKyOZC7CIA==
dependencies:
- "@webassemblyjs/ast" "1.11.1"
- "@webassemblyjs/helper-buffer" "1.11.1"
- "@webassemblyjs/helper-wasm-bytecode" "1.11.1"
- "@webassemblyjs/wasm-gen" "1.11.1"
+ "@webassemblyjs/ast" "1.11.5"
+ "@webassemblyjs/helper-buffer" "1.11.5"
+ "@webassemblyjs/helper-wasm-bytecode" "1.11.5"
+ "@webassemblyjs/wasm-gen" "1.11.5"
-"@webassemblyjs/[email protected]":
- version "1.11.1"
- resolved "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz#963929e9bbd05709e7e12243a099180812992614"
- integrity sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ==
+"@webassemblyjs/[email protected]":
+ version "1.11.5"
+ resolved "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.5.tgz#b2db1b33ce9c91e34236194c2b5cba9b25ca9d60"
+ integrity sha512-37aGq6qVL8A8oPbPrSGMBcp38YZFXcHfiROflJn9jxSdSMMM5dS5P/9e2/TpaJuhE+wFrbukN2WI6Hw9MH5acg==
dependencies:
"@xtuc/ieee754" "^1.2.0"
-"@webassemblyjs/[email protected]":
- version "1.11.1"
- resolved "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.1.tgz#ce814b45574e93d76bae1fb2644ab9cdd9527aa5"
- integrity sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw==
+"@webassemblyjs/[email protected]":
+ version "1.11.5"
+ resolved "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.5.tgz#482e44d26b6b949edf042a8525a66c649e38935a"
+ integrity sha512-ajqrRSXaTJoPW+xmkfYN6l8VIeNnR4vBOTQO9HzR7IygoCcKWkICbKFbVTNMjMgMREqXEr0+2M6zukzM47ZUfQ==
dependencies:
"@xtuc/long" "4.2.2"
-"@webassemblyjs/[email protected]":
- version "1.11.1"
- resolved "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.1.tgz#d1f8b764369e7c6e6bae350e854dec9a59f0a3ff"
- integrity sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ==
-
-"@webassemblyjs/[email protected]":
- version "1.11.1"
- resolved "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz#ad206ebf4bf95a058ce9880a8c092c5dec8193d6"
- integrity sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA==
- dependencies:
- "@webassemblyjs/ast" "1.11.1"
- "@webassemblyjs/helper-buffer" "1.11.1"
- "@webassemblyjs/helper-wasm-bytecode" "1.11.1"
- "@webassemblyjs/helper-wasm-section" "1.11.1"
- "@webassemblyjs/wasm-gen" "1.11.1"
- "@webassemblyjs/wasm-opt" "1.11.1"
- "@webassemblyjs/wasm-parser" "1.11.1"
- "@webassemblyjs/wast-printer" "1.11.1"
-
-"@webassemblyjs/[email protected]":
- version "1.11.1"
- resolved "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz#86c5ea304849759b7d88c47a32f4f039ae3c8f76"
- integrity sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA==
- dependencies:
- "@webassemblyjs/ast" "1.11.1"
- "@webassemblyjs/helper-wasm-bytecode" "1.11.1"
- "@webassemblyjs/ieee754" "1.11.1"
- "@webassemblyjs/leb128" "1.11.1"
- "@webassemblyjs/utf8" "1.11.1"
-
-"@webassemblyjs/[email protected]":
- version "1.11.1"
- resolved "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz#657b4c2202f4cf3b345f8a4c6461c8c2418985f2"
- integrity sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw==
- dependencies:
- "@webassemblyjs/ast" "1.11.1"
- "@webassemblyjs/helper-buffer" "1.11.1"
- "@webassemblyjs/wasm-gen" "1.11.1"
- "@webassemblyjs/wasm-parser" "1.11.1"
-
-"@webassemblyjs/[email protected]":
- version "1.11.1"
- resolved "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz#86ca734534f417e9bd3c67c7a1c75d8be41fb199"
- integrity sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA==
- dependencies:
- "@webassemblyjs/ast" "1.11.1"
- "@webassemblyjs/helper-api-error" "1.11.1"
- "@webassemblyjs/helper-wasm-bytecode" "1.11.1"
- "@webassemblyjs/ieee754" "1.11.1"
- "@webassemblyjs/leb128" "1.11.1"
- "@webassemblyjs/utf8" "1.11.1"
-
-"@webassemblyjs/[email protected]":
- version "1.11.1"
- resolved "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz#d0c73beda8eec5426f10ae8ef55cee5e7084c2f0"
- integrity sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg==
- dependencies:
- "@webassemblyjs/ast" "1.11.1"
+"@webassemblyjs/[email protected]":
+ version "1.11.5"
+ resolved "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.5.tgz#83bef94856e399f3740e8df9f63bc47a987eae1a"
+ integrity sha512-WiOhulHKTZU5UPlRl53gHR8OxdGsSOxqfpqWeA2FmcwBMaoEdz6b2x2si3IwC9/fSPLfe8pBMRTHVMk5nlwnFQ==
+
+"@webassemblyjs/wasm-edit@^1.11.5":
+ version "1.11.5"
+ resolved "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.5.tgz#93ee10a08037657e21c70de31c47fdad6b522b2d"
+ integrity sha512-C0p9D2fAu3Twwqvygvf42iGCQ4av8MFBLiTb+08SZ4cEdwzWx9QeAHDo1E2k+9s/0w1DM40oflJOpkZ8jW4HCQ==
+ dependencies:
+ "@webassemblyjs/ast" "1.11.5"
+ "@webassemblyjs/helper-buffer" "1.11.5"
+ "@webassemblyjs/helper-wasm-bytecode" "1.11.5"
+ "@webassemblyjs/helper-wasm-section" "1.11.5"
+ "@webassemblyjs/wasm-gen" "1.11.5"
+ "@webassemblyjs/wasm-opt" "1.11.5"
+ "@webassemblyjs/wasm-parser" "1.11.5"
+ "@webassemblyjs/wast-printer" "1.11.5"
+
+"@webassemblyjs/[email protected]":
+ version "1.11.5"
+ resolved "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.5.tgz#ceb1c82b40bf0cf67a492c53381916756ef7f0b1"
+ integrity sha512-14vteRlRjxLK9eSyYFvw1K8Vv+iPdZU0Aebk3j6oB8TQiQYuO6hj9s4d7qf6f2HJr2khzvNldAFG13CgdkAIfA==
+ dependencies:
+ "@webassemblyjs/ast" "1.11.5"
+ "@webassemblyjs/helper-wasm-bytecode" "1.11.5"
+ "@webassemblyjs/ieee754" "1.11.5"
+ "@webassemblyjs/leb128" "1.11.5"
+ "@webassemblyjs/utf8" "1.11.5"
+
+"@webassemblyjs/[email protected]":
+ version "1.11.5"
+ resolved "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.5.tgz#b52bac29681fa62487e16d3bb7f0633d5e62ca0a"
+ integrity sha512-tcKwlIXstBQgbKy1MlbDMlXaxpucn42eb17H29rawYLxm5+MsEmgPzeCP8B1Cl69hCice8LeKgZpRUAPtqYPgw==
+ dependencies:
+ "@webassemblyjs/ast" "1.11.5"
+ "@webassemblyjs/helper-buffer" "1.11.5"
+ "@webassemblyjs/wasm-gen" "1.11.5"
+ "@webassemblyjs/wasm-parser" "1.11.5"
+
+"@webassemblyjs/[email protected]", "@webassemblyjs/wasm-parser@^1.11.5":
+ version "1.11.5"
+ resolved "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.5.tgz#7ba0697ca74c860ea13e3ba226b29617046982e2"
+ integrity sha512-SVXUIwsLQlc8srSD7jejsfTU83g7pIGr2YYNb9oHdtldSxaOhvA5xwvIiWIfcX8PlSakgqMXsLpLfbbJ4cBYew==
+ dependencies:
+ "@webassemblyjs/ast" "1.11.5"
+ "@webassemblyjs/helper-api-error" "1.11.5"
+ "@webassemblyjs/helper-wasm-bytecode" "1.11.5"
+ "@webassemblyjs/ieee754" "1.11.5"
+ "@webassemblyjs/leb128" "1.11.5"
+ "@webassemblyjs/utf8" "1.11.5"
+
+"@webassemblyjs/[email protected]":
+ version "1.11.5"
+ resolved "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.5.tgz#7a5e9689043f3eca82d544d7be7a8e6373a6fa98"
+ integrity sha512-f7Pq3wvg3GSPUPzR0F6bmI89Hdb+u9WXrSKc4v+N0aV0q6r42WoF92Jp2jEorBEBRoRNXgjp53nBniDXcqZYPA==
+ dependencies:
+ "@webassemblyjs/ast" "1.11.5"
"@xtuc/long" "4.2.2"
"@webpack-cli/configtest@^1.2.0":
@@ -2108,7 +2084,7 @@ abort-controller@^3.0.0:
dependencies:
event-target-shim "^5.0.0"
-accepts@^1.3.7, accepts@~1.3.5, accepts@~1.3.8:
+accepts@~1.3.5, accepts@~1.3.8:
version "1.3.8"
resolved "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz#0bf0be125b67014adcb0b0921e62db7bffe16b2e"
integrity sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==
@@ -2666,10 +2642,10 @@ colord@^2.9.1:
resolved "https://registry.npmjs.org/colord/-/colord-2.9.3.tgz#4f8ce919de456f1d5c1c368c307fe20f3e59fb43"
integrity sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw==
-colorette@^1.2.2:
- version "1.4.0"
- resolved "https://registry.npmjs.org/colorette/-/colorette-1.4.0.tgz#5190fbb87276259a86ad700bff2c6d6faa3fca40"
- integrity sha512-Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g==
+colorette@^2.0.10:
+ version "2.0.20"
+ resolved "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz#9eb793e6833067f7235902fcd3b09917a000a95a"
+ integrity sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==
colorette@^2.0.14, colorette@^2.0.7:
version "2.0.19"
@@ -2761,7 +2737,7 @@ [email protected]:
dependencies:
safe-buffer "5.2.1"
-content-type@^1.0.4, content-type@~1.0.4:
+content-type@~1.0.4:
version "1.0.5"
resolved "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz#8b773162656d1d1086784c8f23a54ce6d73d7918"
integrity sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==
@@ -2846,13 +2822,6 @@ css-blank-pseudo@^3.0.3:
dependencies:
postcss-selector-parser "^6.0.9"
-css-box-model@^1.2.0:
- version "1.2.1"
- resolved "https://registry.npmjs.org/css-box-model/-/css-box-model-1.2.1.tgz#59951d3b81fd6b2074a62d49444415b0d2b4d7c1"
- integrity sha512-a7Vr4Q/kd/aw96bnJG332W9V9LkJO69JRcaCYDUqjp6/z0w6VcZjgAcTbgFxEPfBgdnAwlh3iwu+hLopa+flJw==
- dependencies:
- tiny-invariant "^1.0.6"
-
css-declaration-sorter@^6.3.1:
version "6.3.1"
resolved "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.3.1.tgz#be5e1d71b7a992433fb1c542c7a1b835e45682ec"
@@ -3129,11 +3098,6 @@ [email protected]:
resolved "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df"
integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==
-depd@~1.1.2:
- version "1.1.2"
- resolved "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
- integrity sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==
-
[email protected]:
version "1.2.0"
resolved "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz#4803735509ad8be552934c67df614f94e66fa015"
@@ -3297,10 +3261,10 @@ end-of-stream@^1.1.0, end-of-stream@^1.4.1:
dependencies:
once "^1.4.0"
-enhanced-resolve@^5.10.0:
- version "5.12.0"
- resolved "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.12.0.tgz#300e1c90228f5b570c4d35babf263f6da7155634"
- integrity sha512-QHTXI/sZQmko1cbDoNAa3mJ5qhWUUNAq3vR0/YiD379fWQrcfuoX1+HW2S0MTt7XmoPLapdaDKUtelUSPic7hQ==
+enhanced-resolve@^5.13.0:
+ version "5.13.0"
+ resolved "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.13.0.tgz#26d1ecc448c02de997133217b5c1053f34a0a275"
+ integrity sha512-eyV8f0y1+bzyfh8xAwW/WTSZpLbjhqc4ne9eGSH4Zo2ejdyiNG9pU6mf9DG8a7+Auk6MFTlNOT4Y2y/9k8GKVg==
dependencies:
graceful-fs "^4.2.4"
tapable "^2.2.0"
@@ -3386,10 +3350,10 @@ es-get-iterator@^1.1.2:
isarray "^2.0.5"
stop-iteration-iterator "^1.0.0"
-es-module-lexer@^0.9.0:
- version "0.9.3"
- resolved "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.9.3.tgz#6f13db00cc38417137daf74366f535c8eb438f19"
- integrity sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==
+es-module-lexer@^1.2.1:
+ version "1.2.1"
+ resolved "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.2.1.tgz#ba303831f63e6a394983fde2f97ad77b22324527"
+ integrity sha512-9978wrXM50Y4rTMmW5kXIC09ZdXQZqkE4mxhwkd8VbzsGkXGPgV4zWuqQJgCEzYngdo2dYDa0l8xhX4fkSwJSg==
es-set-tostringtag@^2.0.1:
version "2.0.1"
@@ -3679,16 +3643,6 @@ [email protected]:
dependencies:
busboy "^1.6.0"
[email protected]:
- version "0.12.0"
- resolved "https://registry.npmjs.org/express-graphql/-/express-graphql-0.12.0.tgz#58deabc309909ca2c9fe2f83f5fbe94429aa23df"
- integrity sha512-DwYaJQy0amdy3pgNtiTDuGGM2BLdj+YO2SgbKoLliCfuHv3VVTt7vNG/ZqK2hRYjtYHE2t2KB705EU94mE64zg==
- dependencies:
- accepts "^1.3.7"
- content-type "^1.0.4"
- http-errors "1.8.0"
- raw-body "^2.4.1"
-
express-rate-limit@^5.5.1:
version "5.5.1"
resolved "https://registry.npmjs.org/express-rate-limit/-/express-rate-limit-5.5.1.tgz#110c23f6a65dfa96ab468eda95e71697bc6987a2"
@@ -4056,6 +4010,11 @@ get-symbol-description@^1.0.0:
call-bind "^1.0.2"
get-intrinsic "^1.1.1"
+get-tsconfig@^4.4.0:
+ version "4.5.0"
+ resolved "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.5.0.tgz#6d52d1c7b299bd3ee9cd7638561653399ac77b0f"
+ integrity sha512-MjhiaIWCJ1sAU4pIQ5i5OfOuHHxVo1oYeNsWTON7jxYkod8pHocXeh+SSbmu5OZZZK73B6cbJ2XADzXehLyovQ==
+
[email protected]:
version "0.0.0"
resolved "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz#97fb5d96bfde8973313f20e8288ef9a167fa64ce"
@@ -4175,6 +4134,11 @@ grapheme-splitter@^1.0.4:
resolved "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz#9cf3a665c6247479896834af35cf1dbb4400767e"
integrity sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==
+graphql-http@^1.17.1:
+ version "1.18.0"
+ resolved "https://registry.npmjs.org/graphql-http/-/graphql-http-1.18.0.tgz#6a72fc6d085e0761d9d483273c6fa9a6de5f6c4c"
+ integrity sha512-r2sIo6jCTQi1aj7s+Srg7oU3+r5pUUgxgDD5JDZOmFzrbXVGz+yMhIKhvqW0cV10DcnVIFCOzuFuc1qvnjJ7yQ==
+
graphql-playground-html@^1.6.30:
version "1.6.30"
resolved "https://registry.npmjs.org/graphql-playground-html/-/graphql-playground-html-1.6.30.tgz#14c2a8eb7fc17bfeb1a746bbb28a11e34bf0b391"
@@ -4300,7 +4264,7 @@ history@^4.9.0:
tiny-warning "^1.0.0"
value-equal "^1.0.1"
-hoist-non-react-statics@^3.1.0, hoist-non-react-statics@^3.3.0, hoist-non-react-statics@^3.3.2:
+hoist-non-react-statics@^3.1.0:
version "3.3.2"
resolved "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45"
integrity sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==
@@ -4353,17 +4317,6 @@ htmlparser2@^6.1.0:
domutils "^2.5.2"
entities "^2.0.0"
[email protected]:
- version "1.8.0"
- resolved "https://registry.npmjs.org/http-errors/-/http-errors-1.8.0.tgz#75d1bbe497e1044f51e4ee9e704a62f28d336507"
- integrity sha512-4I8r0C5JDhT5VkvI47QktDW75rNlGVsUf/8hzjCC/wkWI/jdTRmBb9aI7erSG82r1bjKY3F6k28WnsVxB1C73A==
- dependencies:
- depd "~1.1.2"
- inherits "2.0.4"
- setprototypeof "1.2.0"
- statuses ">= 1.5.0 < 2"
- toidentifier "1.0.0"
-
[email protected]:
version "2.0.0"
resolved "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz#b7774a1486ef73cf7667ac9ae0858c012c57b9d3"
@@ -4812,7 +4765,7 @@ json-parse-even-better-errors@^2.3.0, json-parse-even-better-errors@^2.3.1:
resolved "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d"
integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==
-json-schema-to-typescript@^11.0.2:
[email protected]:
version "11.0.3"
resolved "https://registry.npmjs.org/json-schema-to-typescript/-/json-schema-to-typescript-11.0.3.tgz#9b401c2b78329959f1c4c4e0639a6bdcf6a6ed77"
integrity sha512-EaEE9Y4VZ8b9jW5zce5a9L3+p4C9AqgIRHbNVDJahfMnoKzcd4sDb98BLxLdQhJEuRAXyKLg4H66NKm80W8ilg==
@@ -5054,13 +5007,6 @@ make-error@^1.1.1:
resolved "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2"
integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==
-map-age-cleaner@^0.1.3:
- version "0.1.3"
- resolved "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz#7d583a7306434c055fe474b0f45078e6e1b4b92a"
- integrity sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==
- dependencies:
- p-defer "^1.0.0"
-
md5@^2.3.0:
version "2.3.0"
resolved "https://registry.npmjs.org/md5/-/md5-2.3.0.tgz#c3da9a6aae3a30b46b7b0c349b87b110dc3bda4f"
@@ -5080,22 +5026,14 @@ [email protected]:
resolved "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
integrity sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==
-mem@^8.1.1:
- version "8.1.1"
- resolved "https://registry.npmjs.org/mem/-/mem-8.1.1.tgz#cf118b357c65ab7b7e0817bdf00c8062297c0122"
- integrity sha512-qFCFUDs7U3b8mBDPyz5EToEKoAkgCzqquIgi9nkkR9bixxOVOre+09lbuH7+9Kn2NFpm56M3GUWVbU2hQgdACA==
- dependencies:
- map-age-cleaner "^0.1.3"
- mimic-fn "^3.1.0"
-
-memfs@^3.2.2:
- version "3.4.13"
- resolved "https://registry.npmjs.org/memfs/-/memfs-3.4.13.tgz#248a8bd239b3c240175cd5ec548de5227fc4f345"
- integrity sha512-omTM41g3Skpvx5dSYeZIbXKcXoAVc/AoMNwn9TKx++L/gaen/+4TTttmu8ZSch5vfVJ8uJvGbroTsIlslRg6lg==
+memfs@^3.4.12:
+ version "3.5.1"
+ resolved "https://registry.npmjs.org/memfs/-/memfs-3.5.1.tgz#f0cd1e2bfaef58f6fe09bfb9c2288f07fea099ec"
+ integrity sha512-UWbFJKvj5k+nETdteFndTpYxdeTMox/ULeqX5k/dpaQJCCFmj5EeKv3dBcyO2xmkRAx2vppRu5dVG7SOtsGOzA==
dependencies:
fs-monkey "^1.0.3"
-memoize-one@^5.0.0, memoize-one@^5.0.4, memoize-one@^5.1.1:
+memoize-one@^5.0.0, memoize-one@^5.0.4:
version "5.2.1"
resolved "https://registry.npmjs.org/memoize-one/-/memoize-one-5.2.1.tgz#8337aa3c4335581839ec01c3d594090cebe8f00e"
integrity sha512-zYiwtZUcYyXKo/np96AGZAckk+FWWsUdJ3cHGGmld7+AhvcWmQyGCYUh1hc4Q/pkOhb65dQR/pqCyK0cOaHz4Q==
@@ -5167,7 +5105,7 @@ [email protected], "mime-db@>= 1.43.0 < 2":
resolved "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70"
integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==
-mime-types@^2.0.8, mime-types@^2.1.12, mime-types@^2.1.27, mime-types@^2.1.30, mime-types@~2.1.24, mime-types@~2.1.34:
+mime-types@^2.0.8, mime-types@^2.1.12, mime-types@^2.1.27, mime-types@^2.1.31, mime-types@~2.1.24, mime-types@~2.1.34:
version "2.1.35"
resolved "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a"
integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==
@@ -5189,7 +5127,7 @@ mimic-fn@^2.1.0:
resolved "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
-mimic-fn@^3.0.0, mimic-fn@^3.1.0:
+mimic-fn@^3.0.0:
version "3.1.0"
resolved "https://registry.npmjs.org/mimic-fn/-/mimic-fn-3.1.0.tgz#65755145bbf3e36954b949c16450427451d5ca74"
integrity sha512-Ysbi9uYW9hFyfrThdDEQuykN4Ey6BuwPD2kpI5ES/nFTDn/98yxYNLZJcgUAKPT/mcrLLKaGzJR9YVxJrIdASQ==
@@ -5551,11 +5489,6 @@ optionator@^0.9.1:
type-check "^0.4.0"
word-wrap "^1.2.3"
-p-defer@^1.0.0:
- version "1.0.0"
- resolved "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"
- integrity sha512-wB3wfAxZpk2AzOfUMJNL+d36xothRSyj8EXOa4f6GMqYDN9BJaaSISbsk+wS9abmnebVw95C2Kb5t85UmpCxuw==
-
p-limit@^2.0.0, p-limit@^2.2.0:
version "2.3.0"
resolved "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
@@ -5739,10 +5672,10 @@ [email protected]:
resolved "https://registry.npmjs.org/pause/-/pause-0.0.1.tgz#1d408b3fdb76923b9543d96fb4c9dfd535d9cb5d"
integrity sha512-KG8UEiEVkR3wGEb4m5yZkVCzigAD+cVEJck2CzYZO37ZGJfctvVptVO192MwrtPhzONn6go8ylnOdMhKqi4nfg==
-payload@^1.6.6:
- version "1.6.7"
- resolved "https://registry.npmjs.org/payload/-/payload-1.6.7.tgz#0fdac40e43bb61b426c9d1b80c444a100bd388fa"
- integrity sha512-G2vlemFWe+YKFXOsJuq27xh3RqwjYVMO2Ygq53nIdA0XsI+i2crSt6CxPdx4VWQ4/kXPPemrsNqRz2W9Z6Bbow==
+payload@^1.7.2:
+ version "1.7.2"
+ resolved "https://registry.npmjs.org/payload/-/payload-1.7.2.tgz#22aeb42871b1f09279382db9731724c697f44460"
+ integrity sha512-577DgrstocvKlnBo5ZgXEoH65qtoxP7HozgpgsFqAAgxCxudJ1zlnAAvce5usFxYdkOg6Yj1ezkq2ttLJeZbxA==
dependencies:
"@date-io/date-fns" "^2.16.0"
"@dnd-kit/core" "^6.0.7"
@@ -5768,14 +5701,15 @@ payload@^1.6.6:
dotenv "^8.6.0"
express "^4.18.2"
express-fileupload "1.4.0"
- express-graphql "0.12.0"
express-rate-limit "^5.5.1"
file-loader "^6.2.0"
file-type "16.5.4"
find-up "4.1.0"
flatley "^5.2.0"
fs-extra "^10.1.0"
+ get-tsconfig "^4.4.0"
graphql "^16.6.0"
+ graphql-http "^1.17.1"
graphql-playground-middleware-express "^1.7.23"
graphql-query-complexity "^0.12.0"
graphql-scalars "^1.20.1"
@@ -5789,7 +5723,7 @@ payload@^1.6.6:
is-plain-object "^5.0.0"
isomorphic-fetch "^3.0.0"
joi "^17.7.0"
- json-schema-to-typescript "^11.0.2"
+ json-schema-to-typescript "11.0.3"
jsonwebtoken "^9.0.0"
jwt-decode "^3.1.2"
md5 "^2.3.0"
@@ -5822,7 +5756,6 @@ payload@^1.6.6:
qs-middleware "^1.0.3"
react "^18.2.0"
react-animate-height "^2.1.2"
- react-beautiful-dnd "^13.1.1"
react-datepicker "^4.10.0"
react-diff-viewer "^3.1.1"
react-dom "^18.2.0"
@@ -5836,10 +5769,10 @@ payload@^1.6.6:
sass "^1.57.1"
sass-loader "^12.6.0"
sharp "^0.31.3"
- slate "^0.88.1"
+ slate "^0.91.4"
slate-history "^0.86.0"
slate-hyperscript "^0.81.3"
- slate-react "^0.88.0"
+ slate-react "^0.92.0"
style-loader "^2.0.0"
swc-loader "^0.2.3"
swc-minify-webpack-plugin "^1.0.1"
@@ -5848,10 +5781,10 @@ payload@^1.6.6:
url-loader "^4.1.1"
use-context-selector "^1.4.1"
uuid "^8.3.2"
- webpack "^5.75.0"
- webpack-bundle-analyzer "^4.7.0"
+ webpack "^5.78.0"
+ webpack-bundle-analyzer "^4.8.0"
webpack-cli "^4.10.0"
- webpack-dev-middleware "^4.3.0"
+ webpack-dev-middleware "6.0.1"
webpack-hot-middleware "^2.25.3"
peek-readable@^4.1.0:
@@ -6569,11 +6502,6 @@ quick-format-unescaped@^4.0.3:
resolved "https://registry.npmjs.org/quick-format-unescaped/-/quick-format-unescaped-4.0.4.tgz#93ef6dd8d3453cbc7970dd614fad4c5954d6b5a7"
integrity sha512-tYC1Q1hgyRuHgloV/YXs2w15unPVh8qfu/qCTfhTYamaw7fyhumKa2yGpdSo87vY32rIclj+4fWYQXUMs9EHvg==
-raf-schd@^4.0.2:
- version "4.0.3"
- resolved "https://registry.npmjs.org/raf-schd/-/raf-schd-4.0.3.tgz#5d6c34ef46f8b2a0e880a8fcdb743efc5bfdbc1a"
- integrity sha512-tQkJl2GRWh83ui2DiPTJz9wEiMN20syf+5oKfB03yYP7ioZcJwsIK8FjrtLwH1m7C7e+Tt2yYBlrOpdT+dyeIQ==
-
randombytes@^2.1.0:
version "2.1.0"
resolved "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a"
@@ -6586,7 +6514,7 @@ range-parser@^1.2.1, range-parser@~1.2.1:
resolved "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031"
integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==
[email protected], raw-body@^2.4.1:
[email protected]:
version "2.5.1"
resolved "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz#fe1b1628b181b700215e5fd42389f98b71392857"
integrity sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==
@@ -6614,19 +6542,6 @@ react-animate-height@^2.1.2:
classnames "^2.2.5"
prop-types "^15.6.1"
-react-beautiful-dnd@^13.1.1:
- version "13.1.1"
- resolved "https://registry.npmjs.org/react-beautiful-dnd/-/react-beautiful-dnd-13.1.1.tgz#b0f3087a5840920abf8bb2325f1ffa46d8c4d0a2"
- integrity sha512-0Lvs4tq2VcrEjEgDXHjT98r+63drkKEgqyxdA7qD3mvKwga6a5SscbdLPO2IExotU1jW8L0Ksdl0Cj2AF67nPQ==
- dependencies:
- "@babel/runtime" "^7.9.2"
- css-box-model "^1.2.0"
- memoize-one "^5.1.1"
- raf-schd "^4.0.2"
- react-redux "^7.2.0"
- redux "^4.0.4"
- use-memo-one "^1.1.1"
-
react-datepicker@^4.10.0:
version "4.10.0"
resolved "https://registry.npmjs.org/react-datepicker/-/react-datepicker-4.10.0.tgz#3f386ac5873dac5ea56544e51cdc01109938796c"
@@ -6694,11 +6609,6 @@ react-is@^16.13.1, react-is@^16.6.0, react-is@^16.7.0:
resolved "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
-react-is@^17.0.2:
- version "17.0.2"
- resolved "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0"
- integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==
-
react-onclickoutside@^6.12.2:
version "6.12.2"
resolved "https://registry.npmjs.org/react-onclickoutside/-/react-onclickoutside-6.12.2.tgz#8e6cf80c7d17a79f2c908399918158a7b02dda01"
@@ -6712,18 +6622,6 @@ react-popper@^2.3.0:
react-fast-compare "^3.0.1"
warning "^4.0.2"
-react-redux@^7.2.0:
- version "7.2.9"
- resolved "https://registry.npmjs.org/react-redux/-/react-redux-7.2.9.tgz#09488fbb9416a4efe3735b7235055442b042481d"
- integrity sha512-Gx4L3uM182jEEayZfRbI/G11ZpYdNAnBs70lFVMNdHJI76XYtR+7m0MN+eAs7UHBPhWXcnFPaS+9owSCJQHNpQ==
- dependencies:
- "@babel/runtime" "^7.15.4"
- "@types/react-redux" "^7.1.20"
- hoist-non-react-statics "^3.3.2"
- loose-envify "^1.4.0"
- prop-types "^15.7.2"
- react-is "^17.0.2"
-
react-router-dom@^5.3.4:
version "5.3.4"
resolved "https://registry.npmjs.org/react-router-dom/-/react-router-dom-5.3.4.tgz#2ed62ffd88cae6db134445f4a0c0ae8b91d2e5e6"
@@ -6840,13 +6738,6 @@ rechoir@^0.7.0:
dependencies:
resolve "^1.9.0"
-redux@^4.0.0, redux@^4.0.4:
- version "4.2.1"
- resolved "https://registry.npmjs.org/redux/-/redux-4.2.1.tgz#c08f4306826c49b5e9dc901dee0452ea8fce6197"
- integrity sha512-LAUYz4lc+Do8/g7aeRa8JkyDErK6ekstQaqWQrNRW//MY1TvCEpMtpTWvlQ+FPbWCx+Xixu/6SHt5N0HR+SB4w==
- dependencies:
- "@babel/runtime" "^7.9.2"
-
regenerator-runtime@^0.13.11:
version "0.13.11"
resolved "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz#f6dca3e7ceec20590d07ada785636a90cdca17f9"
@@ -7027,7 +6918,7 @@ scheduler@^0.23.0:
dependencies:
loose-envify "^1.1.0"
-schema-utils@^3.0.0, schema-utils@^3.1.0, schema-utils@^3.1.1:
+schema-utils@^3.0.0, schema-utils@^3.1.1:
version "3.1.1"
resolved "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz#bc74c4b6b6995c1d88f76a8b77bea7219e0c8281"
integrity sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==
@@ -7036,6 +6927,15 @@ schema-utils@^3.0.0, schema-utils@^3.1.0, schema-utils@^3.1.1:
ajv "^6.12.5"
ajv-keywords "^3.5.2"
+schema-utils@^3.1.2:
+ version "3.1.2"
+ resolved "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.2.tgz#36c10abca6f7577aeae136c804b0c741edeadc99"
+ integrity sha512-pvjEHOgWc9OWA/f/DE3ohBWTD6EleVLf7iFUkoSwAxttdBhB9QUebQgxER2kWueOvRJXPHNnyrvvh9eZINB8Eg==
+ dependencies:
+ "@types/json-schema" "^7.0.8"
+ ajv "^6.12.5"
+ ajv-keywords "^3.5.2"
+
schema-utils@^4.0.0:
version "4.0.0"
resolved "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz#60331e9e3ae78ec5d16353c467c34b3a0a1d3df7"
@@ -7099,7 +6999,7 @@ [email protected]:
range-parser "~1.2.1"
statuses "2.0.1"
-serialize-javascript@^6.0.0:
+serialize-javascript@^6.0.0, serialize-javascript@^6.0.1:
version "6.0.1"
resolved "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.1.tgz#b206efb27c3da0b0ab6b52f48d170b7996458e5c"
integrity sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w==
@@ -7224,11 +7124,12 @@ slate-hyperscript@^0.81.3:
dependencies:
is-plain-object "^5.0.0"
-slate-react@^0.88.0:
- version "0.88.2"
- resolved "https://registry.npmjs.org/slate-react/-/slate-react-0.88.2.tgz#e072d54980876ec11ca057703a0e386dd290c03e"
- integrity sha512-r06i+b7c1deP9PH69D3kJLStB2cbwryCVUGC++3phG7G3Ie+qEeJ5AZqogdxtsXd2vZaVGYKEjSASd3bTnj3tw==
+slate-react@^0.92.0:
+ version "0.92.0"
+ resolved "https://registry.npmjs.org/slate-react/-/slate-react-0.92.0.tgz#eb158ac2a33d962f48c466c4c8cc7bc14c1c6633"
+ integrity sha512-xEDKu5RKw5f0N95l1UeNQnrB0Pxh4JPjpIZR/BVsMo0ININnLAknR99gLo46bl/Ffql4mr7LeaxQRoXxbFtJOQ==
dependencies:
+ "@juggle/resize-observer" "^3.4.0"
"@types/is-hotkey" "^0.1.1"
"@types/lodash" "^4.14.149"
direction "^1.0.3"
@@ -7238,10 +7139,10 @@ slate-react@^0.88.0:
scroll-into-view-if-needed "^2.2.20"
tiny-invariant "1.0.6"
-slate@^0.88.1:
- version "0.88.1"
- resolved "https://registry.npmjs.org/slate/-/slate-0.88.1.tgz#0fc20f33b7baed7ea979fa848232c336e788cc31"
- integrity sha512-DEj9RpkNwPfdh3zbE9eGpeOVGWdS8BYQt754S0Lk6IvJXOkYaxza7WEZLZl/vnp7vloMdTe24zccyxywA3XK8g==
+slate@^0.91.4:
+ version "0.91.4"
+ resolved "https://registry.npmjs.org/slate/-/slate-0.91.4.tgz#759764d63c8a8a7aff29a29e598e593ed80277f9"
+ integrity sha512-aUJ3rpjrdi5SbJ5G1Qjr3arytfRkEStTmHjBfWq2A2Q8MybacIzkScSvGJjQkdTk3djCK9C9SEOt39sSeZFwTw==
dependencies:
immer "^9.0.6"
is-plain-object "^5.0.0"
@@ -7330,11 +7231,6 @@ [email protected]:
resolved "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz#55cb000ccf1d48728bd23c685a063998cf1a1b63"
integrity sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==
-"statuses@>= 1.5.0 < 2":
- version "1.5.0"
- resolved "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
- integrity sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==
-
stop-iteration-iterator@^1.0.0:
version "1.0.0"
resolved "https://registry.npmjs.org/stop-iteration-iterator/-/stop-iteration-iterator-1.0.0.tgz#6a60be0b4ee757d1ed5254858ec66b10c49285e4"
@@ -7546,7 +7442,7 @@ teeny-request@^8.0.0:
stream-events "^1.0.5"
uuid "^9.0.0"
-terser-webpack-plugin@^5.1.3, terser-webpack-plugin@^5.3.6:
+terser-webpack-plugin@^5.3.6:
version "5.3.6"
resolved "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.6.tgz#5590aec31aa3c6f771ce1b1acca60639eab3195c"
integrity sha512-kfLFk+PoLUQIbLmB1+PZDMRSZS99Mp+/MHqDNmMA6tOItzRt+Npe3E+fsMs5mfcM0wCtrrdU387UnV+vnSffXQ==
@@ -7557,6 +7453,17 @@ terser-webpack-plugin@^5.1.3, terser-webpack-plugin@^5.3.6:
serialize-javascript "^6.0.0"
terser "^5.14.1"
+terser-webpack-plugin@^5.3.7:
+ version "5.3.7"
+ resolved "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.7.tgz#ef760632d24991760f339fe9290deb936ad1ffc7"
+ integrity sha512-AfKwIktyP7Cu50xNjXF/6Qb5lBNzYaWpU6YfoX3uZicTx0zTy0stDDCsvjDapKsSDvOeWo5MEq4TmdBy2cNoHw==
+ dependencies:
+ "@jridgewell/trace-mapping" "^0.3.17"
+ jest-worker "^27.4.5"
+ schema-utils "^3.1.1"
+ serialize-javascript "^6.0.1"
+ terser "^5.16.5"
+
terser@^5.10.0, terser@^5.14.1:
version "5.16.3"
resolved "https://registry.npmjs.org/terser/-/terser-5.16.3.tgz#3266017a9b682edfe019b8ecddd2abaae7b39c6b"
@@ -7567,6 +7474,16 @@ terser@^5.10.0, terser@^5.14.1:
commander "^2.20.0"
source-map-support "~0.5.20"
+terser@^5.16.5:
+ version "5.17.1"
+ resolved "https://registry.npmjs.org/terser/-/terser-5.17.1.tgz#948f10830454761e2eeedc6debe45c532c83fd69"
+ integrity sha512-hVl35zClmpisy6oaoKALOpS0rDYLxRFLHhRuDlEGTKey9qHjS1w9GMORjuwIMt70Wan4lwsLYyWDVnWgF+KUEw==
+ dependencies:
+ "@jridgewell/source-map" "^0.3.2"
+ acorn "^8.5.0"
+ commander "^2.20.0"
+ source-map-support "~0.5.20"
+
text-table@^0.2.0:
version "0.2.0"
resolved "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
@@ -7599,7 +7516,7 @@ [email protected]:
resolved "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.0.6.tgz#b3f9b38835e36a41c843a3b0907a5a7b3755de73"
integrity sha512-FOyLWWVjG+aC0UqG76V53yAWdXfH8bO6FNmyZOuUrzDzK8DI3/JRY25UD7+g49JWM1LXwymsKERB+DzI0dTEQA==
-tiny-invariant@^1.0.2, tiny-invariant@^1.0.6:
+tiny-invariant@^1.0.2:
version "1.3.1"
resolved "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.3.1.tgz#8560808c916ef02ecfd55e66090df23a4b7aa642"
integrity sha512-AD5ih2NlSssTCwsMznbvwMZpJ1cbhkGd2uueNxzv2jDlEeZdU04JQfRnggJQ8DrcVBGjAsCKwFBbDlVNtEMlzw==
@@ -7621,11 +7538,6 @@ to-regex-range@^5.0.1:
dependencies:
is-number "^7.0.0"
[email protected]:
- version "1.0.0"
- resolved "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553"
- integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==
-
[email protected]:
version "1.0.1"
resolved "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35"
@@ -7852,11 +7764,6 @@ use-context-selector@^1.4.1:
resolved "https://registry.npmjs.org/use-context-selector/-/use-context-selector-1.4.1.tgz#eb96279965846b72915d7f899b8e6ef1d768b0ae"
integrity sha512-Io2ArvcRO+6MWIhkdfMFt+WKQX+Vb++W8DS2l03z/Vw/rz3BclKpM0ynr4LYGyU85Eke+Yx5oIhTY++QR0ZDoA==
-use-memo-one@^1.1.1:
- version "1.1.3"
- resolved "https://registry.npmjs.org/use-memo-one/-/use-memo-one-1.1.3.tgz#2fd2e43a2169eabc7496960ace8c79efef975e99"
- integrity sha512-g66/K7ZQGYrI6dy8GLpVcMsBp4s17xNkYJVSMvTEevGy3nDxHOfE6z8BVE22+5G5x7t3+bhzrlTDB7ObrEE0cQ==
-
utf8-byte-length@^1.0.1:
version "1.0.4"
resolved "https://registry.npmjs.org/utf8-byte-length/-/utf8-byte-length-1.0.4.tgz#f45f150c4c66eee968186505ab93fcbb8ad6bf61"
@@ -7927,11 +7834,12 @@ webidl-conversions@^7.0.0:
resolved "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz#256b4e1882be7debbf01d05f0aa2039778ea080a"
integrity sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==
-webpack-bundle-analyzer@^4.7.0:
- version "4.7.0"
- resolved "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.7.0.tgz#33c1c485a7fcae8627c547b5c3328b46de733c66"
- integrity sha512-j9b8ynpJS4K+zfO5GGwsAcQX4ZHpWV+yRiHDiL+bE0XHJ8NiPYLTNVQdlFYWxtpg9lfAQNlwJg16J9AJtFSXRg==
+webpack-bundle-analyzer@^4.8.0:
+ version "4.8.0"
+ resolved "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.8.0.tgz#951b8aaf491f665d2ae325d8b84da229157b1d04"
+ integrity sha512-ZzoSBePshOKhr+hd8u6oCkZVwpVaXgpw23ScGLFpR6SjYI7+7iIWYarjN6OEYOfRt8o7ZyZZQk0DuMizJ+LEIg==
dependencies:
+ "@discoveryjs/json-ext" "0.5.7"
acorn "^8.0.4"
acorn-walk "^8.0.0"
chalk "^4.1.0"
@@ -7960,17 +7868,16 @@ webpack-cli@^4.10.0:
rechoir "^0.7.0"
webpack-merge "^5.7.3"
-webpack-dev-middleware@^4.3.0:
- version "4.3.0"
- resolved "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-4.3.0.tgz#179cc40795882cae510b1aa7f3710cbe93c9333e"
- integrity sha512-PjwyVY95/bhBh6VUqt6z4THplYcsvQ8YNNBTBM873xLVmw8FLeALn0qurHbs9EmcfhzQis/eoqypSnZeuUz26w==
[email protected]:
+ version "6.0.1"
+ resolved "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-6.0.1.tgz#fd585127ed44dab3f253daf0d98f4d58a5088cc2"
+ integrity sha512-PZPZ6jFinmqVPJZbisfggDiC+2EeGZ1ZByyMP5sOFJcPPWSexalISz+cvm+j+oYPT7FIJyxT76esjnw9DhE5sw==
dependencies:
- colorette "^1.2.2"
- mem "^8.1.1"
- memfs "^3.2.2"
- mime-types "^2.1.30"
+ colorette "^2.0.10"
+ memfs "^3.4.12"
+ mime-types "^2.1.31"
range-parser "^1.2.1"
- schema-utils "^3.0.0"
+ schema-utils "^4.0.0"
webpack-hot-middleware@^2.25.3:
version "2.25.3"
@@ -8002,22 +7909,22 @@ webpack-sources@^3.2.3:
resolved "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde"
integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==
-webpack@^5.75.0:
- version "5.75.0"
- resolved "https://registry.npmjs.org/webpack/-/webpack-5.75.0.tgz#1e440468647b2505860e94c9ff3e44d5b582c152"
- integrity sha512-piaIaoVJlqMsPtX/+3KTTO6jfvrSYgauFVdt8cr9LTHKmcq/AMd4mhzsiP7ZF/PGRNPGA8336jldh9l2Kt2ogQ==
+webpack@^5.78.0:
+ version "5.81.0"
+ resolved "https://registry.npmjs.org/webpack/-/webpack-5.81.0.tgz#27a2e8466c8b4820d800a8d90f06ef98294f9956"
+ integrity sha512-AAjaJ9S4hYCVODKLQTgG5p5e11hiMawBwV2v8MYLE0C/6UAGLuAF4n1qa9GOwdxnicaP+5k6M5HrLmD4+gIB8Q==
dependencies:
"@types/eslint-scope" "^3.7.3"
- "@types/estree" "^0.0.51"
- "@webassemblyjs/ast" "1.11.1"
- "@webassemblyjs/wasm-edit" "1.11.1"
- "@webassemblyjs/wasm-parser" "1.11.1"
+ "@types/estree" "^1.0.0"
+ "@webassemblyjs/ast" "^1.11.5"
+ "@webassemblyjs/wasm-edit" "^1.11.5"
+ "@webassemblyjs/wasm-parser" "^1.11.5"
acorn "^8.7.1"
acorn-import-assertions "^1.7.6"
browserslist "^4.14.5"
chrome-trace-event "^1.0.2"
- enhanced-resolve "^5.10.0"
- es-module-lexer "^0.9.0"
+ enhanced-resolve "^5.13.0"
+ es-module-lexer "^1.2.1"
eslint-scope "5.1.1"
events "^3.2.0"
glob-to-regexp "^0.4.1"
@@ -8026,9 +7933,9 @@ webpack@^5.75.0:
loader-runner "^4.2.0"
mime-types "^2.1.27"
neo-async "^2.6.2"
- schema-utils "^3.1.0"
+ schema-utils "^3.1.2"
tapable "^2.1.1"
- terser-webpack-plugin "^5.1.3"
+ terser-webpack-plugin "^5.3.7"
watchpack "^2.4.0"
webpack-sources "^3.2.3"
|
f7f56510046acf35ee999dff084d355637940e50
|
2025-03-01 03:33:42
|
Vincent Vu
|
fix(templates): handle enableLink condition safely (#10728)
| false
|
handle enableLink condition safely (#10728)
|
fix
|
diff --git a/templates/website/src/blocks/Content/config.ts b/templates/website/src/blocks/Content/config.ts
index 16a01e218c2..db9bcdf5541 100644
--- a/templates/website/src/blocks/Content/config.ts
+++ b/templates/website/src/blocks/Content/config.ts
@@ -55,7 +55,9 @@ const columnFields: Field[] = [
link({
overrides: {
admin: {
- condition: (_, { enableLink }) => Boolean(enableLink),
+ condition: (_data, siblingData) => {
+ return Boolean(siblingData?.enableLink);
+ },
},
},
}),
|
259ae674a104a30f4b33411950a1d36a20882afb
|
2024-05-08 20:48:39
|
Elliot DeNolf
|
chore(release): v3.0.0-beta.26 [skip ci]
| false
|
v3.0.0-beta.26 [skip ci]
|
chore
|
diff --git a/package.json b/package.json
index 6388c2ed568..2d4fe00bfcf 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "payload-monorepo",
- "version": "3.0.0-beta.25",
+ "version": "3.0.0-beta.26",
"private": true,
"type": "module",
"scripts": {
diff --git a/packages/create-payload-app/package.json b/packages/create-payload-app/package.json
index 7ad049791a9..8aa09471df1 100644
--- a/packages/create-payload-app/package.json
+++ b/packages/create-payload-app/package.json
@@ -1,6 +1,6 @@
{
"name": "create-payload-app",
- "version": "3.0.0-beta.25",
+ "version": "3.0.0-beta.26",
"homepage": "https://payloadcms.com",
"repository": {
"type": "git",
diff --git a/packages/db-mongodb/package.json b/packages/db-mongodb/package.json
index 2ec6f5ff5bd..8c8c45dad36 100644
--- a/packages/db-mongodb/package.json
+++ b/packages/db-mongodb/package.json
@@ -1,6 +1,6 @@
{
"name": "@payloadcms/db-mongodb",
- "version": "3.0.0-beta.25",
+ "version": "3.0.0-beta.26",
"description": "The officially supported MongoDB database adapter for Payload",
"homepage": "https://payloadcms.com",
"repository": {
diff --git a/packages/db-postgres/package.json b/packages/db-postgres/package.json
index bedac5a84da..84e3163ef1c 100644
--- a/packages/db-postgres/package.json
+++ b/packages/db-postgres/package.json
@@ -1,6 +1,6 @@
{
"name": "@payloadcms/db-postgres",
- "version": "3.0.0-beta.25",
+ "version": "3.0.0-beta.26",
"description": "The officially supported Postgres database adapter for Payload",
"homepage": "https://payloadcms.com",
"repository": {
diff --git a/packages/email-nodemailer/package.json b/packages/email-nodemailer/package.json
index 5758d46c20d..14f9ff58ac3 100644
--- a/packages/email-nodemailer/package.json
+++ b/packages/email-nodemailer/package.json
@@ -1,6 +1,6 @@
{
"name": "@payloadcms/email-nodemailer",
- "version": "3.0.0-beta.25",
+ "version": "3.0.0-beta.26",
"description": "Payload Nodemailer Email Adapter",
"homepage": "https://payloadcms.com",
"repository": {
diff --git a/packages/email-resend/package.json b/packages/email-resend/package.json
index 2bb19368517..e14ed15b386 100644
--- a/packages/email-resend/package.json
+++ b/packages/email-resend/package.json
@@ -1,6 +1,6 @@
{
"name": "@payloadcms/email-resend",
- "version": "3.0.0-beta.25",
+ "version": "3.0.0-beta.26",
"description": "Payload Resend Email Adapter",
"homepage": "https://payloadcms.com",
"repository": {
diff --git a/packages/graphql/package.json b/packages/graphql/package.json
index d8b364bfd91..446088c06e0 100644
--- a/packages/graphql/package.json
+++ b/packages/graphql/package.json
@@ -1,6 +1,6 @@
{
"name": "@payloadcms/graphql",
- "version": "3.0.0-beta.25",
+ "version": "3.0.0-beta.26",
"homepage": "https://payloadcms.com",
"repository": {
"type": "git",
diff --git a/packages/next/package.json b/packages/next/package.json
index 72f8e23189c..f58074cbe28 100644
--- a/packages/next/package.json
+++ b/packages/next/package.json
@@ -1,6 +1,6 @@
{
"name": "@payloadcms/next",
- "version": "3.0.0-beta.25",
+ "version": "3.0.0-beta.26",
"homepage": "https://payloadcms.com",
"repository": {
"type": "git",
diff --git a/packages/payload/package.json b/packages/payload/package.json
index 6c73fc1d375..9d6eb28b918 100644
--- a/packages/payload/package.json
+++ b/packages/payload/package.json
@@ -1,6 +1,6 @@
{
"name": "payload",
- "version": "3.0.0-beta.25",
+ "version": "3.0.0-beta.26",
"description": "Node, React, Headless CMS and Application Framework built on Next.js",
"keywords": [
"admin panel",
diff --git a/packages/plugin-cloud-storage/package.json b/packages/plugin-cloud-storage/package.json
index 47511a0ec19..005646b2c4a 100644
--- a/packages/plugin-cloud-storage/package.json
+++ b/packages/plugin-cloud-storage/package.json
@@ -1,6 +1,6 @@
{
"name": "@payloadcms/plugin-cloud-storage",
- "version": "3.0.0-beta.25",
+ "version": "3.0.0-beta.26",
"description": "The official cloud storage plugin for Payload CMS",
"homepage": "https://payloadcms.com",
"repository": {
diff --git a/packages/plugin-cloud/package.json b/packages/plugin-cloud/package.json
index 9f65c3cbb39..0cc0d0d0c60 100644
--- a/packages/plugin-cloud/package.json
+++ b/packages/plugin-cloud/package.json
@@ -1,6 +1,6 @@
{
"name": "@payloadcms/plugin-cloud",
- "version": "3.0.0-beta.25",
+ "version": "3.0.0-beta.26",
"description": "The official Payload Cloud plugin",
"homepage": "https://payloadcms.com",
"repository": {
diff --git a/packages/plugin-form-builder/package.json b/packages/plugin-form-builder/package.json
index 0bfea010cec..be497035bcd 100644
--- a/packages/plugin-form-builder/package.json
+++ b/packages/plugin-form-builder/package.json
@@ -1,6 +1,6 @@
{
"name": "@payloadcms/plugin-form-builder",
- "version": "3.0.0-beta.25",
+ "version": "3.0.0-beta.26",
"description": "Form builder plugin for Payload CMS",
"keywords": [
"payload",
diff --git a/packages/plugin-nested-docs/package.json b/packages/plugin-nested-docs/package.json
index a714b7c74c7..fffde1cf023 100644
--- a/packages/plugin-nested-docs/package.json
+++ b/packages/plugin-nested-docs/package.json
@@ -1,6 +1,6 @@
{
"name": "@payloadcms/plugin-nested-docs",
- "version": "3.0.0-beta.25",
+ "version": "3.0.0-beta.26",
"description": "The official Nested Docs plugin for Payload",
"homepage": "https://payloadcms.com",
"repository": {
diff --git a/packages/plugin-redirects/package.json b/packages/plugin-redirects/package.json
index 33ae2c22c86..385b9e326da 100644
--- a/packages/plugin-redirects/package.json
+++ b/packages/plugin-redirects/package.json
@@ -1,6 +1,6 @@
{
"name": "@payloadcms/plugin-redirects",
- "version": "3.0.0-beta.25",
+ "version": "3.0.0-beta.26",
"description": "Redirects plugin for Payload",
"keywords": [
"payload",
diff --git a/packages/plugin-search/package.json b/packages/plugin-search/package.json
index b2edc315650..88ad2bfe2b9 100644
--- a/packages/plugin-search/package.json
+++ b/packages/plugin-search/package.json
@@ -1,6 +1,6 @@
{
"name": "@payloadcms/plugin-search",
- "version": "3.0.0-beta.25",
+ "version": "3.0.0-beta.26",
"description": "Search plugin for Payload",
"keywords": [
"payload",
diff --git a/packages/plugin-seo/package.json b/packages/plugin-seo/package.json
index 4184c2e8296..7529671cdb7 100644
--- a/packages/plugin-seo/package.json
+++ b/packages/plugin-seo/package.json
@@ -1,6 +1,6 @@
{
"name": "@payloadcms/plugin-seo",
- "version": "3.0.0-beta.25",
+ "version": "3.0.0-beta.26",
"description": "SEO plugin for Payload",
"keywords": [
"payload",
diff --git a/packages/plugin-stripe/package.json b/packages/plugin-stripe/package.json
index da6840cac3c..e94e52c2423 100644
--- a/packages/plugin-stripe/package.json
+++ b/packages/plugin-stripe/package.json
@@ -1,6 +1,6 @@
{
"name": "@payloadcms/plugin-stripe",
- "version": "3.0.0-beta.25",
+ "version": "3.0.0-beta.26",
"description": "Stripe plugin for Payload",
"keywords": [
"payload",
diff --git a/packages/richtext-lexical/package.json b/packages/richtext-lexical/package.json
index 55d195022b7..ee5bd2b53cd 100644
--- a/packages/richtext-lexical/package.json
+++ b/packages/richtext-lexical/package.json
@@ -1,6 +1,6 @@
{
"name": "@payloadcms/richtext-lexical",
- "version": "3.0.0-beta.25",
+ "version": "3.0.0-beta.26",
"description": "The officially supported Lexical richtext adapter for Payload",
"homepage": "https://payloadcms.com",
"repository": {
diff --git a/packages/richtext-slate/package.json b/packages/richtext-slate/package.json
index 24dfd06afe0..54eacf4dfb5 100644
--- a/packages/richtext-slate/package.json
+++ b/packages/richtext-slate/package.json
@@ -1,6 +1,6 @@
{
"name": "@payloadcms/richtext-slate",
- "version": "3.0.0-beta.25",
+ "version": "3.0.0-beta.26",
"description": "The officially supported Slate richtext adapter for Payload",
"homepage": "https://payloadcms.com",
"repository": {
diff --git a/packages/storage-azure/package.json b/packages/storage-azure/package.json
index d6c28dca92f..cb76a6a208c 100644
--- a/packages/storage-azure/package.json
+++ b/packages/storage-azure/package.json
@@ -1,6 +1,6 @@
{
"name": "@payloadcms/storage-azure",
- "version": "3.0.0-beta.25",
+ "version": "3.0.0-beta.26",
"description": "Payload storage adapter for Azure Blob Storage",
"homepage": "https://payloadcms.com",
"repository": {
diff --git a/packages/storage-gcs/package.json b/packages/storage-gcs/package.json
index 999d6367d5a..2cf2070da9d 100644
--- a/packages/storage-gcs/package.json
+++ b/packages/storage-gcs/package.json
@@ -1,6 +1,6 @@
{
"name": "@payloadcms/storage-gcs",
- "version": "3.0.0-beta.25",
+ "version": "3.0.0-beta.26",
"description": "Payload storage adapter for Google Cloud Storage",
"homepage": "https://payloadcms.com",
"repository": {
diff --git a/packages/storage-s3/package.json b/packages/storage-s3/package.json
index bd08d826af7..afd7ab68c97 100644
--- a/packages/storage-s3/package.json
+++ b/packages/storage-s3/package.json
@@ -1,6 +1,6 @@
{
"name": "@payloadcms/storage-s3",
- "version": "3.0.0-beta.25",
+ "version": "3.0.0-beta.26",
"description": "Payload storage adapter for Amazon S3",
"homepage": "https://payloadcms.com",
"repository": {
diff --git a/packages/storage-vercel-blob/package.json b/packages/storage-vercel-blob/package.json
index 20b8d60526d..0262f2694f5 100644
--- a/packages/storage-vercel-blob/package.json
+++ b/packages/storage-vercel-blob/package.json
@@ -1,6 +1,6 @@
{
"name": "@payloadcms/storage-vercel-blob",
- "version": "3.0.0-beta.25",
+ "version": "3.0.0-beta.26",
"description": "Payload storage adapter for Vercel Blob Storage",
"homepage": "https://payloadcms.com",
"repository": {
diff --git a/packages/translations/package.json b/packages/translations/package.json
index 0fb07d4e7dd..1dc114fa71c 100644
--- a/packages/translations/package.json
+++ b/packages/translations/package.json
@@ -1,6 +1,6 @@
{
"name": "@payloadcms/translations",
- "version": "3.0.0-beta.25",
+ "version": "3.0.0-beta.26",
"homepage": "https://payloadcms.com",
"repository": {
"type": "git",
diff --git a/packages/ui/package.json b/packages/ui/package.json
index 6794456e581..50d9bd02a27 100644
--- a/packages/ui/package.json
+++ b/packages/ui/package.json
@@ -1,6 +1,6 @@
{
"name": "@payloadcms/ui",
- "version": "3.0.0-beta.25",
+ "version": "3.0.0-beta.26",
"homepage": "https://payloadcms.com",
"repository": {
"type": "git",
|
c356b969131764066ee1945a52beb12ace4fa2f4
|
2023-09-19 15:21:56
|
Alessio Gravili
|
chore: package.json improvements: order, duplicate scripts and packages
| false
|
package.json improvements: order, duplicate scripts and packages
|
chore
|
diff --git a/package.json b/package.json
index 6bd35587c74..7e8f39207c3 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,6 @@
"clean:unix": "find . \\( -type d \\( -name node_modules -o -name dist -o -name .cache \\) -o -type f -name tsconfig.tsbuildinfo \\) -exec rm -rf {} +",
"dev": "pnpm --filter payload run dev",
"dev:generate-graphql-schema": "ts-node -T ./test/generateGraphQLSchema.ts",
- "test:int:postgres": "cross-env PAYLOAD_DATABASE=postgres yarn test:int",
"dev:generate-types": "pnpm --filter payload run dev:generate-types",
"dev:postgres": "pnpm --filter payload run dev:postgres",
"fix": "eslint \"src/**/*.ts\" --fix",
@@ -51,7 +50,6 @@
"express": "4.18.2",
"form-data": "3.0.1",
"get-port": "5.1.1",
- "graphql-request": "3.7.0",
"isomorphic-fetch": "3.0.0",
"jest": "29.6.4",
"jest-environment-jsdom": "29.6.4",
diff --git a/packages/bundler-vite/package.json b/packages/bundler-vite/package.json
index a074ec9d046..e37b9762ea1 100644
--- a/packages/bundler-vite/package.json
+++ b/packages/bundler-vite/package.json
@@ -4,6 +4,7 @@
"description": "The officially supported Vite bundler adapter for Payload",
"repository": "https://github.com/payloadcms/payload",
"license": "MIT",
+ "homepage": "https://payloadcms.com",
"author": {
"email": "[email protected]",
"name": "Payload",
@@ -12,9 +13,9 @@
"main": "./src/index.ts",
"types": "./src/index.ts",
"scripts": {
+ "build": "pnpm build:swc && pnpm build:types",
"build:swc": "swc ./src -d ./dist --config-file .swcrc",
- "build:types": "tsc --emitDeclarationOnly --outDir dist",
- "build": "pnpm build:swc && pnpm build:types"
+ "build:types": "tsc --emitDeclarationOnly --outDir dist"
},
"dependencies": {
"@rollup/plugin-commonjs": "^25.0.4",
diff --git a/packages/bundler-webpack/package.json b/packages/bundler-webpack/package.json
index c6dde39885d..85240d5621b 100644
--- a/packages/bundler-webpack/package.json
+++ b/packages/bundler-webpack/package.json
@@ -4,6 +4,7 @@
"description": "The officially supported Webpack bundler adapter for Payload",
"repository": "https://github.com/payloadcms/payload",
"license": "MIT",
+ "homepage": "https://payloadcms.com",
"author": {
"email": "[email protected]",
"name": "Payload",
diff --git a/packages/db-postgres/package.json b/packages/db-postgres/package.json
index 1f54f318dfd..d7c94bce6dc 100644
--- a/packages/db-postgres/package.json
+++ b/packages/db-postgres/package.json
@@ -4,6 +4,7 @@
"description": "The officially supported Postgres database adapter for Payload",
"repository": "https://github.com/payloadcms/payload",
"license": "MIT",
+ "homepage": "https://payloadcms.com",
"author": {
"email": "[email protected]",
"name": "Payload",
@@ -14,8 +15,7 @@
"scripts": {
"build": "pnpm build:swc && pnpm build:types",
"build:swc": "swc ./src -d ./dist --config-file .swcrc",
- "build:types": "tsc --emitDeclarationOnly --outDir dist",
- "builddisabled": "pnpm build:swc && pnpm build:types"
+ "build:types": "tsc --emitDeclarationOnly --outDir dist"
},
"dependencies": {
"@libsql/client": "^0.3.1",
diff --git a/packages/eslint-config-payload/package.json b/packages/eslint-config-payload/package.json
index de42b1976bf..cb00f213384 100644
--- a/packages/eslint-config-payload/package.json
+++ b/packages/eslint-config-payload/package.json
@@ -3,6 +3,12 @@
"version": "0.0.1",
"private": true,
"description": "Payload styles for ESLint and Prettier",
+ "license": "MIT",
+ "author": {
+ "email": "[email protected]",
+ "name": "Payload",
+ "url": "https://payloadcms.com"
+ },
"main": "index.js",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
@@ -24,7 +30,5 @@
"eslint-plugin-react-hooks": "4.6.0",
"eslint-plugin-regexp": "1.15.0"
},
- "keywords": [],
- "author": "",
- "license": "MIT"
+ "keywords": []
}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3c457c29bcf..e48476d9087 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -67,8 +67,8 @@ importers:
specifier: 5.1.1
version: 5.1.1
graphql-request:
- specifier: 3.7.0
- version: 3.7.0([email protected])
+ specifier: 6.1.0
+ version: 6.1.0([email protected])
isomorphic-fetch:
specifier: 3.0.0
version: 3.0.0
@@ -2518,6 +2518,14 @@ packages:
resolution: {integrity: sha512-qprfWkn82Iw821mcKofJ5Pk9wgioHicxcQMxx+5zt5GSKoqdWvgG5AxVmpmUUjzTLPVSH5auBrhI93Deayn/DA==}
dev: false
+ /@graphql-typed-document-node/[email protected]([email protected]):
+ resolution: {integrity: sha512-mB9oAsNCm9aM3/SOv4YtBMqZbYj10R7dkq8byBqxGY/ncFwhf2oQzMV+LCRlWoDSEBJ3COiR1yeDvMtsoOsuFQ==}
+ peerDependencies:
+ graphql: ^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
+ dependencies:
+ graphql: 16.7.1
+ dev: true
+
/@hapi/[email protected]:
resolution: {integrity: sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ==}
dev: false
@@ -8419,6 +8427,18 @@ packages:
- encoding
dev: true
+ /[email protected]([email protected]):
+ resolution: {integrity: sha512-p+XPfS4q7aIpKVcgmnZKhMNqhltk20hfXtkaIkTfjjmiKMJ5xrt5c743cL03y/K7y1rg3WrIC49xGiEQ4mxdNw==}
+ peerDependencies:
+ graphql: 14 - 16
+ dependencies:
+ '@graphql-typed-document-node/core': 3.2.0([email protected])
+ cross-fetch: 3.1.8
+ graphql: 16.7.1
+ transitivePeerDependencies:
+ - encoding
+ dev: true
+
/[email protected]([email protected]):
resolution: {integrity: sha512-my9FB4GtghqXqi/lWSVAOPiTzTnnEzdOXCsAC2bb5V7EFNQjVjwy3cSSbUvgYOtDuDibd+ZsCDhz+4eykYOlhQ==}
engines: {node: '>=10'}
|
ad1357739942eccc1af74274d91abaeea08e9a87
|
2024-04-29 05:28:07
|
Alessio Gravili
|
chore(richtext-lexical): fix build and backport badNode logic change from lexical core
| false
|
fix build and backport badNode logic change from lexical core
|
chore
|
diff --git a/packages/richtext-lexical/src/field/features/link/plugins/floatingLinkEditor/LinkEditor/index.tsx b/packages/richtext-lexical/src/field/features/link/plugins/floatingLinkEditor/LinkEditor/index.tsx
index 5534458b25e..e7da1b76d89 100644
--- a/packages/richtext-lexical/src/field/features/link/plugins/floatingLinkEditor/LinkEditor/index.tsx
+++ b/packages/richtext-lexical/src/field/features/link/plugins/floatingLinkEditor/LinkEditor/index.tsx
@@ -73,13 +73,17 @@ export function LinkEditor({ anchorElem }: { anchorElem: HTMLElement }): React.R
selectedNodeDomRect = editor.getElementByKey(focusNode.getKey())?.getBoundingClientRect()
const focusLinkParent: LinkNode = $findMatchingParent(focusNode, $isLinkNode)
- const badNode = selection.getNodes().find((node) => {
- // Prevent link modal from showing if selection spans further than the link: https://github.com/facebook/lexical/issues/4064
- const linkNode = $findMatchingParent(node, $isLinkNode)
- if (!linkNode?.is(focusLinkParent) && !linkNode && !$isLineBreakNode(node)) {
- return node
- }
- })
+ // Prevent link modal from showing if selection spans further than the link: https://github.com/facebook/lexical/issues/4064
+ const badNode = selection
+ .getNodes()
+ .filter((node) => !$isLineBreakNode(node))
+ .find((node) => {
+ const linkNode = $findMatchingParent(node, $isLinkNode)
+ return (
+ (focusLinkParent && !focusLinkParent.is(linkNode)) ||
+ (linkNode && !linkNode.is(focusLinkParent))
+ )
+ })
if (focusLinkParent == null || badNode) {
setIsLink(false)
diff --git a/packages/richtext-lexical/src/field/lexical/utils/nodeFormat.ts b/packages/richtext-lexical/src/field/lexical/utils/nodeFormat.ts
index 3b08f5e93f0..be8ad250a55 100644
--- a/packages/richtext-lexical/src/field/lexical/utils/nodeFormat.ts
+++ b/packages/richtext-lexical/src/field/lexical/utils/nodeFormat.ts
@@ -4,7 +4,8 @@
//This copy-and-pasted from lexical here: https://github.com/facebook/lexical/blob/c2ceee223f46543d12c574e62155e619f9a18a5d/packages/lexical/src/LexicalConstants.ts
import type { ElementFormatType, TextFormatType } from 'lexical'
-import type { TextDetailType, TextModeType } from 'lexical/nodes/LexicalTextNode.js'
+export type TextDetailType = 'directionless' | 'unmergable'
+import type { TextModeType } from 'lexical'
// DOM
export const NodeFormat = {
|
d2f281d318253193fae9cb4c0a97441903b367c2
|
2022-12-15 22:56:06
|
Dan Ribbens
|
chore: update changelog
| false
|
update changelog
|
chore
|
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 192dec13260..ea9afd87b1c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,24 +6,12 @@
### Bug Fixes
* add i18n type to collection and globals admin.description ([#1675](https://github.com/payloadcms/payload/issues/1675)) ([049d560](https://github.com/payloadcms/payload/commit/049d560898fdf3fd9be40a4689eb1ef4170ef207))
-* add new relationship modal when related to many ([e2fce30](https://github.com/payloadcms/payload/commit/e2fce30964cb6cd5f046b83acb5e98d33f1b4333))
* adds draftsEnabled to baseSchema for tabs / arrays / groups & allows for null enum ([80da898](https://github.com/payloadcms/payload/commit/80da898de8cfe068a0ad685803d8523fd9a10dcd))
* adds draftsEnabled to versionSchema in collections / globals ([f0db5e0](https://github.com/payloadcms/payload/commit/f0db5e0170807944cfbed8495c813b7c28b05bb3))
-* collapsible children margin bottom ([#1673](https://github.com/payloadcms/payload/issues/1673)) ([64086e8](https://github.com/payloadcms/payload/commit/64086e8122e04965ca0ae8d254b99114208944bf))
-* drawer blur, scroll, and document sidebar ([a36ac20](https://github.com/payloadcms/payload/commit/a36ac209b2e267b154f71bb5947921a253291330))
-* ensures unique document drawer slugs ([a0b41eb](https://github.com/payloadcms/payload/commit/a0b41eb83b3e78a069ac91dd5c1bc0a92d8577f2))
+* collapsible margin bottom adjustment ([#1673](https://github.com/payloadcms/payload/issues/1673)) ([64086e8](https://github.com/payloadcms/payload/commit/64086e8122e04965ca0ae8d254b99114208944bf))
* escapes react-select events when drawer is open ([f290cda](https://github.com/payloadcms/payload/commit/f290cda333aecab104d7cd195bcc7fab2059134d))
-* fields e2e tests ([92d2c4d](https://github.com/payloadcms/payload/commit/92d2c4d80500cece618d28526c6f16487e241952))
-* fields-relationship e2e tests ([c72f074](https://github.com/payloadcms/payload/commit/c72f074b777e127cdbe7a78ca727e98eec766312))
* label translation in about to delete dialog ([#1667](https://github.com/payloadcms/payload/issues/1667)) ([d9c45f6](https://github.com/payloadcms/payload/commit/d9c45f62b19162a34bc317e997d9912213a3012b))
* list view date field display format ([#1661](https://github.com/payloadcms/payload/issues/1661)) ([934b443](https://github.com/payloadcms/payload/commit/934b443b5b3b0f610767786f940175b9db0b2da7))
-* prevents duplicative DocumentDrawer ([6fab722](https://github.com/payloadcms/payload/commit/6fab722a2eb67b4fc02e7b7c6f7f0b36fe6c984d))
-* prevents react-select from opening on drawer toggle ([3c862ad](https://github.com/payloadcms/payload/commit/3c862add3c588424550817d45cb632c29cae99ab))
-* prevents recursive DocumentDrawer ([670e524](https://github.com/payloadcms/payload/commit/670e5243a9f3e6fe32c1dd7da9c57826e271620f))
-* relationship create and edit onSave handling ([49528dd](https://github.com/payloadcms/payload/commit/49528dd3c3c4f96c6d9ecb5b55b285e4e3205e27))
-* relationship drawer permissions ([39a956c](https://github.com/payloadcms/payload/commit/39a956cee35986c045904bce94699b6ee8f4119a))
-* remounts document drawer when single-value relationship changes ([d9eb1ea](https://github.com/payloadcms/payload/commit/d9eb1ea8013ab369672a786be6fd667fd2558466))
-* Remove template literal from link ([9d4dac8](https://github.com/payloadcms/payload/commit/9d4dac892efac7396d8aecfd562818d6a6745b1c))
* removes case for select field that sets data to undefined if set to null ([b4f39d5](https://github.com/payloadcms/payload/commit/b4f39d5fd380190ee82a5bb967756d25e9c98e95))
* Set 'Dashboard's link to config route ([#1652](https://github.com/payloadcms/payload/issues/1652)) ([940c1e8](https://github.com/payloadcms/payload/commit/940c1e84f5f091bf4b4ae0bd6628f077d9d0d6e9))
* stringifies date in DateTime field for useAsTitle ([#1674](https://github.com/payloadcms/payload/issues/1674)) ([a1813ca](https://github.com/payloadcms/payload/commit/a1813ca4b32dfcd8ca3604f7f03b1ba316d740e2))
@@ -31,15 +19,9 @@
### Features
-* builds DocumentDrawer component ([2118927](https://github.com/payloadcms/payload/commit/2118927f4248a4969d88fad57bc0528991c23b7f))
-* builds Drawer component ([c6013c3](https://github.com/payloadcms/payload/commit/c6013c39043cc7bf9e8ff39551662c25e8d744c8))
+* inline relationships ([8d744c8](https://github.com/payloadcms/payload/commit/c6013c39043cc7bf9e8ff39551662c25e8d744c8))
* custom button html element ([5592fb1](https://github.com/payloadcms/payload/commit/5592fb148dfa3058df577cfb7f5ed72ea25e1217))
* further Tooltip improvements ([e101f92](https://github.com/payloadcms/payload/commit/e101f925cc71af4c3a1b5ce4ad552d9834d35bfd))
-* retrofits DocumentDrawer into relationship AddNew ([475f147](https://github.com/payloadcms/payload/commit/475f147f2cab64bf79ff019a1eae9e7f18690557))
-* retrofits DocumentDrawer into relationship multi-select ([dd21775](https://github.com/payloadcms/payload/commit/dd217750d7481f07b7487eecb4b7c643ec0d178d))
-* supports custom react-select components ([7a42e38](https://github.com/payloadcms/payload/commit/7a42e38cca87e34d90b1af369fcc8575c8622456))
-* supports tooltip show and delay ([00b3b76](https://github.com/payloadcms/payload/commit/00b3b768eb3e19eb87e7ef2f99454f8fddf41066))
-* wires DocumentDrawer into singular relationships ([811ade6](https://github.com/payloadcms/payload/commit/811ade60b40782d9ac25f8274ff573dbee1bfc14))
# [1.3.0](https://github.com/payloadcms/payload/compare/v1.2.5...v1.3.0) (2022-12-09)
@@ -2415,4 +2397,4 @@ If none of your collections or globals should be publicly exposed, you don't nee
* add blind index for encrypting API Keys ([9a1c1f6](https://github.com/payloadcms/payload/commit/9a1c1f64c0ea0066b679195f50e6cb1ac4bf3552))
* add license key to access routej ([2565005](https://github.com/payloadcms/payload/commit/2565005cc099797a6e3b8995e0984c28b7837e82))
-## [0.0.137](https://github.com/payloadcms/payload/commit/5c1e2846a2694a80cc8707703406c2ac1bb6af8a) (2020-11-12)
\ No newline at end of file
+## [0.0.137](https://github.com/payloadcms/payload/commit/5c1e2846a2694a80cc8707703406c2ac1bb6af8a) (2020-11-12)
|
a8d6f3f543ab94cfe2b08d8daed646a38640c4d3
|
2025-01-10 13:44:29
|
Steve Kuznetsov
|
docs: update draft doc for formatting (#10393)
| false
|
update draft doc for formatting (#10393)
|
docs
|
diff --git a/docs/fields/relationship.mdx b/docs/fields/relationship.mdx
index ce44d9822af..1da2fcb40f4 100644
--- a/docs/fields/relationship.mdx
+++ b/docs/fields/relationship.mdx
@@ -188,9 +188,9 @@ You can learn more about writing queries [here](/docs/queries/overview).
<Banner type="warning">
**Note:**
- When a relationship field has both **filterOptions** and a custom{' '}
- **validate** function, the api will not validate **filterOptions**{' '}
- unless you call the default relationship field validation function imported from{' '}
+ When a relationship field has both **filterOptions** and a custom
+ **validate** function, the api will not validate **filterOptions**
+ unless you call the default relationship field validation function imported from
**payload/shared** in your validate function.
</Banner>
diff --git a/docs/fields/upload.mdx b/docs/fields/upload.mdx
index f5abe8a807d..3aa8db02d8c 100644
--- a/docs/fields/upload.mdx
+++ b/docs/fields/upload.mdx
@@ -128,9 +128,9 @@ You can learn more about writing queries [here](/docs/queries/overview).
<Banner type="warning">
**Note:**
- When an upload field has both **filterOptions** and a custom{' '}
- **validate** function, the api will not validate **filterOptions**{' '}
- unless you call the default upload field validation function imported from{' '}
+ When an upload field has both **filterOptions** and a custom
+ **validate** function, the api will not validate **filterOptions**
+ unless you call the default upload field validation function imported from
**payload/shared** in your validate function.
</Banner>
diff --git a/docs/rich-text/slate.mdx b/docs/rich-text/slate.mdx
index ee97ec86d8a..c21b6de99b0 100644
--- a/docs/rich-text/slate.mdx
+++ b/docs/rich-text/slate.mdx
@@ -127,7 +127,7 @@ Similar to the `relationship` element, the `upload` element is a user-friendly w
Collections are automatically allowed to be selected within the Rich Text relationship and upload
elements by default. If you want to disable a collection from being able to be referenced in Rich
- Text fields, set the collection admin options of **enableRichTextLink** and{' '}
+ Text fields, set the collection admin options of **enableRichTextLink** and
**enableRichTextRelationship** to false.
</Banner>
diff --git a/docs/versions/autosave.mdx b/docs/versions/autosave.mdx
index ffc0ff479a5..6841c42f46b 100644
--- a/docs/versions/autosave.mdx
+++ b/docs/versions/autosave.mdx
@@ -69,7 +69,7 @@ When `autosave` is enabled, all `update` operations within Payload expose a new
If we created a new version for each autosave, you'd quickly find a ton of autosaves that clutter up your `_versions` collection within the database. That would be messy quick because `autosave` is typically set to save a document at ~800ms intervals.
<Banner type="success">
- Instead of creating a new version each time a document is autosaved, Payload smartly only creates{' '}
+ Instead of creating a new version each time a document is autosaved, Payload smartly only creates
**one** autosave version, and then updates that specific version with each autosave
performed. This makes sure that your versions remain nice and tidy.
</Banner>
diff --git a/docs/versions/drafts.mdx b/docs/versions/drafts.mdx
index 96edb8d6c0b..e8f215cb304 100644
--- a/docs/versions/drafts.mdx
+++ b/docs/versions/drafts.mdx
@@ -123,12 +123,12 @@ export const Pages: CollectionConfig = {
**Note regarding adding versions to an existing collection**
If you already have a collection with documents, and you *opt in* to draft functionality
- after you have already created existing documents, all of your old documents{' '}
- *will not have a _status field* until you resave them. For this reason, if you are{' '}
+ after you have already created existing documents, all of your old documents
+ *will not have a `_status` field* until you resave them. For this reason, if you are
*adding* versions into an existing collection, you might want to write your Access Control
- function to allow for users to read both documents where{' '}
- **status is equal to "published"** as well as where{' '}
- **status does not exis**.
+ function to allow for users to read both documents where
+ **`_status` is equal to `"published"`** as well as where
+ **`_status` does not exist**.
</Banner>
Here is an example for how to write an [Access Control](../access-control/overview) function that grants access to both documents where `_status` is equal to "published" and where `_status` does not exist:
|
6ea29094bafdba4624e233342d0720e5224de1be
|
2023-11-23 02:44:14
|
Dan Ribbens
|
fix(db-postgres): incorrect pagination totalDocs (#4248)
| false
|
incorrect pagination totalDocs (#4248)
|
fix
|
diff --git a/packages/db-postgres/src/find/findMany.ts b/packages/db-postgres/src/find/findMany.ts
index 6ca5a1165bd..dfe2f0bdfd6 100644
--- a/packages/db-postgres/src/find/findMany.ts
+++ b/packages/db-postgres/src/find/findMany.ts
@@ -33,7 +33,7 @@ export const findMany = async function find({
const db = adapter.sessions[req.transactionID]?.db || adapter.drizzle
const table = adapter.tables[tableName]
- let limit = limitArg ?? 10
+ const limit = limitArg ?? 10
let totalDocs: number
let totalPages: number
let hasPrevPage: boolean
@@ -51,6 +51,7 @@ export const findMany = async function find({
})
const orderedIDMap: Record<number | string, number> = {}
+ let orderedIDs: (number | string)[]
const selectDistinctMethods: ChainedMethods = []
@@ -116,7 +117,8 @@ export const findMany = async function find({
selectDistinctResult.forEach(({ id }, i) => {
orderedIDMap[id as number | string] = i
})
- findManyArgs.where = inArray(adapter.tables[tableName].id, Object.keys(orderedIDMap))
+ orderedIDs = Object.keys(orderedIDMap)
+ findManyArgs.where = inArray(adapter.tables[tableName].id, orderedIDs)
} else {
findManyArgs.limit = limitArg === 0 ? undefined : limitArg
@@ -132,7 +134,7 @@ export const findMany = async function find({
const findPromise = db.query[tableName].findMany(findManyArgs)
- if (pagination !== false || selectDistinctResult?.length > limit) {
+ if (pagination !== false && (orderedIDs ? orderedIDs?.length >= limit : true)) {
const selectCountMethods: ChainedMethods = []
joinAliases.forEach(({ condition, table }) => {
@@ -174,9 +176,8 @@ export const findMany = async function find({
rawDocs.sort((a, b) => orderedIDMap[a.id] - orderedIDMap[b.id])
}
- if (pagination === false) {
+ if (pagination === false || !totalDocs) {
totalDocs = rawDocs.length
- limit = totalDocs
totalPages = 1
pagingCounter = 1
hasPrevPage = false
diff --git a/test/relationships/config.ts b/test/relationships/config.ts
index 54c4d15f0ec..b85655cb18f 100644
--- a/test/relationships/config.ts
+++ b/test/relationships/config.ts
@@ -199,6 +199,39 @@ export default buildConfigWithDefaults({
},
],
},
+ {
+ fields: [
+ {
+ name: 'movieReviewer',
+ relationTo: 'users',
+ required: true,
+ type: 'relationship',
+ },
+ {
+ name: 'likes',
+ hasMany: true,
+ relationTo: 'users',
+ type: 'relationship',
+ },
+ {
+ name: 'visibility',
+ options: [
+ {
+ label: 'followers',
+ value: 'followers',
+ },
+ {
+ label: 'public',
+ value: 'public',
+ },
+ ],
+ required: true,
+ type: 'radio',
+ },
+ ],
+
+ slug: 'movieReviews',
+ },
],
onInit: async (payload) => {
await payload.create({
diff --git a/test/relationships/int.spec.ts b/test/relationships/int.spec.ts
index c62f6b677eb..8f695159a21 100644
--- a/test/relationships/int.spec.ts
+++ b/test/relationships/int.spec.ts
@@ -185,6 +185,73 @@ describe('Relationships', () => {
expect(status).toEqual(400)
})
+ it('should count totalDocs correctly when using or in where query and relation contains hasMany relationship fields', async () => {
+ const user = (
+ await payload.find({
+ collection: 'users',
+ })
+ ).docs[0]
+
+ const user2 = await payload.create({
+ collection: 'users',
+ data: {
+ email: '[email protected]',
+ password: 'fwefe',
+ },
+ })
+ const user3 = await payload.create({
+ collection: 'users',
+ data: {
+ email: '[email protected]',
+ password: 'fwsefe',
+ },
+ })
+ const user4 = await payload.create({
+ collection: 'users',
+ data: {
+ email: '[email protected]',
+ password: 'fwddsefe',
+ },
+ })
+ await Promise.all([
+ payload.create({
+ collection: 'movieReviews',
+ data: {
+ likes: [user3.id, user2.id, user.id, user4.id],
+ movieReviewer: user.id,
+ visibility: 'public',
+ },
+ }),
+ payload.create({
+ collection: 'movieReviews',
+ data: {
+ movieReviewer: user2.id,
+ visibility: 'public',
+ },
+ }),
+ ])
+
+ const query = await payload.find({
+ collection: 'movieReviews',
+ depth: 1,
+ where: {
+ or: [
+ {
+ visibility: {
+ equals: 'public',
+ },
+ },
+ {
+ movieReviewer: {
+ equals: user.id,
+ },
+ },
+ ],
+ },
+ })
+ expect(query.totalDocs).toEqual(2)
+ })
+
describe('Custom ID', () => {
it('should query a custom id relation', async () => {
const { doc } = await client.findByID<Post>({ id: post.id })
|
5e3963482ebbfda886fa0097e6328ec0d3aaf599
|
2024-12-12 07:23:57
|
Sasha
|
fix(db-postgres): `payload.db.upsert` inserts new rows instead of updating existing ones (#9916)
| false
|
`payload.db.upsert` inserts new rows instead of updating existing ones (#9916)
|
fix
|
diff --git a/packages/drizzle/src/update.ts b/packages/drizzle/src/update.ts
index 3c2c8dcf7b4..86c41e0aac1 100644
--- a/packages/drizzle/src/update.ts
+++ b/packages/drizzle/src/update.ts
@@ -4,6 +4,7 @@ import toSnakeCase from 'to-snake-case'
import type { DrizzleAdapter } from './types.js'
+import { buildFindManyArgs } from './find/buildFindManyArgs.js'
import buildQuery from './queries/buildQuery.js'
import { selectDistinct } from './queries/selectDistinct.js'
import { upsertRow } from './upsertRow/index.js'
@@ -38,6 +39,22 @@ export const updateOne: UpdateOne = async function updateOne(
if (selectDistinctResult?.[0]?.id) {
idToUpdate = selectDistinctResult?.[0]?.id
+
+ // If id wasn't passed but `where` without any joins, retrieve it with findFirst
+ } else if (whereArg && !joins.length) {
+ const findManyArgs = buildFindManyArgs({
+ adapter: this,
+ depth: 0,
+ fields: collection.flattenedFields,
+ joinQuery: false,
+ select: {},
+ tableName,
+ })
+
+ findManyArgs.where = where
+
+ const docToUpdate = await db.query[tableName].findFirst(findManyArgs)
+ idToUpdate = docToUpdate?.id
}
const result = await upsertRow({
diff --git a/test/database/int.spec.ts b/test/database/int.spec.ts
index a2ad8d34d11..90a9569d708 100644
--- a/test/database/int.spec.ts
+++ b/test/database/int.spec.ts
@@ -1076,4 +1076,37 @@ describe('database', () => {
expect(relationBDocs.docs).toHaveLength(0)
})
+
+ it('should upsert', async () => {
+ const postShouldCreated = await payload.db.upsert({
+ req: {},
+ collection: 'posts',
+ data: {
+ title: 'some-title-here',
+ },
+ where: {
+ title: {
+ equals: 'some-title-here',
+ },
+ },
+ })
+
+ expect(postShouldCreated).toBeTruthy()
+
+ const postShouldUpdated = await payload.db.upsert({
+ req: {},
+ collection: 'posts',
+ data: {
+ title: 'some-title-here',
+ },
+ where: {
+ title: {
+ equals: 'some-title-here',
+ },
+ },
+ })
+
+ // Should stay the same ID
+ expect(postShouldCreated.id).toBe(postShouldUpdated.id)
+ })
})
|
5eb03b675e7c90680d625e56dea964c1660b9233
|
2021-12-23 00:51:02
|
James
|
chore: beta
| false
|
beta
|
chore
|
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 08c58e74e51..b6b5dda058e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-## [0.13.10-beta.0](https://github.com/payloadcms/payload/compare/v0.13.6...v0.13.10-beta.0) (2021-12-21)
+## [0.13.11-beta.0](https://github.com/payloadcms/payload/compare/v0.13.6...v0.13.11-beta.0) (2021-12-22)
### Bug Fixes
@@ -6,6 +6,7 @@
* [#370](https://github.com/payloadcms/payload/issues/370), only performs password functions when auth enabled ([9738873](https://github.com/payloadcms/payload/commit/97388738def687f3b26eaf8de6b067f4d3758418))
* [#390](https://github.com/payloadcms/payload/issues/390), safari rich text link bug ([a16b99b](https://github.com/payloadcms/payload/commit/a16b99b0c87d55f768ed74ab35708a291fc7bbb0))
* [#393](https://github.com/payloadcms/payload/issues/393), ensures preview button gets up to date data ([2f47e39](https://github.com/payloadcms/payload/commit/2f47e39a9f765bd8ce437d4b7500a5b314a192a5))
+* ensures getDataByPath works ([140a3aa](https://github.com/payloadcms/payload/commit/140a3aa9eafa29b2a43bdfd8883c79c6ee4a93e4))
### Features
diff --git a/package.json b/package.json
index f48000f2f39..f09dbafb64d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "payload",
- "version": "0.13.10-beta.0",
+ "version": "0.13.11-beta.0",
"description": "Node, React and MongoDB Headless CMS and Application Framework",
"license": "SEE LICENSE IN license.md",
"author": {
|
70e068b18292881eed70f3f347e896b7a40eacbd
|
2023-10-09 20:31:49
|
Jessica Boezwinkle
|
docs: updates required node version
| false
|
updates required node version
|
docs
|
diff --git a/docs/getting-started/installation.mdx b/docs/getting-started/installation.mdx
index b100eb3a819..cc48164825a 100644
--- a/docs/getting-started/installation.mdx
+++ b/docs/getting-started/installation.mdx
@@ -11,7 +11,7 @@ keywords: documentation, getting started, guide, Content Management System, cms,
Payload requires the following software:
- Yarn or NPM
-- Node.js version 14+
+- Node.js version 16+
- Any [compatible database](/docs/database/overview) (MongoDB or Postgres)
<Banner type="warning">
|
094b0399cb0c7d507410cf07accea9aa81227dfa
|
2021-01-02 21:53:50
|
James
|
docs: auth overview
| false
|
auth overview
|
docs
|
diff --git a/demo/collections/Admin.ts b/demo/collections/Admin.ts
index 2ac83b1628e..66b2e295604 100644
--- a/demo/collections/Admin.ts
+++ b/demo/collections/Admin.ts
@@ -29,7 +29,7 @@ const Admin: PayloadCollectionConfig = {
depth: 0,
cookies: {
secure: false,
- sameSite: 'Lax',
+ sameSite: 'lax',
domain: undefined,
},
},
diff --git a/demo/collections/PublicUsers.ts b/demo/collections/PublicUsers.ts
index 0c2271be2a3..2f6b3c28457 100644
--- a/demo/collections/PublicUsers.ts
+++ b/demo/collections/PublicUsers.ts
@@ -38,7 +38,7 @@ const PublicUsers: PayloadCollectionConfig = {
lockTime: 600 * 1000, // lock time in ms
cookies: {
secure: process.env.NODE_ENV === 'production',
- sameSite: 'Lax',
+ sameSite: 'lax',
domain: undefined,
},
},
diff --git a/docs/Authentication/accessing-logged-in-user.mdx b/docs/Authentication/accessing-logged-in-user.mdx
index e8cd8094b4a..30881cdb7b8 100644
--- a/docs/Authentication/accessing-logged-in-user.mdx
+++ b/docs/Authentication/accessing-logged-in-user.mdx
@@ -1,7 +1,7 @@
---
title: Accessing the User
label: Accessing the User
-order: 40
+order: 50
---
Talk about how to access the User in custom code like hooks and access control. The User is on the req.
diff --git a/docs/Authentication/config.mdx b/docs/Authentication/config.mdx
index b1eb2492252..1592c815783 100644
--- a/docs/Authentication/config.mdx
+++ b/docs/Authentication/config.mdx
@@ -1,18 +1,15 @@
---
title: Authentication Config
label: Config
-order: 10
+order: 20
---
Talk about how to configure authentication here.
Need to cover:
-1. What collection to use for Admin panel and how there can only be one
-1. Can have multiple auth collections
1. Token expiration
1. Email verification
1. Security (max login, lock time)
1. API keys
1. Depth to populate (performance impact)
-1. Cookie settings (HTTP only discussion)
diff --git a/docs/Authentication/overview.mdx b/docs/Authentication/overview.mdx
index 59033976034..64175211128 100644
--- a/docs/Authentication/overview.mdx
+++ b/docs/Authentication/overview.mdx
@@ -4,4 +4,132 @@ label: Overview
order: 10
---
-Talk about how Payload authentication works.
+Payload provides for highly secure and customizable user Authentication out of the box, which allows for users to identify themselves to Payload. Authentication is used within the Payload Admin panel itself as well as throughout your app(s) themselves however you determine necessary.
+
+Here are some common use cases of Authentication outside of Payload's dashboard itself:
+
+- Customer accounts for an ecommerce app
+- Customer accounts for a SaaS product
+- P2P app or social site where users need to log in and manage their profiles
+- Online game where players need to track their progress over time
+
+By default, Payload provides you with a `User` collection that supports Authentication, which is used to access the Admin panel. But, you can add support to one or many Collections of your own. For more information on how to customize, override, or remove the default `User` collection, [click here](/docs/admin#the-admin-user-collection).
+
+### How it works
+
+Every Payload Collection can opt-in to supporting Authentication by specifying the `auth` property on the Collection's config to either `true` or to an object containing `auth` options.
+
+**For a full list of all `auth` options, [click here](/docs/authentication/config).**
+
+Simple example collection:
+
+```js
+const Admins = {
+ slug:
+ // highlight-start
+ auth: {
+ tokenExpiration: 300,
+ verify: true,
+ maxLoginAttempts: 5,
+ lockTime: 600 * 1000, // lock time in ms
+ },
+ // highlight-end
+ fields: [
+ {
+ name: 'role',
+ type: 'select',
+ required: true,
+ options: [
+ 'user',
+ 'admin',
+ 'editor',
+ 'developer',
+ ],
+ }
+ ],
+}
+```
+
+**By enabling Authetication on a config, the following modifications will automatically be made to your Collection:**
+
+1. `email` as well as password `salt` & `hash` fields will be added to your Collection's schema
+1. The Admin panel will feature a new set of corresponding UI to allow for changing password and editing email
+1. [A new set of `operations`](/docs/authentication/operations) will be exposed via Payload's REST, Local, and GraphQL APIs
+
+Once enabled, each document that is created within the Collection can be thought of as a `user` - who can make use of commonly required authentication functions such as logging in / out, resetting their password, and more.
+
+### HTTP-only cookies
+
+Payload `login`, `logout`, and `refresh` operations make use of HTTP-only cookies for authentication purposes. HTTP-only cookies are a highly secure method of storing identifiable data on a user's device so that Payload can automatically recognize a returning user until their cookie expires. They are totally protected from common XSS attacks and cannot be read at all via JavaScript in the browser.
+
+##### Automatic browser inclusion
+
+Modern browsers automatically include `http-only` cookies when making requests directly to URLs—meaning that if you are running your API on http://example.com, and you have logged in and visit http://example.com/test-page, your browser will automatically include the Payload authentication cookie for you.
+
+##### Using Fetch or other HTTP APIs
+
+However, if you use `fetch` or similar APIs to retrieve Payload resources from its REST or GraphQL API, you need to specify to include credentials (cookies).
+
+Fetch example, including credentials:
+
+```js
+const response = await fetch('http://localhost:3000/api/pages', {
+ credentials: 'include',
+});
+
+const pages = await response.json();
+```
+
+For more about how to automatically include cookies in requests from your app to your Payload API, [click here](https://developer.mozilla.org/en-US/docs/Web/API/Fetch_API/Using_Fetch#Sending_a_request_with_credentials_included).
+
+<Banner type="success">
+ <strong>Tip:</strong><br/>
+ To make sure you have a Payload cookie set properly in your browser after logging in, you can use Chrome's Developer Tools - Application - Cookies - [your-domain-here]. The Chrome Developer tools will still show HTTP-only cookies, even when JavaScript running on the page can't.
+</Banner>
+
+### CSRF Protection
+
+CSRF (cross-site request forgery) attacks are common and dangerous. By using an HTTP-only cookie, Payload removes any XSS vulnerabilities, however, CSRF attacks can still be possible.
+
+For example, let's say you have a very popular app running at coolsite.com. This app allows users to manage finances and send / receive money. As Payload is using HTTP-only cookies, that means that browsers automatically will include cookies when sending requests to your domain - no matter what page created the request.
+
+So, if a user of coolsite.com is logged in and just browsing around on the internet, they might stumble onto a page with bad intentions. That bad page might automatically make requests to all sorts of sites to see if they can find one that they can log into - and coolsite.com might be on their list. If your user was logged in while they visited that evil site, the attacker could do whatever they wanted as if they were your coolsite.com user—including send themselves a bunch of money from your user's account. This is what a CSRF attack is.
+
+<Banner type="success">
+ <strong>To protect against CSRF attacks, Payload only accepts cookie-based authentication from domains that you explicitly whitelist.</strong>
+</Banner>
+
+To define domains that should allow users to identify themselves via the Payload HTTP-only cookie, use the `csrf` option on the base Payload config to whitelist domains that you trust.
+
+`payload.config.js`:
+```js
+import { buildConfig } from 'payload/config';
+
+const config = buildConfig({
+ serverURL: 'http://localhost:3000',
+ collections: [
+ // collections here
+ ],
+ csrf: [
+ 'https://your-frontend-app.com',
+ 'https://your-other-frontend-app.com',
+ ],
+});
+
+export default config;
+```
+
+### Identifying users via the Authorization Header
+
+In addition to authenticating via an HTTP-only cookie, you can also identify users via the `Authorization` header on an HTTP request.
+
+Example:
+```js
+const request = await fetch('http://localhost:3000', {
+ headers: {
+ Authorization: `JWT ${token}`
+ }
+})
+```
+
+You can retrieve a user's token via the response to `login`, `refresh`, and `me` auth operations.
diff --git a/docs/Authentication/security.mdx b/docs/Authentication/security.mdx
index db0966ec167..eb69e254820 100644
--- a/docs/Authentication/security.mdx
+++ b/docs/Authentication/security.mdx
@@ -1,7 +1,7 @@
---
title: Authentication Security
label: Security
-order: 20
+order: 40
---
Talk about how Payload securely authenticates here.
diff --git a/docs/Configuration/overview.mdx b/docs/Configuration/overview.mdx
index b620b5034a1..e05a3eaa2e9 100644
--- a/docs/Configuration/overview.mdx
+++ b/docs/Configuration/overview.mdx
@@ -23,7 +23,7 @@ Payload is a *config-based*, code-first CMS and application framework. The Paylo
| `graphQL` | Manage GraphQL-specific functionality here. Define your own queries and mutations, manage query complexity limits, and [more](/docs/graphql/config). |
| `cookiePrefix` | A string that will be prefixed to all cookies that Payload sets. |
| `cors` | Either a whitelist array of URLS to allow CORS requests from, or a wildcard string (`'*'`) to accept incoming requests from any domain. |
-| `csrf` | A whitelist array of URLs to allow Payload cookies to be accepted from as a form of CSRF protection. [More](/docs/production/security#csrf) |
+| `csrf` | A whitelist array of URLs to allow Payload cookies to be accepted from as a form of CSRF protection. [More](/docs/authentication/overview#csrf-protection) |
| `defaultDepth` | If a user does not specify `depth` while requesting a resource, this depth will be used. [More](/docs/getting-started/concepts#depth) |
| `maxDepth` | The maximum allowed depth to be permitted application-wide. This setting helps prevent against malicious queries. Defaults to `10`. |
| `upload` | Base Payload upload configuration. [More](/docs/admin/upload#global). |
|
c4327f22946f3a1c47dbd316a62f9b291546da40
|
2024-11-29 03:25:41
|
Alessio Gravili
|
fix(ui): ensure UI is reactive to HMR changes, without having to refresh the page (#9602)
| false
|
ensure UI is reactive to HMR changes, without having to refresh the page (#9602)
|
fix
|
diff --git a/packages/ui/src/elements/DocumentFields/index.tsx b/packages/ui/src/elements/DocumentFields/index.tsx
index fc73a9961c0..303f6ba6706 100644
--- a/packages/ui/src/elements/DocumentFields/index.tsx
+++ b/packages/ui/src/elements/DocumentFields/index.tsx
@@ -2,7 +2,7 @@
import type { ClientField, SanitizedDocumentPermissions } from 'payload'
import { fieldIsSidebar } from 'payload/shared'
-import React from 'react'
+import React, { useMemo } from 'react'
import { useFormInitializing, useFormProcessing } from '../../forms/Form/context.js'
import { RenderFields } from '../../forms/RenderFields/index.js'
@@ -32,11 +32,7 @@ export const DocumentFields: React.FC<Args> = ({
readOnly: readOnlyProp,
schemaPathSegments,
}) => {
- const [{ hasSidebarFields, mainFields, sidebarFields }] = React.useState<{
- hasSidebarFields: boolean
- mainFields: ClientField[]
- sidebarFields: ClientField[]
- }>(() => {
+ const { hasSidebarFields, mainFields, sidebarFields } = useMemo(() => {
return fields.reduce(
(acc, field) => {
if (fieldIsSidebar(field)) {
@@ -50,12 +46,12 @@ export const DocumentFields: React.FC<Args> = ({
return acc
},
{
- hasSidebarFields: false as boolean,
+ hasSidebarFields: false,
mainFields: [] as ClientField[],
sidebarFields: [] as ClientField[],
},
)
- })
+ }, [fields])
const formInitializing = useFormInitializing()
const formProcessing = useFormProcessing()
diff --git a/packages/ui/src/providers/Config/index.tsx b/packages/ui/src/providers/Config/index.tsx
index ca2eaf353fc..97cd6f0041e 100644
--- a/packages/ui/src/providers/Config/index.tsx
+++ b/packages/ui/src/providers/Config/index.tsx
@@ -1,7 +1,7 @@
'use client'
import type { ClientCollectionConfig, ClientConfig, ClientGlobalConfig } from 'payload'
-import React, { createContext, useCallback, useContext, useState } from 'react'
+import React, { createContext, useCallback, useContext, useEffect, useState } from 'react'
export type ClientConfigContext = {
config: ClientConfig
@@ -29,6 +29,12 @@ export const ConfigProvider: React.FC<{
}> = ({ children, config: configFromProps }) => {
const [config, setConfig] = useState<ClientConfig>(configFromProps)
+ // Need to update local config state if config from props changes, for HMR.
+ // That way, config changes will be updated in the UI immediately without needing a refresh.
+ useEffect(() => {
+ setConfig(configFromProps)
+ }, [configFromProps])
+
const getEntityConfig = useCallback(
({ collectionSlug, globalSlug }: { collectionSlug?: string; globalSlug?: string }) => {
if (collectionSlug) {
|
fed7f2fa5b22454cf2873d49da870d945d9fb02d
|
2024-08-27 03:20:29
|
Jacob Fletcher
|
fix: sanitizes modifyResponseHeaders from client config (#7876)
| false
|
sanitizes modifyResponseHeaders from client config (#7876)
|
fix
|
diff --git a/packages/payload/src/collections/config/client.ts b/packages/payload/src/collections/config/client.ts
index 6e677117e04..a78f137ed45 100644
--- a/packages/payload/src/collections/config/client.ts
+++ b/packages/payload/src/collections/config/client.ts
@@ -14,6 +14,15 @@ export type ServerOnlyCollectionAdminProperties = keyof Pick<
'hidden' | 'preview'
>
+export type ServerOnlyUploadProperties = keyof Pick<
+ SanitizedCollectionConfig['upload'],
+ | 'adminThumbnail'
+ | 'externalFileHeaderFilter'
+ | 'handlers'
+ | 'modifyResponseHeaders'
+ | 'withMetadata'
+>
+
export type ClientCollectionConfig = {
_isPreviewEnabled?: true
admin: {
diff --git a/packages/payload/src/index.ts b/packages/payload/src/index.ts
index 680bac36a87..cda588fee8d 100644
--- a/packages/payload/src/index.ts
+++ b/packages/payload/src/index.ts
@@ -663,6 +663,7 @@ export type { ClientCollectionConfig } from './collections/config/client.js'
export type {
ServerOnlyCollectionAdminProperties,
ServerOnlyCollectionProperties,
+ ServerOnlyUploadProperties,
} from './collections/config/client.js'
export type {
AfterChangeHook as CollectionAfterChangeHook,
diff --git a/packages/ui/src/providers/Config/createClientConfig/collections.tsx b/packages/ui/src/providers/Config/createClientConfig/collections.tsx
index 07695ee6773..6f5ae2de4cc 100644
--- a/packages/ui/src/providers/Config/createClientConfig/collections.tsx
+++ b/packages/ui/src/providers/Config/createClientConfig/collections.tsx
@@ -11,6 +11,7 @@ import type {
SanitizedCollectionConfig,
ServerOnlyCollectionAdminProperties,
ServerOnlyCollectionProperties,
+ ServerOnlyUploadProperties,
} from 'payload'
import type React from 'react'
@@ -18,6 +19,30 @@ import { deepCopyObjectSimple } from 'payload'
import { createClientFields } from './fields.js'
+const serverOnlyCollectionProperties: Partial<ServerOnlyCollectionProperties>[] = [
+ 'hooks',
+ 'access',
+ 'endpoints',
+ 'custom',
+ // `upload`
+ // `admin`
+ // are all handled separately
+]
+
+const serverOnlyUploadProperties: Partial<ServerOnlyUploadProperties>[] = [
+ 'adminThumbnail',
+ 'externalFileHeaderFilter',
+ 'handlers',
+ 'modifyResponseHeaders',
+ 'withMetadata',
+]
+
+const serverOnlyCollectionAdminProperties: Partial<ServerOnlyCollectionAdminProperties>[] = [
+ 'hidden',
+ 'preview',
+ // `livePreview` is handled separately
+]
+
export const createClientCollectionConfig = ({
DefaultEditView,
DefaultListView,
@@ -46,16 +71,6 @@ export const createClientCollectionConfig = ({
payload,
})
- const serverOnlyCollectionProperties: Partial<ServerOnlyCollectionProperties>[] = [
- 'hooks',
- 'access',
- 'endpoints',
- 'custom',
- // `upload`
- // `admin`
- // are all handled separately
- ]
-
serverOnlyCollectionProperties.forEach((key) => {
if (key in clientCollection) {
delete clientCollection[key]
@@ -63,10 +78,11 @@ export const createClientCollectionConfig = ({
})
if ('upload' in clientCollection && typeof clientCollection.upload === 'object') {
- delete clientCollection.upload.handlers
- delete clientCollection.upload.adminThumbnail
- delete clientCollection.upload.externalFileHeaderFilter
- delete clientCollection.upload.withMetadata
+ serverOnlyUploadProperties.forEach((key) => {
+ if (key in clientCollection.upload) {
+ delete clientCollection.upload[key]
+ }
+ })
if ('imageSizes' in clientCollection.upload && clientCollection.upload.imageSizes.length) {
clientCollection.upload.imageSizes = clientCollection.upload.imageSizes.map((size) => {
@@ -91,12 +107,6 @@ export const createClientCollectionConfig = ({
})
}
- const serverOnlyCollectionAdminProperties: Partial<ServerOnlyCollectionAdminProperties>[] = [
- 'hidden',
- 'preview',
- // `livePreview` is handled separately
- ]
-
serverOnlyCollectionAdminProperties.forEach((key) => {
if (key in clientCollection.admin) {
delete clientCollection.admin[key]
|
049d560898fdf3fd9be40a4689eb1ef4170ef207
|
2022-12-15 20:15:06
|
Dan Ribbens
|
fix: add i18n type to collection and globals admin.description (#1675)
| false
|
add i18n type to collection and globals admin.description (#1675)
|
fix
|
diff --git a/src/config/types.ts b/src/config/types.ts
index 9a35cf7a437..df5978ef9f8 100644
--- a/src/config/types.ts
+++ b/src/config/types.ts
@@ -545,5 +545,6 @@ export type SanitizedConfig = Omit<
export type EntityDescription =
| string
+ | Record<string, string>
| (() => string)
| React.ComponentType<any>;
diff --git a/src/globals/config/types.ts b/src/globals/config/types.ts
index 652ba3e27fc..e65cd307292 100644
--- a/src/globals/config/types.ts
+++ b/src/globals/config/types.ts
@@ -3,7 +3,7 @@ import { Model, Document } from 'mongoose';
import { DeepRequired } from 'ts-essentials';
import { GraphQLNonNull, GraphQLObjectType } from 'graphql';
import { PayloadRequest } from '../../express/types';
-import { Access, Endpoint, GeneratePreviewURL } from '../../config/types';
+import { Access, Endpoint, EntityDescription, GeneratePreviewURL } from '../../config/types';
import { Field } from '../../fields/config/types';
import { IncomingGlobalVersions, SanitizedGlobalVersions } from '../../versions/types';
@@ -78,7 +78,7 @@ export type GlobalConfig = {
}
fields: Field[];
admin?: {
- description?: string | (() => string);
+ description?: EntityDescription;
group?: Record<string, string> | string;
hideAPIURL?: boolean;
components?: {
|
ae68093f35182aeb66675a1ced31faf1ec9fb3cd
|
2023-10-07 21:23:52
|
Elliot DeNolf
|
chore: update postgres replacement
| false
|
update postgres replacement
|
chore
|
diff --git a/src/lib/packages.ts b/src/lib/packages.ts
index 7084e4fe617..e19498cd183 100644
--- a/src/lib/packages.ts
+++ b/src/lib/packages.ts
@@ -34,7 +34,7 @@ const postgresReplacement: DbAdapterReplacement = {
importReplacement: "import { postgresAdapter } from '@payloadcms/db-postgres'",
configReplacement: [
' db: postgresAdapter({',
- ' client: {',
+ ' pool: {',
' connectionString: process.env.DATABASE_URI,',
' },',
' }),',
|
224cddd04573eff578ea3fa9ea5419f28b66c613
|
2023-11-30 02:52:47
|
Patrik
|
feat: relationship sortOptions property (#4301)
| false
|
relationship sortOptions property (#4301)
|
feat
|
diff --git a/docs/fields/relationship.mdx b/docs/fields/relationship.mdx
index 9a25b18b2c0..a37d8526b47 100644
--- a/docs/fields/relationship.mdx
+++ b/docs/fields/relationship.mdx
@@ -70,6 +70,43 @@ Set to `true` if you'd like this field to be sortable within the Admin UI using
Set to `false` if you'd like to disable the ability to create new documents from within the relationship field (hides the "Add new" button in the admin UI).
+**`sortOptions`**
+
+The `sortOptions` property allows you to define a default sorting order for the options within a Relationship field's dropdown. This can be particularly useful for ensuring that the most relevant options are presented first to the user.
+
+You can specify `sortOptions` in two ways:
+
+**As a string:**
+
+Provide a string to define a global default sort field for all relationship field dropdowns across different collections. You can prefix the field name with a minus symbol ("-") to sort in descending order.
+
+Example:
+
+```ts
+sortOptions: 'fieldName',
+```
+This configuration will sort all relationship field dropdowns by `"fieldName"` in ascending order.
+
+**As an object :**
+
+Specify an object where keys are collection slugs and values are strings representing the field names to sort by. This allows for different sorting fields for each collection's relationship dropdown.
+
+Example:
+
+```ts
+sortOptions: {
+ "pages": "fieldName1",
+ "posts": "-fieldName2",
+ "categories": "fieldName3"
+}
+```
+In this configuration:
+- Dropdowns related to `pages` will be sorted by `"fieldName1"` in ascending order.
+- Dropdowns for `posts` will use `"fieldName2"` for sorting in descending order (noted by the "-" prefix).
+- Dropdowns associated with `categories` will sort based on `"fieldName3"` in ascending order.
+
+Note: If `sortOptions` is not defined, the default sorting behavior of the Relationship field dropdown will be used.
+
### Filtering relationship options
Options can be dynamically limited by supplying a [query constraint](/docs/queries/overview), which will be used both for validating input and filtering available relationships in the UI.
diff --git a/packages/payload/src/admin/components/forms/field-types/Relationship/index.tsx b/packages/payload/src/admin/components/forms/field-types/Relationship/index.tsx
index f9e7e294e1b..e2a8a92e866 100644
--- a/packages/payload/src/admin/components/forms/field-types/Relationship/index.tsx
+++ b/packages/payload/src/admin/components/forms/field-types/Relationship/index.tsx
@@ -40,13 +40,14 @@ const Relationship: React.FC<Props> = (props) => {
admin: {
allowCreate = true,
className,
+ components: { Error, Label } = {},
condition,
description,
isSortable = true,
readOnly,
+ sortOptions,
style,
width,
- components: { Error, Label } = {},
} = {},
filterOptions,
hasMany,
@@ -139,7 +140,14 @@ const Relationship: React.FC<Props> = (props) => {
if (resultsFetched < 10) {
const collection = collections.find((coll) => coll.slug === relation)
- const fieldToSearch = collection?.admin?.useAsTitle || 'id'
+ let fieldToSearch = collection?.defaultSort || collection?.admin?.useAsTitle || 'id'
+ if (!searchArg) {
+ if (typeof sortOptions === 'string') {
+ fieldToSearch = sortOptions
+ } else if (sortOptions?.[relation]) {
+ fieldToSearch = sortOptions[relation]
+ }
+ }
const query: {
[key: string]: unknown
@@ -236,6 +244,7 @@ const Relationship: React.FC<Props> = (props) => {
locale,
filterOptionsResult,
serverURL,
+ sortOptions,
api,
i18n,
config,
@@ -252,7 +261,7 @@ const Relationship: React.FC<Props> = (props) => {
(searchArg: string, valueArg: Value | Value[]) => {
if (search !== searchArg) {
setLastLoadedPage({})
- updateSearch(searchArg, valueArg)
+ updateSearch(searchArg, valueArg, searchArg !== '')
}
},
[search, updateSearch],
diff --git a/packages/payload/src/exports/types.ts b/packages/payload/src/exports/types.ts
index 24e9bdc1397..b30fc500a29 100644
--- a/packages/payload/src/exports/types.ts
+++ b/packages/payload/src/exports/types.ts
@@ -80,6 +80,7 @@ export type {
Option,
OptionObject,
PointField,
+ PolymorphicRelationshipField,
RadioField,
RelationshipField,
RelationshipValue,
@@ -87,6 +88,7 @@ export type {
RowAdmin,
RowField,
SelectField,
+ SingleRelationshipField,
Tab,
TabAsField,
TabsAdmin,
diff --git a/packages/payload/src/fields/config/schema.ts b/packages/payload/src/fields/config/schema.ts
index 43a81794339..ead01c9542f 100644
--- a/packages/payload/src/fields/config/schema.ts
+++ b/packages/payload/src/fields/config/schema.ts
@@ -366,6 +366,11 @@ export const relationship = baseField.keys({
Label: componentSchema,
}),
isSortable: joi.boolean().default(false),
+ sortOptions: joi.alternatives().conditional(joi.ref('...relationTo'), {
+ is: joi.string(),
+ otherwise: joi.object().pattern(joi.string(), joi.string()),
+ then: joi.string(),
+ }),
}),
defaultValue: joi.alternatives().try(joi.func()),
filterOptions: joi.alternatives().try(joi.object(), joi.func()),
diff --git a/packages/payload/src/fields/config/types.ts b/packages/payload/src/fields/config/types.ts
index 936e4849eb3..b9eec3ba873 100644
--- a/packages/payload/src/fields/config/types.ts
+++ b/packages/payload/src/fields/config/types.ts
@@ -430,19 +430,10 @@ export type SelectField = FieldBase & {
type: 'select'
}
-export type RelationshipField = FieldBase & {
- admin?: Admin & {
- allowCreate?: boolean
- components?: {
- Error?: React.ComponentType<ErrorProps>
- Label?: React.ComponentType<LabelProps>
- }
- isSortable?: boolean
- }
+type SharedRelationshipProperties = FieldBase & {
filterOptions?: FilterOptions
hasMany?: boolean
maxDepth?: number
- relationTo: string | string[]
type: 'relationship'
} & (
| {
@@ -473,6 +464,28 @@ export type RelationshipField = FieldBase & {
}
)
+type RelationshipAdmin = Admin & {
+ allowCreate?: boolean
+ components?: {
+ Error?: React.ComponentType<ErrorProps>
+ Label?: React.ComponentType<LabelProps>
+ }
+ isSortable?: boolean
+}
+export type PolymorphicRelationshipField = SharedRelationshipProperties & {
+ admin?: RelationshipAdmin & {
+ sortOptions?: { [collectionSlug: string]: string }
+ }
+ relationTo: string[]
+}
+export type SingleRelationshipField = SharedRelationshipProperties & {
+ admin?: RelationshipAdmin & {
+ sortOptions?: string
+ }
+ relationTo: string
+}
+export type RelationshipField = PolymorphicRelationshipField | SingleRelationshipField
+
export type ValueWithRelation = {
relationTo: string
value: number | string
diff --git a/packages/plugin-nested-docs/src/fields/parent.ts b/packages/plugin-nested-docs/src/fields/parent.ts
index 717146420e2..e39dbc6ce5f 100644
--- a/packages/plugin-nested-docs/src/fields/parent.ts
+++ b/packages/plugin-nested-docs/src/fields/parent.ts
@@ -1,13 +1,13 @@
-import type { RelationshipField } from 'payload/types'
+import type { SingleRelationshipField } from 'payload/types'
const createParentField = (
relationTo: string,
overrides?: Partial<
- RelationshipField & {
+ SingleRelationshipField & {
hasMany: false
}
>,
-): RelationshipField => ({
+): SingleRelationshipField => ({
name: 'parent',
relationTo,
type: 'relationship',
diff --git a/test/fields/collections/Array/index.ts b/test/fields/collections/Array/index.ts
index 8c8243cb851..7ff8727b395 100644
--- a/test/fields/collections/Array/index.ts
+++ b/test/fields/collections/Array/index.ts
@@ -10,6 +10,11 @@ const ArrayFields: CollectionConfig = {
enableRichTextLink: false,
},
fields: [
+ {
+ name: 'title',
+ type: 'text',
+ required: false,
+ },
{
name: 'items',
defaultValue: arrayDefaultValue,
diff --git a/test/fields/collections/Array/shared.ts b/test/fields/collections/Array/shared.ts
index 29fdf376723..d78c73ac9e6 100644
--- a/test/fields/collections/Array/shared.ts
+++ b/test/fields/collections/Array/shared.ts
@@ -1,6 +1,7 @@
import type { ArrayField } from '../../payload-types'
export const arrayDoc: Partial<ArrayField> = {
+ title: 'array doc 1',
items: [
{
text: 'first row',
@@ -35,3 +36,31 @@ export const arrayDoc: Partial<ArrayField> = {
},
],
}
+
+export const anotherArrayDoc: Partial<ArrayField> = {
+ title: 'array doc 2',
+ items: [
+ {
+ text: 'first row',
+ },
+ {
+ text: 'second row',
+ },
+ {
+ text: 'third row',
+ },
+ ],
+ collapsedArray: [
+ {
+ text: 'initialize collapsed',
+ },
+ ],
+ arrayWithMinRows: [
+ {
+ text: 'first row',
+ },
+ {
+ text: 'second row',
+ },
+ ],
+}
diff --git a/test/fields/collections/Relationship/index.ts b/test/fields/collections/Relationship/index.ts
index 25f419ec0e1..cecca09b75b 100644
--- a/test/fields/collections/Relationship/index.ts
+++ b/test/fields/collections/Relationship/index.ts
@@ -13,12 +13,23 @@ const RelationshipFields: CollectionConfig = {
relationTo: ['text-fields', 'array-fields'],
required: true,
type: 'relationship',
+ admin: {
+ sortOptions: {
+ 'text-fields': '-id',
+ 'array-fields': '-id',
+ },
+ },
},
{
name: 'relationHasManyPolymorphic',
type: 'relationship',
relationTo: ['text-fields', 'array-fields'],
hasMany: true,
+ admin: {
+ sortOptions: {
+ 'text-fields': '-text',
+ },
+ },
},
{
name: 'relationToSelf',
diff --git a/test/fields/collections/Text/index.ts b/test/fields/collections/Text/index.ts
index 6fb6ef56f90..227b611669c 100644
--- a/test/fields/collections/Text/index.ts
+++ b/test/fields/collections/Text/index.ts
@@ -10,6 +10,7 @@ const TextFields: CollectionConfig = {
admin: {
useAsTitle: 'text',
},
+ defaultSort: 'id',
fields: [
{
name: 'text',
diff --git a/test/fields/collections/Text/shared.ts b/test/fields/collections/Text/shared.ts
index c7ed92011cc..a91912ff5ab 100644
--- a/test/fields/collections/Text/shared.ts
+++ b/test/fields/collections/Text/shared.ts
@@ -7,3 +7,7 @@ export const textDoc: Partial<TextField> = {
text: 'Seeded text document',
localizedText: 'Localized text',
}
+
+export const anotherTextDoc: Partial<TextField> = {
+ text: 'Another text document',
+}
diff --git a/test/fields/e2e.spec.ts b/test/fields/e2e.spec.ts
index ec13cbe0288..59911a77b30 100644
--- a/test/fields/e2e.spec.ts
+++ b/test/fields/e2e.spec.ts
@@ -1666,6 +1666,30 @@ describe('fields', () => {
await page.click('#action-save', { delay: 100 })
await expect(page.locator('.Toastify')).toContainText('Please correct invalid fields')
})
+
+ test('should sort relationship options by sortOptions property (ID in ascending order)', async () => {
+ await page.goto(url.create)
+
+ const field = page.locator('#field-relationship')
+ await field.click()
+
+ const firstOption = page.locator('.rs__option').first()
+ await expect(firstOption).toBeVisible()
+ const firstOptionText = await firstOption.textContent()
+ expect(firstOptionText.trim()).toBe('Another text document')
+ })
+
+ test('should sort relationHasManyPolymorphic options by sortOptions property: text-fields collection (items in descending order)', async () => {
+ await page.goto(url.create)
+
+ const field = page.locator('#field-relationHasManyPolymorphic')
+ await field.click()
+
+ const firstOption = page.locator('.rs__option').first()
+ await expect(firstOption).toBeVisible()
+ const firstOptionText = await firstOption.textContent()
+ expect(firstOptionText.trim()).toBe('Seeded text document')
+ })
})
describe('upload', () => {
diff --git a/test/fields/lexical.int.spec.ts b/test/fields/lexical.int.spec.ts
index 956404124f0..2b70bca6b68 100644
--- a/test/fields/lexical.int.spec.ts
+++ b/test/fields/lexical.int.spec.ts
@@ -64,8 +64,8 @@ describe('Lexical', () => {
await payload.find({
collection: arrayFieldsSlug,
where: {
- id: {
- exists: true,
+ title: {
+ equals: 'array doc 1',
},
},
})
@@ -75,8 +75,8 @@ describe('Lexical', () => {
await payload.find({
collection: uploadsSlug,
where: {
- id: {
- exists: true,
+ filename: {
+ equals: 'payload.jpg',
},
},
})
@@ -86,8 +86,8 @@ describe('Lexical', () => {
await payload.find({
collection: textFieldsSlug,
where: {
- id: {
- exists: true,
+ text: {
+ equals: 'Seeded text document',
},
},
})
@@ -97,8 +97,8 @@ describe('Lexical', () => {
await payload.find({
collection: richTextFieldsSlug,
where: {
- id: {
- exists: true,
+ title: {
+ equals: 'Rich Text',
},
},
})
diff --git a/test/fields/payload-types.ts b/test/fields/payload-types.ts
index cf0359506ec..3eecb4c3aaf 100644
--- a/test/fields/payload-types.ts
+++ b/test/fields/payload-types.ts
@@ -166,6 +166,7 @@ export interface User {
}
export interface ArrayField {
id: string
+ title?: string | null
items: {
text: string
id?: string | null
diff --git a/test/fields/seed.ts b/test/fields/seed.ts
index 85a4a5c7a52..5f9ba7b8425 100644
--- a/test/fields/seed.ts
+++ b/test/fields/seed.ts
@@ -4,7 +4,7 @@ import { type Payload } from '../../packages/payload/src'
import getFileByPath from '../../packages/payload/src/uploads/getFileByPath'
import { devUser } from '../credentials'
import { seedDB } from '../helpers/seed'
-import { arrayDoc } from './collections/Array/shared'
+import { anotherArrayDoc, arrayDoc } from './collections/Array/shared'
import { blocksDoc } from './collections/Blocks/shared'
import { codeDoc } from './collections/Code/shared'
import { collapsibleDoc } from './collections/Collapsible/shared'
@@ -20,7 +20,7 @@ import { radiosDoc } from './collections/Radio/shared'
import { richTextBulletsDocData, richTextDocData } from './collections/RichText/data'
import { selectsDoc } from './collections/Select/shared'
import { tabsDoc } from './collections/Tabs/shared'
-import { textDoc } from './collections/Text/shared'
+import { anotherTextDoc, textDoc } from './collections/Text/shared'
import { uploadsDoc } from './collections/Upload/shared'
import {
arrayFieldsSlug,
@@ -56,9 +56,17 @@ export async function clearAndSeedEverything(_payload: Payload) {
// Get both files in parallel
const [jpgFile, pngFile] = await Promise.all([getFileByPath(jpgPath), getFileByPath(pngPath)])
- const [createdArrayDoc, createdTextDoc, createdPNGDoc] = await Promise.all([
+ const [
+ createdArrayDoc,
+ createdAnotherArrayDoc,
+ createdTextDoc,
+ createdAnotherTextDoc,
+ createdPNGDoc,
+ ] = await Promise.all([
_payload.create({ collection: arrayFieldsSlug, data: arrayDoc }),
+ _payload.create({ collection: arrayFieldsSlug, data: anotherArrayDoc }),
_payload.create({ collection: textFieldsSlug, data: textDoc }),
+ _payload.create({ collection: textFieldsSlug, data: anotherTextDoc }),
_payload.create({ collection: uploadsSlug, data: {}, file: pngFile }),
])
|
b2662eeb1f1bfbd9b40967b1e7d4de5698a1782b
|
2024-05-29 00:05:18
|
Elliot DeNolf
|
ci: update app-build-with-packed job (#6541)
| false
|
update app-build-with-packed job (#6541)
|
ci
|
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 5f3a881f722..bc9971be024 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -427,8 +427,8 @@ jobs:
cd templates/blank-3.0
cp .env.example .env
ls -la
- pnpm add ./*.tgz
- pnpm install --ignore-workspace
+ pnpm add ./*.tgz --ignore-workspace
+ pnpm install --ignore-workspace --no-frozen-lockfile
cat package.json
pnpm run build
diff --git a/scripts/pack-all-to-dest.ts b/scripts/pack-all-to-dest.ts
index 83f826843d5..566839ad9fb 100644
--- a/scripts/pack-all-to-dest.ts
+++ b/scripts/pack-all-to-dest.ts
@@ -38,6 +38,7 @@ async function main() {
'db-mongodb',
'richtext-lexical',
'translations',
+ 'plugin-cloud',
]
const packageDetails = await getPackageDetails(packageWhitelist)
|
7369da3d8dcd4d1955765196908d911ca35c5486
|
2024-04-16 19:02:08
|
Bohdan Kucheriavyi
|
chore(plugin-seo): adds Ukrainian translations (#5836)
| false
|
adds Ukrainian translations (#5836)
|
chore
|
diff --git a/packages/plugin-seo/src/translations/index.ts b/packages/plugin-seo/src/translations/index.ts
index 95d807d373d..7104df69451 100644
--- a/packages/plugin-seo/src/translations/index.ts
+++ b/packages/plugin-seo/src/translations/index.ts
@@ -149,4 +149,26 @@ export const translations = {
tooShort: 'Zbyt krótkie',
},
},
+ uk: {
+ $schema: './translation-schema.json',
+ 'plugin-seo': {
+ almostThere: 'Ще трошки',
+ autoGenerate: 'Згенерувати',
+ bestPractices: 'найкращі практики',
+ characterCount: '{{current}}/{{minLength}}-{{maxLength}} символів, ',
+ charactersLeftOver: 'залишилось {{characters}} символів',
+ charactersToGo: ' на {{characters}} символів коротше',
+ charactersTooMany: 'на {{characters}} символів довше',
+ checksPassing: '{{current}}/{{max}} перевірок пройдено',
+ good: 'Чудово',
+ imageAutoGenerationTip: 'Автоматична генерація використає зображення з головного блоку',
+ lengthTipDescription: 'Має бути від {{minLength}} до {{maxLength}} символів. Щоб дізнатися, як писати якісні метаописи — перегляньте ',
+ lengthTipTitle: 'Має бути від {{minLength}} до {{maxLength}} символів. Щоб дізнатися, як писати якісні метазаголовки — перегляньте ',
+ noImage: 'Немає зображення',
+ preview: 'Попередній перегляд',
+ previewDescription: 'Реальне відображення може відрізнятися в залежності від вмісту та релевантності пошуку.',
+ tooLong: 'Задовгий',
+ tooShort: 'Закороткий',
+ },
+ },
}
diff --git a/packages/plugin-seo/src/translations/uk.json b/packages/plugin-seo/src/translations/uk.json
new file mode 100644
index 00000000000..14a818c544f
--- /dev/null
+++ b/packages/plugin-seo/src/translations/uk.json
@@ -0,0 +1,22 @@
+{
+ "$schema": "./translation-schema.json",
+ "plugin-seo": {
+ "almostThere": "Ще трошки",
+ "autoGenerate": "Згенерувати",
+ "bestPractices": "найкращі практики",
+ "characterCount": "{{current}}/{{minLength}}-{{maxLength}} символів, ",
+ "charactersLeftOver": "залишилось {{characters}} символів",
+ "charactersToGo": " на {{characters}} символів коротше",
+ "charactersTooMany": "на {{characters}} символів довше",
+ "checksPassing": "{{current}}/{{max}} перевірок пройдено",
+ "good": "Чудово",
+ "imageAutoGenerationTip": "Автоматична генерація використає зображення з головного блоку",
+ "lengthTipDescription": "Має бути від {{minLength}} до {{maxLength}} символів. Щоб дізнатися, як писати якісні метаописи — перегляньте ",
+ "lengthTipTitle": "Має бути від {{minLength}} до {{maxLength}} символів. Щоб дізнатися, як писати якісні метазаголовки — перегляньте ",
+ "noImage": "Немає зображення",
+ "preview": "Попередній перегляд",
+ "previewDescription": "Реальне відображення може відрізнятися в залежності від вмісту та релевантності пошуку.",
+ "tooLong": "Задовгий",
+ "tooShort": "Закороткий"
+ }
+}
diff --git a/packages/translations/src/importDateFNSLocale.ts b/packages/translations/src/importDateFNSLocale.ts
index f27689d76f0..7dad7fcc53f 100644
--- a/packages/translations/src/importDateFNSLocale.ts
+++ b/packages/translations/src/importDateFNSLocale.ts
@@ -95,6 +95,10 @@ export const importDateFNSLocale = async (locale: string): Promise<Locale> => {
case 'tr':
result = await import('date-fns/locale/tr')
+ break
+ case 'uk':
+ result = await import('date-fns/locale/uk')
+
break
case 'vi':
result = await import('date-fns/locale/vi')
diff --git a/packages/translations/src/languages/uk.ts b/packages/translations/src/languages/uk.ts
index 25b2d934b53..71005b0a611 100644
--- a/packages/translations/src/languages/uk.ts
+++ b/packages/translations/src/languages/uk.ts
@@ -1,7 +1,7 @@
import type { Language } from '../types.js'
export const uk: Language = {
- dateFNSKey: 'en-US',
+ dateFNSKey: 'uk',
translations: {
authentication: {
account: 'Обліковий запис',
@@ -10,10 +10,10 @@ export const uk: Language = {
alreadyLoggedIn: 'Вже увійшли в систему',
apiKey: 'API ключ',
backToLogin: 'Повернутися до входу',
- beginCreateFirstUser: 'Щоб розпочати - створість першого користувача',
+ beginCreateFirstUser: 'Щоб розпочати — створість першого користувача',
changePassword: 'Змінити пароль',
checkYourEmailForPasswordReset:
- 'Перевірте вашу пошту на наявність посилання, яке дозволить вам безпечно скинути пароль',
+ 'Перевірте вашу електронну пошту на наявність посилання, що дозволить вам безпечно скинути пароль',
confirmGeneration: 'Підтвердити генерацію',
confirmPassword: 'Підтвердження паролю',
createFirstUser: 'Створення першого користувача',
@@ -22,79 +22,79 @@ export const uk: Language = {
enableAPIKey: 'Активувати API ключ',
failedToUnlock: 'Не вдалось розблокувати',
forceUnlock: 'Примусове розблокування',
- forgotPassword: 'Забули пароль',
+ forgotPassword: 'Забули пароль?',
forgotPasswordEmailInstructions:
- 'Будь ласка, введіть вашу адресу електронної пошти нижче. Ви отримаєте повідомлення електронною поштою з інструкціями щодо скидання пароля.',
+ 'Будь ласка, вкажіть адресу вашої електронної пошти нижче. Ви отримаєте лист на вашу електронну пошту з інструкціями щодо скидання пароля.',
forgotPasswordQuestion: 'Забули пароль?',
generate: 'Згенерувати',
generateNewAPIKey: 'Згенерувати новий API ключ',
generatingNewAPIKeyWillInvalidate:
- 'Генерація нового API ключа зробить попередній <1>недійсним</1>. Ви впевнені, що хочете продовжити?',
+ 'Генерація нового API ключа зробить попередній <1>недійсним</1>. Ви впевнені, що бажаєте продовжити?',
lockUntil: 'Заблокувати до',
logBackIn: 'Увійти знову',
logOut: 'Вийти',
- loggedIn: 'Щоб увійти в інший обліковий запис, спочатку <0>вийдіть</0> з поточного.',
+ loggedIn: 'Щоб увйти в систему з іншого облікового запису, спочатку <0>вийдіть з системи</0>.',
loggedInChangePassword:
- 'Щоб змінити ваш пароль, перейдіть до <0>облікового запису</0> і змініть ваш пароль там.',
+ 'Щоб змінити ваш пароль, перейдіть до <0>сторінки облікового запису</0> і змініть ваш пароль.',
loggedOutInactivity: 'Ви вийшли з системи через бездіяльність.',
loggedOutSuccessfully: 'Ви успішно вийшли з системи.',
login: 'Увійти',
loginAttempts: 'Спроби входу',
loginUser: 'Вхід користувача в систему',
- loginWithAnotherUser: 'Щоб увйти в систему під іншим користувачем, спочатку <0>вийдіть</0>.',
+ loginWithAnotherUser: 'Щоб увйти в систему з іншого облікового запису, спочатку <0>вийдіть з системи</0>.',
logout: 'Вийти',
logoutUser: 'Вийти з системи',
newAPIKeyGenerated: 'Новий API ключ згенеровано.',
newAccountCreated:
- 'Новий обліковий запис було створено, щоб отримати доступ до <a href="{{serverURL}}">{{serverURL}}</a>, будь ласка, натисніть на наступне посилання, або вставте посилання в адресну строку вашого браузера, щоб підтвердити вашу пошту: <a href="{{verificationURL}}">{{verificationURL}}</a><br> Після Підтвердження вашої пошти, ви матимете змогу зайти в систему.',
+ 'Новий обліковий запис було створено, щоб отримати доступ до <a href="{{serverURL}}">{{serverURL}}</a>, будь ласка, натисніть на наступне посилання, або вставте його в адресний рядок браузера, щоб підтвердити вашу електронну пошту: <a href="{{verificationURL}}">{{verificationURL}}</a><br> Після підтвердження вашої електронно пошти, ви зможете увійти в систему.',
newPassword: 'Новий пароль',
resetPassword: 'Скинути пароль',
resetPasswordExpiration: 'Скинути пароль після закінчення строку дії',
resetPasswordToken: 'Токет для скидання пароля',
resetYourPassword: 'Скинути ваш пароль',
- stayLoggedIn: 'Залишатись в системі',
+ stayLoggedIn: 'Залишитись в системі',
successfullyUnlocked: 'Успішно розблоковано',
unableToVerify: 'Неможливо підтвердити',
verified: 'Підтверджено',
- verifiedSuccessfully: 'Успішно Підтверджено',
+ verifiedSuccessfully: 'Успішно підтверджено',
verify: 'Підтвердити',
verifyUser: 'Підтвердити користувача',
verifyYourEmail: 'Підтвердити пошту',
youAreInactive:
'Ви були неактивні певний час і скоро, в цілях вашої безпеки, вас буде розлогінено. Чи бажаєте ви залишитись в системі?',
youAreReceivingResetPassword:
- 'Ви отримали це повідомлення, бо ви (або хтось інший) створив запит на скидання пароля до вашого облікового запису. Будь ласка, натисніть на наступне посилання, або вставте посилання в адресний рядок вашого браузера, щоб завершити процес:',
+ 'Ви отримали це повідомлення, бо ви (або хтось інший) створив запит на скидання пароля до вашого облікового запису. Будь ласка, натисніть на наступне посилання, або вставте посилання в адресний рядок браузера, щоб завершити процес:',
youDidNotRequestPassword:
- 'Якщо ви не сторювали запит на це, будь ласка, ігноруйте це повідомлення і пароль залишиться без змін',
+ 'Якщо ви не сторювали цей запит, будь ласка, проігноруйте це повідомлення',
},
error: {
- accountAlreadyActivated: 'Цей аккаунт вже активований',
+ accountAlreadyActivated: 'Цей обліковий запис вже активований',
autosaving: 'Виникла проблема під час автозбереження цього документа.',
correctInvalidFields: 'Будь ласка, виправте невірні поля.',
deletingFile: 'Виникла помилка під час видалення файлу',
deletingTitle:
- "Виникла помилка під час видалення {{title}}, Будь ласка, перевірте ваше з'єднання та спробуйте ще раз.",
- emailOrPasswordIncorrect: 'Вказаний email або пароль не є вірними',
- followingFieldsInvalid_one: 'Наступне поле не є вірним:',
- followingFieldsInvalid_other: 'Наступні поля не є вірними',
+ "Виникла помилка під час видалення {{title}}. Будь ласка, перевірте ваше з'єднання та спробуйте ще раз.",
+ emailOrPasswordIncorrect: 'Вказана адреса електронної пошти або пароль є невірними',
+ followingFieldsInvalid_one: 'Наступне поле невірне:',
+ followingFieldsInvalid_other: 'Наступні поля невірні',
incorrectCollection: 'Неправильна колекція',
- invalidFileType: 'Невіртий тип файлу',
+ invalidFileType: 'Невірний тип файлу',
invalidFileTypeValue: 'Невірний тип файлу: {{value}}',
loadingDocument: 'Виникла помилка під час завантаження документа з ID {{id}}.',
missingEmail: 'Відсутній email.',
missingIDOfDocument: 'Відсутній ID документа для оновлення.',
missingIDOfVersion: 'Відсутній ID версії.',
missingRequiredData: "Відсусті обов'язкові дані.",
- noFilesUploaded: 'Не було загружено жодного файлу.',
+ noFilesUploaded: 'Жодного файлу не було завантажено.',
noMatchedField: 'Не знайдено відповідного поля для "{{label}}"',
noUser: 'Немає користувача',
notAllowedToAccessPage: 'Ви не маєте доступу до цієї сторінки.',
- notAllowedToPerformAction: 'Вам не дозволено виконувати цю дію.',
+ notAllowedToPerformAction: 'Ви не маєте дозволу виконувати цю дію.',
notFound: 'Запитуваний ресурс не знайдено.',
previewing: 'Виникла помилка під час попереднього перегляду цього документа.',
problemUploadingFile: 'Виникла помилка під час завантаження файлу.',
- tokenInvalidOrExpired: 'Токен або не дійсний, або його строк дії закінчився.',
- unPublishingDocument: 'Підчас відміни публікації даного документа, виникла помилка.',
+ tokenInvalidOrExpired: 'Токен недійсний, або його строк дії закінчився.',
+ unPublishingDocument: 'Під час скасування публікації даного документа виникла помилка.',
unableToDeleteCount: 'Не вдалося видалити {{count}} із {{total}} {{label}}.',
unableToUpdateCount: 'Не вдалося оновити {{count}} із {{total}} {{label}}.',
unauthorized: 'Немає доступу, ви повинні увійти, щоб виконати цей запит.',
@@ -102,7 +102,7 @@ export const uk: Language = {
unspecific: 'Виникла помилка.',
userLocked: 'Цей користувач заблокований через велику кількість невдалих спроб входу.',
valueMustBeUnique: 'Значення має бути унікальним.',
- verificationTokenInvalid: 'Токен верифікації є недійсним.',
+ verificationTokenInvalid: 'Токен верифікації недійсний.',
},
fields: {
addLabel: 'Додати {{label}}',
@@ -115,19 +115,19 @@ export const uk: Language = {
blockType: 'Тип блока',
blocks: 'блоки',
chooseBetweenCustomTextOrDocument:
- 'Виберіть між введенням власної текстової URL-адреси і посиланням на інший документ.',
- chooseDocumentToLink: 'Виберіть документ, на який потрібно зробити посилання',
- chooseFromExisting: 'Вибрати з існуючих',
- chooseLabel: 'Вибрати {{label}}',
+ 'Виберіть між введенням власної URL-адреси та посиланням на інший документ.',
+ chooseDocumentToLink: 'Оберіть документ, на який потрібно зробити посилання',
+ chooseFromExisting: 'Обрати з існуючих',
+ chooseLabel: 'Обрати {{label}}',
collapseAll: 'Згорнути все',
customURL: 'Власний URL',
- editLabelData: 'Редагувати данні {{label}}',
+ editLabelData: 'Редагувати дані {{label}}',
editLink: 'Редагувати посилання',
editRelationship: "Редагувати взаємозв'язок",
enterURL: 'Введіть URL',
internalLink: 'Внутрішнє посилання',
itemsAndMore: '{{items}} і ще {{count}}',
- labelRelationship: "{{label}} Зв'язок",
+ labelRelationship: "{{label}} взаємов'язок",
latitude: 'Широта',
linkType: 'Тип посилання',
linkedTo: "Зв'язано з <0>{{label}}</0>",
@@ -136,8 +136,8 @@ export const uk: Language = {
openInNewTab: 'Відкривати в новій вкладці',
passwordsDoNotMatch: 'Паролі не співпадають.',
relatedDocument: "Пов'язаний документ",
- relationTo: "Зв'язано з",
- removeRelationship: "Видалити зв'язок",
+ relationTo: "Пов'язано з",
+ removeRelationship: "Видалити взаємозв'язок",
removeUpload: 'Видалити завантаження',
saveChanges: 'Зберегти зміни',
searchForBlock: 'Знайти блок',
@@ -152,12 +152,12 @@ export const uk: Language = {
},
general: {
aboutToDelete: 'Ви бажаєте видалити {{label}} <1>{{title}}</1>. Ви впевнені?',
- aboutToDeleteCount_many: 'Ви збираєтеся видалити {{count}} {{label}}',
- aboutToDeleteCount_one: 'Ви збираєтеся видалити {{count}} {{label}}',
- aboutToDeleteCount_other: 'Ви збираєтеся видалити {{count}} {{label}}',
+ aboutToDeleteCount_many: 'Ви бажаєте видалити {{count}} {{label}}',
+ aboutToDeleteCount_one: 'Ви бажаєте видалити {{count}} {{label}}',
+ aboutToDeleteCount_other: 'Ви бажаєте видалити {{count}} {{label}}',
addBelow: 'Додати нижче',
addFilter: 'Додати фільтр',
- adminTheme: 'Тема адмінки',
+ adminTheme: 'Тема адмін панелі',
and: 'і',
applyChanges: 'Застосувати зміни',
ascending: 'В порядку зростання',
@@ -199,8 +199,8 @@ export const uk: Language = {
editingLabel_many: 'Редагування {{count}} {{label}}',
editingLabel_one: 'Редагування {{count}} {{label}}',
editingLabel_other: 'Редагування {{count}} {{label}}',
- email: 'Email',
- emailAddress: 'Email адреса',
+ email: 'Електронна пошта',
+ emailAddress: 'Адреса електронної пошти',
enterAValue: 'Введіть значення',
error: 'Помилка',
errors: 'Помилки',
@@ -215,9 +215,9 @@ export const uk: Language = {
leaveWithoutSaving: 'Вийти без збереження',
light: 'Світла',
livePreview: 'Попередній перегляд',
- loading: 'Загрузка',
+ loading: 'Завантаження',
locale: 'Локаль',
- locales: 'Переклади',
+ locales: 'Локалі',
menu: 'Меню',
moveDown: 'Перемістити нижче',
moveUp: 'Перемістити вище',
@@ -226,7 +226,7 @@ export const uk: Language = {
noLabel: '<без {{label}}>',
noOptions: 'Немає варіантів',
noResults:
- 'Жодного {{label}} не знайдено. Або {{label}} ще не існує, або жодна з них не відповідає фільтрам, які ви задали више.',
+ 'Жодного {{label}} не знайдено. Або {{label}} ще не існує, або жодна з них не відповідає фільтрам, що ви задали више.',
noValue: 'Немає значення',
none: 'Ніхто',
notFound: 'Не знайдено',
@@ -247,11 +247,11 @@ export const uk: Language = {
saving: 'Збереження...',
searchBy: 'Шукати по {{label}}',
selectAll: 'Вибрати всі {{count}} {{label}}',
- selectAllRows: 'Вибрати всі рядки',
- selectValue: 'Вибрати значення',
- selectedCount: 'Вибрано {{count}} {{label}}',
+ selectAllRows: 'Обрати всі рядки',
+ selectValue: 'Обрати значення',
+ selectedCount: 'Обрано {{count}} {{label}}',
showAllLabel: 'Показати всі {{label}}',
- sorryNotFound: 'Вибачте - немає нічого, що відповідало б Вашому запиту.',
+ sorryNotFound: 'Вибачте, немає нічого, що відповідало б Вашому запиту.',
sort: 'Сортувати',
sortByLabelDirection: 'Сортувати за {{label}} {{direction}}',
stayOnThisPage: 'Залишитись на цій сторінці',
@@ -262,7 +262,7 @@ export const uk: Language = {
thisLanguage: 'Українська',
titleDeleted: '{{label}} "{{title}}" успішно видалено.',
unauthorized: 'Немає доступу',
- unsavedChangesDuplicate: 'Ви маєте не збережені зміни. Чи бажаєте ви продовжити дублювання?',
+ unsavedChangesDuplicate: 'Ви маєте незбережені зміни. Чи бажаєте ви продовжити дублювання?',
untitled: 'Без назви',
updatedAt: 'Змінено',
updatedCountSuccessfully: 'Успішно оновлено {{count}} {{label}}.',
@@ -297,67 +297,66 @@ export const uk: Language = {
editImage: 'Редагувати зображення',
fileName: 'Назва файлу',
fileSize: 'Розмір файлу',
- focalPoint: 'Центральна точка',
+ focalPoint: 'Точка фокусу',
focalPointDescription:
- 'Перетягніть фокусний пункт безпосередньо на попередній перегляд або налаштуйте значення нижче.',
+ 'Перетягніть точку фокусу безпосередньо на попередньому перегляді або налаштуйте значення нижче.',
height: 'Висота',
lessInfo: 'Менше інформації',
moreInfo: 'Більше інформації',
- previewSizes: 'Розміри попереднього перегляду',
- selectCollectionToBrowse: 'Виберіть колекцію для перегляду',
- selectFile: 'Виберіть файл',
+ previewSizes: 'Попередній перегляд розмірів',
+ selectCollectionToBrowse: 'Оберіть колекцію для перегляду',
+ selectFile: 'Оберіть файл',
setCropArea: 'Встановити область обрізки',
- setFocalPoint: 'Встановити фокусний пункт',
+ setFocalPoint: 'Встановити точку фокусу',
sizes: 'Розміри',
sizesFor: 'Розміри для {{label}}',
width: 'Ширина',
},
validation: {
- emailAddress: 'Будь ласка, введіть валідну email адресу.',
- enterNumber: 'Будь ласка, введіть валідний номер.',
- fieldHasNo: 'В цього поля немає {{label}}',
- greaterThanMax: '{{value}} більше, ніж дозволено максимуму {{label}} в {{max}}.',
+ emailAddress: 'Будь ласка, введіть валідну адресу електронної пошти.',
+ enterNumber: 'Будь ласка, введіть валідне число.',
+ fieldHasNo: 'В цього полі немає {{label}}',
+ greaterThanMax: '{{value}} більше, ніж припустиме максимальне значення {{label}} в {{max}}.',
invalidInput: 'У цьому полі введено некоректне значення.',
invalidSelection: 'Це поле має некоректний вибір.',
invalidSelections: 'Це поле має наступні невірні варіанти вибору:',
- lessThanMin: '{{value}} менше, ніж дозволено мінімуму {{label}} в {{min}}.',
+ lessThanMin: '{{value}} менше, ніж мінімальне припустиме значення {{label}} в {{min}}.',
limitReached: 'Досягнуто межі, можна додати лише {{max}} елементів.',
- longerThanMin:
- 'Це значення має бути більше, ніж мінімальна довжина {{minLength}} characters.',
+ longerThanMin: 'Це значення має дорівнювати або бути довшим, ніж {{minLength}} символів.',
notValidDate: '"{{value}}" - некоректна дата.',
required: "Це поле є обов'язковим.",
requiresAtLeast: 'Це поле потребує не менше {{count}} {{label}}.',
requiresNoMoreThan: 'Це поле потребує не більше {{count}} {{label}}.',
requiresTwoNumbers: 'У цьому полі потрібно ввести два числа.',
- shorterThanMax: 'Це значення має бути меншим за максимальну довжину символів {{maxLength}}.',
+ shorterThanMax: 'Це значення має дорівнювати або бути коротшим, ніж {{maxLength}} символів.',
trueOrFalse: 'Це поле може мати значення тільки true або false.',
validUploadID: 'Це поле не є дійсним ID завантаження.',
},
version: {
type: 'Тип',
- aboutToPublishSelection: 'Ви збираєтеся опублікувати всі {{label}} у добірці. Ти впевнений?',
+ aboutToPublishSelection: 'Ви бажаєте опублікувати всі {{label}} у вибірці. Ви впевнені?',
aboutToRestore:
- 'Ви збираєтесь відновити цей документ {{label}} до стану, в якому він знаходився {{versionDate}}.',
+ 'Ви бажаєте відновити цей документ {{label}} до стану, в якому він знаходився {{versionDate}}. Ви впевнені?',
aboutToRestoreGlobal:
- 'Ви збираєтесь відновити глобальний запис {{label}} до стану, в якому він знаходився {{versionDate}}.',
+ 'Ви бажаєте відновити глобальний запис {{label}} до стану, в якому він знаходився {{versionDate}}. Ви впевнені?',
aboutToRevertToPublished:
- 'Ви збираєтесь вернути зміни цього документа до його опублікованого стану. Ви впевнені?',
- aboutToUnpublish: 'Ви збираєтесь відмінити публікацю цього документа. Ви впевнені?',
+ 'Ви бажаєте повернути зміни цього документа до його опублікованого стану. Ви впевнені?',
+ aboutToUnpublish: 'Ви бажаєте скасувати публікацю цього документа. Ви впевнені?',
aboutToUnpublishSelection:
- 'Ви збираєтеся скасувати публікацію всіх {{label}} у вибраному. Ти впевнений?',
+ 'Ви бажаєте скасувати публікацію всіх {{label}} у вибірці. Ви впевнені?',
autosave: 'Автозбереження',
autosavedSuccessfully: 'Автозбереження успішно виконано.',
- autosavedVersion: 'Автозбережена версія',
+ autosavedVersion: 'Автозбереження',
changed: 'Змінено',
compareVersion: 'Порівняти версію з:',
confirmPublish: 'Підтвердити публікацію',
- confirmRevertToSaved: 'Підтвердити повернення до збереженого',
- confirmUnpublish: 'Підвтердити відміну публікації',
+ confirmRevertToSaved: 'Підтвердити повернення до збереженого стану',
+ confirmUnpublish: 'Підвтердити скасування публікації',
confirmVersionRestoration: 'Підтвердити відновлення версії',
currentDocumentStatus: 'Поточний статус {{docStatus}} документа',
draft: 'Чернетка',
- draftSavedSuccessfully: 'Чернетка успішно збережена.',
- lastSavedAgo: 'Останній раз збережено {{distance}} тому',
+ draftSavedSuccessfully: 'Чернетку успішно збережено.',
+ lastSavedAgo: 'Востаннє збережено {{distance}} тому',
noFurtherVersionsFound: 'Інших версій не знайдено',
noRowsFound: 'Не знайдено {{label}}',
preview: 'Попередній перегляд',
@@ -368,29 +367,30 @@ export const uk: Language = {
publishing: 'Публікація',
restoreThisVersion: 'Відновити цю версію',
restoredSuccessfully: 'Відновлено успішно.',
- restoring: 'Відеовлення...',
- revertToPublished: 'Відновити до опублікованого',
- reverting: 'Відновлення...',
+ restoring: 'Відновлення...',
+ revertToPublished: 'Повернутися до опублікованого стану',
+ reverting: 'Повернення до опублікованого стану...',
saveDraft: 'Зберегти чернетку',
- selectLocales: 'Виберіть переклад для відображення',
- selectVersionToCompare: 'Виберіть версію для порівняння',
- showLocales: 'Показати переклади:',
+ selectLocales: 'Оберіть локаль для відображення',
+ selectVersionToCompare: 'Оберіть версію для порівняння',
+ showLocales: 'Показати локалі:',
showingVersionsFor: 'Показані версії для:',
status: 'Статус',
- unpublish: 'Відмінити публікацію',
- unpublishing: 'Відміна публікації...',
+ unpublish: 'Скасувати публікацію',
+ unpublishing: 'Скасування публікації...',
version: 'Версія',
- versionCount_many: '{{count}} Версій знайдено',
+ versionCount_many: '{{count}} версій знайдено',
versionCount_none: 'Версій не знайдено',
versionCount_one: '{{count}} версія знайдена',
- versionCount_other: '{{count}} versions found',
+ versionCount_other: '{{count}} версій знайдено',
+ versionCount_two: '{{count}} версії знайдено',
versionCreatedOn: '{{version}} створена:',
versionID: 'ID версії',
versions: 'Версії',
- viewingVersion: 'Огляд версії для {{entityLabel}} {{documentTitle}}',
- viewingVersionGlobal: 'Огляд версій для глобальної колекці {{entityLabel}}',
- viewingVersions: 'Огляд версій для {{entityLabel}} {{documentTitle}}',
- viewingVersionsGlobal: 'Огляд версій для глобальної колекції {{entityLabel}}',
+ viewingVersion: 'Перенляд версії для {{entityLabel}} {{documentTitle}}',
+ viewingVersionGlobal: 'Перегляд версій для глобальної колекції {{entityLabel}}',
+ viewingVersions: 'Перегляд версій для {{entityLabel}} {{documentTitle}}',
+ viewingVersionsGlobal: 'Перегляд версій для глобальної колекції {{entityLabel}}',
},
},
}
diff --git a/packages/translations/src/types.ts b/packages/translations/src/types.ts
index 937b252b439..1e06bf82b77 100644
--- a/packages/translations/src/types.ts
+++ b/packages/translations/src/types.ts
@@ -26,6 +26,7 @@ type DateFNSKeys =
| 'sv'
| 'th'
| 'tr'
+ | 'uk'
| 'vi'
| 'zh-CN'
| 'zh-TW'
|
e3866c403541410af34abbad0c63f11e53aeb801
|
2024-11-22 01:44:57
|
Alessio Gravili
|
fix(ui): stale server components when rows are moved (#9410)
| false
|
stale server components when rows are moved (#9410)
|
fix
|
diff --git a/packages/ui/src/forms/Form/fieldReducer.ts b/packages/ui/src/forms/Form/fieldReducer.ts
index 689123f4625..cb655226d33 100644
--- a/packages/ui/src/forms/Form/fieldReducer.ts
+++ b/packages/ui/src/forms/Form/fieldReducer.ts
@@ -198,6 +198,7 @@ export function fieldReducer(state: FormState, action: FieldAction): FormState {
...flattenRows(path, rows),
[path]: {
...state[path],
+ requiresRender: true,
rows: rowStateCopy,
},
}
diff --git a/test/fields/collections/Lexical/e2e/main/e2e.spec.ts b/test/fields/collections/Lexical/e2e/main/e2e.spec.ts
index 75bcd895a3f..a5a96a29c32 100644
--- a/test/fields/collections/Lexical/e2e/main/e2e.spec.ts
+++ b/test/fields/collections/Lexical/e2e/main/e2e.spec.ts
@@ -1044,6 +1044,30 @@ describe('lexicalMain', () => {
await expect(htmlOutput).toBeVisible()
})
+ test('ensure lexical fields in blocks have correct value when moving blocks', async () => {
+ // Previously, we had the issue that the lexical field values did not update when moving blocks, as the MOVE_ROW form action did not request
+ // re-rendering of server components
+ await page.goto('http://localhost:3000/admin/collections/LexicalInBlock?limit=10')
+ await page.locator('.cell-id a').first().click()
+ await page.waitForURL(`**/collections/LexicalInBlock/**`)
+
+ await expect(page.locator('#blocks-row-0 .LexicalEditorTheme__paragraph')).toContainText('1')
+ await expect(page.locator('#blocks-row-0 .section-title__input')).toHaveValue('1') // block name
+ await expect(page.locator('#blocks-row-1 .LexicalEditorTheme__paragraph')).toContainText('2')
+ await expect(page.locator('#blocks-row-1 .section-title__input')).toHaveValue('2') // block name
+
+ // Move block 1 to the end
+ await page.locator('#blocks-row-0 .array-actions__button').click()
+ await expect(page.locator('#blocks-row-0 .popup__content')).toBeVisible()
+
+ await page.locator('#blocks-row-0 .popup__content').getByText('Move Down').click()
+
+ await expect(page.locator('#blocks-row-0 .LexicalEditorTheme__paragraph')).toContainText('2')
+ await expect(page.locator('#blocks-row-0 .section-title__input')).toHaveValue('2') // block name
+ await expect(page.locator('#blocks-row-1 .LexicalEditorTheme__paragraph')).toContainText('1')
+ await expect(page.locator('#blocks-row-1 .section-title__input')).toHaveValue('1') // block name
+ })
+
describe('localization', () => {
test.skip('ensure simple localized lexical field works', async () => {
await navigateToLexicalFields(true, true)
diff --git a/test/fields/collections/LexicalInBlock/index.ts b/test/fields/collections/LexicalInBlock/index.ts
new file mode 100644
index 00000000000..b3e3c2e0fa8
--- /dev/null
+++ b/test/fields/collections/LexicalInBlock/index.ts
@@ -0,0 +1,22 @@
+import type { CollectionConfig } from 'payload'
+
+export const LexicalInBlock: CollectionConfig = {
+ slug: 'LexicalInBlock',
+ fields: [
+ {
+ name: 'blocks',
+ type: 'blocks',
+ blocks: [
+ {
+ slug: 'lexicalInBlock2',
+ fields: [
+ {
+ name: 'lexical',
+ type: 'richText',
+ },
+ ],
+ },
+ ],
+ },
+ ],
+}
diff --git a/test/fields/config.ts b/test/fields/config.ts
index 8bc8abec7d7..12ca0d12517 100644
--- a/test/fields/config.ts
+++ b/test/fields/config.ts
@@ -19,6 +19,7 @@ import GroupFields from './collections/Group/index.js'
import IndexedFields from './collections/Indexed/index.js'
import JSONFields from './collections/JSON/index.js'
import { LexicalFields } from './collections/Lexical/index.js'
+import { LexicalInBlock } from './collections/LexicalInBlock/index.js'
import { LexicalLocalizedFields } from './collections/LexicalLocalized/index.js'
import { LexicalMigrateFields } from './collections/LexicalMigrate/index.js'
import { LexicalObjectReferenceBugCollection } from './collections/LexicalObjectReferenceBug/index.js'
@@ -63,6 +64,8 @@ export const collectionSlugs: CollectionConfig[] = [
},
],
},
+ LexicalInBlock,
+
ArrayFields,
BlockFields,
CheckboxFields,
diff --git a/test/fields/payload-types.ts b/test/fields/payload-types.ts
index 9296fdd2e72..8f02f35f117 100644
--- a/test/fields/payload-types.ts
+++ b/test/fields/payload-types.ts
@@ -33,6 +33,7 @@ export interface Config {
'lexical-localized-fields': LexicalLocalizedField;
lexicalObjectReferenceBug: LexicalObjectReferenceBug;
users: User;
+ LexicalInBlock: LexicalInBlock;
'array-fields': ArrayField;
'block-fields': BlockField;
'checkbox-fields': CheckboxField;
@@ -75,6 +76,7 @@ export interface Config {
'lexical-localized-fields': LexicalLocalizedFieldsSelect<false> | LexicalLocalizedFieldsSelect<true>;
lexicalObjectReferenceBug: LexicalObjectReferenceBugSelect<false> | LexicalObjectReferenceBugSelect<true>;
users: UsersSelect<false> | UsersSelect<true>;
+ LexicalInBlock: LexicalInBlockSelect<false> | LexicalInBlockSelect<true>;
'array-fields': ArrayFieldsSelect<false> | ArrayFieldsSelect<true>;
'block-fields': BlockFieldsSelect<false> | BlockFieldsSelect<true>;
'checkbox-fields': CheckboxFieldsSelect<false> | CheckboxFieldsSelect<true>;
@@ -123,9 +125,9 @@ export interface Config {
user: User & {
collection: 'users';
};
- jobs?: {
+ jobs: {
tasks: unknown;
- workflows?: unknown;
+ workflows: unknown;
};
}
export interface UserAuthOperations {
@@ -394,6 +396,37 @@ export interface User {
lockUntil?: string | null;
password?: string | null;
}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "LexicalInBlock".
+ */
+export interface LexicalInBlock {
+ id: string;
+ blocks?:
+ | {
+ lexical?: {
+ root: {
+ type: string;
+ children: {
+ type: string;
+ version: number;
+ [k: string]: unknown;
+ }[];
+ direction: ('ltr' | 'rtl') | null;
+ format: 'left' | 'start' | 'center' | 'right' | 'end' | 'justify' | '';
+ indent: number;
+ version: number;
+ };
+ [k: string]: unknown;
+ } | null;
+ id?: string | null;
+ blockName?: string | null;
+ blockType: 'lexicalInBlock2';
+ }[]
+ | null;
+ updatedAt: string;
+ createdAt: string;
+}
/**
* This interface was referenced by `Config`'s JSON-Schema
* via the `definition` "array-fields".
@@ -1783,6 +1816,10 @@ export interface PayloadLockedDocument {
relationTo: 'users';
value: string | User;
} | null)
+ | ({
+ relationTo: 'LexicalInBlock';
+ value: string | LexicalInBlock;
+ } | null)
| ({
relationTo: 'array-fields';
value: string | ArrayField;
@@ -2025,6 +2062,25 @@ export interface UsersSelect<T extends boolean = true> {
loginAttempts?: T;
lockUntil?: T;
}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "LexicalInBlock_select".
+ */
+export interface LexicalInBlockSelect<T extends boolean = true> {
+ blocks?:
+ | T
+ | {
+ lexicalInBlock2?:
+ | T
+ | {
+ lexical?: T;
+ id?: T;
+ blockName?: T;
+ };
+ };
+ updatedAt?: T;
+ createdAt?: T;
+}
/**
* This interface was referenced by `Config`'s JSON-Schema
* via the `definition` "array-fields_select".
diff --git a/test/fields/seed.ts b/test/fields/seed.ts
index 895a98dd5e7..3f1150917e2 100644
--- a/test/fields/seed.ts
+++ b/test/fields/seed.ts
@@ -367,7 +367,7 @@ export const seed = async (_payload: Payload) => {
collection: lexicalLocalizedFieldsSlug,
data: {
title: 'Localized Lexical en',
- lexicalBlocksLocalized: textToLexicalJSON({ text: 'English text' }) as any,
+ lexicalBlocksLocalized: textToLexicalJSON({ text: 'English text' }),
lexicalBlocksSubLocalized: generateLexicalLocalizedRichText(
'Shared text',
'English text in block',
@@ -381,7 +381,7 @@ export const seed = async (_payload: Payload) => {
await _payload.create({
collection: lexicalRelationshipFieldsSlug,
data: {
- richText: textToLexicalJSON({ text: 'English text' }) as any,
+ richText: textToLexicalJSON({ text: 'English text' }),
},
depth: 0,
overrideAccess: true,
@@ -392,7 +392,7 @@ export const seed = async (_payload: Payload) => {
id: lexicalLocalizedDoc1.id,
data: {
title: 'Localized Lexical es',
- lexicalBlocksLocalized: textToLexicalJSON({ text: 'Spanish text' }) as any,
+ lexicalBlocksLocalized: textToLexicalJSON({ text: 'Spanish text' }),
lexicalBlocksSubLocalized: generateLexicalLocalizedRichText(
'Shared text',
'Spanish text in block',
@@ -408,10 +408,7 @@ export const seed = async (_payload: Payload) => {
collection: lexicalLocalizedFieldsSlug,
data: {
title: 'Localized Lexical en 2',
- lexicalSimple: textToLexicalJSON({
- text: 'English text 2',
- lexicalLocalizedRelID: lexicalLocalizedDoc1.id,
- }),
+
lexicalBlocksLocalized: textToLexicalJSON({
text: 'English text 2',
lexicalLocalizedRelID: lexicalLocalizedDoc1.id,
@@ -431,10 +428,7 @@ export const seed = async (_payload: Payload) => {
id: lexicalLocalizedDoc2.id,
data: {
title: 'Localized Lexical es 2',
- lexicalSimple: textToLexicalJSON({
- text: 'Spanish text 2',
- lexicalLocalizedRelID: lexicalLocalizedDoc1.id,
- }),
+
lexicalBlocksLocalized: textToLexicalJSON({
text: 'Spanish text 2',
lexicalLocalizedRelID: lexicalLocalizedDoc1.id,
@@ -479,6 +473,24 @@ export const seed = async (_payload: Payload) => {
text: 'text',
},
})
+
+ await _payload.create({
+ collection: 'LexicalInBlock',
+ data: {
+ blocks: [
+ {
+ blockType: 'lexicalInBlock2',
+ blockName: '1',
+ lexical: textToLexicalJSON({ text: '1' }),
+ },
+ {
+ blockType: 'lexicalInBlock2',
+ blockName: '2',
+ lexical: textToLexicalJSON({ text: '2' }),
+ },
+ ],
+ },
+ })
}
export async function clearAndSeedEverything(_payload: Payload) {
|
827428d6b57a7abe858ca5ddaad5ba4ec9d3a270
|
2023-02-06 22:55:05
|
Jacob Fletcher
|
fix: replaced media not rendering after document save
| false
|
replaced media not rendering after document save
|
fix
|
diff --git a/src/admin/components/views/collections/Edit/Default.tsx b/src/admin/components/views/collections/Edit/Default.tsx
index f6a661f268f..e7e06295835 100644
--- a/src/admin/components/views/collections/Edit/Default.tsx
+++ b/src/admin/components/views/collections/Edit/Default.tsx
@@ -46,7 +46,7 @@ const DefaultEditView: React.FC<Props> = (props) => {
onSave,
permissions,
isLoading,
- initialState,
+ internalState,
apiURL,
action,
hasSavePermission,
@@ -90,7 +90,7 @@ const DefaultEditView: React.FC<Props> = (props) => {
action={action}
onSuccess={onSave}
disabled={!hasSavePermission}
- initialState={initialState}
+ initialState={internalState}
>
<FormLoadingOverlayToggle
formIsLoading={isLoading}
@@ -149,6 +149,7 @@ const DefaultEditView: React.FC<Props> = (props) => {
<Upload
data={data}
collection={collection}
+ internalState={internalState}
/>
)}
<RenderFields
diff --git a/src/admin/components/views/collections/Edit/Upload/index.tsx b/src/admin/components/views/collections/Edit/Upload/index.tsx
index 96ecb7f3809..2842ff1a5ef 100644
--- a/src/admin/components/views/collections/Edit/Upload/index.tsx
+++ b/src/admin/components/views/collections/Edit/Upload/index.tsx
@@ -6,9 +6,10 @@ import useField from '../../../../forms/useField';
import Button from '../../../../elements/Button';
import FileDetails from '../../../../elements/FileDetails';
import Error from '../../../../forms/Error';
-import { Props, Data } from './types';
+import { Props } from './types';
import './index.scss';
+import reduceFieldsToValues from '../../../../forms/Form/reduceFieldsToValues';
const baseClass = 'file-field';
@@ -26,6 +27,14 @@ const validate = (value) => {
};
const Upload: React.FC<Props> = (props) => {
+ const {
+ collection,
+ internalState,
+ internalState: {
+ filename,
+ },
+ } = props;
+
const inputRef = useRef(null);
const dropRef = useRef(null);
const [selectingFile, setSelectingFile] = useState(false);
@@ -33,13 +42,7 @@ const Upload: React.FC<Props> = (props) => {
const [dragCounter, setDragCounter] = useState(0);
const [replacingFile, setReplacingFile] = useState(false);
const { t } = useTranslation('upload');
-
- const {
- data = {} as Data,
- collection,
- } = props;
-
- const { filename } = data;
+ const [doc, setDoc] = useState(reduceFieldsToValues(internalState));
const {
value,
@@ -99,6 +102,11 @@ const Upload: React.FC<Props> = (props) => {
}
}, [selectingFile, inputRef, setSelectingFile]);
+ useEffect(() => {
+ setDoc(reduceFieldsToValues(internalState));
+ setReplacingFile(false);
+ }, [internalState]);
+
useEffect(() => {
const div = dropRef.current;
if (div) {
@@ -118,10 +126,6 @@ const Upload: React.FC<Props> = (props) => {
return () => null;
}, [handleDragIn, handleDragOut, handleDrop, value]);
- useEffect(() => {
- setReplacingFile(false);
- }, [data]);
-
const classes = [
baseClass,
dragging && `${baseClass}--dragging`,
@@ -136,7 +140,7 @@ const Upload: React.FC<Props> = (props) => {
/>
{(filename && !replacingFile) && (
<FileDetails
- doc={data}
+ doc={doc}
collection={collection}
handleRemove={() => {
setReplacingFile(true);
diff --git a/src/admin/components/views/collections/Edit/Upload/types.ts b/src/admin/components/views/collections/Edit/Upload/types.ts
index c90cb15fa06..d1296496ee1 100644
--- a/src/admin/components/views/collections/Edit/Upload/types.ts
+++ b/src/admin/components/views/collections/Edit/Upload/types.ts
@@ -1,13 +1,9 @@
import { SanitizedCollectionConfig } from '../../../../../../collections/config/types';
-
-export type Data = {
- filename: string
- mimeType: string
- filesize: number
-}
+import { Fields } from '../../../../forms/Form/types';
export type Props = {
- data?: Data
+ internalState?: Fields
+ data?: Fields
collection: SanitizedCollectionConfig
adminThumbnail?: string
mimeTypes?: string[];
diff --git a/src/admin/components/views/collections/Edit/index.tsx b/src/admin/components/views/collections/Edit/index.tsx
index 5db899b38ad..570c1e1642e 100644
--- a/src/admin/components/views/collections/Edit/index.tsx
+++ b/src/admin/components/views/collections/Edit/index.tsx
@@ -40,13 +40,18 @@ const EditView: React.FC<IndexProps> = (props) => {
const { params: { id } = {} } = useRouteMatch<Record<string, string>>();
const { state: locationState } = useLocation();
const history = useHistory();
- const [initialState, setInitialState] = useState<Fields>();
+ const [internalState, setInternalState] = useState<Fields>();
const [updatedAt, setUpdatedAt] = useState<string>();
const { user } = useAuth();
const { getVersions, preferencesKey, getDocPermissions, docPermissions } = useDocumentInfo();
const { getPreference } = usePreferences();
const { t } = useTranslation('general');
+ const [{ data, isLoading: isLoadingData, isError }] = usePayloadAPI(
+ (isEditing ? `${serverURL}${api}/${slug}/${id}` : null),
+ { initialParams: { 'fallback-locale': 'null', depth: 0, draft: 'true' } },
+ );
+
const onSave = useCallback(async (json: any) => {
getVersions();
getDocPermissions();
@@ -55,26 +60,21 @@ const EditView: React.FC<IndexProps> = (props) => {
setRedirect(`${admin}/collections/${collection.slug}/${json?.doc?.id}`);
} else {
const state = await buildStateFromSchema({ fieldSchema: collection.fields, data: json.doc, user, id, operation: 'update', locale, t });
- setInitialState(state);
+ setInternalState(state);
}
}, [admin, collection, isEditing, getVersions, user, id, t, locale, getDocPermissions]);
- const [{ data, isLoading: isLoadingData, isError }] = usePayloadAPI(
- (isEditing ? `${serverURL}${api}/${slug}/${id}` : null),
- { initialParams: { 'fallback-locale': 'null', depth: 0, draft: 'true' } },
- );
-
const dataToRender = (locationState as Record<string, unknown>)?.data || data;
useEffect(() => {
- const awaitInitialState = async () => {
+ const awaitInternalState = async () => {
setUpdatedAt(dataToRender?.updatedAt);
const state = await buildStateFromSchema({ fieldSchema: fields, data: dataToRender, user, operation: isEditing ? 'update' : 'create', id, locale, t });
await getPreference(preferencesKey);
- setInitialState(state);
+ setInternalState(state);
};
- awaitInitialState();
+ awaitInternalState();
}, [dataToRender, fields, isEditing, id, user, locale, isLoadingData, preferencesKey, getPreference, t]);
useEffect(() => {
@@ -92,7 +92,7 @@ const EditView: React.FC<IndexProps> = (props) => {
const apiURL = `${serverURL}${api}/${slug}/${id}${collection.versions.drafts ? '?draft=true' : ''}`;
const action = `${serverURL}${api}/${slug}${isEditing ? `/${id}` : ''}?locale=${locale}&depth=0&fallback-locale=null`;
const hasSavePermission = (isEditing && docPermissions?.update?.permission) || (!isEditing && (docPermissions as CollectionPermission)?.create?.permission);
- const isLoading = !initialState || !docPermissions || isLoadingData;
+ const isLoading = !internalState || !docPermissions || isLoadingData;
return (
<EditDepthContext.Provider value={1}>
@@ -107,7 +107,7 @@ const EditView: React.FC<IndexProps> = (props) => {
permissions: docPermissions,
isEditing,
onSave,
- initialState,
+ internalState,
hasSavePermission,
apiURL,
action,
diff --git a/src/admin/components/views/collections/Edit/types.ts b/src/admin/components/views/collections/Edit/types.ts
index ed65c4b3b99..0560a0671b3 100644
--- a/src/admin/components/views/collections/Edit/types.ts
+++ b/src/admin/components/views/collections/Edit/types.ts
@@ -15,7 +15,7 @@ export type Props = IndexProps & {
id?: string
permissions: CollectionPermission
isLoading: boolean
- initialState?: Fields
+ internalState?: Fields
apiURL: string
action: string
hasSavePermission: boolean
|
ab09f2aff5481a2d98bc84059985d36e8c4927e2
|
2024-08-20 00:55:31
|
Paul
|
fix(ui): tabs preferences not being saved (#7761)
| false
|
tabs preferences not being saved (#7761)
|
fix
|
diff --git a/packages/ui/src/providers/DocumentInfo/index.tsx b/packages/ui/src/providers/DocumentInfo/index.tsx
index bb9e38b3773..6199832bb86 100644
--- a/packages/ui/src/providers/DocumentInfo/index.tsx
+++ b/packages/ui/src/providers/DocumentInfo/index.tsx
@@ -558,6 +558,7 @@ const DocumentInfo: React.FC<
isInitializing,
isLoading,
onSave,
+ preferencesKey,
publishedDoc,
setDocFieldPreferences,
setDocumentTitle,
diff --git a/test/fields/e2e.spec.ts b/test/fields/e2e.spec.ts
index 969eb76683e..5812fb6c24e 100644
--- a/test/fields/e2e.spec.ts
+++ b/test/fields/e2e.spec.ts
@@ -20,6 +20,7 @@ import {
blockFieldsSlug,
collapsibleFieldsSlug,
tabsFields2Slug,
+ tabsFieldsSlug,
} from './slugs.js'
const filename = fileURLToPath(import.meta.url)
const dirname = path.dirname(filename)
@@ -479,13 +480,18 @@ describe('fields', () => {
})
describe('tabs', () => {
- let url: AdminUrlUtil
+ // tabsFieldsSlug is used for testing tabs
+ let tabsFieldsUrl: AdminUrlUtil
+ // tabsFields2Slug is used for testing nested tabs
+ let tabsFieldsUrl2: AdminUrlUtil
+
beforeAll(() => {
- url = new AdminUrlUtil(serverURL, tabsFields2Slug)
+ tabsFieldsUrl = new AdminUrlUtil(serverURL, tabsFieldsSlug)
+ tabsFieldsUrl2 = new AdminUrlUtil(serverURL, tabsFields2Slug)
})
test('should correctly save nested unnamed and named tabs', async () => {
- await page.goto(url.create)
+ await page.goto(tabsFieldsUrl2.create)
await page.locator('#field-tabsInArray .array-field__add-row').click()
await page.locator('#field-tabsInArray__0__text').fill('tab 1 text')
@@ -498,5 +504,27 @@ describe('fields', () => {
await page.locator('.tabs-field__tabs button:nth-child(2)').click()
await expect(page.locator('#field-tabsInArray__0__tab2__text2')).toHaveValue('tab 2 text')
})
+
+ test('should save preferences for tab order', async () => {
+ await page.goto(tabsFieldsUrl.list)
+
+ const firstItem = page.locator('.cell-id a').nth(0)
+ const href = await firstItem.getAttribute('href')
+ await firstItem.click()
+
+ const regex = new RegExp(href.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'))
+
+ await page.waitForURL(regex)
+
+ await page.locator('.tabs-field__tabs button:nth-child(2)').nth(0).click()
+
+ await page.reload()
+
+ const tab2 = page.locator('.tabs-field__tabs button:nth-child(2)').nth(0)
+
+ await expect(async () => await expect(tab2).toHaveClass(/--active/)).toPass({
+ timeout: POLL_TOPASS_TIMEOUT,
+ })
+ })
})
})
|
f0642ce0315b13881001203efa0b1f4cc8d2adb6
|
2023-11-13 02:14:18
|
Alessio Gravili
|
chore(richtext-lexical): add a bunch of e2e tests, including a failing one
| false
|
add a bunch of e2e tests, including a failing one
|
chore
|
diff --git a/test/fields/collections/Lexical/generateLexicalRichText.ts b/test/fields/collections/Lexical/generateLexicalRichText.ts
index a63eed411b8..4cbffe63c6c 100644
--- a/test/fields/collections/Lexical/generateLexicalRichText.ts
+++ b/test/fields/collections/Lexical/generateLexicalRichText.ts
@@ -109,6 +109,24 @@ export function generateLexicalRichText() {
id: '{{RICH_TEXT_DOC_ID}}',
},
},
+ {
+ children: [
+ {
+ detail: 0,
+ format: 0,
+ mode: 'normal',
+ style: '',
+ text: 'Some text below relationship node 1',
+ type: 'text',
+ version: 1,
+ },
+ ],
+ direction: 'ltr',
+ format: '',
+ indent: 0,
+ type: 'paragraph',
+ version: 1,
+ },
],
direction: null,
},
@@ -147,6 +165,24 @@ export function generateLexicalRichText() {
id: '{{TEXT_DOC_ID}}',
},
},
+ {
+ children: [
+ {
+ detail: 0,
+ format: 0,
+ mode: 'normal',
+ style: '',
+ text: 'Some text below relationship node 2',
+ type: 'text',
+ version: 1,
+ },
+ ],
+ direction: 'ltr',
+ format: '',
+ indent: 0,
+ type: 'paragraph',
+ version: 1,
+ },
],
direction: null,
},
diff --git a/test/fields/lexical.e2e.spec.ts b/test/fields/lexical.e2e.spec.ts
index 54749ca658d..be09a4b604b 100644
--- a/test/fields/lexical.e2e.spec.ts
+++ b/test/fields/lexical.e2e.spec.ts
@@ -2,11 +2,17 @@ import type { Page } from '@playwright/test'
import { expect, test } from '@playwright/test'
+import type { SerializedBlockNode } from '../../packages/richtext-lexical/src'
+import type { RichTextField } from './payload-types'
+
import payload from '../../packages/payload/src'
+import { saveDocAndAssert } from '../helpers'
import { AdminUrlUtil } from '../helpers/adminUrlUtil'
import { initPayloadE2E } from '../helpers/configHelpers'
import { RESTClient } from '../helpers/rest'
+import { lexicalDocData } from './collections/Lexical/data'
import { clearAndSeedEverything } from './seed'
+import { lexicalFieldsSlug } from './slugs'
const { beforeAll, describe, beforeEach } = test
@@ -47,7 +53,6 @@ describe('lexical', () => {
// Other than the annoying unsaved changed prompt, this can also cause unnecessary auto-saves, when drafts & autosave is enabled
await navigateToLexicalFields()
-
await expect(
page.locator('.rich-text-lexical').nth(1).locator('.lexical-block').first(),
).toBeVisible()
@@ -58,4 +63,248 @@ describe('lexical', () => {
// Make sure .leave-without-saving__content (the "Leave without saving") is not visible
await expect(page.locator('.leave-without-saving__content').first()).not.toBeVisible()
})
+
+ test('should type and save typed text', async () => {
+ await navigateToLexicalFields()
+ const richTextField = page.locator('.rich-text-lexical').nth(1) // second
+ await richTextField.scrollIntoViewIfNeeded()
+ await expect(richTextField).toBeVisible()
+
+ const spanInEditor = richTextField.locator('span').getByText('Upload Node:').first()
+ await expect(spanInEditor).toBeVisible()
+
+ await spanInEditor.click() // Click works better than focus
+ // Now go to the END of the span
+ for (let i = 0; i < 6; i++) {
+ await page.keyboard.press('ArrowRight')
+ }
+
+ await page.keyboard.type('moretext')
+ await expect(spanInEditor).toHaveText('Upload Node:moretext')
+
+ await saveDocAndAssert(page)
+
+ const lexicalDoc: RichTextField = (
+ await payload.find({
+ collection: lexicalFieldsSlug,
+ where: {
+ title: {
+ equals: lexicalDocData.title,
+ },
+ },
+ depth: 0,
+ })
+ ).docs[0] as never
+
+ const lexicalField: SerializedEditorState = lexicalDoc.lexicalWithBlocks
+ const firstParagraphTextNode: SerializedTextNode = lexicalField.root.children[0].children[0]
+
+ expect(firstParagraphTextNode.text).toBe('Upload Node:moretext')
+ })
+ test('should be able to bold text using floating select toolbar', async () => {
+ await navigateToLexicalFields()
+ const richTextField = page.locator('.rich-text-lexical').nth(1) // second
+ await richTextField.scrollIntoViewIfNeeded()
+ await expect(richTextField).toBeVisible()
+
+ const spanInEditor = richTextField.locator('span').getByText('Upload Node:').first()
+ await expect(spanInEditor).toBeVisible()
+
+ await spanInEditor.click() // Click works better than focus
+ await page.keyboard.press('ArrowRight')
+
+ // Now select the text 'Node' (the .click() makes it click in the middle of the span)
+ for (let i = 0; i < 4; i++) {
+ await page.keyboard.press('Shift+ArrowRight')
+ }
+ // The following text should now be selected: Node
+
+ const floatingToolbar_formatSection = page.locator(
+ '.floating-select-toolbar-popup__section-format',
+ )
+
+ await expect(floatingToolbar_formatSection).toBeVisible()
+
+ await expect(page.locator('.floating-select-toolbar-popup__button').first()).toBeVisible()
+
+ const boldButton = floatingToolbar_formatSection
+ .locator('.floating-select-toolbar-popup__button')
+ .first()
+
+ await expect(boldButton).toBeVisible()
+ await boldButton.click()
+
+ /**
+ * Next test section: check if it worked correctly
+ */
+
+ const boldText = richTextField
+ .locator('.LexicalEditorTheme__paragraph')
+ .first()
+ .locator('strong')
+ await expect(boldText).toBeVisible()
+ await expect(boldText).toHaveText('Node')
+
+ await saveDocAndAssert(page)
+
+ const lexicalDoc: RichTextField = (
+ await payload.find({
+ collection: lexicalFieldsSlug,
+ where: {
+ title: {
+ equals: lexicalDocData.title,
+ },
+ },
+ depth: 0,
+ })
+ ).docs[0] as never
+
+ const lexicalField: SerializedEditorState = lexicalDoc.lexicalWithBlocks
+ const firstParagraph: SerializeParagrapbNode = lexicalField.root.children[0]
+ expect(firstParagraph.children).toHaveLength(3)
+
+ const textNode1: SerializedTextNode = firstParagraph.children[0]
+ const boldNode: SerializedTextNode = firstParagraph.children[1]
+ const textNode2: SerializedTextNode = firstParagraph.children[2]
+
+ expect(textNode1.text).toBe('Upload ')
+ expect(textNode1.format).toBe(0)
+
+ expect(boldNode.text).toBe('Node')
+ expect(boldNode.format).toBe(1)
+
+ expect(textNode2.text).toBe(':')
+ expect(textNode2.format).toBe(0)
+ })
+
+ describe('nested lexical editor in block', () => {
+ test('should type and save typed text', async () => {
+ await navigateToLexicalFields()
+ const richTextField = page.locator('.rich-text-lexical').nth(1) // second
+ await richTextField.scrollIntoViewIfNeeded()
+ await expect(richTextField).toBeVisible()
+
+ const lexicalBlock = richTextField.locator('.lexical-block').nth(1) // second
+ await lexicalBlock.scrollIntoViewIfNeeded()
+ await expect(lexicalBlock).toBeVisible()
+
+ // Find span in contentEditable with text "Some text below relationship node"
+ const spanInSubEditor = lexicalBlock
+ .locator('span')
+ .getByText('Some text below relationship node 1')
+ .first()
+ await expect(spanInSubEditor).toBeVisible()
+ await spanInSubEditor.click() // Use click, because focus does not work
+
+ // Now go to the END of the span
+ for (let i = 0; i < 18; i++) {
+ await page.keyboard.press('ArrowRight')
+ }
+ await page.keyboard.type(' inserted text')
+
+ await expect(spanInSubEditor).toHaveText('Some text below relationship node 1 inserted text')
+ await saveDocAndAssert(page)
+
+ const lexicalDoc: RichTextField = (
+ await payload.find({
+ collection: lexicalFieldsSlug,
+ where: {
+ title: {
+ equals: lexicalDocData.title,
+ },
+ },
+ depth: 0,
+ })
+ ).docs[0] as never
+
+ const lexicalField: SerializedEditorState = lexicalDoc.lexicalWithBlocks
+ const blockNode: SerializedBlockNode = lexicalField.root.children[3]
+ const textNodeInBlockNodeRichText =
+ blockNode.fields.data.richText.root.children[1].children[0]
+
+ expect(textNodeInBlockNodeRichText.text).toBe(
+ 'Some text below relationship node 1 inserted text',
+ )
+ })
+ test('should be able to bold text using floating select toolbar', async () => {
+ // Reproduces https://github.com/payloadcms/payload/issues/4025
+ await navigateToLexicalFields()
+ const richTextField = page.locator('.rich-text-lexical').nth(1) // second
+ await richTextField.scrollIntoViewIfNeeded()
+ await expect(richTextField).toBeVisible()
+
+ const lexicalBlock = richTextField.locator('.lexical-block').nth(1) // second
+ await lexicalBlock.scrollIntoViewIfNeeded()
+ await expect(lexicalBlock).toBeVisible()
+
+ // Find span in contentEditable with text "Some text below relationship node"
+ const spanInSubEditor = lexicalBlock
+ .locator('span')
+ .getByText('Some text below relationship node 1')
+ .first()
+ await expect(spanInSubEditor).toBeVisible()
+ await spanInSubEditor.click() // Use click, because focus does not work
+
+ // Now go to the END of the span while selecting the text
+ for (let i = 0; i < 18; i++) {
+ await page.keyboard.press('Shift+ArrowRight')
+ }
+ // The following text should now be selected: elationship node 1
+
+ const floatingToolbar_formatSection = page.locator(
+ '.floating-select-toolbar-popup__section-format',
+ )
+
+ await expect(floatingToolbar_formatSection).toBeVisible()
+
+ await expect(page.locator('.floating-select-toolbar-popup__button').first()).toBeVisible()
+
+ const boldButton = floatingToolbar_formatSection
+ .locator('.floating-select-toolbar-popup__button')
+ .first()
+
+ await expect(boldButton).toBeVisible()
+ await boldButton.click()
+
+ /**
+ * Next test section: check if it worked correctly
+ */
+
+ const boldText = lexicalBlock
+ .locator('.LexicalEditorTheme__paragraph')
+ .first()
+ .locator('strong')
+ await expect(boldText).toBeVisible()
+ await expect(boldText).toHaveText('elationship node 1')
+
+ await saveDocAndAssert(page)
+
+ const lexicalDoc: RichTextField = (
+ await payload.find({
+ collection: lexicalFieldsSlug,
+ where: {
+ title: {
+ equals: lexicalDocData.title,
+ },
+ },
+ depth: 0,
+ })
+ ).docs[0] as never
+
+ const lexicalField: SerializedEditorState = lexicalDoc.lexicalWithBlocks
+ const blockNode: SerializedBlockNode = lexicalField.root.children[3]
+ const paragraphNodeInBlockNodeRichText = blockNode.fields.data.richText.root.children[1]
+
+ expect(paragraphNodeInBlockNodeRichText.children).toHaveLength(2)
+
+ const textNode1: SerializedTextNode = paragraphNodeInBlockNodeRichText.children[0]
+ const boldNode: SerializedTextNode = paragraphNodeInBlockNodeRichText.children[1]
+
+ expect(textNode1.text).toBe('Some text below ')
+ expect(textNode1.format).toBe(0)
+
+ expect(boldNode.text).toBe('elationship node 1')
+ expect(boldNode.format).toBe(1)
+ })
+ })
})
|
0e5ff246b286fcddb708095f044f9373da51bbf3
|
2025-01-29 20:48:24
|
Germán Jabloñski
|
fix(richtext-lexical): preserve selection in Firefox when using LexicalMenu (#10867)
| false
|
preserve selection in Firefox when using LexicalMenu (#10867)
|
fix
|
diff --git a/packages/richtext-lexical/src/lexical/plugins/SlashMenu/LexicalTypeaheadMenuPlugin/LexicalMenu.tsx b/packages/richtext-lexical/src/lexical/plugins/SlashMenu/LexicalTypeaheadMenuPlugin/LexicalMenu.tsx
index 2095c5aa3db..adc448db4c7 100644
--- a/packages/richtext-lexical/src/lexical/plugins/SlashMenu/LexicalTypeaheadMenuPlugin/LexicalMenu.tsx
+++ b/packages/richtext-lexical/src/lexical/plugins/SlashMenu/LexicalTypeaheadMenuPlugin/LexicalMenu.tsx
@@ -1,5 +1,5 @@
'use client'
-import type { LexicalCommand, LexicalEditor, TextNode } from 'lexical'
+import type { BaseSelection, LexicalCommand, LexicalEditor, TextNode } from 'lexical'
import type { JSX, ReactPortal, RefObject } from 'react'
import { useLexicalComposerContext } from '@lexical/react/LexicalComposerContext.js'
@@ -7,6 +7,7 @@ import { mergeRegister } from '@lexical/utils'
import {
$getSelection,
$isRangeSelection,
+ $setSelection,
COMMAND_PRIORITY_LOW,
createCommand,
KEY_ARROW_DOWN_COMMAND,
@@ -266,6 +267,17 @@ export function LexicalMenu({
})
setTimeout(() => {
+ // Needed in Firefox. See https://github.com/payloadcms/payload/issues/10724
+ let selection: BaseSelection | undefined
+ editor.read(() => {
+ selection = $getSelection()?.clone()
+ })
+ editor.update(() => {
+ if (selection) {
+ $setSelection(selection)
+ }
+ })
+
selectedItem.onSelect({
editor,
queryString: resolution.match ? resolution.match.matchingString : '',
|
ac4750d01692a2f6538918c46ace5c902501a141
|
2024-04-22 23:50:02
|
Jarrod Flesch
|
chore: adds fallbackFileType functionality (#5958)
| false
|
adds fallbackFileType functionality (#5958)
|
chore
|
diff --git a/packages/next/src/routes/rest/files/getFile.ts b/packages/next/src/routes/rest/files/getFile.ts
index e76ba9fb83e..3e3b0085e1f 100644
--- a/packages/next/src/routes/rest/files/getFile.ts
+++ b/packages/next/src/routes/rest/files/getFile.ts
@@ -10,6 +10,7 @@ import { streamFile } from '../../../next-stream-file/index.js'
import { headersWithCors } from '../../../utilities/headersWithCors.js'
import { routeError } from '../routeError.js'
import { checkFileAccess } from './checkFileAccess.js'
+import { getFileTypeFallback } from './getFileTypeFallback.js'
// /:collectionSlug/file/:filename
type Args = {
@@ -54,15 +55,15 @@ export const getFile = async ({ collection, filename, req }: Args): Promise<Resp
const data = streamFile(filePath)
const headers = new Headers({
- 'content-length': stats.size + '',
+ 'Content-Length': stats.size + '',
})
- const fileTypeResult = await getFileType.fromFile(filePath)
- if (fileTypeResult?.mime) headers.set('content-type', fileTypeResult.mime)
+ const fileTypeResult = (await getFileType.fromFile(filePath)) || getFileTypeFallback(filePath)
+ headers.set('Content-Type', fileTypeResult.mime)
return new Response(data, {
headers: headersWithCors({
- headers: new Headers(),
+ headers,
req,
}),
status: httpStatus.OK,
diff --git a/packages/next/src/routes/rest/files/getFileTypeFallback.ts b/packages/next/src/routes/rest/files/getFileTypeFallback.ts
new file mode 100644
index 00000000000..1007ae5764a
--- /dev/null
+++ b/packages/next/src/routes/rest/files/getFileTypeFallback.ts
@@ -0,0 +1,28 @@
+type ReturnType = {
+ ext: string
+ mime: string
+}
+
+const extensionMap: {
+ [ext: string]: string
+} = {
+ css: 'text/css',
+ csv: 'text/csv',
+ htm: 'text/html',
+ html: 'text/html',
+ js: 'application/javascript',
+ json: 'application/json',
+ md: 'text/markdown',
+ svg: 'image/svg+xml',
+ xml: 'application/xml',
+ yml: 'application/x-yaml',
+}
+
+export const getFileTypeFallback = (path: string): ReturnType => {
+ const ext = path.split('.').pop() || 'txt'
+
+ return {
+ ext,
+ mime: extensionMap[ext] || 'text/plain',
+ }
+}
diff --git a/test/uploads/e2e.spec.ts b/test/uploads/e2e.spec.ts
index 3a451d6dafa..a1ed8b723cd 100644
--- a/test/uploads/e2e.spec.ts
+++ b/test/uploads/e2e.spec.ts
@@ -244,12 +244,13 @@ describe('uploads', () => {
test('should throw error when file is larger than the limit and abortOnLimit is true', async () => {
await page.goto(mediaURL.create)
await page.setInputFiles('input[type="file"]', path.resolve(dirname, './2mb.jpg'))
+ await expect(page.locator('.file-field__filename')).toHaveValue('2mb.jpg')
- await wait(500) // TODO: Fix this
await page.click('#action-save', { delay: 100 })
await expect(page.locator('.Toastify .Toastify__toast--error')).toContainText(
'File size limit has been reached',
)
+ await wait(500) // TODO: Fix this
})
test('Should render adminThumbnail when using a function', async () => {
|
ca852e8cb2d78982abeae0b5db4117f0261d8fed
|
2022-08-12 03:32:17
|
James
|
fix: ensures you can query on nested block fields
| false
|
ensures you can query on nested block fields
|
fix
|
diff --git a/src/mongoose/buildQuery.ts b/src/mongoose/buildQuery.ts
index 3f8d0f766ee..1d80c8e8291 100644
--- a/src/mongoose/buildQuery.ts
+++ b/src/mongoose/buildQuery.ts
@@ -200,7 +200,7 @@ class ParamParser {
return;
}
- if (priorSchemaType.instance === 'Mixed') {
+ if (priorSchemaType.instance === 'Mixed' || priorSchemaType.instance === 'Array') {
lastIncompletePath.path = currentPath;
}
}
diff --git a/src/mongoose/connect.ts b/src/mongoose/connect.ts
index 42f1c9a2e63..1f128b7a77b 100644
--- a/src/mongoose/connect.ts
+++ b/src/mongoose/connect.ts
@@ -39,6 +39,8 @@ const connectMongoose = async (
try {
await mongoose.connect(urlToConnect, connectionOptions);
+ mongoose.set('strictQuery', false);
+
if (process.env.PAYLOAD_DROP_DATABASE === 'true') {
logger.info('---- DROPPING DATABASE ----');
await mongoose.connection.dropDatabase();
|
5991a2e60fae32982242db26f515620cbf8999c3
|
2025-01-07 10:15:38
|
Jacob Fletcher
|
test: fixes flaky localization e2e once and for all (#10406)
| false
|
fixes flaky localization e2e once and for all (#10406)
|
test
|
diff --git a/packages/ui/src/elements/DocumentControls/index.tsx b/packages/ui/src/elements/DocumentControls/index.tsx
index fd6e2d814cc..255e6389331 100644
--- a/packages/ui/src/elements/DocumentControls/index.tsx
+++ b/packages/ui/src/elements/DocumentControls/index.tsx
@@ -13,6 +13,7 @@ import React, { Fragment, useEffect } from 'react'
import type { DocumentDrawerContextType } from '../DocumentDrawer/Provider.js'
+import { useFormInitializing, useFormProcessing } from '../../forms/Form/context.js'
import { useConfig } from '../../providers/Config/index.js'
import { useEditDepth } from '../../providers/EditDepth/index.js'
import { useTranslation } from '../../providers/Translation/index.js'
@@ -111,6 +112,9 @@ export const DocumentControls: React.FC<{
const [updatedAt, setUpdatedAt] = React.useState<string>('')
const [createdAt, setCreatedAt] = React.useState<string>('')
+ const processing = useFormProcessing()
+ const initializing = useFormInitializing()
+
useEffect(() => {
if (data?.updatedAt) {
setUpdatedAt(formatDate({ date: data.updatedAt, i18n, pattern: dateFormat }))
@@ -255,6 +259,7 @@ export const DocumentControls: React.FC<{
</div>
}
className={`${baseClass}__popup`}
+ disabled={initializing || processing}
horizontalAlign="right"
size="large"
verticalAlign="bottom"
diff --git a/packages/ui/src/elements/PublishButton/index.tsx b/packages/ui/src/elements/PublishButton/index.tsx
index 653bd7fbd4c..a9c806dcdbe 100644
--- a/packages/ui/src/elements/PublishButton/index.tsx
+++ b/packages/ui/src/elements/PublishButton/index.tsx
@@ -63,16 +63,18 @@ export const PublishButton: React.FC<{ label?: string }> = ({ label: labelProp }
entityConfig?.versions?.drafts.schedulePublish
const hasNewerVersions = unpublishedVersionCount > 0
+
const canPublish =
hasPublishPermission &&
(modified || hasNewerVersions || !hasPublishedDoc) &&
uploadStatus !== 'uploading'
+
const operation = useOperation()
- const forceDisable = operation === 'update' && !modified
+ const disabled = operation === 'update' && !modified
const saveDraft = useCallback(async () => {
- if (forceDisable) {
+ if (disabled) {
return
}
@@ -99,7 +101,7 @@ export const PublishButton: React.FC<{ label?: string }> = ({ label: labelProp }
},
skipValidation: true,
})
- }, [submit, collectionSlug, globalSlug, serverURL, api, localeCode, id, forceDisable])
+ }, [submit, collectionSlug, globalSlug, serverURL, api, localeCode, id, disabled])
useHotkey({ cmdCtrlKey: true, editDepth, keyCodes: ['s'] }, (e) => {
e.preventDefault()
diff --git a/packages/ui/src/elements/SaveButton/index.tsx b/packages/ui/src/elements/SaveButton/index.tsx
index 42f85e29392..633d553f83c 100644
--- a/packages/ui/src/elements/SaveButton/index.tsx
+++ b/packages/ui/src/elements/SaveButton/index.tsx
@@ -20,10 +20,10 @@ export const SaveButton: React.FC<{ label?: string }> = ({ label: labelProp }) =
const editDepth = useEditDepth()
const operation = useOperation()
- const forceDisable = (operation === 'update' && !modified) || uploadStatus === 'uploading'
+ const disabled = (operation === 'update' && !modified) || uploadStatus === 'uploading'
useHotkey({ cmdCtrlKey: true, editDepth, keyCodes: ['s'] }, (e) => {
- if (forceDisable) {
+ if (disabled) {
// absorb the event
}
@@ -45,7 +45,7 @@ export const SaveButton: React.FC<{ label?: string }> = ({ label: labelProp }) =
return (
<FormSubmit
buttonId="action-save"
- disabled={forceDisable}
+ disabled={disabled}
onClick={handleSubmit}
ref={ref}
size="medium"
diff --git a/packages/ui/src/elements/SaveDraftButton/index.tsx b/packages/ui/src/elements/SaveDraftButton/index.tsx
index 0b511401dd3..cc6d6216b32 100644
--- a/packages/ui/src/elements/SaveDraftButton/index.tsx
+++ b/packages/ui/src/elements/SaveDraftButton/index.tsx
@@ -23,6 +23,7 @@ export const SaveDraftButton: React.FC = () => {
} = useConfig()
const { id, collectionSlug, globalSlug, setUnpublishedVersionCount, uploadStatus } =
useDocumentInfo()
+
const modified = useFormModified()
const { code: locale } = useLocale()
const ref = useRef<HTMLButtonElement>(null)
@@ -31,10 +32,10 @@ export const SaveDraftButton: React.FC = () => {
const { submit } = useForm()
const operation = useOperation()
- const forceDisable = (operation === 'update' && !modified) || uploadStatus === 'uploading'
+ const disabled = (operation === 'update' && !modified) || uploadStatus === 'uploading'
const saveDraft = useCallback(async () => {
- if (forceDisable) {
+ if (disabled) {
return
}
@@ -71,12 +72,12 @@ export const SaveDraftButton: React.FC = () => {
api,
locale,
id,
- forceDisable,
+ disabled,
setUnpublishedVersionCount,
])
useHotkey({ cmdCtrlKey: true, editDepth, keyCodes: ['s'] }, (e) => {
- if (forceDisable) {
+ if (disabled) {
// absorb the event
}
@@ -92,7 +93,7 @@ export const SaveDraftButton: React.FC = () => {
buttonId="action-save-draft"
buttonStyle="secondary"
className={baseClass}
- disabled={forceDisable}
+ disabled={disabled}
onClick={() => {
return void saveDraft()
}}
diff --git a/test/localization/e2e.spec.ts b/test/localization/e2e.spec.ts
index 00cc6df75fd..a72fd009090 100644
--- a/test/localization/e2e.spec.ts
+++ b/test/localization/e2e.spec.ts
@@ -1,4 +1,4 @@
-import type { Page } from '@playwright/test'
+import type { BrowserContext, Page } from '@playwright/test'
import { expect, test } from '@playwright/test'
import { openDocControls } from 'helpers/e2e/openDocControls.js'
@@ -14,6 +14,7 @@ import {
initPageConsoleErrorCatch,
openDocDrawer,
saveDocAndAssert,
+ throttleTest,
} from '../helpers.js'
import { AdminUrlUtil } from '../helpers/adminUrlUtil.js'
import { initPayloadE2ENoConfig } from '../helpers/initPayloadE2ENoConfig.js'
@@ -28,6 +29,7 @@ import {
spanishLocale,
withRequiredLocalizedFields,
} from './shared.js'
+import { navigateToDoc } from 'helpers/e2e/navigateToDoc.js'
const filename = fileURLToPath(import.meta.url)
const dirname = path.dirname(filename)
@@ -40,7 +42,7 @@ const dirname = path.dirname(filename)
* Repeat above for Globals
*/
-const { beforeAll, describe } = test
+const { beforeAll, beforeEach, describe } = test
let url: AdminUrlUtil
let urlWithRequiredLocalizedFields: AdminUrlUtil
let urlRelationshipLocalized: AdminUrlUtil
@@ -54,6 +56,7 @@ let page: Page
let payload: PayloadTestSDK<Config>
let serverURL: string
let richTextURL: AdminUrlUtil
+let context: BrowserContext
describe('Localization', () => {
beforeAll(async ({ browser }, testInfo) => {
@@ -65,7 +68,7 @@ describe('Localization', () => {
richTextURL = new AdminUrlUtil(serverURL, richTextSlug)
urlWithRequiredLocalizedFields = new AdminUrlUtil(serverURL, withRequiredLocalizedFields)
- const context = await browser.newContext()
+ context = await browser.newContext()
page = await context.newPage()
initPageConsoleErrorCatch(page)
@@ -73,6 +76,14 @@ describe('Localization', () => {
await ensureCompilationIsDone({ page, serverURL })
})
+ beforeEach(async () => {
+ // await throttleTest({
+ // page,
+ // context,
+ // delay: 'Fast 4G',
+ // })
+ })
+
describe('localized text', () => {
test('create english post, switch to spanish', async () => {
await page.goto(url.create)
@@ -243,43 +254,30 @@ describe('Localization', () => {
})
describe('localized relationships', () => {
- test('ensure relationship field fetches are localised as well', async () => {
- await page.goto(url.list)
+ test('ensure relationship field fetches are localized as well', async () => {
await changeLocale(page, spanishLocale)
-
- const localisedPost = page.locator('.cell-title a').first()
- const localisedPostUrl = await localisedPost.getAttribute('href')
- await page.goto(serverURL + localisedPostUrl)
- await page.waitForURL(serverURL + localisedPostUrl)
-
+ await navigateToDoc(page, url)
const selectField = page.locator('#field-children .rs__control')
await selectField.click()
-
await expect(page.locator('#field-children .rs__menu')).toContainText('spanish-relation2')
})
test('ensure relationship edit drawers are opened in currently selected locale', async () => {
- await page.goto(urlRelationshipLocalized.list)
await changeLocale(page, spanishLocale)
-
- const post = page.locator('.cell-id a').first()
- const postUrl = await post.getAttribute('href')
- await page.goto(serverURL + postUrl)
- await page.waitForURL(serverURL + postUrl)
-
- await openDocDrawer(
- page,
- '#field-relationMultiRelationTo .relationship--single-value__drawer-toggler',
- )
-
+ await navigateToDoc(page, urlRelationshipLocalized)
+ const drawerToggler =
+ '#field-relationMultiRelationTo .relationship--single-value__drawer-toggler'
+ expect(page.locator(drawerToggler)).toBeEnabled()
+ await openDocDrawer(page, drawerToggler)
await expect(page.locator('.doc-drawer__header-text')).toContainText('spanish-relation2')
+ await page.locator('.doc-drawer__header-close').click()
})
})
describe('copy localized data', () => {
test('should show Copy To Locale button and drawer', async () => {
await changeLocale(page, defaultLocale)
- await createAndSaveDoc(page, url, { description, title })
+ await navigateToDoc(page, url)
await openCopyToLocaleDrawer(page)
await expect(page.locator('.copy-locale-data__content')).toBeVisible()
await page.locator('.drawer-close-button').click()
@@ -287,11 +285,9 @@ describe('Localization', () => {
test('should copy data to correct locale', async () => {
await createAndSaveDoc(page, url, { title })
-
await openCopyToLocaleDrawer(page)
await setToLocale(page, 'Spanish')
await runCopy(page)
-
await expect(page.locator('#field-title')).toHaveValue(title)
})
@@ -400,6 +396,9 @@ describe('Localization', () => {
await runCopy(page)
await expect(page.locator('#field-title')).toHaveValue(title)
+ const regexPattern = new RegExp(`locale=es`)
+ await expect(page).toHaveURL(regexPattern)
+
await openCopyToLocaleDrawer(page)
await setToLocale(page, 'Hungarian')
await runCopy(page)
@@ -445,11 +444,13 @@ async function createAndSaveDoc(page, url, values) {
}
async function openCopyToLocaleDrawer(page) {
- const docControls = page.locator('.doc-controls__popup')
+ const docControls = page.locator('.doc-controls__popup button.popup-button')
+ expect(docControls).toBeEnabled()
await docControls.click()
const copyButton = page.locator('#copy-locale-data__button')
await expect(copyButton).toBeVisible()
await copyButton.click()
+ await expect(page.locator('#copy-locale')).toBeVisible()
await expect(page.locator('.copy-locale-data__content')).toBeVisible()
}
|
7690fa1b559d8ee8cbad7b14caab8b0ff3d73dc6
|
2023-10-06 22:54:25
|
Elliot DeNolf
|
chore(release): [email protected]
| false
|
chore
|
diff --git a/packages/payload/package.json b/packages/payload/package.json
index a17224bac0c..a7440445684 100644
--- a/packages/payload/package.json
+++ b/packages/payload/package.json
@@ -1,6 +1,6 @@
{
"name": "payload",
- "version": "2.0.0-beta.20",
+ "version": "2.0.0-beta.21",
"description": "Node, React and MongoDB Headless CMS and Application Framework",
"license": "MIT",
"main": "./src/index.ts",
|
|
9d2aad7bf9726579f06b2d4bf483ba1c01239802
|
2024-04-06 23:31:16
|
James
|
chore: lockfile
| false
|
lockfile
|
chore
|
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index b367a650f38..687d89dfc30 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -775,9 +775,6 @@ importers:
pino-pretty:
specifier: 10.2.0
version: 10.2.0
- pirates:
- specifier: ^4.0.6
- version: 4.0.6
pluralize:
specifier: 8.0.0
version: 8.0.0
@@ -9774,7 +9771,7 @@ packages:
dependencies:
loader-utils: 2.0.4
schema-utils: 3.3.0
- webpack: 5.90.3(@swc/[email protected])
+ webpack: 5.90.3(@swc/[email protected])([email protected])([email protected])
dev: true
/[email protected]:
@@ -12275,7 +12272,7 @@ packages:
dependencies:
loader-utils: 2.0.4
schema-utils: 3.3.0
- webpack: 5.90.3(@swc/[email protected])
+ webpack: 5.90.3(@swc/[email protected])([email protected])([email protected])
webpack-sources: 1.4.3
dev: true
@@ -15656,31 +15653,6 @@ packages:
webpack: 5.90.3(@swc/[email protected])([email protected])([email protected])
dev: true
- /[email protected](@swc/[email protected])([email protected]):
- resolution: {integrity: sha512-BKFPWlPDndPs+NGGCr1U59t0XScL5317Y0UReNrHaw9/FwhPENlq6bfgs+4yPfyP51vqC1bQ4rp1EfXW5ZSH9w==}
- engines: {node: '>= 10.13.0'}
- peerDependencies:
- '@swc/core': '*'
- esbuild: '*'
- uglify-js: '*'
- webpack: ^5.1.0
- peerDependenciesMeta:
- '@swc/core':
- optional: true
- esbuild:
- optional: true
- uglify-js:
- optional: true
- dependencies:
- '@jridgewell/trace-mapping': 0.3.23
- '@swc/core': 1.4.2
- jest-worker: 27.5.1
- schema-utils: 3.3.0
- serialize-javascript: 6.0.2
- terser: 5.28.1
- webpack: 5.90.3(@swc/[email protected])
- dev: true
-
/[email protected]:
resolution: {integrity: sha512-wM+bZp54v/E9eRRGXb5ZFDvinrJIOaTapx3WUokyVGZu5ucVCK55zEgGd5Dl2fSr3jUo5sDiERErUWLY6QPFyA==}
engines: {node: '>=10'}
@@ -16440,46 +16412,6 @@ packages:
engines: {node: '>=10.13.0'}
dev: true
- /[email protected](@swc/[email protected]):
- resolution: {integrity: sha512-h6uDYlWCctQRuXBs1oYpVe6sFcWedl0dpcVaTf/YF67J9bKvwJajFulMVSYKHrksMB3I/pIagRzDxwxkebuzKA==}
- engines: {node: '>=10.13.0'}
- hasBin: true
- peerDependencies:
- webpack-cli: '*'
- peerDependenciesMeta:
- webpack-cli:
- optional: true
- dependencies:
- '@types/eslint-scope': 3.7.7
- '@types/estree': 1.0.5
- '@webassemblyjs/ast': 1.11.6
- '@webassemblyjs/wasm-edit': 1.11.6
- '@webassemblyjs/wasm-parser': 1.11.6
- acorn: 8.11.3
- acorn-import-assertions: 1.9.0([email protected])
- browserslist: 4.23.0
- chrome-trace-event: 1.0.3
- enhanced-resolve: 5.15.1
- es-module-lexer: 1.4.1
- eslint-scope: 5.1.1
- events: 3.3.0
- glob-to-regexp: 0.4.1
- graceful-fs: 4.2.11
- json-parse-even-better-errors: 2.3.1
- loader-runner: 4.3.0
- mime-types: 2.1.35
- neo-async: 2.6.2
- schema-utils: 3.3.0
- tapable: 2.2.1
- terser-webpack-plugin: 5.3.10(@swc/[email protected])([email protected])
- watchpack: 2.4.0
- webpack-sources: 3.2.3
- transitivePeerDependencies:
- - '@swc/core'
- - esbuild
- - uglify-js
- dev: true
-
/[email protected](@swc/[email protected])([email protected])([email protected]):
resolution: {integrity: sha512-h6uDYlWCctQRuXBs1oYpVe6sFcWedl0dpcVaTf/YF67J9bKvwJajFulMVSYKHrksMB3I/pIagRzDxwxkebuzKA==}
engines: {node: '>=10.13.0'}
|
098e389147f112073a5c7a52ae6890304ae3f546
|
2023-11-28 02:41:31
|
Elliot DeNolf
|
chore(release): payload/2.2.2 [skip ci]
| false
|
payload/2.2.2 [skip ci]
|
chore
|
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d54e374866e..f950842cc27 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,19 @@
+## [2.2.2](https://github.com/payloadcms/payload/compare/v2.2.1...v2.2.2) (2023-11-27)
+
+
+### Features
+
+* **i18n:** adds Korean translation ([#4258](https://github.com/payloadcms/payload/issues/4258)) ([1401718](https://github.com/payloadcms/payload/commit/1401718b3b549ce1454389a982474dbe159eb61f))
+
+
+### Bug Fixes
+
+* number field validation ([#4233](https://github.com/payloadcms/payload/issues/4233)) ([19fcfc2](https://github.com/payloadcms/payload/commit/19fcfc27af2ecb68ff989dcaed19b7b7d041a322))
+* passes date options to the react-datepicker in filter UI, removes duplicate options from operators select ([#4225](https://github.com/payloadcms/payload/issues/4225)) ([3d2b62b](https://github.com/payloadcms/payload/commit/3d2b62b2100e36a54adc6a675257a4d671fdd469))
+* prevent json data getting reset when switching tabs ([#4123](https://github.com/payloadcms/payload/issues/4123)) ([1dcd3a2](https://github.com/payloadcms/payload/commit/1dcd3a27825ed9d276b997a66f84bb2c05e87955))
+* transactions broken within doc access ([443847e](https://github.com/payloadcms/payload/commit/443847ec716a3b87032d9d1904b6c90aadd47197))
+* typo in polish translations ([#4234](https://github.com/payloadcms/payload/issues/4234)) ([56a4692](https://github.com/payloadcms/payload/commit/56a469266207ef83053b0c9176d1be4fc26087e6))
+
## [2.2.1](https://github.com/payloadcms/payload/compare/v2.2.0...v2.2.1) (2023-11-21)
diff --git a/packages/payload/package.json b/packages/payload/package.json
index f7fbed020f5..d731b684aee 100644
--- a/packages/payload/package.json
+++ b/packages/payload/package.json
@@ -1,6 +1,6 @@
{
"name": "payload",
- "version": "2.2.1",
+ "version": "2.2.2",
"description": "Node, React and MongoDB Headless CMS and Application Framework",
"license": "MIT",
"main": "./dist/index.js",
|
131157ba296ca769beceb7ef1a1cc3726fa664b8
|
2023-10-05 21:08:26
|
Elliot DeNolf
|
chore(db-postgres): write json snapshot to migrations dir
| false
|
write json snapshot to migrations dir
|
chore
|
diff --git a/packages/db-postgres/src/createMigration.ts b/packages/db-postgres/src/createMigration.ts
index 13f2ffc3e3b..e671eb48b5d 100644
--- a/packages/db-postgres/src/createMigration.ts
+++ b/packages/db-postgres/src/createMigration.ts
@@ -78,18 +78,19 @@ export const createMigration: CreateMigration = async function createMigration(
let drizzleJsonBefore = getDefaultDrizzleSnapshot()
- const hasMigrationTable = await migrationTableExists(this.drizzle)
-
- if (hasMigrationTable) {
- const migrationQuery = await payload.find({
- collection: 'payload-migrations',
- limit: 1,
- sort: '-name',
- })
-
- if (migrationQuery.docs?.[0]?.schema) {
- drizzleJsonBefore = migrationQuery.docs[0]?.schema as DrizzleSnapshotJSON
- }
+ // Get latest migration snapshot
+ const latestSnapshot = fs
+ .readdirSync(dir)
+ .filter((file) => file.endsWith('.json'))
+ .sort()
+ .reverse()[0]
+
+ if (latestSnapshot) {
+ const latestSnapshotJSON = JSON.parse(
+ fs.readFileSync(`${dir}/${latestSnapshot}`, 'utf8'),
+ ) as DrizzleSnapshotJSON
+
+ drizzleJsonBefore = latestSnapshotJSON
}
const drizzleJsonAfter = generateDrizzleJson(this.schema)
@@ -97,7 +98,7 @@ export const createMigration: CreateMigration = async function createMigration(
const sqlStatementsDown = await generateMigration(drizzleJsonAfter, drizzleJsonBefore)
// write schema
- fs.writeFileSync(`${filePath}.json`, JSON.stringify(drizzleJsonAfter))
+ fs.writeFileSync(`${filePath}.json`, JSON.stringify(drizzleJsonAfter, null, 2))
// write migration
fs.writeFileSync(
diff --git a/packages/db-postgres/src/migrate.ts b/packages/db-postgres/src/migrate.ts
index b93038e078d..f91a8360777 100644
--- a/packages/db-postgres/src/migrate.ts
+++ b/packages/db-postgres/src/migrate.ts
@@ -23,7 +23,7 @@ export async function migrate(this: PostgresAdapter): Promise<void> {
limit: 0,
sort: '-name',
}))
- if (typeof existingMigrations[0]?.batch !== 'undefined') {
+ if (Number(existingMigrations[0]?.batch) > 0) {
latestBatch = Number(existingMigrations[0]?.batch)
}
} else {
|
c417e3a627dbaf8e8f1226ef28cfa2aeb1b81466
|
2025-03-04 01:28:39
|
Patrik
|
fix: avif images not converting to `upload.formatOptions` set file types (#11505)
| false
|
avif images not converting to `upload.formatOptions` set file types (#11505)
|
fix
|
diff --git a/packages/payload/src/uploads/canResizeImage.ts b/packages/payload/src/uploads/canResizeImage.ts
index 15f4c63b1f1..b3df32d1b3f 100644
--- a/packages/payload/src/uploads/canResizeImage.ts
+++ b/packages/payload/src/uploads/canResizeImage.ts
@@ -1,3 +1,7 @@
export function canResizeImage(mimeType: string): boolean {
- return ['image/jpeg', 'image/png', 'image/gif', 'image/webp', 'image/tiff'].indexOf(mimeType) > -1
+ return (
+ ['image/jpeg', 'image/png', 'image/gif', 'image/webp', 'image/tiff', 'image/avif'].indexOf(
+ mimeType,
+ ) > -1
+ )
}
diff --git a/test/uploads/e2e.spec.ts b/test/uploads/e2e.spec.ts
index 6d1032b9ccc..5ccb6d42bdb 100644
--- a/test/uploads/e2e.spec.ts
+++ b/test/uploads/e2e.spec.ts
@@ -223,6 +223,19 @@ describe('Uploads', () => {
await saveDocAndAssert(page)
})
+ test('should properly convert avif image to png', async () => {
+ await page.goto(mediaURL.create)
+
+ await page.setInputFiles('input[type="file"]', path.resolve(dirname, './test-image-avif.avif'))
+ const filename = page.locator('.file-field__filename')
+ await expect(filename).toHaveValue('test-image-avif.avif')
+
+ await saveDocAndAssert(page)
+
+ const fileMetaSizeType = page.locator('.file-meta__size-type')
+ await expect(fileMetaSizeType).toHaveText(/image\/png/)
+ })
+
test('should create animated file upload', async () => {
await page.goto(animatedTypeMediaURL.create)
diff --git a/test/uploads/test-image-avif.avif b/test/uploads/test-image-avif.avif
new file mode 100644
index 00000000000..111d24b178f
Binary files /dev/null and b/test/uploads/test-image-avif.avif differ
|
9182d8d594d692369524db23dd35bf92aff48a4b
|
2024-03-19 02:20:15
|
Jacob Fletcher
|
fix(ui): falls back custom fields as undefined instead of null
| false
|
falls back custom fields as undefined instead of null
|
fix
|
diff --git a/packages/ui/src/utilities/buildComponentMap/mapFields.tsx b/packages/ui/src/utilities/buildComponentMap/mapFields.tsx
index 2fcdd5b77c7..0c7bae03c1b 100644
--- a/packages/ui/src/utilities/buildComponentMap/mapFields.tsx
+++ b/packages/ui/src/utilities/buildComponentMap/mapFields.tsx
@@ -659,7 +659,7 @@ export const mapFields = (args: {
Cell,
CustomField: CustomFieldComponent ? (
<CustomFieldComponent {...fieldComponentProps} />
- ) : null,
+ ) : undefined,
Heading,
fieldComponentProps,
fieldIsPresentational,
diff --git a/tsconfig.json b/tsconfig.json
index 8350e3acf05..f6045448986 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -94,7 +94,7 @@
"./packages/graphql/src"
],
"@payload-config": [
- "./test/_community/config.ts"
+ "./test/auth/config.ts"
]
}
},
|
c5491e6f272fa4f8cff44c2a380e1f379c1679f8
|
2024-03-20 01:06:29
|
James
|
chore: linting useThumbnail
| false
|
linting useThumbnail
|
chore
|
diff --git a/packages/ui/src/elements/DeleteMany/index.tsx b/packages/ui/src/elements/DeleteMany/index.tsx
index 8fbd79fcffb..54bc868824b 100644
--- a/packages/ui/src/elements/DeleteMany/index.tsx
+++ b/packages/ui/src/elements/DeleteMany/index.tsx
@@ -11,7 +11,7 @@ import { useAuth } from '../../providers/Auth/index.js'
import { useConfig } from '../../providers/Config/index.js'
import { useRouteCache } from '../../providers/RouteCache/index.js'
import { useSearchParams } from '../../providers/SearchParams/index.js'
-import { SelectAllStatus, useSelection } from '../../providers/Selection/index.jsx'
+import { SelectAllStatus, useSelection } from '../../providers/Selection/index.js'
import { useTranslation } from '../../providers/Translation/index.js'
import { MinimalTemplate } from '../../templates/Minimal/index.js'
import { requests } from '../../utilities/api.js'
diff --git a/packages/ui/src/elements/DocumentDrawer/DrawerContent.tsx b/packages/ui/src/elements/DocumentDrawer/DrawerContent.tsx
index d2ee8a928cf..c1318892fa1 100644
--- a/packages/ui/src/elements/DocumentDrawer/DrawerContent.tsx
+++ b/packages/ui/src/elements/DocumentDrawer/DrawerContent.tsx
@@ -12,7 +12,7 @@ import type { DocumentDrawerProps } from './types.js'
import { useRelatedCollections } from '../../fields/Relationship/AddNew/useRelatedCollections.js'
import usePayloadAPI from '../../hooks/usePayloadAPI.js'
import { X } from '../../icons/X/index.js'
-import { useComponentMap } from '../../providers/ComponentMap/index.jsx'
+import { useComponentMap } from '../../providers/ComponentMap/index.js'
import { useConfig } from '../../providers/Config/index.js'
import { DocumentInfoProvider } from '../../providers/DocumentInfo/index.js'
import { useFormQueryParams } from '../../providers/FormQueryParams/index.js'
diff --git a/packages/ui/src/elements/EditMany/index.tsx b/packages/ui/src/elements/EditMany/index.tsx
index 8a8e01310e4..23d24a337ad 100644
--- a/packages/ui/src/elements/EditMany/index.tsx
+++ b/packages/ui/src/elements/EditMany/index.tsx
@@ -6,7 +6,7 @@ import { getTranslation } from '@payloadcms/translations'
import { useRouter } from 'next/navigation.js'
import React, { useCallback, useState } from 'react'
-import type { FormProps } from '../../index.js'
+import type { FormProps } from '../../forms/Form/index.js'
import type { Props } from './types.js'
import { useForm } from '../../forms/Form/context.js'
@@ -16,12 +16,12 @@ import FormSubmit from '../../forms/Submit/index.js'
import { X } from '../../icons/X/index.js'
import { useRouteCache } from '../../index.js'
import { useAuth } from '../../providers/Auth/index.js'
-import { useComponentMap } from '../../providers/ComponentMap/index.jsx'
+import { useComponentMap } from '../../providers/ComponentMap/index.js'
import { useConfig } from '../../providers/Config/index.js'
import { DocumentInfoProvider } from '../../providers/DocumentInfo/index.js'
-import { OperationContext } from '../../providers/Operation/index.jsx'
+import { OperationContext } from '../../providers/Operation/index.js'
import { useSearchParams } from '../../providers/SearchParams/index.js'
-import { SelectAllStatus, useSelection } from '../../providers/Selection/index.jsx'
+import { SelectAllStatus, useSelection } from '../../providers/Selection/index.js'
import { useTranslation } from '../../providers/Translation/index.js'
import { getFormState } from '../../utilities/getFormState.js'
import { Drawer, DrawerToggler } from '../Drawer/index.js'
diff --git a/packages/ui/src/elements/ListDrawer/DrawerContent.tsx b/packages/ui/src/elements/ListDrawer/DrawerContent.tsx
index ffbb5e3a4b3..9d99dcd3553 100644
--- a/packages/ui/src/elements/ListDrawer/DrawerContent.tsx
+++ b/packages/ui/src/elements/ListDrawer/DrawerContent.tsx
@@ -14,7 +14,7 @@ import usePayloadAPI from '../../hooks/usePayloadAPI.js'
import { useUseTitleField } from '../../hooks/useUseAsTitle.sx'
import { X } from '../../icons/X/index.js'
import { useAuth } from '../../providers/Auth/index.js'
-import { useComponentMap } from '../../providers/ComponentMap/index.jsx'
+import { useComponentMap } from '../../providers/ComponentMap/index.js'
import { useConfig } from '../../providers/Config/index.js'
import { ListInfoProvider } from '../../providers/ListInfo/index.js'
import { usePreferences } from '../../providers/Preferences/index.js'
diff --git a/packages/ui/src/elements/ListSelection/index.tsx b/packages/ui/src/elements/ListSelection/index.tsx
index a34f7954761..ff13eedf6c9 100644
--- a/packages/ui/src/elements/ListSelection/index.tsx
+++ b/packages/ui/src/elements/ListSelection/index.tsx
@@ -1,7 +1,7 @@
'use client'
import React, { Fragment } from 'react'
-import { SelectAllStatus, useSelection } from '../../providers/Selection/index.jsx'
+import { SelectAllStatus, useSelection } from '../../providers/Selection/index.js'
import { useTranslation } from '../../providers/Translation/index.js'
import './index.scss'
diff --git a/packages/ui/src/elements/PublishMany/index.tsx b/packages/ui/src/elements/PublishMany/index.tsx
index 70f8765984b..188b11b2b42 100644
--- a/packages/ui/src/elements/PublishMany/index.tsx
+++ b/packages/ui/src/elements/PublishMany/index.tsx
@@ -11,7 +11,7 @@ import { useRouteCache } from '../../index.js'
import { useAuth } from '../../providers/Auth/index.js'
import { useConfig } from '../../providers/Config/index.js'
import { useSearchParams } from '../../providers/SearchParams/index.js'
-import { SelectAllStatus, useSelection } from '../../providers/Selection/index.jsx'
+import { SelectAllStatus, useSelection } from '../../providers/Selection/index.js'
import { useTranslation } from '../../providers/Translation/index.js'
import { MinimalTemplate } from '../../templates/Minimal/index.js'
import { requests } from '../../utilities/api.js'
diff --git a/packages/ui/src/elements/SelectAll/index.tsx b/packages/ui/src/elements/SelectAll/index.tsx
index d6c0e3ca4d4..4e0fa8e8f13 100644
--- a/packages/ui/src/elements/SelectAll/index.tsx
+++ b/packages/ui/src/elements/SelectAll/index.tsx
@@ -3,7 +3,7 @@
import React from 'react'
import { CheckboxInput } from '../../forms/fields/Checkbox/Input.js'
-import { SelectAllStatus, useSelection } from '../../providers/Selection/index.jsx'
+import { SelectAllStatus, useSelection } from '../../providers/Selection/index.js'
import { useTranslation } from '../../providers/Translation/index.js'
import './index.scss'
diff --git a/packages/ui/src/elements/SelectRow/index.tsx b/packages/ui/src/elements/SelectRow/index.tsx
index 45ad9e1a7a2..217f94f8580 100644
--- a/packages/ui/src/elements/SelectRow/index.tsx
+++ b/packages/ui/src/elements/SelectRow/index.tsx
@@ -3,7 +3,7 @@ import React from 'react'
import { useTableCell } from '../../elements/Table/TableCellProvider/index.js'
import { CheckboxInput } from '../../forms/fields/Checkbox/Input.js'
-import { useSelection } from '../../providers/Selection/index.jsx'
+import { useSelection } from '../../providers/Selection/index.js'
import './index.scss'
const baseClass = 'select-row'
diff --git a/packages/ui/src/elements/TableColumns/index.tsx b/packages/ui/src/elements/TableColumns/index.tsx
index e9640315e71..84171e832b5 100644
--- a/packages/ui/src/elements/TableColumns/index.tsx
+++ b/packages/ui/src/elements/TableColumns/index.tsx
@@ -8,7 +8,7 @@ import type { ColumnPreferences } from '../../providers/ListInfo/types.js'
import type { Column } from '../Table/types.js'
import type { Action } from './columnReducer.js'
-import { useComponentMap } from '../../providers/ComponentMap/index.jsx'
+import { useComponentMap } from '../../providers/ComponentMap/index.js'
import { useConfig } from '../../providers/Config/index.js'
import { usePreferences } from '../../providers/Preferences/index.js'
import { buildColumns } from './buildColumns.js'
diff --git a/packages/ui/src/elements/Thumbnail/index.tsx b/packages/ui/src/elements/Thumbnail/index.tsx
index 736370291ef..94d82d2be8b 100644
--- a/packages/ui/src/elements/Thumbnail/index.tsx
+++ b/packages/ui/src/elements/Thumbnail/index.tsx
@@ -4,7 +4,7 @@ import React, { useEffect, useState } from 'react'
import type { Props } from './types.js'
import { File } from '../../graphics/File/index.js'
-import useThumbnail from '../../hooks/useThumbnail.js'
+import { useThumbnail } from '../../hooks/useThumbnail.js'
import './index.scss'
const baseClass = 'thumbnail'
diff --git a/packages/ui/src/elements/UnpublishMany/index.tsx b/packages/ui/src/elements/UnpublishMany/index.tsx
index b07eec5d76c..49b08e5efc7 100644
--- a/packages/ui/src/elements/UnpublishMany/index.tsx
+++ b/packages/ui/src/elements/UnpublishMany/index.tsx
@@ -11,7 +11,7 @@ import { useRouteCache } from '../../index.js'
import { useAuth } from '../../providers/Auth/index.js'
import { useConfig } from '../../providers/Config/index.js'
import { useSearchParams } from '../../providers/SearchParams/index.js'
-import { SelectAllStatus, useSelection } from '../../providers/Selection/index.jsx'
+import { SelectAllStatus, useSelection } from '../../providers/Selection/index.js'
import { useTranslation } from '../../providers/Translation/index.js'
import { MinimalTemplate } from '../../templates/Minimal/index.js'
import { requests } from '../../utilities/api.js'
diff --git a/packages/ui/src/fields/Text/index.tsx b/packages/ui/src/fields/Text/index.tsx
index fc654572938..2f163a546d5 100644
--- a/packages/ui/src/fields/Text/index.tsx
+++ b/packages/ui/src/fields/Text/index.tsx
@@ -2,7 +2,6 @@
import type { ClientValidate } from 'payload/types'
import type {} from 'payload/types'
-import { TextField } from 'payload/types'
import React, { useCallback, useEffect, useState } from 'react'
import type { Option } from '../../elements/ReactSelect/types.js'
diff --git a/packages/ui/src/forms/Form/index.tsx b/packages/ui/src/forms/Form/index.tsx
index 7debefa6fe8..080d7b5594d 100644
--- a/packages/ui/src/forms/Form/index.tsx
+++ b/packages/ui/src/forms/Form/index.tsx
@@ -19,7 +19,7 @@ import { useConfig } from '../../providers/Config/index.js'
import { useDocumentInfo } from '../../providers/DocumentInfo/index.js'
import { useFormQueryParams } from '../../providers/FormQueryParams/index.js'
import { useLocale } from '../../providers/Locale/index.js'
-import { useOperation } from '../../providers/Operation/index.jsx'
+import { useOperation } from '../../providers/Operation/index.js'
import { useTranslation } from '../../providers/Translation/index.js'
import { requests } from '../../utilities/api.js'
import { getFormState } from '../../utilities/getFormState.js'
diff --git a/packages/ui/src/forms/RenderFields/RenderField.tsx b/packages/ui/src/forms/RenderFields/RenderField.tsx
index 9e0bd88a38c..b88fad34483 100644
--- a/packages/ui/src/forms/RenderFields/RenderField.tsx
+++ b/packages/ui/src/forms/RenderFields/RenderField.tsx
@@ -1,6 +1,6 @@
'use client'
-import type { FieldTypes } from 'payload/config.js'
+import type { FieldTypes } from 'payload/config'
import type { FieldPermissions } from 'payload/types'
import React from 'react'
@@ -10,9 +10,9 @@ import type {
MappedField,
} from '../../providers/ComponentMap/buildComponentMap/types.js'
-import { HiddenInput } from '../../index.js'
-import { useFieldComponents } from '../../providers/FieldComponents/index.jsx'
-import { useOperation } from '../../providers/Operation/index.jsx'
+import { HiddenInput } from '../../fields/HiddenInput/index.js'
+import { useFieldComponents } from '../../providers/FieldComponents/index.js'
+import { useOperation } from '../../providers/Operation/index.js'
import { FieldPropsProvider, useFieldProps } from '../FieldPropsProvider/index.js'
type Props = {
diff --git a/packages/ui/src/forms/RowLabel/Context/index.tsx b/packages/ui/src/forms/RowLabel/Context/index.tsx
index 3748c10134f..9db33eabec5 100644
--- a/packages/ui/src/forms/RowLabel/Context/index.tsx
+++ b/packages/ui/src/forms/RowLabel/Context/index.tsx
@@ -1,8 +1,9 @@
'use client'
-import { useWatchForm } from '@payloadcms/ui'
import React from 'react'
+import { useWatchForm } from '../../Form/context.js'
+
type RowLabelType<T = unknown> = {
data: T
path: string
diff --git a/packages/ui/src/forms/useField/index.tsx b/packages/ui/src/forms/useField/index.tsx
index f6c96e45773..3e61ad7d2e7 100644
--- a/packages/ui/src/forms/useField/index.tsx
+++ b/packages/ui/src/forms/useField/index.tsx
@@ -8,7 +8,7 @@ import useThrottledEffect from '../../hooks/useThrottledEffect.js'
import { useAuth } from '../../providers/Auth/index.js'
import { useConfig } from '../../providers/Config/index.js'
import { useDocumentInfo } from '../../providers/DocumentInfo/index.js'
-import { useOperation } from '../../providers/Operation/index.jsx'
+import { useOperation } from '../../providers/Operation/index.js'
import { useTranslation } from '../../providers/Translation/index.js'
import { useFieldProps } from '../FieldPropsProvider/index.js'
import { useForm, useFormFields, useFormProcessing, useFormSubmitted } from '../Form/context.js'
diff --git a/packages/ui/src/graphics/Icon/index.tsx b/packages/ui/src/graphics/Icon/index.tsx
index 731a03bd258..c3dd4cecbf2 100644
--- a/packages/ui/src/graphics/Icon/index.tsx
+++ b/packages/ui/src/graphics/Icon/index.tsx
@@ -1,6 +1,6 @@
import React, { Fragment } from 'react'
-import { useComponentMap } from '../../providers/ComponentMapProvider/index.js'
+import { useComponentMap } from '../../providers/ComponentMap/index.js'
import { useTranslation } from '../../providers/Translation/index.js'
const css = `
diff --git a/packages/ui/src/hooks/usePayloadAPI.ts b/packages/ui/src/hooks/usePayloadAPI.ts
index dc9bdb1efd1..2a0ae63d4e4 100644
--- a/packages/ui/src/hooks/usePayloadAPI.ts
+++ b/packages/ui/src/hooks/usePayloadAPI.ts
@@ -2,8 +2,8 @@
import queryString from 'qs'
import { useEffect, useRef, useState } from 'react'
-import { useLocale } from '../providers/Locale/index.jsx'
-import { useTranslation } from '../providers/Translation/index.jsx'
+import { useLocale } from '../providers/Locale/index.js'
+import { useTranslation } from '../providers/Translation/index.js'
import { requests } from '../utilities/api.js'
type Result = [
diff --git a/packages/ui/src/hooks/useThumbnail.ts b/packages/ui/src/hooks/useThumbnail.ts
index 7ab3d7abce9..92b6f3897d6 100644
--- a/packages/ui/src/hooks/useThumbnail.ts
+++ b/packages/ui/src/hooks/useThumbnail.ts
@@ -2,15 +2,13 @@ import type { SanitizedCollectionConfig } from 'payload/types'
import { isImage } from 'payload/utilities'
-import { useComponentMap } from '../providers/ComponentMap/index.jsx'
+import { useComponentMap } from '../providers/ComponentMap/index.js'
import { useConfig } from '../providers/Config/index.js'
-const absoluteURLPattern = new RegExp('^(?:[a-z]+:)?//', 'i')
-const base64Pattern = new RegExp(/^data:image\/[a-z]+;base64,/)
+const absoluteURLPattern = /^(?:[a-z]+:)?\/\//i
+const base64Pattern = /^data:image\/[a-z]+;base64,/
-// /api/[collectionSlug]/file/[filename]
-
-const useThumbnail = (
+export const useThumbnail = (
collectionSlug: string,
uploadConfig: SanitizedCollectionConfig['upload'],
doc: Record<string, unknown>,
@@ -66,5 +64,3 @@ const useThumbnail = (
return false
}
-
-export default useThumbnail
diff --git a/packages/ui/src/providers/Actions/SetViewActions/index.tsx b/packages/ui/src/providers/Actions/SetViewActions/index.tsx
index df36631048e..f898826c64c 100644
--- a/packages/ui/src/providers/Actions/SetViewActions/index.tsx
+++ b/packages/ui/src/providers/Actions/SetViewActions/index.tsx
@@ -5,7 +5,7 @@ import { useEffect } from 'react'
import type { ActionMap } from '../../ComponentMap/buildComponentMap/types.js'
-import { useActions } from '../index.jsx'
+import { useActions } from '../index.js'
export const SetViewActions: React.FC<{ actions: ActionMap['Edit'][string] }> = ({ actions }) => {
const { setViewActions } = useActions()
diff --git a/packages/ui/src/providers/Actions/index.tsx b/packages/ui/src/providers/Actions/index.tsx
index 18bb4e054e1..daa6c361b5e 100644
--- a/packages/ui/src/providers/Actions/index.tsx
+++ b/packages/ui/src/providers/Actions/index.tsx
@@ -3,9 +3,9 @@ import React, { createContext, useContext, useEffect, useState } from 'react'
import type { ActionMap } from '../ComponentMap/buildComponentMap/types.js'
-import { useComponentMap } from '../ComponentMap/index.jsx'
+import { useComponentMap } from '../ComponentMap/index.js'
-export { SetViewActions } from './SetViewActions/index.jsx'
+export { SetViewActions } from './SetViewActions/index.js'
type ActionsContextType = {
actions: ActionMap['Edit'][string]
@@ -39,5 +39,3 @@ export const ActionsProvider = ({ children }) => {
</ActionsContext.Provider>
)
}
-
-export { SetViewActions } from './SetViewActions/index.jsx'
diff --git a/packages/ui/src/providers/ComponentMap/buildComponentMap/index.tsx b/packages/ui/src/providers/ComponentMap/buildComponentMap/index.tsx
index df0dba5e147..5fb7a087cc6 100644
--- a/packages/ui/src/providers/ComponentMap/buildComponentMap/index.tsx
+++ b/packages/ui/src/providers/ComponentMap/buildComponentMap/index.tsx
@@ -4,8 +4,8 @@ import React from 'react'
import type { CollectionComponentMap, ComponentMap, GlobalComponentMap } from './types.js'
-import { mapActions } from './mapActions.jsx'
-import { mapFields } from './mapFields.jsx'
+import { mapActions } from './mapActions.js'
+import { mapFields } from './mapFields.js'
export const buildComponentMap = (args: {
DefaultCell: React.FC<any>
diff --git a/packages/ui/src/providers/ComponentMap/buildComponentMap/mapFields.tsx b/packages/ui/src/providers/ComponentMap/buildComponentMap/mapFields.tsx
index cc9713eefdb..87c4c2d393f 100644
--- a/packages/ui/src/providers/ComponentMap/buildComponentMap/mapFields.tsx
+++ b/packages/ui/src/providers/ComponentMap/buildComponentMap/mapFields.tsx
@@ -4,21 +4,21 @@ import { fieldAffectsData, fieldIsPresentationalOnly } from 'payload/types'
import { isPlainObject } from 'payload/utilities'
import React, { Fragment } from 'react'
-import type { ArrayFieldProps } from '../../../fields/Array/index.jsx'
-import type { BlocksFieldProps } from '../../../fields/Blocks/index.jsx'
-import type { CheckboxFieldProps } from '../../../fields/Checkbox/index.jsx'
-import type { CodeFieldProps } from '../../../fields/Code/index.jsx'
-import type { CollapsibleFieldProps } from '../../../fields/Collapsible/index.jsx'
-import type { DateFieldProps } from '../../../fields/DateTime/index.jsx'
-import type { EmailFieldProps } from '../../../fields/Email/index.jsx'
-import type { GroupFieldProps } from '../../../fields/Group/index.jsx'
-import type { JSONFieldProps } from '../../../fields/JSON/index.jsx'
-import type { NumberFieldProps } from '../../../fields/Number/index.jsx'
-import type { PointFieldProps } from '../../../fields/Point/index.jsx'
+import type { ArrayFieldProps } from '../../../fields/Array/index.js'
+import type { BlocksFieldProps } from '../../../fields/Blocks/index.js'
+import type { CheckboxFieldProps } from '../../../fields/Checkbox/index.js'
+import type { CodeFieldProps } from '../../../fields/Code/index.js'
+import type { CollapsibleFieldProps } from '../../../fields/Collapsible/index.js'
+import type { DateFieldProps } from '../../../fields/DateTime/index.js'
+import type { EmailFieldProps } from '../../../fields/Email/index.js'
+import type { GroupFieldProps } from '../../../fields/Group/index.js'
+import type { JSONFieldProps } from '../../../fields/JSON/index.js'
+import type { NumberFieldProps } from '../../../fields/Number/index.js'
+import type { PointFieldProps } from '../../../fields/Point/index.js'
import type { RelationshipFieldProps } from '../../../fields/Relationship/types.js'
import type { RowFieldProps } from '../../../fields/Row/types.js'
-import type { SelectFieldProps } from '../../../fields/Select/index.jsx'
-import type { TabsFieldProps } from '../../../fields/Tabs/index.jsx'
+import type { SelectFieldProps } from '../../../fields/Select/index.js'
+import type { TabsFieldProps } from '../../../fields/Tabs/index.js'
import type { TextFieldProps } from '../../../fields/Text/types.js'
import type { TextareaFieldProps } from '../../../fields/Textarea/types.js'
import type { UploadFieldProps } from '../../../fields/Upload/types.js'
@@ -32,12 +32,12 @@ import type {
ReducedBlock,
} from './types.js'
-import { RenderCustomComponent } from '../../../elements/RenderCustomComponent/index.jsx'
-import { SortColumn } from '../../../elements/SortColumn/index.jsx'
-import { HiddenInput } from '../../../fields/HiddenInput/index.jsx'
-import { Error as DefaultError } from '../../../forms/Error/index.jsx'
-import { FieldDescription as DefaultDescription } from '../../../forms/FieldDescription/index.jsx'
-import { Label as DefaultLabel } from '../../../forms/Label/index.jsx'
+import { RenderCustomComponent } from '../../../elements/RenderCustomComponent/index.js'
+import { SortColumn } from '../../../elements/SortColumn/index.js'
+import { HiddenInput } from '../../../fields/HiddenInput/index.js'
+import { Error as DefaultError } from '../../../forms/Error/index.js'
+import { FieldDescription as DefaultDescription } from '../../../forms/FieldDescription/index.js'
+import { Label as DefaultLabel } from '../../../forms/Label/index.js'
export const mapFields = (args: {
DefaultCell?: React.FC<any>
diff --git a/packages/ui/src/providers/Root/index.tsx b/packages/ui/src/providers/Root/index.tsx
index dfa20e36af0..0c73aca768f 100644
--- a/packages/ui/src/providers/Root/index.tsx
+++ b/packages/ui/src/providers/Root/index.tsx
@@ -14,13 +14,13 @@ import type { LanguageOptions } from '../Translation/index.js'
import { LoadingOverlayProvider } from '../../elements/LoadingOverlay/index.js'
import { NavProvider } from '../../elements/Nav/context.js'
import { StepNavProvider } from '../../elements/StepNav/index.js'
-import { ActionsProvider } from '../Actions/index.jsx'
+import { ActionsProvider } from '../Actions/index.js'
import { AuthProvider } from '../Auth/index.js'
import { ClientFunctionProvider } from '../ClientFunction/index.js'
-import { ComponentMapProvider } from '../ComponentMap/index.jsx'
+import { ComponentMapProvider } from '../ComponentMap/index.js'
import { ConfigProvider } from '../Config/index.js'
import { DocumentEventsProvider } from '../DocumentEvents/index.js'
-import { FieldComponentsProvider } from '../FieldComponents/index.jsx'
+import { FieldComponentsProvider } from '../FieldComponents/index.js'
import { LocaleProvider } from '../Locale/index.js'
import { ParamsProvider } from '../Params/index.js'
import { PreferencesProvider } from '../Preferences/index.js'
diff --git a/packages/ui/src/providers/Selection/index.tsx b/packages/ui/src/providers/Selection/index.tsx
index e762ef67e40..7af98ebe557 100644
--- a/packages/ui/src/providers/Selection/index.tsx
+++ b/packages/ui/src/providers/Selection/index.tsx
@@ -4,8 +4,8 @@ import type { Where } from 'payload/types'
import queryString from 'qs'
import React, { createContext, useCallback, useContext, useEffect, useRef, useState } from 'react'
-import { useLocale } from '../Locale/index.jsx'
-import { useSearchParams } from '../SearchParams/index.jsx'
+import { useLocale } from '../Locale/index.js'
+import { useSearchParams } from '../SearchParams/index.js'
export enum SelectAllStatus {
AllAvailable = 'allAvailable',
diff --git a/packages/ui/src/utilities/formatDocTitle.ts b/packages/ui/src/utilities/formatDocTitle.ts
index 1dc16a7b8b4..9744374c0da 100644
--- a/packages/ui/src/utilities/formatDocTitle.ts
+++ b/packages/ui/src/utilities/formatDocTitle.ts
@@ -7,7 +7,8 @@ import type {
} from 'payload/types'
import { getTranslation } from '@payloadcms/translations'
-import { formatDate } from '@payloadcms/ui'
+
+import { formatDate } from '../utilities/formatDate.js'
export const formatDocTitle = ({
collectionConfig,
|
6da4f06205558b5a45e52272d417719807a09653
|
2024-09-24 22:40:25
|
Elliot DeNolf
|
fix(db-vercel-postgres): include needed pg dependency (#8393)
| false
|
include needed pg dependency (#8393)
|
fix
|
diff --git a/packages/db-vercel-postgres/package.json b/packages/db-vercel-postgres/package.json
index 6712127d072..dac64a65382 100644
--- a/packages/db-vercel-postgres/package.json
+++ b/packages/db-vercel-postgres/package.json
@@ -62,7 +62,8 @@
"@types/pg": "8.10.2",
"@types/to-snake-case": "1.0.0",
"esbuild": "0.23.1",
- "payload": "workspace:*"
+ "payload": "workspace:*",
+ "pg": "8.11.3"
},
"peerDependencies": {
"payload": "workspace:*"
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 39871ca4f98..8db5fef6ad4 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -428,6 +428,9 @@ importers:
payload:
specifier: workspace:*
version: link:../payload
+ pg:
+ specifier: 8.11.3
+ version: 8.11.3
packages/drizzle:
dependencies:
|
dbbff4cfa41aa20077e47c8c7b87d4d00683c571
|
2021-09-22 21:35:09
|
James
|
feat: allows local update api to replace existing files with newly uploaded ones
| false
|
allows local update api to replace existing files with newly uploaded ones
|
feat
|
diff --git a/docs/local-api/overview.mdx b/docs/local-api/overview.mdx
index 49e00894818..fefb3600dc1 100644
--- a/docs/local-api/overview.mdx
+++ b/docs/local-api/overview.mdx
@@ -162,6 +162,11 @@ const result = await payload.update({
// a file directly through the Local API by providing
// its full, absolute file path.
filePath: path.resolve(__dirname, './path-to-image.jpg'),
+
+ // If you are uploading a file and would like to replace
+ // the existing file instead of generating a new filename,
+ // you can set the following property to `true`
+ overwriteExistingFiles: true,
})
```
diff --git a/src/collections/operations/local/update.ts b/src/collections/operations/local/update.ts
index 0fca8540220..c7823b2e257 100644
--- a/src/collections/operations/local/update.ts
+++ b/src/collections/operations/local/update.ts
@@ -12,6 +12,7 @@ export type Options = {
overrideAccess?: boolean
showHiddenFields?: boolean
filePath?: string
+ overwriteExistingFiles?: boolean
}
export default async function update(options: Options): Promise<Document> {
@@ -26,6 +27,7 @@ export default async function update(options: Options): Promise<Document> {
overrideAccess = true,
showHiddenFields,
filePath,
+ overwriteExistingFiles = false,
} = options;
const collection = this.collections[collectionSlug];
@@ -37,6 +39,7 @@ export default async function update(options: Options): Promise<Document> {
overrideAccess,
id,
showHiddenFields,
+ overwriteExistingFiles,
req: {
user,
payloadAPI: 'local',
diff --git a/src/collections/operations/update.ts b/src/collections/operations/update.ts
index 2b579f49e4c..0afe26b9794 100644
--- a/src/collections/operations/update.ts
+++ b/src/collections/operations/update.ts
@@ -27,6 +27,7 @@ export type Arguments = {
disableVerificationEmail?: boolean
overrideAccess?: boolean
showHiddenFields?: boolean
+ overwriteExistingFiles?: boolean
}
async function update(incomingArgs: Arguments): Promise<Document> {
@@ -60,6 +61,7 @@ async function update(incomingArgs: Arguments): Promise<Document> {
},
overrideAccess,
showHiddenFields,
+ overwriteExistingFiles = false,
} = args;
if (!id) {
@@ -135,7 +137,7 @@ async function update(incomingArgs: Arguments): Promise<Document> {
const file = ((req.files && req.files.file) ? req.files.file : req.file) as UploadedFile;
if (file) {
- const fsSafeName = await getSafeFilename(staticPath, file.name);
+ const fsSafeName = overwriteExistingFiles ? await getSafeFilename(staticPath, file.name) : file.name;
try {
if (!disableLocalStorage) {
|
0b1a1b585b9a11b574341ed3bbdc3ecdc4c9b235
|
2025-03-17 19:57:21
|
Jacob Fletcher
|
fix(ui): processing and initializing form does not disable standalone fields (#11714)
| false
|
processing and initializing form does not disable standalone fields (#11714)
|
fix
|
diff --git a/packages/richtext-lexical/src/field/Field.tsx b/packages/richtext-lexical/src/field/Field.tsx
index 98a4fbeb737..3b10ed5290a 100644
--- a/packages/richtext-lexical/src/field/Field.tsx
+++ b/packages/richtext-lexical/src/field/Field.tsx
@@ -68,8 +68,7 @@ const RichTextComponent: React.FC<
const {
customComponents: { AfterInput, BeforeInput, Description, Error, Label } = {},
- formInitializing,
- formProcessing,
+ disabled: disabledFromField,
initialValue,
setValue,
showError,
@@ -79,7 +78,7 @@ const RichTextComponent: React.FC<
validate: memoizedValidate,
})
- const disabled = readOnlyFromProps || formProcessing || formInitializing
+ const disabled = readOnlyFromProps || disabledFromField
const [isSmallWidthViewport, setIsSmallWidthViewport] = useState<boolean>(false)
const [rerenderProviderKey, setRerenderProviderKey] = useState<Date>()
diff --git a/packages/richtext-slate/src/field/RichText.tsx b/packages/richtext-slate/src/field/RichText.tsx
index 03a0ca15cae..1effc7eb099 100644
--- a/packages/richtext-slate/src/field/RichText.tsx
+++ b/packages/richtext-slate/src/field/RichText.tsx
@@ -95,7 +95,7 @@ const RichTextField: React.FC<LoadedSlateFieldProps> = (props) => {
const {
customComponents: { Description, Error, Label } = {},
- formInitializing,
+ disabled: disabledFromField,
initialValue,
setValue,
showError,
@@ -105,7 +105,7 @@ const RichTextField: React.FC<LoadedSlateFieldProps> = (props) => {
validate: memoizedValidate,
})
- const disabled = readOnlyFromProps || formInitializing
+ const disabled = readOnlyFromProps || disabledFromField
const editor = useMemo(() => {
let CreatedEditor = withEnterBreakOut(withHistory(withReact(createEditor())))
diff --git a/packages/ui/src/elements/DocumentFields/index.tsx b/packages/ui/src/elements/DocumentFields/index.tsx
index 303f6ba6706..bf65c01cd39 100644
--- a/packages/ui/src/elements/DocumentFields/index.tsx
+++ b/packages/ui/src/elements/DocumentFields/index.tsx
@@ -29,7 +29,7 @@ export const DocumentFields: React.FC<Args> = ({
docPermissions,
fields,
forceSidebarWrap,
- readOnly: readOnlyProp,
+ readOnly,
schemaPathSegments,
}) => {
const { hasSidebarFields, mainFields, sidebarFields } = useMemo(() => {
@@ -53,11 +53,6 @@ export const DocumentFields: React.FC<Args> = ({
)
}, [fields])
- const formInitializing = useFormInitializing()
- const formProcessing = useFormProcessing()
-
- const readOnly = readOnlyProp || formInitializing || formProcessing
-
return (
<div
className={[
diff --git a/packages/ui/src/fields/Array/index.tsx b/packages/ui/src/fields/Array/index.tsx
index 08a9f783924..3a6ee757337 100644
--- a/packages/ui/src/fields/Array/index.tsx
+++ b/packages/ui/src/fields/Array/index.tsx
@@ -111,6 +111,7 @@ export const ArrayFieldComponent: ArrayFieldClientComponent = (props) => {
const {
customComponents: { AfterInput, BeforeInput, Description, Error, Label, RowLabels } = {},
+ disabled,
errorPaths,
rows: rowsData = [],
showError,
@@ -197,7 +198,7 @@ export const ArrayFieldComponent: ArrayFieldClientComponent = (props) => {
const fieldErrorCount = errorPaths.length
const fieldHasErrors = submitted && errorPaths.length > 0
- const showRequired = readOnly && rowsData.length === 0
+ const showRequired = (readOnly || disabled) && rowsData.length === 0
const showMinRows = rowsData.length < minRows || (required && rowsData.length === 0)
return (
@@ -285,7 +286,11 @@ export const ArrayFieldComponent: ArrayFieldClientComponent = (props) => {
).length
return (
- <DraggableSortableItem disabled={readOnly || !isSortable} id={rowID} key={rowID}>
+ <DraggableSortableItem
+ disabled={readOnly || disabled || !isSortable}
+ id={rowID}
+ key={rowID}
+ >
{(draggableSortableItemProps) => (
<ArrayRow
{...draggableSortableItemProps}
@@ -303,7 +308,7 @@ export const ArrayFieldComponent: ArrayFieldClientComponent = (props) => {
parentPath={path}
path={rowPath}
permissions={permissions}
- readOnly={readOnly}
+ readOnly={readOnly || disabled}
removeRow={removeRow}
row={rowData}
rowCount={rowsData?.length}
diff --git a/packages/ui/src/fields/Blocks/index.tsx b/packages/ui/src/fields/Blocks/index.tsx
index e0904f65070..8b68ebf6db7 100644
--- a/packages/ui/src/fields/Blocks/index.tsx
+++ b/packages/ui/src/fields/Blocks/index.tsx
@@ -54,6 +54,7 @@ const BlocksFieldComponent: BlocksFieldClientComponent = (props) => {
schemaPath: schemaPathFromProps,
validate,
} = props
+
const schemaPath = schemaPathFromProps ?? name
const minRows = (minRowsProp ?? required) ? 1 : 0
@@ -98,6 +99,7 @@ const BlocksFieldComponent: BlocksFieldClientComponent = (props) => {
const {
customComponents: { AfterInput, BeforeInput, Description, Error, Label, RowLabels } = {},
+ disabled,
errorPaths,
rows = [],
showError,
@@ -276,7 +278,11 @@ const BlocksFieldComponent: BlocksFieldClientComponent = (props) => {
).length
return (
- <DraggableSortableItem disabled={readOnly || !isSortable} id={row.id} key={row.id}>
+ <DraggableSortableItem
+ disabled={readOnly || disabled || !isSortable}
+ id={row.id}
+ key={row.id}
+ >
{(draggableSortableItemProps) => (
<BlockRow
{...draggableSortableItemProps}
@@ -295,7 +301,7 @@ const BlocksFieldComponent: BlocksFieldClientComponent = (props) => {
parentPath={path}
path={rowPath}
permissions={permissions}
- readOnly={readOnly}
+ readOnly={readOnly || disabled}
removeRow={removeRow}
row={row}
rowCount={rows.length}
@@ -335,12 +341,12 @@ const BlocksFieldComponent: BlocksFieldClientComponent = (props) => {
<Fragment>
<DrawerToggler
className={`${baseClass}__drawer-toggler`}
- disabled={readOnly}
+ disabled={readOnly || disabled}
slug={drawerSlug}
>
<Button
buttonStyle="icon-label"
- disabled={readOnly}
+ disabled={readOnly || disabled}
el="span"
icon="plus"
iconPosition="left"
diff --git a/packages/ui/src/fields/Checkbox/index.tsx b/packages/ui/src/fields/Checkbox/index.tsx
index 336a7285ba9..e3fc493cf62 100644
--- a/packages/ui/src/fields/Checkbox/index.tsx
+++ b/packages/ui/src/fields/Checkbox/index.tsx
@@ -18,9 +18,9 @@ import { withCondition } from '../../forms/withCondition/index.js'
import { useEditDepth } from '../../providers/EditDepth/index.js'
import { generateFieldID } from '../../utilities/generateFieldID.js'
import { mergeFieldStyles } from '../mergeFieldStyles.js'
-import './index.scss'
import { fieldBaseClass } from '../shared/index.js'
import { CheckboxInput } from './Input.js'
+import './index.scss'
const baseClass = 'checkbox'
@@ -59,6 +59,7 @@ const CheckboxFieldComponent: CheckboxFieldClientComponent = (props) => {
const {
customComponents: { AfterInput, BeforeInput, Description, Error, Label } = {},
+ disabled,
setValue,
showError,
value,
@@ -91,7 +92,7 @@ const CheckboxFieldComponent: CheckboxFieldClientComponent = (props) => {
showError && 'error',
className,
value && `${baseClass}--checked`,
- readOnly && `${baseClass}--read-only`,
+ (readOnly || disabled) && `${baseClass}--read-only`,
]
.filter(Boolean)
.join(' ')}
@@ -112,7 +113,7 @@ const CheckboxFieldComponent: CheckboxFieldClientComponent = (props) => {
name={path}
onToggle={onToggle}
partialChecked={partialChecked}
- readOnly={readOnly}
+ readOnly={readOnly || disabled}
required={required}
/>
<RenderCustomComponent
diff --git a/packages/ui/src/fields/Code/index.tsx b/packages/ui/src/fields/Code/index.tsx
index 078b124594b..5a9f38e45b2 100644
--- a/packages/ui/src/fields/Code/index.tsx
+++ b/packages/ui/src/fields/Code/index.tsx
@@ -47,6 +47,7 @@ const CodeFieldComponent: CodeFieldClientComponent = (props) => {
const {
customComponents: { AfterInput, BeforeInput, Description, Error, Label } = {},
+ disabled,
setValue,
showError,
value,
@@ -64,7 +65,7 @@ const CodeFieldComponent: CodeFieldClientComponent = (props) => {
baseClass,
className,
showError && 'error',
- readOnly && 'read-only',
+ (readOnly || disabled) && 'read-only',
]
.filter(Boolean)
.join(' ')}
@@ -84,10 +85,10 @@ const CodeFieldComponent: CodeFieldClientComponent = (props) => {
{BeforeInput}
<CodeEditor
defaultLanguage={prismToMonacoLanguageMap[language] || language}
- onChange={readOnly ? () => null : (val) => setValue(val)}
+ onChange={readOnly || disabled ? () => null : (val) => setValue(val)}
onMount={onMount}
options={editorOptions}
- readOnly={readOnly}
+ readOnly={readOnly || disabled}
value={(value as string) || ''}
/>
{AfterInput}
diff --git a/packages/ui/src/fields/Collapsible/index.tsx b/packages/ui/src/fields/Collapsible/index.tsx
index 4955fc40ec0..70bebd913b4 100644
--- a/packages/ui/src/fields/Collapsible/index.tsx
+++ b/packages/ui/src/fields/Collapsible/index.tsx
@@ -42,9 +42,10 @@ const CollapsibleFieldComponent: CollapsibleFieldClientComponent = (props) => {
const [errorCount, setErrorCount] = useState(0)
const fieldHasErrors = errorCount > 0
- const { customComponents: { AfterInput, BeforeInput, Description, Label } = {} } = useField({
- path,
- })
+ const { customComponents: { AfterInput, BeforeInput, Description, Label } = {}, disabled } =
+ useField({
+ path,
+ })
const onToggle = useCallback(
async (newCollapsedState: boolean): Promise<void> => {
@@ -145,7 +146,7 @@ const CollapsibleFieldComponent: CollapsibleFieldClientComponent = (props) => {
parentPath={parentPath}
parentSchemaPath={parentSchemaPath}
permissions={permissions}
- readOnly={readOnly}
+ readOnly={readOnly || disabled}
/>
</CollapsibleElement>
{AfterInput}
diff --git a/packages/ui/src/fields/ConfirmPassword/index.tsx b/packages/ui/src/fields/ConfirmPassword/index.tsx
index c0722f0b6af..cb20ffc3a59 100644
--- a/packages/ui/src/fields/ConfirmPassword/index.tsx
+++ b/packages/ui/src/fields/ConfirmPassword/index.tsx
@@ -16,10 +16,10 @@ export type ConfirmPasswordFieldProps = {
}
export const ConfirmPasswordField: React.FC<ConfirmPasswordFieldProps> = (props) => {
- const { disabled, path = 'confirm-password' } = props
+ const { disabled: disabledFromProps, path = 'confirm-password' } = props
const { t } = useTranslation()
- const { setValue, showError, value } = useField({
+ const { disabled, setValue, showError, value } = useField({
path,
validate: (value, options) => {
return confirmPassword(value, {
@@ -47,7 +47,7 @@ export const ConfirmPasswordField: React.FC<ConfirmPasswordFieldProps> = (props)
<input
aria-label={t('authentication:confirmPassword')}
autoComplete="off"
- disabled={!!disabled}
+ disabled={!!(disabled || disabledFromProps)}
id="field-confirm-password"
name="confirm-password"
onChange={setValue}
diff --git a/packages/ui/src/fields/DateTime/index.tsx b/packages/ui/src/fields/DateTime/index.tsx
index a020c8cdfcc..da801b937a7 100644
--- a/packages/ui/src/fields/DateTime/index.tsx
+++ b/packages/ui/src/fields/DateTime/index.tsx
@@ -58,6 +58,7 @@ const DateTimeFieldComponent: DateFieldClientComponent = (props) => {
const {
customComponents: { AfterInput, BeforeInput, Description, Error, Label } = {},
+ disabled,
setValue,
showError,
value,
@@ -102,7 +103,7 @@ const DateTimeFieldComponent: DateFieldClientComponent = (props) => {
const onChange = useCallback(
(incomingDate: Date) => {
- if (!readOnly) {
+ if (!(readOnly || disabled)) {
if (timezone && selectedTimezone && incomingDate) {
// Create TZDate instances for the selected timezone
const TZDateWithSelectedTz = TZDate.tz(selectedTimezone)
@@ -132,7 +133,7 @@ const DateTimeFieldComponent: DateFieldClientComponent = (props) => {
}
}
},
- [readOnly, setValue, timezone, selectedTimezone],
+ [readOnly, disabled, timezone, selectedTimezone, isDateOnly, setValue],
)
const onChangeTimezone = useCallback(
@@ -157,7 +158,7 @@ const DateTimeFieldComponent: DateFieldClientComponent = (props) => {
baseClass,
className,
showError && `${baseClass}--has-error`,
- readOnly && 'read-only',
+ (readOnly || disabled) && 'read-only',
]
.filter(Boolean)
.join(' ')}
@@ -180,7 +181,7 @@ const DateTimeFieldComponent: DateFieldClientComponent = (props) => {
...datePickerProps?.overrides,
}}
placeholder={getTranslation(placeholder, i18n)}
- readOnly={readOnly}
+ readOnly={readOnly || disabled}
value={displayedValue}
/>
{timezone && supportedTimezones.length > 0 && (
diff --git a/packages/ui/src/fields/Email/index.tsx b/packages/ui/src/fields/Email/index.tsx
index 430065febfb..305ad5b287c 100644
--- a/packages/ui/src/fields/Email/index.tsx
+++ b/packages/ui/src/fields/Email/index.tsx
@@ -51,6 +51,7 @@ const EmailFieldComponent: EmailFieldClientComponent = (props) => {
const {
customComponents: { AfterInput, BeforeInput, Description, Error, Label } = {},
+ disabled,
setValue,
showError,
value,
@@ -63,7 +64,13 @@ const EmailFieldComponent: EmailFieldClientComponent = (props) => {
return (
<div
- className={[fieldBaseClass, 'email', className, showError && 'error', readOnly && 'read-only']
+ className={[
+ fieldBaseClass,
+ 'email',
+ className,
+ showError && 'error',
+ (readOnly || disabled) && 'read-only',
+ ]
.filter(Boolean)
.join(' ')}
style={styles}
@@ -84,7 +91,7 @@ const EmailFieldComponent: EmailFieldClientComponent = (props) => {
{/* eslint-disable-next-line jsx-a11y/control-has-associated-label */}
<input
autoComplete={autoComplete}
- disabled={readOnly}
+ disabled={readOnly || disabled}
id={`field-${path.replace(/\./g, '__')}`}
name={path}
onChange={setValue}
diff --git a/packages/ui/src/fields/Group/index.tsx b/packages/ui/src/fields/Group/index.tsx
index b93661ba3ca..6190304ac66 100644
--- a/packages/ui/src/fields/Group/index.tsx
+++ b/packages/ui/src/fields/Group/index.tsx
@@ -40,8 +40,10 @@ export const GroupFieldComponent: GroupFieldClientComponent = (props) => {
const isWithinGroup = useGroup()
const isWithinRow = useRow()
const isWithinTab = useTabs()
+
const { customComponents: { AfterInput, BeforeInput, Description, Label } = {}, errorPaths } =
useField({ path })
+
const submitted = useFormSubmitted()
const errorCount = errorPaths.length
const fieldHasErrors = submitted && errorCount > 0
diff --git a/packages/ui/src/fields/JSON/index.tsx b/packages/ui/src/fields/JSON/index.tsx
index 87cf7f32c65..2cc811b6eff 100644
--- a/packages/ui/src/fields/JSON/index.tsx
+++ b/packages/ui/src/fields/JSON/index.tsx
@@ -31,6 +31,7 @@ const JSONFieldComponent: JSONFieldClientComponent = (props) => {
readOnly,
validate,
} = props
+
const [jsonError, setJsonError] = useState<string>()
const inputChangeFromRef = React.useRef<'system' | 'user'>('system')
const [editorKey, setEditorKey] = useState<string>('')
@@ -46,6 +47,7 @@ const JSONFieldComponent: JSONFieldClientComponent = (props) => {
const {
customComponents: { AfterInput, BeforeInput, Description, Error, Label } = {},
+ disabled,
initialValue,
setValue,
showError,
@@ -90,7 +92,7 @@ const JSONFieldComponent: JSONFieldClientComponent = (props) => {
const handleChange = useCallback(
(val) => {
- if (readOnly) {
+ if (readOnly || disabled) {
return
}
inputChangeFromRef.current = 'user'
@@ -103,7 +105,7 @@ const JSONFieldComponent: JSONFieldClientComponent = (props) => {
setJsonError(e)
}
},
- [readOnly, setValue],
+ [readOnly, disabled, setValue],
)
useEffect(() => {
@@ -128,7 +130,7 @@ const JSONFieldComponent: JSONFieldClientComponent = (props) => {
baseClass,
className,
showError && 'error',
- readOnly && 'read-only',
+ (readOnly || disabled) && 'read-only',
]
.filter(Boolean)
.join(' ')}
@@ -153,7 +155,7 @@ const JSONFieldComponent: JSONFieldClientComponent = (props) => {
onChange={handleChange}
onMount={handleMount}
options={editorOptions}
- readOnly={readOnly}
+ readOnly={readOnly || disabled}
value={initialStringValue}
wrapperProps={{
id: `field-${path?.replace(/\./g, '__')}`,
diff --git a/packages/ui/src/fields/Number/index.tsx b/packages/ui/src/fields/Number/index.tsx
index c0ae6a9c0a9..98be6bee36a 100644
--- a/packages/ui/src/fields/Number/index.tsx
+++ b/packages/ui/src/fields/Number/index.tsx
@@ -56,6 +56,7 @@ const NumberFieldComponent: NumberFieldClientComponent = (props) => {
const {
customComponents: { AfterInput, BeforeInput, Description, Error, Label } = {},
+ disabled,
setValue,
showError,
value,
@@ -88,7 +89,7 @@ const NumberFieldComponent: NumberFieldClientComponent = (props) => {
const handleHasManyChange = useCallback(
(selectedOption) => {
- if (!readOnly) {
+ if (!(readOnly || disabled)) {
let newValue
if (!selectedOption) {
newValue = []
@@ -101,7 +102,7 @@ const NumberFieldComponent: NumberFieldClientComponent = (props) => {
setValue(newValue)
}
},
- [readOnly, setValue],
+ [readOnly, disabled, setValue],
)
// useEffect update valueToRender:
@@ -131,7 +132,7 @@ const NumberFieldComponent: NumberFieldClientComponent = (props) => {
'number',
className,
showError && 'error',
- readOnly && 'read-only',
+ (readOnly || disabled) && 'read-only',
hasMany && 'has-many',
]
.filter(Boolean)
@@ -153,7 +154,7 @@ const NumberFieldComponent: NumberFieldClientComponent = (props) => {
{hasMany ? (
<ReactSelect
className={`field-${path.replace(/\./g, '__')}`}
- disabled={readOnly}
+ disabled={readOnly || disabled}
filterOption={(_, rawInput) => {
const isOverHasMany = Array.isArray(value) && value.length >= maxRows
return isNumber(rawInput) && !isOverHasMany
@@ -179,7 +180,7 @@ const NumberFieldComponent: NumberFieldClientComponent = (props) => {
) : (
<div>
<input
- disabled={readOnly}
+ disabled={readOnly || disabled}
id={`field-${path.replace(/\./g, '__')}`}
max={max}
min={min}
diff --git a/packages/ui/src/fields/Password/index.tsx b/packages/ui/src/fields/Password/index.tsx
index 89d4531a615..a494728d580 100644
--- a/packages/ui/src/fields/Password/index.tsx
+++ b/packages/ui/src/fields/Password/index.tsx
@@ -71,8 +71,7 @@ const PasswordFieldComponent: React.FC<PasswordFieldProps> = (props) => {
const {
customComponents: { AfterInput, BeforeInput, Description, Error, Label } = {},
- formInitializing,
- formProcessing,
+ disabled,
setValue,
showError,
value,
@@ -81,8 +80,6 @@ const PasswordFieldComponent: React.FC<PasswordFieldProps> = (props) => {
validate: memoizedValidate,
})
- const disabled = disabledFromProps || formInitializing || formProcessing
-
const renderRTL = isFieldRTL({
fieldLocalized: false,
fieldRTL: rtl,
@@ -109,7 +106,7 @@ const PasswordFieldComponent: React.FC<PasswordFieldProps> = (props) => {
}}
path={path}
placeholder={placeholder}
- readOnly={disabled}
+ readOnly={disabled || disabledFromProps}
required={required}
rtl={renderRTL}
showError={showError}
diff --git a/packages/ui/src/fields/Point/index.tsx b/packages/ui/src/fields/Point/index.tsx
index 37f79b0cd04..3d3ec40a943 100644
--- a/packages/ui/src/fields/Point/index.tsx
+++ b/packages/ui/src/fields/Point/index.tsx
@@ -44,6 +44,7 @@ export const PointFieldComponent: PointFieldClientComponent = (props) => {
const {
customComponents: { AfterInput, BeforeInput, Description, Error, Label } = {},
+ disabled,
setValue,
showError,
value = [null, null],
@@ -81,7 +82,7 @@ export const PointFieldComponent: PointFieldClientComponent = (props) => {
baseClass,
className,
showError && 'error',
- readOnly && 'read-only',
+ (readOnly || disabled) && 'read-only',
]
.filter(Boolean)
.join(' ')}
@@ -105,7 +106,7 @@ export const PointFieldComponent: PointFieldClientComponent = (props) => {
{/* disable eslint rule because the label is dynamic */}
{/* eslint-disable-next-line jsx-a11y/control-has-associated-label */}
<input
- disabled={readOnly}
+ disabled={readOnly || disabled}
id={`field-longitude-${path?.replace(/\./g, '__')}`}
name={`${path}.longitude`}
onChange={(e) => handleChange(e, 0)}
@@ -138,7 +139,7 @@ export const PointFieldComponent: PointFieldClientComponent = (props) => {
{/* disable eslint rule because the label is dynamic */}
{/* eslint-disable-next-line jsx-a11y/control-has-associated-label */}
<input
- disabled={readOnly}
+ disabled={readOnly || disabled}
id={`field-latitude-${path?.replace(/\./g, '__')}`}
name={`${path}.latitude`}
onChange={(e) => handleChange(e, 1)}
diff --git a/packages/ui/src/fields/RadioGroup/index.tsx b/packages/ui/src/fields/RadioGroup/index.tsx
index 76b3978c55f..bb5746bda00 100644
--- a/packages/ui/src/fields/RadioGroup/index.tsx
+++ b/packages/ui/src/fields/RadioGroup/index.tsx
@@ -53,6 +53,7 @@ const RadioGroupFieldComponent: RadioFieldClientComponent = (props) => {
const {
customComponents: { AfterInput, BeforeInput, Description, Error, Label } = {},
+ disabled,
setValue,
showError,
value: valueFromContext,
@@ -73,7 +74,7 @@ const RadioGroupFieldComponent: RadioFieldClientComponent = (props) => {
className,
`${baseClass}--layout-${layout}`,
showError && 'error',
- readOnly && `${baseClass}--read-only`,
+ (readOnly || disabled) && `${baseClass}--read-only`,
]
.filter(Boolean)
.join(' ')}
@@ -115,13 +116,13 @@ const RadioGroupFieldComponent: RadioFieldClientComponent = (props) => {
onChangeFromProps(optionValue)
}
- if (!readOnly) {
+ if (!(readOnly || disabled)) {
setValue(optionValue, !!disableModifyingFormFromProps)
}
}}
option={optionIsObject(option) ? option : { label: option, value: option }}
path={path}
- readOnly={readOnly}
+ readOnly={readOnly || disabled}
uuid={uuid}
/>
</li>
diff --git a/packages/ui/src/fields/Relationship/index.tsx b/packages/ui/src/fields/Relationship/index.tsx
index 11fc7870d75..f704829812d 100644
--- a/packages/ui/src/fields/Relationship/index.tsx
+++ b/packages/ui/src/fields/Relationship/index.tsx
@@ -101,6 +101,7 @@ const RelationshipFieldComponent: RelationshipFieldClientComponent = (props) =>
const {
customComponents: { AfterInput, BeforeInput, Description, Error, Label } = {},
+ disabled,
filterOptions,
initialValue,
setValue,
@@ -577,8 +578,8 @@ const RelationshipFieldComponent: RelationshipFieldClientComponent = (props) =>
className,
showError && 'error',
errorLoading && 'error-loading',
- readOnly && `${baseClass}--read-only`,
- !readOnly && allowCreate && `${baseClass}--allow-create`,
+ (readOnly || disabled) && `${baseClass}--read-only`,
+ !(readOnly || disabled) && allowCreate && `${baseClass}--allow-create`,
]
.filter(Boolean)
.join(' ')}
@@ -611,7 +612,7 @@ const RelationshipFieldComponent: RelationshipFieldClientComponent = (props) =>
onDocumentDrawerOpen,
onSave,
}}
- disabled={readOnly || isDrawerOpen}
+ disabled={readOnly || disabled || isDrawerOpen}
filterOption={enableWordBoundarySearch ? filterOption : undefined}
getOptionValue={(option) => {
if (!option) {
@@ -625,7 +626,7 @@ const RelationshipFieldComponent: RelationshipFieldClientComponent = (props) =>
isMulti={hasMany}
isSortable={isSortable}
onChange={
- !readOnly
+ !(readOnly || disabled)
? (selected) => {
if (selected === null) {
setValue(hasMany ? [] : null)
@@ -689,7 +690,7 @@ const RelationshipFieldComponent: RelationshipFieldClientComponent = (props) =>
showError={showError}
value={valueToRender ?? null}
/>
- {!readOnly && allowCreate && (
+ {!(readOnly || disabled) && allowCreate && (
<AddNewRelation
hasMany={hasMany}
path={path}
diff --git a/packages/ui/src/fields/Select/index.tsx b/packages/ui/src/fields/Select/index.tsx
index 609c5ea4dc6..f49af6fe6cc 100644
--- a/packages/ui/src/fields/Select/index.tsx
+++ b/packages/ui/src/fields/Select/index.tsx
@@ -64,6 +64,7 @@ const SelectFieldComponent: SelectFieldClientComponent = (props) => {
const {
customComponents: { AfterInput, BeforeInput, Description, Error, Label } = {},
+ disabled,
setValue,
showError,
value,
@@ -74,7 +75,7 @@ const SelectFieldComponent: SelectFieldClientComponent = (props) => {
const onChange: ReactSelectAdapterProps['onChange'] = useCallback(
(selectedOption: OptionObject | OptionObject[]) => {
- if (!readOnly) {
+ if (!readOnly || disabled) {
let newValue: string | string[] = null
if (selectedOption && hasMany) {
if (Array.isArray(selectedOption)) {
@@ -93,7 +94,7 @@ const SelectFieldComponent: SelectFieldClientComponent = (props) => {
setValue(newValue)
}
},
- [readOnly, hasMany, setValue, onChangeFromProps],
+ [readOnly, disabled, hasMany, setValue, onChangeFromProps],
)
const styles = useMemo(() => mergeFieldStyles(field), [field])
@@ -116,7 +117,7 @@ const SelectFieldComponent: SelectFieldClientComponent = (props) => {
onChange={onChange}
options={options}
path={path}
- readOnly={readOnly}
+ readOnly={readOnly || disabled}
required={required}
showError={showError}
style={styles}
diff --git a/packages/ui/src/fields/Tabs/index.tsx b/packages/ui/src/fields/Tabs/index.tsx
index 13601cc4742..1646086cd0d 100644
--- a/packages/ui/src/fields/Tabs/index.tsx
+++ b/packages/ui/src/fields/Tabs/index.tsx
@@ -259,6 +259,7 @@ type ActiveTabProps = {
readonly permissions: SanitizedFieldPermissions
readonly readOnly: boolean
}
+
function TabContent({
description,
fields,
@@ -273,6 +274,7 @@ function TabContent({
readOnly,
}: ActiveTabProps) {
const { i18n } = useTranslation()
+
const { customComponents: { AfterInput, BeforeInput, Description, Field } = {} } = useField({
path,
})
diff --git a/packages/ui/src/fields/Text/index.tsx b/packages/ui/src/fields/Text/index.tsx
index 28f1b68d96a..afa9aaa5366 100644
--- a/packages/ui/src/fields/Text/index.tsx
+++ b/packages/ui/src/fields/Text/index.tsx
@@ -54,6 +54,7 @@ const TextFieldComponent: TextFieldClientComponent = (props) => {
const {
customComponents: { AfterInput, BeforeInput, Description, Error, Label } = {},
+ disabled,
setValue,
showError,
value,
@@ -75,7 +76,7 @@ const TextFieldComponent: TextFieldClientComponent = (props) => {
const handleHasManyChange = useCallback(
(selectedOption) => {
- if (!readOnly) {
+ if (!(readOnly || disabled)) {
let newValue
if (!selectedOption) {
newValue = []
@@ -88,7 +89,7 @@ const TextFieldComponent: TextFieldClientComponent = (props) => {
setValue(newValue)
}
},
- [readOnly, setValue],
+ [readOnly, setValue, disabled],
)
// useEffect update valueToRender:
@@ -136,7 +137,7 @@ const TextFieldComponent: TextFieldClientComponent = (props) => {
}
path={path}
placeholder={placeholder}
- readOnly={readOnly}
+ readOnly={readOnly || disabled}
required={required}
rtl={renderRTL}
showError={showError}
diff --git a/packages/ui/src/fields/Textarea/index.tsx b/packages/ui/src/fields/Textarea/index.tsx
index 91560fbe2a1..f27695f3691 100644
--- a/packages/ui/src/fields/Textarea/index.tsx
+++ b/packages/ui/src/fields/Textarea/index.tsx
@@ -60,6 +60,7 @@ const TextareaFieldComponent: TextareaFieldClientComponent = (props) => {
const {
customComponents: { AfterInput, BeforeInput, Description, Error, Label } = {},
+ disabled,
setValue,
showError,
value,
@@ -86,7 +87,7 @@ const TextareaFieldComponent: TextareaFieldClientComponent = (props) => {
}}
path={path}
placeholder={getTranslation(placeholder, i18n)}
- readOnly={readOnly}
+ readOnly={readOnly || disabled}
required={required}
rows={rows}
rtl={isRTL}
diff --git a/packages/ui/src/fields/Upload/index.tsx b/packages/ui/src/fields/Upload/index.tsx
index d84c58908fc..681e5c18e58 100644
--- a/packages/ui/src/fields/Upload/index.tsx
+++ b/packages/ui/src/fields/Upload/index.tsx
@@ -48,6 +48,7 @@ export function UploadComponent(props: UploadFieldClientProps) {
const {
customComponents: { AfterInput, BeforeInput, Description, Error, Label } = {},
+ disabled,
filterOptions,
setValue,
showError,
@@ -79,7 +80,7 @@ export function UploadComponent(props: UploadFieldClientProps) {
maxRows={maxRows}
onChange={setValue}
path={path}
- readOnly={readOnly}
+ readOnly={readOnly || disabled}
relationTo={relationTo}
required={required}
serverURL={config.serverURL}
diff --git a/packages/ui/src/forms/useField/index.tsx b/packages/ui/src/forms/useField/index.tsx
index 7a39a05b82c..f3fc737df10 100644
--- a/packages/ui/src/forms/useField/index.tsx
+++ b/packages/ui/src/forms/useField/index.tsx
@@ -105,6 +105,7 @@ export const useField = <TValue,>(options: Options): FieldType<TValue> => {
const result: FieldType<TValue> = useMemo(
() => ({
customComponents: field?.customComponents,
+ disabled: processing || initializing,
errorMessage: field?.errorMessage,
errorPaths: field?.errorPaths || [],
filterOptions,
diff --git a/packages/ui/src/forms/useField/types.ts b/packages/ui/src/forms/useField/types.ts
index fbe6043a85d..2f43cbab681 100644
--- a/packages/ui/src/forms/useField/types.ts
+++ b/packages/ui/src/forms/useField/types.ts
@@ -9,6 +9,7 @@ export type Options = {
export type FieldType<T> = {
customComponents?: FieldState['customComponents']
+ disabled: boolean
errorMessage?: string
errorPaths?: string[]
filterOptions?: FilterOptionsResult
diff --git a/test/form-state/e2e.spec.ts b/test/form-state/e2e.spec.ts
index fca62aea5b8..1c0b5418515 100644
--- a/test/form-state/e2e.spec.ts
+++ b/test/form-state/e2e.spec.ts
@@ -1,12 +1,14 @@
import type { BrowserContext, Page } from '@playwright/test'
+import type { PayloadTestSDK } from 'helpers/sdk/index.js'
import { expect, test } from '@playwright/test'
import { addBlock } from 'helpers/e2e/addBlock.js'
import { assertNetworkRequests } from 'helpers/e2e/assertNetworkRequests.js'
import * as path from 'path'
-import React from 'react'
import { fileURLToPath } from 'url'
+import type { Config, Post } from './payload-types.js'
+
import {
ensureCompilationIsDone,
initPageConsoleErrorCatch,
@@ -22,6 +24,8 @@ const dirname = path.dirname(filename)
const title = 'Title'
let context: BrowserContext
+let payload: PayloadTestSDK<Config>
+let serverURL: string
test.describe('Form State', () => {
let page: Page
@@ -29,8 +33,7 @@ test.describe('Form State', () => {
test.beforeAll(async ({ browser }, testInfo) => {
testInfo.setTimeout(TEST_TIMEOUT_LONG)
-
- const { payload, serverURL } = await initPayloadE2ENoConfig({ dirname })
+ ;({ payload, serverURL } = await initPayloadE2ENoConfig({ dirname }))
postsUrl = new AdminUrlUtil(serverURL, 'posts')
context = await browser.newContext()
@@ -38,15 +41,31 @@ test.describe('Form State', () => {
initPageConsoleErrorCatch(page)
await ensureCompilationIsDone({ page, serverURL })
})
+ test.beforeEach(async () => {
+ // await throttleTest({ page, context, delay: 'Fast 3G' })
+ })
+
+ test('should disable fields during initialization', async () => {
+ await page.goto(postsUrl.create, { waitUntil: 'commit' })
+ await expect(page.locator('#field-title')).toBeDisabled()
+ })
- test('collection — should re-enable fields after save', async () => {
+ test('should disable fields while processing', async () => {
+ const doc = await createPost()
+ await page.goto(postsUrl.edit(doc.id))
+ await page.locator('#field-title').fill(title)
+ await page.click('#action-save', { delay: 100 })
+ await expect(page.locator('#field-title')).toBeDisabled()
+ })
+
+ test('should re-enable fields after save', async () => {
await page.goto(postsUrl.create)
await page.locator('#field-title').fill(title)
await saveDocAndAssert(page)
await expect(page.locator('#field-title')).toBeEnabled()
})
- test('should thread proper event argument to validation functions', async () => {
+ test('should only validate on submit via the `event` argument', async () => {
await page.goto(postsUrl.create)
await page.locator('#field-title').fill(title)
await page.locator('#field-validateUsingEvent').fill('Not allowed')
@@ -161,3 +180,13 @@ test.describe('Form State', () => {
await cdpSession.detach()
})
})
+
+async function createPost(overrides?: Partial<Post>): Promise<Post> {
+ return payload.create({
+ collection: 'posts',
+ data: {
+ title: 'Post Title',
+ ...overrides,
+ },
+ }) as unknown as Promise<Post>
+}
diff --git a/tsconfig.base.json b/tsconfig.base.json
index c9793d25c61..e2b64e3bc86 100644
--- a/tsconfig.base.json
+++ b/tsconfig.base.json
@@ -31,7 +31,7 @@
}
],
"paths": {
- "@payload-config": ["./test/_community/config.ts"],
+ "@payload-config": ["./test/form-state/config.ts"],
"@payloadcms/admin-bar": ["./packages/admin-bar/src"],
"@payloadcms/live-preview": ["./packages/live-preview/src"],
"@payloadcms/live-preview-react": ["./packages/live-preview-react/src/index.ts"],
|
b6de432ab2c00ee4c995ac93264c4d5d1d52acbb
|
2025-01-01 02:41:47
|
Said Akhrarov
|
docs: fix all missing vertical lines in tables (#10288)
| false
|
fix all missing vertical lines in tables (#10288)
|
docs
|
diff --git a/docs/admin/collections.mdx b/docs/admin/collections.mdx
index 91f25e46fcd..6fa5fb9db3d 100644
--- a/docs/admin/collections.mdx
+++ b/docs/admin/collections.mdx
@@ -65,18 +65,18 @@ export const MyCollection: SanitizedCollectionConfig = {
The following options are available:
-| Path | Description |
-| -------------------------- | ---------------------------------------------------------------------------------------------------------------------- |
-| **`beforeList`** | An array of components to inject _before_ the built-in List View |
-| **`beforeListTable`** | An array of components to inject _before_ the built-in List View's table |
-| **`afterList`** | An array of components to inject _after_ the built-in List View |
-| **`afterListTable`** | An array of components to inject _after_ the built-in List View's table
-| **`Description`** | A component to render below the Collection label in the List View. An alternative to the `admin.description` property. |
-| **`edit.SaveButton`** | Replace the default Save Button with a Custom Component. [Drafts](../versions/drafts) must be disabled. |
+| Path | Description |
+| -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------ |
+| **`beforeList`** | An array of components to inject _before_ the built-in List View |
+| **`beforeListTable`** | An array of components to inject _before_ the built-in List View's table |
+| **`afterList`** | An array of components to inject _after_ the built-in List View |
+| **`afterListTable`** | An array of components to inject _after_ the built-in List View's table |
+| **`Description`** | A component to render below the Collection label in the List View. An alternative to the `admin.description` property. |
+| **`edit.SaveButton`** | Replace the default Save Button with a Custom Component. [Drafts](../versions/drafts) must be disabled. |
| **`edit.SaveDraftButton`** | Replace the default Save Draft Button with a Custom Component. [Drafts](../versions/drafts) must be enabled and autosave must be disabled. |
| **`edit.PublishButton`** | Replace the default Publish Button with a Custom Component. [Drafts](../versions/drafts) must be enabled. |
-| **`edit.PreviewButton`** | Replace the default Preview Button with a Custom Component. [Preview](#preview) must be enabled. |
-| **`views`** | Override or create new views within the Admin Panel. [More details](./views). |
+| **`edit.PreviewButton`** | Replace the default Preview Button with a Custom Component. [Preview](#preview) must be enabled. |
+| **`views`** | Override or create new views within the Admin Panel. [More details](./views). |
<Banner type="success">
**Note:**
diff --git a/docs/admin/fields.mdx b/docs/admin/fields.mdx
index a16fdf72f09..44b41228317 100644
--- a/docs/admin/fields.mdx
+++ b/docs/admin/fields.mdx
@@ -242,31 +242,31 @@ _For details on how to build Custom Components, see [Building Custom Components]
All Field Components receive the following props by default:
-| Property | Description |
-| ---------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| **`docPreferences`** | An object that contains the [Preferences](./preferences) for the document.
-| **`field`** | In Client Components, this is the sanitized Client Field Config. In Server Components, this is the original Field Config. Server Components will also receive the sanitized field config through the`clientField` prop (see below). |
-| **`locale`** | The locale of the field. [More details](../configuration/localization). |
-| **`readOnly`** | A boolean value that represents if the field is read-only or not. |
-| **`user`** | The currently authenticated user. [More details](../authentication/overview). |
-| **`validate`** | A function that can be used to validate the field. |
-| **`path`** | A string representing the direct, dynamic path to the field at runtime, i.e. `myGroup.myArray.0.myField`. |
-| **`schemaPath`** | A string representing the direct, static path to the [Field Config](../fields/overview), i.e. `posts.myGroup.myArray.myField`. |
-| **`indexPath`** | A hyphen-notated string representing the path to the field _within the nearest named ancestor field_, i.e. `0-0` |
+| Property | Description |
+| -------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| **`docPreferences`** | An object that contains the [Preferences](./preferences) for the document. |
+| **`field`** | In Client Components, this is the sanitized Client Field Config. In Server Components, this is the original Field Config. Server Components will also receive the sanitized field config through the`clientField` prop (see below). |
+| **`locale`** | The locale of the field. [More details](../configuration/localization). |
+| **`readOnly`** | A boolean value that represents if the field is read-only or not. |
+| **`user`** | The currently authenticated user. [More details](../authentication/overview). |
+| **`validate`** | A function that can be used to validate the field. |
+| **`path`** | A string representing the direct, dynamic path to the field at runtime, i.e. `myGroup.myArray.0.myField`. |
+| **`schemaPath`** | A string representing the direct, static path to the [Field Config](../fields/overview), i.e. `posts.myGroup.myArray.myField`. |
+| **`indexPath`** | A hyphen-notated string representing the path to the field _within the nearest named ancestor field_, i.e. `0-0` |
In addition to the above props, all Server Components will also receive the following props:
-| Property | Description |
-| ---------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| **`clientField`** | The serializable Client Field Config. |
-| **`field`** | The Field Config. [More details](../fields/overview). |
-| **`data`** | The current document being edited. |
-| **`i18n`** | The [i18n](../configuration/i18n) object.
-| **`payload`** | The [Payload](../local-api/overview) class. |
-| **`permissions`** | The field permissions based on the currently authenticated user. |
-| **`siblingData`** | The data of the field's siblings. |
-| **`user`** | The currently authenticated user. [More details](../authentication/overview). |
-| **`value`** | The value of the field at render-time. |
+| Property | Description |
+| ----------------- | ----------------------------------------------------------------------------- |
+| **`clientField`** | The serializable Client Field Config. |
+| **`field`** | The Field Config. [More details](../fields/overview). |
+| **`data`** | The current document being edited. |
+| **`i18n`** | The [i18n](../configuration/i18n) object. |
+| **`payload`** | The [Payload](../local-api/overview) class. |
+| **`permissions`** | The field permissions based on the currently authenticated user. |
+| **`siblingData`** | The data of the field's siblings. |
+| **`user`** | The currently authenticated user. [More details](../authentication/overview). |
+| **`value`** | The value of the field at render-time. |
#### Sending and receiving values from the form
diff --git a/docs/fields/blocks.mdx b/docs/fields/blocks.mdx
index fde324f4f6e..1320a269043 100644
--- a/docs/fields/blocks.mdx
+++ b/docs/fields/blocks.mdx
@@ -145,14 +145,14 @@ Blocks are defined as separate configs of their own.
| Option | Description |
| -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| **`slug`** * | Identifier for this block type. Will be saved on each block as the `blockType` property. |
-| **`fields`** * | Array of fields to be stored in this block. |
+| **`slug`** * | Identifier for this block type. Will be saved on each block as the `blockType` property. |
+| **`fields`** * | Array of fields to be stored in this block. |
| **`labels`** | Customize the block labels that appear in the Admin dashboard. Auto-generated from slug if not defined. |
| **`imageURL`** | Provide a custom image thumbnail to help editors identify this block in the Admin UI. |
| **`imageAltText`** | Customize this block's image thumbnail alt text. |
| **`interfaceName`** | Create a top level, reusable [Typescript interface](/docs/typescript/generating-types#custom-field-interfaces) & [GraphQL type](/docs/graphql/graphql-schema#custom-field-schemas). |
| **`graphQL.singularName`** | Text to use for the GraphQL schema name. Auto-generated from slug if not defined. NOTE: this is set for deprecation, prefer `interfaceName`. |
-| **`dbName`** | Custom table name for this block type when using SQL Database Adapter ([Postgres](/docs/database/postgres)). Auto-generated from slug if not defined.
+| **`dbName`** | Custom table name for this block type when using SQL Database Adapter ([Postgres](/docs/database/postgres)). Auto-generated from slug if not defined. |
| **`custom`** | Extension point for adding custom data (e.g. for plugins) |
### Auto-generated data per block
diff --git a/docs/hooks/collections.mdx b/docs/hooks/collections.mdx
index 0e487ed3938..f5902b2cf80 100644
--- a/docs/hooks/collections.mdx
+++ b/docs/hooks/collections.mdx
@@ -186,13 +186,13 @@ const beforeReadHook: CollectionBeforeReadHook = async ({
The following arguments are provided to the `beforeRead` hook:
-| Option | Description |
-| ------------------------ | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| **`collection`** | The [Collection](../configuration/collections) in which this Hook is running against. |
-| **`context`** | Custom context passed between hooks. [More details](./context). |
-| **`doc`** | The resulting Document after changes are applied. |
-| **`query`** | The [Query](../queries/overview) of the request.
-| **`req`** | The [Web Request](https://developer.mozilla.org/en-US/docs/Web/API/Request) object. This is mocked for [Local API](../local-api/overview) operations. |
+| Option | Description |
+| ---------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------- |
+| **`collection`** | The [Collection](../configuration/collections) in which this Hook is running against. |
+| **`context`** | Custom context passed between hooks. [More details](./context). |
+| **`doc`** | The resulting Document after changes are applied. |
+| **`query`** | The [Query](../queries/overview) of the request. |
+| **`req`** | The [Web Request](https://developer.mozilla.org/en-US/docs/Web/API/Request) object. This is mocked for [Local API](../local-api/overview) operations. |
### afterRead
@@ -210,13 +210,13 @@ const afterReadHook: CollectionAfterReadHook = async ({
The following arguments are provided to the `afterRead` hook:
-| Option | Description |
-| ------------------------ | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| **`collection`** | The [Collection](../configuration/collections) in which this Hook is running against. |
-| **`context`** | Custom context passed between hooks. [More details](./context). |
-| **`doc`** | The resulting Document after changes are applied. |
-| **`query`** | The [Query](../queries/overview) of the request.
-| **`req`** | The [Web Request](https://developer.mozilla.org/en-US/docs/Web/API/Request) object. This is mocked for [Local API](../local-api/overview) operations. |
+| Option | Description |
+| ---------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------- |
+| **`collection`** | The [Collection](../configuration/collections) in which this Hook is running against. |
+| **`context`** | Custom context passed between hooks. [More details](./context). |
+| **`doc`** | The resulting Document after changes are applied. |
+| **`query`** | The [Query](../queries/overview) of the request. |
+| **`req`** | The [Web Request](https://developer.mozilla.org/en-US/docs/Web/API/Request) object. This is mocked for [Local API](../local-api/overview) operations. |
### beforeDelete
diff --git a/docs/hooks/globals.mdx b/docs/hooks/globals.mdx
index 76f0a4630e4..013379d0010 100644
--- a/docs/hooks/globals.mdx
+++ b/docs/hooks/globals.mdx
@@ -163,14 +163,14 @@ const afterReadHook: GlobalAfterReadHook = async ({
The following arguments are provided to the `beforeRead` hook:
-| Option | Description |
-| ------------------------ | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| **`global`** | The [Global](../configuration/globals) in which this Hook is running against. |
-| **`context`** | Custom context passed between hooks. [More details](./context). |
-| **`findMany`** | Boolean to denote if this hook is running against finding one, or finding many (useful in versions). |
-| **`doc`** | The resulting Document after changes are applied. |
-| **`query`** | The [Query](../queries/overview) of the request.
-| **`req`** | The [Web Request](https://developer.mozilla.org/en-US/docs/Web/API/Request) object. This is mocked for [Local API](../local-api/overview) operations. |
+| Option | Description |
+| -------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------- |
+| **`global`** | The [Global](../configuration/globals) in which this Hook is running against. |
+| **`context`** | Custom context passed between hooks. [More details](./context). |
+| **`findMany`** | Boolean to denote if this hook is running against finding one, or finding many (useful in versions). |
+| **`doc`** | The resulting Document after changes are applied. |
+| **`query`** | The [Query](../queries/overview) of the request. |
+| **`req`** | The [Web Request](https://developer.mozilla.org/en-US/docs/Web/API/Request) object. This is mocked for [Local API](../local-api/overview) operations. |
## TypeScript
diff --git a/docs/plugins/stripe.mdx b/docs/plugins/stripe.mdx
index f7c73f9b60e..8d4802261be 100644
--- a/docs/plugins/stripe.mdx
+++ b/docs/plugins/stripe.mdx
@@ -65,14 +65,14 @@ export default config
| Option | Type | Default | Description |
| ------------------------------ | ------------------ | ----------- | ------------------------------------------------------------------------------------------------------------------------ |
-| `stripeSecretKey` \* | string | `undefined` | Your Stripe secret key |
+| `stripeSecretKey` * | string | `undefined` | Your Stripe secret key |
| `stripeWebhooksEndpointSecret` | string | `undefined` | Your Stripe webhook endpoint secret |
| `rest` | boolean | `false` | When `true`, opens the `/api/stripe/rest` endpoint |
-| `webhooks` | object \| function | `undefined` | Either a function to handle all webhooks events, or an object of Stripe webhook handlers, keyed to the name of the event |
+| `webhooks` | object or function | `undefined` | Either a function to handle all webhooks events, or an object of Stripe webhook handlers, keyed to the name of the event |
| `sync` | array | `undefined` | An array of sync configs |
| `logs` | boolean | `false` | When `true`, logs sync events to the console as they happen |
-_\* An asterisk denotes that a property is required._
+_* An asterisk denotes that a property is required._
## Endpoints
diff --git a/docs/queries/pagination.mdx b/docs/queries/pagination.mdx
index f4b15234298..e3549d5f3ad 100644
--- a/docs/queries/pagination.mdx
+++ b/docs/queries/pagination.mdx
@@ -10,18 +10,18 @@ All collection `find` queries are paginated automatically. Responses are returne
**`Find` response properties:**
-| Property | Description |
-| ------------- | --------------------------------------------------------- |
-| docs | Array of documents in the collection |
-| totalDocs | Total available documents within the collection |
-| limit | Limit query parameter - defaults to `10` |
-| totalPages | Total pages available, based upon the `limit` queried for |
-| page | Current page number |
-| pagingCounter | `number` of the first doc on the current page |
-| hasPrevPage | `true/false` if previous page exists |
-| hasNextPage | `true/false` if next page exists |
-| prevPage | `number` of previous page, `null` if it doesn't exist |
-| nextPage | `number` of next page, `null` if it doesn't exist |
+| Property | Description |
+| --------------- | --------------------------------------------------------- |
+| `docs` | Array of documents in the collection |
+| `totalDocs` | Total available documents within the collection |
+| `limit` | Limit query parameter - defaults to `10` |
+| `totalPages` | Total pages available, based upon the `limit` queried for |
+| `page` | Current page number |
+| `pagingCounter` | `number` of the first doc on the current page |
+| `hasPrevPage` | `true/false` if previous page exists |
+| `hasNextPage` | `true/false` if next page exists |
+| `prevPage` | `number` of previous page, `null` if it doesn't exist |
+| `nextPage` | `number` of next page, `null` if it doesn't exist |
**Example response:**
diff --git a/docs/rich-text/building-custom-features.mdx b/docs/rich-text/building-custom-features.mdx
index e29e0d5f72e..20ae2978ed3 100644
--- a/docs/rich-text/building-custom-features.mdx
+++ b/docs/rich-text/building-custom-features.mdx
@@ -191,8 +191,7 @@ import { lexicalEditor } from '@payloadcms/richtext-lexical';
},
```
-By default, this server feature does nothing - you haven't added any functionality yet. Depending on what you want your
-feature to do, the ServerFeature type exposes various properties you can set to inject custom functionality into the lexical editor.
+By default, this server feature does nothing - you haven't added any functionality yet. Depending on what you want your feature to do, the ServerFeature type exposes various properties you can set to inject custom functionality into the lexical editor.
### i18n
diff --git a/docs/troubleshooting/troubleshooting.mdx b/docs/troubleshooting/troubleshooting.mdx
index aa0fa6c1f2a..14f3e2ec2c2 100644
--- a/docs/troubleshooting/troubleshooting.mdx
+++ b/docs/troubleshooting/troubleshooting.mdx
@@ -10,7 +10,7 @@ keywords: admin, components, custom, customize, documentation, Content Managemen
### "Unauthorized, you must be logged in to make this request" when attempting to log in
-This means that your auth cookie is not being set or accepted correctly upon logging in. To resolve heck the following settings in your Payload Config:
+This means that your auth cookie is not being set or accepted correctly upon logging in. To resolve check the following settings in your Payload Config:
- CORS - If you are using the '*', try to explicitly only allow certain domains instead including the one you have specified.
- CSRF - Do you have this set? if so, make sure your domain is whitelisted within the csrf domains. If not, probably not the issue, but probably can't hurt to whitelist it anyway.
diff --git a/docs/versions/overview.mdx b/docs/versions/overview.mdx
index 1e4ea4b3ff5..801d20ed04e 100644
--- a/docs/versions/overview.mdx
+++ b/docs/versions/overview.mdx
@@ -56,7 +56,7 @@ Configuring Versions is done by adding the `versions` key to your Collection con
| Option | Description |
| ----------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
| `maxPerDoc` | Use this setting to control how many versions to keep on a document by document basis. Must be an integer. Defaults to 100, use 0 to save all versions. |
-| `drafts ` | Enable [Drafts](/docs/versions/drafts) mode for this collection. To enable, set to `true` or pass an object with `draft` [options](/docs/versions/drafts#options). |
+| `drafts` | Enable [Drafts](/docs/versions/drafts) mode for this collection. To enable, set to `true` or pass an object with `draft` [options](/docs/versions/drafts#options). |
## Global config
|
65cdf6bfd0578bc8949552d89a8d17ebe0177051
|
2023-10-12 00:09:44
|
Elliot DeNolf
|
fix(bundler-webpack): pnpm webpack aliases
| false
|
pnpm webpack aliases
|
fix
|
diff --git a/packages/bundler-webpack/package.json b/packages/bundler-webpack/package.json
index 3d42d0fdfc7..2ee4f9bf97a 100644
--- a/packages/bundler-webpack/package.json
+++ b/packages/bundler-webpack/package.json
@@ -25,6 +25,7 @@
"css-loader": "5.2.7",
"css-minimizer-webpack-plugin": "^5.0.0",
"file-loader": "6.2.0",
+ "find-node-modules": "^2.1.3",
"html-webpack-plugin": "^5.5.0",
"md5": "2.3.0",
"mini-css-extract-plugin": "1.6.2",
@@ -48,6 +49,7 @@
"devDependencies": {
"@payloadcms/eslint-config": "workspace:*",
"@types/extract-text-webpack-plugin": "^3.0.7",
+ "@types/find-node-modules": "^2.1.0",
"@types/html-webpack-plugin": "^3.2.6",
"@types/mini-css-extract-plugin": "^1.4.3",
"@types/optimize-css-assets-webpack-plugin": "^5.0.5",
diff --git a/packages/bundler-webpack/src/configs/base.ts b/packages/bundler-webpack/src/configs/base.ts
index 9e3385f72db..22f2fe01934 100644
--- a/packages/bundler-webpack/src/configs/base.ts
+++ b/packages/bundler-webpack/src/configs/base.ts
@@ -1,6 +1,7 @@
import type { SanitizedConfig } from 'payload/config'
import type { Configuration } from 'webpack'
+import findNodeModules from 'find-node-modules'
import HtmlWebpackPlugin from 'html-webpack-plugin'
import path from 'path'
import webpack from 'webpack'
@@ -8,7 +9,8 @@ import webpack from 'webpack'
const mockModulePath = path.resolve(__dirname, '../mocks/emptyModule.js')
const mockDotENVPath = path.resolve(__dirname, '../mocks/dotENV.js')
-const nodeModulesPath = path.resolve(__dirname, '../../../../')
+const nodeModulesPaths = findNodeModules({ cwd: process.cwd() })
+const nodeModulesPath = path.resolve(nodeModulesPaths[0])
const adminFolderPath = path.resolve(nodeModulesPath, 'payload/dist/admin')
export const getBaseConfig = (payloadConfig: SanitizedConfig): Configuration => ({
diff --git a/packages/bundler-webpack/src/configs/dev.ts b/packages/bundler-webpack/src/configs/dev.ts
index 9308ca4d2a1..c5d1c3af39e 100644
--- a/packages/bundler-webpack/src/configs/dev.ts
+++ b/packages/bundler-webpack/src/configs/dev.ts
@@ -23,7 +23,9 @@ export const getDevConfig = (payloadConfig: SanitizedConfig): Configuration => {
entry: {
...baseConfig.entry,
main: [
- `webpack-hot-middleware/client?path=${payloadConfig.routes.admin}/__webpack_hmr`,
+ `${require.resolve('webpack-hot-middleware/client')}?path=${
+ payloadConfig.routes.admin
+ }/__webpack_hmr`,
...(baseConfig.entry.main as string[]),
],
},
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 8ead05273ab..fff5e018140 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -202,6 +202,9 @@ importers:
packages/bundler-webpack:
dependencies:
+ '@swc/core':
+ specifier: '>= 1.3.76'
+ version: 1.3.76
compression:
specifier: 1.7.4
version: 1.7.4
@@ -217,6 +220,9 @@ importers:
file-loader:
specifier: 6.2.0
version: 6.2.0([email protected])
+ find-node-modules:
+ specifier: ^2.1.3
+ version: 2.1.3
html-webpack-plugin:
specifier: ^5.5.0
version: 5.5.3([email protected])
@@ -281,6 +287,9 @@ importers:
'@types/extract-text-webpack-plugin':
specifier: ^3.0.7
version: 3.0.7
+ '@types/find-node-modules':
+ specifier: ^2.1.0
+ version: 2.1.0
'@types/html-webpack-plugin':
specifier: ^3.2.6
version: 3.2.7
@@ -355,11 +364,11 @@ importers:
specifier: 2.11.2
version: 2.11.2
drizzle-kit:
- specifier: 0.19.13
- version: 0.19.13
+ specifier: 0.19.13-e99bac1
+ version: 0.19.13-e99bac1
drizzle-orm:
specifier: 0.28.5
- version: 0.28.5(@libsql/[email protected])(@types/[email protected])([email protected])
+ version: 0.28.5(@libsql/[email protected])(@types/[email protected])([email protected])([email protected])
pg:
specifier: 8.11.3
version: 8.11.3
@@ -4326,6 +4335,10 @@ packages:
'@types/webpack': 4.41.33
dev: true
+ /@types/[email protected]:
+ resolution: {integrity: sha512-rnh1kFUbwp5xEu54GhGDnzxm5/iJC3irypLO9+YECIal+XXKU5ki4I1h0Sm43KNpvKzFfyYFeGOm7o6tGI9Bgw==}
+ dev: true
+
/@types/[email protected]:
resolution: {integrity: sha512-c0hrgAOVYr21EX8J0jBMXGLMgJqVf/v6yxi0dLaJboW9aQPh16Id+z6w2Tx1hm+piJOLv8xPfVKZCLfjPw/IMQ==}
dependencies:
@@ -7123,6 +7136,11 @@ packages:
resolution: {integrity: sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==}
engines: {node: '>= 0.8', npm: 1.2.8000 || >= 1.4.16}
+ /[email protected]:
+ resolution: {integrity: sha512-DtCOLG98P007x7wiiOmfI0fi3eIKyWiLTGJ2MDnVi/E04lWGbf+JzrRHMm0rgIIZJGtHpKpbVgLWHrv8xXpc3Q==}
+ engines: {node: '>=0.10.0'}
+ dev: false
+
/[email protected]:
resolution: {integrity: sha512-UX6sGumvvqSaXgdKGUsgZWqcUyIXZ/vZTrlRT/iobiKhGL0zL4d3osHj3uqllWJK+i+sixDS/3COVEOFbupFyw==}
engines: {node: '>=8'}
@@ -7284,8 +7302,8 @@ packages:
wordwrap: 1.0.0
dev: false
- /[email protected]:
- resolution: {integrity: sha512-Rba5VW1O2JfJlwVBeZ8Zwt2E2us5oZ08PQBDiVSGlug53TOc8hzXjblZFuF+dnll9/RQEHrkzBmJFgqTvn5Rxg==}
+ /[email protected]:
+ resolution: {integrity: sha512-25Ahwm7CoaXCcrSuDjNqNH7vwrjt1s+I4O1yXVDBwYnyRe4RY8ZD57s5iA9PE5C+IJwBJtxBSXYWkat+efb3ug==}
hasBin: true
dependencies:
'@drizzle-team/studio': 0.0.5
@@ -7304,7 +7322,7 @@ packages:
- supports-color
dev: false
- /[email protected](@libsql/[email protected])(@types/[email protected])([email protected]):
+ /[email protected](@libsql/[email protected])(@types/[email protected])([email protected])([email protected]):
resolution: {integrity: sha512-6r6Iw4c38NAmW6TiKH3TUpGUQ1YdlEoLJOQptn8XPx3Z63+vFNKfAiANqrIiYZiMjKR9+NYAL219nFrmo1duXA==}
peerDependencies:
'@aws-sdk/client-rds-data': '>=3'
@@ -7368,6 +7386,7 @@ packages:
dependencies:
'@libsql/client': 0.3.4
'@types/pg': 8.10.2
+ better-sqlite3: 8.6.0
pg: 8.11.3
dev: false
@@ -8143,6 +8162,13 @@ packages:
engines: {node: '>=6'}
dev: false
+ /[email protected]:
+ resolution: {integrity: sha512-A5EmesHW6rfnZ9ysHQjPdJRni0SRar0tjtG5MNtm9n5TUvsYU8oozprtRD4AqHxcZWWlVuAmQo2nWKfN9oyjTw==}
+ engines: {node: '>=0.10.0'}
+ dependencies:
+ homedir-polyfill: 1.0.3
+ dev: false
+
/[email protected]:
resolution: {integrity: sha512-2Zks0hf1VLFYI1kbh0I5jP3KHHyCHpkfyHBzsSXRFgl/Bg9mWYfMW8oD+PdMPlEwy5HNsR9JutYy6pMeOh61nw==}
engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
@@ -8390,6 +8416,13 @@ packages:
pkg-dir: 4.2.0
dev: true
+ /[email protected]:
+ resolution: {integrity: sha512-UC2I2+nx1ZuOBclWVNdcnbDR5dlrOdVb7xNjmT/lHE+LsgztWks3dG7boJ37yTS/venXw84B/mAW9uHVoC5QRg==}
+ dependencies:
+ findup-sync: 4.0.0
+ merge: 2.1.1
+ dev: false
+
/[email protected]:
resolution: {integrity: sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng==}
dev: false
@@ -8430,6 +8463,16 @@ packages:
semver-regex: 4.0.5
dev: true
+ /[email protected]:
+ resolution: {integrity: sha512-6jvvn/12IC4quLBL1KNokxC7wWTvYncaVUYSoxWw7YykPLuRrnv4qdHcSOywOI5RpkOVGeQRtWM8/q+G6W6qfQ==}
+ engines: {node: '>= 8'}
+ dependencies:
+ detect-file: 1.0.0
+ is-glob: 4.0.3
+ micromatch: 4.0.5
+ resolve-dir: 1.0.1
+ dev: false
+
/[email protected]:
resolution: {integrity: sha512-OHx4Qwrrt0E4jEIcI5/Xb+f+QmJYNj2rrK8wiIdQOIrB9WrrJL8cjZvXdXuBTkkEwEqLycb5BeZDV1o2i9bTew==}
engines: {node: '>=12.0.0'}
@@ -8757,6 +8800,26 @@ packages:
ini: 2.0.0
dev: true
+ /[email protected]:
+ resolution: {integrity: sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==}
+ engines: {node: '>=0.10.0'}
+ dependencies:
+ global-prefix: 1.0.2
+ is-windows: 1.0.2
+ resolve-dir: 1.0.1
+ dev: false
+
+ /[email protected]:
+ resolution: {integrity: sha512-5lsx1NUDHtSjfg0eHlmYvZKv8/nVqX4ckFbM+FrGcQ+04KWcWFo9P5MxPZYSzUvyzmdTbI7Eix8Q4IbELDqzKg==}
+ engines: {node: '>=0.10.0'}
+ dependencies:
+ expand-tilde: 2.0.2
+ homedir-polyfill: 1.0.3
+ ini: 1.3.8
+ is-windows: 1.0.2
+ which: 1.3.1
+ dev: false
+
/[email protected]:
resolution: {integrity: sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==}
engines: {node: '>=4'}
@@ -9040,6 +9103,13 @@ packages:
react-is: 16.13.1
dev: false
+ /[email protected]:
+ resolution: {integrity: sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==}
+ engines: {node: '>=0.10.0'}
+ dependencies:
+ parse-passwd: 1.0.0
+ dev: false
+
/[email protected]:
resolution: {integrity: sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==}
dev: true
@@ -9649,6 +9719,11 @@ packages:
call-bind: 1.0.2
get-intrinsic: 1.2.1
+ /[email protected]:
+ resolution: {integrity: sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==}
+ engines: {node: '>=0.10.0'}
+ dev: false
+
/[email protected]:
resolution: {integrity: sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==}
engines: {node: '>=8'}
@@ -10873,6 +10948,10 @@ packages:
resolution: {integrity: sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==}
engines: {node: '>= 8'}
+ /[email protected]:
+ resolution: {integrity: sha512-jz+Cfrg9GWOZbQAnDQ4hlVnQky+341Yk5ru8bZSe6sIDTCIg8n9i/u7hSQGSVOF3C7lH6mGtqjkiT9G4wFLL0w==}
+ dev: false
+
/[email protected]:
resolution: {integrity: sha512-IJ2NNN/mSl9w3kzWB92rcdHpz+HjkxhDJWNDBqSlas+zQdP8wBiJzITPg08M/k2uVvMow7Sk41atndNtt/PHSA==}
engines: {node: '>= 0.10'}
@@ -11731,6 +11810,11 @@ packages:
json-parse-even-better-errors: 2.3.1
lines-and-columns: 1.2.4
+ /[email protected]:
+ resolution: {integrity: sha512-1Y1A//QUXEZK7YKz+rD9WydcE1+EuPr6ZBgKecAB8tmoW6UFv0NREVJe1p+jRxtThkcbbKkfwIbWJe/IeE6m2Q==}
+ engines: {node: '>=0.10.0'}
+ dev: false
+
/[email protected]:
resolution: {integrity: sha512-Euf9GG8WT9CdqwuWJGdf3RkUcTBArppHABkO7Lm8IzRQp0e2r/kkFnmhu4TSK30Wcu5rVAZLmfPKSBBi9tWFog==}
dependencies:
@@ -13506,6 +13590,14 @@ packages:
dependencies:
resolve-from: 5.0.0
+ /[email protected]:
+ resolution: {integrity: sha512-R7uiTjECzvOsWSfdM0QKFNBVFcK27aHOUwdvK53BcW8zqnGdYp0Fbj82cy54+2A4P2tFM22J5kRfe1R+lM/1yg==}
+ engines: {node: '>=0.10.0'}
+ dependencies:
+ expand-tilde: 2.0.2
+ global-modules: 1.0.0
+ dev: false
+
/[email protected]:
resolution: {integrity: sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==}
engines: {node: '>=4'}
@@ -15413,7 +15505,6 @@ packages:
hasBin: true
dependencies:
isexe: 2.0.0
- dev: true
/[email protected]:
resolution: {integrity: sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==}
|
760565f1e96e4cb1f6bce8663ad3fa8a16a2601c
|
2023-10-27 17:55:31
|
Alessio Gravili
|
fix(richtext-lexical): remove unnecessary dependencies (fixes #3889)
| false
|
remove unnecessary dependencies (fixes #3889)
|
fix
|
diff --git a/packages/richtext-lexical/package.json b/packages/richtext-lexical/package.json
index 7f207c83f4b..e3c8f279c5e 100644
--- a/packages/richtext-lexical/package.json
+++ b/packages/richtext-lexical/package.json
@@ -19,30 +19,20 @@
},
"dependencies": {
"@faceless-ui/modal": "2.0.1",
- "@lexical/clipboard": "0.12.2",
- "@lexical/code": "0.12.2",
- "@lexical/file": "0.12.2",
- "@lexical/hashtag": "0.12.2",
"@lexical/headless": "0.12.2",
- "@lexical/html": "0.12.2",
"@lexical/link": "0.12.2",
"@lexical/list": "0.12.2",
"@lexical/mark": "0.12.2",
"@lexical/markdown": "0.12.2",
- "@lexical/overflow": "0.12.2",
- "@lexical/plain-text": "0.12.2",
"@lexical/react": "0.12.2",
"@lexical/rich-text": "0.12.2",
"@lexical/selection": "0.12.2",
- "@lexical/table": "0.12.2",
"@lexical/utils": "0.12.2",
"bson-objectid": "2.0.4",
"classnames": "^2.3.2",
"i18next": "22.5.1",
- "katex": "0.16.8",
"lexical": "0.12.2",
"lodash": "4.17.21",
- "openai": "4.7.1",
"react": "18.2.0",
"react-dom": "18.2.0",
"react-error-boundary": "^4.0.11",
diff --git a/packages/richtext-lexical/src/populate/defaultValue.ts b/packages/richtext-lexical/src/populate/defaultValue.ts
index 6b7f9b1f130..128e00f4249 100644
--- a/packages/richtext-lexical/src/populate/defaultValue.ts
+++ b/packages/richtext-lexical/src/populate/defaultValue.ts
@@ -1,4 +1,6 @@
-export const defaultRichTextValue = {
+import type { SerializedEditorState, SerializedParagraphNode, SerializedTextNode } from 'lexical'
+
+export const defaultRichTextValue: SerializedEditorState = {
root: {
children: [
{
@@ -11,14 +13,14 @@ export const defaultRichTextValue = {
text: '',
type: 'text',
version: 1,
- },
+ } as SerializedTextNode,
],
direction: null,
format: '',
indent: 0,
type: 'paragraph',
version: 1,
- },
+ } as SerializedParagraphNode,
],
direction: null,
format: '',
@@ -28,7 +30,7 @@ export const defaultRichTextValue = {
},
}
-export const defaultRichTextValueV2 = {
+export const defaultRichTextValueV2: SerializedEditorState = {
root: {
children: [
{
@@ -38,7 +40,7 @@ export const defaultRichTextValueV2 = {
indent: 0,
type: 'paragraph',
version: 1,
- },
+ } as SerializedParagraphNode,
],
direction: null,
format: '',
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index eae54eb1182..9ded33909e6 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1239,24 +1239,9 @@ importers:
'@faceless-ui/modal':
specifier: 2.0.1
version: 2.0.1([email protected])([email protected])
- '@lexical/clipboard':
- specifier: 0.12.2
- version: 0.12.2([email protected])
- '@lexical/code':
- specifier: 0.12.2
- version: 0.12.2([email protected])
- '@lexical/file':
- specifier: 0.12.2
- version: 0.12.2([email protected])
- '@lexical/hashtag':
- specifier: 0.12.2
- version: 0.12.2([email protected])
'@lexical/headless':
specifier: 0.12.2
version: 0.12.2([email protected])
- '@lexical/html':
- specifier: 0.12.2
- version: 0.12.2([email protected])
'@lexical/link':
specifier: 0.12.2
version: 0.12.2([email protected])
@@ -1269,12 +1254,6 @@ importers:
'@lexical/markdown':
specifier: 0.12.2
version: 0.12.2(@lexical/[email protected])(@lexical/[email protected])([email protected])
- '@lexical/overflow':
- specifier: 0.12.2
- version: 0.12.2([email protected])
- '@lexical/plain-text':
- specifier: 0.12.2
- version: 0.12.2(@lexical/[email protected])(@lexical/[email protected])(@lexical/[email protected])([email protected])
'@lexical/react':
specifier: 0.12.2
version: 0.12.2([email protected])([email protected])([email protected])([email protected])
@@ -1284,9 +1263,6 @@ importers:
'@lexical/selection':
specifier: 0.12.2
version: 0.12.2([email protected])
- '@lexical/table':
- specifier: 0.12.2
- version: 0.12.2([email protected])
'@lexical/utils':
specifier: 0.12.2
version: 0.12.2([email protected])
@@ -1302,18 +1278,12 @@ importers:
i18next:
specifier: 22.5.1
version: 22.5.1
- katex:
- specifier: 0.16.8
- version: 0.16.8
lexical:
specifier: 0.12.2
version: 0.12.2
lodash:
specifier: 4.17.21
version: 4.17.21
- openai:
- specifier: 4.7.1
- version: 4.7.1
react:
specifier: 18.2.0
version: 18.2.0
@@ -3968,14 +3938,6 @@ packages:
lexical: 0.12.2
dev: false
- /@lexical/[email protected]([email protected]):
- resolution: {integrity: sha512-jkhaGhj+lj/Edc1YGxdw1RzOIt04yy7KRsgSDHSPo38nqyhOh2oKqUQhnBcFIHCrB0TPCmIT0IbviYY/8TBvJw==}
- peerDependencies:
- lexical: 0.12.2
- dependencies:
- lexical: 0.12.2
- dev: false
-
/@lexical/[email protected]([email protected]):
resolution: {integrity: sha512-2vYzIu5Ldf+eYdUrNA2m80c3N3MF3vJ0fIJzpl5QyX8OdViggEWl1bh+lKtw1Ju0H0CUyDIXdDLZ2apW3WDkTA==}
peerDependencies:
@@ -5980,10 +5942,6 @@ packages:
/@types/[email protected]:
resolution: {integrity: sha512-YGncyA25/MaVtQkjWW9r0EFBukZ+JulsLcVZBlGUfIb96OBMjkoRWwQo5IEWJ8Fj06Go3GHw+bjYDitv6BaGsA==}
- /@types/[email protected]:
- resolution: {integrity: sha512-cOxcXsQ2sxiwkykdJqvyFS+MLQPLvIdwh5l6gNg8qF6s+C7XSkEWOZjK+XhUZd+mYvHV/180g2cnCcIl4l06Pw==}
- dev: false
-
/@types/[email protected]:
resolution: {integrity: sha512-dP7f3LdZIysZnmvP3ANJYTSwg+wLLl8p7RqniVlV7j+oXSXAbt9h0WIBFmJy5inWZoX9wZN6eXx+YXd9Rh3RBA==}
@@ -6800,13 +6758,6 @@ packages:
- supports-color
dev: true
- /[email protected]:
- resolution: {integrity: sha512-5GG/5IbQQpC9FpkRGsSvZI5QYeSCzlJHdpBQntCsuTOxhKD8lqKhrleg2Yi7yvMIf82Ycmmqln9U8V9qwEiJew==}
- engines: {node: '>= 8.0.0'}
- dependencies:
- humanize-ms: 1.2.1
- dev: false
-
/[email protected]([email protected]):
resolution: {integrity: sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==}
peerDependencies:
@@ -7224,10 +7175,6 @@ packages:
/[email protected]:
resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==}
- /[email protected]:
- resolution: {integrity: sha512-Y5gU45svrR5tI2Vt/X9GPd3L0HNIKzGu202EjxrXMpuc2V2CiKgemAbUUsqYmZJvPtCXoUKjNZwBJzsNScUbXA==}
- dev: false
-
/[email protected]:
resolution: {integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==}
@@ -8831,13 +8778,6 @@ packages:
heap: 0.2.7
dev: false
- /[email protected]:
- resolution: {integrity: sha512-CGJuv6iKNM7QyZlM2T3sPAdZWd/p9zQiRNS9G+9COUCwzWFTs0Xp8NF5iePx7wtvhDykReiRRrSeNb4oMmB8lA==}
- dependencies:
- base-64: 0.1.0
- md5: 2.3.0
- dev: false
-
/[email protected]:
resolution: {integrity: sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==}
engines: {node: '>=8'}
@@ -10211,10 +10151,6 @@ packages:
dependencies:
is-callable: 1.2.7
- /[email protected]:
- resolution: {integrity: sha512-qfqtYan3rxrnCk1VYaA4H+Ms9xdpPqvLZa6xmMgFvhO32x7/3J/ExcTd6qpxM0vH2GdMI+poehyBZvqfMTto8A==}
- dev: false
-
/[email protected]:
resolution: {integrity: sha512-yDYSgNMraqvnxiEXO4hi88+YZxaHC6QKzb5N84iRCTDeRO7ZALpir/lVmf/uXUhnwUr2O4HU8s/n6x+yNjQkHw==}
engines: {node: '>= 14.17'}
@@ -10236,14 +10172,6 @@ packages:
combined-stream: 1.0.8
mime-types: 2.1.35
- /[email protected]:
- resolution: {integrity: sha512-0iirZp3uVDjVGt9p49aTaqjk84TrglENEDuqfdlZQ1roC9CWlPk6Avf8EEnZNcAqPonwkG35x4n3ww/1THYAeQ==}
- engines: {node: '>= 12.20'}
- dependencies:
- node-domexception: 1.0.0
- web-streams-polyfill: 4.0.0-beta.3
- dev: false
-
/[email protected]:
resolution: {integrity: sha512-buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g==}
engines: {node: '>=12.20.0'}
@@ -11076,12 +11004,6 @@ packages:
engines: {node: '>=14.18.0'}
dev: true
- /[email protected]:
- resolution: {integrity: sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ==}
- dependencies:
- ms: 2.1.3
- dev: false
-
/[email protected]:
resolution: {integrity: sha512-+dQSyqPh4x1hlO1swXBiNb2HzTDN1I2IGLQx1GrBuiqFJfoMrnZWwVmatvSiO+Iz8fBUnf+lekwNo4c2LlXItg==}
engines: {node: '>=14'}
@@ -12504,13 +12426,6 @@ packages:
resolution: {integrity: sha512-7jFxRVm+jD+rkq3kY0iZDJfsO2/t4BBPeEb2qKn2lR/9KhuksYk5hxzfRYWMPV8P/x2d0kHD306YyWLzjjH+uA==}
engines: {node: '>=12.0.0'}
- /[email protected]:
- resolution: {integrity: sha512-ftuDnJbcbOckGY11OO+zg3OofESlbR5DRl2cmN8HeWeeFIV7wTXvAOx8kEjZjobhA+9wh2fbKeO6cdcA9Mnovg==}
- hasBin: true
- dependencies:
- commander: 8.3.0
- dev: false
-
/[email protected]:
resolution: {integrity: sha512-QCiSav9WaX1PgETJ+SpNnx2PRRapJ/oRSXM4VO5OGYGSjrxbKPVFVhB3l2OCbLCk329N8qyAtsJjSjvVBWzEug==}
dependencies:
@@ -13680,22 +13595,6 @@ packages:
is-wsl: 2.2.0
dev: true
- /[email protected]:
- resolution: {integrity: sha512-4Um9A4aLGzZxyENyway0zVgi69BOxaqXmjOCKp3PUteOvSn9TeVf6IjkaNY8k/LXYG5l2e7PpacOl2sxsrTc/w==}
- hasBin: true
- dependencies:
- '@types/node': 18.17.17
- '@types/node-fetch': 2.6.4
- abort-controller: 3.0.0
- agentkeepalive: 4.5.0
- digest-fetch: 1.3.0
- form-data-encoder: 1.7.2
- formdata-node: 4.4.1
- node-fetch: 2.6.12
- transitivePeerDependencies:
- - encoding
- dev: false
-
/[email protected]:
resolution: {integrity: sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A==}
hasBin: true
@@ -14180,7 +14079,7 @@ packages:
uuid: 8.3.2
webpack: 5.88.2(@swc/[email protected])([email protected])
webpack-bundle-analyzer: 4.9.1
- webpack-cli: 4.10.0([email protected])([email protected])
+ webpack-cli: 4.10.0([email protected])
webpack-dev-middleware: 6.0.1([email protected])
webpack-hot-middleware: 2.25.4
transitivePeerDependencies:
@@ -17897,11 +17796,6 @@ packages:
resolution: {integrity: sha512-e0MO3wdXWKrLbL0DgGnUV7WHVuw9OUvL4hjgnPkIeEvESk74gAITi5G606JtZPp39cd8HA9VQzCIvA49LpPN5Q==}
engines: {node: '>= 8'}
- /[email protected]:
- resolution: {integrity: sha512-QW95TCTaHmsYfHDybGMwO5IJIM93I/6vTRk+daHTWFPhwh+C8Cg7j7XyKrwrj8Ib6vYXe0ocYNrmzY4xAAN6ug==}
- engines: {node: '>= 14'}
- dev: false
-
/[email protected]:
resolution: {integrity: sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==}
|
58bbbbd395ca0697e0b024b99d90c224c8eb22c7
|
2024-05-14 20:35:36
|
Jessica Chowdhury
|
fix: collection labels with multiple locales showing incorrectly (#5998)
| false
|
collection labels with multiple locales showing incorrectly (#5998)
|
fix
|
diff --git a/packages/ui/src/elements/DocumentControls/index.tsx b/packages/ui/src/elements/DocumentControls/index.tsx
index 67d9b83dc63..228bbf185eb 100644
--- a/packages/ui/src/elements/DocumentControls/index.tsx
+++ b/packages/ui/src/elements/DocumentControls/index.tsx
@@ -2,6 +2,7 @@
import type { CollectionPermission, GlobalPermission } from 'payload/auth'
import type { SanitizedCollectionConfig } from 'payload/types'
+import { getTranslation } from '@payloadcms/translations'
import { useComponentMap } from '@payloadcms/ui/providers/ComponentMap'
import React, { Fragment } from 'react'
@@ -81,10 +82,10 @@ export const DocumentControls: React.FC<{
<li className={`${baseClass}__list-item`}>
<p className={`${baseClass}__value`}>
{i18n.t('general:creatingNewLabel', {
- label:
- typeof collectionConfig?.labels?.singular === 'string'
- ? collectionConfig.labels.singular
- : i18n.t('general:document'),
+ label: getTranslation(
+ collectionConfig?.labels?.singular ?? i18n.t('general:document'),
+ i18n,
+ ),
})}
</p>
</li>
|
a89df757bf0e47ca71530e80ba3787a67fc1644b
|
2023-05-15 20:53:29
|
Jacob Fletcher
|
chore: eslint and prettier (#40)
| false
|
eslint and prettier (#40)
|
chore
|
diff --git a/packages/plugin-form-builder/.eslintrc.js b/packages/plugin-form-builder/.eslintrc.js
new file mode 100644
index 00000000000..8713f59e060
--- /dev/null
+++ b/packages/plugin-form-builder/.eslintrc.js
@@ -0,0 +1,3 @@
+module.exports = {
+ extends: ['@payloadcms'],
+}
diff --git a/packages/plugin-form-builder/.prettierrc.js b/packages/plugin-form-builder/.prettierrc.js
new file mode 100644
index 00000000000..70c17c995fa
--- /dev/null
+++ b/packages/plugin-form-builder/.prettierrc.js
@@ -0,0 +1,8 @@
+module.exports = {
+ printWidth: 100,
+ parser: "typescript",
+ semi: false,
+ singleQuote: true,
+ trailingComma: "all",
+ arrowParens: "avoid",
+};
diff --git a/packages/plugin-form-builder/demo/package.json b/packages/plugin-form-builder/demo/package.json
index 3dc829288c0..6c67b5be97d 100644
--- a/packages/plugin-form-builder/demo/package.json
+++ b/packages/plugin-form-builder/demo/package.json
@@ -20,6 +20,7 @@
},
"devDependencies": {
"@types/express": "^4.17.9",
+ "@types/react": "^18.2.6",
"cross-env": "^7.0.3",
"nodemon": "^2.0.6",
"ts-node": "^9.1.1",
diff --git a/packages/plugin-form-builder/demo/src/collections/Pages.ts b/packages/plugin-form-builder/demo/src/collections/Pages.ts
index ab2565418ca..8a091087f51 100644
--- a/packages/plugin-form-builder/demo/src/collections/Pages.ts
+++ b/packages/plugin-form-builder/demo/src/collections/Pages.ts
@@ -1,5 +1,4 @@
-// const payload = require('payload');
-import { CollectionConfig } from 'payload/types';
+import type { CollectionConfig } from 'payload/types'
export const Pages: CollectionConfig = {
slug: 'pages',
@@ -22,6 +21,6 @@ export const Pages: CollectionConfig = {
label: 'Form',
type: 'relationship',
relationTo: 'forms',
- }
+ },
],
-};
+}
diff --git a/packages/plugin-form-builder/demo/src/collections/Users.ts b/packages/plugin-form-builder/demo/src/collections/Users.ts
index 467a256e6e3..a621159274f 100644
--- a/packages/plugin-form-builder/demo/src/collections/Users.ts
+++ b/packages/plugin-form-builder/demo/src/collections/Users.ts
@@ -1,4 +1,4 @@
-import { CollectionConfig } from 'payload/types';
+import type { CollectionConfig } from 'payload/types'
export const Users: CollectionConfig = {
slug: 'users',
@@ -13,4 +13,4 @@ export const Users: CollectionConfig = {
// Email added by default
// Add more fields as needed
],
-};
+}
diff --git a/packages/plugin-form-builder/demo/src/payload.config.ts b/packages/plugin-form-builder/demo/src/payload.config.ts
index 682bdff282a..44d297d9728 100644
--- a/packages/plugin-form-builder/demo/src/payload.config.ts
+++ b/packages/plugin-form-builder/demo/src/payload.config.ts
@@ -1,10 +1,12 @@
-import { buildConfig } from 'payload/config';
-import path from 'path';
+import path from 'path'
+import { buildConfig } from 'payload/config'
+import type { Block } from 'payload/types'
+
// import formBuilderPlugin from '../../dist';
-import formBuilderPlugin from '../../src';
-import { Users } from './collections/Users';
-import { Pages } from './collections/Pages';
-import { Block } from 'payload/types';
+// eslint-disable-next-line import/no-relative-packages
+import formBuilderPlugin from '../../src'
+import { Pages } from './collections/Pages'
+import { Users } from './collections/Users'
const colorField: Block = {
slug: 'color',
@@ -16,8 +18,8 @@ const colorField: Block = {
{
name: 'value',
type: 'text',
- }
- ]
+ },
+ ],
}
export default buildConfig({
@@ -28,34 +30,29 @@ export default buildConfig({
},
admin: {
user: Users.slug,
- webpack: (config) => {
+ webpack: config => {
const newConfig = {
...config,
resolve: {
...config.resolve,
alias: {
...config.resolve.alias,
- react: path.join(__dirname, "../node_modules/react"),
- "react-dom": path.join(__dirname, "../node_modules/react-dom"),
- "payload": path.join(__dirname, "../node_modules/payload"),
+ react: path.join(__dirname, '../node_modules/react'),
+ 'react-dom': path.join(__dirname, '../node_modules/react-dom'),
+ payload: path.join(__dirname, '../node_modules/payload'),
},
},
- };
+ }
- return newConfig;
+ return newConfig
},
},
- collections: [
- Users,
- Pages
- ],
+ collections: [Users, Pages],
plugins: [
formBuilderPlugin({
// handlePayment: handleFormPayments,
// beforeEmail: prepareFormEmails,
- redirectRelationships: [
- 'pages'
- ],
+ redirectRelationships: ['pages'],
formOverrides: {
// labels: {
// singular: 'Contact Form',
@@ -65,8 +62,8 @@ export default buildConfig({
{
name: 'name',
type: 'text',
- }
- ]
+ },
+ ],
},
fields: {
payment: true,
@@ -86,6 +83,6 @@ export default buildConfig({
}),
],
typescript: {
- outputFile: path.resolve(__dirname, 'payload-types.ts')
+ outputFile: path.resolve(__dirname, 'payload-types.ts'),
},
-});
+})
diff --git a/packages/plugin-form-builder/demo/src/seed/index.ts b/packages/plugin-form-builder/demo/src/seed/index.ts
index d5925299693..abdb4c4151a 100644
--- a/packages/plugin-form-builder/demo/src/seed/index.ts
+++ b/packages/plugin-form-builder/demo/src/seed/index.ts
@@ -1,15 +1,15 @@
-import { Payload } from 'payload';
+import type { Payload } from 'payload'
-export const seed = async (payload: Payload) => {
- payload.logger.info('Seeding data...');
+export const seed = async (payload: Payload): Promise<any> => {
+ payload.logger.info('Seeding data...')
await payload.create({
collection: 'users',
data: {
email: '[email protected]',
password: 'test',
- }
- });
+ },
+ })
const { id: formID } = await payload.create({
collection: 'forms',
@@ -33,8 +33,8 @@ export const seed = async (payload: Payload) => {
label: 'Email',
name: 'email',
required: true,
- }
- ]
+ },
+ ],
},
})
@@ -42,7 +42,7 @@ export const seed = async (payload: Payload) => {
collection: 'pages',
data: {
title: 'Contact',
- form: formID
+ form: formID,
},
})
}
diff --git a/packages/plugin-form-builder/demo/src/server.ts b/packages/plugin-form-builder/demo/src/server.ts
index 19d027b8ca0..8588b2f6ce8 100644
--- a/packages/plugin-form-builder/demo/src/server.ts
+++ b/packages/plugin-form-builder/demo/src/server.ts
@@ -1,17 +1,19 @@
-import express from 'express';
-import payload from 'payload';
-import { seed } from './seed';
+import dotenv from 'dotenv'
+import express from 'express'
+import payload from 'payload'
-require('dotenv').config();
-const app = express();
+import { seed } from './seed'
+
+dotenv.config()
+const app = express()
// Redirect root to Admin panel
app.get('/', (_, res) => {
- res.redirect('/admin');
-});
+ res.redirect('/admin')
+})
// Initialize Payload
-const start = async () => {
+const start = async (): Promise<any> => {
await payload.initAsync({
secret: process.env.PAYLOAD_SECRET,
mongoURL: process.env.MONGODB_URI,
@@ -22,10 +24,10 @@ const start = async () => {
})
if (process.env.PAYLOAD_SEED === 'true') {
- await seed(payload);
+ await seed(payload)
}
- app.listen(3000);
+ app.listen(3000)
}
-start();
+start()
diff --git a/packages/plugin-form-builder/demo/yarn.lock b/packages/plugin-form-builder/demo/yarn.lock
index 458a51e318b..aaa84f781d6 100644
--- a/packages/plugin-form-builder/demo/yarn.lock
+++ b/packages/plugin-form-builder/demo/yarn.lock
@@ -1861,6 +1861,15 @@
"@types/scheduler" "*"
csstype "^3.0.2"
+"@types/react@^18.2.6":
+ version "18.2.6"
+ resolved "https://registry.yarnpkg.com/@types/react/-/react-18.2.6.tgz#5cd53ee0d30ffc193b159d3516c8c8ad2f19d571"
+ integrity sha512-wRZClXn//zxCFW+ye/D2qY65UsYP1Fpex2YXorHc8awoNamkMZSvBxwxdYVInsHOZZd2Ppq8isnSzJL5Mpf8OA==
+ dependencies:
+ "@types/prop-types" "*"
+ "@types/scheduler" "*"
+ csstype "^3.0.2"
+
"@types/scheduler@*":
version "0.16.2"
resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.2.tgz#1a62f89525723dde24ba1b01b092bf5df8ad4d39"
diff --git a/packages/plugin-form-builder/package.json b/packages/plugin-form-builder/package.json
index fdd6b6fc7e7..2cfd46c084f 100644
--- a/packages/plugin-form-builder/package.json
+++ b/packages/plugin-form-builder/package.json
@@ -8,7 +8,9 @@
"types": "dist/index.d.ts",
"scripts": {
"build": "tsc",
- "test": "echo \"Error: no test specified\" && exit 1"
+ "test": "echo \"Error: no test specified\" && exit 1",
+ "lint": "eslint src",
+ "lint:fix": "eslint --fix --ext .ts,.tsx src"
},
"keywords": [
"payload",
@@ -29,9 +31,27 @@
},
"devDependencies": {
"@types/escape-html": "^1.0.1",
+ "@payloadcms/eslint-config": "^0.0.1",
+ "@types/express": "^4.17.9",
+ "@types/node": "18.11.3",
+ "@types/react": "18.0.21",
+ "@typescript-eslint/eslint-plugin": "^5.51.0",
+ "@typescript-eslint/parser": "^5.51.0",
+ "copyfiles": "^2.4.1",
+ "cross-env": "^7.0.3",
+ "eslint": "^8.19.0",
+ "eslint-config-prettier": "^8.5.0",
+ "eslint-plugin-filenames": "^1.3.2",
+ "eslint-plugin-import": "2.25.4",
+ "eslint-plugin-prettier": "^4.0.0",
+ "eslint-plugin-react-hooks": "^4.6.0",
+ "eslint-plugin-simple-import-sort": "^10.0.0",
+ "nodemon": "^2.0.6",
"payload": "^1.3.0",
+ "prettier": "^2.7.1",
"react": "^18.0.0",
- "typescript": "^4.5.5"
+ "ts-node": "^9.1.1",
+ "typescript": "^4.8.4"
},
"files": [
"dist",
diff --git a/packages/plugin-form-builder/src/collections/FormSubmissions/hooks/createCharge.ts b/packages/plugin-form-builder/src/collections/FormSubmissions/hooks/createCharge.ts
index 3bafb745aa7..6691a925efe 100644
--- a/packages/plugin-form-builder/src/collections/FormSubmissions/hooks/createCharge.ts
+++ b/packages/plugin-form-builder/src/collections/FormSubmissions/hooks/createCharge.ts
@@ -1,24 +1,19 @@
-import { PluginConfig } from "../../../types";
+import type { PluginConfig } from '../../../types'
-const createCharge = async (beforeChangeData: any, formConfig: PluginConfig) => {
- const {
- operation,
- data
- } = beforeChangeData;
+const createCharge = async (beforeChangeData: any, formConfig: PluginConfig): Promise<any> => {
+ const { operation, data } = beforeChangeData
- let dataWithPaymentDetails = data;
+ let dataWithPaymentDetails = data
if (operation === 'create') {
- const {
- handlePayment
- } = formConfig || {};
+ const { handlePayment } = formConfig || {}
if (typeof handlePayment === 'function') {
- dataWithPaymentDetails = await handlePayment(beforeChangeData);
+ dataWithPaymentDetails = await handlePayment(beforeChangeData)
}
}
- return dataWithPaymentDetails;
-};
+ return dataWithPaymentDetails
+}
export default createCharge
diff --git a/packages/plugin-form-builder/src/collections/FormSubmissions/hooks/sendEmail.ts b/packages/plugin-form-builder/src/collections/FormSubmissions/hooks/sendEmail.ts
index d5910a19274..6eb5a66e28c 100644
--- a/packages/plugin-form-builder/src/collections/FormSubmissions/hooks/sendEmail.ts
+++ b/packages/plugin-form-builder/src/collections/FormSubmissions/hooks/sendEmail.ts
@@ -1,111 +1,93 @@
-import { serialize } from '../../../utilities/serializeRichText';
-import { Email, FormattedEmail, PluginConfig } from '../../../types';
-import { replaceDoubleCurlys } from '../../../utilities/replaceDoubleCurlys';
+import type { Email, FormattedEmail, PluginConfig } from '../../../types'
+import { replaceDoubleCurlys } from '../../../utilities/replaceDoubleCurlys'
+import { serialize } from '../../../utilities/serializeRichText'
-const sendEmail = async (beforeChangeData: any, formConfig: PluginConfig) => {
- const {
- operation,
- data
- } = beforeChangeData;
+const sendEmail = async (beforeChangeData: any, formConfig: PluginConfig): Promise<any> => {
+ const { operation, data } = beforeChangeData
if (operation === 'create') {
const {
- data: {
- id: formSubmissionID
- },
- req: {
- payload,
- locale
- }
- } = beforeChangeData;
+ data: { id: formSubmissionID },
+ req: { payload, locale },
+ } = beforeChangeData
- const {
- form: formID,
- submissionData
- } = data || {};
+ const { form: formID, submissionData } = data || {}
- const {
- beforeEmail,
- formOverrides
- } = formConfig || {};
+ const { beforeEmail, formOverrides } = formConfig || {}
try {
const form = await payload.findByID({
id: formID,
collection: formOverrides?.slug || 'forms',
- locale
- });
+ locale,
+ })
if (form) {
- const {
- emails,
- } = form;
+ const { emails } = form
if (emails) {
- const formattedEmails: FormattedEmail[] = emails.map((email: Email): FormattedEmail | null => {
- const {
- message,
- subject,
- emailTo,
- cc: emailCC,
- bcc: emailBCC,
- emailFrom,
- replyTo: emailReplyTo,
- } = email;
+ const formattedEmails: FormattedEmail[] = emails.map(
+ (email: Email): FormattedEmail | null => {
+ const {
+ message,
+ subject,
+ emailTo,
+ cc: emailCC,
+ bcc: emailBCC,
+ emailFrom,
+ replyTo: emailReplyTo,
+ } = email
- const to = replaceDoubleCurlys(emailTo, submissionData);
- const cc = emailCC ? replaceDoubleCurlys(emailCC, submissionData) : '';
- const bcc = emailBCC ? replaceDoubleCurlys(emailBCC, submissionData) : '';
- const from = replaceDoubleCurlys(emailFrom, submissionData);
- const replyTo = replaceDoubleCurlys(emailReplyTo || emailFrom, submissionData);
+ const to = replaceDoubleCurlys(emailTo, submissionData)
+ const cc = emailCC ? replaceDoubleCurlys(emailCC, submissionData) : ''
+ const bcc = emailBCC ? replaceDoubleCurlys(emailBCC, submissionData) : ''
+ const from = replaceDoubleCurlys(emailFrom, submissionData)
+ const replyTo = replaceDoubleCurlys(emailReplyTo || emailFrom, submissionData)
- return ({
- to,
- from,
- cc,
- bcc,
- replyTo,
- subject: replaceDoubleCurlys(subject, submissionData),
- html: `<div>${serialize(message, submissionData)}</div>`
- });
- });
+ return {
+ to,
+ from,
+ cc,
+ bcc,
+ replyTo,
+ subject: replaceDoubleCurlys(subject, submissionData),
+ html: `<div>${serialize(message, submissionData)}</div>`,
+ }
+ },
+ )
let emailsToSend = formattedEmails
if (typeof beforeEmail === 'function') {
- emailsToSend = await beforeEmail(formattedEmails);
+ emailsToSend = await beforeEmail(formattedEmails)
}
- const log = emailsToSend.map(({ html, ...rest }) => ({ ...rest }))
+ // const log = emailsToSend.map(({ html, ...rest }) => ({ ...rest }))
await Promise.all(
- emailsToSend.map(async (email) => {
- const { to } = email;
+ emailsToSend.map(async email => {
+ const { to } = email
try {
- const emailPromise = await payload.sendEmail(email);
- return emailPromise;
- } catch (err: any) {
- console.error(`Error while sending email to address: ${to}. Email not sent.`);
- if (err?.response?.body?.errors) {
- const error = err.response.body.errors?.[0];
- console.log('%s: %s', error?.field, error?.message);
- } else {
- console.log(err);
- }
+ const emailPromise = await payload.sendEmail(email)
+ return emailPromise
+ } catch (err: unknown) {
+ payload.logger.error({
+ err: `Error while sending email to address: ${to}. Email not sent: ${err}`,
+ })
}
- })
- );
+ }),
+ )
}
} else {
- console.log('No emails to send.')
+ payload.logger.info({ msg: 'No emails to send.' })
}
- } catch (err) {
- console.error(`Error while sending one or more emails in form submission id: ${formSubmissionID}.`);
- console.error(err);
+ } catch (err: unknown) {
+ const msg = `Error while sending one or more emails in form submission id: ${formSubmissionID}.`
+ payload.logger.error({ err: msg })
}
}
- return data;
-};
+ return data
+}
-export default sendEmail;
\ No newline at end of file
+export default sendEmail
diff --git a/packages/plugin-form-builder/src/collections/FormSubmissions/index.ts b/packages/plugin-form-builder/src/collections/FormSubmissions/index.ts
index 69a39229c46..49ef35e24fd 100644
--- a/packages/plugin-form-builder/src/collections/FormSubmissions/index.ts
+++ b/packages/plugin-form-builder/src/collections/FormSubmissions/index.ts
@@ -1,30 +1,31 @@
-import { CollectionConfig } from 'payload/types';
-import { PluginConfig } from '../../types';
-import sendEmail from './hooks/sendEmail';
-import createCharge from './hooks/createCharge';
+import type { CollectionConfig } from 'payload/types'
+
+import type { PluginConfig } from '../../types'
+import createCharge from './hooks/createCharge'
+import sendEmail from './hooks/sendEmail'
// all settings can be overridden by the config
export const generateSubmissionCollection = (formConfig: PluginConfig): CollectionConfig => {
const newConfig: CollectionConfig = {
- ...formConfig?.formSubmissionOverrides || {},
+ ...(formConfig?.formSubmissionOverrides || {}),
slug: formConfig?.formSubmissionOverrides?.slug || 'form-submissions',
access: {
create: () => true,
update: () => false,
read: ({ req: { user } }) => !!user, // logged-in users,
- ...formConfig?.formSubmissionOverrides?.access || {}
+ ...(formConfig?.formSubmissionOverrides?.access || {}),
},
admin: {
- ...formConfig?.formSubmissionOverrides?.admin || {},
- enableRichTextRelationship: false
+ ...(formConfig?.formSubmissionOverrides?.admin || {}),
+ enableRichTextRelationship: false,
},
hooks: {
beforeChange: [
- (data) => createCharge(data, formConfig),
- (data) => sendEmail(data, formConfig),
- ...formConfig?.formSubmissionOverrides?.hooks?.beforeChange || []
+ data => createCharge(data, formConfig),
+ data => sendEmail(data, formConfig),
+ ...(formConfig?.formSubmissionOverrides?.hooks?.beforeChange || []),
],
- ...formConfig?.formSubmissionOverrides?.hooks || {}
+ ...(formConfig?.formSubmissionOverrides?.hooks || {}),
},
fields: [
{
@@ -33,14 +34,14 @@ export const generateSubmissionCollection = (formConfig: PluginConfig): Collecti
relationTo: formConfig?.formOverrides?.slug || 'forms',
required: true,
admin: {
- readOnly: true
+ readOnly: true,
},
},
{
name: 'submissionData',
type: 'array',
admin: {
- readOnly: true
+ readOnly: true,
},
fields: [
{
@@ -64,44 +65,44 @@ export const generateSubmissionCollection = (formConfig: PluginConfig): Collecti
// Instead, might need to do all validation in a `beforeValidate` collection hook.
if (typeof value !== 'undefined') {
- return true;
+ return true
}
- return 'This field is required.';
+ return 'This field is required.'
},
},
],
},
- ...formConfig?.formSubmissionOverrides?.fields || []
+ ...(formConfig?.formSubmissionOverrides?.fields || []),
],
- };
+ }
- const paymentFieldConfig = formConfig?.fields?.payment;
+ const paymentFieldConfig = formConfig?.fields?.payment
if (paymentFieldConfig) {
newConfig.fields.push({
name: 'payment',
type: 'group',
admin: {
- readOnly: true
+ readOnly: true,
},
fields: [
{
name: 'field',
label: 'Field',
- type: 'text'
+ type: 'text',
},
{
name: 'status',
label: 'Status',
- type: 'text'
+ type: 'text',
},
{
name: 'amount',
type: 'number',
admin: {
- description: 'Amount in cents'
- }
+ description: 'Amount in cents',
+ },
},
{
name: 'paymentProcessor',
@@ -115,23 +116,23 @@ export const generateSubmissionCollection = (formConfig: PluginConfig): Collecti
{
name: 'token',
label: 'token',
- type: 'text'
+ type: 'text',
},
{
name: 'brand',
label: 'Brand',
- type: 'text'
+ type: 'text',
},
{
name: 'number',
label: 'Number',
- type: 'text'
- }
- ]
- }
- ]
+ type: 'text',
+ },
+ ],
+ },
+ ],
})
}
- return newConfig;
+ return newConfig
}
diff --git a/packages/plugin-form-builder/src/collections/Forms/DynamicFieldSelector.tsx b/packages/plugin-form-builder/src/collections/Forms/DynamicFieldSelector.tsx
index 45751f31c1b..db4df57baf8 100644
--- a/packages/plugin-form-builder/src/collections/Forms/DynamicFieldSelector.tsx
+++ b/packages/plugin-form-builder/src/collections/Forms/DynamicFieldSelector.tsx
@@ -1,48 +1,36 @@
-import React, { useEffect, useState } from 'react';
-import { Select, useForm } from 'payload/components/forms';
-import { TextField } from 'payload/dist/fields/config/types';
-import { SelectFieldOption } from '../../types';
+import React, { useEffect, useState } from 'react'
+import { Select, useForm } from 'payload/components/forms'
+import { TextField } from 'payload/dist/fields/config/types'
-export const DynamicFieldSelector: React.FC<TextField> = (props) => {
- const {
- fields,
- getDataByPath
- } = useForm();
+import { SelectFieldOption } from '../../types'
- const [options, setOptions] = useState<SelectFieldOption[]>([]);
+export const DynamicFieldSelector: React.FC<TextField> = props => {
+ const { fields, getDataByPath } = useForm()
+
+ const [options, setOptions] = useState<SelectFieldOption[]>([])
useEffect(() => {
// @ts-ignore
const fields: any[] = getDataByPath('fields')
if (fields) {
- const allNonPaymentFields = fields.map((block): SelectFieldOption | null => {
- const {
- name,
- label,
- blockType
- } = block;
-
- if (blockType !== 'payment') {
- return ({
- label,
- value: name
- })
- }
-
- return null
- }).filter(Boolean) as SelectFieldOption[];
- setOptions(allNonPaymentFields);
+ const allNonPaymentFields = fields
+ .map((block): SelectFieldOption | null => {
+ const { name, label, blockType } = block
+
+ if (blockType !== 'payment') {
+ return {
+ label,
+ value: name,
+ }
+ }
+
+ return null
+ })
+ .filter(Boolean) as SelectFieldOption[]
+ setOptions(allNonPaymentFields)
}
- }, [
- fields,
- getDataByPath
- ]);
-
- return (
- <Select
- {...props}
- options={options}
- />
- );
-};
+ }, [fields, getDataByPath])
+
+ return <Select {...props} options={options} />
+}
diff --git a/packages/plugin-form-builder/src/collections/Forms/fields.ts b/packages/plugin-form-builder/src/collections/Forms/fields.ts
index 5d8247bcb6c..c58fb04b73f 100644
--- a/packages/plugin-form-builder/src/collections/Forms/fields.ts
+++ b/packages/plugin-form-builder/src/collections/Forms/fields.ts
@@ -1,33 +1,34 @@
-import { Block, Field } from 'payload/types';
-import { FieldConfig, PaymentFieldConfig, TextField } from '../../types';
-import { DynamicFieldSelector } from './DynamicFieldSelector';
-import { DynamicPriceSelector } from './DynamicPriceSelector';
+import type { Block, Field } from 'payload/types'
+
+import type { FieldConfig, PaymentFieldConfig } from '../../types'
+import { DynamicFieldSelector } from './DynamicFieldSelector'
+import { DynamicPriceSelector } from './DynamicPriceSelector'
const name: Field = {
name: 'name',
label: 'Name (lowercase, no special characters)',
type: 'text',
required: true,
-};
+}
const label: Field = {
name: 'label',
label: 'Label',
type: 'text',
localized: true,
-};
+}
const required: Field = {
name: 'required',
label: 'Required',
type: 'checkbox',
-};
+}
const width: Field = {
name: 'width',
label: 'Field Width (percentage)',
type: 'number',
-};
+}
const Select: Block = {
slug: 'select',
@@ -110,7 +111,7 @@ const Select: Block = {
},
required,
],
-};
+}
const Text: Block = {
slug: 'text',
@@ -158,7 +159,7 @@ const Text: Block = {
},
required,
],
-};
+}
const TextArea: Block = {
slug: 'textarea',
@@ -206,7 +207,7 @@ const TextArea: Block = {
},
required,
],
-};
+}
const Number: Block = {
slug: 'number',
@@ -253,7 +254,7 @@ const Number: Block = {
},
required,
],
-};
+}
const Email: Block = {
slug: 'email',
@@ -282,7 +283,7 @@ const Email: Block = {
width,
required,
],
-};
+}
const State: Block = {
slug: 'state',
@@ -311,7 +312,7 @@ const State: Block = {
width,
required,
],
-};
+}
const Country: Block = {
slug: 'country',
@@ -340,7 +341,7 @@ const Country: Block = {
width,
required,
],
-};
+}
const Checkbox: Block = {
slug: 'checkbox',
@@ -389,11 +390,10 @@ const Checkbox: Block = {
type: 'checkbox',
},
],
-};
+}
const Payment = (fieldConfig: PaymentFieldConfig): Block => {
-
- let paymentProcessorField = null;
+ let paymentProcessorField = null
if (fieldConfig?.paymentProcessor) {
paymentProcessorField = {
type: 'select',
@@ -474,25 +474,26 @@ const Payment = (fieldConfig: PaymentFieldConfig): Block => {
options: [
{
value: 'hasValue',
- label: 'Has Any Value'
+ label: 'Has Any Value',
},
{
value: 'equals',
- label: 'Equals'
+ label: 'Equals',
},
{
value: 'notEquals',
- label: 'Does Not Equal'
- }
- ]
+ label: 'Does Not Equal',
+ },
+ ],
},
{
name: 'valueForCondition',
label: 'Value',
type: 'text',
admin: {
- condition: (_: any, { condition }: any) => condition === 'equals' || condition === 'notEquals'
- }
+ condition: (_: any, { condition }: any) =>
+ condition === 'equals' || condition === 'notEquals',
+ },
},
{
name: 'operator',
@@ -501,21 +502,21 @@ const Payment = (fieldConfig: PaymentFieldConfig): Block => {
options: [
{
value: 'add',
- label: 'Add'
+ label: 'Add',
},
{
value: 'subtract',
- label: 'Subtract'
+ label: 'Subtract',
},
{
value: 'multiply',
- label: 'Multiply'
+ label: 'Multiply',
},
{
value: 'divide',
- label: 'Divide'
- }
- ]
+ label: 'Divide',
+ },
+ ],
},
{
name: 'valueType',
@@ -528,13 +529,13 @@ const Payment = (fieldConfig: PaymentFieldConfig): Block => {
options: [
{
label: 'Static Value',
- value: 'static'
+ value: 'static',
},
{
label: 'Value Of Field',
- value: 'valueOfField'
- }
- ]
+ value: 'valueOfField',
+ },
+ ],
},
{
name: 'valueForOperator',
@@ -546,14 +547,14 @@ const Payment = (fieldConfig: PaymentFieldConfig): Block => {
},
},
},
- ]
+ ],
},
required,
- ].filter(Boolean) as Field[]
+ ].filter(Boolean) as Field[],
}
return fields
-};
+}
const Message: Block = {
slug: 'message',
@@ -568,8 +569,9 @@ const Message: Block = {
localized: true,
},
],
-};
+}
+// eslint-disable-next-line @typescript-eslint/consistent-type-assertions
export default {
select: Select,
checkbox: Checkbox,
@@ -580,7 +582,7 @@ export default {
number: Number,
country: Country,
state: State,
- payment: Payment
+ payment: Payment,
} as {
[key: string]: Block | ((fieldConfig?: boolean | FieldConfig) => Block)
-};
+}
diff --git a/packages/plugin-form-builder/src/collections/Forms/index.ts b/packages/plugin-form-builder/src/collections/Forms/index.ts
index 798e9acf228..2d7472d4249 100644
--- a/packages/plugin-form-builder/src/collections/Forms/index.ts
+++ b/packages/plugin-form-builder/src/collections/Forms/index.ts
@@ -1,11 +1,11 @@
-import { Block, CollectionConfig, Field } from 'payload/types';
-import merge from 'deepmerge';
-import { FieldConfig, PluginConfig } from '../../types';
-import fields from './fields';
+import merge from 'deepmerge'
+import type { Block, CollectionConfig, Field } from 'payload/types'
+
+import type { FieldConfig, PluginConfig } from '../../types'
+import fields from './fields'
// all settings can be overridden by the config
export const generateFormCollection = (formConfig: PluginConfig): CollectionConfig => {
-
const redirect: Field = {
name: 'redirect',
type: 'group',
@@ -21,7 +21,7 @@ export const generateFormCollection = (formConfig: PluginConfig): CollectionConf
required: true,
},
],
- };
+ }
if (formConfig.redirectRelationships) {
redirect.fields.unshift({
@@ -34,7 +34,7 @@ export const generateFormCollection = (formConfig: PluginConfig): CollectionConf
admin: {
condition: (_, siblingData) => siblingData?.type === 'reference',
},
- });
+ })
redirect.fields.unshift({
name: 'type',
@@ -53,26 +53,26 @@ export const generateFormCollection = (formConfig: PluginConfig): CollectionConf
admin: {
layout: 'horizontal',
},
- });
+ })
- if (redirect.fields[2].type !== 'row') redirect.fields[2].label = 'Custom URL';
+ if (redirect.fields[2].type !== 'row') redirect.fields[2].label = 'Custom URL'
redirect.fields[2].admin = {
condition: (_, siblingData) => siblingData?.type === 'custom',
- };
+ }
}
const config: CollectionConfig = {
- ...formConfig?.formOverrides || {},
+ ...(formConfig?.formOverrides || {}),
slug: formConfig?.formOverrides?.slug || 'forms',
admin: {
useAsTitle: 'title',
enableRichTextRelationship: false,
- ...formConfig?.formOverrides?.admin || {},
+ ...(formConfig?.formOverrides?.admin || {}),
},
access: {
read: () => true,
- ...formConfig?.formOverrides?.access || {}
+ ...(formConfig?.formOverrides?.access || {}),
},
fields: [
{
@@ -83,30 +83,32 @@ export const generateFormCollection = (formConfig: PluginConfig): CollectionConf
{
name: 'fields',
type: 'blocks',
- blocks: Object.entries(formConfig?.fields || {}).map(([fieldKey, fieldConfig]) => {
- // let the config enable/disable fields with either boolean values or objects
- if (fieldConfig !== false) {
- let block = fields[fieldKey];
+ blocks: Object.entries(formConfig?.fields || {})
+ .map(([fieldKey, fieldConfig]) => {
+ // let the config enable/disable fields with either boolean values or objects
+ if (fieldConfig !== false) {
+ let block = fields[fieldKey]
- if (block === undefined && typeof fieldConfig === 'object') {
- return fieldConfig
- }
+ if (block === undefined && typeof fieldConfig === 'object') {
+ return fieldConfig
+ }
- if (typeof block === 'object' && typeof fieldConfig === 'object') {
- return merge<FieldConfig>(block, fieldConfig, {
- arrayMerge: (_, sourceArray) => sourceArray
- });
- }
+ if (typeof block === 'object' && typeof fieldConfig === 'object') {
+ return merge<FieldConfig>(block, fieldConfig, {
+ arrayMerge: (_, sourceArray) => sourceArray,
+ })
+ }
- if (typeof block === 'function') {
- return block(fieldConfig);
- }
+ if (typeof block === 'function') {
+ return block(fieldConfig)
+ }
- return block;
- }
+ return block
+ }
- return null;
- }).filter(Boolean) as Block[],
+ return null
+ })
+ .filter(Boolean) as Block[],
},
{
name: 'submitButtonLabel',
@@ -117,7 +119,8 @@ export const generateFormCollection = (formConfig: PluginConfig): CollectionConf
name: 'confirmationType',
type: 'radio',
admin: {
- description: 'Choose whether to display an on-page message or redirect to a different page after they submit the form.',
+ description:
+ 'Choose whether to display an on-page message or redirect to a different page after they submit the form.',
layout: 'horizontal',
},
options: [
@@ -146,7 +149,8 @@ export const generateFormCollection = (formConfig: PluginConfig): CollectionConf
name: 'emails',
type: 'array',
admin: {
- description: 'Send custom emails when the form submits. Use comma separated lists to send the same email to multiple recipients. To reference a value from this form, wrap that field\'s name with double curly brackets, i.e. {{firstName}}.',
+ description:
+ "Send custom emails when the form submits. Use comma separated lists to send the same email to multiple recipients. To reference a value from this form, wrap that field's name with double curly brackets, i.e. {{firstName}}.",
},
fields: [
{
@@ -158,7 +162,7 @@ export const generateFormCollection = (formConfig: PluginConfig): CollectionConf
label: 'Email To',
admin: {
width: '100%',
- placeholder: '"Email Sender" <[email protected]>'
+ placeholder: '"Email Sender" <[email protected]>',
},
},
{
@@ -206,7 +210,7 @@ export const generateFormCollection = (formConfig: PluginConfig): CollectionConf
type: 'text',
name: 'subject',
label: 'Subject',
- defaultValue: 'You\'ve received a new message.',
+ defaultValue: "You've received a new message.",
required: true,
localized: true,
},
@@ -221,9 +225,9 @@ export const generateFormCollection = (formConfig: PluginConfig): CollectionConf
},
],
},
- ...formConfig?.formOverrides?.fields || []
+ ...(formConfig?.formOverrides?.fields || []),
],
}
- return config;
-};
+ return config
+}
diff --git a/packages/plugin-form-builder/src/index.ts b/packages/plugin-form-builder/src/index.ts
index 27e0656fd5c..784be8ab107 100644
--- a/packages/plugin-form-builder/src/index.ts
+++ b/packages/plugin-form-builder/src/index.ts
@@ -1,51 +1,54 @@
-import { Config } from 'payload/config';
-import { generateFormCollection } from './collections/Forms';
-import { generateSubmissionCollection } from './collections/FormSubmissions';
-import { PluginConfig } from './types';
+import type { Config } from 'payload/config'
+
+import { generateFormCollection } from './collections/Forms'
+import { generateSubmissionCollection } from './collections/FormSubmissions'
+import type { PluginConfig } from './types'
// import path from 'path';
export { getPaymentTotal } from './utilities/getPaymentTotal'
-const FormBuilder = (incomingFormConfig: PluginConfig) => (config: Config): Config => {
- const formConfig: PluginConfig = {
- ...incomingFormConfig,
- fields: {
- text: true,
- textarea: true,
- select: true,
- email: true,
- state: true,
- country: true,
- number: true,
- checkbox: true,
- message: true,
- payment: false,
- ...incomingFormConfig.fields,
- },
- };
+const FormBuilder =
+ (incomingFormConfig: PluginConfig) =>
+ (config: Config): Config => {
+ const formConfig: PluginConfig = {
+ ...incomingFormConfig,
+ fields: {
+ text: true,
+ textarea: true,
+ select: true,
+ email: true,
+ state: true,
+ country: true,
+ number: true,
+ checkbox: true,
+ message: true,
+ payment: false,
+ ...incomingFormConfig.fields,
+ },
+ }
- return {
- ...config,
- // admin: {
- // ...config.admin,
- // webpack: (webpackConfig) => ({
- // ...webpackConfig,
- // resolve: {
- // ...webpackConfig.resolve,
- // alias: {
- // ...webpackConfig.resolve.alias,
- // [path.resolve(__dirname, 'collections/FormSubmissions/hooks/sendEmail.ts')]: path.resolve(__dirname, 'mocks/serverModule.js'),
- // [path.resolve(__dirname, 'collections/FormSubmissions/hooks/createCharge.ts')]: path.resolve(__dirname, 'mocks/serverModule.js'),
- // },
- // },
- // })
- // },
- collections: [
- ...config?.collections || [],
- generateFormCollection(formConfig),
- generateSubmissionCollection(formConfig),
- ],
- };
-};
+ return {
+ ...config,
+ // admin: {
+ // ...config.admin,
+ // webpack: (webpackConfig) => ({
+ // ...webpackConfig,
+ // resolve: {
+ // ...webpackConfig.resolve,
+ // alias: {
+ // ...webpackConfig.resolve.alias,
+ // [path.resolve(__dirname, 'collections/FormSubmissions/hooks/sendEmail.ts')]: path.resolve(__dirname, 'mocks/serverModule.js'),
+ // [path.resolve(__dirname, 'collections/FormSubmissions/hooks/createCharge.ts')]: path.resolve(__dirname, 'mocks/serverModule.js'),
+ // },
+ // },
+ // })
+ // },
+ collections: [
+ ...(config?.collections || []),
+ generateFormCollection(formConfig),
+ generateSubmissionCollection(formConfig),
+ ],
+ }
+ }
-export default FormBuilder;
+export default FormBuilder
diff --git a/packages/plugin-form-builder/src/mocks/serverModule.js b/packages/plugin-form-builder/src/mocks/serverModule.js
index ff8b4c56321..b1c6ea436a5 100644
--- a/packages/plugin-form-builder/src/mocks/serverModule.js
+++ b/packages/plugin-form-builder/src/mocks/serverModule.js
@@ -1 +1 @@
-export default {};
+export default {}
diff --git a/packages/plugin-form-builder/src/types.ts b/packages/plugin-form-builder/src/types.ts
index 14d903bb99d..b3db8671e42 100644
--- a/packages/plugin-form-builder/src/types.ts
+++ b/packages/plugin-form-builder/src/types.ts
@@ -1,17 +1,19 @@
-import { Block, CollectionConfig, Field } from 'payload/types';
+import type { Block, CollectionConfig, Field } from 'payload/types'
-export type BlockConfig = {
+export interface BlockConfig {
block: Block
validate?: (value: unknown) => boolean | string
}
export function isValidBlockConfig(blockConfig: BlockConfig | string): blockConfig is BlockConfig {
- return typeof blockConfig !== 'string'
- && typeof blockConfig?.block?.slug === 'string'
- && Array.isArray(blockConfig?.block?.fields);
+ return (
+ typeof blockConfig !== 'string' &&
+ typeof blockConfig?.block?.slug === 'string' &&
+ Array.isArray(blockConfig?.block?.fields)
+ )
}
-export type FieldValues = {
+export interface FieldValues {
[key: string]: string | number | boolean | null | undefined
}
@@ -19,9 +21,9 @@ export type PaymentFieldConfig = Partial<Field> & {
paymentProcessor: Partial<SelectField>
}
-export type FieldConfig = Partial<Field> | PaymentFieldConfig;
+export type FieldConfig = Partial<Field> | PaymentFieldConfig
-export type FieldsConfig = {
+export interface FieldsConfig {
select?: boolean | FieldConfig
text?: boolean | FieldConfig
textarea?: boolean | FieldConfig
@@ -35,10 +37,10 @@ export type FieldsConfig = {
[key: string]: boolean | FieldConfig | undefined
}
-export type BeforeEmail = (emails: FormattedEmail[]) => FormattedEmail[] | Promise<FormattedEmail[]>;
-export type HandlePayment = (data: any) => void;
+export type BeforeEmail = (emails: FormattedEmail[]) => FormattedEmail[] | Promise<FormattedEmail[]>
+export type HandlePayment = (data: any) => void
-export type PluginConfig = {
+export interface PluginConfig {
fields?: FieldsConfig
formSubmissionOverrides?: Partial<CollectionConfig>
formOverrides?: Partial<CollectionConfig>
@@ -47,7 +49,7 @@ export type PluginConfig = {
redirectRelationships?: string[]
}
-export type TextField = {
+export interface TextField {
blockType: 'text'
blockName?: string
width?: string
@@ -57,7 +59,7 @@ export type TextField = {
required?: boolean
}
-export type TextAreaField = {
+export interface TextAreaField {
blockType: 'textarea'
blockName?: string
width?: string
@@ -67,12 +69,12 @@ export type TextAreaField = {
required?: boolean
}
-export type SelectFieldOption = {
+export interface SelectFieldOption {
label: string
value: string
}
-export type SelectField = {
+export interface SelectField {
blockType: 'select'
blockName?: string
width?: string
@@ -83,7 +85,7 @@ export type SelectField = {
options: SelectFieldOption[]
}
-export type PriceCondition = {
+export interface PriceCondition {
fieldToUse: string
condition: 'equals' | 'notEquals' | 'hasValue'
valueForCondition: string
@@ -92,7 +94,7 @@ export type PriceCondition = {
valueForOperator: string | number // TODO: make this a number, see ./collections/Forms/DynamicPriceSelector.tsx
}
-export type PaymentField = {
+export interface PaymentField {
blockType: 'payment'
blockName?: string
width?: string
@@ -100,12 +102,12 @@ export type PaymentField = {
label?: string
defaultValue?: string
required?: boolean
- paymentProcessor: string,
+ paymentProcessor: string
basePrice: number
priceConditions: PriceCondition[]
}
-export type EmailField = {
+export interface EmailField {
blockType: 'email'
blockName?: string
width?: string
@@ -115,7 +117,7 @@ export type EmailField = {
required?: boolean
}
-export type StateField = {
+export interface StateField {
blockType: 'state'
blockName?: string
width?: string
@@ -125,7 +127,7 @@ export type StateField = {
required?: boolean
}
-export type CountryField = {
+export interface CountryField {
blockType: 'country'
blockName?: string
width?: string
@@ -135,7 +137,7 @@ export type CountryField = {
required?: boolean
}
-export type CheckboxField = {
+export interface CheckboxField {
blockType: 'checkbox'
blockName?: string
width?: string
@@ -145,15 +147,24 @@ export type CheckboxField = {
required?: boolean
}
-export type MessageField = {
+export interface MessageField {
blockType: 'message'
blockName?: string
message: unknown
}
-export type FormFieldBlock = TextField | TextAreaField | SelectField | EmailField | StateField | CountryField | CheckboxField | MessageField | PaymentField
+export type FormFieldBlock =
+ | TextField
+ | TextAreaField
+ | SelectField
+ | EmailField
+ | StateField
+ | CountryField
+ | CheckboxField
+ | MessageField
+ | PaymentField
-export type Email = {
+export interface Email {
emailTo: string
emailFrom: string
cc?: string
@@ -163,7 +174,7 @@ export type Email = {
message?: any // TODO: configure rich text type
}
-export type FormattedEmail = {
+export interface FormattedEmail {
to: string
cc?: string
bcc?: string
@@ -173,7 +184,7 @@ export type FormattedEmail = {
replyTo: string
}
-export type Redirect = {
+export interface Redirect {
type: 'reference' | 'custom'
reference?: {
relationTo: string
@@ -182,7 +193,7 @@ export type Redirect = {
url: string
}
-export type Form = {
+export interface Form {
id: string
title: string
fields: FormFieldBlock[]
@@ -193,12 +204,12 @@ export type Form = {
emails: Email[]
}
-export type SubmissionValue = {
+export interface SubmissionValue {
field: string
value: unknown
}
-export type FormSubmission = {
+export interface FormSubmission {
form: string | Form
submissionData: SubmissionValue[]
}
diff --git a/packages/plugin-form-builder/src/utilities/getPaymentTotal.ts b/packages/plugin-form-builder/src/utilities/getPaymentTotal.ts
index ec70a7df0b6..eac2f199919 100644
--- a/packages/plugin-form-builder/src/utilities/getPaymentTotal.ts
+++ b/packages/plugin-form-builder/src/utilities/getPaymentTotal.ts
@@ -1,61 +1,53 @@
-import { FieldValues, PaymentField, PriceCondition } from "../types";
+import type { FieldValues, PaymentField, PriceCondition } from '../types'
-export const getPaymentTotal = (args: Partial<PaymentField> & {
- fieldValues: FieldValues
-}): number => {
- const {
- basePrice = 0,
- priceConditions,
- fieldValues
- } = args;
+export const getPaymentTotal = (
+ args: Partial<PaymentField> & {
+ fieldValues: FieldValues
+ },
+): number => {
+ const { basePrice = 0, priceConditions, fieldValues } = args
- let total = basePrice;
+ let total = basePrice
if (Array.isArray(priceConditions) && priceConditions.length > 0) {
priceConditions.forEach((priceCondition: PriceCondition) => {
- const {
- condition,
- valueForCondition,
- fieldToUse,
- operator,
- valueType,
- valueForOperator
- } = priceCondition;
+ const { condition, valueForCondition, fieldToUse, operator, valueType, valueForOperator } =
+ priceCondition
- const valueOfField = fieldValues?.[fieldToUse];
+ const valueOfField = fieldValues?.[fieldToUse]
if (valueOfField) {
if (
- condition === 'hasValue'
- || condition === 'equals' && valueOfField === valueForCondition
- || condition === 'notEquals' && valueOfField !== valueForCondition
+ condition === 'hasValue' ||
+ (condition === 'equals' && valueOfField === valueForCondition) ||
+ (condition === 'notEquals' && valueOfField !== valueForCondition)
) {
- const valueToUse = Number(valueType === 'valueOfField' ? valueOfField : valueForOperator);
+ const valueToUse = Number(valueType === 'valueOfField' ? valueOfField : valueForOperator)
switch (operator) {
case 'add': {
- total += valueToUse;
- break;
+ total += valueToUse
+ break
}
case 'subtract': {
- total -= valueToUse;
- break;
+ total -= valueToUse
+ break
}
case 'multiply': {
- total *= valueToUse;
- break;
+ total *= valueToUse
+ break
}
case 'divide': {
- total /= valueToUse;
- break;
+ total /= valueToUse
+ break
}
default: {
- break;
+ break
}
}
}
}
- });
+ })
}
- return total;
+ return total
}
diff --git a/packages/plugin-form-builder/src/utilities/replaceDoubleCurlys.ts b/packages/plugin-form-builder/src/utilities/replaceDoubleCurlys.ts
index 5821fd415be..c5551a6d02e 100644
--- a/packages/plugin-form-builder/src/utilities/replaceDoubleCurlys.ts
+++ b/packages/plugin-form-builder/src/utilities/replaceDoubleCurlys.ts
@@ -1,18 +1,18 @@
-type EmailVariable = {
+interface EmailVariable {
field: string
value: string
}
-type EmailVariables = EmailVariable[];
+type EmailVariables = EmailVariable[]
export const replaceDoubleCurlys = (str: string, variables?: EmailVariables): string => {
- const regex = /{{(.+?)}}/g;
+ const regex = /{{(.+?)}}/g
if (str && variables) {
return str.replace(regex, (_, variable) => {
- const foundVariable = variables.find(({ field: fieldName }) => variable === fieldName);
- if (foundVariable) return foundVariable.value;
- return variable;
+ const foundVariable = variables.find(({ field: fieldName }) => variable === fieldName)
+ if (foundVariable) return foundVariable.value
+ return variable
})
}
- return str;
+ return str
}
diff --git a/packages/plugin-form-builder/src/utilities/serializeRichText.ts b/packages/plugin-form-builder/src/utilities/serializeRichText.ts
index a8d52c84fe4..51338cad484 100644
--- a/packages/plugin-form-builder/src/utilities/serializeRichText.ts
+++ b/packages/plugin-form-builder/src/utilities/serializeRichText.ts
@@ -1,8 +1,9 @@
-import escapeHTML from 'escape-html';
-import { Text } from 'slate';
-import { replaceDoubleCurlys } from './replaceDoubleCurlys';
+import escapeHTML from 'escape-html'
+import { Text } from 'slate'
-type Node = {
+import { replaceDoubleCurlys } from './replaceDoubleCurlys'
+
+interface Node {
bold?: boolean
code?: boolean
italic?: boolean
@@ -11,96 +12,100 @@ type Node = {
children?: Node[]
}
-export const serialize = (children?: Node[], submissionData?: any): string | undefined => children?.map((node: Node, i) => {
- if (Text.isText(node)) {
- let text = `<span>${escapeHTML(replaceDoubleCurlys(node.text, submissionData))}</span>`;
+export const serialize = (children?: Node[], submissionData?: any): string | undefined =>
+ children
+ ?.map((node: Node) => {
+ if (Text.isText(node)) {
+ let text = `<span>${escapeHTML(replaceDoubleCurlys(node.text, submissionData))}</span>`
- if (node.bold) {
- text = (`
+ if (node.bold) {
+ text = `
<strong>
${text}
</strong>
- `);
- }
+ `
+ }
- if (node.code) {
- text = (`
+ if (node.code) {
+ text = `
<code>
${text}
</code>
- `);
- }
+ `
+ }
- if (node.italic) {
- text = (`
+ if (node.italic) {
+ text = `
<em >
${text}
</em>
- `);
- }
+ `
+ }
- return text;
- }
+ return text
+ }
- if (!node) {
- return null;
- }
+ if (!node) {
+ return null
+ }
- switch (node.type) {
- case 'h1':
- return (`
+ switch (node.type) {
+ case 'h1':
+ return `
<h1>
${serialize(node.children, submissionData)}
</h1>
- `);
- case 'h6':
- return (`
+ `
+ case 'h6':
+ return `
<h6>
${serialize(node.children, submissionData)}
</h6>
- `);
- case 'quote':
- return (`
+ `
+ case 'quote':
+ return `
<blockquote>
${serialize(node.children, submissionData)}
</blockquote>
- `);
- case 'ul':
- return (`
+ `
+ case 'ul':
+ return `
<ul>
${serialize(node.children, submissionData)}
</ul>
- `);
- case 'ol':
- return (`
+ `
+ case 'ol':
+ return `
<ol>
${serialize(node.children, submissionData)}
</ol>
- `);
- case 'li':
- return (`
+ `
+ case 'li':
+ return `
<li>
${serialize(node.children, submissionData)}
</li>
- `);
- case 'indent':
- return (`
+ `
+ case 'indent':
+ return `
<p style="padding-left: 20px">
${serialize(node.children, submissionData)}
</p>
- `);
- case 'link':
- return (`
+ `
+ case 'link':
+ return `
<a href={${escapeHTML(node.url)}}>
${serialize(node.children, submissionData)}
</a>
- `);
+ `
- default:
- return (`
+ default:
+ return `
<p>
${serialize(node.children, submissionData)}
</p>
- `);
- }
-}).filter(Boolean).join('');
+ `
+ }
+ })
+ .filter(Boolean)
+ .join('')
diff --git a/packages/plugin-form-builder/yarn.lock b/packages/plugin-form-builder/yarn.lock
index 5d392c89159..de7dd9169bc 100644
--- a/packages/plugin-form-builder/yarn.lock
+++ b/packages/plugin-form-builder/yarn.lock
@@ -1299,6 +1299,38 @@
resolved "https://registry.yarnpkg.com/@emotion/weak-memoize/-/weak-memoize-0.2.5.tgz#8eed982e2ee6f7f4e44c253e12962980791efd46"
integrity sha512-6U71C2Wp7r5XtFtQzYrW5iKFT67OixrSxjI4MptCHzdSVlgabczzqLe0ZSgnub/5Kp4hSbpDB1tMytZY9pwxxA==
+"@eslint-community/eslint-utils@^4.2.0":
+ version "4.4.0"
+ resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz#a23514e8fb9af1269d5f7788aa556798d61c6b59"
+ integrity sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==
+ dependencies:
+ eslint-visitor-keys "^3.3.0"
+
+"@eslint-community/regexpp@^4.4.0":
+ version "4.5.1"
+ resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.5.1.tgz#cdd35dce4fa1a89a4fd42b1599eb35b3af408884"
+ integrity sha512-Z5ba73P98O1KUYCCJTUeVpja9RcGoMdncZ6T49FCUl2lN38JtCJ+3WgIDBv0AuY4WChU5PmtJmOCTlN6FZTFKQ==
+
+"@eslint/eslintrc@^2.0.3":
+ version "2.0.3"
+ resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.0.3.tgz#4910db5505f4d503f27774bf356e3704818a0331"
+ integrity sha512-+5gy6OQfk+xx3q0d6jGZZC3f3KzAkXc/IanVxd1is/VIIziRqqt3ongQz0FiTUXqTk0c7aDB3OaFuKnuSoJicQ==
+ dependencies:
+ ajv "^6.12.4"
+ debug "^4.3.2"
+ espree "^9.5.2"
+ globals "^13.19.0"
+ ignore "^5.2.0"
+ import-fresh "^3.2.1"
+ js-yaml "^4.1.0"
+ minimatch "^3.1.2"
+ strip-json-comments "^3.1.1"
+
+"@eslint/[email protected]":
+ version "8.40.0"
+ resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.40.0.tgz#3ba73359e11f5a7bd3e407f70b3528abfae69cec"
+ integrity sha512-ElyB54bJIhXQYVKjDSvCkPO1iU1tSAeVQJbllWJq1XQSmmA4dgFk8CbiBGpiOPxleE48vDogxCtmMYku4HSVLA==
+
"@faceless-ui/modal@^2.0.1":
version "2.0.1"
resolved "https://registry.yarnpkg.com/@faceless-ui/modal/-/modal-2.0.1.tgz#8a47299442eff450c09432cfaef35c5471becad6"
@@ -1331,6 +1363,25 @@
dependencies:
"@hapi/hoek" "^9.0.0"
+"@humanwhocodes/config-array@^0.11.8":
+ version "0.11.8"
+ resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.8.tgz#03595ac2075a4dc0f191cc2131de14fbd7d410b9"
+ integrity sha512-UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g==
+ dependencies:
+ "@humanwhocodes/object-schema" "^1.2.1"
+ debug "^4.1.1"
+ minimatch "^3.0.5"
+
+"@humanwhocodes/module-importer@^1.0.1":
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c"
+ integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==
+
+"@humanwhocodes/object-schema@^1.2.1":
+ version "1.2.1"
+ resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45"
+ integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==
+
"@hypnosphi/create-react-context@^0.3.1":
version "0.3.1"
resolved "https://registry.yarnpkg.com/@hypnosphi/create-react-context/-/create-react-context-0.3.1.tgz#f8bfebdc7665f5d426cba3753e0e9c7d3154d7c6"
@@ -1584,6 +1635,32 @@
resolved "https://registry.yarnpkg.com/@nicolo-ribaudo/chokidar-2/-/chokidar-2-2.1.8-no-fsevents.3.tgz#323d72dd25103d0c4fbdce89dadf574a787b1f9b"
integrity sha512-s88O1aVtXftvp5bCPB7WnmXc5IwOZZ7YPuwNPt+GtOOXpPvad1LfbmjYv+qII7zP6RU2QGnqve27dnLycEnyEQ==
+"@nodelib/[email protected]":
+ version "2.1.5"
+ resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5"
+ integrity sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==
+ dependencies:
+ "@nodelib/fs.stat" "2.0.5"
+ run-parallel "^1.1.9"
+
+"@nodelib/[email protected]", "@nodelib/fs.stat@^2.0.2":
+ version "2.0.5"
+ resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b"
+ integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==
+
+"@nodelib/fs.walk@^1.2.3", "@nodelib/fs.walk@^1.2.8":
+ version "1.2.8"
+ resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a"
+ integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==
+ dependencies:
+ "@nodelib/fs.scandir" "2.1.5"
+ fastq "^1.6.0"
+
+"@payloadcms/eslint-config@^0.0.1":
+ version "0.0.1"
+ resolved "https://registry.yarnpkg.com/@payloadcms/eslint-config/-/eslint-config-0.0.1.tgz#4324702ddef6c773b3f3033795a13e6b50c95a92"
+ integrity sha512-Il59+0C4E/bI6uM2hont3I+oABWkJZbfbItubje5SGMrXkymUq8jT/UZRk0eCt918bB7gihxDXx8guFnR/aNIw==
+
"@polka/url@^1.0.0-next.20":
version "1.0.0-next.21"
resolved "https://registry.yarnpkg.com/@polka/url/-/url-1.0.0-next.21.tgz#5de5a2385a35309427f6011992b544514d559aa1"
@@ -1668,6 +1745,21 @@
dependencies:
"@babel/types" "^7.3.0"
+"@types/body-parser@*":
+ version "1.19.2"
+ resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.2.tgz#aea2059e28b7658639081347ac4fab3de166e6f0"
+ integrity sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g==
+ dependencies:
+ "@types/connect" "*"
+ "@types/node" "*"
+
+"@types/connect@*":
+ version "3.4.35"
+ resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.35.tgz#5fcf6ae445e4021d1fc2219a4873cc73a3bb2ad1"
+ integrity sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==
+ dependencies:
+ "@types/node" "*"
+
"@types/escape-html@^1.0.1":
version "1.0.2"
resolved "https://registry.yarnpkg.com/@types/escape-html/-/escape-html-1.0.2.tgz#072b7b13784fb3cee9c2450c22f36405983f5e3c"
@@ -1699,6 +1791,26 @@
resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.51.tgz#cfd70924a25a3fd32b218e5e420e6897e1ac4f40"
integrity sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==
+"@types/express-serve-static-core@^4.17.33":
+ version "4.17.35"
+ resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.35.tgz#c95dd4424f0d32e525d23812aa8ab8e4d3906c4f"
+ integrity sha512-wALWQwrgiB2AWTT91CB62b6Yt0sNHpznUXeZEcnPU3DRdlDIz74x8Qg1UUYKSVFi+va5vKOLYRBI1bRKiLLKIg==
+ dependencies:
+ "@types/node" "*"
+ "@types/qs" "*"
+ "@types/range-parser" "*"
+ "@types/send" "*"
+
+"@types/express@^4.17.9":
+ version "4.17.17"
+ resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.17.tgz#01d5437f6ef9cfa8668e616e13c2f2ac9a491ae4"
+ integrity sha512-Q4FmmuLGBG58btUnfS1c1r/NQdlp3DMfGDGig8WhfpA2YRUtEkxAjkZb0yvplJGYdF1fsQ81iMDcH24sSCNC/Q==
+ dependencies:
+ "@types/body-parser" "*"
+ "@types/express-serve-static-core" "^4.17.33"
+ "@types/qs" "*"
+ "@types/serve-static" "*"
+
"@types/glob@^7.1.3":
version "7.2.0"
resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.2.0.tgz#bc1b5bf3aa92f25bd5dd39f35c57361bdce5b2eb"
@@ -1763,11 +1875,26 @@
resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.11.tgz#d421b6c527a3037f7c84433fd2c4229e016863d3"
integrity sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==
+"@types/json5@^0.0.29":
+ version "0.0.29"
+ resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"
+ integrity sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==
+
"@types/lodash@^4.14.149", "@types/lodash@^4.14.182":
version "4.14.191"
resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.191.tgz#09511e7f7cba275acd8b419ddac8da9a6a79e2fa"
integrity sha512-BdZ5BCCvho3EIXw6wUCXHe7rS53AIDPLE+JzwgT+OsJk53oBfbSmZZ7CX4VaRoN78N+TJpFi9QPlfIVNmJYWxQ==
+"@types/mime@*":
+ version "3.0.1"
+ resolved "https://registry.yarnpkg.com/@types/mime/-/mime-3.0.1.tgz#5f8f2bca0a5863cb69bc0b0acd88c96cb1d4ae10"
+ integrity sha512-Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA==
+
+"@types/mime@^1":
+ version "1.3.2"
+ resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.2.tgz#93e25bf9ee75fe0fd80b594bc4feb0e862111b5a"
+ integrity sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==
+
"@types/minimatch@*":
version "5.1.2"
resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-5.1.2.tgz#07508b45797cb81ec3f273011b054cd0755eddca"
@@ -1778,6 +1905,11 @@
resolved "https://registry.yarnpkg.com/@types/node/-/node-18.11.17.tgz#5c009e1d9c38f4a2a9d45c0b0c493fe6cdb4bcb5"
integrity sha512-HJSUJmni4BeDHhfzn6nF0sVmd1SMezP7/4F0Lq+aXzmp2xm9O7WXrUtHW/CHlYVtZUbByEvWidHqRtcJXGF2Ng==
+"@types/[email protected]":
+ version "18.11.3"
+ resolved "https://registry.yarnpkg.com/@types/node/-/node-18.11.3.tgz#78a6d7ec962b596fc2d2ec102c4dd3ef073fea6a"
+ integrity sha512-fNjDQzzOsZeKZu5NATgXUPsaFaTxeRgFXoosrHivTl8RGeV733OLawXsGfEk9a8/tySyZUyiZ6E8LcjPFZ2y1A==
+
"@types/normalize-package-data@^2.4.0":
version "2.4.1"
resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz#d3357479a0fdfdd5907fe67e17e0a85c906e1301"
@@ -1798,6 +1930,16 @@
resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.5.tgz#5f19d2b85a98e9558036f6a3cacc8819420f05cf"
integrity sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w==
+"@types/qs@*":
+ version "6.9.7"
+ resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.7.tgz#63bb7d067db107cc1e457c303bc25d511febf6cb"
+ integrity sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw==
+
+"@types/range-parser@*":
+ version "1.2.4"
+ resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.4.tgz#cd667bcfdd025213aafb7ca5915a932590acdcdc"
+ integrity sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==
+
"@types/react-redux@^7.1.20":
version "7.1.24"
resolved "https://registry.yarnpkg.com/@types/react-redux/-/react-redux-7.1.24.tgz#6caaff1603aba17b27d20f8ad073e4c077e975c0"
@@ -1817,11 +1959,41 @@
"@types/scheduler" "*"
csstype "^3.0.2"
+"@types/[email protected]":
+ version "18.0.21"
+ resolved "https://registry.yarnpkg.com/@types/react/-/react-18.0.21.tgz#b8209e9626bb00a34c76f55482697edd2b43cc67"
+ integrity sha512-7QUCOxvFgnD5Jk8ZKlUAhVcRj7GuJRjnjjiY/IUBWKgOlnvDvTMLD4RTF7NPyVmbRhNrbomZiOepg7M/2Kj1mA==
+ dependencies:
+ "@types/prop-types" "*"
+ "@types/scheduler" "*"
+ csstype "^3.0.2"
+
"@types/scheduler@*":
version "0.16.2"
resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.2.tgz#1a62f89525723dde24ba1b01b092bf5df8ad4d39"
integrity sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew==
+"@types/semver@^7.3.12":
+ version "7.5.0"
+ resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.0.tgz#591c1ce3a702c45ee15f47a42ade72c2fd78978a"
+ integrity sha512-G8hZ6XJiHnuhQKR7ZmysCeJWE08o8T0AXtk5darsCaTVsYZhhgUrq53jizaR2FvsoeCwJhlmwTjkXBY5Pn/ZHw==
+
+"@types/send@*":
+ version "0.17.1"
+ resolved "https://registry.yarnpkg.com/@types/send/-/send-0.17.1.tgz#ed4932b8a2a805f1fe362a70f4e62d0ac994e301"
+ integrity sha512-Cwo8LE/0rnvX7kIIa3QHCkcuF21c05Ayb0ZfxPiv0W8VRiZiNW/WuRupHKpqqGVGf7SUA44QSOUKaEd9lIrd/Q==
+ dependencies:
+ "@types/mime" "^1"
+ "@types/node" "*"
+
+"@types/serve-static@*":
+ version "1.15.1"
+ resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.15.1.tgz#86b1753f0be4f9a1bee68d459fcda5be4ea52b5d"
+ integrity sha512-NUo5XNiAdULrJENtJXZZ3fHtfMolzZwczzBbnAeBbqBwG+LaG6YaJtuwzwGSQZ2wsCrxjEhNNjAkKigy3n8teQ==
+ dependencies:
+ "@types/mime" "*"
+ "@types/node" "*"
+
"@types/sharp@^0.26.1":
version "0.26.1"
resolved "https://registry.yarnpkg.com/@types/sharp/-/sharp-0.26.1.tgz#92f6b3e65fb02a54ac7027cea0d17cf64f0d2958"
@@ -1859,6 +2031,90 @@
dependencies:
"@types/yargs-parser" "*"
+"@typescript-eslint/eslint-plugin@^5.51.0":
+ version "5.59.5"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.59.5.tgz#f156827610a3f8cefc56baeaa93cd4a5f32966b4"
+ integrity sha512-feA9xbVRWJZor+AnLNAr7A8JRWeZqHUf4T9tlP+TN04b05pFVhO5eN7/O93Y/1OUlLMHKbnJisgDURs/qvtqdg==
+ dependencies:
+ "@eslint-community/regexpp" "^4.4.0"
+ "@typescript-eslint/scope-manager" "5.59.5"
+ "@typescript-eslint/type-utils" "5.59.5"
+ "@typescript-eslint/utils" "5.59.5"
+ debug "^4.3.4"
+ grapheme-splitter "^1.0.4"
+ ignore "^5.2.0"
+ natural-compare-lite "^1.4.0"
+ semver "^7.3.7"
+ tsutils "^3.21.0"
+
+"@typescript-eslint/parser@^5.51.0":
+ version "5.59.5"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.59.5.tgz#63064f5eafbdbfb5f9dfbf5c4503cdf949852981"
+ integrity sha512-NJXQC4MRnF9N9yWqQE2/KLRSOLvrrlZb48NGVfBa+RuPMN6B7ZcK5jZOvhuygv4D64fRKnZI4L4p8+M+rfeQuw==
+ dependencies:
+ "@typescript-eslint/scope-manager" "5.59.5"
+ "@typescript-eslint/types" "5.59.5"
+ "@typescript-eslint/typescript-estree" "5.59.5"
+ debug "^4.3.4"
+
+"@typescript-eslint/[email protected]":
+ version "5.59.5"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.59.5.tgz#33ffc7e8663f42cfaac873de65ebf65d2bce674d"
+ integrity sha512-jVecWwnkX6ZgutF+DovbBJirZcAxgxC0EOHYt/niMROf8p4PwxxG32Qdhj/iIQQIuOflLjNkxoXyArkcIP7C3A==
+ dependencies:
+ "@typescript-eslint/types" "5.59.5"
+ "@typescript-eslint/visitor-keys" "5.59.5"
+
+"@typescript-eslint/[email protected]":
+ version "5.59.5"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.59.5.tgz#485b0e2c5b923460bc2ea6b338c595343f06fc9b"
+ integrity sha512-4eyhS7oGym67/pSxA2mmNq7X164oqDYNnZCUayBwJZIRVvKpBCMBzFnFxjeoDeShjtO6RQBHBuwybuX3POnDqg==
+ dependencies:
+ "@typescript-eslint/typescript-estree" "5.59.5"
+ "@typescript-eslint/utils" "5.59.5"
+ debug "^4.3.4"
+ tsutils "^3.21.0"
+
+"@typescript-eslint/[email protected]":
+ version "5.59.5"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.59.5.tgz#e63c5952532306d97c6ea432cee0981f6d2258c7"
+ integrity sha512-xkfRPHbqSH4Ggx4eHRIO/eGL8XL4Ysb4woL8c87YuAo8Md7AUjyWKa9YMwTL519SyDPrfEgKdewjkxNCVeJW7w==
+
+"@typescript-eslint/[email protected]":
+ version "5.59.5"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.59.5.tgz#9b252ce55dd765e972a7a2f99233c439c5101e42"
+ integrity sha512-+XXdLN2CZLZcD/mO7mQtJMvCkzRfmODbeSKuMY/yXbGkzvA9rJyDY5qDYNoiz2kP/dmyAxXquL2BvLQLJFPQIg==
+ dependencies:
+ "@typescript-eslint/types" "5.59.5"
+ "@typescript-eslint/visitor-keys" "5.59.5"
+ debug "^4.3.4"
+ globby "^11.1.0"
+ is-glob "^4.0.3"
+ semver "^7.3.7"
+ tsutils "^3.21.0"
+
+"@typescript-eslint/[email protected]":
+ version "5.59.5"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.59.5.tgz#15b3eb619bb223302e60413adb0accd29c32bcae"
+ integrity sha512-sCEHOiw+RbyTii9c3/qN74hYDPNORb8yWCoPLmB7BIflhplJ65u2PBpdRla12e3SSTJ2erRkPjz7ngLHhUegxA==
+ dependencies:
+ "@eslint-community/eslint-utils" "^4.2.0"
+ "@types/json-schema" "^7.0.9"
+ "@types/semver" "^7.3.12"
+ "@typescript-eslint/scope-manager" "5.59.5"
+ "@typescript-eslint/types" "5.59.5"
+ "@typescript-eslint/typescript-estree" "5.59.5"
+ eslint-scope "^5.1.1"
+ semver "^7.3.7"
+
+"@typescript-eslint/[email protected]":
+ version "5.59.5"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.59.5.tgz#ba5b8d6791a13cf9fea6716af1e7626434b29b9b"
+ integrity sha512-qL+Oz+dbeBRTeyJTIy0eniD3uvqU7x+y1QceBismZ41hd4aBSRh8UAw4pZP0+XzLuPZmx4raNMq/I+59W2lXKA==
+ dependencies:
+ "@typescript-eslint/types" "5.59.5"
+ eslint-visitor-keys "^3.3.0"
+
"@webassemblyjs/[email protected]":
version "1.11.1"
resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.1.tgz#2bfd767eae1a6996f432ff7e8d7fc75679c0b6a7"
@@ -2012,6 +2268,11 @@ abab@^2.0.3, abab@^2.0.5:
resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.6.tgz#41b80f2c871d19686216b82309231cfd3cb3d291"
integrity sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==
+abbrev@1:
+ version "1.1.1"
+ resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
+ integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
+
abort-controller@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/abort-controller/-/abort-controller-3.0.0.tgz#eaf54d53b62bae4138e809ca225c8439a6efb392"
@@ -2040,6 +2301,11 @@ acorn-import-assertions@^1.7.6:
resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz#ba2b5939ce62c238db6d93d81c9b111b29b855e9"
integrity sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==
+acorn-jsx@^5.3.2:
+ version "5.3.2"
+ resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
+ integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
+
acorn-walk@^7.1.1:
version "7.2.0"
resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz#0de889a601203909b0fbe07b8938dc21d2e967bc"
@@ -2060,6 +2326,11 @@ acorn@^8.0.4, acorn@^8.2.4, acorn@^8.5.0, acorn@^8.7.1:
resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.1.tgz#0a3f9cbecc4ec3bea6f0a80b66ae8dd2da250b73"
integrity sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==
+acorn@^8.8.0:
+ version "8.8.2"
+ resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.2.tgz#1b2f25db02af965399b9776b0c2c391276d37c4a"
+ integrity sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==
+
agent-base@6:
version "6.0.2"
resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77"
@@ -2086,7 +2357,7 @@ ajv-keywords@^5.0.0:
dependencies:
fast-deep-equal "^3.1.3"
-ajv@^6.12.4, ajv@^6.12.5:
+ajv@^6.10.0, ajv@^6.12.4, ajv@^6.12.5:
version "6.12.6"
resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
@@ -2158,6 +2429,11 @@ anymatch@^3.0.3, anymatch@~3.1.2:
normalize-path "^3.0.0"
picomatch "^2.0.4"
+arg@^4.1.0:
+ version "4.1.3"
+ resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089"
+ integrity sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==
+
argparse@^1.0.7:
version "1.0.10"
resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
@@ -2190,11 +2466,37 @@ [email protected]:
resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
integrity sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==
+array-includes@^3.1.4:
+ version "3.1.6"
+ resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.6.tgz#9e9e720e194f198266ba9e18c29e6a9b0e4b225f"
+ integrity sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw==
+ dependencies:
+ call-bind "^1.0.2"
+ define-properties "^1.1.4"
+ es-abstract "^1.20.4"
+ get-intrinsic "^1.1.3"
+ is-string "^1.0.7"
+
+array-union@^2.1.0:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
+ integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==
+
array-unique@^0.3.2:
version "0.3.2"
resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
integrity sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==
+array.prototype.flat@^1.2.5:
+ version "1.3.1"
+ resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz#ffc6576a7ca3efc2f46a143b9d1dda9b4b3cf5e2"
+ integrity sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA==
+ dependencies:
+ call-bind "^1.0.2"
+ define-properties "^1.1.4"
+ es-abstract "^1.20.4"
+ es-shim-unscopables "^1.0.0"
+
array.prototype.reduce@^1.0.5:
version "1.0.5"
resolved "https://registry.yarnpkg.com/array.prototype.reduce/-/array.prototype.reduce-1.0.5.tgz#6b20b0daa9d9734dd6bc7ea66b5bbce395471eac"
@@ -2658,7 +2960,7 @@ [email protected]:
resolved "https://registry.yarnpkg.com/charenc/-/charenc-0.0.2.tgz#c0a1d2f3a7092e03774bfa83f14c0fc5790a8667"
integrity sha512-yrLQ/yVUFXkzg7EDQsPieE/53+0RlaWTs+wBrvW36cyilJ2SaDWfl4Yj7MtLTXleV9uEKefbAGUPv2/iWSooRA==
-"chokidar@>=3.0.0 <4.0.0", chokidar@^3.4.0:
+"chokidar@>=3.0.0 <4.0.0", chokidar@^3.4.0, chokidar@^3.5.2:
version "3.5.3"
resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd"
integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==
@@ -2735,6 +3037,15 @@ cliui@^6.0.0:
strip-ansi "^6.0.0"
wrap-ansi "^6.2.0"
+cliui@^7.0.2:
+ version "7.0.4"
+ resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f"
+ integrity sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==
+ dependencies:
+ string-width "^4.2.0"
+ strip-ansi "^6.0.0"
+ wrap-ansi "^7.0.0"
+
clone-deep@^4.0.1:
version "4.0.1"
resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387"
@@ -2942,6 +3253,19 @@ copy-descriptor@^0.1.0:
resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
integrity sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw==
+copyfiles@^2.4.1:
+ version "2.4.1"
+ resolved "https://registry.yarnpkg.com/copyfiles/-/copyfiles-2.4.1.tgz#d2dcff60aaad1015f09d0b66e7f0f1c5cd3c5da5"
+ integrity sha512-fereAvAvxDrQDOXybk3Qu3dPbOoKoysFMWtkY3mv5BsL8//OSZVL5DCLYqgRfY5cWirgRzlC+WSrxp6Bo3eNZg==
+ dependencies:
+ glob "^7.0.5"
+ minimatch "^3.0.3"
+ mkdirp "^1.0.4"
+ noms "0.0.0"
+ through2 "^2.0.1"
+ untildify "^4.0.0"
+ yargs "^16.1.0"
+
core-js-compat@^3.25.1:
version "3.26.1"
resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.26.1.tgz#0e710b09ebf689d719545ac36e49041850f943df"
@@ -2954,6 +3278,11 @@ core-js@^3.26.0:
resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.26.1.tgz#7a9816dabd9ee846c1c0fe0e8fcad68f3709134e"
integrity sha512-21491RRQVzUn0GGM9Z1Jrpr6PNPxPi+Za8OM9q4tksTSnlbXXGKK1nXNg/QvwFYettXvSX6zWKCtHHfjN4puyA==
+core-util-is@~1.0.0:
+ version "1.0.3"
+ resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85"
+ integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==
+
cosmiconfig@^6.0.0:
version "6.0.0"
resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-6.0.0.tgz#da4fee853c52f6b1e6935f41c1a2fc50bd4a9982"
@@ -2986,6 +3315,18 @@ create-emotion@^10.0.14, create-emotion@^10.0.27:
"@emotion/sheet" "0.9.4"
"@emotion/utils" "0.11.3"
+create-require@^1.1.0:
+ version "1.1.1"
+ resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333"
+ integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==
+
+cross-env@^7.0.3:
+ version "7.0.3"
+ resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-7.0.3.tgz#865264b29677dc015ba8418918965dd232fc54cf"
+ integrity sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==
+ dependencies:
+ cross-spawn "^7.0.1"
+
cross-spawn@^6.0.0:
version "6.0.5"
resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
@@ -2997,7 +3338,7 @@ cross-spawn@^6.0.0:
shebang-command "^1.2.0"
which "^1.2.9"
-cross-spawn@^7.0.0, cross-spawn@^7.0.3:
+cross-spawn@^7.0.0, cross-spawn@^7.0.1, cross-spawn@^7.0.2, cross-spawn@^7.0.3:
version "7.0.3"
resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
@@ -3231,7 +3572,7 @@ debounce-fn@^4.0.0:
dependencies:
mimic-fn "^3.0.0"
-debug@2, [email protected], debug@^2.2.0, debug@^2.3.3:
+debug@2, [email protected], debug@^2.2.0, debug@^2.3.3, debug@^2.6.9:
version "2.6.9"
resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
@@ -3245,14 +3586,14 @@ [email protected]:
dependencies:
ms "2.0.0"
-debug@4, [email protected], debug@^4.1.0, debug@^4.1.1:
+debug@4, [email protected], debug@^4.1.0, debug@^4.1.1, debug@^4.3.2, debug@^4.3.4:
version "4.3.4"
resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
dependencies:
ms "2.1.2"
-debug@^3.2.6:
+debug@^3.2.6, debug@^3.2.7:
version "3.2.7"
resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a"
integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==
@@ -3319,7 +3660,7 @@ deep-extend@^0.6.0:
resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==
-deep-is@~0.1.3:
+deep-is@^0.1.3, deep-is@~0.1.3:
version "0.1.4"
resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831"
integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==
@@ -3404,11 +3745,32 @@ diff@^4.0.1:
resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d"
integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==
+dir-glob@^3.0.1:
+ version "3.0.1"
+ resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f"
+ integrity sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==
+ dependencies:
+ path-type "^4.0.0"
+
direction@^1.0.3:
version "1.0.4"
resolved "https://registry.yarnpkg.com/direction/-/direction-1.0.4.tgz#2b86fb686967e987088caf8b89059370d4837442"
integrity sha512-GYqKi1aH7PJXxdhTeZBFrg8vUBeKXi+cNprXsC1kpJcbcVnV9wBsrOu1cQEdG0WeQwlfHiy3XvnKfIrJ2R0NzQ==
+doctrine@^2.1.0:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d"
+ integrity sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==
+ dependencies:
+ esutils "^2.0.2"
+
+doctrine@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961"
+ integrity sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==
+ dependencies:
+ esutils "^2.0.2"
+
dom-converter@^0.2.0:
version "0.2.0"
resolved "https://registry.yarnpkg.com/dom-converter/-/dom-converter-0.2.0.tgz#6721a9daee2e293682955b6afe416771627bb768"
@@ -3623,6 +3985,13 @@ es-module-lexer@^0.9.0:
resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-0.9.3.tgz#6f13db00cc38417137daf74366f535c8eb438f19"
integrity sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==
+es-shim-unscopables@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz#702e632193201e3edf8713635d083d378e510241"
+ integrity sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==
+ dependencies:
+ has "^1.0.3"
+
es-to-primitive@^1.2.1:
version "1.2.1"
resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a"
@@ -3688,6 +4057,11 @@ escape-string-regexp@^2.0.0:
resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344"
integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==
+escape-string-regexp@^4.0.0:
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
+ integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
+
escodegen@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-2.0.0.tgz#5e32b12833e8aa8fa35e1bf0befa89380484c7dd"
@@ -3700,7 +4074,74 @@ escodegen@^2.0.0:
optionalDependencies:
source-map "~0.6.1"
[email protected]:
+eslint-config-prettier@^8.5.0:
+ version "8.8.0"
+ resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.8.0.tgz#bfda738d412adc917fd7b038857110efe98c9348"
+ integrity sha512-wLbQiFre3tdGgpDv67NQKnJuTlcUVYHas3k+DZCc2U2BadthoEY4B7hLPvAxaqdyOGCzuLfii2fqGph10va7oA==
+
+eslint-import-resolver-node@^0.3.6:
+ version "0.3.7"
+ resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.7.tgz#83b375187d412324a1963d84fa664377a23eb4d7"
+ integrity sha512-gozW2blMLJCeFpBwugLTGyvVjNoeo1knonXAcatC6bjPBZitotxdWf7Gimr25N4c0AAOo4eOUfaG82IJPDpqCA==
+ dependencies:
+ debug "^3.2.7"
+ is-core-module "^2.11.0"
+ resolve "^1.22.1"
+
+eslint-module-utils@^2.7.2:
+ version "2.8.0"
+ resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.8.0.tgz#e439fee65fc33f6bba630ff621efc38ec0375c49"
+ integrity sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw==
+ dependencies:
+ debug "^3.2.7"
+
+eslint-plugin-filenames@^1.3.2:
+ version "1.3.2"
+ resolved "https://registry.yarnpkg.com/eslint-plugin-filenames/-/eslint-plugin-filenames-1.3.2.tgz#7094f00d7aefdd6999e3ac19f72cea058e590cf7"
+ integrity sha512-tqxJTiEM5a0JmRCUYQmxw23vtTxrb2+a3Q2mMOPhFxvt7ZQQJmdiuMby9B/vUAuVMghyP7oET+nIf6EO6CBd/w==
+ dependencies:
+ lodash.camelcase "4.3.0"
+ lodash.kebabcase "4.1.1"
+ lodash.snakecase "4.1.1"
+ lodash.upperfirst "4.3.1"
+
[email protected]:
+ version "2.25.4"
+ resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.25.4.tgz#322f3f916a4e9e991ac7af32032c25ce313209f1"
+ integrity sha512-/KJBASVFxpu0xg1kIBn9AUa8hQVnszpwgE7Ld0lKAlx7Ie87yzEzCgSkekt+le/YVhiaosO4Y14GDAOc41nfxA==
+ dependencies:
+ array-includes "^3.1.4"
+ array.prototype.flat "^1.2.5"
+ debug "^2.6.9"
+ doctrine "^2.1.0"
+ eslint-import-resolver-node "^0.3.6"
+ eslint-module-utils "^2.7.2"
+ has "^1.0.3"
+ is-core-module "^2.8.0"
+ is-glob "^4.0.3"
+ minimatch "^3.0.4"
+ object.values "^1.1.5"
+ resolve "^1.20.0"
+ tsconfig-paths "^3.12.0"
+
+eslint-plugin-prettier@^4.0.0:
+ version "4.2.1"
+ resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-4.2.1.tgz#651cbb88b1dab98bfd42f017a12fa6b2d993f94b"
+ integrity sha512-f/0rXLXUt0oFYs8ra4w49wYZBG5GKZpAYsJSm6rnYL5uVDjd+zowwMwVZHnAjf4edNrKpCDYfXDgmRE/Ak7QyQ==
+ dependencies:
+ prettier-linter-helpers "^1.0.0"
+
+eslint-plugin-react-hooks@^4.6.0:
+ version "4.6.0"
+ resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.0.tgz#4c3e697ad95b77e93f8646aaa1630c1ba607edd3"
+ integrity sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g==
+
+eslint-plugin-simple-import-sort@^10.0.0:
+ version "10.0.0"
+ resolved "https://registry.yarnpkg.com/eslint-plugin-simple-import-sort/-/eslint-plugin-simple-import-sort-10.0.0.tgz#cc4ceaa81ba73252427062705b64321946f61351"
+ integrity sha512-AeTvO9UCMSNzIHRkg8S6c3RPy5YEwKWSQPx3DYghLedo2ZQxowPFLGDN1AZ2evfg6r6mjBSZSLxLFsWSu3acsw==
+
[email protected], eslint-scope@^5.1.1:
version "5.1.1"
resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c"
integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==
@@ -3708,11 +4149,86 @@ [email protected]:
esrecurse "^4.3.0"
estraverse "^4.1.1"
+eslint-scope@^7.2.0:
+ version "7.2.0"
+ resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.2.0.tgz#f21ebdafda02352f103634b96dd47d9f81ca117b"
+ integrity sha512-DYj5deGlHBfMt15J7rdtyKNq/Nqlv5KfU4iodrQ019XESsRnwXH9KAE0y3cwtUHDo2ob7CypAnCqefh6vioWRw==
+ dependencies:
+ esrecurse "^4.3.0"
+ estraverse "^5.2.0"
+
+eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1:
+ version "3.4.1"
+ resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz#c22c48f48942d08ca824cc526211ae400478a994"
+ integrity sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA==
+
+eslint@^8.19.0:
+ version "8.40.0"
+ resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.40.0.tgz#a564cd0099f38542c4e9a2f630fa45bf33bc42a4"
+ integrity sha512-bvR+TsP9EHL3TqNtj9sCNJVAFK3fBN8Q7g5waghxyRsPLIMwL73XSKnZFK0hk/O2ANC+iAoq6PWMQ+IfBAJIiQ==
+ dependencies:
+ "@eslint-community/eslint-utils" "^4.2.0"
+ "@eslint-community/regexpp" "^4.4.0"
+ "@eslint/eslintrc" "^2.0.3"
+ "@eslint/js" "8.40.0"
+ "@humanwhocodes/config-array" "^0.11.8"
+ "@humanwhocodes/module-importer" "^1.0.1"
+ "@nodelib/fs.walk" "^1.2.8"
+ ajv "^6.10.0"
+ chalk "^4.0.0"
+ cross-spawn "^7.0.2"
+ debug "^4.3.2"
+ doctrine "^3.0.0"
+ escape-string-regexp "^4.0.0"
+ eslint-scope "^7.2.0"
+ eslint-visitor-keys "^3.4.1"
+ espree "^9.5.2"
+ esquery "^1.4.2"
+ esutils "^2.0.2"
+ fast-deep-equal "^3.1.3"
+ file-entry-cache "^6.0.1"
+ find-up "^5.0.0"
+ glob-parent "^6.0.2"
+ globals "^13.19.0"
+ grapheme-splitter "^1.0.4"
+ ignore "^5.2.0"
+ import-fresh "^3.0.0"
+ imurmurhash "^0.1.4"
+ is-glob "^4.0.0"
+ is-path-inside "^3.0.3"
+ js-sdsl "^4.1.4"
+ js-yaml "^4.1.0"
+ json-stable-stringify-without-jsonify "^1.0.1"
+ levn "^0.4.1"
+ lodash.merge "^4.6.2"
+ minimatch "^3.1.2"
+ natural-compare "^1.4.0"
+ optionator "^0.9.1"
+ strip-ansi "^6.0.1"
+ strip-json-comments "^3.1.0"
+ text-table "^0.2.0"
+
+espree@^9.5.2:
+ version "9.5.2"
+ resolved "https://registry.yarnpkg.com/espree/-/espree-9.5.2.tgz#e994e7dc33a082a7a82dceaf12883a829353215b"
+ integrity sha512-7OASN1Wma5fum5SrNhFMAMJxOUAbhyfQ8dQ//PJaJbNw0URTPWqIghHWt1MmAANKhHZIYOHruW4Kw4ruUWOdGw==
+ dependencies:
+ acorn "^8.8.0"
+ acorn-jsx "^5.3.2"
+ eslint-visitor-keys "^3.4.1"
+
esprima@^4.0.0, esprima@^4.0.1:
version "4.0.1"
resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
+esquery@^1.4.2:
+ version "1.5.0"
+ resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.5.0.tgz#6ce17738de8577694edd7361c57182ac8cb0db0b"
+ integrity sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==
+ dependencies:
+ estraverse "^5.1.0"
+
esrecurse@^4.3.0:
version "4.3.0"
resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921"
@@ -3725,7 +4241,7 @@ estraverse@^4.1.1:
resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
-estraverse@^5.2.0:
+estraverse@^5.1.0, estraverse@^5.2.0:
version "5.3.0"
resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123"
integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==
@@ -3931,12 +4447,28 @@ fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
+fast-diff@^1.1.2:
+ version "1.2.0"
+ resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.2.0.tgz#73ee11982d86caaf7959828d519cfe927fac5f03"
+ integrity sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==
+
+fast-glob@^3.2.9:
+ version "3.2.12"
+ resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.12.tgz#7f39ec99c2e6ab030337142da9e0c18f37afae80"
+ integrity sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==
+ dependencies:
+ "@nodelib/fs.stat" "^2.0.2"
+ "@nodelib/fs.walk" "^1.2.3"
+ glob-parent "^5.1.2"
+ merge2 "^1.3.0"
+ micromatch "^4.0.4"
+
fast-json-stable-stringify@^2.0.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
-fast-levenshtein@~2.0.6:
+fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.6:
version "2.0.6"
resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==
@@ -3956,6 +4488,13 @@ fastest-levenshtein@^1.0.12:
resolved "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz#210e61b6ff181de91ea9b3d1b84fdedd47e034e5"
integrity sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==
+fastq@^1.6.0:
+ version "1.15.0"
+ resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.15.0.tgz#d04d07c6a2a68fe4599fea8d2e103a937fae6b3a"
+ integrity sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==
+ dependencies:
+ reusify "^1.0.4"
+
fb-watchman@^2.0.0:
version "2.0.2"
resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.2.tgz#e9524ee6b5c77e9e5001af0f85f3adbb8623255c"
@@ -3963,6 +4502,13 @@ fb-watchman@^2.0.0:
dependencies:
bser "2.1.1"
+file-entry-cache@^6.0.1:
+ version "6.0.1"
+ resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027"
+ integrity sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==
+ dependencies:
+ flat-cache "^3.0.4"
+
file-loader@^6.2.0:
version "6.2.0"
resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-6.2.0.tgz#baef7cf8e1840df325e4390b4484879480eebe4d"
@@ -4048,6 +4594,22 @@ find-up@^3.0.0:
dependencies:
locate-path "^3.0.0"
+find-up@^5.0.0:
+ version "5.0.0"
+ resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc"
+ integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==
+ dependencies:
+ locate-path "^6.0.0"
+ path-exists "^4.0.0"
+
+flat-cache@^3.0.4:
+ version "3.0.4"
+ resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz#61b0338302b2fe9f957dcc32fc2a87f1c3048b11"
+ integrity sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==
+ dependencies:
+ flatted "^3.1.0"
+ rimraf "^3.0.2"
+
flatley@^5.2.0:
version "5.2.0"
resolved "https://registry.yarnpkg.com/flatley/-/flatley-5.2.0.tgz#3a645837c669be8d978335e37ae3afffcfbdedb7"
@@ -4060,6 +4622,11 @@ flatstr@^1.0.12:
resolved "https://registry.yarnpkg.com/flatstr/-/flatstr-1.0.12.tgz#c2ba6a08173edbb6c9640e3055b95e287ceb5931"
integrity sha512-4zPxDyhCyiN2wIAtSLI6gc82/EjqZc1onI4Mz/l0pWrAlsSfYH/2ZIcU+e3oA2wDwbzIWNKwa23F8rh6+DRWkw==
+flatted@^3.1.0:
+ version "3.2.7"
+ resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.7.tgz#609f39207cb614b89d0765b477cb2d437fbf9787"
+ integrity sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==
+
focus-trap@^6.9.2:
version "6.9.4"
resolved "https://registry.yarnpkg.com/focus-trap/-/focus-trap-6.9.4.tgz#436da1a1d935c48b97da63cd8f361c6f3aa16444"
@@ -4174,7 +4741,7 @@ gensync@^1.0.0-beta.2:
resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==
-get-caller-file@^2.0.1:
+get-caller-file@^2.0.1, get-caller-file@^2.0.5:
version "2.0.5"
resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
@@ -4230,13 +4797,20 @@ [email protected]:
resolved "https://registry.yarnpkg.com/github-from-package/-/github-from-package-0.0.0.tgz#97fb5d96bfde8973313f20e8288ef9a167fa64ce"
integrity sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw==
-glob-parent@~5.1.2:
+glob-parent@^5.1.2, glob-parent@~5.1.2:
version "5.1.2"
resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
dependencies:
is-glob "^4.0.1"
+glob-parent@^6.0.2:
+ version "6.0.2"
+ resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3"
+ integrity sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==
+ dependencies:
+ is-glob "^4.0.3"
+
glob-promise@^4.2.2:
version "4.2.2"
resolved "https://registry.yarnpkg.com/glob-promise/-/glob-promise-4.2.2.tgz#15f44bcba0e14219cd93af36da6bb905ff007877"
@@ -4249,7 +4823,7 @@ glob-to-regexp@^0.4.1:
resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e"
integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==
-glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.2.0:
+glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.2.0:
version "7.2.3"
resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
@@ -4277,6 +4851,25 @@ globals@^11.1.0:
resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
+globals@^13.19.0:
+ version "13.20.0"
+ resolved "https://registry.yarnpkg.com/globals/-/globals-13.20.0.tgz#ea276a1e508ffd4f1612888f9d1bad1e2717bf82"
+ integrity sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==
+ dependencies:
+ type-fest "^0.20.2"
+
+globby@^11.1.0:
+ version "11.1.0"
+ resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b"
+ integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==
+ dependencies:
+ array-union "^2.1.0"
+ dir-glob "^3.0.1"
+ fast-glob "^3.2.9"
+ ignore "^5.2.0"
+ merge2 "^1.4.1"
+ slash "^3.0.0"
+
gopd@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.0.1.tgz#29ff76de69dac7489b7c0918a5788e56477c332c"
@@ -4289,6 +4882,11 @@ graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4,
resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c"
integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==
+grapheme-splitter@^1.0.4:
+ version "1.0.4"
+ resolved "https://registry.yarnpkg.com/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz#9cf3a665c6247479896834af35cf1dbb4400767e"
+ integrity sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==
+
graphql-playground-html@^1.6.30:
version "1.6.30"
resolved "https://registry.yarnpkg.com/graphql-playground-html/-/graphql-playground-html-1.6.30.tgz#14c2a8eb7fc17bfeb1a746bbb28a11e34bf0b391"
@@ -4603,6 +5201,16 @@ ieee754@^1.1.13, ieee754@^1.2.1:
resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
+ignore-by-default@^1.0.1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/ignore-by-default/-/ignore-by-default-1.0.1.tgz#48ca6d72f6c6a3af00a9ad4ae6876be3889e2b09"
+ integrity sha512-Ius2VYcGNk7T90CppJqcIkS5ooHUZyIQK+ClZfMfMNFEF9VSE73Fq+906u/CWu92x4gzZMWOwfFYckPObzdEbA==
+
+ignore@^5.2.0:
+ version "5.2.4"
+ resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.4.tgz#a291c0c6178ff1b960befe47fcdec301674a6324"
+ integrity sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==
+
immer@^9.0.6:
version "9.0.16"
resolved "https://registry.yarnpkg.com/immer/-/immer-9.0.16.tgz#8e7caab80118c2b54b37ad43e05758cdefad0198"
@@ -4613,7 +5221,7 @@ immutable@^4.0.0:
resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.2.1.tgz#8a4025691018c560a40c67e43d698f816edc44d4"
integrity sha512-7WYV7Q5BTs0nlQm7tl92rDYYoyELLKHoDMBKhrxEoiV4mrfVdRz8hzPiYOzH7yWjzoVEamxRuAqhxL2PLRwZYQ==
-import-fresh@^3.1.0, import-fresh@^3.2.1:
+import-fresh@^3.0.0, import-fresh@^3.1.0, import-fresh@^3.2.1:
version "3.3.0"
resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b"
integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==
@@ -4642,7 +5250,7 @@ inflight@^1.0.4:
once "^1.3.0"
wrappy "1"
-inherits@2, [email protected], inherits@^2.0.3, inherits@^2.0.4:
+inherits@2, [email protected], inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.1, inherits@~2.0.3:
version "2.0.4"
resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
@@ -4747,6 +5355,13 @@ is-ci@^2.0.0:
dependencies:
ci-info "^2.0.0"
+is-core-module@^2.11.0, is-core-module@^2.8.0:
+ version "2.12.0"
+ resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.12.0.tgz#36ad62f6f73c8253fd6472517a12483cf03e7ec4"
+ integrity sha512-RECHCBCd/viahWmwj6enj19sKbHfJrddi/6cBDsNTKbNq0f7VeaUkBo60BqzvPqo/W54ChS62Z5qyun7cfOMqQ==
+ dependencies:
+ has "^1.0.3"
+
is-core-module@^2.9.0:
version "2.11.0"
resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.11.0.tgz#ad4cb3e3863e814523c96f3f58d26cc570ff0144"
@@ -4825,7 +5440,7 @@ is-generator-fn@^2.0.0:
resolved "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-2.1.0.tgz#7d140adc389aaf3011a8f2a2a4cfa6faadffb118"
integrity sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==
-is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1:
+is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1:
version "4.0.3"
resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084"
integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==
@@ -4876,6 +5491,11 @@ is-obj@^2.0.0:
resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982"
integrity sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==
+is-path-inside@^3.0.3:
+ version "3.0.3"
+ resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283"
+ integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==
+
is-plain-object@*, is-plain-object@^5.0.0:
version "5.0.0"
resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-5.0.0.tgz#4427f50ab3429e9025ea7d52e9043a9ef4159344"
@@ -4995,7 +5615,7 @@ [email protected]:
resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
integrity sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==
[email protected]:
[email protected], isarray@~1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
integrity sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==
@@ -5480,6 +6100,11 @@ joycon@^3.1.1:
resolved "https://registry.yarnpkg.com/joycon/-/joycon-3.1.1.tgz#bce8596d6ae808f8b68168f5fc69280996894f03"
integrity sha512-34wB/Y7MW7bzjKRjUKTa46I2Z7eV62Rkhva+KkopW7Qvv/OSWBqvkSY7vusOPrNuZcUG3tApvdVgNB8POj3SPw==
+js-sdsl@^4.1.4:
+ version "4.4.0"
+ resolved "https://registry.yarnpkg.com/js-sdsl/-/js-sdsl-4.4.0.tgz#8b437dbe642daa95760400b602378ed8ffea8430"
+ integrity sha512-FfVSdx6pJ41Oa+CF7RDaFmTnCaFhua+SNYQX74riGOpl96x+2jQCqEfQ2bnXu/5DPCqlRuiqyvTJM0Qjz26IVg==
+
"js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
@@ -5583,6 +6208,18 @@ json-schema-typed@^7.0.3:
resolved "https://registry.yarnpkg.com/json-schema-typed/-/json-schema-typed-7.0.3.tgz#23ff481b8b4eebcd2ca123b4fa0409e66469a2d9"
integrity sha512-7DE8mpG+/fVw+dTpjbxnx47TaMnDfOI1jwft9g1VybltZCduyRQPJPvc+zzKY9WPHxhPWczyFuYa6I8Mw4iU5A==
+json-stable-stringify-without-jsonify@^1.0.1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
+ integrity sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==
+
+json5@^1.0.2:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.2.tgz#63d98d60f21b313b77c4d6da18bfa69d80e1d593"
+ integrity sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==
+ dependencies:
+ minimist "^1.2.0"
+
json5@^2.1.2, json5@^2.2.1:
version "2.2.2"
resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.2.tgz#64471c5bdcc564c18f7c1d4df2e2297f2457c5ab"
@@ -5679,6 +6316,14 @@ leven@^3.1.0:
resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2"
integrity sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==
+levn@^0.4.1:
+ version "0.4.1"
+ resolved "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade"
+ integrity sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==
+ dependencies:
+ prelude-ls "^1.2.1"
+ type-check "~0.4.0"
+
levn@~0.3.0:
version "0.3.0"
resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
@@ -5726,6 +6371,18 @@ locate-path@^5.0.0:
dependencies:
p-locate "^4.1.0"
+locate-path@^6.0.0:
+ version "6.0.0"
+ resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286"
+ integrity sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==
+ dependencies:
+ p-locate "^5.0.0"
+
[email protected]:
+ version "4.3.0"
+ resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6"
+ integrity sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==
+
lodash.debounce@^4.0.8:
version "4.0.8"
resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
@@ -5766,21 +6423,41 @@ lodash.isstring@^4.0.1:
resolved "https://registry.yarnpkg.com/lodash.isstring/-/lodash.isstring-4.0.1.tgz#d527dfb5456eca7cc9bb95d5daeaf88ba54a5451"
integrity sha512-0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw==
[email protected]:
+ version "4.1.1"
+ resolved "https://registry.yarnpkg.com/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz#8489b1cb0d29ff88195cceca448ff6d6cc295c36"
+ integrity sha512-N8XRTIMMqqDgSy4VLKPnJ/+hpGZN+PHQiJnSenYqPaVV/NCqEogTnAdZLQiGKhxX+JCs8waWq2t1XHWKOmlY8g==
+
lodash.memoize@^4.1.2:
version "4.1.2"
resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
integrity sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==
+lodash.merge@^4.6.2:
+ version "4.6.2"
+ resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
+ integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==
+
lodash.once@^4.0.0:
version "4.1.1"
resolved "https://registry.yarnpkg.com/lodash.once/-/lodash.once-4.1.1.tgz#0dd3971213c7c56df880977d504c88fb471a97ac"
integrity sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg==
[email protected]:
+ version "4.1.1"
+ resolved "https://registry.yarnpkg.com/lodash.snakecase/-/lodash.snakecase-4.1.1.tgz#39d714a35357147837aefd64b5dcbb16becd8f8d"
+ integrity sha512-QZ1d4xoBHYUeuouhEq3lk3Uq7ldgyFXGBhg04+oRLnIz8o9T65Eh+8YdroUwn846zchkA9yDsDl5CVVaV2nqYw==
+
lodash.uniq@^4.5.0:
version "4.5.0"
resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
integrity sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ==
[email protected]:
+ version "4.3.1"
+ resolved "https://registry.yarnpkg.com/lodash.upperfirst/-/lodash.upperfirst-4.3.1.tgz#1365edf431480481ef0d1c68957a5ed99d49f7ce"
+ integrity sha512-sReKOYJIJf74dhJONhU4e0/shzi1trVbSWDOhKYE5XV2O+H7Sb2Dihwuc7xWxVl+DgFPyTqIN3zMfT9cq5iWDg==
+
lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.4, lodash@^4.7.0:
version "4.17.21"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
@@ -5836,6 +6513,11 @@ make-dir@^3.0.0, make-dir@^3.0.2, make-dir@^3.1.0:
dependencies:
semver "^6.0.0"
+make-error@^1.1.1:
+ version "1.3.6"
+ resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2"
+ integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==
+
[email protected]:
version "1.0.12"
resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.12.tgz#3e5dd2079a82e812e983cc6610c4a2cb0eaa801a"
@@ -5930,6 +6612,11 @@ merge-stream@^2.0.0:
resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==
+merge2@^1.3.0, merge2@^1.4.1:
+ version "1.4.1"
+ resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
+ integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
+
method-override@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/method-override/-/method-override-3.0.0.tgz#6ab0d5d574e3208f15b0c9cf45ab52000468d7a2"
@@ -5969,7 +6656,7 @@ micromatch@^3.1.4:
snapdragon "^0.8.1"
to-regex "^3.0.2"
-micromatch@^4.0.2:
+micromatch@^4.0.2, micromatch@^4.0.4:
version "4.0.5"
resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6"
integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==
@@ -6018,7 +6705,7 @@ [email protected]:
schema-utils "^3.0.0"
webpack-sources "^1.1.0"
-minimatch@^3.0.4, minimatch@^3.1.1:
+minimatch@^3.0.3, minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2:
version "3.1.2"
resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
@@ -6166,6 +6853,11 @@ napi-build-utils@^1.0.1:
resolved "https://registry.yarnpkg.com/napi-build-utils/-/napi-build-utils-1.0.2.tgz#b1fddc0b2c46e380a0b7a76f984dd47c41a13806"
integrity sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg==
+natural-compare-lite@^1.4.0:
+ version "1.4.0"
+ resolved "https://registry.yarnpkg.com/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz#17b09581988979fddafe0201e931ba933c96cbb4"
+ integrity sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==
+
natural-compare@^1.4.0:
version "1.4.0"
resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
@@ -6262,6 +6954,37 @@ nodemailer@^6.4.2:
resolved "https://registry.yarnpkg.com/nodemailer/-/nodemailer-6.8.0.tgz#804bcc5256ee5523bc914506ee59f8de8f0b1cd5"
integrity sha512-EjYvSmHzekz6VNkNd12aUqAco+bOkRe3Of5jVhltqKhEsjw/y0PYPJfp83+s9Wzh1dspYAkUW/YNQ350NATbSQ==
+nodemon@^2.0.6:
+ version "2.0.22"
+ resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-2.0.22.tgz#182c45c3a78da486f673d6c1702e00728daf5258"
+ integrity sha512-B8YqaKMmyuCO7BowF1Z1/mkPqLk6cs/l63Ojtd6otKjMx47Dq1utxfRxcavH1I7VSaL8n5BUaoutadnsX3AAVQ==
+ dependencies:
+ chokidar "^3.5.2"
+ debug "^3.2.7"
+ ignore-by-default "^1.0.1"
+ minimatch "^3.1.2"
+ pstree.remy "^1.1.8"
+ semver "^5.7.1"
+ simple-update-notifier "^1.0.7"
+ supports-color "^5.5.0"
+ touch "^3.1.0"
+ undefsafe "^2.0.5"
+
[email protected]:
+ version "0.0.0"
+ resolved "https://registry.yarnpkg.com/noms/-/noms-0.0.0.tgz#da8ebd9f3af9d6760919b27d9cdc8092a7332859"
+ integrity sha512-lNDU9VJaOPxUmXcLb+HQFeUgQQPtMI24Gt6hgfuMHRJgMRHMF/qZ4HJD3GDru4sSw9IQl2jPjAYnQrdIeLbwow==
+ dependencies:
+ inherits "^2.0.1"
+ readable-stream "~1.0.31"
+
+nopt@~1.0.10:
+ version "1.0.10"
+ resolved "https://registry.yarnpkg.com/nopt/-/nopt-1.0.10.tgz#6ddd21bd2a31417b92727dd585f8a6f37608ebee"
+ integrity sha512-NWmpvLSqUrgrAC9HCuxEvb+PSloHpqVu+FqcO4eeF2h5qYRhA7ev6KvelyQAKtegUbC6RypJnlEOhd8vloNKYg==
+ dependencies:
+ abbrev "1"
+
normalize-package-data@^2.5.0:
version "2.5.0"
resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
@@ -6391,6 +7114,15 @@ object.pick@^1.3.0:
dependencies:
isobject "^3.0.1"
+object.values@^1.1.5:
+ version "1.1.6"
+ resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.6.tgz#4abbaa71eba47d63589d402856f908243eea9b1d"
+ integrity sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw==
+ dependencies:
+ call-bind "^1.0.2"
+ define-properties "^1.1.4"
+ es-abstract "^1.20.4"
+
on-exit-leak-free@^2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/on-exit-leak-free/-/on-exit-leak-free-2.1.0.tgz#5c703c968f7e7f851885f6459bf8a8a57edc9cc4"
@@ -6439,6 +7171,18 @@ optionator@^0.8.1:
type-check "~0.3.2"
word-wrap "~1.2.3"
+optionator@^0.9.1:
+ version "0.9.1"
+ resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz#4f236a6373dae0566a6d43e1326674f50c291499"
+ integrity sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==
+ dependencies:
+ deep-is "^0.1.3"
+ fast-levenshtein "^2.0.6"
+ levn "^0.4.1"
+ prelude-ls "^1.2.1"
+ type-check "^0.4.0"
+ word-wrap "^1.2.3"
+
p-defer@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"
@@ -6461,6 +7205,13 @@ p-limit@^2.0.0, p-limit@^2.2.0:
dependencies:
p-try "^2.0.0"
+p-limit@^3.0.2:
+ version "3.1.0"
+ resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b"
+ integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==
+ dependencies:
+ yocto-queue "^0.1.0"
+
p-locate@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4"
@@ -6475,6 +7226,13 @@ p-locate@^4.1.0:
dependencies:
p-limit "^2.2.0"
+p-locate@^5.0.0:
+ version "5.0.0"
+ resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834"
+ integrity sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==
+ dependencies:
+ p-limit "^3.0.2"
+
p-try@^2.0.0:
version "2.2.0"
resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
@@ -7388,16 +8146,33 @@ prebuild-install@^7.1.1:
tar-fs "^2.0.0"
tunnel-agent "^0.6.0"
+prelude-ls@^1.2.1:
+ version "1.2.1"
+ resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"
+ integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==
+
prelude-ls@~1.1.2:
version "1.1.2"
resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
integrity sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==
+prettier-linter-helpers@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz#d23d41fe1375646de2d0104d3454a3008802cf7b"
+ integrity sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==
+ dependencies:
+ fast-diff "^1.1.2"
+
prettier@^2.6.2:
version "2.8.1"
resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.1.tgz#4e1fd11c34e2421bc1da9aea9bd8127cd0a35efc"
integrity sha512-lqGoSJBQNJidqCHE80vqZJHWHRFoNYsSpP9AjFhlhi9ODCJA541svILes/+/1GM3VaL/abZi7cpFzOpdR9UPKg==
+prettier@^2.7.1:
+ version "2.8.8"
+ resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.8.tgz#e8c5d7e98a4305ffe3de2e1fc4aca1a71c28b1da"
+ integrity sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==
+
pretty-error@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/pretty-error/-/pretty-error-4.0.0.tgz#90a703f46dd7234adb46d0f84823e9d1cb8f10d6"
@@ -7430,6 +8205,11 @@ probe-image-size@^6.0.0:
needle "^2.5.2"
stream-parser "~0.3.1"
+process-nextick-args@~2.0.0:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
+ integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
+
process-warning@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/process-warning/-/process-warning-1.0.0.tgz#980a0b25dc38cd6034181be4b7726d89066b4616"
@@ -7470,6 +8250,11 @@ psl@^1.1.33:
resolved "https://registry.yarnpkg.com/psl/-/psl-1.9.0.tgz#d0df2a137f00794565fcaf3b2c00cd09f8d5a5a7"
integrity sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==
+pstree.remy@^1.1.8:
+ version "1.1.8"
+ resolved "https://registry.yarnpkg.com/pstree.remy/-/pstree.remy-1.1.8.tgz#c242224f4a67c21f686839bbdb4ac282b8373d3a"
+ integrity sha512-77DZwxQmxKnu3aR542U+X8FypNzbfJ+C5XQDk3uWjWxn6151aIMGthWYRXTqT1E5oJvg+ljaa2OJi+VfvCOQ8w==
+
pump@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64"
@@ -7507,6 +8292,11 @@ querystringify@^2.1.1:
resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6"
integrity sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==
+queue-microtask@^1.2.2:
+ version "1.2.3"
+ resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"
+ integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==
+
quick-format-unescaped@^4.0.3:
version "4.0.4"
resolved "https://registry.yarnpkg.com/quick-format-unescaped/-/quick-format-unescaped-4.0.4.tgz#93ef6dd8d3453cbc7970dd614fad4c5954d6b5a7"
@@ -7790,6 +8580,29 @@ readable-stream@^4.0.0:
events "^3.3.0"
process "^0.11.10"
+readable-stream@~1.0.31:
+ version "1.0.34"
+ resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c"
+ integrity sha512-ok1qVCJuRkNmvebYikljxJA/UEsKwLl2nI1OmaqAu4/UE+h0wKCHok4XkL/gvi39OacXvw59RJUOFUkDib2rHg==
+ dependencies:
+ core-util-is "~1.0.0"
+ inherits "~2.0.1"
+ isarray "0.0.1"
+ string_decoder "~0.10.x"
+
+readable-stream@~2.3.6:
+ version "2.3.8"
+ resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.8.tgz#91125e8042bba1b9887f49345f6277027ce8be9b"
+ integrity sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==
+ dependencies:
+ core-util-is "~1.0.0"
+ inherits "~2.0.3"
+ isarray "~1.0.0"
+ process-nextick-args "~2.0.0"
+ safe-buffer "~5.1.1"
+ string_decoder "~1.1.1"
+ util-deprecate "~1.0.1"
+
readable-web-to-node-stream@^3.0.0:
version "3.0.2"
resolved "https://registry.yarnpkg.com/readable-web-to-node-stream/-/readable-web-to-node-stream-3.0.2.tgz#5d52bb5df7b54861fd48d015e93a2cb87b3ee0bb"
@@ -7970,12 +8783,26 @@ resolve@^1.10.0, resolve@^1.12.0, resolve@^1.14.2, resolve@^1.18.1, resolve@^1.9
path-parse "^1.0.7"
supports-preserve-symlinks-flag "^1.0.0"
+resolve@^1.20.0, resolve@^1.22.1:
+ version "1.22.2"
+ resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.2.tgz#0ed0943d4e301867955766c9f3e1ae6d01c6845f"
+ integrity sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==
+ dependencies:
+ is-core-module "^2.11.0"
+ path-parse "^1.0.7"
+ supports-preserve-symlinks-flag "^1.0.0"
+
ret@~0.1.10:
version "0.1.15"
resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==
-rimraf@^3.0.0:
+reusify@^1.0.4:
+ version "1.0.4"
+ resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
+ integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
+
+rimraf@^3.0.0, rimraf@^3.0.2:
version "3.0.2"
resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
@@ -7987,7 +8814,14 @@ rsvp@^4.8.4:
resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-4.8.5.tgz#c8f155311d167f68f21e168df71ec5b083113734"
integrity sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA==
[email protected]:
+run-parallel@^1.1.9:
+ version "1.2.0"
+ resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee"
+ integrity sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==
+ dependencies:
+ queue-microtask "^1.2.2"
+
[email protected], safe-buffer@~5.1.0, safe-buffer@~5.1.1:
version "5.1.2"
resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
@@ -8128,7 +8962,7 @@ secure-json-parse@^2.4.0:
resolved "https://registry.yarnpkg.com/secure-json-parse/-/secure-json-parse-2.6.0.tgz#95d89f84adf32d76ff7800e68a673b129fe918b0"
integrity sha512-B9osKohb6L+EZ6Kve3wHKfsAClzOC/iISA2vSuCe5Jx5NAKiwitfxx8ZKYapHXr0sYRj7UZInT7pLb3rp2Yx6A==
-"semver@2 || 3 || 4 || 5", semver@^5.5.0, semver@^5.6.0, semver@^5.7.0:
+"semver@2 || 3 || 4 || 5", semver@^5.5.0, semver@^5.6.0, semver@^5.7.0, semver@^5.7.1:
version "5.7.1"
resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
@@ -8145,6 +8979,18 @@ semver@^7.3.2, semver@^7.3.5, semver@^7.3.8:
dependencies:
lru-cache "^6.0.0"
+semver@^7.3.7:
+ version "7.5.1"
+ resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.1.tgz#c90c4d631cf74720e46b21c1d37ea07edfab91ec"
+ integrity sha512-Wvss5ivl8TMRZXXESstBA4uR5iXgEN/VC5/sOcuXdVLzcdkz4HWetIoRfG5gb5X+ij/G9rw9YoGn3QoQ8OCSpw==
+ dependencies:
+ lru-cache "^6.0.0"
+
+semver@~7.0.0:
+ version "7.0.0"
+ resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
+ integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==
+
[email protected]:
version "0.18.0"
resolved "https://registry.yarnpkg.com/send/-/send-0.18.0.tgz#670167cc654b05f5aa4a767f9113bb371bc706be"
@@ -8291,6 +9137,13 @@ simple-swizzle@^0.2.2:
dependencies:
is-arrayish "^0.3.1"
+simple-update-notifier@^1.0.7:
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/simple-update-notifier/-/simple-update-notifier-1.1.0.tgz#67694c121de354af592b347cdba798463ed49c82"
+ integrity sha512-VpsrsJSUcJEseSbMHkrsrAVSdvVS5I96Qo1QAQ4FxQ9wXFcB+pjj7FB7/us9+GcgfW4ziHtYMc1J0PLczb55mg==
+ dependencies:
+ semver "~7.0.0"
+
sirv@^1.0.7:
version "1.0.19"
resolved "https://registry.yarnpkg.com/sirv/-/sirv-1.0.19.tgz#1d73979b38c7fe91fcba49c85280daa9c2363b49"
@@ -8431,7 +9284,7 @@ source-map-resolve@^0.5.0:
source-map-url "^0.4.0"
urix "^0.1.0"
-source-map-support@^0.5.16, source-map-support@^0.5.6, source-map-support@~0.5.20:
+source-map-support@^0.5.16, source-map-support@^0.5.17, source-map-support@^0.5.6, source-map-support@~0.5.20:
version "0.5.21"
resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f"
integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==
@@ -8593,6 +9446,18 @@ string_decoder@^1.1.1:
dependencies:
safe-buffer "~5.2.0"
+string_decoder@~0.10.x:
+ version "0.10.31"
+ resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
+ integrity sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==
+
+string_decoder@~1.1.1:
+ version "1.1.1"
+ resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
+ integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
+ dependencies:
+ safe-buffer "~5.1.0"
+
strip-ansi@^6.0.0, strip-ansi@^6.0.1:
version "6.0.1"
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
@@ -8600,6 +9465,11 @@ strip-ansi@^6.0.0, strip-ansi@^6.0.1:
dependencies:
ansi-regex "^5.0.1"
+strip-bom@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
+ integrity sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==
+
strip-bom@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-4.0.0.tgz#9c3505c1db45bcedca3d9cf7a16f5c5aa3901878"
@@ -8615,7 +9485,7 @@ strip-final-newline@^2.0.0:
resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"
integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==
-strip-json-comments@^3.1.1:
+strip-json-comments@^3.1.0, strip-json-comments@^3.1.1:
version "3.1.1"
resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
@@ -8649,7 +9519,7 @@ stylehacks@^5.1.1:
browserslist "^4.21.4"
postcss-selector-parser "^6.0.4"
-supports-color@^5.3.0:
+supports-color@^5.3.0, supports-color@^5.5.0:
version "5.5.0"
resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
@@ -8770,6 +9640,11 @@ test-exclude@^6.0.0:
glob "^7.1.4"
minimatch "^3.0.4"
+text-table@^0.2.0:
+ version "0.2.0"
+ resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
+ integrity sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==
+
thenify-all@^1.0.0:
version "1.6.0"
resolved "https://registry.yarnpkg.com/thenify-all/-/thenify-all-1.6.0.tgz#1a1918d402d8fc3f98fbf234db0bcc8cc10e9726"
@@ -8789,6 +9664,14 @@ throat@^5.0.0:
resolved "https://registry.yarnpkg.com/throat/-/throat-5.0.0.tgz#c5199235803aad18754a667d659b5e72ce16764b"
integrity sha512-fcwX4mndzpLQKBS1DVYhGAcYaYt7vsHNIvQV+WXMvnow5cgjPphq5CaayLaGsjRdSCKZFNGt7/GYAuXaNOiYCA==
+through2@^2.0.1:
+ version "2.0.5"
+ resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd"
+ integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==
+ dependencies:
+ readable-stream "~2.3.6"
+ xtend "~4.0.1"
+
timers-ext@^0.1.7:
version "0.1.7"
resolved "https://registry.yarnpkg.com/timers-ext/-/timers-ext-0.1.7.tgz#6f57ad8578e07a3fb9f91d9387d65647555e25c6"
@@ -8877,6 +9760,13 @@ totalist@^1.0.0:
resolved "https://registry.yarnpkg.com/totalist/-/totalist-1.1.0.tgz#a4d65a3e546517701e3e5c37a47a70ac97fe56df"
integrity sha512-gduQwd1rOdDMGxFG1gEvhV88Oirdo2p+KjoYFU7k2g+i7n6AFFbDQ5kMPUsW0pNbfQsB/cwXvT1i4Bue0s9g5g==
+touch@^3.1.0:
+ version "3.1.0"
+ resolved "https://registry.yarnpkg.com/touch/-/touch-3.1.0.tgz#fe365f5f75ec9ed4e56825e0bb76d24ab74af83b"
+ integrity sha512-WBx8Uy5TLtOSRtIq+M03/sKDrXCLHxwDcquSP2c43Le03/9serjQBIztjRz6FkJez9D/hleyAXTBGLwwZUw9lA==
+ dependencies:
+ nopt "~1.0.10"
+
tough-cookie@^4.0.0:
version "4.1.2"
resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.2.tgz#e53e84b85f24e0b65dd526f46628db6c85f6b874"
@@ -8918,11 +9808,45 @@ ts-essentials@^7.0.1:
resolved "https://registry.yarnpkg.com/ts-essentials/-/ts-essentials-7.0.3.tgz#686fd155a02133eedcc5362dc8b5056cde3e5a38"
integrity sha512-8+gr5+lqO3G84KdiTSMRLtuyJ+nTBVRKuCrK4lidMPdVeEp0uqC875uE5NMcaA7YYMN7XsNiFQuMvasF8HT/xQ==
+ts-node@^9.1.1:
+ version "9.1.1"
+ resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-9.1.1.tgz#51a9a450a3e959401bda5f004a72d54b936d376d"
+ integrity sha512-hPlt7ZACERQGf03M253ytLY3dHbGNGrAq9qIHWUY9XHYl1z7wYngSr3OQ5xmui8o2AaxsONxIzjafLUiWBo1Fg==
+ dependencies:
+ arg "^4.1.0"
+ create-require "^1.1.0"
+ diff "^4.0.1"
+ make-error "^1.1.1"
+ source-map-support "^0.5.17"
+ yn "3.1.1"
+
+tsconfig-paths@^3.12.0:
+ version "3.14.2"
+ resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.14.2.tgz#6e32f1f79412decd261f92d633a9dc1cfa99f088"
+ integrity sha512-o/9iXgCYc5L/JxCHPe3Hvh8Q/2xm5Z+p18PESBU6Ff33695QnCHBEjcytY2q19ua7Mbl/DavtBOLq+oG0RCL+g==
+ dependencies:
+ "@types/json5" "^0.0.29"
+ json5 "^1.0.2"
+ minimist "^1.2.6"
+ strip-bom "^3.0.0"
+
+tslib@^1.8.1:
+ version "1.14.1"
+ resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
+ integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
+
tslib@^2.0.0, tslib@^2.0.3, tslib@~2.4.0:
version "2.4.1"
resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.1.tgz#0d0bfbaac2880b91e22df0768e55be9753a5b17e"
integrity sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==
+tsutils@^3.21.0:
+ version "3.21.0"
+ resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.21.0.tgz#b48717d394cea6c1e096983eed58e9d61715b623"
+ integrity sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==
+ dependencies:
+ tslib "^1.8.1"
+
tunnel-agent@^0.6.0:
version "0.6.0"
resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
@@ -8930,6 +9854,13 @@ tunnel-agent@^0.6.0:
dependencies:
safe-buffer "^5.0.1"
+type-check@^0.4.0, type-check@~0.4.0:
+ version "0.4.0"
+ resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1"
+ integrity sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==
+ dependencies:
+ prelude-ls "^1.2.1"
+
type-check@~0.3.2:
version "0.3.2"
resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
@@ -8942,6 +9873,11 @@ [email protected]:
resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c"
integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==
+type-fest@^0.20.2:
+ version "0.20.2"
+ resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4"
+ integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==
+
type-fest@^0.21.3:
version "0.21.3"
resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz#d260a24b0198436e133fa26a524a6d65fa3b2e37"
@@ -8987,10 +9923,10 @@ typedarray-to-buffer@^3.1.5:
dependencies:
is-typedarray "^1.0.0"
-typescript@^4.5.5:
- version "4.9.4"
- resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.4.tgz#a2a3d2756c079abda241d75f149df9d561091e78"
- integrity sha512-Uz+dTXYzxXXbsFpM86Wh3dKCxrQqUcVMxwU54orwlJjOpO3ao8L7j5lH+dWfTwgCwIuM9GQ2kvVotzYJMXTBZg==
+typescript@^4.8.4:
+ version "4.9.5"
+ resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.5.tgz#095979f9bcc0d09da324d58d03ce8f8374cbe65a"
+ integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==
unbox-primitive@^1.0.2:
version "1.0.2"
@@ -9002,6 +9938,11 @@ unbox-primitive@^1.0.2:
has-symbols "^1.0.3"
which-boxed-primitive "^1.0.2"
+undefsafe@^2.0.5:
+ version "2.0.5"
+ resolved "https://registry.yarnpkg.com/undefsafe/-/undefsafe-2.0.5.tgz#38733b9327bdcd226db889fb723a6efd162e6e2c"
+ integrity sha512-WxONCrssBM8TSPRqN5EmsjVrsv4A8X12J4ArBiiayv3DyyG3ZlIg6yysuuSYdZsVz3TKcTg2fd//Ujd4CHV1iA==
+
unicode-canonical-property-names-ecmascript@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz#301acdc525631670d39f6146e0e77ff6bbdebddc"
@@ -9058,6 +9999,11 @@ unset-value@^1.0.0:
has-value "^0.3.1"
isobject "^3.0.0"
+untildify@^4.0.0:
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/untildify/-/untildify-4.0.0.tgz#2bc947b953652487e4600949fb091e3ae8cd919b"
+ integrity sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==
+
update-browserslist-db@^1.0.9:
version "1.0.10"
resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz#0f54b876545726f17d00cd9a2561e6dade943ff3"
@@ -9115,7 +10061,7 @@ utf8-byte-length@^1.0.1:
resolved "https://registry.yarnpkg.com/utf8-byte-length/-/utf8-byte-length-1.0.4.tgz#f45f150c4c66eee968186505ab93fcbb8ad6bf61"
integrity sha512-4+wkEYLBbWxqTahEsWrhxepcoVOJ+1z5PGIjPZxRkytcdSUaNjIjBM7Xn8E+pdSuV7SzvWovBFA54FO0JSoqhA==
-util-deprecate@^1.0.1, util-deprecate@^1.0.2:
+util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1:
version "1.0.2"
resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==
@@ -9434,7 +10380,7 @@ wildcard@^2.0.0:
resolved "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.0.tgz#a77d20e5200c6faaac979e4b3aadc7b3dd7f8fec"
integrity sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==
-word-wrap@~1.2.3:
+word-wrap@^1.2.3, word-wrap@~1.2.3:
version "1.2.3"
resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
@@ -9448,6 +10394,15 @@ wrap-ansi@^6.2.0:
string-width "^4.1.0"
strip-ansi "^6.0.0"
+wrap-ansi@^7.0.0:
+ version "7.0.0"
+ resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
+ integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
+ dependencies:
+ ansi-styles "^4.0.0"
+ string-width "^4.1.0"
+ strip-ansi "^6.0.0"
+
wrappy@1:
version "1.0.2"
resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
@@ -9486,11 +10441,21 @@ xss@^1.0.6:
commander "^2.20.3"
cssfilter "0.0.10"
+xtend@~4.0.1:
+ version "4.0.2"
+ resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
+ integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==
+
y18n@^4.0.0:
version "4.0.3"
resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.3.tgz#b5f259c82cd6e336921efd7bfd8bf560de9eeedf"
integrity sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==
+y18n@^5.0.5:
+ version "5.0.8"
+ resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"
+ integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==
+
yallist@^3.0.2:
version "3.1.1"
resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
@@ -9514,6 +10479,11 @@ yargs-parser@^18.1.2:
camelcase "^5.0.0"
decamelize "^1.2.0"
+yargs-parser@^20.2.2:
+ version "20.2.9"
+ resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee"
+ integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==
+
yargs@^15.4.1:
version "15.4.1"
resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.4.1.tgz#0d87a16de01aee9d8bec2bfbf74f67851730f4f8"
@@ -9530,3 +10500,26 @@ yargs@^15.4.1:
which-module "^2.0.0"
y18n "^4.0.0"
yargs-parser "^18.1.2"
+
+yargs@^16.1.0:
+ version "16.2.0"
+ resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66"
+ integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==
+ dependencies:
+ cliui "^7.0.2"
+ escalade "^3.1.1"
+ get-caller-file "^2.0.5"
+ require-directory "^2.1.1"
+ string-width "^4.2.0"
+ y18n "^5.0.5"
+ yargs-parser "^20.2.2"
+
[email protected]:
+ version "3.1.1"
+ resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50"
+ integrity sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==
+
+yocto-queue@^0.1.0:
+ version "0.1.0"
+ resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"
+ integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==
|
3ac910bf6dd525e7b1467da43b8068a2a7b4a469
|
2023-07-19 00:02:30
|
Alessio Gravili
|
chore: improves datepicker styles and functionality (#2347)
| false
|
improves datepicker styles and functionality (#2347)
|
chore
|
diff --git a/src/admin/components/elements/DatePicker/DatePicker.tsx b/src/admin/components/elements/DatePicker/DatePicker.tsx
index a3a97a85c51..92f1b450ff2 100644
--- a/src/admin/components/elements/DatePicker/DatePicker.tsx
+++ b/src/admin/components/elements/DatePicker/DatePicker.tsx
@@ -17,7 +17,7 @@ const DateTime: React.FC<Props> = (props) => {
value,
onChange,
displayFormat,
- pickerAppearance,
+ pickerAppearance = "dayOnly",
minDate,
maxDate,
monthsToShow = 1,
@@ -98,6 +98,9 @@ const DateTime: React.FC<Props> = (props) => {
enabled: true,
},
]}
+ showMonthDropdown
+ showYearDropdown
+ dropdownMode="select"
/>
</div>
</div>
diff --git a/src/admin/components/elements/DatePicker/index.scss b/src/admin/components/elements/DatePicker/index.scss
index 85dbaa97563..ca6bdd24221 100644
--- a/src/admin/components/elements/DatePicker/index.scss
+++ b/src/admin/components/elements/DatePicker/index.scss
@@ -99,9 +99,9 @@ $cal-icon-width: 18px;
.react-datepicker {
@include shadow-lg;
+ border: 1px solid var(--theme-elevation-100);
background: var(--theme-input-bg);
display: inline-flex;
- border: none;
font-family: var(--font-body);
font-weight: 100;
border-radius: 0;
@@ -169,8 +169,12 @@ $cal-icon-width: 18px;
}
&__current-month {
+ display: none;
+ }
+
+ &__header__dropdown, &-year-header {
padding: 10px 0;
- font-weight: 600;
+ font-weight: bold;
}
&__month-container {
@@ -185,6 +189,20 @@ $cal-icon-width: 18px;
border-left: none;
}
+ &__month-text {
+ &:hover {
+ background: var(--theme-elevation-100);
+ }
+ }
+
+ &__month-select,
+ &__year-select {
+ min-width: 70px;
+ border: none;
+ background: none;
+ outline: none;
+ cursor: pointer;
+ }
&__day-names {
background-color: var(--theme-elevation-100);
@@ -239,6 +257,10 @@ $cal-icon-width: 18px;
border: none;
}
+ .react-datepicker__time-container .react-datepicker__time .react-datepicker__time-box ul.react-datepicker__time-list {
+ max-height: 100%;
+ }
+
.react-datepicker__day--keyboard-selected,
.react-datepicker__month-text--keyboard-selected,
.react-datepicker__time-container .react-datepicker__time .react-datepicker__time-box ul.react-datepicker__time-list li.react-datepicker__time-list-item--selected {
@@ -281,7 +303,40 @@ $cal-icon-width: 18px;
font-size: base(.5);
}
+ &__appearance--dayOnly,
+ &__appearance--monthOnly {
+ .react-datepicker {
+ &__month-container {
+ border-right: none;
+ }
+ }
+ }
+
@include small-break {
+ .react-datepicker {
+ flex-direction: column;
+ }
+ .react-datepicker__month-container {
+ border-right: 0;
+ }
+ .react-datepicker__time-container {
+ width: auto;
+ }
+ .react-datepicker__header--time {
+ background-color: var(--theme-elevation-100);
+ padding: 8px 0;
+ border-bottom: none;
+ }
+ .react-datepicker__time-container .react-datepicker__time .react-datepicker__time-box {
+ height: 120px;
+ width: unset;
+ > ul {
+ height: 120px;
+ }
+ }
+ .react-datepicker__navigation--next--with-time:not(.react-datepicker__navigation--next--with-today-button) {
+ right: 0px;
+ }
&__input-wrapper {
.icon {
top: calc(50% - #{base(.25)});
diff --git a/test/fields/collections/Date/index.ts b/test/fields/collections/Date/index.ts
index 578a94e54d5..bb1decc4d50 100644
--- a/test/fields/collections/Date/index.ts
+++ b/test/fields/collections/Date/index.ts
@@ -16,6 +16,15 @@ const DateFields: CollectionConfig = {
{
name: 'timeOnly',
type: 'date',
+ admin: {
+ date: {
+ pickerAppearance: 'timeOnly',
+ },
+ },
+ },
+ {
+ name: 'timeOnlyWithCustomFormat',
+ type: 'date',
admin: {
date: {
pickerAppearance: 'timeOnly',
@@ -56,6 +65,7 @@ const DateFields: CollectionConfig = {
export const dateDoc = {
default: '2022-08-12T10:00:00.000+00:00',
timeOnly: '2022-08-12T10:00:00.157+00:00',
+ timeOnlyWithCustomFormat: '2022-08-12T10:00:00.157+00:00',
dayOnly: '2022-08-11T22:00:00.000+00:00',
dayAndTime: '2022-08-12T10:00:00.052+00:00',
monthOnly: '2022-07-31T22:00:00.000+00:00',
|
9dc11b2b83d3932a76aa6658656a5dc0d6709a41
|
2022-02-01 20:15:43
|
James
|
chore: rich text upload cleanup
| false
|
rich text upload cleanup
|
chore
|
diff --git a/src/admin/components/forms/field-types/RichText/RichText.tsx b/src/admin/components/forms/field-types/RichText/RichText.tsx
index 8b29f484695..14cbe8e2c08 100644
--- a/src/admin/components/forms/field-types/RichText/RichText.tsx
+++ b/src/admin/components/forms/field-types/RichText/RichText.tsx
@@ -31,7 +31,7 @@ const defaultLeaves: RichTextLeaf[] = ['bold', 'italic', 'underline', 'strikethr
const baseClass = 'rich-text';
type CustomText = { text: string;[x: string]: unknown }
-type CustomElement = { type: string; children: CustomText[] }
+type CustomElement = { type?: string; children: CustomText[] }
declare module 'slate' {
interface CustomTypes {
@@ -280,9 +280,7 @@ const RichText: React.FC<Props> = (props) => {
const selectedLeaf = Node.descendant(editor, editor.selection.anchor.path);
if (Text.isText(selectedLeaf) && String(selectedLeaf.text).length === editor.selection.anchor.offset) {
- Transforms.insertNodes(editor, {
- text: '',
- });
+ Transforms.insertNodes(editor, { children: [{ text: '' }] });
} else {
Transforms.splitNodes(editor);
Transforms.setNodes(editor, {});
diff --git a/src/admin/components/forms/field-types/RichText/elements/upload/Element/index.scss b/src/admin/components/forms/field-types/RichText/elements/upload/Element/index.scss
index 7c2e8784caa..3b50eccd14d 100644
--- a/src/admin/components/forms/field-types/RichText/elements/upload/Element/index.scss
+++ b/src/admin/components/forms/field-types/RichText/elements/upload/Element/index.scss
@@ -22,6 +22,7 @@
width: base(3.25);
height: auto;
position: relative;
+ overflow: hidden;
img, svg {
position: absolute;
diff --git a/src/admin/components/forms/field-types/RichText/elements/upload/Element/index.tsx b/src/admin/components/forms/field-types/RichText/elements/upload/Element/index.tsx
index 233e518380d..c2c3964a1bd 100644
--- a/src/admin/components/forms/field-types/RichText/elements/upload/Element/index.tsx
+++ b/src/admin/components/forms/field-types/RichText/elements/upload/Element/index.tsx
@@ -98,7 +98,7 @@ const Element = ({ attributes, children, element, path, fieldProps }) => {
e.preventDefault();
setModalToRender('edit');
}}
- tooltip="Upload Fields"
+ tooltip="Edit"
/>
)}
<Button
|
29d8bf0927038d2305218e5a6b811e0c4039d617
|
2023-07-01 02:22:35
|
Alessio Gravili
|
fix: GraphQL type for number field (#2954)
| false
|
GraphQL type for number field (#2954)
|
fix
|
diff --git a/src/graphql/schema/withOperators.ts b/src/graphql/schema/withOperators.ts
index 77f0b40e38d..97175ea8467 100644
--- a/src/graphql/schema/withOperators.ts
+++ b/src/graphql/schema/withOperators.ts
@@ -2,7 +2,7 @@ import { GraphQLBoolean, GraphQLInputObjectType, GraphQLString, GraphQLList, Gra
import type { GraphQLType } from 'graphql';
import { GraphQLJSON } from 'graphql-type-json';
import { DateTimeResolver, EmailAddressResolver } from 'graphql-scalars';
-import { FieldAffectingData, RadioField, SelectField, optionIsObject } from '../../fields/config/types';
+import { FieldAffectingData, NumberField, RadioField, SelectField, optionIsObject } from '../../fields/config/types';
import combineParentName from '../utilities/combineParentName';
import formatName from '../utilities/formatName';
import operators from './operators';
@@ -27,7 +27,9 @@ type DefaultsType = {
const defaults: DefaultsType = {
number: {
- type: GraphQLInt,
+ type: (field: NumberField): GraphQLType => {
+ return field?.name === 'id' ? GraphQLInt : GraphQLFloat;
+ },
operators: [...operators.equality, ...operators.comparison],
},
text: {
|
d67f6741605149fd00635bf7277c41b0b070e636
|
2024-08-17 00:29:58
|
Alessio Gravili
|
chore: update all templates (#7731)
| false
|
update all templates (#7731)
|
chore
|
diff --git a/package.json b/package.json
index 416edb7fad8..b4026f85647 100644
--- a/package.json
+++ b/package.json
@@ -93,7 +93,7 @@
"prettier --write",
"eslint --cache --fix"
],
- "templates/website/**/*": "sh -c \"cd templates/website; pnpm install --ignore-workspace --frozen-lockfile; pnpm run lint --fix\"",
+ "templates/website/**/*": "sh -c \"cd templates/website; pnpm install --ignore-workspace; pnpm run lint --fix\"",
"tsconfig.json": "node scripts/reset-tsconfig.js"
},
"devDependencies": {
diff --git a/templates/_template/src/app/(payload)/admin/importMap.js b/templates/_template/src/app/(payload)/admin/importMap.js
index 5bcee7915ae..8ef7021383f 100644
--- a/templates/_template/src/app/(payload)/admin/importMap.js
+++ b/templates/_template/src/app/(payload)/admin/importMap.js
@@ -1,5 +1 @@
-import { emptyComponent as emptyComponent_0 } from '@payloadcms/ui/shared'
-
-export const importMap = {
- '@payloadcms/ui/shared#emptyComponent': emptyComponent_0,
-}
+export const importMap = {}
diff --git a/templates/blank/src/app/(payload)/admin/importMap.js b/templates/blank/src/app/(payload)/admin/importMap.js
index 5bcee7915ae..8ef7021383f 100644
--- a/templates/blank/src/app/(payload)/admin/importMap.js
+++ b/templates/blank/src/app/(payload)/admin/importMap.js
@@ -1,5 +1 @@
-import { emptyComponent as emptyComponent_0 } from '@payloadcms/ui/shared'
-
-export const importMap = {
- '@payloadcms/ui/shared#emptyComponent': emptyComponent_0,
-}
+export const importMap = {}
diff --git a/templates/website/package.json b/templates/website/package.json
index e4d3941e09e..93631b22bb1 100644
--- a/templates/website/package.json
+++ b/templates/website/package.json
@@ -18,16 +18,16 @@
"generate:importmap": "payload generate:importmap"
},
"dependencies": {
- "@payloadcms/db-mongodb": "3.0.0-beta.79",
- "@payloadcms/live-preview-react": "3.0.0-beta.79",
- "@payloadcms/next": "3.0.0-beta.79",
- "@payloadcms/plugin-cloud": "3.0.0-beta.79",
- "@payloadcms/plugin-form-builder": "3.0.0-beta.79",
- "@payloadcms/plugin-nested-docs": "3.0.0-beta.79",
- "@payloadcms/plugin-redirects": "3.0.0-beta.79",
- "@payloadcms/plugin-seo": "3.0.0-beta.79",
- "@payloadcms/richtext-lexical": "3.0.0-beta.79",
- "@payloadcms/ui": "3.0.0-beta.79",
+ "@payloadcms/db-mongodb": "3.0.0-beta.84",
+ "@payloadcms/live-preview-react": "3.0.0-beta.84",
+ "@payloadcms/next": "3.0.0-beta.84",
+ "@payloadcms/plugin-cloud": "3.0.0-beta.84",
+ "@payloadcms/plugin-form-builder": "3.0.0-beta.84",
+ "@payloadcms/plugin-nested-docs": "3.0.0-beta.84",
+ "@payloadcms/plugin-redirects": "3.0.0-beta.84",
+ "@payloadcms/plugin-seo": "3.0.0-beta.84",
+ "@payloadcms/richtext-lexical": "3.0.0-beta.84",
+ "@payloadcms/ui": "3.0.0-beta.84",
"@radix-ui/react-checkbox": "^1.0.4",
"@radix-ui/react-label": "^2.0.2",
"@radix-ui/react-select": "^2.0.0",
@@ -41,7 +41,7 @@
"lexical": "0.17.0",
"lucide-react": "^0.378.0",
"next": "15.0.0-canary.104",
- "payload": "3.0.0-beta.79",
+ "payload": "3.0.0-beta.84",
"payload-admin-bar": "^1.0.6",
"prism-react-renderer": "^2.3.1",
"react": "19.0.0-rc-06d0b89e-20240801",
diff --git a/templates/website/src/app/(payload)/admin/importMap.js b/templates/website/src/app/(payload)/admin/importMap.js
index a9582444903..c30291b87f6 100644
--- a/templates/website/src/app/(payload)/admin/importMap.js
+++ b/templates/website/src/app/(payload)/admin/importMap.js
@@ -13,11 +13,10 @@ import { MetaTitleComponent as MetaTitleComponent_11 } from '@payloadcms/plugin-
import { MetaImageComponent as MetaImageComponent_12 } from '@payloadcms/plugin-seo/client'
import { MetaDescriptionComponent as MetaDescriptionComponent_13 } from '@payloadcms/plugin-seo/client'
import { PreviewComponent as PreviewComponent_14 } from '@payloadcms/plugin-seo/client'
-import { emptyComponent as emptyComponent_15 } from '@payloadcms/ui/shared'
-import { HorizontalRuleFeatureClient as HorizontalRuleFeatureClient_16 } from '@payloadcms/richtext-lexical/client'
-import { BlocksFeatureClient as BlocksFeatureClient_17 } from '@payloadcms/richtext-lexical/client'
-import { default as default_18 } from 'src/payload/components/BeforeDashboard'
-import { default as default_19 } from 'src/payload/components/BeforeLogin'
+import { HorizontalRuleFeatureClient as HorizontalRuleFeatureClient_15 } from '@payloadcms/richtext-lexical/client'
+import { BlocksFeatureClient as BlocksFeatureClient_16 } from '@payloadcms/richtext-lexical/client'
+import { default as default_17 } from 'src/payload/components/BeforeDashboard'
+import { default as default_18 } from 'src/payload/components/BeforeLogin'
export const importMap = {
'@payloadcms/richtext-lexical/client#RichTextCell': RichTextCell_0,
@@ -36,9 +35,8 @@ export const importMap = {
'@payloadcms/plugin-seo/client#MetaImageComponent': MetaImageComponent_12,
'@payloadcms/plugin-seo/client#MetaDescriptionComponent': MetaDescriptionComponent_13,
'@payloadcms/plugin-seo/client#PreviewComponent': PreviewComponent_14,
- '@payloadcms/ui/shared#emptyComponent': emptyComponent_15,
- '@payloadcms/richtext-lexical/client#HorizontalRuleFeatureClient': HorizontalRuleFeatureClient_16,
- '@payloadcms/richtext-lexical/client#BlocksFeatureClient': BlocksFeatureClient_17,
- '/payload/components/BeforeDashboard#default': default_18,
- '/payload/components/BeforeLogin#default': default_19,
+ '@payloadcms/richtext-lexical/client#HorizontalRuleFeatureClient': HorizontalRuleFeatureClient_15,
+ '@payloadcms/richtext-lexical/client#BlocksFeatureClient': BlocksFeatureClient_16,
+ '/payload/components/BeforeDashboard#default': default_17,
+ '/payload/components/BeforeLogin#default': default_18,
}
diff --git a/templates/with-payload-cloud/src/app/(payload)/admin/importMap.js b/templates/with-payload-cloud/src/app/(payload)/admin/importMap.js
index 5bcee7915ae..8ef7021383f 100644
--- a/templates/with-payload-cloud/src/app/(payload)/admin/importMap.js
+++ b/templates/with-payload-cloud/src/app/(payload)/admin/importMap.js
@@ -1,5 +1 @@
-import { emptyComponent as emptyComponent_0 } from '@payloadcms/ui/shared'
-
-export const importMap = {
- '@payloadcms/ui/shared#emptyComponent': emptyComponent_0,
-}
+export const importMap = {}
diff --git a/templates/with-vercel-mongodb/src/app/(payload)/admin/importMap.js b/templates/with-vercel-mongodb/src/app/(payload)/admin/importMap.js
index 5bcee7915ae..8ef7021383f 100644
--- a/templates/with-vercel-mongodb/src/app/(payload)/admin/importMap.js
+++ b/templates/with-vercel-mongodb/src/app/(payload)/admin/importMap.js
@@ -1,5 +1 @@
-import { emptyComponent as emptyComponent_0 } from '@payloadcms/ui/shared'
-
-export const importMap = {
- '@payloadcms/ui/shared#emptyComponent': emptyComponent_0,
-}
+export const importMap = {}
diff --git a/templates/with-vercel-postgres/src/app/(payload)/admin/importMap.js b/templates/with-vercel-postgres/src/app/(payload)/admin/importMap.js
index 5bcee7915ae..8ef7021383f 100644
--- a/templates/with-vercel-postgres/src/app/(payload)/admin/importMap.js
+++ b/templates/with-vercel-postgres/src/app/(payload)/admin/importMap.js
@@ -1,5 +1 @@
-import { emptyComponent as emptyComponent_0 } from '@payloadcms/ui/shared'
-
-export const importMap = {
- '@payloadcms/ui/shared#emptyComponent': emptyComponent_0,
-}
+export const importMap = {}
|
eb6572e9e56e680cad331c1bc5da47e91306deb9
|
2023-12-13 21:47:41
|
Fredrik Nordström
|
fix: make admin navigation transition smoother (#4217)
| false
|
make admin navigation transition smoother (#4217)
|
fix
|
diff --git a/packages/payload/src/admin/components/elements/Nav/index.scss b/packages/payload/src/admin/components/elements/Nav/index.scss
index 19b50547e80..56eee072677 100644
--- a/packages/payload/src/admin/components/elements/Nav/index.scss
+++ b/packages/payload/src/admin/components/elements/Nav/index.scss
@@ -8,11 +8,11 @@
height: 100vh;
width: var(--nav-width);
border-right: 1px solid var(--theme-elevation-100);
- transform: translate3d(calc(var(--nav-width) * -1), 0, 0);
+ opacity: 0;
+ transition: opacity var(--nav-trans-time) ease-in-out;
&--nav-open {
- transform: translate3d(0, 0, 0);
- transition: transform var(--nav-trans-time) linear;
+ opacity: 1;
}
&__header {
@@ -141,10 +141,6 @@
line-height: base(1.5);
}
- &--nav-open {
- transition: none;
- }
-
&__mobile-close {
display: flex;
height: 100%;
diff --git a/packages/payload/src/admin/components/templates/Default/index.scss b/packages/payload/src/admin/components/templates/Default/index.scss
index 92c2100f9c9..fd59bc638df 100644
--- a/packages/payload/src/admin/components/templates/Default/index.scss
+++ b/packages/payload/src/admin/components/templates/Default/index.scss
@@ -2,17 +2,18 @@
.template-default {
min-height: 100vh;
- display: flex;
+ display: grid;
position: relative;
- width: calc(100% + var(--nav-width));
- transform: translate3d(calc(var(--nav-width) * -1), 0, 0);
+ grid-template-columns: 0 auto;
+ transition: grid-template-columns var(--nav-trans-time) linear;
+ isolation: isolate;
+ @media (prefers-reduced-motion) {
+ transition: none;
+ }
&--nav-open {
width: 100%;
- transition:
- width var(--nav-trans-time) linear,
- transform var(--nav-trans-time) linear;
- transform: translate3d(0, 0, 0);
+ grid-template-columns: var(--nav-width) auto;
.template-default {
&__nav-overlay {
@@ -38,6 +39,18 @@
width: 100%;
flex-grow: 1;
position: relative;
+ background-color: var(--theme-bg);
+ &:before {
+ content: '';
+ display: block;
+ position: absolute;
+ inset: 0;
+ background-color: inherit;
+ opacity: 0;
+ z-index: var(--z-status);
+ visibility: hidden;
+ transition: all var(--nav-trans-time) linear;
+ }
}
@include mid-break {
@@ -50,7 +63,12 @@
@include small-break {
&--nav-open {
- transition: none;
+ .template-default__wrap {
+ &:before {
+ opacity: 0.7;
+ visibility: visible;
+ }
+ }
}
&__nav-toggler-wrapper {
@@ -64,7 +82,7 @@
.template-default {
&__wrap {
- transition: none;
+ min-width: 100vw;
}
}
}
|
e5cc8123b9b0c0309a350f5b2970751c8f8bf079
|
2024-03-21 22:08:04
|
Elliot DeNolf
|
chore: tsconfig.json conflicts
| false
|
tsconfig.json conflicts
|
chore
|
diff --git a/tsconfig.json b/tsconfig.json
index 6ea0e2c750e..bbb0643e4f2 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -37,7 +37,7 @@
],
"paths": {
"@payload-config": [
- "./test/_community/config.ts"
+ "./test/auth/config.ts"
],
"@payloadcms/ui/assets": [
"./packages/ui/src/assets/index.ts"
@@ -154,4 +154,4 @@
".next/types/**/*.ts",
"scripts/**/*.ts"
]
-}
+}
\ No newline at end of file
|
6eee7874936d27ea80294d99d01c603a719a3a9e
|
2025-02-12 21:36:03
|
Germán Jabloñski
|
chore: add typescript-strict-plugin to the payload package for incremental file-by-file migration [skip lint] (#11133)
| false
|
add typescript-strict-plugin to the payload package for incremental file-by-file migration [skip lint] (#11133)
|
chore
|
diff --git a/packages/payload/package.json b/packages/payload/package.json
index 70dc5ebf8d8..da7b163777f 100644
--- a/packages/payload/package.json
+++ b/packages/payload/package.json
@@ -74,7 +74,7 @@
"build": "rimraf .dist && rimraf tsconfig.tsbuildinfo && pnpm copyfiles && pnpm build:types && pnpm build:swc && pnpm build:esbuild",
"build:esbuild": "echo skipping esbuild",
"build:swc": "swc ./src -d ./dist --config-file .swcrc --strip-leading-paths",
- "build:types": "tsc --emitDeclarationOnly --outDir dist",
+ "build:types": "concurrently --group \"tsc --emitDeclarationOnly --outDir dist\" \"tsc-strict\"",
"clean": "rimraf -g {dist,*.tsbuildinfo}",
"clean:cache": "rimraf node_modules/.cache",
"copyfiles": "copyfiles -u 1 \"src/**/*.{html,ttf,woff,woff2,eot,svg,jpg,png,json}\" dist/",
@@ -124,13 +124,15 @@
"@types/pluralize": "0.0.33",
"@types/uuid": "10.0.0",
"@types/ws": "^8.5.10",
+ "concurrently": "9.1.2",
"copyfiles": "2.4.1",
"cross-env": "7.0.3",
"esbuild": "0.24.2",
"graphql-http": "^1.22.0",
"react-datepicker": "7.6.0",
"rimraf": "6.0.1",
- "sharp": "0.32.6"
+ "sharp": "0.32.6",
+ "typescript-strict-plugin": "2.4.4"
},
"peerDependencies": {
"graphql": "^16.8.1"
diff --git a/packages/payload/src/admin/RichText.ts b/packages/payload/src/admin/RichText.ts
index 7c25daa6b9c..9d4bac05ce2 100644
--- a/packages/payload/src/admin/RichText.ts
+++ b/packages/payload/src/admin/RichText.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { GenericLanguages, I18n } from '@payloadcms/translations'
import type { JSONSchema4 } from 'json-schema'
diff --git a/packages/payload/src/admin/forms/Diff.ts b/packages/payload/src/admin/forms/Diff.ts
index 42f116d9195..b58b1a140c7 100644
--- a/packages/payload/src/admin/forms/Diff.ts
+++ b/packages/payload/src/admin/forms/Diff.ts
@@ -1,3 +1,5 @@
+// @ts-strict-ignore
+
import type { I18nClient } from '@payloadcms/translations'
import type { ClientField, Field, FieldTypes, Tab } from '../../fields/config/types.js'
diff --git a/packages/payload/src/auth/cookies.ts b/packages/payload/src/auth/cookies.ts
index 2276b7fb410..56992cb2bfb 100644
--- a/packages/payload/src/auth/cookies.ts
+++ b/packages/payload/src/auth/cookies.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { SanitizedCollectionConfig } from './../collections/config/types.js'
type CookieOptions = {
diff --git a/packages/payload/src/auth/crypto.ts b/packages/payload/src/auth/crypto.ts
index 552a2bb289a..967ff56d776 100644
--- a/packages/payload/src/auth/crypto.ts
+++ b/packages/payload/src/auth/crypto.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import crypto from 'crypto'
const algorithm = 'aes-256-ctr'
diff --git a/packages/payload/src/auth/endpoints/forgotPassword.ts b/packages/payload/src/auth/endpoints/forgotPassword.ts
index 680828d0c6f..107b5cc61c2 100644
--- a/packages/payload/src/auth/endpoints/forgotPassword.ts
+++ b/packages/payload/src/auth/endpoints/forgotPassword.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import { status as httpStatus } from 'http-status'
import type { PayloadHandler } from '../../config/types.js'
diff --git a/packages/payload/src/auth/endpoints/login.ts b/packages/payload/src/auth/endpoints/login.ts
index 7cc85d1edee..999aa4b97f9 100644
--- a/packages/payload/src/auth/endpoints/login.ts
+++ b/packages/payload/src/auth/endpoints/login.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import { status as httpStatus } from 'http-status'
import type { PayloadHandler } from '../../config/types.js'
diff --git a/packages/payload/src/auth/endpoints/me.ts b/packages/payload/src/auth/endpoints/me.ts
index c0627b439ac..886a51b9e38 100644
--- a/packages/payload/src/auth/endpoints/me.ts
+++ b/packages/payload/src/auth/endpoints/me.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import { status as httpStatus } from 'http-status'
import type { PayloadHandler } from '../../config/types.js'
diff --git a/packages/payload/src/auth/endpoints/refresh.ts b/packages/payload/src/auth/endpoints/refresh.ts
index cad5c5b981e..4ccc9e6a468 100644
--- a/packages/payload/src/auth/endpoints/refresh.ts
+++ b/packages/payload/src/auth/endpoints/refresh.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import { status as httpStatus } from 'http-status'
import type { PayloadHandler } from '../../config/types.js'
diff --git a/packages/payload/src/auth/endpoints/registerFirstUser.ts b/packages/payload/src/auth/endpoints/registerFirstUser.ts
index bba30867dc6..c006135042b 100644
--- a/packages/payload/src/auth/endpoints/registerFirstUser.ts
+++ b/packages/payload/src/auth/endpoints/registerFirstUser.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import { status as httpStatus } from 'http-status'
import type { PayloadHandler } from '../../config/types.js'
diff --git a/packages/payload/src/auth/endpoints/resetPassword.ts b/packages/payload/src/auth/endpoints/resetPassword.ts
index 7baf4c1448e..1b3749a552f 100644
--- a/packages/payload/src/auth/endpoints/resetPassword.ts
+++ b/packages/payload/src/auth/endpoints/resetPassword.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import { status as httpStatus } from 'http-status'
import type { PayloadHandler } from '../../config/types.js'
diff --git a/packages/payload/src/auth/executeAuthStrategies.ts b/packages/payload/src/auth/executeAuthStrategies.ts
index 57144a4773e..bb07cad1d66 100644
--- a/packages/payload/src/auth/executeAuthStrategies.ts
+++ b/packages/payload/src/auth/executeAuthStrategies.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { AuthStrategyFunctionArgs, AuthStrategyResult } from './index.js'
export const executeAuthStrategies = async (
diff --git a/packages/payload/src/auth/getAccessResults.ts b/packages/payload/src/auth/getAccessResults.ts
index db52a2641f6..c42ee040544 100644
--- a/packages/payload/src/auth/getAccessResults.ts
+++ b/packages/payload/src/auth/getAccessResults.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { AllOperations, PayloadRequest } from '../types/index.js'
import type { Permissions, SanitizedPermissions } from './types.js'
diff --git a/packages/payload/src/auth/getFieldsToSign.ts b/packages/payload/src/auth/getFieldsToSign.ts
index 4c8d269c734..f6a2b774f9b 100644
--- a/packages/payload/src/auth/getFieldsToSign.ts
+++ b/packages/payload/src/auth/getFieldsToSign.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { CollectionConfig } from '../collections/config/types.js'
import type { Field, TabAsField } from '../fields/config/types.js'
import type { PayloadRequest } from '../types/index.js'
diff --git a/packages/payload/src/auth/getLoginOptions.ts b/packages/payload/src/auth/getLoginOptions.ts
index 4a4fdb6be2d..0d002a7987f 100644
--- a/packages/payload/src/auth/getLoginOptions.ts
+++ b/packages/payload/src/auth/getLoginOptions.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { Auth } from './types.js'
export const getLoginOptions = (
diff --git a/packages/payload/src/auth/operations/forgotPassword.ts b/packages/payload/src/auth/operations/forgotPassword.ts
index db5712dda7a..394f2e19985 100644
--- a/packages/payload/src/auth/operations/forgotPassword.ts
+++ b/packages/payload/src/auth/operations/forgotPassword.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import crypto from 'crypto'
import { status as httpStatus } from 'http-status'
import { URL } from 'url'
diff --git a/packages/payload/src/auth/operations/local/forgotPassword.ts b/packages/payload/src/auth/operations/local/forgotPassword.ts
index 2cf8dd00ee3..d5a9f766add 100644
--- a/packages/payload/src/auth/operations/local/forgotPassword.ts
+++ b/packages/payload/src/auth/operations/local/forgotPassword.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { CollectionSlug, Payload, RequestContext } from '../../../index.js'
import type { PayloadRequest } from '../../../types/index.js'
import type { Result } from '../forgotPassword.js'
diff --git a/packages/payload/src/auth/operations/login.ts b/packages/payload/src/auth/operations/login.ts
index aa08987d76e..04954ad01fe 100644
--- a/packages/payload/src/auth/operations/login.ts
+++ b/packages/payload/src/auth/operations/login.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type {
AuthOperationsFromCollectionSlug,
Collection,
diff --git a/packages/payload/src/auth/operations/me.ts b/packages/payload/src/auth/operations/me.ts
index 502e6a863f1..f8c21b56550 100644
--- a/packages/payload/src/auth/operations/me.ts
+++ b/packages/payload/src/auth/operations/me.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import { decodeJwt } from 'jose'
import type { Collection } from '../../collections/config/types.js'
diff --git a/packages/payload/src/auth/operations/refresh.ts b/packages/payload/src/auth/operations/refresh.ts
index e3796abf53c..ee8fed1bae4 100644
--- a/packages/payload/src/auth/operations/refresh.ts
+++ b/packages/payload/src/auth/operations/refresh.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import url from 'url'
import type { BeforeOperationHook, Collection } from '../../collections/config/types.js'
diff --git a/packages/payload/src/auth/operations/unlock.ts b/packages/payload/src/auth/operations/unlock.ts
index aedc789194a..751380318c0 100644
--- a/packages/payload/src/auth/operations/unlock.ts
+++ b/packages/payload/src/auth/operations/unlock.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import { status as httpStatus } from 'http-status'
import type {
diff --git a/packages/payload/src/auth/sendVerificationEmail.ts b/packages/payload/src/auth/sendVerificationEmail.ts
index 3e3060a66d5..bfcdde1448d 100644
--- a/packages/payload/src/auth/sendVerificationEmail.ts
+++ b/packages/payload/src/auth/sendVerificationEmail.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import { URL } from 'url'
import type { Collection } from '../collections/config/types.js'
diff --git a/packages/payload/src/auth/strategies/apiKey.ts b/packages/payload/src/auth/strategies/apiKey.ts
index 6454c76ef29..0417b4cbcdf 100644
--- a/packages/payload/src/auth/strategies/apiKey.ts
+++ b/packages/payload/src/auth/strategies/apiKey.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import crypto from 'crypto'
import type { SanitizedCollectionConfig } from '../../collections/config/types.js'
diff --git a/packages/payload/src/auth/strategies/jwt.ts b/packages/payload/src/auth/strategies/jwt.ts
index 4ce77781e45..45fbc84db88 100644
--- a/packages/payload/src/auth/strategies/jwt.ts
+++ b/packages/payload/src/auth/strategies/jwt.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import { jwtVerify } from 'jose'
import type { Payload, Where } from '../../types/index.js'
diff --git a/packages/payload/src/auth/strategies/local/authenticate.ts b/packages/payload/src/auth/strategies/local/authenticate.ts
index 6170c7b73dd..8eef4304603 100644
--- a/packages/payload/src/auth/strategies/local/authenticate.ts
+++ b/packages/payload/src/auth/strategies/local/authenticate.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import crypto from 'crypto'
import scmp from 'scmp'
diff --git a/packages/payload/src/bin/generateImportMap/iterateConfig.ts b/packages/payload/src/bin/generateImportMap/iterateConfig.ts
index b36a3c88a06..77c7af067fd 100644
--- a/packages/payload/src/bin/generateImportMap/iterateConfig.ts
+++ b/packages/payload/src/bin/generateImportMap/iterateConfig.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
/* eslint-disable @typescript-eslint/no-unused-expressions */
import type { AdminViewConfig } from '../../admin/views/types.js'
import type { SanitizedConfig } from '../../config/types.js'
diff --git a/packages/payload/src/bin/generateImportMap/iterateFields.ts b/packages/payload/src/bin/generateImportMap/iterateFields.ts
index e4e52ed3bb8..602782ef414 100644
--- a/packages/payload/src/bin/generateImportMap/iterateFields.ts
+++ b/packages/payload/src/bin/generateImportMap/iterateFields.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
/* eslint-disable @typescript-eslint/no-unused-expressions */
import type { PayloadComponent, SanitizedConfig } from '../../config/types.js'
import type { Block, Field, Tab } from '../../fields/config/types.js'
diff --git a/packages/payload/src/bin/generateImportMap/parsePayloadComponent.ts b/packages/payload/src/bin/generateImportMap/parsePayloadComponent.ts
index 03964eb7d61..20e784dd1cd 100644
--- a/packages/payload/src/bin/generateImportMap/parsePayloadComponent.ts
+++ b/packages/payload/src/bin/generateImportMap/parsePayloadComponent.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { PayloadComponent } from '../../config/types.js'
export function parsePayloadComponent(PayloadComponent: PayloadComponent): {
diff --git a/packages/payload/src/bin/index.ts b/packages/payload/src/bin/index.ts
index 0db33cb859a..f9eb3714b9e 100755
--- a/packages/payload/src/bin/index.ts
+++ b/packages/payload/src/bin/index.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
/* eslint-disable no-console */
import { Cron } from 'croner'
import minimist from 'minimist'
diff --git a/packages/payload/src/bin/loadEnv.ts b/packages/payload/src/bin/loadEnv.ts
index 73fcf0878ae..26136e8a98c 100644
--- a/packages/payload/src/bin/loadEnv.ts
+++ b/packages/payload/src/bin/loadEnv.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import nextEnvImport from '@next/env'
import { findUpSync } from '../utilities/findUp.js'
diff --git a/packages/payload/src/bin/migrate.ts b/packages/payload/src/bin/migrate.ts
index d1dd2ff0c29..fceb0bb9e01 100644
--- a/packages/payload/src/bin/migrate.ts
+++ b/packages/payload/src/bin/migrate.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { ParsedArgs } from 'minimist'
import type { SanitizedConfig } from '../config/types.js'
diff --git a/packages/payload/src/collections/config/client.ts b/packages/payload/src/collections/config/client.ts
index 30f81c1cfb0..bdd68b2643a 100644
--- a/packages/payload/src/collections/config/client.ts
+++ b/packages/payload/src/collections/config/client.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { I18nClient } from '@payloadcms/translations'
import type { StaticDescription } from '../../admin/types.js'
diff --git a/packages/payload/src/collections/config/reservedFieldNames.ts b/packages/payload/src/collections/config/reservedFieldNames.ts
index 41e3fe3dd9c..199571dae1d 100644
--- a/packages/payload/src/collections/config/reservedFieldNames.ts
+++ b/packages/payload/src/collections/config/reservedFieldNames.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { Field } from '../../fields/config/types.js'
import type { CollectionConfig } from '../../index.js'
diff --git a/packages/payload/src/collections/config/sanitize.ts b/packages/payload/src/collections/config/sanitize.ts
index b00b11ff5d0..30a7bb76ee1 100644
--- a/packages/payload/src/collections/config/sanitize.ts
+++ b/packages/payload/src/collections/config/sanitize.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { LoginWithUsernameOptions } from '../../auth/types.js'
import type { Config, SanitizedConfig } from '../../config/types.js'
import type { CollectionConfig, SanitizedCollectionConfig, SanitizedJoins } from './types.js'
diff --git a/packages/payload/src/collections/dataloader.ts b/packages/payload/src/collections/dataloader.ts
index b846b1add0e..41f2d723793 100644
--- a/packages/payload/src/collections/dataloader.ts
+++ b/packages/payload/src/collections/dataloader.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { BatchLoadFn } from 'dataloader'
import DataLoader from 'dataloader'
diff --git a/packages/payload/src/collections/endpoints/create.ts b/packages/payload/src/collections/endpoints/create.ts
index 309ce7fe7b3..86ea499c4bb 100644
--- a/packages/payload/src/collections/endpoints/create.ts
+++ b/packages/payload/src/collections/endpoints/create.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import { getTranslation } from '@payloadcms/translations'
import { status as httpStatus } from 'http-status'
diff --git a/packages/payload/src/collections/endpoints/delete.ts b/packages/payload/src/collections/endpoints/delete.ts
index 0948fa8da06..29c5f7c1be9 100644
--- a/packages/payload/src/collections/endpoints/delete.ts
+++ b/packages/payload/src/collections/endpoints/delete.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import { getTranslation } from '@payloadcms/translations'
import { status as httpStatus } from 'http-status'
diff --git a/packages/payload/src/collections/endpoints/find.ts b/packages/payload/src/collections/endpoints/find.ts
index a743926fe7e..7381c1a240e 100644
--- a/packages/payload/src/collections/endpoints/find.ts
+++ b/packages/payload/src/collections/endpoints/find.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import { status as httpStatus } from 'http-status'
import type { PayloadHandler } from '../../config/types.js'
diff --git a/packages/payload/src/collections/endpoints/findByID.ts b/packages/payload/src/collections/endpoints/findByID.ts
index 33c509d68f3..cabae0f132f 100644
--- a/packages/payload/src/collections/endpoints/findByID.ts
+++ b/packages/payload/src/collections/endpoints/findByID.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import { status as httpStatus } from 'http-status'
import type { PayloadHandler } from '../../config/types.js'
diff --git a/packages/payload/src/collections/endpoints/getFile.ts b/packages/payload/src/collections/endpoints/getFile.ts
index 0b824b19e83..3d23af6da57 100644
--- a/packages/payload/src/collections/endpoints/getFile.ts
+++ b/packages/payload/src/collections/endpoints/getFile.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import { fileTypeFromFile } from 'file-type'
import fsPromises from 'fs/promises'
import { status as httpStatus } from 'http-status'
diff --git a/packages/payload/src/collections/endpoints/getFileFromURL.ts b/packages/payload/src/collections/endpoints/getFileFromURL.ts
index 8c182d12ec2..f493b522f8f 100644
--- a/packages/payload/src/collections/endpoints/getFileFromURL.ts
+++ b/packages/payload/src/collections/endpoints/getFileFromURL.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { PayloadHandler } from '../../config/types.js'
import executeAccess from '../../auth/executeAccess.js'
diff --git a/packages/payload/src/collections/endpoints/preview.ts b/packages/payload/src/collections/endpoints/preview.ts
index b556eb8a244..b1e39f737c1 100644
--- a/packages/payload/src/collections/endpoints/preview.ts
+++ b/packages/payload/src/collections/endpoints/preview.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import { status as httpStatus } from 'http-status'
import type { PayloadHandler } from '../../config/types.js'
diff --git a/packages/payload/src/collections/endpoints/update.ts b/packages/payload/src/collections/endpoints/update.ts
index bcd51ce26e1..9bad8838538 100644
--- a/packages/payload/src/collections/endpoints/update.ts
+++ b/packages/payload/src/collections/endpoints/update.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import { getTranslation } from '@payloadcms/translations'
import { status as httpStatus } from 'http-status'
diff --git a/packages/payload/src/collections/endpoints/updateByID.ts b/packages/payload/src/collections/endpoints/updateByID.ts
index 1729ad80835..4bdd63415ee 100644
--- a/packages/payload/src/collections/endpoints/updateByID.ts
+++ b/packages/payload/src/collections/endpoints/updateByID.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import { status as httpStatus } from 'http-status'
import type { PayloadHandler } from '../../config/types.js'
diff --git a/packages/payload/src/collections/operations/count.ts b/packages/payload/src/collections/operations/count.ts
index ad8cd9b0581..bcb2b9fd7c1 100644
--- a/packages/payload/src/collections/operations/count.ts
+++ b/packages/payload/src/collections/operations/count.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { AccessResult } from '../../config/types.js'
import type { CollectionSlug } from '../../index.js'
import type { PayloadRequest, Where } from '../../types/index.js'
diff --git a/packages/payload/src/collections/operations/countVersions.ts b/packages/payload/src/collections/operations/countVersions.ts
index 8c7ffa639a8..70ddbe2962c 100644
--- a/packages/payload/src/collections/operations/countVersions.ts
+++ b/packages/payload/src/collections/operations/countVersions.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { AccessResult } from '../../config/types.js'
import type { PayloadRequest, Where } from '../../types/index.js'
import type { Collection } from '../config/types.js'
diff --git a/packages/payload/src/collections/operations/create.ts b/packages/payload/src/collections/operations/create.ts
index 32e207454c4..940052429f4 100644
--- a/packages/payload/src/collections/operations/create.ts
+++ b/packages/payload/src/collections/operations/create.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import crypto from 'crypto'
import type {
diff --git a/packages/payload/src/collections/operations/delete.ts b/packages/payload/src/collections/operations/delete.ts
index 90315c4c03f..20f333590da 100644
--- a/packages/payload/src/collections/operations/delete.ts
+++ b/packages/payload/src/collections/operations/delete.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import { status as httpStatus } from 'http-status'
import type { AccessResult } from '../../config/types.js'
diff --git a/packages/payload/src/collections/operations/deleteByID.ts b/packages/payload/src/collections/operations/deleteByID.ts
index 5750e1bea47..73de48188c3 100644
--- a/packages/payload/src/collections/operations/deleteByID.ts
+++ b/packages/payload/src/collections/operations/deleteByID.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { CollectionSlug } from '../../index.js'
import type {
PayloadRequest,
diff --git a/packages/payload/src/collections/operations/docAccess.ts b/packages/payload/src/collections/operations/docAccess.ts
index feae243a527..4fa64d796e9 100644
--- a/packages/payload/src/collections/operations/docAccess.ts
+++ b/packages/payload/src/collections/operations/docAccess.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { SanitizedCollectionPermission } from '../../auth/index.js'
import type { AllOperations, PayloadRequest } from '../../types/index.js'
import type { Collection } from '../config/types.js'
diff --git a/packages/payload/src/collections/operations/find.ts b/packages/payload/src/collections/operations/find.ts
index 4e1c05969d5..b7d5167ce3f 100644
--- a/packages/payload/src/collections/operations/find.ts
+++ b/packages/payload/src/collections/operations/find.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { AccessResult } from '../../config/types.js'
import type { PaginatedDocs } from '../../database/types.js'
import type { CollectionSlug, JoinQuery } from '../../index.js'
diff --git a/packages/payload/src/collections/operations/findByID.ts b/packages/payload/src/collections/operations/findByID.ts
index b438936ff9b..c1d9d5e469d 100644
--- a/packages/payload/src/collections/operations/findByID.ts
+++ b/packages/payload/src/collections/operations/findByID.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { FindOneArgs } from '../../database/types.js'
import type { CollectionSlug, JoinQuery } from '../../index.js'
import type {
diff --git a/packages/payload/src/collections/operations/findVersionByID.ts b/packages/payload/src/collections/operations/findVersionByID.ts
index 6164a95fc00..82d9ccaf25e 100644
--- a/packages/payload/src/collections/operations/findVersionByID.ts
+++ b/packages/payload/src/collections/operations/findVersionByID.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import { status as httpStatus } from 'http-status'
import type { PayloadRequest, PopulateType, SelectType } from '../../types/index.js'
diff --git a/packages/payload/src/collections/operations/findVersions.ts b/packages/payload/src/collections/operations/findVersions.ts
index 6c5e6200c0f..bdb2d4e62fd 100644
--- a/packages/payload/src/collections/operations/findVersions.ts
+++ b/packages/payload/src/collections/operations/findVersions.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { PaginatedDocs } from '../../database/types.js'
import type { PayloadRequest, PopulateType, SelectType, Sort, Where } from '../../types/index.js'
import type { TypeWithVersion } from '../../versions/types.js'
diff --git a/packages/payload/src/collections/operations/local/count.ts b/packages/payload/src/collections/operations/local/count.ts
index 9b1646595e8..5d7681d9d8e 100644
--- a/packages/payload/src/collections/operations/local/count.ts
+++ b/packages/payload/src/collections/operations/local/count.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { CollectionSlug, Payload, RequestContext, TypedLocale } from '../../../index.js'
import type { Document, PayloadRequest, Where } from '../../../types/index.js'
diff --git a/packages/payload/src/collections/operations/local/countVersions.ts b/packages/payload/src/collections/operations/local/countVersions.ts
index 30bc96a31ee..8003ad1e18d 100644
--- a/packages/payload/src/collections/operations/local/countVersions.ts
+++ b/packages/payload/src/collections/operations/local/countVersions.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { CollectionSlug, Payload, RequestContext, TypedLocale } from '../../../index.js'
import type { Document, PayloadRequest, Where } from '../../../types/index.js'
diff --git a/packages/payload/src/collections/operations/local/create.ts b/packages/payload/src/collections/operations/local/create.ts
index 713fc953023..4deb8431c89 100644
--- a/packages/payload/src/collections/operations/local/create.ts
+++ b/packages/payload/src/collections/operations/local/create.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type {
Document,
PayloadRequest,
diff --git a/packages/payload/src/collections/operations/local/delete.ts b/packages/payload/src/collections/operations/local/delete.ts
index 0680da7754c..2c6f59895a5 100644
--- a/packages/payload/src/collections/operations/local/delete.ts
+++ b/packages/payload/src/collections/operations/local/delete.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { CollectionSlug, Payload, RequestContext, TypedLocale } from '../../../index.js'
import type {
Document,
diff --git a/packages/payload/src/collections/operations/local/duplicate.ts b/packages/payload/src/collections/operations/local/duplicate.ts
index d4a998967cc..6c5bd32f039 100644
--- a/packages/payload/src/collections/operations/local/duplicate.ts
+++ b/packages/payload/src/collections/operations/local/duplicate.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { DeepPartial } from 'ts-essentials'
import type { CollectionSlug, TypedLocale } from '../../..//index.js'
diff --git a/packages/payload/src/collections/operations/local/find.ts b/packages/payload/src/collections/operations/local/find.ts
index 1ea8c7d0810..9c62a3139d5 100644
--- a/packages/payload/src/collections/operations/local/find.ts
+++ b/packages/payload/src/collections/operations/local/find.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { PaginatedDocs } from '../../../database/types.js'
import type {
CollectionSlug,
diff --git a/packages/payload/src/collections/operations/local/findByID.ts b/packages/payload/src/collections/operations/local/findByID.ts
index b2a4b273bc0..c721a068d59 100644
--- a/packages/payload/src/collections/operations/local/findByID.ts
+++ b/packages/payload/src/collections/operations/local/findByID.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
/* eslint-disable no-restricted-exports */
import type {
CollectionSlug,
diff --git a/packages/payload/src/collections/operations/local/findVersionByID.ts b/packages/payload/src/collections/operations/local/findVersionByID.ts
index 581fb5a5c18..3e03d429bac 100644
--- a/packages/payload/src/collections/operations/local/findVersionByID.ts
+++ b/packages/payload/src/collections/operations/local/findVersionByID.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { CollectionSlug, Payload, RequestContext, TypedLocale } from '../../../index.js'
import type { Document, PayloadRequest, PopulateType, SelectType } from '../../../types/index.js'
import type { TypeWithVersion } from '../../../versions/types.js'
diff --git a/packages/payload/src/collections/operations/local/findVersions.ts b/packages/payload/src/collections/operations/local/findVersions.ts
index 664076d9901..6fb202064cc 100644
--- a/packages/payload/src/collections/operations/local/findVersions.ts
+++ b/packages/payload/src/collections/operations/local/findVersions.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { PaginatedDocs } from '../../../database/types.js'
import type { CollectionSlug, Payload, RequestContext, TypedLocale } from '../../../index.js'
import type {
diff --git a/packages/payload/src/collections/operations/local/restoreVersion.ts b/packages/payload/src/collections/operations/local/restoreVersion.ts
index 6ce4bff4853..5644503c48d 100644
--- a/packages/payload/src/collections/operations/local/restoreVersion.ts
+++ b/packages/payload/src/collections/operations/local/restoreVersion.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { CollectionSlug, Payload, RequestContext, TypedLocale } from '../../../index.js'
import type { Document, PayloadRequest, PopulateType, SelectType } from '../../../types/index.js'
import type { DataFromCollectionSlug } from '../../config/types.js'
diff --git a/packages/payload/src/collections/operations/local/update.ts b/packages/payload/src/collections/operations/local/update.ts
index ddf0ee46240..225a90bf807 100644
--- a/packages/payload/src/collections/operations/local/update.ts
+++ b/packages/payload/src/collections/operations/local/update.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { DeepPartial } from 'ts-essentials'
import type { CollectionSlug, Payload, RequestContext, TypedLocale } from '../../../index.js'
diff --git a/packages/payload/src/collections/operations/restoreVersion.ts b/packages/payload/src/collections/operations/restoreVersion.ts
index 7c00a6a7e20..c763e6bd9f4 100644
--- a/packages/payload/src/collections/operations/restoreVersion.ts
+++ b/packages/payload/src/collections/operations/restoreVersion.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import { status as httpStatus } from 'http-status'
import type { FindOneArgs } from '../../database/types.js'
diff --git a/packages/payload/src/collections/operations/update.ts b/packages/payload/src/collections/operations/update.ts
index eee1e501ab7..3d8d75cc350 100644
--- a/packages/payload/src/collections/operations/update.ts
+++ b/packages/payload/src/collections/operations/update.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { DeepPartial } from 'ts-essentials'
import { status as httpStatus } from 'http-status'
diff --git a/packages/payload/src/collections/operations/updateByID.ts b/packages/payload/src/collections/operations/updateByID.ts
index dd343ac7335..13463ca8a67 100644
--- a/packages/payload/src/collections/operations/updateByID.ts
+++ b/packages/payload/src/collections/operations/updateByID.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { DeepPartial } from 'ts-essentials'
import { status as httpStatus } from 'http-status'
diff --git a/packages/payload/src/collections/operations/utilities/update.ts b/packages/payload/src/collections/operations/utilities/update.ts
index 6173a5824f8..32b56cc39a1 100644
--- a/packages/payload/src/collections/operations/utilities/update.ts
+++ b/packages/payload/src/collections/operations/utilities/update.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { DeepPartial } from 'ts-essentials'
import type { Args } from '../../../fields/hooks/beforeChange/index.js'
diff --git a/packages/payload/src/config/client.ts b/packages/payload/src/config/client.ts
index f5b037152c8..0befb3696fe 100644
--- a/packages/payload/src/config/client.ts
+++ b/packages/payload/src/config/client.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { I18nClient } from '@payloadcms/translations'
import type { DeepPartial } from 'ts-essentials'
diff --git a/packages/payload/src/config/find.ts b/packages/payload/src/config/find.ts
index e0858d2d0c6..2661ad330b4 100644
--- a/packages/payload/src/config/find.ts
+++ b/packages/payload/src/config/find.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import { getTsconfig } from 'get-tsconfig'
import path from 'path'
diff --git a/packages/payload/src/config/sanitize.ts b/packages/payload/src/config/sanitize.ts
index 0033425360e..4a2961ea0f4 100644
--- a/packages/payload/src/config/sanitize.ts
+++ b/packages/payload/src/config/sanitize.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { AcceptedLanguages } from '@payloadcms/translations'
import { en } from '@payloadcms/translations/languages/en'
diff --git a/packages/payload/src/config/types.ts b/packages/payload/src/config/types.ts
index 852926284ad..2fc479033a0 100644
--- a/packages/payload/src/config/types.ts
+++ b/packages/payload/src/config/types.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type {
DefaultTranslationKeys,
DefaultTranslationsObject,
diff --git a/packages/payload/src/database/combineQueries.ts b/packages/payload/src/database/combineQueries.ts
index 33169ac0809..e56c24405cc 100644
--- a/packages/payload/src/database/combineQueries.ts
+++ b/packages/payload/src/database/combineQueries.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { Where } from '../types/index.js'
import { hasWhereAccessResult } from '../auth/index.js'
diff --git a/packages/payload/src/database/createDatabaseAdapter.ts b/packages/payload/src/database/createDatabaseAdapter.ts
index 1879e8a105c..03521bcb57e 100644
--- a/packages/payload/src/database/createDatabaseAdapter.ts
+++ b/packages/payload/src/database/createDatabaseAdapter.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { MarkOptional } from 'ts-essentials'
import type {
diff --git a/packages/payload/src/database/getLocalizedPaths.ts b/packages/payload/src/database/getLocalizedPaths.ts
index f66168a3eae..6a3e3001d5e 100644
--- a/packages/payload/src/database/getLocalizedPaths.ts
+++ b/packages/payload/src/database/getLocalizedPaths.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { Field, FlattenedField } from '../fields/config/types.js'
import type { Payload } from '../index.js'
import type { PathToQuery } from './queryValidation/types.js'
diff --git a/packages/payload/src/database/migrations/createMigration.ts b/packages/payload/src/database/migrations/createMigration.ts
index ceb0be45f81..a6fcf03acfb 100644
--- a/packages/payload/src/database/migrations/createMigration.ts
+++ b/packages/payload/src/database/migrations/createMigration.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import fs from 'fs'
import type { CreateMigration } from '../types.js'
diff --git a/packages/payload/src/database/migrations/migrate.ts b/packages/payload/src/database/migrations/migrate.ts
index f3e0e73191b..6587c6c3cac 100644
--- a/packages/payload/src/database/migrations/migrate.ts
+++ b/packages/payload/src/database/migrations/migrate.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { BaseDatabaseAdapter } from '../types.js'
import { commitTransaction } from '../../utilities/commitTransaction.js'
diff --git a/packages/payload/src/database/migrations/migrateDown.ts b/packages/payload/src/database/migrations/migrateDown.ts
index 19bcb957499..c941dd76a72 100644
--- a/packages/payload/src/database/migrations/migrateDown.ts
+++ b/packages/payload/src/database/migrations/migrateDown.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { BaseDatabaseAdapter } from '../types.js'
import { commitTransaction } from '../../utilities/commitTransaction.js'
diff --git a/packages/payload/src/database/migrations/migrateRefresh.ts b/packages/payload/src/database/migrations/migrateRefresh.ts
index 98a2d1f71cb..1df37e9e292 100644
--- a/packages/payload/src/database/migrations/migrateRefresh.ts
+++ b/packages/payload/src/database/migrations/migrateRefresh.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { BaseDatabaseAdapter } from '../types.js'
import { commitTransaction } from '../../utilities/commitTransaction.js'
diff --git a/packages/payload/src/database/migrations/migrateReset.ts b/packages/payload/src/database/migrations/migrateReset.ts
index 10cf733e9a4..da39a157e04 100644
--- a/packages/payload/src/database/migrations/migrateReset.ts
+++ b/packages/payload/src/database/migrations/migrateReset.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { BaseDatabaseAdapter } from '../types.js'
import { commitTransaction } from '../../utilities/commitTransaction.js'
diff --git a/packages/payload/src/database/migrations/readMigrationFiles.ts b/packages/payload/src/database/migrations/readMigrationFiles.ts
index 8087a7f1326..5bf413b7b91 100644
--- a/packages/payload/src/database/migrations/readMigrationFiles.ts
+++ b/packages/payload/src/database/migrations/readMigrationFiles.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import fs from 'fs'
import { pathToFileURL } from 'node:url'
import path from 'path'
diff --git a/packages/payload/src/database/queryValidation/validateQueryPaths.ts b/packages/payload/src/database/queryValidation/validateQueryPaths.ts
index 98f662cafcc..32fd2544536 100644
--- a/packages/payload/src/database/queryValidation/validateQueryPaths.ts
+++ b/packages/payload/src/database/queryValidation/validateQueryPaths.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { SanitizedCollectionConfig } from '../../collections/config/types.js'
import type { FlattenedField } from '../../fields/config/types.js'
import type { SanitizedGlobalConfig } from '../../globals/config/types.js'
diff --git a/packages/payload/src/database/queryValidation/validateSearchParams.ts b/packages/payload/src/database/queryValidation/validateSearchParams.ts
index 84fa0845a5b..1c9d5f36683 100644
--- a/packages/payload/src/database/queryValidation/validateSearchParams.ts
+++ b/packages/payload/src/database/queryValidation/validateSearchParams.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { SanitizedCollectionConfig } from '../../collections/config/types.js'
import type { FlattenedField } from '../../fields/config/types.js'
import type { SanitizedGlobalConfig } from '../../globals/config/types.js'
diff --git a/packages/payload/src/database/sanitizeJoinQuery.ts b/packages/payload/src/database/sanitizeJoinQuery.ts
index 03e0c599d86..298fb4c4cac 100644
--- a/packages/payload/src/database/sanitizeJoinQuery.ts
+++ b/packages/payload/src/database/sanitizeJoinQuery.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { SanitizedCollectionConfig } from '../collections/config/types.js'
import type { JoinQuery, PayloadRequest } from '../types/index.js'
diff --git a/packages/payload/src/duplicateDocument/index.ts b/packages/payload/src/duplicateDocument/index.ts
index cac3c44696b..023a4baf2a3 100644
--- a/packages/payload/src/duplicateDocument/index.ts
+++ b/packages/payload/src/duplicateDocument/index.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { SanitizedCollectionConfig } from '../collections/config/types.js'
import type { FindOneArgs } from '../database/types.js'
import type { JsonObject, PayloadRequest } from '../types/index.js'
diff --git a/packages/payload/src/email/getStringifiedToAddress.ts b/packages/payload/src/email/getStringifiedToAddress.ts
index c7612a2d706..4884be89246 100644
--- a/packages/payload/src/email/getStringifiedToAddress.ts
+++ b/packages/payload/src/email/getStringifiedToAddress.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { SendEmailOptions } from './types.js'
export const getStringifiedToAddress = (message: SendEmailOptions): string | undefined => {
diff --git a/packages/payload/src/errors/APIError.ts b/packages/payload/src/errors/APIError.ts
index 43a6fcd5e43..1c92ba81675 100644
--- a/packages/payload/src/errors/APIError.ts
+++ b/packages/payload/src/errors/APIError.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import { status as httpStatus } from 'http-status'
// This gets dynamically reassigned during compilation
diff --git a/packages/payload/src/fields/baseFields/timezone/baseField.ts b/packages/payload/src/fields/baseFields/timezone/baseField.ts
index f0cd6592bf4..f71efddae1b 100644
--- a/packages/payload/src/fields/baseFields/timezone/baseField.ts
+++ b/packages/payload/src/fields/baseFields/timezone/baseField.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { SelectField } from '../../config/types.js'
export const baseTimezoneField: (args: Partial<SelectField>) => SelectField = ({
diff --git a/packages/payload/src/fields/config/client.ts b/packages/payload/src/fields/config/client.ts
index b9a9529e267..32cd4822aa6 100644
--- a/packages/payload/src/fields/config/client.ts
+++ b/packages/payload/src/fields/config/client.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
/* eslint-disable perfectionist/sort-switch-case */
// Keep perfectionist/sort-switch-case disabled - it incorrectly messes up the ordering of the switch cases, causing it to break
import type { I18nClient } from '@payloadcms/translations'
diff --git a/packages/payload/src/fields/config/sanitize.ts b/packages/payload/src/fields/config/sanitize.ts
index 4ea4f269770..79df250ac59 100644
--- a/packages/payload/src/fields/config/sanitize.ts
+++ b/packages/payload/src/fields/config/sanitize.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import { deepMergeSimple } from '@payloadcms/translations/utilities'
import type { CollectionConfig, SanitizedJoins } from '../../collections/config/types.js'
diff --git a/packages/payload/src/fields/config/sanitizeJoinField.ts b/packages/payload/src/fields/config/sanitizeJoinField.ts
index 806490dc11e..d851a81c63e 100644
--- a/packages/payload/src/fields/config/sanitizeJoinField.ts
+++ b/packages/payload/src/fields/config/sanitizeJoinField.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { SanitizedJoin, SanitizedJoins } from '../../collections/config/types.js'
import type { Config } from '../../config/types.js'
import type { FlattenedJoinField, JoinField, RelationshipField, UploadField } from './types.js'
diff --git a/packages/payload/src/fields/config/types.ts b/packages/payload/src/fields/config/types.ts
index 13ea6d2ec8f..9784e60b831 100644
--- a/packages/payload/src/fields/config/types.ts
+++ b/packages/payload/src/fields/config/types.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
/* eslint-disable @typescript-eslint/no-explicit-any */
import type { EditorProps } from '@monaco-editor/react'
diff --git a/packages/payload/src/fields/getFieldPaths.ts b/packages/payload/src/fields/getFieldPaths.ts
index 56dd4b9b7d5..0f2d62bd694 100644
--- a/packages/payload/src/fields/getFieldPaths.ts
+++ b/packages/payload/src/fields/getFieldPaths.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { ClientField, Field, Tab, TabAsFieldClient } from './config/types.js'
type Args = {
diff --git a/packages/payload/src/fields/hooks/afterChange/index.ts b/packages/payload/src/fields/hooks/afterChange/index.ts
index 71701c206de..4f72c9c9c86 100644
--- a/packages/payload/src/fields/hooks/afterChange/index.ts
+++ b/packages/payload/src/fields/hooks/afterChange/index.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { SanitizedCollectionConfig } from '../../../collections/config/types.js'
import type { SanitizedGlobalConfig } from '../../../globals/config/types.js'
import type { RequestContext } from '../../../index.js'
diff --git a/packages/payload/src/fields/hooks/afterChange/promise.ts b/packages/payload/src/fields/hooks/afterChange/promise.ts
index efcda66bb93..20fbad922fc 100644
--- a/packages/payload/src/fields/hooks/afterChange/promise.ts
+++ b/packages/payload/src/fields/hooks/afterChange/promise.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { RichTextAdapter } from '../../../admin/RichText.js'
import type { SanitizedCollectionConfig } from '../../../collections/config/types.js'
import type { SanitizedGlobalConfig } from '../../../globals/config/types.js'
diff --git a/packages/payload/src/fields/hooks/afterChange/traverseFields.ts b/packages/payload/src/fields/hooks/afterChange/traverseFields.ts
index 84ff814983e..223fce92e01 100644
--- a/packages/payload/src/fields/hooks/afterChange/traverseFields.ts
+++ b/packages/payload/src/fields/hooks/afterChange/traverseFields.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { SanitizedCollectionConfig } from '../../../collections/config/types.js'
import type { SanitizedGlobalConfig } from '../../../globals/config/types.js'
import type { RequestContext } from '../../../index.js'
diff --git a/packages/payload/src/fields/hooks/afterRead/index.ts b/packages/payload/src/fields/hooks/afterRead/index.ts
index d9a659df69d..84427ffd1b3 100644
--- a/packages/payload/src/fields/hooks/afterRead/index.ts
+++ b/packages/payload/src/fields/hooks/afterRead/index.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { SanitizedCollectionConfig } from '../../../collections/config/types.js'
import type { SanitizedGlobalConfig } from '../../../globals/config/types.js'
import type { RequestContext } from '../../../index.js'
diff --git a/packages/payload/src/fields/hooks/afterRead/promise.ts b/packages/payload/src/fields/hooks/afterRead/promise.ts
index 66e8236375e..2fca395a3f5 100644
--- a/packages/payload/src/fields/hooks/afterRead/promise.ts
+++ b/packages/payload/src/fields/hooks/afterRead/promise.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { RichTextAdapter } from '../../../admin/RichText.js'
import type { SanitizedCollectionConfig } from '../../../collections/config/types.js'
import type { SanitizedGlobalConfig } from '../../../globals/config/types.js'
diff --git a/packages/payload/src/fields/hooks/afterRead/relationshipPopulationPromise.ts b/packages/payload/src/fields/hooks/afterRead/relationshipPopulationPromise.ts
index 22a0ebae781..dfe5887723a 100644
--- a/packages/payload/src/fields/hooks/afterRead/relationshipPopulationPromise.ts
+++ b/packages/payload/src/fields/hooks/afterRead/relationshipPopulationPromise.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { PayloadRequest, PopulateType } from '../../../types/index.js'
import type { JoinField, RelationshipField, UploadField } from '../../config/types.js'
diff --git a/packages/payload/src/fields/hooks/beforeChange/index.ts b/packages/payload/src/fields/hooks/beforeChange/index.ts
index 9359b5c37ba..bb53cf8fb51 100644
--- a/packages/payload/src/fields/hooks/beforeChange/index.ts
+++ b/packages/payload/src/fields/hooks/beforeChange/index.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { SanitizedCollectionConfig } from '../../../collections/config/types.js'
import type { ValidationFieldError } from '../../../errors/index.js'
import type { SanitizedGlobalConfig } from '../../../globals/config/types.js'
diff --git a/packages/payload/src/fields/hooks/beforeChange/promise.ts b/packages/payload/src/fields/hooks/beforeChange/promise.ts
index 3cea81cfc78..1a12ea058cd 100644
--- a/packages/payload/src/fields/hooks/beforeChange/promise.ts
+++ b/packages/payload/src/fields/hooks/beforeChange/promise.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { RichTextAdapter } from '../../../admin/RichText.js'
import type { SanitizedCollectionConfig } from '../../../collections/config/types.js'
import type { ValidationFieldError } from '../../../errors/index.js'
diff --git a/packages/payload/src/fields/hooks/beforeChange/traverseFields.ts b/packages/payload/src/fields/hooks/beforeChange/traverseFields.ts
index 80e49166830..c685b778d11 100644
--- a/packages/payload/src/fields/hooks/beforeChange/traverseFields.ts
+++ b/packages/payload/src/fields/hooks/beforeChange/traverseFields.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { SanitizedCollectionConfig } from '../../../collections/config/types.js'
import type { ValidationFieldError } from '../../../errors/index.js'
import type { SanitizedGlobalConfig } from '../../../globals/config/types.js'
diff --git a/packages/payload/src/fields/hooks/beforeDuplicate/index.ts b/packages/payload/src/fields/hooks/beforeDuplicate/index.ts
index 7eea0c3af3d..4a0910ae42c 100644
--- a/packages/payload/src/fields/hooks/beforeDuplicate/index.ts
+++ b/packages/payload/src/fields/hooks/beforeDuplicate/index.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { SanitizedCollectionConfig } from '../../../collections/config/types.js'
import type { RequestContext } from '../../../index.js'
import type { JsonObject, PayloadRequest } from '../../../types/index.js'
diff --git a/packages/payload/src/fields/hooks/beforeDuplicate/promise.ts b/packages/payload/src/fields/hooks/beforeDuplicate/promise.ts
index f624e0c3f18..6beaf3ce051 100644
--- a/packages/payload/src/fields/hooks/beforeDuplicate/promise.ts
+++ b/packages/payload/src/fields/hooks/beforeDuplicate/promise.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { SanitizedCollectionConfig } from '../../../collections/config/types.js'
import type { RequestContext } from '../../../index.js'
import type { JsonObject, PayloadRequest } from '../../../types/index.js'
diff --git a/packages/payload/src/fields/hooks/beforeDuplicate/runHook.ts b/packages/payload/src/fields/hooks/beforeDuplicate/runHook.ts
index a4328277eb2..e6232ec4ce1 100644
--- a/packages/payload/src/fields/hooks/beforeDuplicate/runHook.ts
+++ b/packages/payload/src/fields/hooks/beforeDuplicate/runHook.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { FieldHookArgs } from '../../config/types.js'
export const runBeforeDuplicateHooks = async (args: FieldHookArgs) =>
diff --git a/packages/payload/src/fields/hooks/beforeDuplicate/traverseFields.ts b/packages/payload/src/fields/hooks/beforeDuplicate/traverseFields.ts
index 4dce89f9ff4..78b3569ce57 100644
--- a/packages/payload/src/fields/hooks/beforeDuplicate/traverseFields.ts
+++ b/packages/payload/src/fields/hooks/beforeDuplicate/traverseFields.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { SanitizedCollectionConfig } from '../../../collections/config/types.js'
import type { RequestContext } from '../../../index.js'
import type { JsonObject, PayloadRequest } from '../../../types/index.js'
diff --git a/packages/payload/src/fields/hooks/beforeValidate/index.ts b/packages/payload/src/fields/hooks/beforeValidate/index.ts
index b390d7a1c55..967193021a8 100644
--- a/packages/payload/src/fields/hooks/beforeValidate/index.ts
+++ b/packages/payload/src/fields/hooks/beforeValidate/index.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { SanitizedCollectionConfig } from '../../../collections/config/types.js'
import type { SanitizedGlobalConfig } from '../../../globals/config/types.js'
import type { JsonObject, PayloadRequest } from '../../../types/index.js'
diff --git a/packages/payload/src/fields/hooks/beforeValidate/promise.ts b/packages/payload/src/fields/hooks/beforeValidate/promise.ts
index 3b18742f1f0..81bbc93d4cc 100644
--- a/packages/payload/src/fields/hooks/beforeValidate/promise.ts
+++ b/packages/payload/src/fields/hooks/beforeValidate/promise.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { RichTextAdapter } from '../../../admin/RichText.js'
import type { SanitizedCollectionConfig, TypeWithID } from '../../../collections/config/types.js'
import type { SanitizedGlobalConfig } from '../../../globals/config/types.js'
diff --git a/packages/payload/src/fields/hooks/beforeValidate/traverseFields.ts b/packages/payload/src/fields/hooks/beforeValidate/traverseFields.ts
index 8c36b5b5839..c8c594a31fc 100644
--- a/packages/payload/src/fields/hooks/beforeValidate/traverseFields.ts
+++ b/packages/payload/src/fields/hooks/beforeValidate/traverseFields.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { SanitizedCollectionConfig } from '../../../collections/config/types.js'
import type { SanitizedGlobalConfig } from '../../../globals/config/types.js'
import type { RequestContext } from '../../../index.js'
diff --git a/packages/payload/src/fields/mergeBaseFields.ts b/packages/payload/src/fields/mergeBaseFields.ts
index 6112a8a02b7..dfca0fc0611 100644
--- a/packages/payload/src/fields/mergeBaseFields.ts
+++ b/packages/payload/src/fields/mergeBaseFields.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { Field, FieldWithSubFields } from './config/types.js'
import { deepMergeWithReactComponents } from '../utilities/deepMerge.js'
diff --git a/packages/payload/src/fields/setDefaultBeforeDuplicate.ts b/packages/payload/src/fields/setDefaultBeforeDuplicate.ts
index a94a116ec98..97f2314e508 100644
--- a/packages/payload/src/fields/setDefaultBeforeDuplicate.ts
+++ b/packages/payload/src/fields/setDefaultBeforeDuplicate.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
// default beforeDuplicate hook for required and unique fields
import type { FieldAffectingData, FieldHook } from './config/types.js'
diff --git a/packages/payload/src/fields/validations.ts b/packages/payload/src/fields/validations.ts
index fa2ba973591..5e61f62a88b 100644
--- a/packages/payload/src/fields/validations.ts
+++ b/packages/payload/src/fields/validations.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import Ajv from 'ajv'
import ObjectIdImport from 'bson-objectid'
diff --git a/packages/payload/src/globals/config/client.ts b/packages/payload/src/globals/config/client.ts
index 6dda67d9970..c7449304015 100644
--- a/packages/payload/src/globals/config/client.ts
+++ b/packages/payload/src/globals/config/client.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { I18nClient } from '@payloadcms/translations'
import type { ImportMap } from '../../bin/generateImportMap/index.js'
diff --git a/packages/payload/src/globals/config/sanitize.ts b/packages/payload/src/globals/config/sanitize.ts
index 40cf74728d0..263b0c2472f 100644
--- a/packages/payload/src/globals/config/sanitize.ts
+++ b/packages/payload/src/globals/config/sanitize.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { Config, SanitizedConfig } from '../../config/types.js'
import type { GlobalConfig, SanitizedGlobalConfig } from './types.js'
diff --git a/packages/payload/src/globals/endpoints/findVersionByID.ts b/packages/payload/src/globals/endpoints/findVersionByID.ts
index 36e8b71309b..7b5a67b4b6e 100644
--- a/packages/payload/src/globals/endpoints/findVersionByID.ts
+++ b/packages/payload/src/globals/endpoints/findVersionByID.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import { status as httpStatus } from 'http-status'
import type { PayloadHandler } from '../../config/types.js'
diff --git a/packages/payload/src/globals/endpoints/preview.ts b/packages/payload/src/globals/endpoints/preview.ts
index 07d275aaea4..5df42796f68 100644
--- a/packages/payload/src/globals/endpoints/preview.ts
+++ b/packages/payload/src/globals/endpoints/preview.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import { status as httpStatus } from 'http-status'
import type { PayloadHandler } from '../../config/types.js'
diff --git a/packages/payload/src/globals/endpoints/restoreVersion.ts b/packages/payload/src/globals/endpoints/restoreVersion.ts
index 135dc4a461a..01d34a07eb8 100644
--- a/packages/payload/src/globals/endpoints/restoreVersion.ts
+++ b/packages/payload/src/globals/endpoints/restoreVersion.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import { status as httpStatus } from 'http-status'
import type { PayloadHandler } from '../../config/types.js'
diff --git a/packages/payload/src/globals/endpoints/update.ts b/packages/payload/src/globals/endpoints/update.ts
index 67ace0ec944..5bf8683ea42 100644
--- a/packages/payload/src/globals/endpoints/update.ts
+++ b/packages/payload/src/globals/endpoints/update.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import { status as httpStatus } from 'http-status'
import type { PayloadHandler } from '../../config/types.js'
diff --git a/packages/payload/src/globals/operations/countGlobalVersions.ts b/packages/payload/src/globals/operations/countGlobalVersions.ts
index fbba748165c..4fa4b11cbb7 100644
--- a/packages/payload/src/globals/operations/countGlobalVersions.ts
+++ b/packages/payload/src/globals/operations/countGlobalVersions.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { AccessResult } from '../../config/types.js'
import type { PayloadRequest, Where } from '../../types/index.js'
diff --git a/packages/payload/src/globals/operations/docAccess.ts b/packages/payload/src/globals/operations/docAccess.ts
index 26021eccb8c..a5aa6aa6418 100644
--- a/packages/payload/src/globals/operations/docAccess.ts
+++ b/packages/payload/src/globals/operations/docAccess.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { SanitizedGlobalPermission } from '../../auth/index.js'
import type { AllOperations, PayloadRequest } from '../../types/index.js'
import type { SanitizedGlobalConfig } from '../config/types.js'
diff --git a/packages/payload/src/globals/operations/findOne.ts b/packages/payload/src/globals/operations/findOne.ts
index 542daf7de47..3a5517d7efa 100644
--- a/packages/payload/src/globals/operations/findOne.ts
+++ b/packages/payload/src/globals/operations/findOne.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { AccessResult } from '../../config/types.js'
import type { PayloadRequest, PopulateType, SelectType, Where } from '../../types/index.js'
import type { SanitizedGlobalConfig } from '../config/types.js'
diff --git a/packages/payload/src/globals/operations/findVersionByID.ts b/packages/payload/src/globals/operations/findVersionByID.ts
index 81fae5f293b..5e490421bb0 100644
--- a/packages/payload/src/globals/operations/findVersionByID.ts
+++ b/packages/payload/src/globals/operations/findVersionByID.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { FindGlobalVersionsArgs } from '../../database/types.js'
import type { PayloadRequest, PopulateType, SelectType } from '../../types/index.js'
import type { TypeWithVersion } from '../../versions/types.js'
diff --git a/packages/payload/src/globals/operations/findVersions.ts b/packages/payload/src/globals/operations/findVersions.ts
index ca7f8308734..42b6365e39e 100644
--- a/packages/payload/src/globals/operations/findVersions.ts
+++ b/packages/payload/src/globals/operations/findVersions.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { PaginatedDocs } from '../../database/types.js'
import type { PayloadRequest, PopulateType, SelectType, Sort, Where } from '../../types/index.js'
import type { TypeWithVersion } from '../../versions/types.js'
diff --git a/packages/payload/src/globals/operations/local/countGlobalVersions.ts b/packages/payload/src/globals/operations/local/countGlobalVersions.ts
index 979cdbd54a7..7c72fe08640 100644
--- a/packages/payload/src/globals/operations/local/countGlobalVersions.ts
+++ b/packages/payload/src/globals/operations/local/countGlobalVersions.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { GlobalSlug, Payload, RequestContext, TypedLocale } from '../../../index.js'
import type { Document, PayloadRequest, Where } from '../../../types/index.js'
diff --git a/packages/payload/src/globals/operations/local/findOne.ts b/packages/payload/src/globals/operations/local/findOne.ts
index 1e626d1c663..b2e68d89177 100644
--- a/packages/payload/src/globals/operations/local/findOne.ts
+++ b/packages/payload/src/globals/operations/local/findOne.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { GlobalSlug, Payload, RequestContext, TypedLocale } from '../../../index.js'
import type {
Document,
diff --git a/packages/payload/src/globals/operations/local/findVersionByID.ts b/packages/payload/src/globals/operations/local/findVersionByID.ts
index 3cb132af4c8..60b3e2ddff9 100644
--- a/packages/payload/src/globals/operations/local/findVersionByID.ts
+++ b/packages/payload/src/globals/operations/local/findVersionByID.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { GlobalSlug, Payload, RequestContext, TypedLocale } from '../../../index.js'
import type { Document, PayloadRequest, PopulateType, SelectType } from '../../../types/index.js'
import type { TypeWithVersion } from '../../../versions/types.js'
diff --git a/packages/payload/src/globals/operations/local/findVersions.ts b/packages/payload/src/globals/operations/local/findVersions.ts
index 42d78b6fc86..20cc0572a16 100644
--- a/packages/payload/src/globals/operations/local/findVersions.ts
+++ b/packages/payload/src/globals/operations/local/findVersions.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
/* eslint-disable no-restricted-exports */
import type { PaginatedDocs } from '../../../database/types.js'
import type { GlobalSlug, Payload, RequestContext, TypedLocale } from '../../../index.js'
diff --git a/packages/payload/src/globals/operations/local/restoreVersion.ts b/packages/payload/src/globals/operations/local/restoreVersion.ts
index 6b2d7b5050e..db96a1d6875 100644
--- a/packages/payload/src/globals/operations/local/restoreVersion.ts
+++ b/packages/payload/src/globals/operations/local/restoreVersion.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
/* eslint-disable no-restricted-exports */
import type { GlobalSlug, Payload, RequestContext, TypedLocale } from '../../../index.js'
import type { Document, PayloadRequest, PopulateType } from '../../../types/index.js'
diff --git a/packages/payload/src/globals/operations/local/update.ts b/packages/payload/src/globals/operations/local/update.ts
index 2fcd18e5aad..841f6684f80 100644
--- a/packages/payload/src/globals/operations/local/update.ts
+++ b/packages/payload/src/globals/operations/local/update.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { DeepPartial } from 'ts-essentials'
import type {
diff --git a/packages/payload/src/globals/operations/restoreVersion.ts b/packages/payload/src/globals/operations/restoreVersion.ts
index 50c4a94ead9..0d46d43ccdf 100644
--- a/packages/payload/src/globals/operations/restoreVersion.ts
+++ b/packages/payload/src/globals/operations/restoreVersion.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { PayloadRequest, PopulateType } from '../../types/index.js'
import type { TypeWithVersion } from '../../versions/types.js'
import type { SanitizedGlobalConfig } from '../config/types.js'
diff --git a/packages/payload/src/globals/operations/update.ts b/packages/payload/src/globals/operations/update.ts
index d699b1b78ce..cb6969aee8c 100644
--- a/packages/payload/src/globals/operations/update.ts
+++ b/packages/payload/src/globals/operations/update.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { DeepPartial } from 'ts-essentials'
import type { GlobalSlug, JsonObject } from '../../index.js'
diff --git a/packages/payload/src/index.ts b/packages/payload/src/index.ts
index bd4879575dd..afd459066d6 100644
--- a/packages/payload/src/index.ts
+++ b/packages/payload/src/index.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { ExecutionResult, GraphQLSchema, ValidationRule } from 'graphql'
import type { Request as graphQLRequest, OperationArgs } from 'graphql-http'
import type { Logger } from 'pino'
diff --git a/packages/payload/src/lockedDocuments/lockedDocumentsCollection.ts b/packages/payload/src/lockedDocuments/lockedDocumentsCollection.ts
index a8d346d261f..59fa37f9161 100644
--- a/packages/payload/src/lockedDocuments/lockedDocumentsCollection.ts
+++ b/packages/payload/src/lockedDocuments/lockedDocumentsCollection.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { CollectionConfig } from '../collections/config/types.js'
import type { Config } from '../config/types.js'
diff --git a/packages/payload/src/preferences/operations/findOne.ts b/packages/payload/src/preferences/operations/findOne.ts
index d8f2b534a4b..752867acada 100644
--- a/packages/payload/src/preferences/operations/findOne.ts
+++ b/packages/payload/src/preferences/operations/findOne.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { TypedCollection } from '../../index.js'
import type { Where } from '../../types/index.js'
import type { PreferenceRequest } from '../types.js'
diff --git a/packages/payload/src/preferences/preferencesCollection.ts b/packages/payload/src/preferences/preferencesCollection.ts
index 10f1ce1c75e..c6b0d4d5c07 100644
--- a/packages/payload/src/preferences/preferencesCollection.ts
+++ b/packages/payload/src/preferences/preferencesCollection.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { CollectionConfig } from '../collections/config/types.js'
import type { Access, Config } from '../config/types.js'
diff --git a/packages/payload/src/preferences/requestHandlers/delete.ts b/packages/payload/src/preferences/requestHandlers/delete.ts
index 7d1cd7e45de..9a2bcfd2b4a 100644
--- a/packages/payload/src/preferences/requestHandlers/delete.ts
+++ b/packages/payload/src/preferences/requestHandlers/delete.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import { status as httpStatus } from 'http-status'
import type { PayloadHandler } from '../../config/types.js'
diff --git a/packages/payload/src/preferences/requestHandlers/findOne.ts b/packages/payload/src/preferences/requestHandlers/findOne.ts
index 21b81390a50..69554088479 100644
--- a/packages/payload/src/preferences/requestHandlers/findOne.ts
+++ b/packages/payload/src/preferences/requestHandlers/findOne.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import { status as httpStatus } from 'http-status'
import type { PayloadHandler } from '../../config/types.js'
diff --git a/packages/payload/src/preferences/requestHandlers/update.ts b/packages/payload/src/preferences/requestHandlers/update.ts
index 5eb3f8eee9e..06d9f929178 100644
--- a/packages/payload/src/preferences/requestHandlers/update.ts
+++ b/packages/payload/src/preferences/requestHandlers/update.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import { status as httpStatus } from 'http-status'
import type { PayloadHandler } from '../../config/types.js'
diff --git a/packages/payload/src/queues/config/generateJobsJSONSchemas.ts b/packages/payload/src/queues/config/generateJobsJSONSchemas.ts
index 8229f87f226..b61ab05401e 100644
--- a/packages/payload/src/queues/config/generateJobsJSONSchemas.ts
+++ b/packages/payload/src/queues/config/generateJobsJSONSchemas.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { I18n } from '@payloadcms/translations'
import type { JSONSchema4 } from 'json-schema'
diff --git a/packages/payload/src/queues/localAPI.ts b/packages/payload/src/queues/localAPI.ts
index ada2ec53959..6ef1d9cab1d 100644
--- a/packages/payload/src/queues/localAPI.ts
+++ b/packages/payload/src/queues/localAPI.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { BaseJob, RunningJobFromTask } from './config/types/workflowTypes.js'
import {
diff --git a/packages/payload/src/queues/operations/runJobs/index.ts b/packages/payload/src/queues/operations/runJobs/index.ts
index 3a2bf2e08bf..9c67a0444bd 100644
--- a/packages/payload/src/queues/operations/runJobs/index.ts
+++ b/packages/payload/src/queues/operations/runJobs/index.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { PaginatedDocs } from '../../../database/types.js'
import type { PayloadRequest, Where } from '../../../types/index.js'
import type { WorkflowJSON } from '../../config/types/workflowJSONTypes.js'
diff --git a/packages/payload/src/queues/operations/runJobs/runJSONJob/index.ts b/packages/payload/src/queues/operations/runJobs/runJSONJob/index.ts
index 3009e672f62..436f7ea6bce 100644
--- a/packages/payload/src/queues/operations/runJobs/runJSONJob/index.ts
+++ b/packages/payload/src/queues/operations/runJobs/runJSONJob/index.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { PayloadRequest } from '../../../../types/index.js'
import type { WorkflowJSON, WorkflowStep } from '../../../config/types/workflowJSONTypes.js'
import type {
diff --git a/packages/payload/src/queues/operations/runJobs/runJob/getRunTaskFunction.ts b/packages/payload/src/queues/operations/runJobs/runJob/getRunTaskFunction.ts
index 2db3cfc61b2..f2b9f6ad39d 100644
--- a/packages/payload/src/queues/operations/runJobs/runJob/getRunTaskFunction.ts
+++ b/packages/payload/src/queues/operations/runJobs/runJob/getRunTaskFunction.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { PayloadRequest } from '../../../../types/index.js'
import type {
RetryConfig,
diff --git a/packages/payload/src/queues/operations/runJobs/runJob/getUpdateJobFunction.ts b/packages/payload/src/queues/operations/runJobs/runJob/getUpdateJobFunction.ts
index 0ad34702261..9bfa8f71e28 100644
--- a/packages/payload/src/queues/operations/runJobs/runJob/getUpdateJobFunction.ts
+++ b/packages/payload/src/queues/operations/runJobs/runJob/getUpdateJobFunction.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { PayloadRequest } from '../../../../types/index.js'
import type { BaseJob } from '../../../config/types/workflowTypes.js'
diff --git a/packages/payload/src/queues/operations/runJobs/runJob/handleWorkflowError.ts b/packages/payload/src/queues/operations/runJobs/runJob/handleWorkflowError.ts
index e0396d966e4..2e0ebadb801 100644
--- a/packages/payload/src/queues/operations/runJobs/runJob/handleWorkflowError.ts
+++ b/packages/payload/src/queues/operations/runJobs/runJob/handleWorkflowError.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { PayloadRequest } from '../../../../types/index.js'
import type { BaseJob, WorkflowConfig, WorkflowTypes } from '../../../config/types/workflowTypes.js'
import type { RunTaskFunctionState } from './getRunTaskFunction.js'
diff --git a/packages/payload/src/queues/operations/runJobs/runJob/importHandlerPath.ts b/packages/payload/src/queues/operations/runJobs/runJob/importHandlerPath.ts
index 3e66c416c0a..14d5f335cd9 100644
--- a/packages/payload/src/queues/operations/runJobs/runJob/importHandlerPath.ts
+++ b/packages/payload/src/queues/operations/runJobs/runJob/importHandlerPath.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import { pathToFileURL } from 'url'
export async function importHandlerPath<T>(path: string): Promise<T> {
diff --git a/packages/payload/src/queues/operations/runJobs/runJob/index.ts b/packages/payload/src/queues/operations/runJobs/runJob/index.ts
index efca33dede6..176ca116959 100644
--- a/packages/payload/src/queues/operations/runJobs/runJob/index.ts
+++ b/packages/payload/src/queues/operations/runJobs/runJob/index.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { PayloadRequest } from '../../../../types/index.js'
import type {
BaseJob,
diff --git a/packages/payload/src/queues/restEndpointRun.ts b/packages/payload/src/queues/restEndpointRun.ts
index f5949c478d7..edadcfc46ee 100644
--- a/packages/payload/src/queues/restEndpointRun.ts
+++ b/packages/payload/src/queues/restEndpointRun.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { Endpoint, SanitizedConfig } from '../config/types.js'
import { runJobs, type RunJobsArgs } from './operations/runJobs/index.js'
diff --git a/packages/payload/src/queues/utilities/getJobTaskStatus.ts b/packages/payload/src/queues/utilities/getJobTaskStatus.ts
index fb17a604123..d911c42e53d 100644
--- a/packages/payload/src/queues/utilities/getJobTaskStatus.ts
+++ b/packages/payload/src/queues/utilities/getJobTaskStatus.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { TaskConfig, TaskType } from '../config/types/taskTypes.js'
import type { BaseJob, JobTaskStatus } from '../config/types/workflowTypes.js'
diff --git a/packages/payload/src/types/index.ts b/packages/payload/src/types/index.ts
index df0d147cdc3..3b51397982e 100644
--- a/packages/payload/src/types/index.ts
+++ b/packages/payload/src/types/index.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { I18n, TFunction } from '@payloadcms/translations'
import type DataLoader from 'dataloader'
import type { URL } from 'url'
diff --git a/packages/payload/src/uploads/checkFileAccess.ts b/packages/payload/src/uploads/checkFileAccess.ts
index c9a2ee53da3..21cd88a1147 100644
--- a/packages/payload/src/uploads/checkFileAccess.ts
+++ b/packages/payload/src/uploads/checkFileAccess.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { Collection, TypeWithID } from '../collections/config/types.js'
import type { PayloadRequest, Where } from '../types/index.js'
diff --git a/packages/payload/src/uploads/cropImage.ts b/packages/payload/src/uploads/cropImage.ts
index c4996cbc334..eb882fd7c7f 100644
--- a/packages/payload/src/uploads/cropImage.ts
+++ b/packages/payload/src/uploads/cropImage.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { SharpOptions } from 'sharp'
import type { SanitizedConfig } from '../config/types.js'
diff --git a/packages/payload/src/uploads/fetchAPI-multipart/handlers.ts b/packages/payload/src/uploads/fetchAPI-multipart/handlers.ts
index c03c225c6f4..9e65e3691ca 100644
--- a/packages/payload/src/uploads/fetchAPI-multipart/handlers.ts
+++ b/packages/payload/src/uploads/fetchAPI-multipart/handlers.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import crypto from 'crypto'
import fs, { WriteStream } from 'fs'
import path from 'path'
diff --git a/packages/payload/src/uploads/fetchAPI-multipart/index.ts b/packages/payload/src/uploads/fetchAPI-multipart/index.ts
index d90d0b17476..a57a37c98f4 100644
--- a/packages/payload/src/uploads/fetchAPI-multipart/index.ts
+++ b/packages/payload/src/uploads/fetchAPI-multipart/index.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import path from 'path'
import type { FetchAPIFileUploadOptions } from '../../config/types.js'
diff --git a/packages/payload/src/uploads/fetchAPI-multipart/isEligibleRequest.ts b/packages/payload/src/uploads/fetchAPI-multipart/isEligibleRequest.ts
index c5eb3379824..c9df6f6960b 100644
--- a/packages/payload/src/uploads/fetchAPI-multipart/isEligibleRequest.ts
+++ b/packages/payload/src/uploads/fetchAPI-multipart/isEligibleRequest.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
// eslint-disable-next-line regexp/no-super-linear-backtracking, regexp/no-obscure-range
const ACCEPTABLE_CONTENT_TYPE = /multipart\/['"()+-_]+(?:; ?['"()+-_]*)+$/i
const UNACCEPTABLE_METHODS = new Set(['CONNECT', 'DELETE', 'GET', 'HEAD', 'OPTIONS', 'TRACE'])
diff --git a/packages/payload/src/uploads/fetchAPI-multipart/processMultipart.ts b/packages/payload/src/uploads/fetchAPI-multipart/processMultipart.ts
index 8a13a2b5225..7a2b5566556 100644
--- a/packages/payload/src/uploads/fetchAPI-multipart/processMultipart.ts
+++ b/packages/payload/src/uploads/fetchAPI-multipart/processMultipart.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { Readable } from 'stream'
import Busboy from 'busboy'
diff --git a/packages/payload/src/uploads/fetchAPI-multipart/processNested.ts b/packages/payload/src/uploads/fetchAPI-multipart/processNested.ts
index a3ca0fb7e3d..0c63830ec9d 100644
--- a/packages/payload/src/uploads/fetchAPI-multipart/processNested.ts
+++ b/packages/payload/src/uploads/fetchAPI-multipart/processNested.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import { isSafeFromPollution } from './utilities.js'
export const processNested = function (data) {
diff --git a/packages/payload/src/uploads/fetchAPI-multipart/uploadTimer.ts b/packages/payload/src/uploads/fetchAPI-multipart/uploadTimer.ts
index 5e312b5af07..3f700e43259 100644
--- a/packages/payload/src/uploads/fetchAPI-multipart/uploadTimer.ts
+++ b/packages/payload/src/uploads/fetchAPI-multipart/uploadTimer.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
type CreateUploadTimer = (
timeout?: number,
callback?: () => void,
diff --git a/packages/payload/src/uploads/fetchAPI-multipart/utilities.ts b/packages/payload/src/uploads/fetchAPI-multipart/utilities.ts
index d2fb2f03d55..04026e6c6ae 100644
--- a/packages/payload/src/uploads/fetchAPI-multipart/utilities.ts
+++ b/packages/payload/src/uploads/fetchAPI-multipart/utilities.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import fs from 'fs'
import path from 'path'
import { Readable } from 'stream'
diff --git a/packages/payload/src/uploads/fetchAPI-stream-file/index.ts b/packages/payload/src/uploads/fetchAPI-stream-file/index.ts
index 3f1d8729f4e..4df0dd4ac69 100644
--- a/packages/payload/src/uploads/fetchAPI-stream-file/index.ts
+++ b/packages/payload/src/uploads/fetchAPI-stream-file/index.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import fs from 'fs'
export function iteratorToStream(iterator) {
diff --git a/packages/payload/src/uploads/generateFileData.ts b/packages/payload/src/uploads/generateFileData.ts
index 01f0f80a52f..6c15270a5ca 100644
--- a/packages/payload/src/uploads/generateFileData.ts
+++ b/packages/payload/src/uploads/generateFileData.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { OutputInfo, Sharp, SharpOptions } from 'sharp'
import { fileTypeFromBuffer } from 'file-type'
diff --git a/packages/payload/src/uploads/getBaseFields.ts b/packages/payload/src/uploads/getBaseFields.ts
index 59c16950fbe..dc4af9743dd 100644
--- a/packages/payload/src/uploads/getBaseFields.ts
+++ b/packages/payload/src/uploads/getBaseFields.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { CollectionConfig } from '../collections/config/types.js'
import type { Config } from '../config/types.js'
import type { Field } from '../fields/config/types.js'
diff --git a/packages/payload/src/uploads/getExternalFile.ts b/packages/payload/src/uploads/getExternalFile.ts
index 7607fea81b1..eb2e780ada5 100644
--- a/packages/payload/src/uploads/getExternalFile.ts
+++ b/packages/payload/src/uploads/getExternalFile.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { PayloadRequest } from '../types/index.js'
import type { File, FileData, UploadConfig } from './types.js'
diff --git a/packages/payload/src/uploads/getFileByPath.ts b/packages/payload/src/uploads/getFileByPath.ts
index 0f6beef7469..2a83b760f14 100644
--- a/packages/payload/src/uploads/getFileByPath.ts
+++ b/packages/payload/src/uploads/getFileByPath.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import { fileTypeFromFile } from 'file-type'
import fs from 'fs'
import path from 'path'
diff --git a/packages/payload/src/uploads/getImageSize.ts b/packages/payload/src/uploads/getImageSize.ts
index 2313f546898..64971923221 100644
--- a/packages/payload/src/uploads/getImageSize.ts
+++ b/packages/payload/src/uploads/getImageSize.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import fs from 'fs'
import sizeOfImport from 'image-size'
import { promisify } from 'util'
diff --git a/packages/payload/src/uploads/imageResizer.ts b/packages/payload/src/uploads/imageResizer.ts
index a678becc225..e5d08180ca1 100644
--- a/packages/payload/src/uploads/imageResizer.ts
+++ b/packages/payload/src/uploads/imageResizer.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { Sharp, Metadata as SharpMetadata, SharpOptions } from 'sharp'
import { fileTypeFromBuffer } from 'file-type'
diff --git a/packages/payload/src/uploads/saveBufferToFile.ts b/packages/payload/src/uploads/saveBufferToFile.ts
index 7deac72e01a..659d5cabb31 100644
--- a/packages/payload/src/uploads/saveBufferToFile.ts
+++ b/packages/payload/src/uploads/saveBufferToFile.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import fs from 'fs'
import { Readable } from 'stream'
diff --git a/packages/payload/src/uploads/tempFile.ts b/packages/payload/src/uploads/tempFile.ts
index dd393fd3112..7b978ec7872 100644
--- a/packages/payload/src/uploads/tempFile.ts
+++ b/packages/payload/src/uploads/tempFile.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import { promises as fsPromises } from 'fs'
import os from 'node:os'
import path from 'node:path'
diff --git a/packages/payload/src/utilities/addDataAndFileToRequest.ts b/packages/payload/src/utilities/addDataAndFileToRequest.ts
index 28013bcb1de..3fff110a571 100644
--- a/packages/payload/src/utilities/addDataAndFileToRequest.ts
+++ b/packages/payload/src/utilities/addDataAndFileToRequest.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { PayloadRequest } from '../types/index.js'
import { APIError } from '../errors/APIError.js'
diff --git a/packages/payload/src/utilities/addLocalesToRequest.ts b/packages/payload/src/utilities/addLocalesToRequest.ts
index 8345a94e319..2bfd27f4b78 100644
--- a/packages/payload/src/utilities/addLocalesToRequest.ts
+++ b/packages/payload/src/utilities/addLocalesToRequest.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { SanitizedConfig } from '../config/types.js'
import type { PayloadRequest } from '../types/index.js'
diff --git a/packages/payload/src/utilities/commitTransaction.ts b/packages/payload/src/utilities/commitTransaction.ts
index 07d336d95b6..d3f1a75aaf4 100644
--- a/packages/payload/src/utilities/commitTransaction.ts
+++ b/packages/payload/src/utilities/commitTransaction.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { MarkRequired } from 'ts-essentials'
import type { PayloadRequest } from '../types/index.js'
diff --git a/packages/payload/src/utilities/configToJSONSchema.ts b/packages/payload/src/utilities/configToJSONSchema.ts
index 5176d8ce619..a4acbd69dac 100644
--- a/packages/payload/src/utilities/configToJSONSchema.ts
+++ b/packages/payload/src/utilities/configToJSONSchema.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { JSONSchema4, JSONSchema4TypeName } from 'json-schema'
import pluralize from 'pluralize'
diff --git a/packages/payload/src/utilities/createLocalReq.ts b/packages/payload/src/utilities/createLocalReq.ts
index c4b6c577c2c..21931e6b492 100644
--- a/packages/payload/src/utilities/createLocalReq.ts
+++ b/packages/payload/src/utilities/createLocalReq.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { User } from '../auth/types.js'
import type { Payload, RequestContext, TypedLocale } from '../index.js'
import type { PayloadRequest } from '../types/index.js'
diff --git a/packages/payload/src/utilities/createPayloadRequest.ts b/packages/payload/src/utilities/createPayloadRequest.ts
index 6baf88c3131..ea418308623 100644
--- a/packages/payload/src/utilities/createPayloadRequest.ts
+++ b/packages/payload/src/utilities/createPayloadRequest.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import { initI18n } from '@payloadcms/translations'
import * as qs from 'qs-esm'
diff --git a/packages/payload/src/utilities/deepCopyObject.ts b/packages/payload/src/utilities/deepCopyObject.ts
index d368769c329..953d69edefb 100644
--- a/packages/payload/src/utilities/deepCopyObject.ts
+++ b/packages/payload/src/utilities/deepCopyObject.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { JsonValue } from '../types/index.js'
/*
diff --git a/packages/payload/src/utilities/deepMerge.ts b/packages/payload/src/utilities/deepMerge.ts
index 701cd3a997a..d1660ce06c7 100644
--- a/packages/payload/src/utilities/deepMerge.ts
+++ b/packages/payload/src/utilities/deepMerge.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import deepMerge from 'deepmerge'
import { isPlainObject } from './isPlainObject.js'
diff --git a/packages/payload/src/utilities/dependencies/dependencyChecker.ts b/packages/payload/src/utilities/dependencies/dependencyChecker.ts
index 3a46ec3a4f7..7b015729e07 100644
--- a/packages/payload/src/utilities/dependencies/dependencyChecker.ts
+++ b/packages/payload/src/utilities/dependencies/dependencyChecker.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import path from 'path'
import { fileURLToPath } from 'url'
diff --git a/packages/payload/src/utilities/dependencies/versionUtils.ts b/packages/payload/src/utilities/dependencies/versionUtils.ts
index 76b4ad8347f..582abfeebde 100644
--- a/packages/payload/src/utilities/dependencies/versionUtils.ts
+++ b/packages/payload/src/utilities/dependencies/versionUtils.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { CustomVersionParser } from './dependencyChecker.js'
export function parseVersion(version: string): { parts: number[]; preReleases: string[] } {
diff --git a/packages/payload/src/utilities/fieldSchemaToJSON.ts b/packages/payload/src/utilities/fieldSchemaToJSON.ts
index 3cc8da2009a..534b4ac895b 100644
--- a/packages/payload/src/utilities/fieldSchemaToJSON.ts
+++ b/packages/payload/src/utilities/fieldSchemaToJSON.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { ClientField } from '../fields/config/client.js'
import type { FieldTypes } from '../fields/config/types.js'
diff --git a/packages/payload/src/utilities/findUp.ts b/packages/payload/src/utilities/findUp.ts
index 843714e5a5d..159c1c4c645 100644
--- a/packages/payload/src/utilities/findUp.ts
+++ b/packages/payload/src/utilities/findUp.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import fs from 'fs'
import path from 'path'
diff --git a/packages/payload/src/utilities/flattenTopLevelFields.ts b/packages/payload/src/utilities/flattenTopLevelFields.ts
index 5427bfbac61..c330125b504 100644
--- a/packages/payload/src/utilities/flattenTopLevelFields.ts
+++ b/packages/payload/src/utilities/flattenTopLevelFields.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { ClientTab } from '../admin/fields/Tabs.js'
import type { ClientField } from '../fields/config/client.js'
import type {
diff --git a/packages/payload/src/utilities/formatErrors.ts b/packages/payload/src/utilities/formatErrors.ts
index b7520fdc4c1..d691bfa621d 100644
--- a/packages/payload/src/utilities/formatErrors.ts
+++ b/packages/payload/src/utilities/formatErrors.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { ErrorResult } from '../config/types.js'
import type { APIError } from '../errors/APIError.js'
diff --git a/packages/payload/src/utilities/formatLabels.ts b/packages/payload/src/utilities/formatLabels.ts
index b730f96096c..52f84b5084c 100644
--- a/packages/payload/src/utilities/formatLabels.ts
+++ b/packages/payload/src/utilities/formatLabels.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import pluralize from 'pluralize'
const { isPlural, singular } = pluralize
diff --git a/packages/payload/src/utilities/getCollectionIDFieldTypes.ts b/packages/payload/src/utilities/getCollectionIDFieldTypes.ts
index e8bba9406c0..ce264989741 100644
--- a/packages/payload/src/utilities/getCollectionIDFieldTypes.ts
+++ b/packages/payload/src/utilities/getCollectionIDFieldTypes.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { SanitizedConfig } from '../config/types.js'
/**
diff --git a/packages/payload/src/utilities/getDataByPath.ts b/packages/payload/src/utilities/getDataByPath.ts
index 5be4d23182e..7ad5cba92ef 100644
--- a/packages/payload/src/utilities/getDataByPath.ts
+++ b/packages/payload/src/utilities/getDataByPath.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { FormState } from '../admin/types.js'
import { unflatten } from './unflatten.js'
diff --git a/packages/payload/src/utilities/getEntityPolicies.ts b/packages/payload/src/utilities/getEntityPolicies.ts
index 1f77a970272..48853a68a4e 100644
--- a/packages/payload/src/utilities/getEntityPolicies.ts
+++ b/packages/payload/src/utilities/getEntityPolicies.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { CollectionPermission, GlobalPermission } from '../auth/types.js'
import type { SanitizedCollectionConfig, TypeWithID } from '../collections/config/types.js'
import type { Access } from '../config/types.js'
diff --git a/packages/payload/src/utilities/getObjectDotNotation.ts b/packages/payload/src/utilities/getObjectDotNotation.ts
index 6cdb7ab9a4f..bbe22bfbf57 100644
--- a/packages/payload/src/utilities/getObjectDotNotation.ts
+++ b/packages/payload/src/utilities/getObjectDotNotation.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
export const getObjectDotNotation = <T>(
obj: Record<string, unknown>,
path: string,
diff --git a/packages/payload/src/utilities/getRequestEntity.ts b/packages/payload/src/utilities/getRequestEntity.ts
index 151eabecce5..c0ffb6e83fc 100644
--- a/packages/payload/src/utilities/getRequestEntity.ts
+++ b/packages/payload/src/utilities/getRequestEntity.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { Collection } from '../collections/config/types.js'
import type { SanitizedGlobalConfig } from '../globals/config/types.js'
import type { PayloadRequest } from '../types/index.js'
diff --git a/packages/payload/src/utilities/getRequestLanguage.ts b/packages/payload/src/utilities/getRequestLanguage.ts
index 4a922a71f7c..764555df7d4 100644
--- a/packages/payload/src/utilities/getRequestLanguage.ts
+++ b/packages/payload/src/utilities/getRequestLanguage.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { AcceptedLanguages } from '@payloadcms/translations'
import type { ReadonlyRequestCookies } from 'next/dist/server/web/spec-extension/adapters/request-cookies.js'
diff --git a/packages/payload/src/utilities/getSiblingData.ts b/packages/payload/src/utilities/getSiblingData.ts
index 75960a61fdb..72e994875b4 100644
--- a/packages/payload/src/utilities/getSiblingData.ts
+++ b/packages/payload/src/utilities/getSiblingData.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { Data, FormState } from '../admin/types.js'
import { reduceFieldsToValues } from './reduceFieldsToValues.js'
diff --git a/packages/payload/src/utilities/getTranslatedLabel.ts b/packages/payload/src/utilities/getTranslatedLabel.ts
index 50ab92f2d55..77e9f5b8c50 100644
--- a/packages/payload/src/utilities/getTranslatedLabel.ts
+++ b/packages/payload/src/utilities/getTranslatedLabel.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import { getTranslation, type I18n } from '@payloadcms/translations'
import type { LabelFunction, StaticLabel } from '../config/types.js'
diff --git a/packages/payload/src/utilities/getUniqueListBy.ts b/packages/payload/src/utilities/getUniqueListBy.ts
index 8fd04c7ef7b..92691cbc794 100644
--- a/packages/payload/src/utilities/getUniqueListBy.ts
+++ b/packages/payload/src/utilities/getUniqueListBy.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
export function getUniqueListBy<T>(arr: T[], key: string): T[] {
return [...new Map(arr.map((item) => [item[key], item])).values()]
}
diff --git a/packages/payload/src/utilities/handleEndpoints.ts b/packages/payload/src/utilities/handleEndpoints.ts
index 25cd16ccb24..25a70d04b11 100644
--- a/packages/payload/src/utilities/handleEndpoints.ts
+++ b/packages/payload/src/utilities/handleEndpoints.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import { status as httpStatus } from 'http-status'
import { match } from 'path-to-regexp'
diff --git a/packages/payload/src/utilities/headersWithCors.ts b/packages/payload/src/utilities/headersWithCors.ts
index c6042d17e24..846abac7f78 100644
--- a/packages/payload/src/utilities/headersWithCors.ts
+++ b/packages/payload/src/utilities/headersWithCors.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { PayloadRequest } from '../types/index.js'
type CorsArgs = {
diff --git a/packages/payload/src/utilities/initTransaction.ts b/packages/payload/src/utilities/initTransaction.ts
index 152957b811b..e9e180650cb 100644
--- a/packages/payload/src/utilities/initTransaction.ts
+++ b/packages/payload/src/utilities/initTransaction.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { MarkRequired } from 'ts-essentials'
import type { PayloadRequest } from '../types/index.js'
diff --git a/packages/payload/src/utilities/isEntityHidden.ts b/packages/payload/src/utilities/isEntityHidden.ts
index 72ec9078ede..00cc21fb201 100644
--- a/packages/payload/src/utilities/isEntityHidden.ts
+++ b/packages/payload/src/utilities/isEntityHidden.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { SanitizedCollectionConfig } from '../collections/config/types.js'
import type { SanitizedGlobalConfig } from '../globals/config/types.js'
import type { PayloadRequest } from '../types/index.js'
diff --git a/packages/payload/src/utilities/isValidID.ts b/packages/payload/src/utilities/isValidID.ts
index 4c909fb2de3..5a8945d76a3 100644
--- a/packages/payload/src/utilities/isValidID.ts
+++ b/packages/payload/src/utilities/isValidID.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import ObjectIdImport from 'bson-objectid'
const ObjectId = (ObjectIdImport.default ||
diff --git a/packages/payload/src/utilities/killTransaction.ts b/packages/payload/src/utilities/killTransaction.ts
index 3d702d79851..ce2ab5cabb6 100644
--- a/packages/payload/src/utilities/killTransaction.ts
+++ b/packages/payload/src/utilities/killTransaction.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { MarkRequired } from 'ts-essentials'
import type { PayloadRequest } from '../types/index.js'
diff --git a/packages/payload/src/utilities/logError.ts b/packages/payload/src/utilities/logError.ts
index 0c275b959f4..a36e098fc61 100644
--- a/packages/payload/src/utilities/logError.ts
+++ b/packages/payload/src/utilities/logError.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type pino from 'pino'
import type { Payload } from '../types/index.js'
diff --git a/packages/payload/src/utilities/parseCookies.ts b/packages/payload/src/utilities/parseCookies.ts
index f882143b2a3..6c9e4438afd 100644
--- a/packages/payload/src/utilities/parseCookies.ts
+++ b/packages/payload/src/utilities/parseCookies.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import { APIError } from '../errors/APIError.js'
export const parseCookies = (headers: Request['headers']): Map<string, string> => {
diff --git a/packages/payload/src/utilities/reduceFieldsToValues.ts b/packages/payload/src/utilities/reduceFieldsToValues.ts
index 594594358e1..826b04448d2 100644
--- a/packages/payload/src/utilities/reduceFieldsToValues.ts
+++ b/packages/payload/src/utilities/reduceFieldsToValues.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { Data, FormState } from '../admin/types.js'
import { unflatten as flatleyUnflatten } from './unflatten.js'
diff --git a/packages/payload/src/utilities/sanitizeJoinParams.ts b/packages/payload/src/utilities/sanitizeJoinParams.ts
index a094d18d30c..96ef34c16ef 100644
--- a/packages/payload/src/utilities/sanitizeJoinParams.ts
+++ b/packages/payload/src/utilities/sanitizeJoinParams.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { JoinQuery } from '../types/index.js'
import { isNumber } from './isNumber.js'
diff --git a/packages/payload/src/utilities/sanitizePermissions.ts b/packages/payload/src/utilities/sanitizePermissions.ts
index 76f665d2006..5786fdac606 100644
--- a/packages/payload/src/utilities/sanitizePermissions.ts
+++ b/packages/payload/src/utilities/sanitizePermissions.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { MarkOptional } from 'ts-essentials'
import type {
diff --git a/packages/payload/src/utilities/sanitizePopulateParam.ts b/packages/payload/src/utilities/sanitizePopulateParam.ts
index 9240e54d484..d23ad2a6279 100644
--- a/packages/payload/src/utilities/sanitizePopulateParam.ts
+++ b/packages/payload/src/utilities/sanitizePopulateParam.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { PopulateType } from '../types/index.js'
import { sanitizeSelectParam } from './sanitizeSelectParam.js'
diff --git a/packages/payload/src/utilities/sanitizeSelectParam.ts b/packages/payload/src/utilities/sanitizeSelectParam.ts
index acc40134c28..2d8d30846bf 100644
--- a/packages/payload/src/utilities/sanitizeSelectParam.ts
+++ b/packages/payload/src/utilities/sanitizeSelectParam.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { SelectType } from '../types/index.js'
/**
diff --git a/packages/payload/src/utilities/telemetry/conf/envPaths.ts b/packages/payload/src/utilities/telemetry/conf/envPaths.ts
index 3a284ff6f3c..099d90c690f 100644
--- a/packages/payload/src/utilities/telemetry/conf/envPaths.ts
+++ b/packages/payload/src/utilities/telemetry/conf/envPaths.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
/**
* Taken from https://github.com/sindresorhus/env-paths/blob/main/index.js
*
diff --git a/packages/payload/src/utilities/telemetry/events/adminInit.ts b/packages/payload/src/utilities/telemetry/events/adminInit.ts
index 7037c50d181..bae26bbec34 100644
--- a/packages/payload/src/utilities/telemetry/events/adminInit.ts
+++ b/packages/payload/src/utilities/telemetry/events/adminInit.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { Payload } from '../../../index.js'
import type { PayloadRequest } from '../../../types/index.js'
diff --git a/packages/payload/src/utilities/telemetry/index.ts b/packages/payload/src/utilities/telemetry/index.ts
index dcfa172c057..91e46c746b5 100644
--- a/packages/payload/src/utilities/telemetry/index.ts
+++ b/packages/payload/src/utilities/telemetry/index.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import { execSync } from 'child_process'
import ciInfo from 'ci-info'
import { randomBytes } from 'crypto'
diff --git a/packages/payload/src/utilities/timestamp.ts b/packages/payload/src/utilities/timestamp.ts
index adce0b000b3..a45a09a5b41 100644
--- a/packages/payload/src/utilities/timestamp.ts
+++ b/packages/payload/src/utilities/timestamp.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
export const timestamp = (label) => {
if (!process.env.PAYLOAD_TIME) {
process.env.PAYLOAD_TIME = String(new Date().getTime())
diff --git a/packages/payload/src/utilities/toKebabCase.ts b/packages/payload/src/utilities/toKebabCase.ts
index 29644883d17..200e54e3242 100644
--- a/packages/payload/src/utilities/toKebabCase.ts
+++ b/packages/payload/src/utilities/toKebabCase.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
const toKebabCase = (string) =>
string
.replace(/([a-z])([A-Z])/g, '$1-$2')
diff --git a/packages/payload/src/utilities/traverseFields.ts b/packages/payload/src/utilities/traverseFields.ts
index 4061c04d6c3..ae8b3b45a71 100644
--- a/packages/payload/src/utilities/traverseFields.ts
+++ b/packages/payload/src/utilities/traverseFields.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { ArrayField, BlocksField, Field, TabAsField } from '../fields/config/types.js'
import { fieldHasSubFields } from '../fields/config/types.js'
diff --git a/packages/payload/src/utilities/unflatten.ts b/packages/payload/src/utilities/unflatten.ts
index 6424a3a66e2..2e3bb57ab3b 100644
--- a/packages/payload/src/utilities/unflatten.ts
+++ b/packages/payload/src/utilities/unflatten.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
/*
* Copyright (c) 2014, Hugh Kennedy
* All rights reserved.
diff --git a/packages/payload/src/utilities/wait.ts b/packages/payload/src/utilities/wait.ts
index 9bf4e786a11..dcef6b308d9 100644
--- a/packages/payload/src/utilities/wait.ts
+++ b/packages/payload/src/utilities/wait.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
export async function wait(ms) {
return new Promise((resolve) => {
setTimeout(resolve, ms)
diff --git a/packages/payload/src/versions/baseFields.ts b/packages/payload/src/versions/baseFields.ts
index 3cc55e1fae7..79857b0d298 100644
--- a/packages/payload/src/versions/baseFields.ts
+++ b/packages/payload/src/versions/baseFields.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { CheckboxField, Field } from '../fields/config/types.js'
export const statuses = [
diff --git a/packages/payload/src/versions/buildCollectionFields.ts b/packages/payload/src/versions/buildCollectionFields.ts
index 14872fa130a..00fadd510ac 100644
--- a/packages/payload/src/versions/buildCollectionFields.ts
+++ b/packages/payload/src/versions/buildCollectionFields.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { SanitizedCollectionConfig } from '../collections/config/types.js'
import type { SanitizedConfig } from '../config/types.js'
import type { Field, FlattenedField } from '../fields/config/types.js'
diff --git a/packages/payload/src/versions/buildGlobalFields.ts b/packages/payload/src/versions/buildGlobalFields.ts
index 4a78c09033c..1166d91a6f8 100644
--- a/packages/payload/src/versions/buildGlobalFields.ts
+++ b/packages/payload/src/versions/buildGlobalFields.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { SanitizedConfig } from '../config/types.js'
import type { Field, FlattenedField } from '../fields/config/types.js'
import type { SanitizedGlobalConfig } from '../globals/config/types.js'
diff --git a/packages/payload/src/versions/drafts/replaceWithDraftIfAvailable.ts b/packages/payload/src/versions/drafts/replaceWithDraftIfAvailable.ts
index b891aed9596..6bed0fbe2d3 100644
--- a/packages/payload/src/versions/drafts/replaceWithDraftIfAvailable.ts
+++ b/packages/payload/src/versions/drafts/replaceWithDraftIfAvailable.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { SanitizedCollectionConfig, TypeWithID } from '../../collections/config/types.js'
import type { AccessResult } from '../../config/types.js'
import type { FindGlobalVersionsArgs, FindVersionsArgs } from '../../database/types.js'
diff --git a/packages/payload/src/versions/enforceMaxVersions.ts b/packages/payload/src/versions/enforceMaxVersions.ts
index 74335c93ade..8dfcab8076c 100644
--- a/packages/payload/src/versions/enforceMaxVersions.ts
+++ b/packages/payload/src/versions/enforceMaxVersions.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { SanitizedCollectionConfig } from '../collections/config/types.js'
import type { SanitizedGlobalConfig } from '../globals/config/types.js'
import type { Payload, PayloadRequest, Where } from '../types/index.js'
diff --git a/packages/payload/src/versions/getLatestCollectionVersion.ts b/packages/payload/src/versions/getLatestCollectionVersion.ts
index 4c18faf6991..da5bd21427a 100644
--- a/packages/payload/src/versions/getLatestCollectionVersion.ts
+++ b/packages/payload/src/versions/getLatestCollectionVersion.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { SanitizedCollectionConfig, TypeWithID } from '../collections/config/types.js'
import type { FindOneArgs } from '../database/types.js'
import type { Payload, PayloadRequest } from '../types/index.js'
diff --git a/packages/payload/src/versions/getLatestGlobalVersion.ts b/packages/payload/src/versions/getLatestGlobalVersion.ts
index aaf02436c8e..65c372c156e 100644
--- a/packages/payload/src/versions/getLatestGlobalVersion.ts
+++ b/packages/payload/src/versions/getLatestGlobalVersion.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { SanitizedGlobalConfig } from '../globals/config/types.js'
import type { Document, Payload, PayloadRequest, Where } from '../types/index.js'
diff --git a/packages/payload/src/versions/saveVersion.ts b/packages/payload/src/versions/saveVersion.ts
index 77d44b513ad..8911d5eb322 100644
--- a/packages/payload/src/versions/saveVersion.ts
+++ b/packages/payload/src/versions/saveVersion.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { SanitizedCollectionConfig, TypeWithID } from '../collections/config/types.js'
import type { SanitizedGlobalConfig } from '../globals/config/types.js'
import type { Payload } from '../index.js'
diff --git a/packages/payload/src/versions/schedule/job.ts b/packages/payload/src/versions/schedule/job.ts
index 7e5a632bd7f..cf3450b5d33 100644
--- a/packages/payload/src/versions/schedule/job.ts
+++ b/packages/payload/src/versions/schedule/job.ts
@@ -1,3 +1,4 @@
+// @ts-strict-ignore
import type { User } from '../../auth/types.js'
import type { TaskConfig } from '../../queues/config/types/taskTypes.js'
import type { SchedulePublishTaskInput } from './types.js'
diff --git a/packages/payload/tsconfig.json b/packages/payload/tsconfig.json
index 1e18fb6d288..b2954a2500d 100644
--- a/packages/payload/tsconfig.json
+++ b/packages/payload/tsconfig.json
@@ -4,6 +4,14 @@
/* TODO: remove the following lines */
"strict": false,
"noUncheckedIndexedAccess": false,
+ "plugins": [
+ {
+ "name": "typescript-strict-plugin"
+ },
+ {
+ "name": "tsc-strict"
+ }
+ ],
},
"references": [{ "path": "../translations" }]
}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index fec65562718..967e52920e9 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -45,7 +45,7 @@ importers:
version: 1.50.0
'@sentry/nextjs':
specifier: ^8.33.1
- version: 8.37.1(@opentelemetry/[email protected](@opentelemetry/[email protected]))(@opentelemetry/[email protected](@opentelemetry/[email protected]))(@opentelemetry/[email protected](@opentelemetry/[email protected]))([email protected](@opentelemetry/[email protected])(@playwright/[email protected])([email protected])([email protected])([email protected]([email protected]))([email protected])([email protected]))([email protected])([email protected](@swc/[email protected](@swc/[email protected])))
+ version: 8.37.1(@opentelemetry/[email protected](@opentelemetry/[email protected]))(@opentelemetry/[email protected](@opentelemetry/[email protected]))(@opentelemetry/[email protected](@opentelemetry/[email protected]))([email protected](@babel/[email protected])(@opentelemetry/[email protected])(@playwright/[email protected])([email protected])([email protected])([email protected]([email protected]))([email protected])([email protected]))([email protected])([email protected](@swc/[email protected](@swc/[email protected]))([email protected]))
'@sentry/node':
specifier: ^8.33.1
version: 8.37.1
@@ -135,7 +135,7 @@ importers:
version: 10.1.3(@aws-sdk/[email protected](@aws-sdk/[email protected](@aws-sdk/[email protected])))([email protected])
next:
specifier: 15.1.5
- version: 15.1.5(@opentelemetry/[email protected])(@playwright/[email protected])([email protected])([email protected])([email protected]([email protected]))([email protected])([email protected])
+ version: 15.1.5(@babel/[email protected])(@opentelemetry/[email protected])(@playwright/[email protected])([email protected])([email protected])([email protected]([email protected]))([email protected])([email protected])
open:
specifier: ^10.1.0
version: 10.1.0
@@ -895,6 +895,9 @@ importers:
'@types/ws':
specifier: ^8.5.10
version: 8.5.13
+ concurrently:
+ specifier: 9.1.2
+ version: 9.1.2
copyfiles:
specifier: 2.4.1
version: 2.4.1
@@ -916,6 +919,9 @@ importers:
sharp:
specifier: 0.32.6
version: 0.32.6
+ typescript-strict-plugin:
+ specifier: 2.4.4
+ version: 2.4.4
packages/payload-cloud:
dependencies:
@@ -1008,7 +1014,7 @@ importers:
dependencies:
next:
specifier: ^15.0.3
- version: 15.1.3(@opentelemetry/[email protected])(@playwright/[email protected])([email protected])([email protected]([email protected]))([email protected])([email protected])
+ version: 15.1.3(@babel/[email protected])(@opentelemetry/[email protected])(@playwright/[email protected])([email protected])([email protected]([email protected]))([email protected])([email protected])
devDependencies:
'@payloadcms/eslint-config':
specifier: workspace:*
@@ -1070,7 +1076,7 @@ importers:
dependencies:
'@sentry/nextjs':
specifier: ^8.33.1
- version: 8.37.1(@opentelemetry/[email protected](@opentelemetry/[email protected]))(@opentelemetry/[email protected](@opentelemetry/[email protected]))(@opentelemetry/[email protected](@opentelemetry/[email protected]))([email protected](@opentelemetry/[email protected])(@playwright/[email protected])([email protected])([email protected])([email protected]([email protected]))([email protected])([email protected]))([email protected])([email protected](@swc/[email protected](@swc/[email protected])))
+ version: 8.37.1(@opentelemetry/[email protected](@opentelemetry/[email protected]))(@opentelemetry/[email protected](@opentelemetry/[email protected]))(@opentelemetry/[email protected](@opentelemetry/[email protected]))([email protected](@babel/[email protected])(@opentelemetry/[email protected])(@playwright/[email protected])([email protected])([email protected])([email protected]([email protected]))([email protected])([email protected]))([email protected])([email protected](@swc/[email protected](@swc/[email protected]))([email protected]))
'@sentry/types':
specifier: ^8.33.1
version: 8.37.1
@@ -1420,7 +1426,7 @@ importers:
version: link:../plugin-cloud-storage
uploadthing:
specifier: 7.3.0
- version: 7.3.0([email protected](@opentelemetry/[email protected])(@playwright/[email protected])([email protected])([email protected]([email protected]))([email protected])([email protected]))
+ version: 7.3.0([email protected](@babel/[email protected])(@opentelemetry/[email protected])(@playwright/[email protected])([email protected])([email protected]([email protected]))([email protected])([email protected]))
devDependencies:
payload:
specifier: workspace:*
@@ -1700,7 +1706,7 @@ importers:
version: link:../packages/ui
'@sentry/nextjs':
specifier: ^8.33.1
- version: 8.37.1(@opentelemetry/[email protected](@opentelemetry/[email protected]))(@opentelemetry/[email protected](@opentelemetry/[email protected]))(@opentelemetry/[email protected](@opentelemetry/[email protected]))([email protected](@opentelemetry/[email protected])(@playwright/[email protected])([email protected])([email protected])([email protected]([email protected]))([email protected])([email protected]))([email protected])([email protected](@swc/[email protected](@swc/[email protected])))
+ version: 8.37.1(@opentelemetry/[email protected](@opentelemetry/[email protected]))(@opentelemetry/[email protected](@opentelemetry/[email protected]))(@opentelemetry/[email protected](@opentelemetry/[email protected]))([email protected](@babel/[email protected])(@opentelemetry/[email protected])(@playwright/[email protected])([email protected])([email protected])([email protected]([email protected]))([email protected])([email protected]))([email protected])([email protected](@swc/[email protected](@swc/[email protected]))([email protected]))
'@sentry/react':
specifier: ^7.77.0
version: 7.119.2([email protected])
@@ -1751,7 +1757,7 @@ importers:
version: 8.9.5(@aws-sdk/[email protected](@aws-sdk/[email protected](@aws-sdk/[email protected])))([email protected])
next:
specifier: 15.1.5
- version: 15.1.5(@opentelemetry/[email protected])(@playwright/[email protected])([email protected])([email protected])([email protected]([email protected]))([email protected])([email protected])
+ version: 15.1.5(@babel/[email protected])(@opentelemetry/[email protected])(@playwright/[email protected])([email protected])([email protected])([email protected]([email protected]))([email protected])([email protected])
nodemailer:
specifier: 6.9.16
version: 6.9.16
@@ -5958,10 +5964,18 @@ packages:
resolution: {integrity: sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==}
engines: {node: '>=6'}
+ [email protected]:
+ resolution: {integrity: sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==}
+ engines: {node: '>=8'}
+
[email protected]:
resolution: {integrity: sha512-aCj4O5wKyszjMmDT4tZj93kxyydN/K5zPWSCe6/0AV/AA1pqe5ZBIw0a2ZfPQV7lL5/yb5HsUreJ6UFAF1tEQw==}
engines: {node: '>=18'}
+ [email protected]:
+ resolution: {integrity: sha512-ywqV+5MmyL4E7ybXgKys4DugZbX0FC6LnwrhjuykIjnK9k8OQacQ7axGKnjDXWNhns0xot3bZI5h55H8yo9cJg==}
+ engines: {node: '>=6'}
+
[email protected]:
resolution: {integrity: sha512-nPdaFdQ0h/GEigbPClz11D0v/ZJEwxmeVZGeMo3Z5StPtUTkA9o1lD6QwoirYiSDzbcwn2XcjwmCp68W1IS4TA==}
engines: {node: '>=18'}
@@ -5976,6 +5990,10 @@ packages:
resolution: {integrity: sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==}
engines: {node: '>=12'}
+ [email protected]:
+ resolution: {integrity: sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==}
+ engines: {node: '>=0.8'}
+
[email protected]:
resolution: {integrity: sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==}
engines: {node: '>=6'}
@@ -6047,6 +6065,11 @@ packages:
[email protected]:
resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==}
+ [email protected]:
+ resolution: {integrity: sha512-H9MWcoPsYddwbOGM6difjVwVZHl63nwMEwDJG/L7VGtuaJhb12h2caPG2tVPWs7emuYix252iGfqOyrz1GczTQ==}
+ engines: {node: '>=18'}
+ hasBin: true
+
[email protected]:
resolution: {integrity: sha512-RMtmw0iFkeR4YV+fUOSucriAQNb9g8zFR52MWCtl+cCZOFRNL6zeB395vPzFhEjjn4fMxXudmELnl/KF/WrK6w==}
@@ -6200,6 +6223,9 @@ packages:
resolution: {integrity: sha512-WY/3TUME0x3KPYdRRxEJJvXRHV4PyPoUsxtZa78lwItwRQRHhd2U9xOscaT/YTf8uCXIAjeJOFBVEh/7FtD8Xg==}
engines: {node: '>=18'}
+ [email protected]:
+ resolution: {integrity: sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==}
+
[email protected]:
resolution: {integrity: sha512-RsqXDEAALjfRTro+IFNKpcPCt0/Cy2FqHSIlnomiJp9YGadpQnrtbRpSgN2+np21qHcIKiva4fiOQGjS9/qR/A==}
engines: {node: '>=18'}
@@ -6740,6 +6766,10 @@ packages:
resolution: {integrity: sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==}
engines: {node: '>=0.8.x'}
+ [email protected]:
+ resolution: {integrity: sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==}
+ engines: {node: '>=10'}
+
[email protected]:
resolution: {integrity: sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==}
engines: {node: '>=10'}
@@ -7009,6 +7039,10 @@ packages:
resolution: {integrity: sha512-dVKBjfWisLAicarI2Sf+JuBE/DghV4UzNAVe9yhEJuzeREd3JhOTE9cUaJTeSa77fsbQUK3pcOpJfM59+VKZaA==}
engines: {node: '>=12'}
+ [email protected]:
+ resolution: {integrity: sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==}
+ engines: {node: '>=8'}
+
[email protected]:
resolution: {integrity: sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==}
engines: {node: '>=10'}
@@ -7221,6 +7255,10 @@ packages:
resolution: {integrity: sha512-1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw==}
engines: {node: '>= 14'}
+ [email protected]:
+ resolution: {integrity: sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==}
+ engines: {node: '>=8.12.0'}
+
[email protected]:
resolution: {integrity: sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==}
engines: {node: '>=10.17.0'}
@@ -7402,6 +7440,10 @@ packages:
engines: {node: '>=14.16'}
hasBin: true
+ [email protected]:
+ resolution: {integrity: sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==}
+ engines: {node: '>=8'}
+
[email protected]:
resolution: {integrity: sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==}
engines: {node: '>= 0.4'}
@@ -7465,6 +7507,10 @@ packages:
resolution: {integrity: sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw==}
engines: {node: '>= 0.4'}
+ [email protected]:
+ resolution: {integrity: sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==}
+ engines: {node: '>=10'}
+
[email protected]:
resolution: {integrity: sha512-mE00Gnza5EEB3Ds0HfMyllZzbBrmLOX3vfWoj9A9PEnTfratQ/BcaJOuMhnkhjXvb2+FkY3VuHqtAGpTPmglFQ==}
engines: {node: '>=18'}
@@ -7794,6 +7840,7 @@ packages:
[email protected]:
resolution: {integrity: sha512-T9eIRCs6b0J1SHKYIvD8+KCJMcWZ900iZyxdnSCdqxN12Z1ijzT+jY5nrk72Jw4B0HGzms2NgpryArlJqvc3Lw==}
+ cpu: [x64, arm64, wasm32]
os: [darwin, linux, win32]
[email protected]:
@@ -7846,6 +7893,10 @@ packages:
[email protected]:
resolution: {integrity: sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==}
+ [email protected]:
+ resolution: {integrity: sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==}
+ engines: {node: '>=10'}
+
[email protected]:
resolution: {integrity: sha512-9ie8ItPR6tjY5uYJh8K/Zrv/RMZ5VOlOWvtZdEHYSTFKZfIBPQa9tOAEeAWhd+AnIneLJ22w5fjOYtoutpWq5w==}
engines: {node: '>=18'}
@@ -8392,6 +8443,10 @@ packages:
resolution: {integrity: sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==}
engines: {node: '>= 0.8.0'}
+ [email protected]:
+ resolution: {integrity: sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==}
+ engines: {node: '>=10'}
+
[email protected]:
resolution: {integrity: sha512-YlaCIArvWNKCWZFRrMjhh2l5jK80eXnpYP+bhRc1J/7cW3TiyEY0ngJo73o/5n8hA3+4yLdTmXLNTQ3Ncz50LQ==}
@@ -8907,6 +8962,10 @@ packages:
resolution: {integrity: sha512-40yHxbNcl2+rzXvZuVkrYohathsSJlMTXKryG5y8uciHv1+xDLHQpgjG64JUO9nrEq2jGLH6IZ8BcZyw3wrweg==}
engines: {node: '>=14.16'}
+ [email protected]:
+ resolution: {integrity: sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==}
+ engines: {node: '>=8'}
+
[email protected]:
resolution: {integrity: sha512-oMA2dcrw6u0YfxJQXm342bFKX/E4sG9rbTzO9ptUcR/e8A33cHuvStiYOwH7fszkZlZ1z/ta9AAoPk2F4qIOHA==}
engines: {node: '>=18'}
@@ -9187,6 +9246,10 @@ packages:
resolution: {integrity: sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==}
engines: {node: '>=8'}
+ [email protected]:
+ resolution: {integrity: sha512-AzqKpGKjrj7EM6rKVQEPpB288oCfnrEIuyoT9cyF4nmGa7V8Zk6f7RRqYisX8X9m+Q7bd632aZW4ky7EhbQztA==}
+ engines: {node: '>= 0.4'}
+
[email protected]:
resolution: {integrity: sha512-TiwcRcrkhHvbrZbnRcFYMLl30Dfov3HKqzp5tO5b4pt6G/SezKcYhmDg15zXVBswHmctSAQKznqNW2LO5tTDow==}
engines: {node: '>=4'}
@@ -9636,6 +9699,10 @@ packages:
resolution: {integrity: sha512-2lv/66T7e5yNyhAAC4NaKe5nVavzuGJQVVtRYLyQ2OI8tsJ61PMLlelehb0wi2Hx6+hT/OJUWZcw8MjlSRnxvw==}
engines: {node: '>=14'}
+ [email protected]:
+ resolution: {integrity: sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==}
+ hasBin: true
+
[email protected]:
resolution: {integrity: sha512-95Pu1QXQvruGEhv62XCMO3Mm90GscOCClvrIUwCM0PYOXK3kaF3l3sIHxx71ThJfcbM2O5Au6SO3AWCSEfW4mQ==}
@@ -9768,6 +9835,10 @@ packages:
typescript:
optional: true
+ [email protected]:
+ resolution: {integrity: sha512-OXcWHQk+pW9gqEL/Mb1eTgj/Yiqk1oHBERr9v4VInPOYN++p+cXejmQK/h/VlUPGD++FXQ8pgiqVMyEtxU4T6A==}
+ hasBin: true
+
[email protected]:
resolution: {integrity: sha512-84MVSjMEHP+FQRPy3pX9sTVV/INIex71s9TL2Gm5FG/WG1SqXeKyZ0k7/blY/4FdOzI12CBy1vGc4og/eus0fw==}
engines: {node: '>=14.17'}
@@ -9938,6 +10009,9 @@ packages:
resolution: {integrity: sha512-TnbFSbcOCcDgjZ4piURLCbJ3nJhznVh9kw6F6iokjiFPl8ONxe9A6nMDVXDiNbrSfLILs6vB07F7wLBrwPYzJw==}
engines: {node: '>=10.13.0'}
+ [email protected]:
+ resolution: {integrity: sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==}
+
[email protected]:
resolution: {integrity: sha512-d2JWLCivmZYTSIoge9MsgFCZrt571BikcWGYkjC1khllbTeDlGqZ2D8vD8E/lJa8WGWbb7Plm8/XJYV7IJHZZw==}
engines: {node: '>= 8'}
@@ -13607,7 +13681,7 @@ snapshots:
'@sentry/utils': 7.119.2
localforage: 1.10.0
- '@sentry/[email protected](@opentelemetry/[email protected](@opentelemetry/[email protected]))(@opentelemetry/[email protected](@opentelemetry/[email protected]))(@opentelemetry/[email protected](@opentelemetry/[email protected]))([email protected](@opentelemetry/[email protected])(@playwright/[email protected])([email protected])([email protected])([email protected]([email protected]))([email protected])([email protected]))([email protected])([email protected](@swc/[email protected](@swc/[email protected])))':
+ '@sentry/[email protected](@opentelemetry/[email protected](@opentelemetry/[email protected]))(@opentelemetry/[email protected](@opentelemetry/[email protected]))(@opentelemetry/[email protected](@opentelemetry/[email protected]))([email protected](@babel/[email protected])(@opentelemetry/[email protected])(@playwright/[email protected])([email protected])([email protected])([email protected]([email protected]))([email protected])([email protected]))([email protected])([email protected](@swc/[email protected](@swc/[email protected]))([email protected]))':
dependencies:
'@opentelemetry/api': 1.9.0
'@opentelemetry/instrumentation-http': 0.53.0(@opentelemetry/[email protected])
@@ -13621,9 +13695,9 @@ snapshots:
'@sentry/types': 8.37.1
'@sentry/utils': 8.37.1
'@sentry/vercel-edge': 8.37.1
- '@sentry/webpack-plugin': 2.22.6([email protected](@swc/[email protected](@swc/[email protected])))
+ '@sentry/webpack-plugin': 2.22.6([email protected](@swc/[email protected](@swc/[email protected]))([email protected]))
chalk: 3.0.0
- next: 15.1.5(@opentelemetry/[email protected])(@playwright/[email protected])([email protected])([email protected])([email protected]([email protected]))([email protected])([email protected])
+ next: 15.1.5(@babel/[email protected])(@opentelemetry/[email protected])(@playwright/[email protected])([email protected])([email protected])([email protected]([email protected]))([email protected])([email protected])
resolve: 1.22.8
rollup: 3.29.5
stacktrace-parser: 0.1.10
@@ -13731,12 +13805,12 @@ snapshots:
'@sentry/types': 8.37.1
'@sentry/utils': 8.37.1
- '@sentry/[email protected]([email protected](@swc/[email protected](@swc/[email protected])))':
+ '@sentry/[email protected]([email protected](@swc/[email protected](@swc/[email protected]))([email protected]))':
dependencies:
'@sentry/bundler-plugin-core': 2.22.6
unplugin: 1.0.1
uuid: 9.0.0
- webpack: 5.96.1(@swc/[email protected](@swc/[email protected]))
+ webpack: 5.96.1(@swc/[email protected](@swc/[email protected]))([email protected])
transitivePeerDependencies:
- encoding
- supports-color
@@ -15325,10 +15399,16 @@ snapshots:
[email protected]: {}
+ [email protected]:
+ dependencies:
+ restore-cursor: 3.1.0
+
[email protected]:
dependencies:
restore-cursor: 5.1.0
+ [email protected]: {}
+
[email protected]:
dependencies:
slice-ansi: 5.0.0
@@ -15348,6 +15428,8 @@ snapshots:
strip-ansi: 6.0.1
wrap-ansi: 7.0.0
+ [email protected]: {}
+
[email protected]: {}
[email protected]: {}
@@ -15404,6 +15486,16 @@ snapshots:
[email protected]: {}
+ [email protected]:
+ dependencies:
+ chalk: 4.1.2
+ lodash: 4.17.21
+ rxjs: 7.8.1
+ shell-quote: 1.8.2
+ supports-color: 8.1.1
+ tree-kill: 1.2.2
+ yargs: 17.7.2
+
[email protected]: {}
[email protected]: {}
@@ -15546,6 +15638,10 @@ snapshots:
bundle-name: 4.1.0
default-browser-id: 5.0.0
+ [email protected]:
+ dependencies:
+ clone: 1.0.4
+
[email protected]: {}
[email protected]: {}
@@ -16226,6 +16322,18 @@ snapshots:
[email protected]: {}
+ [email protected]:
+ dependencies:
+ cross-spawn: 7.0.5
+ get-stream: 5.2.0
+ human-signals: 1.1.1
+ is-stream: 2.0.1
+ merge-stream: 2.0.0
+ npm-run-path: 4.0.1
+ onetime: 5.1.2
+ signal-exit: 3.0.7
+ strip-final-newline: 2.0.0
+
[email protected]:
dependencies:
cross-spawn: 7.0.5
@@ -16520,6 +16628,10 @@ snapshots:
[email protected]: {}
+ [email protected]:
+ dependencies:
+ pump: 3.0.2
+
[email protected]: {}
[email protected]: {}
@@ -16780,6 +16892,8 @@ snapshots:
transitivePeerDependencies:
- supports-color
+ [email protected]: {}
+
[email protected]: {}
[email protected]: {}
@@ -16935,6 +17049,8 @@ snapshots:
dependencies:
is-docker: 3.0.0
+ [email protected]: {}
+
[email protected]: {}
[email protected]:
@@ -16982,6 +17098,8 @@ snapshots:
dependencies:
which-typed-array: 1.1.15
+ [email protected]: {}
+
[email protected]: {}
[email protected]:
@@ -17560,6 +17678,11 @@ snapshots:
[email protected]: {}
+ [email protected]:
+ dependencies:
+ chalk: 4.1.2
+ is-unicode-supported: 0.1.0
+
[email protected]:
dependencies:
ansi-escapes: 7.0.0
@@ -18066,7 +18189,7 @@ snapshots:
- '@babel/core'
- babel-plugin-macros
- [email protected](@opentelemetry/[email protected])(@playwright/[email protected])([email protected])([email protected]([email protected]))([email protected])([email protected]):
+ [email protected](@babel/[email protected])(@opentelemetry/[email protected])(@playwright/[email protected])([email protected])([email protected]([email protected]))([email protected])([email protected]):
dependencies:
'@next/env': 15.1.3
'@swc/counter': 0.1.3
@@ -18094,7 +18217,7 @@ snapshots:
- '@babel/core'
- babel-plugin-macros
- [email protected](@opentelemetry/[email protected])(@playwright/[email protected])([email protected])([email protected])([email protected]([email protected]))([email protected])([email protected]):
+ [email protected](@babel/[email protected])(@opentelemetry/[email protected])(@playwright/[email protected])([email protected])([email protected])([email protected]([email protected]))([email protected])([email protected]):
dependencies:
'@next/env': 15.1.5
'@swc/counter': 0.1.3
@@ -18251,6 +18374,18 @@ snapshots:
type-check: 0.4.0
word-wrap: 1.2.5
+ [email protected]:
+ dependencies:
+ bl: 4.1.0
+ chalk: 4.1.2
+ cli-cursor: 3.1.0
+ cli-spinners: 2.9.2
+ is-interactive: 1.0.0
+ is-unicode-supported: 0.1.0
+ log-symbols: 4.1.0
+ strip-ansi: 6.0.1
+ wcwidth: 1.0.1
+
[email protected]:
optionalDependencies:
'@oxc-resolver/binding-darwin-arm64': 1.12.0
@@ -18796,6 +18931,11 @@ snapshots:
dependencies:
lowercase-keys: 3.0.0
+ [email protected]:
+ dependencies:
+ onetime: 5.1.2
+ signal-exit: 3.0.7
+
[email protected]:
dependencies:
onetime: 7.0.0
@@ -19071,6 +19211,8 @@ snapshots:
[email protected]: {}
+ [email protected]: {}
+
[email protected]:
dependencies:
glob: 7.2.3
@@ -19481,16 +19623,17 @@ snapshots:
ansi-escapes: 4.3.2
supports-hyperlinks: 2.3.0
- [email protected](@swc/[email protected](@swc/[email protected]))([email protected](@swc/[email protected](@swc/[email protected]))):
+ [email protected](@swc/[email protected](@swc/[email protected]))([email protected])([email protected](@swc/[email protected](@swc/[email protected]))([email protected])):
dependencies:
'@jridgewell/trace-mapping': 0.3.25
jest-worker: 27.5.1
schema-utils: 3.3.0
serialize-javascript: 6.0.2
terser: 5.36.0
- webpack: 5.96.1(@swc/[email protected](@swc/[email protected]))
+ webpack: 5.96.1(@swc/[email protected](@swc/[email protected]))([email protected])
optionalDependencies:
'@swc/core': 1.10.12(@swc/[email protected])
+ esbuild: 0.19.12
[email protected]:
dependencies:
@@ -19558,6 +19701,8 @@ snapshots:
dependencies:
punycode: 2.3.1
+ [email protected]: {}
+
[email protected]:
dependencies:
utf8-byte-length: 1.0.5
@@ -19680,6 +19825,14 @@ snapshots:
- eslint
- supports-color
+ [email protected]:
+ dependencies:
+ chalk: 3.0.0
+ execa: 4.1.0
+ minimatch: 9.0.5
+ ora: 5.4.1
+ yargs: 16.2.0
+
[email protected]: {}
[email protected]: {}
@@ -19761,14 +19914,14 @@ snapshots:
escalade: 3.2.0
picocolors: 1.1.1
- [email protected]([email protected](@opentelemetry/[email protected])(@playwright/[email protected])([email protected])([email protected]([email protected]))([email protected])([email protected])):
+ [email protected]([email protected](@babel/[email protected])(@opentelemetry/[email protected])(@playwright/[email protected])([email protected])([email protected]([email protected]))([email protected])([email protected])):
dependencies:
'@effect/platform': 0.69.8([email protected])
'@uploadthing/mime-types': 0.3.2
'@uploadthing/shared': 7.1.1
effect: 3.10.3
optionalDependencies:
- next: 15.1.5(@opentelemetry/[email protected])(@playwright/[email protected])([email protected])([email protected])([email protected]([email protected]))([email protected])([email protected])
+ next: 15.1.5(@babel/[email protected])(@opentelemetry/[email protected])(@playwright/[email protected])([email protected])([email protected])([email protected]([email protected]))([email protected])([email protected])
[email protected]:
dependencies:
@@ -19833,6 +19986,10 @@ snapshots:
glob-to-regexp: 0.4.1
graceful-fs: 4.2.11
+ [email protected]:
+ dependencies:
+ defaults: 1.0.4
+
[email protected]: {}
[email protected]: {}
@@ -19862,7 +20019,7 @@ snapshots:
[email protected]: {}
- [email protected](@swc/[email protected](@swc/[email protected])):
+ [email protected](@swc/[email protected](@swc/[email protected]))([email protected]):
dependencies:
'@types/eslint-scope': 3.7.7
'@types/estree': 1.0.6
@@ -19884,7 +20041,7 @@ snapshots:
neo-async: 2.6.2
schema-utils: 3.3.0
tapable: 2.2.1
- terser-webpack-plugin: 5.3.10(@swc/[email protected](@swc/[email protected]))([email protected](@swc/[email protected](@swc/[email protected])))
+ terser-webpack-plugin: 5.3.10(@swc/[email protected](@swc/[email protected]))([email protected])([email protected](@swc/[email protected](@swc/[email protected]))([email protected]))
watchpack: 2.4.2
webpack-sources: 3.2.3
transitivePeerDependencies:
|
b646485388304db39263ab6872b4b5279298bfbf
|
2025-02-17 08:11:43
|
Said Akhrarov
|
docs: adds onInit to payload config options (#11069)
| false
|
adds onInit to payload config options (#11069)
|
docs
|
diff --git a/docs/configuration/overview.mdx b/docs/configuration/overview.mdx
index deeceb3c046..ebff325de6d 100644
--- a/docs/configuration/overview.mdx
+++ b/docs/configuration/overview.mdx
@@ -87,6 +87,7 @@ The following options are available:
| **`upload`** | Base Payload upload configuration. [More details](../upload/overview#payload-wide-upload-options). |
| **`routes`** | Control the routing structure that Payload binds itself to. [More details](../admin/overview#root-level-routes). |
| **`email`** | Configure the Email Adapter for Payload to use. [More details](../email/overview). |
+| **`onInit`** | A function that is called immediately following startup that receives the Payload instance as its only argument. |
| **`debug`** | Enable to expose more detailed error information. |
| **`telemetry`** | Disable Payload telemetry by passing `false`. [More details](#telemetry). |
| **`rateLimit`** | Control IP-based rate limiting for all Payload resources. Used to prevent DDoS attacks, etc. [More details](../production/preventing-abuse#rate-limiting-requests). |
|
b9767b865a69938164baaf7e83ca6e0eb2bed6bd
|
2024-04-03 20:17:01
|
Jarrod Flesch
|
chore: working but wip admin e2e
| false
|
working but wip admin e2e
|
chore
|
diff --git a/test/admin/e2e.spec.ts b/test/admin/e2e.spec.ts
index 89bbfe06705..17db48a039d 100644
--- a/test/admin/e2e.spec.ts
+++ b/test/admin/e2e.spec.ts
@@ -1,5 +1,4 @@
import type { Page } from '@playwright/test'
-import type { Payload } from 'payload'
import { expect, test } from '@playwright/test'
import { wait } from 'payload/utilities'
@@ -7,6 +6,7 @@ import { mapAsync } from 'payload/utilities'
import qs from 'qs'
import type { Geo, Post } from './payload-types.js'
+import type { Config } from './payload-types.js'
import {
checkBreadcrumb,
@@ -19,8 +19,7 @@ import {
saveDocHotkeyAndAssert,
} from '../helpers.js'
import { AdminUrlUtil } from '../helpers/adminUrlUtil.js'
-import { initPayloadE2E } from '../helpers/initPayloadE2E.js'
-import { clearAndSeedEverything } from './seed.js'
+import { initPayloadE2ENoConfig } from '../helpers/initPayloadE2ENoConfig.js'
import {
customEditLabel,
customNestedTabViewPath,
@@ -51,25 +50,30 @@ const { beforeAll, beforeEach, describe } = test
const title = 'Title'
const description = 'Description'
-let payload: Payload
+let payload: PayloadTestSDK<Config>
import path from 'path'
import { fileURLToPath } from 'url'
+
+import type { PayloadTestSDK } from '../helpers/sdk/index.js'
+
+import { reInitializeDB } from '../helpers/reInit.js'
+import { POLL_TOPASS_TIMEOUT } from '../playwright.config.js'
const filename = fileURLToPath(import.meta.url)
const dirname = path.dirname(filename)
describe('admin', () => {
let page: Page
let geoUrl: AdminUrlUtil
- let url: AdminUrlUtil
+ let postsUrl: AdminUrlUtil
let customViewsURL: AdminUrlUtil
let serverURL: string
beforeAll(async ({ browser }) => {
process.env.SEED_IN_CONFIG_ONINIT = 'false' // Makes it so the payload config onInit seed is not run. Otherwise, the seed would be run unnecessarily twice for the initial test run - once for beforeEach and once for onInit
- ;({ payload, serverURL } = await initPayloadE2E({ dirname }))
+ ;({ payload, serverURL } = await initPayloadE2ENoConfig<Config>({ dirname }))
geoUrl = new AdminUrlUtil(serverURL, geoCollectionSlug)
- url = new AdminUrlUtil(serverURL, postsCollectionSlug)
+ postsUrl = new AdminUrlUtil(serverURL, postsCollectionSlug)
customViewsURL = new AdminUrlUtil(serverURL, customViews2CollectionSlug)
const context = await browser.newContext()
@@ -77,33 +81,45 @@ describe('admin', () => {
initPageConsoleErrorCatch(page)
})
beforeEach(async () => {
- await clearAndSeedEverything(payload)
+ await reInitializeDB({
+ serverURL,
+ snapshotKey: 'adminTests',
+ })
})
describe('Nav', () => {
test('should nav to collection - nav', async () => {
- await page.goto(url.admin)
+ await page.goto(postsUrl.admin)
+ await page.waitForURL(postsUrl.admin)
await openNav(page)
- await page.locator(`#nav-${postsCollectionSlug}`).click()
- expect(page.url()).toContain(url.list)
+ const anchor = page.locator(`#nav-${postsCollectionSlug}`)
+ const anchorHref = await anchor.getAttribute('href')
+ await anchor.click()
+ await expect.poll(() => page.url(), { timeout: POLL_TOPASS_TIMEOUT }).toContain(anchorHref)
})
test('should nav to a global - nav', async () => {
- await page.goto(url.admin)
+ await page.goto(postsUrl.admin)
+ await page.waitForURL(postsUrl.admin)
await openNav(page)
- await page.locator(`#nav-global-${globalSlug}`).click()
- expect(page.url()).toContain(url.global(globalSlug))
+ const anchor = page.locator(`#nav-global-${globalSlug}`)
+ const anchorHref = await anchor.getAttribute('href')
+ await anchor.click()
+ await expect.poll(() => page.url(), { timeout: POLL_TOPASS_TIMEOUT }).toContain(anchorHref)
})
test('should navigate to collection - card', async () => {
- await page.goto(url.admin)
- await wait(200)
- await page.locator(`#card-${postsCollectionSlug}`).click()
- expect(page.url()).toContain(url.list)
+ await page.goto(postsUrl.admin)
+ await page.waitForURL(postsUrl.admin)
+ const anchor = page.locator(`#card-${postsCollectionSlug}`)
+ const anchorHref = await anchor.getAttribute('href')
+ await anchor.click()
+ await expect.poll(() => page.url(), { timeout: POLL_TOPASS_TIMEOUT }).toContain(anchorHref)
})
test('should collapse and expand collection groups', async () => {
- await page.goto(url.admin)
+ await page.goto(postsUrl.admin)
+ await page.waitForURL(postsUrl.admin)
await openNav(page)
const navGroup = page.locator('#nav-group-One .nav-group__toggle')
@@ -120,7 +136,7 @@ describe('admin', () => {
})
test('should collapse and expand globals groups', async () => {
- await page.goto(url.admin)
+ await page.goto(postsUrl.admin)
await openNav(page)
const navGroup = page.locator('#nav-group-Group .nav-group__toggle')
@@ -137,33 +153,33 @@ describe('admin', () => {
})
test('should save nav group collapse preferences', async () => {
- await page.goto(url.admin)
+ await page.goto(postsUrl.admin)
+ await page.waitForURL(postsUrl.admin)
await openNav(page)
await page.locator('#nav-group-One .nav-group__toggle').click()
- await page.goto(url.admin)
const link = page.locator('#nav-group-one-collection-ones')
await expect(link).toBeHidden()
})
test('breadcrumbs - from list to dashboard', async () => {
- await page.goto(url.list)
+ await page.goto(postsUrl.list)
await page.locator('.step-nav a[href="/admin"]').click()
- expect(page.url()).toContain(url.admin)
+ expect(page.url()).toContain(postsUrl.admin)
})
test('breadcrumbs - from document to collection', async () => {
const { id } = await createPost()
- await page.goto(url.edit(id))
+ await page.goto(postsUrl.edit(id))
const collectionBreadcrumb = page.locator(
`.step-nav a[href="/admin/collections/${postsCollectionSlug}"]`,
)
await expect(collectionBreadcrumb).toBeVisible()
await expect(collectionBreadcrumb).toHaveText(slugPluralLabel)
- expect(page.url()).toContain(url.list)
+ expect(page.url()).toContain(postsUrl.list)
})
test('should not show hidden collections and globals', async () => {
- await page.goto(url.admin)
+ await page.goto(postsUrl.admin)
// nav menu
await expect(page.locator('#nav-hidden-collection')).toBeHidden()
@@ -174,9 +190,9 @@ describe('admin', () => {
await expect(page.locator('#card-hidden-global')).toBeHidden()
// routing
- await page.goto(url.collection('hidden-collection'))
+ await page.goto(postsUrl.collection('hidden-collection'))
await expect(page.locator('.not-found')).toContainText('Nothing found')
- await page.goto(url.global('hidden-global'))
+ await page.goto(postsUrl.global('hidden-global'))
await expect(page.locator('.not-found')).toContainText('Nothing found')
})
@@ -247,7 +263,7 @@ describe('admin', () => {
})
test('collection - should not show API tab when disabled in config', async () => {
- await page.goto(url.collection(noApiViewCollectionSlug))
+ await page.goto(postsUrl.collection(noApiViewCollectionSlug))
await page.locator('.collection-list .table a').click()
await expect(page.locator('.doc-tabs__tabs-container')).not.toContainText('API')
})
@@ -258,31 +274,33 @@ describe('admin', () => {
limit: 1,
})
expect(collectionItems.docs.length).toBe(1)
- await page.goto(`${url.collection(noApiViewGlobalSlug)}/${collectionItems.docs[0].id}/api`)
+ await page.goto(
+ `${postsUrl.collection(noApiViewGlobalSlug)}/${collectionItems.docs[0].id}/api`,
+ )
await expect(page.locator('.not-found')).toHaveCount(1)
})
test('collection - sidebar fields should respond to permission', async () => {
const { id } = await createPost()
- await page.goto(url.edit(id))
+ await page.goto(postsUrl.edit(id))
await expect(page.locator('#field-sidebarField')).toBeDisabled()
})
test('global - should not show API tab when disabled in config', async () => {
- await page.goto(url.global(noApiViewGlobalSlug))
+ await page.goto(postsUrl.global(noApiViewGlobalSlug))
await expect(page.locator('.doc-tabs__tabs-container')).not.toContainText('API')
})
test('global - should not enable API route when disabled in config', async () => {
- await page.goto(`${url.global(noApiViewGlobalSlug)}/api`)
+ await page.goto(`${postsUrl.global(noApiViewGlobalSlug)}/api`)
await expect(page.locator('.not-found')).toHaveCount(1)
})
})
describe('app-header', () => {
test('should show admin level action in admin panel', async () => {
- await page.goto(url.admin)
+ await page.goto(postsUrl.admin)
// Check if the element with the class .admin-button exists
await expect(page.locator('.app-header .admin-button')).toHaveCount(1)
})
@@ -370,7 +388,7 @@ describe('admin', () => {
describe('doc titles', () => {
test('collection - should render fallback titles when creating new', async () => {
- await page.goto(url.create)
+ await page.goto(postsUrl.create)
await checkPageTitle(page, '[Untitled]')
await checkBreadcrumb(page, 'Create New')
await saveDocAndAssert(page)
@@ -378,7 +396,7 @@ describe('admin', () => {
})
test('collection - should render `useAsTitle` field', async () => {
- await page.goto(url.create)
+ await page.goto(postsUrl.create)
await page.locator('#field-title')?.fill(title)
await saveDocAndAssert(page)
await wait(500)
@@ -389,7 +407,7 @@ describe('admin', () => {
test('collection - should render `id` as `useAsTitle` fallback', async () => {
const { id } = await createPost()
- await page.goto(url.edit(id))
+ await page.goto(postsUrl.edit(id))
await page.locator('#field-title')?.fill('')
expect(await page.locator('.doc-header__title.render-title')?.innerText()).toContain('ID:')
await saveDocAndAssert(page)
@@ -430,7 +448,7 @@ describe('admin', () => {
describe('CRUD', () => {
test('should create', async () => {
- await page.goto(url.create)
+ await page.goto(postsUrl.create)
await page.locator('#field-title').fill(title)
await page.locator('#field-description').fill(description)
await saveDocAndAssert(page)
@@ -440,14 +458,14 @@ describe('admin', () => {
test('should read existing', async () => {
const { id } = await createPost()
- await page.goto(url.edit(id))
+ await page.goto(postsUrl.edit(id))
await expect(page.locator('#field-title')).toHaveValue(title)
await expect(page.locator('#field-description')).toHaveValue(description)
})
test('should update existing', async () => {
const { id } = await createPost()
- await page.goto(url.edit(id))
+ await page.goto(postsUrl.edit(id))
const newTitle = 'new title'
const newDesc = 'new description'
await page.locator('#field-title').fill(newTitle)
@@ -459,7 +477,7 @@ describe('admin', () => {
test('should save using hotkey', async () => {
const { id } = await createPost()
- await page.goto(url.edit(id))
+ await page.goto(postsUrl.edit(id))
const newTitle = 'new title'
await page.locator('#field-title').fill(newTitle)
await saveDocHotkeyAndAssert(page)
@@ -468,12 +486,12 @@ describe('admin', () => {
test('should delete existing', async () => {
const { id, title } = await createPost()
- await page.goto(url.edit(id))
+ await page.goto(postsUrl.edit(id))
await openDocControls(page)
await page.locator('#action-delete').click()
await page.locator('#confirm-delete').click()
await expect(page.locator(`text=Post "${title}" successfully deleted.`)).toBeVisible()
- expect(page.url()).toContain(url.list)
+ expect(page.url()).toContain(postsUrl.list)
})
test('should bulk delete', async () => {
@@ -482,7 +500,7 @@ describe('admin', () => {
await Promise.all([createPost(), createPost(), createPost()])
- await page.goto(url.list)
+ await page.goto(postsUrl.list)
await page.locator('input#select-all').check()
await page.locator('.delete-documents__toggle').click()
await page.locator('#confirm-delete').click()
@@ -499,7 +517,7 @@ describe('admin', () => {
await Promise.all([createPost(), createPost(), createPost()])
const bulkTitle = 'Bulk update title'
- await page.goto(url.list)
+ await page.goto(postsUrl.list)
await page.locator('input#select-all').check()
await page.locator('.edit-many__toggle').click()
@@ -528,7 +546,7 @@ describe('admin', () => {
})
test('should save globals', async () => {
- await page.goto(url.global(globalSlug))
+ await page.goto(postsUrl.global(globalSlug))
await page.locator('#field-title').fill(title)
await saveDocAndAssert(page)
@@ -539,7 +557,7 @@ describe('admin', () => {
describe('Custom IDs', () => {
test('should allow custom ID field nested inside an unnamed tab', async () => {
- await page.goto(url.collection('customIdTab') + '/' + customIdCollectionId)
+ await page.goto(postsUrl.collection('customIdTab') + '/' + customIdCollectionId)
const idField = page.locator('#field-id')
@@ -547,7 +565,7 @@ describe('admin', () => {
})
test('should allow custom ID field nested inside a row', async () => {
- await page.goto(url.collection('customIdRow') + '/' + customIdCollectionId)
+ await page.goto(postsUrl.collection('customIdRow') + '/' + customIdCollectionId)
const idField = page.locator('#field-id')
@@ -557,7 +575,7 @@ describe('admin', () => {
describe('i18n', () => {
test('should allow changing language', async () => {
- await page.goto(url.account)
+ await page.goto(postsUrl.account)
const field = page.locator('.payload-settings__language .react-select')
@@ -577,7 +595,7 @@ describe('admin', () => {
})
test('should allow custom translation', async () => {
- await page.goto(url.account)
+ await page.goto(postsUrl.account)
await expect(page.locator('.step-nav a').first().locator('span')).toHaveAttribute(
'title',
'Home',
@@ -603,7 +621,7 @@ describe('admin', () => {
await secondLocale.click()
// Go to account page
- await page.goto(url.account)
+ await page.goto(postsUrl.account)
const languageField = page.locator('.payload-settings__language .react-select')
const options = page.locator('.rs__option')
@@ -626,7 +644,7 @@ describe('admin', () => {
const tableRowLocator = 'table > tbody > tr'
beforeEach(async () => {
- await page.goto(url.list)
+ await page.goto(postsUrl.list)
})
describe('filtering', () => {
@@ -635,7 +653,7 @@ describe('admin', () => {
await createPost({ title: 'charlie' })
// prefill search with "a" from the query param
- await page.goto(`${url.list}?search=dennis`)
+ await page.goto(`${postsUrl.list}?search=dennis`)
// input should be filled out, list should filter
await expect(page.locator('.search-filter__input')).toHaveValue('dennis')
@@ -644,7 +662,7 @@ describe('admin', () => {
test('search by id with listSearchableFields', async () => {
const { id } = await createPost()
- await page.goto(`${url.list}?limit=10&page=1&search=${id}`)
+ await page.goto(`${postsUrl.list}?limit=10&page=1&search=${id}`)
const tableItems = page.locator(tableRowLocator)
await expect(tableItems).toHaveCount(1)
})
@@ -818,7 +836,9 @@ describe('admin', () => {
test('should accept where query from valid URL where parameter', async () => {
await createPost({ title: 'post1' })
await createPost({ title: 'post2' })
- await page.goto(`${url.list}?limit=10&page=1&where[or][0][and][0][title][equals]=post1`)
+ await page.goto(
+ `${postsUrl.list}?limit=10&page=1&where[or][0][and][0][title][equals]=post1`,
+ )
await expect(page.locator('.react-select--single-value').first()).toContainText('Title')
await expect(page.locator(tableRowLocator)).toHaveCount(1)
@@ -828,7 +848,7 @@ describe('admin', () => {
await createPost({ title: 'post1' })
await createPost({ title: 'post2' })
// [title][equals]=post1 should be getting transformed into a valid where[or][0][and][0][title][equals]=post1
- await page.goto(`${url.list}?limit=10&page=1&where[title][equals]=post1`)
+ await page.goto(`${postsUrl.list}?limit=10&page=1&where[title][equals]=post1`)
await expect(page.locator('.react-select--single-value').first()).toContainText('Title')
await expect(page.locator(tableRowLocator)).toHaveCount(1)
@@ -955,7 +975,7 @@ describe('admin', () => {
await page.reload()
await createPost()
- await page.goto(url.create)
+ await page.goto(postsUrl.create)
// Open the drawer
await page.locator('.rich-text .list-drawer__toggler').click()
@@ -994,7 +1014,7 @@ describe('admin', () => {
})
test('should retain preferences when changing drawer collections', async () => {
- await page.goto(url.create)
+ await page.goto(postsUrl.create)
// Open the drawer
await page.locator('.rich-text .list-drawer__toggler').click()
@@ -1086,7 +1106,7 @@ describe('admin', () => {
test('should render custom table cell component', async () => {
await createPost()
- await page.goto(url.list)
+ await page.goto(postsUrl.list)
await expect(
page.locator('table > thead > tr > th', {
hasText: exactText('Demo UI Field'),
@@ -1161,7 +1181,7 @@ describe('admin', () => {
describe('custom css', () => {
test('should see custom css in admin UI', async () => {
- await page.goto(url.admin)
+ await page.goto(postsUrl.admin)
await openNav(page)
const navControls = page.locator('#custom-css')
await expect(navControls).toHaveCSS('font-family', 'monospace')
@@ -1200,7 +1220,7 @@ describe('admin', () => {
describe('i18n', () => {
test('should display translated collections and globals config options', async () => {
- await page.goto(url.list)
+ await page.goto(postsUrl.list)
// collection label
await expect(page.locator('#nav-posts')).toContainText('Posts')
@@ -1237,13 +1257,13 @@ describe('admin', () => {
test('should use fallback language on field titles', async () => {
// change language German
- await page.goto(url.account)
+ await page.goto(postsUrl.account)
await page.locator('.payload-settings__language .react-select').click()
const languageSelect = page.locator('.rs__option')
// text field does not have a 'de' label
await languageSelect.locator('text=Deutsch').click()
- await page.goto(url.list)
+ await page.goto(postsUrl.list)
await page.locator('.list-controls__toggle-columns').click()
// expecting the label to fall back to english as default fallbackLng
await expect(
@@ -1257,20 +1277,20 @@ describe('admin', () => {
describe('Field descriptions', () => {
test('should render static field description', async () => {
- await page.goto(url.create)
+ await page.goto(postsUrl.create)
await expect(page.locator('.field-description-descriptionAsString')).toContainText(
'Static field description.',
)
})
test('should render functional field description', async () => {
- await page.goto(url.create)
+ await page.goto(postsUrl.create)
await page.locator('#field-descriptionAsFunction').fill('functional')
await expect(page.locator('.field-description-descriptionAsFunction')).toContainText(
'Function description: descriptionAsFunction - functional',
)
})
test('should render component field description', async () => {
- await page.goto(url.create)
+ await page.goto(postsUrl.create)
await page.locator('#field-descriptionAsComponent').fill('component')
await expect(page.locator('.field-description-descriptionAsComponent')).toContainText(
'Component description: descriptionAsComponent - component',
diff --git a/test/helpers/sdk/endpoint.ts b/test/helpers/sdk/endpoint.ts
index 736bcadb3c0..5974dc42f8e 100644
--- a/test/helpers/sdk/endpoint.ts
+++ b/test/helpers/sdk/endpoint.ts
@@ -1,9 +1,8 @@
-import type { Endpoint } from 'payload/config'
-import type { PayloadRequest } from 'payload/types'
+import type { Endpoint, PayloadHandler } from 'payload/config'
import httpStatus from 'http-status'
-export const handler = async ({ payload, data, user }: PayloadRequest) => {
+export const handler: PayloadHandler = async ({ payload, data, user }) => {
const method = String(data.method)
if (typeof payload[method] === 'function') {
diff --git a/test/helpers/sdk/index.ts b/test/helpers/sdk/index.ts
index 0d4bf4e688e..5b1e407ff3e 100644
--- a/test/helpers/sdk/index.ts
+++ b/test/helpers/sdk/index.ts
@@ -1,6 +1,6 @@
import type { PaginatedDocs } from 'payload/database'
-import type { CreateArgs, FetchOptions, FindArgs, GeneratedTypes } from './types.js'
+import type { CreateArgs, DeleteArgs, FetchOptions, FindArgs, GeneratedTypes } from './types.js'
type Args = {
serverURL: string
@@ -18,6 +18,17 @@ export class PayloadTestSDK<TGeneratedTypes extends GeneratedTypes<TGeneratedTyp
})
}
+ delete = async <T extends keyof TGeneratedTypes['collections']>({
+ jwt,
+ ...args
+ }: DeleteArgs<TGeneratedTypes, T>) => {
+ return this.fetch<PaginatedDocs<TGeneratedTypes['collections'][T]>>({
+ method: 'delete',
+ args,
+ jwt,
+ })
+ }
+
fetch = async <T>({ jwt, reduceJSON, args, method }: FetchOptions): Promise<T> => {
const headers: HeadersInit = {
'Content-Type': 'application/json',
diff --git a/test/helpers/sdk/types.ts b/test/helpers/sdk/types.ts
index b7e62090f99..9a9a3efaa67 100644
--- a/test/helpers/sdk/types.ts
+++ b/test/helpers/sdk/types.ts
@@ -25,7 +25,7 @@ export type GeneratedTypes<T extends BaseTypes> = {
export type FetchOptions = {
args?: Record<string, unknown>
jwt?: string
- method: 'create' | 'find'
+ method: 'create' | 'delete' | 'find'
reduceJSON?: <R>(json: any) => R
}
@@ -73,3 +73,13 @@ export type FindArgs<
user?: TypeWithID
where?: Where
} & BaseArgs
+
+export type DeleteArgs<
+ TGeneratedTypes extends GeneratedTypes<TGeneratedTypes>,
+ TSlug extends keyof TGeneratedTypes['collections'],
+> = {
+ collection: TSlug
+ id?: string
+ overrideAccess?: boolean
+ where?: Where
+} & BaseArgs
|
ac355b58d4eeaf114a4c0228673e1e09a52e96b9
|
2022-05-17 22:45:24
|
James
|
chore(release): v0.17.1
| false
|
v0.17.1
|
chore
|
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 23d249d64b0..55ad8adefc3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## [0.17.1](https://github.com/payloadcms/payload/compare/v0.17.0...v0.17.1) (2022-05-17)
+
+
+### Bug Fixes
+
+* only localizes schema if both field and top-level config are enabled ([e1a5547](https://github.com/payloadcms/payload/commit/e1a5547fea065f5590930cbeb6d07bf59d62d21d))
+
# [0.17.0](https://github.com/payloadcms/payload/compare/v0.16.4...v0.17.0) (2022-05-16)
diff --git a/package.json b/package.json
index cab85b02119..4b66355c334 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "payload",
- "version": "0.17.0",
+ "version": "0.17.1",
"description": "Node, React and MongoDB Headless CMS and Application Framework",
"license": "SEE LICENSE IN license.md",
"author": {
|
0cd83f05916a148615cf88a06b0de2ed9fa97aee
|
2024-11-08 04:24:45
|
Alessio Gravili
|
perf: upgrade json-schema-to-typescript and various other dependencies (#9076)
| false
|
upgrade json-schema-to-typescript and various other dependencies (#9076)
|
perf
|
diff --git a/examples/testing/package.json b/examples/testing/package.json
index df60b4e9e9b..c746e405223 100644
--- a/examples/testing/package.json
+++ b/examples/testing/package.json
@@ -1,15 +1,24 @@
{
"name": "jest-payload",
"version": "1.0.0",
- "main": "index.js",
"license": "MIT",
+ "main": "index.js",
+ "scripts": {
+ "build": "yarn build:server && yarn build:payload",
+ "build:payload": "PAYLOAD_CONFIG_PATH=src/payload.config.ts payload build",
+ "build:server": "tsc",
+ "dev": "nodemon",
+ "generate:types": "PAYLOAD_CONFIG_PATH=src/payload.config.ts payload generate:types",
+ "serve": "PAYLOAD_CONFIG_PATH=dist/payload.config.js NODE_ENV=production node dist/server.js",
+ "test": "jest --forceExit --detectOpenHandles"
+ },
"dependencies": {
"@payloadcms/bundler-webpack": "^1.0.5",
"@payloadcms/db-mongodb": "^1.1.0",
"@payloadcms/richtext-slate": "^1.3.1",
"dotenv": "^16.3.1",
"express": "^4.18.2",
- "get-tsconfig": "^4.7.0",
+ "get-tsconfig": "4.8.1",
"payload": "^2.4.0"
},
"devDependencies": {
@@ -21,14 +30,5 @@
"nodemon": "^3.0.1",
"ts-node": "10.9.1",
"typescript": "^5.2.2"
- },
- "scripts": {
- "generate:types": "PAYLOAD_CONFIG_PATH=src/payload.config.ts payload generate:types",
- "dev": "nodemon",
- "build:payload": "PAYLOAD_CONFIG_PATH=src/payload.config.ts payload build",
- "build:server": "tsc",
- "build": "yarn build:server && yarn build:payload",
- "serve": "PAYLOAD_CONFIG_PATH=dist/payload.config.js NODE_ENV=production node dist/server.js",
- "test": "jest --forceExit --detectOpenHandles"
}
}
diff --git a/package.json b/package.json
index 62f9e22a5c2..e59ffa83fd2 100644
--- a/package.json
+++ b/package.json
@@ -162,7 +162,7 @@
"sort-package-json": "^2.10.0",
"swc-plugin-transform-remove-imports": "1.15.0",
"tempy": "1.0.1",
- "tsx": "4.19.1",
+ "tsx": "4.19.2",
"turbo": "^2.1.3",
"typescript": "5.6.3"
},
diff --git a/packages/db-postgres/package.json b/packages/db-postgres/package.json
index 98c6567198d..096e8fd107a 100644
--- a/packages/db-postgres/package.json
+++ b/packages/db-postgres/package.json
@@ -49,7 +49,7 @@
"dependencies": {
"@payloadcms/drizzle": "workspace:*",
"@types/pg": "8.10.2",
- "console-table-printer": "2.11.2",
+ "console-table-printer": "2.12.1",
"drizzle-kit": "0.26.2",
"drizzle-orm": "0.35.1",
"pg": "8.11.3",
diff --git a/packages/db-sqlite/package.json b/packages/db-sqlite/package.json
index 79f1420e3f7..1ae730a849d 100644
--- a/packages/db-sqlite/package.json
+++ b/packages/db-sqlite/package.json
@@ -47,7 +47,7 @@
"dependencies": {
"@libsql/client": "0.14.0",
"@payloadcms/drizzle": "workspace:*",
- "console-table-printer": "2.11.2",
+ "console-table-printer": "2.12.1",
"drizzle-kit": "0.26.2",
"drizzle-orm": "0.35.1",
"prompts": "2.4.2",
diff --git a/packages/db-vercel-postgres/package.json b/packages/db-vercel-postgres/package.json
index a541f31764e..4bbd5ea7d3f 100644
--- a/packages/db-vercel-postgres/package.json
+++ b/packages/db-vercel-postgres/package.json
@@ -49,7 +49,7 @@
"dependencies": {
"@payloadcms/drizzle": "workspace:*",
"@vercel/postgres": "^0.9.0",
- "console-table-printer": "2.11.2",
+ "console-table-printer": "2.12.1",
"drizzle-kit": "0.26.2",
"drizzle-orm": "0.35.1",
"pg": "8.11.3",
diff --git a/packages/drizzle/package.json b/packages/drizzle/package.json
index 0f1250adb79..e5e1ab20f16 100644
--- a/packages/drizzle/package.json
+++ b/packages/drizzle/package.json
@@ -45,7 +45,7 @@
"prepublishOnly": "pnpm clean && pnpm turbo build"
},
"dependencies": {
- "console-table-printer": "2.11.2",
+ "console-table-printer": "2.12.1",
"drizzle-orm": "0.35.1",
"prompts": "2.4.2",
"to-snake-case": "1.0.0",
diff --git a/packages/graphql/package.json b/packages/graphql/package.json
index 1a59a3b58b4..4f45a1a925a 100644
--- a/packages/graphql/package.json
+++ b/packages/graphql/package.json
@@ -45,8 +45,8 @@
"dependencies": {
"graphql-scalars": "1.22.2",
"pluralize": "8.0.0",
- "ts-essentials": "10.0.2",
- "tsx": "4.19.1"
+ "ts-essentials": "10.0.3",
+ "tsx": "4.19.2"
},
"devDependencies": {
"@payloadcms/eslint-config": "workspace:*",
diff --git a/packages/payload/package.json b/packages/payload/package.json
index 2cd909e76c7..dc5e8174434 100644
--- a/packages/payload/package.json
+++ b/packages/payload/package.json
@@ -91,24 +91,24 @@
"ajv": "8.17.1",
"bson-objectid": "2.0.4",
"ci-info": "^4.0.0",
- "console-table-printer": "2.11.2",
- "croner": "8.1.2",
+ "console-table-printer": "2.12.1",
+ "croner": "9.0.0",
"dataloader": "2.2.2",
"deepmerge": "4.3.1",
"file-type": "19.3.0",
- "get-tsconfig": "^4.7.2",
+ "get-tsconfig": "4.8.1",
"http-status": "1.6.2",
"image-size": "^1.1.1",
- "jose": "5.9.2",
- "json-schema-to-typescript": "15.0.1",
+ "jose": "5.9.6",
+ "json-schema-to-typescript": "15.0.3",
"minimist": "1.2.8",
"pino": "9.5.0",
- "pino-pretty": "11.3.0",
+ "pino-pretty": "12.0.0",
"pluralize": "8.0.0",
"sanitize-filename": "1.6.3",
"scmp": "2.1.0",
- "ts-essentials": "10.0.2",
- "tsx": "4.19.1",
+ "ts-essentials": "10.0.3",
+ "tsx": "4.19.2",
"uuid": "10.0.0"
},
"devDependencies": {
diff --git a/packages/payload/src/bin/index.ts b/packages/payload/src/bin/index.ts
index ca3f16bea00..4a2508c63a2 100755
--- a/packages/payload/src/bin/index.ts
+++ b/packages/payload/src/bin/index.ts
@@ -91,7 +91,7 @@ export const bin = async () => {
const queue = args.queue ? args.queue : undefined
if (args.cron) {
- Cron(args.cron, async () => {
+ new Cron(args.cron, async () => {
await payload.jobs.run({
limit,
queue,
diff --git a/packages/ui/package.json b/packages/ui/package.json
index 4633685822f..c4feab918de 100644
--- a/packages/ui/package.json
+++ b/packages/ui/package.json
@@ -92,7 +92,7 @@
"react-select": "5.8.0",
"scheduler": "0.0.0-experimental-3edc000d-20240926",
"sonner": "^1.5.0",
- "ts-essentials": "10.0.2",
+ "ts-essentials": "10.0.3",
"use-context-selector": "2.0.0",
"uuid": "10.0.0"
},
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 40c5744d990..9b64705b951 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -199,8 +199,8 @@ importers:
specifier: 1.0.1
version: 1.0.1
tsx:
- specifier: 4.19.1
- version: 4.19.1
+ specifier: 4.19.2
+ version: 4.19.2
turbo:
specifier: ^2.1.3
version: 2.1.3
@@ -312,8 +312,8 @@ importers:
specifier: 8.10.2
version: 8.10.2
console-table-printer:
- specifier: 2.11.2
- version: 2.11.2
+ specifier: 2.12.1
+ version: 2.12.1
drizzle-kit:
specifier: 0.26.2
version: 0.26.2
@@ -358,8 +358,8 @@ importers:
specifier: workspace:*
version: link:../drizzle
console-table-printer:
- specifier: 2.11.2
- version: 2.11.2
+ specifier: 2.12.1
+ version: 2.12.1
drizzle-kit:
specifier: 0.26.2
version: 0.26.2
@@ -398,8 +398,8 @@ importers:
specifier: ^0.9.0
version: 0.9.0
console-table-printer:
- specifier: 2.11.2
- version: 2.11.2
+ specifier: 2.12.1
+ version: 2.12.1
drizzle-kit:
specifier: 0.26.2
version: 0.26.2
@@ -441,8 +441,8 @@ importers:
packages/drizzle:
dependencies:
console-table-printer:
- specifier: 2.11.2
- version: 2.11.2
+ specifier: 2.12.1
+ version: 2.12.1
drizzle-orm:
specifier: 0.35.1
version: 0.35.1(@libsql/[email protected]([email protected])([email protected]))(@neondatabase/[email protected])(@opentelemetry/[email protected])(@types/[email protected])(@vercel/[email protected])([email protected])([email protected])([email protected])
@@ -620,11 +620,11 @@ importers:
specifier: 8.0.0
version: 8.0.0
ts-essentials:
- specifier: 10.0.2
- version: 10.0.2([email protected])
+ specifier: 10.0.3
+ version: 10.0.3([email protected])
tsx:
- specifier: 4.19.1
- version: 4.19.1
+ specifier: 4.19.2
+ version: 4.19.2
devDependencies:
'@payloadcms/eslint-config':
specifier: workspace:*
@@ -825,11 +825,11 @@ importers:
specifier: ^4.0.0
version: 4.0.0
console-table-printer:
- specifier: 2.11.2
- version: 2.11.2
+ specifier: 2.12.1
+ version: 2.12.1
croner:
- specifier: 8.1.2
- version: 8.1.2
+ specifier: 9.0.0
+ version: 9.0.0
dataloader:
specifier: 2.2.2
version: 2.2.2
@@ -840,8 +840,8 @@ importers:
specifier: 19.3.0
version: 19.3.0
get-tsconfig:
- specifier: ^4.7.2
- version: 4.7.6
+ specifier: 4.8.1
+ version: 4.8.1
graphql:
specifier: ^16.8.1
version: 16.9.0
@@ -852,11 +852,11 @@ importers:
specifier: ^1.1.1
version: 1.1.1
jose:
- specifier: 5.9.2
- version: 5.9.2
+ specifier: 5.9.6
+ version: 5.9.6
json-schema-to-typescript:
- specifier: 15.0.1
- version: 15.0.1
+ specifier: 15.0.3
+ version: 15.0.3
minimist:
specifier: 1.2.8
version: 1.2.8
@@ -864,8 +864,8 @@ importers:
specifier: 9.5.0
version: 9.5.0
pino-pretty:
- specifier: 11.3.0
- version: 11.3.0
+ specifier: 12.0.0
+ version: 12.0.0
pluralize:
specifier: 8.0.0
version: 8.0.0
@@ -876,11 +876,11 @@ importers:
specifier: 2.1.0
version: 2.1.0
ts-essentials:
- specifier: 10.0.2
- version: 10.0.2([email protected])
+ specifier: 10.0.3
+ version: 10.0.3([email protected])
tsx:
- specifier: 4.19.1
- version: 4.19.1
+ specifier: 4.19.2
+ version: 4.19.2
uuid:
specifier: 10.0.0
version: 10.0.0
@@ -1537,8 +1537,8 @@ importers:
specifier: ^1.5.0
version: 1.5.0([email protected]([email protected]))([email protected])
ts-essentials:
- specifier: 10.0.2
- version: 10.0.2([email protected])
+ specifier: 10.0.3
+ version: 10.0.3([email protected])
use-context-selector:
specifier: 2.0.0
version: 2.0.0([email protected])([email protected])
@@ -1772,8 +1772,8 @@ importers:
specifier: ^1.0.1
version: 1.0.1
ts-essentials:
- specifier: 10.0.2
- version: 10.0.2([email protected])
+ specifier: 10.0.3
+ version: 10.0.3([email protected])
typescript:
specifier: 5.6.3
version: 5.6.3
@@ -5559,8 +5559,8 @@ packages:
resolution: {integrity: sha512-I5qxpzLv+sJhTVEoLYNcTW+bThDCPsit0vLNKShZx6rLtpilNpmmeTPaeqJb9ZE9dV3DGaeby6Vuhrw38WjeyQ==}
engines: {node: ^14.18.0 || >=16.10.0}
- [email protected]:
- resolution: {integrity: sha512-uuUHie0sfPP542TKGzPFal0W1wo1beuKAqIZdaavcONx8OoqdnJRKjkinbRTOta4FaCa1RcIL+7mMJWX3pQGVg==}
+ [email protected]:
+ resolution: {integrity: sha512-wKGOQRRvdnd89pCeH96e2Fn4wkbenSP6LMHfjfyNLMbGuHEFbMqQNuxXqd0oXG9caIOQ1FTvc5Uijp9/4jujnQ==}
[email protected]:
resolution: {integrity: sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==}
@@ -5605,8 +5605,8 @@ packages:
engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
hasBin: true
- [email protected]:
- resolution: {integrity: sha512-ypfPFcAXHuAZRCzo3vJL6ltENzniTjwe/qsLleH1V2/7SRDjgvRQyrLmumFTLmjFax4IuSxfGXEn79fozXcJog==}
+ [email protected]:
+ resolution: {integrity: sha512-onMB0OkDjkXunhdW9htFjEhqrD54+M94i6ackoUkjHKbRnXdyEyKRelp4nJ1kAz32+s27jP1FsebpJCVl0BsvA==}
engines: {node: '>=18.0'}
[email protected]:
@@ -6449,6 +6449,14 @@ packages:
[email protected]:
resolution: {integrity: sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==}
+ [email protected]:
+ resolution: {integrity: sha512-KnhMXsKSPZlAhp7+IjUkRZKPb4fUyccpDrdFXbi4QL1qkmFh9kVY09Yox+n4MaOb3lHZ1Tv829C3oaaXoMYPDQ==}
+ peerDependencies:
+ picomatch: ^3 || ^4
+ peerDependenciesMeta:
+ picomatch:
+ optional: true
+
[email protected]:
resolution: {integrity: sha512-7yAQpD2UMJzLi1Dqv7qFYnPbaPx7ZfFK6PiIxQ4PfkGPyNyl2Ugx+a/umUonmKqjhM4DnfbMvdX6otXq83soQQ==}
engines: {node: ^12.20 || >= 14.13}
@@ -6660,6 +6668,9 @@ packages:
[email protected]:
resolution: {integrity: sha512-ZAqrLlu18NbDdRaHq+AKXzAmqIUPswPWKUchfytdAjiRFnCe5ojG2bstg6mRiZabkKfCoL/e98pbBELIV/YCeA==}
+ [email protected]:
+ resolution: {integrity: sha512-k9PN+cFBmaLWtVz29SkUoqU5O0slLuHJXt/2P+tMVFT+phsSGXGkp9t3rQIqdz0e+06EHNGs3oM6ZX1s2zHxRg==}
+
[email protected]:
resolution: {integrity: sha512-8EHPljDvs7qKykr6uw8b+lqLiUc/vUg+KVTI0uND4s63TdsZM2Xus3mflvF0DDG9SiM4RlCkFGL+7aAjRmV7KA==}
hasBin: true
@@ -7388,8 +7399,8 @@ packages:
resolution: {integrity: sha512-2yTgeWTWzMWkHu6Jp9NKgePDaYHbntiwvYuuJLbbN9vl7DC9DvXKOB2BC3ZZ92D3cvV/aflH0osDfwpHepQ53w==}
hasBin: true
- [email protected]:
- resolution: {integrity: sha512-ILI2xx/I57b20sd7rHZvgiiQrmp2mcotwsAH+5ajbpFQbrYVQdNHYlQhoA5cFb78CgtBOxtC05TeA+mcgkuCqQ==}
+ [email protected]:
+ resolution: {integrity: sha512-AMlnetc9+CV9asI19zHmrgS/WYsWUwCn2R7RzlbJWD7F9eWYUTGyBmU9o6PxngtLGOiDGPRu+Uc4fhKzbpteZQ==}
[email protected]:
resolution: {integrity: sha512-34wB/Y7MW7bzjKRjUKTa46I2Z7eV62Rkhva+KkopW7Qvv/OSWBqvkSY7vusOPrNuZcUG3tApvdVgNB8POj3SPw==}
@@ -7455,8 +7466,8 @@ packages:
[email protected]:
resolution: {integrity: sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==}
- [email protected]:
- resolution: {integrity: sha512-gSSg20skxv+ZQqR8Y8itZt+2iYFGNgneuTgf/Va0TBw+zo6JsykDG1bqhkhMs5g/vIdqmZx55oQJLbgOEuxPJw==}
+ [email protected]:
+ resolution: {integrity: sha512-iOKdzTUWEVM4nlxpFudFsWyUiu/Jakkga4OZPEt7CGoSEsAsUgdOZqR6pcgx2STBek9Gm4hcarJpXSzIvZ/hKA==}
engines: {node: '>=16.0.0'}
hasBin: true
@@ -8260,8 +8271,8 @@ packages:
[email protected]:
resolution: {integrity: sha512-F63x5tizV6WCh4R6RHyi2Ml+M70DNRXt/+HANowMflpgGFMAym/VKm6G7ZOQRjqN7XbGxK1Lg9t6ZrtzOaivMw==}
- [email protected]:
- resolution: {integrity: sha512-oXwn7ICywaZPHmu3epHGU2oJX4nPmKvHvB/bwrJHlGcbEWaVcotkpyVHMKLKmiVryWYByNp0jpgAcXpFJDXJzA==}
+ [email protected]:
+ resolution: {integrity: sha512-Cx08RuTg6337DbzXqiHpo+2ej0K2FwnyLYIHCmbB5ZhVXJA5XV7zTnvSGoeEERVIGTW9yj7XNtgS+5LpzRdR8w==}
hasBin: true
[email protected]:
@@ -8355,11 +8366,6 @@ packages:
resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
engines: {node: '>= 0.8.0'}
- [email protected]:
- resolution: {integrity: sha512-rAVeHYMcv8ATV5d508CFdn+8/pHPpXeIid1DdrPwXnaAdH7cqjVbpJaT5eq4yRAFU/lsbwYwSF/n5iNrdJHPQA==}
- engines: {node: '>=14'}
- hasBin: true
-
[email protected]:
resolution: {integrity: sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==}
engines: {node: '>=14'}
@@ -9410,6 +9416,10 @@ packages:
[email protected]:
resolution: {integrity: sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==}
+ [email protected]:
+ resolution: {integrity: sha512-Zc+8eJlFMvgatPZTl6A9L/yht8QqdmUNtURHaKZLmKBE12hNPSrqNkUp2cs3M/UKmNVVAMFQYSjYIVHDjW5zew==}
+ engines: {node: '>=12.0.0'}
+
[email protected]:
resolution: {integrity: sha512-KxVu8EYHDPBdUYdKZdKtU2aj2XfEx9AfjXxE/Aj0vT06w2icA09Vus1rh6eSu1y01akYg6BjIK/hxyLJINoMLQ==}
engines: {node: '>=12'}
@@ -9483,8 +9493,8 @@ packages:
peerDependencies:
typescript: 5.6.3
- [email protected]:
- resolution: {integrity: sha512-Xwag0TULqriaugXqVdDiGZ5wuZpqABZlpwQ2Ho4GDyiu/R2Xjkp/9+zcFxL7uzeLl/QCPrflnvpVYyS3ouT7Zw==}
+ [email protected]:
+ resolution: {integrity: sha512-/FrVAZ76JLTWxJOERk04fm8hYENDo0PWSP3YLQKxevLwWtxemGcl5JJEzN4iqfDlRve0ckyfFaOBu4xbNH/wZw==}
peerDependencies:
typescript: 5.6.3
peerDependenciesMeta:
@@ -9524,8 +9534,8 @@ packages:
[email protected]:
resolution: {integrity: sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==}
- [email protected]:
- resolution: {integrity: sha512-0flMz1lh74BR4wOvBjuh9olbnwqCPc35OOlfyzHba0Dc+QNUeWX/Gq2YTbnwcWPO3BMd8fkzRVrHcsR+a7z7rA==}
+ [email protected]:
+ resolution: {integrity: sha512-pOUl6Vo2LUq/bSa8S5q7b91cgNSjctn9ugq/+Mvow99qW6x/UZYwzxy/3NmqoT66eHYfCVvFvACC58UBPFf28g==}
engines: {node: '>=18.0.0'}
hasBin: true
@@ -11755,7 +11765,7 @@ snapshots:
'@esbuild-kit/[email protected]':
dependencies:
'@esbuild-kit/core-utils': 3.3.2
- get-tsconfig: 4.7.6
+ get-tsconfig: 4.8.1
'@esbuild/[email protected]':
optional: true
@@ -15096,7 +15106,7 @@ snapshots:
[email protected]: {}
- [email protected]:
+ [email protected]:
dependencies:
simple-wcswidth: 1.0.1
@@ -15158,7 +15168,7 @@ snapshots:
- supports-color
- ts-node
- [email protected]: {}
+ [email protected]: {}
[email protected]:
dependencies:
@@ -16196,6 +16206,10 @@ snapshots:
dependencies:
bser: 2.1.1
+ [email protected]([email protected]):
+ optionalDependencies:
+ picomatch: 4.0.2
+
[email protected]:
dependencies:
node-domexception: 1.0.0
@@ -16433,6 +16447,10 @@ snapshots:
dependencies:
resolve-pkg-maps: 1.0.0
+ [email protected]:
+ dependencies:
+ resolve-pkg-maps: 1.0.0
+
[email protected]:
dependencies:
citty: 0.1.6
@@ -17368,7 +17386,7 @@ snapshots:
[email protected]: {}
- [email protected]: {}
+ [email protected]: {}
[email protected]: {}
@@ -17446,16 +17464,17 @@ snapshots:
[email protected]: {}
- [email protected]:
+ [email protected]:
dependencies:
'@apidevtools/json-schema-ref-parser': 11.7.0
'@types/json-schema': 7.0.15
- glob: 10.4.5
+ '@types/lodash': 4.17.7
is-glob: 4.0.3
js-yaml: 4.1.0
lodash: 4.17.21
minimist: 1.2.8
- prettier: 3.3.2
+ prettier: 3.3.3
+ tinyglobby: 0.2.10
[email protected]: {}
@@ -18309,7 +18328,7 @@ snapshots:
dependencies:
split2: 4.2.0
- [email protected]:
+ [email protected]:
dependencies:
colorette: 2.0.20
dateformat: 4.6.3
@@ -18421,8 +18440,6 @@ snapshots:
[email protected]: {}
- [email protected]: {}
-
[email protected]: {}
[email protected]:
@@ -19566,6 +19583,11 @@ snapshots:
[email protected]: {}
+ [email protected]:
+ dependencies:
+ fdir: 6.4.2([email protected])
+ picomatch: 4.0.2
+
[email protected]: {}
[email protected]: {}
@@ -19633,7 +19655,7 @@ snapshots:
minimatch: 10.0.1
typescript: 5.6.3
- [email protected]([email protected]):
+ [email protected]([email protected]):
optionalDependencies:
typescript: 5.6.3
@@ -19662,7 +19684,7 @@ snapshots:
[email protected]: {}
- [email protected]:
+ [email protected]:
dependencies:
esbuild: 0.23.1
get-tsconfig: 4.7.6
diff --git a/test/package.json b/test/package.json
index 12101ffceb9..a9d94999288 100644
--- a/test/package.json
+++ b/test/package.json
@@ -79,7 +79,7 @@
"server-only": "^0.0.1",
"slate": "0.91.4",
"tempy": "^1.0.1",
- "ts-essentials": "10.0.2",
+ "ts-essentials": "10.0.3",
"typescript": "5.6.3",
"uploadthing": "^6.10.1",
"uuid": "10.0.0"
|
9574444b5702cf1c7261ee272eeeb25a101804ab
|
2023-10-08 04:52:01
|
Elliot DeNolf
|
chore: better handle retrieving migrations
| false
|
better handle retrieving migrations
|
chore
|
diff --git a/packages/payload/src/database/migrations/getMigrations.ts b/packages/payload/src/database/migrations/getMigrations.ts
index e23ba091502..16e787c8c8f 100644
--- a/packages/payload/src/database/migrations/getMigrations.ts
+++ b/packages/payload/src/database/migrations/getMigrations.ts
@@ -1,6 +1,9 @@
import type { Payload } from '../..'
import type { MigrationData } from '../types'
+/**
+ * Gets all existing migrations from the database, excluding the dev migration
+ */
export async function getMigrations({
payload,
}: {
@@ -10,6 +13,11 @@ export async function getMigrations({
collection: 'payload-migrations',
limit: 0,
sort: '-name',
+ where: {
+ batch: {
+ not_equals: -1,
+ },
+ },
})
const existingMigrations = migrationQuery.docs as unknown as MigrationData[]
diff --git a/packages/payload/src/database/migrations/migrateDown.ts b/packages/payload/src/database/migrations/migrateDown.ts
index 200422f2282..e878c25898c 100644
--- a/packages/payload/src/database/migrations/migrateDown.ts
+++ b/packages/payload/src/database/migrations/migrateDown.ts
@@ -13,20 +13,16 @@ export async function migrateDown(this: BaseDatabaseAdapter): Promise<void> {
payload,
})
- const migrationsToRollback = existingMigrations.filter(
- (migration) => migration.batch === latestBatch && migration.batch !== -1,
- )
-
- if (!migrationsToRollback?.length) {
+ if (!existingMigrations?.length) {
payload.logger.info({ msg: 'No migrations to rollback.' })
return
}
payload.logger.info({
- msg: `Rolling back batch ${latestBatch} consisting of ${migrationsToRollback.length} migration(s).`,
+ msg: `Rolling back batch ${latestBatch} consisting of ${existingMigrations.length} migration(s).`,
})
- for (const migration of migrationsToRollback) {
+ for (const migration of existingMigrations) {
const migrationFile = migrationFiles.find((m) => m.name === migration.name)
if (!migrationFile) {
throw new Error(`Migration ${migration.name} not found locally.`)
@@ -57,7 +53,7 @@ export async function migrateDown(this: BaseDatabaseAdapter): Promise<void> {
err,
msg: `Error running migration ${migrationFile.name}`,
})
- throw err
+ process.exit(1)
}
}
}
diff --git a/packages/payload/src/database/migrations/migrateRefresh.ts b/packages/payload/src/database/migrations/migrateRefresh.ts
index 283a7ec9d88..9ebc0a231ec 100644
--- a/packages/payload/src/database/migrations/migrateRefresh.ts
+++ b/packages/payload/src/database/migrations/migrateRefresh.ts
@@ -16,25 +16,21 @@ export async function migrateRefresh(this: BaseDatabaseAdapter) {
payload,
})
- const migrationsToRollback = existingMigrations.filter(
- (migration) => migration.batch === latestBatch && migration.batch !== -1,
- )
-
- if (!migrationsToRollback?.length) {
+ if (!existingMigrations?.length) {
payload.logger.info({ msg: 'No migrations to rollback.' })
return
}
payload.logger.info({
- msg: `Rolling back batch ${latestBatch} consisting of ${migrationsToRollback.length} migration(s).`,
+ msg: `Rolling back batch ${latestBatch} consisting of ${existingMigrations.length} migration(s).`,
})
let transactionID
// Reverse order of migrations to rollback
- migrationsToRollback.reverse()
+ existingMigrations.reverse()
- for (const migration of migrationsToRollback) {
+ for (const migration of existingMigrations) {
try {
const migrationFile = migrationFiles.find((m) => m.name === migration.name)
if (!migrationFile) {
@@ -69,7 +65,7 @@ export async function migrateRefresh(this: BaseDatabaseAdapter) {
err,
msg,
})
- throw err
+ process.exit(1)
}
}
@@ -95,11 +91,15 @@ export async function migrateRefresh(this: BaseDatabaseAdapter) {
payload.logger.info({ msg: `Migrated: ${migration.name} (${Date.now() - start}ms)` })
} catch (err: unknown) {
await this.rollbackTransaction(transactionID)
+ let msg = `Error running migration ${migration.name}. Rolling back.`
+ if (err instanceof Error) {
+ msg += ` ${err.message}`
+ }
payload.logger.error({
err,
- msg: `Error running migration ${migration.name}. Rolling back.`,
+ msg,
})
- throw err
+ process.exit(1)
}
}
}
|
c7c34188e16d7e85a038ccc7f128590d0784131d
|
2022-01-01 03:08:49
|
James
|
fix: avoids console 404 on unpublished docs
| false
|
avoids console 404 on unpublished docs
|
fix
|
diff --git a/src/admin/components/utilities/DocumentInfo/index.tsx b/src/admin/components/utilities/DocumentInfo/index.tsx
index 5114bbb87fe..90da6793dda 100644
--- a/src/admin/components/utilities/DocumentInfo/index.tsx
+++ b/src/admin/components/utilities/DocumentInfo/index.tsx
@@ -47,6 +47,7 @@ export const DocumentInfoProvider: React.FC<Props> = ({
let shouldFetchVersions = false;
let unpublishedVersionJSON = null;
let versionJSON = null;
+ let shouldFetch = true;
const params = {
where: {
@@ -57,14 +58,18 @@ export const DocumentInfoProvider: React.FC<Props> = ({
if (global) {
shouldFetchVersions = Boolean(global?.versions);
- versionFetchURL = `${baseURL}/globals/${global.slug}/versions`;
- publishedFetchURL = `${baseURL}/globals/${global.slug}`;
+ versionFetchURL = `${baseURL}/globals/${global.slug}/versions?depth=0`;
+ publishedFetchURL = `${baseURL}/globals/${global.slug}?depth=0`;
}
if (collection) {
shouldFetchVersions = Boolean(collection?.versions);
- versionFetchURL = `${baseURL}/${collection.slug}/versions`;
- publishedFetchURL = `${baseURL}/${collection.slug}/${id}`;
+ versionFetchURL = `${baseURL}/${collection.slug}/versions?depth=0`;
+ publishedFetchURL = `${baseURL}/${collection.slug}?where[id][equals]=${id}&depth=0`;
+
+ if (!id) {
+ shouldFetch = false;
+ }
params.where.and.push({
parent: {
@@ -73,39 +78,45 @@ export const DocumentInfoProvider: React.FC<Props> = ({
});
}
- const publishedJSON = await fetch(publishedFetchURL).then((res) => res.json());
-
- if (shouldFetchVersions) {
- versionJSON = await fetch(versionFetchURL).then((res) => res.json());
-
- if (publishedJSON?.updatedAt) {
- const newerVersionParams = {
- ...params,
- where: {
- ...params.where,
- and: [
- ...params.where.and,
- {
- updatedAt: {
- greater_than: publishedJSON?.updatedAt,
+ if (shouldFetch) {
+ let publishedJSON = await fetch(publishedFetchURL).then((res) => res.json());
+
+ if (collection) {
+ publishedJSON = publishedJSON?.docs?.[0];
+ }
+
+ if (shouldFetchVersions) {
+ versionJSON = await fetch(versionFetchURL).then((res) => res.json());
+
+ if (publishedJSON?.updatedAt) {
+ const newerVersionParams = {
+ ...params,
+ where: {
+ ...params.where,
+ and: [
+ ...params.where.and,
+ {
+ updatedAt: {
+ greater_than: publishedJSON?.updatedAt,
+ },
},
- },
- ],
- },
- };
+ ],
+ },
+ };
- // Get any newer versions available
- const newerVersionRes = await fetch(`${versionFetchURL}?${qs.stringify(newerVersionParams)}`);
+ // Get any newer versions available
+ const newerVersionRes = await fetch(`${versionFetchURL}?${qs.stringify(newerVersionParams)}`);
- if (newerVersionRes.status === 200) {
- unpublishedVersionJSON = await newerVersionRes.json();
+ if (newerVersionRes.status === 200) {
+ unpublishedVersionJSON = await newerVersionRes.json();
+ }
}
}
- }
- setPublishedDoc(publishedJSON);
- setVersions(versionJSON);
- setUnpublishedVersions(unpublishedVersionJSON);
+ setPublishedDoc(publishedJSON);
+ setVersions(versionJSON);
+ setUnpublishedVersions(unpublishedVersionJSON);
+ }
}, [global, collection, id, baseURL]);
useEffect(() => {
diff --git a/src/collections/operations/find.ts b/src/collections/operations/find.ts
index 9f1fd7e2a1c..862b4c42eb2 100644
--- a/src/collections/operations/find.ts
+++ b/src/collections/operations/find.ts
@@ -71,6 +71,7 @@ async function find<T extends TypeWithID = any>(incomingArgs: Arguments): Promis
if (where) {
queryToBuild.where = {
+ and: [],
...where,
};
|
a3df2ca0ef28fddc86587ab04b55df3bf0d85f27
|
2024-03-21 21:20:20
|
Elliot DeNolf
|
chore(ui): export EditView
| false
|
export EditView
|
chore
|
diff --git a/packages/next/src/exports/views.ts b/packages/next/src/exports/views.ts
index 93fd51f2099..05439ff4280 100644
--- a/packages/next/src/exports/views.ts
+++ b/packages/next/src/exports/views.ts
@@ -1,2 +1,3 @@
+export { EditView } from '../views/Edit/index.js'
export { NotFoundView } from '../views/NotFound/index.js'
export { type GenerateViewMetadata, RootPage, generatePageMetadata } from '../views/Root/index.js'
diff --git a/test/refresh-permissions/GlobalViewWithRefresh.tsx b/test/refresh-permissions/GlobalViewWithRefresh.tsx
index beba60f1506..495b651e5ba 100644
--- a/test/refresh-permissions/GlobalViewWithRefresh.tsx
+++ b/test/refresh-permissions/GlobalViewWithRefresh.tsx
@@ -1,10 +1,9 @@
import type { EditViewProps } from 'payload/types'
+import { EditView as DefaultEditView } from '@payloadcms/next/views'
import { useAuth } from '@payloadcms/ui/providers/Auth'
import React, { useCallback } from 'react'
-import { EditView as DefaultEditView } from '../../packages/next/src/views/Edit/index.js'
-
const GlobalView: React.FC<EditViewProps> = (props) => {
const { onSave } = props
const { refreshPermissions } = useAuth()
|
49817ee0fa093ea5e71f901651f68806c6320052
|
2024-01-06 00:49:43
|
Jacob Fletcher
|
chore(next): moves dashboard view into next dir
| false
|
moves dashboard view into next dir
|
chore
|
diff --git a/packages/ui/src/views/Dashboard/index.client.tsx b/packages/next/src/pages/Dashboard/Default/index.client.tsx
similarity index 91%
rename from packages/ui/src/views/Dashboard/index.client.tsx
rename to packages/next/src/pages/Dashboard/Default/index.client.tsx
index b21d8a7456a..35a93d54b23 100644
--- a/packages/ui/src/views/Dashboard/index.client.tsx
+++ b/packages/next/src/pages/Dashboard/Default/index.client.tsx
@@ -2,16 +2,19 @@
import React, { Fragment, useEffect, useState } from 'react'
import { useTranslation } from 'react-i18next'
-import type { EntityToGroup, Group } from '../../utilities/groupNavItems'
+import type { EntityToGroup, Group } from '@payloadcms/ui'
+import {
+ EntityType,
+ groupNavItems,
+ Button,
+ Card,
+ useAuth,
+ useConfig,
+ useActions,
+} from '@payloadcms/ui'
import { getTranslation } from 'payload/utilities'
-import { EntityType, groupNavItems } from '../../utilities/groupNavItems'
-import { Button } from '../../elements/Button'
-import { Card } from '../../elements/Card'
import './index.scss'
-import { useAuth } from '../../providers/Auth'
-import { useConfig } from '../../providers/Config'
-import { useActions } from '../../providers/ActionsProvider'
const baseClass = 'dashboard'
diff --git a/packages/ui/src/views/Dashboard/index.scss b/packages/next/src/pages/Dashboard/Default/index.scss
similarity index 95%
rename from packages/ui/src/views/Dashboard/index.scss
rename to packages/next/src/pages/Dashboard/Default/index.scss
index 16f7ddbbabc..03aa0144b7e 100644
--- a/packages/ui/src/views/Dashboard/index.scss
+++ b/packages/next/src/pages/Dashboard/Default/index.scss
@@ -1,4 +1,4 @@
-@import '../../scss/styles';
+@import '../../../scss/queries.scss';
.dashboard {
width: 100%;
diff --git a/packages/ui/src/views/Dashboard/index.tsx b/packages/next/src/pages/Dashboard/Default/index.tsx
similarity index 88%
rename from packages/ui/src/views/Dashboard/index.tsx
rename to packages/next/src/pages/Dashboard/Default/index.tsx
index dc948f6efeb..3ae9b9615f5 100644
--- a/packages/ui/src/views/Dashboard/index.tsx
+++ b/packages/next/src/pages/Dashboard/Default/index.tsx
@@ -1,10 +1,9 @@
import React from 'react'
import type { SanitizedConfig } from 'payload/types'
-import { Gutter } from '../../elements/Gutter'
+import { Gutter, SetStepNav } from '@payloadcms/ui'
import './index.scss'
import { DefaultDashboardClient } from './index.client'
-import { SetStepNav } from '../../elements/StepNav/SetStepNav'
const baseClass = 'dashboard'
diff --git a/packages/next/src/pages/Dashboard/index.tsx b/packages/next/src/pages/Dashboard/index.tsx
index 29d27c722e7..8af2f6062f1 100644
--- a/packages/next/src/pages/Dashboard/index.tsx
+++ b/packages/next/src/pages/Dashboard/index.tsx
@@ -1,8 +1,9 @@
import { SanitizedConfig } from 'payload/types'
import React, { Fragment } from 'react'
-import { RenderCustomComponent, DefaultDashboard, HydrateClientUser } from '@payloadcms/ui'
+import { RenderCustomComponent, HydrateClientUser } from '@payloadcms/ui'
import Link from 'next/link'
import { initPage } from '../../utilities/initPage'
+import { DefaultDashboard } from './Default'
export const Dashboard = async ({
config: configPromise,
diff --git a/packages/ui/src/exports/utilities.ts b/packages/ui/src/exports/utilities.ts
index fbf4f141bf9..de538343709 100644
--- a/packages/ui/src/exports/utilities.ts
+++ b/packages/ui/src/exports/utilities.ts
@@ -1,3 +1,5 @@
export { findLocaleFromCode } from '../utilities/findLocaleFromCode'
export { formatFields } from '../utilities/formatFields'
export { formatDate } from '../utilities/formatDate'
+export type { EntityToGroup, Group } from '../utilities/groupNavItems'
+export { EntityType, groupNavItems } from '../utilities/groupNavItems'
diff --git a/packages/ui/src/exports/views.ts b/packages/ui/src/exports/views.ts
index de529ce6304..b2b6021207f 100644
--- a/packages/ui/src/exports/views.ts
+++ b/packages/ui/src/exports/views.ts
@@ -1,5 +1,4 @@
export { DefaultAccount } from '../views/Account'
-export { DefaultDashboard } from '../views/Dashboard'
export { DefaultList } from '../views/List'
export { DefaultEditView } from '../views/Edit'
export { DefaultGlobalView } from '../views/Global'
|
4300c3d550e125dfc2ebebcdca930b4ff393c148
|
2024-03-15 08:18:27
|
Alessio Gravili
|
chore: add missing .prettierignore files. Without them, folders like "dist" would not be excluded on a package-level despite a root-level .prettierignore being present
| false
|
add missing .prettierignore files. Without them, folders like "dist" would not be excluded on a package-level despite a root-level .prettierignore being present
|
chore
|
diff --git a/packages/create-payload-app/.prettierignore b/packages/create-payload-app/.prettierignore
new file mode 100644
index 00000000000..17883dc0e52
--- /dev/null
+++ b/packages/create-payload-app/.prettierignore
@@ -0,0 +1,12 @@
+.tmp
+**/.git
+**/.hg
+**/.pnp.*
+**/.svn
+**/.yarn/**
+**/build
+**/dist/**
+**/node_modules
+**/temp
+**/docs/**
+tsconfig.json
diff --git a/packages/graphql/.prettierignore b/packages/graphql/.prettierignore
new file mode 100644
index 00000000000..17883dc0e52
--- /dev/null
+++ b/packages/graphql/.prettierignore
@@ -0,0 +1,12 @@
+.tmp
+**/.git
+**/.hg
+**/.pnp.*
+**/.svn
+**/.yarn/**
+**/build
+**/dist/**
+**/node_modules
+**/temp
+**/docs/**
+tsconfig.json
diff --git a/packages/next/.prettierignore b/packages/next/.prettierignore
new file mode 100644
index 00000000000..17883dc0e52
--- /dev/null
+++ b/packages/next/.prettierignore
@@ -0,0 +1,12 @@
+.tmp
+**/.git
+**/.hg
+**/.pnp.*
+**/.svn
+**/.yarn/**
+**/build
+**/dist/**
+**/node_modules
+**/temp
+**/docs/**
+tsconfig.json
diff --git a/packages/plugin-cloud-storage/.prettierignore b/packages/plugin-cloud-storage/.prettierignore
new file mode 100644
index 00000000000..17883dc0e52
--- /dev/null
+++ b/packages/plugin-cloud-storage/.prettierignore
@@ -0,0 +1,12 @@
+.tmp
+**/.git
+**/.hg
+**/.pnp.*
+**/.svn
+**/.yarn/**
+**/build
+**/dist/**
+**/node_modules
+**/temp
+**/docs/**
+tsconfig.json
diff --git a/packages/plugin-form-builder/.prettierignore b/packages/plugin-form-builder/.prettierignore
new file mode 100644
index 00000000000..17883dc0e52
--- /dev/null
+++ b/packages/plugin-form-builder/.prettierignore
@@ -0,0 +1,12 @@
+.tmp
+**/.git
+**/.hg
+**/.pnp.*
+**/.svn
+**/.yarn/**
+**/build
+**/dist/**
+**/node_modules
+**/temp
+**/docs/**
+tsconfig.json
diff --git a/packages/plugin-redirects/.prettierignore b/packages/plugin-redirects/.prettierignore
new file mode 100644
index 00000000000..17883dc0e52
--- /dev/null
+++ b/packages/plugin-redirects/.prettierignore
@@ -0,0 +1,12 @@
+.tmp
+**/.git
+**/.hg
+**/.pnp.*
+**/.svn
+**/.yarn/**
+**/build
+**/dist/**
+**/node_modules
+**/temp
+**/docs/**
+tsconfig.json
diff --git a/packages/plugin-search/.prettierignore b/packages/plugin-search/.prettierignore
new file mode 100644
index 00000000000..17883dc0e52
--- /dev/null
+++ b/packages/plugin-search/.prettierignore
@@ -0,0 +1,12 @@
+.tmp
+**/.git
+**/.hg
+**/.pnp.*
+**/.svn
+**/.yarn/**
+**/build
+**/dist/**
+**/node_modules
+**/temp
+**/docs/**
+tsconfig.json
diff --git a/packages/plugin-sentry/.prettierignore b/packages/plugin-sentry/.prettierignore
new file mode 100644
index 00000000000..17883dc0e52
--- /dev/null
+++ b/packages/plugin-sentry/.prettierignore
@@ -0,0 +1,12 @@
+.tmp
+**/.git
+**/.hg
+**/.pnp.*
+**/.svn
+**/.yarn/**
+**/build
+**/dist/**
+**/node_modules
+**/temp
+**/docs/**
+tsconfig.json
diff --git a/packages/plugin-seo/.prettierignore b/packages/plugin-seo/.prettierignore
new file mode 100644
index 00000000000..17883dc0e52
--- /dev/null
+++ b/packages/plugin-seo/.prettierignore
@@ -0,0 +1,12 @@
+.tmp
+**/.git
+**/.hg
+**/.pnp.*
+**/.svn
+**/.yarn/**
+**/build
+**/dist/**
+**/node_modules
+**/temp
+**/docs/**
+tsconfig.json
diff --git a/packages/plugin-stripe/.prettierignore b/packages/plugin-stripe/.prettierignore
new file mode 100644
index 00000000000..17883dc0e52
--- /dev/null
+++ b/packages/plugin-stripe/.prettierignore
@@ -0,0 +1,12 @@
+.tmp
+**/.git
+**/.hg
+**/.pnp.*
+**/.svn
+**/.yarn/**
+**/build
+**/dist/**
+**/node_modules
+**/temp
+**/docs/**
+tsconfig.json
diff --git a/packages/translations/.prettierignore b/packages/translations/.prettierignore
new file mode 100644
index 00000000000..17883dc0e52
--- /dev/null
+++ b/packages/translations/.prettierignore
@@ -0,0 +1,12 @@
+.tmp
+**/.git
+**/.hg
+**/.pnp.*
+**/.svn
+**/.yarn/**
+**/build
+**/dist/**
+**/node_modules
+**/temp
+**/docs/**
+tsconfig.json
diff --git a/packages/ui/.prettierignore b/packages/ui/.prettierignore
new file mode 100644
index 00000000000..17883dc0e52
--- /dev/null
+++ b/packages/ui/.prettierignore
@@ -0,0 +1,12 @@
+.tmp
+**/.git
+**/.hg
+**/.pnp.*
+**/.svn
+**/.yarn/**
+**/build
+**/dist/**
+**/node_modules
+**/temp
+**/docs/**
+tsconfig.json
|
389ee261d4ebae0b773bca375ed8a74685506aa0
|
2022-12-20 02:01:03
|
Dan Ribbens
|
fix: #1656 remove size data
| false
|
#1656 remove size data
|
fix
|
diff --git a/src/collections/operations/local/update.ts b/src/collections/operations/local/update.ts
index 8a72469ce82..02e02ca4abe 100644
--- a/src/collections/operations/local/update.ts
+++ b/src/collections/operations/local/update.ts
@@ -4,6 +4,7 @@ import getFileByPath from '../../../uploads/getFileByPath';
import update from '../update';
import { PayloadRequest } from '../../../express/types';
import { getDataLoader } from '../../dataloader';
+import { File } from '../../../uploads/types';
import i18nInit from '../../../translations/init';
export type Options<T> = {
diff --git a/src/uploads/imageResizer.ts b/src/uploads/imageResizer.ts
index d3360925097..35b8f9c35bc 100644
--- a/src/uploads/imageResizer.ts
+++ b/src/uploads/imageResizer.ts
@@ -52,10 +52,21 @@ export default async function resizeAndSave({
}: Args): Promise<Result> {
const { imageSizes } = config.upload;
const sizesToSave: FileToSave[] = [];
+ const sizeData = {};
- const sizes = imageSizes
- .filter((desiredSize) => needsResize(desiredSize, dimensions))
+ const promises = imageSizes
.map(async (desiredSize) => {
+ if (!needsResize(desiredSize, dimensions)) {
+ sizeData[desiredSize.name] = {
+ url: null,
+ width: null,
+ height: null,
+ filename: null,
+ filesize: null,
+ mimeType: null,
+ };
+ return;
+ }
let resized = sharp(file).resize(desiredSize);
if (desiredSize.formatOptions) {
@@ -83,8 +94,7 @@ export default async function resizeAndSave({
buffer: bufferObject.data,
});
- return {
- name: desiredSize.name,
+ sizeData[desiredSize.name] = {
width: bufferObject.info.width,
height: bufferObject.info.height,
filename: imageNameWithDimensions,
@@ -93,22 +103,10 @@ export default async function resizeAndSave({
};
});
- const savedSizes = await Promise.all(sizes);
+ await Promise.all(promises);
return {
- sizeData: savedSizes.reduce(
- (results, size) => ({
- ...results,
- [size.name]: {
- width: size.width,
- height: size.height,
- filename: size.filename,
- mimeType: size.mimeType,
- filesize: size.filesize,
- },
- }),
- {},
- ),
+ sizeData,
sizesToSave,
};
}
diff --git a/src/uploads/types.ts b/src/uploads/types.ts
index a5448adc953..86df560684c 100644
--- a/src/uploads/types.ts
+++ b/src/uploads/types.ts
@@ -7,10 +7,8 @@ export type FileSize = {
filename: string;
filesize: number;
mimeType: string;
- name: string;
width: number;
height: number;
- crop: string;
}
export type FileSizes = {
diff --git a/test/uploads/int.spec.ts b/test/uploads/int.spec.ts
index dbc9ee333d9..c223e6f49f6 100644
--- a/test/uploads/int.spec.ts
+++ b/test/uploads/int.spec.ts
@@ -7,6 +7,7 @@ import { RESTClient } from '../helpers/rest';
import config, { mediaSlug, relationSlug } from './config';
import payload from '../../src';
import getFileByPath from '../../src/uploads/getFileByPath';
+import type { Media } from './payload-types';
const stat = promisify(fs.stat);
@@ -76,7 +77,7 @@ describe('Collections - Uploads', () => {
expect(await fileExists(path.join(__dirname, './media', doc.sizes.icon.filename))).toBe(true);
// Check api response
- expect(doc.sizes.tablet.filename).toBeUndefined();
+ expect(doc.sizes.tablet.filename).toBeNull();
expect(doc.sizes.icon.filename).toBeDefined();
});
@@ -159,6 +160,28 @@ describe('Collections - Uploads', () => {
expect(await fileExists(path.join(__dirname, './media', mediaDoc.sizes.icon.filename))).toBe(true);
});
+ it('should remove extra sizes on update', async () => {
+ const filePath = path.resolve(__dirname, './image.png');
+ const file = await getFileByPath(filePath);
+ const small = await getFileByPath(path.resolve(__dirname, './small.png'));
+
+ const { id } = await payload.create<Media>({
+ collection: mediaSlug,
+ data: {},
+ file,
+ });
+
+ const doc = await payload.update<Media>({
+ collection: mediaSlug,
+ id,
+ data: {},
+ file: small,
+ });
+
+ expect(doc.sizes.icon).toBeDefined();
+ expect(doc.sizes.tablet.width).toBeNull();
+ });
+
it('should allow update removing a relationship', async () => {
const filePath = path.resolve(__dirname, './image.png');
const file = await getFileByPath(filePath);
|
b47b5ddb0543058345505dd068871a89cf6e3015
|
2024-03-20 01:00:07
|
James
|
chore: more progress to elements
| false
|
more progress to elements
|
chore
|
diff --git a/packages/ui/src/elements/ColumnSelector/index.tsx b/packages/ui/src/elements/ColumnSelector/index.tsx
index f30a81b598a..815dd1261fa 100644
--- a/packages/ui/src/elements/ColumnSelector/index.tsx
+++ b/packages/ui/src/elements/ColumnSelector/index.tsx
@@ -8,7 +8,7 @@ import { Plus } from '../../icons/Plus/index.js'
import { X } from '../../icons/X/index.js'
import { useEditDepth } from '../../providers/EditDepth/index.js'
import { useTranslation } from '../../providers/Translation/index.js'
-import DraggableSortable from '../DraggableSortable/index.js'
+import { DraggableSortable } from '../DraggableSortable/index.js'
import Pill from '../Pill/index.js'
import { useTableColumns } from '../TableColumns/index.js'
import './index.scss'
diff --git a/packages/ui/src/elements/DocumentControls/index.tsx b/packages/ui/src/elements/DocumentControls/index.tsx
index b36df8af1fa..9273fc8db98 100644
--- a/packages/ui/src/elements/DocumentControls/index.tsx
+++ b/packages/ui/src/elements/DocumentControls/index.tsx
@@ -9,7 +9,7 @@ import { useTranslation } from '../../providers/Translation/index.js'
import { formatDate } from '../../utilities/formatDate.js'
import Autosave from '../Autosave/index.js'
import DeleteDocument from '../DeleteDocument/index.js'
-import DuplicateDocument from '../DuplicateDocument/index.js'
+import { DuplicateDocument } from '../DuplicateDocument/index.js'
import { Gutter } from '../Gutter/index.js'
import * as PopupList from '../Popup/PopupButtonList/index.js'
import Popup from '../Popup/index.js'
diff --git a/packages/ui/src/elements/DocumentDrawer/DrawerContent.tsx b/packages/ui/src/elements/DocumentDrawer/DrawerContent.tsx
index c84f807f5b6..d2ee8a928cf 100644
--- a/packages/ui/src/elements/DocumentDrawer/DrawerContent.tsx
+++ b/packages/ui/src/elements/DocumentDrawer/DrawerContent.tsx
@@ -9,10 +9,9 @@ import { toast } from 'react-toastify'
import type { DocumentDrawerProps } from './types.js'
-import { useRelatedCollections } from '../../forms/fields/Relationship/AddNew/useRelatedCollections.js'
+import { useRelatedCollections } from '../../fields/Relationship/AddNew/useRelatedCollections.js'
import usePayloadAPI from '../../hooks/usePayloadAPI.js'
import { X } from '../../icons/X/index.js'
-import { formatDocTitle } from '../../index.js'
import { useComponentMap } from '../../providers/ComponentMap/index.jsx'
import { useConfig } from '../../providers/Config/index.js'
import { DocumentInfoProvider } from '../../providers/DocumentInfo/index.js'
@@ -20,6 +19,7 @@ import { useFormQueryParams } from '../../providers/FormQueryParams/index.js'
import { useLocale } from '../../providers/Locale/index.js'
import { usePreferences } from '../../providers/Preferences/index.js'
import { useTranslation } from '../../providers/Translation/index.js'
+import { formatDocTitle } from '../../utilities/formatDocTitle.js'
import { getFormState } from '../../utilities/getFormState.js'
import { Gutter } from '../Gutter/index.js'
import IDLabel from '../IDLabel/index.js'
diff --git a/packages/ui/src/elements/DocumentDrawer/index.tsx b/packages/ui/src/elements/DocumentDrawer/index.tsx
index 428470126f1..53e535e0db7 100644
--- a/packages/ui/src/elements/DocumentDrawer/index.tsx
+++ b/packages/ui/src/elements/DocumentDrawer/index.tsx
@@ -5,7 +5,7 @@ import React, { useCallback, useEffect, useId, useMemo, useState } from 'react'
import type { DocumentDrawerProps, DocumentTogglerProps, UseDocumentDrawer } from './types.js'
-import { useRelatedCollections } from '../../forms/fields/Relationship/AddNew/useRelatedCollections.js'
+import { useRelatedCollections } from '../../fields/Relationship/AddNew/useRelatedCollections.js'
import { useEditDepth } from '../../providers/EditDepth/index.js'
import { useTranslation } from '../../providers/Translation/index.js'
import { Drawer, DrawerToggler } from '../Drawer/index.js'
diff --git a/packages/ui/src/elements/DocumentDrawer/types.ts b/packages/ui/src/elements/DocumentDrawer/types.ts
index 2a22ab1caab..0637d39d398 100644
--- a/packages/ui/src/elements/DocumentDrawer/types.ts
+++ b/packages/ui/src/elements/DocumentDrawer/types.ts
@@ -1,4 +1,4 @@
-import type { TypeWithID } from 'payload/types.js'
+import type { TypeWithID } from 'payload/types'
import type React from 'react'
import type { HTMLAttributes } from 'react'
diff --git a/packages/ui/src/elements/DraggableSortable/DraggableSortableItem/index.tsx b/packages/ui/src/elements/DraggableSortable/DraggableSortableItem/index.tsx
index 53f236d2965..9846488ba75 100644
--- a/packages/ui/src/elements/DraggableSortable/DraggableSortableItem/index.tsx
+++ b/packages/ui/src/elements/DraggableSortable/DraggableSortableItem/index.tsx
@@ -34,5 +34,3 @@ export const DraggableSortableItem: React.FC<
</Fragment>
)
}
-
-export default DraggableSortableItem
diff --git a/packages/ui/src/elements/DraggableSortable/index.tsx b/packages/ui/src/elements/DraggableSortable/index.tsx
index 79b7b970385..b9e782829df 100644
--- a/packages/ui/src/elements/DraggableSortable/index.tsx
+++ b/packages/ui/src/elements/DraggableSortable/index.tsx
@@ -14,7 +14,9 @@ import React, { useCallback, useId } from 'react'
import type { Props } from './types.js'
-const DraggableSortable: React.FC<Props> = (props) => {
+export { Props }
+
+export const DraggableSortable: React.FC<Props> = (props) => {
const { children, className, ids, onDragEnd } = props
const id = useId()
@@ -66,5 +68,3 @@ const DraggableSortable: React.FC<Props> = (props) => {
</DndContext>
)
}
-
-export default DraggableSortable
diff --git a/packages/ui/src/elements/Dropzone/index.tsx b/packages/ui/src/elements/Dropzone/index.tsx
index 38f26208e1f..b5b1f829be5 100644
--- a/packages/ui/src/elements/Dropzone/index.tsx
+++ b/packages/ui/src/elements/Dropzone/index.tsx
@@ -11,7 +11,7 @@ const handleDragOver = (e: DragEvent) => {
const baseClass = 'dropzone'
-type Props = {
+export type Props = {
className?: string
mimeTypes?: string[]
onChange: (e: FileList) => void
diff --git a/packages/ui/src/elements/DuplicateDocument/index.tsx b/packages/ui/src/elements/DuplicateDocument/index.tsx
index 6a8e98a20db..d0bf45fcb58 100644
--- a/packages/ui/src/elements/DuplicateDocument/index.tsx
+++ b/packages/ui/src/elements/DuplicateDocument/index.tsx
@@ -1,12 +1,12 @@
'use client'
+import type { SanitizedCollectionConfig } from 'payload/types'
+
import * as facelessUIImport from '@faceless-ui/modal'
import { getTranslation } from '@payloadcms/translations'
import { useRouter } from 'next/navigation.js'
import React, { useCallback, useState } from 'react'
import { toast } from 'react-toastify'
-import type { Props } from './types.js'
-
// import { requests } from '../../../api'
import { useForm, useFormModified } from '../../forms/Form/context.js'
import { useConfig } from '../../providers/Config/index.js'
@@ -18,7 +18,13 @@ import './index.scss'
const baseClass = 'duplicate'
-const Duplicate: React.FC<Props> = ({ id, slug, singularLabel }) => {
+export type Props = {
+ id: string
+ singularLabel: SanitizedCollectionConfig['labels']['singular']
+ slug: string
+}
+
+export const DuplicateDocument: React.FC<Props> = ({ id, slug, singularLabel }) => {
const { Modal, useModal } = facelessUIImport
const { push } = useRouter()
@@ -47,11 +53,7 @@ const Duplicate: React.FC<Props> = ({ id, slug, singularLabel }) => {
return
}
- const saveDocument = async ({
- id,
- duplicateID = '',
- locale = '',
- }): Promise<null | string> => {
+ const saveDocument = ({ id, duplicateID = '', locale = '' }): Promise<null | string> => {
const data = null
// const response = await requests.get(`${serverURL}${api}/${slug}/${id}`, {
@@ -163,16 +165,15 @@ const Duplicate: React.FC<Props> = ({ id, slug, singularLabel }) => {
modified,
localization,
t,
+ singularLabel,
i18n,
setModified,
toggleModal,
modalSlug,
- serverURL,
- api,
- slug,
id,
push,
admin,
+ slug,
],
)
@@ -208,5 +209,3 @@ const Duplicate: React.FC<Props> = ({ id, slug, singularLabel }) => {
</React.Fragment>
)
}
-
-export default Duplicate
diff --git a/packages/ui/src/elements/DuplicateDocument/types.ts b/packages/ui/src/elements/DuplicateDocument/types.ts
deleted file mode 100644
index 272e6466cfc..00000000000
--- a/packages/ui/src/elements/DuplicateDocument/types.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import type { SanitizedCollectionConfig } from 'payload/types'
-
-export type Props = {
- id: string
- singularLabel: SanitizedCollectionConfig['labels']['singular']
- slug: string
-}
diff --git a/packages/ui/src/elements/ReactSelect/index.tsx b/packages/ui/src/elements/ReactSelect/index.tsx
index 013b4500444..64eff08f991 100644
--- a/packages/ui/src/elements/ReactSelect/index.tsx
+++ b/packages/ui/src/elements/ReactSelect/index.tsx
@@ -12,7 +12,7 @@ import type { Props as ReactSelectAdapterProps } from './types.js'
import { Chevron } from '../../icons/Chevron/index.js'
import { useTranslation } from '../../providers/Translation/index.js'
-import DraggableSortable from '../DraggableSortable/index.js'
+import { DraggableSortable } from '../DraggableSortable/index.js'
import { ClearIndicator } from './ClearIndicator/index.js'
import { Control } from './Control/index.js'
import { MultiValue } from './MultiValue/index.js'
diff --git a/packages/ui/src/fields/Array/index.tsx b/packages/ui/src/fields/Array/index.tsx
index 697744d84e5..96dfc0a713d 100644
--- a/packages/ui/src/fields/Array/index.tsx
+++ b/packages/ui/src/fields/Array/index.tsx
@@ -11,8 +11,8 @@ import type { FormFieldBase } from '../shared.js'
import { Banner } from '../../elements/Banner/index.js'
import { Button } from '../../elements/Button/index.js'
-import DraggableSortableItem from '../../elements/DraggableSortable/DraggableSortableItem/index.js'
-import DraggableSortable from '../../elements/DraggableSortable/index.js'
+import { DraggableSortableItem } from '../../elements/DraggableSortable/DraggableSortableItem/index.js'
+import { DraggableSortable } from '../../elements/DraggableSortable/index.js'
import { ErrorPill } from '../../elements/ErrorPill/index.js'
import { useForm, useFormSubmitted } from '../../forms/Form/context.js'
import { Label as LabelComp } from '../../forms/Label/index.js'
diff --git a/packages/ui/src/fields/Blocks/index.tsx b/packages/ui/src/fields/Blocks/index.tsx
index cef1e060567..4999a22bbef 100644
--- a/packages/ui/src/fields/Blocks/index.tsx
+++ b/packages/ui/src/fields/Blocks/index.tsx
@@ -2,10 +2,10 @@
import { getTranslation } from '@payloadcms/translations'
import React, { Fragment, useCallback } from 'react'
-import Banner from '../../elements/Banner/index.js'
+import { Banner } from '../../elements/Banner/index.js'
import { Button } from '../../elements/Button/index.js'
-import DraggableSortableItem from '../../elements/DraggableSortable/DraggableSortableItem/index.js'
-import DraggableSortable from '../../elements/DraggableSortable/index.js'
+import { DraggableSortableItem } from '../../elements/DraggableSortable/DraggableSortableItem/index.js'
+import { DraggableSortable } from '../../elements/DraggableSortable/index.js'
import { DrawerToggler } from '../../elements/Drawer/index.js'
import { useDrawerSlug } from '../../elements/Drawer/useDrawerSlug.js'
import { ErrorPill } from '../../elements/ErrorPill/index.js'
|
03c8445a6d8d6ded719de44227dbbe928200427f
|
2022-02-08 02:46:49
|
James
|
fix: removes required from versions status field
| false
|
removes required from versions status field
|
fix
|
diff --git a/src/versions/baseFields.ts b/src/versions/baseFields.ts
index 934aafda1f4..25a1c234aee 100644
--- a/src/versions/baseFields.ts
+++ b/src/versions/baseFields.ts
@@ -18,7 +18,6 @@ const baseVersionFields: Field[] = [
type: 'select',
options: statuses,
defaultValue: 'draft',
- required: true,
admin: {
components: {
Field: () => null,
|
55325a081224468ab7b668a87df8fdfc72b1b685
|
2024-02-08 03:34:42
|
Jarrod Flesch
|
chore: dep cleanup
| false
|
dep cleanup
|
chore
|
diff --git a/packages/next/package.json b/packages/next/package.json
index ecab6908044..8ee22c9b8e5 100644
--- a/packages/next/package.json
+++ b/packages/next/package.json
@@ -44,25 +44,20 @@
"devDependencies": {
"@payloadcms/eslint-config": "workspace:*",
"payload": "workspace:*",
- "sass": "^1.70.0",
- "ts-essentials": "7.0.3"
+ "sass": "^1.70.0"
},
"dependencies": {
"@faceless-ui/modal": "2.0.1",
+ "@payloadcms/graphql": "workspace:*",
"@payloadcms/translations": "workspace:^",
"@payloadcms/ui": "workspace:*",
- "@payloadcms/graphql": "workspace:*",
"@types/busboy": "^1.5.3",
"busboy": "^1.6.0",
"deep-equal": "2.2.2",
"graphql": "16.8.1",
"graphql-http": "^1.22.0",
"graphql-playground-html": "1.6.30",
- "graphql-query-complexity": "0.12.0",
- "graphql-scalars": "1.22.2",
- "graphql-type-json": "0.3.2",
"path-to-regexp": "^6.2.1",
- "pluralize": "8.0.0",
"react-diff-viewer-continued": "3.2.6",
"react-toastify": "8.2.0"
},
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index c776ca71cd8..5fb38523b4a 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -543,15 +543,6 @@ importers:
graphql-playground-html:
specifier: 1.6.30
version: 1.6.30
- graphql-query-complexity:
- specifier: 0.12.0
- version: 0.12.0([email protected])
- graphql-scalars:
- specifier: 1.22.2
- version: 1.22.2([email protected])
- graphql-type-json:
- specifier: 0.3.2
- version: 0.3.2([email protected])
http-status:
specifier: 1.6.2
version: 1.6.2
@@ -564,9 +555,6 @@ importers:
path-to-regexp:
specifier: ^6.2.1
version: 6.2.1
- pluralize:
- specifier: 8.0.0
- version: 8.0.0
react-diff-viewer-continued:
specifier: 3.2.6
version: 3.2.6([email protected])([email protected])
@@ -583,9 +571,6 @@ importers:
sass:
specifier: ^1.70.0
version: 1.70.0
- ts-essentials:
- specifier: 7.0.3
- version: 7.0.3([email protected])
packages/payload:
dependencies:
|
1cce3ebce99baf3b27bbfea3a8533c92af4a9562
|
2023-10-05 01:07:53
|
Dan Ribbens
|
chore: fix mongodb transactions
| false
|
fix mongodb transactions
|
chore
|
diff --git a/packages/db-mongodb/src/transactions/beginTransaction.ts b/packages/db-mongodb/src/transactions/beginTransaction.ts
index 4ec3f22eb89..8470452cbaa 100644
--- a/packages/db-mongodb/src/transactions/beginTransaction.ts
+++ b/packages/db-mongodb/src/transactions/beginTransaction.ts
@@ -16,12 +16,13 @@ export const beginTransaction: BeginTransaction = async function beginTransactio
if (transactionsNotAvailable) return id
- if (!this.connection.get('replicaSet')) {
+ const client = this.connection.getClient()
+ if (!client.options.replicaSet) {
transactionsNotAvailable = true
} else {
id = uuid()
if (!this.sessions[id]) {
- this.sessions[id] = await this.connection.getClient().startSession()
+ this.sessions[id] = await client.startSession()
}
if (this.sessions[id].inTransaction()) {
this.payload.logger.warn('beginTransaction called while transaction already exists')
diff --git a/packages/db-mongodb/src/transactions/commitTransaction.ts b/packages/db-mongodb/src/transactions/commitTransaction.ts
index 43869c3d9ff..a461407c8cd 100644
--- a/packages/db-mongodb/src/transactions/commitTransaction.ts
+++ b/packages/db-mongodb/src/transactions/commitTransaction.ts
@@ -1,14 +1,11 @@
import type { CommitTransaction } from 'payload/database'
export const commitTransaction: CommitTransaction = async function commitTransaction(id) {
- if (!this.connection.get('replicaSet')) {
- return
- }
- if (!this.session[id]?.inTransaction()) {
+ if (!this.sessions[id]?.inTransaction()) {
this.payload.logger.warn('commitTransaction called when no transaction exists')
return
}
- await this.session[id].commitTransaction()
- await this.session[id].endSession()
- delete this.session[id]
+ await this.sessions[id].commitTransaction()
+ await this.sessions[id].endSession()
+ delete this.sessions[id]
}
diff --git a/packages/db-mongodb/src/transactions/rollbackTransaction.ts b/packages/db-mongodb/src/transactions/rollbackTransaction.ts
index ec30a865e77..d523f3f81a6 100644
--- a/packages/db-mongodb/src/transactions/rollbackTransaction.ts
+++ b/packages/db-mongodb/src/transactions/rollbackTransaction.ts
@@ -3,11 +3,11 @@ import type { RollbackTransaction } from 'payload/database'
export const rollbackTransaction: RollbackTransaction = async function rollbackTransaction(
id = '',
) {
- if (!this.session[id]?.inTransaction()) {
+ if (!this.sessions[id]?.inTransaction()) {
this.payload.logger.warn('rollbackTransaction called when no transaction exists')
return
}
- await this.session[id].abortTransaction()
- await this.session[id].endSession()
- delete this.session[id]
+ await this.sessions[id].abortTransaction()
+ await this.sessions[id].endSession()
+ delete this.sessions[id]
}
|
030b75952975f50ffcf0ebbeaf934aeecf4d0e8c
|
2024-11-30 02:24:38
|
Alessio Gravili
|
fix(richtext-lexical): ensure lexical doesn't break if used without react installed (#9620)
| false
|
ensure lexical doesn't break if used without react installed (#9620)
|
fix
|
diff --git a/packages/richtext-lexical/src/getDefaultSanitizedEditorConfig.ts b/packages/richtext-lexical/src/getDefaultSanitizedEditorConfig.ts
index 19816b0777d..de8e851b8ee 100644
--- a/packages/richtext-lexical/src/getDefaultSanitizedEditorConfig.ts
+++ b/packages/richtext-lexical/src/getDefaultSanitizedEditorConfig.ts
@@ -1,7 +1,5 @@
import type { SanitizedConfig } from 'payload'
-import { cache } from 'react'
-
import { type SanitizedServerEditorConfig } from './index.js'
import { defaultEditorConfig } from './lexical/config/server/default.js'
import { sanitizeServerEditorConfig } from './lexical/config/server/sanitize.js'
@@ -18,29 +16,27 @@ if (!cachedDefaultSanitizedServerEditorConfig) {
)._payload_lexical_defaultSanitizedServerEditorConfig = null
}
-export const getDefaultSanitizedEditorConfig = cache(
- async (args: {
- config: SanitizedConfig
- parentIsLocalized: boolean
- }): Promise<SanitizedServerEditorConfig> => {
- const { config, parentIsLocalized } = args
-
- if (cachedDefaultSanitizedServerEditorConfig) {
- return await cachedDefaultSanitizedServerEditorConfig
- }
-
- cachedDefaultSanitizedServerEditorConfig = sanitizeServerEditorConfig(
- defaultEditorConfig,
- config,
- parentIsLocalized,
- )
- ;(global as any).payload_lexical_defaultSanitizedServerEditorConfig =
- cachedDefaultSanitizedServerEditorConfig
-
- cachedDefaultSanitizedServerEditorConfig = await cachedDefaultSanitizedServerEditorConfig
- ;(global as any).payload_lexical_defaultSanitizedServerEditorConfig =
- cachedDefaultSanitizedServerEditorConfig
-
- return cachedDefaultSanitizedServerEditorConfig
- },
-)
+export const getDefaultSanitizedEditorConfig = async (args: {
+ config: SanitizedConfig
+ parentIsLocalized: boolean
+}): Promise<SanitizedServerEditorConfig> => {
+ const { config, parentIsLocalized } = args
+
+ if (cachedDefaultSanitizedServerEditorConfig) {
+ return await cachedDefaultSanitizedServerEditorConfig
+ }
+
+ cachedDefaultSanitizedServerEditorConfig = sanitizeServerEditorConfig(
+ defaultEditorConfig,
+ config,
+ parentIsLocalized,
+ )
+ ;(global as any).payload_lexical_defaultSanitizedServerEditorConfig =
+ cachedDefaultSanitizedServerEditorConfig
+
+ cachedDefaultSanitizedServerEditorConfig = await cachedDefaultSanitizedServerEditorConfig
+ ;(global as any).payload_lexical_defaultSanitizedServerEditorConfig =
+ cachedDefaultSanitizedServerEditorConfig
+
+ return cachedDefaultSanitizedServerEditorConfig
+}
|
4ea07940f854896a89b470f48c9a1d05b4bd2738
|
2024-02-09 02:53:11
|
Jarrod Flesch
|
chore: fix APIError import
| false
|
fix APIError import
|
chore
|
diff --git a/packages/next/src/next-fileupload/processMultipart.ts b/packages/next/src/next-fileupload/processMultipart.ts
index f7de23bcb97..d6a539e5ed6 100644
--- a/packages/next/src/next-fileupload/processMultipart.ts
+++ b/packages/next/src/next-fileupload/processMultipart.ts
@@ -6,7 +6,7 @@ import { tempFileHandler, memHandler } from './handlers'
import { processNested } from './processNested'
import { isFunc, debugLog, buildFields, parseFileName } from './utilities'
import { NextFileUploadOptions, NextFileUploadResponse } from '.'
-import APIError from 'payload/dist/errors/APIError'
+import { APIError } from 'payload/errors'
const waitFlushProperty = Symbol('wait flush property symbol')
|
5eea398e4340224db4792147fd3e3bcd4d44317f
|
2021-12-23 00:54:24
|
Dan Ribbens
|
feat: adds restore revisions to collections
| false
|
adds restore revisions to collections
|
feat
|
diff --git a/src/collections/init.ts b/src/collections/init.ts
index 605d822ce0f..5210d1dc821 100644
--- a/src/collections/init.ts
+++ b/src/collections/init.ts
@@ -106,6 +106,7 @@ export default function registerCollections(ctx: Payload): void {
findByID,
findRevisions,
findRevisionByID,
+ restoreRevision,
delete: deleteHandler,
} = ctx.requestHandlers.collections;
@@ -180,7 +181,8 @@ export default function registerCollections(ctx: Payload): void {
.get(findRevisions);
router.route(`/${slug}/revisions/:id`)
- .get(findRevisionByID);
+ .get(findRevisionByID)
+ .post(restoreRevision);
}
router.route(`/${slug}`)
diff --git a/src/collections/operations/findRevisionByID.ts b/src/collections/operations/findRevisionByID.ts
index 8c63b8e1859..754d257cb30 100644
--- a/src/collections/operations/findRevisionByID.ts
+++ b/src/collections/operations/findRevisionByID.ts
@@ -1,8 +1,10 @@
/* eslint-disable no-underscore-dangle */
+import httpStatus from 'http-status';
+import { Payload } from '../../index';
import { PayloadRequest } from '../../express/types';
-import { Collection } from '../config/types';
+import { Collection, CollectionModel } from '../config/types';
import sanitizeInternalFields from '../../utilities/sanitizeInternalFields';
-import { Forbidden, NotFound } from '../../errors';
+import { APIError, Forbidden, NotFound } from '../../errors';
import executeAccess from '../../auth/executeAccess';
import { Where } from '../../types';
import { hasWhereAccessResult } from '../../auth/types';
@@ -19,7 +21,7 @@ export type Arguments = {
depth?: number
}
-async function findRevisionByID<T extends TypeWithRevision<T> = any>(args: Arguments): Promise<T> {
+async function findRevisionByID<T extends TypeWithRevision<T> = any>(this: Payload, args: Arguments): Promise<T> {
const {
depth,
collection: {
@@ -36,7 +38,11 @@ async function findRevisionByID<T extends TypeWithRevision<T> = any>(args: Argum
showHiddenFields,
} = args;
- const RevisionsModel = this.revisions[collectionConfig.slug];
+ if (!id) {
+ throw new APIError('Missing ID of revision.', httpStatus.BAD_REQUEST);
+ }
+
+ const RevisionsModel = (this.revisions[collectionConfig.slug]) as CollectionModel;
// /////////////////////////////////////
// Access
diff --git a/src/collections/operations/findRevisions.ts b/src/collections/operations/findRevisions.ts
index d63aedb15af..554101e4825 100644
--- a/src/collections/operations/findRevisions.ts
+++ b/src/collections/operations/findRevisions.ts
@@ -8,6 +8,7 @@ import flattenWhereConstraints from '../../utilities/flattenWhereConstraints';
import { buildSortParam } from '../../mongoose/buildSortParam';
import { PaginatedDocs } from '../../mongoose/types';
import { TypeWithRevision } from '../../revisions/types';
+import { Payload } from '../../index';
export type Arguments = {
collection: Collection
@@ -21,7 +22,7 @@ export type Arguments = {
showHiddenFields?: boolean
}
-async function findRevisions<T extends TypeWithRevision<T> = any>(args: Arguments): Promise<PaginatedDocs<T>> {
+async function findRevisions<T extends TypeWithRevision<T> = any>(this: Payload, args: Arguments): Promise<PaginatedDocs<T>> {
const {
where,
page,
diff --git a/src/collections/operations/local/findRevisionByID.ts b/src/collections/operations/local/findRevisionByID.ts
new file mode 100644
index 00000000000..5303ae807c2
--- /dev/null
+++ b/src/collections/operations/local/findRevisionByID.ts
@@ -0,0 +1,48 @@
+import { Document } from '../../../types';
+import { PayloadRequest } from '../../../express/types';
+import { TypeWithRevision } from '../../../revisions/types';
+
+export type Options = {
+ collection: string
+ id: string
+ depth?: number
+ locale?: string
+ fallbackLocale?: string
+ user?: Document
+ overrideAccess?: boolean
+ showHiddenFields?: boolean
+ disableErrors?: boolean
+ req?: PayloadRequest
+}
+
+export default async function findRevisionByID<T extends TypeWithRevision<T> = any>(options: Options): Promise<T> {
+ const {
+ collection: collectionSlug,
+ depth,
+ id,
+ locale = this?.config?.localization?.defaultLocale,
+ fallbackLocale = null,
+ overrideAccess = true,
+ disableErrors = false,
+ showHiddenFields,
+ req,
+ } = options;
+
+ const collection = this.collections[collectionSlug];
+
+ return this.operations.collections.findRevisionByID({
+ depth,
+ id,
+ collection,
+ overrideAccess,
+ disableErrors,
+ showHiddenFields,
+ req: {
+ ...req,
+ payloadAPI: 'local',
+ locale,
+ fallbackLocale,
+ payload: this,
+ },
+ });
+}
diff --git a/src/collections/operations/local/findRevisions.ts b/src/collections/operations/local/findRevisions.ts
new file mode 100644
index 00000000000..c01429e3379
--- /dev/null
+++ b/src/collections/operations/local/findRevisions.ts
@@ -0,0 +1,53 @@
+import { Document, Where } from '../../../types';
+import { PaginatedDocs } from '../../../mongoose/types';
+import { TypeWithRevision } from '../../../revisions/types';
+
+export type Options = {
+ collection: string
+ depth?: number
+ page?: number
+ limit?: number
+ locale?: string
+ fallbackLocale?: string
+ user?: Document
+ overrideAccess?: boolean
+ showHiddenFields?: boolean
+ sort?: string
+ where?: Where
+}
+
+export default async function findRevisions<T extends TypeWithRevision<T> = any>(options: Options): Promise<PaginatedDocs<T>> {
+ const {
+ collection: collectionSlug,
+ depth,
+ page,
+ limit,
+ where,
+ locale = this?.config?.localization?.defaultLocale,
+ fallbackLocale = null,
+ user,
+ overrideAccess = true,
+ showHiddenFields,
+ sort,
+ } = options;
+
+ const collection = this.collections[collectionSlug];
+
+ return this.operations.collections.findRevisions({
+ where,
+ page,
+ limit,
+ depth,
+ collection,
+ sort,
+ overrideAccess,
+ showHiddenFields,
+ req: {
+ user,
+ payloadAPI: 'local',
+ locale,
+ fallbackLocale,
+ payload: this,
+ },
+ });
+}
diff --git a/src/collections/operations/local/index.ts b/src/collections/operations/local/index.ts
index a7f16bb919c..2ccb69670c6 100644
--- a/src/collections/operations/local/index.ts
+++ b/src/collections/operations/local/index.ts
@@ -4,6 +4,9 @@ import create from './create';
import update from './update';
import localDelete from './delete';
import auth from '../../../auth/operations/local';
+import findRevisionByID from './findRevisionByID';
+import findRevisions from './findRevisions';
+import restoreRevision from './restoreRevision';
export default {
find,
@@ -12,4 +15,7 @@ export default {
update,
localDelete,
auth,
+ findRevisionByID,
+ findRevisions,
+ restoreRevision,
};
diff --git a/src/collections/operations/local/restoreRevision.ts b/src/collections/operations/local/restoreRevision.ts
new file mode 100644
index 00000000000..6080aae48d5
--- /dev/null
+++ b/src/collections/operations/local/restoreRevision.ts
@@ -0,0 +1,48 @@
+import { Document } from '../../../types';
+import { TypeWithRevision } from '../../../revisions/types';
+
+export type Options = {
+ collection: string
+ id: string
+ data: Record<string, unknown>
+ depth?: number
+ locale?: string
+ fallbackLocale?: string
+ user?: Document
+ overrideAccess?: boolean
+ showHiddenFields?: boolean
+}
+
+export default async function restoreRevision<T extends TypeWithRevision<T> = any>(options: Options): Promise<T> {
+ const {
+ collection: collectionSlug,
+ depth,
+ locale = this?.config?.localization?.defaultLocale,
+ fallbackLocale = null,
+ data,
+ id,
+ user,
+ overrideAccess = true,
+ showHiddenFields,
+ } = options;
+
+ const collection = this.collections[collectionSlug];
+
+ const args = {
+ depth,
+ data,
+ collection,
+ overrideAccess,
+ id,
+ showHiddenFields,
+ req: {
+ user,
+ payloadAPI: 'local',
+ locale,
+ fallbackLocale,
+ payload: this,
+ },
+ };
+
+ return this.operations.collections.restoreRevision(args);
+}
diff --git a/src/collections/operations/restoreRevision.ts b/src/collections/operations/restoreRevision.ts
new file mode 100644
index 00000000000..fd1deb619db
--- /dev/null
+++ b/src/collections/operations/restoreRevision.ts
@@ -0,0 +1,51 @@
+/* eslint-disable no-underscore-dangle */
+import httpStatus from 'http-status';
+import { PayloadRequest } from '../../express/types';
+import { Collection } from '../config/types';
+import { APIError } from '../../errors';
+import { TypeWithRevision } from '../../revisions/types';
+import { Payload } from '../../index';
+
+export type Arguments = {
+ collection: Collection
+ id: string
+ req: PayloadRequest
+ disableErrors?: boolean
+ currentDepth?: number
+ overrideAccess?: boolean
+ showHiddenFields?: boolean
+ depth?: number
+}
+
+async function restoreRevision<T extends TypeWithRevision<T> = any>(this: Payload, args: Arguments): Promise<T> {
+ const {
+ collection,
+ id,
+ // overrideAccess = false,
+ } = args;
+
+ if (!id) {
+ throw new APIError('Missing ID of revision to restore.', httpStatus.BAD_REQUEST);
+ }
+
+ // /////////////////////////////////////
+ // Retrieve revision
+ // /////////////////////////////////////
+
+ const revision = await this.findRevisionByID({
+ ...args,
+ collection: collection.config.slug,
+ });
+
+ const result = await this.update({
+ ...args,
+ id: revision.parent,
+ collection: collection.config.slug,
+ data: revision.revision,
+ locale: args.req.locale,
+ });
+
+ return result;
+}
+
+export default restoreRevision;
diff --git a/src/collections/requestHandlers/restoreRevision.ts b/src/collections/requestHandlers/restoreRevision.ts
new file mode 100644
index 00000000000..71254e62d4c
--- /dev/null
+++ b/src/collections/requestHandlers/restoreRevision.ts
@@ -0,0 +1,29 @@
+import { Response, NextFunction } from 'express';
+import httpStatus from 'http-status';
+import { PayloadRequest } from '../../express/types';
+import { Document } from '../../types';
+import formatSuccessResponse from '../../express/responses/formatSuccess';
+
+export type RestoreResult = {
+ message: string
+ doc: Document
+};
+
+export default async function restoreRevision(req: PayloadRequest, res: Response, next: NextFunction): Promise<Response<RestoreResult> | void> {
+ const options = {
+ req,
+ collection: req.collection,
+ id: req.params.id,
+ depth: req.query.depth,
+ };
+
+ try {
+ const doc = await this.operations.collections.restoreRevision(options);
+ return res.status(httpStatus.OK).json({
+ ...formatSuccessResponse('Restored successfully.', 'message'),
+ doc,
+ });
+ } catch (error) {
+ return next(error);
+ }
+}
diff --git a/src/globals/init.ts b/src/globals/init.ts
index b44f809576d..5b73dd6812b 100644
--- a/src/globals/init.ts
+++ b/src/globals/init.ts
@@ -53,7 +53,8 @@ export default function initGlobals(ctx: Payload): void {
.get(ctx.requestHandlers.globals.findRevisions(global));
router.route(`/globals/${global.slug}/revisions/:id`)
- .get(ctx.requestHandlers.globals.findRevisionByID(global));
+ .get(ctx.requestHandlers.globals.findRevisionByID(global))
+ .post(ctx.requestHandlers.globals.restoreRevision(global));
}
});
diff --git a/src/globals/operations/restoreRevision.ts b/src/globals/operations/restoreRevision.ts
new file mode 100644
index 00000000000..51c5e51aad1
--- /dev/null
+++ b/src/globals/operations/restoreRevision.ts
@@ -0,0 +1,162 @@
+import { Where } from '../../types';
+import { PayloadRequest } from '../../express/types';
+import executeAccess from '../../auth/executeAccess';
+import sanitizeInternalFields from '../../utilities/sanitizeInternalFields';
+import { PaginatedDocs } from '../../mongoose/types';
+import { hasWhereAccessResult } from '../../auth/types';
+import flattenWhereConstraints from '../../utilities/flattenWhereConstraints';
+import { buildSortParam } from '../../mongoose/buildSortParam';
+import { TypeWithRevision } from '../../revisions/types';
+import { SanitizedGlobalConfig } from '../config/types';
+
+export type Arguments = {
+ globalConfig: SanitizedGlobalConfig
+ where?: Where
+ page?: number
+ limit?: number
+ sort?: string
+ depth?: number
+ req?: PayloadRequest
+ overrideAccess?: boolean
+ showHiddenFields?: boolean
+}
+
+// TODO: finish
+
+async function restoreRevision<T extends TypeWithRevision<T> = any>(args: Arguments): Promise<PaginatedDocs<T>> {
+ const {
+ where,
+ page,
+ limit,
+ depth,
+ globalConfig,
+ req,
+ req: {
+ locale,
+ },
+ overrideAccess,
+ showHiddenFields,
+ } = args;
+
+ const RevisionsModel = this.revisions[globalConfig.slug];
+
+ // /////////////////////////////////////
+ // Access
+ // /////////////////////////////////////
+
+ const queryToBuild: { where?: Where} = {};
+ let useEstimatedCount = false;
+
+ if (where) {
+ let and = [];
+
+ if (Array.isArray(where.and)) and = where.and;
+ if (Array.isArray(where.AND)) and = where.AND;
+
+ queryToBuild.where = {
+ ...where,
+ and: [
+ ...and,
+ ],
+ };
+
+ const constraints = flattenWhereConstraints(queryToBuild);
+
+ useEstimatedCount = constraints.some((prop) => Object.keys(prop).some((key) => key === 'near'));
+ }
+
+ if (!overrideAccess) {
+ const accessResults = await executeAccess({ req }, globalConfig.access.readRevisions);
+
+ if (hasWhereAccessResult(accessResults)) {
+ if (!where) {
+ queryToBuild.where = {
+ and: [
+ accessResults,
+ ],
+ };
+ } else {
+ (queryToBuild.where.and as Where[]).push(accessResults);
+ }
+ }
+ }
+
+ const query = await RevisionsModel.buildQuery(queryToBuild, locale);
+
+ // /////////////////////////////////////
+ // Find
+ // /////////////////////////////////////
+
+ const [sortProperty, sortOrder] = buildSortParam(args.sort, true);
+
+ const optionsToExecute = {
+ page: page || 1,
+ limit: limit || 10,
+ sort: {
+ [sortProperty]: sortOrder,
+ },
+ lean: true,
+ leanWithId: true,
+ useEstimatedCount,
+ };
+
+ const paginatedDocs = await RevisionsModel.paginate(query, optionsToExecute);
+
+ // /////////////////////////////////////
+ // afterRead - Fields
+ // /////////////////////////////////////
+
+ let result = {
+ ...paginatedDocs,
+ docs: await Promise.all(paginatedDocs.docs.map(async (data) => ({
+ ...data,
+ revision: await this.performFieldOperations(
+ globalConfig,
+ {
+ depth,
+ data: data.revision,
+ req,
+ id: data.revision.id,
+ hook: 'afterRead',
+ operation: 'read',
+ overrideAccess,
+ flattenLocales: true,
+ showHiddenFields,
+ isRevision: true,
+ },
+ ),
+ }))),
+ };
+
+ // /////////////////////////////////////
+ // afterRead - Collection
+ // /////////////////////////////////////
+
+ result = {
+ ...result,
+ docs: await Promise.all(result.docs.map(async (doc) => {
+ const docRef = doc;
+
+ await globalConfig.hooks.afterRead.reduce(async (priorHook, hook) => {
+ await priorHook;
+
+ docRef.revision = await hook({ req, query, doc: doc.revision }) || doc.revision;
+ }, Promise.resolve());
+
+ return docRef;
+ })),
+ };
+
+ // /////////////////////////////////////
+ // Return results
+ // /////////////////////////////////////
+
+ result = {
+ ...result,
+ docs: result.docs.map((doc) => sanitizeInternalFields<T>(doc)),
+ };
+
+ return result;
+}
+
+export default restoreRevision;
diff --git a/src/globals/requestHandlers/restoreRevision.ts b/src/globals/requestHandlers/restoreRevision.ts
new file mode 100644
index 00000000000..996549a2311
--- /dev/null
+++ b/src/globals/requestHandlers/restoreRevision.ts
@@ -0,0 +1,25 @@
+import { Response, NextFunction } from 'express';
+import { PayloadRequest } from '../../express/types';
+import { Document } from '../../types';
+import { SanitizedGlobalConfig } from '../config/types';
+
+export default function (globalConfig: SanitizedGlobalConfig) {
+ async function handler(req: PayloadRequest, res: Response, next: NextFunction): Promise<Response<Document> | void> {
+ const options = {
+ req,
+ globalConfig,
+ id: req.params.id,
+ depth: req.query.depth,
+ };
+
+ try {
+ const doc = await this.operations.globals.restoreRevision(options);
+ return res.json(doc);
+ } catch (error) {
+ return next(error);
+ }
+ }
+
+ const restoreRevisionHandler = handler.bind(this);
+ return restoreRevisionHandler;
+}
diff --git a/src/index.ts b/src/index.ts
index 5e3f834d7d9..e7a4d427086 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -9,10 +9,11 @@ import {
EmailOptions,
InitOptions,
} from './config/types';
+import { TypeWithRevision } from './revisions/types';
import { PaginatedDocs } from './mongoose/types';
import Logger from './utilities/logger';
-import bindOperations from './init/bindOperations';
+import bindOperations, { Operations } from './init/bindOperations';
import bindRequestHandlers, { RequestHandlers } from './init/bindRequestHandlers';
import loadConfig from './config/load';
import authenticate, { PayloadAuthenticate } from './express/middleware/authenticate';
@@ -45,6 +46,9 @@ import { Options as FindOptions } from './collections/operations/local/find';
import { Options as FindByIDOptions } from './collections/operations/local/findByID';
import { Options as UpdateOptions } from './collections/operations/local/update';
import { Options as DeleteOptions } from './collections/operations/local/delete';
+import { Options as FindRevisionsOptions } from './collections/operations/local/findRevisions';
+import { Options as FindRevisionByIDOptions } from './collections/operations/local/findRevisionByID';
+import { Options as RestoreRevisionOptions } from './collections/operations/local/restoreRevision';
require('isomorphic-fetch');
@@ -94,7 +98,7 @@ export class Payload {
decrypt = decrypt;
- operations: { [key: string]: any };
+ operations: Operations;
errorHandler: ErrorHandler;
@@ -269,6 +273,47 @@ export class Payload {
return deleteOperation<T>(options);
}
+ /**
+ * @description Find revisions with criteria
+ * @param options
+ * @returns revisions satisfying query
+ */
+ findRevisions = async <T extends TypeWithRevision<T> = any>(options: FindRevisionsOptions): Promise<PaginatedDocs<T>> => {
+ let { findRevisions } = localOperations;
+ findRevisions = findRevisions.bind(this);
+ return findRevisions<T>(options);
+ }
+
+ /**
+ * @description Find revision by ID
+ * @param options
+ * @returns revision with specified ID
+ */
+ findRevisionByID = async <T extends TypeWithRevision<T> = any>(options: FindRevisionByIDOptions): Promise<T> => {
+ let { findRevisionByID } = localOperations;
+ findRevisionByID = findRevisionByID.bind(this);
+ return findRevisionByID(options);
+ }
+
+ /**
+ * @description Restore revision by ID
+ * @param options
+ * @returns revision with specified ID
+ */
+ restoreRevision = async <T extends TypeWithRevision<T> = any>(options: RestoreRevisionOptions): Promise<T> => {
+ let { restoreRevision } = localOperations;
+ restoreRevision = restoreRevision.bind(this);
+ return restoreRevision(options);
+ }
+
+ // TODO: globals
+ // findRevisionGlobal
+ // findRevisionByIDGlobal
+ // restoreRevisionGlobal
+ // TODO:
+ // graphql operations & request handlers, where
+ // tests
+
login = async (options): Promise<any> => {
let { login } = localOperations.auth;
login = login.bind(this);
diff --git a/src/init/bindOperations.ts b/src/init/bindOperations.ts
index 1a7fbab2a40..bb938241353 100644
--- a/src/init/bindOperations.ts
+++ b/src/init/bindOperations.ts
@@ -16,18 +16,58 @@ import find from '../collections/operations/find';
import findByID from '../collections/operations/findByID';
import findRevisions from '../collections/operations/findRevisions';
import findRevisionByID from '../collections/operations/findRevisionByID';
+import restoreRevision from '../collections/operations/restoreRevision';
import update from '../collections/operations/update';
import deleteHandler from '../collections/operations/delete';
import findOne from '../globals/operations/findOne';
import findGlobalRevisions from '../globals/operations/findRevisions';
import findGlobalRevisionByID from '../globals/operations/findRevisionByID';
+import restoreGlobalRevision from '../globals/operations/restoreRevision';
import globalUpdate from '../globals/operations/update';
import preferenceUpdate from '../preferences/operations/update';
import preferenceFindOne from '../preferences/operations/findOne';
import preferenceDelete from '../preferences/operations/delete';
+export type Operations = {
+ collections: {
+ create: typeof create
+ find: typeof find
+ findByID: typeof findByID
+ findRevisions: typeof findRevisions
+ findRevisionByID: typeof findRevisionByID
+ restoreRevision: typeof restoreRevision
+ update: typeof update
+ delete: typeof deleteHandler
+ auth: {
+ access: typeof access
+ forgotPassword: typeof forgotPassword
+ init: typeof init
+ login: typeof login
+ logout: typeof logout
+ me: typeof me
+ refresh: typeof refresh
+ registerFirstUser: typeof registerFirstUser
+ resetPassword: typeof resetPassword
+ verifyEmail: typeof verifyEmail
+ unlock: typeof unlock
+ }
+ }
+ globals: {
+ findOne: typeof findOne
+ findRevisions: typeof findGlobalRevisions
+ findRevisionByID: typeof findGlobalRevisionByID
+ restoreRevision: typeof restoreGlobalRevision
+ update: typeof globalUpdate
+ }
+ preferences: {
+ update: typeof preferenceUpdate
+ findOne: typeof preferenceFindOne
+ delete: typeof preferenceDelete
+ }
+}
+
function bindOperations(ctx: Payload): void {
ctx.operations = {
collections: {
@@ -36,6 +76,7 @@ function bindOperations(ctx: Payload): void {
findByID: findByID.bind(ctx),
findRevisions: findRevisions.bind(ctx),
findRevisionByID: findRevisionByID.bind(ctx),
+ restoreRevision: restoreRevision.bind(ctx),
update: update.bind(ctx),
delete: deleteHandler.bind(ctx),
auth: {
@@ -56,6 +97,7 @@ function bindOperations(ctx: Payload): void {
findOne: findOne.bind(ctx),
findRevisions: findGlobalRevisions.bind(ctx),
findRevisionByID: findGlobalRevisionByID.bind(ctx),
+ restoreRevision: restoreGlobalRevision.bind(ctx),
update: globalUpdate.bind(ctx),
},
preferences: {
diff --git a/src/init/bindRequestHandlers.ts b/src/init/bindRequestHandlers.ts
index 3d29f569e8a..f42312adb66 100644
--- a/src/init/bindRequestHandlers.ts
+++ b/src/init/bindRequestHandlers.ts
@@ -15,12 +15,14 @@ import find from '../collections/requestHandlers/find';
import findByID from '../collections/requestHandlers/findByID';
import findRevisions from '../collections/requestHandlers/findRevisions';
import findRevisionByID from '../collections/requestHandlers/findRevisionByID';
+import restoreRevision from '../collections/requestHandlers/restoreRevision';
import update from '../collections/requestHandlers/update';
import deleteHandler from '../collections/requestHandlers/delete';
import findOne from '../globals/requestHandlers/findOne';
import findGlobalRevisions from '../globals/requestHandlers/findRevisions';
import findGlobalRevisionByID from '../globals/requestHandlers/findRevisionByID';
+import restoreGlobalRevision from '../globals/requestHandlers/restoreRevision';
import globalUpdate from '../globals/requestHandlers/update';
import { Payload } from '../index';
import preferenceUpdate from '../preferences/requestHandlers/update';
@@ -34,6 +36,7 @@ export type RequestHandlers = {
findByID: typeof findByID,
findRevisions: typeof findRevisions,
findRevisionByID: typeof findRevisionByID,
+ restoreRevision: typeof restoreRevision,
update: typeof update,
delete: typeof deleteHandler,
auth: {
@@ -55,6 +58,7 @@ export type RequestHandlers = {
update: typeof globalUpdate,
findRevisions: typeof findGlobalRevisions
findRevisionByID: typeof findGlobalRevisionByID
+ restoreRevision: typeof restoreGlobalRevision
},
preferences: {
update: typeof preferenceUpdate,
@@ -71,6 +75,7 @@ function bindRequestHandlers(ctx: Payload): void {
findByID: findByID.bind(ctx),
findRevisions: findRevisions.bind(ctx),
findRevisionByID: findRevisionByID.bind(ctx),
+ restoreRevision: restoreRevision.bind(ctx),
update: update.bind(ctx),
delete: deleteHandler.bind(ctx),
auth: {
@@ -92,6 +97,7 @@ function bindRequestHandlers(ctx: Payload): void {
update: globalUpdate.bind(ctx),
findRevisions: findGlobalRevisions.bind(ctx),
findRevisionByID: findGlobalRevisionByID.bind(ctx),
+ restoreRevision: restoreGlobalRevision.bind(ctx),
},
preferences: {
update: preferenceUpdate.bind(ctx),
diff --git a/src/revisions/tests/rest.spec.ts b/src/revisions/tests/rest.spec.ts
index 97c277c6d6d..f015f1a0b03 100644
--- a/src/revisions/tests/rest.spec.ts
+++ b/src/revisions/tests/rest.spec.ts
@@ -116,4 +116,40 @@ describe('Revisions - REST', () => {
expect(revisions.docs[0].revision.title.es).toStrictEqual(spanishTitle);
});
});
+
+ describe('Restore', () => {
+ it('should allow a revision to be restored', async () => {
+ const title2 = 'Here is an updated post title in EN';
+
+ const updatedPost = await fetch(`${url}/api/localized-posts/${postID}`, {
+ body: JSON.stringify({
+ title: title2,
+ }),
+ headers,
+ method: 'put',
+ }).then((res) => res.json());
+
+ expect(updatedPost.doc.title).toBe(title2);
+
+ const revisions = await fetch(`${url}/api/localized-posts/revisions`, {
+ headers,
+ }).then((res) => res.json());
+
+ revisionID = revisions.docs[0].id;
+
+ const restore = await fetch(`${url}/api/localized-posts/revisions/${revisionID}`, {
+ headers,
+ method: 'post',
+ }).then((res) => res.json());
+
+ expect(restore.message).toBeDefined();
+ expect(restore.doc.title).toBeDefined();
+
+ const restoredPost = await fetch(`${url}/api/localized-posts/${postID}`, {
+ headers,
+ }).then((res) => res.json());
+
+ expect(restoredPost.title).toBe(restore.doc.title);
+ });
+ });
});
|
59bd6abfc3faca2f99ba076c974bd20f4dbfedec
|
2023-10-07 20:54:33
|
Elliot DeNolf
|
chore: stub out basic READMEs for all packages
| false
|
stub out basic READMEs for all packages
|
chore
|
diff --git a/packages/bundler-vite/README.md b/packages/bundler-vite/README.md
new file mode 100644
index 00000000000..e33bc1c936c
--- /dev/null
+++ b/packages/bundler-vite/README.md
@@ -0,0 +1,28 @@
+# Payload Vite Adapter
+
+Official Vite adapter for [Payload](https://payloadcms.com).
+
+- [Main Repository](https://github.com/payloadcms/payload)
+- [Payload Docs](https://payloadcms.com/docs)
+
+## Installation
+
+```bash
+npm install @payloadcms/bundler-vite
+```
+
+## Usage
+
+```ts
+import { buildConfig } from 'payload/config'
+import { viteBundler } from '@payloadcms/bundler-vite'
+
+export default buildConfig({
+ bundler: viteBundler(),
+ // ...rest of config
+})
+
+```
+
+More detailed usage can be found in the [Payload Docs](https://payloadcms.com/docs/configuration/overview).
+
diff --git a/packages/bundler-webpack/README.md b/packages/bundler-webpack/README.md
new file mode 100644
index 00000000000..b7c9bc7c1ef
--- /dev/null
+++ b/packages/bundler-webpack/README.md
@@ -0,0 +1,28 @@
+# Payload Webpack Adapter
+
+Official Webpack adapter for [Payload](https://payloadcms.com).
+
+- [Main Repository](https://github.com/payloadcms/payload)
+- [Payload Docs](https://payloadcms.com/docs)
+
+## Installation
+
+```bash
+npm install @payloadcms/bundler-webpack
+```
+
+## Usage
+
+```ts
+import { buildConfig } from 'payload/config'
+import { webpackBundler } from '@payloadcms/bundler-webpack'
+
+export default buildConfig({
+ bundler: webpackBundler()
+ // ...rest of config
+})
+
+```
+
+More detailed usage can be found in the [Payload Docs](https://payloadcms.com/docs/configuration/overview).
+
diff --git a/packages/db-mongodb/README.md b/packages/db-mongodb/README.md
new file mode 100644
index 00000000000..fcde1fead3b
--- /dev/null
+++ b/packages/db-mongodb/README.md
@@ -0,0 +1,28 @@
+# Payload MongoDB Adapter
+
+Official MongoDB adapter for [Payload](https://payloadcms.com).
+
+- [Main Repository](https://github.com/payloadcms/payload)
+- [Payload Docs](https://payloadcms.com/docs)
+
+## Installation
+
+```bash
+npm install @payloadcms/db-mongodb
+```
+
+## Usage
+
+```ts
+import { buildConfig } from 'payload/config'
+import { mongooseAdapter } from '@payloadcms/db-mongodb'
+
+export default buildConfig({
+ db: mongooseAdapter({}),
+ // ...rest of config
+})
+
+```
+
+More detailed usage can be found in the [Payload Docs](https://payloadcms.com/docs/configuration/overview).
+
diff --git a/packages/db-postgres/README.md b/packages/db-postgres/README.md
new file mode 100644
index 00000000000..31dfe66bfc3
--- /dev/null
+++ b/packages/db-postgres/README.md
@@ -0,0 +1,28 @@
+# Payload Postgres Adapter
+
+Official Postgres adapter for [Payload](https://payloadcms.com).
+
+- [Main Repository](https://github.com/payloadcms/payload)
+- [Payload Docs](https://payloadcms.com/docs)
+
+## Installation
+
+```bash
+npm install @payloadcms/db-postgres
+```
+
+## Usage
+
+```ts
+import { buildConfig } from 'payload/config'
+import { postgresAdapter } from '@payloadcms/db-postgres'
+
+export default buildConfig({
+ db: postgresAdapter({}),
+ // ...rest of config
+})
+
+```
+
+More detailed usage can be found in the [Payload Docs](https://payloadcms.com/docs/configuration/overview).
+
diff --git a/packages/richtext-lexical/README.md b/packages/richtext-lexical/README.md
new file mode 100644
index 00000000000..94eb44718a9
--- /dev/null
+++ b/packages/richtext-lexical/README.md
@@ -0,0 +1,28 @@
+# Payload Lexical Rich Text Editor
+
+Lexical Rich Text Editor for [Payload](https://payloadcms.com).
+
+- [Main Repository](https://github.com/payloadcms/payload)
+- [Payload Docs](https://payloadcms.com/docs)
+
+## Installation
+
+```bash
+npm install @payloadcms/richtext-lexical
+```
+
+## Usage
+
+```ts
+import { buildConfig } from 'payload/config'
+import { lexicalEditor } from '@payloadcms/richtext-lexical'
+
+export default buildConfig({
+ editor: lexicalEditor({})
+ // ...rest of config
+})
+
+```
+
+More detailed usage can be found in the [Payload Docs](https://payloadcms.com/docs/configuration/overview).
+
diff --git a/packages/richtext-slate/README.md b/packages/richtext-slate/README.md
new file mode 100644
index 00000000000..64534528b72
--- /dev/null
+++ b/packages/richtext-slate/README.md
@@ -0,0 +1,28 @@
+# Payload Slate Rich Text Editor
+
+Slate Rich Text Editor for [Payload](https://payloadcms.com).
+
+- [Main Repository](https://github.com/payloadcms/payload)
+- [Payload Docs](https://payloadcms.com/docs)
+
+## Installation
+
+```bash
+npm install @payloadcms/richtext-slate
+```
+
+## Usage
+
+```ts
+import { buildConfig } from 'payload/config'
+import { slateEditor } from '@payloadcms/richtext-slate'
+
+export default buildConfig({
+ editor: slateEditor({})
+ // ...rest of config
+})
+
+```
+
+More detailed usage can be found in the [Payload Docs](https://payloadcms.com/docs/configuration/overview).
+
|
55d9377403a837181abb18bbc6305db59dc8e9a4
|
2024-03-18 22:21:39
|
Jacob Fletcher
|
chore(ui): client-side renders all default fields (#5357)
| false
|
client-side renders all default fields (#5357)
|
chore
|
diff --git a/packages/next/src/views/Account/index.tsx b/packages/next/src/views/Account/index.tsx
index b788000cf09..79e44b2644c 100644
--- a/packages/next/src/views/Account/index.tsx
+++ b/packages/next/src/views/Account/index.tsx
@@ -87,7 +87,7 @@ export const Account: React.FC<AdminViewProps> = async ({ initPageResult, search
req,
})
- const serverSideProps: ServerSideEditViewProps = {
+ const viewComponentProps: ServerSideEditViewProps = {
initPageResult,
routeSegments: [],
searchParams,
@@ -133,7 +133,7 @@ export const Account: React.FC<AdminViewProps> = async ({ initPageResult, search
typeof CustomAccountComponent === 'function' ? CustomAccountComponent : undefined
}
DefaultComponent={EditView}
- componentProps={serverSideProps}
+ componentProps={viewComponentProps}
/>
</FormQueryParamsProvider>
</DocumentInfoProvider>
diff --git a/packages/next/src/views/Dashboard/index.tsx b/packages/next/src/views/Dashboard/index.tsx
index e125d6b0625..a08c4ed3890 100644
--- a/packages/next/src/views/Dashboard/index.tsx
+++ b/packages/next/src/views/Dashboard/index.tsx
@@ -41,7 +41,7 @@ export const Dashboard: React.FC<AdminViewProps> = ({
return acc
}, [])
- const componentProps: DashboardProps = {
+ const viewComponentProps: DashboardProps = {
Link,
config,
permissions,
@@ -57,7 +57,7 @@ export const Dashboard: React.FC<AdminViewProps> = ({
typeof CustomDashboardComponent === 'function' ? CustomDashboardComponent : undefined
}
DefaultComponent={DefaultDashboard}
- componentProps={componentProps}
+ componentProps={viewComponentProps}
/>
</Fragment>
)
diff --git a/packages/next/src/views/Document/index.tsx b/packages/next/src/views/Document/index.tsx
index aeb4bb77a1b..95e162859b7 100644
--- a/packages/next/src/views/Document/index.tsx
+++ b/packages/next/src/views/Document/index.tsx
@@ -214,7 +214,7 @@ export const Document: React.FC<AdminViewProps> = async ({
req,
})
- const serverSideProps: ServerSideEditViewProps = {
+ const viewComponentProps: ServerSideEditViewProps = {
initPageResult,
routeSegments: segments,
searchParams,
@@ -263,7 +263,7 @@ export const Document: React.FC<AdminViewProps> = async ({
<RenderCustomComponent
CustomComponent={ViewOverride || CustomView}
DefaultComponent={DefaultView}
- componentProps={serverSideProps}
+ componentProps={viewComponentProps}
/>
</FormQueryParamsProvider>
</EditDepthProvider>
diff --git a/packages/next/src/views/List/index.tsx b/packages/next/src/views/List/index.tsx
index b9c0c192648..66b926c501f 100644
--- a/packages/next/src/views/List/index.tsx
+++ b/packages/next/src/views/List/index.tsx
@@ -85,7 +85,7 @@ export const ListView: React.FC<AdminViewProps> = async ({ initPageResult, searc
user,
})
- const componentProps: DefaultListViewProps = {
+ const viewComponentProps: DefaultListViewProps = {
collectionSlug,
}
@@ -107,7 +107,7 @@ export const ListView: React.FC<AdminViewProps> = async ({ initPageResult, searc
<RenderCustomComponent
CustomComponent={CustomListView}
DefaultComponent={DefaultListView}
- componentProps={componentProps}
+ componentProps={viewComponentProps}
/>
</TableColumnsProvider>
</ListInfoProvider>
diff --git a/packages/next/src/views/Version/Default/SetStepNav.tsx b/packages/next/src/views/Version/Default/SetStepNav.tsx
index 09fb80ed370..e6513bcf199 100644
--- a/packages/next/src/views/Version/Default/SetStepNav.tsx
+++ b/packages/next/src/views/Version/Default/SetStepNav.tsx
@@ -1,9 +1,5 @@
import type { FieldMap, StepNavItem } from '@payloadcms/ui'
-import type {
- FieldAffectingData,
- SanitizedCollectionConfig,
- SanitizedGlobalConfig,
-} from 'payload/types'
+import type { SanitizedCollectionConfig, SanitizedGlobalConfig } from 'payload/types'
import type React from 'react'
import { getTranslation } from '@payloadcms/translations'
@@ -53,8 +49,8 @@ export const SetStepNav: React.FC<{
const titleField = fieldMap.find((f) => {
const { isFieldAffectingData } = f
const fieldName = 'name' in f ? f.name : undefined
- return isFieldAffectingData && fieldName === useAsTitle
- }) as FieldAffectingData
+ return Boolean(isFieldAffectingData && fieldName === useAsTitle)
+ })
if (titleField && mostRecentDoc[useAsTitle]) {
if (titleField.localized) {
diff --git a/packages/next/src/views/Version/RenderFieldsToDiff/fields/Iterable/index.tsx b/packages/next/src/views/Version/RenderFieldsToDiff/fields/Iterable/index.tsx
index e8df517d379..70356e5aef2 100644
--- a/packages/next/src/views/Version/RenderFieldsToDiff/fields/Iterable/index.tsx
+++ b/packages/next/src/views/Version/RenderFieldsToDiff/fields/Iterable/index.tsx
@@ -28,10 +28,10 @@ const Iterable: React.FC<Props> = ({
return (
<div className={baseClass}>
- {'label' in field && field.label && (
+ {'label' in field.fieldComponentProps && field.fieldComponentProps.label && (
<Label>
{locale && <span className={`${baseClass}__locale-label`}>{locale}</span>}
- {getTranslation(field.label, i18n)}
+ {getTranslation(field.fieldComponentProps.label, i18n)}
</Label>
)}
{maxRows > 0 && (
@@ -42,7 +42,8 @@ const Iterable: React.FC<Props> = ({
let fieldMap: MappedField[] = []
- if (field.type === 'array' && 'fieldMap' in field) fieldMap = field.fieldMap
+ if (field.type === 'array' && 'fieldMap' in field.fieldComponentProps)
+ fieldMap = field.fieldComponentProps.fieldMap
if (field.type === 'blocks') {
fieldMap = [
@@ -54,20 +55,26 @@ const Iterable: React.FC<Props> = ({
]
if (versionRow?.blockType === comparisonRow?.blockType) {
- const matchedBlock = ('blocks' in field &&
- field.blocks?.find((block) => block.slug === versionRow?.blockType)) || {
+ const matchedBlock = ('blocks' in field.fieldComponentProps &&
+ field.fieldComponentProps.blocks?.find(
+ (block) => block.slug === versionRow?.blockType,
+ )) || {
fieldMap: [],
}
fieldMap = [...fieldMap, ...matchedBlock.fieldMap]
} else {
- const matchedVersionBlock = ('blocks' in field &&
- field.blocks?.find((block) => block.slug === versionRow?.blockType)) || {
+ const matchedVersionBlock = ('blocks' in field.fieldComponentProps &&
+ field.fieldComponentProps.blocks?.find(
+ (block) => block.slug === versionRow?.blockType,
+ )) || {
fieldMap: [],
}
- const matchedComparisonBlock = ('blocks' in field &&
- field.blocks?.find((block) => block.slug === comparisonRow?.blockType)) || {
+ const matchedComparisonBlock = ('blocks' in field.fieldComponentProps &&
+ field.fieldComponentProps.blocks?.find(
+ (block) => block.slug === comparisonRow?.blockType,
+ )) || {
fieldMap: [],
}
@@ -102,8 +109,8 @@ const Iterable: React.FC<Props> = ({
<div className={`${baseClass}__no-rows`}>
{i18n.t('version:noRowsFound', {
label:
- 'labels' in field && field.labels?.plural
- ? getTranslation(field.labels?.plural, i18n)
+ 'labels' in field.fieldComponentProps && field.fieldComponentProps.labels?.plural
+ ? getTranslation(field.fieldComponentProps.labels.plural, i18n)
: i18n.t('general:rows'),
})}
</div>
diff --git a/packages/next/src/views/Version/RenderFieldsToDiff/fields/Nested/index.tsx b/packages/next/src/views/Version/RenderFieldsToDiff/fields/Nested/index.tsx
index 57ea43ce74d..92583684307 100644
--- a/packages/next/src/views/Version/RenderFieldsToDiff/fields/Nested/index.tsx
+++ b/packages/next/src/views/Version/RenderFieldsToDiff/fields/Nested/index.tsx
@@ -23,10 +23,10 @@ const Nested: React.FC<Props> = ({
}) => {
return (
<div className={baseClass}>
- {'label' in field && field.label && (
+ {'label' in field.fieldComponentProps && field.fieldComponentProps.label && (
<Label>
{locale && <span className={`${baseClass}__locale-label`}>{locale}</span>}
- {getTranslation(field.label, i18n)}
+ {getTranslation(field.fieldComponentProps.label, i18n)}
</Label>
)}
<div
diff --git a/packages/next/src/views/Version/RenderFieldsToDiff/fields/Relationship/index.tsx b/packages/next/src/views/Version/RenderFieldsToDiff/fields/Relationship/index.tsx
index 065abe3fcbd..ac6fc82940e 100644
--- a/packages/next/src/views/Version/RenderFieldsToDiff/fields/Relationship/index.tsx
+++ b/packages/next/src/views/Version/RenderFieldsToDiff/fields/Relationship/index.tsx
@@ -30,7 +30,8 @@ const generateLabelFromValue = (
let relatedDoc: RelationshipValue
let valueToReturn = '' as any
- const relationTo = 'relationTo' in field ? field.relationTo : undefined
+ const relationTo =
+ 'relationTo' in field.fieldComponentProps ? field.fieldComponentProps.relationTo : undefined
if (value === null || typeof value === 'undefined') {
return String(value)
@@ -96,7 +97,10 @@ const Relationship: React.FC<Props> = ({ comparison, field, i18n, locale, versio
comparisonToRender = generateLabelFromValue(collections, field, locale, comparison)
}
- const label = 'label' in field && typeof field.label !== 'boolean' ? field?.label : ''
+ const label =
+ 'label' in field.fieldComponentProps && typeof field.fieldComponentProps.label !== 'boolean'
+ ? field.fieldComponentProps.label
+ : ''
return (
<div className={baseClass}>
diff --git a/packages/next/src/views/Version/RenderFieldsToDiff/fields/Select/index.tsx b/packages/next/src/views/Version/RenderFieldsToDiff/fields/Select/index.tsx
index ab04419afa3..f764c037768 100644
--- a/packages/next/src/views/Version/RenderFieldsToDiff/fields/Select/index.tsx
+++ b/packages/next/src/views/Version/RenderFieldsToDiff/fields/Select/index.tsx
@@ -1,6 +1,6 @@
import type { I18n } from '@payloadcms/translations'
import type { SelectFieldProps } from 'packages/ui/src/forms/fields/Select/types.js'
-import type { MappedFieldBase } from 'packages/ui/src/utilities/buildComponentMap/types.js'
+import type { MappedField } from 'packages/ui/src/utilities/buildComponentMap/types.js'
import type { OptionObject, SelectField } from 'payload/types'
import { getTranslation } from '@payloadcms/translations'
@@ -48,7 +48,7 @@ const getTranslatedOptions = (
const Select: React.FC<
Omit<Props, 'field'> & {
- field: MappedFieldBase & SelectFieldProps
+ field: MappedField & SelectFieldProps
}
> = ({ comparison, diffMethod, field, i18n, locale, version }) => {
let placeholder = ''
diff --git a/packages/next/src/views/Version/RenderFieldsToDiff/fields/Tabs/index.tsx b/packages/next/src/views/Version/RenderFieldsToDiff/fields/Tabs/index.tsx
index 2be8600b1a6..68ad15fe120 100644
--- a/packages/next/src/views/Version/RenderFieldsToDiff/fields/Tabs/index.tsx
+++ b/packages/next/src/views/Version/RenderFieldsToDiff/fields/Tabs/index.tsx
@@ -1,5 +1,5 @@
import type { TabsFieldProps } from 'packages/ui/src/forms/fields/Tabs/types.js'
-import type { MappedFieldBase } from 'packages/ui/src/utilities/buildComponentMap/types.js'
+import type { MappedField } from 'packages/ui/src/utilities/buildComponentMap/types.js'
import React from 'react'
@@ -12,7 +12,7 @@ const baseClass = 'tabs-diff'
const Tabs: React.FC<
Omit<Props, 'field'> & {
- field: MappedFieldBase & TabsFieldProps
+ field: MappedField & TabsFieldProps
}
> = ({ comparison, diffComponents, field, i18n, locale, locales, permissions, version }) => {
return (
diff --git a/packages/next/src/views/Version/RenderFieldsToDiff/fields/Text/index.tsx b/packages/next/src/views/Version/RenderFieldsToDiff/fields/Text/index.tsx
index f5f6529df1d..2fc22b61f3f 100644
--- a/packages/next/src/views/Version/RenderFieldsToDiff/fields/Text/index.tsx
+++ b/packages/next/src/views/Version/RenderFieldsToDiff/fields/Text/index.tsx
@@ -35,7 +35,8 @@ const Text: React.FC<Props> = ({
<div className={baseClass}>
<Label>
{locale && <span className={`${baseClass}__locale-label`}>{locale}</span>}
- {'label' in field && getTranslation(field?.label || '', i18n)}
+ {'label' in field.fieldComponentProps &&
+ getTranslation(field.fieldComponentProps.label || '', i18n)}
</Label>
<DiffViewer
comparisonToRender={comparisonToRender}
diff --git a/packages/next/src/views/Version/RenderFieldsToDiff/index.tsx b/packages/next/src/views/Version/RenderFieldsToDiff/index.tsx
index 8902489796d..f0efb4ce4ca 100644
--- a/packages/next/src/views/Version/RenderFieldsToDiff/index.tsx
+++ b/packages/next/src/views/Version/RenderFieldsToDiff/index.tsx
@@ -32,19 +32,20 @@ const RenderFieldsToDiff: React.FC<Props> = ({
if (Component) {
if (field.isFieldAffectingData && 'name' in field) {
+ const fieldName = field.name
const valueIsObject = field.type === 'code' || field.type === 'json'
const versionValue = valueIsObject
- ? JSON.stringify(version?.[field.name])
- : version?.[field.name]
+ ? JSON.stringify(version?.[fieldName])
+ : version?.[fieldName]
const comparisonValue = valueIsObject
- ? JSON.stringify(comparison?.[field.name])
- : comparison?.[field.name]
+ ? JSON.stringify(comparison?.[fieldName])
+ : comparison?.[fieldName]
- const hasPermission = fieldPermissions?.[field.name]?.read?.permission
+ const hasPermission = fieldPermissions?.[fieldName]?.read?.permission
- const subFieldPermissions = fieldPermissions?.[field.name]?.fields
+ const subFieldPermissions = fieldPermissions?.[fieldName]?.fields
if (hasPermission === false) return null
@@ -53,7 +54,10 @@ const RenderFieldsToDiff: React.FC<Props> = ({
diffComponents,
diffMethod,
field,
- fieldMap: 'fieldMap' in field ? field.fieldMap : fieldMap,
+ fieldMap:
+ 'fieldMap' in field.fieldComponentProps
+ ? field.fieldComponentProps?.fieldMap
+ : fieldMap,
fieldPermissions: subFieldPermissions,
i18n,
isRichText,
@@ -93,7 +97,7 @@ const RenderFieldsToDiff: React.FC<Props> = ({
)
}
- if (field.type === 'tabs' && 'fieldMap' in field) {
+ if (field.type === 'tabs' && 'fieldMap' in field.fieldComponentProps) {
const Tabs = diffComponents.tabs
return (
@@ -101,7 +105,7 @@ const RenderFieldsToDiff: React.FC<Props> = ({
comparison={comparison}
diffComponents={diffComponents}
field={field}
- fieldMap={field.fieldMap}
+ fieldMap={field.fieldComponentProps.fieldMap}
i18n={i18n}
key={i}
locales={locales}
@@ -111,14 +115,14 @@ const RenderFieldsToDiff: React.FC<Props> = ({
}
// At this point, we are dealing with a `row`, etc
- if ('fieldMap' in field) {
+ if ('fieldMap' in field.fieldComponentProps) {
return (
<Nested
comparison={comparison}
diffComponents={diffComponents}
disableGutter
field={field}
- fieldMap={field.fieldMap}
+ fieldMap={field.fieldComponentProps.fieldMap}
i18n={i18n}
key={i}
locales={locales}
diff --git a/packages/ui/src/elements/RenderCustomComponent/types.ts b/packages/ui/src/elements/RenderCustomComponent/types.ts
index 0102abb2b7f..b5ef14060f7 100644
--- a/packages/ui/src/elements/RenderCustomComponent/types.ts
+++ b/packages/ui/src/elements/RenderCustomComponent/types.ts
@@ -3,5 +3,5 @@ import type React from 'react'
export type Props = {
CustomComponent?: Promise<React.ComponentType<any>> | React.ComponentType<any>
DefaultComponent: Promise<React.ComponentType<any>> | React.ComponentType<any>
- componentProps?: Record<string, unknown>
+ fieldComponentProps?: Record<string, unknown>
}
diff --git a/packages/ui/src/elements/TableColumns/buildColumns.tsx b/packages/ui/src/elements/TableColumns/buildColumns.tsx
index 10bc1c996ba..92429ed62cf 100644
--- a/packages/ui/src/elements/TableColumns/buildColumns.tsx
+++ b/packages/ui/src/elements/TableColumns/buildColumns.tsx
@@ -59,10 +59,12 @@ export const buildColumns = (args: {
const isFirstActiveColumn = activeColumnsIndices[0] === index
+ const name = 'name' in field ? field.name : undefined
+
if (field) {
const column: Column = {
- name: 'name' in field ? field.name : undefined,
- accessor: 'name' in field ? field.name : undefined,
+ name,
+ accessor: name,
active,
cellProps: {
...cellProps?.[index],
@@ -72,7 +74,7 @@ export const buildColumns = (args: {
Cell: field.Cell,
Heading: field.Heading,
},
- label: 'label' in field ? field.label : undefined,
+ label: 'label' in field.fieldComponentProps ? field.fieldComponentProps.label : undefined,
}
acc.push(column)
diff --git a/packages/ui/src/exports/forms.ts b/packages/ui/src/exports/forms.ts
index b9b8909402b..c64dd099c78 100644
--- a/packages/ui/src/exports/forms.ts
+++ b/packages/ui/src/exports/forms.ts
@@ -55,7 +55,7 @@ export { type TextAreaInputProps, TextareaInput } from '../forms/fields/Textarea
export { default as Textarea } from '../forms/fields/Textarea/index.js'
export { UploadInput, type UploadInputProps } from '../forms/fields/Upload/Input.js'
export { default as UploadField } from '../forms/fields/Upload/index.js'
-export { fieldTypes } from '../forms/fields/index.js'
+export { fieldComponents } from '../forms/fields/index.js'
export { fieldBaseClass } from '../forms/fields/shared.js'
export { useField } from '../forms/useField/index.js'
export type { FieldType, Options } from '../forms/useField/types.js'
diff --git a/packages/ui/src/forms/RenderFields/RenderField.tsx b/packages/ui/src/forms/RenderFields/RenderField.tsx
index 3641ec7f20a..a8f3510c5ec 100644
--- a/packages/ui/src/forms/RenderFields/RenderField.tsx
+++ b/packages/ui/src/forms/RenderFields/RenderField.tsx
@@ -1,15 +1,20 @@
'use client'
+import type { FieldTypes } from 'payload/config.js'
import type { FieldPermissions } from 'payload/types'
import React from 'react'
+import type { FieldComponentProps, MappedField } from '../../utilities/buildComponentMap/types.js'
+
+import { useFieldComponents } from '../../providers/FieldComponentsProvider/index.js'
import { useOperation } from '../../providers/OperationProvider/index.js'
import { FieldPropsProvider, useFieldProps } from '../FieldPropsProvider/index.js'
type Props = {
- Field: React.ReactNode
+ CustomField: MappedField['CustomField']
disabled: boolean
+ fieldComponentProps?: FieldComponentProps
name?: string
path: string
permissions?: FieldPermissions
@@ -18,12 +23,15 @@ type Props = {
siblingPermissions: {
[fieldName: string]: FieldPermissions
}
+ type: keyof FieldTypes
}
export const RenderField: React.FC<Props> = ({
name,
- Field,
+ type,
+ CustomField,
disabled,
+ fieldComponentProps,
path: pathFromProps,
permissions,
readOnly: readOnlyFromProps,
@@ -32,6 +40,7 @@ export const RenderField: React.FC<Props> = ({
}) => {
const operation = useOperation()
const { readOnly: readOnlyFromContext } = useFieldProps()
+ const fieldComponents = useFieldComponents()
const path = `${pathFromProps ? `${pathFromProps}.` : ''}${name ? `${name}` : ''}`
const schemaPath = `${schemaPathFromProps ? `${schemaPathFromProps}` : ''}${name ? `.${name}` : ''}`
@@ -53,6 +62,12 @@ export const RenderField: React.FC<Props> = ({
readOnly = true
}
+ const DefaultField = fieldComponents[type]
+
+ if (!CustomField && !DefaultField) {
+ return null
+ }
+
return (
<FieldPropsProvider
path={path}
@@ -61,7 +76,7 @@ export const RenderField: React.FC<Props> = ({
schemaPath={schemaPath}
siblingPermissions={siblingPermissions}
>
- {Field}
+ {CustomField || <DefaultField {...fieldComponentProps} />}
</FieldPropsProvider>
)
}
diff --git a/packages/ui/src/forms/RenderFields/index.tsx b/packages/ui/src/forms/RenderFields/index.tsx
index d0bb185cc1e..c13cfbcd508 100644
--- a/packages/ui/src/forms/RenderFields/index.tsx
+++ b/packages/ui/src/forms/RenderFields/index.tsx
@@ -32,11 +32,11 @@ export const RenderFields: React.FC<Props> = (props) => {
}, [shouldRender, hasRendered])
if (!fieldMap || (Array.isArray(fieldMap) && fieldMap.length === 0)) {
- console.error('No fieldMap provided when calling RenderFields')
+ console.error('No fieldMap provided when calling RenderFields') // eslint-disable-line no-console
}
if (!i18n) {
- console.error('Need to implement i18n when calling RenderFields')
+ console.error('Need to implement i18n when calling RenderFields') // eslint-disable-line no-console
}
if (fieldMap) {
@@ -54,14 +54,21 @@ export const RenderFields: React.FC<Props> = (props) => {
>
{hasRendered &&
fieldMap?.map((f, fieldIndex) => {
- const { Field, disabled, readOnly } = f
+ const {
+ type,
+ CustomField,
+ disabled,
+ fieldComponentProps,
+ fieldComponentProps: { readOnly },
+ } = f
const name = 'name' in f ? f.name : undefined
return (
<RenderField
- Field={Field}
+ CustomField={CustomField}
disabled={disabled}
+ fieldComponentProps={fieldComponentProps}
key={fieldIndex}
name={name}
path={path}
@@ -69,6 +76,7 @@ export const RenderFields: React.FC<Props> = (props) => {
readOnly={readOnly}
schemaPath={schemaPath}
siblingPermissions={permissions}
+ type={type}
/>
)
})}
diff --git a/packages/ui/src/forms/WatchChildErrors/buildPathSegments.ts b/packages/ui/src/forms/WatchChildErrors/buildPathSegments.ts
index ae7933bd03d..5ed599c6054 100644
--- a/packages/ui/src/forms/WatchChildErrors/buildPathSegments.ts
+++ b/packages/ui/src/forms/WatchChildErrors/buildPathSegments.ts
@@ -2,18 +2,20 @@ import type { FieldMap } from '../../utilities/buildComponentMap/types.js'
export const buildPathSegments = (parentPath: string, fieldMap: FieldMap): string[] => {
const pathNames = fieldMap.reduce((acc, subField) => {
- if ('fieldMap' in subField) {
- if (subField.fieldMap && subField.isFieldAffectingData) {
+ if ('fieldMap' in subField.fieldComponentProps) {
+ const fieldMap = subField.fieldComponentProps.fieldMap
+
+ if (fieldMap && subField.isFieldAffectingData) {
// group, block, array
const name = 'name' in subField ? subField.name : 'unnamed'
acc.push(parentPath ? `${parentPath}.${name}.` : `${name}.`)
- } else if (subField.fieldMap) {
+ } else if (fieldMap) {
// rows, collapsibles, unnamed-tab
- acc.push(...buildPathSegments(parentPath, subField.fieldMap))
+ acc.push(...buildPathSegments(parentPath, fieldMap))
} else if (subField.type === 'tabs') {
// tabs
- 'tabs' in subField &&
- subField.tabs?.forEach((tab) => {
+ 'tabs' in subField.fieldComponentProps &&
+ subField.fieldComponentProps?.tabs?.forEach((tab) => {
let tabPath = parentPath
if ('name' in tab) {
tabPath = parentPath ? `${parentPath}.${tab.name}` : tab.name
diff --git a/packages/ui/src/forms/fields/Code/index.tsx b/packages/ui/src/forms/fields/Code/index.tsx
index b8748ca004c..1d47341c22a 100644
--- a/packages/ui/src/forms/fields/Code/index.tsx
+++ b/packages/ui/src/forms/fields/Code/index.tsx
@@ -27,7 +27,9 @@ const Code: React.FC<CodeFieldProps> = (props) => {
Error,
Label: LabelFromProps,
className,
+ editorOptions = {},
label,
+ language = 'javascript',
path: pathFromProps,
readOnly,
required,
@@ -38,9 +40,6 @@ const Code: React.FC<CodeFieldProps> = (props) => {
const Label = LabelFromProps || <LabelComp label={label} required={required} />
- const editorOptions = 'editorOptions' in props ? props.editorOptions : {}
- const language = 'language' in props ? props.language : 'javascript'
-
const memoizedValidate = useCallback(
(value, options) => {
if (typeof validate === 'function') {
diff --git a/packages/ui/src/forms/fields/Collapsible/index.tsx b/packages/ui/src/forms/fields/Collapsible/index.tsx
index 0e07a79e380..8a354092768 100644
--- a/packages/ui/src/forms/fields/Collapsible/index.tsx
+++ b/packages/ui/src/forms/fields/Collapsible/index.tsx
@@ -27,6 +27,7 @@ const CollapsibleField: React.FC<CollapsibleFieldProps> = (props) => {
Label: LabelFromProps,
className,
fieldMap,
+ initCollapsed = false,
label,
path: pathFromProps,
required,
@@ -38,7 +39,6 @@ const CollapsibleField: React.FC<CollapsibleFieldProps> = (props) => {
const path = pathFromProps || pathFromContext
const { i18n } = useTranslation()
- const initCollapsed = 'initCollapsed' in props ? props.initCollapsed : false
const { getPreference, setPreference } = usePreferences()
const { preferencesKey } = useDocumentInfo()
const [collapsedOnMount, setCollapsedOnMount] = useState<boolean>()
diff --git a/packages/ui/src/forms/fields/Relationship/index.tsx b/packages/ui/src/forms/fields/Relationship/index.tsx
index e4b46218933..cf2684ec635 100644
--- a/packages/ui/src/forms/fields/Relationship/index.tsx
+++ b/packages/ui/src/forms/fields/Relationship/index.tsx
@@ -44,6 +44,11 @@ const Relationship: React.FC<RelationshipFieldProps> = (props) => {
style,
validate,
width,
+ relationTo,
+ hasMany,
+ sortOptions,
+ isSortable = true,
+ allowCreate = true,
} = props
const config = useConfig()
@@ -54,12 +59,6 @@ const Relationship: React.FC<RelationshipFieldProps> = (props) => {
serverURL,
} = config
- const relationTo = 'relationTo' in props ? props?.relationTo : undefined
- const hasMany = 'hasMany' in props ? props?.hasMany : undefined
- const sortOptions = 'sortOptions' in props ? props?.sortOptions : undefined
- const isSortable = 'isSortable' in props ? props?.isSortable : true
- const allowCreate = 'allowCreate' in props ? props?.allowCreate : true
-
const { i18n, t } = useTranslation()
const { permissions } = useAuth()
const { code: locale } = useLocale()
diff --git a/packages/ui/src/forms/fields/Select/index.tsx b/packages/ui/src/forms/fields/Select/index.tsx
index dedeb5a89ed..6378791446c 100644
--- a/packages/ui/src/forms/fields/Select/index.tsx
+++ b/packages/ui/src/forms/fields/Select/index.tsx
@@ -44,15 +44,14 @@ export const Select: React.FC<SelectFieldProps> = (props) => {
style,
validate,
width,
+ options: optionsFromProps = [],
+ hasMany = false,
+ isClearable = true,
+ isSortable = true,
} = props
const Label = LabelFromProps || <LabelComp label={label} required={required} />
- const optionsFromProps = 'options' in props ? props.options : []
- const hasMany = 'hasMany' in props ? props.hasMany : false
- const isClearable = 'isClearable' in props ? props.isClearable : true
- const isSortable = 'isSortable' in props ? props.isSortable : true
-
const { i18n } = useTranslation()
const [options] = useState(formatOptions(optionsFromProps))
diff --git a/packages/ui/src/forms/fields/Textarea/index.tsx b/packages/ui/src/forms/fields/Textarea/index.tsx
index 3972e6d0b94..8bd08f68dd9 100644
--- a/packages/ui/src/forms/fields/Textarea/index.tsx
+++ b/packages/ui/src/forms/fields/Textarea/index.tsx
@@ -37,12 +37,11 @@ const Textarea: React.FC<TextareaFieldProps> = (props) => {
style,
validate,
width,
+ rows,
} = props
const Label = LabelFromProps || <LabelComp label={label} required={required} />
- const rows = 'rows' in props ? props.rows : undefined
-
const { i18n } = useTranslation()
const { localization } = useConfig()
diff --git a/packages/ui/src/forms/fields/index.tsx b/packages/ui/src/forms/fields/index.tsx
index 31a0fbb7d66..d23e2350b94 100644
--- a/packages/ui/src/forms/fields/index.tsx
+++ b/packages/ui/src/forms/fields/index.tsx
@@ -25,7 +25,7 @@ import textarea from './Textarea/index.js'
import ui from './UI/index.js'
import upload from './Upload/index.js'
-export const fieldTypes: FieldTypes = {
+export const fieldComponents: FieldTypes = {
array,
blocks,
checkbox,
diff --git a/packages/ui/src/providers/FieldComponentsProvider/index.tsx b/packages/ui/src/providers/FieldComponentsProvider/index.tsx
new file mode 100644
index 00000000000..cf05b1aa92b
--- /dev/null
+++ b/packages/ui/src/providers/FieldComponentsProvider/index.tsx
@@ -0,0 +1,21 @@
+'use client'
+import React, { createContext, useContext } from 'react'
+
+import { fieldComponents } from '../../forms/fields/index.js'
+import { FieldTypes } from 'payload/config.js'
+
+export type IFieldComponentsContext = FieldTypes
+
+const FieldComponentsContext = createContext<IFieldComponentsContext>(fieldComponents)
+
+export const FieldComponentsProvider: React.FC<{
+ children: React.ReactNode
+}> = ({ children }) => {
+ return (
+ <FieldComponentsContext.Provider value={fieldComponents}>
+ {children}
+ </FieldComponentsContext.Provider>
+ )
+}
+
+export const useFieldComponents = (): IFieldComponentsContext => useContext(FieldComponentsContext)
diff --git a/packages/ui/src/providers/Root/index.tsx b/packages/ui/src/providers/Root/index.tsx
index 490ebe6c896..a16d2ea8fca 100644
--- a/packages/ui/src/providers/Root/index.tsx
+++ b/packages/ui/src/providers/Root/index.tsx
@@ -27,6 +27,7 @@ import { RouteCache } from '../RouteCache/index.js'
import { SearchParamsProvider } from '../SearchParams/index.js'
import { ThemeProvider } from '../Theme/index.js'
import { TranslationProvider } from '../Translation/index.js'
+import { FieldComponentsProvider } from '../FieldComponentsProvider/index.js'
type Props = {
children: React.ReactNode
@@ -59,50 +60,52 @@ export const RootProvider: React.FC<Props> = ({
<RouteCache>
<ConfigProvider config={config}>
<ComponentMapProvider componentMap={componentMap}>
- <ClientFunctionProvider>
- <TranslationProvider
- fallbackLang={fallbackLang}
- lang={lang}
- languageOptions={languageOptions}
- translations={translations}
- >
- <WindowInfoProvider
- breakpoints={{
- l: '(max-width: 1440px)',
- m: '(max-width: 1024px)',
- s: '(max-width: 768px)',
- xs: '(max-width: 400px)',
- }}
+ <FieldComponentsProvider>
+ <ClientFunctionProvider>
+ <TranslationProvider
+ fallbackLang={fallbackLang}
+ lang={lang}
+ languageOptions={languageOptions}
+ translations={translations}
>
- <ScrollInfoProvider>
- <SearchParamsProvider>
- <ModalProvider classPrefix="payload" transTime={0} zIndex="var(--z-modal)">
- <AuthProvider>
- <PreferencesProvider>
- <ThemeProvider>
- <ParamsProvider>
- <LocaleProvider>
- <StepNavProvider>
- <LoadingOverlayProvider>
- <DocumentEventsProvider>
- <ActionsProvider>
- <NavProvider>{children}</NavProvider>
- </ActionsProvider>
- </DocumentEventsProvider>
- </LoadingOverlayProvider>
- </StepNavProvider>
- </LocaleProvider>
- </ParamsProvider>
- </ThemeProvider>
- </PreferencesProvider>
- <ModalContainer />
- </AuthProvider>
- </ModalProvider>
- </SearchParamsProvider>
- </ScrollInfoProvider>
- </WindowInfoProvider>
- </TranslationProvider>
- </ClientFunctionProvider>
+ <WindowInfoProvider
+ breakpoints={{
+ l: '(max-width: 1440px)',
+ m: '(max-width: 1024px)',
+ s: '(max-width: 768px)',
+ xs: '(max-width: 400px)',
+ }}
+ >
+ <ScrollInfoProvider>
+ <SearchParamsProvider>
+ <ModalProvider classPrefix="payload" transTime={0} zIndex="var(--z-modal)">
+ <AuthProvider>
+ <PreferencesProvider>
+ <ThemeProvider>
+ <ParamsProvider>
+ <LocaleProvider>
+ <StepNavProvider>
+ <LoadingOverlayProvider>
+ <DocumentEventsProvider>
+ <ActionsProvider>
+ <NavProvider>{children}</NavProvider>
+ </ActionsProvider>
+ </DocumentEventsProvider>
+ </LoadingOverlayProvider>
+ </StepNavProvider>
+ </LocaleProvider>
+ </ParamsProvider>
+ </ThemeProvider>
+ </PreferencesProvider>
+ <ModalContainer />
+ </AuthProvider>
+ </ModalProvider>
+ </SearchParamsProvider>
+ </ScrollInfoProvider>
+ </WindowInfoProvider>
+ </TranslationProvider>
+ </ClientFunctionProvider>
+ </FieldComponentsProvider>
</ComponentMapProvider>
</ConfigProvider>
</RouteCache>
diff --git a/packages/ui/src/utilities/buildComponentMap/mapFields.tsx b/packages/ui/src/utilities/buildComponentMap/mapFields.tsx
index 49ada16c18d..de1b9987b35 100644
--- a/packages/ui/src/utilities/buildComponentMap/mapFields.tsx
+++ b/packages/ui/src/utilities/buildComponentMap/mapFields.tsx
@@ -37,8 +37,7 @@ import { SortColumn } from '../../elements/SortColumn/index.js'
import DefaultError from '../../forms/Error/index.js'
import DefaultDescription from '../../forms/FieldDescription/index.js'
import DefaultLabel from '../../forms/Label/index.js'
-import HiddenInput from '../../forms/fields/HiddenInput/index.js'
-import { fieldTypes } from '../../forms/fields/index.js'
+import { HiddenInput } from '../../index.js'
export const mapFields = (args: {
DefaultCell?: React.FC<any>
@@ -64,13 +63,15 @@ export const mapFields = (args: {
const result: FieldMap = fieldSchema.reduce((acc, field): FieldMap => {
const fieldIsPresentational = fieldIsPresentationalOnly(field)
- let FieldComponent = field.admin?.components?.Field || fieldTypes[field.type]
- let CellComponent = field.admin?.components?.Cell
+ let CustomFieldComponent: React.ComponentType<FieldComponentProps>
+ const CustomCellComponent = field.admin?.components?.Cell
if (fieldIsPresentational || (!field?.hidden && field?.admin?.disabled !== true)) {
if ((filter && typeof filter === 'function' && filter(field)) || !filter) {
if (field.admin && 'hidden' in field.admin && field?.admin?.hidden) {
- FieldComponent = fieldTypes.hidden
+ if (CustomFieldComponent) {
+ CustomFieldComponent = HiddenInput
+ }
}
const isFieldAffectingData = fieldAffectsData(field)
@@ -480,11 +481,11 @@ export const mapFields = (args: {
}
if (RichTextFieldComponent) {
- FieldComponent = RichTextFieldComponent
+ CustomFieldComponent = RichTextFieldComponent
}
if (RichTextCellComponent) {
- CellComponent = RichTextCellComponent
+ cellComponentProps.CellComponentOverride = <RichTextCellComponent />
}
break
@@ -622,11 +623,9 @@ export const mapFields = (args: {
}
}
- const Field = <FieldComponent {...fieldComponentProps} />
-
const Cell = (
<RenderCustomComponent
- CustomComponent={CellComponent}
+ CustomComponent={CustomCellComponent}
DefaultComponent={DefaultCell}
componentProps={cellComponentProps}
/>
@@ -651,11 +650,14 @@ export const mapFields = (args: {
)
const reducedField: MappedField = {
- ...fieldComponentProps,
+ name: 'name' in field ? field.name : undefined,
type: field.type,
Cell,
- Field,
+ CustomField: CustomFieldComponent ? (
+ <CustomFieldComponent {...fieldComponentProps} />
+ ) : null,
Heading,
+ fieldComponentProps,
fieldIsPresentational,
isFieldAffectingData,
isSidebar:
@@ -663,9 +665,7 @@ export const mapFields = (args: {
localized: 'localized' in field ? field.localized : false,
}
- if (FieldComponent) {
- acc.push(reducedField)
- }
+ acc.push(reducedField)
}
}
@@ -677,11 +677,12 @@ export const mapFields = (args: {
if (!disableAddingID && !hasID) {
result.push({
- name: 'id',
type: 'text',
Cell: DefaultCell ? <DefaultCell name="id" /> : null,
- Field: <HiddenInput name="id" />,
Heading: <SortColumn label="ID" name="id" />,
+ fieldComponentProps: {
+ name: 'id',
+ },
fieldIsPresentational: false,
isFieldAffectingData: true,
// label: 'ID',
diff --git a/packages/ui/src/utilities/buildComponentMap/types.ts b/packages/ui/src/utilities/buildComponentMap/types.ts
index b3c23042953..fb5c69ff60f 100644
--- a/packages/ui/src/utilities/buildComponentMap/types.ts
+++ b/packages/ui/src/utilities/buildComponentMap/types.ts
@@ -1,10 +1,6 @@
+import type { FieldTypes } from 'payload/config.js'
import type {
BlockField,
- FieldBase,
- Labels,
- Option,
- RelationshipField,
- RichTextField,
SanitizedCollectionConfig,
SanitizedGlobalConfig,
TabsField,
@@ -28,7 +24,6 @@ import type { TabsFieldProps } from '../../forms/fields/Tabs/types.js'
import type { TextFieldProps } from '../../forms/fields/Text/types.js'
import type { TextareaFieldProps } from '../../forms/fields/Textarea/types.js'
import type { UploadFieldProps } from '../../forms/fields/Upload/types.js'
-import type { fieldTypes } from '../../forms/fields/index.js'
export type MappedTab = {
fieldMap?: FieldMap
@@ -64,20 +59,20 @@ export type FieldComponentProps =
| TextareaFieldProps
| UploadFieldProps
-export type MappedFieldBase = {
+export type MappedField = {
Cell: React.ReactNode
- Field: React.ReactNode
+ CustomField?: React.ReactNode
Heading: React.ReactNode
disabled?: boolean
+ fieldComponentProps: FieldComponentProps
fieldIsPresentational: boolean
isFieldAffectingData: boolean
isSidebar?: boolean
localized: boolean
- type: keyof typeof fieldTypes
+ name?: string
+ type: keyof FieldTypes
}
-export type MappedField = FieldComponentProps & MappedFieldBase
-
export type FieldMap = MappedField[]
export type ActionMap = {
diff --git a/test/_community/collections/Posts/index.ts b/test/_community/collections/Posts/index.ts
index b04fc677cce..e45245c25de 100644
--- a/test/_community/collections/Posts/index.ts
+++ b/test/_community/collections/Posts/index.ts
@@ -18,24 +18,24 @@ export const PostsCollection: CollectionConfig = {
type: 'row',
fields: [],
},
- // {
- // name: 'richText',
- // type: 'richText',
- // },
+ {
+ name: 'richText',
+ type: 'richText',
+ },
{
name: 'relationship',
type: 'relationship',
- filterOptions: ({ id }) => {
- return {
- where: [
- {
- id: {
- not_equals: id,
- },
- },
- ],
- }
- },
+ // filterOptions: ({ id }) => {
+ // return {
+ // where: [
+ // {
+ // id: {
+ // not_equals: id,
+ // },
+ // },
+ // ],
+ // }
+ // },
relationTo: ['posts'],
},
{
diff --git a/tsconfig.json b/tsconfig.json
index fac8d3ef39f..426caf83c11 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -165,4 +165,4 @@
"app/**/*.tsx",
"scripts/**/*.ts"
]
-}
+}
\ No newline at end of file
|
078c28bd5fd08fd17a0b0b360e904f51fe8a2e98
|
2022-11-22 02:54:13
|
Carlo Brualdi
|
fix: versionCount was broken & other i18n improvements (#1450)
| false
|
versionCount was broken & other i18n improvements (#1450)
|
fix
|
diff --git a/src/admin/components/elements/ReactSelect/index.tsx b/src/admin/components/elements/ReactSelect/index.tsx
index 9684b06ba46..d1469f8e9b1 100644
--- a/src/admin/components/elements/ReactSelect/index.tsx
+++ b/src/admin/components/elements/ReactSelect/index.tsx
@@ -51,6 +51,8 @@ const SortableMultiValueLabel = SortableHandle((props) => <components.MultiValue
const SortableSelect = SortableContainer(Select) as React.ComponentClass<SelectProps<Value, true> & SortableContainerProps>;
const ReactSelect: React.FC<Props> = (props) => {
+ const { t, i18n } = useTranslation();
+
const {
className,
showError = false,
@@ -58,7 +60,7 @@ const ReactSelect: React.FC<Props> = (props) => {
onChange,
value,
disabled = false,
- placeholder,
+ placeholder = t('general:selectValue'),
isSearchable = true,
isClearable,
isMulti,
@@ -66,8 +68,6 @@ const ReactSelect: React.FC<Props> = (props) => {
filterOption = undefined,
} = props;
- const { i18n } = useTranslation();
-
const classes = [
className,
'react-select',
diff --git a/src/admin/components/elements/WhereBuilder/Condition/Text/index.tsx b/src/admin/components/elements/WhereBuilder/Condition/Text/index.tsx
index e9df200e42c..313aa3c0e03 100644
--- a/src/admin/components/elements/WhereBuilder/Condition/Text/index.tsx
+++ b/src/admin/components/elements/WhereBuilder/Condition/Text/index.tsx
@@ -1,18 +1,22 @@
import React from 'react';
+import { useTranslation } from 'react-i18next';
import { Props } from './types';
import './index.scss';
const baseClass = 'condition-value-text';
-const Text: React.FC<Props> = ({ onChange, value }) => (
- <input
- placeholder="Enter a value"
- className={baseClass}
- type="text"
- onChange={(e) => onChange(e.target.value)}
- value={value || ''}
- />
-);
+const Text: React.FC<Props> = ({ onChange, value }) => {
+ const { t } = useTranslation('general');
+ return (
+ <input
+ placeholder={t('enterAValue')}
+ className={baseClass}
+ type="text"
+ onChange={(e) => onChange(e.target.value)}
+ value={value || ''}
+ />
+ );
+};
export default Text;
diff --git a/src/admin/components/views/Login/index.tsx b/src/admin/components/views/Login/index.tsx
index ec20548374a..1bf8c9e181b 100644
--- a/src/admin/components/views/Login/index.tsx
+++ b/src/admin/components/views/Login/index.tsx
@@ -111,7 +111,7 @@ const Login: React.FC = () => {
required
/>
<Link to={`${admin}/forgot`}>
- {t('forgotPassword')}
+ {t('forgotPasswordQuestion')}
</Link>
<FormSubmit>{t('login')}</FormSubmit>
</Form>
diff --git a/src/admin/components/views/Versions/index.tsx b/src/admin/components/views/Versions/index.tsx
index 004d1ef26af..eca3f3d7a35 100644
--- a/src/admin/components/views/Versions/index.tsx
+++ b/src/admin/components/views/Versions/index.tsx
@@ -177,7 +177,7 @@ const Versions: React.FC<Props> = ({ collection, global }) => {
<Eyebrow />
<Gutter className={`${baseClass}__wrap`}>
<header className={`${baseClass}__header`}>
- <div className={`${baseClass}__intro`}>Showing versions for:</div>
+ <div className={`${baseClass}__intro`}>{t('showingVersionsFor')}</div>
{useIDLabel && (
<IDLabel id={doc?.id} />
)}
diff --git a/src/translations/en.json b/src/translations/en.json
index 8a57362c4b8..bf8791b917c 100644
--- a/src/translations/en.json
+++ b/src/translations/en.json
@@ -271,6 +271,7 @@
"saveDraft": "Save Draft",
"selectLocales": "Select locales to display",
"selectVersionToCompare": "Select a version to compare",
+ "showingVersionsFor": "Showing versions for:",
"showLocales": "Show locales:",
"status": "Status",
"type": "Type",
@@ -280,6 +281,7 @@
"versionCount_many": "{{count}} versions found",
"versionCount_none": "No versions found",
"versionCount_one": "{{count}} version found",
+ "versionCount_other": "{{count}} versions found",
"versionCreatedOn": "{{version}} created on:",
"versionID": "Version ID",
"versions": "Versions",
diff --git a/src/translations/it.json b/src/translations/it.json
index cccc7cd4728..cfd17be7efb 100644
--- a/src/translations/it.json
+++ b/src/translations/it.json
@@ -4,7 +4,7 @@
"account": "Account",
"accountOfCurrentUser": "Account dell'utente corrente",
"alreadyActivated": "Già Attivato",
- "alreadyLoggedIn": "Già loggato",
+ "alreadyLoggedIn": "Sei già loggato",
"apiKey": "Chiave API",
"backToLogin": "Torna al login",
"beginCreateFirstUser": "Per iniziare, crea il tuo primo utente.",
@@ -18,7 +18,7 @@
"enableAPIKey": "Abilita la Chiave API",
"failedToUnlock": "Lo sblocco è fallito",
"forceUnlock": "Forza Sblocco",
- "forgotPassword": "Password dimenticata",
+ "forgotPassword": "Cambia Password",
"forgotPasswordEmailInstructions": "Inserisci la tua mail qui sotto. Riceverai un messaggio email con le istruzioni su come cambiare la tua password.",
"forgotPasswordQuestion": "Password dimenticata?",
"generate": "Genera",
@@ -60,6 +60,7 @@
"accountAlreadyActivated": "Questo account è già stato attivato.",
"autosaving": "Si è verificato un problema durante il salvataggio automatico di questo documento.",
"correctInvalidFields": "Per favore correggi i campi non validi.",
+ "deletingFile": "Si è verificato un errore durante l'eleminazione del file.",
"deletingTitle": "Si è verificato un errore durante l'eliminazione di {{title}}. Per favore controlla la tua connessione e riprova.",
"emailOrPasswordIncorrect": "L'email o la password fornita non è corretta.",
"followingFieldsInvalid_many": "I seguenti campi non sono validi:",
@@ -127,7 +128,7 @@
"automatic": "Automatico",
"backToDashboard": "Torna alla Dashboard",
"cancel": "Cancella",
- "changesNotSaved": "Le tue modifiche non sono state salvate. Se esci ora, perderai le modifiche.",
+ "changesNotSaved": "Le tue modifiche non sono state salvate. Se esci ora, verranno perse.",
"collections": "Collezioni",
"columnToSort": "Colonna da Ordinare",
"columns": "Colonne",
@@ -139,19 +140,19 @@
"create": "Crea",
"createNew": "Crea Nuovo",
"createNewLabel": "Crea nuovo {{label}}",
- "created": "Data Creazione",
+ "created": "Data di creazione",
"createdAt": "Creato il",
- "creating": "Sto creando",
+ "creating": "Crea nuovo",
"dark": "Scuro",
"dashboard": "Dashboard",
"delete": "Elimina",
"deletedSuccessfully": "Eliminato con successo.",
- "deleting": "Eliminando...",
+ "deleting": "Sto eliminando...",
"descending": "Decrescente",
"duplicate": "Duplica",
"duplicateWithoutSaving": "Duplica senza salvare le modifiche",
"editLabel": "Modifica {{label}}",
- "editing": "Editando",
+ "editing": "Modifica",
"email": "Email",
"emailAddress": "Indirizzo Email",
"enterAValue": "Inserisci un valore",
@@ -160,7 +161,7 @@
"filters": "Filtri",
"globals": "Globali",
"language": "Lingua",
- "lastModified": "Ultima Modifica",
+ "lastModified": "Ultima modifica",
"leaveAnyway": "Esci comunque",
"leaveWithoutSaving": "Esci senza salvare",
"light": "Chiaro",
@@ -171,24 +172,24 @@
"newPassword": "Nuova Password",
"noFiltersSet": "Nessun filtro impostato",
"noLabel": "<No {{label}}>",
- "noResults": "Nessun {{label}} trovato. O non esiste ancora nessun {{label}} oppure nessuno corrisponde ai filtri che hai specificato sopra.",
+ "noResults": "Nessun {{label}} trovato. Non esiste ancora nessun {{label}} oppure nessuno corrisponde ai filtri che hai specificato sopra.",
"noValue": "Nessun valore",
"none": "Nessuno",
"notFound": "Non Trovato",
"nothingFound": "Non è stato trovato nulla",
"of": "di",
- "or": "O",
+ "or": "Oppure",
"order": "Ordine",
"pageNotFound": "Pagina non trovata",
"password": "Password",
- "payloadSettings": "Impostazioni Payload",
+ "payloadSettings": "Impostazioni di Payload",
"perPage": "Per Pagina: {{limit}}",
"remove": "Rimuovi",
"row": "Riga",
"rows": "Righe",
"save": "Salva",
"saving": "Salvo...",
- "searchBy": "Cercato da",
+ "searchBy": "Cerca per {{label}}",
"selectValue": "Seleziona un valore",
"sorryNotFound": "Siamo spiacenti, non c'è nulla che corrisponda alla tua richiesta.",
"sort": "Ordina",
@@ -204,8 +205,8 @@
"untitled": "Senza titolo",
"updatedAt": "Aggiornato il",
"updatedSuccessfully": "Aggiornato con successo.",
- "user": "utente",
- "users": "utenti",
+ "user": "Utente",
+ "users": "Utenti",
"welcome": "Benvenuto"
},
"upload": {
@@ -263,13 +264,14 @@
"publishChanges": "Pubblica modifiche",
"published": "Pubblicato",
"restoreThisVersion": "Ripristina questa versione",
- "restoredSuccessfully": "Restaurato successo.",
+ "restoredSuccessfully": "Ripristinato con successo.",
"restoring": "Ripristino...",
"revertToPublished": "Ritorna alla versione pubblicata",
"reverting": "Ritorno...",
"saveDraft": "Salva Bozza",
"selectLocales": "Seleziona le lingue da visualizzare",
"selectVersionToCompare": "Seleziona una versione da confrontare",
+ "showingVersionsFor": "Mostra le versioni per:",
"showLocales": "Mostra localizzazioni:",
"status": "Stato",
"type": "Tipo",
@@ -279,6 +281,7 @@
"versionCount_many": "{{count}} versioni trovate",
"versionCount_none": "Nessuna versione trovata",
"versionCount_one": "{{count}} versione trovata",
+ "versionCount_other": "{{count}} versioni trovate",
"versionCreatedOn": "{{version}} creata il:",
"versionID": "ID Versione",
"versions": "Versioni",
diff --git a/src/translations/translation-schema.json b/src/translations/translation-schema.json
index 00cc7488e84..4e207ae7ba6 100644
--- a/src/translations/translation-schema.json
+++ b/src/translations/translation-schema.json
@@ -1056,6 +1056,9 @@
"selectVersionToCompare": {
"type": "string"
},
+ "showingVersionsFor": {
+ "type": "string"
+ },
"showLocales": {
"type": "string"
},
@@ -1077,6 +1080,9 @@
"versionCount_many": {
"type": "string"
},
+ "versionCount_other": {
+ "type": "string"
+ },
"versionCount_none": {
"type": "string"
},
@@ -1136,6 +1142,7 @@
"saveDraft",
"selectLocales",
"selectVersionToCompare",
+ "showingVersionsFor",
"showLocales",
"status",
"type",
@@ -1143,6 +1150,7 @@
"unpublishing",
"version",
"versionCount_many",
+ "versionCount_other",
"versionCount_none",
"versionCount_one",
"versionCreatedOn",
|
2628249a5114a3aa6fafcfbf012528fb881eade2
|
2024-04-16 00:28:57
|
Jacob Fletcher
|
fix(next): removes links to hidden entities (#5861)
| false
|
removes links to hidden entities (#5861)
|
fix
|
diff --git a/packages/next/src/views/API/index.client.tsx b/packages/next/src/views/API/index.client.tsx
index 6cf91c1c157..4578bddcebf 100644
--- a/packages/next/src/views/API/index.client.tsx
+++ b/packages/next/src/views/API/index.client.tsx
@@ -18,7 +18,7 @@ import qs from 'qs'
import * as React from 'react'
import { toast } from 'react-toastify'
-import { SetStepNav } from '../Edit/Default/SetStepNav/index.js'
+import { SetDocumentStepNav } from '../Edit/Default/SetDocumentStepNav/index.js'
import { RenderJSON } from './RenderJSON/index.js'
import './index.scss'
@@ -113,7 +113,7 @@ export const APIViewClient: React.FC = () => {
className={[baseClass, fullscreen && `${baseClass}--fullscreen`].filter(Boolean).join(' ')}
right={false}
>
- <SetStepNav
+ <SetDocumentStepNav
collectionSlug={collectionSlug}
globalLabel={globalConfig?.label}
globalSlug={globalSlug}
diff --git a/packages/next/src/views/Edit/Default/SetStepNav/index.tsx b/packages/next/src/views/Edit/Default/SetDocumentStepNav/index.tsx
similarity index 80%
rename from packages/next/src/views/Edit/Default/SetStepNav/index.tsx
rename to packages/next/src/views/Edit/Default/SetDocumentStepNav/index.tsx
index 107b9fa4e84..ed00d67dfb6 100644
--- a/packages/next/src/views/Edit/Default/SetStepNav/index.tsx
+++ b/packages/next/src/views/Edit/Default/SetDocumentStepNav/index.tsx
@@ -7,10 +7,11 @@ import { useStepNav } from '@payloadcms/ui/elements/StepNav'
import { useConfig } from '@payloadcms/ui/providers/Config'
import { useDocumentInfo } from '@payloadcms/ui/providers/DocumentInfo'
import { useEditDepth } from '@payloadcms/ui/providers/EditDepth'
+import { useEntityVisibility } from '@payloadcms/ui/providers/EntityVisibility'
import { useTranslation } from '@payloadcms/ui/providers/Translation'
import { useEffect } from 'react'
-export const SetStepNav: React.FC<{
+export const SetDocumentStepNav: React.FC<{
collectionSlug?: SanitizedCollectionConfig['slug']
globalLabel?: SanitizedGlobalConfig['label']
globalSlug?: SanitizedGlobalConfig['slug']
@@ -24,6 +25,8 @@ export const SetStepNav: React.FC<{
const view: string | undefined = props?.view || undefined
const { isEditing, title } = useDocumentInfo()
+ const { isEntityVisible } = useEntityVisibility()
+ const isVisible = isEntityVisible({ collectionSlug, globalSlug })
const { setStepNav } = useStepNav()
@@ -41,13 +44,13 @@ export const SetStepNav: React.FC<{
if (collectionSlug) {
nav.push({
label: getTranslation(pluralLabel, i18n),
- url: `${admin}/collections/${collectionSlug}`,
+ url: isVisible ? `${admin}/collections/${collectionSlug}` : undefined,
})
if (isEditing) {
nav.push({
label: (useAsTitle && useAsTitle !== 'id' && title) || `${id}`,
- url: `${admin}/collections/${collectionSlug}/${id}`,
+ url: isVisible ? `${admin}/collections/${collectionSlug}/${id}` : undefined,
})
} else {
nav.push({
@@ -57,7 +60,7 @@ export const SetStepNav: React.FC<{
} else if (globalSlug) {
nav.push({
label: title,
- url: `${admin}/globals/${globalSlug}`,
+ url: isVisible ? `${admin}/globals/${globalSlug}` : undefined,
})
}
@@ -82,6 +85,7 @@ export const SetStepNav: React.FC<{
globalSlug,
view,
drawerDepth,
+ isVisible,
])
return null
diff --git a/packages/next/src/views/Edit/Default/index.tsx b/packages/next/src/views/Edit/Default/index.tsx
index 081b5c14599..4bb5ada620c 100644
--- a/packages/next/src/views/Edit/Default/index.tsx
+++ b/packages/next/src/views/Edit/Default/index.tsx
@@ -22,8 +22,8 @@ import React, { Fragment, useCallback } from 'react'
import { LeaveWithoutSaving } from '../../../elements/LeaveWithoutSaving/index.js'
// import { getTranslation } from '@payloadcms/translations'
import { Auth } from './Auth/index.js'
+import { SetDocumentStepNav } from './SetDocumentStepNav/index.js'
import { SetDocumentTitle } from './SetDocumentTitle/index.js'
-import { SetStepNav } from './SetStepNav/index.js'
import './index.scss'
const baseClass = 'collection-edit'
@@ -202,7 +202,7 @@ export const DefaultEditView: React.FC = () => {
/>
{BeforeDocument}
{preventLeaveWithoutSaving && <LeaveWithoutSaving />}
- <SetStepNav
+ <SetDocumentStepNav
collectionSlug={collectionConfig?.slug}
globalSlug={globalConfig?.slug}
id={id}
diff --git a/packages/next/src/views/LivePreview/index.client.tsx b/packages/next/src/views/LivePreview/index.client.tsx
index dce6ef72e5e..7aa4a878abb 100644
--- a/packages/next/src/views/LivePreview/index.client.tsx
+++ b/packages/next/src/views/LivePreview/index.client.tsx
@@ -18,8 +18,8 @@ import { getFormState } from '@payloadcms/ui/utilities/getFormState'
import React, { Fragment, useCallback } from 'react'
import { LeaveWithoutSaving } from '../../elements/LeaveWithoutSaving/index.js'
+import { SetDocumentStepNav } from '../Edit/Default/SetDocumentStepNav/index.js'
import { SetDocumentTitle } from '../Edit/Default/SetDocumentTitle/index.js'
-import { SetStepNav } from '../Edit/Default/SetStepNav/index.js'
import { useLivePreviewContext } from './Context/context.js'
import { LivePreviewProvider } from './Context/index.js'
import { LivePreview } from './Preview/index.js'
@@ -140,7 +140,7 @@ const PreviewView: React.FC<Props> = ({
(globalConfig &&
!(globalConfig.versions?.drafts && globalConfig.versions?.drafts?.autosave))) &&
!disableLeaveWithoutSaving && <LeaveWithoutSaving />}
- <SetStepNav
+ <SetDocumentStepNav
collectionSlug={collectionSlug}
globalLabel={globalConfig?.label}
globalSlug={globalSlug}
diff --git a/packages/next/src/views/Versions/index.tsx b/packages/next/src/views/Versions/index.tsx
index e3392c8383f..794cf3a6554 100644
--- a/packages/next/src/views/Versions/index.tsx
+++ b/packages/next/src/views/Versions/index.tsx
@@ -7,7 +7,7 @@ import { notFound } from 'next/navigation.js'
import { isNumber } from 'payload/utilities'
import React from 'react'
-import { SetStepNav } from '../Edit/Default/SetStepNav/index.js'
+import { SetDocumentStepNav } from '../Edit/Default/SetDocumentStepNav/index.js'
import { buildVersionColumns } from './buildColumns.js'
import { VersionsViewClient } from './index.client.js'
import './index.scss'
@@ -100,7 +100,7 @@ export const VersionsView: EditViewComponent = async (props) => {
return (
<React.Fragment>
- <SetStepNav
+ <SetDocumentStepNav
collectionSlug={collectionConfig?.slug}
globalSlug={globalConfig?.slug}
id={id}
|
023719d77554a70493d779ba94bf55058d4caf98
|
2023-04-19 00:58:42
|
Teun Mooij
|
feat: configuration extension points
| false
|
configuration extension points
|
feat
|
diff --git a/docs/configuration/collections.mdx b/docs/configuration/collections.mdx
index 68e28e14a99..b1aef90d2c0 100644
--- a/docs/configuration/collections.mdx
+++ b/docs/configuration/collections.mdx
@@ -27,8 +27,9 @@ It's often best practice to write your Collections in separate files and then im
| **`endpoints`** | Add custom routes to the REST API. [More](/docs/rest-api/overview#custom-endpoints) |
| **`graphQL`** | An object with `singularName` and `pluralName` strings used in schema generation. Auto-generated from slug if not defined. |
| **`typescript`** | An object with property `interface` as the text used in schema generation. Auto-generated from slug if not defined. |
-| **`defaultSort`** | Pass a top-level field to sort by default in the collection List view. Prefix the name of the field with a minus symbol ("-") to sort in descending order. |
-| **`pagination`** | Set pagination-specific options for this collection. [More](#pagination) |
+| **`defaultSort`** | Pass a top-level field to sort by default in the collection List view. Prefix the name of the field with a minus symbol ("-") to sort in descending order. |
+| **`pagination`** | Set pagination-specific options for this collection. [More](#pagination) |
+| **`custom`** | Extension point for adding custom data (e.g. for plugins) |
*\* An asterisk denotes that a property is required.*
diff --git a/docs/configuration/globals.mdx b/docs/configuration/globals.mdx
index 88c3d902bb8..fe14da72950 100644
--- a/docs/configuration/globals.mdx
+++ b/docs/configuration/globals.mdx
@@ -25,6 +25,7 @@ As with Collection configs, it's often best practice to write your Globals in se
| **`endpoints`** | Add custom routes to the REST API. [More](/docs/rest-api/overview#custom-endpoints) |
| **`graphQL.name`** | Text used in schema generation. Auto-generated from slug if not defined. |
| **`typescript`** | An object with property `interface` as the text used in schema generation. Auto-generated from slug if not defined. |
+| **`custom`** | Extension point for adding custom data (e.g. for plugins) |
_\* An asterisk denotes that a property is required._
diff --git a/docs/configuration/overview.mdx b/docs/configuration/overview.mdx
index 71896bb313c..0c7db48dcaf 100644
--- a/docs/configuration/overview.mdx
+++ b/docs/configuration/overview.mdx
@@ -43,6 +43,7 @@ Payload is a _config-based_, code-first CMS and application framework. The Paylo
| `hooks` | Tap into Payload-wide hooks. [More](/docs/hooks/overview) |
| `plugins` | An array of Payload plugins. [More](/docs/plugins/overview) |
| `endpoints` | An array of custom API endpoints added to the Payload router. [More](/docs/rest-api/overview#custom-endpoints) |
+| `custom` | Extension point for adding custom data (e.g. for plugins) |
#### Simple example
diff --git a/docs/fields/array.mdx b/docs/fields/array.mdx
index d42a61a33eb..b17c957edd5 100644
--- a/docs/fields/array.mdx
+++ b/docs/fields/array.mdx
@@ -35,7 +35,8 @@ keywords: array, fields, config, configuration, documentation, Content Managemen
| **`localized`** | Enable localization for this field. Requires [localization to be enabled](/docs/configuration/localization) in the Base config. If enabled, a separate, localized set of all data within this Array will be kept, so there is no need to specify each nested field as `localized`. |
| **`required`** | Require this field to have a value. |
| **`labels`** | Customize the row labels appearing in the Admin dashboard. |
-| **`admin`** | Admin-specific configuration. See below for [more detail](#admin-config). |
+| **`admin`** | Admin-specific configuration. See below for [more detail](#admin-config). |
+| **`custom`** | Extension point for adding custom data (e.g. for plugins) |
*\* An asterisk denotes that a property is required.*
diff --git a/docs/fields/blocks.mdx b/docs/fields/blocks.mdx
index 1b10b4a32f3..7103e57dce3 100644
--- a/docs/fields/blocks.mdx
+++ b/docs/fields/blocks.mdx
@@ -37,6 +37,7 @@ keywords: blocks, fields, config, configuration, documentation, Content Manageme
| **`unique`** | Enforce that each entry in the Collection has a unique value for this field. |
| **`labels`** | Customize the block row labels appearing in the Admin dashboard. |
| **`admin`** | Admin-specific configuration. See below for [more detail](#admin-config). |
+| **`custom`** | Extension point for adding custom data (e.g. for plugins) |
*\* An asterisk denotes that a property is required.*
diff --git a/docs/fields/checkbox.mdx b/docs/fields/checkbox.mdx
index 34baa7b5fb5..54f725f23de 100644
--- a/docs/fields/checkbox.mdx
+++ b/docs/fields/checkbox.mdx
@@ -26,6 +26,7 @@ keywords: checkbox, fields, config, configuration, documentation, Content Manage
| **`localized`** | Enable localization for this field. Requires [localization to be enabled](/docs/configuration/localization) in the Base config. |
| **`required`** | Require this field to have a value. |
| **`admin`** | Admin-specific configuration. See the [default field admin config](/docs/fields/overview#admin-config) for more details. |
+| **`custom`** | Extension point for adding custom data (e.g. for plugins) |
*\* An asterisk denotes that a property is required.*
diff --git a/docs/fields/code.mdx b/docs/fields/code.mdx
index 5766f87f48c..e70010f1490 100644
--- a/docs/fields/code.mdx
+++ b/docs/fields/code.mdx
@@ -32,6 +32,7 @@ This field uses the `monaco-react` editor syntax highlighting.
| **`localized`** | Enable localization for this field. Requires [localization to be enabled](/docs/configuration/localization) in the Base config. |
| **`required`** | Require this field to have a value. |
| **`admin`** | Admin-specific configuration. See below for [more detail](#admin-config). |
+| **`custom`** | Extension point for adding custom data (e.g. for plugins) |
_\* An asterisk denotes that a property is required._
diff --git a/docs/fields/collapsible.mdx b/docs/fields/collapsible.mdx
index e8ab1707c0f..8a6a4c80852 100644
--- a/docs/fields/collapsible.mdx
+++ b/docs/fields/collapsible.mdx
@@ -17,6 +17,7 @@ keywords: row, fields, config, configuration, documentation, Content Management
| **`label`** * | A label to render within the header of the collapsible component. This can be a string, function or react component. Function/components receive `({ data, path })` as args. |
| **`fields`** * | Array of field types to nest within this Collapsible. |
| **`admin`** | Admin-specific configuration. See below for [more detail](#admin-config). |
+| **`custom`** | Extension point for adding custom data (e.g. for plugins) |
*\* An asterisk denotes that a property is required.*
diff --git a/docs/fields/date.mdx b/docs/fields/date.mdx
index f0d1c3ecb00..6e358fb395b 100644
--- a/docs/fields/date.mdx
+++ b/docs/fields/date.mdx
@@ -29,6 +29,7 @@ This field uses [`react-datepicker`](https://www.npmjs.com/package/react-datepic
| **`localized`** | Enable localization for this field. Requires [localization to be enabled](/docs/configuration/localization) in the Base config. |
| **`required`** | Require this field to have a value. |
| **`admin`** | Admin-specific configuration. See below for [more detail](#admin-config). |
+| **`custom`** | Extension point for adding custom data (e.g. for plugins) |
_\* An asterisk denotes that a property is required._
diff --git a/docs/fields/email.mdx b/docs/fields/email.mdx
index 2ccb458e31c..9e5a305b3a3 100644
--- a/docs/fields/email.mdx
+++ b/docs/fields/email.mdx
@@ -27,6 +27,7 @@ keywords: email, fields, config, configuration, documentation, Content Managemen
| **`localized`** | Enable localization for this field. Requires [localization to be enabled](/docs/configuration/localization) in the Base config. |
| **`required`** | Require this field to have a value. |
| **`admin`** | Admin-specific configuration. See below for [more detail](#admin-config). |
+| **`custom`** | Extension point for adding custom data (e.g. for plugins) |
*\* An asterisk denotes that a property is required.*
diff --git a/docs/fields/group.mdx b/docs/fields/group.mdx
index 86015433d60..a7dc8f32040 100644
--- a/docs/fields/group.mdx
+++ b/docs/fields/group.mdx
@@ -25,6 +25,7 @@ keywords: group, fields, config, configuration, documentation, Content Managemen
| **`defaultValue`** | Provide an object of data to be used for this field's default value. [More](/docs/fields/overview#default-values) |
| **`localized`** | Enable localization for this field. Requires [localization to be enabled](/docs/configuration/localization) in the Base config. If enabled, a separate, localized set of all data within this Group will be kept, so there is no need to specify each nested field as `localized`. |
| **`admin`** | Admin-specific configuration. See below for [more detail](#admin-config). |
+| **`custom`** | Extension point for adding custom data (e.g. for plugins) |
*\* An asterisk denotes that a property is required.*
diff --git a/docs/fields/json.mdx b/docs/fields/json.mdx
index a35b0c81ec4..89a7ace771a 100644
--- a/docs/fields/json.mdx
+++ b/docs/fields/json.mdx
@@ -30,6 +30,7 @@ This field uses the `monaco-react` editor syntax highlighting.
| **`localized`** | Enable localization for this field. Requires [localization to be enabled](/docs/configuration/localization) in the Base config. |
| **`required`** | Require this field to have a value. |
| **`admin`** | Admin-specific configuration. See below for [more detail](#admin-config). |
+| **`custom`** | Extension point for adding custom data (e.g. for plugins) |
_\* An asterisk denotes that a property is required._
diff --git a/docs/fields/number.mdx b/docs/fields/number.mdx
index d8b91bcb159..c18c685acd8 100644
--- a/docs/fields/number.mdx
+++ b/docs/fields/number.mdx
@@ -29,6 +29,7 @@ keywords: number, fields, config, configuration, documentation, Content Manageme
| **`localized`** | Enable localization for this field. Requires [localization to be enabled](/docs/configuration/localization) in the Base config. |
| **`required`** | Require this field to have a value. |
| **`admin`** | Admin-specific configuration. See below for [more detail](#admin-config). |
+| **`custom`** | Extension point for adding custom data (e.g. for plugins) |
*\* An asterisk denotes that a property is required.*
diff --git a/docs/fields/point.mdx b/docs/fields/point.mdx
index 568b932364b..ebd45959682 100644
--- a/docs/fields/point.mdx
+++ b/docs/fields/point.mdx
@@ -30,6 +30,7 @@ The data structure in the database matches the GeoJSON structure to represent po
| **`localized`** | Enable localization for this field. Requires [localization to be enabled](/docs/configuration/localization) in the Base config. |
| **`required`** | Require this field to have a value. |
| **`admin`** | Admin-specific configuration. See below for [more detail](#admin-config). |
+| **`custom`** | Extension point for adding custom data (e.g. for plugins) |
*\* An asterisk denotes that a property is required.*
diff --git a/docs/fields/radio.mdx b/docs/fields/radio.mdx
index 0255962fbe0..664582dd22e 100644
--- a/docs/fields/radio.mdx
+++ b/docs/fields/radio.mdx
@@ -27,6 +27,7 @@ keywords: radio, fields, config, configuration, documentation, Content Managemen
| **`localized`** | Enable localization for this field. Requires [localization to be enabled](/docs/configuration/localization) in the Base config. |
| **`required`** | Require this field to have a value. |
| **`admin`** | Admin-specific configuration. See below for [more detail](#admin-config). |
+| **`custom`** | Extension point for adding custom data (e.g. for plugins) |
*\* An asterisk denotes that a property is required.*
diff --git a/docs/fields/relationship.mdx b/docs/fields/relationship.mdx
index a0c1ed1d04d..bb64160bc4a 100644
--- a/docs/fields/relationship.mdx
+++ b/docs/fields/relationship.mdx
@@ -26,7 +26,7 @@ keywords: relationship, fields, config, configuration, documentation, Content Ma
| **`filterOptions`** | A query to filter which options appear in the UI and validate against. [More](#filtering-relationship-options). |
| **`hasMany`** | Boolean when, if set to `true`, allows this field to have many relations instead of only one. |
| **`min`** | A number for the fewest allowed items during validation when a value is present. Used with `hasMany`. |
-| **`max`** | A number for the most allowed items during validation when a value is present. Used with `hasMany`. |
+| **`max`** | A number for the most allowed items during validation when a value is present. Used with `hasMany`. |
| **`maxDepth`** | Sets a number limit on iterations of related documents to populate when queried. [Depth](/docs/getting-started/concepts#depth) |
| **`label`** | Text used as a field label in the Admin panel or an object with keys for each language. |
| **`unique`** | Enforce that each entry in the Collection has a unique value for this field. |
@@ -40,6 +40,7 @@ keywords: relationship, fields, config, configuration, documentation, Content Ma
| **`localized`** | Enable localization for this field. Requires [localization to be enabled](/docs/configuration/localization) in the Base config. |
| **`required`** | Require this field to have a value. |
| **`admin`** | Admin-specific configuration. See the [default field admin config](/docs/fields/overview#admin-config) for more details. |
+| **`custom`** | Extension point for adding custom data (e.g. for plugins) |
_\* An asterisk denotes that a property is required._
diff --git a/docs/fields/rich-text.mdx b/docs/fields/rich-text.mdx
index ecfd31f8aee..338981a5254 100644
--- a/docs/fields/rich-text.mdx
+++ b/docs/fields/rich-text.mdx
@@ -31,6 +31,7 @@ The Admin component is built on the powerful [`slatejs`](https://docs.slatejs.or
| **`localized`** | Enable localization for this field. Requires [localization to be enabled](/docs/configuration/localization) in the Base config. |
| **`required`** | Require this field to have a value. |
| **`admin`** | Admin-specific configuration. See below for [more detail](#admin-config). |
+| **`custom`** | Extension point for adding custom data (e.g. for plugins) |
*\* An asterisk denotes that a property is required.*
diff --git a/docs/fields/row.mdx b/docs/fields/row.mdx
index 9823aeacd46..5987e59f3a3 100644
--- a/docs/fields/row.mdx
+++ b/docs/fields/row.mdx
@@ -16,6 +16,7 @@ keywords: row, fields, config, configuration, documentation, Content Management
| ---------------- | ----------- |
| **`fields`** * | Array of field types to nest within this Row. |
| **`admin`** | Admin-specific configuration excluding `description`, `readOnly`, and `hidden`. See the [default field admin config](/docs/fields/overview#admin-config) for more details. |
+| **`custom`** | Extension point for adding custom data (e.g. for plugins) |
*\* An asterisk denotes that a property is required.*
diff --git a/docs/fields/select.mdx b/docs/fields/select.mdx
index fbfd03326a0..a0a92aee0ee 100644
--- a/docs/fields/select.mdx
+++ b/docs/fields/select.mdx
@@ -30,6 +30,7 @@ keywords: select, multi-select, fields, config, configuration, documentation, Co
| **`localized`** | Enable localization for this field. Requires [localization to be enabled](/docs/configuration/localization) in the Base config. |
| **`required`** | Require this field to have a value. |
| **`admin`** | Admin-specific configuration. See the [default field admin config](/docs/fields/overview#admin-config) for more details. |
+| **`custom`** | Extension point for adding custom data (e.g. for plugins) |
_\* An asterisk denotes that a property is required._
diff --git a/docs/fields/tabs.mdx b/docs/fields/tabs.mdx
index a40f4aff2ff..9d1a4985606 100644
--- a/docs/fields/tabs.mdx
+++ b/docs/fields/tabs.mdx
@@ -19,6 +19,7 @@ keywords: tabs, fields, config, configuration, documentation, Content Management
| ---------------- | ----------- |
| **`tabs`** * | Array of tabs to render within this Tabs field. |
| **`admin`** | Admin-specific configuration. See the [default field admin config](/docs/fields/overview#admin-config) for more details. |
+| **`custom`** | Extension point for adding custom data (e.g. for plugins) |
#### Tab-specific Config
diff --git a/docs/fields/text.mdx b/docs/fields/text.mdx
index ccb36cccbe1..3c44e26055d 100644
--- a/docs/fields/text.mdx
+++ b/docs/fields/text.mdx
@@ -29,6 +29,7 @@ keywords: text, fields, config, configuration, documentation, Content Management
| **`localized`** | Enable localization for this field. Requires [localization to be enabled](/docs/configuration/localization) in the Base config. |
| **`required`** | Require this field to have a value. |
| **`admin`** | Admin-specific configuration. See below for [more detail](#admin-config). |
+| **`custom`** | Extension point for adding custom data (e.g. for plugins) |
*\* An asterisk denotes that a property is required.*
diff --git a/docs/fields/textarea.mdx b/docs/fields/textarea.mdx
index bd33a34f101..29005aba662 100644
--- a/docs/fields/textarea.mdx
+++ b/docs/fields/textarea.mdx
@@ -29,6 +29,7 @@ keywords: textarea, fields, config, configuration, documentation, Content Manage
| **`localized`** | Enable localization for this field. Requires [localization to be enabled](/docs/configuration/localization) in the Base config. |
| **`required`** | Require this field to have a value. |
| **`admin`** | Admin-specific configuration. See below for [more detail](#admin-config). |
+| **`custom`** | Extension point for adding custom data (e.g. for plugins) |
*\* An asterisk denotes that a property is required.*
diff --git a/docs/fields/ui.mdx b/docs/fields/ui.mdx
index 61847d66448..7f393ccf823 100644
--- a/docs/fields/ui.mdx
+++ b/docs/fields/ui.mdx
@@ -29,6 +29,7 @@ With this field, you can also inject custom `Cell` components that appear as add
| **`label`** | Human-readable label for this UI field. |
| **`admin.components.Field`** | React component to be rendered for this field within the Edit view. [More](/docs/admin/components/#field-component) |
| **`admin.components.Cell`** | React component to be rendered as a Cell within collection List views. [More](/docs/admin/components/#field-component) |
+| **`custom`** | Extension point for adding custom data (e.g. for plugins) |
*\* An asterisk denotes that a property is required.*
diff --git a/docs/fields/upload.mdx b/docs/fields/upload.mdx
index 5c8f2f3d6c2..44d0d2e8cf8 100644
--- a/docs/fields/upload.mdx
+++ b/docs/fields/upload.mdx
@@ -41,6 +41,7 @@ keywords: upload, images media, fields, config, configuration, documentation, Co
| **`localized`** | Enable localization for this field. Requires [localization to be enabled](/docs/configuration/localization) in the Base config. |
| **`required`** | Require this field to have a value. |
| **`admin`** | Admin-specific configuration. See the [default field admin config](/docs/fields/overview#admin-config) for more details. |
+| **`custom`** | Extension point for adding custom data (e.g. for plugins) |
*\* An asterisk denotes that a property is required.*
diff --git a/docs/rest-api/overview.mdx b/docs/rest-api/overview.mdx
index 9e994fa0915..bf4219bc11a 100644
--- a/docs/rest-api/overview.mdx
+++ b/docs/rest-api/overview.mdx
@@ -91,6 +91,7 @@ Each endpoint object needs to have:
| **`method`** | The lowercase HTTP verb to use: 'get', 'head', 'post', 'put', 'delete', 'connect' or 'options' |
| **`handler`** | A function or array of functions to be called with **req**, **res** and **next** arguments. [Express](https://expressjs.com/en/guide/routing.html#route-handlers) |
| **`root`** | When `true`, defines the endpoint on the root Express app, bypassing Payload handlers and the `routes.api` subpath. Note: this only applies to top-level endpoints of your Payload config, endpoints defined on `collections` or `globals` cannot be root. |
+| **`custom`** | Extension point for adding custom data (e.g. for plugins) |
Example:
diff --git a/src/collections/config/defaults.ts b/src/collections/config/defaults.ts
index 96625710b3b..da20e645717 100644
--- a/src/collections/config/defaults.ts
+++ b/src/collections/config/defaults.ts
@@ -39,6 +39,7 @@ export const defaults = {
auth: false,
upload: false,
versions: false,
+ custom: {},
};
export const authDefaults = {
diff --git a/src/collections/config/schema.ts b/src/collections/config/schema.ts
index 2950eff74db..107fa669961 100644
--- a/src/collections/config/schema.ts
+++ b/src/collections/config/schema.ts
@@ -187,6 +187,7 @@ const collectionSchema = joi.object().keys({
}),
joi.boolean(),
),
+ custom: joi.object().pattern(joi.string(), joi.any()),
});
export default collectionSchema;
diff --git a/src/collections/config/types.ts b/src/collections/config/types.ts
index 2d5f6ddabc4..082b57778bf 100644
--- a/src/collections/config/types.ts
+++ b/src/collections/config/types.ts
@@ -304,13 +304,16 @@ export type CollectionConfig = {
* @default true
*/
timestamps?: boolean
+ /** Extension point to add your custom data. */
+ custom?: Record<string, any>;
};
-export interface SanitizedCollectionConfig extends Omit<DeepRequired<CollectionConfig>, 'auth' | 'upload' | 'fields' | 'versions'> {
+export interface SanitizedCollectionConfig extends Omit<DeepRequired<CollectionConfig>, 'auth' | 'upload' | 'fields' | 'versions'| 'endpoints'> {
auth: Auth;
upload: Upload;
fields: Field[];
- versions: SanitizedCollectionVersions
+ versions: SanitizedCollectionVersions;
+ endpoints: Omit<Endpoint, 'root'>[];
}
export type Collection = {
diff --git a/src/config/defaults.ts b/src/config/defaults.ts
index 3ffbfd729c2..da7d2317158 100644
--- a/src/config/defaults.ts
+++ b/src/config/defaults.ts
@@ -55,4 +55,5 @@ export const defaults: Config = {
hooks: {},
localization: false,
telemetry: true,
+ custom: {},
};
diff --git a/src/config/schema.ts b/src/config/schema.ts
index eece575e948..33a3ccef057 100644
--- a/src/config/schema.ts
+++ b/src/config/schema.ts
@@ -13,6 +13,7 @@ export const endpointsSchema = joi.array().items(joi.object({
joi.array().items(joi.func()),
joi.func(),
),
+ custom: joi.object().pattern(joi.string(), joi.any()),
}));
export default joi.object({
@@ -162,4 +163,5 @@ export default joi.object({
),
onInit: joi.func(),
debug: joi.boolean(),
+ custom: joi.object().pattern(joi.string(), joi.any()),
});
diff --git a/src/config/types.ts b/src/config/types.ts
index c54ecf94185..440a79f7752 100644
--- a/src/config/types.ts
+++ b/src/config/types.ts
@@ -189,6 +189,8 @@ export type Endpoint = {
* @default false
*/
root?: boolean;
+ /** Extension point to add your custom data. */
+ custom?: Record<string, any>;
};
export type AdminView = React.ComponentType<{
@@ -527,14 +529,17 @@ export type Config = {
telemetry?: boolean;
/** A function that is called immediately following startup that receives the Payload instance as its only argument. */
onInit?: (payload: Payload) => Promise<void> | void;
+ /** Extension point to add your custom data. */
+ custom?: Record<string, any>;
};
export type SanitizedConfig = Omit<
DeepRequired<Config>,
- 'collections' | 'globals'
+ 'collections' | 'globals' | 'endpoint'
> & {
collections: SanitizedCollectionConfig[];
globals: SanitizedGlobalConfig[];
+ endpoints: Endpoint[];
paths: {
configDir: string
config: string
diff --git a/src/fields/config/schema.ts b/src/fields/config/schema.ts
index 78011974a40..4f8c5a7ecc0 100644
--- a/src/fields/config/schema.ts
+++ b/src/fields/config/schema.ts
@@ -52,6 +52,7 @@ export const baseField = joi.object().keys({
afterRead: joi.array().items(joi.func()).default([]),
}).default(),
admin: baseAdminFields.default(),
+ custom: joi.object().pattern(joi.string(), joi.any()),
}).default();
export const idField = baseField.keys({
diff --git a/src/fields/config/types.ts b/src/fields/config/types.ts
index b517e1c03b1..e0ea264d50b 100644
--- a/src/fields/config/types.ts
+++ b/src/fields/config/types.ts
@@ -121,6 +121,8 @@ export interface FieldBase {
read?: FieldAccess;
update?: FieldAccess;
};
+ /** Extension point to add your custom data. */
+ custom?: Record<string, any>;
}
export type NumberField = FieldBase & {
@@ -241,6 +243,8 @@ export type UIField = {
}
}
type: 'ui';
+ /** Extension point to add your custom data. */
+ custom?: Record<string, any>;
}
export type UploadField = FieldBase & {
diff --git a/src/globals/config/sanitize.ts b/src/globals/config/sanitize.ts
index 321f79530f7..095c3d297fe 100644
--- a/src/globals/config/sanitize.ts
+++ b/src/globals/config/sanitize.ts
@@ -51,6 +51,8 @@ const sanitizeGlobals = (collections: CollectionConfig[], globals: GlobalConfig[
}
}
+ if (!sanitizedGlobal.custom) sanitizedGlobal.custom = {};
+
// /////////////////////////////////
// Sanitize fields
// /////////////////////////////////
diff --git a/src/globals/config/schema.ts b/src/globals/config/schema.ts
index 0101308eb2c..1d15e9de89e 100644
--- a/src/globals/config/schema.ts
+++ b/src/globals/config/schema.ts
@@ -66,6 +66,7 @@ const globalSchema = joi.object().keys({
}),
joi.boolean(),
),
+ custom: joi.object().pattern(joi.string(), joi.any()),
}).unknown();
export default globalSchema;
diff --git a/src/globals/config/types.ts b/src/globals/config/types.ts
index 67ca97b72b2..d7219fc6cb0 100644
--- a/src/globals/config/types.ts
+++ b/src/globals/config/types.ts
@@ -109,10 +109,13 @@ export type GlobalConfig = {
}
fields: Field[];
admin?: GlobalAdminOptions
+ /** Extension point to add your custom data. */
+ custom?: Record<string, any>;
}
-export interface SanitizedGlobalConfig extends Omit<DeepRequired<GlobalConfig>, 'fields' | 'versions'> {
+export interface SanitizedGlobalConfig extends Omit<DeepRequired<GlobalConfig>, 'fields' | 'versions' | 'endpoints'> {
fields: Field[]
+ endpoints: Omit<Endpoint, 'root'>[],
versions: SanitizedGlobalVersions
}
diff --git a/test/config/config.ts b/test/config/config.ts
new file mode 100644
index 00000000000..d7d252990f4
--- /dev/null
+++ b/test/config/config.ts
@@ -0,0 +1,65 @@
+import { buildConfig } from '../buildConfig';
+import { openAccess } from '../helpers/configHelpers';
+import { Config } from '../../src/config/types';
+
+const config: Config = {
+ collections: [
+ {
+ slug: 'pages',
+ access: openAccess,
+ endpoints: [
+ {
+ path: '/hello',
+ method: 'get',
+ handler: (_, res): void => {
+ res.json({ message: 'hi' });
+ },
+ custom: { examples: [{ type: 'response', value: { message: 'hi' } }] },
+ },
+ ],
+ fields: [
+ {
+ name: 'title',
+ type: 'text',
+ custom: { description: 'The title of this page' },
+ },
+ ],
+ custom: { externalLink: 'https://foo.bar' },
+ },
+ ],
+ globals: [
+ {
+ slug: 'my-global',
+ endpoints: [{
+ path: '/greet',
+ method: 'get',
+ handler: (req, res): void => {
+ const { name } = req.query;
+ res.json({ message: `Hi ${name}!` });
+ },
+ custom: { params: [{ in: 'query', name: 'name', type: 'string' }] },
+ }],
+ fields: [{
+ name: 'title',
+ type: 'text',
+ custom: { description: 'The title of my global' },
+ },
+ ],
+ custom: { foo: 'bar' },
+ },
+ ],
+ endpoints: [
+ {
+ path: '/config',
+ method: 'get',
+ root: true,
+ handler: (req, res): void => {
+ res.json(req.payload.config);
+ },
+ custom: { description: 'Get the sanitized payload config' },
+ },
+ ],
+ custom: { name: 'Customer portal' },
+};
+
+export default buildConfig(config);
diff --git a/test/config/int.spec.ts b/test/config/int.spec.ts
new file mode 100644
index 00000000000..d680bf6f162
--- /dev/null
+++ b/test/config/int.spec.ts
@@ -0,0 +1,66 @@
+import { initPayloadTest } from '../helpers/configHelpers';
+import payload from '../../src';
+
+require('isomorphic-fetch');
+
+describe('Config', () => {
+ beforeAll(async () => {
+ await initPayloadTest({ __dirname, init: { local: true } });
+ });
+
+ describe('payload config', () => {
+ it('allows a custom field at the config root', () => {
+ const { config } = payload;
+ expect(config.custom).toEqual({ name: 'Customer portal' });
+ });
+
+ it('allows a custom field in the root endpoints', () => {
+ const [endpoint] = payload.config.endpoints;
+
+ expect(endpoint.custom).toEqual({ description: 'Get the sanitized payload config' });
+ });
+ });
+
+ describe('collection config', () => {
+ it('allows a custom field in collections', () => {
+ const [collection] = payload.config.collections;
+ expect(collection.custom).toEqual({ externalLink: 'https://foo.bar' });
+ });
+
+ it('allows a custom field in collection endpoints', () => {
+ const [collection] = payload.config.collections;
+ const [endpoint] = collection.endpoints;
+
+ expect(endpoint.custom).toEqual({ examples: [{ type: 'response', value: { message: 'hi' } }] });
+ });
+
+ it('allows a custom field in collection fields', () => {
+ const [collection] = payload.config.collections;
+ const [field] = collection.fields;
+
+ expect(field.custom).toEqual({ description: 'The title of this page' });
+ });
+ });
+
+
+ describe('global config', () => {
+ it('allows a custom field in globals', () => {
+ const [global] = payload.config.globals;
+ expect(global.custom).toEqual({ foo: 'bar' });
+ });
+
+ it('allows a custom field in global endpoints', () => {
+ const [global] = payload.config.globals;
+ const [endpoint] = global.endpoints;
+
+ expect(endpoint.custom).toEqual({ params: [{ in: 'query', name: 'name', type: 'string' }] });
+ });
+
+ it('allows a custom field in global fields', () => {
+ const [global] = payload.config.globals;
+ const [field] = global.fields;
+
+ expect(field.custom).toEqual({ description: 'The title of my global' });
+ });
+ });
+});
|
abfd8841a5c0a73aed93c04f11220c09172037d9
|
2024-03-09 03:37:01
|
Dan Ribbens
|
chore(release): v3.0.0-alpha.41 [skip ci]
| false
|
v3.0.0-alpha.41 [skip ci]
|
chore
|
diff --git a/package.json b/package.json
index 1bf71783ac0..920e4066326 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "payload-monorepo",
- "version": "3.0.0-alpha.40",
+ "version": "3.0.0-alpha.41",
"private": true,
"type": "module",
"workspaces:": [
diff --git a/packages/db-mongodb/package.json b/packages/db-mongodb/package.json
index e9da159a7d2..14ca83730fc 100644
--- a/packages/db-mongodb/package.json
+++ b/packages/db-mongodb/package.json
@@ -1,6 +1,6 @@
{
"name": "@payloadcms/db-mongodb",
- "version": "3.0.0-alpha.40",
+ "version": "3.0.0-alpha.41",
"description": "The officially supported MongoDB database adapter for Payload - Update 2",
"repository": "https://github.com/payloadcms/payload",
"license": "MIT",
diff --git a/packages/db-postgres/package.json b/packages/db-postgres/package.json
index 12d499e0227..9853843e3d1 100644
--- a/packages/db-postgres/package.json
+++ b/packages/db-postgres/package.json
@@ -1,6 +1,6 @@
{
"name": "@payloadcms/db-postgres",
- "version": "3.0.0-alpha.40",
+ "version": "3.0.0-alpha.41",
"description": "The officially supported Postgres database adapter for Payload",
"repository": "https://github.com/payloadcms/payload",
"license": "MIT",
diff --git a/packages/graphql/package.json b/packages/graphql/package.json
index d1ee37cefc6..17941b271cd 100644
--- a/packages/graphql/package.json
+++ b/packages/graphql/package.json
@@ -1,6 +1,6 @@
{
"name": "@payloadcms/graphql",
- "version": "3.0.0-alpha.40",
+ "version": "3.0.0-alpha.41",
"main": "./src/index.ts",
"types": "./src/index.d.ts",
"type": "module",
diff --git a/packages/next/package.json b/packages/next/package.json
index 10a15339b19..ce625cc8ea9 100644
--- a/packages/next/package.json
+++ b/packages/next/package.json
@@ -1,6 +1,6 @@
{
"name": "@payloadcms/next",
- "version": "3.0.0-alpha.40",
+ "version": "3.0.0-alpha.41",
"main": "./src/index.ts",
"types": "./src/index.d.ts",
"type": "module",
diff --git a/packages/payload/package.json b/packages/payload/package.json
index b9e36a73b49..f4efdd2ac75 100644
--- a/packages/payload/package.json
+++ b/packages/payload/package.json
@@ -1,6 +1,6 @@
{
"name": "payload",
- "version": "3.0.0-alpha.40",
+ "version": "3.0.0-alpha.41",
"description": "Node, React and MongoDB Headless CMS and Application Framework",
"license": "MIT",
"main": "./src/index.js",
diff --git a/packages/plugin-cloud-storage/package.json b/packages/plugin-cloud-storage/package.json
index 9348a610d1f..0d25da5b1c9 100644
--- a/packages/plugin-cloud-storage/package.json
+++ b/packages/plugin-cloud-storage/package.json
@@ -1,7 +1,7 @@
{
"name": "@payloadcms/plugin-cloud-storage",
"description": "The official cloud storage plugin for Payload CMS",
- "version": "3.0.0-alpha.40",
+ "version": "3.0.0-alpha.41",
"main": "dist/index.js",
"types": "dist/index.d.ts",
"type": "module",
diff --git a/packages/plugin-cloud/package.json b/packages/plugin-cloud/package.json
index 5223edf7c01..39f4dd35227 100644
--- a/packages/plugin-cloud/package.json
+++ b/packages/plugin-cloud/package.json
@@ -1,7 +1,7 @@
{
"name": "@payloadcms/plugin-cloud",
"description": "The official Payload Cloud plugin",
- "version": "3.0.0-alpha.40",
+ "version": "3.0.0-alpha.41",
"main": "dist/index.js",
"types": "dist/index.d.ts",
"license": "MIT",
diff --git a/packages/plugin-seo/package.json b/packages/plugin-seo/package.json
index 9d78f584b5d..dc3792ae709 100644
--- a/packages/plugin-seo/package.json
+++ b/packages/plugin-seo/package.json
@@ -1,6 +1,6 @@
{
"name": "@payloadcms/plugin-seo",
- "version": "3.0.0-alpha.40",
+ "version": "3.0.0-alpha.41",
"homepage:": "https://payloadcms.com",
"repository": "[email protected]:payloadcms/plugin-seo.git",
"description": "SEO plugin for Payload",
diff --git a/packages/richtext-lexical/package.json b/packages/richtext-lexical/package.json
index 8d479efe9d5..e89339428ed 100644
--- a/packages/richtext-lexical/package.json
+++ b/packages/richtext-lexical/package.json
@@ -1,6 +1,6 @@
{
"name": "@payloadcms/richtext-lexical",
- "version": "3.0.0-alpha.40",
+ "version": "3.0.0-alpha.41",
"description": "The officially supported Lexical richtext adapter for Payload",
"repository": "https://github.com/payloadcms/payload",
"license": "MIT",
diff --git a/packages/richtext-slate/package.json b/packages/richtext-slate/package.json
index 2ea64acc13f..f3720438aa3 100644
--- a/packages/richtext-slate/package.json
+++ b/packages/richtext-slate/package.json
@@ -1,6 +1,6 @@
{
"name": "@payloadcms/richtext-slate",
- "version": "3.0.0-alpha.40",
+ "version": "3.0.0-alpha.41",
"description": "The officially supported Slate richtext adapter for Payload",
"repository": "https://github.com/payloadcms/payload",
"license": "MIT",
diff --git a/packages/translations/package.json b/packages/translations/package.json
index aea4e2416da..750092d7946 100644
--- a/packages/translations/package.json
+++ b/packages/translations/package.json
@@ -1,6 +1,6 @@
{
"name": "@payloadcms/translations",
- "version": "3.0.0-alpha.40",
+ "version": "3.0.0-alpha.41",
"main": "./dist/exports/index.ts",
"types": "./dist/types.d.ts",
"type": "module",
diff --git a/packages/ui/package.json b/packages/ui/package.json
index 231bd219b86..289cb2ea844 100644
--- a/packages/ui/package.json
+++ b/packages/ui/package.json
@@ -1,6 +1,6 @@
{
"name": "@payloadcms/ui",
- "version": "3.0.0-alpha.40",
+ "version": "3.0.0-alpha.41",
"main": "./src/index.ts",
"types": "./dist/index.d.ts",
"type": "module",
|
f3415bb13e630335faaf803cf36ab03e5c45887b
|
2023-09-22 23:41:18
|
James
|
chore: ensures relationships can be cleared
| false
|
ensures relationships can be cleared
|
chore
|
diff --git a/packages/db-postgres/src/transform/write/array.ts b/packages/db-postgres/src/transform/write/array.ts
index 87b0c21b7c0..b5894f38aed 100644
--- a/packages/db-postgres/src/transform/write/array.ts
+++ b/packages/db-postgres/src/transform/write/array.ts
@@ -1,7 +1,7 @@
/* eslint-disable no-param-reassign */
import type { ArrayField } from 'payload/types'
-import type { ArrayRowToInsert, BlockRowToInsert } from './types'
+import type { ArrayRowToInsert, BlockRowToInsert, RelationshipToDelete } from './types'
import { isArrayOfRows } from '../../utilities/isArrayOfRows'
import { traverseFields } from './traverseFields'
@@ -15,8 +15,13 @@ type Args = {
data: unknown
field: ArrayField
locale?: string
+ numbers: Record<string, unknown>[]
path: string
relationships: Record<string, unknown>[]
+ relationshipsToDelete: RelationshipToDelete[]
+ selects: {
+ [tableName: string]: Record<string, unknown>[]
+ }
}
export const transformArray = ({
@@ -26,8 +31,11 @@ export const transformArray = ({
data,
field,
locale,
+ numbers,
path,
relationships,
+ relationshipsToDelete,
+ selects,
}: Args) => {
const newRows: ArrayRowToInsert[] = []
@@ -60,10 +68,13 @@ export const transformArray = ({
fields: field.fields,
locales: newRow.locales,
newTableName: arrayTableName,
+ numbers,
parentTableName: arrayTableName,
path: `${path || ''}${field.name}.${i}.`,
relationships,
+ relationshipsToDelete,
row: newRow.row,
+ selects,
})
newRows.push(newRow)
diff --git a/packages/db-postgres/src/transform/write/blocks.ts b/packages/db-postgres/src/transform/write/blocks.ts
index a80a3f913d4..c23ffbc1cc1 100644
--- a/packages/db-postgres/src/transform/write/blocks.ts
+++ b/packages/db-postgres/src/transform/write/blocks.ts
@@ -3,7 +3,7 @@ import type { BlockField } from 'payload/types'
import toSnakeCase from 'to-snake-case'
-import type { BlockRowToInsert } from './types'
+import type { BlockRowToInsert, RelationshipToDelete } from './types'
import { traverseFields } from './traverseFields'
@@ -14,8 +14,13 @@ type Args = {
data: Record<string, unknown>[]
field: BlockField
locale?: string
+ numbers: Record<string, unknown>[]
path: string
relationships: Record<string, unknown>[]
+ relationshipsToDelete: RelationshipToDelete[]
+ selects: {
+ [tableName: string]: Record<string, unknown>[]
+ }
tableName
}
export const transformBlocks = ({
@@ -23,8 +28,11 @@ export const transformBlocks = ({
data,
field,
locale,
+ numbers,
path,
relationships,
+ relationshipsToDelete,
+ selects,
tableName,
}: Args) => {
data.forEach((blockRow, i) => {
@@ -55,10 +63,13 @@ export const transformBlocks = ({
fields: matchedBlock.fields,
locales: newRow.locales,
newTableName: blockTableName,
+ numbers,
parentTableName: blockTableName,
path: `${path || ''}${field.name}.${i}.`,
relationships,
+ relationshipsToDelete,
row: newRow.row,
+ selects,
})
blocks[blockRow.blockType].push(newRow)
diff --git a/packages/db-postgres/src/transform/write/index.ts b/packages/db-postgres/src/transform/write/index.ts
index 9dffc1ea3b9..d88cf8411dd 100644
--- a/packages/db-postgres/src/transform/write/index.ts
+++ b/packages/db-postgres/src/transform/write/index.ts
@@ -13,14 +13,14 @@ type Args = {
}
export const transformForWrite = ({ data, fields, path = '', tableName }: Args): RowToInsert => {
- // Split out the incoming data into the corresponding:
- // base row, locales, relationships, blocks, and arrays
+ // Split out the incoming data into rows to insert / delete
const rowToInsert: RowToInsert = {
arrays: {},
blocks: {},
locales: {},
numbers: [],
relationships: [],
+ relationshipsToDelete: [],
row: {},
selects: {},
}
@@ -39,6 +39,7 @@ export const transformForWrite = ({ data, fields, path = '', tableName }: Args):
parentTableName: tableName,
path,
relationships: rowToInsert.relationships,
+ relationshipsToDelete: rowToInsert.relationshipsToDelete,
row: rowToInsert.row,
selects: rowToInsert.selects,
})
diff --git a/packages/db-postgres/src/transform/write/traverseFields.ts b/packages/db-postgres/src/transform/write/traverseFields.ts
index 0d91ac891e1..70fb9195354 100644
--- a/packages/db-postgres/src/transform/write/traverseFields.ts
+++ b/packages/db-postgres/src/transform/write/traverseFields.ts
@@ -4,7 +4,7 @@ import type { Field } from 'payload/types'
import { fieldAffectsData } from 'payload/types'
import toSnakeCase from 'to-snake-case'
-import type { ArrayRowToInsert, BlockRowToInsert } from './types'
+import type { ArrayRowToInsert, BlockRowToInsert, RelationshipToDelete } from './types'
import { isArrayOfRows } from '../../utilities/isArrayOfRows'
import { transformArray } from './array'
@@ -33,6 +33,7 @@ type Args = {
parentTableName: string
path: string
relationships: Record<string, unknown>[]
+ relationshipsToDelete: RelationshipToDelete[]
row: Record<string, unknown>
selects: {
[tableName: string]: Record<string, unknown>[]
@@ -53,6 +54,7 @@ export const traverseFields = ({
parentTableName,
path,
relationships,
+ relationshipsToDelete,
row,
selects,
}: Args) => {
@@ -80,8 +82,11 @@ export const traverseFields = ({
data: localeData,
field,
locale: localeKey,
+ numbers,
path,
relationships,
+ relationshipsToDelete,
+ selects,
})
arrays[arrayTableName] = arrays[arrayTableName].concat(newRows)
@@ -95,8 +100,11 @@ export const traverseFields = ({
columnName,
data: data[field.name],
field,
+ numbers,
path,
relationships,
+ relationshipsToDelete,
+ selects,
})
arrays[arrayTableName] = arrays[arrayTableName].concat(newRows)
@@ -115,8 +123,11 @@ export const traverseFields = ({
data: localeData,
field,
locale: localeKey,
+ numbers,
path,
relationships,
+ relationshipsToDelete,
+ selects,
tableName: newTableName,
})
}
@@ -127,8 +138,11 @@ export const traverseFields = ({
blocks,
data: fieldData,
field,
+ numbers,
path,
relationships,
+ relationshipsToDelete,
+ selects,
tableName: newTableName,
})
}
@@ -154,6 +168,7 @@ export const traverseFields = ({
parentTableName,
path: `${path || ''}${field.name}.`,
relationships,
+ relationshipsToDelete,
row,
selects,
})
@@ -172,6 +187,7 @@ export const traverseFields = ({
parentTableName,
path: `${path || ''}${field.name}.`,
relationships,
+ relationshipsToDelete,
row,
selects,
})
@@ -201,6 +217,7 @@ export const traverseFields = ({
parentTableName,
path: `${path || ''}${tab.name}.`,
relationships,
+ relationshipsToDelete,
row,
selects,
})
@@ -219,6 +236,7 @@ export const traverseFields = ({
parentTableName,
path: `${path || ''}${tab.name}.`,
relationships,
+ relationshipsToDelete,
row,
selects,
})
@@ -238,6 +256,7 @@ export const traverseFields = ({
parentTableName,
path,
relationships,
+ relationshipsToDelete,
row,
selects,
})
@@ -259,6 +278,7 @@ export const traverseFields = ({
parentTableName,
path,
relationships,
+ relationshipsToDelete,
row,
selects,
})
@@ -270,6 +290,14 @@ export const traverseFields = ({
if (field.localized) {
if (typeof fieldData === 'object') {
Object.entries(fieldData).forEach(([localeKey, localeData]) => {
+ if (localeData === null) {
+ relationshipsToDelete.push({
+ locale: localeKey,
+ path: relationshipPath,
+ })
+ return
+ }
+
transformRelationship({
baseRow: {
locale: localeKey,
@@ -282,6 +310,11 @@ export const traverseFields = ({
})
}
} else {
+ if (fieldData === null) {
+ relationshipsToDelete.push({ path: relationshipPath })
+ return
+ }
+
transformRelationship({
baseRow: {
path: relationshipPath,
@@ -380,10 +413,10 @@ export const traverseFields = ({
valuesToTransform.forEach(({ localeKey, ref, value }) => {
if (typeof value !== 'undefined') {
- let formattedValue = value;
+ let formattedValue = value
if (field.type === 'date' && field.name === 'updatedAt') {
- formattedValue = new Date().toISOString();
+ formattedValue = new Date().toISOString()
}
if (localeKey) {
diff --git a/packages/db-postgres/src/transform/write/types.ts b/packages/db-postgres/src/transform/write/types.ts
index 3fcaa3ff043..e7e530374e9 100644
--- a/packages/db-postgres/src/transform/write/types.ts
+++ b/packages/db-postgres/src/transform/write/types.ts
@@ -19,6 +19,11 @@ export type BlockRowToInsert = {
row: Record<string, unknown>
}
+export type RelationshipToDelete = {
+ locale?: string
+ path: string
+}
+
export type RowToInsert = {
arrays: {
[tableName: string]: ArrayRowToInsert[]
@@ -31,6 +36,7 @@ export type RowToInsert = {
}
numbers: Record<string, unknown>[]
relationships: Record<string, unknown>[]
+ relationshipsToDelete: RelationshipToDelete[]
row: Record<string, unknown>
selects: {
[tableName: string]: Record<string, unknown>[]
diff --git a/packages/db-postgres/src/upsertRow/deleteExistingRowsByPath.ts b/packages/db-postgres/src/upsertRow/deleteExistingRowsByPath.ts
index 09448e6af3c..4c39ebf91d9 100644
--- a/packages/db-postgres/src/upsertRow/deleteExistingRowsByPath.ts
+++ b/packages/db-postgres/src/upsertRow/deleteExistingRowsByPath.ts
@@ -6,10 +6,10 @@ type Args = {
adapter: PostgresAdapter
db: DrizzleDB
localeColumnName?: string
- newRows: Record<string, unknown>[]
parentColumnName?: string
parentID: unknown
pathColumnName?: string
+ rows: Record<string, unknown>[]
tableName: string
}
@@ -17,17 +17,17 @@ export const deleteExistingRowsByPath = async ({
adapter,
db,
localeColumnName = '_locale',
- newRows,
parentColumnName = '_parentID',
parentID,
pathColumnName = '_path',
+ rows,
tableName,
}: Args): Promise<void> => {
const localizedPathsToDelete = new Set<string>()
const pathsToDelete = new Set<string>()
const table = adapter.tables[tableName]
- newRows.forEach((row) => {
+ rows.forEach((row) => {
const path = row[pathColumnName]
const localeData = row[localeColumnName]
if (typeof path === 'string') {
diff --git a/packages/db-postgres/src/upsertRow/index.ts b/packages/db-postgres/src/upsertRow/index.ts
index 2324a997697..2901a77c001 100644
--- a/packages/db-postgres/src/upsertRow/index.ts
+++ b/packages/db-postgres/src/upsertRow/index.ts
@@ -140,10 +140,10 @@ export const upsertRow = async ({
adapter,
db,
localeColumnName: 'locale',
- newRows: relationsToInsert,
parentColumnName: 'parent',
parentID: insertedRow.id,
pathColumnName: 'path',
+ rows: [...relationsToInsert, ...rowToInsert.relationshipsToDelete],
tableName: relationshipsTableName,
})
}
@@ -165,10 +165,10 @@ export const upsertRow = async ({
adapter,
db,
localeColumnName: 'locale',
- newRows: numbersToInsert,
parentColumnName: 'parent',
parentID: insertedRow.id,
pathColumnName: 'path',
+ rows: numbersToInsert,
tableName: numbersTableName,
})
}
@@ -191,9 +191,9 @@ export const upsertRow = async ({
await deleteExistingRowsByPath({
adapter,
db,
- newRows: blockRows.map(({ row }) => row),
parentID: insertedRow.id,
pathColumnName: '_path',
+ rows: blockRows.map(({ row }) => row),
tableName: `${tableName}_${blockName}`,
})
}
diff --git a/test/relationships/int.spec.ts b/test/relationships/int.spec.ts
index 9d853f23222..6329a4ce1cc 100644
--- a/test/relationships/int.spec.ts
+++ b/test/relationships/int.spec.ts
@@ -225,7 +225,7 @@ describe('Relationships', () => {
})
expect(result.status).toEqual(200)
- expect(result.doc.relationField).toBeNull()
+ expect(result.doc.relationField).toBeFalsy()
})
})
|
a5fcdf03bae681c5b2e0de6b681d20efe8ebdd7f
|
2021-05-12 07:51:03
|
Elliot DeNolf
|
feat: add mimeTypes validation for uploads
| false
|
add mimeTypes validation for uploads
|
feat
|
diff --git a/src/collections/config/sanitize.ts b/src/collections/config/sanitize.ts
index 340fad1e735..fe7671c8ec5 100644
--- a/src/collections/config/sanitize.ts
+++ b/src/collections/config/sanitize.ts
@@ -10,6 +10,7 @@ import baseUploadFields from '../../fields/baseFields/baseUploadFields';
import baseImageUploadFields from '../../fields/baseFields/baseImageUploadFields';
import { formatLabels } from '../../utilities/formatLabels';
import { defaults, authDefaults } from './defaults';
+import { mimeTypeValidator } from '../../fields/baseFields/mimeTypeValidator';
const mergeBaseFields = (fields, baseFields) => {
const mergedFields = [];
@@ -73,6 +74,10 @@ const sanitizeCollection = (collections: PayloadCollectionConfig[], collection:
let uploadFields = baseUploadFields;
+ if (sanitized.upload.mimeTypes) {
+ uploadFields.find((f) => f.name === 'mimeType').validate = mimeTypeValidator(sanitized.upload.mimeTypes);
+ }
+
if (sanitized.upload.imageSizes && Array.isArray(sanitized.upload.imageSizes)) {
uploadFields = uploadFields.concat(baseImageUploadFields(sanitized.upload.imageSizes));
}
diff --git a/src/errors/ValidationError.ts b/src/errors/ValidationError.ts
index 0b24af4b41f..fa111eff76f 100644
--- a/src/errors/ValidationError.ts
+++ b/src/errors/ValidationError.ts
@@ -3,7 +3,7 @@ import APIError from './APIError';
class ValidationError extends APIError {
constructor(results: {message: string, field: string}[]) {
- super(`Bad request with ${results.length} errors`, httpStatus.BAD_REQUEST, results);
+ super(`The following field${results.length === 1 ? ' is' : 's are'} invalid: ${results.map((f) => f.field).join(', ')}`, httpStatus.BAD_REQUEST, results);
}
}
diff --git a/src/fields/baseFields/mimeTypeValidator.spec.ts b/src/fields/baseFields/mimeTypeValidator.spec.ts
new file mode 100644
index 00000000000..b07677a97db
--- /dev/null
+++ b/src/fields/baseFields/mimeTypeValidator.spec.ts
@@ -0,0 +1,55 @@
+import { mimeTypeValidator } from './mimeTypeValidator';
+
+describe('mimeTypeValidator', () => {
+ it('should validate single mimeType', () => {
+ const mimeTypes = ['image/png'];
+ const validate = mimeTypeValidator(mimeTypes);
+ expect(validate('image/png')).toBe(true);
+ });
+
+ it('should validate multiple mimeTypes', () => {
+ const mimeTypes = ['image/png', 'application/pdf'];
+ const validate = mimeTypeValidator(mimeTypes);
+ expect(validate('image/png')).toBe(true);
+ expect(validate('application/pdf')).toBe(true);
+ });
+
+ it('should validate using wildcard', () => {
+ const mimeTypes = ['image/*'];
+ const validate = mimeTypeValidator(mimeTypes);
+ expect(validate('image/png')).toBe(true);
+ expect(validate('image/gif')).toBe(true);
+ });
+
+ it('should validate multiple wildcards', () => {
+ const mimeTypes = ['image/*', 'audio/*'];
+ const validate = mimeTypeValidator(mimeTypes);
+ expect(validate('image/png')).toBe(true);
+ expect(validate('audio/mpeg')).toBe(true);
+ });
+
+ it('should not validate when unmatched', () => {
+ const mimeTypes = ['image/png'];
+ const validate = mimeTypeValidator(mimeTypes);
+ expect(validate('audio/mpeg')).toBe('Invalid file type: \'audio/mpeg\'');
+ });
+
+ it('should not validate when unmatched - multiple mimeTypes', () => {
+ const mimeTypes = ['image/png', 'application/pdf'];
+ const validate = mimeTypeValidator(mimeTypes);
+ expect(validate('audio/mpeg')).toBe('Invalid file type: \'audio/mpeg\'');
+ });
+
+ it('should not validate using wildcard - unmatched', () => {
+ const mimeTypes = ['image/*'];
+ const validate = mimeTypeValidator(mimeTypes);
+ expect(validate('audio/mpeg')).toBe('Invalid file type: \'audio/mpeg\'');
+ });
+
+ it('should not validate multiple wildcards - unmatched', () => {
+ const mimeTypes = ['image/*', 'audio/*'];
+ const validate = mimeTypeValidator(mimeTypes);
+ expect(validate('video/mp4')).toBe('Invalid file type: \'video/mp4\'');
+ expect(validate('application/pdf')).toBe('Invalid file type: \'application/pdf\'');
+ });
+});
diff --git a/src/fields/baseFields/mimeTypeValidator.ts b/src/fields/baseFields/mimeTypeValidator.ts
new file mode 100644
index 00000000000..7135458d4fc
--- /dev/null
+++ b/src/fields/baseFields/mimeTypeValidator.ts
@@ -0,0 +1,9 @@
+import { Validate } from '../config/types';
+
+export const mimeTypeValidator = (mimeTypes: string[]): Validate => (val: string) => {
+ const cleanedMimeTypes = mimeTypes.map((v) => v.replace('*', ''));
+
+ return !cleanedMimeTypes.some((v) => val.startsWith(v))
+ ? `Invalid file type: '${val}'`
+ : true;
+};
diff --git a/src/fields/config/types.ts b/src/fields/config/types.ts
index 91133cdc801..1a4aec8b483 100644
--- a/src/fields/config/types.ts
+++ b/src/fields/config/types.ts
@@ -40,7 +40,7 @@ export type Labels = {
plural: string;
};
-export type Validate = (value: unknown, options?: any) => string | boolean | Promise<string | boolean>;
+export type Validate = (value: unknown, options?: any) => string | true | Promise<string | true>;
export type OptionObject = {
label: string
|
f5535f613ac4d876d040be74b45e105e0f4775a8
|
2022-03-07 20:53:50
|
James
|
fix: rare crash with link rte element
| false
|
rare crash with link rte element
|
fix
|
diff --git a/src/admin/components/forms/field-types/RichText/injectVoid.ts b/src/admin/components/forms/field-types/RichText/elements/injectVoid.ts
similarity index 100%
rename from src/admin/components/forms/field-types/RichText/injectVoid.ts
rename to src/admin/components/forms/field-types/RichText/elements/injectVoid.ts
diff --git a/src/admin/components/forms/field-types/RichText/isLastSelectedElementEmpty.ts b/src/admin/components/forms/field-types/RichText/elements/isLastSelectedElementEmpty.ts
similarity index 100%
rename from src/admin/components/forms/field-types/RichText/isLastSelectedElementEmpty.ts
rename to src/admin/components/forms/field-types/RichText/elements/isLastSelectedElementEmpty.ts
diff --git a/src/admin/components/forms/field-types/RichText/elements/link/utilities.tsx b/src/admin/components/forms/field-types/RichText/elements/link/utilities.tsx
index 7478ba74de9..f6f2f5b1e84 100644
--- a/src/admin/components/forms/field-types/RichText/elements/link/utilities.tsx
+++ b/src/admin/components/forms/field-types/RichText/elements/link/utilities.tsx
@@ -1,41 +1,37 @@
import { Editor, Transforms, Range, Element } from 'slate';
-
-export const isLinkActive = (editor: Editor): boolean => {
- const [link] = Editor.nodes(editor, { match: (n) => Element.isElement(n) && n.type === 'link' });
- return !!link;
-};
+import isElementActive from '../isActive';
export const unwrapLink = (editor: Editor): void => {
Transforms.unwrapNodes(editor, { match: (n) => Element.isElement(n) && n.type === 'link' });
};
-export const wrapLink = (editor, url?: string, newTab?: boolean): void => {
- if (isLinkActive(editor)) {
- unwrapLink(editor);
- }
-
+export const wrapLink = (editor: Editor, url?: string, newTab?: boolean): void => {
const { selection, blurSelection } = editor;
if (blurSelection) {
Transforms.select(editor, blurSelection);
}
- const selectionToUse = selection || blurSelection;
-
- const isCollapsed = selectionToUse && Range.isCollapsed(selectionToUse);
-
- const link = {
- type: 'link',
- url,
- newTab,
- children: isCollapsed ? [{ text: url }] : [],
- };
-
- if (isCollapsed) {
- Transforms.insertNodes(editor, link);
+ if (isElementActive(editor, 'link')) {
+ unwrapLink(editor);
} else {
- Transforms.wrapNodes(editor, link, { split: true });
- Transforms.collapse(editor, { edge: 'end' });
+ const selectionToUse = selection || blurSelection;
+
+ const isCollapsed = selectionToUse && Range.isCollapsed(selectionToUse);
+
+ const link = {
+ type: 'link',
+ url,
+ newTab,
+ children: isCollapsed ? [{ text: url }] : [],
+ };
+
+ if (isCollapsed) {
+ Transforms.insertNodes(editor, link);
+ } else {
+ Transforms.wrapNodes(editor, link, { split: true });
+ Transforms.collapse(editor, { edge: 'end' });
+ }
}
};
diff --git a/src/admin/components/forms/field-types/RichText/elements/relationship/Button/index.tsx b/src/admin/components/forms/field-types/RichText/elements/relationship/Button/index.tsx
index e1ee606d527..26064141b8e 100644
--- a/src/admin/components/forms/field-types/RichText/elements/relationship/Button/index.tsx
+++ b/src/admin/components/forms/field-types/RichText/elements/relationship/Button/index.tsx
@@ -12,7 +12,7 @@ import Submit from '../../../../../Submit';
import X from '../../../../../../icons/X';
import Fields from './Fields';
import { requests } from '../../../../../../../api';
-import { injectVoidElement } from '../../../injectVoid';
+import { injectVoidElement } from '../../injectVoid';
import './index.scss';
diff --git a/src/admin/components/forms/field-types/RichText/elements/upload/Button/index.tsx b/src/admin/components/forms/field-types/RichText/elements/upload/Button/index.tsx
index 0f875f0d9da..d5ce011dd09 100644
--- a/src/admin/components/forms/field-types/RichText/elements/upload/Button/index.tsx
+++ b/src/admin/components/forms/field-types/RichText/elements/upload/Button/index.tsx
@@ -16,7 +16,7 @@ import MinimalTemplate from '../../../../../../templates/Minimal';
import Button from '../../../../../../elements/Button';
import { SanitizedCollectionConfig } from '../../../../../../../../collections/config/types';
import PerPage from '../../../../../../elements/PerPage';
-import { injectVoidElement } from '../../../injectVoid';
+import { injectVoidElement } from '../../injectVoid';
import './index.scss';
import '../addSwapModals.scss';
|
dec87e971a38c130cae21469ece5fe453ae2bf7f
|
2024-12-20 22:31:47
|
Shrinidhi Shastri
|
chore(templates): remove console.log that logs payload secret for security (#10095)
| false
|
remove console.log that logs payload secret for security (#10095)
|
chore
|
diff --git a/examples/draft-preview/src/app/(app)/next/preview/route.ts b/examples/draft-preview/src/app/(app)/next/preview/route.ts
index 287b454c1f4..da133e64d9d 100644
--- a/examples/draft-preview/src/app/(app)/next/preview/route.ts
+++ b/examples/draft-preview/src/app/(app)/next/preview/route.ts
@@ -53,7 +53,6 @@ export async function GET(
headers: req.headers,
})
} catch (error) {
- console.log({ token, payloadSecret: payload.secret })
payload.logger.error({ err: error }, 'Error verifying token for live preview')
return new Response('You are not allowed to preview this page', { status: 403 })
}
diff --git a/templates/website/src/app/(frontend)/next/preview/route.ts b/templates/website/src/app/(frontend)/next/preview/route.ts
index 0a49f3ef773..80642637c05 100644
--- a/templates/website/src/app/(frontend)/next/preview/route.ts
+++ b/templates/website/src/app/(frontend)/next/preview/route.ts
@@ -51,7 +51,6 @@ export async function GET(
headers: req.headers,
})
} catch (error) {
- console.log({ token, payloadSecret: payload.secret })
payload.logger.error({ err: error }, 'Error verifying token for live preview')
return new Response('You are not allowed to preview this page', { status: 403 })
}
diff --git a/templates/with-vercel-website/src/app/(frontend)/next/preview/route.ts b/templates/with-vercel-website/src/app/(frontend)/next/preview/route.ts
index 0a49f3ef773..80642637c05 100644
--- a/templates/with-vercel-website/src/app/(frontend)/next/preview/route.ts
+++ b/templates/with-vercel-website/src/app/(frontend)/next/preview/route.ts
@@ -51,7 +51,6 @@ export async function GET(
headers: req.headers,
})
} catch (error) {
- console.log({ token, payloadSecret: payload.secret })
payload.logger.error({ err: error }, 'Error verifying token for live preview')
return new Response('You are not allowed to preview this page', { status: 403 })
}
|
0cdd5b628c4287516dbbd9c85b10151e49bf70fd
|
2024-09-20 19:27:09
|
Alessio Gravili
|
perf: disable router cache refresh that occurs after every page transition or page load (#8318)
| false
|
disable router cache refresh that occurs after every page transition or page load (#8318)
|
perf
|
diff --git a/packages/next/src/views/List/Default/index.tsx b/packages/next/src/views/List/Default/index.tsx
index abcddd9862a..338f4f86f00 100644
--- a/packages/next/src/views/List/Default/index.tsx
+++ b/packages/next/src/views/List/Default/index.tsx
@@ -28,13 +28,13 @@ import {
useListInfo,
useListQuery,
useModal,
- useRouteCache,
useStepNav,
useTranslation,
useWindowInfo,
ViewDescription,
} from '@payloadcms/ui'
import LinkImport from 'next/link.js'
+import { useRouter } from 'next/navigation.js'
import { formatFilesize, isNumber } from 'payload/shared'
import React, { Fragment, useEffect } from 'react'
@@ -55,9 +55,10 @@ export const DefaultListView: React.FC = () => {
newDocumentURL,
} = useListInfo()
+ const router = useRouter()
+
const { data, defaultLimit, handlePageChange, handlePerPageChange, params } = useListQuery()
const { openModal } = useModal()
- const { clearRouteCache } = useRouteCache()
const { setCollectionSlug, setOnSuccess } = useBulkUpload()
const { drawerSlug } = useBulkUpload()
@@ -109,8 +110,8 @@ export const DefaultListView: React.FC = () => {
const openBulkUpload = React.useCallback(() => {
setCollectionSlug(collectionSlug)
openModal(drawerSlug)
- setOnSuccess(clearRouteCache)
- }, [clearRouteCache, collectionSlug, drawerSlug, openModal, setCollectionSlug, setOnSuccess])
+ setOnSuccess(() => router.refresh())
+ }, [router, collectionSlug, drawerSlug, openModal, setCollectionSlug, setOnSuccess])
useEffect(() => {
if (drawerDepth <= 1) {
diff --git a/packages/next/src/withPayload.js b/packages/next/src/withPayload.js
index 33930f045df..a080e72c796 100644
--- a/packages/next/src/withPayload.js
+++ b/packages/next/src/withPayload.js
@@ -4,10 +4,13 @@
* @returns {import('next').NextConfig}
* */
export const withPayload = (nextConfig = {}) => {
+ const env = nextConfig?.env || {}
+
if (nextConfig.experimental?.staleTimes?.dynamic) {
console.warn(
- 'Payload detected a non-zero value for the `staleTimes.dynamic` option in your Next.js config. This may cause stale data to load in the Admin Panel. To clear this warning, remove the `staleTimes.dynamic` option from your Next.js config or set it to 0. In the future, Next.js may support scoping this option to specific routes.',
+ 'Payload detected a non-zero value for the `staleTimes.dynamic` option in your Next.js config. This will slow down page transitions and may cause stale data to load within the Admin panel. To clear this warning, remove the `staleTimes.dynamic` option from your Next.js config or set it to 0. In the future, Next.js may support scoping this option to specific routes.',
)
+ env.NEXT_PUBLIC_ENABLE_ROUTER_CACHE_REFRESH = 'true'
}
/**
@@ -15,9 +18,7 @@ export const withPayload = (nextConfig = {}) => {
*/
const toReturn = {
...nextConfig,
- env: {
- ...(nextConfig?.env || {}),
- },
+ env,
outputFileTracingExcludes: {
...(nextConfig?.outputFileTracingExcludes || {}),
'**/*': [
diff --git a/packages/payload/src/auth/operations/login.ts b/packages/payload/src/auth/operations/login.ts
index cc4535a8487..ecd03b17097 100644
--- a/packages/payload/src/auth/operations/login.ts
+++ b/packages/payload/src/auth/operations/login.ts
@@ -173,6 +173,7 @@ export const loginOperation = async <TSlug extends CollectionSlug>(
req,
where: whereConstraint,
})
+ user.collection = collectionConfig.slug
if (!user || (args.collection.config.auth.verify && user._verified === false)) {
throw new AuthenticationError(req.t, Boolean(canLoginWithUsername && sanitizedUsername))
diff --git a/packages/payload/src/auth/operations/me.ts b/packages/payload/src/auth/operations/me.ts
index 1774277a0f8..f34d4763d7c 100644
--- a/packages/payload/src/auth/operations/me.ts
+++ b/packages/payload/src/auth/operations/me.ts
@@ -37,6 +37,7 @@ export const meOperation = async (args: Arguments): Promise<MeOperationResult> =
req,
showHiddenFields: false,
})) as User
+ user.collection = collection.config.slug
if (req.user.collection !== collection.config.slug) {
return {
@@ -44,8 +45,6 @@ export const meOperation = async (args: Arguments): Promise<MeOperationResult> =
}
}
- delete user.collection
-
// /////////////////////////////////////
// me hook - Collection
// /////////////////////////////////////
diff --git a/packages/payload/src/auth/operations/refresh.ts b/packages/payload/src/auth/operations/refresh.ts
index d0dbb7e31a2..6d27ffe5e69 100644
--- a/packages/payload/src/auth/operations/refresh.ts
+++ b/packages/payload/src/auth/operations/refresh.ts
@@ -75,6 +75,7 @@ export const refreshOperation = async (incomingArgs: Arguments): Promise<Result>
depth: isGraphQL ? 0 : args.collection.config.auth.depth,
req: args.req,
})
+ user.collection = args.req.user.collection
let result: Result
diff --git a/packages/payload/src/auth/types.ts b/packages/payload/src/auth/types.ts
index ca62348cd75..82bda087b24 100644
--- a/packages/payload/src/auth/types.ts
+++ b/packages/payload/src/auth/types.ts
@@ -61,19 +61,24 @@ export type Permissions = {
}
}
-export type User = {
- [key: string]: any // This NEEDS to be an any, otherwise it breaks the Omit for ClientUser below
+type BaseUser = {
collection: string
email?: string
id: number | string
username?: string
}
+export type User = {
+ [key: string]: any
+} & BaseUser
+
/**
* `collection` is not available one the client. It's only available on the server (req.user)
* On the client, you can access the collection via config.admin.user. Config can be accessed using the useConfig() hook
*/
-export type ClientUser = Omit<User, 'collection'>
+export type ClientUser = {
+ [key: string]: any
+} & BaseUser
type GenerateVerifyEmailHTML<TUser = any> = (args: {
req: PayloadRequest
diff --git a/packages/ui/src/elements/EditMany/index.tsx b/packages/ui/src/elements/EditMany/index.tsx
index 4f705deb9c2..dc46bae9925 100644
--- a/packages/ui/src/elements/EditMany/index.tsx
+++ b/packages/ui/src/elements/EditMany/index.tsx
@@ -173,7 +173,7 @@ export const EditMany: React.FC<EditManyProps> = (props) => {
params: { page: selectAll === SelectAllStatus.AllAvailable ? '1' : undefined },
}),
)
- clearRouteCache()
+ clearRouteCache() // Use clearRouteCache instead of router.refresh, as we only need to clear the cache if the user has route caching enabled - clearRouteCache checks for this
closeModal(drawerSlug)
}
diff --git a/packages/ui/src/elements/PublishMany/index.tsx b/packages/ui/src/elements/PublishMany/index.tsx
index febb5c72a76..e3e7daaa94d 100644
--- a/packages/ui/src/elements/PublishMany/index.tsx
+++ b/packages/ui/src/elements/PublishMany/index.tsx
@@ -81,7 +81,7 @@ export const PublishMany: React.FC<PublishManyProps> = (props) => {
}),
)
- clearRouteCache()
+ clearRouteCache() // Use clearRouteCache instead of router.refresh, as we only need to clear the cache if the user has route caching enabled - clearRouteCache checks for this
return null
}
diff --git a/packages/ui/src/elements/UnpublishMany/index.tsx b/packages/ui/src/elements/UnpublishMany/index.tsx
index a3ab2f82cb6..2d8fba666d8 100644
--- a/packages/ui/src/elements/UnpublishMany/index.tsx
+++ b/packages/ui/src/elements/UnpublishMany/index.tsx
@@ -78,7 +78,7 @@ export const UnpublishMany: React.FC<UnpublishManyProps> = (props) => {
},
}),
)
- clearRouteCache()
+ clearRouteCache() // Use clearRouteCache instead of router.refresh, as we only need to clear the cache if the user has route caching enabled - clearRouteCache checks for this
return null
}
diff --git a/packages/ui/src/providers/Root/index.tsx b/packages/ui/src/providers/Root/index.tsx
index 4c31eca5d83..48e5264bc39 100644
--- a/packages/ui/src/providers/Root/index.tsx
+++ b/packages/ui/src/providers/Root/index.tsx
@@ -58,9 +58,12 @@ export const RootProvider: React.FC<Props> = ({
translations,
user,
}) => {
+ const RouteCacheComponent =
+ process.env.NEXT_PUBLIC_ENABLE_ROUTER_CACHE_REFRESH === 'true' ? RouteCache : Fragment
+
return (
<Fragment>
- <RouteCache>
+ <RouteCacheComponent>
<ConfigProvider config={config}>
<FieldComponentsProvider fieldComponents={fieldComponents}>
<ClientFunctionProvider>
@@ -114,7 +117,7 @@ export const RootProvider: React.FC<Props> = ({
</ClientFunctionProvider>
</FieldComponentsProvider>
</ConfigProvider>
- </RouteCache>
+ </RouteCacheComponent>
<ToastContainer />
</Fragment>
)
diff --git a/packages/ui/src/providers/Translation/index.tsx b/packages/ui/src/providers/Translation/index.tsx
index 50d7130caed..6ba23c9b6c5 100644
--- a/packages/ui/src/providers/Translation/index.tsx
+++ b/packages/ui/src/providers/Translation/index.tsx
@@ -12,10 +12,9 @@ import type { ClientConfig, LanguageOptions } from 'payload'
import { importDateFNSLocale, t } from '@payloadcms/translations'
import { enUS } from 'date-fns/locale/en-US'
+import { useRouter } from 'next/navigation.js'
import React, { createContext, useContext, useEffect, useState } from 'react'
-import { useRouteCache } from '../RouteCache/index.js'
-
type ContextType<
TAdditionalTranslations = {},
TAdditionalClientTranslationKeys extends string = never,
@@ -64,7 +63,7 @@ export const TranslationProvider: React.FC<Props> = ({
switchLanguageServerAction,
translations,
}) => {
- const { clearRouteCache } = useRouteCache()
+ const router = useRouter()
const [dateFNS, setDateFNS] = useState<Locale>()
const nextT: ContextType['t'] = (key, vars): string =>
@@ -78,13 +77,13 @@ export const TranslationProvider: React.FC<Props> = ({
async (lang: string) => {
try {
await switchLanguageServerAction(lang)
- clearRouteCache()
+ router.refresh()
} catch (error) {
// eslint-disable-next-line no-console
console.error(`Error loading language: "${lang}"`, error)
}
},
- [switchLanguageServerAction, clearRouteCache],
+ [switchLanguageServerAction, router],
)
useEffect(() => {
|
05bb73bb7ce847844373dc14e6b6d27a4d30de17
|
2024-03-27 04:15:53
|
Elliot DeNolf
|
chore: update blank 3.0 template
| false
|
update blank 3.0 template
|
chore
|
diff --git a/templates/blank-3.0/next.config.mjs b/templates/blank-3.0/next.config.mjs
index 7ec4bd83665..8d3f99c5be3 100644
--- a/templates/blank-3.0/next.config.mjs
+++ b/templates/blank-3.0/next.config.mjs
@@ -1,4 +1,4 @@
-import { withPayload } from '@payloadcms/next/withPayload'
+import { withPayload } from '@payloadcms/next'
/** @type {import('next').NextConfig} */
const nextConfig = {
diff --git a/templates/blank-3.0/payload.config.ts b/templates/blank-3.0/payload.config.ts
index 0c2f68e57f6..9d19201e649 100644
--- a/templates/blank-3.0/payload.config.ts
+++ b/templates/blank-3.0/payload.config.ts
@@ -1,12 +1,12 @@
-import { mongooseAdapter } from '@payloadcms/db-mongodb'
+import { mongooseAdapter } from '@payloadcms/db-mongodb' // database-adapter-import
import { payloadCloud } from '@payloadcms/plugin-cloud'
-import path from 'path' // database-adapter-import
-import { slateEditor } from '@payloadcms/richtext-slate' // editor-import
+import { lexicalEditor } from '@payloadcms/richtext-lexical' // editor-import
+import path from 'path'
import { buildConfig } from 'payload/config'
import sharp from 'sharp'
import { fileURLToPath } from 'url'
-import Users from './src/collections/Users'
+import { Users } from './src/collections/Users'
const filename = fileURLToPath(import.meta.url)
const dirname = path.dirname(filename)
@@ -16,7 +16,7 @@ export default buildConfig({
user: Users.slug,
},
collections: [Users],
- editor: slateEditor({}), // editor-config
+ editor: lexicalEditor({}),
plugins: [payloadCloud()],
secret: process.env.PAYLOAD_SECRET || '',
typescript: {
diff --git a/templates/blank-3.0/src/collections/Users.ts b/templates/blank-3.0/src/collections/Users.ts
index 6e898e07f8d..96a8831d0f9 100644
--- a/templates/blank-3.0/src/collections/Users.ts
+++ b/templates/blank-3.0/src/collections/Users.ts
@@ -1,6 +1,6 @@
import type { CollectionConfig } from 'payload/types'
-const Users: CollectionConfig = {
+export const Users: CollectionConfig = {
slug: 'users',
admin: {
useAsTitle: 'email',
@@ -11,5 +11,3 @@ const Users: CollectionConfig = {
// Add more fields as needed
],
}
-
-export default Users
|
a1083727ef54ec15ea2c3b4dfd114567639dfef1
|
2022-09-13 05:08:02
|
James Mikrut
|
feat: #1001 - builds a way to allow list view to search multiple fields
| false
|
#1001 - builds a way to allow list view to search multiple fields
|
feat
|
diff --git a/docs/configuration/collections.mdx b/docs/configuration/collections.mdx
index 2a64d9c8b30..7020d99ea27 100644
--- a/docs/configuration/collections.mdx
+++ b/docs/configuration/collections.mdx
@@ -69,6 +69,7 @@ You can customize the way that the Admin panel behaves on a collection-by-collec
| `enableRichTextRelationship` | The [Rich Text](/docs/fields/rich-text) field features a `Relationship` element which allows for users to automatically reference related documents within their rich text. Set to `true` by default. |
| `preview` | Function to generate preview URLS within the Admin panel that can point to your app. [More](#preview). |
| `components` | Swap in your own React components to be used within this collection. [More](/docs/admin/components#collections) |
+| `listSearchableFields ` | Specify which fields should be searched in the List search view. [More](/docs/configuration/collections#list-searchable-fields) |
### Preview
@@ -119,6 +120,17 @@ Hooks are a powerful way to extend collection functionality and execute your own
Collections support all field types that Payload has to offer—including simple fields like text and checkboxes all the way to more complicated layout-building field groups like Blocks. [Click here](/docs/fields/overview) to learn more about field types.
+#### List Searchable Fields
+
+In the List view, there is a "search" box that allows you to quickly find a document with a search. By default, it searches on the ID field. If you have `admin.useAsTitle` defined, the list search will use that field. However, you can define more than one field to search to make it easier on your admin editors to find the data they need.
+
+For example, let's say you have a Posts collection with `title`, `metaDescription`, and `tags` fields - and you want all three of those fields to be searchable in the List view. You can simply add `admin.listSearchableFields: ['title', 'metaDescription', 'tags']` - and the admin UI will automatically search on those three fields plus the ID field.
+
+<Banner type="warning">
+ <strong>Note:</strong><br/>
+ If you are adding <strong>listSearchableFields</strong>, make sure you index each of these fields so your admin queries can remain performant.
+</Banner>
+
### TypeScript
You can import collection types as follows:
diff --git a/src/admin/components/elements/ListControls/index.tsx b/src/admin/components/elements/ListControls/index.tsx
index 35842b13346..6448e641ccb 100644
--- a/src/admin/components/elements/ListControls/index.tsx
+++ b/src/admin/components/elements/ListControls/index.tsx
@@ -1,6 +1,6 @@
import React, { useState } from 'react';
import AnimateHeight from 'react-animate-height';
-import { fieldAffectsData } from '../../../../fields/config/types';
+import { FieldAffectingData, fieldAffectsData } from '../../../../fields/config/types';
import SearchFilter from '../SearchFilter';
import ColumnSelector from '../ColumnSelector';
import WhereBuilder from '../WhereBuilder';
@@ -29,6 +29,7 @@ const ListControls: React.FC<Props> = (props) => {
fields,
admin: {
useAsTitle,
+ listSearchableFields,
},
},
} = props;
@@ -37,6 +38,7 @@ const ListControls: React.FC<Props> = (props) => {
const shouldInitializeWhereOpened = validateWhereQuery(params?.where);
const [titleField] = useState(() => fields.find((field) => fieldAffectsData(field) && field.name === useAsTitle));
+ const [textFieldsToBeSearched] = useState(listSearchableFields ? () => fields.filter((field) => fieldAffectsData(field) && listSearchableFields.includes(field.name)) as FieldAffectingData[] : null);
const [visibleDrawer, setVisibleDrawer] = useState<'where' | 'sort' | 'columns'>(shouldInitializeWhereOpened ? 'where' : undefined);
return (
@@ -47,6 +49,7 @@ const ListControls: React.FC<Props> = (props) => {
handleChange={handleWhereChange}
modifySearchQuery={modifySearchQuery}
fieldLabel={titleField && titleField.label ? titleField.label : undefined}
+ listSearchableFields={textFieldsToBeSearched}
/>
<div className={`${baseClass}__buttons`}>
<div className={`${baseClass}__buttons-wrap`}>
diff --git a/src/admin/components/elements/SearchFilter/index.tsx b/src/admin/components/elements/SearchFilter/index.tsx
index b1eb6422979..dfb5bb7022a 100644
--- a/src/admin/components/elements/SearchFilter/index.tsx
+++ b/src/admin/components/elements/SearchFilter/index.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useState } from 'react';
+import React, { useEffect, useRef, useState } from 'react';
import { useHistory } from 'react-router-dom';
import queryString from 'qs';
import { Props } from './types';
@@ -16,6 +16,7 @@ const SearchFilter: React.FC<Props> = (props) => {
fieldName = 'id',
fieldLabel = 'ID',
modifySearchQuery = true,
+ listSearchableFields,
handleChange,
} = props;
@@ -24,11 +25,32 @@ const SearchFilter: React.FC<Props> = (props) => {
const [search, setSearch] = useState(() => params?.where?.[fieldName]?.like || '');
+ const placeholder = useRef(`Search by ${fieldLabel}`);
+
const debouncedSearch = useDebounce(search, 300);
useEffect(() => {
- if (debouncedSearch !== params?.where?.[fieldName]?.like) {
- const newWhere = {
+ if (debouncedSearch || params?.where) {
+ let newWhere = listSearchableFields?.length > 0 ? {
+ ...(typeof params?.where === 'object' ? params.where : {}),
+ or: [
+ {
+ [fieldName]: {
+ like: debouncedSearch,
+ },
+ },
+ ...listSearchableFields.reduce<Record<string, unknown>[]>((prev, curr) => {
+ return [
+ ...prev,
+ {
+ [curr.name]: {
+ like: debouncedSearch,
+ },
+ },
+ ];
+ }, []),
+ ],
+ } : {
...(typeof params?.where === 'object' ? params.where : {}),
[fieldName]: {
like: debouncedSearch,
@@ -36,12 +58,12 @@ const SearchFilter: React.FC<Props> = (props) => {
};
if (!debouncedSearch) {
- delete newWhere[fieldName];
+ newWhere = undefined;
}
if (handleChange) handleChange(newWhere as Where);
- if (modifySearchQuery && params?.where?.[fieldName]?.like !== newWhere?.[fieldName]?.like) {
+ if (modifySearchQuery && queryString.stringify(params?.where) !== queryString.stringify(newWhere)) {
history.replace({
search: queryString.stringify({
...params,
@@ -51,13 +73,24 @@ const SearchFilter: React.FC<Props> = (props) => {
});
}
}
- }, [debouncedSearch, history, fieldName, params, handleChange, modifySearchQuery]);
+ }, [debouncedSearch, history, fieldName, params, handleChange, modifySearchQuery, listSearchableFields]);
+
+ useEffect(() => {
+ if (listSearchableFields?.length > 0) {
+ placeholder.current = listSearchableFields.reduce<string>((prev, curr, i) => {
+ if (i === listSearchableFields.length - 1) {
+ return `${prev} or ${curr.label || curr.name}`;
+ }
+ return `${prev}, ${curr.label || curr.name}`;
+ }, placeholder.current);
+ }
+ }, [listSearchableFields]);
return (
<div className={baseClass}>
<input
className={`${baseClass}__input`}
- placeholder={`Search by ${fieldLabel}`}
+ placeholder={placeholder.current}
type="text"
value={search || ''}
onChange={(e) => setSearch(e.target.value)}
diff --git a/src/admin/components/elements/SearchFilter/types.ts b/src/admin/components/elements/SearchFilter/types.ts
index 6111162196f..50e96381647 100644
--- a/src/admin/components/elements/SearchFilter/types.ts
+++ b/src/admin/components/elements/SearchFilter/types.ts
@@ -1,8 +1,10 @@
+import { FieldAffectingData } from '../../../../fields/config/types';
import { Where } from '../../../../types';
export type Props = {
fieldName?: string,
fieldLabel?: string,
modifySearchQuery?: boolean
+ listSearchableFields?: FieldAffectingData[]
handleChange?: (where: Where) => void
}
diff --git a/src/collections/config/schema.ts b/src/collections/config/schema.ts
index 58e7d7363c1..825cf6a68da 100644
--- a/src/collections/config/schema.ts
+++ b/src/collections/config/schema.ts
@@ -26,6 +26,7 @@ const collectionSchema = joi.object().keys({
admin: joi.object({
useAsTitle: joi.string(),
defaultColumns: joi.array().items(joi.string()),
+ listSearchableFields: joi.array().items(joi.string()),
group: joi.string(),
description: joi.alternatives().try(
joi.string(),
diff --git a/src/collections/config/types.ts b/src/collections/config/types.ts
index 80c2541acdf..c8d4ec15b66 100644
--- a/src/collections/config/types.ts
+++ b/src/collections/config/types.ts
@@ -27,14 +27,14 @@ export interface AuthCollectionModel extends CollectionModel {
}
export type HookOperationType =
-| 'create'
-| 'autosave'
-| 'read'
-| 'update'
-| 'delete'
-| 'refresh'
-| 'login'
-| 'forgotPassword';
+ | 'create'
+ | 'autosave'
+ | 'read'
+ | 'update'
+ | 'delete'
+ | 'refresh'
+ | 'login'
+ | 'forgotPassword';
type CreateOrUpdateOperation = Extract<HookOperationType, 'create' | 'update'>;
@@ -153,8 +153,12 @@ export type CollectionAdminOptions = {
*/
defaultColumns?: string[];
/**
- * Place collections into a navigational group
+ * Additional fields to be searched via the full text search
*/
+ listSearchableFields?: string[];
+ /**
+ * Place collections into a navigational group
+ * */
group?: string;
/**
* Custom description for collection
diff --git a/src/mongoose/buildQuery.ts b/src/mongoose/buildQuery.ts
index b1e90bed445..fcff2a451dc 100644
--- a/src/mongoose/buildQuery.ts
+++ b/src/mongoose/buildQuery.ts
@@ -121,7 +121,9 @@ class ParamParser {
// If the operation is properly formatted as an object
if (typeof condition === 'object') {
const result = await this.parsePathOrRelation(condition);
- completedConditions.push(result);
+ if (Object.keys(result).length > 0) {
+ completedConditions.push(result);
+ }
}
}
return completedConditions;
diff --git a/test/admin/config.ts b/test/admin/config.ts
index 318bf15866b..b0823537abc 100644
--- a/test/admin/config.ts
+++ b/test/admin/config.ts
@@ -56,6 +56,7 @@ export default buildConfig({
{
slug,
admin: {
+ listSearchableFields: ['title', 'description', 'number'],
group: 'One',
},
fields: [
@@ -67,6 +68,10 @@ export default buildConfig({
name: 'description',
type: 'text',
},
+ {
+ name: 'number',
+ type: 'number',
+ },
],
},
{
diff --git a/test/admin/e2e.spec.ts b/test/admin/e2e.spec.ts
index ad619884e67..420a18385fe 100644
--- a/test/admin/e2e.spec.ts
+++ b/test/admin/e2e.spec.ts
@@ -184,10 +184,26 @@ describe('admin', () => {
test('search by id', async () => {
const { id } = await createPost();
await page.locator('.search-filter__input').fill(id);
+ await wait(250);
const tableItems = page.locator(tableRowLocator);
await expect(tableItems).toHaveCount(1);
});
+ test('search by title or description', async () => {
+ await createPost({
+ title: 'find me',
+ description: 'this is fun',
+ });
+
+ await page.locator('.search-filter__input').fill('find me');
+ await wait(250);
+ await expect(page.locator(tableRowLocator)).toHaveCount(1);
+
+ await page.locator('.search-filter__input').fill('this is fun');
+ await wait(250);
+ await expect(page.locator(tableRowLocator)).toHaveCount(1);
+ });
+
test('toggle columns', async () => {
const columnCountLocator = 'table >> thead >> tr >> th';
await createPost();
diff --git a/test/devServer.ts b/test/devServer.ts
index 4926c5c109d..933ff6c917d 100644
--- a/test/devServer.ts
+++ b/test/devServer.ts
@@ -19,6 +19,11 @@ const init = async () => {
},
});
+ // Redirect root to Admin panel
+ expressApp.get('/', (_, res) => {
+ res.redirect('/admin');
+ });
+
const externalRouter = express.Router();
externalRouter.use(payload.authenticate);
|
4415f9db48efa951c6d48fe3203ca54ee052b783
|
2022-07-21 20:47:54
|
Elliot DeNolf
|
chore: add error message if test config doesn't exist
| false
|
add error message if test config doesn't exist
|
chore
|
diff --git a/test/dev.js b/test/dev.js
index 04d5e4c483f..d08f3d9ebaa 100644
--- a/test/dev.js
+++ b/test/dev.js
@@ -1,3 +1,4 @@
+const fs = require('fs');
const path = require('path');
const babelConfig = require('../babel.config');
@@ -15,6 +16,12 @@ require('@babel/register')({
const [testSuiteDir] = process.argv.slice(2);
const configPath = path.resolve(__dirname, testSuiteDir, 'config.ts');
+
+if (!fs.existsSync(configPath)) {
+ console.error('ERROR: You must pass a valid directory under test/ that contains a config.ts');
+ process.exit(1);
+}
+
process.env.PAYLOAD_CONFIG_PATH = configPath;
process.env.PAYLOAD_DROP_DATABASE = 'true';
|
796669279afb8fe23723ce36e6e47a44b7088b09
|
2023-11-01 21:11:35
|
Jarrod Flesch
|
fix: exclude files from dev bundle if aliased (#3957)
| false
|
exclude files from dev bundle if aliased (#3957)
|
fix
|
diff --git a/packages/bundler-vite/src/config.ts b/packages/bundler-vite/src/config.ts
index f91d2d76f6c..bce17ac84c1 100644
--- a/packages/bundler-vite/src/config.ts
+++ b/packages/bundler-vite/src/config.ts
@@ -91,6 +91,7 @@ export const getViteConfig = async (payloadConfig: SanitizedConfig): Promise<Inl
// Dependencies that need aliases should be excluded
// from pre-bundling
'@payloadcms/bundler-vite',
+ ...(Object.keys(absoluteAliases) || []),
],
include: ['payload/components/root', 'react-dom/client'],
},
|
16ad7a671ff48520f45ef1219906e62764773a9c
|
2025-01-14 21:44:37
|
Germán Jabloñski
|
fix(payload-cloud): add ts strict mode and fix a couple of wrong runtime behaviors (#10570)
| false
|
add ts strict mode and fix a couple of wrong runtime behaviors (#10570)
|
fix
|
diff --git a/packages/payload-cloud/src/email.ts b/packages/payload-cloud/src/email.ts
index 68d1a783833..cfc4956e597 100644
--- a/packages/payload-cloud/src/email.ts
+++ b/packages/payload-cloud/src/email.ts
@@ -7,7 +7,7 @@ type NodemailerAdapter = ReturnType<typeof nodemailerAdapter>
export const payloadCloudEmail = async (
args: PayloadCloudEmailOptions,
-): Promise<NodemailerAdapter> | undefined => {
+): Promise<NodemailerAdapter | undefined> => {
if (process.env.PAYLOAD_CLOUD !== 'true' || !args) {
return undefined
}
diff --git a/packages/payload-cloud/src/hooks/afterDelete.ts b/packages/payload-cloud/src/hooks/afterDelete.ts
index 820896b4263..968c960f72c 100644
--- a/packages/payload-cloud/src/hooks/afterDelete.ts
+++ b/packages/payload-cloud/src/hooks/afterDelete.ts
@@ -17,8 +17,10 @@ export const getAfterDeleteHook = ({
const { identityID, storageClient } = await getStorageClient()
const filesToDelete: string[] = [
- doc.filename,
- ...Object.values(doc?.sizes || []).map((resizedFileData) => resizedFileData?.filename),
+ doc.filename || '',
+ ...Object.values(doc?.sizes || [])
+ .map((resizedFileData) => resizedFileData.filename)
+ .filter((filename): filename is string => filename !== null),
]
const promises = filesToDelete.map(async (filename) => {
diff --git a/packages/payload-cloud/src/plugin.ts b/packages/payload-cloud/src/plugin.ts
index b23c0d0d559..21bf05571f2 100644
--- a/packages/payload-cloud/src/plugin.ts
+++ b/packages/payload-cloud/src/plugin.ts
@@ -128,7 +128,7 @@ export const payloadCloudPlugin =
return config
}
- const oldAutoRunCopy = config.jobs.autoRun
+ const oldAutoRunCopy = config.jobs.autoRun ?? []
const newAutoRun = async (payload: Payload) => {
const instance = generateRandomString()
diff --git a/packages/payload-cloud/src/staticHandler.ts b/packages/payload-cloud/src/staticHandler.ts
index f596132eef5..2e21132711f 100644
--- a/packages/payload-cloud/src/staticHandler.ts
+++ b/packages/payload-cloud/src/staticHandler.ts
@@ -11,7 +11,7 @@ interface Args {
}
// Convert a stream into a promise that resolves with a Buffer
-const streamToBuffer = async (readableStream) => {
+const streamToBuffer = async (readableStream: any) => {
const chunks = []
for await (const chunk of readableStream) {
chunks.push(typeof chunk === 'string' ? Buffer.from(chunk) : chunk)
@@ -52,7 +52,7 @@ export const getStaticHandler = ({ cachingOptions, collection }: Args): StaticHa
Key: key,
})
- if (!object.Body) {
+ if (!object.Body || !object.ContentType || !object.ETag) {
return new Response(null, { status: 404, statusText: 'Not Found' })
}
diff --git a/packages/payload-cloud/src/utilities/authAsCognitoUser.ts b/packages/payload-cloud/src/utilities/authAsCognitoUser.ts
index 3c2e6b8428f..4e48a750599 100644
--- a/packages/payload-cloud/src/utilities/authAsCognitoUser.ts
+++ b/packages/payload-cloud/src/utilities/authAsCognitoUser.ts
@@ -13,6 +13,13 @@ export const authAsCognitoUser = async (
return sessionAndToken
}
+ if (!process.env.PAYLOAD_CLOUD_COGNITO_USER_POOL_CLIENT_ID) {
+ throw new Error('PAYLOAD_CLOUD_COGNITO_USER_POOL_CLIENT_ID is required')
+ }
+ if (!process.env.PAYLOAD_CLOUD_COGNITO_USER_POOL_ID) {
+ throw new Error('PAYLOAD_CLOUD_COGNITO_USER_POOL_ID is required')
+ }
+
const userPool = new CognitoUserPool({
ClientId: process.env.PAYLOAD_CLOUD_COGNITO_USER_POOL_CLIENT_ID,
UserPoolId: process.env.PAYLOAD_CLOUD_COGNITO_USER_POOL_ID,
diff --git a/packages/payload-cloud/src/utilities/getStorageClient.ts b/packages/payload-cloud/src/utilities/getStorageClient.ts
index 4867e0c68b9..0aa70331e4a 100644
--- a/packages/payload-cloud/src/utilities/getStorageClient.ts
+++ b/packages/payload-cloud/src/utilities/getStorageClient.ts
@@ -23,6 +23,16 @@ export const getStorageClient: GetStorageClient = async () => {
}
}
+ if (!process.env.PAYLOAD_CLOUD_PROJECT_ID) {
+ throw new Error('PAYLOAD_CLOUD_PROJECT_ID is required')
+ }
+ if (!process.env.PAYLOAD_CLOUD_COGNITO_PASSWORD) {
+ throw new Error('PAYLOAD_CLOUD_COGNITO_PASSWORD is required')
+ }
+ if (!process.env.PAYLOAD_CLOUD_COGNITO_IDENTITY_POOL_ID) {
+ throw new Error('PAYLOAD_CLOUD_COGNITO_IDENTITY_POOL_ID is required')
+ }
+
session = await authAsCognitoUser(
process.env.PAYLOAD_CLOUD_PROJECT_ID,
process.env.PAYLOAD_CLOUD_COGNITO_PASSWORD,
diff --git a/packages/payload-cloud/tsconfig.json b/packages/payload-cloud/tsconfig.json
index 45209999a24..9f2129e174b 100644
--- a/packages/payload-cloud/tsconfig.json
+++ b/packages/payload-cloud/tsconfig.json
@@ -1,4 +1,7 @@
{
"extends": "../../tsconfig.base.json",
+ "compilerOptions": {
+ "strict": true
+ },
"references": [{ "path": "../payload" }]
}
|
940c1e84f5f091bf4b4ae0bd6628f077d9d0d6e9
|
2022-12-13 03:40:57
|
Damian Tziamtzis
|
fix: Set 'Dashboard's link to config route (#1652)
| false
|
Set 'Dashboard's link to config route (#1652)
|
fix
|
diff --git a/src/admin/components/elements/StepNav/index.tsx b/src/admin/components/elements/StepNav/index.tsx
index 2956509f398..cee0c87c59a 100644
--- a/src/admin/components/elements/StepNav/index.tsx
+++ b/src/admin/components/elements/StepNav/index.tsx
@@ -6,6 +6,7 @@ import { useTranslation } from 'react-i18next';
import Chevron from '../../icons/Chevron';
import { Context as ContextType } from './types';
import { getTranslation } from '../../../../utilities/getTranslation';
+import { useConfig } from '../../utilities/Config';
import './index.scss';
@@ -31,12 +32,14 @@ const StepNav: React.FC = () => {
const { t, i18n } = useTranslation();
const dashboardLabel = <span>{t('general:dashboard')}</span>;
const { stepNav } = useStepNav();
+ const config = useConfig();
+ const { routes: { admin } } = config;
return (
<nav className="step-nav">
{stepNav.length > 0
? (
- <Link to="/admin">
+ <Link to={`${admin}`}>
{dashboardLabel}
<Chevron />
</Link>
|
2f945919a385ca73d5a6997586044309e8053eb7
|
2023-10-17 20:54:50
|
Alessio Gravili
|
chore: disable props for useIntersect hook
| false
|
disable props for useIntersect hook
|
chore
|
diff --git a/packages/payload/src/admin/components/forms/RenderFields/index.tsx b/packages/payload/src/admin/components/forms/RenderFields/index.tsx
index aae4df5824d..b1d2a455a66 100644
--- a/packages/payload/src/admin/components/forms/RenderFields/index.tsx
+++ b/packages/payload/src/admin/components/forms/RenderFields/index.tsx
@@ -37,21 +37,13 @@ const RenderFields: React.FC<Props> = (props) => {
const { i18n, t } = useTranslation('general')
const [hasRendered, setHasRendered] = useState(Boolean(forceRender))
- const [intersectionRef, entry] = useIntersect(intersectionObserverOptions)
+ const [intersectionRef, entry] = useIntersect(intersectionObserverOptions, forceRender)
const isIntersecting = Boolean(entry?.isIntersecting)
const isAboveViewport = entry?.boundingClientRect?.top < 0
const shouldRender = forceRender || isIntersecting || isAboveViewport
const operation = useOperation()
- const actualDivRef = useRef(null)
-
- useEffect(() => {
- if (!forceRender && actualDivRef.current) {
- intersectionRef(actualDivRef.current)
- }
- }, [forceRender, actualDivRef, intersectionRef])
-
useEffect(() => {
if (shouldRender && !hasRendered) {
setHasRendered(true)
@@ -84,7 +76,7 @@ const RenderFields: React.FC<Props> = (props) => {
]
.filter(Boolean)
.join(' ')}
- ref={actualDivRef}
+ ref={intersectionRef}
>
{hasRendered &&
fieldsToRender.map((reducedField, fieldIndex) => {
diff --git a/packages/payload/src/admin/hooks/useIntersect.tsx b/packages/payload/src/admin/hooks/useIntersect.tsx
index c2c17ab2c99..42416b7bb7c 100644
--- a/packages/payload/src/admin/hooks/useIntersect.tsx
+++ b/packages/payload/src/admin/hooks/useIntersect.tsx
@@ -3,7 +3,10 @@ import { useEffect, useRef, useState } from 'react'
type Intersect = [setNode: React.Dispatch<Element>, entry: IntersectionObserverEntry]
-const useIntersect = ({ root = null, rootMargin = '0px', threshold = 0 } = {}): Intersect => {
+const useIntersect = (
+ { root = null, rootMargin = '0px', threshold = 0 } = {},
+ disable?: boolean,
+): Intersect => {
const [entry, updateEntry] = useState<IntersectionObserverEntry>()
const [node, setNode] = useState(null)
@@ -16,13 +19,16 @@ const useIntersect = ({ root = null, rootMargin = '0px', threshold = 0 } = {}):
)
useEffect(() => {
+ if (disable) {
+ return
+ }
const { current: currentObserver } = observer
currentObserver.disconnect()
if (node) currentObserver.observe(node)
return () => currentObserver.disconnect()
- }, [node])
+ }, [node, disable])
return [setNode, entry]
}
|
06fc8cbf4d1aeb0cc32e5d055d3aa13563ac51db
|
2023-02-20 07:34:41
|
Elliot DeNolf
|
chore: sizes property optional on create graphql resolver
| false
|
sizes property optional on create graphql resolver
|
chore
|
diff --git a/src/collections/graphql/resolvers/create.ts b/src/collections/graphql/resolvers/create.ts
index 6f02f06dcf1..17dd581ea64 100644
--- a/src/collections/graphql/resolvers/create.ts
+++ b/src/collections/graphql/resolvers/create.ts
@@ -7,7 +7,7 @@ import { Collection } from '../../config/types';
import create from '../../operations/create';
export type Resolver<TSlug extends keyof GeneratedTypes['collections']> = (_: unknown, args: {
- data: Omit<MarkOptional<GeneratedTypes['collections'][TSlug], 'id' | 'updatedAt' | 'createdAt'>, 'sizes'>,
+ data: MarkOptional<GeneratedTypes['collections'][TSlug], 'id' | 'updatedAt' | 'createdAt' | 'sizes'>,
locale?: string
draft: boolean
},
|
c7c6fca53733c24b4d708f370aa2c6ba8154383c
|
2024-08-22 19:06:17
|
Elliot DeNolf
|
chore(eslint): remove fixable from no-imports-from-self [skip ci]
| false
|
remove fixable from no-imports-from-self [skip ci]
|
chore
|
diff --git a/packages/eslint-plugin/customRules/no-imports-from-self.js b/packages/eslint-plugin/customRules/no-imports-from-self.js
index d8510e0f143..da6a9b51179 100644
--- a/packages/eslint-plugin/customRules/no-imports-from-self.js
+++ b/packages/eslint-plugin/customRules/no-imports-from-self.js
@@ -9,7 +9,6 @@ export const rule = {
category: 'Best Practices',
recommended: true,
},
- fixable: 'code',
schema: [],
},
|
d7c3b4e17a433e3d43bdec49f1dcdfcc3c9cdba7
|
2025-01-30 04:47:23
|
Jacob Fletcher
|
docs: admin preview and draft preview (#10875)
| false
|
admin preview and draft preview (#10875)
|
docs
|
diff --git a/docs/admin/components.mdx b/docs/admin/components.mdx
index 07b2ccb000d..2458ed48f5c 100644
--- a/docs/admin/components.mdx
+++ b/docs/admin/components.mdx
@@ -1,7 +1,7 @@
---
title: Swap in your own React components
label: Custom Components
-order: 40
+order: 20
desc: Fully customize your Admin Panel by swapping in your own React components. Add fields, remove views, update routes and change functions to sculpt your perfect Dashboard.
keywords: admin, components, custom, documentation, Content Management System, cms, headless, javascript, node, react, nextjs
---
diff --git a/docs/admin/hooks.mdx b/docs/admin/hooks.mdx
index dd83eaa483b..4c2c151bc24 100644
--- a/docs/admin/hooks.mdx
+++ b/docs/admin/hooks.mdx
@@ -1,7 +1,7 @@
---
title: React Hooks
label: React Hooks
-order: 70
+order: 40
desc: Make use of all of the powerful React hooks that Payload provides.
keywords: admin, components, custom, documentation, Content Management System, cms, headless, javascript, node, react, nextjs
---
diff --git a/docs/admin/overview.mdx b/docs/admin/overview.mdx
index e18c673f1bb..a02a7d94e92 100644
--- a/docs/admin/overview.mdx
+++ b/docs/admin/overview.mdx
@@ -6,7 +6,7 @@ desc: Manage your data and customize the Payload Admin Panel by swapping in your
keywords: admin, components, custom, customize, documentation, Content Management System, cms, headless, javascript, node, react, nextjs
---
-Payload dynamically generates a beautiful, [fully type-safe](../typescript/overview) Admin Panel to manage your users and data. It is highly performant, even with 100+ fields, and is translated in over 30 languages. Within the Admin Panel you can manage content, [render your site](../live-preview/overview), preview drafts, [diff versions](../versions/overview), and so much more.
+Payload dynamically generates a beautiful, [fully type-safe](../typescript/overview) Admin Panel to manage your users and data. It is highly performant, even with 100+ fields, and is translated in over 30 languages. Within the Admin Panel you can manage content, [render your site](../live-preview/overview), [preview drafts](./preview), [diff versions](../versions/overview), and so much more.
The Admin Panel is designed to [white-label your brand](https://payloadcms.com/blog/white-label-admin-ui). You can endlessly customize and extend the Admin UI by swapping in your own [Custom Components](./components)—everything from simple field labels to entire views can be modified or replaced to perfectly tailor the interface for your editors.
diff --git a/docs/admin/preview.mdx b/docs/admin/preview.mdx
new file mode 100644
index 00000000000..f55ab698e6d
--- /dev/null
+++ b/docs/admin/preview.mdx
@@ -0,0 +1,219 @@
+---
+title: Preview
+label: Preview
+order: 50
+desc: Enable links to your front-end to preview published or draft content.
+keywords: admin, components, preview, documentation, Content Management System, cms, headless, javascript, node, react, nextjs
+---
+
+Preview is a feature that allows you to generate a direct link to your front-end application. When enabled, a "preview" button will appear on the Edit View within the [Admin Panel](./overview) with an href pointing to the URL you provide. This will provide your editors with a quick way of navigating to the front-end application where that Document's data is represented. Otherwise, they'd have to determine that URL themselves which is not always straightforward especially in complex apps.
+
+The Preview feature can also be used to achieve something known as "Draft Preview". With Draft Preview, you can navigate to your front-end application and enter "draft mode", where your queries are modified to fetch draft content instead of published content. This is useful for seeing how your content will look before being published. [More details](#draft-preview).
+
+<Banner type="warning">
+ **Note:**
+ Preview is different than [Live Preview](../live-preview/overview). Live Preview loads your app within an iframe and renders it in the Admin Panel allowing you to see changes in real-time. Preview, on the other hand, allows you to generate a direct link to your front-end application.
+</Banner>
+
+To add Preview, pass a function to the `admin.preview` property in any [Collection Config](../configuration/collections#admin-options) or [Global Config](../configuration/globals#admin-options):
+
+```ts
+import type { CollectionConfig } from 'payload'
+
+export const Pages: CollectionConfig = {
+ slug: 'pages',
+ admin: {
+ preview: ({ slug }) => `http://localhost:3000/${slug}`,
+ },
+ fields: [
+ {
+ name: 'slug',
+ type: 'text',
+ }
+ ],
+}
+```
+
+## Options
+
+The `preview` function resolves to a string that points to your front-end application with additional URL parameters. This can be an absolute URL or a relative path, and can run async if needed.
+
+The following arguments are provided to the `preview` function:
+
+| Path | Description |
+| ------------------ | ----------------------------------------------------------------------------------------------------------------- |
+| **`doc`** | The data of the Document being edited. This includes changes that have not yet been saved. |
+| **`options`** | An object with additional properties. |
+
+The `options` object contains the following properties:
+
+| Path | Description |
+| ------------------ | ----------------------------------------------------------------------------------------------------------------- |
+| **`locale`** | The current locale of the Document being edited. |
+| **`req`** | The Payload Request object. |
+| **`token`** | The JWT token of the currently authenticated in user. |
+
+If your application requires a fully qualified URL, such as within deploying to Vercel Preview Deployments, you can use the `req` property to build this URL:
+
+```ts
+preview: (doc, { req }) => `${req.protocol}//${req.host}/${doc.slug}` // highlight-line
+```
+
+## Draft Preview
+
+The Preview feature can be used to achieve "Draft Preview", where you enter into a "draft mode" after clicking the preview button. While in "draft mode", you can adjust your page's query to include the `draft: true` in its params. Payload will read this param on the request, and when present, send back a draft document as opposed to a published one based on the document's `_status` field.
+
+To enter draft mode, the URL provided to the `preview` function can point to a custom endpoint in your front-end application that sets a cookie or session variable to indicate that you are in "draft mode". This is framework specific, so the mechanisms here very from framework to framework although the underlying concept is the same.
+
+### Next.js
+
+If you're using Next.js, you can do the following code to enter draft mode.
+
+#### Step 1: Create an API Route
+
+First, format your `preview` function to point to a custom endpoint that you'll open on your front-end. This URL will include a few key query search params:
+
+```ts
+import type { CollectionConfig } from 'payload'
+
+export const Pages: CollectionConfig = {
+ slug: 'pages',
+ admin: {
+ preview: ({ slug }, { req }) => {
+ const path = `/${slug}`
+
+ const encodedParams = new URLSearchParams({
+ slug,
+ collection,
+ path,
+ previewSecret: process.env.PREVIEW_SECRET
+ })
+
+ return `/next/preview?${encodedParams.toString()}` // highlight-line
+ }
+ },
+ fields: [
+ {
+ name: 'slug',
+ type: 'text',
+ }
+ ],
+}
+```
+
+#### Step 2: Create the Preview Route
+
+Then, create an API route that verifies the preview secret, authenticates the user, and enters draft mode:
+
+`/preview/route.ts`
+
+```ts
+import type { CollectionSlug, PayloadRequest, getPayload } from 'payload'
+
+import { draftMode } from 'next/headers'
+import { redirect } from 'next/navigation'
+
+import configPromise from '@payload-config'
+
+const payloadToken = 'payload-token'
+
+export async function GET(
+ req: {
+ cookies: {
+ get: (name: string) => {
+ value: string
+ }
+ }
+ } & Request,
+): Promise<Response> {
+ const payload = await getPayload({ config: configPromise })
+
+ const { searchParams } = new URL(req.url)
+
+ const path = searchParams.get('path')
+ const collection = searchParams.get('collection') as CollectionSlug
+ const slug = searchParams.get('slug')
+ const previewSecret = searchParams.get('previewSecret')
+
+ if (previewSecret !== process.env.PREVIEW_SECRET) {
+ return new Response('You are not allowed to preview this page', { status: 403 })
+ }
+
+ if (!path || !collection || !slug) {
+ return new Response('Insufficient search params', { status: 404 })
+ }
+
+ if (!path.startsWith('/')) {
+ return new Response('This endpoint can only be used for relative previews', { status: 500 })
+ }
+
+ let user
+
+ try {
+ user = await payload.auth({
+ req: req as unknown as PayloadRequest,
+ headers: req.headers,
+ })
+ } catch (error) {
+ payload.logger.error({ err: error }, 'Error verifying token for live preview')
+ return new Response('You are not allowed to preview this page', { status: 403 })
+ }
+
+ const draft = await draftMode()
+
+ // You can add additional checks here to see if the user is allowed to preview this page
+ if (!user) {
+ draft.disable()
+ return new Response('You are not allowed to preview this page', { status: 403 })
+ }
+
+ draft.enable()
+
+ redirect(path)
+}
+```
+
+#### Step 3: Query Draft Content
+
+Finally, in your front-end application, you can detect draft mode and adjust your queries to include drafts:
+
+`/pages/[slug].tsx`
+
+```ts
+export default async function Page({ params: paramsPromise }) {
+ const { slug = 'home' } = await paramsPromise
+
+ const { isEnabled: isDraftMode } = await draftMode()
+
+ const payload = await getPayload({ config })
+
+ const page = await payload.find({
+ collection: 'pages',
+ depth: 0,
+ draft: isDraftMode, // highlight-line
+ limit: 1,
+ overrideAccess: isDraftMode,
+ where: {
+ slug: {
+ equals: slug,
+ },
+ },
+ })?.then(({ docs }) => docs?.[0])
+
+ if (page === null) {
+ return notFound()
+ }
+
+ return (
+ <main>
+ <h1>{page?.title}</h1>
+ </main>
+ )
+}
+```
+
+<Banner type="success">
+ **Note:**
+ For fully working example of this, check of the official [Draft Preview Example](https://github.com/payloadcms/payload/tree/main/examples/draft-preview) in the [Examples Directory](https://github.com/payloadcms/payload/tree/main/examples).
+</Banner>
+
diff --git a/docs/admin/views.mdx b/docs/admin/views.mdx
index 25d3bfdec8a..e7eb88a8daa 100644
--- a/docs/admin/views.mdx
+++ b/docs/admin/views.mdx
@@ -1,7 +1,7 @@
---
title: Customizing Views
label: Customizing Views
-order: 50
+order: 30
desc:
keywords:
---
@@ -289,7 +289,7 @@ The following options are available:
### Document Tabs
-Each Document View can be given a new tab in the Edit View, if desired. Tabs are highly configurable, from as simple as changing the label to swapping out the entire component, they can be modified in any way. To add or customize tabs in the Edit View, use the `tab` key:
+Each Custom View can be given a new tab in the Edit View, if desired. Tabs are highly configurable, from as simple as changing the label to swapping out the entire component, they can be modified in any way. To add or customize tabs in the Edit View, use the `tab` key:
```ts
import type { SanitizedCollectionConfig } from 'payload'
diff --git a/docs/configuration/collections.mdx b/docs/configuration/collections.mdx
index e484626d51e..8416e772924 100644
--- a/docs/configuration/collections.mdx
+++ b/docs/configuration/collections.mdx
@@ -124,7 +124,7 @@ The following options are available:
| **`enableRichTextLink`** | The [Rich Text](../fields/rich-text) field features a `Link` element which allows for users to automatically reference related documents within their rich text. Set to `true` by default. |
| **`enableRichTextRelationship`** | The [Rich Text](../fields/rich-text) field features a `Relationship` element which allows for users to automatically reference related documents within their rich text. Set to `true` by default. |
| **`meta`** | Page metadata overrides to apply to this Collection within the Admin Panel. [More details](../admin/metadata). |
-| **`preview`** | Function to generate preview URLs within the Admin Panel that can point to your app. [More details](#preview). |
+| **`preview`** | Function to generate preview URLs within the Admin Panel that can point to your app. [More details](../admin/preview). |
| **`livePreview`** | Enable real-time editing for instant visual feedback of your front-end application. [More details](../live-preview/overview). |
| **`components`** | Swap in your own React components to be used within this Collection. [More details](#custom-components). |
| **`listSearchableFields`** | Specify which fields should be searched in the List search view. [More details](#list-searchable-fields). |
@@ -162,7 +162,7 @@ The following options are available:
| **`edit.SaveButton`** | Replace the default Save Button with a Custom Component. [Drafts](../versions/drafts) must be disabled. |
| **`edit.SaveDraftButton`** | Replace the default Save Draft Button with a Custom Component. [Drafts](../versions/drafts) must be enabled and autosave must be disabled. |
| **`edit.PublishButton`** | Replace the default Publish Button with a Custom Component. [Drafts](../versions/drafts) must be enabled. |
-| **`edit.PreviewButton`** | Replace the default Preview Button with a Custom Component. [Preview](#preview) must be enabled. |
+| **`edit.PreviewButton`** | Replace the default Preview Button with a Custom Component. [Preview](../admin/preview) must be enabled. |
| **`edit.Upload`** | Replace the default Upload component with a Custom Component. [Upload](../upload/overview) must be enabled. |
| **`views`** | Override or create new views within the Admin Panel. [More details](../admin/views). |
@@ -171,51 +171,6 @@ The following options are available:
For details on how to build Custom Components, see [Building Custom Components](../admin/components#building-custom-components).
</Banner>
-### Preview
-
-It is possible to display a Preview Button within the Edit View of the Admin Panel. This will allow editors to visit the frontend of your app the corresponds to the document they are actively editing. This way they can preview the latest, potentially unpublished changes.
-
-To configure the Preview Button, set the `admin.preview` property to a function in your Collection Config:
-
-```ts
-import type { CollectionConfig } from 'payload'
-
-export const Posts: CollectionConfig = {
- // ...
- admin: {
- // highlight-start
- preview: (doc, { locale }) => {
- if (doc?.slug) {
- return `/${doc.slug}?locale=${locale}`
- }
-
- return null
- },
- // highlight-end
- },
-}
-```
-
-The `preview` property resolves to a string that points to your front-end application with additional URL parameters. This can be an absolute URL or a relative path.
-
-The preview function receives two arguments:
-
-| Argument | Description |
-| --- | --- |
-| **`doc`** | The Document being edited. |
-| **`ctx`** | An object containing `locale`, `token`, and `req` properties. The `token` is the currently logged-in user's JWT. |
-
-If your application requires a fully qualified URL, such as within deploying to Vercel Preview Deployments, you can use the `req` property to build this URL:
-
-```ts
-preview: (doc, { req }) => `${req.protocol}//${req.host}/${doc.slug}` // highlight-line
-```
-
-<Banner type="success">
- **Note:**
- For fully working example of this, check of the official [Draft Preview Example](https://github.com/payloadcms/payload/tree/main/examples/draft-preview) in the [Examples Directory](https://github.com/payloadcms/payload/tree/main/examples).
-</Banner>
-
### Pagination
All Collections receive their own List View which displays a paginated list of documents that can be sorted and filtered. The pagination behavior of the List View can be customized on a per-Collection basis, and uses the same [Pagination](../queries/pagination) API that Payload provides.
diff --git a/docs/configuration/globals.mdx b/docs/configuration/globals.mdx
index 7f3db079283..2ae7cc28b59 100644
--- a/docs/configuration/globals.mdx
+++ b/docs/configuration/globals.mdx
@@ -120,7 +120,7 @@ The following options are available:
| **`group`** | Text or localization object used to group Collection and Global links in the admin navigation. Set to `false` to hide the link from the navigation while keeping its routes accessible. |
| **`hidden`** | Set to true or a function, called with the current user, returning true to exclude this Global from navigation and admin routing. |
| **`components`** | Swap in your own React components to be used within this Global. [More details](#custom-components). |
-| **`preview`** | Function to generate a preview URL within the Admin Panel for this Global that can point to your app. [More details](#preview). |
+| **`preview`** | Function to generate a preview URL within the Admin Panel for this Global that can point to your app. [More details](../admin/preview). |
| **`livePreview`** | Enable real-time editing for instant visual feedback of your front-end application. [More details](../live-preview/overview). |
| **`hideAPIURL`** | Hides the "API URL" meta field while editing documents within this collection. |
| **`meta`** | Page metadata overrides to apply to this Global within the Admin Panel. [More details](../admin/metadata). |
@@ -151,7 +151,7 @@ The following options are available:
| **`elements.SaveButton`** | Replace the default Save Button with a Custom Component. [Drafts](../versions/drafts) must be disabled. |
| **`elements.SaveDraftButton`** | Replace the default Save Draft Button with a Custom Component. [Drafts](../versions/drafts) must be enabled and autosave must be disabled. |
| **`elements.PublishButton`** | Replace the default Publish Button with a Custom Component. [Drafts](../versions/drafts) must be enabled. |
-| **`elements.PreviewButton`** | Replace the default Preview Button with a Custom Component. [Preview](#preview) must be enabled. |
+| **`elements.PreviewButton`** | Replace the default Preview Button with a Custom Component. [Preview](../admin/preview) must be enabled. |
| **`views`** | Override or create new views within the Admin Panel. [More details](../admin/views). |
<Banner type="success">
@@ -159,43 +159,6 @@ The following options are available:
For details on how to build Custom Components, see [Building Custom Components](../admin/components#building-custom-components).
</Banner>
-### Preview
-
-It is possible to display a Preview Button within the Edit View of the Admin Panel. This will allow editors to visit the frontend of your app the corresponds to the document they are actively editing. This way they can preview the latest, potentially unpublished changes.
-
-To configure the Preview Button, set the `admin.preview` property to a function in your Global Config:
-
-```ts
-import { GlobalConfig } from 'payload'
-
-export const MainMenu: GlobalConfig = {
- // ...
- admin: {
- // highlight-start
- preview: (doc, { locale }) => {
- if (doc?.slug) {
- return `/${doc.slug}?locale=${locale}`
- }
-
- return null
- },
- // highlight-end
- },
-}
-```
-
-The preview function receives two arguments:
-
-| Argument | Description |
-| --- | --- |
-| **`doc`** | The Document being edited. |
-| **`ctx`** | An object containing `locale` and `token` properties. The `token` is the currently logged-in user's JWT. |
-
-<Banner type="success">
- **Note:**
- For fully working example of this, check of the official [Draft Preview Example](https://github.com/payloadcms/payload/tree/main/examples/draft-preview) in the [Examples Directory](https://github.com/payloadcms/payload/tree/main/examples).
-</Banner>
-
## GraphQL
You can completely disable GraphQL for this global by passing `graphQL: false` to your global config. This will completely disable all queries, mutations, and types from appearing in your GraphQL schema.
diff --git a/docs/live-preview/overview.mdx b/docs/live-preview/overview.mdx
index 761c55036bd..1efde35bcc9 100644
--- a/docs/live-preview/overview.mdx
+++ b/docs/live-preview/overview.mdx
@@ -28,6 +28,7 @@ const config = buildConfig({
}
})
```
+
<Banner type="warning">
**Reminder:**
Alternatively, you can define the `admin.livePreview` property on individual [Collection Admin Configs](../configuration/collections#admin-options) and [Global Admin Configs](../configuration/globals#admin-options). Settings defined here will be merged into the top-level as overrides.
|
1bf7c4084c997be381052bb757c1b46fb551001c
|
2023-01-16 21:51:51
|
Elliot DeNolf
|
feat: remove javascript templates
| false
|
remove javascript templates
|
feat
|
diff --git a/src/lib/common-files/javascript/nodemon.json b/src/lib/common-files/javascript/nodemon.json
deleted file mode 100644
index 558e4b3ab0b..00000000000
--- a/src/lib/common-files/javascript/nodemon.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "exec": "node server.js"
-}
diff --git a/src/lib/common-files/javascript/package.template.json b/src/lib/common-files/javascript/package.template.json
deleted file mode 100644
index 79e4f50578e..00000000000
--- a/src/lib/common-files/javascript/package.template.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- "name": "payload-template-{{templateName}}",
- "description": "Payload project created from {{templateName}} template",
- "version": "1.0.0",
- "main": "server.js",
- "license": "MIT",
- "scripts": {
- "dev": "nodemon",
- "build": "payload build",
- "serve": "NODE_ENV=production node server.js"
- },
- "dependencies": {
- "payload": "1.1.17",
- "dotenv": "^8.2.0",
- "express": "^4.17.1"
- },
- "devDependencies": {
- "nodemon": "^2.0.6"
- }
-}
diff --git a/src/lib/common-files/typescript/nodemon.json b/src/lib/common-files/nodemon.json
similarity index 100%
rename from src/lib/common-files/typescript/nodemon.json
rename to src/lib/common-files/nodemon.json
diff --git a/src/lib/common-files/typescript/package.template.json b/src/lib/common-files/package.template.json
similarity index 100%
rename from src/lib/common-files/typescript/package.template.json
rename to src/lib/common-files/package.template.json
diff --git a/src/lib/common-files/typescript/tsconfig.json b/src/lib/common-files/tsconfig.json
similarity index 100%
rename from src/lib/common-files/typescript/tsconfig.json
rename to src/lib/common-files/tsconfig.json
diff --git a/src/lib/create-project.test.ts b/src/lib/create-project.test.ts
index ac9b3fdb6e3..d8dfe5b1658 100644
--- a/src/lib/create-project.test.ts
+++ b/src/lib/create-project.test.ts
@@ -31,10 +31,10 @@ describe('createProject', () => {
it('creates static project', async () => {
const expectedPayloadVersion = await getLatestPayloadVersion()
+ const templateName = 'todo'
const template: ProjectTemplate = {
- name: 'ts-todo',
+ name: templateName,
type: 'static',
- language: 'typescript',
}
await createProject(args, projectDir, template, packageManager)
@@ -45,7 +45,7 @@ describe('createProject', () => {
// Check package name and description
expect(packageJson.name).toEqual(path.basename(projectDir))
- expect(packageJson.description).toContain('ts-todo')
+ expect(packageJson.description).toContain(templateName)
// Check all common files are create
assertProjectFileExists('.npmrc')
diff --git a/src/lib/parse-language.ts b/src/lib/parse-language.ts
deleted file mode 100644
index 69ca550af0b..00000000000
--- a/src/lib/parse-language.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import prompts from 'prompts'
-import type { CliArgs } from '../types'
-
-export async function parseLanguage(args: CliArgs): Promise<string> {
- if (args['--template']) return args['--template']
-
- const response = await prompts(
- {
- type: 'select',
- name: 'value',
- message: 'Choose language',
- choices: [
- {
- title: 'javascript',
- value: 'js',
- },
- {
- title: 'typescript',
- value: 'ts',
- },
- ],
- validate: (value: string) => !!value.length,
- },
- {
- onCancel: () => {
- process.exit(0)
- },
- },
- )
-
- return response.value
-}
diff --git a/src/lib/parse-template.ts b/src/lib/parse-template.ts
index 027671fb34b..b68faa97e8e 100644
--- a/src/lib/parse-template.ts
+++ b/src/lib/parse-template.ts
@@ -4,7 +4,6 @@ import type { CliArgs, ProjectTemplate } from '../types'
export async function parseTemplate(
args: CliArgs,
validTemplates: ProjectTemplate[],
- language: string,
): Promise<ProjectTemplate> {
if (args['--template']) {
const templateName = args['--template']
@@ -13,9 +12,7 @@ export async function parseTemplate(
return template
}
- const filteredTemplates = validTemplates
- .filter(d => d.name.startsWith(language))
- .map(t => t.name.replace(`${language}-`, ''))
+ const filteredTemplates = validTemplates.map(t => t.name)
const response = await prompts(
{
@@ -23,7 +20,7 @@ export async function parseTemplate(
name: 'value',
message: 'Choose project template',
choices: filteredTemplates.map(p => {
- return { title: p, value: `${language}-${p}` }
+ return { title: p, value: p }
}),
validate: (value: string) => !!value.length,
},
@@ -34,7 +31,6 @@ export async function parseTemplate(
},
)
- // const template = `${language}-${response.value}`
const template = validTemplates.find(t => t.name === response.value)
if (!template) throw new Error('Template is undefined')
diff --git a/src/lib/templates.ts b/src/lib/templates.ts
index 32f95ac8d13..7ee0e726469 100644
--- a/src/lib/templates.ts
+++ b/src/lib/templates.ts
@@ -21,7 +21,6 @@ export async function getValidTemplates(): Promise<ProjectTemplate[]> {
return {
name,
type: 'static',
- language: name.startsWith('js-') ? 'javascript' : 'typescript',
}
})
return templates
diff --git a/src/lib/write-common-files.ts b/src/lib/write-common-files.ts
index 6b9f1c6ced9..392d3ef6cd6 100644
--- a/src/lib/write-common-files.ts
+++ b/src/lib/write-common-files.ts
@@ -22,7 +22,7 @@ export async function writeCommonFiles(
// package.json
const packageJsonTemplate = await fse.readFile(
- path.resolve(commonFilesDir, template.language, 'package.template.json'),
+ path.resolve(commonFilesDir, 'package.template.json'),
'utf8',
)
const packageJson = handlebars.compile(packageJsonTemplate)({
@@ -33,7 +33,7 @@ export async function writeCommonFiles(
await fse.writeFile(path.resolve(projectDir, 'package.json'), packageJson)
// nodemon.json
- const nodemon = path.resolve(commonFilesDir, template.language, 'nodemon.json')
+ const nodemon = path.resolve(commonFilesDir, 'nodemon.json')
const nodemonDest = path.resolve(projectDir, 'nodemon.json')
await fse.copy(nodemon, nodemonDest)
@@ -49,11 +49,9 @@ export async function writeCommonFiles(
await fse.writeFile(path.resolve(projectDir, 'README.md'), readme)
// tsconfig.json
- if (template.language === 'typescript') {
- const tsconfig = path.resolve(commonFilesDir, template.language, 'tsconfig.json')
- const tsconfigDest = path.resolve(projectDir, 'tsconfig.json')
- await fse.copy(tsconfig, tsconfigDest)
- }
+ const tsconfig = path.resolve(commonFilesDir, 'tsconfig.json')
+ const tsconfigDest = path.resolve(projectDir, 'tsconfig.json')
+ await fse.copy(tsconfig, tsconfigDest)
// docker-compose.yml
const dockerComposeTemplate = await fse.readFile(
diff --git a/src/main.ts b/src/main.ts
index 064adc81d59..944aed5cec2 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -4,7 +4,6 @@ import commandExists from 'command-exists'
import { createProject } from './lib/create-project'
import { getDatabaseConnection } from './lib/get-db-connection'
import { generateSecret } from './lib/generate-secret'
-import { parseLanguage } from './lib/parse-language'
import { parseProjectName } from './lib/parse-project-name'
import { parseTemplate } from './lib/parse-template'
import { getValidTemplates, validateTemplate } from './lib/templates'
@@ -55,9 +54,8 @@ export class Main {
console.log(welcomeMessage)
const projectName = await parseProjectName(this.args)
- const language = await parseLanguage(this.args)
const validTemplates = await getValidTemplates()
- const template = await parseTemplate(this.args, validTemplates, language)
+ const template = await parseTemplate(this.args, validTemplates)
const databaseUri = await getDatabaseConnection(this.args, projectName)
const payloadSecret = await generateSecret()
const projectDir =
diff --git a/src/templates/ts-blank/src/collections/Examples.ts b/src/templates/blank/src/collections/Examples.ts
similarity index 100%
rename from src/templates/ts-blank/src/collections/Examples.ts
rename to src/templates/blank/src/collections/Examples.ts
diff --git a/src/templates/ts-blank/src/collections/Users.ts b/src/templates/blank/src/collections/Users.ts
similarity index 100%
rename from src/templates/ts-blank/src/collections/Users.ts
rename to src/templates/blank/src/collections/Users.ts
diff --git a/src/templates/ts-blank/src/payload.config.ts b/src/templates/blank/src/payload.config.ts
similarity index 100%
rename from src/templates/ts-blank/src/payload.config.ts
rename to src/templates/blank/src/payload.config.ts
diff --git a/src/templates/ts-blank/src/server.ts b/src/templates/blank/src/server.ts
similarity index 100%
rename from src/templates/ts-blank/src/server.ts
rename to src/templates/blank/src/server.ts
diff --git a/src/templates/ts-blog/src/collections/Categories.ts b/src/templates/blog/src/collections/Categories.ts
similarity index 100%
rename from src/templates/ts-blog/src/collections/Categories.ts
rename to src/templates/blog/src/collections/Categories.ts
diff --git a/src/templates/ts-blog/src/collections/Posts.ts b/src/templates/blog/src/collections/Posts.ts
similarity index 100%
rename from src/templates/ts-blog/src/collections/Posts.ts
rename to src/templates/blog/src/collections/Posts.ts
diff --git a/src/templates/ts-blog/src/collections/Tags.ts b/src/templates/blog/src/collections/Tags.ts
similarity index 100%
rename from src/templates/ts-blog/src/collections/Tags.ts
rename to src/templates/blog/src/collections/Tags.ts
diff --git a/src/templates/ts-blog/src/collections/Users.ts b/src/templates/blog/src/collections/Users.ts
similarity index 100%
rename from src/templates/ts-blog/src/collections/Users.ts
rename to src/templates/blog/src/collections/Users.ts
diff --git a/src/templates/ts-blog/src/payload.config.ts b/src/templates/blog/src/payload.config.ts
similarity index 100%
rename from src/templates/ts-blog/src/payload.config.ts
rename to src/templates/blog/src/payload.config.ts
diff --git a/src/templates/ts-blog/src/server.ts b/src/templates/blog/src/server.ts
similarity index 100%
rename from src/templates/ts-blog/src/server.ts
rename to src/templates/blog/src/server.ts
diff --git a/src/templates/js-blank/collections/Examples.js b/src/templates/js-blank/collections/Examples.js
deleted file mode 100644
index 06cc694a588..00000000000
--- a/src/templates/js-blank/collections/Examples.js
+++ /dev/null
@@ -1,15 +0,0 @@
-// Example Collection - For reference only, this must be added to payload.config.js to be used.
-const Examples = {
- slug: 'examples',
- admin: {
- useAsTitle: 'someField',
- },
- fields: [
- {
- name: 'someField',
- type: 'text',
- },
- ],
-}
-
-export default Examples;
\ No newline at end of file
diff --git a/src/templates/js-blank/collections/Users.js b/src/templates/js-blank/collections/Users.js
deleted file mode 100644
index b6dedcd7b83..00000000000
--- a/src/templates/js-blank/collections/Users.js
+++ /dev/null
@@ -1,16 +0,0 @@
-const Users = {
- slug: 'users',
- auth: true,
- admin: {
- useAsTitle: 'email',
- },
- access: {
- read: () => true,
- },
- fields: [
- // Email added by default
- // Add more fields as needed
- ],
-};
-
-export default Users;
\ No newline at end of file
diff --git a/src/templates/js-blank/payload.config.js b/src/templates/js-blank/payload.config.js
deleted file mode 100644
index 3ce7c4f1821..00000000000
--- a/src/templates/js-blank/payload.config.js
+++ /dev/null
@@ -1,15 +0,0 @@
-import { buildConfig } from 'payload/config';
-import Examples from './collections/Examples';
-import Users from './collections/Users';
-
-export default buildConfig({
- serverURL: 'http://localhost:3000',
- admin: {
- user: Users.slug,
- },
- collections: [
- Users,
- // Add Collections here
- // Examples
- ],
-});
diff --git a/src/templates/js-blank/server.js b/src/templates/js-blank/server.js
deleted file mode 100644
index 07ca00b5b06..00000000000
--- a/src/templates/js-blank/server.js
+++ /dev/null
@@ -1,24 +0,0 @@
-const express = require('express');
-const payload = require('payload');
-
-require('dotenv').config();
-const app = express();
-
-// Redirect root to Admin panel
-app.get('/', (_, res) => {
- res.redirect('/admin');
-});
-
-// Initialize Payload
-payload.init({
- secret: process.env.PAYLOAD_SECRET,
- mongoURL: process.env.MONGODB_URI,
- express: app,
- onInit: () => {
- payload.logger.info(`Payload Admin URL: ${payload.getAdminURL()}`);
- },
-});
-
-// Add your own express routes here
-
-app.listen(3000);
diff --git a/src/templates/js-blog/collections/Categories.js b/src/templates/js-blog/collections/Categories.js
deleted file mode 100644
index 902db6a3f41..00000000000
--- a/src/templates/js-blog/collections/Categories.js
+++ /dev/null
@@ -1,18 +0,0 @@
-const Categories = {
- slug: 'categories',
- admin: {
- useAsTitle: 'name',
- },
- access: {
- read: () => true,
- },
- fields: [
- {
- name: 'name',
- type: 'text',
- },
- ],
- timestamps: false,
-}
-
-export default Categories;
\ No newline at end of file
diff --git a/src/templates/js-blog/collections/Posts.js b/src/templates/js-blog/collections/Posts.js
deleted file mode 100644
index cabdf269f2f..00000000000
--- a/src/templates/js-blog/collections/Posts.js
+++ /dev/null
@@ -1,60 +0,0 @@
-const Posts = {
- slug: 'posts',
- admin: {
- defaultColumns: ['title', 'author', 'category', 'tags', 'status'],
- useAsTitle: 'title',
- },
- access: {
- read: () => true,
- },
- fields: [
- {
- name: 'title',
- type: 'text',
- },
- {
- name: 'author',
- type: 'relationship',
- relationTo: 'users',
- },
- {
- name: 'publishedDate',
- type: 'date',
- },
- {
- name: 'category',
- type: 'relationship',
- relationTo: 'categories'
- },
- {
- name: 'tags',
- type: 'relationship',
- relationTo: 'tags',
- hasMany: true,
- },
- {
- name: 'content',
- type: 'richText'
- },
- {
- name: 'status',
- type: 'select',
- options: [
- {
- value: 'draft',
- label: 'Draft',
- },
- {
- value: 'published',
- label: 'Published',
- },
- ],
- defaultValue: 'draft',
- admin: {
- position: 'sidebar',
- }
- }
- ],
-}
-
-export default Posts;
\ No newline at end of file
diff --git a/src/templates/js-blog/collections/Tags.js b/src/templates/js-blog/collections/Tags.js
deleted file mode 100644
index 332cf55562f..00000000000
--- a/src/templates/js-blog/collections/Tags.js
+++ /dev/null
@@ -1,18 +0,0 @@
-const Tags = {
- slug: 'tags',
- admin: {
- useAsTitle: 'name',
- },
- access: {
- read: () => true,
- },
- fields: [
- {
- name: 'name',
- type: 'text',
- },
- ],
- timestamps: false,
-}
-
-export default Tags;
\ No newline at end of file
diff --git a/src/templates/js-blog/collections/Users.js b/src/templates/js-blog/collections/Users.js
deleted file mode 100644
index cbb85230f34..00000000000
--- a/src/templates/js-blog/collections/Users.js
+++ /dev/null
@@ -1,19 +0,0 @@
-const Users = {
- slug: 'users',
- auth: true,
- admin: {
- useAsTitle: 'email',
- },
- access: {
- read: () => true,
- },
- fields: [
- // Email added by default
- {
- name: 'name',
- type: 'text',
- }
- ],
-};
-
-export default Users;
\ No newline at end of file
diff --git a/src/templates/js-blog/payload.config.js b/src/templates/js-blog/payload.config.js
deleted file mode 100644
index 8de11c2b677..00000000000
--- a/src/templates/js-blog/payload.config.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import { buildConfig } from 'payload/config';
-import Categories from './collections/Categories';
-import Posts from './collections/Posts';
-import Tags from './collections/Tags';
-import Users from './collections/Users';
-
-export default buildConfig({
- serverURL: 'http://localhost:3000',
- admin: {
- user: Users.slug,
- },
- collections: [
- Categories,
- Posts,
- Tags,
- Users,
- ],
-});
diff --git a/src/templates/js-blog/server.js b/src/templates/js-blog/server.js
deleted file mode 100644
index 07ca00b5b06..00000000000
--- a/src/templates/js-blog/server.js
+++ /dev/null
@@ -1,24 +0,0 @@
-const express = require('express');
-const payload = require('payload');
-
-require('dotenv').config();
-const app = express();
-
-// Redirect root to Admin panel
-app.get('/', (_, res) => {
- res.redirect('/admin');
-});
-
-// Initialize Payload
-payload.init({
- secret: process.env.PAYLOAD_SECRET,
- mongoURL: process.env.MONGODB_URI,
- express: app,
- onInit: () => {
- payload.logger.info(`Payload Admin URL: ${payload.getAdminURL()}`);
- },
-});
-
-// Add your own express routes here
-
-app.listen(3000);
diff --git a/src/templates/js-todo/collections/TodoLists.js b/src/templates/js-todo/collections/TodoLists.js
deleted file mode 100644
index 41473ba6a26..00000000000
--- a/src/templates/js-todo/collections/TodoLists.js
+++ /dev/null
@@ -1,36 +0,0 @@
-const Todo = {
- slug: 'todos',
- admin: {
- defaultColumns: ['listName', 'tasks', 'updatedAt'],
- useAsTitle: 'listName',
- },
- access: {
- create: () => true,
- read: () => true,
- update: () => true,
- delete: () => true,
- },
- fields: [
- {
- name: 'listName',
- type: 'text',
- },
- {
- name: 'tasks',
- type: 'array',
- fields: [
- {
- name: 'name',
- type: 'text',
- },
- {
- name: 'complete',
- type: 'checkbox',
- defaultValue: false,
- }
- ]
- },
- ],
-}
-
-export default Todo;
\ No newline at end of file
diff --git a/src/templates/js-todo/collections/Users.js b/src/templates/js-todo/collections/Users.js
deleted file mode 100644
index b6dedcd7b83..00000000000
--- a/src/templates/js-todo/collections/Users.js
+++ /dev/null
@@ -1,16 +0,0 @@
-const Users = {
- slug: 'users',
- auth: true,
- admin: {
- useAsTitle: 'email',
- },
- access: {
- read: () => true,
- },
- fields: [
- // Email added by default
- // Add more fields as needed
- ],
-};
-
-export default Users;
\ No newline at end of file
diff --git a/src/templates/js-todo/payload.config.js b/src/templates/js-todo/payload.config.js
deleted file mode 100644
index 814ec444fd0..00000000000
--- a/src/templates/js-todo/payload.config.js
+++ /dev/null
@@ -1,14 +0,0 @@
-import { buildConfig } from 'payload/config';
-import TodoLists from './collections/TodoLists';
-import Users from './collections/Users';
-
-export default buildConfig({
- serverURL: 'http://localhost:3000',
- admin: {
- user: Users.slug,
- },
- collections: [
- TodoLists,
- Users,
- ],
-});
diff --git a/src/templates/js-todo/server.js b/src/templates/js-todo/server.js
deleted file mode 100644
index 07ca00b5b06..00000000000
--- a/src/templates/js-todo/server.js
+++ /dev/null
@@ -1,24 +0,0 @@
-const express = require('express');
-const payload = require('payload');
-
-require('dotenv').config();
-const app = express();
-
-// Redirect root to Admin panel
-app.get('/', (_, res) => {
- res.redirect('/admin');
-});
-
-// Initialize Payload
-payload.init({
- secret: process.env.PAYLOAD_SECRET,
- mongoURL: process.env.MONGODB_URI,
- express: app,
- onInit: () => {
- payload.logger.info(`Payload Admin URL: ${payload.getAdminURL()}`);
- },
-});
-
-// Add your own express routes here
-
-app.listen(3000);
diff --git a/src/templates/ts-todo/src/collections/TodoLists.ts b/src/templates/todo/src/collections/TodoLists.ts
similarity index 100%
rename from src/templates/ts-todo/src/collections/TodoLists.ts
rename to src/templates/todo/src/collections/TodoLists.ts
diff --git a/src/templates/ts-todo/src/collections/Users.ts b/src/templates/todo/src/collections/Users.ts
similarity index 100%
rename from src/templates/ts-todo/src/collections/Users.ts
rename to src/templates/todo/src/collections/Users.ts
diff --git a/src/templates/ts-todo/src/payload.config.ts b/src/templates/todo/src/payload.config.ts
similarity index 100%
rename from src/templates/ts-todo/src/payload.config.ts
rename to src/templates/todo/src/payload.config.ts
diff --git a/src/templates/ts-todo/src/server.ts b/src/templates/todo/src/server.ts
similarity index 100%
rename from src/templates/ts-todo/src/server.ts
rename to src/templates/todo/src/server.ts
diff --git a/src/types.ts b/src/types.ts
index 819c3d4216a..c9e5309e337 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -31,5 +31,4 @@ export interface GitTemplate extends Template {
interface Template {
name: string
type: 'static' | 'starter'
- language: 'typescript' | 'javascript'
}
|
dbaecda0e92fcb0fa67b4c5ac085e025f02de53a
|
2023-12-06 19:57:43
|
Dan Ribbens
|
fix(db-postgres): sorting on a not-configured field throws error (#4382)
| false
|
sorting on a not-configured field throws error (#4382)
|
fix
|
diff --git a/packages/db-postgres/src/queries/buildQuery.ts b/packages/db-postgres/src/queries/buildQuery.ts
index 85453773490..9020a77dd93 100644
--- a/packages/db-postgres/src/queries/buildQuery.ts
+++ b/packages/db-postgres/src/queries/buildQuery.ts
@@ -64,20 +64,25 @@ const buildQuery = async function buildQuery({
orderBy.order = asc
}
- const { columnName: sortTableColumnName, table: sortTable } = getTableColumnFromPath({
- adapter,
- collectionPath: sortPath,
- fields,
- joinAliases,
- joins,
- locale,
- pathSegments: sortPath.replace(/__/g, '.').split('.'),
- selectFields,
- tableName,
- })
+ try {
+ const { columnName: sortTableColumnName, table: sortTable } = getTableColumnFromPath({
+ adapter,
+ collectionPath: sortPath,
+ fields,
+ joinAliases,
+ joins,
+ locale,
+ pathSegments: sortPath.replace(/__/g, '.').split('.'),
+ selectFields,
+ tableName,
+ })
+ orderBy.column = sortTable?.[sortTableColumnName]
+ } catch (err) {
+ // continue
+ }
+ }
- orderBy.column = sortTable[sortTableColumnName]
- } else {
+ if (!orderBy?.column) {
orderBy.order = desc
const createdAt = adapter.tables[tableName]?.createdAt
diff --git a/test/collections-rest/int.spec.ts b/test/collections-rest/int.spec.ts
index c968f82fcbf..c9753073300 100644
--- a/test/collections-rest/int.spec.ts
+++ b/test/collections-rest/int.spec.ts
@@ -614,6 +614,14 @@ describe('collections-rest', () => {
expect(status).toEqual(200)
expect(result.docs).toHaveLength(1)
})
+
+ it('should not error when attempting to sort on a field that does not exist', async () => {
+ const { status } = await client.find({
+ sort: 'fake',
+ })
+
+ expect(status).toStrictEqual(200)
+ })
})
describe('Operators', () => {
diff --git a/test/helpers/rest.ts b/test/helpers/rest.ts
index ec7fa69fdac..f50bac602d3 100644
--- a/test/helpers/rest.ts
+++ b/test/helpers/rest.ts
@@ -37,6 +37,7 @@ type FindArgs = {
page?: number
query?: Where
slug?: string
+ sort?: string
}
type FindByIDArgs = {
@@ -102,8 +103,8 @@ type DocsResponse<T> = {
}
const headers = {
- 'Content-Type': 'application/json',
Authorization: '',
+ 'Content-Type': 'application/json',
}
type QueryResponse<T> = {
@@ -144,7 +145,7 @@ export class RESTClient {
const response = await fetch(`${this.serverURL}/api/${slug}`, options)
const { status } = response
const { doc } = await response.json()
- return { status, doc }
+ return { doc, status }
}
async delete<T = any>(id: string, args?: DeleteArgs): Promise<DocResponse<T>> {
@@ -161,7 +162,7 @@ export class RESTClient {
const response = await fetch(`${this.serverURL}/api/${slug}/${id}`, options)
const { status } = response
const doc = await response.json()
- return { status, doc }
+ return { doc, status }
}
async deleteMany<T = any>(args: DeleteManyArgs): Promise<DocsResponse<T>> {
@@ -188,7 +189,7 @@ export class RESTClient {
const response = await fetch(`${this.serverURL}/api/${slug}${formattedQs}`, options)
const { status } = response
const json = await response.json()
- return { status, docs: json.docs, errors: json.errors }
+ return { docs: json.docs, errors: json.errors, status }
}
async endpoint<T = any>(
@@ -205,7 +206,7 @@ export class RESTClient {
const response = await fetch(`${this.serverURL}${path}`, options)
const { status } = response
const data = await response.json()
- return { status, data }
+ return { data, status }
}
async endpointWithAuth<T = any>(
@@ -226,7 +227,7 @@ export class RESTClient {
const response = await fetch(`${this.serverURL}${path}`, options)
const { status } = response
const data = await response.json()
- return { status, data }
+ return { data, status }
}
async find<T = any>(args?: FindArgs): Promise<QueryResponse<T>> {
@@ -243,6 +244,7 @@ export class RESTClient {
...(args?.query ? { where: args.query } : {}),
limit: args?.limit,
page: args?.page,
+ sort: args?.sort,
},
{
addQueryPrefix: true,
@@ -254,7 +256,7 @@ export class RESTClient {
const { status } = response
const result = await response.json()
if (result.errors) throw new Error(result.errors[0].message)
- return { status, result }
+ return { result, status }
}
async findByID<T = any>(args: FindByIDArgs): Promise<DocResponse<T>> {
@@ -274,7 +276,7 @@ export class RESTClient {
)
const { status } = response
const doc = await response.json()
- return { status, doc }
+ return { doc, status }
}
async findGlobal<T = any>(args?: FindGlobalArgs): Promise<DocResponse<T>> {
@@ -290,14 +292,14 @@ export class RESTClient {
const response = await fetch(`${this.serverURL}/api/globals/${slug}`, options)
const { status } = response
const doc = await response.json()
- return { status, doc }
+ return { doc, status }
}
async login(incomingArgs?: LoginArgs): Promise<string> {
const args = incomingArgs ?? {
+ collection: 'users',
email: devUser.email,
password: devUser.password,
- collection: 'users',
}
const response = await fetch(`${this.serverURL}/api/${args.collection}/login`, {
@@ -337,7 +339,7 @@ export class RESTClient {
}
async update<T = any>(args: UpdateArgs<T>): Promise<DocResponse<T>> {
- const { id, query, data } = args
+ const { id, data, query } = args
const options = {
body: JSON.stringify(data),
@@ -354,7 +356,7 @@ export class RESTClient {
const response = await fetch(`${this.serverURL}/api/${slug}/${id}${formattedQs}`, options)
const { status } = response
const json = await response.json()
- return { status, doc: json.doc, errors: json.errors }
+ return { doc: json.doc, errors: json.errors, status }
}
async updateGlobal<T = any>(args: UpdateGlobalArgs): Promise<DocResponse<T>> {
@@ -373,7 +375,7 @@ export class RESTClient {
const response = await fetch(`${this.serverURL}/api/globals/${slug}`, options)
const { status } = response
const { result } = await response.json()
- return { status, doc: result }
+ return { doc: result, status }
}
async updateMany<T = any>(args: UpdateManyArgs<T>): Promise<DocsResponse<T>> {
@@ -401,6 +403,6 @@ export class RESTClient {
const response = await fetch(`${this.serverURL}/api/${slug}${formattedQs}`, options)
const { status } = response
const json = await response.json()
- return { status, docs: json.docs, errors: json.errors }
+ return { docs: json.docs, errors: json.errors, status }
}
}
|
f1840a5f6caba710d46925c6a10ffd4d08453baf
|
2021-12-31 07:43:18
|
James
|
chore: adds draft tests
| false
|
adds draft tests
|
chore
|
diff --git a/src/collections/operations/findByID.ts b/src/collections/operations/findByID.ts
index 0bdfccc1a91..7035257f3eb 100644
--- a/src/collections/operations/findByID.ts
+++ b/src/collections/operations/findByID.ts
@@ -125,8 +125,7 @@ async function findByID<T extends TypeWithID = any>(this: Payload, incomingArgs:
if (!result) {
if (!disableErrors) {
- if (!hasWhereAccess) throw new NotFound();
- if (hasWhereAccess) throw new Forbidden();
+ throw new NotFound();
}
return null;
diff --git a/src/versions/tests/rest.spec.ts b/src/versions/tests/rest.spec.ts
index c2eabfec7ad..42d74d1b8a7 100644
--- a/src/versions/tests/rest.spec.ts
+++ b/src/versions/tests/rest.spec.ts
@@ -152,4 +152,27 @@ describe('Versions - REST', () => {
expect(restoredPost.title).toBe(restore.doc.title);
});
});
+
+ describe('Draft Access Control', () => {
+ it('should prevent a draft from being publicly readable', async () => {
+ const badAttempt = await fetch(`${url}/api/autosave-posts/${postID}`);
+ expect(badAttempt.status).toBe(404);
+ });
+
+ it('should prevent an authenticated user from retrieving drafts without asking', async () => {
+ const badAttempt = await fetch(`${url}/api/autosave-posts/${postID}`, {
+ headers,
+ });
+
+ expect(badAttempt.status).toBe(404);
+ });
+
+ it('should allow an authenticated user to explicitly retrieve draft', async () => {
+ const badAttempt = await fetch(`${url}/api/autosave-posts/${postID}?draft=true`, {
+ headers,
+ });
+
+ expect(badAttempt.status).toBe(200);
+ });
+ });
});
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.