fix build errors

2024-06-24 17:34:40 +02:00 · 2024-06-24 17:34:40 +02:00 · cb0a2f77a8
commit cb0a2f77a8
parent 043470fe0c
7 changed files with 25 additions and 38 deletions
--- a/package.json
+++ b/package.json
@ -22,13 +22,14 @@
  },
  "dependencies": {
    "@payloadcms/db-mongodb": "3.0.0-beta.40",
+    "@payloadcms/live-preview": "3.0.0-beta.35",
+    "@payloadcms/live-preview-react": "3.0.0-beta.35",
    "@payloadcms/next": "3.0.0-beta.40",
    "@payloadcms/plugin-nested-docs": "3.0.0-beta.35",
    "@payloadcms/richtext-lexical": "3.0.0-beta.40",
    "@payloadcms/ui": "3.0.0-beta.40",
-    "@payloadcms/live-preview": "3.0.0-beta.35",
-    "@payloadcms/live-preview-react": "3.0.0-beta.35",
    "babel-plugin-react-compiler": "^0.0.0-experimental-592953e-20240517",
+    "clsx": "^2.1.1",
    "cross-env": "^7.0.3",
    "deepmerge": "^4.3.1",
    "graphql": "^16.8.1",
@ -37,7 +38,8 @@
    "react": "19.0.0-rc-f994737d14-20240522",
    "react-dom": "19.0.0-rc-f994737d14-20240522",
    "sharp": "0.32.6",
-    "tailwind-merge": "^2.3.0"
+    "tailwind-merge": "^2.3.0",
+    "lodash": "^4.17.21"
  },
  "devDependencies": {
    "@types/node": "^20.12.12",
@ -48,7 +50,8 @@
    "eslint-config-next": "14.2.3",
    "postcss": "^8.4.38",
    "tailwindcss": "^3.4.4",
-    "typescript": "^5.4.5"
+    "typescript": "^5.4.5",
+    "@types/lodash": "^4.17.4"
  },
  "pnpm": {
    "overrides": {
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@ -36,6 +36,9 @@ importers:
      babel-plugin-react-compiler:
        specifier: ^0.0.0-experimental-592953e-20240517
        version: 0.0.0-experimental-938cd9a-20240601
+      clsx:
+        specifier: ^2.1.1
+        version: 2.1.1
      cross-env:
        specifier: ^7.0.3
        version: 7.0.3
@ -45,6 +48,9 @@ importers:
      graphql:
        specifier: ^16.8.1
        version: 16.8.1
+      lodash:
+        specifier: ^4.17.21
+        version: 4.17.21
      next:
        specifier: 15.0.0-rc.0
        version: 15.0.0-rc.0(babel-plugin-react-compiler@0.0.0-experimental-938cd9a-20240601)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)(sass@1.77.4)
@ -64,6 +70,9 @@ importers:
        specifier: ^2.3.0
        version: 2.3.0
    devDependencies:
+      '@types/lodash':
+        specifier: ^4.17.4
+        version: 4.17.4
      '@types/node':
        specifier: ^20.12.12
        version: 20.14.1
@ -5767,7 +5776,7 @@ snapshots:
      eslint: 8.57.0
      eslint-import-resolver-node: 0.3.9
      eslint-import-resolver-typescript: 3.6.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.4.5))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.29.1(eslint@8.57.0))(eslint@8.57.0)
-      eslint-plugin-import: 2.29.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.4.5))(eslint-import-resolver-typescript@3.6.1)(eslint@8.57.0)
+      eslint-plugin-import: 2.29.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.4.5))(eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.4.5))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.29.1(eslint@8.57.0))(eslint@8.57.0))(eslint@8.57.0)
      eslint-plugin-jsx-a11y: 6.8.0(eslint@8.57.0)
      eslint-plugin-react: 7.34.2(eslint@8.57.0)
      eslint-plugin-react-hooks: 4.6.2(eslint@8.57.0)
@ -5791,7 +5800,7 @@ snapshots:
      enhanced-resolve: 5.16.1
      eslint: 8.57.0
      eslint-module-utils: 2.8.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.4.5))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.4.5))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.29.1(eslint@8.57.0))(eslint@8.57.0))(eslint@8.57.0)
