From 12760151bece19ae613dad2af7b099866308235e Mon Sep 17 00:00:00 2001
From: Daniel LaCosse <3759828+daniellacosse@users.noreply.github.com>
Date: Tue, 2 Apr 2024 11:09:50 -0400
Subject: [PATCH] wha'd I miss

---
 .github/workflows/build_and_test_debug_client.yml | 4 ++--
 client/src/cordova/build.action.mjs               | 9 +++++----
 client/src/cordova/import_messages.action.mjs     | 2 +-
 client/src/cordova/setup.action.mjs               | 6 +++---
 client/src/cordova/test.action.mjs                | 4 ++--
 client/src/tun2socks/build.action.mjs             | 2 +-
 client/src/www/build.action.mjs                   | 2 +-
 client/src/www/start.action.mjs                   | 2 +-
 client/src/www/storybook.action.mjs               | 2 +-
 client/src/www/test.action.mjs                    | 2 +-
 {client/src => src}/build/download_file.mjs       | 0
 {client/src => src}/build/get_file_checksum.mjs   | 0
 {client/src => src}/build/get_root_dir.mjs        | 0
 {client/src => src}/build/run_action.mjs          | 0
 {client/src => src}/build/spawn_stream.mjs        | 0
 third_party/jsign/index.mjs                       | 6 +++---
 16 files changed, 21 insertions(+), 20 deletions(-)
 rename {client/src => src}/build/download_file.mjs (100%)
 rename {client/src => src}/build/get_file_checksum.mjs (100%)
 rename {client/src => src}/build/get_root_dir.mjs (100%)
 rename {client/src => src}/build/run_action.mjs (100%)
 rename {client/src => src}/build/spawn_stream.mjs (100%)

diff --git a/.github/workflows/build_and_test_debug_client.yml b/.github/workflows/build_and_test_debug_client.yml
index 29c881c68a..f7c5ce58f0 100644
--- a/.github/workflows/build_and_test_debug_client.yml
+++ b/.github/workflows/build_and_test_debug_client.yml
@@ -72,7 +72,7 @@ jobs:
           go-version-file: '${{ github.workspace }}/go.mod'
 
       - name: Build Linux Client
-        run: npm run action client/src/electron/build linux
+        run: npm run action src/electron/build linux
 
   windows_debug_build:
     name: Windows Debug Build
@@ -102,7 +102,7 @@ jobs:
           go-version-file: '${{ github.workspace }}/go.mod'
 
       - name: Build Windows Client
-        run: npm run action client/src/electron/build windows
+        run: npm run action src/electron/build windows
 
   macos_debug_build:
     name: MacOS Debug Build
diff --git a/client/src/cordova/build.action.mjs b/client/src/cordova/build.action.mjs
index d4b12e345d..5ffa105820 100644
--- a/client/src/cordova/build.action.mjs
+++ b/client/src/cordova/build.action.mjs
@@ -19,11 +19,12 @@ import fs from 'node:fs/promises';
 import cordovaLib from 'cordova-lib';
 const {cordova} = cordovaLib;
 
-import {runAction} from '../build/run_action.mjs';
-import {getRootDir} from '../build/get_root_dir.mjs';
-import {spawnStream} from '../build/spawn_stream.mjs';
+import {runAction} from '../../../src/build/run_action.mjs';
+import {getRootDir} from '../../../src/build/get_root_dir.mjs';
+import {spawnStream} from '../../../src/build/spawn_stream.mjs';
+import {downloadHttpsFile} from '../../../src/build/download_file.mjs';
+
 import {getBuildParameters} from '../build/get_build_parameters.mjs';
