Update dependency diff to v9#451
Open
renovate[bot] wants to merge 1 commit intomainfrom
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR contains the following updates:
7.0.0→9.0.0Warning
Some dependencies could not be looked up. Check the Dependency Dashboard for more information.
Test plan: CI should pass with updated dependencies. No review required: this is an automated dependency update PR.
Release Notes
kpdecker/jsdiff (diff)
v9.0.0Compare Source
(All changes part of PR #672.)
ES5 support is dropped.
parsePatchnow usesTextDecoderandUint8Array, which are not available in ES5, and TypeScript is now compiled with the "es6"target. From now on, I intend to freely use any features that are deemed "Widely available" by Baseline. Users who need ES5 support should stick to version 8.C-style quoted strings in filename headers are now properly supported.
When the name of either the old or new file in a patch contains "special characters", both GNU
diffand Git quote the filename in the patch's headers and escape special characters using the same escape sequences that are used in string literals in C, including octal escapes for all non-ASCII characters. Previously, jsdiff had very little support for this;parsePatchwould remove the quotes, and unescape any escaped backslashes, but would not unescape other escape sequences.formatPatch, meanwhile, did not quote or escape special characters at all.Now,
parsePatchparses all the possible escape sequences that GNU diff (or Git) ever output, andformatPatchquotes and escapes filenames containing special characters in the same way GNU diff does.formatPatchnow omits file headers whenoldFileNameornewFileNamein the provided patch object areundefined, regardless of theheaderOptionsparameter. (Previously, it would treat the absence ofoldFileNameornewFileNameas indicating the filename was the word "undefined" and emit headers--- undefined/+++ undefined.)formatPatchno longer outputs trailing tab characters at the end of---/+++headers.Previously, if
formatPatchwas passed a patch object to serialize that had empty strings for theoldHeaderornewHeaderproperty, it would include a trailing tab character after the filename in the---and/or+++file header. Now, this scenario is treated the same as whenoldHeader/newHeaderisundefined- i.e. the trailing tab is omitted.formatPatchno longer mutates its input when serializing a patch containing a hunk where either the old or new content contained zero lines. (Such a hunk occurs only when the hunk has no context lines and represents a pure insertion or pure deletion, which for instance will occur whenever one of the two files being diffed is completely empty.) PreviouslyformatPatchwould provide the correct output but also mutate theoldLinesornewLinesproperty on the hunk, changing the meaning of the underlying patch.Git-style patches are now supported by
parsePatch,formatPatch, andreversePatch.Patches output by
git diffcan include some features that are unlike those output by GNUdiff, and therefore not handled by an ordinary unified diff format parser. An ordinary diff simply describes the differences between the content of two files, but Git diffs can also indicate, via "extended headers", the creation or deletion of (potentially empty) files, indicate that a file was renamed, and contain information about file mode changes. Furthermore, when these changes appear in a diff in the absence of a content change (e.g. when an empty file is created, or a file is renamed without content changes), the patch will contain no associated---/+++file headers nor any hunks.jsdiff previously did not support parsing Git's extended headers, nor hunkless patches. Now
parsePatchparses some of the extended headers, parses hunkless Git patches, and can determine filenames (e.g. from the extended headers) when parsing a patch that includes no---or+++file headers. The additional information conveyed by the extended headers we support is recorded on new fields on the result object returned byparsePatch. SeeisGitand subsequent properties in the docs in the README.md file.formatPatchnow outputs extended headers based on these new Git-specific properties, andreversePatchrespects them as far as possible (with one unavoidable caveat noted in the README.md file).Unpaired file headers now cause
parsePatchto throw.It remains acceptable to have a patch with no file headers whatsoever (e.g. one that begins with a
@@​hunk header on the very first line), but a patch with only a---header or only a+++header is now considered an error.parsePatchis now more tolerant of "trailing garbage"That is: after a patch, or between files/indexes in a patch, it is now acceptable to have arbitrary lines of "garbage" (so long as they unambiguously have no syntactic meaning - e.g. trailing garbage that leads with a
+,-, orand thus is interpretable as part of a hunk still triggers a throw).This means we no longer reject patches output by tools that include extra data in "garbage" lines not understood by generic unified diff parsers. (For example, SVN patches can include "Property changes on:" lines that generic unified diff parsers should discard as garbage; jsdiff previously threw errors when encountering them.)
This change brings jsdiff's behaviour more in line with GNU
patch, which is highly permissive of "garbage".The
oldFileNameandnewFileNamefields ofStructuredPatchare now typed asstring | undefinedinstead ofstring. This type change reflects the (pre-existing) reality thatparsePatchcan produce patches without filenames (e.g. when parsing a patch that simply contains hunks with no file headers).v8.0.4Compare Source
diffWordswhen used with anIntl.Segmenter. If the text to be diffed included a combining mark after a whitespace character (i.e. roughly speaking, an accented space),diffWordswould previously crash. Now this case is handled correctly.v8.0.3Compare Source
Intl.SegmenterwithdiffWords. This has been almost completely broken since the feature was added in v6.0.0, since it would outright crash on any text that featured two consecutive newlines between a pair of words (a very common case).diffWordswhen used without anIntl.Segmenter. Specifically, the soft hyphen (U+00AD) is no longer considered to be a word break, and the multiplication and division signs (×and÷) are now treated as punctuation instead of as letters / word characters.createPatchetc. patches can now be customised somewhat. It now takes aheaderOptionsoption that can be used to disable the file headers entirely, or omit theIndex:line and/or the underline. In particular, this was motivated by a request to make jsdiff patches compatible with react-diff-view, which they now are if produced withheaderOptions: FILE_HEADERS_ONLY.parsePatchwhereby adversarial input could cause a memory-leaking infinite loop, typically crashing the calling process. Also fixed ReDOS vulnerabilities whereby adversarially-crafted patch headers could take cubic time to parse. Now,parsePatchshould reliably take linear time. (Handling of headers that include the line break characters\r,\u2028, or\u2029in non-trailing positions is also now more reasonable as side effect of the fix.)v8.0.2Compare Source
diffSentenceswith old Safari versions. This was broken in 8.0.0 by the introduction of a regex with a lookbehind assertion; these weren't supported in Safari prior to version 16.4.sideEffects: false.v8.0.1Compare Source
diffJsonwhich were broken by 8.0.0. The new bundled types in 8.0.0 only alloweddiffJsonto be passed string arguments, but it should've been possible to pass either strings or objects (and now is). Thanks to Josh Kelley for the fix.v8.0.0Compare Source
diffSentences:["foo.", " ", "bar."]but "foo. bar" tokenized to["foo.", " bar"]- i.e. whether the space between sentences was treated as a separate token depended upon whether the final sentence had trailing punctuation or not. This was arbitrary and surprising; it is no longer the case.)diffWordstaking O(n^2) time in pathological cases.push()using.applyor the spread operator and hitting the JS-implementation-specific limit on the maximum number of arguments to a function, as shown at https://stackoverflow.com/a/56809779/1709587; thus the exact threshold to hit the error will depend on the environment in which you were running JsDiff.)mergefunction. Previously JsDiff included an undocumented function calledmergethat was meant to, in some sense, merge patches. It had at least a couple of serious bugs that could lead to it returning unambiguously wrong results, and it was difficult to simply "fix" because it was unclear precisely what it was meant to do. For now, the fix is to remove it entirely.the
diffpackage on npm now includes its own TypeScript type definitions. Users who previously used the@types/diffnpm package from DefinitelyTyped should remove that dependency when upgrading JsDiff to v8.Note that the transition from the DefinitelyTyped types to JsDiff's own type definitions includes multiple fixes and also removes many exported types previously used for
optionsarguments to diffing and patch-generation functions. (There are now different exported options types for abortable calls - ones with atimeoutormaxEditLengththat may give a result ofundefined- and non-abortable calls.) See the TypeScript section of the README for some usage tips.The
Diffobject is now a class. Custom extensions ofDiff, as described in the "Defining custom diffing behaviors" section of the README, can therefore now be done by writing aclass CustomDiff extends Diffand overriding methods, instead of the old way based on prototype inheritance. (I think code that did things the old way should still work, though!)diff/lib/index.es6.jsanddiff/lib/index.mjsno longer exist, and the ESM version of the library is no longer bundled into a single file.The
ignoreWhitespaceoption fordiffWordsis no longer included in the type declarations. The effect of passingignoreWhitespace: truehas always been to makediffWordsjust calldiffWordsWithSpaceinstead, which was confusing, because that behaviour doesn't seem properly described as "ignoring" whitespace at all. The property remains available to non-TypeScript applications for the sake of backwards compatibility, but TypeScript applications will now see a type error if they try to passignoreWhitespace: truetodiffWordsand should change their code to calldiffWordsWithSpaceinstead.JsDiff no longer purports to support ES3 environments. (I'm pretty sure it never truly did, despite claiming to in its README, since even the 1.0.0 release used
Array.mapwhich was added in ES5.)diffJson'sstringifyReplaceroption behaves more likeJSON.stringify'sreplacerargument now. In particular:keypassed to the replacer when the top-level object is passed in asvalueis now""(previously, wasundefined), and thekeypassed with an array element is the array index as a string, like"0"or"1"(previously was whatever the key for the entire array was). Both the new behaviours match that ofJSON.stringify.undefinedwhen called in async mode (i.e. with a callback). Previously, there was an odd quirk where they would returntrueif the strings being diffed were equal andundefinedotherwise.Configuration
📅 Schedule: (in timezone America/Los_Angeles)
🚦 Automerge: Disabled by config. Please merge this manually once you are satisfied.
♻ Rebasing: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.
🔕 Ignore: Close this PR and you won't be reminded about this update again.
This PR was generated by Mend Renovate. View the repository job log.