sf-git-merge-driver 1.0.0-dev-3.13704714225-2
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.
- package/LICENSE.md +9 -0
- package/README.md +74 -0
- package/bin/dev.cmd +3 -0
- package/bin/dev.js +7 -0
- package/bin/run.cmd +3 -0
- package/bin/run.js +7 -0
- package/lib/commands/git/merge/driver/install.d.ts +8 -0
- package/lib/commands/git/merge/driver/install.js +21 -0
- package/lib/commands/git/merge/driver/install.js.map +1 -0
- package/lib/commands/git/merge/driver/uninstall.d.ts +8 -0
- package/lib/commands/git/merge/driver/uninstall.js +15 -0
- package/lib/commands/git/merge/driver/uninstall.js.map +1 -0
- package/lib/constant/driverConstant.d.ts +1 -0
- package/lib/constant/driverConstant.js +2 -0
- package/lib/constant/driverConstant.js.map +1 -0
- package/lib/driver/MergeDriver.d.ts +3 -0
- package/lib/driver/MergeDriver.js +17 -0
- package/lib/driver/MergeDriver.js.map +1 -0
- package/lib/index.d.ts +2 -0
- package/lib/index.js +18 -0
- package/lib/index.js.map +1 -0
- package/lib/merger/JsonMerger.d.ts +14 -0
- package/lib/merger/JsonMerger.js +90 -0
- package/lib/merger/JsonMerger.js.map +1 -0
- package/lib/merger/XmlMerger.d.ts +3 -0
- package/lib/merger/XmlMerger.js +32 -0
- package/lib/merger/XmlMerger.js.map +1 -0
- package/lib/service/installService.d.ts +3 -0
- package/lib/service/installService.js +24 -0
- package/lib/service/installService.js.map +1 -0
- package/lib/service/uninstallService.d.ts +3 -0
- package/lib/service/uninstallService.js +29 -0
- package/lib/service/uninstallService.js.map +1 -0
- package/messages/install.md +13 -0
- package/messages/uninstall.md +13 -0
- package/npm-shrinkwrap.json +14069 -0
- package/oclif.manifest.json +145 -0
- package/package.json +255 -0
|
@@ -0,0 +1,145 @@
|
|
|
1
|
+
{
|
|
2
|
+
"commands": {
|
|
3
|
+
"git:merge:driver:install": {
|
|
4
|
+
"aliases": [],
|
|
5
|
+
"args": {},
|
|
6
|
+
"description": "Installs a local git merge driver for the given org and branch, by updating the `.gitattributes` files in the project and creating a new merge driver configuration file in the `.git/config` of the project.",
|
|
7
|
+
"examples": [
|
|
8
|
+
"Install the driver for a given project:\n<%= config.bin %> <%= command.id %>"
|
|
9
|
+
],
|
|
10
|
+
"flags": {
|
|
11
|
+
"json": {
|
|
12
|
+
"description": "Format output as json.",
|
|
13
|
+
"helpGroup": "GLOBAL",
|
|
14
|
+
"name": "json",
|
|
15
|
+
"allowNo": false,
|
|
16
|
+
"type": "boolean"
|
|
17
|
+
},
|
|
18
|
+
"flags-dir": {
|
|
19
|
+
"helpGroup": "GLOBAL",
|
|
20
|
+
"name": "flags-dir",
|
|
21
|
+
"summary": "Import flag values from a directory.",
|
|
22
|
+
"hasDynamicHelp": false,
|
|
23
|
+
"multiple": false,
|
|
24
|
+
"type": "option"
|
|
25
|
+
}
|
|
26
|
+
},
|
|
27
|
+
"hasDynamicHelp": false,
|
|
28
|
+
"hiddenAliases": [],
|
|
29
|
+
"id": "git:merge:driver:install",
|
|
30
|
+
"pluginAlias": "sf-git-merge-driver",
|
|
31
|
+
"pluginName": "sf-git-merge-driver",
|
|
32
|
+
"pluginType": "core",
|
|
33
|
+
"strict": true,
|
|
34
|
+
"summary": "Installs a local git merge driver for the given org and branch.",
|
|
35
|
+
"enableJsonFlag": true,
|
|
36
|
+
"isESM": true,
|
|
37
|
+
"relativePath": [
|
|
38
|
+
"lib",
|
|
39
|
+
"commands",
|
|
40
|
+
"git",
|
|
41
|
+
"merge",
|
|
42
|
+
"driver",
|
|
43
|
+
"install.js"
|
|
44
|
+
],
|
|
45
|
+
"aliasPermutations": [],
|
|
46
|
+
"permutations": [
|
|
47
|
+
"git:merge:driver:install",
|
|
48
|
+
"merge:git:driver:install",
|
|
49
|
+
"merge:driver:git:install",
|
|
50
|
+
"merge:driver:install:git",
|
|
51
|
+
"git:driver:merge:install",
|
|
52
|
+
"driver:git:merge:install",
|
|
53
|
+
"driver:merge:git:install",
|
|
54
|
+
"driver:merge:install:git",
|
|
55
|
+
"git:driver:install:merge",
|
|
56
|
+
"driver:git:install:merge",
|
|
57
|
+
"driver:install:git:merge",
|
|
58
|
+
"driver:install:merge:git",
|
|
59
|
+
"git:merge:install:driver",
|
|
60
|
+
"merge:git:install:driver",
|
|
61
|
+
"merge:install:git:driver",
|
|
62
|
+
"merge:install:driver:git",
|
|
63
|
+
"git:install:merge:driver",
|
|
64
|
+
"install:git:merge:driver",
|
|
65
|
+
"install:merge:git:driver",
|
|
66
|
+
"install:merge:driver:git",
|
|
67
|
+
"git:install:driver:merge",
|
|
68
|
+
"install:git:driver:merge",
|
|
69
|
+
"install:driver:git:merge",
|
|
70
|
+
"install:driver:merge:git"
|
|
71
|
+
]
|
|
72
|
+
},
|
|
73
|
+
"git:merge:driver:uninstall": {
|
|
74
|
+
"aliases": [],
|
|
75
|
+
"args": {},
|
|
76
|
+
"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 and deleting the merge driver configuration file in the `.git/config` of the project.",
|
|
77
|
+
"examples": [
|
|
78
|
+
"Uninstall the driver for a given project:\n<%= config.bin %> <%= command.id %>"
|
|
79
|
+
],
|
|
80
|
+
"flags": {
|
|
81
|
+
"json": {
|
|
82
|
+
"description": "Format output as json.",
|
|
83
|
+
"helpGroup": "GLOBAL",
|
|
84
|
+
"name": "json",
|
|
85
|
+
"allowNo": false,
|
|
86
|
+
"type": "boolean"
|
|
87
|
+
},
|
|
88
|
+
"flags-dir": {
|
|
89
|
+
"helpGroup": "GLOBAL",
|
|
90
|
+
"name": "flags-dir",
|
|
91
|
+
"summary": "Import flag values from a directory.",
|
|
92
|
+
"hasDynamicHelp": false,
|
|
93
|
+
"multiple": false,
|
|
94
|
+
"type": "option"
|
|
95
|
+
}
|
|
96
|
+
},
|
|
97
|
+
"hasDynamicHelp": false,
|
|
98
|
+
"hiddenAliases": [],
|
|
99
|
+
"id": "git:merge:driver:uninstall",
|
|
100
|
+
"pluginAlias": "sf-git-merge-driver",
|
|
101
|
+
"pluginName": "sf-git-merge-driver",
|
|
102
|
+
"pluginType": "core",
|
|
103
|
+
"strict": true,
|
|
104
|
+
"summary": "Uninstalls the local git merge driver for the given org and branch.",
|
|
105
|
+
"enableJsonFlag": true,
|
|
106
|
+
"isESM": true,
|
|
107
|
+
"relativePath": [
|
|
108
|
+
"lib",
|
|
109
|
+
"commands",
|
|
110
|
+
"git",
|
|
111
|
+
"merge",
|
|
112
|
+
"driver",
|
|
113
|
+
"uninstall.js"
|
|
114
|
+
],
|
|
115
|
+
"aliasPermutations": [],
|
|
116
|
+
"permutations": [
|
|
117
|
+
"git:merge:driver:uninstall",
|
|
118
|
+
"merge:git:driver:uninstall",
|
|
119
|
+
"merge:driver:git:uninstall",
|
|
120
|
+
"merge:driver:uninstall:git",
|
|
121
|
+
"git:driver:merge:uninstall",
|
|
122
|
+
"driver:git:merge:uninstall",
|
|
123
|
+
"driver:merge:git:uninstall",
|
|
124
|
+
"driver:merge:uninstall:git",
|
|
125
|
+
"git:driver:uninstall:merge",
|
|
126
|
+
"driver:git:uninstall:merge",
|
|
127
|
+
"driver:uninstall:git:merge",
|
|
128
|
+
"driver:uninstall:merge:git",
|
|
129
|
+
"git:merge:uninstall:driver",
|
|
130
|
+
"merge:git:uninstall:driver",
|
|
131
|
+
"merge:uninstall:git:driver",
|
|
132
|
+
"merge:uninstall:driver:git",
|
|
133
|
+
"git:uninstall:merge:driver",
|
|
134
|
+
"uninstall:git:merge:driver",
|
|
135
|
+
"uninstall:merge:git:driver",
|
|
136
|
+
"uninstall:merge:driver:git",
|
|
137
|
+
"git:uninstall:driver:merge",
|
|
138
|
+
"uninstall:git:driver:merge",
|
|
139
|
+
"uninstall:driver:git:merge",
|
|
140
|
+
"uninstall:driver:merge:git"
|
|
141
|
+
]
|
|
142
|
+
}
|
|
143
|
+
},
|
|
144
|
+
"version": "1.0.0-dev-3.13704714225-2"
|
|
145
|
+
}
|
package/package.json
ADDED
|
@@ -0,0 +1,255 @@
|
|
|
1
|
+
{
|
|
2
|
+
"name": "sf-git-merge-driver",
|
|
3
|
+
"description": "git remote add origin git@github.com:scolladon/sf-git-merge-driver.git",
|
|
4
|
+
"version": "1.0.0-dev-3.13704714225-2",
|
|
5
|
+
"exports": "./lib/driver/MergeDriver.js",
|
|
6
|
+
"bin": {
|
|
7
|
+
"sf-git-merge-driver": "./lib/index.js"
|
|
8
|
+
},
|
|
9
|
+
"type": "module",
|
|
10
|
+
"author": "Sébastien Colladon (colladonsebastien@gmail.com)",
|
|
11
|
+
"repository": {
|
|
12
|
+
"type": "git",
|
|
13
|
+
"url": "git+https://github.com/scolladon/sf-git-merge-driver.git"
|
|
14
|
+
},
|
|
15
|
+
"dependencies": {
|
|
16
|
+
"@oclif/core": "^4.2.8",
|
|
17
|
+
"@salesforce/core": "^8.8.5",
|
|
18
|
+
"@salesforce/sf-plugins-core": "^12.2.0",
|
|
19
|
+
"fast-xml-parser": "^5.0.8",
|
|
20
|
+
"simple-git": "^3.27.0"
|
|
21
|
+
},
|
|
22
|
+
"devDependencies": {
|
|
23
|
+
"@biomejs/biome": "1.9.4",
|
|
24
|
+
"@commitlint/config-conventional": "^19.7.1",
|
|
25
|
+
"@oclif/plugin-help": "^6.2.26",
|
|
26
|
+
"@salesforce/cli-plugins-testkit": "^5.3.39",
|
|
27
|
+
"@salesforce/dev-config": "^4.3.1",
|
|
28
|
+
"@types/chai": "^5.2.0",
|
|
29
|
+
"@types/jest": "^29.5.14",
|
|
30
|
+
"chai": "^5.2.0",
|
|
31
|
+
"husky": "^9.1.7",
|
|
32
|
+
"jest": "^29.7.0",
|
|
33
|
+
"knip": "^5.45.0",
|
|
34
|
+
"mocha": "^11.1.0",
|
|
35
|
+
"nyc": "^17.1.0",
|
|
36
|
+
"oclif": "^4.17.34",
|
|
37
|
+
"shx": "^0.3.4",
|
|
38
|
+
"ts-jest": "^29.2.6",
|
|
39
|
+
"ts-jest-mock-import-meta": "^1.2.1",
|
|
40
|
+
"ts-node": "^10.9.2",
|
|
41
|
+
"tslib": "^2.8.1",
|
|
42
|
+
"typescript": "^5.8.2",
|
|
43
|
+
"wireit": "^0.14.11"
|
|
44
|
+
},
|
|
45
|
+
"engines": {
|
|
46
|
+
"node": ">=18.6.0"
|
|
47
|
+
},
|
|
48
|
+
"files": [
|
|
49
|
+
"/lib",
|
|
50
|
+
"/messages",
|
|
51
|
+
"/npm-shrinkwrap.json",
|
|
52
|
+
"/oclif.manifest.json",
|
|
53
|
+
"/oclif.lock",
|
|
54
|
+
"/bin"
|
|
55
|
+
],
|
|
56
|
+
"keywords": [
|
|
57
|
+
"sf",
|
|
58
|
+
"sf-plugin",
|
|
59
|
+
"source",
|
|
60
|
+
"git",
|
|
61
|
+
"merge",
|
|
62
|
+
"driver"
|
|
63
|
+
],
|
|
64
|
+
"license": "MIT",
|
|
65
|
+
"oclif": {
|
|
66
|
+
"commands": "./lib/commands",
|
|
67
|
+
"bin": "sf",
|
|
68
|
+
"topicSeparator": " ",
|
|
69
|
+
"flexibleTaxonomy": true,
|
|
70
|
+
"devPlugins": [
|
|
71
|
+
"@oclif/plugin-help"
|
|
72
|
+
]
|
|
73
|
+
},
|
|
74
|
+
"scripts": {
|
|
75
|
+
"build": "wireit",
|
|
76
|
+
"clean:package-manager": "wireit",
|
|
77
|
+
"clean": "wireit",
|
|
78
|
+
"compile": "wireit",
|
|
79
|
+
"dependencies:upgrade": "npx npm-check-updates -u ; npm install ; npm audit fix",
|
|
80
|
+
"lint": "wireit",
|
|
81
|
+
"lint:dependencies": "wireit",
|
|
82
|
+
"lint:fix": "wireit",
|
|
83
|
+
"lint:staged": "wireit",
|
|
84
|
+
"postpack": "shx rm -f oclif.manifest.json",
|
|
85
|
+
"prepack": "wireit",
|
|
86
|
+
"prepare": "husky",
|
|
87
|
+
"prepublishOnly": "npm shrinkwrap",
|
|
88
|
+
"test:build": "wireit",
|
|
89
|
+
"test:nut": "wireit",
|
|
90
|
+
"test:unit": "wireit",
|
|
91
|
+
"test": "wireit"
|
|
92
|
+
},
|
|
93
|
+
"publishConfig": {
|
|
94
|
+
"access": "public"
|
|
95
|
+
},
|
|
96
|
+
"wireit": {
|
|
97
|
+
"build": {
|
|
98
|
+
"dependencies": [
|
|
99
|
+
"compile",
|
|
100
|
+
"lint"
|
|
101
|
+
]
|
|
102
|
+
},
|
|
103
|
+
"clean": {
|
|
104
|
+
"command": "shx rm -rf 'reports/*' .nyc_output oclif.manifest.json package.tgz 'sfdx-git-delta-*.tgz' 'stderr*.txt' 'stdout*.txt' '.stryker-tmp/*' perf-result.txt",
|
|
105
|
+
"files": [
|
|
106
|
+
"lib",
|
|
107
|
+
"reports/*",
|
|
108
|
+
".nyc_output",
|
|
109
|
+
"oclif.manifest.json",
|
|
110
|
+
"package.tgz",
|
|
111
|
+
"sfdx-git-delta-v*.tgz",
|
|
112
|
+
"stderr*.txt",
|
|
113
|
+
"stdout*.txt",
|
|
114
|
+
".stryker-tmp/*",
|
|
115
|
+
"perf-result.txt"
|
|
116
|
+
],
|
|
117
|
+
"dependencies": [
|
|
118
|
+
"clean:build"
|
|
119
|
+
]
|
|
120
|
+
},
|
|
121
|
+
"clean:build": {
|
|
122
|
+
"command": "shx rm -rf lib",
|
|
123
|
+
"files": [
|
|
124
|
+
"lib/*"
|
|
125
|
+
]
|
|
126
|
+
},
|
|
127
|
+
"clean:package-manager": {
|
|
128
|
+
"command": "shx rm -rf node_modules tsconfig.tsbuildinfo .wireit",
|
|
129
|
+
"files": [
|
|
130
|
+
"node_modules/*"
|
|
131
|
+
]
|
|
132
|
+
},
|
|
133
|
+
"compile": {
|
|
134
|
+
"command": "tsc -p . --pretty --incremental",
|
|
135
|
+
"files": [
|
|
136
|
+
"src/**/*.ts",
|
|
137
|
+
"**/tsconfig.json",
|
|
138
|
+
"messages/**"
|
|
139
|
+
],
|
|
140
|
+
"output": [
|
|
141
|
+
"lib/**",
|
|
142
|
+
"*.tsbuildinfo"
|
|
143
|
+
],
|
|
144
|
+
"clean": "if-file-deleted"
|
|
145
|
+
},
|
|
146
|
+
"lint": {
|
|
147
|
+
"command": "npx @biomejs/biome check --error-on-warnings --no-errors-on-unmatched src test",
|
|
148
|
+
"files": [
|
|
149
|
+
"src/**",
|
|
150
|
+
"test/**/*.ts",
|
|
151
|
+
"messages/**",
|
|
152
|
+
"**/biome.json",
|
|
153
|
+
"**/tsconfig.json"
|
|
154
|
+
],
|
|
155
|
+
"output": []
|
|
156
|
+
},
|
|
157
|
+
"lint:dependencies": {
|
|
158
|
+
"command": "knip",
|
|
159
|
+
"files": [
|
|
160
|
+
"src/**/*.ts",
|
|
161
|
+
"test/**/*.ts",
|
|
162
|
+
"messages/**",
|
|
163
|
+
"**/tsconfig.json",
|
|
164
|
+
"knip.config.ts"
|
|
165
|
+
],
|
|
166
|
+
"output": [],
|
|
167
|
+
"dependencies": [
|
|
168
|
+
"lint"
|
|
169
|
+
]
|
|
170
|
+
},
|
|
171
|
+
"lint:fix": {
|
|
172
|
+
"command": "npx @biomejs/biome check --error-on-warnings --no-errors-on-unmatched src test --fix --unsafe ",
|
|
173
|
+
"files": [
|
|
174
|
+
"src/**",
|
|
175
|
+
"test/**/*.ts",
|
|
176
|
+
"messages/**",
|
|
177
|
+
"**/biome.json",
|
|
178
|
+
"**/tsconfig.json"
|
|
179
|
+
],
|
|
180
|
+
"output": []
|
|
181
|
+
},
|
|
182
|
+
"lint:staged": {
|
|
183
|
+
"command": "npx @biomejs/biome check --error-on-warnings --no-errors-on-unmatched --staged src test",
|
|
184
|
+
"files": [
|
|
185
|
+
"src/**",
|
|
186
|
+
"test/**/*.ts",
|
|
187
|
+
"messages/**",
|
|
188
|
+
"**/biome.json",
|
|
189
|
+
"**/tsconfig.json"
|
|
190
|
+
],
|
|
191
|
+
"output": []
|
|
192
|
+
},
|
|
193
|
+
"prepack": {
|
|
194
|
+
"command": "oclif manifest && oclif readme",
|
|
195
|
+
"files": [
|
|
196
|
+
"src/commands/apex/mutation/test/run.ts",
|
|
197
|
+
"messages/apex.mutation.test.run.md",
|
|
198
|
+
"README.md"
|
|
199
|
+
],
|
|
200
|
+
"dependencies": [
|
|
201
|
+
"build"
|
|
202
|
+
],
|
|
203
|
+
"output": [
|
|
204
|
+
"README.md"
|
|
205
|
+
],
|
|
206
|
+
"clean": false
|
|
207
|
+
},
|
|
208
|
+
"test": {
|
|
209
|
+
"dependencies": [
|
|
210
|
+
"build",
|
|
211
|
+
"lint",
|
|
212
|
+
"test:unit",
|
|
213
|
+
"test:nut"
|
|
214
|
+
]
|
|
215
|
+
},
|
|
216
|
+
"test:build": {
|
|
217
|
+
"command": "npm install && npm pack && npm run test",
|
|
218
|
+
"dependencies": [
|
|
219
|
+
"clean",
|
|
220
|
+
"clean:package-manager"
|
|
221
|
+
]
|
|
222
|
+
},
|
|
223
|
+
"test:nut": {
|
|
224
|
+
"command": "nyc mocha -r ts-node/register **/*.nut.ts",
|
|
225
|
+
"files": [
|
|
226
|
+
"src/**/*.ts",
|
|
227
|
+
"test/**/*.ts",
|
|
228
|
+
"messages/**",
|
|
229
|
+
"**/tsconfig.json"
|
|
230
|
+
],
|
|
231
|
+
"output": [
|
|
232
|
+
".nyc_output/**"
|
|
233
|
+
],
|
|
234
|
+
"dependencies": [
|
|
235
|
+
"lint",
|
|
236
|
+
"build"
|
|
237
|
+
]
|
|
238
|
+
},
|
|
239
|
+
"test:unit": {
|
|
240
|
+
"command": "jest --coverage",
|
|
241
|
+
"files": [
|
|
242
|
+
"src/**/*.ts",
|
|
243
|
+
"__tests__/**/*.ts",
|
|
244
|
+
"messages/**",
|
|
245
|
+
"**/tsconfig.json"
|
|
246
|
+
],
|
|
247
|
+
"output": [
|
|
248
|
+
"reports/coverage/**"
|
|
249
|
+
],
|
|
250
|
+
"dependencies": [
|
|
251
|
+
"lint"
|
|
252
|
+
]
|
|
253
|
+
}
|
|
254
|
+
}
|
|
255
|
+
}
|