feat: gracefully handle when a merge conflict happens with a simulated merge by levibostian · Pull Request #154 · levibostian/decaf

levibostian · 2026-03-15T13:03:40Z

Related GitHub Issues

Problem

When we perform a simulated merge, we use many different merge types, and it can be common for there to be a merge conflict when trying to rebase, for example. This causes decaf to crash on the CI, which feels not right. A crash shouldn't occur for something that is possible to occur.

Solution

In the GitHub UI, you will also see that merge conflict, and they won't even allow you to click the merge button because of the merge conflict.

We should gracefully handle it just the same, knowing the user can't actually merge the pull request anyway. So, instead of crashing the app, we should gracefully handle it and exit with a zero code, knowing the user can't merge anyway using rebase. They could use a different method instead.

Testing

Added automated tests.
Manually tested. If you check this box, provide instructions for others to test, too.

Notes for reviewers

…d merge When we perform a simulated merge, we use many different merge types, and it can be common for there to be a merge conflict when trying to rebase, for example. Now, in the GitHub UI, you will also see that merge conflict, and they won't even allow you to click the merge button because of the merge conflict. We should gracefully handle it just the same, knowing the user can't actually merge the pull request anyway. So, instead of crashing the app, we should gracefully handle it and exit with a zero code, knowing the user can't merge anyway using rebase. They could use a different method instead. For this reason, we shouldn't fail or anything.

github-actions · 2026-03-15T13:03:59Z

decaf

Running deployments in test mode. Results will appear below.
If this pull request and all of it's parent pull requests are merged using the...

...🟩 squash 🟩 merge method... 🚢 The next version of the project will be: 0.12.0

Learn more

Latest release: 0.11.1
Commit of latest release: 74aa739

Commits since last release:
- feat: gracefully handle when a merge conflict happens with a simulated merge

Related GitHub Issues

Problem

When we perform a simulated merge, we use many different merge types, and it can be common for there to be a merge conflict when trying to rebase, for example. This causes decaf to crash on the CI, which feels not right. A crash shouldn't occur for something that is possible to occur.

Solution

In the GitHub UI, you will also see that merge conflict, and they won't even allow you to click the merge button because of the merge conflict.

We should gracefully handle it just the same, knowing the user can't actually merge the pull request anyway. So, instead of crashing the app, we should gracefully handle it and exit with a zero code, knowing the user can't merge anyway using rebase. They could use a different method instead.

Testing

Added automated tests.
Manually tested. If you check this box, provide instructions for others to test, too.

Notes for reviewers

