jest-diff: Replace diff with diff-sequences package

CHANGELOG.md

@@ -3,6 +3,7 @@
 ### Features
 
 - `[jest-runtime]` Add `jest.isolateModules` for scoped module initialization ([#6701](https://github.com/facebook/jest/pull/6701))
+- `[jest-diff]` [**BREAKING**] Replace `diff` with `diff-sequences` package ([#6961](https://github.com/facebook/jest/pull/6961))
 - `[jest-cli]` [**BREAKING**] Only set error process error codes when they are non-zero ([#7363](https://github.com/facebook/jest/pull/7363))
 - `[jest-config]` [**BREAKING**] Deprecate `setupTestFrameworkScriptFile` in favor of new `setupFilesAfterEnv` ([#7119](https://github.com/facebook/jest/pull/7119))
 - `[jest-worker]` [**BREAKING**] Add functionality to call a `setup` method in the worker before the first call and a `teardown` method when ending the farm ([#7014](https://github.com/facebook/jest/pull/7014))

packages/expect/src/__tests__/__snapshots__/matchers.test.js.snap

@@ -1794,9 +1794,9 @@ Difference:
 <red>+ Received</>
 
 <dim>  Array [</>
-<red>+   1,</>
-<dim>    2,</>
-<green>-   1,</>
+<green>-   2,</>
+<dim>    1,</>
+<red>+   2,</>
 <dim>  ]</>"
 `;
 
@@ -1963,9 +1963,9 @@ Difference:
 <red>+ Received</>
 
 <dim>  Immutable.List [</>
-<red>+   1,</>
-<dim>    2,</>
-<green>-   1,</>
+<green>-   2,</>
+<dim>    1,</>
+<red>+   2,</>
 <dim>  ]</>"
 `;
 
@@ -2080,9 +2080,9 @@ Difference:
 <red>+ Received</>
 
 <dim>  Immutable.OrderedMap {</>
-<red>+   1: \\"one\\",</>
-<dim>    2: \\"two\\",</>
-<green>-   1: \\"one\\",</>
+<green>-   2: \\"two\\",</>
+<dim>    1: \\"one\\",</>
+<red>+   2: \\"two\\",</>
 <dim>  }</>"
 `;
 
@@ -2109,9 +2109,9 @@ Difference:
 <red>+ Received</>
 
 <dim>  Immutable.OrderedSet [</>
-<red>+   1,</>
-<dim>    2,</>
-<green>-   1,</>
+<green>-   2,</>
+<dim>    1,</>
+<red>+   2,</>
 <dim>  ]</>"
 `;
 

packages/jest-diff/package.json

@@ -9,7 +9,7 @@
   "main": "build/index.js",
   "dependencies": {
     "chalk": "^2.0.1",
-    "diff": "^3.2.0",
+    "diff-sequences": "^23.6.0",
     "jest-get-type": "^22.1.0",
     "pretty-format": "^23.6.0"
   },

packages/jest-diff/src/__tests__/__snapshots__/diff.test.js.snap

@@ -76,9 +76,9 @@ exports[`collapses big diffs to patch format 1`] = `
 <dim>      6,</>
 <dim>      7,</>
 <dim>      8,</>
-<red>+     10,</>
-<dim>      9,</>
-<green>-     10,</>
+<green>-     9,</>
+<dim>      10,</>
+<red>+     9,</>
 <dim>    ],</>
 <dim>  }</>"
 `;
@@ -109,9 +109,9 @@ exports[`context number of lines: -1 (5 default) 1`] = `
 <dim>      6,</>
 <dim>      7,</>
 <dim>      8,</>
-<red>+     10,</>
-<dim>      9,</>
-<green>-     10,</>
+<green>-     9,</>
+<dim>      10,</>
+<red>+     9,</>
 <dim>    ],</>
 <dim>  }</>"
 `;
@@ -120,10 +120,10 @@ exports[`context number of lines: 0  1`] = `
 "<green>- Expected</>
 <red>+ Received</>
 
-<yellow>@@ -11,0 +11,1 @@</>
-<red>+     10,</>
-<yellow>@@ -12,1 +13,0 @@</>
-<green>-     10,</>"
+<yellow>@@ -11,1 +11,0 @@</>
+<green>-     9,</>
+<yellow>@@ -13,0 +12,1 @@</>
+<red>+     9,</>"
 `;
 
 exports[`context number of lines: 1  1`] = `
@@ -132,9 +132,9 @@ exports[`context number of lines: 1  1`] = `
 
 <yellow>@@ -10,4 +10,4 @@</>
 <dim>      8,</>
-<red>+     10,</>
-<dim>      9,</>
-<green>-     10,</>
+<green>-     9,</>
+<dim>      10,</>
+<red>+     9,</>
 <dim>    ],</>"
 `;
 
@@ -145,9 +145,9 @@ exports[`context number of lines: 2  1`] = `
 <yellow>@@ -9,6 +9,6 @@</>
 <dim>      7,</>
 <dim>      8,</>
-<red>+     10,</>
-<dim>      9,</>
-<green>-     10,</>
+<green>-     9,</>
+<dim>      10,</>
+<red>+     9,</>
 <dim>    ],</>
 <dim>  }</>"
 `;
@@ -162,9 +162,9 @@ exports[`context number of lines: null (5 default) 1`] = `
 <dim>      6,</>
 <dim>      7,</>
 <dim>      8,</>
-<red>+     10,</>
-<dim>      9,</>
-<green>-     10,</>
+<green>-     9,</>
+<dim>      10,</>
+<red>+     9,</>
 <dim>    ],</>
 <dim>  }</>"
 `;