From 3f3c2f92edeab94d74d36fffadfdb11a2589b409 Mon Sep 17 00:00:00 2001 From: William Grant Date: Mon, 20 May 2024 10:55:22 +1000 Subject: [PATCH] fix: resolve cyclic import with outgoing message type avatar placeholder unit test now runs --- .eslintrc.js | 2 +- ts/session/messages/outgoing/ContentMessage.ts | 2 +- ts/session/messages/outgoing/index.ts | 7 +++---- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index 9da3b3656..b1749d46a 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -79,7 +79,7 @@ module.exports = { // make imports without file extensions 'import/extensions': ['warn', 'never'], - // NOTE Remove this line when debugging cyclic dependencies + // NOTE Comment out this line when debugging cyclic dependencies 'import/no-cycle': 'off', // Prettier overrides: diff --git a/ts/session/messages/outgoing/ContentMessage.ts b/ts/session/messages/outgoing/ContentMessage.ts index f1d445767..4a57b7cf8 100644 --- a/ts/session/messages/outgoing/ContentMessage.ts +++ b/ts/session/messages/outgoing/ContentMessage.ts @@ -1,6 +1,6 @@ -import { Message } from '.'; import { SignalService } from '../../../protobuf'; import { TTL_DEFAULT } from '../../constants'; +import { Message } from './Message'; export abstract class ContentMessage extends Message { public plainTextBuffer(): Uint8Array { diff --git a/ts/session/messages/outgoing/index.ts b/ts/session/messages/outgoing/index.ts index 96e276147..8c25fa4ed 100644 --- a/ts/session/messages/outgoing/index.ts +++ b/ts/session/messages/outgoing/index.ts @@ -1,6 +1,5 @@ +import { ContentMessage } from './ContentMessage'; +import { DataMessage } from './DataMessage'; import { Message } from './Message'; -export * from './ContentMessage'; -export * from './DataMessage'; - -export { Message }; +export { ContentMessage, DataMessage, Message };