- chore(deps): update jdx/mise-action action to v4 (#153)

This PR contains the following updates:

Package	Type	Update	Change
jdx/mise-action
action	major	`v3` → `v4`

Release Notes

jdx/mise-action (jdx/mise-action)

`v4`

Compare
Source

Configuration

📅 Schedule: Branch creation - "every weekend" in timezone
America/Chicago, Automerge - At any time (no schedule defined).

🚦 Automerge: Enabled.

♻ Rebasing: Whenever PR is behind base branch, or you tick the
rebase/retry checkbox.

🔕 Ignore: Close this PR and you won't be reminded about this update
again.

If you want to rebase/retry this PR, check
this box

This PR was generated by Mend Renovate.
View the repository job
log.

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
- chore(deps): update actions/create-github-app-token action to v3 (#152)

This PR contains the following updates:

Package	Type	Update	Change

Release Notes

actions/create-github-app-token (actions/create-github-app-token)

v3

Compare
Source

Configuration

📅 Schedule: Branch creation - "every weekend" in timezone
America/Chicago, Automerge - At any time (no schedule defined).

🚦 Automerge: Enabled.

♻ Rebasing: Whenever PR is behind base branch, or you tick the
rebase/retry checkbox.

🔕 Ignore: Close this PR and you won't be reminded about this update
again.

If you want to rebase/retry this PR, check
this box

This PR was generated by Mend Renovate.
View the repository job
log.

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
- chore(deps): update dependency deno to v2.7.5 (#151)

This PR contains the following updates:

Package	Update	Change
deno	patch	`2.7.4` →
`2.7.5`

Release Notes

denoland/deno (deno)

v2.7.5

Compare
Source

feat(coverage): add function coverage to summary and HTML reports
(#32507)
feat(doc): support npm packages in deno doc
(#32435)
feat(ext/node): add node_api_create_object_with_properties API
(#31443)
feat(ext/node): implement KeyObject.toCryptoKey() and
KeyObject.from(CryptoKey)
(#32523)
feat(otel): allow feeding permission audit data into OTEL
(#32501)
feat: --cpu-prof flags for CPU profiles
(#31909)
fix(console): prevent multi-line object values in console.table
(#32604)
fix(core): switch to V8 Explicit microtask policy for correct nextTick
ordering
(#32466)
fix(ext/http): allow rejecting HTTP upgrades with non-101 status codes

(#32615)

fix(ext/napi): run async work execute callback on a worker thread
(#32560)
fix(ext/node): add node_api_create_property_key_(latin1/utf8)
(#32559)
fix(ext/node): add missing http2 header constants
(#32611)
fix(ext/node): emit DEP0198 warning for SHAKE digests without
outputLength

(#32521)

fix(ext/node): emit correct error codes for unsupported PQC key types
(#32533)
fix(ext/node): fix multiple DiffieHellman crypto bugs
(#32531)
fix(ext/node): fix multiple node:dgram compatibility issues
(#32520)
fix(ext/node): handle generateKeyPair 2-arg call and enable PQC tests
(#32619)
fix(ext/node): implement ECDH.convertKey and fix related ECDH bugs
(#32532)
fix(ext/node): implement node:v8 heap APIs
(#32483)
fix(ext/node): implement proper resourceLimits for
node:worker_threads

(#32430)

fix(ext/node): improve getCipherInfo and allow repeated Hmac digest()
(#32522)
fix(ext/node): improve node:dns compat
(#32536)
fix(ext/node): initialize debuglog testEnabled with safe default
(#32598)
fix(ext/node): make TTY stdout/stderr indestructible
(#32530)
fix(ext/node): make tty ReadStream/WriteStream callable without new
(#32537)
fix(ext/node): multiple readline improvements
(#32538)
fix(ext/node): napi_set_instance_data on exit
(#32509)
fix(ext/node): rewrite http2 implementation
(#32418)
fix(ext/node): run worker_threads eval code in sloppy mode
(#32428)
fix(ext/node): support des-ede3-cbc cipher and allow
Cipheriv/Decipheriv
without new
(#32519)
fix(ext/node): use max salt length as default for RSA-PSS signing
(#32534)
fix(ext/otel): remove panicking unwraps in telemetry code
(#32557)
fix(ext/websocket): handle non-ASCII bytes in WebSocket response
headers

(#32594)

fix(lsp): properly sync root files with tsgo
(#32455)
fix(lsp): tsgo scope attribution for asset files
(#32608)
fix(napi): remove unimplemented Node-API symbols from napi_sys
(#32593)
fix(npm): memoize peer cache hit checks to prevent combinatorial
explosion

(#32609)

fix(npm): support npmrc email authorization
(#32616)
fix: ensure binaries distributed in @deno/... npm packages are
exectuable

(#32581)

fix: flush CPU profile and coverage data on Deno.exit()
(#32591)
fix: normalize capture to boolean in removeEventListener options
(#32508)
fix: prevent panic on dynamic import with non-string error name
(#32498)
fix: set process.features.openssl_is_boringssl to true
(#32512)
fix: support value substitution when loading environment variable
files

(#32495)

perf(ext/node): move most fs.cp logic to rust
(#32580)
perf(lsp): drop jsx import source cache
(#32506)
perf(npm): improve decompression speed more
(#32547)
perf(npm): less syscalls in tarball extraction
(#32541)
perf(npm): remove folder canonicalization in tarball extract
(#32540)
perf(npm): use libdeflater and preallocate buffer
(#32511)

Configuration

📅 Schedule: Branch creation - "every weekend" in timezone
America/Chicago, Automerge - At any time (no schedule defined).

🚦 Automerge: Enabled.

♻ Rebasing: Whenever PR is behind base branch, or you tick the
rebase/retry checkbox.

🔕 Ignore: Close this PR and you won't be reminded about this update
again.

If you want to rebase/retry this PR, check
this box

This PR was generated by Mend Renovate.
View the repository job
log.

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
- chore(deps): update actions/create-github-app-token digest to fee1f7d (#150)

This PR contains the following updates:

Package	Type	Update	Change

Configuration

📅 Schedule: Branch creation - "every weekend" in timezone
America/Chicago, Automerge - At any time (no schedule defined).

🚦 Automerge: Enabled.

♻ Rebasing: Whenever PR is behind base branch, or you tick the
rebase/retry checkbox.

🔕 Ignore: Close this PR and you won't be reminded about this update
again.

If you want to rebase/retry this PR, check
this box

This PR was generated by Mend Renovate.
View the repository job
log.

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
- chore(deps): update dependency @david/dax to ^0.45.0 (#139)

This PR contains the following updates:

Package	Update	Change
@david/dax	minor	`^0.44.0` →
`^0.45.0`

Configuration

📅 Schedule: Branch creation - "every weekend" in timezone
America/Chicago, Automerge - At any time (no schedule defined).

🚦 Automerge: Disabled by config. Please merge this manually once you
are satisfied.

♻ Rebasing: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 Ignore: Close this PR and you won't be reminded about this update
again.

If you want to rebase/retry this PR, check
this box

This PR was generated by Mend Renovate.
View the repository job
log.

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: GitHub Action action@github.com
Co-authored-by: Levi Bostian levi@levi.earth
- renovatebot automerge (#148)
- chore(deps): update dependency deno to v2.7.4 (#147)

This PR contains the following updates:

Package	Update	Change
deno	patch	`2.7.1` →
`2.7.4`

Release Notes

denoland/deno (deno)

v2.7.4

Compare
Source

Reland refactor(core): move nextTick/immediate queues into core,
replace ops
with shared buffers
(#32440)
(#32465)
Revert "refactor(core): move nextTick/immediate queues into core,
replace ops
with shared buffers
(#32440)
(#32462)
fix(core): uv_compat cleanup and fixes
(#32458)
fix(deploy): correctly handle version lookup
(#32489)
fix(ext/node): deep assert compatibility
(#32434)
fix(ext/node): use sync writes for TTY stdout/stderr WriteStream
(#32488)
fix(test): restart all tests on env file change
(#32461)
perf(npm): actually improve npm install -g deno binary startup
performance

(#32467)

v2.7.3

Compare
Source

fix(deploy): dont use jsr api for deploy subcommand
(#32441)
fix(ext/node): handle partial writes to process.stdout/stderr
(#32433)
fix(ext/node): make UDP socket ops synchronous, implement missing
dgram
methods
(#32381)
fix(ext/node): support HTTP over Windows named pipes in node:http
(#32414)
fix(npm): don't panic when peer dep is not in snapshot
(#32454)
fix(npm): regression where resolution was missing dependencies
(#32453)
perf(npm): improve npm install -g deno binary startup performance
(#32439)

v2.7.2

Compare
Source

feat: v8 14.6, fix require(esm), libuv compat
(#32347)
fix(ci): fix ordering of platforms in ecosystem_compat_slack
(#32393)
fix(cli): load multiple env files in the correct order
(#32354)
fix(compile): store self extracting dir in hidden dir beside
executable

(#32329)

fix(core): store Global ptr for libuv-compat callbacks
(#32361)
fix(coverage): correct line and branch counts in coverage reports
(#32312)
fix(coverage): warn instead of erroring when source files are missing
(#32398)
fix(ext/console): support iterators in console.table
(#32379)
fix(ext/crypto): fix P-521 EC key export for all formats
(#32412)
fix(ext/crypto): handle wrong algorithm in subtle.importKey without
panicking

(#32410)

fix(ext/node): CBC decipher setAutoPadding(false) incorrectly strips
bytes

(#32403)

fix(ext/node): gracefully exit on invalid NODE_CHANNEL_FD instead of
panicking

(#32421)

fix(ext/node): handle emoji width correctly in readline
(#32383)
fix(ext/node): implement KeyObject.equals, fix createCipheriv with
KeyObject/null IV
(#32409)
fix(ext/node): implement missing X509Certificate methods
(#32270)
fix(ext/node): make execPath named export a real string
(#32396)
fix(ext/node): make setAutoPadding(false) a no-op for GCM ciphers
(#32290)
fix(ext/node): make fsPromises.watch() a proper AsyncIterable with
close()

(#32378)

fix(ext/node): provide CJS globals in worker_threads eval mode
(#32266)
fix(ext/node): rename conflict callback field typo
(#32306)
fix(ext/node): return first created path from recursive "node:fs"
mkdir call

(#32300)

fix(ext/node): support DER-encoded keys in
publicEncrypt/privateDecrypt

(#32291)

fix(ext/node): support
Ed25519,
X25519, and P-521 keys in
X509Certificate.publicKey
(#32267)
fix(ext/node): support RSA PSS padding option in crypto sign/verify
(#32269)
fix(ext/node): support SEC1 EC private key import/export in
node:crypto

(#32401)

fix(ext/node): support process.stdout resize events
(#32343)
fix(ext/node): use internal compileFunction binding in CJS wrap
(#32373)
fix(install): do not panic if lockfile incorrectly says package has a
bin

(#32345)

fix(install): global install should not warn about using node_modules
dir for
npm specifiers
(#32341)
fix(jupyter): handle shutdown and interrupt requests per protocol
(#32359)
fix(node): implement resolveObjectURL for node:buffer
(#32382)
fix(node): implement process.umask properly
(#32385)
fix(node): preserve AsyncLocalStorage context in stream.finished
callback

(#32389)

fix(node): support ECDSA with secp256k1 in node:crypto
(#32390)
fix(node/buffer): fix base64 decoding for strings with hyphens
(#32298)
fix(node/crypto): handle empty input in decipher final with
auto_pad=false

(#31958)

fix(node/vm): support vm.constants.DONT_CONTEXTIFY in createContext
(#32337)
fix(npm): NPM_CONFIG_REGISTRY correctly overrides .npmrc
(#32394)
fix(npm): peerDependency resolution leading to multiple versions being
installed + hanging
(#32358)
fix(test): dedupe discovered workspace test modules
(#32380)
fix: fix some stack frame dimming, and make the console log more
aligned with
cli formatting
(#32399)
fix: process level environment variables should take precedence over
env files

(#32407)

fix: validate cron schedule when using cron socket
(#32406)
fix:(ext/node): escape simple quotes in node:child_process
(#32336)
perf(install): improve parallelism of fetches during npm resolution
(#32416)
perf(install): move HTTP decompression for registry requests off the
async
event loop
(#32400)
perf(install): request abbreviated packuments from npm registry
(#32364)
perf(install): split tarball extraction into decompress + write, limit
write
concurrency
(#32408)
perf(install): use aws-lc-rs for tarball integrity hashing
(#32365)

Configuration

📅 Schedule: Branch creation - "every weekend" in timezone
America/Chicago, Automerge - At any time (no schedule defined).

🚦 Automerge: Disabled by config. Please merge this manually once you
are satisfied.

♻ Rebasing: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 Ignore: Close this PR and you won't be reminded about this update
again.

If you want to rebase/retry this PR, check
this box

This PR was generated by Mend Renovate.
View the repository job
log.

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
- chore(deps): update jdx/mise-action digest to 5228313 (#146)

This PR contains the following updates:

Package	Type	Update
jdx/mise-action
(changelog)
action	digest	`6d1e696` → `5228313`

Configuration

📅 Schedule: Branch creation - "every weekend" in timezone
America/Chicago, Automerge - At any time (no schedule defined).

🚦 Automerge: Enabled.

♻ Rebasing: Whenever PR is behind base branch, or you tick the
rebase/retry checkbox.

🔕 Ignore: Close this PR and you won't be reminded about this update
again.

If you want to rebase/retry this PR, check
this box

This PR was generated by Mend Renovate.
View the repository job
log.

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
- chore(deps): pin jdx/mise-action action to 6d1e696 (#145)

This PR contains the following updates:

Package	Type	Update	Change
jdx/mise-action
action	pinDigest	→ `6d1e696`

Configuration

📅 Schedule: Branch creation - "every weekend" in timezone
America/Chicago, Automerge - At any time (no schedule defined).

🚦 Automerge: Disabled by config. Please merge this manually once you
are satisfied.

♻ Rebasing: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 Ignore: Close this PR and you won't be reminded about this update
again.

If you want to rebase/retry this PR, check
this box

This PR was generated by Mend Renovate.
View the repository job
log.

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
- chore(deps): update actions/upload-artifact action to v7 (#143)

This PR contains the following updates:

Package	Type	Update	Change

Release Notes

actions/upload-artifact (actions/upload-artifact)

v7

Compare
Source

Configuration

📅 Schedule: Branch creation - "every weekend" in timezone
America/Chicago, Automerge - At any time (no schedule defined).

🚦 Automerge: Disabled by config. Please merge this manually once you
are satisfied.

♻ Rebasing: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 Ignore: Close this PR and you won't be reminded about this update
again.

If you want to rebase/retry this PR, check
this box

This PR was generated by Mend Renovate.
View the repository job
log.

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
- chore(deps): update dependency deno to v2.7.1 (#142)

This PR contains the following updates:

Package	Update	Change
deno	minor	`2.6.10` →
`2.7.1`

Release Notes

denoland/deno (deno)

Configuration

📅 Schedule: Branch creation - "every weekend" in timezone
America/Chicago, Automerge - At any time (no schedule defined).

🚦 Automerge: Disabled by config. Please merge this manually once you
are satisfied.

♻ Rebasing: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 Ignore: Close this PR and you won't be reminded about this update
again.

If you want to rebase/retry this PR, check
this box

This PR was generated by Mend Renovate.
View the repository job
log.

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

...🟩 rebase 🟩 merge method... 🚢 The next version of the project will be: 0.12.0

Learn more

Latest release: 0.11.1
Commit of latest release: 74aa739

Commits since last release:
- refactor: move from describe/it to Deno.test syntax for test functions
- feat: gracefully handle when a merge conflict happens with a simulated merge

When we perform a simulated merge, we use many different merge types, and it can be common for there to be a merge conflict when trying to rebase, for example. Now, in the GitHub UI, you will also see that merge conflict, and they won't even allow you to click the merge button because of the merge conflict.

We should gracefully handle it just the same, knowing the user can't actually merge the pull request anyway. So, instead of crashing the app, we should gracefully handle it and exit with a zero code, knowing the user can't merge anyway using rebase. They could use a different method instead.

For this reason, we shouldn't fail or anything.
- chore(deps): update jdx/mise-action action to v4 (#153)

This PR contains the following updates:

Package	Type	Update	Change
jdx/mise-action
action	major	`v3` → `v4`

Release Notes

jdx/mise-action (jdx/mise-action)

`v4`

Compare
Source

Configuration

📅 Schedule: Branch creation - "every weekend" in timezone
America/Chicago, Automerge - At any time (no schedule defined).

🚦 Automerge: Enabled.

♻ Rebasing: Whenever PR is behind base branch, or you tick the
rebase/retry checkbox.

🔕 Ignore: Close this PR and you won't be reminded about this update
again.

If you want to rebase/retry this PR, check
this box

This PR was generated by Mend Renovate.
View the repository job
log.

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
- chore(deps): update actions/create-github-app-token action to v3 (#152)

This PR contains the following updates:

Package	Type	Update	Change

Release Notes

actions/create-github-app-token (actions/create-github-app-token)

v3

Compare
Source

Configuration

📅 Schedule: Branch creation - "every weekend" in timezone
America/Chicago, Automerge - At any time (no schedule defined).

🚦 Automerge: Enabled.

♻ Rebasing: Whenever PR is behind base branch, or you tick the
rebase/retry checkbox.

🔕 Ignore: Close this PR and you won't be reminded about this update
again.

If you want to rebase/retry this PR, check
this box

This PR was generated by Mend Renovate.
View the repository job
log.

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
- chore(deps): update dependency deno to v2.7.5 (#151)

This PR contains the following updates:

Package	Update	Change
deno	patch	`2.7.4` →
`2.7.5`

Release Notes

denoland/deno (deno)

v2.7.5

Compare
Source

feat(coverage): add function coverage to summary and HTML reports
(#32507)
feat(doc): support npm packages in deno doc
(#32435)
feat(ext/node): add node_api_create_object_with_properties API
(#31443)
feat(ext/node): implement KeyObject.toCryptoKey() and
KeyObject.from(CryptoKey)
(#32523)
feat(otel): allow feeding permission audit data into OTEL
(#32501)
feat: --cpu-prof flags for CPU profiles
(#31909)
fix(console): prevent multi-line object values in console.table
(#32604)
fix(core): switch to V8 Explicit microtask policy for correct nextTick
ordering
(#32466)
fix(ext/http): allow rejecting HTTP upgrades with non-101 status codes

(#32615)

fix(ext/napi): run async work execute callback on a worker thread
(#32560)
fix(ext/node): add node_api_create_property_key_(latin1/utf8)
(#32559)
fix(ext/node): add missing http2 header constants
(#32611)
fix(ext/node): emit DEP0198 warning for SHAKE digests without
outputLength

(#32521)

fix(ext/node): emit correct error codes for unsupported PQC key types
(#32533)
fix(ext/node): fix multiple DiffieHellman crypto bugs
(#32531)
fix(ext/node): fix multiple node:dgram compatibility issues
(#32520)
fix(ext/node): handle generateKeyPair 2-arg call and enable PQC tests
(#32619)
fix(ext/node): implement ECDH.convertKey and fix related ECDH bugs
(#32532)
fix(ext/node): implement node:v8 heap APIs
(#32483)
fix(ext/node): implement proper resourceLimits for
node:worker_threads

(#32430)

fix(ext/node): improve getCipherInfo and allow repeated Hmac digest()
(#32522)
fix(ext/node): improve node:dns compat
(#32536)
fix(ext/node): initialize debuglog testEnabled with safe default
(#32598)
fix(ext/node): make TTY stdout/stderr indestructible
(#32530)
fix(ext/node): make tty ReadStream/WriteStream callable without new
(#32537)
fix(ext/node): multiple readline improvements
(#32538)
fix(ext/node): napi_set_instance_data on exit
(#32509)
fix(ext/node): rewrite http2 implementation
(#32418)
fix(ext/node): run worker_threads eval code in sloppy mode
(#32428)
fix(ext/node): support des-ede3-cbc cipher and allow
Cipheriv/Decipheriv
without new
(#32519)
fix(ext/node): use max salt length as default for RSA-PSS signing
(#32534)
fix(ext/otel): remove panicking unwraps in telemetry code
(#32557)
fix(ext/websocket): handle non-ASCII bytes in WebSocket response
headers

(#32594)

fix(lsp): properly sync root files with tsgo
(#32455)
fix(lsp): tsgo scope attribution for asset files
(#32608)
fix(napi): remove unimplemented Node-API symbols from napi_sys
(#32593)
fix(npm): memoize peer cache hit checks to prevent combinatorial
explosion

(#32609)

fix(npm): support npmrc email authorization
(#32616)
fix: ensure binaries distributed in @deno/... npm packages are
exectuable

(#32581)

fix: flush CPU profile and coverage data on Deno.exit()
(#32591)
fix: normalize capture to boolean in removeEventListener options
(#32508)
fix: prevent panic on dynamic import with non-string error name
(#32498)
fix: set process.features.openssl_is_boringssl to true
(#32512)
fix: support value substitution when loading environment variable
files

(#32495)

perf(ext/node): move most fs.cp logic to rust
(#32580)
perf(lsp): drop jsx import source cache
(#32506)
perf(npm): improve decompression speed more
(#32547)
perf(npm): less syscalls in tarball extraction
(#32541)
perf(npm): remove folder canonicalization in tarball extract
(#32540)
perf(npm): use libdeflater and preallocate buffer
(#32511)

Configuration

📅 Schedule: Branch creation - "every weekend" in timezone
America/Chicago, Automerge - At any time (no schedule defined).

🚦 Automerge: Enabled.

♻ Rebasing: Whenever PR is behind base branch, or you tick the
rebase/retry checkbox.

🔕 Ignore: Close this PR and you won't be reminded about this update
again.

If you want to rebase/retry this PR, check
this box

This PR was generated by Mend Renovate.
View the repository job
log.

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
- chore(deps): update actions/create-github-app-token digest to fee1f7d (#150)

This PR contains the following updates:

Package	Type	Update	Change

Configuration

📅 Schedule: Branch creation - "every weekend" in timezone
America/Chicago, Automerge - At any time (no schedule defined).

🚦 Automerge: Enabled.

♻ Rebasing: Whenever PR is behind base branch, or you tick the
rebase/retry checkbox.

🔕 Ignore: Close this PR and you won't be reminded about this update
again.

If you want to rebase/retry this PR, check
this box

This PR was generated by Mend Renovate.
View the repository job
log.

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
- chore(deps): update dependency @david/dax to ^0.45.0 (#139)

This PR contains the following updates:

Package	Update	Change
@david/dax	minor	`^0.44.0` →
`^0.45.0`

Configuration

📅 Schedule: Branch creation - "every weekend" in timezone
America/Chicago, Automerge - At any time (no schedule defined).

🚦 Automerge: Disabled by config. Please merge this manually once you
are satisfied.

♻ Rebasing: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 Ignore: Close this PR and you won't be reminded about this update
again.

If you want to rebase/retry this PR, check
this box

This PR was generated by Mend Renovate.
View the repository job
log.

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: GitHub Action action@github.com
Co-authored-by: Levi Bostian levi@levi.earth
- renovatebot automerge (#148)
- chore(deps): update dependency deno to v2.7.4 (#147)

This PR contains the following updates:

Package	Update	Change
deno	patch	`2.7.1` →
`2.7.4`

Release Notes

denoland/deno (deno)

v2.7.4

Compare
Source

Reland refactor(core): move nextTick/immediate queues into core,
replace ops
with shared buffers
(#32440)
(#32465)
Revert "refactor(core): move nextTick/immediate queues into core,
replace ops
with shared buffers
(#32440)
(#32462)
fix(core): uv_compat cleanup and fixes
(#32458)
fix(deploy): correctly handle version lookup
(#32489)
fix(ext/node): deep assert compatibility
(#32434)
fix(ext/node): use sync writes for TTY stdout/stderr WriteStream
(#32488)
fix(test): restart all tests on env file change
(#32461)
perf(npm): actually improve npm install -g deno binary startup
performance

(#32467)

v2.7.3

Compare
Source

fix(deploy): dont use jsr api for deploy subcommand
(#32441)
fix(ext/node): handle partial writes to process.stdout/stderr
(#32433)
fix(ext/node): make UDP socket ops synchronous, implement missing
dgram
methods
(#32381)
fix(ext/node): support HTTP over Windows named pipes in node:http
(#32414)
fix(npm): don't panic when peer dep is not in snapshot
(#32454)
fix(npm): regression where resolution was missing dependencies
(#32453)
perf(npm): improve npm install -g deno binary startup performance
(#32439)

v2.7.2

Compare
Source

feat: v8 14.6, fix require(esm), libuv compat
(#32347)
fix(ci): fix ordering of platforms in ecosystem_compat_slack
(#32393)
fix(cli): load multiple env files in the correct order
(#32354)
fix(compile): store self extracting dir in hidden dir beside
executable

(#32329)

fix(core): store Global ptr for libuv-compat callbacks
(#32361)
fix(coverage): correct line and branch counts in coverage reports
(#32312)
fix(coverage): warn instead of erroring when source files are missing
(#32398)
fix(ext/console): support iterators in console.table
(#32379)
fix(ext/crypto): fix P-521 EC key export for all formats
(#32412)
fix(ext/crypto): handle wrong algorithm in subtle.importKey without
panicking

(#32410)

fix(ext/node): CBC decipher setAutoPadding(false) incorrectly strips
bytes

(#32403)

fix(ext/node): gracefully exit on invalid NODE_CHANNEL_FD instead of
panicking

(#32421)

fix(ext/node): handle emoji width correctly in readline
(#32383)
fix(ext/node): implement KeyObject.equals, fix createCipheriv with
KeyObject/null IV
(#32409)
fix(ext/node): implement missing X509Certificate methods
(#32270)
fix(ext/node): make execPath named export a real string
(#32396)
fix(ext/node): make setAutoPadding(false) a no-op for GCM ciphers
(#32290)
fix(ext/node): make fsPromises.watch() a proper AsyncIterable with
close()

(#32378)

fix(ext/node): provide CJS globals in worker_threads eval mode
(#32266)
fix(ext/node): rename conflict callback field typo
(#32306)
fix(ext/node): return first created path from recursive "node:fs"
mkdir call

(#32300)

fix(ext/node): support DER-encoded keys in
publicEncrypt/privateDecrypt

(#32291)

fix(ext/node): support
Ed25519,
X25519, and P-521 keys in
X509Certificate.publicKey
(#32267)
fix(ext/node): support RSA PSS padding option in crypto sign/verify
(#32269)
fix(ext/node): support SEC1 EC private key import/export in
node:crypto

(#32401)

fix(ext/node): support process.stdout resize events
(#32343)
fix(ext/node): use internal compileFunction binding in CJS wrap
(#32373)
fix(install): do not panic if lockfile incorrectly says package has a
bin

(#32345)

fix(install): global install should not warn about using node_modules
dir for
npm specifiers
(#32341)
fix(jupyter): handle shutdown and interrupt requests per protocol
(#32359)
fix(node): implement resolveObjectURL for node:buffer
(#32382)
fix(node): implement process.umask properly
(#32385)
fix(node): preserve AsyncLocalStorage context in stream.finished
callback

(#32389)

fix(node): support ECDSA with secp256k1 in node:crypto
(#32390)
fix(node/buffer): fix base64 decoding for strings with hyphens
(#32298)
fix(node/crypto): handle empty input in decipher final with
auto_pad=false

(#31958)

fix(node/vm): support vm.constants.DONT_CONTEXTIFY in createContext
(#32337)
fix(npm): NPM_CONFIG_REGISTRY correctly overrides .npmrc
(#32394)
fix(npm): peerDependency resolution leading to multiple versions being
installed + hanging
(#32358)
fix(test): dedupe discovered workspace test modules
(#32380)
fix: fix some stack frame dimming, and make the console log more
aligned with
cli formatting
(#32399)
fix: process level environment variables should take precedence over
env files

(#32407)

fix: validate cron schedule when using cron socket
(#32406)
fix:(ext/node): escape simple quotes in node:child_process
(#32336)
perf(install): improve parallelism of fetches during npm resolution
(#32416)
perf(install): move HTTP decompression for registry requests off the
async
event loop
(#32400)
perf(install): request abbreviated packuments from npm registry
(#32364)
perf(install): split tarball extraction into decompress + write, limit
write
concurrency
(#32408)
perf(install): use aws-lc-rs for tarball integrity hashing
(#32365)

Configuration

📅 Schedule: Branch creation - "every weekend" in timezone
America/Chicago, Automerge - At any time (no schedule defined).

🚦 Automerge: Disabled by config. Please merge this manually once you
are satisfied.

♻ Rebasing: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 Ignore: Close this PR and you won't be reminded about this update
again.

If you want to rebase/retry this PR, check
this box

This PR was generated by Mend Renovate.
View the repository job
log.

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
- chore(deps): update jdx/mise-action digest to 5228313 (#146)

This PR contains the following updates:

Package	Type	Update
jdx/mise-action
(changelog)
action	digest	`6d1e696` → `5228313`

Configuration

📅 Schedule: Branch creation - "every weekend" in timezone
America/Chicago, Automerge - At any time (no schedule defined).

🚦 Automerge: Enabled.

♻ Rebasing: Whenever PR is behind base branch, or you tick the
rebase/retry checkbox.

🔕 Ignore: Close this PR and you won't be reminded about this update
again.

If you want to rebase/retry this PR, check
this box

This PR was generated by Mend Renovate.
View the repository job
log.

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
- chore(deps): pin jdx/mise-action action to 6d1e696 (#145)

This PR contains the following updates:

Package	Type	Update	Change
jdx/mise-action
action	pinDigest	→ `6d1e696`

Configuration

📅 Schedule: Branch creation - "every weekend" in timezone
America/Chicago, Automerge - At any time (no schedule defined).

🚦 Automerge: Disabled by config. Please merge this manually once you
are satisfied.

♻ Rebasing: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 Ignore: Close this PR and you won't be reminded about this update
again.

If you want to rebase/retry this PR, check
this box

This PR was generated by Mend Renovate.
View the repository job
log.

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
- chore(deps): update actions/upload-artifact action to v7 (#143)

This PR contains the following updates:

Package	Type	Update	Change

Release Notes

actions/upload-artifact (actions/upload-artifact)

v7

Compare
Source

Configuration

📅 Schedule: Branch creation - "every weekend" in timezone
America/Chicago, Automerge - At any time (no schedule defined).

🚦 Automerge: Disabled by config. Please merge this manually once you
are satisfied.

♻ Rebasing: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 Ignore: Close this PR and you won't be reminded about this update
again.

If you want to rebase/retry this PR, check
this box

This PR was generated by Mend Renovate.
View the repository job
log.

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
- chore(deps): update dependency deno to v2.7.1 (#142)

This PR contains the following updates:

Package	Update	Change
deno	minor	`2.6.10` →
`2.7.1`

Release Notes

denoland/deno (deno)

Configuration

📅 Schedule: Branch creation - "every weekend" in timezone
America/Chicago, Automerge - At any time (no schedule defined).

🚦 Automerge: Disabled by config. Please merge this manually once you
are satisfied.

♻ Rebasing: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 Ignore: Close this PR and you won't be reminded about this update
again.

If you want to rebase/retry this PR, check
this box

This PR was generated by Mend Renovate.
View the repository job
log.

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

levibostian added 2 commits March 15, 2026 08:01

refactor: move from describe/it to Deno.test syntax for test functions

be61820

Merge branch 'main' into rebase-error-handling

7623b17

levibostian merged commit 7a66814 into main Mar 15, 2026
11 checks passed

levibostian deleted the rebase-error-handling branch March 15, 2026 13:07

Conversation

levibostian commented Mar 15, 2026

Related GitHub Issues

Problem

Solution

Testing

Notes for reviewers

Uh oh!

github-actions bot commented Mar 15, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

decaf

Related GitHub Issues

Problem

Solution

Testing

Notes for reviewers

Release Notes

v4

Configuration

Release Notes

Configuration

Release Notes

Configuration

Configuration

Configuration

Release Notes

Configuration

Configuration

Configuration

Release Notes

Configuration

Release Notes

Configuration

Release Notes

v4

Configuration

Release Notes

Configuration

Release Notes

Configuration

Configuration

Configuration

Release Notes

Configuration

Configuration

Configuration

Release Notes

Configuration

Release Notes

Configuration

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant

github-actions bot commented Mar 15, 2026 •

edited

Loading

`v4`

`v4`