chore: sync plus with upstream main (conflicts)

[riderx]

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 padding issue on Android API <= 34.
  • Improved CLI SPM package generation for compiler flags, framework support, and binary targets.
  • Enhanced Xcode project metadata handling for iOS plugins.

• Chores

  • Released version 8.3.2 across all packages.
  • Realigned package identity and metadata across all modules.

[coderabbitai]

📝 Walkthrough

Walkthrough

This PR rebrand the entire monorepo from Capacitor+ (@capacitor-plus/*) to Capacitor (@capacitor/*), downgrades the version from 8.3.4 to 8.3.2, and updates all associated package metadata, dependencies, and release documentation to reflect the upstream alignment.

Changes

Package Rebranding and Version Synchronization to v8.3.2

Layer / File(s)	Summary
Package Identity and Version Updates core/package.json, android/package.json, cli/package.json, ios/package.json	Package names change from @capacitor-plus/* to @capacitor/*, versions change from 8.3.4 to 8.3.2, and author/description metadata updated to Ionic Team branding.
Repository and License Metadata core/package.json, android/package.json, cli/package.json	Repository, bugs, and license URLs updated from Cap-go/capacitor-plus references to capacitorjs.com and upstream Capacitor project locations.
Peer Dependency Declarations android/package.json	Android package peer dependencies updated to reference @capacitor/core and @capacitor-plus/core at ^8.3.0.
Monorepo Version Configuration lerna.json	Lerna workspace version field synchronized from 8.3.4 to 8.3.2.
Release Changelog Documentation CHANGELOG.md, core/CHANGELOG.md, cli/CHANGELOG.md, android/CHANGELOG.md, ios/CHANGELOG.md	New v8.3.2 release sections added documenting CLI SPM/Package.swift generation bug fixes, iOS SystemBars padding adjustments, and compiler flag support. Prior @capacitor-plus/* changelog entries removed and replaced.

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~12 minutes

Poem

🐰 The packages hop from Plus to plain,
A version shift down the changelog lane,
Now eight-three-two in each manifest place,
Ionic Team's branding adorns this space,
The monorepo's reborn with a simpler face!

🚥 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 reflects the main objective: syncing the capacitor-plus fork with the upstream Capacitor repository and resolving merge conflicts during that process.
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 unit tests (beta)

• Create PR with unit tests
• Commit unit tests in branch sync/plus-upstream-20260508-054234

---

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

[socket-security]

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

Diff	Package	Supply Chain Security	Vulnerability	Quality	Maintenance	License
	rollup-plugin-terser@​7.0.2
	jest-environment-jsdom@​29.7.0
	jest@​29.7.0
	jest-jasmine2@​29.7.0
	@​types/​jest@​29.5.14
	@​rollup/​plugin-replace@​2.4.2
	@​rollup/​plugin-node-resolve@​10.0.0
	rollup@​2.80.0
	typescript@​5.0.4
	@​capacitor/​docgen@​0.2.2

View full report

[socket-security]

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.

Action	Severity	Alert  (click "▶" to expand/collapse)
Warn		Obfuscated code: npm entities is 91.0% likely obfuscated Confidence: 0.91 Location: Package overview From: ? → npm/jest-environment-jsdom@29.7.0 → npm/entities@6.0.1 ℹ Read more on: This package | This alert | What is obfuscated code? Next steps: Take a moment to review the security alert above. Review the linked package source code to understand the potential risk. Ensure the package is not malicious before proceeding. If you're unsure how to proceed, reach out to your security team or ask the Socket team for help at support@socket.dev. Suggestion: Packages should not obfuscate their code. Consider not using packages with obfuscated code. Mark the package as acceptable risk. To ignore this alert only in this pull request, reply with the comment @SocketSecurity ignore npm/entities@6.0.1. You can also ignore all packages with @SocketSecurity ignore-all. To ignore an alert for all future pull requests, use Socket's Dashboard to change the triage state of this alert.

View full report

[chatgpt-codex-connector]

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 9b6e44e544

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

• Open a pull request for review
• Mark a draft as ready
• Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

[chatgpt-codex-connector]

Keep core package name in the @capacitor-plus scope

Renaming this manifest to @capacitor/core breaks the repo’s release tooling and dependency sync flow, which still look up @capacitor-plus/core by exact name (see scripts/sync-peer-dependencies.mjs, where pkgs.find((p) => p.name === '@capacitor-plus/core') is dereferenced immediately). With this change, corePkg becomes undefined and npm run version/Lerna release automation will fail before publishing.

Useful? React with 👍 / 👎.

[coderabbitai]

Actionable comments posted: 4

Caution

Some comments are outside the diff and can’t be posted inline due to platform limitations.

⚠️ Outside diff range comments (1)

cli/package.json (1)

2-14: ⚠️ Potential issue | 🟠 Major | ⚡ Quick win

Review this repository-wide identity pattern: upstream branding with Cap-go repository/bugs pointers.

The metadata inconsistency exists across all packages (cli, core, ios, android), not just cli/package.json. Each advertises @capacitor/* name, Ionic authorship, and upstream homepage, but points consumers to Cap-go's fork for source and issues. This consistent pattern suggests it may be intentional, but it still creates provenance ambiguity—external users may misattribute issues or contributions. Clarify whether this hybrid identity approach is by design (for fork continuity) or needs correction to fully reflect one identity or the other.

🤖 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 - 14, The package metadata in package.json
(fields: "name", "author", "homepage", "repository.url", "bugs.url") is
inconsistent—packages advertise upstream `@capacitor/`* names and Ionic authorship
while pointing to the Cap-go fork for source/bugs; decide whether this fork
should present itself as a fork or as an upstream replacement and then update
all package.json files consistently: either change "name" and "author" to
reflect the Cap-go identity and set "homepage", "repository.url", and "bugs.url"
to Cap-go canonical locations, or revert those fields to upstream values and
point "repository.url"/"bugs.url" back to the original upstream; apply the same
change across all package.json files (cli, core, ios, android) to remove
provenance ambiguity.

🤖 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-20: The PR includes a manual edit to CHANGELOG.md (the new "##
[8.3.2]" release block and its entries) which violates the rule that the
changelog is auto-generated; remove the manual additions in CHANGELOG.md (delete
the "## [8.3.2]" block and its bullet entries) so the file is unchanged in this
PR and rely on the CI/CD release tooling to regenerate the changelog instead; if
you need to keep a note for reviewers, put it in the PR description or in a
separate non-managed file rather than editing CHANGELOG.md.

In `@core/CHANGELOG.md`:
- Around line 6-8: The release note under the heading "##
[8.3.2](https://github.com/ionic-team/capacitor/compare/8.3.1...8.3.2)
(2026-05-07)" incorrectly says "Version bump only for package `@capacitor/core`";
update that note to accurately state that this change aligns the package version
with upstream and reflects a downgrade from 8.3.4 to 8.3.2 (or otherwise
indicate "version alignment with upstream" instead of "bump") so the description
matches the actual change.

In `@ios/CHANGELOG.md`:
- Around line 6-8: The changelog note is misleading: it claims a "Version bump
only" but the entry shows 8.3.2 (a downgrade from 8.3.4) and the compare link
points to ionic-team/capacitor; update the header or note to accurately reflect
the change (e.g., "Version alignment with upstream `@capacitor/ios` 8.3.2" or
"Synced with upstream `@capacitor/ios` 8.3.2"), correct the compare link target to
reference Cap-go/capacitor-plus if this entry reflects your repo's sync, and
replace the ambiguous sentence "Version bump only for package `@capacitor/ios`"
with the clarified phrasing so the version strings ("8.3.2" and "8.3.4"), the
note text, and the compare link are consistent.

In `@ios/package.json`:
- Around line 2-3: The package declares both `@capacitor/core` and
`@capacitor-plus/core` as required peers which forces consumers to install both;
make the alternative core optional by updating ios package.json so that
`@capacitor-plus/core` is marked optional via peerDependenciesMeta (e.g. add a
peerDependenciesMeta entry setting "@capacitor-plus/core": {"optional": true})
so consumers can install either `@capacitor/core` or `@capacitor-plus/core`; edit
the package.json for "@capacitor/ios" and update the
peerDependencies/peerDependenciesMeta accordingly and run your package lint/test
to ensure package.json remains valid.

---

Outside diff comments:
In `@cli/package.json`:
- Around line 2-14: The package metadata in package.json (fields: "name",
"author", "homepage", "repository.url", "bugs.url") is inconsistent—packages
advertise upstream `@capacitor/`* names and Ionic authorship while pointing to the
Cap-go fork for source/bugs; decide whether this fork should present itself as a
fork or as an upstream replacement and then update all package.json files
consistently: either change "name" and "author" to reflect the Cap-go identity
and set "homepage", "repository.url", and "bugs.url" to Cap-go canonical
locations, or revert those fields to upstream values and point
"repository.url"/"bugs.url" back to the original upstream; apply the same change
across all package.json files (cli, core, ios, android) to remove provenance
ambiguity.

🪄 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: 0d3d5401-6c9d-42e8-812c-627521d07f1b

📥 Commits

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

📒 Files selected for processing (10)

• CHANGELOG.md
• android/CHANGELOG.md
• android/package.json
• cli/CHANGELOG.md
• cli/package.json
• core/CHANGELOG.md
• core/package.json
• ios/CHANGELOG.md
• ios/package.json
• lerna.json

[coderabbitai]

⚠️ Potential issue | 🟠 Major | ⚡ Quick win

Do not manually modify CHANGELOG.md; regenerate it via CI release tooling.

This PR manually adds a new release block in CHANGELOG.md, which violates repo policy and is already causing inconsistent release history shape (e.g., duplicated 8.3.2 sections in-file). Please drop manual changelog edits from this PR and let the CI/CD changelog workflow produce the file.

As per coding guidelines, "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 - 20, The PR includes a manual edit to
CHANGELOG.md (the new "## [8.3.2]" release block and its entries) which violates
the rule that the changelog is auto-generated; remove the manual additions in
CHANGELOG.md (delete the "## [8.3.2]" block and its bullet entries) so the file
is unchanged in this PR and rely on the CI/CD release tooling to regenerate the
changelog instead; if you need to keep a note for reviewers, put it in the PR
description or in a separate non-managed file rather than editing CHANGELOG.md.

[coderabbitai]

⚠️ Potential issue | 🟡 Minor | ⚡ Quick win

Inconsistent version change description.

Similar to ios/CHANGELOG.md, this entry describes the change as "Version bump only" when the version is actually being downgraded from 8.3.4 to 8.3.2. The compare link also references the upstream ionic-team/capacitor repository.

Recommendation: Update the changelog note to accurately reflect the version alignment with upstream rather than describing it as a "bump."

🤖 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 `@core/CHANGELOG.md` around lines 6 - 8, The release note under the heading "##
[8.3.2](https://github.com/ionic-team/capacitor/compare/8.3.1...8.3.2)
(2026-05-07)" incorrectly says "Version bump only for package `@capacitor/core`";
update that note to accurately state that this change aligns the package version
with upstream and reflects a downgrade from 8.3.4 to 8.3.2 (or otherwise
indicate "version alignment with upstream" instead of "bump") so the description
matches the actual change.

[coderabbitai]

⚠️ Potential issue | 🟡 Minor | ⚡ Quick win

Inconsistent version change description.

The changelog entry states "Version bump only" but the actual change downgrades the version from 8.3.4 to 8.3.2, which is the opposite of a bump. Additionally, the compare link references the upstream ionic-team/capacitor repository rather than Cap-go/capacitor-plus, which may confuse users about the source of changes.

Recommendation: Update the note to accurately describe the change (e.g., "Version alignment with upstream @capacitor/ios 8.3.2") or clarify that this represents a sync with upstream rather than a version bump.

🤖 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/CHANGELOG.md` around lines 6 - 8, The changelog note is misleading: it
claims a "Version bump only" but the entry shows 8.3.2 (a downgrade from 8.3.4)
and the compare link points to ionic-team/capacitor; update the header or note
to accurately reflect the change (e.g., "Version alignment with upstream
`@capacitor/ios` 8.3.2" or "Synced with upstream `@capacitor/ios` 8.3.2"), correct
the compare link target to reference Cap-go/capacitor-plus if this entry
reflects your repo's sync, and replace the ambiguous sentence "Version bump only
for package `@capacitor/ios`" with the clarified phrasing so the version strings
("8.3.2" and "8.3.4"), the note text, and the compare link are consistent.

[coderabbitai]

⚠️ Potential issue | 🟠 Major | ⚡ Quick win

🧩 Analysis chain

🏁 Script executed:

#!/bin/bash
python - <<'PY'
import json
for f in ["ios/package.json", "android/package.json"]:
    with open(f) as fh:
        p = json.load(fh)
    peers = p.get("peerDependencies", {})
    print(f"{f}: {list(peers.keys())}")
    print(f"  peerDependenciesMeta: {p.get('peerDependenciesMeta')}")
PY

Repository: Cap-go/capacitor-plus

Length of output: 251

---

🏁 Script executed:

# Search for imports of the capacitor core packages in ios and android directories
rg "@capacitor(/|-plus/)core" --type ts --type tsx --type js --type json ios/ android/ -A 2

Repository: Cap-go/capacitor-plus

Length of output: 93

---

🏁 Script executed:

# Check the main entry files for ios and android packages
fd -t f "index\.(ts|js|tsx|jsx)" ios/ android/ | head -20

Repository: Cap-go/capacitor-plus

Length of output: 47

---

🏁 Script executed:

# Look for any documentation or comments explaining the dual dependency
rg "capacitor-plus|peer" ios/ android/ --type md --type txt -B 2 -A 2

Repository: Cap-go/capacitor-plus

Length of output: 1784

---

🏁 Script executed:

# Read the complete ios/package.json to see structure
cat ios/package.json

Repository: Cap-go/capacitor-plus

Length of output: 1191

---

🏁 Script executed:

# Read the complete android/package.json to see structure
cat android/package.json

Repository: Cap-go/capacitor-plus

Length of output: 916

---

🏁 Script executed:

# Check what source files exist in ios and android
fd -t f "\.ts$|\.js$" ios/ android/ | head -30

Repository: Cap-go/capacitor-plus

Length of output: 164

---

🏁 Script executed:

# Check repository root for documentation on capacitor vs capacitor-plus
ls -la | head -20
cat README.md 2>/dev/null | head -50

Repository: Cap-go/capacitor-plus

Length of output: 4174

---

🏁 Script executed:

# Search for any comments or docs explaining the dual core dependency
rg "capacitor-plus|capacitor/core" . --type md -B 3 -A 3 | head -80

Repository: Cap-go/capacitor-plus

Length of output: 3756

---

Peer dependencies force both core packages; marking one optional would improve compatibility.

@capacitor/ios and @capacitor/android both declare @capacitor/core and @capacitor-plus/core as required peers. Since Capacitor+ is designed to maintain API compatibility with the official Capacitor, one should be marked optional to allow consumers to install either core package without friction under strict peer resolution.

Suggested fix

  "peerDependencies": {
    "@capacitor-plus/core": "^8.3.0",
    "@capacitor/core": "^8.3.0"
+  },
+  "peerDependenciesMeta": {
+    "@capacitor-plus/core": {
+      "optional": true
+    }
   }

🤖 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 - 3, The package declares both
`@capacitor/core` and `@capacitor-plus/core` as required peers which forces
consumers to install both; make the alternative core optional by updating ios
package.json so that `@capacitor-plus/core` is marked optional via
peerDependenciesMeta (e.g. add a peerDependenciesMeta entry setting
"@capacitor-plus/core": {"optional": true}) so consumers can install either
`@capacitor/core` or `@capacitor-plus/core`; edit the package.json for
"@capacitor/ios" and update the peerDependencies/peerDependenciesMeta
accordingly and run your package lint/test to ensure package.json remains valid.