From d07d9f9fd23e92c73e268c10ca7e99ca979910e2 Mon Sep 17 00:00:00 2001
From: Janne Savolainen <janne.savolainen@live.fi>
Date: Thu, 18 Nov 2021 15:30:50 +0200
Subject: [PATCH] Update version of injectable library

Signed-off-by: Janne Savolainen <janne.savolainen@live.fi>
---
 package.json                     |  2 +-
 types/ogre-tools-injectable.d.ts | 16 +++++++++-------
 yarn.lock                        |  8 ++++----
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/package.json b/package.json
index 09fa5f212a..b7507cf0ad 100644
--- a/package.json
+++ b/package.json
@@ -189,7 +189,7 @@
     "@sentry/electron": "^2.5.4",
     "@sentry/integrations": "^6.15.0",
     "@ogre-tools/injectable": "^1.1.0",
-    "@ogre-tools/injectable-react": "^1.1.0",
+    "@ogre-tools/injectable-react": "^1.2.0",
     "abort-controller": "^3.0.0",
     "auto-bind": "^4.0.0",
     "autobind-decorator": "^2.4.0",
diff --git a/types/ogre-tools-injectable.d.ts b/types/ogre-tools-injectable.d.ts
index 2f22e592e3..93d59c37a4 100644
--- a/types/ogre-tools-injectable.d.ts
+++ b/types/ogre-tools-injectable.d.ts
@@ -42,17 +42,19 @@ declare module "@ogre-tools/injectable" {
     ) => void;
   }
 
-  interface ICommonInjectable<TDependencies> {
-    id?: string;
-    getDependencies: (di?: IDependencyInjectionContainer) => TDependencies;
-    lifecycle?: lifecycleEnum;
-  }
-
   export interface IInjectable<
     TInstance,
     TDependencies extends object = {},
     TInstantiationParameter extends object = {},
-  > extends ICommonInjectable<TDependencies> {
+  > {
+    id?: string;
+
+    getDependencies: (
+      di?: IDependencyInjectionContainer,
+    ) => TDependencies | Promise<TDependencies>;
+
+    lifecycle?: lifecycleEnum;
+
     instantiate: (
       dependencies: TDependencies,
       instantiationParameter: TInstantiationParameter,
diff --git a/yarn.lock b/yarn.lock
index 0b0eda05b4..b2f1e93d8f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -953,10 +953,10 @@
   dependencies:
     lodash "^4.17.21"
 
-"@ogre-tools/injectable-react@^1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@ogre-tools/injectable-react/-/injectable-react-1.1.0.tgz#32757e250b5701c9b467331e99baf9702984106a"
-  integrity sha512-qsC1Igi55SSiH0/oVuH1QcMFhUouEjhfZG5924PG+hqk2Hzsgi3gN1cnPMTpH8vXJiskNQ0tSrgklPb4w5J8KA==
+"@ogre-tools/injectable-react@^1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@ogre-tools/injectable-react/-/injectable-react-1.2.0.tgz#1634f702bf017f934d06e4332505c2c4aa0d87d6"
+  integrity sha512-T4GEuK0HBIHgE5B2WoibDaeQvhn1jgwwsR1K6fy5sYkNnU5Qa4LlciCuxHU7j7dKy6cDVwNWQVg/OXocb0h0lA==
   dependencies:
     "@ogre-tools/fp" "^1.0.2"
     "@ogre-tools/injectable" "^1.1.0"