hendrik/lens
1
0
Fork 0
mirror of https://github.com/lensapp/lens.git synced 2025-05-20 05:10:56 +00:00
Code Issues Projects Releases Wiki Activity

Update version of injectable for disambiguous typing

Browse Source 
Signed-off-by: Mikko Aspiala <mikko.aspiala@gmail.com>
Co-authored-by: Janne Savolainen <janne.savolainen@live.fi>
This commit is contained in:
Mikko Aspiala 2021-11-17 14:34:47 +02:00 committed by Janne Savolainen
parent 0af1d08299
commit 2e5e549957
4 changed files with 23 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package.json
View File

@ -188,8 +188,8 @@
"@kubernetes/client-node": "^0.15.1", "@kubernetes/client-node": "^0.15.1",
"@sentry/electron": "^2.5.4", "@sentry/electron": "^2.5.4",
"@sentry/integrations": "^6.15.0", "@sentry/integrations": "^6.15.0",
"@ogre-tools/injectable": "^1.0.2", "@ogre-tools/injectable": "^1.1.0",
"@ogre-tools/injectable-react": "^1.0.3", "@ogre-tools/injectable-react": "^1.1.0",
"abort-controller": "^3.0.0", "abort-controller": "^3.0.0",
"auto-bind": "^4.0.0", "auto-bind": "^4.0.0",
"autobind-decorator": "^2.4.0", "autobind-decorator": "^2.4.0",

9
types/ogre-tools-injectable-react.d.ts vendored
View File

@ -20,7 +20,7 @@
*/ */
/// <reference types="react" /> /// <reference types="react" />
declare module "@ogre-tools/injectable-react" { declare module "@ogre-tools/injectable-react" {
import type { IDependencyInjectionContainer } from "@ogre-tools/injectable"; import type { IDependencyInjectionContainer, IInjectable } from "@ogre-tools/injectable";
interface IDependencyInjectionContainerProviderProps { interface IDependencyInjectionContainerProviderProps {
di: IDependencyInjectionContainer; di: IDependencyInjectionContainer;
@ -29,16 +29,13 @@ declare module "@ogre-tools/injectable-react" {
export const DiContextProvider: React.Provider<IDependencyInjectionContainerProviderProps>; export const DiContextProvider: React.Provider<IDependencyInjectionContainerProviderProps>;
export const Inject: < export const Inject: <
TComponentInjectable extends IComponentInjectable<any, {}>, TComponentInjectable extends IInjectable<any>,
>({ >({
Component, Component,
injectableKey, injectableKey,
getPlaceholder, getPlaceholder,
...props ...props
}: Omit< }: Parameters<TComponentInjectable["instantiate"]>[1] & {
React.ComponentProps<TComponentInjectable["instantiate"]>,
keyof ReturnType<TComponentInjectable["getDependencies"]>
> & {
injectableKey: TComponentInjectable; injectableKey: TComponentInjectable;
getPlaceholder?: () => JSX.Element | null; getPlaceholder?: () => JSX.Element | null;
}) => JSX.Element; }) => JSX.Element;

17
types/ogre-tools-injectable.d.ts vendored
View File

@ -48,14 +48,15 @@ declare module "@ogre-tools/injectable" {
lifecycle?: lifecycleEnum; lifecycle?: lifecycleEnum;
} }
export interface IInjectable<TInstance, TDependencies = {}> export interface IInjectable<
extends ICommonInjectable<TDependencies> { TInstance,
instantiate: (dependencies: TDependencies) => TInstance; TDependencies extends object = {},
} TInstantiationParameter extends object = {},
> extends ICommonInjectable<TDependencies> {
export interface IComponentInjectable<TInstance, TDependencies = {}> instantiate: (
extends ICommonInjectable<TDependencies> { dependencies: TDependencies,
instantiate: TInstance; instantiationParameter: TInstantiationParameter,
) => TInstance;
} }
export enum lifecycleEnum { export enum lifecycleEnum {

18
yarn.lock
View File

@ -953,19 +953,19 @@
dependencies: dependencies:
lodash "^4.17.21" lodash "^4.17.21"
"@ogre-tools/injectable-react@^1.0.3": "@ogre-tools/injectable-react@^1.1.0":
version "1.0.3" version "1.1.0"
resolved "https://registry.yarnpkg.com/@ogre-tools/injectable-react/-/injectable-react-1.0.3.tgz#e30ea455cc4ccf24fbad831b460023492832c2f9" resolved "https://registry.yarnpkg.com/@ogre-tools/injectable-react/-/injectable-react-1.1.0.tgz#32757e250b5701c9b467331e99baf9702984106a"
integrity sha512-CFJeuezdJIZD0o0rp1MnahzItzZ7eSixSo0v0+002kq8T7HZb1ycD8d/zvXOBnkEF34K6GGibXicEw1q46SZzw== integrity sha512-qsC1Igi55SSiH0/oVuH1QcMFhUouEjhfZG5924PG+hqk2Hzsgi3gN1cnPMTpH8vXJiskNQ0tSrgklPb4w5J8KA==
dependencies: dependencies:
"@ogre-tools/fp" "^1.0.2" "@ogre-tools/fp" "^1.0.2"
"@ogre-tools/injectable" "^1.0.2" "@ogre-tools/injectable" "^1.1.0"
lodash "^4.17.21" lodash "^4.17.21"
"@ogre-tools/injectable@^1.0.2": "@ogre-tools/injectable@^1.1.0":
version "1.0.2" version "1.1.0"
resolved "https://registry.yarnpkg.com/@ogre-tools/injectable/-/injectable-1.0.2.tgz#b081fefb2026c57fe47e27c268efa73d43934546" resolved "https://registry.yarnpkg.com/@ogre-tools/injectable/-/injectable-1.1.0.tgz#095c9d12001d03dd96c98d8986392b0fee05262c"
integrity sha512-NZ7FHxKLfr+8o4aL51UQ212w1wD3QIsEN/JNtjtEq0TgLjd2Qo3zSniL4hCEj5M49K2qe3CxEb6ezyf2vFTb5g== integrity sha512-ViuFC2iHM86os87W2qubUCAlPYzdxmZwtPBAExb2SLNMHk8Z8dRx9BGDk8AcfCd8aPUw5GHIgf7wxCAMWcyvlw==
dependencies: dependencies:
"@ogre-tools/fp" "^1.0.2" "@ogre-tools/fp" "^1.0.2"
lodash "^4.17.21" lodash "^4.17.21"