diff --git a/apps/meteor/app/cloud/server/functions/supportedVersionsToken/supportedVersionsToken.ts b/apps/meteor/app/cloud/server/functions/supportedVersionsToken/supportedVersionsToken.ts index 0b04d10e3556..dd933107d57c 100644 --- a/apps/meteor/app/cloud/server/functions/supportedVersionsToken/supportedVersionsToken.ts +++ b/apps/meteor/app/cloud/server/functions/supportedVersionsToken/supportedVersionsToken.ts @@ -12,7 +12,7 @@ import { buildVersionUpdateMessage } from '../../../../version-check/server/func import { generateWorkspaceBearerHttpHeader } from '../getWorkspaceAccessToken'; import { supportedVersionsChooseLatest } from './supportedVersionsChooseLatest'; -declare module '@rocket.chat/license' { +declare module '@rocket.chat/core-typings' { interface ILicenseV3 { supportedVersions?: SignedSupportedVersions; } diff --git a/apps/meteor/client/hooks/useShouldPreventAction.ts b/apps/meteor/client/hooks/useShouldPreventAction.ts index edcbd5abe676..99b831a7928c 100644 --- a/apps/meteor/client/hooks/useShouldPreventAction.ts +++ b/apps/meteor/client/hooks/useShouldPreventAction.ts @@ -1,4 +1,4 @@ -import type { LicenseLimitKind } from '@rocket.chat/license'; +import type { LicenseLimitKind } from '@rocket.chat/core-typings'; import { useLicense } from './useLicense'; diff --git a/apps/meteor/client/lib/utils/isOverLicenseLimits.ts b/apps/meteor/client/lib/utils/isOverLicenseLimits.ts index 20e0a2b7ca42..957500c1ac30 100644 --- a/apps/meteor/client/lib/utils/isOverLicenseLimits.ts +++ b/apps/meteor/client/lib/utils/isOverLicenseLimits.ts @@ -1,4 +1,4 @@ -import type { LicenseLimitKind } from '@rocket.chat/license'; +import type { LicenseLimitKind } from '@rocket.chat/core-typings'; type Limits = Record< LicenseLimitKind, diff --git a/apps/meteor/client/views/admin/subscription/SubscriptionCalloutLimits.tsx b/apps/meteor/client/views/admin/subscription/SubscriptionCalloutLimits.tsx index 074e349081bd..2adc3d306034 100644 --- a/apps/meteor/client/views/admin/subscription/SubscriptionCalloutLimits.tsx +++ b/apps/meteor/client/views/admin/subscription/SubscriptionCalloutLimits.tsx @@ -1,5 +1,5 @@ +import type { LicenseBehavior } from '@rocket.chat/core-typings'; import { Callout } from '@rocket.chat/fuselage'; -import type { LicenseBehavior } from '@rocket.chat/license/src/definition/LicenseBehavior'; import { validateWarnLimit } from '@rocket.chat/license/src/validation/validateLimit'; import { ExternalLink } from '@rocket.chat/ui-client'; import React from 'react'; diff --git a/apps/meteor/client/views/admin/subscription/components/cards/PlanCard.tsx b/apps/meteor/client/views/admin/subscription/components/cards/PlanCard.tsx index c9e1e06ff8cd..066a4fc1f160 100644 --- a/apps/meteor/client/views/admin/subscription/components/cards/PlanCard.tsx +++ b/apps/meteor/client/views/admin/subscription/components/cards/PlanCard.tsx @@ -1,4 +1,4 @@ -import type { ILicenseV3 } from '@rocket.chat/license'; +import type { ILicenseV3 } from '@rocket.chat/core-typings'; import type { ReactElement } from 'react'; import React from 'react'; diff --git a/apps/meteor/client/views/admin/subscription/components/cards/PlanCard/PlanCardPremium.tsx b/apps/meteor/client/views/admin/subscription/components/cards/PlanCard/PlanCardPremium.tsx index cd7227bda098..056aab081785 100644 --- a/apps/meteor/client/views/admin/subscription/components/cards/PlanCard/PlanCardPremium.tsx +++ b/apps/meteor/client/views/admin/subscription/components/cards/PlanCard/PlanCardPremium.tsx @@ -1,5 +1,5 @@ +import type { ILicenseV3 } from '@rocket.chat/core-typings'; import { Box, Icon, Skeleton } from '@rocket.chat/fuselage'; -import type { ILicenseV3 } from '@rocket.chat/license'; import { ExternalLink } from '@rocket.chat/ui-client'; import type { ReactElement } from 'react'; import React from 'react'; diff --git a/apps/meteor/client/views/admin/subscription/components/cards/PlanCard/PlanCardTrial.tsx b/apps/meteor/client/views/admin/subscription/components/cards/PlanCard/PlanCardTrial.tsx index f1d3001bd508..95ce21e67918 100644 --- a/apps/meteor/client/views/admin/subscription/components/cards/PlanCard/PlanCardTrial.tsx +++ b/apps/meteor/client/views/admin/subscription/components/cards/PlanCard/PlanCardTrial.tsx @@ -1,5 +1,5 @@ +import type { ILicenseV3 } from '@rocket.chat/core-typings'; import { Box, Tag } from '@rocket.chat/fuselage'; -import type { ILicenseV3 } from '@rocket.chat/license'; import { ExternalLink } from '@rocket.chat/ui-client'; import differenceInDays from 'date-fns/differenceInDays'; import type { ReactElement } from 'react'; diff --git a/apps/meteor/ee/app/license/server/lib/getAppCount.ts b/apps/meteor/ee/app/license/server/lib/getAppCount.ts index a05813f596bb..f408143218de 100644 --- a/apps/meteor/ee/app/license/server/lib/getAppCount.ts +++ b/apps/meteor/ee/app/license/server/lib/getAppCount.ts @@ -1,5 +1,5 @@ import { Apps } from '@rocket.chat/core-services'; -import type { LicenseAppSources } from '@rocket.chat/license'; +import type { LicenseAppSources } from '@rocket.chat/core-typings'; import { getInstallationSourceFromAppStorageItem } from '../../../../../lib/apps/getInstallationSourceFromAppStorageItem'; diff --git a/apps/meteor/ee/app/license/server/license.internalService.ts b/apps/meteor/ee/app/license/server/license.internalService.ts index 6c179bf9797e..9998378191d1 100644 --- a/apps/meteor/ee/app/license/server/license.internalService.ts +++ b/apps/meteor/ee/app/license/server/license.internalService.ts @@ -1,6 +1,7 @@ import type { ILicense } from '@rocket.chat/core-services'; import { api, ServiceClassInternal } from '@rocket.chat/core-services'; -import { License, type LicenseModule } from '@rocket.chat/license'; +import { type LicenseModule } from '@rocket.chat/core-typings'; +import { License } from '@rocket.chat/license'; import { guestPermissions } from '../../authorization/lib/guestPermissions'; import { resetEnterprisePermissions } from '../../authorization/server/resetEnterprisePermissions'; diff --git a/apps/meteor/ee/app/license/server/methods.ts b/apps/meteor/ee/app/license/server/methods.ts index 39d14326a79a..dbdfe7aea68c 100644 --- a/apps/meteor/ee/app/license/server/methods.ts +++ b/apps/meteor/ee/app/license/server/methods.ts @@ -1,4 +1,5 @@ -import { License, type ILicenseTag, type LicenseModule } from '@rocket.chat/license'; +import { type ILicenseTag, type LicenseModule } from '@rocket.chat/core-typings'; +import { License } from '@rocket.chat/license'; import type { ServerMethods } from '@rocket.chat/ui-contexts'; import { check } from 'meteor/check'; import { Meteor } from 'meteor/meteor'; diff --git a/apps/meteor/ee/app/license/server/startup.ts b/apps/meteor/ee/app/license/server/startup.ts index 1f05ae27ce9d..e483cb8d7336 100644 --- a/apps/meteor/ee/app/license/server/startup.ts +++ b/apps/meteor/ee/app/license/server/startup.ts @@ -1,5 +1,5 @@ import { api } from '@rocket.chat/core-services'; -import type { LicenseLimitKind } from '@rocket.chat/license'; +import type { LicenseLimitKind } from '@rocket.chat/core-typings'; import { License } from '@rocket.chat/license'; import { Subscriptions, Users, Settings, LivechatVisitors } from '@rocket.chat/models'; import { wrapExceptions } from '@rocket.chat/tools'; diff --git a/apps/meteor/ee/app/settings/server/settings.ts b/apps/meteor/ee/app/settings/server/settings.ts index 76ce7c15155a..d404dfa1741a 100644 --- a/apps/meteor/ee/app/settings/server/settings.ts +++ b/apps/meteor/ee/app/settings/server/settings.ts @@ -1,5 +1,5 @@ -import type { ISetting, SettingValue } from '@rocket.chat/core-typings'; -import { License, type LicenseModule } from '@rocket.chat/license'; +import type { ISetting, SettingValue, LicenseModule } from '@rocket.chat/core-typings'; +import { License } from '@rocket.chat/license'; import { Settings } from '@rocket.chat/models'; import { Meteor } from 'meteor/meteor'; diff --git a/apps/meteor/ee/client/hooks/useHasLicenseModule.ts b/apps/meteor/ee/client/hooks/useHasLicenseModule.ts index 4e44029c60f4..f2d75ab23746 100644 --- a/apps/meteor/ee/client/hooks/useHasLicenseModule.ts +++ b/apps/meteor/ee/client/hooks/useHasLicenseModule.ts @@ -1,4 +1,4 @@ -import type { LicenseModule } from '@rocket.chat/license'; +import type { LicenseModule } from '@rocket.chat/core-typings'; import { useLicenseBase } from '../../../client/hooks/useLicense'; diff --git a/apps/meteor/ee/client/lib/onToggledFeature.ts b/apps/meteor/ee/client/lib/onToggledFeature.ts index ae2e4ad9f4a8..3f47b35bdbe2 100644 --- a/apps/meteor/ee/client/lib/onToggledFeature.ts +++ b/apps/meteor/ee/client/lib/onToggledFeature.ts @@ -1,4 +1,4 @@ -import type { LicenseModule } from '@rocket.chat/license'; +import type { LicenseModule } from '@rocket.chat/core-typings'; import { QueryObserver } from '@tanstack/react-query'; import { queryClient } from '../../../client/lib/queryClient'; diff --git a/apps/meteor/lib/apps/getInstallationSourceFromAppStorageItem.ts b/apps/meteor/lib/apps/getInstallationSourceFromAppStorageItem.ts index 8ac29d191576..d8fd5a48f79f 100644 --- a/apps/meteor/lib/apps/getInstallationSourceFromAppStorageItem.ts +++ b/apps/meteor/lib/apps/getInstallationSourceFromAppStorageItem.ts @@ -1,5 +1,5 @@ import type { IAppStorageItem } from '@rocket.chat/apps-engine/server/storage'; -import type { LicenseAppSources } from '@rocket.chat/license'; +import type { LicenseAppSources } from '@rocket.chat/core-typings'; /** * There have been reports of apps not being correctly migrated from versions prior to 6.0