chore: resolve conflicts

plugins/sentry/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-sentry",
-  "version": "0.1.1-alpha.23",
+  "version": "0.1.1-alpha.24",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -21,9 +21,9 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^0.1.1-alpha.23",
-    "@backstage/core": "^0.1.1-alpha.23",
-    "@backstage/theme": "^0.1.1-alpha.23",
+    "@backstage/catalog-model": "^0.1.1-alpha.24",
+    "@backstage/core": "^0.1.1-alpha.24",
+    "@backstage/theme": "^0.1.1-alpha.24",
     "@material-ui/core": "^4.11.0",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",
@@ -36,8 +36,8 @@
     "timeago.js": "^4.0.2"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.1.1-alpha.23",
-    "@backstage/dev-utils": "^0.1.1-alpha.23",
+    "@backstage/cli": "^0.1.1-alpha.24",
+    "@backstage/dev-utils": "^0.1.1-alpha.24",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^10.4.1",
     "@testing-library/user-event": "^12.0.7",

plugins/sentry/src/components/Router.tsx

@@ -16,7 +16,7 @@
 import React from 'react';
 import { Entity } from '@backstage/catalog-model';
 import { Routes, Route } from 'react-router';
-import { WarningPanel } from '@backstage/core';
+import { MissingAnnotationEmptyState } from '@backstage/core';
 import { SentryPluginWidget } from './SentryPluginWidget/SentryPluginWidget';
 
 const SENTRY_ANNOTATION = 'sentry.io/project-slug';
@@ -25,11 +25,7 @@ export const Router = ({ entity }: { entity: Entity }) => {
   const projectId = entity.metadata.annotations?.[SENTRY_ANNOTATION];
 
   if (!projectId) {
-    return (
-      <WarningPanel title="Sentry plugin:">
-        <pre>{SENTRY_ANNOTATION}</pre> annotation is missing on the entity.
-      </WarningPanel>
-    );
+    return <MissingAnnotationEmptyState annotation={SENTRY_ANNOTATION} />;
   }
 
   return (