Skip to content

Sync rocicorp/mono main (9aca1b0) - #28

Merged
tmm merged 9 commits into
mainfrom
sync-upstream-2
Oct 23, 2026
Merged

tmm merged 9 commits into
mainfrom
sync-upstream-2

Conversation

@tmm

@tmm tmm commented Oct 23, 2026

Copy link
Copy Markdown
Member

Merges rocicorp/mono main up to 9aca1b0: 7 commits, with no conflicts.

  • Client-relevant: none need a Swift port.
    • ast.ts swaps Array.prototype.toSorted for a helper (Hermes lacks it); behaviour is the same, and the regenerated conformance vectors are byte-identical.
    • The two Replicache close fixes (overlapping close() dropping a shared SQLite connection; a throwing close() blocking a reopen) have no Swift counterpart: ReplicaDatabase.release() runs once per client, guarded by repClosed, synchronously on the engine loop, and opening never waits on a close.
  • Server or JS only: z2s timestamptz reads, zero-cache replication-manager start phases, vitest 5.0.5.
  • Follow-up commit: upstream's lockfile dropped vitest 5.0.0, which zero-conformance and zero-swift-cli still resolved to. They now take ^5.0.5 and upstream's existing 5.0.5 entry; only their two importers change in the lockfile (8 lines). pnpm install --frozen-lockfile leaves it unchanged, and syncpack lint is clean.
  • Checks: zero-conformance 28/28 (vectors regenerated, unchanged), zero-swift CLI 26/26, Swift 215 tests in 41 suites.

No changeset: nothing in the Swift package changes.

Landing: like #3, this should land with its merge commit so upstream stays an ancestor of main; a squash would make the next sync conflict.

arv and others added 9 commits October 22, 2026 09:25
Mono-Internal-Commit: 16db23d0bc36943539d4573b1d85c4e497150a69
Mono-Internal-Commit: 3fe85f2d6943f81cfa2e6e81fa09876e36b97e53
Closes rocicorp#6730

Co-authored-by: joshuasun <sunjue123@outlook.com>
Mono-Internal-Commit: aa98917c5d5a37e9b2d3662baadc7e65d96eb823
Closes rocicorp#6728

Co-authored-by: joshuasun <sunjue123@outlook.com>
Mono-Internal-Commit: d461b05f94088d043ab60edcd870daaf949df242
…s overlap

Closes rocicorp#6729

Co-authored-by: joshuasun <sunjue123@outlook.com>
Mono-Internal-Commit: 678acb51506b32c30d1c21bf356e05ac5c1e4981
…tart

Mono-Internal-Commit: 1215b6d4787a9768a83fee28e2c479b719018999
Mono-Internal-Commit: ae6de4792084dab468bd9269d271b494354a7b8d
…s vitest ^5.0.5

Upstream's lockfile dropped vitest 5.0.0, which both still resolved to;
they now resolve to upstream's 5.0.5 entry. Only their two importers
change in the lockfile.

Amp-Thread-ID: https://ampcode.com/threads/T-c513a037-a257-45e0-b9a9-15c15edfe859
Co-authored-by: tmm <tmm@tmm.dev>
@socket-security

Copy link
Copy Markdown

Review the following changes in direct dependencies. Learn more about Socket for GitHub.

Diff Package Supply Chain
Security
Vulnerability Quality Maintenance License
Updated@​vitest/​browser@​5.0.0 ⏵ 5.0.599 +1100 +27899100
Updated@​vitest/​coverage-v8@​5.0.0 ⏵ 5.0.599 +110079 +199 +1100
Updatedvitest@​5.0.0 ⏵ 5.0.59810079 +199 +2100
Updated@​vitest/​browser-playwright@​5.0.0 ⏵ 5.0.59910086 +199100

View full report

@tmm
tmm merged commit 39aa09a into main Oct 23, 2026
9 checks passed
@tmm
tmm deleted the sync-upstream-2 branch October 23, 2026 04:47
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.

4 participants