tabshift/payloadcms
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

fix: imports (part 2/2) (#13520)

Browse Source 
Completes https://github.com/payloadcms/payload/pull/13513

That PR fixed it for the `admin` suite, but I had also encountered the
same issue in `live-preview`.

When searching for instances, I found others with the same pattern
within packages, which I took the opportunity to fix in case the same
error occurs in the future.
This commit is contained in:
German Jablonski
2025-08-20 13:08:55 +01:00
committed by GitHub
parent adb83b1e06
commit cf427e5519
27 changed files with 32 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/payload/src/fields/baseFields/baseIDField.ts
View File

@@ -2,8 +2,7 @@ import ObjectIdImport from 'bson-objectid'
import type { TextField } from '../config/types.js'
const ObjectId = (ObjectIdImport.default ||
ObjectIdImport) as unknown as typeof ObjectIdImport.default
const ObjectId = 'default' in ObjectIdImport ? ObjectIdImport.default : ObjectIdImport
export const baseIDField: TextField = {
name: 'id',

3
packages/payload/src/fields/validations.ts
View File

@@ -1,8 +1,7 @@
import Ajv from 'ajv'
import ObjectIdImport from 'bson-objectid'
const ObjectId = (ObjectIdImport.default ||
ObjectIdImport) as unknown as typeof ObjectIdImport.default
const ObjectId = 'default' in ObjectIdImport ? ObjectIdImport.default : ObjectIdImport
import type { TFunction } from '@payloadcms/translations'
import type { JSONSchema4 } from 'json-schema'

3
packages/payload/src/queues/errors/handleTaskError.ts
View File

@@ -9,8 +9,7 @@ import { getCurrentDate } from '../utilities/getCurrentDate.js'
import { calculateBackoffWaitUntil } from './calculateBackoffWaitUntil.js'
import { getWorkflowRetryBehavior } from './getWorkflowRetryBehavior.js'
const ObjectId = (ObjectIdImport.default ||
ObjectIdImport) as unknown as typeof ObjectIdImport.default
const ObjectId = 'default' in ObjectIdImport ? ObjectIdImport.default : ObjectIdImport
export async function handleTaskError({
error,

3
packages/payload/src/queues/operations/runJobs/runJob/getRunTaskFunction.ts
View File

@@ -23,8 +23,7 @@ import { TaskError } from '../../../errors/index.js'
import { getCurrentDate } from '../../../utilities/getCurrentDate.js'
import { getTaskHandlerFromConfig } from './importHandlerPath.js'
const ObjectId = (ObjectIdImport.default ||
ObjectIdImport) as unknown as typeof ObjectIdImport.default
const ObjectId = 'default' in ObjectIdImport ? ObjectIdImport.default : ObjectIdImport
export type TaskParent = {
taskID: string

3
packages/payload/src/utilities/isValidID.ts
View File

@@ -1,7 +1,6 @@
import ObjectIdImport from 'bson-objectid'
const ObjectId = (ObjectIdImport.default ||
ObjectIdImport) as unknown as typeof ObjectIdImport.default
const ObjectId = 'default' in ObjectIdImport ? ObjectIdImport.default : ObjectIdImport
export const isValidID = (
value: number | string,

2
packages/ui/src/elements/CodeEditor/CodeEditor.tsx
View File

@@ -8,7 +8,7 @@ import { useTheme } from '../../providers/Theme/index.js'
import { ShimmerEffect } from '../ShimmerEffect/index.js'
import './index.scss'
const Editor = (EditorImport.default || EditorImport) as unknown as typeof EditorImport.default
const Editor = 'default' in EditorImport ? EditorImport.default : EditorImport
const baseClass = 'code-editor'

6
packages/ui/src/elements/DatePicker/DatePicker.tsx
View File

@@ -3,8 +3,10 @@ import type { DatePickerProps } from 'react-datepicker'
import React from 'react'
import ReactDatePickerDefaultImport, { registerLocale, setDefaultLocale } from 'react-datepicker'
const ReactDatePicker = (ReactDatePickerDefaultImport.default ||
ReactDatePickerDefaultImport) as unknown as typeof ReactDatePickerDefaultImport.default
const ReactDatePicker =
'default' in ReactDatePickerDefaultImport
? ReactDatePickerDefaultImport.default
: ReactDatePickerDefaultImport
import type { Props } from './types.js'

3
packages/ui/src/elements/Link/index.tsx
View File

@@ -6,8 +6,7 @@ import React from 'react'
import { useRouteTransition } from '../../providers/RouteTransition/index.js'
import { formatUrl } from './formatUrl.js'
const NextLink = (NextLinkImport.default ||
NextLinkImport) as unknown as typeof NextLinkImport.default
const NextLink = 'default' in NextLinkImport ? NextLinkImport.default : NextLinkImport
// Copied from https://github.com/vercel/next.js/blob/canary/packages/next/src/client/link.tsx#L180-L191
function isModifiedEvent(event: React.MouseEvent): boolean {

3
packages/ui/src/fields/Join/index.tsx
View File

@@ -24,8 +24,7 @@ import { FieldError } from '../FieldError/index.js'
import { FieldLabel } from '../FieldLabel/index.js'
import { fieldBaseClass } from '../index.js'
const ObjectId = (ObjectIdImport.default ||
ObjectIdImport) as unknown as typeof ObjectIdImport.default
const ObjectId = 'default' in ObjectIdImport ? ObjectIdImport.default : ObjectIdImport
/**
* Recursively builds the default data for joined collection

3
packages/ui/src/forms/Form/fieldReducer.ts
View File

@@ -10,8 +10,7 @@ import type { FieldAction } from './types.js'
import { mergeServerFormState } from './mergeServerFormState.js'
import { flattenRows, separateRows } from './rows.js'
const ObjectId = (ObjectIdImport.default ||
ObjectIdImport) as unknown as typeof ObjectIdImport.default
const ObjectId = 'default' in ObjectIdImport ? ObjectIdImport.default : ObjectIdImport
/**
* Reducer which modifies the form field state (all the current data of the fields in the form). When called using dispatch, it will return a new state object.

3
packages/ui/src/forms/fieldSchemasToFormState/addFieldStatePromise.ts
View File

@@ -37,8 +37,7 @@ import { resolveFilterOptions } from '../../utilities/resolveFilterOptions.js'
import { isRowCollapsed } from './isRowCollapsed.js'
import { iterateFields } from './iterateFields.js'
const ObjectId = (ObjectIdImport.default ||
ObjectIdImport) as unknown as typeof ObjectIdImport.default
const ObjectId = 'default' in ObjectIdImport ? ObjectIdImport.default : ObjectIdImport
export type AddFieldStatePromiseArgs = {
addErrorPathToParent: (fieldPath: string) => void

3
packages/ui/src/utilities/copyDataFromLocale.ts
View File

@@ -11,8 +11,7 @@ import {
} from 'payload'
import { fieldAffectsData, fieldShouldBeLocalized, tabHasName } from 'payload/shared'
const ObjectId = (ObjectIdImport.default ||
ObjectIdImport) as unknown as typeof ObjectIdImport.default
const ObjectId = 'default' in ObjectIdImport ? ObjectIdImport.default : ObjectIdImport
export type CopyDataFromLocaleArgs = {
collectionSlug?: CollectionSlug

2
test/helpers/bootAdminPanel.mjs
View File

@@ -2,7 +2,7 @@ import { createServer } from 'http'
import next from 'next'
import { parse } from 'url'
const actualNext = next.default || next
const actualNext = 'default' in next ? next.default : next
export const bootAdminPanel = async ({ port = 3000, appDir }) => {
const serverURL = `http://localhost:${port}`
const app = actualNext({

2
test/live-preview/app/live-preview/_components/Button/index.tsx
View File

@@ -7,7 +7,7 @@ import React from 'react'
import classes from './index.module.scss'
const Link = (LinkWithDefault.default || LinkWithDefault) as typeof LinkWithDefault.default
const Link = 'default' in LinkWithDefault ? LinkWithDefault.default : LinkWithDefault
export type Props = {
appearance?: 'default' | 'none' | 'primary' | 'secondary'

2
test/live-preview/app/live-preview/_components/Card/index.tsx
View File

@@ -6,7 +6,7 @@ import type { Post } from '../../../../payload-types.js'
import { Media } from '../Media/index.js'
import classes from './index.module.scss'
const Link = (LinkWithDefault.default || LinkWithDefault) as typeof LinkWithDefault.default
const Link = 'default' in LinkWithDefault ? LinkWithDefault.default : LinkWithDefault
export const Card: React.FC<{
alignItems?: 'center'

2
test/live-preview/app/live-preview/_components/Footer/index.tsx
View File

@@ -6,7 +6,7 @@ import { Gutter } from '../Gutter/index.js'
import { CMSLink } from '../Link/index.js'
import classes from './index.module.scss'
const Link = (LinkWithDefault.default || LinkWithDefault) as typeof LinkWithDefault.default
const Link = 'default' in LinkWithDefault ? LinkWithDefault.default : LinkWithDefault
export async function Footer() {
const footer = await getFooter()

2
test/live-preview/app/live-preview/_components/Header/index.tsx
View File

@@ -6,7 +6,7 @@ import { Gutter } from '../Gutter/index.js'
import classes from './index.module.scss'
import { HeaderNav } from './Nav/index.js'
const Link = (LinkWithDefault.default || LinkWithDefault) as typeof LinkWithDefault.default
const Link = 'default' in LinkWithDefault ? LinkWithDefault.default : LinkWithDefault
export async function Header() {
const header = await getHeader()

2
test/live-preview/app/live-preview/_components/Link/index.tsx
View File

@@ -6,7 +6,7 @@ import type { Props as ButtonProps } from '../Button/index.js'
import { Button } from '../Button/index.js'
const NextLink = (NextLinkImport.default || NextLinkImport) as typeof NextLinkImport.default
const NextLink = 'default' in NextLinkImport ? NextLinkImport.default : NextLinkImport
type CMSLinkType = {
appearance?: ButtonProps['appearance']

4
test/live-preview/app/live-preview/_components/Media/Image/index.tsx
View File

@@ -13,8 +13,8 @@ import classes from './index.module.scss'
const { breakpoints } = cssVariables
const NextImage = (NextImageWithDefault.default ||
NextImageWithDefault) as typeof NextImageWithDefault.default
const NextImage =
'default' in NextImageWithDefault ? NextImageWithDefault.default : NextImageWithDefault
export const Image: React.FC<MediaProps> = (props) => {
const {

2
test/live-preview/app/live-preview/_heros/PostHero/index.tsx
View File

@@ -10,7 +10,7 @@ import RichText from '../../_components/RichText/index.js'
import { formatDateTime } from '../../_utilities/formatDateTime.js'
import classes from './index.module.scss'
const Link = (LinkWithDefault.default || LinkWithDefault) as typeof LinkWithDefault.default
const Link = 'default' in LinkWithDefault ? LinkWithDefault.default : LinkWithDefault
export const PostHero: React.FC<{
post: Post

2
test/live-preview/prod/app/live-preview/_components/Button/index.tsx
View File

@@ -7,7 +7,7 @@ import React from 'react'
import classes from './index.module.scss'
const Link = (LinkWithDefault.default || LinkWithDefault) as typeof LinkWithDefault.default
const Link = 'default' in LinkWithDefault ? LinkWithDefault.default : LinkWithDefault
export type Props = {
appearance?: 'default' | 'none' | 'primary' | 'secondary'

2
test/live-preview/prod/app/live-preview/_components/Card/index.tsx
View File

@@ -6,7 +6,7 @@ import type { Post } from '../../../../../payload-types.js'
import { Media } from '../Media/index.js'
import classes from './index.module.scss'
const Link = (LinkWithDefault.default || LinkWithDefault) as typeof LinkWithDefault.default
const Link = 'default' in LinkWithDefault ? LinkWithDefault.default : LinkWithDefault
export const Card: React.FC<{
alignItems?: 'center'

2
test/live-preview/prod/app/live-preview/_components/Footer/index.tsx
View File

@@ -6,7 +6,7 @@ import { Gutter } from '../Gutter/index.js'
import { CMSLink } from '../Link/index.js'
import classes from './index.module.scss'
const Link = (LinkWithDefault.default || LinkWithDefault) as typeof LinkWithDefault.default
const Link = 'default' in LinkWithDefault ? LinkWithDefault.default : LinkWithDefault
export async function Footer() {
const footer = await getFooter()

2
test/live-preview/prod/app/live-preview/_components/Header/index.tsx
View File

@@ -6,7 +6,7 @@ import { Gutter } from '../Gutter/index.js'
import classes from './index.module.scss'
import { HeaderNav } from './Nav/index.js'
const Link = (LinkWithDefault.default || LinkWithDefault) as typeof LinkWithDefault.default
const Link = 'default' in LinkWithDefault ? LinkWithDefault.default : LinkWithDefault
export async function Header() {
const header = await getHeader()

2
test/live-preview/prod/app/live-preview/_components/Link/index.tsx
View File

@@ -6,7 +6,7 @@ import type { Props as ButtonProps } from '../Button/index.js'
import { Button } from '../Button/index.js'
const NextLink = (NextLinkImport.default || NextLinkImport) as typeof NextLinkImport.default
const NextLink = 'default' in NextLinkImport ? NextLinkImport.default : NextLinkImport
type CMSLinkType = {
appearance?: ButtonProps['appearance']

4
test/live-preview/prod/app/live-preview/_components/Media/Image/index.tsx
View File

@@ -13,8 +13,8 @@ import classes from './index.module.scss'
const { breakpoints } = cssVariables
const NextImage = (NextImageWithDefault.default ||
NextImageWithDefault) as typeof NextImageWithDefault.default
const NextImage =
'default' in NextImageWithDefault ? NextImageWithDefault.default : NextImageWithDefault
export const Image: React.FC<MediaProps> = (props) => {
const {

2
test/live-preview/prod/app/live-preview/_heros/PostHero/index.tsx
View File

@@ -10,7 +10,7 @@ import RichText from '../../_components/RichText/index.js'
import { formatDateTime } from '../../_utilities/formatDateTime.js'
import classes from './index.module.scss'
const Link = (LinkWithDefault.default || LinkWithDefault) as typeof LinkWithDefault.default
const Link = 'default' in LinkWithDefault ? LinkWithDefault.default : LinkWithDefault
export const PostHero: React.FC<{
post: Post