-
Notifications
You must be signed in to change notification settings - Fork 0
chore: sync plus with upstream main (conflicts) #78
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: plus
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Large diffs are not rendered by default.
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,9 @@ | ||
| { | ||
| "name": "@capacitor-plus/android", | ||
| "version": "8.3.4", | ||
| "description": "Capacitor+: Enhanced Capacitor with automated upstream sync - Cross-platform apps with JavaScript and the web", | ||
| "homepage": "https://capgo.app/docs/plugins/capacitor-plus/", | ||
| "author": "Capgo Team <support@capgo.app> (https://capgo.app)", | ||
| "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)", | ||
|
Comment on lines
+2
to
+6
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 🧩 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 After renaming to Suggested fix "peerDependencies": {
- "@capacitor-plus/core": "^8.3.0",
"@capacitor/core": "^8.3.0"
},🤖 Prompt for AI Agents |
||
| "license": "MIT", | ||
| "repository": { | ||
| "type": "git", | ||
|
|
||
Large diffs are not rendered by default.
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,9 @@ | ||
| { | ||
| "name": "@capacitor-plus/cli", | ||
| "version": "8.3.4", | ||
| "description": "Capacitor+: Enhanced Capacitor with automated upstream sync - Cross-platform apps with JavaScript and the web", | ||
| "homepage": "https://capgo.app/docs/plugins/capacitor-plus/", | ||
| "author": "Capgo Team <support@capgo.app> (https://capgo.app)", | ||
| "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)", | ||
|
Comment on lines
+2
to
+6
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 🧩 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 🤖 Prompt for AI Agents |
||
| "license": "MIT", | ||
| "repository": { | ||
| "type": "git", | ||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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 editCHANGELOG.md; it is managed automatically by CI/CD.🤖 Prompt for AI Agents