From f27f2a7d2d57589fc341276b287681dab9b06380 Mon Sep 17 00:00:00 2001
From: Tamim Khan <tamim@pagerduty.com>
Date: Mon, 28 Oct 2024 18:42:31 -0400
Subject: [PATCH 1/2] fix: fix pluginPackages type

The value of `backstage.pluginPackages` is incorrectly set to
`pluginId` when it is supposed to represent an array of all
the packages that are a part of this plugin. This commit corrects
this value to be an array and fixes an issue that prevents the
installation of this plugin on certain backstage installations

Signed-off-by: Tamim Khan <tamim@pagerduty.com>
---
 .yarnrc.yml  |  6 ++++--
 package.json | 10 ++++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/.yarnrc.yml b/.yarnrc.yml
index 5227755..d0f3975 100644
--- a/.yarnrc.yml
+++ b/.yarnrc.yml
@@ -1,8 +1,10 @@
 nodeLinker: node-modules
 
-npmRegistryServer: https://registry.npmjs.org/
+npmRegistryServer: "https://registry.npmjs.org/"
 
 npmScopes:
   pagerduty:
     npmAlwaysAuth: true
-    npmAuthToken: NPM_TOKEN
\ No newline at end of file
+    npmAuthToken: NPM_TOKEN
+
+yarnPath: .yarn/releases/yarn-3.6.3.cjs
diff --git a/package.json b/package.json
index b707e05..aa778b6 100644
--- a/package.json
+++ b/package.json
@@ -13,15 +13,21 @@
   "backstage": {
     "role": "frontend-plugin",
     "pluginId": "pagerduty",
-    "pluginPackages": "pagerduty"
+    "pluginPackages": [
+      "@pagerduty/backstage-plugin",
+      "@pagerduty/backstage-plugin-common",
+      "@pagerduty/backstage-plugin-backend"
+    ]
   },
   "homepage": "https://github.com/pagerduty/backstage-plugin",
   "repository": {
     "type": "git",
-    "url": "https://github.com/pagerduty/backstage-plugin.git"
+    "url": "https://github.com/pagerduty/backstage-plugin.git",
+    "directory": "."
   },
   "keywords": [
     "backstage",
+    "plugin",
     "pagerduty"
   ],
   "scripts": {

From c8e577164b13b751a004668b87f9bfda2a99dddb Mon Sep 17 00:00:00 2001
From: Tamim Khan <tamim@pagerduty.com>
Date: Wed, 30 Oct 2024 11:00:48 -0400
Subject: [PATCH 2/2] fix: relax version pinning of
 @pagerduty/backstage-plugin-common

In order to reduce the amount changes required to update dependent packages
relax the version requirements for @pagerduty/backstage-plugin-common
---
 package.json | 2 +-
 yarn.lock    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index aa778b6..98c2d57 100644
--- a/package.json
+++ b/package.json
@@ -56,7 +56,7 @@
     "@mui/icons-material": "^5.15.19",
     "@mui/material": "^5.15.19",
     "@mui/x-date-pickers": "^7.6.1",
-    "@pagerduty/backstage-plugin-common": "0.2.1",
+    "@pagerduty/backstage-plugin-common": "^0.2.1",
     "@tanstack/react-query": "^5.40.1",
     "classnames": "^2.2.6",
     "luxon": "^3.4.1",
diff --git a/yarn.lock b/yarn.lock
index b017900..9cc3de6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4393,7 +4393,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@pagerduty/backstage-plugin-common@npm:0.2.1":
+"@pagerduty/backstage-plugin-common@npm:^0.2.1":
   version: 0.2.1
   resolution: "@pagerduty/backstage-plugin-common@npm:0.2.1"
   checksum: 76233c2162d8e7bd3479e13652042cf949911be065f0bf92c5823cbc03c122b8ff49938ca36ab8449da800de7dd9c85724f70e3ff5323e77ef879478394115c9
@@ -4425,7 +4425,7 @@ __metadata:
     "@mui/icons-material": ^5.15.19
     "@mui/material": ^5.15.19
     "@mui/x-date-pickers": ^7.6.1
-    "@pagerduty/backstage-plugin-common": 0.2.1
+    "@pagerduty/backstage-plugin-common": ^0.2.1
     "@tanstack/react-query": ^5.40.1
     "@testing-library/dom": ^8.0.0
     "@testing-library/jest-dom": ^5.10.1