Skip to content

chore(repo): sync develop into next - #7204

Merged
supabase-cli-releaser[bot] merged 4 commits into
nextfrom
sync/develop-into-next
Oct 16, 2026
Merged

supabase-cli-releaser[bot] merged 4 commits into
nextfrom
sync/develop-into-next

Conversation

@supabase-cli-releaser

Copy link
Copy Markdown
Contributor

Merging develop into next conflicts. This branch starts at the tip of develop (325d0f6); next is at e9da236.

Conflicting files:

  • apps/cli-go/pkg/config/templates/Dockerfile
  • apps/cli/src/command-internal/local-jwt.ts
  • apps/cli/src/command-internal/local-jwt.unit.test.ts

To resolve:

git fetch origin
git switch sync/develop-into-next
git merge origin/next
# resolve the conflicts, then commit
git push origin sync/develop-into-next

Approve to fast-forward next; do not use the merge button.

7ttp and others added 2 commits October 16, 2026 11:38
…LI-2651) (#7174)

## TL;DR

brings `go-jwt` and `config-pull-run` under the effect lint, with the
`config-validate` missing-path test

## whats introduced?

- `go-jwt.*`, `config-pull-run.*` and `config-validate.*` join the allow
list
- `go-jwt` reads the clock through `DateTime` instead of `Date.now`,
with the same value, and its tests drop `async` for the same promise
chains
- `local-config-values`, `path-containment`, `functions-go-config`,
`config-validate.ts` and two of its tests stay out, since their sync
filesystem access, live `process.env` reads and native error passthrough
have no behaviour-identical effect form

## ref

- related: CLI-2651
This bumps realtime from v2.144.2-r0 to v2.144.3-r0.


https://github.com/supabase/slim-services/releases/tag/realtime-v2.144.3-r0

Planned after supabase/slim-services published v2.144.3-r0. This branch
is rewritten from develop whenever a newer relevant release arrives.

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
@supabase-cli-releaser supabase-cli-releaser Bot added the do not merge Approve to apply; do not merge. label Oct 16, 2026
@supabase-cli-releaser
supabase-cli-releaser Bot requested review from a team and supabase-oss as code owners October 16, 2026 13:45
# Conflicts:
#	apps/cli-go/pkg/config/templates/Dockerfile
#	apps/cli/src/command-internal/local-jwt.ts
#	apps/cli/src/command-internal/local-jwt.unit.test.ts
@supabase-cli-releaser

Copy link
Copy Markdown
Contributor Author

Claude resolved the merge of next

I resolved all three conflicts. In the JWT signer and its tests I kept next's rename (go-jwt → local-jwt, generateAsymmetricLocalJwt, LOCAL_JWT_*, encodeHtmlSafeJsonCompact) and added develop's Effect-lint changes on top: DateTime.nowUnsafe() replaces Date.now(), and the tests use promise chains instead of async/await. I also fixed .oxlintrc.effect.json, which still pointed at the old go-* file paths. The Go Dockerfile is deleted, following next.

File Resolution
apps/cli/src/command-internal/local-jwt.ts Kept next's names (local-jwt, generateAsymmetricLocalJwt, LOCAL_JWT_*, html-safe-json). Ported develop's DateTime.toEpochMillis(DateTime.nowUnsafe()) expiry computation and its effect import.
apps/cli/src/command-internal/local-jwt.unit.test.ts Kept next's describe/test names and function names. Ported develop's lint-driven style: promise chains instead of async/await, and DateTime.nowUnsafe() instead of Date.now().
.oxlintrc.effect.json Semantic fix. develop added Effect-lint coverage for go-* files that next renamed, so I replaced those entries with the new names: go-jwt→local-jwt, go-json→html-safe-json, go-duration→duration, go-float→format-float, go-quote→byte-quote, go-output-flag→output-formats, go-output.encoders→output.encoders.

Deleted: apps/cli-go/pkg/config/templates/Dockerfile.

Decisions for @supabase/cli. Confirm them, or push a change to this branch:

  • develop bumped image tags in the Go CLI's Dockerfile, but next removed the Go CLI entirely. Keep the file or delete it? Chose: Deleted it, following next's removal of apps/cli-go. develop's version bumps are carried by packages/stack's artifact catalog, which merged cleanly.
  • output-formats.ts may not be exactly what go-output-flag became in the rename. Which file should inherit its lint entry? Chose: Mapped it to output-formats.*, which defines the per-command --output enums. A maintainer should check this mapping if check:all reports lint errors there.

Quick checks. The merged tree passes check:all and unit tests.

Approve to fast-forward next once checks pass (workflow run).

@github-actions github-actions Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🤖 AI Review

Both independent reviews were available. Confirmed Claude’s single alphabetical-order nit. Codex reported no findings, and the adjudication found no additional issues.

Findings

Severity Location Category Sources Claim
⚪ NIT .oxlintrc.effect.json:29 style claude The new byte-quote.ts entry interrupts the alphabetical ordering of the command-internal include list.

Stats

Claude findings: 1 · Codex findings: 0 · Confirmed: 1 · Refuted: 0 · Uncertain: 0


Models: claude-opus-5-5 + gpt-6.1-sol · Trigger: manual · Workflow run

This review runs once per PR. A maintainer can request another with a /ai-review comment.

Comment thread .oxlintrc.effect.json Outdated
@supabase-cli-releaser

Copy link
Copy Markdown
Contributor Author

Claude repair round

No CI checks failed, so no code fixes were needed for the sync. I only reordered one entry in the oxlint config so the list is alphabetical again; the order looks like a side effect of merging the two branches.

1 findings fixed, 0 declined (workflow run).

@supabase-cli-releaser
supabase-cli-releaser Bot merged commit 3f3cdfa into next Oct 16, 2026
52 of 53 checks passed
@supabase-cli-releaser
supabase-cli-releaser Bot deleted the sync/develop-into-next branch October 16, 2026 15:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

do not merge Approve to apply; do not merge.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants