chore: sync plus with upstream main (conflicts)#78
Conversation
|
You have reached your Codex usage limits for code reviews. You can see your limits in the Codex usage dashboard. |
|
Review the following changes in direct dependencies. Learn more about Socket for GitHub.
|
|
Warning Review the following alerts detected in dependencies. According to your organization's Security Policy, it is recommended to resolve "Warn" alerts. Learn more about Socket for GitHub.
|
📝 WalkthroughWalkthroughThis PR migrates the monorepo from ChangesPackage Rebranding and Version Rollback
Estimated code review effort🎯 2 (Simple) | ⏱️ ~12 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)
Warning Review ran into problems🔥 ProblemsGit: Failed to clone repository. Please run the Comment |
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Actionable comments posted: 3
Caution
Some comments are outside the diff and can’t be posted inline due to platform limitations.
⚠️ Outside diff range comments (1)
ios/package.json (1)
2-30:⚠️ Potential issue | 🟠 Major | ⚡ Quick winAlign peerDependencies scope with package name.
The package
@capacitor/iosdeclares both@capacitor-plus/coreand@capacitor/coreas peer dependencies, creating a mixed scope contract. Since the package is scoped as@capacitor, remove the@capacitor-plus/coredependency to avoid forcing consumers to install both core packages.Suggested fix
"peerDependencies": { - "@capacitor-plus/core": "^8.3.0", "@capacitor/core": "^8.3.0" },Note: The same issue exists in
android/package.jsonand should be fixed there as well.🤖 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 `@ios/package.json` around lines 2 - 30, The peerDependencies block in ios/package.json mixes scopes by including "@capacitor-plus/core" alongside the scoped package "@capacitor/ios"; remove the "@capacitor-plus/core" entry from the "peerDependencies" object so the package only requires "@capacitor/core" (ensure the version string stays consistent, e.g., "^8.3.0"), and apply the same removal to android/package.json's peerDependencies to keep scope contracts consistent.
🤖 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 `@android/package.json`:
- Around line 2-6: package.json still lists a peer dependency on
"@capacitor-plus/core" which is inconsistent with the package's "name":
"@capacitor/android"; open package.json, locate the "peerDependencies" object
and remove the "@capacitor-plus/core" entry (or replace it with the correct
"@capacitor/core" if you intend to require the official core), then update any
related code/comments referencing "@capacitor-plus/core" and run the package
install/tests to verify there are no unresolved peer-dependency references.
In `@CHANGELOG.md`:
- Around line 6-26: The PR manually added release sections (e.g., headers "##
[8.3.3]" and "## [8.3.2]") causing duplicate entries in CHANGELOG.md; remove the
manual edits to those release blocks and any duplicated lines you added, then
regenerate the changelog via the project's release automation or revert the
CHANGELOG.md changes in this branch so CI can update it automatically; look for
the headers "## [8.3.3]" and "## [8.3.2]" and delete the duplicated blocks
introduced by this commit.
In `@cli/package.json`:
- Around line 2-6: The package.json has inconsistent identity fields: "name",
"author", and "homepage" (e.g., "name": "@capacitor/cli", "author": "Ionic
Team", "homepage") conflict with "repository" and "bugs" pointing to
"https://github.com/Cap-go/capacitor-plus.git"; decide which identity to publish
under and make fields consistent — either update "repository" and "bugs" to the
official Capacitor repo/issue URL if this is intended to be the official
`@capacitor` packages, or change "name", "author", and "homepage" (and the
matching entries in the other workspace packages like "@capacitor/android",
"@capacitor/core", "@capacitor/ios") to reflect Cap-go ownership; ensure the
"name", "author", "homepage", "repository", and "bugs" entries in package.json
are all aligned before merging/publishing.
---
Outside diff comments:
In `@ios/package.json`:
- Around line 2-30: The peerDependencies block in ios/package.json mixes scopes
by including "@capacitor-plus/core" alongside the scoped package
"@capacitor/ios"; remove the "@capacitor-plus/core" entry from the
"peerDependencies" object so the package only requires "@capacitor/core" (ensure
the version string stays consistent, e.g., "^8.3.0"), and apply the same removal
to android/package.json's peerDependencies to keep scope contracts consistent.
🪄 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: 5e71537a-592d-4f8b-867c-75bb2e41e1ea
📒 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
| "name": "@capacitor/android", | ||
| "version": "8.3.3", | ||
| "description": "Capacitor: Cross-platform apps with JavaScript and the web", | ||
| "homepage": "https://capacitorjs.com", | ||
| "author": "Ionic Team <hi@ionic.io> (https://ionic.io)", |
There was a problem hiding this comment.
🧩 Analysis chain
🏁 Script executed:
#!/bin/bash
set -euo pipefail
# Find package manifests and show peerDependency references around capacitor scopes
fd -i package.json | xargs rg -n -C2 '"(`@capacitor-plus/core`|@capacitor/core)"'Repository: Cap-go/capacitor-plus
Length of output: 797
Remove @capacitor-plus/core from peer dependencies to align with renamed package identity.
After renaming to @capacitor/android, the peer dependency on @capacitor-plus/core creates an inconsistent install contract. Consumers will be forced to resolve an unnecessary fork-only package despite the primary package using the @capacitor scope.
Suggested fix
"peerDependencies": {
- "@capacitor-plus/core": "^8.3.0",
"@capacitor/core": "^8.3.0"
},🤖 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 2 - 6, package.json still lists a peer
dependency on "@capacitor-plus/core" which is inconsistent with the package's
"name": "@capacitor/android"; open package.json, locate the "peerDependencies"
object and remove the "@capacitor-plus/core" entry (or replace it with the
correct "@capacitor/core" if you intend to require the official core), then
update any related code/comments referencing "@capacitor-plus/core" and run the
package install/tests to verify there are no unresolved peer-dependency
references.
| ## [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.
Remove manual changelog edits and regenerate this section via release automation.
Line 6 and Line 12 introduce new release blocks while older blocks for the same versions still remain at Line 36 and Line 47, leaving conflicting duplicate entries in the changelog.
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, The PR manually added release sections
(e.g., headers "## [8.3.3]" and "## [8.3.2]") causing duplicate entries in
CHANGELOG.md; remove the manual edits to those release blocks and any duplicated
lines you added, then regenerate the changelog via the project's release
automation or revert the CHANGELOG.md changes in this branch so CI can update it
automatically; look for the headers "## [8.3.3]" and "## [8.3.2]" and delete the
duplicated blocks introduced by this commit.
| "name": "@capacitor/cli", | ||
| "version": "8.3.3", | ||
| "description": "Capacitor: Cross-platform apps with JavaScript and the web", | ||
| "homepage": "https://capacitorjs.com", | ||
| "author": "Ionic Team <hi@ionic.io> (https://ionic.io)", |
There was a problem hiding this comment.
🧩 Analysis chain
🏁 Script executed:
#!/bin/bash
set -euo pipefail
# Inspect package identity metadata across workspace packages
fd package.json --hidden --exclude node_modules | while read -r f; do
jq -r --arg f "$f" \
'"\($f)\tname=\(.name // "n/a")\tversion=\(.version // "n/a")\trepo=\(.repository.url // "n/a")\tbugs=\(.bugs.url // "n/a")\tauthor=\(.author // "n/a")"' "$f"
done | sort
echo "---- `@capacitor` scoped package names ----"
rg -n '"name":\s*"@capacitor/' --glob '**/package.json'
echo "---- `@capacitor-plus` scoped package names ----"
rg -n '"name":\s*"@capacitor-plus/' --glob '**/package.json'Repository: Cap-go/capacitor-plus
Length of output: 1267
🏁 Script executed:
cat -n cli/package.json | head -20Repository: Cap-go/capacitor-plus
Length of output: 732
Resolve package identity inconsistency before publishing.
The package metadata uses official @capacitor/cli name and Ionic Team branding (lines 2–6), but the repository and bugs URLs (lines 10 and 13) point to https://github.com/Cap-go/capacitor-plus.git. This mismatch applies across all workspace packages (@capacitor/android, @capacitor/core, @capacitor/ios). Clarify whether this branch is intended to publish under the official @capacitor scope with Cap-go repository metadata, or if the package metadata should reflect the actual repository ownership before merging.
🤖 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 `@cli/package.json` around lines 2 - 6, The package.json has inconsistent
identity fields: "name", "author", and "homepage" (e.g., "name":
"@capacitor/cli", "author": "Ionic Team", "homepage") conflict with "repository"
and "bugs" pointing to "https://github.com/Cap-go/capacitor-plus.git"; decide
which identity to publish under and make fields consistent — either update
"repository" and "bugs" to the official Capacitor repo/issue URL if this is
intended to be the official `@capacitor` packages, or change "name", "author", and
"homepage" (and the matching entries in the other workspace packages like
"@capacitor/android", "@capacitor/core", "@capacitor/ios") to reflect Cap-go
ownership; ensure the "name", "author", "homepage", "repository", and "bugs"
entries in package.json are all aligned before merging/publishing.
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
Bug Fixes
Chores