Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Future 6.0.0 release #446

Merged
merged 15 commits into from
Feb 13, 2024
Merged

Future 6.0.0 release #446

merged 15 commits into from
Feb 13, 2024

Conversation

ExplodingCabbage
Copy link
Collaborator

Just a PR to keep track of the future 6.0.0 release. I'm currently merging non-breaking changes into master (for a 5.1.1 or 5.2.0 release) and breaking ones into 6.0.0-staging (for a subsequent release after that).

…th unified diffs (#435)

* Add test of vertical tab handling

* Stop treating stuff like vertical tabs as line breaks when dealing with unified diffs

* Add release notes

* Add a consistency test
… same, like the Myers diff paper does (#439)

* Add test for Unix diff-style ordering of deletions & insertions

* Tweak base.js to prefer extending paths that have previously done more deletions

* Remove now-redundant code to flip the order of immediately consecutive add and remove operations

* Fix existing tests

* add release notes
@adaboese
Copy link

adaboese commented Jan 1, 2024

Is there a pre-release available of this?

@ExplodingCabbage
Copy link
Collaborator Author

@adaboese you can just clone the repo, switch to this branch, and install it with npm install ./path/to/jsdiff if you want to use whatever WIP version I've got here prior to release. Expect several more PRs to merge before any release, though, and note that @kpdecker hasn't yet reviewed what I've done and is the ultimate arbiter of what gets released.

…aving them unset or explicitly using `undefined` (#455)

* Always set `added` and `removed` to `true` or `false`, rather than leaving them unset or explicitly using `undefined`

Resolves #233

* Add release notes
…ay you'd expect (#464)

* Add failing test showing maxEditLength: 0 is handled wrongly

* Handle maxEditLength === 0 correctly (test now passes)

* Document change
* Add a oneChangePerToken option to emit one change object per token instead of combining consecutive tokens into one change object

* Document oneChangePerToken

* Add release notes

* Add test (which fails; needs changes from #439)

* Add test of case with identical texts

* Add another test

* Move release notes to correct place now that I'm planning this for 6.0.0
* Ensure the left & right arguments to equals() always correspond to old and new values respectively

* Add test

* Add release notes
Conflicts:
	test/diff/array.js
* Add test demonstrating that maxEditLength crashes createPatch

* Fix maxEditLength handling in createPatch

* Add release notes
Conflicts:
	release-notes.md
@ExplodingCabbage
Copy link
Collaborator Author

Now that 5.2.0 is released, I'm going to merge this PR into master so that further work on 6.0.0 can just happen on master. To be clear, this does not mean 6.0.0 is ready for release yet.

@ExplodingCabbage ExplodingCabbage marked this pull request as ready for review February 13, 2024 15:54
@ExplodingCabbage ExplodingCabbage merged commit fc2e36d into master Feb 13, 2024
@ExplodingCabbage ExplodingCabbage deleted the 6.0.0-staging branch February 13, 2024 15:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants