Repository navigation
fix(fork): merge upstream 96bae54 into patch/voice - #80
Merged
Merged
Conversation
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…gg#23052) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…gdotgg#23205) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…card (pingdotgg#23282) Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
…ingdotgg#22777) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…uests (pingdotgg#23034) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…sed (pingdotgg#23170) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ngdotgg#23096) Co-authored-by: Vishal <vishalprashantdoshi@gmail.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: PR Batch Tester <agent@local.test> Co-authored-by: Vishal Doshi <vdoshi96@users.noreply.github.com>
…ingdotgg#23361) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#23106) Co-authored-by: PR Batch Tester <agent@local.test> Co-authored-by: Nikita Maximilian Grimm <github@nikitagrimm.de> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…tch (pingdotgg#23023) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
… Activities (pingdotgg#23327) Fixes pingdotgg#15682. Takes over pingdotgg#23035. Co-authored-by: Taylor Dolezal <onlydole@users.noreply.github.com> Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Upstream pingdotgg#23023 made typescript the tsc-rs drop-in, which re-resolved many lockfile entries around this patch's react-native-incall-manager and react-native-webrtc entries. Take upstream's lockfile and let pnpm add the patch's entries back. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
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.
The fork's nightly build fails because this patch conflicts with upstream commit 96bae54.
pnpm-lock.yaml: upstream's chore(typecheck): typescript is the tsc-rs drop-in, no effect-tsgo patch pingdotgg/t3code#23023 madetypescriptthe tsc-rs drop-in and removed the effect-tsgo patch, which re-resolved many lockfile entries around this patch'sreact-native-incall-managerandreact-native-webrtcentries. I took upstream's lockfile and ranpnpm install --no-frozen-lockfile --fix-lockfileto add the patch's entries back.apps/voicealready usedtsc --noEmit, the typecheck script upstream now uses in every package, so it needed no change.Verification:
pnpm install --frozen-lockfilepasses on this branch, and on the full stack merged onto 96bae54.pnpm run typecheckinapps/mobileandapps/voice: 0 errors.vp test runinapps/mobilefor the voice session, preferences and widget snapshot tests: 60 passed.patch/release, this branch,patch/home,patch/bots,patch/cache-expiry-compactionandpatch/mobile-launch-crashmerge with no conflicts.Made by Claude Opus 5.5 in Claude Code.
🤖 Generated with Claude Code