[8.17] Update dependency diff to v8 (main) (#220898) (#221048)

# Backport

This will backport the following commits from `main` to `8.17`:
- [Update dependency diff to v8 (main)
(#220898)](#220898)

<!--- Backport version: 9.6.6 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sorenlouv/backport)

<!--BACKPORT
[{"author":{"name":"elastic-renovate-prod[bot]","email":"174716857+elastic-renovate-prod[bot]@users.noreply.github.com"},"sourceCommit":{"committedDate":"2025-05-20T04:05:23Z","message":"Update
dependency diff to v8 (main) (#220898)\n\nThis PR contains the following
updates:\n\n| Package | Type | Update | Change | Pending
|\n|---|---|---|---|---|\n|
[diff](https://redirect.github.com/kpdecker/jsdiff) | dependencies
|\nmajor | [`^7.0.0`
->\n`^8.0.0`](https://renovatebot.com/diffs/npm/diff/7.0.0/8.0.0) |
`8.0.1`\n|\n\n---\n\n### Release
Notes\n\n<details>\n<summary>kpdecker/jsdiff
(diff)</summary>\n\n###\n[`v8.0.0`](https://redirect.github.com/kpdecker/jsdiff/blob/HEAD/release-notes.md#800)\n\n[Compare\nSource](https://redirect.github.com/kpdecker/jsdiff/compare/7.0.0...v8.0.0)\n\n-
[#&#8203;580](https://redirect.github.com/kpdecker/jsdiff/pull/580)\n**Multiple
tweaks to `diffSentences`**:\n- tokenization no longer takes quadratic
time on pathological inputs\n(reported as a ReDOS vulnerability by
Snyk); is now linear instead\n- the final sentence in the string is now
handled the same by the\ntokenizer regardless of whether it has a
trailing punctuation mark or\nnot. (Previously, \"foo. bar.\" tokenized
to `[\"foo.\", \" \", \"bar.\"]` but\n\"foo. bar\" tokenized to
`[\"foo.\", \" bar\"]` - i.e. whether the space\nbetween sentences was
treated as a separate token depended upon whether\nthe final sentence
had trailing punctuation or not. This was arbitrary\nand surprising; it
is no longer the case.)\n- in a string that starts with a sentence end,
like \"! hello.\", the \"!\"\nis now treated as a separate sentence\n-
the README now correctly documents the tokenization behaviour (it
was\nwrong before)\n-
[#&#8203;581](https://redirect.github.com/kpdecker/jsdiff/pull/581)
-\n**fixed some regex operations used for tokenization in
`diffWords`\ntaking O(n^2) time** in pathological cases\n-
[#&#8203;595](https://redirect.github.com/kpdecker/jsdiff/pull/595)
-\n**fixed a crash in patch creation functions when handling a single
hunk\nconsisting of a very large number (e.g. >130k) of lines**. (This
was\ncaused by spreading indefinitely-large arrays to `.push()`
using\n`.apply` or the spread operator and hitting
the\nJS-implementation-specific limit on the maximum number of arguments
to a\nfunction, as shown at
https://stackoverflow.com/a/56809779/1709587; thus\nthe exact threshold
to hit the error will depend on the environment in\nwhich you were
running JsDiff.)\n-
[#&#8203;596](https://redirect.github.com/kpdecker/jsdiff/pull/596)
-\n**removed the `merge` function**. Previously JsDiff included
an\nundocumented function called `merge` that was meant to, in some
sense,\nmerge patches. It had at least a couple of serious bugs that
could lead\nto it returning unambiguously wrong results, and it was
difficult to\nsimply \"fix\" because it was [unclear precisely what it
was meant
to\ndo](https://redirect.github.com/kpdecker/jsdiff/issues/181#issuecomment-2198319542).\nFor
now, the fix is to remove it entirely.\n-
[#&#8203;591](https://redirect.github.com/kpdecker/jsdiff/pull/591)
-\nJsDiff's source code has been rewritten in TypeScript. This
change\nentails the following changes for end users:\n- **the `diff`
package on npm now includes its own TypeScript type\ndefinitions**.
Users who previously used the `@types/diff` npm package\nfrom
DefinitelyTyped should remove that dependency when upgrading JsDiff\nto
v8.\n\nNote that the transition from the DefinitelyTyped types to
JsDiff's own\ntype definitions includes multiple fixes and also removes
many exported\ntypes previously used for `options` arguments to diffing
and\npatch-generation functions. (There are now different exported
options\ntypes for abortable calls - ones with a `timeout` or
`maxEditLength`\nthat may give a result of `undefined` - and
non-abortable calls.) See\nthe TypeScript section of the README for some
usage tips.\n\n- **The `Diff` object is now a class**. Custom extensions
of `Diff`, as\ndescribed in the \"Defining custom diffing behaviors\"
section of the\nREADME, can therefore now be done by writing a `class
CustomDiff extends\nDiff` and overriding methods, instead of the old way
based on prototype\ninheritance. (I *think* code that did things the old
way should still\nwork, though!)\n\n- **`diff/lib/index.es6.js` and
`diff/lib/index.mjs` no longer exist,\nand the ESM version of the
library is no longer bundled into a single\nfile.**\n\n- **The
`ignoreWhitespace` option for `diffWords` is no longer included\nin the
type declarations**. The effect of passing `ignoreWhitespace:\ntrue` has
always been to make `diffWords` just call `diffWordsWithSpace`\ninstead,
which was confusing, because that behaviour doesn't seem\nproperly
described as \"ignoring\" whitespace at all. The property
remains\navailable to non-TypeScript applications for the sake of
backwards\ncompatability, but TypeScript applications will now see a
type error if\nthey try to pass `ignoreWhitespace: true` to `diffWords`
and should\nchange their code to call `diffWordsWithSpace` instead.\n\n-
JsDiff no longer purports to support ES3 environments. (I'm pretty\nsure
it never truly did, despite claiming to in its README, since even\nthe
1.0.0 release used `Array.map` which was added in ES5.)\n-
[#&#8203;601](https://redirect.github.com/kpdecker/jsdiff/pull/601)
-\n**`diffJson`'s `stringifyReplacer` option behaves more
like\n`JSON.stringify`'s `replacer` argument now.** In particular:\n-
Each key/value pair now gets passed through the replacer once
instead\nof twice\n- The `key` passed to the replacer when the top-level
object is passed\nin as `value` is now `\"\"` (previously, was
`undefined`), and the `key`\npassed with an array element is the array
index as a string, like `\"0\"`\nor `\"1\"` (previously was whatever the
key for the entire array was).\nBoth the new behaviours match that of
`JSON.stringify`.\n-
[#&#8203;602](https://redirect.github.com/kpdecker/jsdiff/pull/602)
-\n**diffing functions now consistently return `undefined` when called
in\nasync mode** (i.e. with a callback). Previously, there was an odd
quirk\nwhere they would return `true` if the strings being diffed were
equal\nand `undefined` otherwise.\n\n</details>\n\n---\n\n###
Configuration\n\n📅 **Schedule**: Branch creation - At any time (no
schedule defined),\nAutomerge - At any time (no schedule defined).\n\n🚦
**Automerge**: Disabled by config. Please merge this manually once
you\nare satisfied.\n\n♻ **Rebasing**: Whenever PR becomes conflicted,
or you tick the\nrebase/retry checkbox.\n\n🔕 **Ignore**: Close this PR
and you won't be reminded about this update\nagain.\n\n---\n\n- [ ] If
you want to rebase/retry this PR, check\nthis box\n\n---\n\nThis PR has
been generated by
[Renovate\nBot](https://redirect.github.com/renovatebot/renovate).\n\n\n\n---------\n\nCo-authored-by:
elastic-renovate-prod[bot]
<174716857+elastic-renovate-prod[bot]@users.noreply.github.com>\nCo-authored-by:
Davis McPhee
<[email protected]>","sha":"dbd586662598348af0c193b354f3317bed835751","branchLabelMapping":{"^v9.1.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","Team:DataDiscovery","backport:all-open","v9.1.0"],"title":"Update
dependency diff to v8
(main)","number":220898,"url":"https://github.com/elastic/kibana/pull/220898","mergeCommit":{"message":"Update
dependency diff to v8 (main) (#220898)\n\nThis PR contains the following
updates:\n\n| Package | Type | Update | Change | Pending
|\n|---|---|---|---|---|\n|
[diff](https://redirect.github.com/kpdecker/jsdiff) | dependencies
|\nmajor | [`^7.0.0`
->\n`^8.0.0`](https://renovatebot.com/diffs/npm/diff/7.0.0/8.0.0) |
`8.0.1`\n|\n\n---\n\n### Release
Notes\n\n<details>\n<summary>kpdecker/jsdiff
(diff)</summary>\n\n###\n[`v8.0.0`](https://redirect.github.com/kpdecker/jsdiff/blob/HEAD/release-notes.md#800)\n\n[Compare\nSource](https://redirect.github.com/kpdecker/jsdiff/compare/7.0.0...v8.0.0)\n\n-
[#&#8203;580](https://redirect.github.com/kpdecker/jsdiff/pull/580)\n**Multiple
tweaks to `diffSentences`**:\n- tokenization no longer takes quadratic
time on pathological inputs\n(reported as a ReDOS vulnerability by
Snyk); is now linear instead\n- the final sentence in the string is now
handled the same by the\ntokenizer regardless of whether it has a
trailing punctuation mark or\nnot. (Previously, \"foo. bar.\" tokenized
to `[\"foo.\", \" \", \"bar.\"]` but\n\"foo. bar\" tokenized to
`[\"foo.\", \" bar\"]` - i.e. whether the space\nbetween sentences was
treated as a separate token depended upon whether\nthe final sentence
had trailing punctuation or not. This was arbitrary\nand surprising; it
is no longer the case.)\n- in a string that starts with a sentence end,
like \"! hello.\", the \"!\"\nis now treated as a separate sentence\n-
the README now correctly documents the tokenization behaviour (it
was\nwrong before)\n-
[#&#8203;581](https://redirect.github.com/kpdecker/jsdiff/pull/581)
-\n**fixed some regex operations used for tokenization in
`diffWords`\ntaking O(n^2) time** in pathological cases\n-
[#&#8203;595](https://redirect.github.com/kpdecker/jsdiff/pull/595)
-\n**fixed a crash in patch creation functions when handling a single
hunk\nconsisting of a very large number (e.g. >130k) of lines**. (This
was\ncaused by spreading indefinitely-large arrays to `.push()`
using\n`.apply` or the spread operator and hitting
the\nJS-implementation-specific limit on the maximum number of arguments
to a\nfunction, as shown at
https://stackoverflow.com/a/56809779/1709587; thus\nthe exact threshold
to hit the error will depend on the environment in\nwhich you were
running JsDiff.)\n-
[#&#8203;596](https://redirect.github.com/kpdecker/jsdiff/pull/596)
-\n**removed the `merge` function**. Previously JsDiff included
an\nundocumented function called `merge` that was meant to, in some
sense,\nmerge patches. It had at least a couple of serious bugs that
could lead\nto it returning unambiguously wrong results, and it was
difficult to\nsimply \"fix\" because it was [unclear precisely what it
was meant
to\ndo](https://redirect.github.com/kpdecker/jsdiff/issues/181#issuecomment-2198319542).\nFor
now, the fix is to remove it entirely.\n-
[#&#8203;591](https://redirect.github.com/kpdecker/jsdiff/pull/591)
-\nJsDiff's source code has been rewritten in TypeScript. This
change\nentails the following changes for end users:\n- **the `diff`
package on npm now includes its own TypeScript type\ndefinitions**.
Users who previously used the `@types/diff` npm package\nfrom
DefinitelyTyped should remove that dependency when upgrading JsDiff\nto
v8.\n\nNote that the transition from the DefinitelyTyped types to
JsDiff's own\ntype definitions includes multiple fixes and also removes
many exported\ntypes previously used for `options` arguments to diffing
and\npatch-generation functions. (There are now different exported
options\ntypes for abortable calls - ones with a `timeout` or
`maxEditLength`\nthat may give a result of `undefined` - and
non-abortable calls.) See\nthe TypeScript section of the README for some
usage tips.\n\n- **The `Diff` object is now a class**. Custom extensions
of `Diff`, as\ndescribed in the \"Defining custom diffing behaviors\"
section of the\nREADME, can therefore now be done by writing a `class
CustomDiff extends\nDiff` and overriding methods, instead of the old way
based on prototype\ninheritance. (I *think* code that did things the old
way should still\nwork, though!)\n\n- **`diff/lib/index.es6.js` and
`diff/lib/index.mjs` no longer exist,\nand the ESM version of the
library is no longer bundled into a single\nfile.**\n\n- **The
`ignoreWhitespace` option for `diffWords` is no longer included\nin the
type declarations**. The effect of passing `ignoreWhitespace:\ntrue` has
always been to make `diffWords` just call `diffWordsWithSpace`\ninstead,
which was confusing, because that behaviour doesn't seem\nproperly
described as \"ignoring\" whitespace at all. The property
remains\navailable to non-TypeScript applications for the sake of
backwards\ncompatability, but TypeScript applications will now see a
type error if\nthey try to pass `ignoreWhitespace: true` to `diffWords`
and should\nchange their code to call `diffWordsWithSpace` instead.\n\n-
JsDiff no longer purports to support ES3 environments. (I'm pretty\nsure
it never truly did, despite claiming to in its README, since even\nthe
1.0.0 release used `Array.map` which was added in ES5.)\n-
[#&#8203;601](https://redirect.github.com/kpdecker/jsdiff/pull/601)
-\n**`diffJson`'s `stringifyReplacer` option behaves more
like\n`JSON.stringify`'s `replacer` argument now.** In particular:\n-
Each key/value pair now gets passed through the replacer once
instead\nof twice\n- The `key` passed to the replacer when the top-level
object is passed\nin as `value` is now `\"\"` (previously, was
`undefined`), and the `key`\npassed with an array element is the array
index as a string, like `\"0\"`\nor `\"1\"` (previously was whatever the
key for the entire array was).\nBoth the new behaviours match that of
`JSON.stringify`.\n-
[#&#8203;602](https://redirect.github.com/kpdecker/jsdiff/pull/602)
-\n**diffing functions now consistently return `undefined` when called
in\nasync mode** (i.e. with a callback). Previously, there was an odd
quirk\nwhere they would return `true` if the strings being diffed were
equal\nand `undefined` otherwise.\n\n</details>\n\n---\n\n###
Configuration\n\n📅 **Schedule**: Branch creation - At any time (no
schedule defined),\nAutomerge - At any time (no schedule defined).\n\n🚦
**Automerge**: Disabled by config. Please merge this manually once
you\nare satisfied.\n\n♻ **Rebasing**: Whenever PR becomes conflicted,
or you tick the\nrebase/retry checkbox.\n\n🔕 **Ignore**: Close this PR
and you won't be reminded about this update\nagain.\n\n---\n\n- [ ] If
you want to rebase/retry this PR, check\nthis box\n\n---\n\nThis PR has
been generated by
[Renovate\nBot](https://redirect.github.com/renovatebot/renovate).\n\n\n\n---------\n\nCo-authored-by:
elastic-renovate-prod[bot]
<174716857+elastic-renovate-prod[bot]@users.noreply.github.com>\nCo-authored-by:
Davis McPhee
<[email protected]>","sha":"dbd586662598348af0c193b354f3317bed835751"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v9.1.0","branchLabelMappingKey":"^v9.1.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/220898","number":220898,"mergeCommit":{"message":"Update
dependency diff to v8 (main) (#220898)\n\nThis PR contains the following
updates:\n\n| Package | Type | Update | Change | Pending
|\n|---|---|---|---|---|\n|
[diff](https://redirect.github.com/kpdecker/jsdiff) | dependencies
|\nmajor | [`^7.0.0`
->\n`^8.0.0`](https://renovatebot.com/diffs/npm/diff/7.0.0/8.0.0) |
`8.0.1`\n|\n\n---\n\n### Release
Notes\n\n<details>\n<summary>kpdecker/jsdiff
(diff)</summary>\n\n###\n[`v8.0.0`](https://redirect.github.com/kpdecker/jsdiff/blob/HEAD/release-notes.md#800)\n\n[Compare\nSource](https://redirect.github.com/kpdecker/jsdiff/compare/7.0.0...v8.0.0)\n\n-
[#&#8203;580](https://redirect.github.com/kpdecker/jsdiff/pull/580)\n**Multiple
tweaks to `diffSentences`**:\n- tokenization no longer takes quadratic
time on pathological inputs\n(reported as a ReDOS vulnerability by
Snyk); is now linear instead\n- the final sentence in the string is now
handled the same by the\ntokenizer regardless of whether it has a
trailing punctuation mark or\nnot. (Previously, \"foo. bar.\" tokenized
to `[\"foo.\", \" \", \"bar.\"]` but\n\"foo. bar\" tokenized to
`[\"foo.\", \" bar\"]` - i.e. whether the space\nbetween sentences was
treated as a separate token depended upon whether\nthe final sentence
had trailing punctuation or not. This was arbitrary\nand surprising; it
is no longer the case.)\n- in a string that starts with a sentence end,
like \"! hello.\", the \"!\"\nis now treated as a separate sentence\n-
the README now correctly documents the tokenization behaviour (it
was\nwrong before)\n-
[#&#8203;581](https://redirect.github.com/kpdecker/jsdiff/pull/581)
-\n**fixed some regex operations used for tokenization in
`diffWords`\ntaking O(n^2) time** in pathological cases\n-
[#&#8203;595](https://redirect.github.com/kpdecker/jsdiff/pull/595)
-\n**fixed a crash in patch creation functions when handling a single
hunk\nconsisting of a very large number (e.g. >130k) of lines**. (This
was\ncaused by spreading indefinitely-large arrays to `.push()`
using\n`.apply` or the spread operator and hitting
the\nJS-implementation-specific limit on the maximum number of arguments
to a\nfunction, as shown at
https://stackoverflow.com/a/56809779/1709587; thus\nthe exact threshold
to hit the error will depend on the environment in\nwhich you were
running JsDiff.)\n-
[#&#8203;596](https://redirect.github.com/kpdecker/jsdiff/pull/596)
-\n**removed the `merge` function**. Previously JsDiff included
an\nundocumented function called `merge` that was meant to, in some
sense,\nmerge patches. It had at least a couple of serious bugs that
could lead\nto it returning unambiguously wrong results, and it was
difficult to\nsimply \"fix\" because it was [unclear precisely what it
was meant
to\ndo](https://redirect.github.com/kpdecker/jsdiff/issues/181#issuecomment-2198319542).\nFor
now, the fix is to remove it entirely.\n-
[#&#8203;591](https://redirect.github.com/kpdecker/jsdiff/pull/591)
-\nJsDiff's source code has been rewritten in TypeScript. This
change\nentails the following changes for end users:\n- **the `diff`
package on npm now includes its own TypeScript type\ndefinitions**.
Users who previously used the `@types/diff` npm package\nfrom
DefinitelyTyped should remove that dependency when upgrading JsDiff\nto
v8.\n\nNote that the transition from the DefinitelyTyped types to
JsDiff's own\ntype definitions includes multiple fixes and also removes
many exported\ntypes previously used for `options` arguments to diffing
and\npatch-generation functions. (There are now different exported
options\ntypes for abortable calls - ones with a `timeout` or
`maxEditLength`\nthat may give a result of `undefined` - and
non-abortable calls.) See\nthe TypeScript section of the README for some
usage tips.\n\n- **The `Diff` object is now a class**. Custom extensions
of `Diff`, as\ndescribed in the \"Defining custom diffing behaviors\"
section of the\nREADME, can therefore now be done by writing a `class
CustomDiff extends\nDiff` and overriding methods, instead of the old way
based on prototype\ninheritance. (I *think* code that did things the old
way should still\nwork, though!)\n\n- **`diff/lib/index.es6.js` and
`diff/lib/index.mjs` no longer exist,\nand the ESM version of the
library is no longer bundled into a single\nfile.**\n\n- **The
`ignoreWhitespace` option for `diffWords` is no longer included\nin the
type declarations**. The effect of passing `ignoreWhitespace:\ntrue` has
always been to make `diffWords` just call `diffWordsWithSpace`\ninstead,
which was confusing, because that behaviour doesn't seem\nproperly
described as \"ignoring\" whitespace at all. The property
remains\navailable to non-TypeScript applications for the sake of
backwards\ncompatability, but TypeScript applications will now see a
type error if\nthey try to pass `ignoreWhitespace: true` to `diffWords`
and should\nchange their code to call `diffWordsWithSpace` instead.\n\n-
JsDiff no longer purports to support ES3 environments. (I'm pretty\nsure
it never truly did, despite claiming to in its README, since even\nthe
1.0.0 release used `Array.map` which was added in ES5.)\n-
[#&#8203;601](https://redirect.github.com/kpdecker/jsdiff/pull/601)
-\n**`diffJson`'s `stringifyReplacer` option behaves more
like\n`JSON.stringify`'s `replacer` argument now.** In particular:\n-
Each key/value pair now gets passed through the replacer once
instead\nof twice\n- The `key` passed to the replacer when the top-level
object is passed\nin as `value` is now `\"\"` (previously, was
`undefined`), and the `key`\npassed with an array element is the array
index as a string, like `\"0\"`\nor `\"1\"` (previously was whatever the
key for the entire array was).\nBoth the new behaviours match that of
`JSON.stringify`.\n-
[#&#8203;602](https://redirect.github.com/kpdecker/jsdiff/pull/602)
-\n**diffing functions now consistently return `undefined` when called
in\nasync mode** (i.e. with a callback). Previously, there was an odd
quirk\nwhere they would return `true` if the strings being diffed were
equal\nand `undefined` otherwise.\n\n</details>\n\n---\n\n###
Configuration\n\n📅 **Schedule**: Branch creation - At any time (no
schedule defined),\nAutomerge - At any time (no schedule defined).\n\n🚦
**Automerge**: Disabled by config. Please merge this manually once
you\nare satisfied.\n\n♻ **Rebasing**: Whenever PR becomes conflicted,
or you tick the\nrebase/retry checkbox.\n\n🔕 **Ignore**: Close this PR
and you won't be reminded about this update\nagain.\n\n---\n\n- [ ] If
you want to rebase/retry this PR, check\nthis box\n\n---\n\nThis PR has
been generated by
[Renovate\nBot](https://redirect.github.com/renovatebot/renovate).\n\n\n\n---------\n\nCo-authored-by:
elastic-renovate-prod[bot]
<174716857+elastic-renovate-prod[bot]@users.noreply.github.com>\nCo-authored-by:
Davis McPhee
<[email protected]>","sha":"dbd586662598348af0c193b354f3317bed835751"}},{"url":"https://github.com/elastic/kibana/pull/220946","number":220946,"branch":"9.0","state":"OPEN"}]}]
BACKPORT-->

---------

Co-authored-by: elastic-renovate-prod[bot] <174716857+elastic-renovate-prod[bot]@users.noreply.github.com>
Co-authored-by: kibanamachine <[email protected]>

Author: 3 people

package.json

@@ -1120,7 +1120,7 @@
     "deep-freeze-strict": "^1.1.1",
     "deepmerge": "^4.3.1",
     "del": "^6.1.0",
-    "diff": "^5.1.0",
+    "diff": "^8.0.0",
     "dotenv": "^16.4.5",
     "elastic-apm-node": "^4.13.0",
     "email-addresses": "^5.0.0",
@@ -1558,7 +1558,6 @@
     "@types/dagre": "^0.7.47",
     "@types/dedent": "^0.7.0",
     "@types/deep-freeze-strict": "^1.1.0",
-    "@types/diff": "^5.0.8",
     "@types/ejs": "^3.0.6",
     "@types/enzyme": "^3.10.12",
     "@types/eslint": "^8.44.2",

packages/kbn-unified-data-table/src/components/compare_documents/hooks/__snapshots__/use_comparison_cell_value.test.tsx.snap

@@ -20,63 +20,81 @@ describe('calculateDiff', () => {
     expect(result).toMatchInlineSnapshot(`
       Array [
         Object {
+          "added": false,
           "count": 5,
+          "removed": false,
           "value": "This ",
         },
         Object {
           "added": true,
           "count": 4,
-          "removed": undefined,
+          "removed": false,
           "value": "one ",
         },
         Object {
+          "added": false,
           "count": 5,
+          "removed": false,
           "value": "is a ",
         },
         Object {
-          "added": true,
-          "count": 10,
-          "removed": undefined,
-          "value": "different ",
-        },
-        Object {
+          "added": false,
           "count": 1,
+          "removed": true,
           "value": "m",
         },
         Object {
-          "added": undefined,
+          "added": true,
+          "count": 4,
+          "removed": false,
+          "value": "diff",
+        },
+        Object {
+          "added": false,
           "count": 1,
-          "removed": true,
+          "removed": false,
           "value": "e",
         },
         Object {
+          "added": true,
+          "count": 6,
+          "removed": false,
+          "value": "rent m",
+        },
+        Object {
+          "added": false,
           "count": 1,
+          "removed": false,
           "value": "s",
         },
         Object {
-          "added": undefined,
+          "added": false,
           "count": 2,
           "removed": true,
           "value": "sa",
         },
         Object {
+          "added": false,
           "count": 1,
+          "removed": false,
           "value": "g",
         },
         Object {
-          "added": undefined,
+          "added": false,
           "count": 1,
           "removed": true,
           "value": "e",
         },
         Object {
+          "added": false,
           "count": 4,
+          "removed": false,
           "value": " val",
         },
         Object {
           "added": true,
           "count": 2,
-          "removed": undefined,
+          "removed": false,
           "value": "ue",
         },
       ]
@@ -88,45 +106,51 @@ describe('calculateDiff', () => {
     expect(result).toMatchInlineSnapshot(`
       Array [
         Object {
+          "added": false,
           "count": 2,
+          "removed": false,
           "value": "This ",
         },
         Object {
           "added": true,
           "count": 2,
-          "removed": undefined,
+          "removed": false,
           "value": "one ",
         },
         Object {
+          "added": false,
           "count": 4,
+          "removed": false,
           "value": "is a ",
         },
         Object {
-          "added": undefined,
+          "added": false,
           "count": 1,
           "removed": true,
           "value": "message",
         },
         Object {
           "added": true,
           "count": 1,
-          "removed": undefined,
+          "removed": false,
           "value": "different",
         },
         Object {
+          "added": false,
           "count": 1,
+          "removed": false,
           "value": " ",
         },
         Object {
-          "added": undefined,
+          "added": false,
           "count": 1,
           "removed": true,
           "value": "val",
         },
         Object {
           "added": true,
           "count": 3,
-          "removed": undefined,
+          "removed": false,
           "value": "msg value",
         },
       ]
@@ -138,15 +162,15 @@ describe('calculateDiff', () => {
     expect(result).toMatchInlineSnapshot(`
       Array [
         Object {
-          "added": undefined,
+          "added": false,
           "count": 1,
           "removed": true,
           "value": "This is a message val",
         },
         Object {
           "added": true,
           "count": 1,
-          "removed": undefined,
+          "removed": false,
           "value": "This one is a different msg value",
         },
       ]
@@ -162,31 +186,37 @@ describe('calculateDiff', () => {
     expect(result).toMatchInlineSnapshot(`
       Array [
         Object {
+          "added": false,
           "count": 1,
+          "removed": false,
           "value": "[
       ",
         },
         Object {
-          "added": undefined,
+          "added": false,
           "count": 1,
           "removed": true,
           "value": "  \\"gif\\",
       ",
         },
         Object {
+          "added": false,
           "count": 1,
+          "removed": false,
           "value": "  \\"png\\",
       ",
         },
         Object {
           "added": true,
           "count": 1,
-          "removed": undefined,
+          "removed": false,
           "value": "  \\"jpg\\"
       ",
         },
         Object {
+          "added": false,
           "count": 1,
+          "removed": false,
           "value": "]",
         },
       ]
@@ -203,12 +233,14 @@ describe('calculateDiff', () => {
     expect(result).toMatchInlineSnapshot(`
       Array [
         Object {
+          "added": false,
           "count": 1,
+          "removed": false,
           "value": "[
       ",
         },
         Object {
-          "added": undefined,
+          "added": false,
           "count": 1,
           "removed": true,
           "value": "  \\"single value\\"
@@ -217,13 +249,15 @@ describe('calculateDiff', () => {
         Object {
           "added": true,
           "count": 2,
-          "removed": undefined,
+          "removed": false,
           "value": "  \\"multiple\\",
         \\"values\\"
       ",
         },
         Object {
+          "added": false,
           "count": 1,
+          "removed": false,
           "value": "]",
         },
       ]
@@ -236,12 +270,14 @@ describe('calculateDiff', () => {
     expect(result2).toMatchInlineSnapshot(`
       Array [
         Object {
+          "added": false,
           "count": 1,
+          "removed": false,
           "value": "[
       ",
         },
         Object {
-          "added": undefined,
+          "added": false,
           "count": 2,
           "removed": true,
           "value": "  \\"multiple\\",
@@ -251,12 +287,14 @@ describe('calculateDiff', () => {
         Object {
           "added": true,
           "count": 1,
-          "removed": undefined,
+          "removed": false,
           "value": "  \\"single value\\"
       ",
         },
         Object {
+          "added": false,
           "count": 1,
+          "removed": false,
           "value": "]",
         },
       ]

packages/kbn-unified-data-table/src/components/compare_documents/hooks/calculate_diff.test.ts

@@ -7,7 +7,7 @@
  * License v3.0 only", or the "Server Side Public License, v 1".
  */
 
-import { diffChars, diffJson, diffLines, diffWords } from 'diff';
+import { diffChars, diffJson, diffLines, diffWordsWithSpace } from 'diff';
 import type { DocumentDiffMode } from '../types';
 
 export interface CalculateDiffProps {
@@ -38,11 +38,11 @@ export const calculateDiff = ({ diffMode, baseValue, comparisonValue }: Calculat
   }
 
   if (diffMode === 'words') {
-    return diffWords(formattedBaseValue, formattedComparisonValue, { ignoreWhitespace: false });
+    return diffWordsWithSpace(formattedBaseValue, formattedComparisonValue);
   }
 
   return baseValueIsJson && comparisonValueIsJson
-    ? diffJson(formattedBaseValue, formattedComparisonValue, { ignoreWhitespace: false })
+    ? diffJson(formattedBaseValue, formattedComparisonValue)
     : diffLines(formattedBaseValue, formattedComparisonValue, { ignoreWhitespace: false });
 };
 

packages/kbn-unified-data-table/src/components/compare_documents/hooks/calculate_diff.ts

@@ -277,8 +277,8 @@ describe('useComparisonCellValue', () => {
     expect(comparisonCell1.getCell()).not.toHaveClass(BASE_CELL_CLASS);
     expect(comparisonCell1.getCell()).not.toHaveClass(MATCH_CELL_CLASS);
     expect(comparisonCell1.getCell()).not.toHaveClass(DIFF_CELL_CLASS);
-    expect(comparisonCell1.getAllSegments()).toHaveLength(12);
-    expect(comparisonCell1.getAddedSegments()).toHaveLength(3);
+    expect(comparisonCell1.getAllSegments()).toHaveLength(13);
+    expect(comparisonCell1.getAddedSegments()).toHaveLength(4);
     expect(comparisonCell1.getRemovedSegments()).toHaveLength(3);
     expect(comparisonCell1.getCell()).toMatchSnapshot();
     const comparisonCell2 = renderComparisonCell({

packages/kbn-unified-data-table/src/components/compare_documents/hooks/use_comparison_cell_value.test.tsx

@@ -11459,11 +11459,6 @@
   resolved "https://registry.yarnpkg.com/@types/deep-freeze-strict/-/deep-freeze-strict-1.1.0.tgz#447a6a2576191344aa42310131dd3df5c41492c4"
   integrity sha1-RHpqJXYZE0SqQjEBMd099cQUksQ=
 
-"@types/diff@^5.0.8":
-  version "5.0.8"
-  resolved "https://registry.yarnpkg.com/@types/diff/-/diff-5.0.8.tgz#28dc501cc3e7c62d4c5d096afe20755170acf276"
-  integrity sha512-kR0gRf0wMwpxQq6ME5s+tWk9zVCfJUl98eRkD05HWWRbhPB/eu4V1IbyZAsvzC1Gn4znBJ0HN01M4DGXdBEV8Q==
-
 "@types/ejs@^3.0.6":
   version "3.0.6"
   resolved "https://registry.yarnpkg.com/@types/ejs/-/ejs-3.0.6.tgz#aca442289df623bfa8e47c23961f0357847b83fe"
@@ -17490,6 +17485,11 @@ diff@^5.0.0, diff@^5.1.0, diff@^5.2.0:
   resolved "https://registry.yarnpkg.com/diff/-/diff-5.2.0.tgz#26ded047cd1179b78b9537d5ef725503ce1ae531"
   integrity sha512-uIFDxqpRZGZ6ThOk84hEfqWoHx2devRFvpTZcTHur85vImfaxUbTW9Ryh4CpCuDnToOP1CEtXKIgytHBPVff5A==
 
+diff@^8.0.0:
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/diff/-/diff-8.0.1.tgz#1562531dbca460fe5be98a026412996ccab1abd5"
+  integrity sha512-rEaM3KmVm78zE3dFZaop3aCQa2MTm+T4kcigUFLVU/KbOYdiY6JnL2g2puOYnct3QFw9pjZadaCbCZ1O8ArMlQ==
+
 diffie-hellman@^5.0.3:
   version "5.0.3"
   resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.3.tgz#40e8ee98f55a2149607146921c63e1ae5f3d2875"