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

Completes #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.

Author: GermanJablo

packages/payload/src/fields/baseFields/baseIDField.ts

@@ -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',

packages/payload/src/fields/validations.ts

@@ -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'

packages/payload/src/queues/errors/handleTaskError.ts

@@ -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,

packages/payload/src/queues/operations/runJobs/runJob/getRunTaskFunction.ts

@@ -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

packages/payload/src/utilities/isValidID.ts

@@ -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,

packages/ui/src/elements/CodeEditor/CodeEditor.tsx

@@ -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'
 

packages/ui/src/elements/DatePicker/DatePicker.tsx

@@ -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'
 

packages/ui/src/elements/Link/index.tsx

@@ -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 {

packages/ui/src/fields/Join/index.tsx

@@ -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

packages/ui/src/forms/Form/fieldReducer.ts

@@ -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.