Skip to content

fix(mobile): Order the native-stack patch hunks by line - #78

Closed
mwolson wants to merge 1 commit into
personal/expo-autolinking-aube-storefrom
personal/native-stack-patch-hunk-order
Closed

mwolson wants to merge 1 commit into
personal/expo-autolinking-aube-storefrom
personal/native-stack-patch-hunk-order

Conversation

@mwolson

@mwolson mwolson commented Oct 10, 2026

Copy link
Copy Markdown
Owner

What Changed

Reorders the hunks in patches/@react-navigation%2Fnative-stack@7.17.6.patch so each file's hunks are in line order. In lib/typescript/src/types.d.ts and src/types.tsx, the axisBehavior hunk (lines 864 and 920) now comes before the identifier hunk (lines 1091 and 1156), with three lines of context, and the lockfile picks up the new patch hash. The patched package is otherwise unchanged.

Why

The upstream patch from pingdotgg#12648 duo-ios-app lists those hunks out of order. aube 2.7.0 and pnpm 12.8.1 reject it with "hunks not in order or overlap", so aube cannot install the Nightly tree, and pnpm 11.10.0 applies the earlier hunk seven lines too low, after identifier instead of after sharesBackground. Drop this layer once the upstream patch lists its hunks in order.

Checklist

  • This PR is small and focused
  • I explained what changed and why
  • I included before/after screenshots for any UI changes
  • I included a video for animation/interaction changes

@mwolson
mwolson added this pull request to stack #77 October 10, 2026 03:43
The @react-navigation/native-stack 7.17.6 patch lists its axisBehavior hunk
(line 864 of types.d.ts, 920 of types.tsx) after the identifier hunk at line
1091 (1156). aube 2.7.0 and pnpm 12.8.1 reject the patch with "hunks not in
order or overlap", and pnpm 11.10.0 applies the earlier hunk seven lines too
low, after `identifier` instead of after `sharesBackground`. List the hunks in
line order, with three lines of context on the moved hunks, so every installer
applies them where the patch intends.

Drop this layer once the upstream patch lists its hunks in order.
@mwolson
mwolson removed this pull request from stack #77 October 10, 2026 15:52
@mwolson
mwolson force-pushed the personal/native-stack-patch-hunk-order branch from f152948 to 3fc7cde Compare October 10, 2026 15:52
@mwolson
mwolson force-pushed the personal/expo-autolinking-aube-store branch from ad255bd to 1cafb7e Compare October 10, 2026 15:52
@mwolson
mwolson added this pull request to stack #81 October 10, 2026 15:53
@mwolson
mwolson removed this pull request from stack #81 October 10, 2026 16:45
@mwolson

mwolson commented Oct 10, 2026

Copy link
Copy Markdown
Owner Author

Dropped: replaced by contrib/native-stack-patch-hunk-order, which carries pingdotgg#17839 native-stack-hunk-order (same patched output, upstream's hunk context).

@mwolson mwolson closed this Oct 10, 2026
@mwolson
mwolson deleted the personal/native-stack-patch-hunk-order branch October 10, 2026 16:45
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