You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
{{ message }}
Repository navigation
Commit 7209a5f
Browse filesBrowse the repository at this point in the historyBrowse files
Merge upstream main 5319fe9 into fws/u5-guard-core at d2b65a5
The only conflict was src/core/task/Task.ts. Main's side removed the `abort` boolean field
and the `this.abort = true` assignments in requestAbort() and requestDispose(), because abort
is now a getter reading the run-state reducer (abort(this.runState), abortReason likewise).
The lane's side is the `cancellationGeneration` monotonic fence and its comments. Both sides
are kept in the recorded order: main's field removal and getters are taken verbatim, and the
lane's counter declaration and its increments in requestAbort() and requestDispose() sit on
top of them. The lane comment inside requestAbort() was rewritten because it explained the
abort flag being set at that line, which main's side no longer does.
Adaptation the textual merge could not express: main's Task exposes abort as a getter, so it
is read-only at a call site, and guardedWrite.spec.ts assigned task.abort at six places to
park 'cancelled, then resumed' - abort raised, the generation advanced, abort cleared again.
tsc reported all six as TS2540 once main's Task.ts was in the tree. They now go through one
documented test-local helper that writes the pair on the double; no assertion changed, and
the two sites that clear abort still clear it. main contains neither guardedWrite.ts nor its
spec, so this file is lane-only and main's own tree never compiled it.
Gates on the merged tree, pinned node 22.23.4: tsc --noEmit exit 0; eslint in the form
lint-staged declares (--max-warnings=0 --no-warn-ignored) exit 0 on both edited files;
pnpm format:check - prettier --check . at the repository root - exit 0. Shards: core 198
files / 4345 passed 9 skipped; misc 122 files / 2132 passed 19 skipped 1 file skipped; api
114 files / 4070 passed 2 skipped; services 5 failed 1685 passed; unit 5 failed 12569
passed 43 skipped, where those ten failures are the same services/rules/__tests__/rules.spec
.ts rows that fail with EPERM on symlink creation on an untouched tree on this host.
The merge also brought main's pnpm-lock.yaml. The src/eslint-suppressions.json blob stayed
in main's canonical serialisation on both sides and in the merge result (30,910 bytes,
newline-terminated, prettier --check clean), so this commit carries no re-serialised copy of
it; the shard runs above used this worktree's existing junction install rather than a fresh
install against the newly merged lockfile.
0 commit comments