Skip to content

Commit 82f940e

Browse files
committed
docs(cn): resolve conflicts
1 parent 6389cc7 commit 82f940e

1 file changed

Lines changed: 0 additions & 4 deletions

File tree

docs/plugin-development/index.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -544,11 +544,7 @@ import { foo } from '../bar.js';
544544

545545
`importer` 是导入模块的解析完全后的 id。在解析入口点时,`importer` 通常为 `undefined`。这里的一个例外是通过 [`this.emitFile`](#this-emitfile) 生成的入口点,这里可以提供一个 `importer` 参数。
546546

547-
<<<<<<< HEAD
548547
`importerAttributes` 是导入模块的导入属性。在解析入口点时,`importerAttributes` 通常为 `undefined`
549-
=======
550-
The `importerAttributes` are the import attributes of the importing module. When resolving entry points, `importerAttributes` will usually be `undefined`.
551-
>>>>>>> af91d778cdf564dd1ae1bfd6e92604ec031824a7
552548

553549
对于这些情况,`isEntry` 选项将告诉你我们正在解析用户定义的入口点、已产出的块,还是是否为 [`this.resolve`](#this-resolve) 上下文函数提供了 `isEntry` 参数。
554550

0 commit comments

Comments
 (0)