mirror of
https://github.com/mountain-loop/yaak.git
synced 2026-03-25 19:01:38 +01:00
Merge main into proxy branch (formatting and docs)
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -58,9 +58,7 @@ if (appConfig == null) {
|
||||
|
||||
const port =
|
||||
process.env[appConfig.devPortEnv] ||
|
||||
(appConfig.fallbackDevPortEnv
|
||||
? process.env[appConfig.fallbackDevPortEnv]
|
||||
: undefined) ||
|
||||
(appConfig.fallbackDevPortEnv ? process.env[appConfig.fallbackDevPortEnv] : undefined) ||
|
||||
appConfig.defaultPort;
|
||||
const config = JSON.stringify({
|
||||
build: { devUrl: `http://localhost:${port}` },
|
||||
@@ -76,9 +74,7 @@ for (let i = 0; i < additionalArgs.length; i++) {
|
||||
const isInlineJson = value.trimStart().startsWith("{");
|
||||
normalizedAdditionalArgs.push("--config");
|
||||
normalizedAdditionalArgs.push(
|
||||
!isInlineJson && !path.isAbsolute(value)
|
||||
? path.join(rootDir, value)
|
||||
: value,
|
||||
!isInlineJson && !path.isAbsolute(value) ? path.join(rootDir, value) : value,
|
||||
);
|
||||
i++;
|
||||
continue;
|
||||
@@ -99,13 +95,7 @@ const args = [
|
||||
];
|
||||
|
||||
// Invoke the tauri CLI JS entry point directly via node to avoid shell escaping issues on Windows
|
||||
const tauriJs = path.join(
|
||||
rootDir,
|
||||
"node_modules",
|
||||
"@tauri-apps",
|
||||
"cli",
|
||||
"tauri.js",
|
||||
);
|
||||
const tauriJs = path.join(rootDir, "node_modules", "@tauri-apps", "cli", "tauri.js");
|
||||
|
||||
const result = spawnSync(process.execPath, [tauriJs, ...args], {
|
||||
cwd: path.join(rootDir, appConfig.appDir),
|
||||
|
||||
Reference in New Issue
Block a user