From 9c0d5a607d59d71dfe0bba313d7be5de83c6d125 Mon Sep 17 00:00:00 2001
From: Marley Powell <Marley.Powell@exclaimer.com>
Date: Tue, 19 Oct 2021 10:19:48 +0100
Subject: [PATCH 1/7] refactor(`@backstage/plugin-azure-devops`): Consume
 re-exported types from `@backstage/plugin-azure-devops-backend`.

Signed-off-by: Marley Powell <Marley.Powell@exclaimer.com>
---
 plugins/azure-devops/package.json             |  2 +-
 plugins/azure-devops/src/api/types.ts         |  2 +-
 .../src/components/BuildTable/BuildTable.tsx  | 33 ++++++++++---------
 3 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/plugins/azure-devops/package.json b/plugins/azure-devops/package.json
index c4aea032d2..f9dff7229c 100644
--- a/plugins/azure-devops/package.json
+++ b/plugins/azure-devops/package.json
@@ -31,12 +31,12 @@
     "@backstage/core-components": "^0.7.0",
     "@backstage/core-plugin-api": "^0.1.10",
     "@backstage/errors": "^0.1.2",
+    "@backstage/plugin-azure-devops-backend": "^0.1.2",
     "@backstage/plugin-catalog-react": "^0.6.0",
     "@backstage/theme": "^0.2.11",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.57",
-    "azure-devops-node-api": "^11.0.1",
     "luxon": "^2.0.2",
     "react": "^16.13.1",
     "react-dom": "^16.13.1",
