Revert "Merge remote-tracking branch 'origin/canary' into stable"

This reverts commit 992ed89a89, reversing
changes made to d272d7922d.
This commit is contained in:
李华桥
2023-11-29 11:18:45 +08:00
parent f97d323ab5
commit 89197bacef
63 changed files with 409 additions and 2108 deletions
+2 -6
View File
@@ -1,11 +1,10 @@
import { spawn } from 'node:child_process';
import { resolve } from 'node:path';
import type { ChildProcessWithoutNullStreams } from 'child_process';
import type { BuildContext } from 'esbuild';
import * as esbuild from 'esbuild';
import { config, electronDir, rootDir } from './common';
import { config, electronDir } from './common';
// this means we don't spawn electron windows, mainly for testing
const watchMode = process.argv.includes('--watch');
@@ -30,10 +29,7 @@ function spawnOrReloadElectron() {
spawnProcess = null;
}
const ext = process.platform === 'win32' ? '.cmd' : '';
const exe = resolve(rootDir, 'node_modules', '.bin', `electron${ext}`);
spawnProcess = spawn(exe, ['.'], {
spawnProcess = spawn('electron', ['.'], {
cwd: electronDir,
env: process.env,
});