Skip to content

Commit 96630bb

Browse files
committed
docs(changeset): Export utils for custom strategy development. Add config to control autoAdd to stage after merging
1 parent 97d5512 commit 96630bb

File tree

4 files changed

+22
-1
lines changed

4 files changed

+22
-1
lines changed

.changeset/cuddly-cases-cover.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"git-json-resolver": minor
3+
---
4+
5+
Export utils for custom strategy development. Add config to control autoAdd to stage after merging

lib/package.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,16 @@
2020
"types": "./dist/index.d.ts",
2121
"import": "./dist/index.mjs",
2222
"require": "./dist/index.js"
23+
},
24+
"./utils": {
25+
"types": "./dist/utils.d.ts",
26+
"import": "./dist/utils.mjs",
27+
"require": "./dist/utils.js"
28+
},
29+
"./dist/utils": {
30+
"types": "./dist/utils.d.ts",
31+
"import": "./dist/utils.mjs",
32+
"require": "./dist/utils.js"
2333
}
2434
},
2535
"bin": {

lib/src/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ export const resolveConflicts = async <T extends string = InbuiltMergeStrategies
3131
config,
3232
normalizedConfig,
3333
logger: globalLogger,
34-
autoStage: true,
34+
autoStage: normalizedConfig.autoStage ?? true,
3535
});
3636
}),
3737
);

lib/src/types.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,12 @@ export interface Config<T extends string = InbuiltMergeStrategies, TContext = un
189189
* Defaults to `"json"`.
190190
*/
191191
parsers?: "auto" | SupportedParsers | SupportedParsers[];
192+
193+
/**
194+
* Whether to automatically stage resolved files.
195+
* Default: `true`.
196+
*/
197+
autoStage?: boolean;
192198
}
193199

194200
export type { Matcher };

0 commit comments

Comments
 (0)