sf-git-merge-driver 1.0.1 → 1.0.2-dev-83.16905851057-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 (25) hide show
  1. package/README.md +9 -11
  2. package/lib/commands/git/merge/driver/run.js +4 -7
  3. package/lib/commands/git/merge/driver/run.js.map +1 -1
  4. package/lib/constant/gitConstant.d.ts +1 -0
  5. package/lib/constant/gitConstant.js +2 -0
  6. package/lib/constant/gitConstant.js.map +1 -0
  7. package/lib/driver/MergeDriver.d.ts +1 -1
  8. package/lib/driver/MergeDriver.js +10 -8
  9. package/lib/driver/MergeDriver.js.map +1 -1
  10. package/lib/service/installService.js +4 -2
  11. package/lib/service/installService.js.map +1 -1
  12. package/lib/service/uninstallService.js +11 -7
  13. package/lib/service/uninstallService.js.map +1 -1
  14. package/lib/utils/gitUtils.d.ts +1 -0
  15. package/lib/utils/gitUtils.js +9 -0
  16. package/lib/utils/gitUtils.js.map +1 -0
  17. package/lib/utils/mergeUtils.d.ts +2 -0
  18. package/lib/utils/mergeUtils.js +37 -0
  19. package/lib/utils/mergeUtils.js.map +1 -1
  20. package/messages/install.md +1 -1
  21. package/messages/run.md +0 -8
  22. package/messages/uninstall.md +1 -1
  23. package/npm-shrinkwrap.json +5507 -7859
  24. package/oclif.manifest.json +3 -3
  25. package/package.json +14 -14
package/oclif.manifest.json CHANGED
@@ -3,7 +3,7 @@
3
3
  "git:merge:driver:install": {
4
4
  "aliases": [],
5
5
  "args": {},
6
- "description": "Installs a local git merge driver for the given org and branch, by updating the `.gitattributes` files in the project, creating a new merge driver configuration in the `.git/config` of the project, and installing the binary in the node_modules/.bin directory.",
6
+ "description": "Installs a local git merge driver for the given org and branch, by updating the `.git/info/attributes` files in the project, creating a new merge driver configuration in the `.git/config` of the project, and installing the binary in the node_modules/.bin directory.",
7
7
  "examples": [
8
8
  "Install the driver for a given project:\n<%= config.bin %> <%= command.id %>"
9
9
  ],
@@ -216,7 +216,7 @@
216
216
  "git:merge:driver:uninstall": {
217
217
  "aliases": [],
218
218
  "args": {},
219
- "description": "Uninstalls the local git merge driver for the given org and branch, by removing the merge driver content in the `.gitattributes` files in the project, deleting the merge driver configuration from the `.git/config` of the project, and removing the installed binary from the node_modules/.bin directory.",
219
+ "description": "Uninstalls the local git merge driver for the given org and branch, by removing the merge driver content in the `.git/info/attributes` files in the project, deleting the merge driver configuration from the `.git/config` of the project, and removing the installed binary from the node_modules/.bin directory.",
220
220
  "examples": [
221
221
  "Uninstall the driver for a given project:\n<%= config.bin %> <%= command.id %>"
222
222
  ],
@@ -284,5 +284,5 @@
284
284
  ]
285
285
  }
286
286
  },
287
- "version": "1.0.1"
287
+ "version": "1.0.2-dev-83.16905851057-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.1",
4
+ "version": "1.0.2-dev-83.16905851057-1",
5
5
  "exports": "./lib/driver/MergeDriver.js",
6
6
  "type": "module",
7
7
  "author": "Sébastien Colladon (colladonsebastien@gmail.com)",
@@ -10,38 +10,38 @@
10
10
  "url": "git+https://github.com/scolladon/sf-git-merge-driver.git"
11
11
  },
12
12
  "dependencies": {
13
- "@oclif/core": "^4.5.0",
14
- "@salesforce/core": "^8.18.0",
15
- "@salesforce/sf-plugins-core": "^12.2.3",
13
+ "@oclif/core": "^4.5.2",
14
+ "@salesforce/core": "^8.19.1",
15
+ "@salesforce/sf-plugins-core": "^12.2.4",
16
16
  "fast-equals": "^5.2.2",
17
17
  "fast-xml-parser": "^5.2.5",
18
18
  "lodash-es": "^4.17.21",
19
19
  "simple-git": "^3.28.0"
20
20
  },
21
21
  "devDependencies": {
22
- "@biomejs/biome": "2.1.1",
22
+ "@biomejs/biome": "2.1.4",
23
23
  "@commitlint/config-conventional": "^19.8.1",
24
- "@oclif/plugin-help": "^6.2.30",
24
+ "@oclif/plugin-help": "^6.2.32",
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
- "@types/jest": "^29.5.14",
28
+ "@types/jest": "^30.0.0",
29
29
  "chai": "^5.2.1",
30
30
  "husky": "^9.1.7",
31
- "jest": "^29.7.0",
32
- "knip": "^5.61.3",
31
+ "jest": "^30.0.5",
32
+ "knip": "^5.62.0",
33
33
  "mocha": "^11.7.1",
34
34
  "nyc": "^17.1.0",
35
- "oclif": "^4.20.5",
35
+ "oclif": "^4.22.9",
36
36
  "shx": "^0.4.0",
37
- "ts-jest": "^29.4.0",
37
+ "ts-jest": "^29.4.1",
38
38
  "ts-node": "^10.9.2",
39
39
  "tslib": "^2.8.1",
40
- "typescript": "^5.8.3",
40
+ "typescript": "^5.9.2",
41
41
  "wireit": "^0.14.12"
42
42
  },
43
43
  "engines": {
44
- "node": ">=18.6.0"
44
+ "node": ">=20"
45
45
  },
46
46
  "files": [
47
47
  "/lib",
@@ -74,7 +74,7 @@
74
74
  "clean:package-manager": "wireit",
75
75
  "clean": "wireit",
76
76
  "compile": "wireit",
77
- "dependencies:upgrade": "npx npm-check-updates -u ; npm install ; npm audit fix",
77
+ "dependencies:upgrade": "npm update ; npm audit fix",
78
78
  "lint": "wireit",
79
79
  "lint:dependencies": "wireit",
80
80
  "lint:fix": "wireit",