From 2a604f05e26e496df0934fe69a65648204a19494 Mon Sep 17 00:00:00 2001
From: waynzh <waynzh19@gmail.com>
Date: Mon, 29 Apr 2024 15:54:58 +0800
Subject: [PATCH] docs(cn): resolve conflicts

---
 README.md                            |  70 --------------
 docs/command-line-interface/index.md | 124 +-----------------------
 docs/configuration-options/index.md  |  36 ++-----
 docs/javascript-api/index.md         | 140 ++-------------------------
 docs/plugin-development/index.md     |  16 +--
 5 files changed, 24 insertions(+), 362 deletions(-)

diff --git a/README.md b/README.md
index f958dae75..52866181f 100644
--- a/README.md
+++ b/README.md
@@ -48,77 +48,7 @@
   </a>
 </p>
 
-<<<<<<< HEAD
 ## Rollup 贡献者
-=======
-These commands assume the entry point to your application is named main.js, and that you'd like all imports compiled into a single file named bundle.js.
-
-For browsers:
-
-```bash
-# compile to a <script> containing a self-executing function
-rollup main.js --format iife --name "myBundle" --file bundle.js
-```
-
-For Node.js:
-
-```bash
-# compile to a CommonJS module
-rollup main.js --format cjs --file bundle.js
-```
-
-For both browsers and Node.js:
-
-```bash
-# UMD format requires a bundle name
-rollup main.js --format umd --name "myBundle" --file bundle.js
-```
-
-## Why
-
-Developing software is usually easier if you break your project into smaller separate pieces, since that often removes unexpected interactions and dramatically reduces the complexity of the problems you'll need to solve, and simply writing smaller projects in the first place [isn't necessarily the answer](https://medium.com/@Rich_Harris/small-modules-it-s-not-quite-that-simple-3ca532d65de4). Unfortunately, JavaScript has not historically included this capability as a core feature in the language.
-
-This finally changed with ES modules support in JavaScript, which provides a syntax for importing and exporting functions and data so they can be shared between separate scripts. Most browsers and Node.js support ES modules. However, Node.js releases before 12.17 support ES modules only behind the `--experimental-modules` flag, and older browsers like Internet Explorer do not support ES modules at all. Rollup allows you to write your code using ES modules, and run your application even in environments that do not support ES modules natively. For environments that support them, Rollup can output optimized ES modules; for environments that don't, Rollup can compile your code to other formats such as CommonJS modules, AMD modules, and IIFE-style scripts. This means that you get to _write future-proof code_, and you also get the tremendous benefits of...
-
-## Tree Shaking
-
-In addition to enabling the use of ES modules, Rollup also statically analyzes and optimizes the code you are importing, and will exclude anything that isn't actually used. This allows you to build on top of existing tools and modules without adding extra dependencies or bloating the size of your project.
-
-For example, with CommonJS, the _entire tool or library must be imported_.
-
-```js
-// import the entire utils object with CommonJS
-var utils = require('node:utils');
-var query = 'Rollup';
-// use the ajax method of the utils object
-utils.ajax('https://api.example.com?search=' + query).then(handleResponse);
-```
-
-But with ES modules, instead of importing the whole `utils` object, we can just import the one `ajax` function we need:
-
-```js
-// import the ajax function with an ES import statement
-import { ajax } from 'node:utils';
-
-var query = 'Rollup';
-// call the ajax function
-ajax('https://api.example.com?search=' + query).then(handleResponse);
-```
-
-Because Rollup includes the bare minimum, it results in lighter, faster, and less complicated libraries and applications. Since this approach is based on explicit `import` and `export` statements, it is vastly more effective than simply running an automated minifier to detect unused variables in the compiled output code.
-
-## Compatibility
-
-### Importing CommonJS
-
-Rollup can import existing CommonJS modules [through a plugin](https://github.com/rollup/plugins/tree/master/packages/commonjs).
-
-### Publishing ES Modules
-
-To make sure your ES modules are immediately usable by tools that work with CommonJS such as Node.js and webpack, you can use Rollup to compile to UMD or CommonJS format, and then point to that compiled version with the `main` property in your `package.json` file. If your `package.json` file also has a `module` field, ES-module-aware tools like Rollup and [webpack](https://webpack.js.org/) will [import the ES module version](https://github.com/rollup/rollup/wiki/pkg.module) directly.
-
-## Contributors
->>>>>>> 91352494fc722bcd5e8e922cd1497b34aec57a67
 
 This project exists thanks to all the people who contribute. [[Contribute](CONTRIBUTING.md)]. <a href="https://github.com/rollup/rollup/graphs/contributors"><img src="https://opencollective.com/rollup/contributors.svg?width=890" /></a>. If you want to contribute yourself, head over to the [contribution guidelines](CONTRIBUTING.md).
 
diff --git a/docs/command-line-interface/index.md b/docs/command-line-interface/index.md
index beeb374b1..aae237f18 100755
--- a/docs/command-line-interface/index.md
+++ b/docs/command-line-interface/index.md
@@ -41,14 +41,10 @@ rollup --config rollup.config.ts --configPlugin typescript
 ```javascript twoslash
 // rollup.config.js
 
-<<<<<<< HEAD
 // 可以是数组（即多个输入源）
-=======
-// can be an array (for multiple inputs)
 // ---cut-start---
 /** @type {import('rollup').RollupOptions} */
 // ---cut-end---
->>>>>>> 91352494fc722bcd5e8e922cd1497b34aec57a67
 export default {
 	// 核心输入选项
 	external,
@@ -237,16 +233,7 @@ export default commandLineArgs => {
 export default commandLineArgs => {
 	const inputBase = commandLineArgs.input || 'main.js';
 
-<<<<<<< HEAD
-  // 这会使 Rollup 忽略 CLI 参数
-  delete commandLineArgs.input;
-  return {
-    input: 'src/entries/' + inputBase,
-    output: { ... }
-  }
-}
-=======
-	// this will make Rollup ignore the CLI argument
+	// 这会使 Rollup 忽略 CLI 参数
 	delete commandLineArgs.input;
 	return {
 		input: 'src/entries/' + inputBase,
@@ -255,7 +242,6 @@ export default commandLineArgs => {
 		}
 	};
 };
->>>>>>> 91352494fc722bcd5e8e922cd1497b34aec57a67
 ```
 
 ### 填写配置时的智能提示 {#config-intellisense}
@@ -334,15 +320,9 @@ rollup --config node:my-special-config
 import { fileURLToPath } from 'node:url';
 
 export default {
-<<<<<<< HEAD
-  ...,
-  // 为 <currentdir>/src/some-file.js 生成绝对路径
-  external: [fileURLToPath(new URL('src/some-file.js', import.meta.url))]
-=======
 	/* ..., */
-	// generates an absolute path for <currentdir>/src/some-file.js
+	// 为 <currentdir>/src/some-file.js 生成绝对路径
 	external: [fileURLToPath(new URL('src/some-file.js', import.meta.url))]
->>>>>>> 91352494fc722bcd5e8e922cd1497b34aec57a67
 };
 ```
 
@@ -393,7 +373,6 @@ export default {
 许多选项都有等效的命令行标志。在这些情况下，如果你正在使用配置文件，则此处传递的任何参数都将覆盖配置文件。以下是所有支持的选项列表：
 
 ```
-<<<<<<< HEAD
 -c, --config <filename>     使用此配置文件
 														（如果使用参数但未指定值，则默认为 rollup.config.js）
 -d, --dir <dirname>         用于块的目录（如果不存在，则打印到 stdout）
@@ -424,7 +403,7 @@ export default {
 --no-esModule               不添加 __esModule 属性
 --exports <mode>            指定导出模式（auto、default、named、none）
 --extend                    扩展由 --name 定义的全局变量
---no-externalImportAssertions 在 "es" 输出中省略导入断言
+--no-externalImportAttributes 在 "es" 格式输出中省略导入属性
 --no-externalLiveBindings   不生成支持实时绑定的代码
 --failAfterWarnings         如果生成的构建产生警告，则退出并显示错误
 --filterLogs <filter>       过滤日志信息
@@ -439,6 +418,7 @@ export default {
 --generatedCode.symbols     在生成的代码中使用符号
 --hashCharacters <name>     使用指定的字符集来生成文件的哈希值
 --no-hoistTransitiveImports 不将中转导入提升到入口块中
+--importAttributesKey <name> 使用特定的关键词作为导入属性
 --no-indent                 不缩进结果
 --inlineDynamicImports      使用动态导入时创建单次打包
 --no-interop                不包括交互操作块
@@ -487,102 +467,6 @@ export default {
 --watch.onError <cmd>       在 "ERROR" 事件上运行的 Shell 命令
 --watch.onStart <cmd>       在 "START" 事件上运行的 Shell 命令
 --watch.skipWrite           在监视时不要将文件写入磁盘
-=======
--c, --config <filename>     Use this config file (if argument is used but value
-                              is unspecified, defaults to rollup.config.js)
--d, --dir <dirname>         Directory for chunks (if absent, prints to stdout)
--e, --external <ids>        Comma-separate list of module IDs to exclude
--f, --format <format>       Type of output (amd, cjs, es, iife, umd, system)
--g, --globals <pairs>       Comma-separate list of `moduleID:Global` pairs
--h, --help                  Show this help message
--i, --input <filename>      Input (alternative to <entry file>)
--m, --sourcemap             Generate sourcemap (`-m inline` for inline map)
--n, --name <name>           Name for UMD export
--o, --file <output>         Single output file (if absent, prints to stdout)
--p, --plugin <plugin>       Use the plugin specified (may be repeated)
--v, --version               Show version number
--w, --watch                 Watch files in bundle and rebuild on changes
---amd.autoId                Generate the AMD ID based off the chunk name
---amd.basePath <prefix>     Path to prepend to auto generated AMD ID
---amd.define <name>         Function to use in place of `define`
---amd.forceJsExtensionForImports Use `.js` extension in AMD imports
---amd.id <id>               ID for AMD module (default is anonymous)
---assetFileNames <pattern>  Name pattern for emitted assets
---banner <text>             Code to insert at top of bundle (outside wrapper)
---chunkFileNames <pattern>  Name pattern for emitted secondary chunks
---compact                   Minify wrapper code
---context <variable>        Specify top-level `this` value
---no-dynamicImportInCjs     Write external dynamic CommonJS imports as require
---entryFileNames <pattern>  Name pattern for emitted entry chunks
---environment <values>      Settings passed to config file (see example)
---no-esModule               Do not add __esModule property
---exports <mode>            Specify export mode (auto, default, named, none)
---extend                    Extend global variable defined by --name
---no-externalImportAttributes Omit import attributes in "es" output
---no-externalLiveBindings   Do not generate code to support live bindings
---failAfterWarnings         Exit with an error if the build produced warnings
---filterLogs <filter>       Filter log messages
---footer <text>             Code to insert at end of bundle (outside wrapper)
---forceExit                 Force exit the process when done
---no-freeze                 Do not freeze namespace objects
---generatedCode <preset>    Which code features to use (es5/es2015)
---generatedCode.arrowFunctions Use arrow functions in generated code
---generatedCode.constBindings Use "const" in generated code
---generatedCode.objectShorthand Use shorthand properties in generated code
---no-generatedCode.reservedNamesAsProps Always quote reserved names as props
---generatedCode.symbols     Use symbols in generated code
---hashCharacters <name>     Use the specified character set for file hashes
---no-hoistTransitiveImports Do not hoist transitive imports into entry chunks
---importAttributesKey <name> Use the specified keyword for import attributes
---no-indent                 Don't indent result
---inlineDynamicImports      Create single bundle when using dynamic imports
---no-interop                Do not include interop block
---intro <text>              Code to insert at top of bundle (inside wrapper)
---logLevel <level>          Which kind of logs to display
---no-makeAbsoluteExternalsRelative Prevent normalization of external imports
---maxParallelFileOps <value> How many files to read in parallel
---minifyInternalExports     Force or disable minification of internal exports
---noConflict                Generate a noConflict method for UMD globals
---outro <text>              Code to insert at end of bundle (inside wrapper)
---perf                      Display performance timings
---no-preserveEntrySignatures Avoid facade chunks for entry points
---preserveModules           Preserve module structure
---preserveModulesRoot       Put preserved modules under this path at root level
---preserveSymlinks          Do not follow symlinks when resolving files
---no-reexportProtoFromExternal Ignore `__proto__` in star re-exports
---no-sanitizeFileName       Do not replace invalid characters in file names
---shimMissingExports        Create shim variables for missing exports
---silent                    Don't print warnings
---sourcemapBaseUrl <url>    Emit absolute sourcemap URLs with given base
---sourcemapExcludeSources   Do not include source code in source maps
---sourcemapFile <file>      Specify bundle position for source maps
---sourcemapFileNames <pattern> Name pattern for emitted sourcemaps
---stdin=ext                 Specify file extension used for stdin input
---no-stdin                  Do not read "-" from stdin
---no-strict                 Don't emit `"use strict";` in the generated modules
---strictDeprecations        Throw errors for deprecated features
---no-systemNullSetters      Do not replace empty SystemJS setters with `null`
---no-treeshake              Disable tree-shaking optimisations
---no-treeshake.annotations  Ignore pure call annotations
---treeshake.correctVarValueBeforeDeclaration Deoptimize variables until declared
---treeshake.manualPureFunctions <names> Manually declare functions as pure
---no-treeshake.moduleSideEffects Assume modules have no side effects
---no-treeshake.propertyReadSideEffects Ignore property access side effects
---no-treeshake.tryCatchDeoptimization Do not turn off try-catch-tree-shaking
---no-treeshake.unknownGlobalSideEffects Assume unknown globals do not throw
---validate                  Validate output
---waitForBundleInput        Wait for bundle input files
---watch.buildDelay <number> Throttle watch rebuilds
---no-watch.clearScreen      Do not clear the screen when rebuilding
---watch.exclude <files>     Exclude files from being watched
---watch.include <files>     Limit watching to specified files
---watch.onBundleEnd <cmd>   Shell command to run on `"BUNDLE_END"` event
---watch.onBundleStart <cmd> Shell command to run on `"BUNDLE_START"` event
---watch.onEnd <cmd>         Shell command to run on `"END"` event
---watch.onError <cmd>       Shell command to run on `"ERROR"` event
---watch.onStart <cmd>       Shell command to run on `"START"` event
---watch.skipWrite           Do not write files to disk when watching
->>>>>>> 91352494fc722bcd5e8e922cd1497b34aec57a67
 ```
 
 以下标志仅通过命令行界面可用。所有其他标志都对应并覆盖其配置文件等效项，请参阅[选项大列表](../configuration-options/index.md)获取详细信息。
diff --git a/docs/configuration-options/index.md b/docs/configuration-options/index.md
index 6b8778050..349b63c17 100755
--- a/docs/configuration-options/index.md
+++ b/docs/configuration-options/index.md
@@ -650,13 +650,8 @@ export default {
 
 虽然 CommonJS 输出最初只支持 `require(…)` 语法来引入依赖，但最近的 Node 版本也开始支持 `import(…)` 语法，这是从 CommonJS 文件中引入 ES 模块的唯一方法。如果这个选项默认值为 `true`，表示 Rollup 会在 CommonJS 输出中保持外部依赖以 `import(…)` 表达式动态引入。将值设置为 `false`，以使用 `require(…)` 语法重写动态引入。
 
-<<<<<<< HEAD
-```js
-// 输入
-=======
 ```js twoslash
-// input
->>>>>>> 91352494fc722bcd5e8e922cd1497b34aec57a67
+// 输入
 import('external').then(console.log);
 
 // 设置 dynamicImportInCjs 为 true 或不设置的 cjs 输出
@@ -766,13 +761,8 @@ Promise.resolve()
 
 该选项表示在某些地方和辅助函数中使用 `const` 而不是 `var`。由于代码块的作用域，会使 Rollup 产生更有效的辅助函数。
 
-<<<<<<< HEAD
-```js
-// 输入
-=======
 ```js twoslash
-// input
->>>>>>> 91352494fc722bcd5e8e922cd1497b34aec57a67
+// 输入
 export * from 'external';
 
 // 设置 constBindings 为 false 的 cjs 输出
@@ -940,21 +930,17 @@ exports.foo = foo;
 
 默认情况下，创建多个 chunk 时，入口 chunk 的可传递引入将以空引入的形式被打包。详细信息和背景请查看 ["Why do additional imports turn up in my entry chunks when code-splitting?"](../faqs/index.md#why-do-additional-imports-turn-up-in-my-entry-chunks-when-code-splitting)。该选项的值为 `false` 将禁用此行为。当使用 [`output.preserveModules`](#output-preservemodules) 选项时，该选项会被忽略，使得永远不会取消引入。
 
-<<<<<<< HEAD
-### output.inlineDynamicImports {#output-inlinedynamicimports}
-=======
 ### output.importAttributesKey
 
-|          |                                |
-| -------: | :----------------------------- |
-|    Type: | `"with" \| "assert"`           |
-|     CLI: | `--importAttributesKey <name>` |
-| Default: | `"assert"`                     |
+|        |                                |
+| -----: | :----------------------------- |
+| 类型： | `"with" \| "assert"`           |
+|  CLI： | `--importAttributesKey <name>` |
+| 默认： | `"assert"`                     |
 
-This determines the keyword set that Rollup will use for import attributes.
+该选项决定 Rollup 用于导入属性的关键词集合。
 
-### output.inlineDynamicImports
->>>>>>> 91352494fc722bcd5e8e922cd1497b34aec57a67
+### output.inlineDynamicImports {#output-inlinedynamicimports}
 
 |        |                                                      |
 | -----: | :--------------------------------------------------- |
@@ -1312,14 +1298,10 @@ function getTranslatedStrings(currentLanguage) {
 function manualChunks(id, { getModuleInfo }) {
 	const match = /.*\.strings\.(\w+)\.js/.exec(id);
 	if (match) {
-<<<<<<< HEAD
 		const language = match[1]; // 例如 “en”
-=======
-		const language = match[1]; // e.g. "en"
 // ---cut-start---
 		/** @type {string[]} */
 // ---cut-end---
->>>>>>> 91352494fc722bcd5e8e922cd1497b34aec57a67
 		const dependentEntryPoints = [];
 
 		// 在这里，我们使用 Set 一次性处理每个依赖模块
diff --git a/docs/javascript-api/index.md b/docs/javascript-api/index.md
index 669d4015b..64dd35b6d 100755
--- a/docs/javascript-api/index.md
+++ b/docs/javascript-api/index.md
@@ -22,15 +22,7 @@ Rollup 提供了一个可从 Node.js 使用的 JavaScript API。你很少需要
 ```javascript twoslash
 import { rollup } from 'rollup';
 
-<<<<<<< HEAD
 // 请继续浏览下面的内容获取更多关于这个选项的细节
-const inputOptions = {...};
-
-// 你可以从相同的输入创建多个输出，
-// 以生成例如 CommonJS 和 ESM 这样的不同格式
-const outputOptionsList = [{...}, {...}];
-=======
-// see below for details on these options
 // ---cut-start---
 /** @type {import('rollup').InputOptions} */
 // ---cut-end---
@@ -38,8 +30,8 @@ const inputOptions = {
 	/* ... */
 };
 
-// you can create multiple outputs from the same input to generate e.g.
-// different formats like CommonJS and ESM
+// 你可以从相同的输入创建多个输出，
+// 以生成例如 CommonJS 和 ESM 这样的不同格式
 // ---cut-start---
 /** @type {import('rollup').OutputOptions[]} */
 // ---cut-end---
@@ -51,64 +43,39 @@ const outputOptionsList = [
 		/* ... */
 	}
 ];
->>>>>>> 91352494fc722bcd5e8e922cd1497b34aec57a67
 
 build();
 
 async function build() {
-<<<<<<< HEAD
-  let bundle;
-  let buildFailed = false;
-  try {
-    // 启动一次打包
-    bundle = await rollup(inputOptions);
-
-    // 一个文件名数组，表示此产物所依赖的文件
-    console.log(bundle.watchFiles);
-
-    await generateOutputs(bundle);
-  } catch (error) {
-    buildFailed = true;
-    // 进行一些错误报告
-    console.error(error);
-  }
-  if (bundle) {
-    // 关闭打包过程
-    await bundle.close();
-  }
-  process.exit(buildFailed ? 1 : 0);
-=======
 // ---cut-start---
 	/** @type {import('rollup').RollupBuild} */
 // ---cut-end---
 	let bundle;
 	let buildFailed = false;
 	try {
-		// create a bundle
+		// 启动一次打包
 		bundle = await rollup(inputOptions);
 
-		// an array of file names this bundle depends on
+		// 一个文件名数组，表示此产物所依赖的文件
 		console.log(bundle.watchFiles);
 
 		await generateOutputs(bundle);
 	} catch (error) {
 		buildFailed = true;
-		// do some error reporting
+		// 进行一些错误报告
 		console.error(error);
 	}
 	if (bundle) {
-		// closes the bundle
+		// 关闭打包过程
 		await bundle.close();
 	}
 	process.exit(buildFailed ? 1 : 0);
->>>>>>> 91352494fc722bcd5e8e922cd1497b34aec57a67
 }
 
 // ---cut-start---
 /** @param {import('rollup').RollupBuild} [bundle] */
 // ---cut-end---
 async function generateOutputs(bundle) {
-<<<<<<< HEAD
   for (const outputOptions of outputOptionsList) {
     // 生成特定于输出的内存中代码
     // 你可以在同一个 bundle 对象上多次调用此函数
@@ -157,56 +124,6 @@ async function generateOutputs(bundle) {
       }
     }
   }
-=======
-	for (const outputOptions of outputOptionsList) {
-		// generate output specific code in-memory
-		// you can call this function multiple times on the same bundle object
-		// replace bundle.generate with bundle.write to directly write to disk
-		const { output } = await bundle.generate(outputOptions);
-
-		for (const chunkOrAsset of output) {
-			if (chunkOrAsset.type === 'asset') {
-				// For assets, this contains
-				// {
-				//   fileName: string,              // the asset file name
-				//   source: string | Uint8Array    // the asset source
-				//   type: 'asset'                  // signifies that this is an asset
-				// }
-				console.log('Asset', chunkOrAsset);
-			} else {
-				// For chunks, this contains
-				// {
-				//   code: string,                  // the generated JS code
-				//   dynamicImports: string[],      // external modules imported dynamically by the chunk
-				//   exports: string[],             // exported variable names
-				//   facadeModuleId: string | null, // the id of a module that this chunk corresponds to
-				//   fileName: string,              // the chunk file name
-				//   implicitlyLoadedBefore: string[]; // entries that should only be loaded after this chunk
-				//   imports: string[],             // external modules imported statically by the chunk
-				//   importedBindings: {[imported: string]: string[]} // imported bindings per dependency
-				//   isDynamicEntry: boolean,       // is this chunk a dynamic entry point
-				//   isEntry: boolean,              // is this chunk a static entry point
-				//   isImplicitEntry: boolean,      // should this chunk only be loaded after other chunks
-				//   map: string | null,            // sourcemaps if present
-				//   modules: {                     // information about the modules in this chunk
-				//     [id: string]: {
-				//       renderedExports: string[]; // exported variable names that were included
-				//       removedExports: string[];  // exported variable names that were removed
-				//       renderedLength: number;    // the length of the remaining code in this module
-				//       originalLength: number;    // the original length of the code in this module
-				//       code: string | null;       // remaining code in this module
-				//     };
-				//   },
-				//   name: string                   // the name of this chunk as used in naming patterns
-				//   preliminaryFileName: string    // the preliminary file name of this chunk with hash placeholders
-				//   referencedFiles: string[]      // files referenced via import.meta.ROLLUP_FILE_URL_<id>
-				//   type: 'chunk',                 // signifies that this is a chunk
-				// }
-				console.log('Chunk', chunkOrAsset.modules);
-			}
-		}
-	}
->>>>>>> 91352494fc722bcd5e8e922cd1497b34aec57a67
 }
 ```
 <!-- prettier-ignore-end -->
@@ -332,7 +249,6 @@ const watchOptions = {
 const watcher = rollup.watch(watchOptions);
 
 watcher.on('event', event => {
-<<<<<<< HEAD
   // event.code 可以是以下之一：
   //   START        - 监视器正在（重新）启动
   //   BUNDLE_START - 单次打包
@@ -361,36 +277,6 @@ watcher.on('event', event => {
   //                      你应该在完成后调用 "event.result.close()"。
   // 如果从事件处理程序返回一个 Promise，则 Rollup
   // 将等待 Promise 解析后再继续。
-=======
-	// event.code can be one of:
-	//   START        — the watcher is (re)starting
-	//   BUNDLE_START — building an individual bundle
-	//                  * event.input will be the input options object if present
-	//                  * event.output contains an array of the "file" or
-	//                    "dir" option values of the generated outputs
-	//   BUNDLE_END   — finished building a bundle
-	//                  * event.input will be the input options object if present
-	//                  * event.output contains an array of the "file" or
-	//                    "dir" option values of the generated outputs
-	//                  * event.duration is the build duration in milliseconds
-	//                  * event.result contains the bundle object that can be
-	//                    used to generate additional outputs by calling
-	//                    bundle.generate or bundle.write. This is especially
-	//                    important when the watch.skipWrite option is used.
-	//                  You should call "event.result.close()" once you are done
-	//                  generating outputs, or if you do not generate outputs.
-	//                  This will allow plugins to clean up resources via the
-	//                  "closeBundle" hook.
-	//   END          — finished building all bundles
-	//   ERROR        — encountered an error while bundling
-	//                  * event.error contains the error that was thrown
-	//                  * event.result is null for build errors and contains the
-	//                    bundle object for output generation errors. As with
-	//                    "BUNDLE_END", you should call "event.result.close()" if
-	//                    present once you are done.
-	// If you return a Promise from your event handler, Rollup will wait until the
-	// Promise is resolved before continuing.
->>>>>>> 91352494fc722bcd5e8e922cd1497b34aec57a67
 });
 
 // 这将确保在每次运行后正确关闭打包
@@ -400,25 +286,17 @@ watcher.on('event', ({ result }) => {
 	}
 });
 
-<<<<<<< HEAD
 // 此外，你可以挂钩以下内容。
 // 同样，返回 Promise 以使 Rollup 在该阶段等待：
-watcher.on('change', (id, { event }) => { /* 更改了一个文件 */ })
-watcher.on('restart', () => { /* 新触发了一次运行 */ })
-watcher.on('close', () => { /* 监视器被关闭了，请看下面的代码 */ })
-=======
-// Additionally, you can hook into the following. Again, return a Promise to
-// make Rollup wait at that stage:
 watcher.on('change', (id, { event }) => {
-	/* a file was modified */
+	/* /* 更改了一个文件 */ */
 });
 watcher.on('restart', () => {
-	/* a new run was triggered */
+	/* 新触发了一次运行 */
 });
 watcher.on('close', () => {
-	/* the watcher was closed, see below */
+	/* 监视器被关闭了，请看下面的代码 */
 });
->>>>>>> 91352494fc722bcd5e8e922cd1497b34aec57a67
 
 // 停止监听
 watcher.close();
diff --git a/docs/plugin-development/index.md b/docs/plugin-development/index.md
index 5384d58cb..7dd18371d 100644
--- a/docs/plugin-development/index.md
+++ b/docs/plugin-development/index.md
@@ -505,15 +505,9 @@ import { foo } from '../bar.js';
 
 例如，你可以将其用作为入口点定义自定义代理模块的机制。以下插件将所有入口点代理到注入 polyfill 导入的模块中。
 
-<<<<<<< HEAD
-```js
+```js twoslash
 // 我们在 polyfill id 前面加上 \0，
 // 以告诉其他插件不要尝试加载或转换它
-=======
-```js twoslash
-// We prefix the polyfill id with \0 to tell other plugins not to try to load or
-// transform it
->>>>>>> 91352494fc722bcd5e8e922cd1497b34aec57a67
 const POLYFILL_ID = '\0polyfill';
 const PROXY_SUFFIX = '?inject-polyfill-proxy';
 
@@ -1647,15 +1641,9 @@ export default function addProxyPlugin() {
 
 这里是另一个更详细的示例，其中我们通过 `resolveDependencies` 选项和对 `this.load` 的重复调用来扫描整个依赖子图。我们使用已处理模块 ID 的 `Set` 来处理循环依赖关系。插件的目标是向每个动态导入的块添加日志，该日志仅列出块中的所有模块。虽然这只是一个玩具示例，但该技术可以用于例如为子图中导入的所有 CSS 创建单个样式标记。
 
-<<<<<<< HEAD
-```js
+```js twoslash
 // 前导的 \0 指示其他插件不要尝试解析、加载
 // 或转换我们的代理模块
-=======
-```js twoslash
-// The leading \0 instructs other plugins not to try to resolve, load or
-// transform our proxy modules
->>>>>>> 91352494fc722bcd5e8e922cd1497b34aec57a67
 const DYNAMIC_IMPORT_PROXY_PREFIX = '\0dynamic-import:';
 
 // ---cut-start---