Skip to content

Commit 2a927fa

Browse files
authored
feat(apps): Migrate app management code from @rocket.chat/apps-engine to @rocket.chat/apps internal package (#40343)
1 parent f129bf5 commit 2a927fa

476 files changed

Lines changed: 1521 additions & 1176 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.changeset/beige-parrots-lead.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@rocket.chat/meteor': minor
3+
---
4+
5+
Swap usage of internal @rocket.chat/apps-engine internal APIs to @rocket.chat/apps package

.changeset/brown-files-work.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@rocket.chat/apps-engine': minor
3+
---
4+
5+
Remove files that weren't accessible to apps at development time

.changeset/stale-needles-care.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@rocket.chat/apps': minor
3+
---
4+
5+
Receives the migration of internal files from @rocket.chat/apps-engine

.github/actions/build-docker/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ runs:
9999
100100
find /tmp/build/bundle/programs/server/npm/node_modules/@esbuild -type d -name 'linux-*' -not -name "*-${swc_arch}" -exec rm -rf {} +
101101
102-
find /tmp/build/bundle/programs/server/npm/node_modules/@rocket.chat/apps-engine/node_modules/@esbuild -type d -name 'linux-*' -not -name "*-${swc_arch}" -exec rm -rf {} +
102+
find /tmp/build/bundle/programs/server/npm/node_modules/@rocket.chat/apps/node_modules/@esbuild -type d -name 'linux-*' -not -name "*-${swc_arch}" -exec rm -rf {} +
103103
fi
104104
105105
if [[ "$INPUT_PUBLISH_IMAGE" == 'true' ]]; then

apps/meteor/app/apps/server/bridges/activation.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
import type { IAppServerOrchestrator, AppStatus } from '@rocket.chat/apps';
2-
import type { ProxiedApp } from '@rocket.chat/apps-engine/server/ProxiedApp';
3-
import { AppActivationBridge as ActivationBridge } from '@rocket.chat/apps-engine/server/bridges/AppActivationBridge';
2+
import type { ProxiedApp } from '@rocket.chat/apps/dist/server/ProxiedApp';
3+
import { AppActivationBridge as ActivationBridge } from '@rocket.chat/apps/dist/server/bridges/AppActivationBridge';
44
import { UserStatus } from '@rocket.chat/core-typings';
55
import { Users } from '@rocket.chat/models';
66

77
export class AppActivationBridge extends ActivationBridge {
8-
// eslint-disable-next-line no-empty-function
98
constructor(private readonly orch: IAppServerOrchestrator) {
109
super();
1110
}

apps/meteor/app/apps/server/bridges/api.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import type { IAppServerOrchestrator } from '@rocket.chat/apps';
2+
import { ApiBridge } from '@rocket.chat/apps/dist/server/bridges/ApiBridge';
3+
import type { AppApi } from '@rocket.chat/apps/dist/server/managers/AppApi';
24
import type { RequestMethod } from '@rocket.chat/apps-engine/definition/accessors';
35
import type { IApiRequest, IApiEndpoint, IApi } from '@rocket.chat/apps-engine/definition/api';
4-
import { ApiBridge } from '@rocket.chat/apps-engine/server/bridges/ApiBridge';
5-
import type { AppApi } from '@rocket.chat/apps-engine/server/managers/AppApi';
66
import type { Response, Request, IRouter, RequestHandler } from 'express';
77
import express from 'express';
88
import { Meteor } from 'meteor/meteor';

apps/meteor/app/apps/server/bridges/bridges.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { AppBridges } from '@rocket.chat/apps-engine/server/bridges';
1+
import { AppBridges } from '@rocket.chat/apps/dist/server/bridges/AppBridges';
22

33
import { AppActivationBridge } from './activation';
44
import { AppApisBridge } from './api';

apps/meteor/app/apps/server/bridges/cloud.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import type { IAppServerOrchestrator } from '@rocket.chat/apps';
2+
import { CloudWorkspaceBridge } from '@rocket.chat/apps/dist/server/bridges/CloudWorkspaceBridge';
23
import type { IWorkspaceToken } from '@rocket.chat/apps-engine/definition/cloud/IWorkspaceToken';
3-
import { CloudWorkspaceBridge } from '@rocket.chat/apps-engine/server/bridges/CloudWorkspaceBridge';
44

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

apps/meteor/app/apps/server/bridges/commands.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import type { IAppServerOrchestrator, IAppsRoom, IAppsUser } from '@rocket.chat/apps';
2+
import { CommandBridge } from '@rocket.chat/apps/dist/server/bridges/CommandBridge';
23
import type { ISlashCommand, ISlashCommandPreview, ISlashCommandPreviewItem } from '@rocket.chat/apps-engine/definition/slashcommands';
34
import { SlashCommandContext } from '@rocket.chat/apps-engine/definition/slashcommands';
4-
import { CommandBridge } from '@rocket.chat/apps-engine/server/bridges/CommandBridge';
55
import type { IMessage, RequiredField, SlashCommand, SlashCommandCallbackParams } from '@rocket.chat/core-typings';
66

77
import { Utilities } from '../../../../ee/lib/misc/Utilities';

apps/meteor/app/apps/server/bridges/contact.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import type { IAppServerOrchestrator } from '@rocket.chat/apps';
2+
import { ContactBridge } from '@rocket.chat/apps/dist/server/bridges/ContactBridge';
23
import type { ILivechatContact } from '@rocket.chat/apps-engine/definition/livechat';
3-
import { ContactBridge } from '@rocket.chat/apps-engine/server/bridges';
44

55
import { addContactEmail } from '../../../livechat/server/lib/contacts/addContactEmail';
66
import { verifyContactChannel } from '../../../livechat/server/lib/contacts/verifyContactChannel';

0 commit comments

Comments
 (0)