From d03bb9be7796edf67c139dc81bfb446c2c5bdcd4 Mon Sep 17 00:00:00 2001
From: Callin Mullaney <57088-callinmullaney@users.noreply.drupalcode.org>
Date: Fri, 30 Oct 2026 01:52:44 -0500
Subject: [PATCH 1/2] fix(deps): use simple-git 4 without consumer overrides

---
 package-lock.json | 30 +++++++++++++++---------------
 package.json      |  4 ++--
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 6db14c9..cd4f911 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@emulsify/cli",
-  "version": "2.4.1",
+  "version": "2.4.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@emulsify/cli",
-      "version": "2.4.1",
+      "version": "2.4.2",
       "license": "GPL-2.0",
       "dependencies": {
         "@inquirer/prompts": "^8.7.0",
@@ -18,7 +18,7 @@
         "consola": "^3.4.2",
         "fs-extra": "^11.4.0",
         "progress": "^2.0.3",
-        "simple-git": "^3.36.0"
+        "simple-git": "^4.0.2"
       },
       "bin": {
         "emulsify": "dist/index.js"
@@ -2897,18 +2897,18 @@
       }
     },
     "node_modules/@simple-git/args-pathspec": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@simple-git/args-pathspec/-/args-pathspec-1.0.3.tgz",
-      "integrity": "sha512-ngJMaHlsWDTfjyq9F3VIQ8b7NXbBLq5j9i5bJ6XLYtD6qlDXT7fdKY2KscWWUF8t18xx052Y/PUO1K1TRc9yKA==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/@simple-git/args-pathspec/-/args-pathspec-1.0.4.tgz",
+      "integrity": "sha512-EtMX6XjRWSastG2SdkmSQByPtJ9dx/NIjnHbpQPCYt62j4RmSx5rgLTGpw0YCjF5h191gZOmBfheOT23cRSFdw==",
       "license": "MIT"
     },
     "node_modules/@simple-git/argv-parser": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@simple-git/argv-parser/-/argv-parser-1.1.1.tgz",
-      "integrity": "sha512-Q9lBcfQ+VQCpQqGJFHe5yooOS5hGdLFFbJ5R+R5aDsnkPCahtn1hSkMcORX65J2Z5lxSkD0lQorMsncuBQxYUw==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@simple-git/argv-parser/-/argv-parser-2.0.1.tgz",
+      "integrity": "sha512-M++IaVWrN+vYalilOHfwvT2IL3wYZtVEBQpmX6DLSOJLtxbZ+SUeIDE3IiPogzhPACLajwtxfa5rp+ZX1FczzQ==",
       "license": "MIT",
       "dependencies": {
-        "@simple-git/args-pathspec": "^1.0.3"
+        "@simple-git/args-pathspec": "^1.0.4"
       }
     },
     "node_modules/@simple-libs/child-process-utils": {
@@ -11019,15 +11019,15 @@
       }
     },
     "node_modules/simple-git": {
-      "version": "3.36.0",
-      "resolved": "https://registry.npmjs.org/simple-git/-/simple-git-3.36.0.tgz",
-      "integrity": "sha512-cGQjLjK8bxJw4QuYT7gxHw3/IouVESbhahSsHrX97MzCL1gu2u7oy38W6L2ZIGECEfIBG4BabsWDPjBxJENv9Q==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/simple-git/-/simple-git-4.0.2.tgz",
+      "integrity": "sha512-l0sIsv9VrPwovKELFDBOj/lhmIcbMvxBk2B+hRhsMM4/VL3gKtuZvYnBNixVo+N/0HnqQx2cBdLvxnAbygHpqA==",
       "license": "MIT",
       "dependencies": {
         "@kwsites/file-exists": "^1.1.1",
         "@kwsites/promise-deferred": "^1.1.1",
-        "@simple-git/args-pathspec": "^1.0.3",
-        "@simple-git/argv-parser": "^1.1.0",
+        "@simple-git/args-pathspec": "1.0.4",
+        "@simple-git/argv-parser": "2.0.1",
         "debug": "^4.4.0"
       },
       "funding": {
diff --git a/package.json b/package.json
index 3edf643..3a017a7 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@emulsify/cli",
   "productName": "Emulsify CLI",
-  "version": "2.4.1",
+  "version": "2.4.2",
   "description": "Build and use component systems in Drupal, WordPress, or standalone front ends.",
   "repository": "git@github.com:emulsify-ds/emulsify-cli.git",
   "author": "Patrick Coffey <patrickcoffey48@gmail.com>",
@@ -80,6 +80,6 @@
     "consola": "^3.4.2",
     "fs-extra": "^11.4.0",
     "progress": "^2.0.3",
-    "simple-git": "^3.36.0"
+    "simple-git": "^4.0.2"
   }
 }

From 99ef31818b6fb47ee7cf1bd99e323a1f1837b77c Mon Sep 17 00:00:00 2001
From: Callin Mullaney <57088-callinmullaney@users.noreply.drupalcode.org>
Date: Fri, 30 Oct 2026 02:04:42 -0500
Subject: [PATCH 2/2] test: keep Git fixture line endings stable on Windows

---
 test/e2e/cli.test.mjs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/e2e/cli.test.mjs b/test/e2e/cli.test.mjs
index 2b19720..30346e0 100644
--- a/test/e2e/cli.test.mjs
+++ b/test/e2e/cli.test.mjs
@@ -90,6 +90,7 @@ function createGitRepository(directory, files) {
     writeFileSync(destination, contents);
   }
 
+  writeFileSync(join(directory, '.gitattributes'), '* text eol=lf\n');
   git(directory, ['add', '.']);
   git(directory, [
     '-c',