From d15dd9ada7b2144fa67df2e3f04306cfbcc0b67a Mon Sep 17 00:00:00 2001 From: vchikalkin Date: Tue, 10 Jun 2025 15:36:01 +0300 Subject: [PATCH] packages: radash -> radashi --- .../api/contacts/use-customer-contacts.ts | 2 +- apps/web/package.json | 2 +- packages/graphql/package.json | 1 + packages/graphql/utils/datetime-format.ts | 3 ++- pnpm-lock.yaml | 20 ++++++++++++------- pnpm-workspace.yaml | 1 + 6 files changed, 19 insertions(+), 10 deletions(-) diff --git a/apps/web/hooks/api/contacts/use-customer-contacts.ts b/apps/web/hooks/api/contacts/use-customer-contacts.ts index 47a43d8..1202e9a 100644 --- a/apps/web/hooks/api/contacts/use-customer-contacts.ts +++ b/apps/web/hooks/api/contacts/use-customer-contacts.ts @@ -2,7 +2,7 @@ import { useClientsQuery, useMastersQuery } from './query'; import { ContactsContext } from '@/context/contacts'; -import { sift } from 'radash'; +import { sift } from 'radashi'; import { use, useEffect, useMemo } from 'react'; export function useCustomerContacts() { diff --git a/apps/web/package.json b/apps/web/package.json index 4db2048..86df62d 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -24,7 +24,7 @@ "next-auth": "^4.24.11", "next-intl": "^3.26.0", "next-themes": "^0.4.4", - "radash": "^12.1.0", + "radashi": "catalog:", "react": "catalog:", "react-dom": "catalog:", "use-debounce": "^10.0.4", diff --git a/packages/graphql/package.json b/packages/graphql/package.json index c44907b..796dd06 100644 --- a/packages/graphql/package.json +++ b/packages/graphql/package.json @@ -11,6 +11,7 @@ "@apollo/client": "catalog:", "dayjs": "catalog:", "jsonwebtoken": "catalog:", + "radashi": "catalog:", "zod": "catalog:" }, "devDependencies": { diff --git a/packages/graphql/utils/datetime-format.ts b/packages/graphql/utils/datetime-format.ts index 9ad4744..a870209 100644 --- a/packages/graphql/utils/datetime-format.ts +++ b/packages/graphql/utils/datetime-format.ts @@ -1,6 +1,7 @@ /* eslint-disable import/no-unassigned-import */ import dayjs from 'dayjs'; import 'dayjs/locale/ru'; +import { noop } from 'radashi'; export function combineDateTime(date: Date, time: string) { const [hours = '00', minutes = '00'] = time.split(':'); @@ -15,7 +16,7 @@ export function combineDateTime(date: Date, time: string) { } export function formatDate(date: Date | string) { - if (!date) return { db: () => undefined, user: () => undefined }; + if (!date) return { db: noop, user: noop }; return { db: () => dayjs(date).format('YYYY-MM-DD'), diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 2d3f899..71e50bf 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -57,6 +57,9 @@ catalogs: prettier: specifier: ^3.2.5 version: 3.4.0 + radashi: + specifier: ^12.5.1 + version: 12.5.1 react: specifier: ^19.1.0 version: 19.1.0 @@ -171,9 +174,9 @@ importers: next-themes: specifier: ^0.4.4 version: 0.4.4(react-dom@19.1.0(react@19.1.0))(react@19.1.0) - radash: - specifier: ^12.1.0 - version: 12.1.0 + radashi: + specifier: 'catalog:' + version: 12.5.1 react: specifier: 'catalog:' version: 19.1.0 @@ -277,6 +280,9 @@ importers: jsonwebtoken: specifier: 'catalog:' version: 9.0.2 + radashi: + specifier: 'catalog:' + version: 12.5.1 zod: specifier: 'catalog:' version: 3.24.1 @@ -5024,9 +5030,9 @@ packages: queue-microtask@1.2.3: resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==} - radash@12.1.0: - resolution: {integrity: sha512-b0Zcf09AhqKS83btmUeYBS8tFK7XL2e3RvLmZcm0sTdF1/UUlHSsjXdCcWNxe7yfmAlPve5ym0DmKGtTzP6kVQ==} - engines: {node: '>=14.18.0'} + radashi@12.5.1: + resolution: {integrity: sha512-gcznSPJe2SCIuWf6QTqSHZRyMQU6hnUk4NpR7LmmNmdK1BGOXdnHuNIO4VzNw+feu0Wsnv/AYmxqwUYDBatPMA==} + engines: {node: '>=16.0.0'} rambda@7.5.0: resolution: {integrity: sha512-y/M9weqWAH4iopRd7EHDEQQvpFPHj1AA3oHozE9tfITHUtTR7Z9PSlIRRG2l1GuW7sefC1cXFfIcF+cgnShdBA==} @@ -11559,7 +11565,7 @@ snapshots: queue-microtask@1.2.3: {} - radash@12.1.0: {} + radashi@12.5.1: {} rambda@7.5.0: {} diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 853b936..8e2e4ef 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -21,6 +21,7 @@ catalog: prettier: ^3.2.5 react: ^19.1.0 react-dom: ^19.1.0 + radashi: ^12.5.1 rimraf: ^6.0.1 tailwindcss: ^3.4.15 typescript: ^5.7