From 7993b54439b30d53e569236c5c8955cad8802848 Mon Sep 17 00:00:00 2001 From: Bjorn Lu Date: Mon, 1 Jun 2026 11:03:10 +0800 Subject: [PATCH 1/4] docs: add CoC to nav resources (#22557) --- .vitepress/config.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.vitepress/config.ts b/.vitepress/config.ts index ebc2b44e..f0157565 100644 --- a/.vitepress/config.ts +++ b/.vitepress/config.ts @@ -226,6 +226,10 @@ const config = defineConfig({ { text: 'Blog', link: '/blog' }, { text: 'Releases', link: '/releases' }, { text: 'Acknowledgements', link: '/acknowledgements' }, + { + text: 'Code of Conduct', + link: 'https://github.com/vitejs/.github/blob/main/CODE_OF_CONDUCT.md', + }, { text: 'Plugin Registry', link: 'https://registry.vite.dev/plugins', From 17e00163b8b2e3572a6cf44f8f74cf7cad2876af Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 1 Jun 2026 12:41:24 +0900 Subject: [PATCH 2/4] chore(deps): pin dependencies (#22510) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- guide/static-deploy-github-pages.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/guide/static-deploy-github-pages.yaml b/guide/static-deploy-github-pages.yaml index 985d64a1..873fa037 100644 --- a/guide/static-deploy-github-pages.yaml +++ b/guide/static-deploy-github-pages.yaml @@ -33,9 +33,9 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v6 + uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 - name: Set up Node - uses: actions/setup-node@v6 + uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6 with: node-version: lts/* cache: 'npm' @@ -44,13 +44,13 @@ jobs: - name: Build run: npm run build - name: Setup Pages - uses: actions/configure-pages@v6 + uses: actions/configure-pages@45bfe0192ca1faeb007ade9deae92b16b8254a0d # v6 - name: Upload artifact - uses: actions/upload-pages-artifact@v5 + uses: actions/upload-pages-artifact@fc324d3547104276b827a68afc52ff2a11cc49c9 # v5 with: # Upload dist folder path: './dist' - name: Deploy to GitHub Pages id: deployment - uses: actions/deploy-pages@v5 + uses: actions/deploy-pages@cd2ce8fcbc39b97be8ca5fce6e763baed58fa128 # v5 #endregion content From de46351423faf45bd8ef20d51328cfd4c4376a59 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 1 Jun 2026 13:07:14 +0900 Subject: [PATCH 3/4] fix(deps): update all non-major dependencies (#22511) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: sapphi-red <49056869+sapphi-red@users.noreply.github.com> --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 68a4af72..2313ef6e 100644 --- a/package.json +++ b/package.json @@ -18,8 +18,8 @@ "vitepress": "^2.0.0-alpha.17", "vitepress-plugin-graphviz": "^0.1.0", "vitepress-plugin-group-icons": "^1.7.5", - "vitepress-plugin-llms": "^1.12.2", - "vue": "^3.5.34", - "vue-tsc": "^3.3.1" + "vitepress-plugin-llms": "^1.13.1", + "vue": "^3.5.35", + "vue-tsc": "^3.3.3" } } From 17721d4f40591dbf72fff1df38b84ac310fc6e30 Mon Sep 17 00:00:00 2001 From: thinkasany <480968828@qq.com> Date: Tue, 2 Jun 2026 23:41:53 +0800 Subject: [PATCH 4/4] fix conflict --- .vitepress/config.ts | 8 ++------ package.json | 26 -------------------------- 2 files changed, 2 insertions(+), 32 deletions(-) diff --git a/.vitepress/config.ts b/.vitepress/config.ts index f981961b..9736e791 100644 --- a/.vitepress/config.ts +++ b/.vitepress/config.ts @@ -207,15 +207,11 @@ const config = defineConfig({ { text: '发布策略', link: '/releases' }, { text: '致谢', link: '/acknowledgements' }, { -<<<<<<< HEAD - text: '插件注册', -======= - text: 'Code of Conduct', + text: '行为守则', link: 'https://github.com/vitejs/.github/blob/main/CODE_OF_CONDUCT.md', }, { - text: 'Plugin Registry', ->>>>>>> de46351423faf45bd8ef20d51328cfd4c4376a59 + text: '插件注册', link: 'https://registry.vite.dev/plugins', }, { diff --git a/package.json b/package.json index fac22e2c..6bdff9e5 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,4 @@ { -<<<<<<< HEAD "name": "vite-docs-cn", "version": "8.0.0", "description": "Vite.js documentation Chinese translation.", @@ -42,29 +41,4 @@ "gitHooks": { "commit-msg": "node scripts/verifyCommit.js" } -======= - "name": "@vitejs/monorepo-docs", - "private": true, - "type": "module", - "scripts": { - "docs": "vitepress dev", - "docs-build": "vitepress build", - "docs-serve": "vitepress serve" - }, - "devDependencies": { - "@iconify/vue": "^5.0.1", - "@shikijs/vitepress-twoslash": "^4.1.0", - "@types/express": "^5.0.6", - "@voidzero-dev/vitepress-theme": "^4.8.4", - "feed": "^5.2.1", - "markdown-it-image-size": "^15.0.1", - "oxc-minify": "^0.133.0", - "vitepress": "^2.0.0-alpha.17", - "vitepress-plugin-graphviz": "^0.1.0", - "vitepress-plugin-group-icons": "^1.7.5", - "vitepress-plugin-llms": "^1.13.1", - "vue": "^3.5.35", - "vue-tsc": "^3.3.3" - } ->>>>>>> de46351423faf45bd8ef20d51328cfd4c4376a59 }