sf-git-merge-driver 1.2.1-dev-137.18912696828-1 → 1.2.1-dev-148.20575858150-1

package/README.md

@@ -5,7 +5,13 @@
 
 An intelligent Git merge driver specifically designed for Salesforce metadata files. **Eliminates hours** of manual merge conflicts resolution.
 
-![Demo GIF](./docs/media/demo-sf-git-merge-driver.gif)
+## Demo
+
+### Without sf-git-merge-driver
+![Demo without sf-git-merge-driver](./docs/media/demo-without-sf-git-merge-driver.gif)
+
+### With sf-git-merge-driver
+![Demo with sf-git-merge-driver](./docs/media/demo-with-sf-git-merge-driver.gif)
 
 ## Why use this plugin?
 
@@ -188,7 +194,7 @@ EXAMPLES
     $ sf git merge driver install
 ```
 
-_See code: [src/commands/git/merge/driver/install.ts](https://github.com/scolladon/sf-git-merge-driver/blob/v1.2.1-dev-137.18912696828-1/src/commands/git/merge/driver/install.ts)_
+_See code: [src/commands/git/merge/driver/install.ts](https://github.com/scolladon/sf-git-merge-driver/blob/v1.2.1-dev-148.20575858150-1/src/commands/git/merge/driver/install.ts)_
 
 ## `sf git merge driver run`
 
@@ -232,7 +238,7 @@ EXAMPLES
   - output-file is the path to the file where the merged content will be written
 ```
 
