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 injectable to fix the error coming from cycles of computedInjectMany

Browse Source 
Co-authored-by: Alex Andreev <alex.andreev.email@gmail.com>

Signed-off-by: Janne Savolainen <janne.savolainen@live.fi>
This commit is contained in:
Janne Savolainen 2022-06-21 17:17:35 +03:00
parent e2e0fd3860
commit 338e75ddc5
No known key found for this signature in database
GPG Key ID: 8C6CFB2FFFE8F68A
9 changed files with 45 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
package.json
View File

@ -208,11 +208,11 @@
"@hapi/subtext": "^7.0.3", "@hapi/subtext": "^7.0.3",
"@kubernetes/client-node": "^0.16.3", "@kubernetes/client-node": "^0.16.3",
"@material-ui/styles": "^4.11.5", "@material-ui/styles": "^4.11.5",
"@ogre-tools/fp": "8.0.0", "@ogre-tools/fp": "9.0.0",
"@ogre-tools/injectable": "8.0.0", "@ogre-tools/injectable": "9.0.0",
"@ogre-tools/injectable-extension-for-auto-registration": "8.0.0", "@ogre-tools/injectable-extension-for-auto-registration": "9.0.0",
"@ogre-tools/injectable-extension-for-mobx": "8.0.0", "@ogre-tools/injectable-extension-for-mobx": "9.0.0",
"@ogre-tools/injectable-react": "8.0.0", "@ogre-tools/injectable-react": "9.0.0",
"@sentry/electron": "^3.0.7", "@sentry/electron": "^3.0.7",
"@sentry/integrations": "^6.19.3", "@sentry/integrations": "^6.19.3",
"@side/jest-runtime": "^1.0.0", "@side/jest-runtime": "^1.0.0",

8
src/common/runnable/run-many-for.test.ts
View File