-import {downloadHttpsFile} from '../build/download_file.mjs';
 
 /**
  * @description Builds the parameterized cordova binary (ios, macos, maccatalyst, android).
diff --git a/client/src/cordova/import_messages.action.mjs b/client/src/cordova/import_messages.action.mjs
index da3f6899fa..d6ff6c46a3 100644
--- a/client/src/cordova/import_messages.action.mjs
+++ b/client/src/cordova/import_messages.action.mjs
@@ -16,7 +16,7 @@ import chalk from 'chalk';
 import minimist from 'minimist';
 import path from 'path';
 import url from 'url';
-import {getRootDir} from '../build/get_root_dir.mjs';
+import {getRootDir} from '../../../src/build/get_root_dir.mjs';
 import {readFile, readdir, mkdir} from 'fs/promises';
 import * as ANDROID_IMPORTER from './android/import_messages.mjs';
 import * as IOS_IMPORTER from './apple/import_messages.mjs';
diff --git a/client/src/cordova/setup.action.mjs b/client/src/cordova/setup.action.mjs
index bd062e32ef..74022383e8 100644
--- a/client/src/cordova/setup.action.mjs
+++ b/client/src/cordova/setup.action.mjs
@@ -21,10 +21,10 @@ import replace from 'replace-in-file';
 import cordovaLib from 'cordova-lib';
 const {cordova} = cordovaLib;
 
-import {getRootDir} from '../build/get_root_dir.mjs';
-import {runAction} from '../build/run_action.mjs';
+import {getRootDir} from '../../../src/build/get_root_dir.mjs';
+import {runAction} from '../../../src/build/run_action.mjs';
+import {spawnStream} from '../../../src/build/spawn_stream.mjs';
 import {getBuildParameters} from '../build/get_build_parameters.mjs';
-import {spawnStream} from '../build/spawn_stream.mjs';
 import chalk from 'chalk';
 
 const WORKING_CORDOVA_OSX_COMMIT = '07e62a53aa6a8a828fd988bc9e884c38c3495a67';
diff --git a/client/src/cordova/test.action.mjs b/client/src/cordova/test.action.mjs
index 8a7faef60e..ec2de4ea37 100644
--- a/client/src/cordova/test.action.mjs
+++ b/client/src/cordova/test.action.mjs
@@ -19,8 +19,8 @@ import path from 'path';
 import fs from 'fs/promises';
 import rmfr from 'rmfr';
 
-import {getRootDir} from '../build/get_root_dir.mjs';
-import {spawnStream} from '../build/spawn_stream.mjs';
+import {getRootDir} from '../../../src/build/get_root_dir.mjs';
+import {spawnStream} from '../../../src/build/spawn_stream.mjs';
 
 const APPLE_ROOT = path.join(getRootDir(), 'src', 'cordova', 'apple');
 const APPLE_LIBRARY_NAME = 'OutlineAppleLib';
diff --git a/client/src/tun2socks/build.action.mjs b/client/src/tun2socks/build.action.mjs
index ef2d0f510b..cda0e3fd50 100644
--- a/client/src/tun2socks/build.action.mjs
+++ b/client/src/tun2socks/build.action.mjs
@@ -14,7 +14,7 @@
 
 import url from 'url';
 import os from 'os';
-import {spawnStream} from '../build/spawn_stream.mjs';
+import {spawnStream} from '../../../src/build/spawn_stream.mjs';
 import {getBuildParameters} from '../build/get_build_parameters.mjs';
 
 /**
diff --git a/client/src/www/build.action.mjs b/client/src/www/build.action.mjs
index 4579e34e89..a269b33294 100644
--- a/client/src/www/build.action.mjs
+++ b/client/src/www/build.action.mjs
@@ -19,7 +19,7 @@ import rmfr from 'rmfr';
 
 import {runWebpack} from '../build/run_webpack.mjs';
 import {getBuildParameters} from '../build/get_build_parameters.mjs';
-import {getRootDir} from '../build/get_root_dir.mjs';
+import {getRootDir} from '../../../src/build/get_root_dir.mjs';
 
 import {getBrowserWebpackConfig} from './get_browser_webpack_config.mjs';
 
diff --git a/client/src/www/start.action.mjs b/client/src/www/start.action.mjs
index a45bca81d2..4e996fe6c5 100644
--- a/client/src/www/start.action.mjs
+++ b/client/src/www/start.action.mjs
@@ -16,7 +16,7 @@ import url from 'url';
 import webpack from 'webpack';
 import WebpackServer from 'webpack-dev-server';
 
-import {runAction} from '../build/run_action.mjs';
+import {runAction} from '../../../src/build/run_action.mjs';
 import {getBrowserWebpackConfig} from './get_browser_webpack_config.mjs';
 
 /**
diff --git a/client/src/www/storybook.action.mjs b/client/src/www/storybook.action.mjs
index b3dbb8c1e4..705d59d8a9 100644
--- a/client/src/www/storybook.action.mjs
+++ b/client/src/www/storybook.action.mjs
@@ -20,7 +20,7 @@ import {fromRollup} from '@web/dev-server-rollup';
 import image from '@rollup/plugin-image';
 
 import path from 'path';
-import {getRootDir} from '../build/get_root_dir.mjs';
+import {getRootDir} from '../../../src/build/get_root_dir.mjs';
 
 const WWW_PATH = ['src', 'www'];
 const STORYBOOK_PATH = [...WWW_PATH, '.storybook'];
diff --git a/client/src/www/test.action.mjs b/client/src/www/test.action.mjs
index 2d68cd48e9..bb6cf45273 100644
--- a/client/src/www/test.action.mjs
+++ b/client/src/www/test.action.mjs
@@ -17,7 +17,7 @@ import url from 'url';
 import karma from 'karma';
 import puppeteer from 'puppeteer';
 import path from 'path';
-import {getRootDir} from '../build/get_root_dir.mjs';
+import {getRootDir} from '../../../src/build/get_root_dir.mjs';
 
 const KARMA_CONFIG_PATH = ['src', 'www', 'karma.conf.js'];
 
diff --git a/client/src/build/download_file.mjs b/src/build/download_file.mjs
similarity index 100%
rename from client/src/build/download_file.mjs
rename to src/build/download_file.mjs
diff --git a/client/src/build/get_file_checksum.mjs b/src/build/get_file_checksum.mjs
similarity index 100%
rename from client/src/build/get_file_checksum.mjs
rename to src/build/get_file_checksum.mjs
diff --git a/client/src/build/get_root_dir.mjs b/src/build/get_root_dir.mjs
similarity index 100%
rename from client/src/build/get_root_dir.mjs
rename to src/build/get_root_dir.mjs
diff --git a/client/src/build/run_action.mjs b/src/build/run_action.mjs
similarity index 100%
rename from client/src/build/run_action.mjs
rename to src/build/run_action.mjs
diff --git a/client/src/build/spawn_stream.mjs b/src/build/spawn_stream.mjs
similarity index 100%
rename from client/src/build/spawn_stream.mjs
rename to src/build/spawn_stream.mjs
diff --git a/third_party/jsign/index.mjs b/third_party/jsign/index.mjs
index ad8ed8c58e..d5cf3e10b2 100644
--- a/third_party/jsign/index.mjs
+++ b/third_party/jsign/index.mjs
@@ -15,9 +15,9 @@
 import {spawn} from 'node:child_process';
 import {resolve} from 'node:path';
 
-import {downloadHttpsFile} from '../../client/src/build/download_file.mjs';
-import {getFileChecksum} from '../../client/src/build/get_file_checksum.mjs';
-import {getRootDir} from '../../client/src/build/get_root_dir.mjs';
+import {downloadHttpsFile} from '../../src/build/download_file.mjs';
+import {getFileChecksum} from '../../src/build/get_file_checksum.mjs';
+import {getRootDir} from '../../src/build/get_root_dir.mjs';
 
 /**
  * Run jsign.jar to sign `fileToSign` with a list of cli arguments stored in `options`.