chore: sync plus with upstream main (conflicts)#75
Conversation
|
You have reached your Codex usage limits for code reviews. You can see your limits in the Codex usage dashboard. |
📝 WalkthroughWalkthroughThis PR rebrands the Capacitor Plus monorepo to official Capacitor packages, downgrading all package versions from 8.3.4 to 8.3.3. Package manifests across Android, CLI, Core, and iOS are updated with new identities and metadata. A single functional change makes plugin native file copying conditional on the package manager type (SPM vs non-SPM). All changelogs are synchronized with new release notes. ChangesCapacitor Plus to Capacitor Rebrand
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)
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)
CHANGELOG.md (1)
6-47:⚠️ Potential issue | 🟠 Major | ⚡ Quick winRegenerate changelog instead of resolving it manually.
This edit introduces manually merged release sections that now coexist with prior entries, resulting in duplicated 8.3.x headings and mixed compare-link domains. Please regenerate
CHANGELOG.mdvia the CI/CD changelog pipeline and keep only the generated output.As per coding guidelines,
CHANGELOG.md: Do not manually editCHANGELOG.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 - 47, The CHANGELOG.md has manual merge edits introducing duplicated 8.3.x sections and mixed compare-link domains; revert these manual changes and regenerate the file using the project's CI/CD changelog pipeline so only the canonical generated output remains (remove the duplicated "## [8.3.3]" / "## [8.3.2]" blocks and any entries from "github.com/Cap-go" and restore the authoritative changelog produced by the pipeline).
🤖 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 `@ios/package.json`:
- Around line 2-6: Update the package identity metadata in ios/package.json to
match the fork's published scope and provenance: change the "name" field from
"@capacitor/ios" to "@capacitor-plus/ios", replace the "author" value and
"homepage" (and any repository/bugs fields if present) to the fork's maintainer
information/URL so consumers see the correct source; apply the same corrections
to android/package.json to ensure both packages consistently declare the
`@capacitor-plus` scope and fork ownership while keeping the intentional
peerDependencies for compatibility.
---
Outside diff comments:
In `@CHANGELOG.md`:
- Around line 6-47: The CHANGELOG.md has manual merge edits introducing
duplicated 8.3.x sections and mixed compare-link domains; revert these manual
changes and regenerate the file using the project's CI/CD changelog pipeline so
only the canonical generated output remains (remove the duplicated "## [8.3.3]"
/ "## [8.3.2]" blocks and any entries from "github.com/Cap-go" and restore the
authoritative changelog produced by the pipeline).
🪄 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: ea81e05f-96d8-454a-92bd-1be3b636597d
📒 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/ios", | ||
| "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
# Verify namespace/metadata consistency across package manifests.
# Expected: official-scope packages should have intentionally consistent repo/bugs/peer namespaces.
fd -a package.json | while read -r f; do
jq -r '
[
.name // "",
.version // "",
(.repository.url // ""),
(.bugs.url // ""),
((.peerDependencies // {}) | keys | join(","))
] | `@tsv`
' "$f" | awk -v file="$f" -F '\t' '{
print file "\n name=" $1 "\n version=" $2 "\n repository=" $3 "\n bugs=" $4 "\n peerDeps=" $5 "\n"
}'
done | sed -n '/@capacitor\/ios/,+8p'Repository: Cap-go/capacitor-plus
Length of output: 329
🏁 Script executed:
cat -n ios/package.jsonRepository: Cap-go/capacitor-plus
Length of output: 1429
🏁 Script executed:
# Check root package.json for comparison
cat -n package.json | head -20Repository: Cap-go/capacitor-plus
Length of output: 1963
🏁 Script executed:
# Check if other packages in ios folder reference official or fork scopes
rg -A2 -B2 "peerDependencies" ios/Repository: Cap-go/capacitor-plus
Length of output: 327
🏁 Script executed:
for dir in android cli core; do
echo "=== $dir/package.json ==="
if [ -f "$dir/package.json" ]; then
jq -r '.name, .peerDependencies' "$dir/package.json" 2>/dev/null | head -10
fi
doneRepository: Cap-go/capacitor-plus
Length of output: 275
🏁 Script executed:
# Also check if this appears to be intentional - look for any sync/merge scripts or documentation
rg "sync-peer-dependencies|@capacitor-plus|Cap-go" --type md README* CHANGELOG* 2>/dev/null | head -20Repository: Cap-go/capacitor-plus
Length of output: 3007
Package name does not match published scope and npm publication details.
The ios/package.json declares name as @capacitor/ios with Ionic Team authorship and official Capacitor homepage, but the repository points to Cap-go fork and the package is actually published as @capacitor-plus/ios (per README auto-publish documentation). The same mismatch exists in android/package.json. This creates provenance confusion for consumers who may install what appears to be the official package but receive a fork fork variant instead.
The mixed peer dependencies (@capacitor-plus/core + @capacitor/core) appear intentional for compatibility and are consistently applied, but the package identity mismatch requires resolution before publication.
🤖 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 - 6, Update the package identity metadata in
ios/package.json to match the fork's published scope and provenance: change the
"name" field from "@capacitor/ios" to "@capacitor-plus/ios", replace the
"author" value and "homepage" (and any repository/bugs fields if present) to the
fork's maintainer information/URL so consumers see the correct source; apply the
same corrections to android/package.json to ensure both packages consistently
declare the `@capacitor-plus` scope and fork ownership while keeping the
intentional peerDependencies for compatibility.
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