more path updates

Jigsaw-Code · Apr 2, 2024 · 451f2f1 · 451f2f1
1 parent e27c3b9
commit 451f2f1
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/src/build/run_action.mjs b/src/build/run_action.mjs
@@ -27,7 +27,7 @@ import {spawnStream} from './spawn_stream.mjs';
 const resolveActionPath = async actionPath => {
   if (!actionPath) return '';
 
-  if (actionPath in JSON.parse(await readFile(path.resolve(getRootDir(), '../package.json'))).scripts) {
+  if (actionPath in JSON.parse(await readFile(path.resolve(getRootDir(), 'package.json'))).scripts) {
     return actionPath;
   }
 

diff --git a/src/electron/connectivity.ts b/src/electron/connectivity.ts
@@ -14,8 +14,8 @@
 
 import * as dns from 'dns';
 
-import {timeoutPromise} from '../infrastructure/timeout_promise';
-import * as errors from '../www/model/errors';
+import {timeoutPromise} from '../../client/src/infrastructure/timeout_promise';
+import * as errors from '../../client/src/www/model/errors';
 
 const DNS_LOOKUP_TIMEOUT_MS = 10000;
 

diff --git a/src/electron/index.ts b/src/electron/index.ts
@@ -23,10 +23,10 @@ import * as process from 'process';
 import * as url from 'url';
 import autoLaunch = require('auto-launch'); // tslint:disable-line
 
-import * as errors from '../www/model/errors';
+import * as errors from '../../client/src/www/model/errors';
 
-import {ShadowsocksSessionConfig} from '../www/app/tunnel';
-import {TunnelStatus} from '../www/app/tunnel';
+import {ShadowsocksSessionConfig} from '../../client/src/www/app/tunnel';
+import {TunnelStatus} from '../../client/src/www/app/tunnel';
 import {GoVpnTunnel} from './go_vpn_tunnel';
 import {installRoutingServices, RoutingDaemon} from './routing_service';
 import {TunnelStore, SerializableTunnel} from './tunnel_store';

diff --git a/src/electron/routing_service.ts b/src/electron/routing_service.ts
@@ -19,9 +19,9 @@ import {platform, userInfo} from 'os';
 import * as path from 'path';
 import * as sudo from 'sudo-prompt';
 
-import {getAppPath} from '../infrastructure/electron/app_paths';
-import {TunnelStatus} from '../www/app/tunnel';
-import {ErrorCode, SystemConfigurationException} from '../www/model/errors';
+import {getAppPath} from '../../client/src/infrastructure/electron/app_paths';
+import {TunnelStatus} from '../../client/src/www/app/tunnel';
+import {ErrorCode, SystemConfigurationException} from '../../client/src/www/model/errors';
 
 const isLinux = platform() === 'linux';
 const isWindows = platform() === 'win32';

diff --git a/src/electron/tunnel_store.ts b/src/electron/tunnel_store.ts
@@ -15,7 +15,7 @@
 import * as fs from 'fs';
 import * as path from 'path';
 
-import {ShadowsocksSessionConfig} from '../www/app/tunnel';
+import {ShadowsocksSessionConfig} from '../../client/src/www/app/tunnel';
 
 // Format to store a tunnel configuration.
 export interface SerializableTunnel {

diff --git a/src/electron/vpn_tunnel.ts b/src/electron/vpn_tunnel.ts
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import {TunnelStatus} from '../www/app/tunnel';
+import {TunnelStatus} from '../../client/src/www/app/tunnel';
 
 // Represents a VPN tunnel to a proxy server.
 export interface VpnTunnel {