From 4c8f59a6ddc75ce9916f630e969d593014edd7fb Mon Sep 17 00:00:00 2001 From: Jari Kolehmainen Date: Thu, 27 May 2021 14:30:42 +0300 Subject: [PATCH] move common things to common Signed-off-by: Jari Kolehmainen --- src/extensions/common-api/catalog.ts | 23 +++++++++++++++++++++++ src/extensions/common-api/index.ts | 2 ++ src/extensions/main-api/catalog.ts | 2 -- src/extensions/renderer-api/catalog.ts | 2 -- 4 files changed, 25 insertions(+), 4 deletions(-) create mode 100644 src/extensions/common-api/catalog.ts diff --git a/src/extensions/common-api/catalog.ts b/src/extensions/common-api/catalog.ts new file mode 100644 index 0000000000..689310b69d --- /dev/null +++ b/src/extensions/common-api/catalog.ts @@ -0,0 +1,23 @@ +/** + * Copyright (c) 2021 OpenLens Authors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + +export * from "../../common/catalog-entities"; +export * from "../../common/catalog/catalog-entity"; diff --git a/src/extensions/common-api/index.ts b/src/extensions/common-api/index.ts index 04f68b1afc..9e5d788a27 100644 --- a/src/extensions/common-api/index.ts +++ b/src/extensions/common-api/index.ts @@ -21,6 +21,7 @@ // APIs import * as App from "./app"; +import * as Catalog from "./catalog"; import * as EventBus from "./event-bus"; import * as Store from "./stores"; import * as Util from "./utils"; @@ -29,6 +30,7 @@ import * as Types from "./types"; export { App, + Catalog, EventBus, Registrations, Store, diff --git a/src/extensions/main-api/catalog.ts b/src/extensions/main-api/catalog.ts index 3ffa24418b..789d01519d 100644 --- a/src/extensions/main-api/catalog.ts +++ b/src/extensions/main-api/catalog.ts @@ -23,8 +23,6 @@ import type { CatalogEntity } from "../../common/catalog"; import { catalogEntityRegistry as registry } from "../../main/catalog"; export { catalogCategoryRegistry as catalogCategories } from "../../common/catalog/catalog-category-registry"; -export * from "../../common/catalog-entities"; -export * from "../../common/catalog/catalog-entity"; export class CatalogEntityRegistry { getItemsForApiKind(apiVersion: string, kind: string): T[] { diff --git a/src/extensions/renderer-api/catalog.ts b/src/extensions/renderer-api/catalog.ts index bd930ee5f2..2843bf8737 100644 --- a/src/extensions/renderer-api/catalog.ts +++ b/src/extensions/renderer-api/catalog.ts @@ -24,8 +24,6 @@ import type { CatalogCategory, CatalogEntity } from "../../common/catalog"; import { catalogEntityRegistry as registry } from "../../renderer/api/catalog-entity-registry"; export { catalogCategoryRegistry as catalogCategories } from "../../common/catalog/catalog-category-registry"; -export * from "../../common/catalog-entities"; -export * from "../../common/catalog/catalog-entity"; export class CatalogEntityRegistry { /**