Do Observable too

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

plugins/catalog-react/api-report.md

@@ -16,7 +16,7 @@ import { Entity } from '@backstage/catalog-model';
 import { EntityName } from '@backstage/catalog-model';
 import { IconButton } from '@material-ui/core';
 import { LinkProps } from '@backstage/core-components';
-import { Observable } from '@backstage/core-plugin-api';
+import { Observable } from '@backstage/types';
 import { PropsWithChildren } from 'react';
 import { default as React_2 } from 'react';
 import { ReactNode } from 'react';

plugins/catalog-react/package.json

@@ -36,6 +36,7 @@
     "@backstage/core-plugin-api": "^0.1.11",
     "@backstage/errors": "^0.1.3",
     "@backstage/integration": "^0.6.8",
+    "@backstage/types": "^0.1.1",
     "@backstage/version-bridge": "^0.1.0",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",

plugins/catalog-react/src/apis/StarredEntitiesApi/DefaultStarredEntitiesApi.ts

@@ -14,7 +14,8 @@
  * limitations under the License.
  */
 
-import { Observable, StorageApi } from '@backstage/core-plugin-api';
+import { StorageApi } from '@backstage/core-plugin-api';
+import { Observable } from '@backstage/types';
 import ObservableImpl from 'zen-observable';
 import { performMigrationToTheNewBucket } from './migration';
 import { StarredEntitiesApi } from './StarredEntitiesApi';

plugins/catalog-react/src/apis/StarredEntitiesApi/StarredEntitiesApi.ts

@@ -14,7 +14,8 @@
  * limitations under the License.
  */
 
-import { ApiRef, createApiRef, Observable } from '@backstage/core-plugin-api';
+import { ApiRef, createApiRef } from '@backstage/core-plugin-api';
+import { Observable } from '@backstage/types';
 
 /**
  * An API to store starred entities

plugins/config-schema/api-report.md

@@ -7,7 +7,7 @@
 
 import { ApiRef } from '@backstage/core-plugin-api';
 import { BackstagePlugin } from '@backstage/core-plugin-api';
-import { Observable } from '@backstage/core-plugin-api';
+import { Observable } from '@backstage/types';
 import { RouteRef } from '@backstage/core-plugin-api';
 import { Schema } from 'jsonschema';
 

plugins/config-schema/src/api/StaticSchemaLoader.ts

@@ -18,7 +18,7 @@ import ObservableImpl from 'zen-observable';
 import { ResponseError } from '@backstage/errors';
 import { Schema } from 'jsonschema';
 import { ConfigSchemaApi, ConfigSchemaResult } from './types';
-import { Observable } from '@backstage/core-plugin-api';
+import { Observable } from '@backstage/types';
 
 const DEFAULT_URL = 'config-schema.json';
 

plugins/config-schema/src/api/types.ts

@@ -15,7 +15,8 @@
  */
 
 import { Schema } from 'jsonschema';
-import { createApiRef, Observable } from '@backstage/core-plugin-api';
+import { createApiRef } from '@backstage/core-plugin-api';
+import { Observable } from '@backstage/types';
 
 export interface ConfigSchemaResult {
   schema?: Schema;

plugins/scaffolder/api-report.md

@@ -22,7 +22,7 @@ import { IdentityApi } from '@backstage/core-plugin-api';
 import { JsonObject } from '@backstage/types';
 import { JSONSchema } from '@backstage/catalog-model';
 import { JsonValue } from '@backstage/types';
-import { Observable } from '@backstage/core-plugin-api';
+import { Observable } from '@backstage/types';
 import { default as React_2 } from 'react';
 import { RouteRef } from '@backstage/core-plugin-api';
 import { ScmIntegrationRegistry } from '@backstage/integration';

plugins/scaffolder/src/api.ts

@@ -15,7 +15,7 @@
  */
 
 import { EntityName } from '@backstage/catalog-model';
-import { JsonObject, JsonValue } from '@backstage/types';
+import { JsonObject, JsonValue, Observable } from '@backstage/types';
 import { ResponseError } from '@backstage/errors';
 import { ScmIntegrationRegistry } from '@backstage/integration';
 import { Field, FieldValidation } from '@rjsf/core';
@@ -25,7 +25,6 @@ import {
   createApiRef,
   DiscoveryApi,
   IdentityApi,
-  Observable,
 } from '@backstage/core-plugin-api';
 
 export const scaffolderApiRef = createApiRef<ScaffolderApi>({

plugins/scaffolder/src/components/hooks/useEventStream.ts

@@ -17,7 +17,8 @@ import { useImmerReducer } from 'use-immer';
 import { useEffect } from 'react';
 import { scaffolderApiRef, LogEvent } from '../../api';
 import { ScaffolderTask, Status, TaskOutput } from '../../types';
-import { Subscription, useApi } from '@backstage/core-plugin-api';
+import { useApi } from '@backstage/core-plugin-api';
+import { Subscription } from '@backstage/types';
 
 type Step = {
   id: string;

plugins/shortcuts/api-report.md

@@ -7,7 +7,7 @@
 
 import { ApiRef } from '@backstage/core-plugin-api';
 import { BackstagePlugin } from '@backstage/core-plugin-api';
-import { Observable } from '@backstage/core-plugin-api';
+import { Observable } from '@backstage/types';
 import ObservableImpl from 'zen-observable';
 import { StorageApi } from '@backstage/core-plugin-api';
 

plugins/shortcuts/package.json

@@ -24,6 +24,7 @@
     "@backstage/core-components": "^0.7.1",
     "@backstage/core-plugin-api": "^0.1.11",
     "@backstage/theme": "^0.2.11",
+    "@backstage/types": "^0.1.1",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.57",

plugins/shortcuts/src/api/ShortcutApi.ts

@@ -15,7 +15,8 @@
  */
 
 import { Shortcut } from '../types';
-import { createApiRef, Observable } from '@backstage/core-plugin-api';
+import { createApiRef } from '@backstage/core-plugin-api';
+import { Observable } from '@backstage/types';
 
 export const shortcutsApiRef = createApiRef<ShortcutApi>({
   id: 'plugin.shortcuts.api',