Merge pull request #1605 from vitejs/fix-resolve

resolve conflict

Author: thinkasany

acknowledgements.md

@@ -5,13 +5,8 @@ description: Vite is built upon the shoulders of giants. Thank you to all the pr
 
 <script setup>
 import { computed } from 'vue'
-<<<<<<< HEAD
 // import { data } from './_data/acknowledgements.data'
 import { useSponsor, voidZero } from './.vitepress/theme/composables/sponsor'
-=======
-import { data } from './_data/acknowledgements.data'
-import { useSponsor } from './.vitepress/theme/composables/sponsor'
->>>>>>> fbe217f4529e6842458d880526718899a961bd96
 import VPSponsors from '@components/vitepress-default/VPSponsors.vue'
 
 const sponsors = useSponsor()

guide/troubleshooting.md

@@ -287,17 +287,17 @@ Vite 无法处理、也不支持仅可在非严格模式（sloppy mode）下运
 
 相关 issue：[#10802](https://github.com/vitejs/vite/issues/10802)
 
-### Default import unexpectedly returns an object
+### 默认导入意外地返回了对象
 
-The default import returns the `module.exports` object for CJS modules, while you may expect it to return the `module.exports.default` value.
+对于 CJS 模块，默认导入返回的是 `module.exports` 对象，而你可能期望它返回 `module.exports.default` 的值。
 
-This may cause errors like:
+这可能会导致如下错误：
 
 > Element type is invalid: expected a string (for built-in components) or a class/function (for composite components) but got: object.
 
 > foo is not a function
 
-See Rolldown's docs about this problem for more details: [Ambiguous `default` import from CJS modules - Bundling CJS | Rolldown](https://rolldown.rs/in-depth/bundling-cjs#ambiguous-default-import-from-cjs-modules).
+更多细节请参阅 Rolldown 文档：[来自 CJS 模块的歧义 `default` 导入 - Bundling CJS | Rolldown](https://rolldown.rs/in-depth/bundling-cjs#ambiguous-default-import-from-cjs-modules)。
 
 <script setup lang="ts">
 // 使用哈希将旧链接重定向到旧版本文档