Disperse implementation of resolve-proxy back to conventional directory structure instead of an experimental one

Co-authored-by: Janne Savolainen <janne.savolainen@live.fi>

Signed-off-by: Iku-turso <mikko.aspiala@gmail.com>

src/behaviours/resolve-proxy/resolve-proxy.test.ts

@@ -4,12 +4,12 @@
  */
 import type { AsyncFnMock } from "@async-fn/jest";
 import asyncFn from "@async-fn/jest";
-import type { ApplicationBuilder } from "../../../renderer/components/test-utils/get-application-builder";
-import { getApplicationBuilder } from "../../../renderer/components/test-utils/get-application-builder";
-import type { ResolveProxy } from "./common/resolve-proxy-injection-token";
-import { resolveProxyInjectionToken } from "./common/resolve-proxy-injection-token";
-import resolveProxyFromElectronInjectable from "./main/resolve-proxy-from-electron.injectable";
-import { getPromiseStatus } from "../../../common/test-utils/get-promise-status";
+import type { ApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
+import { getApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
+import type { ResolveProxy } from "../../common/utils/resolve-proxy/resolve-proxy-injection-token";
+import { resolveProxyInjectionToken } from "../../common/utils/resolve-proxy/resolve-proxy-injection-token";
+import resolveProxyFromElectronInjectable from "../../main/utils/resolve-proxy/resolve-proxy-from-electron.injectable";
+import { getPromiseStatus } from "../../common/test-utils/get-promise-status";
 
 describe("resolve-proxy", () => {
   let applicationBuilder: ApplicationBuilder;

src/common/utils/resolve-proxy/resolve-proxy-channel.injectable.ts

@@ -3,8 +3,8 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import type { RequestChannel } from "../../../../common/utils/channel/request-channel-injection-token";
-import { requestChannelInjectionToken } from "../../../../common/utils/channel/request-channel-injection-token";
+import type { RequestChannel } from "../channel/request-channel-injection-token";
+import { requestChannelInjectionToken } from "../channel/request-channel-injection-token";
 
 export type ResolveProxyChannel = RequestChannel<string, string>;
 

src/extensions/common-api/proxy.ts

@@ -4,6 +4,6 @@
  */
 
 import { asLegacyGlobalFunctionForExtensionApi } from "../as-legacy-globals-for-extension-api/as-legacy-global-function-for-extension-api";
-import { resolveProxyInjectionToken } from "../../behaviours/proxy/resolve-proxy/common/resolve-proxy-injection-token";
+import { resolveProxyInjectionToken } from "../../common/utils/resolve-proxy/resolve-proxy-injection-token";
 
 export const resolveProxy = asLegacyGlobalFunctionForExtensionApi(resolveProxyInjectionToken);

src/main/getDiForUnitTesting.ts

@@ -99,7 +99,7 @@ import rollbackHelmReleaseInjectable from "./helm/helm-service/rollback-helm-rel
 import updateHelmReleaseInjectable from "./helm/helm-service/update-helm-release.injectable";
 import waitUntilBundledExtensionsAreLoadedInjectable from "./start-main-application/lens-window/application-window/wait-until-bundled-extensions-are-loaded.injectable";
 import { registerMobX } from "@ogre-tools/injectable-extension-for-mobx";
-import electronInjectable from "../behaviours/proxy/resolve-proxy/main/electron.injectable";
+import electronInjectable from "./utils/resolve-proxy/electron.injectable";
 
 export function getDiForUnitTesting(opts: { doGeneralOverrides?: boolean } = {}) {
   const {

src/main/utils/resolve-proxy/resolve-proxy-channel-responder.injectable.ts

@@ -3,9 +3,9 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import resolveProxyChannelInjectable from "../common/resolve-proxy-channel.injectable";
+import resolveProxyChannelInjectable from "../../../common/utils/resolve-proxy/resolve-proxy-channel.injectable";
 import resolveProxyInjectable from "./resolve-proxy.injectable";
-import { requestChannelListenerInjectionToken } from "../../../../common/utils/channel/request-channel-listener-injection-token";
+import { requestChannelListenerInjectionToken } from "../../../common/utils/channel/request-channel-listener-injection-token";
 
 const resolveProxyChannelResponderInjectable = getInjectable({
   id: "resolve-proxy-channel-responder",

src/main/utils/resolve-proxy/resolve-proxy-from-electron.injectable.ts

@@ -4,7 +4,7 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import electronInjectable from "./electron.injectable";
-import withErrorLoggingInjectable from "../../../../common/utils/with-error-logging/with-error-logging.injectable";
+import withErrorLoggingInjectable from "../../../common/utils/with-error-logging/with-error-logging.injectable";
 
 const resolveProxyFromElectronInjectable = getInjectable({
   id: "resolve-proxy-from-electron",

src/main/utils/resolve-proxy/resolve-proxy-from-electron.test.ts

@@ -3,14 +3,14 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 
-import { getDiForUnitTesting } from "../../../../main/getDiForUnitTesting";
+import { getDiForUnitTesting } from "../../getDiForUnitTesting";
 import resolveProxyFromElectronInjectable from "./resolve-proxy-from-electron.injectable";
 import electronInjectable from "./electron.injectable";
 import type { AsyncFnMock } from "@async-fn/jest";
 import asyncFn from "@async-fn/jest";
 import type electron from "electron";
-import { getPromiseStatus } from "../../../../common/test-utils/get-promise-status";
-import logErrorInjectable from "../../../../common/log-error.injectable";
+import { getPromiseStatus } from "../../../common/test-utils/get-promise-status";
+import logErrorInjectable from "../../../common/log-error.injectable";
 import type { DiContainer } from "@ogre-tools/injectable";
 
 describe("technical: resolve-proxy-from-electron", () => {

src/main/utils/resolve-proxy/resolve-proxy.injectable.ts

@@ -3,7 +3,7 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import { resolveProxyInjectionToken } from "../common/resolve-proxy-injection-token";
+import { resolveProxyInjectionToken } from "../../../common/utils/resolve-proxy/resolve-proxy-injection-token";
 import resolveProxyFromElectronInjectable from "./resolve-proxy-from-electron.injectable";
 
 const resolveProxyInjectable = getInjectable({

src/renderer/utils/resolve-proxy/resolve-proxy.injectable.ts

@@ -3,9 +3,9 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import { resolveProxyInjectionToken } from "../common/resolve-proxy-injection-token";
-import requestFromChannelInjectable from "../../../../renderer/utils/channel/request-from-channel.injectable";
-import resolveProxyChannelInjectable from "../common/resolve-proxy-channel.injectable";
+import { resolveProxyInjectionToken } from "../../../common/utils/resolve-proxy/resolve-proxy-injection-token";
+import requestFromChannelInjectable from "../channel/request-from-channel.injectable";
+import resolveProxyChannelInjectable from "../../../common/utils/resolve-proxy/resolve-proxy-channel.injectable";
 
 const resolveProxyInjectable = getInjectable({
   id: "resolve-proxy-for-renderer",