fix(deps): upgrade diff to 8.0.4 (#45772)

This commit is contained in:
Luke Parker
2026-08-28 09:24:33 +10:00
committed by GitHub
parent bdf2e84812
commit d432823515
3 changed files with 40 additions and 3 deletions
+2 -2
View File
@@ -1134,7 +1134,7 @@
"@typescript/native-preview": "7.0.0-dev.20251207.1",
"ai": "6.0.168",
"cross-spawn": "7.0.6",
"diff": "8.0.2",
"diff": "8.0.4",
"dompurify": "3.3.1",
"drizzle-kit": "1.0.0-rc.5-ab785fc",
"drizzle-orm": "1.0.0-rc.5-169397b",
@@ -3831,7 +3831,7 @@
"didyoumean": ["didyoumean@1.2.2", "", {}, "sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw=="],
"diff": ["diff@8.0.2", "", {}, "sha512-sSuxWU5j5SR9QQji/o2qMvqRNYRDOcBTgsJ/DeCf4iSN4gW+gNMXM7wFIP+fdXZxoNiAnHUTGjCr+TSWXdRDKg=="],
"diff": ["diff@8.0.4", "", {}, "sha512-DPi0FmjiSU5EvQV0++GFDOJ9ASQUVFh5kD+OzOnYdi7n3Wpm9hWWGfB/O2blfHcMVTL5WkQXSnRiK9makhrcnw=="],
"dir-compare": ["dir-compare@4.2.0", "", { "dependencies": { "minimatch": "^3.0.5", "p-limit": "^3.1.0 " } }, "sha512-2xMCmOoMrdQIPHdsTawECdNPwlVFB9zGcz3kuhmBO6U3oU+UQjsue0i8ayLKpgBcm+hcXPMVSGUN9d+pvJ6+VQ=="],
+1 -1
View File
@@ -69,7 +69,7 @@
"opentui-spinner": "0.0.7",
"@solid-primitives/storage": "4.3.3",
"@tailwindcss/vite": "4.1.11",
"diff": "8.0.2",
"diff": "8.0.4",
"dompurify": "3.3.1",
"drizzle-kit": "1.0.0-rc.5-ab785fc",
"drizzle-orm": "1.0.0-rc.5-169397b",
@@ -2,6 +2,43 @@ import { describe, expect, test } from "bun:test"
import { normalize, resolveFileDiff, text } from "./session-diff"
describe("session diff", () => {
test.each([
["carriage return", "\r"],
["line separator", "\u2028"],
["paragraph separator", "\u2029"],
])(
"parses adversarial patch headers containing a %s",
(_, separator) => {
// GHSA-73rr-hh4g-fpgx: isolate synchronous hangs and memory growth from the test runner.
const name = `a${separator}b.ts`
const padding = " ".repeat(10_000)
const patches = [
`--- ${name}\t\n+++ b.ts\t\n`,
`--- a.ts\t\n+++ ${name}\t\n`,
`--- ${padding}${name}\t\n+++ b.ts\t\n`,
`--- a.ts\t\n+++ ${padding}${name}\t\n`,
`Index: ${padding}${name}\n--- a.ts\t\n+++ b.ts\t\n`,
`diff -r abc -r def ${padding}${name}\n--- a.ts\t\n+++ b.ts\t\n`,
].map((header) => `${header}@@ -1 +1 @@\n-old\n+new\n`)
const result = Bun.spawnSync({
cmd: [
process.execPath,
"--eval",
`import { completePatchContents } from "./session-diff.ts"
console.log(JSON.stringify((await Bun.stdin.json()).map(completePatchContents)))`,
],
cwd: import.meta.dir,
stdin: Buffer.from(JSON.stringify(patches)),
timeout: 5_000,
killSignal: "SIGKILL",
})
expect(result.exitCode, result.stderr.toString()).toBe(0)
expect(JSON.parse(result.stdout.toString())).toEqual(patches.map(() => ({ before: "old\n", after: "new\n" })))
},
10_000,
)
test("renders whole-file unified patches as complete diffs", () => {
const diff = {
file: "a.ts",