From 3dacc18f2d85260010b28b46aa6877026123711d Mon Sep 17 00:00:00 2001
From: Matt Newell <matt.newell@brivo.com>
Date: Wed, 7 Oct 2026 16:27:19 -0400
Subject: [PATCH] Upgrade simple-git to ^4.0.2

simple-git 4.0 removed gitP; use the named simpleGit export.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
---
 package.json |  2 +-
 src/git.ts   |  8 ++++----
 yarn.lock    | 31 ++++++++++++++++++++++++++++++-
 3 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 1e480588..0ddb44d9 100644
--- a/package.json
+++ b/package.json
@@ -34,7 +34,7 @@
     "@aws-sdk/client-cloudwatch-logs": "^3.1107.0",
     "@aws-sdk/client-lambda": "^3.1107.0",
     "@datadog/datadog-ci-base": "^5.22.0",
-    "simple-git": "^3.36.0"
+    "simple-git": "^4.0.2"
   },
   "peerDependencies": {
     "serverless": "4.x || 3.x || 2.x || 1.x"
diff --git a/src/git.ts b/src/git.ts
index b771fb01..b0870b5d 100644
--- a/src/git.ts
+++ b/src/git.ts
@@ -1,7 +1,7 @@
-import * as simpleGit from "simple-git";
+import { simpleGit, SimpleGit } from "simple-git";
 
 // Returns a configured SimpleGit.
-export const newSimpleGit = async (): Promise<simpleGit.SimpleGit | undefined> => {
+export const newSimpleGit = async (): Promise<SimpleGit | undefined> => {
   const options = {
     baseDir: process.cwd(),
     binary: "git",
@@ -10,12 +10,12 @@ export const newSimpleGit = async (): Promise<simpleGit.SimpleGit | undefined> =
   try {
     // Attempt to set the baseDir to the root of the repository so the 'git ls-files' command
     // returns the tracked files paths relative to the root of the repository.
-    const git = simpleGit.gitP(options);
+    const git = simpleGit(options);
     const root = await git.revparse("--show-toplevel");
     options.baseDir = root;
   } catch {
     return undefined;
   }
 
-  return simpleGit.gitP(options);
+  return simpleGit(options);
 };
diff --git a/yarn.lock b/yarn.lock
index 0bec6d08..bf5f3421 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1619,6 +1619,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@simple-git/args-pathspec@npm:1.0.4, @simple-git/args-pathspec@npm:^1.0.4":
+  version: 1.0.4
+  resolution: "@simple-git/args-pathspec@npm:1.0.4"
+  checksum: 10c0/f62c09daf6a17734b2a13a186421bf0fdbdbd48782d1ca6d751027b2a9f515f11505da672489609f95335a0541d2fcf6d6fd6c2754919245109e92335e437b1b
+  languageName: node
+  linkType: hard
+
 "@simple-git/args-pathspec@npm:^1.0.3":
   version: 1.0.3
   resolution: "@simple-git/args-pathspec@npm:1.0.3"
@@ -1626,6 +1633,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@simple-git/argv-parser@npm:2.0.1":
+  version: 2.0.1
+  resolution: "@simple-git/argv-parser@npm:2.0.1"
+  dependencies:
+    "@simple-git/args-pathspec": "npm:^1.0.4"
+  checksum: 10c0/7d2cd9852139ca3b524dcd91f6a887fa505cfb68c8813d7b849005566147365bb1e34f5450411c494fbd714a80c123058e65dc2ffc0b41d059e30bdc98e12223
+  languageName: node
+  linkType: hard
+
 "@simple-git/argv-parser@npm:^1.1.0":
   version: 1.1.1
   resolution: "@simple-git/argv-parser@npm:1.1.1"
@@ -6511,7 +6527,7 @@ __metadata:
     oxlint: "npm:^1.78.0"
     oxlint-tsgolint: "npm:^7.0.2001"
     serverless-step-functions: "npm:^3.31.2"
-    simple-git: "npm:^3.36.0"
+    simple-git: "npm:^4.0.2"
     typescript: "npm:^7.0.2"
     vitest: "npm:^4.1.11"
   peerDependencies:
@@ -6694,6 +6710,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"simple-git@npm:^4.0.2":
+  version: 4.0.2
+  resolution: "simple-git@npm:4.0.2"
+  dependencies:
+    "@kwsites/file-exists": "npm:^1.1.1"
+    "@kwsites/promise-deferred": "npm:^1.1.1"
+    "@simple-git/args-pathspec": "npm:1.0.4"
+    "@simple-git/argv-parser": "npm:2.0.1"
+    debug: "npm:^4.4.0"
+  checksum: 10c0/d028927258fa286d9d8e462f29ec6a37a32398acd7e53cef7fc81e70636c149d7359a542d1a4f8490b342d40d98e341c35c718734aec448fc24fdee88566e981
+  languageName: node
+  linkType: hard
+
 "slash@npm:^3.0.0":
   version: 3.0.0
   resolution: "slash@npm:3.0.0"