sf-git-merge-driver 1.0.0-dev-70.16166857864-1 → 1.0.0-dev-66.16167157314-1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. package/README.md +3 -3
  2. package/lib/driver/MergeDriver.js +0 -1
  3. package/lib/driver/MergeDriver.js.map +1 -1
  4. package/npm-shrinkwrap.json +189 -199
  5. package/oclif.manifest.json +1 -1
  6. package/package.json +6 -6
package/README.md CHANGED
@@ -48,7 +48,7 @@ EXAMPLES
48
48
  $ sf git merge driver install
49
49
  ```
50
50
 
51
- _See code: [src/commands/git/merge/driver/install.ts](https://github.com/scolladon/sf-git-merge-driver/blob/v1.0.0-dev-70.16166857864-1/src/commands/git/merge/driver/install.ts)_
51
+ _See code: [src/commands/git/merge/driver/install.ts](https://github.com/scolladon/sf-git-merge-driver/blob/v1.0.0-dev-66.16167157314-1/src/commands/git/merge/driver/install.ts)_
52
52
 
53
53
  ## `sf git merge driver run`
54
54
 
@@ -92,7 +92,7 @@ EXAMPLES
92
92
  - output-file is the path to the file where the merged content will be written
93
93
  ```
94
94
 
95
- _See code: [src/commands/git/merge/driver/run.ts](https://github.com/scolladon/sf-git-merge-driver/blob/v1.0.0-dev-70.16166857864-1/src/commands/git/merge/driver/run.ts)_
95
+ _See code: [src/commands/git/merge/driver/run.ts](https://github.com/scolladon/sf-git-merge-driver/blob/v1.0.0-dev-66.16167157314-1/src/commands/git/merge/driver/run.ts)_
96
96
 
97
97
  ## `sf git merge driver uninstall`
98
98
 
@@ -119,7 +119,7 @@ EXAMPLES
119
119
  $ sf git merge driver uninstall
120
120
  ```
121
121
 
122
- _See code: [src/commands/git/merge/driver/uninstall.ts](https://github.com/scolladon/sf-git-merge-driver/blob/v1.0.0-dev-70.16166857864-1/src/commands/git/merge/driver/uninstall.ts)_
122
+ _See code: [src/commands/git/merge/driver/uninstall.ts](https://github.com/scolladon/sf-git-merge-driver/blob/v1.0.0-dev-66.16167157314-1/src/commands/git/merge/driver/uninstall.ts)_
123
123
  <!-- commandsstop -->
124
124
 
125
125
  ## How It Works
package/lib/driver/MergeDriver.js CHANGED
@@ -10,7 +10,6 @@ export class MergeDriver {
10
10
  ]);
11
11
  const xmlMerger = new XmlMerger();
12
12
  const mergedContent = xmlMerger.mergeThreeWay(ancestorContent, ourContent, theirContent);
13
- console.log('investigation: ', mergedContent);
14
13
  // Write the merged content to the output file
15
14
  await writeFile(outputFile, mergedContent.output);
16
15
  return mergedContent.hasConflict;
package/lib/driver/MergeDriver.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"MergeDriver.js","sourceRoot":"","sources":["../../src/driver/MergeDriver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAA;AAElD,MAAM,OAAO,WAAW;IACtB,KAAK,CAAC,UAAU,CACd,YAAoB,EACpB,OAAe,EACf,SAAiB,EACjB,UAAkB;QAElB,0BAA0B;QAC1B,MAAM,CAAC,eAAe,EAAE,UAAU,EAAE,YAAY,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YACpE,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;YAC9B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;YACzB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;SAC5B,CAAC,CAAA;QAEF,MAAM,SAAS,GAAG,IAAI,SAAS,EAAE,CAAA;QAEjC,MAAM,aAAa,GAAG,SAAS,CAAC,aAAa,CAC3C,eAAe,EACf,UAAU,EACV,YAAY,CACb,CAAA;QAED,OAAO,CAAC,GAAG,CAAC,iBAAiB,EAAE,aAAa,CAAC,CAAA;QAE7C,8CAA8C;QAC9C,MAAM,SAAS,CAAC,UAAU,EAAE,aAAa,CAAC,MAAM,CAAC,CAAA;QACjD,OAAO,aAAa,CAAC,WAAW,CAAA;IAClC,CAAC;CACF"}
1
+ {"version":3,"file":"MergeDriver.js","sourceRoot":"","sources":["../../src/driver/MergeDriver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAA;AAElD,MAAM,OAAO,WAAW;IACtB,KAAK,CAAC,UAAU,CACd,YAAoB,EACpB,OAAe,EACf,SAAiB,EACjB,UAAkB;QAElB,0BAA0B;QAC1B,MAAM,CAAC,eAAe,EAAE,UAAU,EAAE,YAAY,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YACpE,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;YAC9B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;YACzB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;SAC5B,CAAC,CAAA;QAEF,MAAM,SAAS,GAAG,IAAI,SAAS,EAAE,CAAA;QAEjC,MAAM,aAAa,GAAG,SAAS,CAAC,aAAa,CAC3C,eAAe,EACf,UAAU,EACV,YAAY,CACb,CAAA;QAED,8CAA8C;QAC9C,MAAM,SAAS,CAAC,UAAU,EAAE,aAAa,CAAC,MAAM,CAAC,CAAA;QACjD,OAAO,aAAa,CAAC,WAAW,CAAA;IAClC,CAAC;CACF"}
package/npm-shrinkwrap.json CHANGED
@@ -1,16 +1,16 @@
1
1
  {
2
2
  "name": "sf-git-merge-driver",
3
- "version": "1.0.0-dev-70.16166857864-1",
3
+ "version": "1.0.0-dev-66.16167157314-1",
4
4
  "lockfileVersion": 3,
5
5
  "requires": true,
6
6
  "packages": {
7
7
  "": {
8
8
  "name": "sf-git-merge-driver",
9
- "version": "1.0.0-dev-70.16166857864-1",
9
+ "version": "1.0.0-dev-66.16167157314-1",
10
10
  "license": "MIT",
11
11
  "dependencies": {
12
- "@oclif/core": "^4.4.1",
13
- "@salesforce/core": "^8.17.0",
12
+ "@oclif/core": "^4.5.0",
13
+ "@salesforce/core": "^8.18.0",
14
14
  "@salesforce/sf-plugins-core": "^12.2.3",
15
15
  "fast-equals": "^5.2.2",
16
16
  "fast-xml-parser": "^5.2.5",
@@ -18,20 +18,20 @@
18
18
  "simple-git": "^3.28.0"
19
19
  },
20
20
  "devDependencies": {
21
- "@biomejs/biome": "2.0.6",
21
+ "@biomejs/biome": "2.1.1",
22
22
  "@commitlint/config-conventional": "^19.8.1",
23
23
  "@oclif/plugin-help": "^6.2.30",
24
24
  "@salesforce/cli-plugins-testkit": "^5.3.39",
25
25
  "@salesforce/dev-config": "^4.3.1",
26
26
  "@types/chai": "^5.2.2",
27
27
  "@types/jest": "^29.5.14",
28
- "chai": "^5.2.0",
28
+ "chai": "^5.2.1",
29
29
  "husky": "^9.1.7",
30
30
  "jest": "^29.7.0",
31
31
  "knip": "^5.61.3",
32
32
  "mocha": "^11.7.1",
33
33
  "nyc": "^17.1.0",
34
- "oclif": "^4.20.4",
34
+ "oclif": "^4.20.5",
35
35
  "shx": "^0.4.0",
36
36
  "ts-jest": "^29.4.0",
37
37
  "ts-node": "^10.9.2",
@@ -1595,9 +1595,9 @@
1595
1595
  "license": "MIT"
1596
1596
  },
1597
1597
  "node_modules/@biomejs/biome": {
1598
- "version": "2.0.6",
1599
- "resolved": "https://registry.npmjs.org/@biomejs/biome/-/biome-2.0.6.tgz",
1600
- "integrity": "sha512-RRP+9cdh5qwe2t0gORwXaa27oTOiQRQvrFf49x2PA1tnpsyU7FIHX4ZOFMtBC4QNtyWsN7Dqkf5EDbg4X+9iqA==",
1598
+ "version": "2.1.1",
1599
+ "resolved": "https://registry.npmjs.org/@biomejs/biome/-/biome-2.1.1.tgz",
1600
+ "integrity": "sha512-HFGYkxG714KzG+8tvtXCJ1t1qXQMzgWzfvQaUjxN6UeKv+KvMEuliInnbZLJm6DXFXwqVi6446EGI0sGBLIYng==",
1601
1601
  "dev": true,
1602
1602
  "license": "MIT OR Apache-2.0",
1603
1603
  "bin": {
@@ -1611,20 +1611,20 @@
1611
1611
  "url": "https://opencollective.com/biome"
1612
1612
  },
1613
1613
  "optionalDependencies": {
1614
- "@biomejs/cli-darwin-arm64": "2.0.6",
1615
- "@biomejs/cli-darwin-x64": "2.0.6",
1616
- "@biomejs/cli-linux-arm64": "2.0.6",
1617
- "@biomejs/cli-linux-arm64-musl": "2.0.6",
1618
- "@biomejs/cli-linux-x64": "2.0.6",
1619
- "@biomejs/cli-linux-x64-musl": "2.0.6",
1620
- "@biomejs/cli-win32-arm64": "2.0.6",
1621
- "@biomejs/cli-win32-x64": "2.0.6"
1614
+ "@biomejs/cli-darwin-arm64": "2.1.1",
1615
+ "@biomejs/cli-darwin-x64": "2.1.1",
1616
+ "@biomejs/cli-linux-arm64": "2.1.1",
1617
+ "@biomejs/cli-linux-arm64-musl": "2.1.1",
1618
+ "@biomejs/cli-linux-x64": "2.1.1",
1619
+ "@biomejs/cli-linux-x64-musl": "2.1.1",
1620
+ "@biomejs/cli-win32-arm64": "2.1.1",
1621
+ "@biomejs/cli-win32-x64": "2.1.1"
1622
1622
  }
1623
1623
  },
1624
1624
  "node_modules/@biomejs/cli-darwin-arm64": {
1625
- "version": "2.0.6",
1626
- "resolved": "https://registry.npmjs.org/@biomejs/cli-darwin-arm64/-/cli-darwin-arm64-2.0.6.tgz",
1627
- "integrity": "sha512-AzdiNNjNzsE6LfqWyBvcL29uWoIuZUkndu+wwlXW13EKcBHbbKjNQEZIJKYDc6IL+p7bmWGx3v9ZtcRyIoIz5A==",
1625
+ "version": "2.1.1",
1626
+ "resolved": "https://registry.npmjs.org/@biomejs/cli-darwin-arm64/-/cli-darwin-arm64-2.1.1.tgz",
1627
+ "integrity": "sha512-2Muinu5ok4tWxq4nu5l19el48cwCY/vzvI7Vjbkf3CYIQkjxZLyj0Ad37Jv2OtlXYaLvv+Sfu1hFeXt/JwRRXQ==",
1628
1628
  "cpu": [
1629
1629
  "arm64"
1630
1630
  ],
@@ -1639,9 +1639,9 @@
1639
1639
  }
1640
1640
  },
1641
1641
  "node_modules/@biomejs/cli-darwin-x64": {
1642
- "version": "2.0.6",
1643
- "resolved": "https://registry.npmjs.org/@biomejs/cli-darwin-x64/-/cli-darwin-x64-2.0.6.tgz",
1644
- "integrity": "sha512-wJjjP4E7bO4WJmiQaLnsdXMa516dbtC6542qeRkyJg0MqMXP0fvs4gdsHhZ7p9XWTAmGIjZHFKXdsjBvKGIJJQ==",
1642
+ "version": "2.1.1",
1643
+ "resolved": "https://registry.npmjs.org/@biomejs/cli-darwin-x64/-/cli-darwin-x64-2.1.1.tgz",
1644
+ "integrity": "sha512-cC8HM5lrgKQXLAK+6Iz2FrYW5A62pAAX6KAnRlEyLb+Q3+Kr6ur/sSuoIacqlp1yvmjHJqjYfZjPvHWnqxoEIA==",
1645
1645
  "cpu": [
1646
1646
  "x64"
1647
1647
  ],
@@ -1656,9 +1656,9 @@
1656
1656
  }
1657
1657
  },
1658
1658
  "node_modules/@biomejs/cli-linux-arm64": {
1659
- "version": "2.0.6",
1660
- "resolved": "https://registry.npmjs.org/@biomejs/cli-linux-arm64/-/cli-linux-arm64-2.0.6.tgz",
1661
- "integrity": "sha512-ZSVf6TYo5rNMUHIW1tww+rs/krol7U5A1Is/yzWyHVZguuB0lBnIodqyFuwCNqG9aJGyk7xIMS8HG0qGUPz0SA==",
1659
+ "version": "2.1.1",
1660
+ "resolved": "https://registry.npmjs.org/@biomejs/cli-linux-arm64/-/cli-linux-arm64-2.1.1.tgz",
1661
+ "integrity": "sha512-tw4BEbhAUkWPe4WBr6IX04DJo+2jz5qpPzpW/SWvqMjb9QuHY8+J0M23V8EPY/zWU4IG8Ui0XESapR1CB49Q7g==",
1662
1662
  "cpu": [
1663
1663
  "arm64"
1664
1664
  ],
@@ -1673,9 +1673,9 @@
1673
1673
  }
1674
1674
  },
1675
1675
  "node_modules/@biomejs/cli-linux-arm64-musl": {
1676
- "version": "2.0.6",
1677
- "resolved": "https://registry.npmjs.org/@biomejs/cli-linux-arm64-musl/-/cli-linux-arm64-musl-2.0.6.tgz",
1678
- "integrity": "sha512-CVPEMlin3bW49sBqLBg2x016Pws7eUXA27XYDFlEtponD0luYjg2zQaMJ2nOqlkKG9fqzzkamdYxHdMDc2gZFw==",
1676
+ "version": "2.1.1",
1677
+ "resolved": "https://registry.npmjs.org/@biomejs/cli-linux-arm64-musl/-/cli-linux-arm64-musl-2.1.1.tgz",
1678
+ "integrity": "sha512-/7FBLnTswu4jgV9ttI3AMIdDGqVEPIZd8I5u2D4tfCoj8rl9dnjrEQbAIDlWhUXdyWlFSz8JypH3swU9h9P+2A==",
1679
1679
  "cpu": [
1680
1680
  "arm64"
1681
1681
  ],
@@ -1690,9 +1690,9 @@
1690
1690
  }
1691
1691
  },
1692
1692
  "node_modules/@biomejs/cli-linux-x64": {
1693
- "version": "2.0.6",
1694
- "resolved": "https://registry.npmjs.org/@biomejs/cli-linux-x64/-/cli-linux-x64-2.0.6.tgz",
1695
- "integrity": "sha512-geM1MkHTV1Kh2Cs/Xzot9BOF3WBacihw6bkEmxkz4nSga8B9/hWy5BDiOG3gHDGIBa8WxT0nzsJs2f/hPqQIQw==",
1693
+ "version": "2.1.1",
1694
+ "resolved": "https://registry.npmjs.org/@biomejs/cli-linux-x64/-/cli-linux-x64-2.1.1.tgz",
1695
+ "integrity": "sha512-3WJ1GKjU7NzZb6RTbwLB59v9cTIlzjbiFLDB0z4376TkDqoNYilJaC37IomCr/aXwuU8QKkrYoHrgpSq5ffJ4Q==",
1696
1696
  "cpu": [
1697
1697
  "x64"
1698
1698
  ],
@@ -1707,9 +1707,9 @@
1707
1707
  }
1708
1708
  },
1709
1709
  "node_modules/@biomejs/cli-linux-x64-musl": {
1710
- "version": "2.0.6",
1711
- "resolved": "https://registry.npmjs.org/@biomejs/cli-linux-x64-musl/-/cli-linux-x64-musl-2.0.6.tgz",
1712
- "integrity": "sha512-mKHE/e954hR/hSnAcJSjkf4xGqZc/53Kh39HVW1EgO5iFi0JutTN07TSjEMg616julRtfSNJi0KNyxvc30Y4rQ==",
1710
+ "version": "2.1.1",
1711
+ "resolved": "https://registry.npmjs.org/@biomejs/cli-linux-x64-musl/-/cli-linux-x64-musl-2.1.1.tgz",
1712
+ "integrity": "sha512-kUu+loNI3OCD2c12cUt7M5yaaSjDnGIksZwKnueubX6c/HWUyi/0mPbTBHR49Me3F0KKjWiKM+ZOjsmC+lUt9g==",
1713
1713
  "cpu": [
1714
1714
  "x64"
1715
1715
  ],
@@ -1724,9 +1724,9 @@
1724
1724
  }
1725
1725
  },
1726
1726
  "node_modules/@biomejs/cli-win32-arm64": {
1727
- "version": "2.0.6",
1728
- "resolved": "https://registry.npmjs.org/@biomejs/cli-win32-arm64/-/cli-win32-arm64-2.0.6.tgz",
1729
- "integrity": "sha512-290V4oSFoKaprKE1zkYVsDfAdn0An5DowZ+GIABgjoq1ndhvNxkJcpxPsiYtT7slbVe3xmlT0ncdfOsN7KruzA==",
1727
+ "version": "2.1.1",
1728
+ "resolved": "https://registry.npmjs.org/@biomejs/cli-win32-arm64/-/cli-win32-arm64-2.1.1.tgz",
1729
+ "integrity": "sha512-vEHK0v0oW+E6RUWLoxb2isI3rZo57OX9ZNyyGH701fZPj6Il0Rn1f5DMNyCmyflMwTnIQstEbs7n2BxYSqQx4Q==",
1730
1730
  "cpu": [
1731
1731
  "arm64"
1732
1732
  ],
@@ -1741,9 +1741,9 @@
1741
1741
  }
1742
1742
  },
1743
1743
  "node_modules/@biomejs/cli-win32-x64": {
1744
- "version": "2.0.6",
1745
- "resolved": "https://registry.npmjs.org/@biomejs/cli-win32-x64/-/cli-win32-x64-2.0.6.tgz",
1746
- "integrity": "sha512-bfM1Bce0d69Ao7pjTjUS+AWSZ02+5UHdiAP85Th8e9yV5xzw6JrHXbL5YWlcEKQ84FIZMdDc7ncuti1wd2sdbw==",
1744
+ "version": "2.1.1",
1745
+ "resolved": "https://registry.npmjs.org/@biomejs/cli-win32-x64/-/cli-win32-x64-2.1.1.tgz",
1746
+ "integrity": "sha512-i2PKdn70kY++KEF/zkQFvQfX1e8SkA8hq4BgC+yE9dZqyLzB/XStY2MvwI3qswlRgnGpgncgqe0QYKVS1blksg==",
1747
1747
  "cpu": [
1748
1748
  "x64"
1749
1749
  ],
@@ -3523,55 +3523,6 @@
3523
3523
  "url": "https://github.com/chalk/chalk?sponsor=1"
3524
3524
  }
3525
3525
  },
3526
- "node_modules/@jest/environment/node_modules/ci-info": {
3527
- "version": "3.9.0",
3528
- "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",
3529
- "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==",
3530
- "dev": true,
3531
- "funding": [
3532
- {
3533
- "type": "github",
3534
- "url": "https://github.com/sponsors/sibiraj-s"
3535
- }
3536
- ],
3537
- "license": "MIT",
3538
- "engines": {
3539
- "node": ">=8"
3540
- }
3541
- },
3542
- "node_modules/@jest/environment/node_modules/jest-mock": {
3543
- "version": "29.7.0",
3544
- "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.7.0.tgz",
3545
- "integrity": "sha512-ITOMZn+UkYS4ZFh83xYAOzWStloNzJFO2s8DWrE4lhtGD+AorgnbkiKERe4wQVBydIGPx059g6riW5Btp6Llnw==",
3546
- "dev": true,
3547
- "license": "MIT",
3548
- "dependencies": {
3549
- "@jest/types": "^29.6.3",
3550
- "@types/node": "*",
3551
- "jest-util": "^29.7.0"
3552
- },
3553
- "engines": {
3554
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
3555
- }
3556
- },
3557
- "node_modules/@jest/environment/node_modules/jest-util": {
3558
- "version": "29.7.0",
3559
- "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz",
3560
- "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==",
3561
- "dev": true,
3562
- "license": "MIT",
3563
- "dependencies": {
3564
- "@jest/types": "^29.6.3",
3565
- "@types/node": "*",
3566
- "chalk": "^4.0.0",
3567
- "ci-info": "^3.2.0",
3568
- "graceful-fs": "^4.2.9",
3569
- "picomatch": "^2.2.3"
3570
- },
3571
- "engines": {
3572
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
3573
- }
3574
- },
3575
3526
  "node_modules/@jest/environment/node_modules/supports-color": {
3576
3527
  "version": "7.2.0",
3577
3528
  "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -3717,21 +3668,6 @@
3717
3668
  "node": ">=8"
3718
3669
  }
3719
3670
  },
3720
- "node_modules/@jest/fake-timers/node_modules/jest-mock": {
3721
- "version": "29.7.0",
3722
- "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.7.0.tgz",
3723
- "integrity": "sha512-ITOMZn+UkYS4ZFh83xYAOzWStloNzJFO2s8DWrE4lhtGD+AorgnbkiKERe4wQVBydIGPx059g6riW5Btp6Llnw==",
3724
- "dev": true,
3725
- "license": "MIT",
3726
- "dependencies": {
3727
- "@jest/types": "^29.6.3",
3728
- "@types/node": "*",
3729
- "jest-util": "^29.7.0"
3730
- },
3731
- "engines": {
3732
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
3733
- }
3734
- },
3735
3671
  "node_modules/@jest/fake-timers/node_modules/jest-util": {
3736
3672
  "version": "29.7.0",
3737
3673
  "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz",
@@ -3850,55 +3786,6 @@
3850
3786
  "url": "https://github.com/chalk/chalk?sponsor=1"
3851
3787
  }
3852
3788
  },
3853
- "node_modules/@jest/globals/node_modules/ci-info": {
3854
- "version": "3.9.0",
3855
- "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",
3856
- "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==",
3857
- "dev": true,
3858
- "funding": [
3859
- {
3860
- "type": "github",
3861
- "url": "https://github.com/sponsors/sibiraj-s"
3862
- }
3863
- ],
3864
- "license": "MIT",
3865
- "engines": {
3866
- "node": ">=8"
3867
- }
3868
- },
3869
- "node_modules/@jest/globals/node_modules/jest-mock": {
3870
- "version": "29.7.0",
3871
- "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.7.0.tgz",
3872
- "integrity": "sha512-ITOMZn+UkYS4ZFh83xYAOzWStloNzJFO2s8DWrE4lhtGD+AorgnbkiKERe4wQVBydIGPx059g6riW5Btp6Llnw==",
3873
- "dev": true,
3874
- "license": "MIT",
3875
- "dependencies": {
3876
- "@jest/types": "^29.6.3",
3877
- "@types/node": "*",
3878
- "jest-util": "^29.7.0"
3879
- },
3880
- "engines": {
3881
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
3882
- }
3883
- },
3884
- "node_modules/@jest/globals/node_modules/jest-util": {
3885
- "version": "29.7.0",
3886
- "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz",
3887
- "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==",
3888
- "dev": true,
3889
- "license": "MIT",
3890
- "dependencies": {
3891
- "@jest/types": "^29.6.3",
3892
- "@types/node": "*",
3893
- "chalk": "^4.0.0",
3894
- "ci-info": "^3.2.0",
3895
- "graceful-fs": "^4.2.9",
3896
- "picomatch": "^2.2.3"
3897
- },
3898
- "engines": {
3899
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
3900
- }
3901
- },
3902
3789
  "node_modules/@jest/globals/node_modules/supports-color": {
3903
3790
  "version": "7.2.0",
3904
3791
  "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -4831,9 +4718,9 @@
4831
4718
  }
4832
4719
  },
4833
4720
  "node_modules/@oclif/core": {
4834
- "version": "4.4.1",
4835
- "resolved": "https://registry.npmjs.org/@oclif/core/-/core-4.4.1.tgz",
4836
- "integrity": "sha512-RYonV4IJZcGAoi3pdo5CPl5hVH1YdtQMEX77TLdgTPVrMmIjbiB0Borfguj/mdDF2TjLXp+Z+RbmLUejuhSYTA==",
4721
+ "version": "4.5.0",
4722
+ "resolved": "https://registry.npmjs.org/@oclif/core/-/core-4.5.0.tgz",
4723
+ "integrity": "sha512-UYWyDFNKFyzgXVXO0DHfOvJ/8qpw4yPYe7fOHausDEVU44qjDr90ZnfYTljZPK8dhgMggxiZs9n+TFajnXRp7g==",
4837
4724
  "license": "MIT",
4838
4725
  "dependencies": {
4839
4726
  "ansi-escapes": "^4.3.2",
@@ -5263,12 +5150,12 @@
5263
5150
  }
5264
5151
  },
5265
5152
  "node_modules/@salesforce/core": {
5266
- "version": "8.17.0",
5267
- "resolved": "https://registry.npmjs.org/@salesforce/core/-/core-8.17.0.tgz",
5268
- "integrity": "sha512-2pZfBtwA1oX5IuxS8/gVnrFXzPAJpf6ZA5bfImN1dWGbWlwrfocXzXTNRFdQ2gP0FG4o+PFSlc6d4g8Vwz25IA==",
5153
+ "version": "8.18.0",
5154
+ "resolved": "https://registry.npmjs.org/@salesforce/core/-/core-8.18.0.tgz",
5155
+ "integrity": "sha512-r+2hHoZZzzVxbDer1RUHHb85ctoN+ODUqaNS4sURkB6nPSHec33fHIS5x/e0qfgC1crWE8fLNXHv2XofB1vlpw==",
5269
5156
  "license": "BSD-3-Clause",
5270
5157
  "dependencies": {
5271
- "@jsforce/jsforce-node": "^3.8.2",
5158
+ "@jsforce/jsforce-node": "^3.9.1",
5272
5159
  "@salesforce/kit": "^3.2.2",
5273
5160
  "@salesforce/schemas": "^1.9.0",
5274
5161
  "@salesforce/ts-types": "^2.0.10",
@@ -7238,9 +7125,9 @@
7238
7125
  }
7239
7126
  },
7240
7127
  "node_modules/chai": {
7241
- "version": "5.2.0",
7242
- "resolved": "https://registry.npmjs.org/chai/-/chai-5.2.0.tgz",
7243
- "integrity": "sha512-mCuXncKXk5iCLhfhwTc0izo0gtEmpz5CtG2y8GiOINBlMVS6v8TMRc5TaLWKS6692m9+dVVfzgeVxR5UxWHTYw==",
7128
+ "version": "5.2.1",
7129
+ "resolved": "https://registry.npmjs.org/chai/-/chai-5.2.1.tgz",
7130
+ "integrity": "sha512-5nFxhUrX0PqtyogoYOA8IPswy5sZFTOsBFl/9bNsmDLgsxYTzSZQJDPppDnZPTQbzSEm0hqGjWPzRemQCYbD6A==",
7244
7131
  "dev": true,
7245
7132
  "license": "MIT",
7246
7133
  "dependencies": {
@@ -7251,7 +7138,7 @@
7251
7138
  "pathval": "^2.0.0"
7252
7139
  },
7253
7140
  "engines": {
7254
- "node": ">=12"
7141
+ "node": ">=18"
7255
7142
  }
7256
7143
  },
7257
7144
  "node_modules/chalk": {
@@ -11260,21 +11147,6 @@
11260
11147
  "node": ">=8"
11261
11148
  }
11262
11149
  },
11263
- "node_modules/jest-environment-node/node_modules/jest-mock": {
11264
- "version": "29.7.0",
11265
- "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.7.0.tgz",
11266
- "integrity": "sha512-ITOMZn+UkYS4ZFh83xYAOzWStloNzJFO2s8DWrE4lhtGD+AorgnbkiKERe4wQVBydIGPx059g6riW5Btp6Llnw==",
11267
- "dev": true,
11268
- "license": "MIT",
11269
- "dependencies": {
11270
- "@jest/types": "^29.6.3",
11271
- "@types/node": "*",
11272
- "jest-util": "^29.7.0"
11273
- },
11274
- "engines": {
11275
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
11276
- }
11277
- },
11278
11150
  "node_modules/jest-environment-node/node_modules/jest-util": {
11279
11151
  "version": "29.7.0",
11280
11152
  "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz",
@@ -11524,6 +11396,139 @@
11524
11396
  "node": ">=8"
11525
11397
  }
11526
11398
  },
11399
+ "node_modules/jest-mock": {
11400
+ "version": "29.7.0",
11401
+ "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.7.0.tgz",
11402
+ "integrity": "sha512-ITOMZn+UkYS4ZFh83xYAOzWStloNzJFO2s8DWrE4lhtGD+AorgnbkiKERe4wQVBydIGPx059g6riW5Btp6Llnw==",
11403
+ "dev": true,
11404
+ "license": "MIT",
11405
+ "dependencies": {
11406
+ "@jest/types": "^29.6.3",
11407
+ "@types/node": "*",
11408
+ "jest-util": "^29.7.0"
11409
+ },
11410
+ "engines": {
11411
+ "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
11412
+ }
11413
+ },
11414
+ "node_modules/jest-mock/node_modules/@jest/schemas": {
11415
+ "version": "29.6.3",
11416
+ "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz",
11417
+ "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==",
11418
+ "dev": true,
11419
+ "license": "MIT",
11420
+ "dependencies": {
11421
+ "@sinclair/typebox": "^0.27.8"
11422
+ },
11423
+ "engines": {
11424
+ "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
11425
+ }
11426
+ },
11427
+ "node_modules/jest-mock/node_modules/@jest/types": {
11428
+ "version": "29.6.3",
11429
+ "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz",
11430
+ "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==",
11431
+ "dev": true,
11432
+ "license": "MIT",
11433
+ "dependencies": {
11434
+ "@jest/schemas": "^29.6.3",
11435
+ "@types/istanbul-lib-coverage": "^2.0.0",
11436
+ "@types/istanbul-reports": "^3.0.0",
11437
+ "@types/node": "*",
11438
+ "@types/yargs": "^17.0.8",
11439
+ "chalk": "^4.0.0"
11440
+ },
11441
+ "engines": {
11442
+ "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
11443
+ }
11444
+ },
11445
+ "node_modules/jest-mock/node_modules/@sinclair/typebox": {
11446
+ "version": "0.27.8",
11447
+ "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz",
11448
+ "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==",
11449
+ "dev": true,
11450
+ "license": "MIT"
11451
+ },
11452
+ "node_modules/jest-mock/node_modules/ansi-styles": {
11453
+ "version": "4.3.0",
11454
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
11455
+ "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
11456
+ "dev": true,
11457
+ "license": "MIT",
11458
+ "dependencies": {
11459
+ "color-convert": "^2.0.1"
11460
+ },
11461
+ "engines": {
11462
+ "node": ">=8"
11463
+ },
11464
+ "funding": {
11465
+ "url": "https://github.com/chalk/ansi-styles?sponsor=1"
11466
+ }
11467
+ },
11468
+ "node_modules/jest-mock/node_modules/chalk": {
11469
+ "version": "4.1.2",
11470
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
11471
+ "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
11472
+ "dev": true,
11473
+ "license": "MIT",
11474
+ "dependencies": {
11475
+ "ansi-styles": "^4.1.0",
11476
+ "supports-color": "^7.1.0"
11477
+ },
11478
+ "engines": {
11479
+ "node": ">=10"
11480
+ },
11481
+ "funding": {
11482
+ "url": "https://github.com/chalk/chalk?sponsor=1"
11483
+ }
11484
+ },
11485
+ "node_modules/jest-mock/node_modules/ci-info": {
11486
+ "version": "3.9.0",
11487
+ "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",
11488
+ "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==",
11489
+ "dev": true,
11490
+ "funding": [
11491
+ {
11492
+ "type": "github",
11493
+ "url": "https://github.com/sponsors/sibiraj-s"
11494
+ }
11495
+ ],
11496
+ "license": "MIT",
11497
+ "engines": {
11498
+ "node": ">=8"
11499
+ }
11500
+ },
11501
+ "node_modules/jest-mock/node_modules/jest-util": {
11502
+ "version": "29.7.0",
11503
+ "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz",
11504
+ "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==",
11505
+ "dev": true,
11506
+ "license": "MIT",
11507
+ "dependencies": {
11508
+ "@jest/types": "^29.6.3",
11509
+ "@types/node": "*",
11510
+ "chalk": "^4.0.0",
11511
+ "ci-info": "^3.2.0",
11512
+ "graceful-fs": "^4.2.9",
11513
+ "picomatch": "^2.2.3"
11514
+ },
11515
+ "engines": {
11516
+ "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
11517
+ }
11518
+ },
11519
+ "node_modules/jest-mock/node_modules/supports-color": {
11520
+ "version": "7.2.0",
11521
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
11522
+ "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
11523
+ "dev": true,
11524
+ "license": "MIT",
11525
+ "dependencies": {
11526
+ "has-flag": "^4.0.0"
11527
+ },
11528
+ "engines": {
11529
+ "node": ">=8"
11530
+ }
11531
+ },
11527
11532
  "node_modules/jest-pnp-resolver": {
11528
11533
  "version": "1.2.3",
11529
11534
  "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz",
@@ -12288,21 +12293,6 @@
12288
12293
  "fsevents": "^2.3.2"
12289
12294
  }
12290
12295
  },
12291
- "node_modules/jest-runtime/node_modules/jest-mock": {
12292
- "version": "29.7.0",
12293
- "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.7.0.tgz",
12294
- "integrity": "sha512-ITOMZn+UkYS4ZFh83xYAOzWStloNzJFO2s8DWrE4lhtGD+AorgnbkiKERe4wQVBydIGPx059g6riW5Btp6Llnw==",
12295
- "dev": true,
12296
- "license": "MIT",
12297
- "dependencies": {
12298
- "@jest/types": "^29.6.3",
12299
- "@types/node": "*",
12300
- "jest-util": "^29.7.0"
12301
- },
12302
- "engines": {
12303
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
12304
- }
12305
- },
12306
12296
  "node_modules/jest-runtime/node_modules/jest-regex-util": {
12307
12297
  "version": "29.6.3",
12308
12298
  "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.6.3.tgz",
@@ -14412,9 +14402,9 @@
14412
14402
  }
14413
14403
  },
14414
14404
  "node_modules/oclif": {
14415
- "version": "4.20.4",
14416
- "resolved": "https://registry.npmjs.org/oclif/-/oclif-4.20.4.tgz",
14417
- "integrity": "sha512-0M6N81LXCcF/rXyghCwYMT3kVadXWTBKCUp6XzDjC7gcZxl0GTUYXa/QENaE2sAsAcYQZKxbMDx7jrWPdDGggQ==",
14405
+ "version": "4.20.5",
14406
+ "resolved": "https://registry.npmjs.org/oclif/-/oclif-4.20.5.tgz",
14407
+ "integrity": "sha512-7zPeQG/Y2os8ybjXKFGFza97utG339tnYHoovCBEz4ZaF9z53NK9NucUjjiRBs2ZZSGjrqW52JIdF2NY4IRQTA==",
14418
14408
  "dev": true,
14419
14409
  "license": "MIT",
14420
14410
  "dependencies": {
package/oclif.manifest.json CHANGED
@@ -284,5 +284,5 @@
284
284
  ]
285
285
  }
286
286
  },
287
- "version": "1.0.0-dev-70.16166857864-1"
287
+ "version": "1.0.0-dev-66.16167157314-1"
288
288
  }
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "sf-git-merge-driver",
3
3
  "description": "git remote add origin git@github.com:scolladon/sf-git-merge-driver.git",
4
- "version": "1.0.0-dev-70.16166857864-1",
4
+ "version": "1.0.0-dev-66.16167157314-1",
5
5
  "exports": "./lib/driver/MergeDriver.js",
6
6
  "type": "module",
7
7
  "author": "Sébastien Colladon (colladonsebastien@gmail.com)",
@@ -10,8 +10,8 @@
10
10
  "url": "git+https://github.com/scolladon/sf-git-merge-driver.git"
11
11
  },
12
12
  "dependencies": {
13
- "@oclif/core": "^4.4.1",
14
- "@salesforce/core": "^8.17.0",
13
+ "@oclif/core": "^4.5.0",
14
+ "@salesforce/core": "^8.18.0",
15
15
  "@salesforce/sf-plugins-core": "^12.2.3",
16
16
  "fast-equals": "^5.2.2",
17
17
  "fast-xml-parser": "^5.2.5",
@@ -19,20 +19,20 @@
19
19
  "simple-git": "^3.28.0"
20
20
  },
21
21
  "devDependencies": {
22
- "@biomejs/biome": "2.0.6",
22
+ "@biomejs/biome": "2.1.1",
23
23
  "@commitlint/config-conventional": "^19.8.1",
24
24
  "@oclif/plugin-help": "^6.2.30",
25
25
  "@salesforce/cli-plugins-testkit": "^5.3.39",
26
26
  "@salesforce/dev-config": "^4.3.1",
27
27
  "@types/chai": "^5.2.2",
28
28
  "@types/jest": "^29.5.14",
29
- "chai": "^5.2.0",
29
+ "chai": "^5.2.1",
30
30
  "husky": "^9.1.7",
31
31
  "jest": "^29.7.0",
32
32
  "knip": "^5.61.3",
33
33
  "mocha": "^11.7.1",
34
34
  "nyc": "^17.1.0",
35
- "oclif": "^4.20.4",
35
+ "oclif": "^4.20.5",
36
36
  "shx": "^0.4.0",
37
37
  "ts-jest": "^29.4.0",
38
38
  "ts-node": "^10.9.2",