Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
2ab8b32
feat(apps-engine): export ENGINE_VERSION from definition layer
d-gubert Apr 16, 2026
a4a14c1
fix: path detection for version.ts
d-gubert Apr 22, 2026
61e4d45
feat(apps): copy apps-engine server code into @rocket.chat/apps
d-gubert Apr 16, 2026
3269f86
feat(apps): copy apps-engine client UI host code into @rocket.chat/apps
d-gubert Apr 16, 2026
d15f9cb
feat(apps): copy deno-runtime into @rocket.chat/apps
d-gubert Apr 16, 2026
75fb776
refactor(apps): merge IListenerBridge augmentation into the interface…
d-gubert Apr 16, 2026
0f89a7a
chore(apps): add build config for server code and deno-runtime
d-gubert Apr 16, 2026
8bbe587
chore(deps): install new dependencies for @rocket.chat/apps
d-gubert Apr 16, 2026
8ce8b49
fix: typo in regex range
d-gubert Apr 16, 2026
dab63e5
refactor(apps): remove AppManager dependency from deno-runtime Room c…
d-gubert Apr 16, 2026
af58d57
feat(apps): generate deno-runtime config with resolved apps-engine pa…
d-gubert Apr 16, 2026
e87065b
refactor(apps): point AppsEngine facade and IAppServerOrchestrator to…
d-gubert Apr 16, 2026
1eef341
refactor(meteor): migrate apps-engine/server/ imports to @rocket.chat…
d-gubert Apr 16, 2026
0e0fc07
refactor(meteor): migrate apps-engine/client/ imports to @rocket.chat…
d-gubert Apr 16, 2026
2118bf6
refactor(core-services): migrate apps-engine/server/ imports to @rock…
d-gubert Apr 16, 2026
0720d8e
refactor(apps-engine): promote cross-boundary types to definition layer
d-gubert Apr 16, 2026
5d4a6f7
refactor(apps-engine): remove server, client, deno-runtime and scripts
d-gubert Apr 16, 2026
c9af208
refactor(apps): source room options and OAuth2Client from apps-engine…
d-gubert Apr 16, 2026
83f9262
fix(apps): resolve strict-mode TypeScript errors in packages/apps/src
d-gubert Apr 16, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions apps/meteor/app/apps/server/bridges/activation.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { IAppServerOrchestrator, AppStatus } from '@rocket.chat/apps';
import type { ProxiedApp } from '@rocket.chat/apps-engine/server/ProxiedApp';
import { AppActivationBridge as ActivationBridge } from '@rocket.chat/apps-engine/server/bridges/AppActivationBridge';
import type { ProxiedApp } from '@rocket.chat/apps/server/ProxiedApp';
import { AppActivationBridge as ActivationBridge } from '@rocket.chat/apps/server/bridges/AppActivationBridge';
import { UserStatus } from '@rocket.chat/core-typings';
import { Users } from '@rocket.chat/models';

Expand Down
4 changes: 2 additions & 2 deletions apps/meteor/app/apps/server/bridges/api.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import type { IAppServerOrchestrator } from '@rocket.chat/apps';
import type { RequestMethod } from '@rocket.chat/apps-engine/definition/accessors';
import type { IApiRequest, IApiEndpoint, IApi } from '@rocket.chat/apps-engine/definition/api';
import { ApiBridge } from '@rocket.chat/apps-engine/server/bridges/ApiBridge';
import type { AppApi } from '@rocket.chat/apps-engine/server/managers/AppApi';
import { ApiBridge } from '@rocket.chat/apps/server/bridges/ApiBridge';
import type { AppApi } from '@rocket.chat/apps/server/managers/AppApi';
import type { Response, Request, IRouter, RequestHandler } from 'express';
import express from 'express';
import { Meteor } from 'meteor/meteor';
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/app/apps/server/bridges/bridges.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { AppBridges } from '@rocket.chat/apps-engine/server/bridges';
import { AppBridges } from '@rocket.chat/apps/server/bridges';