@ -15,7 +15,7 @@ describe("runManyFor", () => {
let actualPromise: Promise<void>; let actualPromise: Promise<void>;
beforeEach(() => { beforeEach(() => {
const rootDi = createContainer(); const rootDi = createContainer("irrelevant");
runMock = asyncFn(); runMock = asyncFn();
@ -67,7 +67,7 @@ describe("runManyFor", () => {
let actualPromise: Promise<void>; let actualPromise: Promise<void>;
beforeEach(() => { beforeEach(() => {
const di = createContainer(); const di = createContainer("irrelevant");
runMock = asyncFn(); runMock = asyncFn();
@ -170,7 +170,7 @@ describe("runManyFor", () => {
}); });
it("given invalid hierarchy, when running runnables, throws", () => { it("given invalid hierarchy, when running runnables, throws", () => {
const rootDi = createContainer(); const rootDi = createContainer("irrelevant");
const runMock = asyncFn<(...args: unknown[]) => void>(); const runMock = asyncFn<(...args: unknown[]) => void>();
@ -218,7 +218,7 @@ describe("runManyFor", () => {
let runMock: AsyncFnMock<(...args: unknown[]) => Promise<void>>; let runMock: AsyncFnMock<(...args: unknown[]) => Promise<void>>;
beforeEach(() => { beforeEach(() => {
const rootDi = createContainer(); const rootDi = createContainer("irrelevant");
runMock = asyncFn(); runMock = asyncFn();

8
src/common/runnable/run-many-sync-for.test.ts
View File

@ -11,7 +11,7 @@ describe("runManySyncFor", () => {
let runMock: jest.Mock; let runMock: jest.Mock;
beforeEach(() => { beforeEach(() => {
const rootDi = createContainer(); const rootDi = createContainer("irrelevant");
runMock = jest.fn(); runMock = jest.fn();
@ -50,7 +50,7 @@ describe("runManySyncFor", () => {
let runMock: jest.Mock<(arg: string) => void>; let runMock: jest.Mock<(arg: string) => void>;
beforeEach(() => { beforeEach(() => {
const di = createContainer(); const di = createContainer("irrelevant");
runMock = jest.fn(); runMock = jest.fn();
@ -99,7 +99,7 @@ describe("runManySyncFor", () => {
}); });
it("given invalid hierarchy, when running runnables, throws", () => { it("given invalid hierarchy, when running runnables, throws", () => {
const rootDi = createContainer(); const rootDi = createContainer("irrelevant");
const runMock = jest.fn(); const runMock = jest.fn();
@ -147,7 +147,7 @@ describe("runManySyncFor", () => {
let runMock: jest.Mock<(arg: string, arg2: string) => void>; let runMock: jest.Mock<(arg: string, arg2: string) => void>;
beforeEach(() => { beforeEach(() => {
const rootDi = createContainer(); const rootDi = createContainer("irrelevant");
runMock = jest.fn(); runMock = jest.fn();

2
src/extensions/as-legacy-globals-for-extension-api/as-legacy-global-object-for-extension-api-with-modifications.test.ts
View File

@ -21,7 +21,7 @@ describe("asLegacyGlobalObjectForExtensionApiWithModifications", () => {
}; };
beforeEach(() => { beforeEach(() => {
di = createContainer(); di = createContainer("irrelevant");
jest.spyOn(di, "inject"); jest.spyOn(di, "inject");

2
src/main/getDi.ts
View File

@ -8,7 +8,7 @@ import { registerMobX } from "@ogre-tools/injectable-extension-for-mobx";
import { Environments, setLegacyGlobalDiForExtensionApi } from "../extensions/as-legacy-globals-for-extension-api/legacy-global-di-for-extension-api"; import { Environments, setLegacyGlobalDiForExtensionApi } from "../extensions/as-legacy-globals-for-extension-api/legacy-global-di-for-extension-api";
export const getDi = () => { export const getDi = () => {
const di = createContainer(); const di = createContainer("main");
registerMobX(di); registerMobX(di);

2
src/main/getDiForUnitTesting.ts
View File

@ -105,7 +105,7 @@ export function getDiForUnitTesting(opts: { doGeneralOverrides?: boolean } = {})
doGeneralOverrides = false, doGeneralOverrides = false,
} = opts; } = opts;
const di = createContainer(); const di = createContainer("main");
registerMobX(di); registerMobX(di);

2
src/renderer/getDi.tsx
View File

@ -9,7 +9,7 @@ import { registerMobX } from "@ogre-tools/injectable-extension-for-mobx";
import { Environments, setLegacyGlobalDiForExtensionApi } from "../extensions/as-legacy-globals-for-extension-api/legacy-global-di-for-extension-api"; import { Environments, setLegacyGlobalDiForExtensionApi } from "../extensions/as-legacy-globals-for-extension-api/legacy-global-di-for-extension-api";
export const getDi = () => { export const getDi = () => {
const di = createContainer(); const di = createContainer("renderer");
registerMobX(di); registerMobX(di);

2
src/renderer/getDiForUnitTesting.tsx
View File

@ -58,7 +58,7 @@ export const getDiForUnitTesting = (opts: { doGeneralOverrides?: boolean } = {})
doGeneralOverrides = false, doGeneralOverrides = false,
} = opts; } = opts;
const di = createContainer(); const di = createContainer("renderer");
registerMobX(di); registerMobX(di);

54
yarn.lock
View File

@ -1189,46 +1189,46 @@
"@nodelib/fs.scandir" "2.1.5" "@nodelib/fs.scandir" "2.1.5"
fastq "^1.6.0" fastq "^1.6.0"
"@ogre-tools/fp@8.0.0", "@ogre-tools/fp@^8.0.0": "@ogre-tools/fp@9.0.0", "@ogre-tools/fp@^9.0.0":
version "8.0.0" version "9.0.0"
resolved "https://registry.yarnpkg.com/@ogre-tools/fp/-/fp-8.0.0.tgz#dd2319a96ce3d2edd3ee2bc2acca07a94a77bf3b" resolved "https://registry.yarnpkg.com/@ogre-tools/fp/-/fp-9.0.0.tgz#926cd4f13b52961156161feeeafddf22a0ad39c0"
integrity sha512-8OpGUbG3avGtx6ASz3XNnK/KCyPW25RPp8oYzzU0zihKU5D4QKHy9qNkQ3npurzeg4d1k4BsgkeX+805nqtZOA== integrity sha512-kMUgzhdjHuph0UWteOfyXNGBavZJX23NOA5su6fx9NdTzWhl9yB5Uf6Q//nOvL9COftjZDwnAgIaDU4MPdjyqA==
dependencies: dependencies:
lodash "^4.17.21" lodash "^4.17.21"
"@ogre-tools/injectable-extension-for-auto-registration@8.0.0": "@ogre-tools/injectable-extension-for-auto-registration@9.0.0":
version "8.0.0" version "9.0.0"
resolved "https://registry.yarnpkg.com/@ogre-tools/injectable-extension-for-auto-registration/-/injectable-extension-for-auto-registration-8.0.0.tgz#3a443f1f1c9b564baa78cca6a3c81ac4102660b0" resolved "https://registry.yarnpkg.com/@ogre-tools/injectable-extension-for-auto-registration/-/injectable-extension-for-auto-registration-9.0.0.tgz#69463737ef4f7777db4703964b8a72a5fb82d6b3"
integrity sha512-DX1bxn8mDwek+W/SaI5WmDHmkY3B3njs3X4pOvqRtiMis3GaWHzeCZeK3q3Iv5cd14FTW8AsfKtujPmLklNf/A== integrity sha512-+3I9Z0GfA04zZoj7Nw5WhJLDFLJgr5xv8Kp1zPDuT9/OvE9EA6hzAqakMDLbvn1zZOJjkJCGk44x6UjSQJp/9w==
dependencies: dependencies:
"@ogre-tools/fp" "^8.0.0" "@ogre-tools/fp" "^9.0.0"
"@ogre-tools/injectable" "^8.0.0" "@ogre-tools/injectable" "^9.0.0"
lodash "^4.17.21" lodash "^4.17.21"
"@ogre-tools/injectable-extension-for-mobx@8.0.0": "@ogre-tools/injectable-extension-for-mobx@9.0.0":
version "8.0.0" version "9.0.0"
resolved "https://registry.yarnpkg.com/@ogre-tools/injectable-extension-for-mobx/-/injectable-extension-for-mobx-8.0.0.tgz#80ff506011e078050dd8dcb72660d17181db6d34" resolved "https://registry.yarnpkg.com/@ogre-tools/injectable-extension-for-mobx/-/injectable-extension-for-mobx-9.0.0.tgz#ed14df39b266e521272977821d3e05bcbd647577"
integrity sha512-m8gU3cEFHl9IMZLcvvoS7hVxS6p6nG3jdf6fY6MUZE0u9hx4bZuUdWYoylGQizy0FyRFQ2/m5xhTH2VdtXqx8w== integrity sha512-9Hrtr7AdibcD+Fqn2qNsjiOUakAACO55TB1IqNsOJMMuqQHVB5SFZTHBzdVRqqqY2MwQvWYvd4xfy+beItD/xw==
dependencies: dependencies:
"@ogre-tools/fp" "^8.0.0" "@ogre-tools/fp" "^9.0.0"
"@ogre-tools/injectable" "^8.0.0" "@ogre-tools/injectable" "^9.0.0"
lodash "^4.17.21" lodash "^4.17.21"
"@ogre-tools/injectable-react@8.0.0": "@ogre-tools/injectable-react@9.0.0":
version "8.0.0" version "9.0.0"
resolved "https://registry.yarnpkg.com/@ogre-tools/injectable-react/-/injectable-react-8.0.0.tgz#b2d8db4bb697ba2822d71ec73e6cabee30f70f34" resolved "https://registry.yarnpkg.com/@ogre-tools/injectable-react/-/injectable-react-9.0.0.tgz#c5c510e893a5c1d7994d8709f70606967cabdec2"
integrity sha512-rZa38fm3UzGa/09qC765Za8xJiSPOYHJGsob8UOt2JQIt/BecTNXPMHexfxy9W+DIdAer+YruUgedChdk9nvdQ== integrity sha512-vGQrwkcWibRUWFPbu392riBYY4dXK051FxwyMsDYNRqmvaLo8HuumwjzS1DWS7db/P9Li+Kc+Ms670xIZepcpA==
dependencies: dependencies:
"@ogre-tools/fp" "^8.0.0" "@ogre-tools/fp" "^9.0.0"
"@ogre-tools/injectable" "^8.0.0" "@ogre-tools/injectable" "^9.0.0"
lodash "^4.17.21" lodash "^4.17.21"
"@ogre-tools/injectable@8.0.0", "@ogre-tools/injectable@^8.0.0": "@ogre-tools/injectable@9.0.0", "@ogre-tools/injectable@^9.0.0":
version "8.0.0" version "9.0.0"
resolved "https://registry.yarnpkg.com/@ogre-tools/injectable/-/injectable-8.0.0.tgz#ea4f98bd2466149add94d4f6a9beb7be03729da7" resolved "https://registry.yarnpkg.com/@ogre-tools/injectable/-/injectable-9.0.0.tgz#0819bc7b5fbae0a467f3250b10b4adb003268067"
integrity sha512-59p+8uGqwVQ5IpGpgfn3RA+wXzn1tjnPdFWO3GLEgjyp5dWBaMKufCpCFRvvb9sP6B68qo19aLfy/uSm4AXduw== integrity sha512-z9X86Q9AEkkilLu9V33j/aXv/IUoG944AdfN6WX2zZgJqRNjESN9spoOMqdKqib6JmEjCRxpMvaMwHLQSh14fg==
dependencies: dependencies:
"@ogre-tools/fp" "^8.0.0" "@ogre-tools/fp" "^9.0.0"
lodash "^4.17.21" lodash "^4.17.21"
"@panva/asn1.js@^1.0.0": "@panva/asn1.js@^1.0.0":