-      eslint-plugin-import: 2.29.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.4.5))(eslint-import-resolver-typescript@3.6.1)(eslint@8.57.0)
+      eslint-plugin-import: 2.29.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.4.5))(eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.4.5))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.29.1(eslint@8.57.0))(eslint@8.57.0))(eslint@8.57.0)
      fast-glob: 3.3.2
      get-tsconfig: 4.7.5
      is-core-module: 2.13.1
@ -5813,7 +5822,7 @@ snapshots:
    transitivePeerDependencies:
      - supports-color

-  eslint-plugin-import@2.29.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.4.5))(eslint-import-resolver-typescript@3.6.1)(eslint@8.57.0):
+  eslint-plugin-import@2.29.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.4.5))(eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.4.5))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.29.1(eslint@8.57.0))(eslint@8.57.0))(eslint@8.57.0):
    dependencies:
      array-includes: 3.1.8
      array.prototype.findlastindex: 1.2.5
--- a/src/app/(payload)/fields/icon.ts
+++ b/src/app/(payload)/fields/icon.ts
@ -1,26 +0,0 @@
-import deepMerge from 'deepmerge'
-import type { Field } from 'payload/types'
-import * as HiIcons from 'react-icons/hi2'
-
-const iconOptions = Object.entries(HiIcons)
-  .filter(([key, value]) => typeof value === 'function')
-  .map(([key]) => ({
-    value: key,
-    label: key.replace(/([a-z])([A-Z])/g, '$1 $2')
-  }))
-
-type IconField = (overrides?: Partial<Field>) => Field
-
-const iconField: IconField = (overrides = {}) => {
-  return deepMerge<Field, Partial<Field>>(
-    {
-      type: 'select',
-      name: 'icon',
-      label: 'Icon',
-      options: iconOptions
-    },
-    overrides
-  )
-}
-
-export default iconField
--- a/src/components/LexicalContent/index.tsx
+++ b/src/components/LexicalContent/index.tsx
@ -74,7 +74,7 @@ const TextComponent: FC<TextComponentProps> = ({ children, format }) => {
 const SerializedLink: React.FC<{
  node: SerializedLexicalNode
  locale: string
-  children: JSX.Element | null
+  children: React.JSX.Element | null
 }> = ({ node, locale, children }) => {
  const { doc, url, newTab, linkType } = node.fields as any
  const document = doc?.value
@ -164,7 +164,7 @@ const LexicalContent: React.FC<{
          </li>
        )
      case 'heading':
-        const HeadingTag = node.tag as keyof JSX.IntrinsicElements
+        const HeadingTag = node.tag as keyof React.JSX.IntrinsicElements
        return (
          <HeadingTag key={ix} {...attributes}>
            {serializedChildren}
--- a/src/lib/payload/actions.ts
+++ b/src/lib/payload/actions.ts
@ -1,4 +1,4 @@
-'use server'
+/* 'use server'

 import { SESSION_STRATEGY } from '@/lib/auth/config'
 import { COLLECTION_SLUG_SESSIONS } from '@/payload/collections/config'
@ -16,3 +16,4 @@ export const revalidateUser = async (user: User, payload: Payload) => {
    })
  }
 }
+ */
--- a/src/lib/payload/index.ts
+++ b/src/lib/payload/index.ts
@ -1,7 +1,7 @@
 import configPromise from '@payload-config'
 import { getPayloadHMR as getPayloadInstance } from '@payloadcms/next/utilities'
 import { headers as getHeaders } from 'next/headers'
-import type { User } from '~/payload-types'
+import type { User } from 'types/payload-types'

 export async function getPayload(): ReturnType<typeof getPayloadInstance> {
  return getPayloadInstance({ config: await configPromise })
--- a/tsconfig.json
+++ b/tsconfig.json
@ -11,7 +11,7 @@
    "moduleResolution": "bundler",
    "resolveJsonModule": true,
    "isolatedModules": true,
-    "jsx": "preserve",
+    "jsx": "react-jsx",
    "incremental": true,
    "plugins": [
      {