From 16d7baae215faed6230265b376438b51bc3ffa9f Mon Sep 17 00:00:00 2001 From: Sebastian Malton Date: Thu, 23 Feb 2023 16:14:53 -0500 Subject: [PATCH] Fix lint Signed-off-by: Sebastian Malton --- ...bar-and-tab-navigation-for-extensions.test.tsx | 2 +- packages/core/src/main/extension-api.ts | 13 ------------- packages/core/src/main/library.ts | 7 +++++-- packages/core/src/renderer/extension-api.ts | 15 --------------- packages/core/src/renderer/library.ts | 9 +++++++-- 5 files changed, 13 insertions(+), 33 deletions(-) delete mode 100644 packages/core/src/main/extension-api.ts delete mode 100644 packages/core/src/renderer/extension-api.ts diff --git a/packages/core/src/features/cluster/sidebar-and-tab-navigation-for-extensions.test.tsx b/packages/core/src/features/cluster/sidebar-and-tab-navigation-for-extensions.test.tsx index 9bde5663c2..50b022166a 100644 --- a/packages/core/src/features/cluster/sidebar-and-tab-navigation-for-extensions.test.tsx +++ b/packages/core/src/features/cluster/sidebar-and-tab-navigation-for-extensions.test.tsx @@ -21,7 +21,7 @@ import { runInAction, computed, observable } from "mobx"; import storageSaveDelayInjectable from "../../renderer/utils/create-storage/storage-save-delay.injectable"; import type { DiContainer } from "@ogre-tools/injectable"; import { flushPromises } from "../../common/test-utils/flush-promises"; -import type { ClusterPageMenuRegistration } from "../../extensions/common-api/types"; +import type { ClusterPageMenuRegistration } from "../../renderer/components/layout/cluster-page-menu"; describe("cluster - sidebar and tab navigation for extensions", () => { let applicationBuilder: ApplicationBuilder; diff --git a/packages/core/src/main/extension-api.ts b/packages/core/src/main/extension-api.ts deleted file mode 100644 index becd268696..0000000000 --- a/packages/core/src/main/extension-api.ts +++ /dev/null @@ -1,13 +0,0 @@ -/** - * Copyright (c) OpenLens Authors. All rights reserved. - * Licensed under MIT License. See LICENSE in root directory for more information. - */ - -import { spawn } from "node-pty"; - -export * as Mobx from "mobx"; -export * as MainApi from "../extensions/main-api"; - -export const Pty = { - spawn, -}; diff --git a/packages/core/src/main/library.ts b/packages/core/src/main/library.ts index ab1f56528e..68f89637b5 100644 --- a/packages/core/src/main/library.ts +++ b/packages/core/src/main/library.ts @@ -11,6 +11,9 @@ export { onLoadOfApplicationInjectionToken } from "./start-main-application/runn export { createApplication } from "./create-app"; export type { CreateApplication, Application, ApplicationConfig } from "../common/create-app"; export * as Mobx from "mobx"; -export * as mainExtensionApi from "../extensions/main-api"; -export * as commonExtensionApi from "../extensions/common-api"; export * as Pty from "node-pty"; + +// eslint-disable-next-line no-restricted-imports +export * as mainExtensionApi from "../extensions/main-api"; +// eslint-disable-next-line no-restricted-imports +export * as commonExtensionApi from "../extensions/common-api"; diff --git a/packages/core/src/renderer/extension-api.ts b/packages/core/src/renderer/extension-api.ts deleted file mode 100644 index 14d801aa22..0000000000 --- a/packages/core/src/renderer/extension-api.ts +++ /dev/null @@ -1,15 +0,0 @@ -/** - * Copyright (c) OpenLens Authors. All rights reserved. - * Licensed under MIT License. See LICENSE in root directory for more information. - */ - -import React from "react"; -import ReactDOM from "react-dom"; - -export { React, ReactDOM }; - -export * as Mobx from "mobx"; -export * as MobxReact from "mobx-react"; -export * as ReactRouter from "react-router"; -export * as ReactRouterDom from "react-router-dom"; -export * as RendererApi from "../extensions/renderer-api"; diff --git a/packages/core/src/renderer/library.ts b/packages/core/src/renderer/library.ts index aa9c1fc907..f2e2ae410a 100644 --- a/packages/core/src/renderer/library.ts +++ b/packages/core/src/renderer/library.ts @@ -7,12 +7,17 @@ import React from "react"; import ReactDOM from "react-dom"; // @experimental + +export { createApplication } from "./create-app"; +export type { CreateApplication, Application, ApplicationConfig } from "../common/create-app"; + export { React, ReactDOM }; export * as Mobx from "mobx"; export * as MobxReact from "mobx-react"; export * as ReactRouter from "react-router"; export * as ReactRouterDom from "react-router-dom"; + +// eslint-disable-next-line no-restricted-imports export * as rendererExtensionApi from "../extensions/renderer-api"; +// eslint-disable-next-line no-restricted-imports export * as commonExtensionApi from "../extensions/common-api"; -export { createApplication } from "./create-app"; -export type { CreateApplication, Application, ApplicationConfig } from "../common/create-app";