mirror of
https://github.com/lensapp/lens.git
synced 2025-05-20 05:10:56 +00:00
Finial fixups to fix build
Signed-off-by: Sebastian Malton <sebastian@malton.name>
This commit is contained in:
parent
10a316f4e5
commit
09881f2b56
@ -3,7 +3,7 @@
|
|||||||
* 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 { getGlobalOverride } from "@k8slens/test-utils"
|
import { getGlobalOverride } from "@k8slens/test-utils";
|
||||||
import { casChannel } from "../common/channel";
|
import { casChannel } from "../common/channel";
|
||||||
import certificateAuthoritiesChannelListenerInjectable from "./channel-handler.injectable";
|
import certificateAuthoritiesChannelListenerInjectable from "./channel-handler.injectable";
|
||||||
|
|
||||||
|
|||||||
@ -52,7 +52,7 @@ export function getDiForUnitTesting(opts: { doGeneralOverrides?: boolean } = {})
|
|||||||
|
|
||||||
if (doGeneralOverrides) {
|
if (doGeneralOverrides) {
|
||||||
for (const globalOverridePath of global.injectablePaths.main.globalOverridePaths) {
|
for (const globalOverridePath of global.injectablePaths.main.globalOverridePaths) {
|
||||||
const globalOverride = require(globalOverridePath).default as GlobalOverride;
|
const globalOverride = require(globalOverridePath).default as GlobalOverride<unknown, unknown>;
|
||||||
|
|
||||||
di.override(globalOverride.injectable, globalOverride.overridingInstantiate);
|
di.override(globalOverride.injectable, globalOverride.overridingInstantiate);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -39,7 +39,7 @@ export const getDiForUnitTesting = (
|
|||||||
|
|
||||||
if (doGeneralOverrides) {
|
if (doGeneralOverrides) {
|
||||||
for (const globalOverridePath of global.injectablePaths.renderer.globalOverridePaths) {
|
for (const globalOverridePath of global.injectablePaths.renderer.globalOverridePaths) {
|
||||||
const globalOverride = require(globalOverridePath).default as GlobalOverride;
|
const globalOverride = require(globalOverridePath).default as GlobalOverride<unknown, unknown>;
|
||||||
|
|
||||||
di.override(globalOverride.injectable, globalOverride.overridingInstantiate);
|
di.override(globalOverride.injectable, globalOverride.overridingInstantiate);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -4,13 +4,13 @@
|
|||||||
*/
|
*/
|
||||||
import type { Injectable, Instantiate } from "@ogre-tools/injectable";
|
import type { Injectable, Instantiate } from "@ogre-tools/injectable";
|
||||||
|
|
||||||
export interface GlobalOverride<Instance extends Token, Token, Param> {
|
export interface GlobalOverride<Instance, Param> {
|
||||||
injectable: Injectable<Instance, Token, Param>;
|
injectable: Injectable<Instance, unknown, Param>;
|
||||||
overridingInstantiate: Instantiate<Instance, Param>;
|
overridingInstantiate: Instantiate<Instance, Param>;
|
||||||
}
|
}
|
||||||
|
|
||||||
export const getGlobalOverride = <Instance extends Token, Token, Param>(
|
export const getGlobalOverride = <Instance, Param>(
|
||||||
injectable: Injectable<Instance, Token, Param>,
|
injectable: Injectable<Instance, unknown, Param>,
|
||||||
overridingInstantiate: (typeof injectable)["instantiate"],
|
overridingInstantiate: (typeof injectable)["instantiate"],
|
||||||
) => ({
|
) => ({
|
||||||
injectable,
|
injectable,
|
||||||
|
|||||||
@ -5,7 +5,7 @@
|
|||||||
|
|
||||||
import { compile } from "path-to-regexp";
|
import { compile } from "path-to-regexp";
|
||||||
import type { RouteProps } from "react-router";
|
import type { RouteProps } from "react-router";
|
||||||
import { isDefined } from "@k8slens/utilities";
|
import { isDefined } from "./type-narrowing";
|
||||||
|
|
||||||
export interface UrlRouteProps extends RouteProps {
|
export interface UrlRouteProps extends RouteProps {
|
||||||
path: string;
|
path: string;
|
||||||
|
|||||||
@ -4,7 +4,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
import assert from "assert";
|
import assert from "assert";
|
||||||
import { iter } from "@k8slens/utilities";
|
import { iter } from "./iter";
|
||||||
|
|
||||||
// Helper to convert memory from units Ki, Mi, Gi, Ti, Pi to bytes and vise versa
|
// Helper to convert memory from units Ki, Mi, Gi, Ti, Pi to bytes and vise versa
|
||||||
|
|
||||||
|
|||||||
@ -6,7 +6,7 @@
|
|||||||
// Type guard for checking valid react node to use in render
|
// Type guard for checking valid react node to use in render
|
||||||
import type { ReactNode } from "react";
|
import type { ReactNode } from "react";
|
||||||
import React from "react";
|
import React from "react";
|
||||||
import { isObject } from "@k8slens/utilities";
|
import { isObject } from "./type-narrowing";
|
||||||
|
|
||||||
export function isReactNode(node: unknown): node is ReactNode {
|
export function isReactNode(node: unknown): node is ReactNode {
|
||||||
return (isObject(node) && React.isValidElement(node))
|
return (isObject(node) && React.isValidElement(node))
|
||||||
|
|||||||
@ -4,7 +4,7 @@
|
|||||||
*/
|
*/
|
||||||
import type { IComputedValue } from "mobx";
|
import type { IComputedValue } from "mobx";
|
||||||
import { runInAction, when } from "mobx";
|
import { runInAction, when } from "mobx";
|
||||||
import type { Disposer } from "@k8slens/utilities";
|
import type { Disposer } from "./disposer";
|
||||||
|
|
||||||
export async function waitUntilDefined<T>(getter: (() => T | null | undefined) | IComputedValue<T | null | undefined>, opts?: { timeout?: number }): Promise<T> {
|
export async function waitUntilDefined<T>(getter: (() => T | null | undefined) | IComputedValue<T | null | undefined>, opts?: { timeout?: number }): Promise<T> {
|
||||||
return new Promise<T>((resolve, reject) => {
|
return new Promise<T>((resolve, reject) => {
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user