Skip to content

Commit

Permalink
update payload
Browse files Browse the repository at this point in the history
  • Loading branch information
@jpgrusling
jpgrusling committed Nov 17, 2024
1 parent f36b41a commit 4adfbaa
Show file tree
Hide file tree
Showing 9 changed files with 256 additions and 639 deletions.
2 changes: 1 addition & 1 deletion apps/astro/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"astro": "^4.16.13",
"cross-env": "^7.0.3",
"eslint": "^9.14.0",
"payload": "3.0.0-beta.130",
"payload": "3.0.0-beta.134",
"prettier": "^3.3.3",
"react": "catalog:next15",
"react-dom": "catalog:next15",
Expand Down
20 changes: 10 additions & 10 deletions apps/payload/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,20 +26,20 @@
"@local/env": "workspace:*",
"@local/payload": "workspace:*",
"@local/ui": "workspace:*",
"@payloadcms/db-mongodb": "3.0.0-beta.130",
"@payloadcms/db-sqlite": "3.0.0-beta.130",
"@payloadcms/graphql": "3.0.0-beta.130",
"@payloadcms/live-preview-react": "3.0.0-beta.130",
"@payloadcms/next": "3.0.0-beta.130",
"@payloadcms/plugin-nested-docs": "3.0.0-beta.130",
"@payloadcms/plugin-redirects": "3.0.0-beta.130",
"@payloadcms/plugin-seo": "3.0.0-beta.130",
"@payloadcms/richtext-lexical": "3.0.0-beta.130",
"@payloadcms/db-mongodb": "3.0.0-beta.134",
"@payloadcms/db-sqlite": "3.0.0-beta.134",
"@payloadcms/graphql": "3.0.0-beta.134",
"@payloadcms/live-preview-react": "3.0.0-beta.134",
"@payloadcms/next": "3.0.0-beta.134",
"@payloadcms/plugin-nested-docs": "3.0.0-beta.134",
"@payloadcms/plugin-redirects": "3.0.0-beta.134",
"@payloadcms/plugin-seo": "3.0.0-beta.134",
"@payloadcms/richtext-lexical": "3.0.0-beta.134",
"babel-plugin-react-compiler": "^0.0.0",
"cross-env": "^7.0.3",
"graphql": "^16.9.0",
"next": "catalog:next15",
"payload": "3.0.0-beta.130",
"payload": "3.0.0-beta.134",
"react": "catalog:next15",
"react-dom": "catalog:next15",
"sharp": "^0.33.5"
Expand Down
6 changes: 3 additions & 3 deletions apps/payload/src/app/(app)/(marketing)/[[...slug]]/page.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import type { Metadata } from 'next'
import type { FC } from 'react'
import { cache } from 'react'
import { notFound } from 'next/navigation'
import { getPayloadHMR } from '@payloadcms/next/utilities'
import { getPayload } from 'payload'

import config from '@local/payload/payload-config'

Expand All @@ -16,7 +16,7 @@ type ContentPageProps = {
}

