Browse Source

build(deps): bump diff and @types/diff (#72467)

Bumps [diff](https://github.com/kpdecker/jsdiff) and
[@types/diff](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/diff).
These dependencies needed to be updated together.
Updates `diff` from 5.1.0 to 5.2.0
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a
href="https://github.com/kpdecker/jsdiff/blob/master/release-notes.md">diff's
changelog</a>.</em></p>
<blockquote>
<h2>v5.2.0</h2>
<p><a
href="https://github.com/kpdecker/jsdiff/compare/v5.1.0...master">Commits</a></p>
<ul>
<li><a
href="https://redirect.github.com/kpdecker/jsdiff/pull/411">#411</a> Big
performance improvement. Previously an O(n) array-copying operation
inside the innermost loop of jsdiff's base diffing code increased the
overall worst-case time complexity of computing a diff from O(n²) to
O(n³). This is now fixed, bringing the worst-case time complexity down
to what it theoretically should be for a Myers diff implementation.</li>
<li><a
href="https://redirect.github.com/kpdecker/jsdiff/pull/411">#448</a>
Performance improvement. Diagonals whose furthest-reaching D-path would
go off the edge of the edit graph are now skipped, rather than being
pointlessly considered as called for by the original Myers diff
algorithm. This dramatically speeds up computing diffs where the new
text just appends or truncates content at the end of the old text.</li>
<li><a
href="https://redirect.github.com/kpdecker/jsdiff/issues/351">#351</a>
Importing from the lib folder - e.g.
<code>require(&quot;diff/lib/diff/word.js&quot;)</code> - will work
again now. This had been broken for users on the latest version of Node
since Node 17.5.0, which changed how Node interprets the
<code>exports</code> property in jsdiff's <code>package.json</code>
file.</li>
<li><a
href="https://redirect.github.com/kpdecker/jsdiff/issues/344">#344</a>
<code>diffLines</code>, <code>createTwoFilesPatch</code>, and other
patch-creation methods now take an optional <code>stripTrailingCr:
true</code> option which causes Windows-style <code>\r\n</code> line
endings to be replaced with Unix-style <code>\n</code> line endings
before calculating the diff, just like GNU <code>diff</code>'s
<code>--strip-trailing-cr</code> flag.</li>
<li><a
href="https://redirect.github.com/kpdecker/jsdiff/pull/451">#451</a>
Added <code>diff.formatPatch</code>.</li>
<li><a
href="https://redirect.github.com/kpdecker/jsdiff/pull/450">#450</a>
Added <code>diff.reversePatch</code>.</li>
<li><a
href="https://redirect.github.com/kpdecker/jsdiff/pull/478">#478</a>
Added <code>timeout</code> option.</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/kpdecker/jsdiff/commit/370a9df73e12f3f4f4f6f001ac19617c4f9c1052"><code>370a9df</code></a>
5.2.0 release (<a
href="https://redirect.github.com/kpdecker/jsdiff/issues/483">#483</a>)</li>
<li><a
href="https://github.com/kpdecker/jsdiff/commit/a2f726abb9bcb01418b157e0eec0b722aef242a1"><code>a2f726a</code></a>
Add myself to the list of maintainers (<a
href="https://redirect.github.com/kpdecker/jsdiff/issues/482">#482</a>)</li>
<li><a
href="https://github.com/kpdecker/jsdiff/commit/dfc6fe42b5b793f4d82bfc38f5e5a6f962e757bc"><code>dfc6fe4</code></a>
Add examples to docs of creating and applying patches (importantly
including ...</li>
<li><a
href="https://github.com/kpdecker/jsdiff/commit/b5d1cfaa6da8bb759e6082b6164e01bba8b28810"><code>b5d1cfa</code></a>
Modify node_example.js to support showing added/deleted spaces (<a
href="https://redirect.github.com/kpdecker/jsdiff/issues/479">#479</a>)</li>
<li><a
href="https://github.com/kpdecker/jsdiff/commit/533893d4e7d7431395cf3fb7962c19ccefba95f0"><code>533893d</code></a>
Add <code>timeout</code> option (<a
href="https://redirect.github.com/kpdecker/jsdiff/issues/478">#478</a>)</li>
<li><a
href="https://github.com/kpdecker/jsdiff/commit/1f1ec9672b3af4ec68abf6c8e52e8beddfae86a8"><code>1f1ec96</code></a>
Replace broken link to Myers's paper in the README with a working one
(<a
href="https://redirect.github.com/kpdecker/jsdiff/issues/476">#476</a>)</li>
<li><a
href="https://github.com/kpdecker/jsdiff/commit/707fccc382c9e2c88ecd71818f214c9817d46be6"><code>707fccc</code></a>
Add note to README about setting <code>context</code> to Infinity or
MAX_SAFE_INTEGER. (...</li>
<li><a
href="https://github.com/kpdecker/jsdiff/commit/1c7514c4e655d21bdc66526c9687e4a8c0b5a35f"><code>1c7514c</code></a>
Fix mistake in README (<a
href="https://redirect.github.com/kpdecker/jsdiff/issues/471">#471</a>)</li>
<li><a
href="https://github.com/kpdecker/jsdiff/commit/ca8718ce605ca5f2d927a4bd403f642d2ea535d3"><code>ca8718c</code></a>
Bump follow-redirects from 1.14.8 to 1.15.4 (<a
href="https://redirect.github.com/kpdecker/jsdiff/issues/470">#470</a>)</li>
<li><a
href="https://github.com/kpdecker/jsdiff/commit/25a14af5d8124fc9731e9335f1965be236ae7898"><code>25a14af</code></a>
Migrate to DABH's fork of colors (<a
href="https://redirect.github.com/kpdecker/jsdiff/issues/469">#469</a>)</li>
<li>Additional commits viewable in <a
href="https://github.com/kpdecker/jsdiff/compare/v5.1.0...v5.2.0">compare
view</a></li>
</ul>
</details>
<details>
<summary>Maintainer changes</summary>
<p>This version was pushed to npm by <a
href="https://www.npmjs.com/~explodingcabbage">explodingcabbage</a>, a
new releaser for diff since your current version.</p>
</details>
<br />

Updates `@types/diff` from 5.0.2 to 5.2.1
<details>
<summary>Commits</summary>
<ul>
<li>See full diff in <a
href="https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/diff">compare
view</a></li>
</ul>
</details>
<br />


Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
dependabot[bot] 9 months ago
parent
commit
511d2e075a
2 changed files with 10 additions and 10 deletions
  1. 2 2
      package.json
  2. 8 8
      yarn.lock

+ 2 - 2
package.json

@@ -68,7 +68,7 @@
     "@tanstack/react-query": "^4.29.7",
     "@tanstack/react-query-devtools": "^4.36.1",
     "@types/color": "^3.0.3",
-    "@types/diff": "5.0.2",
+    "@types/diff": "5.2.1",
     "@types/dompurify": "^3.0.5",
     "@types/invariant": "^2.2.35",
     "@types/jest": "29.5.12",
@@ -106,7 +106,7 @@
     "cronstrue": "^2.50.0",
     "css-loader": "^7.1.1",
     "css-minimizer-webpack-plugin": "^6.0.0",
-    "diff": "5.1.0",
+    "diff": "5.2.0",
     "dompurify": "^3.1.5",
     "downsample": "1.4.0",
     "echarts": "5.4.0",

+ 8 - 8
yarn.lock

@@ -3555,10 +3555,10 @@
   resolved "https://registry.yarnpkg.com/@types/css-font-loading-module/-/css-font-loading-module-0.0.7.tgz#2f98ede46acc0975de85c0b7b0ebe06041d24601"
   integrity sha512-nl09VhutdjINdWyXxHWN/w9zlNCfr60JUqJbd24YXUuCwgeL0TpFSdElCwb6cxfB6ybE19Gjj4g0jsgkXxKv1Q==
 
-"@types/diff@5.0.2":
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/@types/diff/-/diff-5.0.2.tgz#dd565e0086ccf8bc6522c6ebafd8a3125c91c12b"
-  integrity sha512-uw8eYMIReOwstQ0QKF0sICefSy8cNO/v7gOTiIy9SbwuHyEecJUm7qlgueOO5S1udZ5I/irVydHVwMchgzbKTg==
+"@types/diff@5.2.1":
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/@types/diff/-/diff-5.2.1.tgz#cceae9c4b2dae5c6b8ab1ce1263601c255d87fb3"
+  integrity sha512-uxpcuwWJGhe2AR1g8hD9F5OYGCqjqWnBUQFD8gMZsDbv8oPHzxJF6iMO6n8Tk0AdzlxoaaoQhOYlIg/PukVU8g==
 
 "@types/dompurify@^3.0.5":
   version "3.0.5"
@@ -5951,10 +5951,10 @@ diff-sequences@^29.6.3:
   resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-29.6.3.tgz#4deaf894d11407c51efc8418012f9e70b84ea921"
   integrity sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==
 
-diff@5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/diff/-/diff-5.1.0.tgz#bc52d298c5ea8df9194800224445ed43ffc87e40"
-  integrity sha512-D+mk+qE8VC/PAUrlAU34N+VfXev0ghe5ywmpqrawphmVZc1bEfn56uo9qpyGp1p4xpzOHkSW4ztBd6L7Xx4ACw==
+diff@5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/diff/-/diff-5.2.0.tgz#26ded047cd1179b78b9537d5ef725503ce1ae531"
+  integrity sha512-uIFDxqpRZGZ6ThOk84hEfqWoHx2devRFvpTZcTHur85vImfaxUbTW9Ryh4CpCuDnToOP1CEtXKIgytHBPVff5A==
 
 diff@^4.0.1:
   version "4.0.2"