docs(en): fix conflicts

Author: jacob-lcs

package.json

@@ -100,12 +100,8 @@
     "eslint-plugin-react": "^7.29.4",
     "eslint-plugin-react-hooks": "^4.4.0",
     "front-matter": "^4.0.2",
-<<<<<<< HEAD
-    "github-slugger": "^1.3.0",
-    "html-loader": "^2.1.2",
-=======
     "github-slugger": "^1.4.0",
->>>>>>> 2eb6c6adc5157680cd9e38aa7767c3e5fee78e76
+    "html-loader": "^2.1.2",
     "html-webpack-plugin": "^5.5.0",
     "http-server": "^14.1.0",
     "husky": "^7.0.4",
@@ -114,15 +110,9 @@
     "lint-staged": "^12.3.7",
     "lodash": "^4.17.21",
     "markdownlint": "^0.25.1",
-<<<<<<< HEAD
-    "markdownlint-cli": "^0.31.0",
-    "mdast-util-to-string": "^1.1.0",
-    "mini-css-extract-plugin": "^2.5.3",
-=======
     "markdownlint-cli": "^0.31.1",
     "mdast-util-to-string": "^3.1.0",
     "mini-css-extract-plugin": "^2.6.0",
->>>>>>> 2eb6c6adc5157680cd9e38aa7767c3e5fee78e76
     "mkdirp": "^1.0.4",
     "modularscale-sass": "^3.0.3",
     "node-fetch": "^3.2.3",

src/components/Site/Site.jsx

@@ -268,16 +268,10 @@ function Site(props) {
                   )
                 ),
               },
-<<<<<<< HEAD
               { content: '参与贡献', url: '/contribute/' },
-              { content: '投票', url: 'https://v4.webpack.docschina.org/vote/' },
+              { content: '投票', url: '/vote/' },
               { content: '博客', url: '/blog/' },
               { content: '印记中文', url: 'https://docschina.org' },
-=======
-              { content: 'Contribute', url: '/contribute/' },
-              { content: 'Vote', url: '/vote/' },
-              { content: 'Blog', url: '/blog/' },
->>>>>>> 2eb6c6adc5157680cd9e38aa7767c3e5fee78e76
             ]}
           />
         </div>

src/content/api/cli.mdx

@@ -101,11 +101,7 @@ npx webpack init ./my-app --force --template=default
 
 `boolean`
 
