From a4d9e4f3fd639e07828651de2315aa5dcdeb6fa4 Mon Sep 17 00:00:00 2001 From: situ2001 Date: Thu, 23 Oct 2025 09:06:01 +0800 Subject: [PATCH 1/2] docs(rolldown): fix module types url (#20982) --- guide/rolldown.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guide/rolldown.md b/guide/rolldown.md index 8f474df7..04f650d8 100644 --- a/guide/rolldown.md +++ b/guide/rolldown.md @@ -345,4 +345,4 @@ const plugin = { } ``` -This is because [Rolldown supports non-JavaScript modules](https://rolldown.rs/guide/in-depth/module-types) and infers the module type from extensions unless specified. +This is because [Rolldown supports non-JavaScript modules](https://rolldown.rs/in-depth/module-types) and infers the module type from extensions unless specified. From 2da1634b58ec72e74fb6bac702c296588f761479 Mon Sep 17 00:00:00 2001 From: thinkasany <480968828@qq.com> Date: Fri, 24 Oct 2025 08:14:28 +0800 Subject: [PATCH 2/2] resolved conflict --- guide/rolldown.md | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/guide/rolldown.md b/guide/rolldown.md index 4091d09e..63f58c79 100644 --- a/guide/rolldown.md +++ b/guide/rolldown.md @@ -345,8 +345,4 @@ const plugin = { } ``` -<<<<<<< HEAD -这是因为 [Rolldown 支持非 JavaScript 模块](https://rolldown.rs/guide/in-depth/module-types) 并且除非指定，否则从扩展名推断模块类型。 -======= -This is because [Rolldown supports non-JavaScript modules](https://rolldown.rs/in-depth/module-types) and infers the module type from extensions unless specified. ->>>>>>> a4d9e4f3fd639e07828651de2315aa5dcdeb6fa4 +这是因为 [Rolldown 支持非 JavaScript 模块](https://rolldown.rs/in-depth/module-types) 并且除非指定，否则从扩展名推断模块类型。