docs(en): merging all conflicts

Author: docschina-bot

_data/team.js

@@ -114,6 +114,13 @@ export const core = [
     desc: 'Passionate by tooling around TypeScript and React.',
     links: [{ icon: 'github', link: 'https://github.com/ArnaudBarre' }],
   },
+  {
+    avatar: 'https://github.com/dominikg.png',
+    name: 'Dominik G.',
+    title: 'Resident CI Expert',
+    desc: 'Team Member of Vite and Svelte',
+    links: [{ icon: 'github', link: 'https://github.com/dominikg' }],
+  },
 ]
 
 export const emeriti = [

config/worker-options.md

@@ -1,5 +1,7 @@
 # Worker 选项 {#worker-options}
 
+Options related to Web Workers.
+
 ## worker.format
 
 - **类型：** `'es' | 'iife'`

guide/api-hmr.md

@@ -93,9 +93,15 @@ if (import.meta.hot) {
   import.meta.hot.accept(
     ['./foo.js', './bar.js'],
     ([newFooModule, newBarModule]) => {
+<<<<<<< HEAD
       // 只有当更新模块非空时，回调函数接收一个数组
       // 如果更新不成功（例如语法错误），则该数组为空
     }
+=======
+      // The callback receives an array where only the updated module is non null
+      // If the update was not successful (syntax error for ex.), the array is empty
+    },
+>>>>>>> b487b176946a6940b8f77176b07b19eed975456c
   )
 }
 ```

guide/build.md

@@ -192,14 +192,14 @@ dist/my-lib.umd.cjs 0.30 KiB / gzip: 0.16 KiB
   "type": "module",
   "files": ["dist"],
   "main": "./dist/my-lib.cjs",
-  "module": "./dist/my-lib.mjs",
+  "module": "./dist/my-lib.js",
   "exports": {
     ".": {
-      "import": "./dist/my-lib.mjs",
+      "import": "./dist/my-lib.js",
       "require": "./dist/my-lib.cjs"
     },
     "./secondary": {
-      "import": "./dist/secondary.mjs",
+      "import": "./dist/secondary.js",
       "require": "./dist/secondary.cjs"
     }
   }

guide/troubleshooting.md

@@ -51,7 +51,29 @@
 
 请注意，这些配置会持久作用，但需要 **重新启动**。
 
+<<<<<<< HEAD
 ### 431 Request Header Fields Too Large {#431-request-header-fields-too-large}
+=======
+### Network requests stop loading
+
+When using a self-signed SSL certificate, Chrome ignores all caching directives and reloads the content. Vite relies on these caching directives.
+
+To resolve the problem use a trusted SSL cert.
+
+See: [Cache problems](https://helpx.adobe.com/mt/experience-manager/kb/cache-problems-on-chrome-with-SSL-certificate-errors.html), [Chrome issue](https://bugs.chromium.org/p/chromium/issues/detail?id=110649#c8)
+
+#### macOS
+
+You can install a trusted cert via the CLI with this command:
+
+```
+security add-trusted-cert -d -r trustRoot -k ~/Library/Keychains/login.keychain-db your-cert.cer
+```
+
+Or, by importing it into the Keychain Access app and updating the trust of your cert to "Always Trust."
+
+### 431 Request Header Fields Too Large
+>>>>>>> b487b176946a6940b8f77176b07b19eed975456c
 
 当服务器或 WebSocket 服务收到一个较大的 HTTP 头，该请求可能会被遗落并且会显示下面这样的警告。
 
@@ -83,7 +105,15 @@ import './Foo.js' // 应该为 './foo.js'
 
 同时如果有依赖环，也会发生完全重载。要解决这个问题，请先尝试解决依赖循环。
 
+<<<<<<< HEAD
 ## 构建 {#build}
+=======
+### High number of HMR updates in console
+
+This can be caused by a circular dependency. To solve this, try breaking the loop.
+
+## Build
+>>>>>>> b487b176946a6940b8f77176b07b19eed975456c
 
 ### 构建产物因为 CORS 错误无法工作 {#built-file-does-not-work-because-of-cors-error}