From de3a028c928efea7bcace63e9a612f4c7284181f Mon Sep 17 00:00:00 2001
From: Abhijeet Prasad <aprasad@sentry.io>
Date: Wed, 21 Sep 2022 15:10:39 +0200
Subject: [PATCH] ref(types): Use intersections instead of extend in envelope
 types

Remove the usage of extend so that we don't eliminate the base envelope
types.
---
 packages/types/src/envelope.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/types/src/envelope.ts b/packages/types/src/envelope.ts
index 674619759fa1..70ab2739c037 100644
--- a/packages/types/src/envelope.ts
+++ b/packages/types/src/envelope.ts
@@ -40,11 +40,11 @@ export type BaseEnvelopeItemHeaders = {
   length?: number;
 };
 
-type BaseEnvelopeItem<IH extends BaseEnvelopeItemHeaders, P extends unknown> = [IH, P]; // P is for payload
+type BaseEnvelopeItem<ItemHeader, P extends unknown> = [ItemHeader & BaseEnvelopeItemHeaders, P]; // P is for payload
 
-type BaseEnvelope<EH extends BaseEnvelopeHeaders, I extends BaseEnvelopeItem<BaseEnvelopeItemHeaders, unknown>> = [
-  EH,
-  I[],
+type BaseEnvelope<EnvelopeHeader, Item> = [
+  EnvelopeHeader & BaseEnvelopeHeaders,
+  Array<Item & BaseEnvelopeItem<BaseEnvelopeItemHeaders, unknown>>,
 ];
 
 type EventItemHeaders = {