node-diff3 is an open source project. You can submit bug reports, help out,
or learn more by visiting our project page on GitHub:
https://github.com/bhousel/node-diff3
Please star our project on GitHub to show your support! ⭐️
Breaking changes, which may affect downstream projects, are marked with a
⚠️ Replace rollup with esbuild for super fast build speed. Package outputs are now:"module": "./index.mjs"- ESM, modern JavaScript, works withimport"main": "./dist/index.cjs"- CJS bundle, modern JavaScript, works withrequire()"browser": "./dist/index.iife.js"- IIFE bundle, modern JavaScript, works in browser<script>tag- No longer distributing ES5 builds
⚠️ node-diff3 is marked as"type": "module"now
- (#44) Fix "Type 'Buffer' is not generic." TypeScript error
- (#42) Fix typo and add TypeScript definition for
patch
- (#39) Added a
mergeDiff3function to help print out Diff3 merge result - (#37) Fixed error in TypeScript definition for
MergeRegion
- (#35) Added TypeScript declaration file
⚠️ Several breaking changes:invertPatchnow returns a copy instead of modifying patch in place (#33)diff3Merge,merge,mergeDigInnow acceptoptionsobject instead ofexcludeFalseConflictsargument- Strings are split on whitespace by default. Use
stringSeparatoroption to override this behavior. (#9) diff3MergeIndicesrenamed todiff3MergeRegions
- Add test coverage for everything (#3)
- Pushing major version bump due to change in npm ownership
⚠️ Distribute both ESMindex.mjsand CJSindex.js- Fix improper hunk sorting (iD#3058)
- Add tests, TravisCI
- Initial release