const getPage = cache(async (slug?: string[], isLivePreview?: boolean) => {
const payload = await getPayloadHMR({ config })
const payload = await getPayload({ config })
const pathname = `/${slug?.join('/') ?? ''}`
const response = await payload.find({
collection: 'pages',
Expand All @@ -28,7 +28,7 @@ const getPage = cache(async (slug?: string[], isLivePreview?: boolean) => {
})

const getPages = cache(async () => {
const payload = await getPayloadHMR({ config })
const payload = await getPayload({ config })
const response = await payload.find({ collection: 'pages' })

return response.docs
Expand Down
6 changes: 3 additions & 3 deletions apps/payload/src/app/(app)/(news)/articles/[slug]/page.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import type { Metadata } from 'next'
import type { FC } from 'react'
import { cache } from 'react'
import { notFound } from 'next/navigation'
import { getPayloadHMR } from '@payloadcms/next/utilities'
import { getPayload } from 'payload'

import config from '@local/payload/payload-config'

Expand All @@ -16,7 +16,7 @@ type ArticlePageProps = {
}

const getArticle = cache(async (slug: string, isLivePreview?: boolean) => {
const payload = await getPayloadHMR({ config })
const payload = await getPayload({ config })
const response = await payload.find({
collection: 'articles',
draft: isLivePreview === true,
Expand All @@ -27,7 +27,7 @@ const getArticle = cache(async (slug: string, isLivePreview?: boolean) => {
})

const getArticles = cache(async () => {
const payload = await getPayloadHMR({ config })
const payload = await getPayload({ config })
const response = await payload.find({ collection: 'articles' })

return response.docs
Expand Down
2 changes: 1 addition & 1 deletion apps/svelte/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"cross-env": "^7.0.3",
"eslint": "^9.14.0",
"globals": "^15.12.0",
"payload": "3.0.0-beta.130",
"payload": "3.0.0-beta.134",
"prettier": "^3.3.3",
"svelte": "^5.2.0",
"svelte-check": "^4.0.8",
Expand Down
18 changes: 9 additions & 9 deletions packages/payload/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,17 +31,17 @@
"@local/svg": "workspace:*",
"@local/ui": "workspace:*",
"@local/utils": "workspace:*",
"@payloadcms/db-mongodb": "3.0.0-beta.130",
"@payloadcms/graphql": "3.0.0-beta.130",
"@payloadcms/live-preview-react": "3.0.0-beta.130",
"@payloadcms/plugin-nested-docs": "3.0.0-beta.130",
"@payloadcms/plugin-redirects": "3.0.0-beta.130",
"@payloadcms/plugin-seo": "3.0.0-beta.130",
"@payloadcms/richtext-lexical": "3.0.0-beta.130",
"@payloadcms/ui": "3.0.0-beta.130",
"@payloadcms/db-mongodb": "3.0.0-beta.134",
"@payloadcms/graphql": "3.0.0-beta.134",
"@payloadcms/live-preview-react": "3.0.0-beta.134",
"@payloadcms/plugin-nested-docs": "3.0.0-beta.134",
"@payloadcms/plugin-redirects": "3.0.0-beta.134",
"@payloadcms/plugin-seo": "3.0.0-beta.134",
"@payloadcms/richtext-lexical": "3.0.0-beta.134",
"@payloadcms/ui": "3.0.0-beta.134",
"lexical": "0.20.0",
"next": "catalog:next15",
"payload": "3.0.0-beta.130",
"payload": "3.0.0-beta.134",
"react": "catalog:next15",
"react-dom": "catalog:next15",
"sharp": "^0.33.5",
Expand Down
2 changes: 1 addition & 1 deletion packages/payload/src/configurePayload.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ const baseConfig: Config = {
plugins: [
nestedDocsPlusPlugin({
breadcrumbsFieldSlug: 'breadcrumbs',
collections: [Pages.slug],
collections: ['pages'],
generateLabel: (_, doc) => doc.title as string,
generateURL: docs =>
docs.reduce((acc, doc) => `${acc}/${doc.slug as string}`, ''),
Expand Down
8 changes: 5 additions & 3 deletions packages/payload/src/plugins/nestedDocsPlusPlugin/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,9 @@ export const nestedDocsPlusPlugin =
// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
const fields = [...(collection.fields ?? [])]

if (pluginConfig.collections.includes(collection.slug)) {
if (
pluginConfig.collections.includes(collection.slug as CollectionSlug)
) {
fields.push({
admin: {
position: 'sidebar',
Expand Down Expand Up @@ -69,7 +71,7 @@ export const nestedDocsPlusPlugin =

for (const collectionName of pluginConfig.collections) {
const docsToUpdate = await payload.find({
collection: collectionName as CollectionSlug,
collection: collectionName,
depth: 1,
limit: 0,
where: {
Expand All @@ -81,7 +83,7 @@ export const nestedDocsPlusPlugin =

for (const doc of docsToUpdate.docs) {
await payload.update({
collection: collectionName as CollectionSlug,
collection: collectionName,
data: {
...doc,
},
Expand Down
Loading

0 comments on commit 4adfbaa

Please sign in to comment.