docs(cn): resolve conflicts

rollup · Nov 14, 2024 · fbec424 · fbec424
1 parent df86cdc
commit fbec424
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 116 deletions.
diff --git a/docs/command-line-interface/index.md b/docs/command-line-interface/index.md
@@ -374,7 +374,6 @@ export default {
 许多选项都有等效的命令行标志。在这些情况下，如果你正在使用配置文件，则此处传递的任何参数都将覆盖配置文件。以下是所有支持的选项列表：
 
 ```
-<<<<<<< HEAD
 -c, --config <filename>     使用此配置文件
 														（如果使用参数但未指定值，则默认为 rollup.config.js）
 -d, --dir <dirname>         用于块的目录（如果不存在，则打印到 stdout）
@@ -441,6 +440,7 @@ export default {
 --shimMissingExports        为丢失的导出创建卡扣变量
 --silent                    不打印警告
 --sourcemapBaseUrl <url>    使用给定的基本 URL 发出绝对源映射 URL
+--sourcemapDebugIds         在源代码和源映射中生成唯一的 debug ID
 --sourcemapExcludeSources   在源映射中不包括源代码
 --sourcemapFile <file>      指定源映射的包位置
 --sourcemapFileNames <pattern> 编译后 sourcemap 的命名模式
@@ -469,103 +469,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
---sourcemapDebugIds         Emit unique debug ids in source and sourcemaps
---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
->>>>>>> ae1d14b7855ff6568a6697d37271a5eb4d8e2d3e
 ```
 
 以下标志仅通过命令行界面可用。所有其他标志都对应并覆盖其配置文件等效项，请参阅[选项大列表](../configuration-options/index.md)获取详细信息。

diff --git a/docs/configuration-options/index.md b/docs/configuration-options/index.md
@@ -1744,21 +1744,17 @@ export default {
 
 默认情况下，Rollup 生成的 sourcemap 使用相对 URL 路径来引用它们描述的文件。该选项可提供一个绝对基础 URL 路径，例如 `https://example.com`，sourcemap 将使用绝对 URL 路径来代替。
 
-<<<<<<< HEAD
-### output.sourcemapExcludeSources {#output-sourcemapexcludesources}
-=======
 ### output.sourcemapDebugIds
 
-|          |                                                |
-| -------: | :--------------------------------------------- |
-|    Type: | `boolean`                                      |
-|     CLI: | `--sourcemapDebugIds`/`--no-sourcemapDebugIds` |
-| Default: | `false`                                        |
+|        |                                                |
+| -----: | :--------------------------------------------- |
+| 类型： | `boolean`                                      |
+|  CLI： | `--sourcemapDebugIds`/`--no-sourcemapDebugIds` |
+| 默认： | `false`                                        |
 
-if `true`, unique ids will be emitted in source and sourcemaps which streamlines identifying sourcemaps across different builds. See the [TC39 sourcemap debug ID proposal](https://github.com/tc39/source-map/blob/main/proposals/debug-id.md) for more details.
+如果设为 `true`，将在源代码和 sourcemap 中生成唯一的 ID，这有助于在不同的构建中识别 sourcemap。有关详细信息，请参阅 [TC39 sourcemap debug ID 提案](https://github.com/tc39/source-map/blob/main/proposals/debug-id.md)。
 
-### output.sourcemapExcludeSources
->>>>>>> ae1d14b7855ff6568a6697d37271a5eb4d8e2d3e
+### output.sourcemapExcludeSources {#output-sourcemapexcludesources}
 
 |        |                                                            |
 | -----: | :--------------------------------------------------------- |

diff --git a/docs/javascript-api/index.md b/docs/javascript-api/index.md
@@ -53,16 +53,12 @@ async function build() {
 	let bundle;
 	let buildFailed = false;
 	try {
-<<<<<<< HEAD
-		// 启动一次打包
-=======
-		// Create a bundle. If you are using TypeScript or a runtime that
-		// supports it, you can write
+		// 新建一个 bundle。如果你使用的是 TypeScript 或支持该特性的运行时，
+		// 你可以这样写：
 		//
 		// await using bundle = await rollup(inputOptions);
 		//
-		// instead and do not need to close the bundle explicitly below.
->>>>>>> ae1d14b7855ff6568a6697d37271a5eb4d8e2d3e
+		// 这样做就不需要在下面显式地关闭释放 bundle。
 		bundle = await rollup(inputOptions);
 
 		// 一个文件名数组，表示此产物所依赖的文件