fix: fix all ui imports in our plugins, and get rid of ui subpath exports within monorepo (#6854)

This commit is contained in:
Alessio Gravili
2024-06-19 14:16:31 -04:00
committed by GitHub
parent bc98567f41
commit aef2a52cea
84 changed files with 287 additions and 318 deletions

View File

@@ -2,10 +2,10 @@
import type { SanitizedConfig } from 'payload'
import { useConfig } from '@payloadcms/ui/providers/Config'
import LinkImport from 'next/link.js'
const Link = (LinkImport.default || LinkImport) as unknown as typeof LinkImport.default
import { useConfig } from '@payloadcms/ui'
import React from 'react'
const baseClass = 'after-nav-links'

View File

@@ -2,7 +2,7 @@
import type { SanitizedConfig } from 'payload'
import { useTranslation } from '@payloadcms/ui/providers/Translation'
import { useTranslation } from '@payloadcms/ui'
import React from 'react'
export const BeforeLogin: SanitizedConfig['admin']['components']['beforeLogin'][0] = () => {

View File

@@ -1,7 +1,7 @@
'use client'
import type { CellComponentProps } from 'payload'
import { useTableCell } from '@payloadcms/ui/elements/Table'
import { useTableCell } from '@payloadcms/ui'
import React from 'react'
export const CustomCell: React.FC<CellComponentProps> = (props) => {

View File

@@ -1,6 +1,6 @@
'use client'
import { useConfig } from '@payloadcms/ui/providers/Config'
import { useConfig } from '@payloadcms/ui'
import LinkImport from 'next/link.js'
import { useParams } from 'next/navigation.js'
import React from 'react'

View File

@@ -1,8 +1,7 @@
'use client'
import type { DescriptionComponent } from 'payload'
import { useFieldProps } from '@payloadcms/ui/forms/FieldPropsProvider'
import { useFormFields } from '@payloadcms/ui/forms/Form'
import { useFieldProps, useFormFields } from '@payloadcms/ui'
import React from 'react'
export const FieldDescriptionComponent: DescriptionComponent = () => {

View File

@@ -1,7 +1,6 @@
'use client'
import { LogOutIcon } from '@payloadcms/ui/icons/LogOut'
import { useConfig } from '@payloadcms/ui/providers/Config'
import { LogOutIcon, useConfig } from '@payloadcms/ui'
import React from 'react'
export const Logout: React.FC = () => {

View File

@@ -7,8 +7,7 @@ const Link = (LinkImport.default || LinkImport) as unknown as typeof LinkImport.
import type { AdminViewProps } from 'payload'
import { Button } from '@payloadcms/ui/elements/Button'
import { SetStepNav } from '@payloadcms/ui/elements/StepNav'
import { Button, SetStepNav } from '@payloadcms/ui'
import { customViewPath } from '../../../shared.js'
import './index.scss'

View File

@@ -1,6 +1,6 @@
import type { EditViewComponent } from 'payload'
import { SetStepNav } from '@payloadcms/ui/elements/StepNav'
import { SetStepNav } from '@payloadcms/ui'
import { notFound, redirect } from 'next/navigation.js'
import React, { Fragment } from 'react'

View File

@@ -1,9 +1,9 @@
import { SetStepNav } from '@payloadcms/ui/elements/StepNav'
import type { EditViewComponent } from 'payload'
import { SetStepNav } from '@payloadcms/ui'
import { notFound, redirect } from 'next/navigation.js'
import React, { Fragment } from 'react'
import type { EditViewComponent } from '../../../../../packages/payload/types.js'
export const CustomDefaultEditView: EditViewComponent = ({ initPageResult }) => {
if (!initPageResult) {
notFound()

View File

@@ -13,7 +13,7 @@ const Link = (LinkImport.default || LinkImport) as unknown as typeof LinkImport.
import type { AdminViewProps } from 'payload'
import { MinimalTemplate } from '@payloadcms/next/templates'
import { Button } from '@payloadcms/ui/elements/Button'
import { Button } from '@payloadcms/ui'
import { customViewPath } from '../../../shared.js'
import './index.scss'

View File

@@ -1,9 +1,9 @@
import { SetStepNav } from '@payloadcms/ui/elements/StepNav'
import type { ServerSideEditViewProps } from 'payload'
import { SetStepNav } from '@payloadcms/ui'
import { notFound } from 'next/navigation.js'
import React, { Fragment } from 'react'
import type { ServerSideEditViewProps } from '../../../../../packages/payload/types.js'
import { customTabViewComponentTitle } from '../../../shared.js'
export const CustomTabComponentView: React.FC<ServerSideEditViewProps> = ({ initPageResult }) => {

View File

@@ -1,6 +1,6 @@
import type { EditViewComponent } from 'payload'
import { SetStepNav } from '@payloadcms/ui/elements/StepNav'
import { SetStepNav } from '@payloadcms/ui'
import { notFound } from 'next/navigation.js'
import React, { Fragment } from 'react'

View File

@@ -1,6 +1,6 @@
import type { EditViewComponent } from 'payload'
import { SetStepNav } from '@payloadcms/ui/elements/StepNav'
import { SetStepNav } from '@payloadcms/ui'
import { notFound } from 'next/navigation.js'
import React, { Fragment } from 'react'

View File

@@ -1,6 +1,6 @@
import type { EditViewComponent } from 'payload'
import { SetStepNav } from '@payloadcms/ui/elements/StepNav'
import { SetStepNav } from '@payloadcms/ui'
import { notFound, redirect } from 'next/navigation.js'
import React, { Fragment } from 'react'

View File

@@ -1,8 +1,12 @@
'use client'
import { ConfirmPassword } from '@payloadcms/ui/fields/ConfirmPassword'
import { Password } from '@payloadcms/ui/fields/Password'
import { Form, useFormFields } from '@payloadcms/ui/forms/Form'
import { FormSubmit } from '@payloadcms/ui/forms/Submit'
import {
ConfirmPasswordField,
Form,
FormSubmit,
PasswordField,
useFormFields,
} from '@payloadcms/ui'
import React from 'react'
export const ClientForm: React.FC = () => {
@@ -22,7 +26,7 @@ export const ClientForm: React.FC = () => {
}}
>
<CustomPassword />
<ConfirmPassword />
<ConfirmPasswordField />
<FormSubmit>Submit</FormSubmit>
</Form>
)
@@ -36,7 +40,7 @@ const CustomPassword: React.FC = () => {
const confirmValue = confirmPassword.value
return (
<Password
<PasswordField
autoComplete="off"
label="Password"
name="password"

View File

@@ -5,7 +5,7 @@ import React from 'react'
const Link = (LinkImport.default || LinkImport) as unknown as typeof LinkImport.default
import { Button } from '@payloadcms/ui/elements/Button'
import { Button } from '@payloadcms/ui'
import { customNestedViewPath, customViewTitle } from '../../../shared.js'
import { ClientForm } from './index.client.js'

View File

@@ -1,9 +1,9 @@
import { Button } from '@payloadcms/ui/elements/Button'
import type { AdminViewProps } from 'payload'
import { Button } from '@payloadcms/ui'
import LinkImport from 'next/link.js'
import React from 'react'
import type { AdminViewProps } from '../../../../../packages/payload/types.js'
import { customNestedViewTitle, customViewPath } from '../../../shared.js'
const Link = (LinkImport.default || LinkImport) as unknown as typeof LinkImport.default

View File

@@ -1,11 +1,11 @@
import { Button } from '@payloadcms/ui/elements/Button'
import { Button } from '@payloadcms/ui'
import LinkImport from 'next/link.js'
import React from 'react'
import type { AdminViewProps } from '../../../../../packages/payload/types.js'
const Link = (LinkImport.default || LinkImport) as unknown as typeof LinkImport.default
import type { AdminViewProps } from 'payload'
import {
customParamViewPath,
customParamViewPathBase,