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:
@@ -1,5 +1,6 @@
|
||||
import { defineConfig } from "vitest/config";
|
||||
import { cpus } from "node:os";
|
||||
import { fileURLToPath } from "node:url";
|
||||
|
||||
const defaultMaxWorkers = Math.max(1, cpus().length - 1);
|
||||
const requestedMaxWorkers = Number.parseInt(process.env.VITEST_MAX_WORKERS ?? String(defaultMaxWorkers), 10);
|
||||
@@ -9,7 +10,7 @@ process.env.VITEST_MAX_WORKERS = String(maxWorkers);
|
||||
export default defineConfig({
|
||||
resolve: {
|
||||
alias: {
|
||||
"@fusion/core": new URL("../core/src/index.ts", import.meta.url).pathname,
|
||||
"@fusion/core": fileURLToPath(new URL("../core/src/index.ts", import.meta.url)),
|
||||
},
|
||||
},
|
||||
test: {
|
||||
|
||||
Reference in New Issue
Block a user