import { AppActivationBridge } from './activation';
import { AppApisBridge } from './api';
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/app/apps/server/bridges/cloud.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { IAppServerOrchestrator } from '@rocket.chat/apps';
import type { IWorkspaceToken } from '@rocket.chat/apps-engine/definition/cloud/IWorkspaceToken';
import { CloudWorkspaceBridge } from '@rocket.chat/apps-engine/server/bridges/CloudWorkspaceBridge';
import { CloudWorkspaceBridge } from '@rocket.chat/apps/server/bridges/CloudWorkspaceBridge';

import { getWorkspaceAccessTokenWithScope } from '../../../cloud/server';

Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/app/apps/server/bridges/commands.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import type { IAppServerOrchestrator, IAppsRoom, IAppsUser } from '@rocket.chat/apps';
import type { ISlashCommand, ISlashCommandPreview, ISlashCommandPreviewItem } from '@rocket.chat/apps-engine/definition/slashcommands';
import { SlashCommandContext } from '@rocket.chat/apps-engine/definition/slashcommands';
import { CommandBridge } from '@rocket.chat/apps-engine/server/bridges/CommandBridge';
import { CommandBridge } from '@rocket.chat/apps/server/bridges/CommandBridge';
import type { IMessage, RequiredField, SlashCommand, SlashCommandCallbackParams } from '@rocket.chat/core-typings';

import { Utilities } from '../../../../ee/lib/misc/Utilities';
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/app/apps/server/bridges/contact.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { IAppServerOrchestrator } from '@rocket.chat/apps';
import type { ILivechatContact } from '@rocket.chat/apps-engine/definition/livechat';
import { ContactBridge } from '@rocket.chat/apps-engine/server/bridges';
import { ContactBridge } from '@rocket.chat/apps/server/bridges';

import { addContactEmail } from '../../../livechat/server/lib/contacts/addContactEmail';
import { verifyContactChannel } from '../../../livechat/server/lib/contacts/verifyContactChannel';
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/app/apps/server/bridges/details.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { IAppServerOrchestrator } from '@rocket.chat/apps';
import type { ISetting } from '@rocket.chat/apps-engine/definition/settings';
import { AppDetailChangesBridge as DetailChangesBridge } from '@rocket.chat/apps-engine/server/bridges/AppDetailChangesBridge';
import { AppDetailChangesBridge as DetailChangesBridge } from '@rocket.chat/apps/server/bridges/AppDetailChangesBridge';

