Skip to content

chore: sync plus with upstream main (conflicts)#77

Open
riderx wants to merge 4 commits into
plusfrom
sync/plus-upstream-20260511-061706
Open

chore: sync plus with upstream main (conflicts)#77
riderx wants to merge 4 commits into
plusfrom
sync/plus-upstream-20260511-061706

Conversation

@riderx

@riderx riderx commented May 11, 2026

Copy link
Copy Markdown
Member

Merge Conflict Resolution Required

The automatic sync of the plus branch with upstream main encountered merge conflicts.

What happened

  • Claude Code attempted to resolve the merge conflicts
  • The workflow created this PR so CI and manual review can finish the merge safely

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

    • Fixed SystemBars view padding handling on Android API 34 and below
    • Resolved iOS plugin file copying in CocoaPods projects
    • Fixed native file handling for different iOS package manager modes
  • Chores

    • Updated to version 8.3.3
    • Updated package metadata and release notes

Review Change Stack

@chatgpt-codex-connector

Copy link
Copy Markdown

You have reached your Codex usage limits for code reviews. You can see your limits in the Codex usage dashboard.

@coderabbitai

coderabbitai Bot commented May 11, 2026

Copy link
Copy Markdown
📝 Walkthrough

Walkthrough

This PR migrates all Capacitor+ (@capacitor-plus) packages to upstream Capacitor (@capacitor) at version 8.3.3, updates release documentation, and fixes iOS native file copying logic to respect package manager type (SPM vs. non-SPM).

Changes

Package Migration and Release Update

Layer / File(s) Summary
Package Identity Migration
android/package.json, cli/package.json, core/package.json, ios/package.json, lerna.json
All packages migrate from @capacitor-plus/* scope to @capacitor/*, version downgraded from 8.3.4 to 8.3.3, and metadata (description, homepage, author) updated to reflect upstream Capacitor and Ionic instead of Capacitor+ and Cap-go.
Release Documentation
CHANGELOG.md, android/CHANGELOG.md, cli/CHANGELOG.md, core/CHANGELOG.md, ios/CHANGELOG.md
CHANGELOG files updated with new @capacitor/* 8.3.3 and 8.3.2 release entries from ionic-team/capacitor, replacing prior @capacitor-plus/* release sections with upstream bug-fix documentation.
iOS Native File Copying Logic
cli/src/ios/update.ts
copyPluginsNativeFiles conditional logic now skips native file copying for packaged plugins only when using SPM; non-SPM (CocoaPods) installations will copy native files for all plugins.

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~8 minutes

Poem

🐰 From Plus to pure Capacitor we leap,

Eight-three-three versions, neat and deep,

Package names dance to Ionic's tune,

CocoaPods plugins bloom too soon,

The build now knows which path to choose! 🚀

🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title accurately describes the main purpose of the PR: syncing the Capacitor+ fork with upstream changes, including the note about conflicts encountered during the merge.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

✨ Finishing Touches
📝 Generate docstrings
  • Create stacked PR
  • Commit on current branch
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch sync/plus-upstream-20260511-061706

Comment @coderabbitai help to get the list of available commands and usage tips.

@socket-security

Copy link
Copy Markdown

Review the following changes in direct dependencies. Learn more about Socket for GitHub.

Diff Package Supply Chain
Security
Vulnerability Quality Maintenance License
Added@​ionic/​cli-framework-output@​2.2.81001007180100
Added@​capacitor/​core@​8.3.39910074100100
Added@​capacitor-plus/​core@​8.3.4761008492100

View full report

@coderabbitai coderabbitai Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 1

🤖 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-27: The CHANGELOG.md contains manual edits (the release entries
for versions like "## [8.3.3]" / "## [8.3.2]") that are CI-managed;
revert/remove these manual changes from this PR so the file remains untouched
and let the repository's changelog generation pipeline regenerate the entries,
or run the project's changelog generator locally and commit the generated output
via the automation process instead of manual edits; ensure no manual edits to
CHANGELOG.md are included in the branch before merging.
🪄 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: e503b126-54a3-4791-ae7b-48b50371e2a4

📥 Commits

Reviewing files that changed from the base of the PR and between f3aefab and de90b13.

📒 Files selected for processing (11)
  • CHANGELOG.md
  • android/CHANGELOG.md
  • android/package.json
  • cli/CHANGELOG.md
  • cli/package.json
  • cli/src/ios/update.ts
  • core/CHANGELOG.md
  • core/package.json
  • ios/CHANGELOG.md
  • ios/package.json
  • lerna.json

Comment thread CHANGELOG.md
Comment on lines +6 to 27
## [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)

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟠 Major | ⚡ Quick win

Remove manual CHANGELOG.md edits and regenerate via CI

This block appears manually updated, but this file is CI-managed in this repo. Please drop these direct edits and let the release/changelog automation regenerate the entry to avoid drift and future merge conflicts.

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 - 27, The CHANGELOG.md contains manual edits
(the release entries for versions like "## [8.3.3]" / "## [8.3.2]") that are
CI-managed; revert/remove these manual changes from this PR so the file remains
untouched and let the repository's changelog generation pipeline regenerate the
entries, or run the project's changelog generator locally and commit the
generated output via the automation process instead of manual edits; ensure no
manual edits to CHANGELOG.md are included in the branch before merging.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants