diff --git a/apps/electron/forge.config.js b/apps/electron/forge.config.js index 493198c3ce..b74f9d7b62 100644 --- a/apps/electron/forge.config.js +++ b/apps/electron/forge.config.js @@ -130,6 +130,7 @@ module.exports = { : undefined, // We need the following line for updater extraResource: ['./resources/app-update.yml'], + ignore: ['src', 'e2e', 'tests'], }, makers, hooks: { diff --git a/apps/electron/scripts/dev.mjs b/apps/electron/scripts/dev.mjs index 99c552d61e..5de488c82d 100644 --- a/apps/electron/scripts/dev.mjs +++ b/apps/electron/scripts/dev.mjs @@ -1,12 +1,10 @@ /* eslint-disable no-async-promise-executor */ import { spawn } from 'node:child_process'; -import { readFileSync } from 'node:fs'; -import path from 'node:path'; import electronPath from 'electron'; import * as esbuild from 'esbuild'; -import { config, electronDir } from './common.mjs'; +import { config } from './common.mjs'; // this means we don't spawn electron windows, mainly for testing const watchMode = process.argv.includes('--watch'); @@ -19,20 +17,6 @@ const stderrFilterPatterns = [ /ExtensionLoadWarning/, ]; -// these are set before calling `config`, so we have a chance to override them -try { - const devJson = readFileSync( - path.resolve(electronDir, './dev.json'), - 'utf-8' - ); - const devEnv = JSON.parse(devJson); - Object.assign(process.env, devEnv); -} catch (err) { - console.warn( - `Could not read dev.json. Some functions may not work as expected.` - ); -} - /** @type {ChildProcessWithoutNullStreams | null} */ let spawnProcess = null;