From 4e2b131016d844d4ce69454796ccca4bdd5ba0f7 Mon Sep 17 00:00:00 2001 From: clonemycode <168618167+clonemycode@users.noreply.github.com> Date: Mon, 2 Jun 2025 09:11:29 +0800 Subject: [PATCH 1/4] chore: remove redundant word in comment (#20139) Signed-off-by: clonemycode --- guide/rolldown.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guide/rolldown.md b/guide/rolldown.md index 5d8d1cdf..2b26f8e7 100644 --- a/guide/rolldown.md +++ b/guide/rolldown.md @@ -91,7 +91,7 @@ While Rolldown aims to be a drop-in replacement for Rollup, there are features t ### Option Validation Errors -Rolldown throws an error when unknown or invalid options are passed. Because some options available in Rollup are not supported by Rolldown, you may encounter errors based on the options you or the meta framework you use set. Below, you can find an an example of such an error message: +Rolldown throws an error when unknown or invalid options are passed. Because some options available in Rollup are not supported by Rolldown, you may encounter errors based on the options you or the meta framework you use set. Below, you can find an example of such an error message: > Error: Failed validate input options. > From cba96cc74f083db8414e3b9d2f9c96f43a1c41a3 Mon Sep 17 00:00:00 2001 From: patak <583075+patak-dev@users.noreply.github.com> Date: Mon, 2 Jun 2025 13:30:15 +0200 Subject: [PATCH 2/4] docs: correct environment api stabilization note (#20116) --- guide/api-environment-frameworks.md | 2 +- guide/api-environment-instances.md | 2 +- guide/api-environment-plugins.md | 4 ++-- guide/api-environment-runtimes.md | 2 +- guide/api-environment.md | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/guide/api-environment-frameworks.md b/guide/api-environment-frameworks.md index 94f12f59..b676f19c 100644 --- a/guide/api-environment-frameworks.md +++ b/guide/api-environment-frameworks.md @@ -1,7 +1,7 @@ # Environment API for Frameworks :::warning Experimental -Environment API is experimental. We'll keep the APIs stable during Vite 6 to let the ecosystem experiment and build on top of it. We're planning to stabilize these new APIs with potential breaking changes in Vite 7. +Environment API is experimental. We'll still maintain stability in the APIs between major releases to allow the ecosystem to experiment and build upon them. We plan to stabilize these new APIs (with potential breaking changes) in a future major release once downstream projects have had time to experiment with the new features and validate them. Resources: diff --git a/guide/api-environment-instances.md b/guide/api-environment-instances.md index 420f2b0a..0399ddf1 100644 --- a/guide/api-environment-instances.md +++ b/guide/api-environment-instances.md @@ -1,7 +1,7 @@ # Using `Environment` Instances :::warning Experimental -Environment API is experimental. We'll keep the APIs stable during Vite 6 to let the ecosystem experiment and build on top of it. We're planning to stabilize these new APIs with potential breaking changes in Vite 7. +Environment API is experimental. We'll still maintain stability in the APIs between major releases to allow the ecosystem to experiment and build upon them. We plan to stabilize these new APIs (with potential breaking changes) in a future major release once downstream projects have had time to experiment with the new features and validate them. Resources: diff --git a/guide/api-environment-plugins.md b/guide/api-environment-plugins.md index bbc3aeec..221f127f 100644 --- a/guide/api-environment-plugins.md +++ b/guide/api-environment-plugins.md @@ -1,7 +1,7 @@ # Environment API for Plugins :::warning Experimental -Environment API is experimental. We'll keep the APIs stable during Vite 6 to let the ecosystem experiment and build on top of it. We're planning to stabilize these new APIs with potential breaking changes in Vite 7. +Environment API is experimental. We'll still maintain stability in the APIs between major releases to allow the ecosystem to experiment and build upon them. We plan to stabilize these new APIs (with potential breaking changes) in a future major release once downstream projects have had time to experiment with the new features and validate them. Resources: @@ -198,7 +198,7 @@ Before Vite 6, the plugins pipelines worked in a different way during dev and bu This forced frameworks to share state between the `client` build and the `ssr` build through manifest files written to the file system. In Vite 6, we are now building all environments in a single process so the way the plugins pipeline and inter-environment communication can be aligned with dev. -In a future major (Vite 7 or 8), we aim to have complete alignment: +In a future major, we could have complete alignment: - **During both dev and build:** plugins are shared, with [per-environment filtering](#per-environment-plugins) diff --git a/guide/api-environment-runtimes.md b/guide/api-environment-runtimes.md index 851175ce..2d62e733 100644 --- a/guide/api-environment-runtimes.md +++ b/guide/api-environment-runtimes.md @@ -1,7 +1,7 @@ # Environment API for Runtimes :::warning Experimental -Environment API is experimental. We'll keep the APIs stable during Vite 6 to let the ecosystem experiment and build on top of it. We're planning to stabilize these new APIs with potential breaking changes in Vite 7. +Environment API is experimental. We'll still maintain stability in the APIs between major releases to allow the ecosystem to experiment and build upon them. We plan to stabilize these new APIs (with potential breaking changes) in a future major release once downstream projects have had time to experiment with the new features and validate them. Resources: diff --git a/guide/api-environment.md b/guide/api-environment.md index c8010fdf..e75259d3 100644 --- a/guide/api-environment.md +++ b/guide/api-environment.md @@ -1,7 +1,7 @@ # Environment API :::warning Experimental -Environment API is experimental. We'll keep the APIs stable during Vite 6 to let the ecosystem experiment and build on top of it. We're planning to stabilize these new APIs with potential breaking changes in Vite 7. +Environment API is experimental. We'll still maintain stability in the APIs between major releases to allow the ecosystem to experiment and build upon them. We plan to stabilize these new APIs (with potential breaking changes) in a future major release once downstream projects have had time to experiment with the new features and validate them. Resources: From fbbe8ebca6cd081577720a7b1a3cce131f5b49cf Mon Sep 17 00:00:00 2001 From: thinkasany <480968828@qq.com> Date: Tue, 3 Jun 2025 09:37:54 +0800 Subject: [PATCH 3/4] fix: resolved conflict --- guide/api-environment-frameworks.md | 7 +------ guide/api-environment-instances.md | 7 +------ guide/api-environment-plugins.md | 7 +------ guide/api-environment-runtimes.md | 7 +------ guide/api-environment.md | 7 +------ guide/rolldown.md | 4 ---- 6 files changed, 5 insertions(+), 34 deletions(-) diff --git a/guide/api-environment-frameworks.md b/guide/api-environment-frameworks.md index f3366cb6..4765d250 100644 --- a/guide/api-environment-frameworks.md +++ b/guide/api-environment-frameworks.md @@ -1,12 +1,7 @@ # 用于框架的环境 API {#environment-api-for-frameworks} -<<<<<<< HEAD :::warning 实验性 -环境 API 是实验性的。在 Vite 6 期间，我们将保持这些 API 的稳定，以便生态系统可以在其基础上进行实验和构建。我们计划在 Vite 7 中稳定这些新 API，并可能进行一些重大更改。 -======= -:::warning Experimental -Environment API is experimental. We'll still maintain stability in the APIs between major releases to allow the ecosystem to experiment and build upon them. We plan to stabilize these new APIs (with potential breaking changes) in a future major release once downstream projects have had time to experiment with the new features and validate them. ->>>>>>> cba96cc74f083db8414e3b9d2f9c96f43a1c41a3 +环境 API 仍处于实验阶段。我们仍将在主要版本之间保持 API 的稳定性，以便生态系统进行实验和构建。我们计划在下游项目有时间试验并验证新功能后，在未来的主要版本中稳定这些新 API（可能包含重大更改）。 资料： diff --git a/guide/api-environment-instances.md b/guide/api-environment-instances.md index d66773ab..7c636d18 100644 --- a/guide/api-environment-instances.md +++ b/guide/api-environment-instances.md @@ -1,12 +1,7 @@ # 使用 `Environment` 实例 {#using-environment-instances} -<<<<<<< HEAD :::warning 实验性 -环境 API 是实验性的。在 Vite 6 期间，我们将保持这些 API 的稳定，以便生态系统可以在其基础上进行实验和构建。我们计划在 Vite 7 中稳定这些新 API，并可能进行一些重大更改。 -======= -:::warning Experimental -Environment API is experimental. We'll still maintain stability in the APIs between major releases to allow the ecosystem to experiment and build upon them. We plan to stabilize these new APIs (with potential breaking changes) in a future major release once downstream projects have had time to experiment with the new features and validate them. ->>>>>>> cba96cc74f083db8414e3b9d2f9c96f43a1c41a3 +环境 API 仍处于实验阶段。我们仍将在主要版本之间保持 API 的稳定性，以便生态系统进行实验和构建。我们计划在下游项目有时间试验并验证新功能后，在未来的主要版本中稳定这些新 API（可能包含重大更改）。 资料： diff --git a/guide/api-environment-plugins.md b/guide/api-environment-plugins.md index 97d26705..11d09c25 100644 --- a/guide/api-environment-plugins.md +++ b/guide/api-environment-plugins.md @@ -1,12 +1,7 @@ # 用于插件的环境 API {#environment-api-for-plugins} -<<<<<<< HEAD :::warning 实验性 -环境 API 是实验性的。在 Vite 6 期间，我们将保持这些 API 的稳定，以便生态系统可以在其基础上进行实验和构建。我们计划在 Vite 7 中稳定这些新 API，并可能进行一些重大更改。 -======= -:::warning Experimental -Environment API is experimental. We'll still maintain stability in the APIs between major releases to allow the ecosystem to experiment and build upon them. We plan to stabilize these new APIs (with potential breaking changes) in a future major release once downstream projects have had time to experiment with the new features and validate them. ->>>>>>> cba96cc74f083db8414e3b9d2f9c96f43a1c41a3 +环境 API 仍处于实验阶段。我们仍将在主要版本之间保持 API 的稳定性，以便生态系统进行实验和构建。我们计划在下游项目有时间试验并验证新功能后，在未来的主要版本中稳定这些新 API（可能包含重大更改）。 资料： diff --git a/guide/api-environment-runtimes.md b/guide/api-environment-runtimes.md index b25801d4..be763ea6 100644 --- a/guide/api-environment-runtimes.md +++ b/guide/api-environment-runtimes.md @@ -1,12 +1,7 @@ # 用于运行时的环境 API {#environment-api-for-runtimes} -<<<<<<< HEAD :::warning 实验性 -环境 API 是实验性的。在 Vite 6 期间，我们将保持这些 API 的稳定，以便生态系统可以在其基础上进行实验和构建。我们计划在 Vite 7 中稳定这些新 API，并可能进行一些重大更改。 -======= -:::warning Experimental -Environment API is experimental. We'll still maintain stability in the APIs between major releases to allow the ecosystem to experiment and build upon them. We plan to stabilize these new APIs (with potential breaking changes) in a future major release once downstream projects have had time to experiment with the new features and validate them. ->>>>>>> cba96cc74f083db8414e3b9d2f9c96f43a1c41a3 +环境 API 仍处于实验阶段。我们仍将在主要版本之间保持 API 的稳定性，以便生态系统进行实验和构建。我们计划在下游项目有时间试验并验证新功能后，在未来的主要版本中稳定这些新 API（可能包含重大更改）。 资料： diff --git a/guide/api-environment.md b/guide/api-environment.md index 678b58b8..9ac04207 100644 --- a/guide/api-environment.md +++ b/guide/api-environment.md @@ -1,12 +1,7 @@ # 环境 API {#environment-api} -<<<<<<< HEAD :::warning 实验性 -环境 API 是实验性的。在 Vite 6 期间，我们将保持这些 API 的稳定，以便生态系统可以在其基础上进行实验和构建。我们计划在 Vite 7 中稳定这些新 API，并可能进行一些重大更改。 -======= -:::warning Experimental -Environment API is experimental. We'll still maintain stability in the APIs between major releases to allow the ecosystem to experiment and build upon them. We plan to stabilize these new APIs (with potential breaking changes) in a future major release once downstream projects have had time to experiment with the new features and validate them. ->>>>>>> cba96cc74f083db8414e3b9d2f9c96f43a1c41a3 +环境 API 仍处于实验阶段。我们仍将在主要版本之间保持 API 的稳定性，以便生态系统进行实验和构建。我们计划在下游项目有时间试验并验证新功能后，在未来的主要版本中稳定这些新 API（可能包含重大更改）。 资料： diff --git a/guide/rolldown.md b/guide/rolldown.md index 5497767b..b9266078 100644 --- a/guide/rolldown.md +++ b/guide/rolldown.md @@ -91,11 +91,7 @@ Rolldown 专注于三个主要原则： ### 验证选项错误 {#option-validation-errors} -<<<<<<< HEAD 当传入未知或无效选项时，Rolldown 会抛出错误。由于 Rolldown 不支持 Rollup 中的部分选项，根据您或所使用的元框架设置的选项，可能会遇到相关错误。下方展示了此类错误消息的示例： -======= -Rolldown throws an error when unknown or invalid options are passed. Because some options available in Rollup are not supported by Rolldown, you may encounter errors based on the options you or the meta framework you use set. Below, you can find an example of such an error message: ->>>>>>> cba96cc74f083db8414e3b9d2f9c96f43a1c41a3 > Error: Failed validate input options. > From 3a125384412ac14000d55e2b1a0f09d2b5b32013 Mon Sep 17 00:00:00 2001 From: thinkasany <480968828@qq.com> Date: Tue, 3 Jun 2025 09:39:43 +0800 Subject: [PATCH 4/4] fix: resolved conflict --- guide/api-environment-plugins.md | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/guide/api-environment-plugins.md b/guide/api-environment-plugins.md index 11d09c25..d06d644d 100644 --- a/guide/api-environment-plugins.md +++ b/guide/api-environment-plugins.md @@ -198,11 +198,7 @@ export default defineConfig({ 这迫使框架通过写入文件系统的清单文件在 `client` 构建和 `ssr` 构建之间共享状态。在 Vite 6 中，我们现在在单个进程中构建所有环境，因此插件管道和环境间通信的方式可以与开发对齐。 -<<<<<<< HEAD -在未来的主要版本（Vite 7 或 8）中，我们的目标是完全对齐： -======= -In a future major, we could have complete alignment: ->>>>>>> cba96cc74f083db8414e3b9d2f9c96f43a1c41a3 +在未来的主要版本，我们可以实现完全一致： - **在开发和构建期间：** 插件是共享的，并可以 [根据环境进行过滤](#per-environment-plugins)