sync: merge upstream v1.0.172#154
Closed
shuv1337 wants to merge 4 commits intointegrationfrom
Closed
Conversation
Resolved conflicts: - README.md: keep ours (fork-specific documentation with PR table) - bun.lock: regenerated with bun install - packages/opencode/package.json: accept upstream version 1.0.172 - packages/opencode/src/file/index.ts: preserved fork feature (binary content detection for SVG and extensionless files) - packages/console/*/package.json: accept upstream versions - packages/desktop/package.json: accept upstream version - packages/enterprise/package.json: accept upstream version - packages/extensions/zed/extension.toml: accept upstream - packages/function/package.json: accept upstream version - packages/plugin/package.json: accept upstream version - packages/sdk/js/package.json: accept upstream version - packages/slack/package.json: accept upstream version - packages/tauri/package.json: accept upstream version - packages/ui/package.json: accept upstream version - packages/util/package.json: accept upstream version - packages/web/package.json: accept upstream version - sdks/vscode/package.json: accept upstream version Preserved fork features: - PR #0: Improved text file detection for SVG and extensionless files (isBinaryContent function and application/octet-stream check) - All other fork features auto-merged successfully
|
Important Review skippedAuto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the You can disable this status message by setting the ✨ Finishing touches🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
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
2 participants
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.
Summary
Merge upstream opencode v1.0.172 into integration branch.
Conflict Resolution
README.mdbun.lockbun installpackages/opencode/package.jsonpackages/opencode/src/file/index.tspackages/*/package.json(16 files)packages/extensions/zed/extension.tomlPreserved Fork Features
isBinaryContent()function andapplication/octet-streamcheck for SVG and extensionless files like Dockerfile, MakefileValidation
Closes #152