From 989a24f1f8462a4c2c8779fc78c2dfa06ff7beb9 Mon Sep 17 00:00:00 2001 From: Sebastian Malton Date: Wed, 5 Oct 2022 16:42:38 -0400 Subject: [PATCH] Upgrade all injectable libraries to v11 (#6338) - Includes local fixes that are required by the new code Signed-off-by: Sebastian Malton Signed-off-by: Sebastian Malton --- package.json | 10 +-- src/main/lens-proxy/lens-proxy.ts | 2 +- src/main/router/router.injectable.ts | 18 +++--- .../runnables/setup-lens-proxy.injectable.ts | 2 + yarn.lock | 61 ++++++++----------- 5 files changed, 42 insertions(+), 51 deletions(-) diff --git a/package.json b/package.json index 2835690653..f0d71a2f33 100644 --- a/package.json +++ b/package.json @@ -218,11 +218,11 @@ "@hapi/subtext": "^7.0.4", "@kubernetes/client-node": "^0.17.1", "@material-ui/styles": "^4.11.5", - "@ogre-tools/fp": "10.1.0", - "@ogre-tools/injectable": "10.3.2", - "@ogre-tools/injectable-extension-for-auto-registration": "10.3.2", - "@ogre-tools/injectable-extension-for-mobx": "10.3.2", - "@ogre-tools/injectable-react": "10.1.0", + "@ogre-tools/fp": "^11.0.0", + "@ogre-tools/injectable": "^11.0.0", + "@ogre-tools/injectable-extension-for-auto-registration": "^11.0.0", + "@ogre-tools/injectable-extension-for-mobx": "^11.0.0", + "@ogre-tools/injectable-react": "^11.0.0", "@sentry/electron": "^3.0.8", "@sentry/integrations": "^6.19.3", "@side/jest-runtime": "^1.0.1", diff --git a/src/main/lens-proxy/lens-proxy.ts b/src/main/lens-proxy/lens-proxy.ts index 2a75470154..e160a49465 100644 --- a/src/main/lens-proxy/lens-proxy.ts +++ b/src/main/lens-proxy/lens-proxy.ts @@ -241,6 +241,6 @@ export class LensProxy { } res.setHeader("Content-Security-Policy", this.dependencies.contentSecurityPolicy); - this.dependencies.router.route(cluster, req, res); + await this.dependencies.router.route(cluster, req, res); } } diff --git a/src/main/router/router.injectable.ts b/src/main/router/router.injectable.ts index 23d6c78fc4..f9d98d8a14 100644 --- a/src/main/router/router.injectable.ts +++ b/src/main/router/router.injectable.ts @@ -2,8 +2,8 @@ * Copyright (c) OpenLens Authors. All rights reserved. * Licensed under MIT License. See LICENSE in root directory for more information. */ -import type { Injectable } from "@ogre-tools/injectable"; -import { getInjectable, getInjectionToken, lifecycleEnum } from "@ogre-tools/injectable"; +import type { Injectable, InjectionToken } from "@ogre-tools/injectable"; +import { getInjectable, getInjectionToken } from "@ogre-tools/injectable"; import { Router } from "./router"; import parseRequestInjectable from "./parse-request.injectable"; import type { Route } from "./route"; @@ -12,17 +12,13 @@ export const routeInjectionToken = getInjectionToken>({ id: "route-injection-token", }); -export function getRouteInjectable< - T, - Path extends string, ->( +export function getRouteInjectable( opts: Omit, Route, void>, "lifecycle" | "injectionToken">, -): Injectable, Route, void> { - return { +) { + return getInjectable({ ...opts, - injectionToken: routeInjectionToken as never, - lifecycle: lifecycleEnum.singleton as never, - }; + injectionToken: routeInjectionToken as unknown as InjectionToken, void>, + }); } const routerInjectable = getInjectable({ diff --git a/src/main/start-main-application/runnables/setup-lens-proxy.injectable.ts b/src/main/start-main-application/runnables/setup-lens-proxy.injectable.ts index 58a4b24409..281c1ff844 100644 --- a/src/main/start-main-application/runnables/setup-lens-proxy.injectable.ts +++ b/src/main/start-main-application/runnables/setup-lens-proxy.injectable.ts @@ -12,6 +12,7 @@ import isWindowsInjectable from "../../../common/vars/is-windows.injectable"; import showErrorPopupInjectable from "../../electron-app/features/show-error-popup.injectable"; import { beforeApplicationIsLoadingInjectionToken } from "../runnable-tokens/before-application-is-loading-injection-token"; import buildVersionInjectable from "../../vars/build-version/build-version.injectable"; +import initializeBuildVersionInjectable from "../../vars/build-version/init.injectable"; const setupLensProxyInjectable = getInjectable({ id: "setup-lens-proxy", @@ -69,6 +70,7 @@ const setupLensProxyInjectable = getInjectable({ return exitApp(); } }, + runAfter: di.inject(initializeBuildVersionInjectable), }; }, diff --git a/yarn.lock b/yarn.lock index 3aee42a9f5..c759944400 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1401,53 +1401,46 @@ read-package-json-fast "^2.0.3" which "^2.0.2" -"@ogre-tools/fp@10.1.0": - version "10.1.0" - resolved "https://registry.yarnpkg.com/@ogre-tools/fp/-/fp-10.1.0.tgz#e83c4dad97416c62d89913c0c0a34e734ae06b8b" - integrity sha512-ZqGQXytucSWbSoNjrdyHAiIWO0LotxBU+aI5hCcqedWg9TzNzf78YKD6ngHXxVEwT/JYsslxXMxzE4LNdo8Cbg== +"@ogre-tools/fp@^11.0.0": + version "11.0.0" + resolved "https://registry.yarnpkg.com/@ogre-tools/fp/-/fp-11.0.0.tgz#b448079014319cf43284a2de5e4cb883bf73aed3" + integrity sha512-mmpuPzITVQ1iHTAHPVdZqqs2Z1p1vx6hTxoSQ4TUOpzfFoW1AzDGlm1r9eWHuqjRSvMt5GpkB3qp1Rbz68zBkA== dependencies: lodash "^4.17.21" -"@ogre-tools/fp@^10.1.0", "@ogre-tools/fp@^10.3.2": - version "10.3.2" - resolved "https://registry.yarnpkg.com/@ogre-tools/fp/-/fp-10.3.2.tgz#41fe406842bd523d7e7ba0792a682d9aaaa33d9c" - integrity sha512-4J1hqjHXDyMgtb2QxsGVOUEgiE7+bcPRLuTv2iJHvBlaXIeTdNuOsNZTVhJvhTv/jxXL+AHq1XjaCDLHe6XxAQ== +"@ogre-tools/injectable-extension-for-auto-registration@^11.0.0": + version "11.0.0" + resolved "https://registry.yarnpkg.com/@ogre-tools/injectable-extension-for-auto-registration/-/injectable-extension-for-auto-registration-11.0.0.tgz#3cdf174e54ea0793ed7acfe9bcda3d47c2ebc61d" + integrity sha512-48snZo7pZbghtZWlCzuulw0BHZQzSKVeUN1VEjAEtwjFTqiABQigzY6hkh6owXAQdsIniuPWEdCDBGXDClASbQ== dependencies: + "@ogre-tools/fp" "^11.0.0" + "@ogre-tools/injectable" "^11.0.0" lodash "^4.17.21" -"@ogre-tools/injectable-extension-for-auto-registration@10.3.2": - version "10.3.2" - resolved "https://registry.yarnpkg.com/@ogre-tools/injectable-extension-for-auto-registration/-/injectable-extension-for-auto-registration-10.3.2.tgz#c3672100aef5ab109893e436d4cec965de744e06" - integrity sha512-s9/fTTt6Se87mFuSqdGTYjgqVmW54D7ZlsGQUa8Zw2wL3zu6Mgf3B71rwMzOOghnv4gJ/P/yB8u0xEhAUS+yCg== +"@ogre-tools/injectable-extension-for-mobx@^11.0.0": + version "11.0.0" + resolved "https://registry.yarnpkg.com/@ogre-tools/injectable-extension-for-mobx/-/injectable-extension-for-mobx-11.0.0.tgz#9087054d5bfd7efff15158dfd04d16f8cdfbdfb9" + integrity sha512-yiTbE5wRKn7zkRj1kXFswrDMwMkdj6XNbQTuaP2aAPDdJ01Iff2FgdBXxYXL1ZzHVFbdSL2WvFnsZdXPUow9LQ== dependencies: - "@ogre-tools/fp" "^10.3.2" - "@ogre-tools/injectable" "^10.3.2" + "@ogre-tools/fp" "^11.0.0" + "@ogre-tools/injectable" "^11.0.0" lodash "^4.17.21" -"@ogre-tools/injectable-extension-for-mobx@10.3.2": - version "10.3.2" - resolved "https://registry.yarnpkg.com/@ogre-tools/injectable-extension-for-mobx/-/injectable-extension-for-mobx-10.3.2.tgz#8eba467bf20295d3153b2ac3b8fed1206f448027" - integrity sha512-QYlm26pUnRLyn9EcKeG0bJySCmIKiJxHdHViq77ncHuHo9s+PcxFQJwV4yQljhxcKiAInw/LF8qmRl2ZjJ7X1A== +"@ogre-tools/injectable-react@^11.0.0": + version "11.0.0" + resolved "https://registry.yarnpkg.com/@ogre-tools/injectable-react/-/injectable-react-11.0.0.tgz#67e68a1404a497cd0265490dd869dea13d60717a" + integrity sha512-rQdO4RRgPPAGKOVP6JQopYMsTOUdXnwtONPGRy3M5BiHLeP//xQH9NKGjU44IHSorc3IsDk6hHttDgmP79xdzw== dependencies: - "@ogre-tools/fp" "^10.3.2" - "@ogre-tools/injectable" "^10.3.2" + "@ogre-tools/fp" "^11.0.0" + "@ogre-tools/injectable" "^11.0.0" lodash "^4.17.21" -"@ogre-tools/injectable-react@10.1.0": - version "10.1.0" - resolved "https://registry.yarnpkg.com/@ogre-tools/injectable-react/-/injectable-react-10.1.0.tgz#5c9b4b5eb9e5843cc966629131104055180ba18c" - integrity sha512-4ReLJm8QcruCEm4KFhbsXLki3YiKRwlg3Mg7C2d8KyUfg+MUA5VdvgQSn3HthnyejiXlYCinqJLw83IryX/GNA== +"@ogre-tools/injectable@^11.0.0": + version "11.0.0" + resolved "https://registry.yarnpkg.com/@ogre-tools/injectable/-/injectable-11.0.0.tgz#43112e6bdeb8e52ac39aea86200fc9697a46fbc0" + integrity sha512-kefX6Nv81tuy6cG/veZmt+XRzNft4BJBnlHlosisvcbdxRt8wkJg3sv2ud9gtJsW0LBtmvMf0SThdpayrFa+sQ== dependencies: - "@ogre-tools/fp" "^10.1.0" - "@ogre-tools/injectable" "^10.1.0" - lodash "^4.17.21" - -"@ogre-tools/injectable@10.3.2", "@ogre-tools/injectable@^10.1.0", "@ogre-tools/injectable@^10.3.2": - version "10.3.2" - resolved "https://registry.yarnpkg.com/@ogre-tools/injectable/-/injectable-10.3.2.tgz#9f0c726c17072e2e6f4aab45cad6ddde393bef42" - integrity sha512-hZR3ELS6mwkS30u50/4sD/5qfHy3609iCWr9zN9s6XTCiPqxEMFFy1cnNGgVqjI1MBgB/aHeq9BGNgZzbHWpIw== - dependencies: - "@ogre-tools/fp" "^10.3.2" + "@ogre-tools/fp" "^11.0.0" lodash "^4.17.21" "@pmmmwh/react-refresh-webpack-plugin@^0.5.7":