From e6dd647e51e7e5b5cc2c570b3c4b6d79bc0bfad7 Mon Sep 17 00:00:00 2001 From: Janne Savolainen Date: Thu, 2 Mar 2023 15:08:06 +0200 Subject: [PATCH] Tweak export names to make them easier to import Signed-off-by: Janne Savolainen --- packages/technical-features/application/agnostic/index.ts | 2 +- .../technical-features/application/agnostic/src/feature.ts | 2 +- .../src/start-application/starting-of-application.test.ts | 4 ++-- .../technical-features/application/electron-main/index.ts | 2 +- .../src/{feature.ts => applicationFeatureForElectronMain.ts} | 4 ++-- .../electron-main/src/electron/electron-app.test.ts | 4 ++-- .../when-app-is-ready/when-app-is-ready.test.ts | 4 ++-- .../src/starting-of-electron-main-application.test.ts | 4 ++-- 8 files changed, 13 insertions(+), 13 deletions(-) rename packages/technical-features/application/electron-main/src/{feature.ts => applicationFeatureForElectronMain.ts} (78%) diff --git a/packages/technical-features/application/agnostic/index.ts b/packages/technical-features/application/agnostic/index.ts index c3bed41b84..559a91582b 100644 --- a/packages/technical-features/application/agnostic/index.ts +++ b/packages/technical-features/application/agnostic/index.ts @@ -1,4 +1,4 @@ -export { feature } from "./src/feature"; +export { applicationFeature } from "./src/feature"; export { onLoadOfApplicationInjectionToken } from "./src/start-application/timeslots/on-load-of-application-injection-token"; export { beforeApplicationIsLoadingInjectionToken } from "./src/start-application/timeslots/before-application-is-loading-injection-token"; diff --git a/packages/technical-features/application/agnostic/src/feature.ts b/packages/technical-features/application/agnostic/src/feature.ts index d2ea3df020..3ad2a495e6 100644 --- a/packages/technical-features/application/agnostic/src/feature.ts +++ b/packages/technical-features/application/agnostic/src/feature.ts @@ -1,7 +1,7 @@ import { getFeature } from "@k8slens/feature-core"; import { autoRegister } from "@ogre-tools/injectable-extension-for-auto-registration"; -export const feature = getFeature({ +export const applicationFeature = getFeature({ id: "application", register: (di) => { diff --git a/packages/technical-features/application/agnostic/src/start-application/starting-of-application.test.ts b/packages/technical-features/application/agnostic/src/start-application/starting-of-application.test.ts index 822a97b14e..37453d4ba3 100644 --- a/packages/technical-features/application/agnostic/src/start-application/starting-of-application.test.ts +++ b/packages/technical-features/application/agnostic/src/start-application/starting-of-application.test.ts @@ -4,7 +4,7 @@ import { getInjectable, } from "@ogre-tools/injectable"; import { registerFeature } from "@k8slens/feature-core"; -import { feature } from "../feature"; +import { applicationFeature } from "../feature"; import { startApplicationInjectionToken } from "./start-application.injectable"; import { beforeApplicationIsLoadingInjectionToken } from "./timeslots/before-application-is-loading-injection-token"; import asyncFn, { AsyncFnMock } from "@async-fn/jest"; @@ -21,7 +21,7 @@ describe("starting-of-application", () => { beforeEach(() => { di = createContainer("irrelevant"); - registerFeature(di, feature); + registerFeature(di, applicationFeature); beforeApplicationIsLoadingMock = asyncFn(); onLoadOfApplicationMock = asyncFn(); diff --git a/packages/technical-features/application/electron-main/index.ts b/packages/technical-features/application/electron-main/index.ts index a402fd864f..82d9bba5ab 100644 --- a/packages/technical-features/application/electron-main/index.ts +++ b/packages/technical-features/application/electron-main/index.ts @@ -3,6 +3,6 @@ import { overrideSideEffectsWithFakes } from "./src/override-side-effects-with-f export { beforeElectronIsReadyInjectionToken } from "./src/start-application/timeslots/before-electron-is-ready-injection-token"; export { beforeAnythingInjectionToken } from "./src/start-application/timeslots/before-anything-injection-token"; -export { feature } from "./src/feature"; +export { applicationFeatureForElectronMain } from "./src/applicationFeatureForElectronMain"; export const testUtils = { overrideSideEffectsWithFakes } diff --git a/packages/technical-features/application/electron-main/src/feature.ts b/packages/technical-features/application/electron-main/src/applicationFeatureForElectronMain.ts similarity index 78% rename from packages/technical-features/application/electron-main/src/feature.ts rename to packages/technical-features/application/electron-main/src/applicationFeatureForElectronMain.ts index 36f1b7c4eb..597d7625f9 100644 --- a/packages/technical-features/application/electron-main/src/feature.ts +++ b/packages/technical-features/application/electron-main/src/applicationFeatureForElectronMain.ts @@ -1,8 +1,8 @@ import { getFeature } from "@k8slens/feature-core"; import { autoRegister } from "@ogre-tools/injectable-extension-for-auto-registration"; -import { feature as applicationFeature } from '@k8slens/application'; +import { applicationFeature } from '@k8slens/application'; -export const feature = getFeature({ +export const applicationFeatureForElectronMain = getFeature({ id: "application-for-electron-main", register: (di) => { diff --git a/packages/technical-features/application/electron-main/src/electron/electron-app.test.ts b/packages/technical-features/application/electron-main/src/electron/electron-app.test.ts index 3b6b1f7e2b..01e9f48bc3 100644 --- a/packages/technical-features/application/electron-main/src/electron/electron-app.test.ts +++ b/packages/technical-features/application/electron-main/src/electron/electron-app.test.ts @@ -1,14 +1,14 @@ import electronAppInjectable from "./electron-app.injectable"; import { app } from 'electron'; import { createContainer } from "@ogre-tools/injectable"; -import { feature } from "../feature"; +import { applicationFeatureForElectronMain } from "../applicationFeatureForElectronMain"; import { registerFeature } from "@k8slens/feature-core"; describe('electron-app', () => { it('is electron app', () => { const di = createContainer('irrelevant'); - registerFeature(di, feature) + registerFeature(di, applicationFeatureForElectronMain) const actual = di.inject(electronAppInjectable); diff --git a/packages/technical-features/application/electron-main/src/start-application/when-app-is-ready/when-app-is-ready.test.ts b/packages/technical-features/application/electron-main/src/start-application/when-app-is-ready/when-app-is-ready.test.ts index 0385c0abe7..fb6f359242 100644 --- a/packages/technical-features/application/electron-main/src/start-application/when-app-is-ready/when-app-is-ready.test.ts +++ b/packages/technical-features/application/electron-main/src/start-application/when-app-is-ready/when-app-is-ready.test.ts @@ -1,5 +1,5 @@ import { createContainer, DiContainer } from "@ogre-tools/injectable"; -import { feature } from "../../feature"; +import { applicationFeatureForElectronMain } from "../../applicationFeatureForElectronMain"; import { registerFeature } from "@k8slens/feature-core"; import whenAppIsReadyInjectable from "../when-app-is-ready.injectable"; import { getPromiseStatus } from "@ogre-tools/test-utils"; @@ -14,7 +14,7 @@ describe("when-app-is-ready", () => { beforeEach(() => { di = createContainer("irrelevant"); - registerFeature(di, feature); + registerFeature(di, applicationFeatureForElectronMain); whenReadyMock = asyncFn(); diff --git a/packages/technical-features/application/electron-main/src/starting-of-electron-main-application.test.ts b/packages/technical-features/application/electron-main/src/starting-of-electron-main-application.test.ts index 0abd9a9268..7b4e20e8c1 100644 --- a/packages/technical-features/application/electron-main/src/starting-of-electron-main-application.test.ts +++ b/packages/technical-features/application/electron-main/src/starting-of-electron-main-application.test.ts @@ -4,7 +4,7 @@ import { getInjectable, } from "@ogre-tools/injectable"; import { registerFeature } from "@k8slens/feature-core"; -import { feature } from "./feature"; +import { applicationFeatureForElectronMain } from "./applicationFeatureForElectronMain"; import { beforeApplicationIsLoadingInjectionToken, startApplicationInjectionToken, @@ -30,7 +30,7 @@ describe("starting-of-electron-main-application", () => { beforeApplicationIsLoadingMock = asyncFn(); whenAppIsReadyMock = asyncFn(); - registerFeature(di, feature); + registerFeature(di, applicationFeatureForElectronMain); const beforeAnythingIsLoadingInjectable = getInjectable({ id: "before-anything",