Skip to content

Commit 05084e9

Browse files
mikeharderNont
authored andcommitted
[shared] Replace git.js with dependency "simple-git" (Azure#33967)
- fixes Azure#33942
1 parent 2ee0e5c commit 05084e9

File tree

17 files changed

+291
-294
lines changed

17 files changed

+291
-294
lines changed

.github/package-lock.json

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

.github/package.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,16 @@
77
},
88
"dependencies": {
99
"@apidevtools/json-schema-ref-parser": "^11.9.3",
10+
"debug": "^4.4.0",
1011
"js-yaml": "^4.1.0",
11-
"marked": "^15.0.7"
12+
"marked": "^15.0.7",
13+
"simple-git": "^3.27.0"
1214
},
1315
"devDependencies": {
1416
"@eslint/js": "^9.22.0",
1517
"@octokit/webhooks-types": "^7.5.1",
1618
"@tsconfig/node20": "^20.1.4",
19+
"@types/debug": "^4.1.12",
1720
"@types/github-script": "github:actions/github-script",
1821
"@types/js-yaml": "^4.0.9",
1922
"@types/node": "^20.0.0",

.github/shared/package-lock.json

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

.github/shared/package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
"./changed-files": "./src/changed-files.js",
88
"./equality": "./src/equality.js",
99
"./exec": "./src/exec.js",
10-
"./git": "./src/git.js",
1110
"./logger": "./src/logger.js",
1211
"./readme": "./src/readme.js",
1312
"./sdk-types": "./src/sdk-types.js",
@@ -20,8 +19,10 @@
2019
},
2120
"dependencies": {
2221
"@apidevtools/json-schema-ref-parser": "^11.9.3",
22+
"debug": "^4.4.0",
2323
"js-yaml": "^4.1.0",
24-
"marked": "^15.0.7"
24+
"marked": "^15.0.7",
25+
"simple-git": "^3.27.0"
2526
},
2627
"devDependencies": {
2728
"@eslint/js": "^9.22.0",

.github/shared/src/changed-files.js

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
// @ts-check
22

3-
import { diff } from "./git.js";
3+
import debug from "debug";
4+
import { simpleGit } from "simple-git";
5+
6+
// Enable simple-git debug logging to improve console output
7+
debug.enable("simple-git");
48

59
/**
610
* @param {Object} [options]
@@ -23,11 +27,11 @@ export async function getChangedFiles(options = {}) {
2327
// { name: "/foo/baz.js", status: Status.Renamed, previousName: "/foo/bar.js"}.
2428
// Then add filter functions to filter based on status. This is more flexible and lets consumers
2529
// filter based on status with a single call to `git diff`.
26-
const result = await diff(baseCommitish, headCommitish, {
27-
args: ["--name-only"],
28-
cwd,
29-
logger: logger,
30-
});
30+
const result = await simpleGit(cwd).diff([
31+
"--name-only",
32+
baseCommitish,
33+
headCommitish,
34+
]);
3135

3236
const files = result.trim().split("\n");
3337

.github/shared/src/git.js

Lines changed: 0 additions & 90 deletions
This file was deleted.

0 commit comments

Comments
 (0)