Remove the explicit connection from EntityEnvelope and Entity.

Signed-off-by: Fredrik Adelöw <freben@gmail.com>

.changeset/mean-boats-speak.md

@@ -0,0 +1,5 @@
+---
+'@backstage/catalog-model': patch
+---
+
+Remove the explicit connection from `EntityEnvelope` and `Entity`.

packages/catalog-model/api-report.md

@@ -107,7 +107,7 @@ export const domainEntityV1alpha1Validator: KindValidator;
 export const EDIT_URL_ANNOTATION = "backstage.io/edit-url";
 
 // @public
-export type Entity = EntityEnvelope & {
+export type Entity = {
     apiVersion: string;
     kind: string;
     metadata: EntityMeta;

packages/catalog-model/src/entity/Entity.ts

@@ -16,7 +16,6 @@
 
 import { JsonObject } from '@backstage/config';
 import { EntityName } from '../types';
-import { EntityEnvelope } from './EntityEnvelope';
 import { UNSTABLE_EntityStatus } from './EntityStatus';
 
 /**
@@ -24,7 +23,7 @@ import { UNSTABLE_EntityStatus } from './EntityStatus';
  *
  * @see https://kubernetes.io/docs/concepts/overview/working-with-objects/kubernetes-objects/
  */
-export type Entity = EntityEnvelope & {
+export type Entity = {
   /**
    * The version of specification format for this particular entity that
    * this is written against.