diff --git a/.changeset/stale-walls-move.md b/.changeset/stale-walls-move.md new file mode 100644 index 0000000000000..5f1ffc6d50390 --- /dev/null +++ b/.changeset/stale-walls-move.md @@ -0,0 +1,6 @@ +--- +'@rocket.chat/apps-engine': patch +'@rocket.chat/meteor': patch +--- + +Fixes the Apps-Engine package installation, removing the dependency on an internal package diff --git a/apps/meteor/ee/server/apps/storage/AppRealStorage.ts b/apps/meteor/ee/server/apps/storage/AppRealStorage.ts index da319261bd0c0..a483a48b365cb 100644 --- a/apps/meteor/ee/server/apps/storage/AppRealStorage.ts +++ b/apps/meteor/ee/server/apps/storage/AppRealStorage.ts @@ -1,6 +1,7 @@ import type { IAppStorageItem } from '@rocket.chat/apps-engine/server/storage'; import { AppMetadataStorage } from '@rocket.chat/apps-engine/server/storage'; import type { Apps } from '@rocket.chat/models'; +import { removeEmpty } from '@rocket.chat/tools'; import type { UpdateFilter } from 'mongodb'; export class AppRealStorage extends AppMetadataStorage { @@ -18,10 +19,11 @@ export class AppRealStorage extends AppMetadataStorage { throw new Error('App already exists.'); } - const id = (await this.db.insertOne(item)).insertedId as unknown as string; - item._id = id; + const nonEmptyItem = removeEmpty(item); + const id = (await this.db.insertOne(nonEmptyItem)).insertedId as unknown as string; + nonEmptyItem._id = id; - return item; + return nonEmptyItem; } public async retrieveOne(id: string): Promise { diff --git a/packages/apps-engine/package.json b/packages/apps-engine/package.json index 844d62b5e1d48..eb113f2a14f88 100644 --- a/packages/apps-engine/package.json +++ b/packages/apps-engine/package.json @@ -93,7 +93,6 @@ }, "dependencies": { "@msgpack/msgpack": "3.0.0-beta2", - "@rocket.chat/tools": "workspace:^", "adm-zip": "^0.5.16", "debug": "^4.3.7", "esbuild": "^0.25.0", diff --git a/packages/apps-engine/src/server/AppManager.ts b/packages/apps-engine/src/server/AppManager.ts index 6bbd8855d793b..71fde20f5e675 100644 --- a/packages/apps-engine/src/server/AppManager.ts +++ b/packages/apps-engine/src/server/AppManager.ts @@ -1,7 +1,5 @@ import { Buffer } from 'buffer'; -import { removeEmpty } from '@rocket.chat/tools'; - import type { IGetAppsFilter } from './IGetAppsFilter'; import { ProxiedApp } from './ProxiedApp'; import type { PersistenceBridge, UserBridge } from './bridges'; @@ -609,7 +607,7 @@ export class AppManager { } descriptor.signature = await this.getSignatureManager().signApp(descriptor); - const created = await this.appMetadataStorage.create(removeEmpty(descriptor)); + const created = await this.appMetadataStorage.create(descriptor); if (!created) { aff.setStorageError('Failed to create the App, the storage did not return it.'); diff --git a/yarn.lock b/yarn.lock index 774331c4db321..d257ec62999f6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7999,7 +7999,6 @@ __metadata: dependencies: "@msgpack/msgpack": "npm:3.0.0-beta2" "@rocket.chat/eslint-config": "workspace:~" - "@rocket.chat/tools": "workspace:^" "@rocket.chat/ui-kit": "workspace:~" "@types/adm-zip": "npm:^0.5.6" "@types/debug": "npm:^4.1.12"