sf-git-merge-driver 1.0.5-dev-108.17693754311-1 → 1.1.0-dev-109.17681841243-1

package/oclif.manifest.json

@@ -284,5 +284,5 @@
       ]
     }
   },
-  "version": "1.0.5-dev-108.17693754311-1"
+  "version": "1.1.0-dev-109.17681841243-1"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "sf-git-merge-driver",
   "description": "git remote add origin git@github.com:scolladon/sf-git-merge-driver.git",
-  "version": "1.0.5-dev-108.17693754311-1",
+  "version": "1.1.0-dev-109.17681841243-1",
   "exports": "./lib/driver/MergeDriver.js",
   "type": "module",
   "author": "Sébastien Colladon (colladonsebastien@gmail.com)",
@@ -10,8 +10,8 @@
     "url": "git+https://github.com/scolladon/sf-git-merge-driver.git"
   },
   "dependencies": {
-    "@oclif/core": "^4.5.3",
-    "@salesforce/core": "^8.23.1",
+    "@oclif/core": "^4.5.2",
+    "@salesforce/core": "^8.19.1",
     "@salesforce/sf-plugins-core": "^12.2.4",
     "fast-equals": "^5.2.2",
     "fast-xml-parser": "^5.2.5",
@@ -19,20 +19,20 @@
     "simple-git": "^3.28.0"
   },
   "devDependencies": {
-    "@biomejs/biome": "2.2.4",
+    "@biomejs/biome": "2.1.4",
     "@commitlint/config-conventional": "^19.8.1",
     "@oclif/plugin-help": "^6.2.32",
-    "@salesforce/cli-plugins-testkit": "^5.3.41",
-    "@salesforce/dev-config": "^4.3.2",
+    "@salesforce/cli-plugins-testkit": "^5.3.39",
+    "@salesforce/dev-config": "^4.3.1",
     "@types/chai": "^5.2.2",
     "@types/jest": "^30.0.0",
-    "chai": "^6.0.1",
+    "chai": "^5.2.1",
     "husky": "^9.1.7",
-    "jest": "^30.1.3",
-    "knip": "^5.63.1",
-    "mocha": "^11.7.2",
+    "jest": "^30.0.5",
+    "knip": "^5.62.0",
+    "mocha": "^11.7.1",
     "nyc": "^17.1.0",
-    "oclif": "^4.22.18",
+    "oclif": "^4.22.9",
     "shx": "^0.4.0",
     "ts-jest": "^29.4.1",
     "ts-node": "^10.9.2",
@@ -74,7 +74,7 @@
     "clean:package-manager": "wireit",
     "clean": "wireit",
     "compile": "wireit",
-    "dependencies:upgrade": "npx npm-check-updates -u ; npm update ; npm audit fix",
+    "dependencies:upgrade": "npm update ; npm audit fix",
     "lint": "wireit",
     "lint:dependencies": "wireit",
     "lint:fix": "wireit",

package/lib/constant/pluginConstant.d.ts

@@ -1 +0,0 @@
-export declare const PLUGIN_NAME = "sf-git-merge-driver";

package/lib/constant/pluginConstant.js

@@ -1,2 +0,0 @@
-export const PLUGIN_NAME = 'sf-git-merge-driver';
-//# sourceMappingURL=pluginConstant.js.map

package/lib/constant/pluginConstant.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"pluginConstant.js","sourceRoot":"","sources":["../../src/constant/pluginConstant.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,WAAW,GAAG,qBAAqB,CAAA"}

package/lib/utils/LoggingDecorator.d.ts

@@ -1,2 +0,0 @@
-export declare function TraceSyncMethod(target: any, propertyKey: string, descriptor: PropertyDescriptor): void;
-export declare function TraceAsyncMethod(target: any, propertyKey: string, descriptor: PropertyDescriptor): void;

package/lib/utils/LoggingDecorator.js

@@ -1,21 +0,0 @@
-/** biome-ignore-all lint/suspicious/noExplicitAny: it is dynamic by definition */
-import { Logger } from './LoggingService.js';
-export function TraceSyncMethod(target, propertyKey, descriptor) {
-    const original = descriptor.value;
-    descriptor.value = function (...args) {
-        Logger.trace(`${target.constructor.name}.${propertyKey}: entry`, args);
-        const result = original.call(this, ...args);
-        Logger.trace(`${target.constructor.name}.${propertyKey}: exit`, result);
-        return result;
-    };
-}
-export function TraceAsyncMethod(target, propertyKey, descriptor) {
-    const original = descriptor.value;
-    descriptor.value = async function (...args) {
-        Logger.trace(`${target.constructor.name}.${propertyKey}: entry`, args);
-        const result = await original.call(this, ...args);
-        Logger.trace(`${target.constructor.name}.${propertyKey}: exit`, result);
-        return result;
-    };
-}
-//# sourceMappingURL=LoggingDecorator.js.map

package/lib/utils/LoggingDecorator.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"LoggingDecorator.js","sourceRoot":"","sources":["../../src/utils/LoggingDecorator.ts"],"names":[],"mappings":"AAAA,kFAAkF;AAClF,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AAE5C,MAAM,UAAU,eAAe,CAC7B,MAAW,EACX,WAAmB,EACnB,UAA8B;IAE9B,MAAM,QAAQ,GAAG,UAAU,CAAC,KAAK,CAAA;IAEjC,UAAU,CAAC,KAAK,GAAG,UAAU,GAAG,IAAW;QACzC,MAAM,CAAC,KAAK,CAAC,GAAG,MAAM,CAAC,WAAW,CAAC,IAAI,IAAI,WAAW,SAAS,EAAE,IAAI,CAAC,CAAA;QACtE,MAAM,MAAM,GAAG,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC,CAAA;QAC3C,MAAM,CAAC,KAAK,CAAC,GAAG,MAAM,CAAC,WAAW,CAAC,IAAI,IAAI,WAAW,QAAQ,EAAE,MAAM,CAAC,CAAA;QACvE,OAAO,MAAM,CAAA;IACf,CAAC,CAAA;AACH,CAAC;AAED,MAAM,UAAU,gBAAgB,CAC9B,MAAW,EACX,WAAmB,EACnB,UAA8B;IAE9B,MAAM,QAAQ,GAAG,UAAU,CAAC,KAAK,CAAA;IAEjC,UAAU,CAAC,KAAK,GAAG,KAAK,WAAW,GAAG,IAAW;QAC/C,MAAM,CAAC,KAAK,CAAC,GAAG,MAAM,CAAC,WAAW,CAAC,IAAI,IAAI,WAAW,SAAS,EAAE,IAAI,CAAC,CAAA;QACtE,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC,CAAA;QACjD,MAAM,CAAC,KAAK,CAAC,GAAG,MAAM,CAAC,WAAW,CAAC,IAAI,IAAI,WAAW,QAAQ,EAAE,MAAM,CAAC,CAAA;QACvE,OAAO,MAAM,CAAA;IACf,CAAC,CAAA;AACH,CAAC"}

