Skip to content

Sync: merge main into dependencies (conflicts)#138

Merged
nerjs merged 5 commits into
dependenciesfrom
main
May 12, 2026
Merged

Sync: merge main into dependencies (conflicts)#138
nerjs merged 5 commits into
dependenciesfrom
main

Conversation

@nerjs
Copy link
Copy Markdown
Owner

@nerjs nerjs commented May 11, 2026

Merge conflicts. Resolve manually.

nerjs and others added 5 commits March 31, 2026 11:39
Bumps the eslint group with 2 updates: [eslint](https://github.com/eslint/eslint) and [typescript-eslint](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/typescript-eslint).


Updates `eslint` from 10.0.3 to 10.1.0
- [Release notes](https://github.com/eslint/eslint/releases)
- [Commits](eslint/eslint@v10.0.3...v10.1.0)

Updates `typescript-eslint` from 8.57.0 to 8.58.0
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/typescript-eslint/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v8.58.0/packages/typescript-eslint)

---
updated-dependencies:
- dependency-name: eslint
  dependency-version: 10.1.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: eslint
- dependency-name: typescript-eslint
  dependency-version: 8.58.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: eslint
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Fix timekeeper races, metrics and propagate unrefTimeouts

- runBatch metric on batch start (was rejectBatch)
- set task.runnedAt on run
- check signal.aborted before cache.set
- include maxWaitingTimeMs in deduplicator timeout when limited
- fix race in LimitedTimekeeper.clear()
- split LimitedTimekeeper.runTask into dispatch + enqueue
- register Deduplicator runner before starting it
- propagate unrefTimeouts through all timers
- validate BatchLoader options
- BatchLoader accepts metrics; export metric interfaces
- ITask fields readonly; minor cleanup, README sync

* Bump @types/node and ts-jest, tidy tsconfig

- @types/node 25.0.10 -> 25.6.2
- ts-jest 29.4.6 -> 29.4.9
- tsconfig: moduleResolution "Node" -> "node10", drop unused baseUrl

typescript stays on ^5.9.3: ts-jest is not yet compatible with TS 6.

* Add input validation and improve timer handling
@nerjs nerjs merged commit 21ab89e into dependencies May 12, 2026
7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant