huh, mismatch between vscode and the cli

Jigsaw-Code · Apr 23, 2024 · b09d961 · b09d961
1 parent 0e3c60a
commit b09d961
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/client/electron/build_main.action.mjs b/client/electron/build_main.action.mjs
@@ -16,12 +16,12 @@ import fs from 'fs/promises';
 import path from 'path';
 import url from 'url';
 
+import electronMainWebpackConfigs from './webpack_electron_main.mjs';
 import {getRootDir} from '../../src/build/get_root_dir.mjs';
 import {runAction} from '../../src/build/run_action.mjs';
 import {getBuildParameters} from '../src/build/get_build_parameters.mjs';
 import {getWebpackBuildMode} from '../src/build/get_webpack_build_mode.mjs';
 import {runWebpack} from '../src/build/run_webpack.mjs';
-import electronMainWebpackConfigs from './webpack_electron_main.mjs';
 
 const ELECTRON_BUILD_DIR = 'output';
 const ELECTRON_PLATFORMS = ['linux', 'windows'];

diff --git a/client/electron/go_vpn_tunnel.ts b/client/electron/go_vpn_tunnel.ts
@@ -16,13 +16,13 @@ import {platform} from 'os';
 
 import {powerMonitor} from 'electron';
 
+import {ChildProcessHelper, ProcessTerminatedExitCodeError, ProcessTerminatedSignalError} from './process';
+import {RoutingDaemon} from './routing_service';
+import {VpnTunnel} from './vpn_tunnel';
 import {pathToEmbeddedBinary} from '../infrastructure/electron/app_paths';
 import {ShadowsocksSessionConfig} from '../src/www/app/tunnel';
 import {TunnelStatus} from '../src/www/app/tunnel';
 import {ErrorCode, fromErrorCode, UnexpectedPluginError} from '../src/www/model/errors';
-import {ChildProcessHelper, ProcessTerminatedExitCodeError, ProcessTerminatedSignalError} from './process';
-import {RoutingDaemon} from './routing_service';
-import {VpnTunnel} from './vpn_tunnel';
 
 
 const isLinux = platform() === 'linux';

diff --git a/client/electron/index.ts b/client/electron/index.ts
@@ -25,13 +25,13 @@ import {app, BrowserWindow, ipcMain, Menu, MenuItemConstructorOptions, nativeIma
 import {autoUpdater} from 'electron-updater';
 
 
-import {ShadowsocksSessionConfig} from '../src/www/app/tunnel';
-import {TunnelStatus} from '../src/www/app/tunnel';
-import * as errors from '../src/www/model/errors';
 import {GoVpnTunnel} from './go_vpn_tunnel';
 import {installRoutingServices, RoutingDaemon} from './routing_service';
 import {TunnelStore, SerializableTunnel} from './tunnel_store';
 import {VpnTunnel} from './vpn_tunnel';
+import {ShadowsocksSessionConfig} from '../src/www/app/tunnel';
+import {TunnelStatus} from '../src/www/app/tunnel';
+import * as errors from '../src/www/model/errors';
 
 // TODO: can we define these macros in other .d.ts files with default values?
 // Build-time macros injected by webpack's DefinePlugin: