1
0
mirror of https://github.com/lensapp/lens.git synced 2025-05-20 05:10:56 +00:00

chore: Switch semanticBuildVersion to not use Initializable at all

Signed-off-by: Sebastian Malton <sebastian@malton.name>
This commit is contained in:
Sebastian Malton 2023-04-17 16:41:40 -04:00
parent fc18c61d36
commit 53920a7046
8 changed files with 22 additions and 55 deletions

View File

@ -6,12 +6,12 @@ import { applicationInformationToken } from "@k8slens/application";
import { getInjectable } from "@ogre-tools/injectable"; import { getInjectable } from "@ogre-tools/injectable";
import { bundledExtensionInjectionToken } from "@k8slens/legacy-extensions"; import { bundledExtensionInjectionToken } from "@k8slens/legacy-extensions";
import { object } from "@k8slens/utilities"; 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({ const specificVersionsInjectable = getInjectable({
id: "specific-versions", id: "specific-versions",
instantiate: (di) => { instantiate: (di) => {
const buildSemanticVersion = di.inject(semanticBuildVersionInitializable.stateToken); const buildSemanticVersion = di.inject(semanticBuildVersionInjectable);
const bundledExtensions = di.injectMany(bundledExtensionInjectionToken); const bundledExtensions = di.injectMany(bundledExtensionInjectionToken);
const applicationInformation = di.inject(applicationInformationToken); const applicationInformation = di.inject(applicationInformationToken);

View File

@ -3,12 +3,12 @@
* Licensed under MIT License. See LICENSE in root directory for more information. * Licensed under MIT License. See LICENSE in root directory for more information.
*/ */
import { getInjectable } from "@ogre-tools/injectable"; import { getInjectable } from "@ogre-tools/injectable";
import { semanticBuildVersionInitializable } from "../semantic-build-version/common/token"; import semanticBuildVersionInjectable from "./semantic-build-version.injectable";
const releaseChannelInjectable = getInjectable({ const releaseChannelInjectable = getInjectable({
id: "release-channel", id: "release-channel",
instantiate: (di) => { instantiate: (di) => {
const buildSemanticVersion = di.inject(semanticBuildVersionInitializable.stateToken); const buildSemanticVersion = di.inject(semanticBuildVersionInjectable);
const currentReleaseChannel = buildSemanticVersion.prerelease[0]; const currentReleaseChannel = buildSemanticVersion.prerelease[0];
switch (currentReleaseChannel) { switch (currentReleaseChannel) {

View File

@ -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;

View File

@ -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<SemVer>("semantic-build-version");

View File

@ -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,
});

View File

@ -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,
});

View File

@ -5,7 +5,7 @@
import { getInjectable } from "@ogre-tools/injectable"; import { getInjectable } from "@ogre-tools/injectable";
import { beforeApplicationIsLoadingInjectionToken } from "@k8slens/application"; import { beforeApplicationIsLoadingInjectionToken } from "@k8slens/application";
import defaultUpdateChannelInjectable from "../../../features/application-update/common/selected-update-channel/default-update-channel.injectable"; 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({ const initDefaultUpdateChannelInjectable = getInjectable({
id: "init-default-update-channel", id: "init-default-update-channel",
@ -15,7 +15,7 @@ const initDefaultUpdateChannelInjectable = getInjectable({
await defaultUpdateChannel.init(); await defaultUpdateChannel.init();
}, },
runAfter: semanticBuildVersionInitializationInjectable, runAfter: buildVersionInitializationInjectable,
}), }),
injectionToken: beforeApplicationIsLoadingInjectionToken, injectionToken: beforeApplicationIsLoadingInjectionToken,
}); });

View File

@ -5,7 +5,7 @@
import { getInjectable } from "@ogre-tools/injectable"; import { getInjectable } from "@ogre-tools/injectable";
import { beforeFrameStartsSecondInjectionToken } from "../../before-frame-starts/tokens"; import { beforeFrameStartsSecondInjectionToken } from "../../before-frame-starts/tokens";
import defaultUpdateChannelInjectable from "../../../features/application-update/common/selected-update-channel/default-update-channel.injectable"; 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({ const initDefaultUpdateChannelInjectable = getInjectable({
id: "init-default-update-channel", id: "init-default-update-channel",
@ -15,7 +15,7 @@ const initDefaultUpdateChannelInjectable = getInjectable({
await defaultUpdateChannel.init(); await defaultUpdateChannel.init();
}, },
runAfter: semanticBuildVersionInitializationInjectable, runAfter: buildVersionInitializationInjectable,
}), }),
injectionToken: beforeFrameStartsSecondInjectionToken, injectionToken: beforeFrameStartsSecondInjectionToken,
}); });