AAP-20047: add Detox 20.51.3 patch (resolve composeSessionConfig conflict)#6
Merged
Merged
Conversation
AsijitM
approved these changes
Jun 29, 2026
vvHacker007
approved these changes
Jun 29, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What
Adds
patches/0002-cloud-detox-20.51.3-full.patch— the BrowserStack cloud-Detox patch reworked for upstream Detox 20.51.3 (current prod patch is0001-…20.26.2).Why
DetoxBstackPatchApply(UPSTREAM_TAG=20.51.3) failed because the 20.26.2-based patch conflicts when applied onto 20.51.3 — one file only:detox/src/configuration/composeSessionConfig.js. Between 20.26.2 and 20.51.3, upstream addedignoreUnexpectedMessages/ignoreUnexpectedWsMessageshandling in the exact region where our patch inserts itsif (isCloudSession) { … }cloud-caps validation → overlapping inserts → merge conflict → the job aborts on conflict markers.What changed in this patch vs 0001
composeSessionConfig.jshunks were regenerated against 20.51.3 context, keeping both upstream'signoreUnexpectedMessagesblocks and our cloud-caps validation (they're independent).0001— they already 3-way-merge cleanly onto 20.51.3 (verified in DetoxBstackPatchApply build Missing theDetox-androidfolder in npm package #3, where onlycomposeSessionConfig.jsconflicted).Verification
composeSessionConfig.jshunk to the real upstream 20.51.3 file reproduces the intended merged result exactly.sort -V), so0002-…20.51.3supersedes0001-…20.26.2.After merge
Re-run
DetoxBstackPatchApplywithUPSTREAM_TAG=20.51.3→ applies clean → pushespatched-20.51.3. (Follow-up: regenerate a fully 20.51.3-based patch from the merged tree as cleanup; not required to unblock.)Ref: AAP-20047
🤖 Generated with Claude Code