chore: sync plus with upstream main (conflicts)#76
Conversation
|
You have reached your Codex usage limits for code reviews. You can see your limits in the Codex usage dashboard. |
📝 WalkthroughWalkthroughThis PR migrates the Capacitor fork from the Capacitor-plus namespace back to the upstream Capacitor identity: package scopes shift from ChangesCapacitor Upstream Migration
Estimated code review effort🎯 2 (Simple) | ⏱️ ~10 minutes Poem
🚥 Pre-merge checks | ✅ 4 | ❌ 1❌ Failed checks (1 warning)
✅ Passed checks (4 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing Touches📝 Generate docstrings
🧪 Generate unit tests (beta)
Tip 💬 Introducing Slack Agent: The best way for teams to turn conversations into code.Slack Agent is built on CodeRabbit's deep understanding of your code, so your team can collaborate across the entire SDLC without losing context.
Built for teams:
One agent for your entire SDLC. Right inside Slack. Comment |
|
Review the following changes in direct dependencies. Learn more about Socket for GitHub.
|
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Actionable comments posted: 1
Caution
Some comments are outside the diff and can’t be posted inline due to platform limitations.
⚠️ Outside diff range comments (1)
android/package.json (1)
25-28:⚠️ Potential issue | 🟠 Major | ⚡ Quick winBoth android and ios packages require two core dependencies, creating migration friction.
Lines 25–28 in
android/package.json(and identically inios/package.json) list both@capacitor-plus/coreand@capacitor/coreas mandatory peer dependencies with no optional metadata. This forces consumers installing these packages to install both core variants, producing peer-resolution warnings or failures during migration from@capacitor-plus/*to@capacitor/*.Suggested fix
"peerDependencies": { - "@capacitor-plus/core": "^8.3.0", "@capacitor/core": "^8.3.0" + }, + "peerDependenciesMeta": { + "@capacitor-plus/core": { + "optional": true + } },Apply to both
android/package.jsonandios/package.json.🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the rest with a brief reason, keep changes minimal, and validate. In `@android/package.json` around lines 25 - 28, The peerDependencies currently force consumers to install both `@capacitor-plus/core` and `@capacitor/core`; update android/package.json (and ios/package.json) to allow either by adding a peerDependenciesMeta section that marks one package as optional (e.g., add "peerDependenciesMeta": { "@capacitor-plus/core": { "optional": true } } or mark `@capacitor/core` optional depending on which you want to prefer) so the "peerDependencies" block can remain but consumers are not required to install both; reference the "peerDependencies" key and package names "@capacitor-plus/core" and "@capacitor/core" when applying this change.
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Inline comments:
In `@CHANGELOG.md`:
- Around line 6-26: Revert the manual release notes added to CHANGELOG.md (the
sections starting with the headings "## [8.3.3]" and "## [8.3.2]") and restore
the file to the CI-generated state; either undo the commit that introduced these
manual entries or remove those hunk lines so CHANGELOG.md is left empty of
hand-edited release notes and let the repository's release/changelog automation
regenerate the file during CI.
---
Outside diff comments:
In `@android/package.json`:
- Around line 25-28: The peerDependencies currently force consumers to install
both `@capacitor-plus/core` and `@capacitor/core`; update android/package.json (and
ios/package.json) to allow either by adding a peerDependenciesMeta section that
marks one package as optional (e.g., add "peerDependenciesMeta": {
"@capacitor-plus/core": { "optional": true } } or mark `@capacitor/core` optional
depending on which you want to prefer) so the "peerDependencies" block can
remain but consumers are not required to install both; reference the
"peerDependencies" key and package names "@capacitor-plus/core" and
"@capacitor/core" when applying this change.
🪄 Autofix (Beta)
Fix all unresolved CodeRabbit comments on this PR:
- Push a commit to this branch (recommended)
- Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration
Configuration used: defaults
Review profile: CHILL
Plan: Pro
Run ID: 468bf745-267d-441d-be03-499f099b74e6
📒 Files selected for processing (11)
CHANGELOG.mdandroid/CHANGELOG.mdandroid/package.jsoncli/CHANGELOG.mdcli/package.jsoncli/src/ios/update.tscore/CHANGELOG.mdcore/package.jsonios/CHANGELOG.mdios/package.jsonlerna.json
| ## [8.3.3](https://github.com/ionic-team/capacitor/compare/8.3.2...8.3.3) (2026-05-08) | ||
|
|
||
| ### Bug Fixes | ||
|
|
||
| - **cli:** copy plugin files in CocoaPods projects ([#8467](https://github.com/ionic-team/capacitor/issues/8467)) ([b2d7719](https://github.com/ionic-team/capacitor/commit/b2d771926a180e60deea31992d7d4abcd5ca3bc7)) | ||
|
|
||
| ## [8.3.2](https://github.com/ionic-team/capacitor/compare/8.3.1...8.3.2) (2026-05-07) | ||
|
|
||
| ### Bug Fixes | ||
|
|
||
| - **cli:** add cSettings support for compiler flags in generated Package.swift ([#8448](https://github.com/ionic-team/capacitor/issues/8448)) ([0bd0676](https://github.com/ionic-team/capacitor/commit/0bd0676315c5fd77e50312dd7b5bf4990dcbd7d0)) | ||
| - **cli:** add system framework and weak framework support in SPM Package.swift ([#8447](https://github.com/ionic-team/capacitor/issues/8447)) ([3232f0f](https://github.com/ionic-team/capacitor/commit/3232f0fe1d9811b0b5c500e3dc05cb8a250177f8)) | ||
| - **cli:** correct Capacitor plugin SPM compat check ([#8440](https://github.com/ionic-team/capacitor/issues/8440)) ([e5ccc45](https://github.com/ionic-team/capacitor/commit/e5ccc451dda27d56bca824ed644bd20fe4d988cb)) | ||
| - **cli:** generate binaryTarget entries for custom xcframeworks in Package.swift ([#8445](https://github.com/ionic-team/capacitor/issues/8445)) ([1f7e33f](https://github.com/ionic-team/capacitor/commit/1f7e33fca43d183332ec19d22b0d75ef81d8cc6d)) | ||
| - **cli:** generate resource entries in Package.swift ([#8455](https://github.com/ionic-team/capacitor/issues/8455)) ([790bd27](https://github.com/ionic-team/capacitor/commit/790bd27123497111984227010c3162cec94a108e)) | ||
| - **cli:** handle Cordova plugins without iOS source files ([#8443](https://github.com/ionic-team/capacitor/issues/8443)) ([0da130e](https://github.com/ionic-team/capacitor/commit/0da130eb7a861bee4e2c35bc0aac53ba9c983fc3)) | ||
| - **cli:** link plugin dependencies in Package.swift ([#8457](https://github.com/ionic-team/capacitor/issues/8457)) ([b3c769e](https://github.com/ionic-team/capacitor/commit/b3c769e856c826b1174518877cf86ac7ce73bf09)) | ||
| - **ios:** support Cordova plugins with Package.swift ([#8438](https://github.com/ionic-team/capacitor/issues/8438)) ([139943b](https://github.com/ionic-team/capacitor/commit/139943b0c05fddb2d1ce2d6f468800fddf17b4cf)) | ||
| - **SystemBars:** avoid extra view padding on API <= 34 ([#8439](https://github.com/ionic-team/capacitor/issues/8439)) ([5b135a7](https://github.com/ionic-team/capacitor/commit/5b135a70217be560e7176c8d5b514cc92ed3e4e4)) | ||
|
|
||
| ## [8.3.1](https://github.com/ionic-team/capacitor/compare/8.3.0...8.3.1) (2026-04-16) |
There was a problem hiding this comment.
Revert manual changelog edits and let CI regenerate.
This hunk adds release notes directly in CHANGELOG.md, which should not be hand-edited in this repo. Please revert this section and rely on the release/changelog automation to avoid drift and duplicate history.
As per coding guidelines, "CHANGELOG.md: Do not manually edit CHANGELOG.md; it is managed automatically by CI/CD".
🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
In `@CHANGELOG.md` around lines 6 - 26, Revert the manual release notes added to
CHANGELOG.md (the sections starting with the headings "## [8.3.3]" and "##
[8.3.2]") and restore the file to the CI-generated state; either undo the commit
that introduced these manual entries or remove those hunk lines so CHANGELOG.md
is left empty of hand-edited release notes and let the repository's
release/changelog automation regenerate the file during CI.
2 participants
Merge Conflict Resolution Required
The automatic sync of the
plusbranch with upstream main encountered merge conflicts.What happened
Action needed: Review the branch and resolve any remaining concerns before merging.
This PR was created automatically by the Capacitor+ sync workflow
Summary by CodeRabbit
New Features
Bug Fixes
Chores