From db87a06cfdf170d23850285e2499e5c14bfc26f0 Mon Sep 17 00:00:00 2001 From: Jarrod Flesch Date: Mon, 4 Mar 2024 12:05:21 -0500 Subject: [PATCH] fix: updates incorrect e2e import paths --- test/admin/components/AfterNavLinks/index.tsx | 2 +- test/admin/components/BeforeLogin/index.tsx | 3 +- test/admin/components/Logout/index.tsx | 4 +- .../components/views/CustomDefault/index.tsx | 15 ++-- .../components/views/CustomEdit/index.tsx | 4 +- .../views/CustomEditDefault/index.tsx | 4 +- .../components/views/CustomMinimal/index.tsx | 6 +- .../components/views/CustomTab/index.tsx | 2 +- .../components/views/CustomTab2/index.tsx | 2 +- .../views/CustomTabNested/index.tsx | 2 +- .../components/views/CustomVersions/index.tsx | 4 +- .../GlobalViewWithRefresh.tsx | 4 +- tsconfig.json | 79 +++++-------------- 13 files changed, 45 insertions(+), 86 deletions(-) diff --git a/test/admin/components/AfterNavLinks/index.tsx b/test/admin/components/AfterNavLinks/index.tsx index 403de3cb7..3babb6364 100644 --- a/test/admin/components/AfterNavLinks/index.tsx +++ b/test/admin/components/AfterNavLinks/index.tsx @@ -2,7 +2,7 @@ import React from 'react' import { NavLink } from 'react-router-dom' // As this is the demo project, we import our dependencies from the `src` directory. -import { useConfig } from '../../../../packages/payload/src/admin/components/utilities/Config' +import { useConfig } from '../../../../packages/ui/src/providers/Config' // In your projects, you can import as follows: // import { useConfig } from 'payload/components/utilities'; diff --git a/test/admin/components/BeforeLogin/index.tsx b/test/admin/components/BeforeLogin/index.tsx index 0f178d101..83e814eb1 100644 --- a/test/admin/components/BeforeLogin/index.tsx +++ b/test/admin/components/BeforeLogin/index.tsx @@ -1,5 +1,6 @@ import React from 'react' -import { useTranslation } from 'react-i18next' + +import { useTranslation } from '../../../../packages/ui/src/providers/Translation' const BeforeLogin: React.FC<{ i18n }> = () => { const { t } = useTranslation() diff --git a/test/admin/components/Logout/index.tsx b/test/admin/components/Logout/index.tsx index 9e2e116e7..f0573a691 100644 --- a/test/admin/components/Logout/index.tsx +++ b/test/admin/components/Logout/index.tsx @@ -1,7 +1,7 @@ import React from 'react' -import LogOut from '../../../../packages/payload/src/admin/components/icons/LogOut' -import { useConfig } from '../../../../packages/payload/src/admin/components/utilities/Config' +import { LogOut } from '../../../../packages/ui/src/icons/LogOut' +import { useConfig } from '../../../../packages/ui/src/providers/Config' const Logout: React.FC = () => { const config = useConfig() diff --git a/test/admin/components/views/CustomDefault/index.tsx b/test/admin/components/views/CustomDefault/index.tsx index 239bb40cd..a5edcbb7a 100644 --- a/test/admin/components/views/CustomDefault/index.tsx +++ b/test/admin/components/views/CustomDefault/index.tsx @@ -3,12 +3,13 @@ import { Redirect } from 'react-router-dom' import type { AdminViewComponent } from '../../../../../packages/payload/src/config/types' -import Button from '../../../../../packages/payload/src/admin/components/elements/Button' -import { useStepNav } from '../../../../../packages/payload/src/admin/components/elements/StepNav' +import { Button } from '../../../../../packages/ui/src/elements/Button' +// TODO(3.0): Meta? +// import Meta from '../../../../../packages/payload/src/admin/components/utilities/Meta' +import { useStepNav } from '../../../../../packages/ui/src/elements/StepNav' +import { useConfig } from '../../../../../packages/ui/src/providers/Config' // As this is the demo project, we import our dependencies from the `src` directory. -import DefaultTemplate from '../../../../../packages/payload/src/admin/components/templates/Default' -import { useConfig } from '../../../../../packages/payload/src/admin/components/utilities/Config' -import Meta from '../../../../../packages/payload/src/admin/components/utilities/Meta' +import { DefaultTemplate } from '../../../../../packages/ui/src/templates/Default' // In your projects, you can import as follows: // import { DefaultTemplate } from 'payload/components/templates'; @@ -47,11 +48,11 @@ const CustomDefaultView: AdminViewComponent = ({ canAccessAdmin, user }) => { return ( - + /> */}
{ diff --git a/test/admin/components/views/CustomTab2/index.tsx b/test/admin/components/views/CustomTab2/index.tsx index 1778b3b2b..1a5e5eff4 100644 --- a/test/admin/components/views/CustomTab2/index.tsx +++ b/test/admin/components/views/CustomTab2/index.tsx @@ -1,7 +1,7 @@ import React, { Fragment, useEffect } from 'react' -import { useStepNav } from '../../../../../packages/payload/src/admin/components/elements/StepNav' import { type AdminViewComponent } from '../../../../../packages/payload/src/config/types' +import { useStepNav } from '../../../../../packages/ui/src/elements/StepNav' import { customTabViewTitle } from '../../../shared' const CustomTabView2: AdminViewComponent = () => { diff --git a/test/admin/components/views/CustomTabNested/index.tsx b/test/admin/components/views/CustomTabNested/index.tsx index 9dd561078..69ab0c345 100644 --- a/test/admin/components/views/CustomTabNested/index.tsx +++ b/test/admin/components/views/CustomTabNested/index.tsx @@ -1,7 +1,7 @@ import React, { Fragment, useEffect } from 'react' -import { useStepNav } from '../../../../../packages/payload/src/admin/components/elements/StepNav' import { type AdminViewComponent } from '../../../../../packages/payload/src/config/types' +import { useStepNav } from '../../../../../packages/ui/src/elements/StepNav' import { customNestedTabViewTitle } from '../../../shared' const CustomNestedTabView: AdminViewComponent = () => { diff --git a/test/admin/components/views/CustomVersions/index.tsx b/test/admin/components/views/CustomVersions/index.tsx index 748464503..01870696b 100644 --- a/test/admin/components/views/CustomVersions/index.tsx +++ b/test/admin/components/views/CustomVersions/index.tsx @@ -3,8 +3,8 @@ import { Redirect } from 'react-router-dom' import type { AdminViewComponent } from '../../../../../packages/payload/src/config/types' -import { useStepNav } from '../../../../../packages/payload/src/admin/components/elements/StepNav' -import { useConfig } from '../../../../../packages/payload/src/admin/components/utilities/Config' +import { useStepNav } from '../../../../../packages/ui/src/elements/StepNav' +import { useConfig } from '../../../../../packages/ui/src/providers/Config' const CustomVersionsView: AdminViewComponent = ({ canAccessAdmin, diff --git a/test/refresh-permissions/GlobalViewWithRefresh.tsx b/test/refresh-permissions/GlobalViewWithRefresh.tsx index b6717e980..8ae49efad 100644 --- a/test/refresh-permissions/GlobalViewWithRefresh.tsx +++ b/test/refresh-permissions/GlobalViewWithRefresh.tsx @@ -1,9 +1,9 @@ import React, { useCallback } from 'react' -import type { EditViewProps as Props } from '../../packages/ui/src' +import type { EditViewProps as Props } from '../../packages/payload/src/config/types' +import { EditView as DefaultEditView } from '../../packages/next/src/views/Edit' import { useAuth } from '../../packages/ui/src/providers/Auth' -import { DefaultEditView } from '../../packages/ui/src/views/Edit' const GlobalView: React.FC = (props) => { const { onSave } = props diff --git a/tsconfig.json b/tsconfig.json index b9b955ffd..c46b87997 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -10,11 +10,7 @@ "esModuleInterop": true, "forceConsistentCasingInFileNames": true, "jsx": "preserve", - "lib": [ - "dom", - "dom.iterable", - "esnext" - ], + "lib": ["dom", "dom.iterable", "esnext"], "noEmit": true, "outDir": "./dist", "resolveJsonModule": true, @@ -22,11 +18,7 @@ "skipLibCheck": true, "sourceMap": true, "strict": false, - "types": [ - "jest", - "node", - "@types/jest" - ], + "types": ["jest", "node", "@types/jest"], "incremental": true, "isolatedModules": true, "plugins": [ @@ -35,62 +27,27 @@ } ], "paths": { - "payload": [ - "./packages/payload/src" - ], - "payload/*": [ - "./packages/payload/src/exports/*" - ], - "@payloadcms/db-mongodb": [ - "./packages/db-mongodb/src" - ], - "@payloadcms/richtext-lexical": [ - "./packages/richtext-lexical/src" - ], - "@payloadcms/plugin-cloud-storage": [ - "./packages/plugin-cloud-storage/src" - ], - "@payloadcms/ui": [ - "./packages/ui/src/exports/index.ts" - ], - "@payloadcms/ui/*": [ - "./packages/ui/src/exports/*" - ], - "@payloadcms/ui/scss": [ - "./packages/ui/src/scss/styles.scss" - ], - "@payloadcms/ui/scss/app.scss": [ - "./packages/ui/src/scss/app.scss" - ], - "@payloadcms/translations": [ - "./packages/translations/src/exports/index.ts" - ], + "payload": ["./packages/payload/src"], + "payload/*": ["./packages/payload/src/exports/*"], + "@payloadcms/db-mongodb": ["./packages/db-mongodb/src"], + "@payloadcms/richtext-lexical": ["./packages/richtext-lexical/src"], + "@payloadcms/plugin-cloud-storage": ["./packages/plugin-cloud-storage/src"], + "@payloadcms/ui": ["./packages/ui/src/exports/index.ts"], + "@payloadcms/ui/*": ["./packages/ui/src/exports/*"], + "@payloadcms/ui/scss": ["./packages/ui/src/scss/styles.scss"], + "@payloadcms/ui/scss/app.scss": ["./packages/ui/src/scss/app.scss"], + "@payloadcms/translations": ["./packages/translations/src/exports/index.ts"], "@payloadcms/translations/client": [ "./packages/translations/src/_generatedFiles_/client/index.ts" ], - "@payloadcms/translations/api": [ - "./packages/translations/src/_generatedFiles_/api/index.ts" - ], - "@payloadcms/next/*": [ - "./packages/next/src/*" - ], - "@payloadcms/next": [ - "./packages/next/src/exports/*" - ], - "@payloadcms/graphql": [ - "./packages/graphql/src" - ], - "@payload-config": [ - "./test/_community/config.ts" - ] + "@payloadcms/translations/api": ["./packages/translations/src/_generatedFiles_/api/index.ts"], + "@payloadcms/next/*": ["./packages/next/src/*"], + "@payloadcms/next": ["./packages/next/src/exports/*"], + "@payloadcms/graphql": ["./packages/graphql/src"], + "@payload-config": ["./test/_community/config.ts"] } }, - "exclude": [ - "dist", - "build", - "temp", - "node_modules" - ], + "exclude": ["dist", "build", "temp", "node_modules"], "composite": true, "references": [ {