From feea24f5255a6f77793271f30b58c87ecdd73967 Mon Sep 17 00:00:00 2001 From: Daniel LaCosse <3759828+daniellacosse@users.noreply.github.com> Date: Wed, 1 May 2024 11:52:50 -0400 Subject: [PATCH] fix in progress --- client/electron/build.action.mjs | 1 - client/electron/electron-builder.json | 2 +- client/electron/start.action.mjs | 17 +++++++++-------- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/client/electron/build.action.mjs b/client/electron/build.action.mjs index 7812921ec8..885b05c70e 100644 --- a/client/electron/build.action.mjs +++ b/client/electron/build.action.mjs @@ -16,7 +16,6 @@ import fs from 'fs/promises'; import path from 'path'; import url from 'url'; -import copydir from 'copy-dir'; import electron, {Platform} from 'electron-builder'; import minimist from 'minimist'; diff --git a/client/electron/electron-builder.json b/client/electron/electron-builder.json index 9ead3451d5..bc0c7575e4 100644 --- a/client/electron/electron-builder.json +++ b/client/electron/electron-builder.json @@ -12,7 +12,7 @@ "client/www", "client/resources/tray", "output/client/electron", - "!node_modules/electron" + "!output/client/electron/build" ], "linux": { "category": "Network", diff --git a/client/electron/start.action.mjs b/client/electron/start.action.mjs index 6aa09aeb91..589ac27d1b 100644 --- a/client/electron/start.action.mjs +++ b/client/electron/start.action.mjs @@ -12,14 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. +import path from 'path'; import url from 'url'; import electron from 'electron'; -import {getRootDir} from '../../../src/build/get_root_dir.mjs'; -import {runAction} from '../../../src/build/run_action.mjs'; -import {spawnStream} from '../../../sßrc/build/spawn_stream.mjs'; -import {getBuildParameters} from '../build/get_build_parameters.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 '../src/build/get_build_parameters.mjs'; /** * @description Builds and starts the electron application. @@ -29,13 +30,13 @@ import {getBuildParameters} from '../build/get_build_parameters.mjs'; export async function main(...parameters) { const {platform, buildMode} = getBuildParameters(parameters); - await runAction('www/build', platform, `--buildMode=${buildMode}`); - await runAction('electron/build_main', ...parameters); - await runAction('electron/build', platform, `--buildMode=${buildMode}`); + await runAction('client/src/www/build', platform, `--buildMode=${buildMode}`); + await runAction('client/electron/build_main', ...parameters); + await runAction('client/electron/build', platform, `--buildMode=${buildMode}`); process.env.OUTLINE_DEBUG = buildMode === 'debug'; - await spawnStream(electron, getRootDir()); + await spawnStream(electron, path.join(getRootDir(), 'output', 'client', 'electron')); } if (import.meta.url === url.pathToFileURL(process.argv[1]).href) {