-_See code: [src/commands/git/merge/driver/run.ts](https://github.com/scolladon/sf-git-merge-driver/blob/v1.2.1-dev-137.18912696828-1/src/commands/git/merge/driver/run.ts)_
+_See code: [src/commands/git/merge/driver/run.ts](https://github.com/scolladon/sf-git-merge-driver/blob/v1.2.1-dev-148.20575858150-1/src/commands/git/merge/driver/run.ts)_
 
 ## `sf git merge driver uninstall`
 
@@ -259,7 +265,7 @@ EXAMPLES
     $ sf git merge driver uninstall
 ```
 
-_See code: [src/commands/git/merge/driver/uninstall.ts](https://github.com/scolladon/sf-git-merge-driver/blob/v1.2.1-dev-137.18912696828-1/src/commands/git/merge/driver/uninstall.ts)_
+_See code: [src/commands/git/merge/driver/uninstall.ts](https://github.com/scolladon/sf-git-merge-driver/blob/v1.2.1-dev-148.20575858150-1/src/commands/git/merge/driver/uninstall.ts)_
 <!-- commandsstop -->
 ## Changelog
 

package/lib/constant/gitConstant.d.ts

@@ -1 +1,2 @@
 export declare const GIT_INFO_ATTRIBUTES_PATH = "info/attributes";
+export declare const GIT_EOL = "\n";

package/lib/constant/gitConstant.js

@@ -1,2 +1,3 @@
 export const GIT_INFO_ATTRIBUTES_PATH = 'info/attributes';
+export const GIT_EOL = '\n';
 //# sourceMappingURL=gitConstant.js.map

package/lib/constant/gitConstant.js.map

@@ -1 +1 @@
-{"version":3,"file":"gitConstant.js","sourceRoot":"","sources":["../../src/constant/gitConstant.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,wBAAwB,GAAG,iBAAiB,CAAA"}
+{"version":3,"file":"gitConstant.js","sourceRoot":"","sources":["../../src/constant/gitConstant.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,wBAAwB,GAAG,iBAAiB,CAAA;AACzD,MAAM,CAAC,MAAM,OAAO,GAAG,IAAI,CAAA"}

package/lib/service/uninstallService.js

@@ -2,26 +2,27 @@ import { __decorate } from "tslib";
 import { readFile, writeFile } from 'node:fs/promises';
 import { simpleGit } from 'simple-git';
 import { DRIVER_NAME } from '../constant/driverConstant.js';
+import { GIT_EOL } from '../constant/gitConstant.js';
 import { getGitAttributesPath } from '../utils/gitUtils.js';
 import { log } from '../utils/LoggingDecorator.js';
 import { Logger } from '../utils/LoggingService.js';
 // This match lines like: "*.profile-meta.xml merge=sf-git-merge-driver"
-const MERGE_DRIVER_CONFIG = new RegExp(`.*\s+merge\s*=\s*${DRIVER_NAME}$`);
+const MERGE_DRIVER_CONFIG = new RegExp(String.raw `.*\s+merge\s*=\s*${DRIVER_NAME}\s*$`);
 export class UninstallService {
     async uninstallMergeDriver() {
         const git = simpleGit();
         try {
-            // Throw when the merge driver is not installed
+            // Throws when the merge driver is not installed
             await git.raw(['config', '--remove-section', `merge.${DRIVER_NAME}`]);
             const gitAttributesPath = await getGitAttributesPath();
-            // Throw when the file does not exist
+            // Throws when the file does not exist
             const gitAttributes = await readFile(gitAttributesPath, {
                 encoding: 'utf8',
             });
             const filteredAttributes = gitAttributes
-                .split('\n')
+                .split(GIT_EOL)
                 .filter(line => !MERGE_DRIVER_CONFIG.test(line));
-            await writeFile(gitAttributesPath, filteredAttributes.join('\n'));
+            await writeFile(gitAttributesPath, filteredAttributes.join(GIT_EOL));
         }
         catch (error) {
             Logger.error('Merge driver uninstallation failed', error);

package/lib/service/uninstallService.js.map

@@ -1 +1 @@
-{"version":3,"file":"uninstallService.js","sourceRoot":"","sources":["../../src/service/uninstallService.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAA;AACtC,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAA;AAC3D,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAA;AAC3D,OAAO,EAAE,GAAG,EAAE,MAAM,8BAA8B,CAAA;AAClD,OAAO,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAA;AAEnD,wEAAwE;AACxE,MAAM,mBAAmB,GAAG,IAAI,MAAM,CAAC,oBAAoB,WAAW,GAAG,CAAC,CAAA;AAE1E,MAAM,OAAO,gBAAgB;IAEd,AAAN,KAAK,CAAC,oBAAoB;QAC/B,MAAM,GAAG,GAAG,SAAS,EAAE,CAAA;QACvB,IAAI,CAAC;YACH,+CAA+C;YAC/C,MAAM,GAAG,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,kBAAkB,EAAE,SAAS,WAAW,EAAE,CAAC,CAAC,CAAA;YAErE,MAAM,iBAAiB,GAAG,MAAM,oBAAoB,EAAE,CAAA;YACtD,qCAAqC;YACrC,MAAM,aAAa,GAAG,MAAM,QAAQ,CAAC,iBAAiB,EAAE;gBACtD,QAAQ,EAAE,MAAM;aACjB,CAAC,CAAA;YACF,MAAM,kBAAkB,GAAG,aAAa;iBACrC,KAAK,CAAC,IAAI,CAAC;iBACX,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;YAClD,MAAM,SAAS,CAAC,iBAAiB,EAAE,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;QACnE,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,KAAK,CAAC,oCAAoC,EAAE,KAAK,CAAC,CAAA;QAC3D,CAAC;IACH,CAAC;CACF;AAnBc;IADZ,GAAG;4DAmBH"}
+{"version":3,"file":"uninstallService.js","sourceRoot":"","sources":["../../src/service/uninstallService.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAA;AACtC,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAA;AAC3D,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AACpD,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAA;AAC3D,OAAO,EAAE,GAAG,EAAE,MAAM,8BAA8B,CAAA;AAClD,OAAO,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAA;AAEnD,wEAAwE;AACxE,MAAM,mBAAmB,GAAG,IAAI,MAAM,CACpC,MAAM,CAAC,GAAG,CAAA,oBAAoB,WAAW,MAAM,CAChD,CAAA;AAED,MAAM,OAAO,gBAAgB;IAEd,AAAN,KAAK,CAAC,oBAAoB;QAC/B,MAAM,GAAG,GAAG,SAAS,EAAE,CAAA;QACvB,IAAI,CAAC;YACH,gDAAgD;YAChD,MAAM,GAAG,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,kBAAkB,EAAE,SAAS,WAAW,EAAE,CAAC,CAAC,CAAA;YAErE,MAAM,iBAAiB,GAAG,MAAM,oBAAoB,EAAE,CAAA;YACtD,sCAAsC;YACtC,MAAM,aAAa,GAAG,MAAM,QAAQ,CAAC,iBAAiB,EAAE;gBACtD,QAAQ,EAAE,MAAM;aACjB,CAAC,CAAA;YACF,MAAM,kBAAkB,GAAG,aAAa;iBACrC,KAAK,CAAC,OAAO,CAAC;iBACd,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;YAClD,MAAM,SAAS,CAAC,iBAAiB,EAAE,kBAAkB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAA;QACtE,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,KAAK,CAAC,oCAAoC,EAAE,KAAK,CAAC,CAAA;QAC3D,CAAC;IACH,CAAC;CACF;AAnBc;IADZ,GAAG;4DAmBH"}