feat(FN-2944): merge fusion/fn-2944
- test(FN-2944): cover already checked out worktree conflict recovery - fix(FN-2944): recognize git already checked out worktree conflict - fix(engine): auto-recover from squash-merge orphan rebase failures Fusion-Task-Id: FN-2944
This commit is contained in:
@@ -21,8 +21,9 @@
|
||||
import { join, dirname } from "node:path";
|
||||
import { cpSync, mkdirSync, existsSync, rmSync, writeFileSync, readdirSync } from "node:fs";
|
||||
import { createRequire } from "node:module";
|
||||
import { fileURLToPath } from "node:url";
|
||||
|
||||
const cliRoot = dirname(new URL(import.meta.url).pathname);
|
||||
const cliRoot = dirname(fileURLToPath(import.meta.url));
|
||||
const workspaceRoot = join(cliRoot, "..", "..");
|
||||
const outDir = join(cliRoot, "dist");
|
||||
const dashboardClientSrc = join(workspaceRoot, "packages", "dashboard", "dist", "client");
|
||||
|
||||
Reference in New Issue
Block a user