Skip to content

docs(en): merge docs-cn/sync-docs into docs-cn/dev @ c18a924d #1008

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.

Sign up for GitHub

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

Closed
docschina-bot wants to merge 2 commits into from
Closed

docs(en): merge docs-cn/sync-docs into docs-cn/dev @ c18a924d #1008

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c18a924
fix(deps): update all non-major dependencies (#10861)
renovate[bot] Aug 3, 2026
b78201a
docs(en): merging all conflicts
docschina-bot Aug 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
"vue": "^3.5.40"
},
"devDependencies": {
<<<<<<< HEAD

@chatgpt-codex-connector chatgpt-codex-connector Bot Aug 4, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

P1 Badge Remove unresolved conflict markers from package.json

The merge conflict markers make package.json invalid JSON, so any workflow that parses it (for example pnpm install, scripts, or the docs build) will fail before dependencies can be resolved. I verified this with JSON.parse, which errors at this marker, so the conflict needs to be resolved rather than committed.

Useful? React with 👍 / 👎.

"@antfu/eslint-config": "^9.2.0",
"@antfu/ni": "^30.3.0",
"@iconify-json/carbon": "^1.2.25",
Expand All @@ -31,6 +32,15 @@
"@shikijs/vitepress-twoslash": "^4.3.1",
"@types/node": "^26.1.2",
"@unocss/reset": "^66.7.5",
=======
"@antfu/ni": "^28.3.0",
"@iconify-json/carbon": "catalog:",
"@iconify-json/logos": "catalog:",
"@iconify/vue": "catalog:",
"@shikijs/transformers": "^4.4.1",
"@shikijs/vitepress-twoslash": "^4.4.1",
"@unocss/reset": "catalog:",
>>>>>>> c18a924db951363778078c62e1a21ee37bfa2c18
"@vite-pwa/assets-generator": "^1.0.2",
"@vite-pwa/vitepress": "^1.1.0",
"@vitejs/plugin-vue": "^6.0.8",
Expand All @@ -48,6 +58,10 @@
"vite-plugin-pwa": "^1.3.0",
"vitepress": "2.0.0-alpha.16",
"vitepress-plugin-group-icons": "^1.7.6",
<<<<<<< HEAD
=======
"vitepress-plugin-llms": "^1.13.4",
>>>>>>> c18a924db951363778078c62e1a21ee37bfa2c18
"vitepress-plugin-tabs": "^0.9.1",
"vitest": "^4.1.10",
"workbox-window": "^7.4.1"
Expand Down
Loading