diff --git a/plugins/azure-devops/src/api/types.ts b/plugins/azure-devops/src/api/types.ts
index 1fbc34231e..46a9212aca 100644
--- a/plugins/azure-devops/src/api/types.ts
+++ b/plugins/azure-devops/src/api/types.ts
@@ -17,7 +17,7 @@
 import {
   BuildResult,
   BuildStatus,
-} from 'azure-devops-node-api/interfaces/BuildInterfaces';
+} from '@backstage/plugin-azure-devops-backend';
 
 export type RepoBuild = {
   id?: number;
diff --git a/plugins/azure-devops/src/components/BuildTable/BuildTable.tsx b/plugins/azure-devops/src/components/BuildTable/BuildTable.tsx
index bead424ffb..72aa2acda7 100644
--- a/plugins/azure-devops/src/components/BuildTable/BuildTable.tsx
+++ b/plugins/azure-devops/src/components/BuildTable/BuildTable.tsx
@@ -14,26 +14,27 @@
  * limitations under the License.
  */
 
-import React from 'react';
-import { DateTime } from 'luxon';
-import {
-  Link,
-  Table,
-  TableColumn,
-  StatusError,
-  StatusOK,
-  StatusWarning,
-  StatusAborted,
-  StatusRunning,
-  StatusPending,
-  ResponseErrorPanel,
-} from '@backstage/core-components';
 import { Box, Typography } from '@material-ui/core';
-import { RepoBuild } from '../../api/types';
 import {
   BuildResult,
   BuildStatus,
-} from 'azure-devops-node-api/interfaces/BuildInterfaces';
+} from '@backstage/plugin-azure-devops-backend';
+import {
+  Link,
+  ResponseErrorPanel,
+  StatusAborted,
+  StatusError,
+  StatusOK,
+  StatusPending,
+  StatusRunning,
+  StatusWarning,
+  Table,
+  TableColumn,
+} from '@backstage/core-components';
+
+import { DateTime } from 'luxon';
+import React from 'react';
+import { RepoBuild } from '../../api/types';
 
 const getBuildResultComponent = (result: number | undefined) => {
   switch (result) {

From b85acc8c3539777d73501ec922e65bbf8dbadfe3 Mon Sep 17 00:00:00 2001
From: Marley Powell <Marley.Powell@exclaimer.com>
Date: Tue, 19 Oct 2021 10:21:21 +0100
Subject: [PATCH 2/7] chore: Created changeset.

Signed-off-by: Marley Powell <Marley.Powell@exclaimer.com>
---
 .changeset/many-mayflies-notice.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/many-mayflies-notice.md

diff --git a/.changeset/many-mayflies-notice.md b/.changeset/many-mayflies-notice.md
new file mode 100644
index 0000000000..db058b909a
--- /dev/null
+++ b/.changeset/many-mayflies-notice.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-azure-devops': minor
+---
+
+refactor(`@backstage/plugin-azure-devops`): Consume re-exported types from `@backstage/plugin-azure-devops-backend`.

From b23f048545e442ef8ddcf7bda230cca7048f3ff0 Mon Sep 17 00:00:00 2001
From: Marley Powell <Marley.Powell@exclaimer.com>
Date: Thu, 21 Oct 2021 13:09:57 +0100
Subject: [PATCH 3/7] chore: Updated changeset

Signed-off-by: Marley Powell <Marley.Powell@exclaimer.com>
---
 .changeset/many-mayflies-notice.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.changeset/many-mayflies-notice.md b/.changeset/many-mayflies-notice.md
index db058b909a..b8d551f4fb 100644
--- a/.changeset/many-mayflies-notice.md
+++ b/.changeset/many-mayflies-notice.md
@@ -1,5 +1,5 @@
 ---
-'@backstage/plugin-azure-devops': minor
+'@backstage/plugin-azure-devops': patch
 ---
 
 refactor(`@backstage/plugin-azure-devops`): Consume re-exported types from `@backstage/plugin-azure-devops-backend`.

From 236756d0f204eb55cd3fd4e40a480e38f720ca99 Mon Sep 17 00:00:00 2001
From: Marley Powell <Marley.Powell@exclaimer.com>
Date: Mon, 8 Nov 2021 14:21:39 +0000
Subject: [PATCH 4/7] refactor: Consume types from
 `@backstage/plugin-azure-devops-common`.

Signed-off-by: Marley Powell <Marley.Powell@exclaimer.com>
---
 .changeset/many-mayflies-notice.md            |  2 +-
 plugins/azure-devops/package.json             |  2 +-
 .../azure-devops/src/api/AzureDevOpsApi.ts    |  6 +++-
 .../azure-devops/src/api/AzureDevOpsClient.ts |  8 +++--
 plugins/azure-devops/src/api/types.ts         | 34 -------------------
 .../components/BuildTable/BuildTable.test.ts  |  2 +-
 .../src/components/BuildTable/BuildTable.tsx  |  4 +--
 7 files changed, 16 insertions(+), 42 deletions(-)
 delete mode 100644 plugins/azure-devops/src/api/types.ts

diff --git a/.changeset/many-mayflies-notice.md b/.changeset/many-mayflies-notice.md
index b8d551f4fb..b3d3b3adcd 100644
--- a/.changeset/many-mayflies-notice.md
+++ b/.changeset/many-mayflies-notice.md
@@ -2,4 +2,4 @@
 '@backstage/plugin-azure-devops': patch
 ---
 
-refactor(`@backstage/plugin-azure-devops`): Consume re-exported types from `@backstage/plugin-azure-devops-backend`.
+refactor(`@backstage/plugin-azure-devops`): Consume types from `@backstage/plugin-azure-devops-common`.
diff --git a/plugins/azure-devops/package.json b/plugins/azure-devops/package.json
index 5bde285aa0..5c08f998fb 100644
--- a/plugins/azure-devops/package.json
+++ b/plugins/azure-devops/package.json
@@ -37,7 +37,7 @@
     "@backstage/core-components": "^0.7.2",
     "@backstage/core-plugin-api": "^0.1.12",
     "@backstage/errors": "^0.1.4",
-    "@backstage/plugin-azure-devops-backend": "^0.1.4",
+    "@backstage/plugin-azure-devops-common": "^0.0.1",
     "@backstage/plugin-catalog-react": "^0.6.2",
     "@backstage/theme": "^0.2.12",
     "@material-ui/core": "^4.12.2",
diff --git a/plugins/azure-devops/src/api/AzureDevOpsApi.ts b/plugins/azure-devops/src/api/AzureDevOpsApi.ts
index f0bad53b43..05377b0b7b 100644
--- a/plugins/azure-devops/src/api/AzureDevOpsApi.ts
+++ b/plugins/azure-devops/src/api/AzureDevOpsApi.ts
@@ -14,7 +14,11 @@
  * limitations under the License.
  */
 
-import { RepoBuild, RepoBuildOptions } from './types';
+import {
+  RepoBuild,
+  RepoBuildOptions,
+} from '@backstage/plugin-azure-devops-common';
+
 import { createApiRef } from '@backstage/core-plugin-api';
 
 export const azureDevOpsApiRef = createApiRef<AzureDevOpsApi>({
diff --git a/plugins/azure-devops/src/api/AzureDevOpsClient.ts b/plugins/azure-devops/src/api/AzureDevOpsClient.ts
index e03428e511..4fd4e781c4 100644
--- a/plugins/azure-devops/src/api/AzureDevOpsClient.ts
+++ b/plugins/azure-devops/src/api/AzureDevOpsClient.ts
@@ -14,9 +14,13 @@
  * limitations under the License.
  */
 
-import { AzureDevOpsApi } from './AzureDevOpsApi';
-import { RepoBuild, RepoBuildOptions } from './types';
 import { DiscoveryApi, IdentityApi } from '@backstage/core-plugin-api';
+import {
+  RepoBuild,
+  RepoBuildOptions,
+} from '@backstage/plugin-azure-devops-common';
+
+import { AzureDevOpsApi } from './AzureDevOpsApi';
 import { ResponseError } from '@backstage/errors';
 
 export class AzureDevOpsClient implements AzureDevOpsApi {
diff --git a/plugins/azure-devops/src/api/types.ts b/plugins/azure-devops/src/api/types.ts
deleted file mode 100644
index 46a9212aca..0000000000
--- a/plugins/azure-devops/src/api/types.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright 2021 The Backstage Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import {
-  BuildResult,
-  BuildStatus,
-} from '@backstage/plugin-azure-devops-backend';
-
-export type RepoBuild = {
-  id?: number;
-  title: string;
-  link?: string;
-  status?: BuildStatus;
-  result?: BuildResult;
-  queueTime?: Date;
-  source: string;
-};
-
-export type RepoBuildOptions = {
-  top?: number;
-};
diff --git a/plugins/azure-devops/src/components/BuildTable/BuildTable.test.ts b/plugins/azure-devops/src/components/BuildTable/BuildTable.test.ts
index 81942b72ec..cb240aef42 100644
--- a/plugins/azure-devops/src/components/BuildTable/BuildTable.test.ts
+++ b/plugins/azure-devops/src/components/BuildTable/BuildTable.test.ts
@@ -17,7 +17,7 @@
 import {
   BuildResult,
   BuildStatus,
-} from '@backstage/plugin-azure-devops-backend';
+} from '@backstage/plugin-azure-devops-common';
 import { getBuildResultComponent, getBuildStateComponent } from './BuildTable';
 
 import { renderInTestApp } from '@backstage/test-utils';
diff --git a/plugins/azure-devops/src/components/BuildTable/BuildTable.tsx b/plugins/azure-devops/src/components/BuildTable/BuildTable.tsx
index 4833370cf6..7e260be6e9 100644
--- a/plugins/azure-devops/src/components/BuildTable/BuildTable.tsx
+++ b/plugins/azure-devops/src/components/BuildTable/BuildTable.tsx
@@ -18,7 +18,8 @@ import { Box, Typography } from '@material-ui/core';
 import {
   BuildResult,
   BuildStatus,
-} from '@backstage/plugin-azure-devops-backend';
+  RepoBuild,
+} from '@backstage/plugin-azure-devops-common';
 import {
   Link,
   ResponseErrorPanel,
@@ -34,7 +35,6 @@ import {
 
 import { DateTime } from 'luxon';
 import React from 'react';
-import { RepoBuild } from '../../api/types';
 
 export const getBuildResultComponent = (result: number | undefined) => {
   switch (result) {

From b4ab81cad9ed51d6fe5f985c3a467b5312374c6a Mon Sep 17 00:00:00 2001
From: Marley Powell <Marley.Powell@exclaimer.com>
Date: Mon, 8 Nov 2021 14:55:07 +0000
Subject: [PATCH 5/7] refactor: Stop re-exporting types from
 `@backstage/plugin-azure-devops-backend`.

Signed-off-by: Marley Powell <Marley.Powell@exclaimer.com>
---
 .changeset/many-mayflies-notice.md            |  3 +-
 plugins/azure-devops-backend/api-report.md    | 45 +------------
 plugins/azure-devops-backend/package.json     |  1 +
 .../src/api/AzureDevOpsApi.test.ts            | 12 ++--
 .../src/api/AzureDevOpsApi.ts                 | 12 ++--
 plugins/azure-devops-backend/src/api/index.ts |  2 -
 plugins/azure-devops-backend/src/api/types.ts | 67 -------------------
 plugins/azure-devops-backend/src/index.ts     |  3 +-
 .../src/service/router.test.ts                | 26 +++----
 .../src/service/router.ts                     |  5 +-
 .../azure-devops/src/hooks/useRepoBuilds.ts   |  5 +-
 11 files changed, 43 insertions(+), 138 deletions(-)
 delete mode 100644 plugins/azure-devops-backend/src/api/types.ts

diff --git a/.changeset/many-mayflies-notice.md b/.changeset/many-mayflies-notice.md
index b3d3b3adcd..cd4f91fa93 100644
--- a/.changeset/many-mayflies-notice.md
+++ b/.changeset/many-mayflies-notice.md
@@ -1,5 +1,6 @@
 ---
 '@backstage/plugin-azure-devops': patch
+'@backstage/plugin-azure-devops-backend': minor
 ---
 
-refactor(`@backstage/plugin-azure-devops`): Consume types from `@backstage/plugin-azure-devops-common`.
+refactor(`@backstage/plugin-azure-devops`): Consume types from `@backstage/plugin-azure-devops-common`. Stop re-exporting types from `@backstage/plugin-azure-devops-backend`.
diff --git a/plugins/azure-devops-backend/api-report.md b/plugins/azure-devops-backend/api-report.md
index fac6261a39..1eabccc720 100644
--- a/plugins/azure-devops-backend/api-report.md
+++ b/plugins/azure-devops-backend/api-report.md
@@ -4,13 +4,13 @@
 
 ```ts
 import { Build } from 'azure-devops-node-api/interfaces/BuildInterfaces';
-import { BuildResult } from 'azure-devops-node-api/interfaces/BuildInterfaces';
-import { BuildStatus } from 'azure-devops-node-api/interfaces/BuildInterfaces';
 import { Config } from '@backstage/config';
 import express from 'express';
 import { GitRepository } from 'azure-devops-node-api/interfaces/GitInterfaces';
 import { Logger as Logger_2 } from 'winston';
-import { PullRequestStatus } from 'azure-devops-node-api/interfaces/GitInterfaces';
+import { PullRequest } from '@backstage/plugin-azure-devops-common';
+import { PullRequestOptions } from '@backstage/plugin-azure-devops-common';
+import { RepoBuild } from '@backstage/plugin-azure-devops-common';
 import { WebApi } from 'azure-devops-node-api';
 
 // Warning: (ae-missing-release-tag) "AzureDevOpsApi" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
@@ -29,8 +29,6 @@ export class AzureDevOpsApi {
     projectName: string,
     repoName: string,
   ): Promise<GitRepository>;
-  // Warning: (ae-forgotten-export) The symbol "PullRequestOptions" needs to be exported by the entry point index.d.ts
-  //
   // (undocumented)
   getPullRequests(
     projectName: string,
@@ -45,48 +43,11 @@ export class AzureDevOpsApi {
   ): Promise<RepoBuild[]>;
 }
 
-export { BuildResult };
-
-export { BuildStatus };
-
 // Warning: (ae-missing-release-tag) "createRouter" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export function createRouter(options: RouterOptions): Promise<express.Router>;
 
-// Warning: (ae-missing-release-tag) "PullRequest" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
-// @public (undocumented)
-export type PullRequest = {
-  pullRequestId?: number;
-  repoName?: string;
-  title?: string;
-  uniqueName?: string;
-  createdBy?: string;
-  creationDate?: Date;
-  sourceRefName?: string;
-  targetRefName?: string;
-  status?: PullRequestStatus;
-  isDraft?: boolean;
-  link: string;
-};
-
-// Warning: (ae-missing-release-tag) "RepoBuild" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
-// @public (undocumented)
-export type RepoBuild = {
-  id?: number;
-  title: string;
-  link?: string;
-  status?: BuildStatus;
-  result?: BuildResult;
-  queueTime?: Date;
-  startTime?: Date;
-  finishTime?: Date;
-  source: string;
-  uniqueName?: string;
-};
-
 // Warning: (ae-missing-release-tag) "RouterOptions" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
diff --git a/plugins/azure-devops-backend/package.json b/plugins/azure-devops-backend/package.json
index 8a468b0cc9..9dd79e9f8e 100644
--- a/plugins/azure-devops-backend/package.json
+++ b/plugins/azure-devops-backend/package.json
@@ -22,6 +22,7 @@
   "dependencies": {
     "@backstage/backend-common": "^0.9.8",
     "@backstage/config": "^0.1.11",
+    "@backstage/plugin-azure-devops-common": "^0.0.1",
     "@types/express": "^4.17.6",
     "azure-devops-node-api": "^11.0.1",
     "express": "^4.17.1",
diff --git a/plugins/azure-devops-backend/src/api/AzureDevOpsApi.test.ts b/plugins/azure-devops-backend/src/api/AzureDevOpsApi.test.ts
index fdd49c0440..429d608bd6 100644
--- a/plugins/azure-devops-backend/src/api/AzureDevOpsApi.test.ts
+++ b/plugins/azure-devops-backend/src/api/AzureDevOpsApi.test.ts
@@ -16,17 +16,21 @@
 
 import {
   Build,
+  DefinitionReference,
+} from 'azure-devops-node-api/interfaces/BuildInterfaces';
+import {
   BuildResult,
   BuildStatus,
-  GitPullRequest,
-  GitRepository,
   PullRequest,
   PullRequestStatus,
   RepoBuild,
-} from './types';
+} from '@backstage/plugin-azure-devops-common';
+import {
+  GitPullRequest,
+  GitRepository,
+} from 'azure-devops-node-api/interfaces/GitInterfaces';
 import { mappedPullRequest, mappedRepoBuild } from './AzureDevOpsApi';
 
-import { DefinitionReference } from 'azure-devops-node-api/interfaces/BuildInterfaces';
 import { IdentityRef } from 'azure-devops-node-api/interfaces/common/VSSInterfaces';
 
 describe('AzureDevOpsApi', () => {
diff --git a/plugins/azure-devops-backend/src/api/AzureDevOpsApi.ts b/plugins/azure-devops-backend/src/api/AzureDevOpsApi.ts
index 26378496ea..1ed1f1d5f5 100644
--- a/plugins/azure-devops-backend/src/api/AzureDevOpsApi.ts
+++ b/plugins/azure-devops-backend/src/api/AzureDevOpsApi.ts
@@ -15,17 +15,19 @@
  */
 
 import {
-  Build,
   BuildResult,
   BuildStatus,
-  GitPullRequest,
-  GitPullRequestSearchCriteria,
-  GitRepository,
   PullRequest,
   PullRequestOptions,
   RepoBuild,
-} from './types';
+} from '@backstage/plugin-azure-devops-common';
+import {
+  GitPullRequest,
+  GitPullRequestSearchCriteria,
+  GitRepository,
+} from 'azure-devops-node-api/interfaces/GitInterfaces';
 
+import { Build } from 'azure-devops-node-api/interfaces/BuildInterfaces';
 import { Logger } from 'winston';
 import { WebApi } from 'azure-devops-node-api';
 
diff --git a/plugins/azure-devops-backend/src/api/index.ts b/plugins/azure-devops-backend/src/api/index.ts
index 97c48cb0bf..903c1bdb6a 100644
--- a/plugins/azure-devops-backend/src/api/index.ts
+++ b/plugins/azure-devops-backend/src/api/index.ts
@@ -15,5 +15,3 @@
  */
 
 export { AzureDevOpsApi } from './AzureDevOpsApi';
-export { BuildResult, BuildStatus } from './types';
-export type { RepoBuild, PullRequest } from './types';
diff --git a/plugins/azure-devops-backend/src/api/types.ts b/plugins/azure-devops-backend/src/api/types.ts
deleted file mode 100644
index fab61d26c9..0000000000
--- a/plugins/azure-devops-backend/src/api/types.ts
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright 2021 The Backstage Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import {
-  Build,
-  BuildResult,
-  BuildStatus,
-} from 'azure-devops-node-api/interfaces/BuildInterfaces';
-import {
-  GitPullRequest,
-  GitPullRequestSearchCriteria,
-  GitRepository,
-  PullRequestStatus,
-} from 'azure-devops-node-api/interfaces/GitInterfaces';
-
-export { BuildResult, BuildStatus, PullRequestStatus };
-export type {
-  Build,
-  GitPullRequest,
-  GitPullRequestSearchCriteria,
-  GitRepository,
-};
-
-export type RepoBuild = {
-  id?: number;
-  title: string;
-  link?: string;
-  status?: BuildStatus;
-  result?: BuildResult;
-  queueTime?: Date;
-  startTime?: Date;
-  finishTime?: Date;
-  source: string;
-  uniqueName?: string;
-};
-
-export type PullRequest = {
-  pullRequestId?: number;
-  repoName?: string;
-  title?: string;
-  uniqueName?: string;
-  createdBy?: string;
-  creationDate?: Date;
-  sourceRefName?: string;
-  targetRefName?: string;
-  status?: PullRequestStatus;
-  isDraft?: boolean;
-  link: string;
-};
-
-export type PullRequestOptions = {
-  top: number;
-  status: PullRequestStatus;
-};
diff --git a/plugins/azure-devops-backend/src/index.ts b/plugins/azure-devops-backend/src/index.ts
index 7a2a347b65..6977d3580f 100644
--- a/plugins/azure-devops-backend/src/index.ts
+++ b/plugins/azure-devops-backend/src/index.ts
@@ -13,6 +13,5 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-export { AzureDevOpsApi, BuildResult, BuildStatus } from './api';
-export type { RepoBuild, PullRequest } from './api';
+export { AzureDevOpsApi } from './api';
 export * from './service/router';
diff --git a/plugins/azure-devops-backend/src/service/router.test.ts b/plugins/azure-devops-backend/src/service/router.test.ts
index 4143291409..f5d533d2d8 100644
--- a/plugins/azure-devops-backend/src/service/router.test.ts
+++ b/plugins/azure-devops-backend/src/service/router.test.ts
@@ -14,22 +14,22 @@
  * limitations under the License.
  */
 
-import { getVoidLogger } from '@backstage/backend-common';
-import { ConfigReader } from '@backstage/config';
-import express from 'express';
-import request from 'supertest';
-import { AzureDevOpsApi } from '../api';
-import { createRouter } from './router';
-import { PullRequest, RepoBuild } from '../api/types';
 import {
-  GitRepository,
-  PullRequestStatus,
-} from 'azure-devops-node-api/interfaces/GitInterfaces';
-import {
-  Build,
   BuildResult,
   BuildStatus,
-} from 'azure-devops-node-api/interfaces/BuildInterfaces';
+  PullRequest,
+  PullRequestStatus,
+  RepoBuild,
+} from '@backstage/plugin-azure-devops-common';
+
+import { AzureDevOpsApi } from '../api';
+import { Build } from 'azure-devops-node-api/interfaces/BuildInterfaces';
+import { ConfigReader } from '@backstage/config';
+import { GitRepository } from 'azure-devops-node-api/interfaces/GitInterfaces';
+import { createRouter } from './router';
+import express from 'express';
+import { getVoidLogger } from '@backstage/backend-common';
+import request from 'supertest';
 
 describe('createRouter', () => {
   let azureDevOpsApi: jest.Mocked<AzureDevOpsApi>;
diff --git a/plugins/azure-devops-backend/src/service/router.ts b/plugins/azure-devops-backend/src/service/router.ts
index b3505eae1c..d61148b4ff 100644
--- a/plugins/azure-devops-backend/src/service/router.ts
+++ b/plugins/azure-devops-backend/src/service/router.ts
@@ -14,7 +14,10 @@
  * limitations under the License.
  */
 
-import { PullRequestOptions, PullRequestStatus } from '../api/types';
+import {
+  PullRequestOptions,
+  PullRequestStatus,
+} from '@backstage/plugin-azure-devops-common';
 import { WebApi, getPersonalAccessTokenHandler } from 'azure-devops-node-api';
 
 import { AzureDevOpsApi } from '../api';
diff --git a/plugins/azure-devops/src/hooks/useRepoBuilds.ts b/plugins/azure-devops/src/hooks/useRepoBuilds.ts
index df4f76c57e..af2d181c34 100644
--- a/plugins/azure-devops/src/hooks/useRepoBuilds.ts
+++ b/plugins/azure-devops/src/hooks/useRepoBuilds.ts
@@ -14,7 +14,10 @@
  * limitations under the License.
  */
 
-import { RepoBuild, RepoBuildOptions } from '../api/types';
+import {
+  RepoBuild,
+  RepoBuildOptions,
+} from '@backstage/plugin-azure-devops-common';
 
 import { AZURE_DEVOPS_DEFAULT_TOP } from '../constants';
 import { Entity } from '@backstage/catalog-model';

From 18b6c1543ce003d5e3839374b12706370df0323e Mon Sep 17 00:00:00 2001
From: Marley Powell <Marley.Powell@exclaimer.com>
Date: Mon, 8 Nov 2021 14:58:31 +0000
Subject: [PATCH 6/7] fix: Fixed merge issue in `package.json`.

Signed-off-by: Marley Powell <Marley.Powell@exclaimer.com>
---
 plugins/azure-devops/package.json | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/plugins/azure-devops/package.json b/plugins/azure-devops/package.json
index 5c08f998fb..25328d9e81 100644
--- a/plugins/azure-devops/package.json
+++ b/plugins/azure-devops/package.json
@@ -27,12 +27,6 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^0.9.3",
-    "@backstage/core-components": "^0.7.0",
-    "@backstage/core-plugin-api": "^0.1.10",
-    "@backstage/errors": "^0.1.2",
-    "@backstage/plugin-catalog-react": "^0.6.0",
-    "@backstage/theme": "^0.2.11",
     "@backstage/catalog-model": "^0.9.6",
     "@backstage/core-components": "^0.7.2",
     "@backstage/core-plugin-api": "^0.1.12",

From 910a6a435e4226474fab557120e8c70b06281aef Mon Sep 17 00:00:00 2001
From: Marley Powell <Marley.Powell@exclaimer.com>
Date: Tue, 9 Nov 2021 08:04:51 +0000
Subject: [PATCH 7/7] feat: Added new types to
 `@backstage/plugin-azure-devops-common`.

Signed-off-by: Marley Powell <Marley.Powell@exclaimer.com>
---
 .changeset/many-mayflies-notice.md        |  5 ++-
 plugins/azure-devops-common/api-report.md | 43 +++++++++++++++++++++
 plugins/azure-devops-common/src/types.ts  | 46 +++++++++++++++++++++++
 3 files changed, 93 insertions(+), 1 deletion(-)

diff --git a/.changeset/many-mayflies-notice.md b/.changeset/many-mayflies-notice.md
index cd4f91fa93..a96d1fcce5 100644
--- a/.changeset/many-mayflies-notice.md
+++ b/.changeset/many-mayflies-notice.md
@@ -1,6 +1,9 @@
 ---
 '@backstage/plugin-azure-devops': patch
 '@backstage/plugin-azure-devops-backend': minor
+'@backstage/plugin-azure-devops-common': patch
 ---
 
-refactor(`@backstage/plugin-azure-devops`): Consume types from `@backstage/plugin-azure-devops-common`. Stop re-exporting types from `@backstage/plugin-azure-devops-backend`.
+refactor(`@backstage/plugin-azure-devops`): Consume types from `@backstage/plugin-azure-devops-common`.
+Stop re-exporting types from `@backstage/plugin-azure-devops-backend`.
+Added new types to `@backstage/plugin-azure-devops-common`.
diff --git a/plugins/azure-devops-common/api-report.md b/plugins/azure-devops-common/api-report.md
index 0bc6568189..f03c0b4059 100644
--- a/plugins/azure-devops-common/api-report.md
+++ b/plugins/azure-devops-common/api-report.md
@@ -27,6 +27,42 @@ export enum BuildStatus {
   Postponed = 8,
 }
 
+// Warning: (ae-missing-release-tag) "PullRequest" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export type PullRequest = {
+  pullRequestId?: number;
+  repoName?: string;
+  title?: string;
+  uniqueName?: string;
+  createdBy?: string;
+  creationDate?: Date;
+  sourceRefName?: string;
+  targetRefName?: string;
+  status?: PullRequestStatus;
+  isDraft?: boolean;
+  link: string;
+};
+
+// Warning: (ae-missing-release-tag) "PullRequestOptions" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export type PullRequestOptions = {
+  top: number;
+  status: PullRequestStatus;
+};
+
+// Warning: (ae-missing-release-tag) "PullRequestStatus" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export enum PullRequestStatus {
+  Abandoned = 2,
+  Active = 1,
+  All = 4,
+  Completed = 3,
+  NotSet = 0,
+}
+
 // Warning: (ae-missing-release-tag) "RepoBuild" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
@@ -43,5 +79,12 @@ export type RepoBuild = {
   uniqueName?: string;
 };
 
+// Warning: (ae-missing-release-tag) "RepoBuildOptions" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export type RepoBuildOptions = {
+  top?: number;
+};
+
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/azure-devops-common/src/types.ts b/plugins/azure-devops-common/src/types.ts
index d7736d03e1..eacc2af30d 100644
--- a/plugins/azure-devops-common/src/types.ts
+++ b/plugins/azure-devops-common/src/types.ts
@@ -80,3 +80,49 @@ export type RepoBuild = {
   source: string;
   uniqueName?: string;
 };
+
+export type RepoBuildOptions = {
+  top?: number;
+};
+
+export enum PullRequestStatus {
+  /**
+   * Status not set. Default state.
+   */
+  NotSet = 0,
+  /**
+   * Pull request is active.
+   */
+  Active = 1,
+  /**
+   * Pull request is abandoned.
+   */
+  Abandoned = 2,
+  /**
+   * Pull request is completed.
+   */
+  Completed = 3,
+  /**
+   * Used in pull request search criteria to include all statuses.
+   */
+  All = 4,
+}
+
+export type PullRequest = {
+  pullRequestId?: number;
+  repoName?: string;
+  title?: string;
+  uniqueName?: string;
+  createdBy?: string;
+  creationDate?: Date;
+  sourceRefName?: string;
+  targetRefName?: string;
+  status?: PullRequestStatus;
+  isDraft?: boolean;
+  link: string;
+};
+
+export type PullRequestOptions = {
+  top: number;
+  status: PullRequestStatus;
+};