From 60e3b215967335209d27006ebfa3d4d32a149ed8 Mon Sep 17 00:00:00 2001 From: James Date: Thu, 7 Mar 2024 10:23:12 -0500 Subject: [PATCH] chore: builds --- packages/next/src/views/Dashboard/index.tsx | 4 ++- .../next/src/views/ForgotPassword/index.tsx | 4 ++- .../src/views/List/Default/Cell/index.tsx | 4 ++- .../next/src/views/List/Default/index.tsx | 3 +- .../next/src/views/Login/LoginForm/index.tsx | 3 +- .../next/src/views/Logout/LogoutClient.tsx | 4 ++- .../next/src/views/NotFound/index.client.tsx | 4 ++- .../next/src/views/ResetPassword/index.tsx | 4 ++- .../views/Unauthorized/UnauthorizedClient.tsx | 4 ++- .../fields/Relationship/index.tsx | 4 ++- .../fields/Select/DiffViewer/index.tsx | 5 +++- .../fields/Text/DiffViewer/index.tsx | 5 +++- .../views/Versions/cells/CreatedAt/index.tsx | 4 ++- .../src/field/enablePlugins.tsx | 28 ------------------- .../src/field/icons/headings/index.tsx | 15 ---------- 15 files changed, 39 insertions(+), 56 deletions(-) delete mode 100644 packages/richtext-slate/src/field/enablePlugins.tsx delete mode 100644 packages/richtext-slate/src/field/icons/headings/index.tsx diff --git a/packages/next/src/views/Dashboard/index.tsx b/packages/next/src/views/Dashboard/index.tsx index fd48a0a9f..e026d9a18 100644 --- a/packages/next/src/views/Dashboard/index.tsx +++ b/packages/next/src/views/Dashboard/index.tsx @@ -1,5 +1,5 @@ import { HydrateClientUser, RenderCustomComponent } from '@payloadcms/ui' -import Link from 'next/link.js' +import LinkDefault from 'next/link.js' import { isEntityHidden } from 'payload/utilities' import React, { Fragment } from 'react' @@ -10,6 +10,8 @@ import { DefaultDashboard } from './Default/index.js' export { generateDashboardMetadata } from './meta.js' +const Link = LinkDefault.default + export const Dashboard: React.FC = ({ initPageResult, // searchParams, diff --git a/packages/next/src/views/ForgotPassword/index.tsx b/packages/next/src/views/ForgotPassword/index.tsx index 2159939bf..6f52c32a8 100644 --- a/packages/next/src/views/ForgotPassword/index.tsx +++ b/packages/next/src/views/ForgotPassword/index.tsx @@ -1,11 +1,13 @@ import { Button, Email, Form, FormSubmit, Translation } from '@payloadcms/ui' -import Link from 'next/link.js' +import LinkDefault from 'next/link.js' import React, { Fragment } from 'react' import type { AdminViewProps } from '../Root/index.js' export { generateForgotPasswordMetadata } from './meta.js' +const Link = LinkDefault.default + export const forgotPasswordBaseClass = 'forgot-password' export const ForgotPassword: React.FC = ({ initPageResult }) => { diff --git a/packages/next/src/views/List/Default/Cell/index.tsx b/packages/next/src/views/List/Default/Cell/index.tsx index 5b484ccac..611c4ea1f 100644 --- a/packages/next/src/views/List/Default/Cell/index.tsx +++ b/packages/next/src/views/List/Default/Cell/index.tsx @@ -1,5 +1,5 @@ 'use client' -import Link from 'next/link.js' +import LinkDefault from 'next/link.js' import React from 'react' // TODO: abstract this out to support all routers import type { CellProps } from 'payload/types' @@ -11,6 +11,8 @@ import { TableCellProvider } from '@payloadcms/ui' import { CodeCell } from './fields/Code/index.js' import cellComponents from './fields/index.js' +const Link = LinkDefault.default + export const DefaultCell: React.FC = (props) => { const { name, diff --git a/packages/next/src/views/List/Default/index.tsx b/packages/next/src/views/List/Default/index.tsx index 4c664c594..15e30a418 100644 --- a/packages/next/src/views/List/Default/index.tsx +++ b/packages/next/src/views/List/Default/index.tsx @@ -25,7 +25,7 @@ import { SetViewActions, UnpublishMany, } from '@payloadcms/ui/elements' -import Link from 'next/link.js' +import LinkDefault from 'next/link.js' import { formatFilesize } from 'payload/utilities' import React, { Fragment, useEffect } from 'react' @@ -35,6 +35,7 @@ import { RelationshipProvider } from './RelationshipProvider/index.js' import './index.scss' const baseClass = 'collection-list' +const Link = LinkDefault.default export const DefaultListView: React.FC = () => { const { diff --git a/packages/next/src/views/Login/LoginForm/index.tsx b/packages/next/src/views/Login/LoginForm/index.tsx index 10a174363..a5b5cf047 100644 --- a/packages/next/src/views/Login/LoginForm/index.tsx +++ b/packages/next/src/views/Login/LoginForm/index.tsx @@ -9,10 +9,11 @@ import { useConfig, useTranslation, } from '@payloadcms/ui' -import Link from 'next/link.js' +import LinkDefault from 'next/link.js' import React from 'react' const baseClass = 'login__form' +const Link = LinkDefault.default import type { FormState } from 'payload/types' diff --git a/packages/next/src/views/Logout/LogoutClient.tsx b/packages/next/src/views/Logout/LogoutClient.tsx index e525614e3..a815c9cc0 100644 --- a/packages/next/src/views/Logout/LogoutClient.tsx +++ b/packages/next/src/views/Logout/LogoutClient.tsx @@ -1,9 +1,11 @@ 'use client' import { Button, useTranslation } from '@payloadcms/ui' import { useAuth } from '@payloadcms/ui/providers' -import Link from 'next/link.js' +import LinkDefault from 'next/link.js' import React, { Fragment, useEffect } from 'react' +const Link = LinkDefault.default + export const LogoutClient: React.FC<{ adminRoute: string inactivity?: boolean diff --git a/packages/next/src/views/NotFound/index.client.tsx b/packages/next/src/views/NotFound/index.client.tsx index 4a7751905..b26e34c3a 100644 --- a/packages/next/src/views/NotFound/index.client.tsx +++ b/packages/next/src/views/NotFound/index.client.tsx @@ -1,12 +1,14 @@ 'use client' import { Button, Gutter, useConfig, useStepNav, useTranslation } from '@payloadcms/ui' -import Link from 'next/link.js' +import LinkDefault from 'next/link.js' import React, { useEffect } from 'react' import './index.scss' const baseClass = 'not-found' +const Link = LinkDefault.default + export const NotFoundClient: React.FC<{ marginTop?: 'large' }> = (props) => { diff --git a/packages/next/src/views/ResetPassword/index.tsx b/packages/next/src/views/ResetPassword/index.tsx index fd2301026..e91d4c447 100644 --- a/packages/next/src/views/ResetPassword/index.tsx +++ b/packages/next/src/views/ResetPassword/index.tsx @@ -8,7 +8,7 @@ import { Password, Translation, } from '@payloadcms/ui' -import Link from 'next/link.js' +import LinkDefault from 'next/link.js' import React from 'react' import type { AdminViewProps } from '../Root/index.js' @@ -17,6 +17,8 @@ import './index.scss' export const resetPasswordBaseClass = 'reset-password' +const Link = LinkDefault.default + export { generateResetPasswordMetadata } from './meta.js' export const ResetPassword: React.FC = ({ initPageResult, params }) => { diff --git a/packages/next/src/views/Unauthorized/UnauthorizedClient.tsx b/packages/next/src/views/Unauthorized/UnauthorizedClient.tsx index 8c15e22c8..01538b039 100644 --- a/packages/next/src/views/Unauthorized/UnauthorizedClient.tsx +++ b/packages/next/src/views/Unauthorized/UnauthorizedClient.tsx @@ -1,8 +1,10 @@ 'use client' import { Button, useTranslation } from '@payloadcms/ui' -import Link from 'next/link.js' +import LinkDefault from 'next/link.js' import React from 'react' +const Link = LinkDefault.default + export const UnauthorizedClient: React.FC<{ logoutRoute: string }> = ({ logoutRoute }) => { const { t } = useTranslation() 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 a3e2f1db7..7b3a88e53 100644 --- a/packages/next/src/views/Version/RenderFieldsToDiff/fields/Relationship/index.tsx +++ b/packages/next/src/views/Version/RenderFieldsToDiff/fields/Relationship/index.tsx @@ -5,7 +5,7 @@ import { getTranslation } from '@payloadcms/translations' import { type MappedField, useConfig } from '@payloadcms/ui' import { fieldAffectsData, fieldIsPresentationalOnly } from 'payload/types' import React from 'react' -import ReactDiffViewer from 'react-diff-viewer-continued' +import ReactDiffViewerDefault from 'react-diff-viewer-continued' import type { Props } from '../types.d.ts' @@ -13,6 +13,8 @@ import Label from '../../Label/index.js' import { diffStyles } from '../styles.js' import './index.scss' +const ReactDiffViewer = ReactDiffViewerDefault.default + const baseClass = 'relationship-diff' type RelationshipValue = Record diff --git a/packages/next/src/views/Version/RenderFieldsToDiff/fields/Select/DiffViewer/index.tsx b/packages/next/src/views/Version/RenderFieldsToDiff/fields/Select/DiffViewer/index.tsx index 22630d559..0647e9896 100644 --- a/packages/next/src/views/Version/RenderFieldsToDiff/fields/Select/DiffViewer/index.tsx +++ b/packages/next/src/views/Version/RenderFieldsToDiff/fields/Select/DiffViewer/index.tsx @@ -1,6 +1,9 @@ 'use client' import React from 'react' -import ReactDiffViewer, { DiffMethod } from 'react-diff-viewer-continued' +import ReactDiffViewerDefault from 'react-diff-viewer-continued' + +const ReactDiffViewer = ReactDiffViewerDefault.default +const DiffMethod = ReactDiffViewerDefault.DiffMethod export const DiffViewer: React.FC<{ comparisonToRender: string diff --git a/packages/next/src/views/Version/RenderFieldsToDiff/fields/Text/DiffViewer/index.tsx b/packages/next/src/views/Version/RenderFieldsToDiff/fields/Text/DiffViewer/index.tsx index 94473e45f..91d237f8f 100644 --- a/packages/next/src/views/Version/RenderFieldsToDiff/fields/Text/DiffViewer/index.tsx +++ b/packages/next/src/views/Version/RenderFieldsToDiff/fields/Text/DiffViewer/index.tsx @@ -1,6 +1,9 @@ 'use client' import React from 'react' -import ReactDiffViewer, { DiffMethod } from 'react-diff-viewer-continued' +import ReactDiffViewerDefault from 'react-diff-viewer-continued' + +const ReactDiffViewer = ReactDiffViewerDefault.default +const DiffMethod = ReactDiffViewerDefault.DiffMethod export const DiffViewer: React.FC<{ comparisonToRender: string diff --git a/packages/next/src/views/Versions/cells/CreatedAt/index.tsx b/packages/next/src/views/Versions/cells/CreatedAt/index.tsx index 5a6e6837f..7e16a8d0e 100644 --- a/packages/next/src/views/Versions/cells/CreatedAt/index.tsx +++ b/packages/next/src/views/Versions/cells/CreatedAt/index.tsx @@ -1,8 +1,10 @@ 'use client' import { formatDate, useConfig, useTableCell, useTranslation } from '@payloadcms/ui' -import Link from 'next/link.js' +import LinkDefault from 'next/link.js' import React from 'react' +const Link = LinkDefault.default + type CreatedAtCellProps = { collectionSlug?: string docID?: number | string diff --git a/packages/richtext-slate/src/field/enablePlugins.tsx b/packages/richtext-slate/src/field/enablePlugins.tsx deleted file mode 100644 index 4062de9c3..000000000 --- a/packages/richtext-slate/src/field/enablePlugins.tsx +++ /dev/null @@ -1,28 +0,0 @@ -import elementTypes from './elements/index.js' -import leafTypes from './leaves/index.js' - -const addPluginReducer = (EditorWithPlugins, plugin) => { - if (typeof plugin === 'function') return plugin(EditorWithPlugins) - return EditorWithPlugins -} - -const enablePlugins = (CreatedEditor, functions) => - functions.reduce((CreatedEditorWithPlugins, func) => { - if (typeof func === 'object' && Array.isArray(func.plugins)) { - return func.plugins.reduce(addPluginReducer, CreatedEditorWithPlugins) - } - - if (typeof func === 'string') { - if (elementTypes[func] && elementTypes[func].plugins) { - return elementTypes[func].plugins.reduce(addPluginReducer, CreatedEditorWithPlugins) - } - - if (leafTypes[func] && leafTypes[func].plugins) { - return leafTypes[func].plugins.reduce(addPluginReducer, CreatedEditorWithPlugins) - } - } - - return CreatedEditorWithPlugins - }, CreatedEditor) - -export default enablePlugins diff --git a/packages/richtext-slate/src/field/icons/headings/index.tsx b/packages/richtext-slate/src/field/icons/headings/index.tsx deleted file mode 100644 index dc032d7b0..000000000 --- a/packages/richtext-slate/src/field/icons/headings/index.tsx +++ /dev/null @@ -1,15 +0,0 @@ -import { H1 } from './H1/index.js' -import { H2 } from './H2/index.js' -import { H3 } from './H3/index.js' -import { H4 } from './H4/index.js' -import { H5 } from './H5/index.js' -import { H6 } from './H6/index.js' - -export default { - H1, - H2, - H3, - H4, - H5, - H6, -}