export class AppDetailChangesBridge extends DetailChangesBridge {
constructor(private readonly orch: IAppServerOrchestrator) {
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/app/apps/server/bridges/email.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { IAppServerOrchestrator } from '@rocket.chat/apps';
import type { IEmail } from '@rocket.chat/apps-engine/definition/email';
import { EmailBridge } from '@rocket.chat/apps-engine/server/bridges';
import { EmailBridge } from '@rocket.chat/apps/server/bridges';

import * as Mailer from '../../../mailer/server/api';
import { settings } from '../../../settings/server';
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/app/apps/server/bridges/environmental.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { IAppServerOrchestrator } from '@rocket.chat/apps';
import { EnvironmentalVariableBridge } from '@rocket.chat/apps-engine/server/bridges/EnvironmentalVariableBridge';
import { EnvironmentalVariableBridge } from '@rocket.chat/apps/server/bridges/EnvironmentalVariableBridge';

export class AppEnvironmentalVariableBridge extends EnvironmentalVariableBridge {
allowed: Array<string>;
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/app/apps/server/bridges/experimental.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { IAppServerOrchestrator } from '@rocket.chat/apps';
import { ExperimentalBridge } from '@rocket.chat/apps-engine/server/bridges';
import { ExperimentalBridge } from '@rocket.chat/apps/server/bridges';

export class AppExperimentalBridge extends ExperimentalBridge {
constructor(protected readonly orch: IAppServerOrchestrator) {
Expand Down
4 changes: 2 additions & 2 deletions apps/meteor/app/apps/server/bridges/http.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import type { IAppServerOrchestrator } from '@rocket.chat/apps';
import type { IHttpResponse } from '@rocket.chat/apps-engine/definition/accessors';
import type { IHttpBridgeRequestInfo } from '@rocket.chat/apps-engine/server/bridges';
import { HttpBridge } from '@rocket.chat/apps-engine/server/bridges/HttpBridge';
import type { IHttpBridgeRequestInfo } from '@rocket.chat/apps/server/bridges';
import { HttpBridge } from '@rocket.chat/apps/server/bridges/HttpBridge';
import { serverFetch as fetch, type ExtendedFetchOptions } from '@rocket.chat/server-fetch';

import { settings } from '../../../settings/server';
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/app/apps/server/bridges/internal.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { IAppServerOrchestrator, IAppsSetting } from '@rocket.chat/apps';
import { InternalBridge } from '@rocket.chat/apps-engine/server/bridges/InternalBridge';
import { InternalBridge } from '@rocket.chat/apps/server/bridges/InternalBridge';
import type { ISetting, ISubscription } from '@rocket.chat/core-typings';
import { Settings, Subscriptions } from '@rocket.chat/models';
import { isTruthy } from '@rocket.chat/tools';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { IInternalFederationBridge } from '@rocket.chat/apps-engine/server/bridges/IInternalFederationBridge';
import type { IInternalFederationBridge } from '@rocket.chat/apps/server/bridges/IInternalFederationBridge';
import { FederationKeys } from '@rocket.chat/models';

export class AppInternalFederationBridge implements IInternalFederationBridge {
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/app/apps/server/bridges/livechat.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import type {
} from '@rocket.chat/apps-engine/definition/livechat';
import type { IMessage as IAppsEngineMessage } from '@rocket.chat/apps-engine/definition/messages';
import type { IUser } from '@rocket.chat/apps-engine/definition/users';
import { LivechatBridge } from '@rocket.chat/apps-engine/server/bridges/LivechatBridge';
import { LivechatBridge } from '@rocket.chat/apps/server/bridges/LivechatBridge';
import type { ILivechatDepartment, IOmnichannelRoom, SelectedAgent, IMessage, ILivechatVisitor } from '@rocket.chat/core-typings';
import { OmnichannelSourceType } from '@rocket.chat/core-typings';
import { LivechatVisitors, LivechatRooms, LivechatDepartment, Users } from '@rocket.chat/models';
Expand Down
4 changes: 2 additions & 2 deletions apps/meteor/app/apps/server/bridges/messages.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import type { IAppServerOrchestrator, IAppsMessage, IAppsUser } from '@rocket.chat/apps';
import type { Reaction } from '@rocket.chat/apps-engine/definition/messages';
import type { IRoom } from '@rocket.chat/apps-engine/definition/rooms';
import type { ITypingDescriptor } from '@rocket.chat/apps-engine/server/bridges/MessageBridge';
import { MessageBridge } from '@rocket.chat/apps-engine/server/bridges/MessageBridge';
import type { ITypingDescriptor } from '@rocket.chat/apps/server/bridges/MessageBridge';
import { MessageBridge } from '@rocket.chat/apps/server/bridges/MessageBridge';
import { api } from '@rocket.chat/core-services';
import type { IMessage } from '@rocket.chat/core-typings';
import { Users, Subscriptions } from '@rocket.chat/models';
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/app/apps/server/bridges/moderation.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import type { IAppServerOrchestrator } from '@rocket.chat/apps';
import type { IMessage } from '@rocket.chat/apps-engine/definition/messages';
import type { IUser } from '@rocket.chat/apps-engine/definition/users';
import { ModerationBridge } from '@rocket.chat/apps-engine/server/bridges/ModerationBridge';
import { ModerationBridge } from '@rocket.chat/apps/server/bridges/ModerationBridge';
import { ModerationReports } from '@rocket.chat/models';

import { reportMessage } from '../../../../server/lib/moderation/reportMessage';
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/app/apps/server/bridges/oauthApps.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { randomUUID } from 'crypto';

import type { IAppServerOrchestrator } from '@rocket.chat/apps';
import type { IOAuthApp, IOAuthAppParams } from '@rocket.chat/apps-engine/definition/accessors/IOAuthApp';
import { OAuthAppsBridge } from '@rocket.chat/apps-engine/server/bridges/OAuthAppsBridge';
import { OAuthAppsBridge } from '@rocket.chat/apps/server/bridges/OAuthAppsBridge';
import type { IOAuthApps } from '@rocket.chat/core-typings';
import { OAuthApps, Users } from '@rocket.chat/models';
import { Random } from '@rocket.chat/random';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import type {
IOutboundMessageProviders,
IOutboundPhoneMessageProvider,
} from '@rocket.chat/apps-engine/definition/outboundCommunication';
import { OutboundMessageBridge } from '@rocket.chat/apps-engine/server/bridges';
import { OutboundMessageBridge } from '@rocket.chat/apps/server/bridges';

import { getOutboundService } from '../../../livechat/server/lib/outboundcommunication';

Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/app/apps/server/bridges/persistence.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { IAppServerOrchestrator } from '@rocket.chat/apps';
import type { RocketChatAssociationRecord } from '@rocket.chat/apps-engine/definition/metadata';
import { PersistenceBridge } from '@rocket.chat/apps-engine/server/bridges/PersistenceBridge';
import { PersistenceBridge } from '@rocket.chat/apps/server/bridges/PersistenceBridge';
import type { InsertOneResult } from 'mongodb';

export class AppPersistenceBridge extends PersistenceBridge {
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/app/apps/server/bridges/roles.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { IAppServerOrchestrator, IAppsRole } from '@rocket.chat/apps';
import { RoleBridge } from '@rocket.chat/apps-engine/server/bridges';
import { RoleBridge } from '@rocket.chat/apps/server/bridges';
import type { IRole } from '@rocket.chat/core-typings';
import { Roles } from '@rocket.chat/models';

Expand Down
4 changes: 2 additions & 2 deletions apps/meteor/app/apps/server/bridges/rooms.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import type { IMessage, IMessageRaw } from '@rocket.chat/apps-engine/definition/
import type { IRoom, IRoomRaw } from '@rocket.chat/apps-engine/definition/rooms';
import { RoomType } from '@rocket.chat/apps-engine/definition/rooms';
import type { IUser } from '@rocket.chat/apps-engine/definition/users';
import type { GetMessagesOptions, GetRoomsFilters, GetRoomsOptions } from '@rocket.chat/apps-engine/server/bridges/RoomBridge';
import { RoomBridge } from '@rocket.chat/apps-engine/server/bridges/RoomBridge';
import type { GetMessagesOptions, GetRoomsFilters, GetRoomsOptions } from '@rocket.chat/apps/server/bridges/RoomBridge';
import { RoomBridge } from '@rocket.chat/apps/server/bridges/RoomBridge';
import type { ISubscription, IUser as ICoreUser, IRoom as ICoreRoom, IMessage as ICoreMessage } from '@rocket.chat/core-typings';
import { Subscriptions, Users, Rooms, Messages } from '@rocket.chat/models';
import type { FindOptions, Sort } from 'mongodb';
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/app/apps/server/bridges/scheduler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { Agenda } from '@rocket.chat/agenda';
import type { IAppServerOrchestrator } from '@rocket.chat/apps';
import type { IProcessor, IOnetimeSchedule, IRecurringSchedule, IJobContext } from '@rocket.chat/apps-engine/definition/scheduler';
import { StartupType } from '@rocket.chat/apps-engine/definition/scheduler';
import { SchedulerBridge } from '@rocket.chat/apps-engine/server/bridges/SchedulerBridge';
import { SchedulerBridge } from '@rocket.chat/apps/server/bridges/SchedulerBridge';
import { ObjectId } from 'bson';
import { MongoInternals } from 'meteor/mongo';

Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/app/apps/server/bridges/settings.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Apps, type IAppServerOrchestrator } from '@rocket.chat/apps';
import type { IReadSettingPermission } from '@rocket.chat/apps-engine/definition/permissions/IPermission';
import type { ISetting } from '@rocket.chat/apps-engine/definition/settings';
import { ServerSettingBridge } from '@rocket.chat/apps-engine/server/bridges/ServerSettingBridge';
import { ServerSettingBridge } from '@rocket.chat/apps/server/bridges/ServerSettingBridge';
import { Settings } from '@rocket.chat/models';

import { updateAuditedByApp } from '../../../../server/settings/lib/auditedSettingUpdates';
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/app/apps/server/bridges/thread.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { IAppServerOrchestrator } from '@rocket.chat/apps';
import type { IMessage } from '@rocket.chat/apps-engine/definition/messages';
import { ThreadBridge } from '@rocket.chat/apps-engine/server/bridges/ThreadBridge';
import { ThreadBridge } from '@rocket.chat/apps/server/bridges/ThreadBridge';

export class AppThreadBridge extends ThreadBridge {
constructor(private readonly orch: IAppServerOrchestrator) {
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/app/apps/server/bridges/uiInteraction.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import type { IAppServerOrchestrator } from '@rocket.chat/apps';
import type { IUIKitInteraction } from '@rocket.chat/apps-engine/definition/uikit';
import type { IUser } from '@rocket.chat/apps-engine/definition/users';
import { UiInteractionBridge as AppsEngineUiInteractionBridge } from '@rocket.chat/apps-engine/server/bridges/UiInteractionBridge';
import { UiInteractionBridge as AppsEngineUiInteractionBridge } from '@rocket.chat/apps/server/bridges/UiInteractionBridge';
import { api } from '@rocket.chat/core-services';
import type * as UiKit from '@rocket.chat/ui-kit';

Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/app/apps/server/bridges/uploads.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import type { IAppServerOrchestrator } from '@rocket.chat/apps';
import type { IUpload } from '@rocket.chat/apps-engine/definition/uploads';
import type { IUploadDetails } from '@rocket.chat/apps-engine/definition/uploads/IUploadDetails';
import { UploadBridge } from '@rocket.chat/apps-engine/server/bridges/UploadBridge';
import { UploadBridge } from '@rocket.chat/apps/server/bridges/UploadBridge';

import { determineFileType } from '../../../../ee/lib/misc/determineFileType';
import { FileUpload } from '../../../file-upload/server';
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/app/apps/server/bridges/users.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { IAppServerOrchestrator } from '@rocket.chat/apps';
import type { IUserCreationOptions, IUser, UserType } from '@rocket.chat/apps-engine/definition/users';
import { UserBridge } from '@rocket.chat/apps-engine/server/bridges/UserBridge';
import { UserBridge } from '@rocket.chat/apps/server/bridges/UserBridge';
import { Presence } from '@rocket.chat/core-services';
import type { UserStatus } from '@rocket.chat/core-typings';
import { Subscriptions, Users } from '@rocket.chat/models';
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/app/apps/server/bridges/videoConferences.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import type { IAppServerOrchestrator } from '@rocket.chat/apps';
import type { IVideoConfProvider } from '@rocket.chat/apps-engine/definition/videoConfProviders';
import type { AppVideoConference, VideoConference } from '@rocket.chat/apps-engine/definition/videoConferences';
import { VideoConferenceBridge } from '@rocket.chat/apps-engine/server/bridges/VideoConferenceBridge';
import { VideoConferenceBridge } from '@rocket.chat/apps/server/bridges/VideoConferenceBridge';
import { VideoConf } from '@rocket.chat/core-services';

import { videoConfProviders } from '../../../../server/lib/videoConfProviders';
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/app/statistics/server/lib/getAppsStatistics.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Apps } from '@rocket.chat/apps';
import { AppStatus, AppStatusUtils } from '@rocket.chat/apps-engine/definition/AppStatus';
import { AppInstallationSource } from '@rocket.chat/apps-engine/server/storage';
import { AppInstallationSource } from '@rocket.chat/apps/server/storage';
import mem from 'mem';

import { SystemLogger } from '../../../../server/lib/logger/system';
Expand Down
4 changes: 2 additions & 2 deletions apps/meteor/client/apps/RealAppsEngineUIHost.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { AppsEngineUIHost } from '@rocket.chat/apps-engine/client/AppsEngineUIHost';
import type { IExternalComponentRoomInfo, IExternalComponentUserInfo } from '@rocket.chat/apps-engine/client/definition';
import { AppsEngineUIHost } from '@rocket.chat/apps/client/AppsEngineUIHost';
import type { IExternalComponentRoomInfo, IExternalComponentUserInfo } from '@rocket.chat/apps/client/definition';

import { getUserAvatarURL } from '../../app/utils/client/getUserAvatarURL';
import { sdk } from '../../app/utils/client/lib/SDKClient';
Expand Down
4 changes: 2 additions & 2 deletions apps/meteor/client/apps/orchestrator.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { AppClientManager } from '@rocket.chat/apps-engine/client/AppClientManager';
import type { AppsEngineUIHost } from '@rocket.chat/apps-engine/client/AppsEngineUIHost';
import { AppClientManager } from '@rocket.chat/apps/client/AppClientManager';
import type { AppsEngineUIHost } from '@rocket.chat/apps/client/AppsEngineUIHost';
import type { IPermission } from '@rocket.chat/apps-engine/definition/permissions/IPermission';
import type { ISetting } from '@rocket.chat/apps-engine/definition/settings';
import type { Serialized } from '@rocket.chat/core-typings';
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/client/contexts/AppsContext.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { AppClientManager } from '@rocket.chat/apps-engine/client/AppClientManager';
import type { AppClientManager } from '@rocket.chat/apps/client/AppClientManager';
import type { IPermission } from '@rocket.chat/apps-engine/definition/permissions/IPermission';
import type { ISetting } from '@rocket.chat/apps-engine/definition/settings';
import type { Serialized } from '@rocket.chat/core-typings';
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/ee/app/license/server/canEnableApp.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { IAppStorageItem } from '@rocket.chat/apps-engine/server/storage';
import type { IAppStorageItem } from '@rocket.chat/apps/server/storage';
import { Apps } from '@rocket.chat/core-services';
import type { LicenseModule } from '@rocket.chat/core-typings';
import { License, type LicenseImp } from '@rocket.chat/license';
Expand Down
6 changes: 3 additions & 3 deletions apps/meteor/ee/lib/misc/formatAppInstanceForRest.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import type { AppStatus } from '@rocket.chat/apps-engine/definition/AppStatus';
import type { IAppInfo } from '@rocket.chat/apps-engine/definition/metadata';
import type { ProxiedApp } from '@rocket.chat/apps-engine/server/ProxiedApp';
import type { AppLicenseValidationResult } from '@rocket.chat/apps-engine/server/marketplace/license';
import type { IAppStorageItem } from '@rocket.chat/apps-engine/server/storage';
import type { ProxiedApp } from '@rocket.chat/apps/server/ProxiedApp';
import type { AppLicenseValidationResult } from '@rocket.chat/apps/server/marketplace/license';
import type { IAppStorageItem } from '@rocket.chat/apps/server/storage';
import type { AppStatusReport } from '@rocket.chat/core-services';
import type { App } from '@rocket.chat/core-typings';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { AppManager } from '@rocket.chat/apps-engine/server/AppManager';
import type { AppManager } from '@rocket.chat/apps/server/AppManager';
import { License } from '@rocket.chat/license';

import { API } from '../../../../../app/api/server';
Expand Down
4 changes: 2 additions & 2 deletions apps/meteor/ee/server/apps/communication/rest.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { AppStatus, AppStatusUtils } from '@rocket.chat/apps-engine/definition/AppStatus';
import type { IAppInfo } from '@rocket.chat/apps-engine/definition/metadata';
import type { AppManager } from '@rocket.chat/apps-engine/server/AppManager';
import type { IMarketplaceInfo } from '@rocket.chat/apps-engine/server/marketplace';
import type { AppManager } from '@rocket.chat/apps/server/AppManager';
import type { IMarketplaceInfo } from '@rocket.chat/apps/server/marketplace';
import type { AppStatusReport } from '@rocket.chat/core-services';
import type { IMessage, IUser } from '@rocket.chat/core-typings';
import { License } from '@rocket.chat/license';
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/ee/server/apps/cron.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { AppStatus } from '@rocket.chat/apps-engine/definition/AppStatus';
import type { ProxiedApp } from '@rocket.chat/apps-engine/server/ProxiedApp';
import type { ProxiedApp } from '@rocket.chat/apps/server/ProxiedApp';
import { cronJobs } from '@rocket.chat/cron';
import { Settings, Users } from '@rocket.chat/models';

Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/ee/server/apps/orchestrator.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import * as path from 'path';

import { registerOrchestrator } from '@rocket.chat/apps';
import { EssentialAppDisabledException } from '@rocket.chat/apps-engine/definition/exceptions';
import { AppManager } from '@rocket.chat/apps-engine/server/AppManager';
import { AppManager } from '@rocket.chat/apps/server/AppManager';
import { Logger } from '@rocket.chat/logger';
import { AppLogs, Apps as AppsModel, AppsPersistence, Statistics } from '@rocket.chat/models';
import { Meteor } from 'meteor/meteor';
Expand Down
Loading
Loading