From dfb01beddae77daa15059720d3ca67b8a91d45d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20Adel=C3=B6w?= <freben@gmail.com>
Date: Tue, 8 Aug 2023 15:00:45 +0200
Subject: [PATCH] import non-alpha imports from the main package
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Fredrik Adelöw <freben@gmail.com>
---
 .../backend-plugin-api/alpha-api-report.md    | 19 ++-----------------
 packages/backend-plugin-api/src/alpha.ts      |  9 ++++-----
 2 files changed, 6 insertions(+), 22 deletions(-)

diff --git a/packages/backend-plugin-api/alpha-api-report.md b/packages/backend-plugin-api/alpha-api-report.md
index d76d7e4deb..81b378a671 100644
--- a/packages/backend-plugin-api/alpha-api-report.md
+++ b/packages/backend-plugin-api/alpha-api-report.md
@@ -3,11 +3,8 @@
 > Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
 
 ```ts
-// @public (undocumented)
-export interface BackendFeature {
-  // (undocumented)
-  $$type: '@backstage/BackendFeature';
-}
+import { BackendFeature } from '@backstage/backend-plugin-api';
+import { ServiceRef } from '@backstage/backend-plugin-api';
 
 // @alpha (undocumented)
 export interface FeatureDiscoveryService {
@@ -23,17 +20,5 @@ export const featureDiscoveryServiceRef: ServiceRef<
   'root'
 >;
 
-// @public
-export type ServiceRef<
-  TService,
-  TScope extends 'root' | 'plugin' = 'root' | 'plugin',
-> = {
-  id: string;
-  scope: TScope;
-  T: TService;
-  toString(): string;
-  $$type: '@backstage/ServiceRef';
-};
-
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/packages/backend-plugin-api/src/alpha.ts b/packages/backend-plugin-api/src/alpha.ts
index bd6be5b75e..baee739f49 100644
--- a/packages/backend-plugin-api/src/alpha.ts
+++ b/packages/backend-plugin-api/src/alpha.ts
@@ -14,8 +14,10 @@
  * limitations under the License.
  */
 
-import { createServiceRef } from './services';
-import { BackendFeature } from './wiring';
+import {
+  BackendFeature,
+  createServiceRef,
+} from '@backstage/backend-plugin-api';
 
 /** @alpha */
 export interface FeatureDiscoveryService {
@@ -31,6 +33,3 @@ export const featureDiscoveryServiceRef =
     id: 'core.featureDiscovery',
     scope: 'root',
   });
-
-export type { ServiceRef } from './services';
-export type { BackendFeature };