Skip to content

Commit

Permalink
..
Browse files Browse the repository at this point in the history
  • Loading branch information
ggazzo committed Dec 8, 2023
1 parent 85def9e commit 1fd0cad
Show file tree
Hide file tree
Showing 15 changed files with 18 additions and 16 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/client/hooks/useShouldPreventAction.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { LicenseLimitKind } from '@rocket.chat/license';
import type { LicenseLimitKind } from '@rocket.chat/core-typings';

import { useLicense } from './useLicense';

Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/client/lib/utils/isOverLicenseLimits.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { LicenseLimitKind } from '@rocket.chat/license';
import type { LicenseLimitKind } from '@rocket.chat/core-typings';

type Limits = Record<
LicenseLimitKind,
Expand Down
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
Original file line number Diff line number Diff line change
@@ -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';

Expand Down
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/ee/app/license/server/lib/getAppCount.ts
Original file line number Diff line number Diff line change
@@ -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';

Expand Down
3 changes: 2 additions & 1 deletion apps/meteor/ee/app/license/server/license.internalService.ts
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
3 changes: 2 additions & 1 deletion apps/meteor/ee/app/license/server/methods.ts
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/ee/app/license/server/startup.ts
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
4 changes: 2 additions & 2 deletions apps/meteor/ee/app/settings/server/settings.ts
Original file line number Diff line number Diff line change
@@ -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';

Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/ee/client/hooks/useHasLicenseModule.ts
Original file line number Diff line number Diff line change
@@ -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';

Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/ee/client/lib/onToggledFeature.ts
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit 1fd0cad

Please sign in to comment.