From 0fdef8d637c53522517921040948c0be564468cd Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 12 Aug 2025 10:05:07 +0900 Subject: [PATCH 1/3] fix(deps): update all non-major dependencies (#20587) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 68d46dbd..9b985e4b 100644 --- a/package.json +++ b/package.json @@ -13,9 +13,9 @@ "@types/express": "^5.0.3", "feed": "^5.1.0", "gsap": "^3.13.0", - "markdown-it-image-size": "^14.7.0", - "vitepress": "^2.0.0-alpha.9", - "vitepress-plugin-group-icons": "^1.6.1", + "markdown-it-image-size": "^14.8.0", + "vitepress": "^2.0.0-alpha.10", + "vitepress-plugin-group-icons": "^1.6.2", "vitepress-plugin-llms": "^1.7.2", "vue": "^3.5.18", "vue-tsc": "^3.0.5" From 4319257ca1aa0204a1583f05eae108bef9d51bee Mon Sep 17 00:00:00 2001 From: dalaoshu <165626830+shulaoda@users.noreply.github.com> Date: Tue, 12 Aug 2025 19:22:03 +0800 Subject: [PATCH 2/3] docs(rolldown): update description for enabling native plugins (#20601) --- guide/rolldown.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/guide/rolldown.md b/guide/rolldown.md index 08a6b607..ba15075a 100644 --- a/guide/rolldown.md +++ b/guide/rolldown.md @@ -141,9 +141,9 @@ export default { ### Enabling Native Plugins -Thanks to Rolldown and Oxc, various internal Vite plugins, such as the alias or resolve plugin, have been converted to Rust. At the time of writing, using these plugins is not enabled by default, as their behavior may differ from the JavaScript versions. +Thanks to Rolldown and Oxc, various internal Vite plugins, such as the alias or resolve plugin, have been converted to Rust. Native plugins are now enabled by default, with the default value set to `'v1'`. -To test them, you can set the `experimental.enableNativePlugin` option to `true` in your Vite config. +If you encounter any issues, you can change the `experimental.enableNativePlugin` option in your Vite config to `'resolver'` or `false` as a workaround. Note that this option will be removed in the future. ### Utilizing Oxc's React refresh transform From 1aafaebd780d1070bac74e6f9ee22f8f281ba1d0 Mon Sep 17 00:00:00 2001 From: thinkasany <480968828@qq.com> Date: Wed, 13 Aug 2025 09:07:35 +0800 Subject: [PATCH 3/3] fix: resolved conflict --- guide/rolldown.md | 10 ++-------- package.json | 24 ------------------------ 2 files changed, 2 insertions(+), 32 deletions(-) diff --git a/guide/rolldown.md b/guide/rolldown.md index 22ac1d05..10153901 100644 --- a/guide/rolldown.md +++ b/guide/rolldown.md @@ -141,15 +141,9 @@ export default { ## 启用原生插件 {#enabling-native-plugins} -<<<<<<< HEAD -感谢 Rolldown 和 Oxc，各种内部的 Vite 插件，如别名或解析插件，已被转换为 Rust。在撰写本文时，这些插件默认并未启用，因为它们的行为可能与 JavaScript 版本不同。 +得益于 Rolldown 和 Oxc 的支持，各种 Vite 内部插件（例如 alias 或 resolve 插件）已转换为 Rust 语言。原生插件现在默认启用，默认值设置为 `'v1'`。 -要测试它们，你可以在你的 Vite 配置中将 `experimental.enableNativePlugin` 选项设置为 `true`。 -======= -Thanks to Rolldown and Oxc, various internal Vite plugins, such as the alias or resolve plugin, have been converted to Rust. Native plugins are now enabled by default, with the default value set to `'v1'`. - -If you encounter any issues, you can change the `experimental.enableNativePlugin` option in your Vite config to `'resolver'` or `false` as a workaround. Note that this option will be removed in the future. ->>>>>>> 4319257ca1aa0204a1583f05eae108bef9d51bee +如果您遇到任何问题，可以将 Vite 配置中的 `experimental.enableNativePlugin` 选项更改为 `'resolver'` 或 `false` 以解决问题。请注意，此选项将来会被移除。 ### 利用 Oxc 的 React 刷新转换 {#utilizing-oxc-s-react-refresh-transform} diff --git a/package.json b/package.json index e8b937ae..b95d36ae 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,4 @@ { -<<<<<<< HEAD "name": "vite-docs-cn", "version": "1.0.0", "description": "Vite.js documentation Chinese translation.", @@ -40,27 +39,4 @@ "gitHooks": { "commit-msg": "node scripts/verifyCommit.js" } -======= - "name": "docs", - "private": true, - "type": "module", - "scripts": { - "typecheck": "vue-tsc", - "docs": "vitepress dev", - "docs-build": "vitepress build", - "docs-serve": "vitepress serve" - }, - "devDependencies": { - "@shikijs/vitepress-twoslash": "^3.9.2", - "@types/express": "^5.0.3", - "feed": "^5.1.0", - "gsap": "^3.13.0", - "markdown-it-image-size": "^14.8.0", - "vitepress": "^2.0.0-alpha.10", - "vitepress-plugin-group-icons": "^1.6.2", - "vitepress-plugin-llms": "^1.7.2", - "vue": "^3.5.18", - "vue-tsc": "^3.0.5" - } ->>>>>>> 4319257ca1aa0204a1583f05eae108bef9d51bee }