From 6d5895a6460b8f4c27c6f8b40ea7ffaf1573ed4a Mon Sep 17 00:00:00 2001 From: Sander Bruens Date: Thu, 23 May 2024 15:37:51 -0400 Subject: [PATCH] refactor(client): move `app_paths.ts` to `client/electron` (#2020) * refactor(client): move `app_paths.ts` to `client/electron` * Fix lint issue. --- client/{infrastructure => }/electron/app_paths.ts | 0 client/electron/go_vpn_tunnel.ts | 2 +- client/electron/routing_service.ts | 2 +- client/tsconfig.json | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename client/{infrastructure => }/electron/app_paths.ts (100%) diff --git a/client/infrastructure/electron/app_paths.ts b/client/electron/app_paths.ts similarity index 100% rename from client/infrastructure/electron/app_paths.ts rename to client/electron/app_paths.ts diff --git a/client/electron/go_vpn_tunnel.ts b/client/electron/go_vpn_tunnel.ts index e225222287..7d94720f06 100755 --- a/client/electron/go_vpn_tunnel.ts +++ b/client/electron/go_vpn_tunnel.ts @@ -16,10 +16,10 @@ import {platform} from 'os'; import {powerMonitor} from 'electron'; +import {pathToEmbeddedTun2socksBinary} from './app_paths'; import {ChildProcessHelper, ProcessTerminatedExitCodeError, ProcessTerminatedSignalError} from './process'; import {RoutingDaemon} from './routing_service'; import {VpnTunnel} from './vpn_tunnel'; -import {pathToEmbeddedTun2socksBinary} from '../infrastructure/electron/app_paths'; import {ShadowsocksSessionConfig, TunnelStatus} from '../src/www/app/tunnel'; import {ErrorCode, fromErrorCode, UnexpectedPluginError} from '../src/www/model/errors'; diff --git a/client/electron/routing_service.ts b/client/electron/routing_service.ts index 3ae942954b..78968d9b0d 100755 --- a/client/electron/routing_service.ts +++ b/client/electron/routing_service.ts @@ -20,7 +20,7 @@ import * as path from 'path'; import * as fsextra from 'fs-extra'; import * as sudo from 'sudo-prompt'; -import {pathToEmbeddedOutlineService} from '../infrastructure/electron/app_paths'; +import {pathToEmbeddedOutlineService} from './app_paths'; import {TunnelStatus} from '../src/www/app/tunnel'; import {ErrorCode, SystemConfigurationException} from '../src/www/model/errors'; diff --git a/client/tsconfig.json b/client/tsconfig.json index 581d8b92cf..f6dbb97233 100644 --- a/client/tsconfig.json +++ b/client/tsconfig.json @@ -17,5 +17,5 @@ "lib": ["es2022"] }, "exclude": ["*.cjs", "*.js", "*.mjs", "**/*.spec.ts"], - "include": ["src", "infrastructure"] + "include": ["src"] }