From 53920a704604fc02430d8fb10daa47a5f9c3c785 Mon Sep 17 00:00:00 2001 From: Sebastian Malton Date: Mon, 17 Apr 2023 16:41:40 -0400 Subject: [PATCH] chore: Switch semanticBuildVersion to not use Initializable at all Signed-off-by: Sebastian Malton --- .../about-bundled-extensions.injectable.ts | 4 ++-- .../vars/common/release-channel.injectable.ts | 4 ++-- .../semantic-build-version.injectable.ts | 14 ++++++++++++++ .../semantic-build-version/common/token.ts | 9 --------- .../main/init.injectable.ts | 19 ------------------- .../renderer/init.injectable.ts | 19 ------------------- .../default-update-channel/init.injectable.ts | 4 ++-- .../default-update-channel/init.injectable.ts | 4 ++-- 8 files changed, 22 insertions(+), 55 deletions(-) create mode 100644 packages/core/src/features/vars/common/semantic-build-version.injectable.ts delete mode 100644 packages/core/src/features/vars/semantic-build-version/common/token.ts delete mode 100644 packages/core/src/features/vars/semantic-build-version/main/init.injectable.ts delete mode 100644 packages/core/src/features/vars/semantic-build-version/renderer/init.injectable.ts diff --git a/packages/core/src/features/application-menu/main/menu-items/special-menu-for-mac-application/show-about-application/about-bundled-extensions.injectable.ts b/packages/core/src/features/application-menu/main/menu-items/special-menu-for-mac-application/show-about-application/about-bundled-extensions.injectable.ts index d7e20147ec..dd06f208db 100644 --- a/packages/core/src/features/application-menu/main/menu-items/special-menu-for-mac-application/show-about-application/about-bundled-extensions.injectable.ts +++ b/packages/core/src/features/application-menu/main/menu-items/special-menu-for-mac-application/show-about-application/about-bundled-extensions.injectable.ts @@ -6,12 +6,12 @@ import { applicationInformationToken } from "@k8slens/application"; import { getInjectable } from "@ogre-tools/injectable"; import { bundledExtensionInjectionToken } from "@k8slens/legacy-extensions"; import { object } from "@k8slens/utilities"; -import { semanticBuildVersionInitializable } from "../../../../../vars/semantic-build-version/common/token"; +import semanticBuildVersionInjectable from "../../../../../vars/common/semantic-build-version.injectable"; const specificVersionsInjectable = getInjectable({ id: "specific-versions", instantiate: (di) => { - const buildSemanticVersion = di.inject(semanticBuildVersionInitializable.stateToken); + const buildSemanticVersion = di.inject(semanticBuildVersionInjectable); const bundledExtensions = di.injectMany(bundledExtensionInjectionToken); const applicationInformation = di.inject(applicationInformationToken); diff --git a/packages/core/src/features/vars/common/release-channel.injectable.ts b/packages/core/src/features/vars/common/release-channel.injectable.ts index 485d99e54e..b730e4a16e 100644 --- a/packages/core/src/features/vars/common/release-channel.injectable.ts +++ b/packages/core/src/features/vars/common/release-channel.injectable.ts @@ -3,12 +3,12 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import { semanticBuildVersionInitializable } from "../semantic-build-version/common/token"; +import semanticBuildVersionInjectable from "./semantic-build-version.injectable"; const releaseChannelInjectable = getInjectable({ id: "release-channel", instantiate: (di) => { - const buildSemanticVersion = di.inject(semanticBuildVersionInitializable.stateToken); + const buildSemanticVersion = di.inject(semanticBuildVersionInjectable); const currentReleaseChannel = buildSemanticVersion.prerelease[0]; switch (currentReleaseChannel) { diff --git a/packages/core/src/features/vars/common/semantic-build-version.injectable.ts b/packages/core/src/features/vars/common/semantic-build-version.injectable.ts new file mode 100644 index 0000000000..a9f4a1ab8b --- /dev/null +++ b/packages/core/src/features/vars/common/semantic-build-version.injectable.ts @@ -0,0 +1,14 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ +import { getInjectable } from "@ogre-tools/injectable"; +import { SemVer } from "semver"; +import { buildVersionInitializable } from "../build-version/common/token"; + +const semanticBuildVersionInjectable = getInjectable({ + id: "semantic-build-version", + instantiate: (di) => new SemVer(di.inject(buildVersionInitializable.stateToken)), +}); + +export default semanticBuildVersionInjectable; diff --git a/packages/core/src/features/vars/semantic-build-version/common/token.ts b/packages/core/src/features/vars/semantic-build-version/common/token.ts deleted file mode 100644 index e36e8d8026..0000000000 --- a/packages/core/src/features/vars/semantic-build-version/common/token.ts +++ /dev/null @@ -1,9 +0,0 @@ -/** - * Copyright (c) OpenLens Authors. All rights reserved. - * Licensed under MIT License. See LICENSE in root directory for more information. - */ - -import type { SemVer } from "semver"; -import { getInitializable } from "../../../../common/initializable-state/create"; - -export const semanticBuildVersionInitializable = getInitializable("semantic-build-version"); diff --git a/packages/core/src/features/vars/semantic-build-version/main/init.injectable.ts b/packages/core/src/features/vars/semantic-build-version/main/init.injectable.ts deleted file mode 100644 index 95c76ac62b..0000000000 --- a/packages/core/src/features/vars/semantic-build-version/main/init.injectable.ts +++ /dev/null @@ -1,19 +0,0 @@ -/** - * Copyright (c) OpenLens Authors. All rights reserved. - * Licensed under MIT License. See LICENSE in root directory for more information. - */ - -import { SemVer } from "semver"; -import { getInjectablesForInitializable } from "../../../../common/initializable-state/create"; -import { buildVersionInitializable } from "../../build-version/common/token"; -import { buildVersionInitializationInjectable } from "../../build-version/main/init.injectable"; -import { semanticBuildVersionInitializable } from "../common/token"; - -export const { - stateInjectable: semanticBuildVersionStateInjectable, - initializationInjectable: semanticBuildVersionInitializationInjectable, -} = getInjectablesForInitializable({ - init: (di) => new SemVer(di.inject(buildVersionInitializable.stateToken)), - token: semanticBuildVersionInitializable, - runAfter: buildVersionInitializationInjectable, -}); diff --git a/packages/core/src/features/vars/semantic-build-version/renderer/init.injectable.ts b/packages/core/src/features/vars/semantic-build-version/renderer/init.injectable.ts deleted file mode 100644 index 98679a8519..0000000000 --- a/packages/core/src/features/vars/semantic-build-version/renderer/init.injectable.ts +++ /dev/null @@ -1,19 +0,0 @@ -/** - * Copyright (c) OpenLens Authors. All rights reserved. - * Licensed under MIT License. See LICENSE in root directory for more information. - */ - -import { SemVer } from "semver"; -import { getInjectablesForInitializable } from "../../../../common/initializable-state/create"; -import { buildVersionInitializable } from "../../build-version/common/token"; -import { buildVersionInitializationInjectable } from "../../build-version/renderer/init.injectable"; -import { semanticBuildVersionInitializable } from "../common/token"; - -export const { - stateInjectable: semanticBuildVersionStateInjectable, - initializationInjectable: semanticBuildVersionInitializationInjectable, -} = getInjectablesForInitializable({ - init: (di) => new SemVer(di.inject(buildVersionInitializable.stateToken)), - token: semanticBuildVersionInitializable, - runAfter: buildVersionInitializationInjectable, -}); diff --git a/packages/core/src/main/vars/default-update-channel/init.injectable.ts b/packages/core/src/main/vars/default-update-channel/init.injectable.ts index 56300a1d77..7b18a4e61f 100644 --- a/packages/core/src/main/vars/default-update-channel/init.injectable.ts +++ b/packages/core/src/main/vars/default-update-channel/init.injectable.ts @@ -5,7 +5,7 @@ import { getInjectable } from "@ogre-tools/injectable"; import { beforeApplicationIsLoadingInjectionToken } from "@k8slens/application"; import defaultUpdateChannelInjectable from "../../../features/application-update/common/selected-update-channel/default-update-channel.injectable"; -import { semanticBuildVersionInitializationInjectable } from "../../../features/vars/semantic-build-version/main/init.injectable"; +import { buildVersionInitializationInjectable } from "../../../features/vars/build-version/main/init.injectable"; const initDefaultUpdateChannelInjectable = getInjectable({ id: "init-default-update-channel", @@ -15,7 +15,7 @@ const initDefaultUpdateChannelInjectable = getInjectable({ await defaultUpdateChannel.init(); }, - runAfter: semanticBuildVersionInitializationInjectable, + runAfter: buildVersionInitializationInjectable, }), injectionToken: beforeApplicationIsLoadingInjectionToken, }); diff --git a/packages/core/src/renderer/vars/default-update-channel/init.injectable.ts b/packages/core/src/renderer/vars/default-update-channel/init.injectable.ts index d36573c2ad..e5a79bbbf0 100644 --- a/packages/core/src/renderer/vars/default-update-channel/init.injectable.ts +++ b/packages/core/src/renderer/vars/default-update-channel/init.injectable.ts @@ -5,7 +5,7 @@ import { getInjectable } from "@ogre-tools/injectable"; import { beforeFrameStartsSecondInjectionToken } from "../../before-frame-starts/tokens"; import defaultUpdateChannelInjectable from "../../../features/application-update/common/selected-update-channel/default-update-channel.injectable"; -import { semanticBuildVersionInitializationInjectable } from "../../../features/vars/semantic-build-version/renderer/init.injectable"; +import { buildVersionInitializationInjectable } from "../../../features/vars/build-version/renderer/init.injectable"; const initDefaultUpdateChannelInjectable = getInjectable({ id: "init-default-update-channel", @@ -15,7 +15,7 @@ const initDefaultUpdateChannelInjectable = getInjectable({ await defaultUpdateChannel.init(); }, - runAfter: semanticBuildVersionInitializationInjectable, + runAfter: buildVersionInitializationInjectable, }), injectionToken: beforeFrameStartsSecondInjectionToken, });