Skip to content

Commit 1ba738d

Browse files
committed
fix(scripts): Fix type errors in analyze-conflicts.ts
1 parent 9fc8293 commit 1ba738d

3 files changed

Lines changed: 9 additions & 3 deletions

File tree

bun.lock

Lines changed: 7 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
"clean": "rm -rf apps/*/node_modules packages/*/node_modules node_modules"
1515
},
1616
"devDependencies": {
17+
"@types/bun": "^1.3.9",
1718
"typescript": "^5.9.3"
1819
},
1920
"trustedDependencies": [

scripts/analyze-conflicts.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ console.log(`Analyzing conflicts for PR: ${PR_URL}`);
2525
// Get list of changed files in the current commit (which should be the merge commit with conflicts)
2626
// git show --name-only --format="" HEAD
2727
const changedFilesOutput = await $`git show --name-only --format="" HEAD`.text();
28-
const changedFiles = changedFilesOutput.trim().split("\n").filter(f => f);
28+
const changedFiles = changedFilesOutput.trim().split("\n").filter((f: string) => f);
2929

3030
console.log(`Changed files: ${changedFiles.join(", ")}`);
3131

0 commit comments

Comments
 (0)