package/lib/utils/LoggingService.d.ts

@@ -1,8 +0,0 @@
-export declare class Logger {
-    private static coreLogger;
-    static debug(message: string, meta?: unknown): void;
-    static error(message: string, meta?: unknown): void;
-    static info(message: string, meta?: unknown): void;
-    static trace(message: string, meta?: unknown): void;
-    static warn(message: string, meta?: unknown): void;
-}

package/lib/utils/LoggingService.js

@@ -1,25 +0,0 @@
-import { Logger as CoreLogger } from '@salesforce/core';
-import { PLUGIN_NAME } from '../constant/pluginConstant.js';
-export class Logger {
-    static coreLogger = (() => {
-        const coreLogger = CoreLogger.childFromRoot(PLUGIN_NAME);
-        coreLogger.setLevel();
-        return coreLogger;
-    })();
-    static debug(message, meta) {
-        Logger.coreLogger.debug(message, meta);
-    }
-    static error(message, meta) {
-        Logger.coreLogger.error(message, meta);
-    }
-    static info(message, meta) {
-        Logger.coreLogger.info(message, meta);
-    }
-    static trace(message, meta) {
-        Logger.coreLogger.trace(message, meta);
-    }
-    static warn(message, meta) {
-        Logger.coreLogger.warn(message, meta);
-    }
-}
-//# sourceMappingURL=LoggingService.js.map

package/lib/utils/LoggingService.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"LoggingService.js","sourceRoot":"","sources":["../../src/utils/LoggingService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,UAAU,EAAE,MAAM,kBAAkB,CAAA;AACvD,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAA;AAE3D,MAAM,OAAO,MAAM;IACT,MAAM,CAAC,UAAU,GAAe,CAAC,GAAG,EAAE;QAC5C,MAAM,UAAU,GAAG,UAAU,CAAC,aAAa,CAAC,WAAW,CAAC,CAAA;QACxD,UAAU,CAAC,QAAQ,EAAE,CAAA;QACrB,OAAO,UAAU,CAAA;IACnB,CAAC,CAAC,EAAE,CAAA;IAEJ,MAAM,CAAC,KAAK,CAAC,OAAe,EAAE,IAAc;QAC1C,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,OAAO,EAAE,IAAI,CAAC,CAAA;IACxC,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,OAAe,EAAE,IAAc;QAC1C,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,OAAO,EAAE,IAAI,CAAC,CAAA;IACxC,CAAC;IAED,MAAM,CAAC,IAAI,CAAC,OAAe,EAAE,IAAc;QACzC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,CAAA;IACvC,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,OAAe,EAAE,IAAc;QAC1C,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,OAAO,EAAE,IAAI,CAAC,CAAA;IACxC,CAAC;IAED,MAAM,CAAC,IAAI,CAAC,OAAe,EAAE,IAAc;QACzC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,CAAA;IACvC,CAAC"}