-<<<<<<< HEAD
-生成项目时不启用选项模式。当为 `true` 时，所有命令行选项使用默认值。
-=======
-To generate a project without questions. When enabled, the default answer for each question will be used.
->>>>>>> 2eb6c6adc5157680cd9e38aa7767c3e5fee78e76
+不输入配置项就生成一个项目。该配置启用时所有命令行配置项将使用默认值。
 
 T> 点击 [这里](https://github.com/webpack/webpack-cli/blob/master/packages/generators/INIT.md) 获取 `webpack init` 命令的完整文档。
 
@@ -585,19 +581,11 @@ T> 请查阅 [environment 变量指南](/guides/environment-variables/)了解更
 
 除了上面所说的自定义 `env` 变量，在你的 webpack 配置中也使用了一些 `env` 内置变量：
 
-<<<<<<< HEAD
 | 变量名          | 描述                                          |
 | --------------- | --------------------------------------------- |
-| `WEBPACK_SERVE` | 如果使用了 `serve\|s`，则为 `true`。          |
+| `WEBPACK_SERVE` | 如果使用了 `serve\|server\|s`，则为 `true`。          |
 | `WEBPACK_BUILD` | 如果使用了 `build\|bundle\|b`，则为 `true`。  |
 | `WEBPACK_WATCH` | 如果使用了 `--watch\|watch\|w`，则为 `true`。 |
-=======
-| Environment Variable | Description                                  |
-| -------------------- | -------------------------------------------- |
-| `WEBPACK_SERVE`      | `true` if `serve\|server\|s` is being used.  |
-| `WEBPACK_BUILD`      | `true` if `build\|bundle\|b` is being used.  |
-| `WEBPACK_WATCH`      | `true` if `--watch\|watch\|w` is being used. |
->>>>>>> 2eb6c6adc5157680cd9e38aa7767c3e5fee78e76
 
 请注意你不能在 bundle 代码中使用这些内置环境变量。
 

src/content/api/compilation-object.mdx

@@ -229,15 +229,7 @@ Compilation 对象有很多可用的方法和钩子。在此页面，我们将
 - `block` - `Chunk` 的块连接。
 - `chunk` - 从依赖中删除的块。
 
-<<<<<<< HEAD
-### sortItemsWithModuleIds $#sortitemswithmoduleids$
-
-`function`
-
-### sortItemsWithChunkIds $#sortitemswithchunkids$
-=======
-### sortItemsWithChunkIds
->>>>>>> 2eb6c6adc5157680cd9e38aa7767c3e5fee78e76
+### sortItemsWithChunkIds $#sortitemswithmoduleids$
 
 `function`
 

src/content/api/module-variables.mdx

@@ -109,14 +109,11 @@ console.log(import.meta.webpack); // output `5` for webpack 5
 
 webpack 特定。[`module.hot`](#modulehot-webpack-specific) 的一个别名，[strict ESM](/guides/ecma-script-modules/#flagging-modules-as-esm) 中可以使用 `import.meta.webpackHot` 但是不能使用 `module.hot`。
 
-<<<<<<< HEAD
-## \_\_filename (NodeJS) $#__filename-nodejs$
-=======
 ## import.meta.webpackContext
 
-Returns the same value as `require.context` but only for `javascript/auto` and `javascript/esm`.
+返回与 `require.context` 一样的值，但是仅用于 `javascript/auto` 和 `javascript/esm`。
 
-- Type:
+- 类型：
 
   ```ts
   (
@@ -135,8 +132,8 @@ Returns the same value as `require.context` but only for `javascript/auto` and `
   ) => webpack.Context;
   ```
 
-- Available: 5.70.0+
-- Example:
+- 可用版本：5.70.0+
+- 示例：
   ```js
   const contextRequire = import.meta.webpackContext('.', {
     recursive: false,
@@ -147,7 +144,6 @@ Returns the same value as `require.context` but only for `javascript/auto` and `
   ```
 
 ## \_\_filename (NodeJS)
->>>>>>> 2eb6c6adc5157680cd9e38aa7767c3e5fee78e76
 
 取决于 `node.__filename` 配置选项：
 

src/content/configuration/dev-server.mdx

@@ -1277,11 +1277,7 @@ npx webpack serve --port auto
 
 当拥有单独的 API 后端开发服务器并且希望在同一域上发送 API 请求时，代理某些 URL 可能会很有用。
 
-<<<<<<< HEAD
-开发服务器使用功能强大的 [http-proxy-middleware](https://github.com/chimurai/http-proxy-middleware) 软件包。 查看其 [documentation](https://github.com/chimurai/http-proxy-middleware#options) 了解更多高级用法。 请注意，`http-proxy-middleware` 的某些功能不需要`target`键，例如 它的 `router` 功能，但是仍然需要在此处的配置中包含`target`，否则`webpack-dev-server` 不会将其传递给 `http-proxy-middleware`）。
-=======
-The dev-server makes use of the powerful [http-proxy-middleware](https://github.com/chimurai/http-proxy-middleware) package. Check out its [documentation](https://github.com/chimurai/http-proxy-middleware#options) for more advanced usages. Note that some of `http-proxy-middleware`'s features do not require a `target` key, e.g. its `router` feature, but you will still need to include a `target` key in your configuration here, otherwise `webpack-dev-server` won't pass it along to `http-proxy-middleware`.
->>>>>>> 2eb6c6adc5157680cd9e38aa7767c3e5fee78e76
+开发服务器使用功能强大的 [http-proxy-middleware](https://github.com/chimurai/http-proxy-middleware) 软件包。 查看其 [documentation](https://github.com/chimurai/http-proxy-middleware#options) 了解更多高级用法。 请注意，`http-proxy-middleware` 的某些功能不需要`target`键，例如 它的 `router` 功能，但是仍然需要在此处的配置中包含`target`，否则`webpack-dev-server` 不会将其传递给 `http-proxy-middleware`。
 
 使用后端在 `localhost:3000` 上，可以使用它来启用代理：
 

src/content/configuration/experiments.mdx

@@ -157,45 +157,41 @@ Note that you should commit files under `experiments.buildHttp.cacheLocation` in
 
 Freeze the remote resources and lockfile. Any modification to the lockfile or resource contents will result in an error.
 
-- Type: `boolean`
+- 类型：`boolean`
 
 #### experiments.buildHttp.lockfileLocation $#experimentsbuildhttplockfilelocation$
 
 Define the location to store the lockfile.
 
-- Type: `string`
+- 类型：`string`
 
 By default webpack would generate a `<compiler-name.>webpack.lock` file>. Make sure to commit it into a version control system. During the `production` build, webpack will build those modules beginning with `http(s):` protocol from the lockfile and caches under [`experiments.buildHttp.cacheLocation`](#experimentsbuildhttpcachelocation).
 
-<<<<<<< HEAD
-#### experiments.buildHttp.upgrade $#experimentsbuildhttpupgrade$
-=======
 #### experiments.buildHttp.proxy
 
-Specify the proxy server to use for fetching remote resources.
+指定用来获取远程资源的代理服务器。
 
-- Type: `string`
+- 类型：`string`
 
-By default, Webpack would imply the proxy server to use for fetching remote resources from the `http_proxy` (case insensitive) environment variable. However, you can also specify one through the `proxy` option.
+默认情况下，webpack 会让代理服务器使用 `http_proxy`（不区分大小写） 环境变量值获取远程资源。然而，你也可以通过 `proxy` 配置项指定。
 
 #### experiments.buildHttp.upgrade
->>>>>>> 2eb6c6adc5157680cd9e38aa7767c3e5fee78e76
 
-Detect changes to remote resources and upgrade them automatically.
+检测远程资源的更改并自动升级。
 
-- Type: `boolean`
+- 类型：`boolean`
 
 ### experiments.css $#experimentscss$
 
 启用原生 CSS 支持。请注意该实验特性仍处于开发状态并且将会在 webpack v6 中默认启用，你可以在 [GitHub](https://github.com/webpack/webpack/issues/14893) 中跟踪进度。
 
-- Type: `boolean`
+- 类型：`boolean`
 
 ### experiments.cacheUnaffected $#experimentscacheunaffected$
 
 Enable additional in-memory caching of modules which are unchanged and reference only unchanged modules.
 
-- Type: `boolean`
+- 类型：`boolean`
 
 Defaults to the value of [`futureDefaults`](#experimentsfuturedefaults).
 

src/content/configuration/module.mdx

@@ -206,16 +206,13 @@ const x = require(/* webpackIgnore: true */ 'x');
   };
   ```
 
-<<<<<<< HEAD
-#### module.parser.javascript.reexportExportsPresence $#moduleparserjavascriptreexportexportspresence$
-=======
 #### module.parser.javascript.importMetaContext
 
-Enable/disable evaluating [`import.meta.webpackContext`](/api/module-variables/#importmetawebpackcontext).
+启用/禁用 [`import.meta.webpackContext`](/api/module-variables/#importmetawebpackcontext) 分析。
 
-- Type: `boolean`
-- Available: 5.70.0+
-- Example:
+- 类型：`boolean`
+- 可用版本：5.70.0+
+- 示例：
   ```js
   module.exports = {
     module: {
@@ -229,7 +226,6 @@ Enable/disable evaluating [`import.meta.webpackContext`](/api/module-variables/#
   ```
 
 #### module.parser.javascript.reexportExportsPresence
->>>>>>> 2eb6c6adc5157680cd9e38aa7767c3e5fee78e76
 
 指出在  `\"export ... from ...\"` 中无效导出名称的行为。当在 TypeScript 重新导出类型，从 `\"export ... from ...\"` 迁移到 `\"export type ... from ...\"` 时禁用该配置项是有用的。
 

src/content/configuration/output.mdx

@@ -42,13 +42,9 @@ translators:
 
 与 [`output.filename`](#outputfilename) 相同，不过应用于 [Asset Modules](/guides/asset-modules/)。
 
-<<<<<<< HEAD
-## output.asyncChunks $#outputasyncchunks$
-=======
-`[name]`, `[file]`, `[query]`, `[fragment]`, `[base]`, and `[path]` are set to an empty string for the assets built from data URI replacements.
+对从数据 URI 替换构建的静态资源，`[name]`, `[file]`, `[query]`, `[fragment]`, `[base]` 与 `[path]` 为空字符串。
 
 ## output.asyncChunks
->>>>>>> 2eb6c6adc5157680cd9e38aa7767c3e5fee78e76
 
 `boolean = true`
 
@@ -667,13 +663,9 @@ T> 在某些上下文中，属性将使用 JavaScript 代码表达式代替原
 
 当输出为 library 时，尤其是当 `libraryTarget` 为 `'umd'`时，此选项将决定使用哪个全局对象来挂载 library。为了使 UMD 构建在浏览器和 Node.js 上均可用，应将 `output.globalObject` 选项设置为 `'this'`。对于类似 web 的目标，默认为 `self`。
 
-<<<<<<< HEAD
-示例：
-=======
-The return value of your entry point will be assigned to the global object using the value of `output.library.name`. Depending on the value of the `target` option, the global object could change respectively, e.g., `self`, `global`, or `globalThis`.
+入口点的返回值将会使用 `output.library.name` 赋值给全局对象。依赖于 `target` 配置项，全局对象将会发生对应的改变，例如：`self`, `global` 或者 `globalThis`。
 
-For example:
->>>>>>> 2eb6c6adc5157680cd9e38aa7767c3e5fee78e76
+示例：
 
 **webpack.config.js**
 

src/content/guides/code-splitting.mdx

@@ -34,14 +34,11 @@ contributors:
   - Adarah
   - atesgoral
   - snitin315
-<<<<<<< HEAD
+  - artem-malko
 translators:
   - QC-L
   - jacob-lcs
   - dear-lizhihua
-=======
-  - artem-malko
->>>>>>> 2eb6c6adc5157680cd9e38aa7767c3e5fee78e76
 related:
   - title: webpack 中的 <link rel="prefetch/preload" />
     url: https://medium.com/webpack/link-rel-prefetch-preload-in-webpack-51a52358f84c
@@ -433,22 +430,18 @@ import(/* webpackPreload: true */ 'ChartingLibrary');
 
 T> 不正确地使用 `webpackPreload` 会有损性能，请谨慎使用。
 
-<<<<<<< HEAD
-## bundle 分析(bundle analysis) $#bundle-analysis$
-=======
-Sometimes you need to have your own control over preload. For example, preload of any dynamic import can be done via async script. This can be useful in case of streamming server side rendering.
+有时你需要自己控制预加载。例如，任何动态导入的预加载都可以通过异步脚本完成。这在流式服务器端渲染的情况下很有用。
 
 ```js
 const lazyComp = () =>
   import('DynamicComponent').catch((error) => {
-    // Do something with the error.
-    // For example, we can retry the request in case of any net error
+    // 在发生错误时做一些处理
+    // 例如，我们可以在网络错误的情况下重试请求
   });
 ```
+如果在 webpack 开始加载该脚本之前脚本加载失败（如果该脚本不在页面上，webpack 只是创建一个 script 标签来加载其代码），则该 catch 处理程序将不会启动，直到 [chunkLoadTimeout](/configuration/output/#outputchunkloadtimeout) 未通过。此行为可能是意料之外的。但这是可以解释的 - webpack 不能抛出任何错误，因为 webpack 不知道那个脚本失败了。Webpack 将在错误发生后立即将 onerror 处理脚本添加到 script 中。
 
-If the script loading will fail before webpack starts loading of that script by itself (webpack just creates a script tag to load its code, if that script is not on a page), that catch handler won't start till [chunkLoadTimeout](/configuration/output/#outputchunkloadtimeout) is not passed. This behavior can be unexpected. But it's explainable — webpack can not throw any error, cause webpack doesn't know, that script failed. Webpack will add onerror handler to the script right after the error has happen.
-
-To prevent such problem you can add your own onerror handler, which removes the script in case of any error:
+为了避免上述问题，你可以添加自己的 onerror 处理脚本，将会在错误发生时移除该 script。
 
 ```html
 <script
@@ -458,10 +451,9 @@ To prevent such problem you can add your own onerror handler, which removes the
 ></script>
 ```
 
-In that case, errored script will be removed. Webpack will create its own script and any error will be processed without any timeouts.
+在这种情况下，错误的 script 将被删除。Webpack 将创建自己的 script，并且任何错误都将被处理而没有任何超时。
 
-## Bundle Analysis
->>>>>>> 2eb6c6adc5157680cd9e38aa7767c3e5fee78e76
+## bundle 分析(bundle analysis) $#bundle-analysis$
 
 一旦开始分离代码，一件很有帮助的事情是，分析输出结果来检查模块在何处结束。 [官方分析工具](https://github.com/webpack/analyse) 是一个不错的开始。还有一些其他社区支持的可选项：