chore(plugin-search): esm imports

This commit is contained in:
Dan Ribbens
2024-03-10 11:28:54 -04:00
parent 8c1df551ef
commit f276826b09
7 changed files with 26 additions and 25 deletions

View File

@@ -32,7 +32,7 @@
}, },
"dependencies": { "dependencies": {
"@payloadcms/ui": "workspace:*", "@payloadcms/ui": "workspace:*",
"ts-deepmerge": "^2.0.1" "deepmerge": "4.3.1"
}, },
"devDependencies": { "devDependencies": {
"@payloadcms/eslint-config": "workspace:*", "@payloadcms/eslint-config": "workspace:*",

View File

@@ -1,4 +1,4 @@
import type { DocToSync, SearchConfig, SyncWithSearch } from '../../types' import type { DocToSync, SearchConfig, SyncWithSearch } from '../../types.js'
const syncWithSearch: SyncWithSearch = async (args) => { const syncWithSearch: SyncWithSearch = async (args) => {
const { const {

View File

@@ -1,15 +1,16 @@
import type { CollectionConfig } from 'payload/types' import type { CollectionConfig } from 'payload/types'
import deepMerge from 'ts-deepmerge' import deepMerge from 'deepmerge'
import type { SearchConfig } from '../types' import type { SearchConfig } from '../types.js'
import { LinkToDoc } from './ui' import { LinkToDoc } from './ui/index.js'
// all settings can be overridden by the config // all settings can be overridden by the config
export const generateSearchCollection = (searchConfig: SearchConfig): CollectionConfig => export const generateSearchCollection = (searchConfig: SearchConfig): CollectionConfig =>
deepMerge( deepMerge(
{ {
slug: 'search',
access: { access: {
create: (): boolean => false, create: (): boolean => false,
read: (): boolean => true, read: (): boolean => true,
@@ -24,20 +25,21 @@ export const generateSearchCollection = (searchConfig: SearchConfig): Collection
fields: [ fields: [
{ {
name: 'title', name: 'title',
type: 'text',
admin: { admin: {
readOnly: true, readOnly: true,
}, },
type: 'text',
}, },
{ {
name: 'priority', name: 'priority',
type: 'number',
admin: { admin: {
position: 'sidebar', position: 'sidebar',
}, },
type: 'number',
}, },
{ {
name: 'doc', name: 'doc',
type: 'relationship',
admin: { admin: {
position: 'sidebar', position: 'sidebar',
readOnly: true, readOnly: true,
@@ -46,24 +48,22 @@ export const generateSearchCollection = (searchConfig: SearchConfig): Collection
maxDepth: 0, maxDepth: 0,
relationTo: searchConfig?.collections || [], relationTo: searchConfig?.collections || [],
required: true, required: true,
type: 'relationship',
}, },
{ {
name: 'docUrl', name: 'docUrl',
type: 'ui',
admin: { admin: {
components: { components: {
Field: LinkToDoc, Field: LinkToDoc,
}, },
position: 'sidebar', position: 'sidebar',
}, },
type: 'ui',
}, },
], ],
labels: { labels: {
plural: 'Search Results', plural: 'Search Results',
singular: 'Search Result', singular: 'Search Result',
}, },
slug: 'search',
}, },
searchConfig?.searchOverrides || {}, searchConfig?.searchOverrides || {},
) )

View File

@@ -1,5 +1,4 @@
import type { FormState } from '@payloadcms/ui' import type { FormState, UIField } from 'payload/types'
import type { UIField } from 'payload/types'
import { useConfig, useWatchForm } from '@payloadcms/ui' import { useConfig, useWatchForm } from '@payloadcms/ui'
import React from 'react' import React from 'react'

View File

@@ -1,10 +1,10 @@
import type { Config } from 'payload/config' import type { Config } from 'payload/config'
import type { SearchConfig } from './types' import type { SearchConfig } from './types.js'
import { generateSearchCollection } from './Search' import deleteFromSearch from './Search/hooks/deleteFromSearch.js'
import deleteFromSearch from './Search/hooks/deleteFromSearch' import syncWithSearch from './Search/hooks/syncWithSearch.js'
import syncWithSearch from './Search/hooks/syncWithSearch' import { generateSearchCollection } from './Search/index.js'
const Search = const Search =
(incomingSearchConfig: SearchConfig) => (incomingSearchConfig: SearchConfig) =>

14
pnpm-lock.yaml generated
View File

@@ -199,10 +199,10 @@ importers:
specifier: 10.2.0 specifier: 10.2.0
version: 10.2.0 version: 10.2.0
playwright: playwright:
specifier: file:playwright-1.43.0-next.tgz specifier: file:C:\code\payload\playwright-1.43.0-next.tgz
version: file:playwright-1.43.0-next.tgz version: file:playwright-1.43.0-next.tgz
playwright-core: playwright-core:
specifier: file:playwright-core-1.43.0-next.tgz specifier: file:C:\code\payload\playwright-core-1.43.0-next.tgz
version: file:playwright-core-1.43.0-next.tgz version: file:playwright-core-1.43.0-next.tgz
prettier: prettier:
specifier: ^3.0.3 specifier: ^3.0.3
@@ -973,9 +973,9 @@ importers:
'@payloadcms/ui': '@payloadcms/ui':
specifier: workspace:* specifier: workspace:*
version: link:../ui version: link:../ui
ts-deepmerge: deepmerge:
specifier: ^2.0.1 specifier: 4.3.1
version: 2.0.7 version: 4.3.1
devDependencies: devDependencies:
'@payloadcms/eslint-config': '@payloadcms/eslint-config':
specifier: workspace:* specifier: workspace:*
@@ -15516,10 +15516,6 @@ packages:
typescript: 5.2.2 typescript: 5.2.2
dev: false dev: false
/ts-deepmerge@2.0.7:
resolution: {integrity: sha512-3phiGcxPSSR47RBubQxPoZ+pqXsEsozLo4G4AlSrsMKTFg9TA3l+3he5BqpUi9wiuDbaHWXH/amlzQ49uEdXtg==}
dev: false
/ts-essentials@7.0.3(typescript@5.2.2): /ts-essentials@7.0.3(typescript@5.2.2):
resolution: {integrity: sha512-8+gr5+lqO3G84KdiTSMRLtuyJ+nTBVRKuCrK4lidMPdVeEp0uqC875uE5NMcaA7YYMN7XsNiFQuMvasF8HT/xQ==} resolution: {integrity: sha512-8+gr5+lqO3G84KdiTSMRLtuyJ+nTBVRKuCrK4lidMPdVeEp0uqC875uE5NMcaA7YYMN7XsNiFQuMvasF8HT/xQ==}
peerDependencies: peerDependencies:

View File

@@ -27,7 +27,13 @@ const packageWhitelist = [
'richtext-lexical', 'richtext-lexical',
'plugin-cloud', 'plugin-cloud',
'plugin-cloud-storage', 'plugin-cloud-storage',
// 'plugin-form-builder',
// 'plugin-nested-docs',
// 'plugin-redirects',
// 'plugin-search',
// 'plugin-sentry',
'plugin-seo', 'plugin-seo',
// 'plugin-stripe',
] ]
const __filename = fileURLToPath(import.meta.url) const __filename = fileURLToPath(import.meta.url)