sf-git-merge-driver 1.0.1-dev-70.16851323858-1 → 1.0.1-dev-81.16862932114-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 (12) hide show
  1. package/README.md +5 -3
  2. package/lib/commands/git/merge/driver/run.js +7 -12
  3. package/lib/commands/git/merge/driver/run.js.map +1 -1
  4. package/lib/driver/MergeDriver.d.ts +1 -3
  5. package/lib/driver/MergeDriver.js +8 -23
  6. package/lib/driver/MergeDriver.js.map +1 -1
  7. package/lib/service/installService.js +1 -1
  8. package/lib/service/installService.js.map +1 -1
  9. package/messages/run.md +8 -0
  10. package/npm-shrinkwrap.json +163 -184
  11. package/oclif.manifest.json +1 -1
  12. package/package.json +3 -3
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.1-dev-70.16851323858-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.1-dev-81.16862932114-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.1-dev-70.16851323858-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.1-dev-81.16862932114-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.1-dev-70.16851323858-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.1-dev-81.16862932114-1/src/commands/git/merge/driver/uninstall.ts)_
123
123
  <!-- commandsstop -->
124
124
 
125
125
  ## How It Works
@@ -135,6 +135,8 @@ The merge driver works by:
135
135
  The driver is configured to work with `.xml` files by default. The installation adds the following to your `.gitattributes` file:
136
136
 
137
137
  ```
138
+
139
+
138
140
  *.labels-meta.xml merge=salesforce-source
139
141
  *.label-meta.xml merge=salesforce-source
140
142
  *.profile-meta.xml merge=salesforce-source
package/lib/commands/git/merge/driver/run.js CHANGED
@@ -5,8 +5,6 @@ import { MergeDriver } from '../../../../driver/MergeDriver.js';
5
5
  import { ConflictMarker } from '../../../../merger/conflictMarker.js';
6
6
  Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
7
7
  const messages = Messages.loadMessages('sf-git-merge-driver', 'run');
8
- const ERROR_EXIT_CODE = 1;
9
- const SUCCESS_EXIT_CODE = 0;
10
8
  export default class Run extends SfCommand {
11
9
  static summary = messages.getMessage('summary');
12
10
  static description = messages.getMessage('description');
@@ -60,14 +58,6 @@ export default class Run extends SfCommand {
60
58
  };
61
59
  async run() {
62
60
  const { flags } = await this.parse(Run);
63
- process.stderr.write(`[SF-MERGE-DEBUG] %O(ancestor-file): ${flags['ancestor-file']}\n`);
64
- process.stderr.write(`[SF-MERGE-DEBUG] %A(local-file): ${flags['local-file']}\n`);
65
- process.stderr.write(`[SF-MERGE-DEBUG] %B(other-file): ${flags['other-file']}\n`);
66
- process.stderr.write(`[SF-MERGE-DEBUG] %P(output-file): ${flags['output-file']}\n`);
67
- process.stderr.write(`[SF-MERGE-DEBUG] %L(conflict-marker-size): ${flags['conflict-marker-size']}\n`);
68
- process.stderr.write(`[SF-MERGE-DEBUG] %S(ancestor-conflict-tag): ${flags['ancestor-conflict-tag']}\n`);
69
- process.stderr.write(`[SF-MERGE-DEBUG] %X(local-conflict-tag): ${flags['local-conflict-tag']}\n`);
70
- process.stderr.write(`[SF-MERGE-DEBUG] %Y(other-conflict-tag): ${flags['other-conflict-tag']}\n`);
71
61
  const conflicConfig = {
72
62
  conflictMarkerSize: flags['conflict-marker-size'],
73
63
  ancestorConflictTag: flags['ancestor-conflict-tag'],
@@ -76,8 +66,13 @@ export default class Run extends SfCommand {
76
66
  };
77
67
  ConflictMarker.setConflictConfig(conflicConfig);
78
68
  const mergeDriver = new MergeDriver();
79
- const hasConflict = await mergeDriver.mergeFiles(flags['ancestor-file'], flags['local-file'], flags['other-file']);
80
- process.exitCode = hasConflict ? ERROR_EXIT_CODE : SUCCESS_EXIT_CODE;
69
+ const hasConflict = await mergeDriver.mergeFiles(flags['ancestor-file'], flags['local-file'], flags['other-file'], flags['output-file']);
70
+ if (hasConflict) {
71
+ this.error(messages.getMessage('result.withconflict') + ' ' + flags['output-file'], { exit: 1 });
72
+ }
73
+ else {
74
+ this.info(messages.getMessage('result.successful') + ' ' + flags['output-file']);
75
+ }
81
76
  }
82
77
  }
83
78
  //# sourceMappingURL=run.js.map
package/lib/commands/git/merge/driver/run.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"run.js","sourceRoot":"","sources":["../../../../../src/commands/git/merge/driver/run.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"run.js","sourceRoot":"","sources":["../../../../../src/commands/git/merge/driver/run.ts"],"names":[],"mappings":"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"}
package/lib/driver/MergeDriver.d.ts CHANGED
@@ -1,5 +1,3 @@
1
1
  export declare class MergeDriver {
2
- private static detectEol;
3
- private static applyEol;
4
- mergeFiles(ancestorFile: string, ourFile: string, theirFile: string): Promise<boolean>;
2
+ mergeFiles(ancestorFile: string, ourFile: string, theirFile: string, outputFile: string): Promise<boolean>;
5
3
  }
package/lib/driver/MergeDriver.js CHANGED
@@ -1,32 +1,17 @@
1
1
  import { readFile, writeFile } from 'node:fs/promises';
2
- import { normalize } from 'node:path';
3
2
  import { XmlMerger } from '../merger/XmlMerger.js';
4
3
  export class MergeDriver {
5
- static detectEol(text) {
6
- if (text.includes('\r\n'))
7
- return '\r\n';
8
- return '\n';
9
- }
10
- static applyEol(text, eol) {
11
- // XML Merge Driver default to \n
12
- if (eol === '\r\n')
13
- return text.split(/\r\n|\n/).join(eol);
14
- return text;
15
- }
16
- async mergeFiles(ancestorFile, ourFile, theirFile) {
4
+ async mergeFiles(ancestorFile, ourFile, theirFile, outputFile) {
17
5
  // Read all three versions
18
- const [ancestorContent, ourContent, theirContent] = await Promise.all([ancestorFile, ourFile, theirFile]
19
- .map(normalize)
20
- .map(path => readFile(path, 'utf8')));
6
+ const [ancestorContent, ourContent, theirContent] = await Promise.all([
7
+ readFile(ancestorFile, 'utf8'),
8
+ readFile(ourFile, 'utf8'),
9
+ readFile(theirFile, 'utf8'),
10
+ ]);
21
11
  const xmlMerger = new XmlMerger();
22
12
  const mergedContent = xmlMerger.mergeThreeWay(ancestorContent, ourContent, theirContent);
23
- const targetEol = MergeDriver.detectEol(ourContent);
24
- const outputWithEol = MergeDriver.applyEol(mergedContent.output, targetEol);
25
- process.stderr.write(`[SF-MERGE-DEBUG] wrote to ourFile: ${normalize(ourFile)}\n`);
26
- process.stderr.write(`[SF-MERGE-DEBUG] content: ${outputWithEol}\n`);
27
- process.stderr.write(`[SF-MERGE-DEBUG] hasConflict: ${mergedContent.hasConflict}\n`);
28
- // Write the merged content to the our file
29
- await writeFile(normalize(ourFile), outputWithEol);
13
+ // Write the merged content to the output file
14
+ await writeFile(outputFile, mergedContent.output);
30
15
  return mergedContent.hasConflict;
31
16
  }
32
17
  }
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,WAAW,CAAA;AACrC,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAA;AAElD,MAAM,OAAO,WAAW;IACd,MAAM,CAAC,SAAS,CAAC,IAAY;QACnC,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC;YAAE,OAAO,MAAM,CAAA;QACxC,OAAO,IAAI,CAAA;IACb,CAAC;IAEO,MAAM,CAAC,QAAQ,CAAC,IAAY,EAAE,GAAW;QAC/C,iCAAiC;QACjC,IAAI,GAAG,KAAK,MAAM;YAAE,OAAO,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QAC1D,OAAO,IAAI,CAAA;IACb,CAAC;IAED,KAAK,CAAC,UAAU,CACd,YAAoB,EACpB,OAAe,EACf,SAAiB;QAEjB,0BAA0B;QAC1B,MAAM,CAAC,eAAe,EAAE,UAAU,EAAE,YAAY,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CACnE,CAAC,YAAY,EAAE,OAAO,EAAE,SAAS,CAAC;aAC/B,GAAG,CAAC,SAAS,CAAC;aACd,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CACvC,CAAA;QAED,MAAM,SAAS,GAAG,IAAI,SAAS,EAAE,CAAA;QAEjC,MAAM,aAAa,GAAG,SAAS,CAAC,aAAa,CAC3C,eAAe,EACf,UAAU,EACV,YAAY,CACb,CAAA;QAED,MAAM,SAAS,GAAG,WAAW,CAAC,SAAS,CAAC,UAAU,CAAC,CAAA;QACnD,MAAM,aAAa,GAAG,WAAW,CAAC,QAAQ,CAAC,aAAa,CAAC,MAAM,EAAE,SAAS,CAAC,CAAA;QAE3E,OAAO,CAAC,MAAM,CAAC,KAAK,CAClB,sCAAsC,SAAS,CAAC,OAAO,CAAC,IAAI,CAC7D,CAAA;QACD,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,6BAA6B,aAAa,IAAI,CAAC,CAAA;QACpE,OAAO,CAAC,MAAM,CAAC,KAAK,CAClB,iCAAiC,aAAa,CAAC,WAAW,IAAI,CAC/D,CAAA;QAED,2CAA2C;QAC3C,MAAM,SAAS,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,aAAa,CAAC,CAAA;QAClD,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/lib/service/installService.js CHANGED
@@ -6,7 +6,7 @@ export class InstallService {
6
6
  async installMergeDriver() {
7
7
  const git = simpleGit();
8
8
  await git.addConfig(`merge.${DRIVER_NAME}.name`, 'Salesforce source merge driver');
9
- await git.addConfig(`merge.${DRIVER_NAME}.driver`, `sh -c '${RUN_PLUGIN_COMMAND} -O "$1" -A "$2" -B "$3" -P "$4" -L "$5" -X "$6" -Y "$7"' -- %O %A %B %P %L %X %Y`);
9
+ await git.addConfig(`merge.${DRIVER_NAME}.driver`, `${RUN_PLUGIN_COMMAND} -O %O -A %A -B %B -P %P -L %L -X %X -Y %Y`);
10
10
  await git.addConfig(`merge.${DRIVER_NAME}.recursive`, 'true');
11
11
  // Configure merge driver for each metadata type pattern
12
12
  const patterns = METADATA_TYPES_PATTERNS.map(pattern => `*.${pattern}-meta.xml merge=${DRIVER_NAME}`).join('\n');
package/lib/service/installService.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"installService.js","sourceRoot":"","sources":["../../src/service/installService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAC7C,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAA;AACtC,OAAO,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAA;AAC/E,OAAO,EAAE,uBAAuB,EAAE,MAAM,iCAAiC,CAAA;AAEzE,MAAM,OAAO,cAAc;IAClB,KAAK,CAAC,kBAAkB;QAC7B,MAAM,GAAG,GAAG,SAAS,EAAE,CAAA;QACvB,MAAM,GAAG,CAAC,SAAS,CACjB,SAAS,WAAW,OAAO,EAC3B,gCAAgC,CACjC,CAAA;QACD,MAAM,GAAG,CAAC,SAAS,CACjB,SAAS,WAAW,SAAS,EAC7B,UAAU,kBAAkB,mFAAmF,CAChH,CAAA;QACD,MAAM,GAAG,CAAC,SAAS,CAAC,SAAS,WAAW,YAAY,EAAE,MAAM,CAAC,CAAA;QAE7D,wDAAwD;QACxD,MAAM,QAAQ,GAAG,uBAAuB,CAAC,GAAG,CAC1C,OAAO,CAAC,EAAE,CAAC,KAAK,OAAO,mBAAmB,WAAW,EAAE,CACxD,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACZ,MAAM,OAAO,GAAG,GAAG,QAAQ,IAAI,CAAA;QAE/B,MAAM,UAAU,CAAC,gBAAgB,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,CAAA;IAC5D,CAAC;CACF"}
1
+ {"version":3,"file":"installService.js","sourceRoot":"","sources":["../../src/service/installService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAC7C,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAA;AACtC,OAAO,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAA;AAC/E,OAAO,EAAE,uBAAuB,EAAE,MAAM,iCAAiC,CAAA;AAEzE,MAAM,OAAO,cAAc;IAClB,KAAK,CAAC,kBAAkB;QAC7B,MAAM,GAAG,GAAG,SAAS,EAAE,CAAA;QACvB,MAAM,GAAG,CAAC,SAAS,CACjB,SAAS,WAAW,OAAO,EAC3B,gCAAgC,CACjC,CAAA;QACD,MAAM,GAAG,CAAC,SAAS,CACjB,SAAS,WAAW,SAAS,EAC7B,GAAG,kBAAkB,4CAA4C,CAClE,CAAA;QACD,MAAM,GAAG,CAAC,SAAS,CAAC,SAAS,WAAW,YAAY,EAAE,MAAM,CAAC,CAAA;QAE7D,wDAAwD;QACxD,MAAM,QAAQ,GAAG,uBAAuB,CAAC,GAAG,CAC1C,OAAO,CAAC,EAAE,CAAC,KAAK,OAAO,mBAAmB,WAAW,EAAE,CACxD,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACZ,MAAM,OAAO,GAAG,GAAG,QAAQ,IAAI,CAAA;QAE/B,MAAM,UAAU,CAAC,gBAAgB,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,CAAA;IAC5D,CAAC;CACF"}
package/messages/run.md CHANGED
@@ -45,3 +45,11 @@ string used to tag local version in conflicts
45
45
 
46
46
  # flags.other-conflict-tag.summary
47
47
  string used to tag other version in conflicts
48
+
49
+ # result.withconflict
50
+
51
+ There are conflicts for file
52
+
53
+ # result.successful
54
+
55
+ Successfully merged file
package/npm-shrinkwrap.json CHANGED
@@ -1,12 +1,12 @@
1
1
  {
2
2
  "name": "sf-git-merge-driver",
3
- "version": "1.0.1-dev-70.16851323858-1",
3
+ "version": "1.0.1-dev-81.16862932114-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.1-dev-70.16851323858-1",
9
+ "version": "1.0.1-dev-81.16862932114-1",
10
10
  "license": "MIT",
11
11
  "dependencies": {
12
12
  "@oclif/core": "^4.5.2",
@@ -31,7 +31,7 @@
31
31
  "knip": "^5.62.0",
32
32
  "mocha": "^11.7.1",
33
33
  "nyc": "^17.1.0",
34
- "oclif": "^4.22.6",
34
+ "oclif": "^4.22.9",
35
35
  "shx": "^0.4.0",
36
36
  "ts-jest": "^29.4.1",
37
37
  "ts-node": "^10.9.2",
@@ -40,7 +40,7 @@
40
40
  "wireit": "^0.14.12"
41
41
  },
42
42
  "engines": {
43
- "node": ">=18.6.0"
43
+ "node": ">=20"
44
44
  }
45
45
  },
46
46
  "node_modules/@alcalzone/ansi-tokenize": {
@@ -289,25 +289,25 @@
289
289
  }
290
290
  },
291
291
  "node_modules/@aws-sdk/client-cloudfront": {
292
- "version": "3.863.0",
293
- "resolved": "https://registry.npmjs.org/@aws-sdk/client-cloudfront/-/client-cloudfront-3.863.0.tgz",
294
- "integrity": "sha512-04ME3EqDtWvV2nKl9qlk2TqjDwJL3sI2ey33sIJCL3d2z3cFIQOOdy9QleCPmYPMqPpENRC0qdKprR0yt2t7fg==",
292
+ "version": "3.864.0",
293
+ "resolved": "https://registry.npmjs.org/@aws-sdk/client-cloudfront/-/client-cloudfront-3.864.0.tgz",
294
+ "integrity": "sha512-DpUrEonVs7I7J+tXjvllVNCg7e9mnQwg8eMWqc7S7/c82SUC+U2Xqe6M5Ey5pWkCghy0GDgnn+iUA43W7H0WKg==",
295
295
  "dev": true,
296
296
  "license": "Apache-2.0",
297
297
  "dependencies": {
298
298
  "@aws-crypto/sha256-browser": "5.2.0",
299
299
  "@aws-crypto/sha256-js": "5.2.0",
300
- "@aws-sdk/core": "3.863.0",
301
- "@aws-sdk/credential-provider-node": "3.863.0",
300
+ "@aws-sdk/core": "3.864.0",
301
+ "@aws-sdk/credential-provider-node": "3.864.0",
302
302
  "@aws-sdk/middleware-host-header": "3.862.0",
303
303
  "@aws-sdk/middleware-logger": "3.862.0",
304
304
  "@aws-sdk/middleware-recursion-detection": "3.862.0",
305
- "@aws-sdk/middleware-user-agent": "3.863.0",
305
+ "@aws-sdk/middleware-user-agent": "3.864.0",
306
306
  "@aws-sdk/region-config-resolver": "3.862.0",
307
307
  "@aws-sdk/types": "3.862.0",
308
308
  "@aws-sdk/util-endpoints": "3.862.0",
309
309
  "@aws-sdk/util-user-agent-browser": "3.862.0",
310
- "@aws-sdk/util-user-agent-node": "3.863.0",
310
+ "@aws-sdk/util-user-agent-node": "3.864.0",
311
311
  "@aws-sdk/xml-builder": "3.862.0",
312
312
  "@smithy/config-resolver": "^4.1.5",
313
313
  "@smithy/core": "^3.8.0",
@@ -343,33 +343,33 @@
343
343
  }
344
344
  },
345
345
  "node_modules/@aws-sdk/client-s3": {
346
- "version": "3.863.0",
347
- "resolved": "https://registry.npmjs.org/@aws-sdk/client-s3/-/client-s3-3.863.0.tgz",
348
- "integrity": "sha512-12iPziQtTolNiWFlN7Bg4jDfh1eOVB0hW6bsP1cI3JVr/IF0pVvPjQ1WEUhjTlOujC/U+JaYjw3iQ7nWKHX6vQ==",
346
+ "version": "3.864.0",
347
+ "resolved": "https://registry.npmjs.org/@aws-sdk/client-s3/-/client-s3-3.864.0.tgz",
348
+ "integrity": "sha512-QGYi9bWliewxumsvbJLLyx9WC0a4DP4F+utygBcq0zwPxaM0xDfBspQvP1dsepi7mW5aAjZmJ2+Xb7X0EhzJ/g==",
349
349
  "dev": true,
350
350
  "license": "Apache-2.0",
351
351
  "dependencies": {
352
352
  "@aws-crypto/sha1-browser": "5.2.0",
353
353
  "@aws-crypto/sha256-browser": "5.2.0",
354
354
  "@aws-crypto/sha256-js": "5.2.0",
355
- "@aws-sdk/core": "3.863.0",
356
- "@aws-sdk/credential-provider-node": "3.863.0",
355
+ "@aws-sdk/core": "3.864.0",
356
+ "@aws-sdk/credential-provider-node": "3.864.0",
357
357
  "@aws-sdk/middleware-bucket-endpoint": "3.862.0",
358
358
  "@aws-sdk/middleware-expect-continue": "3.862.0",
359
- "@aws-sdk/middleware-flexible-checksums": "3.863.0",
359
+ "@aws-sdk/middleware-flexible-checksums": "3.864.0",
360
360
  "@aws-sdk/middleware-host-header": "3.862.0",
361
361
  "@aws-sdk/middleware-location-constraint": "3.862.0",
362
362
  "@aws-sdk/middleware-logger": "3.862.0",
363
363
  "@aws-sdk/middleware-recursion-detection": "3.862.0",
364
- "@aws-sdk/middleware-sdk-s3": "3.863.0",
364
+ "@aws-sdk/middleware-sdk-s3": "3.864.0",
365
365
  "@aws-sdk/middleware-ssec": "3.862.0",
366
- "@aws-sdk/middleware-user-agent": "3.863.0",
366
+ "@aws-sdk/middleware-user-agent": "3.864.0",
367
367
  "@aws-sdk/region-config-resolver": "3.862.0",
368
- "@aws-sdk/signature-v4-multi-region": "3.863.0",
368
+ "@aws-sdk/signature-v4-multi-region": "3.864.0",
369
369
  "@aws-sdk/types": "3.862.0",
370
370
  "@aws-sdk/util-endpoints": "3.862.0",
371
371
  "@aws-sdk/util-user-agent-browser": "3.862.0",
372
- "@aws-sdk/util-user-agent-node": "3.863.0",
372
+ "@aws-sdk/util-user-agent-node": "3.864.0",
373
373
  "@aws-sdk/xml-builder": "3.862.0",
374
374
  "@smithy/config-resolver": "^4.1.5",
375
375
  "@smithy/core": "^3.8.0",
@@ -427,24 +427,24 @@
427
427
  }
428
428
  },
429
429
  "node_modules/@aws-sdk/client-sso": {
430
- "version": "3.863.0",
431
- "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.863.0.tgz",
432
- "integrity": "sha512-3DZE5lx5A+MgTVS8yRBz/Ne8pWvwc7tDy4KBx5sDd93wvnDYjZW28g7W73d1dD7jfN8ZIC0REtiuNj00Ty0PBg==",
430
+ "version": "3.864.0",
431
+ "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.864.0.tgz",
432
+ "integrity": "sha512-THiOp0OpQROEKZ6IdDCDNNh3qnNn/kFFaTSOiugDpgcE5QdsOxh1/RXq7LmHpTJum3cmnFf8jG59PHcz9Tjnlw==",
433
433
  "dev": true,
434
434
  "license": "Apache-2.0",
435
435
  "dependencies": {
436
436
  "@aws-crypto/sha256-browser": "5.2.0",
437
437
  "@aws-crypto/sha256-js": "5.2.0",
438
- "@aws-sdk/core": "3.863.0",
438
+ "@aws-sdk/core": "3.864.0",
439
439
  "@aws-sdk/middleware-host-header": "3.862.0",
440
440
  "@aws-sdk/middleware-logger": "3.862.0",
441
441
  "@aws-sdk/middleware-recursion-detection": "3.862.0",
442
- "@aws-sdk/middleware-user-agent": "3.863.0",
442
+ "@aws-sdk/middleware-user-agent": "3.864.0",
443
443
  "@aws-sdk/region-config-resolver": "3.862.0",
444
444
  "@aws-sdk/types": "3.862.0",
445
445
  "@aws-sdk/util-endpoints": "3.862.0",
446
446
  "@aws-sdk/util-user-agent-browser": "3.862.0",
447
- "@aws-sdk/util-user-agent-node": "3.863.0",
447
+ "@aws-sdk/util-user-agent-node": "3.864.0",
448
448
  "@smithy/config-resolver": "^4.1.5",
449
449
  "@smithy/core": "^3.8.0",
450
450
  "@smithy/fetch-http-handler": "^5.1.1",
@@ -477,9 +477,9 @@
477
477
  }
478
478
  },
479
479
  "node_modules/@aws-sdk/core": {
480
- "version": "3.863.0",
481
- "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.863.0.tgz",
482
- "integrity": "sha512-6KUD82jb8Z+PWRoAwqpjFcrhcCvUlKNfUKKdkhj2yEdugem36d29avTpTPa6RiOEsfUi7CM4Yh60Qrj0pNI4xQ==",
480
+ "version": "3.864.0",
481
+ "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.864.0.tgz",
482
+ "integrity": "sha512-LFUREbobleHEln+Zf7IG83lAZwvHZG0stI7UU0CtwyuhQy5Yx0rKksHNOCmlM7MpTEbSCfntEhYi3jUaY5e5lg==",
483
483
  "dev": true,
484
484
  "license": "Apache-2.0",
485
485
  "dependencies": {
@@ -504,13 +504,13 @@
504
504
  }
505
505
  },
506
506
  "node_modules/@aws-sdk/credential-provider-env": {
507
- "version": "3.863.0",
508
- "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.863.0.tgz",
509
- "integrity": "sha512-KmA5cjJU5ihR+oFJtraraeQ7aDSp3GtogSoBUKaHBsiSP7awgxuVcAWSr8wCxi0kPUjCE7kHSLTv4i9UC4soYw==",
507
+ "version": "3.864.0",
508
+ "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.864.0.tgz",
509
+ "integrity": "sha512-StJPOI2Rt8UE6lYjXUpg6tqSZaM72xg46ljPg8kIevtBAAfdtq9K20qT/kSliWGIBocMFAv0g2mC0hAa+ECyvg==",
510
510
  "dev": true,
511
511
  "license": "Apache-2.0",
512
512
  "dependencies": {
513
- "@aws-sdk/core": "3.863.0",
513
+ "@aws-sdk/core": "3.864.0",
514
514
  "@aws-sdk/types": "3.862.0",
515
515
  "@smithy/property-provider": "^4.0.5",
516
516
  "@smithy/types": "^4.3.2",
@@ -521,13 +521,13 @@
521
521
  }
522
522
  },
523
523
  "node_modules/@aws-sdk/credential-provider-http": {
524
- "version": "3.863.0",
525
- "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.863.0.tgz",
526
- "integrity": "sha512-AsMgQgYG5YwBFHAuB5y/ngwT9K2axBqJm1ZM+wBMTqPvyQ7cjnfsliCAGEY2QPIxE2prX85Bc50s1OPQVPROHg==",
524
+ "version": "3.864.0",
525
+ "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.864.0.tgz",
526
+ "integrity": "sha512-E/RFVxGTuGnuD+9pFPH2j4l6HvrXzPhmpL8H8nOoJUosjx7d4v93GJMbbl1v/fkDLqW9qN4Jx2cI6PAjohA6OA==",
527
527
  "dev": true,
528
528
  "license": "Apache-2.0",
529
529
  "dependencies": {
530
- "@aws-sdk/core": "3.863.0",
530
+ "@aws-sdk/core": "3.864.0",
531
531
  "@aws-sdk/types": "3.862.0",
532
532
  "@smithy/fetch-http-handler": "^5.1.1",
533
533
  "@smithy/node-http-handler": "^4.1.1",
@@ -543,19 +543,19 @@
543
543
  }
544
544
  },
545
545
  "node_modules/@aws-sdk/credential-provider-ini": {
546
- "version": "3.863.0",
547
- "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.863.0.tgz",
548
- "integrity": "sha512-RyyUZ7onXQdcjTnnmX3LvO3/tKsmYR9PJrLCnQQUVYlUzwref4E0ytBgk/mycxx6KHCJNVUzY4QV7s9VaUxcZA==",
546
+ "version": "3.864.0",
547
+ "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.864.0.tgz",
548
+ "integrity": "sha512-PlxrijguR1gxyPd5EYam6OfWLarj2MJGf07DvCx9MAuQkw77HBnsu6+XbV8fQriFuoJVTBLn9ROhMr/ROAYfUg==",
549
549
  "dev": true,
550
550
  "license": "Apache-2.0",
551
551
  "dependencies": {
552
- "@aws-sdk/core": "3.863.0",
553
- "@aws-sdk/credential-provider-env": "3.863.0",
554
- "@aws-sdk/credential-provider-http": "3.863.0",
555
- "@aws-sdk/credential-provider-process": "3.863.0",
556
- "@aws-sdk/credential-provider-sso": "3.863.0",
557
- "@aws-sdk/credential-provider-web-identity": "3.863.0",
558
- "@aws-sdk/nested-clients": "3.863.0",
552
+ "@aws-sdk/core": "3.864.0",
553
+ "@aws-sdk/credential-provider-env": "3.864.0",
554
+ "@aws-sdk/credential-provider-http": "3.864.0",
555
+ "@aws-sdk/credential-provider-process": "3.864.0",
556
+ "@aws-sdk/credential-provider-sso": "3.864.0",
557
+ "@aws-sdk/credential-provider-web-identity": "3.864.0",
558
+ "@aws-sdk/nested-clients": "3.864.0",
559
559
  "@aws-sdk/types": "3.862.0",
560
560
  "@smithy/credential-provider-imds": "^4.0.7",
561
561
  "@smithy/property-provider": "^4.0.5",
@@ -568,18 +568,18 @@
568
568
  }
569
569
  },
570
570
  "node_modules/@aws-sdk/credential-provider-node": {
571
- "version": "3.863.0",
572
- "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.863.0.tgz",
573
- "integrity": "sha512-ApRpvgB+DN4BHVmiLvXIdpFN21wBdL5p81G5cXmipJHStThAkk2N9SSG0XxhMaCpzdRWt+4JPRwR5pHiPvnxug==",
571
+ "version": "3.864.0",
572
+ "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.864.0.tgz",
573
+ "integrity": "sha512-2BEymFeXURS+4jE9tP3vahPwbYRl0/1MVaFZcijj6pq+nf5EPGvkFillbdBRdc98ZI2NedZgSKu3gfZXgYdUhQ==",
574
574
  "dev": true,
575
575
  "license": "Apache-2.0",
576
576
  "dependencies": {
577
- "@aws-sdk/credential-provider-env": "3.863.0",
578
- "@aws-sdk/credential-provider-http": "3.863.0",
579
- "@aws-sdk/credential-provider-ini": "3.863.0",
580
- "@aws-sdk/credential-provider-process": "3.863.0",
581
- "@aws-sdk/credential-provider-sso": "3.863.0",
582
- "@aws-sdk/credential-provider-web-identity": "3.863.0",
577
+ "@aws-sdk/credential-provider-env": "3.864.0",
578
+ "@aws-sdk/credential-provider-http": "3.864.0",
579
+ "@aws-sdk/credential-provider-ini": "3.864.0",
580
+ "@aws-sdk/credential-provider-process": "3.864.0",
581
+ "@aws-sdk/credential-provider-sso": "3.864.0",
582
+ "@aws-sdk/credential-provider-web-identity": "3.864.0",
583
583
  "@aws-sdk/types": "3.862.0",
584
584
  "@smithy/credential-provider-imds": "^4.0.7",
585
585
  "@smithy/property-provider": "^4.0.5",
@@ -592,13 +592,13 @@
592
592
  }
593
593
  },
594
594
  "node_modules/@aws-sdk/credential-provider-process": {
595
- "version": "3.863.0",
596
- "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.863.0.tgz",
597
- "integrity": "sha512-UN8AfjFvLGIHg2lMr4SNiOhCsDUv6uaD/XbAiRpt/u0z/xMsICxwkOawnKtHj24xGRAh+GgefMirl6QiTkbJ4Q==",
595
+ "version": "3.864.0",
596
+ "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.864.0.tgz",
597
+ "integrity": "sha512-Zxnn1hxhq7EOqXhVYgkF4rI9MnaO3+6bSg/tErnBQ3F8kDpA7CFU24G1YxwaJXp2X4aX3LwthefmSJHwcVP/2g==",
598
598
  "dev": true,
599
599
  "license": "Apache-2.0",
600
600
  "dependencies": {
601
- "@aws-sdk/core": "3.863.0",
601
+ "@aws-sdk/core": "3.864.0",
602
602
  "@aws-sdk/types": "3.862.0",
603
603
  "@smithy/property-provider": "^4.0.5",
604
604
  "@smithy/shared-ini-file-loader": "^4.0.5",
@@ -610,15 +610,15 @@
610
610
  }
611
611
  },
612
612
  "node_modules/@aws-sdk/credential-provider-sso": {
613
- "version": "3.863.0",
614
- "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.863.0.tgz",
615
- "integrity": "sha512-oV4F1zY0o/txR9ruTCH+UlRf7LAKBiwkthsHplNJT0kVq98RtBIMrzk9DgibvjfBsJH1572wozDIc4yOpcB4YA==",
613
+ "version": "3.864.0",
614
+ "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.864.0.tgz",
615
+ "integrity": "sha512-UPyPNQbxDwHVGmgWdGg9/9yvzuedRQVF5jtMkmP565YX9pKZ8wYAcXhcYdNPWFvH0GYdB0crKOmvib+bmCuwkw==",
616
616
  "dev": true,
617
617
  "license": "Apache-2.0",
618
618
  "dependencies": {
619
- "@aws-sdk/client-sso": "3.863.0",
620
- "@aws-sdk/core": "3.863.0",
621
- "@aws-sdk/token-providers": "3.863.0",
619
+ "@aws-sdk/client-sso": "3.864.0",
620
+ "@aws-sdk/core": "3.864.0",
621
+ "@aws-sdk/token-providers": "3.864.0",
622
622
  "@aws-sdk/types": "3.862.0",
623
623
  "@smithy/property-provider": "^4.0.5",
624
624
  "@smithy/shared-ini-file-loader": "^4.0.5",
@@ -630,14 +630,14 @@
630
630
  }
631
631
  },
632
632
  "node_modules/@aws-sdk/credential-provider-web-identity": {
633
- "version": "3.863.0",
634
- "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.863.0.tgz",
635
- "integrity": "sha512-INN5BNFalw68BxBFT+9sj2Yxia1XvS0+ZG0dkfFAmo8iXb2mw0o52PgqOiKlQfxnjbyOH7LgTB2hfbuuEwpKjw==",
633
+ "version": "3.864.0",
634
+ "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.864.0.tgz",
635
+ "integrity": "sha512-nNcjPN4SYg8drLwqK0vgVeSvxeGQiD0FxOaT38mV2H8cu0C5NzpvA+14Xy+W6vT84dxgmJYKk71Cr5QL2Oz+rA==",
636
636
  "dev": true,
637
637
  "license": "Apache-2.0",
638
638
  "dependencies": {
639
- "@aws-sdk/core": "3.863.0",
640
- "@aws-sdk/nested-clients": "3.863.0",
639
+ "@aws-sdk/core": "3.864.0",
640
+ "@aws-sdk/nested-clients": "3.864.0",
641
641
  "@aws-sdk/types": "3.862.0",
642
642
  "@smithy/property-provider": "^4.0.5",
643
643
  "@smithy/types": "^4.3.2",
@@ -683,16 +683,16 @@
683
683
  }
684
684
  },
685
685
  "node_modules/@aws-sdk/middleware-flexible-checksums": {
686
- "version": "3.863.0",
687
- "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-flexible-checksums/-/middleware-flexible-checksums-3.863.0.tgz",
688
- "integrity": "sha512-nZW9Rf4floAuxmPeik1FJ7/LwEnmWjdgoa0ls/x/KpAVM+LCbEBOV1Tcw2+jRpx3UQH4wAnJz18OFsXC+X/FAw==",
686
+ "version": "3.864.0",
687
+ "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-flexible-checksums/-/middleware-flexible-checksums-3.864.0.tgz",
688
+ "integrity": "sha512-MvakvzPZi9uyP3YADuIqtk/FAcPFkyYFWVVMf5iFs/rCdk0CUzn02Qf4CSuyhbkS6Y0KrAsMgKR4MgklPU79Wg==",
689
689
  "dev": true,
690
690
  "license": "Apache-2.0",
691
691
  "dependencies": {
692
692
  "@aws-crypto/crc32": "5.2.0",
693
693
  "@aws-crypto/crc32c": "5.2.0",
694
694
  "@aws-crypto/util": "5.2.0",
695
- "@aws-sdk/core": "3.863.0",
695
+ "@aws-sdk/core": "3.864.0",
696
696
  "@aws-sdk/types": "3.862.0",
697
697
  "@smithy/is-array-buffer": "^4.0.0",
698
698
  "@smithy/node-config-provider": "^4.1.4",
@@ -770,13 +770,13 @@
770
770
  }
771
771
  },
772
772
  "node_modules/@aws-sdk/middleware-sdk-s3": {
773
- "version": "3.863.0",
774
- "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.863.0.tgz",
775
- "integrity": "sha512-3Ppx5J31DUuaASyzAMYzSUf8y8emCLt1iaU+6yuSV/PwiCzJL5Sspos5xF2F+JErw8p8lNN+7rvHVSNqtgi2Fg==",
773
+ "version": "3.864.0",
774
+ "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.864.0.tgz",
775
+ "integrity": "sha512-GjYPZ6Xnqo17NnC8NIQyvvdzzO7dm+Ks7gpxD/HsbXPmV2aEfuFveJXneGW9e1BheSKFff6FPDWu8Gaj2Iu1yg==",
776
776
  "dev": true,
777
777
  "license": "Apache-2.0",
778
778
  "dependencies": {
779
- "@aws-sdk/core": "3.863.0",
779
+ "@aws-sdk/core": "3.864.0",
780
780
  "@aws-sdk/types": "3.862.0",
781
781
  "@aws-sdk/util-arn-parser": "3.804.0",
782
782
  "@smithy/core": "^3.8.0",
@@ -811,13 +811,13 @@
811
811
  }
812
812
  },
813
813
  "node_modules/@aws-sdk/middleware-user-agent": {
814
- "version": "3.863.0",
815
- "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.863.0.tgz",
816
- "integrity": "sha512-AqXzUUpHM51E/cmq/h3yja+GFff7zxQFj6Fq1bVkkc4vzXBCGpyTmaMcUv4rrR/OmmWfidyzbxdy7PuhMNAspg==",
814
+ "version": "3.864.0",
815
+ "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.864.0.tgz",
816
+ "integrity": "sha512-wrddonw4EyLNSNBrApzEhpSrDwJiNfjxDm5E+bn8n32BbAojXASH8W8jNpxz/jMgNkkJNxCfyqybGKzBX0OhbQ==",
817
817
  "dev": true,
818
818
  "license": "Apache-2.0",
819
819
  "dependencies": {
820
- "@aws-sdk/core": "3.863.0",
820
+ "@aws-sdk/core": "3.864.0",
821
821
  "@aws-sdk/types": "3.862.0",
822
822
  "@aws-sdk/util-endpoints": "3.862.0",
823
823
  "@smithy/core": "^3.8.0",
@@ -830,24 +830,24 @@
830
830
  }
831
831
  },
832
832
  "node_modules/@aws-sdk/nested-clients": {
833
- "version": "3.863.0",
834
- "resolved": "https://registry.npmjs.org/@aws-sdk/nested-clients/-/nested-clients-3.863.0.tgz",
835
- "integrity": "sha512-TgVr6d1MmJz7H6RehaFevZlJ+d1KSmyftp8oi2V5FCQ4OR22ITsTxmm5cIODYk8VInaie2ZABlPCN5fs+glJuA==",
833
+ "version": "3.864.0",
834
+ "resolved": "https://registry.npmjs.org/@aws-sdk/nested-clients/-/nested-clients-3.864.0.tgz",
835
+ "integrity": "sha512-H1C+NjSmz2y8Tbgh7Yy89J20yD/hVyk15hNoZDbCYkXg0M358KS7KVIEYs8E2aPOCr1sK3HBE819D/yvdMgokA==",
836
836
  "dev": true,
837
837
  "license": "Apache-2.0",
838
838
  "dependencies": {
839
839
  "@aws-crypto/sha256-browser": "5.2.0",
840
840
  "@aws-crypto/sha256-js": "5.2.0",
841
- "@aws-sdk/core": "3.863.0",
841
+ "@aws-sdk/core": "3.864.0",
842
842
  "@aws-sdk/middleware-host-header": "3.862.0",
843
843
  "@aws-sdk/middleware-logger": "3.862.0",
844
844
  "@aws-sdk/middleware-recursion-detection": "3.862.0",
845
- "@aws-sdk/middleware-user-agent": "3.863.0",
845
+ "@aws-sdk/middleware-user-agent": "3.864.0",
846
846
  "@aws-sdk/region-config-resolver": "3.862.0",
847
847
  "@aws-sdk/types": "3.862.0",
848
848
  "@aws-sdk/util-endpoints": "3.862.0",
849
849
  "@aws-sdk/util-user-agent-browser": "3.862.0",
850
- "@aws-sdk/util-user-agent-node": "3.863.0",
850
+ "@aws-sdk/util-user-agent-node": "3.864.0",
851
851
  "@smithy/config-resolver": "^4.1.5",
852
852
  "@smithy/core": "^3.8.0",
853
853
  "@smithy/fetch-http-handler": "^5.1.1",
@@ -898,13 +898,13 @@
898
898
  }
899
899
  },
900
900
  "node_modules/@aws-sdk/signature-v4-multi-region": {
901
- "version": "3.863.0",
902
- "resolved": "https://registry.npmjs.org/@aws-sdk/signature-v4-multi-region/-/signature-v4-multi-region-3.863.0.tgz",
903
- "integrity": "sha512-YEi1hER4OtVpeVBO9Ts8nYekF8Q9pcr4kzPxrzXHv83i2/jraPgacHlWvNSjdg8kvY+GsevBsirZXZmThkmKBA==",
901
+ "version": "3.864.0",
902
+ "resolved": "https://registry.npmjs.org/@aws-sdk/signature-v4-multi-region/-/signature-v4-multi-region-3.864.0.tgz",
903
+ "integrity": "sha512-w2HIn/WIcUyv1bmyCpRUKHXB5KdFGzyxPkp/YK5g+/FuGdnFFYWGfcO8O+How4jwrZTarBYsAHW9ggoKvwr37w==",
904
904
  "dev": true,
905
905
  "license": "Apache-2.0",
906
906
  "dependencies": {
907
- "@aws-sdk/middleware-sdk-s3": "3.863.0",
907
+ "@aws-sdk/middleware-sdk-s3": "3.864.0",
908
908
  "@aws-sdk/types": "3.862.0",
909
909
  "@smithy/protocol-http": "^5.1.3",
910
910
  "@smithy/signature-v4": "^5.1.3",
@@ -916,14 +916,14 @@
916
916
  }
917
917
  },
918
918
  "node_modules/@aws-sdk/token-providers": {
919
- "version": "3.863.0",
920
- "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.863.0.tgz",
921
- "integrity": "sha512-rGZ8QsnLWa725etzdPW2rH6+LN9eCcGsTIcxcCyh59cSgZLxT913q84WaUj6fOA7ElCOEU+WrV4Jiz4qwZI2DA==",
919
+ "version": "3.864.0",
920
+ "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.864.0.tgz",
921
+ "integrity": "sha512-gTc2QHOBo05SCwVA65dUtnJC6QERvFaPiuppGDSxoF7O5AQNK0UR/kMSenwLqN8b5E1oLYvQTv3C1idJLRX0cg==",
922
922
  "dev": true,
923
923
  "license": "Apache-2.0",
924
924
  "dependencies": {
925
- "@aws-sdk/core": "3.863.0",
926
- "@aws-sdk/nested-clients": "3.863.0",
925
+ "@aws-sdk/core": "3.864.0",
926
+ "@aws-sdk/nested-clients": "3.864.0",
927
927
  "@aws-sdk/types": "3.862.0",
928
928
  "@smithy/property-provider": "^4.0.5",
929
929
  "@smithy/shared-ini-file-loader": "^4.0.5",
@@ -1005,13 +1005,13 @@
1005
1005
  }
1006
1006
  },
1007
1007
  "node_modules/@aws-sdk/util-user-agent-node": {
1008
- "version": "3.863.0",
1009
- "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.863.0.tgz",
1010
- "integrity": "sha512-qoYXCe07xs0z+MjcDGuNBbP8P47i6h13BiHsXxiMKKiCihB3w2slvRbJYwUwc2fzZWSk0isKbdDmsdNZBKyBHg==",
1008
+ "version": "3.864.0",
1009
+ "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.864.0.tgz",
1010
+ "integrity": "sha512-d+FjUm2eJEpP+FRpVR3z6KzMdx1qwxEYDz8jzNKwxYLBBquaBaP/wfoMtMQKAcbrR7aT9FZVZF7zDgzNxUvQlQ==",
1011
1011
  "dev": true,
1012
1012
  "license": "Apache-2.0",
1013
1013
  "dependencies": {
1014
- "@aws-sdk/middleware-user-agent": "3.863.0",
1014
+ "@aws-sdk/middleware-user-agent": "3.864.0",
1015
1015
  "@aws-sdk/types": "3.862.0",
1016
1016
  "@smithy/node-config-provider": "^4.1.4",
1017
1017
  "@smithy/types": "^4.3.2",
@@ -2013,15 +2013,15 @@
2013
2013
  }
2014
2014
  },
2015
2015
  "node_modules/@inquirer/editor": {
2016
- "version": "4.2.15",
2017
- "resolved": "https://registry.npmjs.org/@inquirer/editor/-/editor-4.2.15.tgz",
2018
- "integrity": "sha512-wst31XT8DnGOSS4nNJDIklGKnf+8shuauVrWzgKegWUe28zfCftcWZ2vktGdzJgcylWSS2SrDnYUb6alZcwnCQ==",
2016
+ "version": "4.2.16",
2017
+ "resolved": "https://registry.npmjs.org/@inquirer/editor/-/editor-4.2.16.tgz",
2018
+ "integrity": "sha512-iSzLjT4C6YKp2DU0fr8T7a97FnRRxMO6CushJnW5ktxLNM2iNeuyUuUA5255eOLPORoGYCrVnuDOEBdGkHGkpw==",
2019
2019
  "dev": true,
2020
2020
  "license": "MIT",
2021
2021
  "dependencies": {
2022
2022
  "@inquirer/core": "^10.1.15",
2023
- "@inquirer/type": "^3.0.8",
2024
- "external-editor": "^3.1.0"
2023
+ "@inquirer/external-editor": "^1.0.0",
2024
+ "@inquirer/type": "^3.0.8"
2025
2025
  },
2026
2026
  "engines": {
2027
2027
  "node": ">=18"
@@ -2232,6 +2232,23 @@
2232
2232
  "node": ">=8"
2233
2233
  }
2234
2234
  },
2235
+ "node_modules/@inquirer/external-editor": {
2236
+ "version": "1.0.0",
2237
+ "resolved": "https://registry.npmjs.org/@inquirer/external-editor/-/external-editor-1.0.0.tgz",
2238
+ "integrity": "sha512-5v3YXc5ZMfL6OJqXPrX9csb4l7NlQA2doO1yynUjpUChT9hg4JcuBVP0RbsEJ/3SL/sxWEyFjT2W69ZhtoBWqg==",
2239
+ "dev": true,
2240
+ "license": "MIT",
2241
+ "dependencies": {
2242
+ "chardet": "^2.1.0",
2243
+ "iconv-lite": "^0.6.3"
2244
+ },
2245
+ "engines": {
2246
+ "node": ">=18"
2247
+ },
2248
+ "peerDependencies": {
2249
+ "@types/node": ">=18"
2250
+ }
2251
+ },
2235
2252
  "node_modules/@inquirer/figures": {
2236
2253
  "version": "1.0.13",
2237
2254
  "resolved": "https://registry.npmjs.org/@inquirer/figures/-/figures-1.0.13.tgz",
@@ -2379,15 +2396,15 @@
2379
2396
  }
2380
2397
  },
2381
2398
  "node_modules/@inquirer/prompts": {
2382
- "version": "7.8.0",
2383
- "resolved": "https://registry.npmjs.org/@inquirer/prompts/-/prompts-7.8.0.tgz",
2384
- "integrity": "sha512-JHwGbQ6wjf1dxxnalDYpZwZxUEosT+6CPGD9Zh4sm9WXdtUp9XODCQD3NjSTmu+0OAyxWXNOqf0spjIymJa2Tw==",
2399
+ "version": "7.8.1",
2400
+ "resolved": "https://registry.npmjs.org/@inquirer/prompts/-/prompts-7.8.1.tgz",
2401
+ "integrity": "sha512-LpBPeIpyCF1H3C7SK/QxJQG4iV1/SRmJdymfcul8PuwtVhD0JI1CSwqmd83VgRgt1QEsDojQYFSXJSgo81PVMw==",
2385
2402
  "dev": true,
2386
2403
  "license": "MIT",
2387
2404
  "dependencies": {
2388
2405
  "@inquirer/checkbox": "^4.2.0",
2389
2406
  "@inquirer/confirm": "^5.1.14",
2390
- "@inquirer/editor": "^4.2.15",
2407
+ "@inquirer/editor": "^4.2.16",
2391
2408
  "@inquirer/expand": "^4.0.17",
2392
2409
  "@inquirer/input": "^4.2.1",
2393
2410
  "@inquirer/number": "^3.0.17",
@@ -3765,9 +3782,9 @@
3765
3782
  }
3766
3783
  },
3767
3784
  "node_modules/@jsonjoy.com/json-pack": {
3768
- "version": "1.9.1",
3769
- "resolved": "https://registry.npmjs.org/@jsonjoy.com/json-pack/-/json-pack-1.9.1.tgz",
3770
- "integrity": "sha512-Dhb4dORtluN0c6GkjhN/E47rtrY8Wgt0+0R3KZRwzsLBm/UcGhwmQKb7q6B/GkUbP0sp35c4ycXOvAoxEW8CvA==",
3785
+ "version": "1.10.0",
3786
+ "resolved": "https://registry.npmjs.org/@jsonjoy.com/json-pack/-/json-pack-1.10.0.tgz",
3787
+ "integrity": "sha512-PMOU9Sh0baiLZEDewwR/YAHJBV2D8pPIzcFQSU7HQl/k/HNCDyVfO1OvkyDwBGp4dPtvZc7Hl9FFYWwTP1CbZw==",
3771
3788
  "license": "Apache-2.0",
3772
3789
  "dependencies": {
3773
3790
  "@jsonjoy.com/base64": "^1.1.2",
@@ -3937,13 +3954,13 @@
3937
3954
  }
3938
3955
  },
3939
3956
  "node_modules/@oclif/plugin-not-found": {
3940
- "version": "3.2.63",
3941
- "resolved": "https://registry.npmjs.org/@oclif/plugin-not-found/-/plugin-not-found-3.2.63.tgz",
3942
- "integrity": "sha512-xW+I6czUGqaeocVt1+brUKzXvL85mBTKdmJGlsB8pl9qUL3PJoIBIIDhbleR499T0jR+j1hpy8yWSCrs54icMQ==",
3957
+ "version": "3.2.64",
3958
+ "resolved": "https://registry.npmjs.org/@oclif/plugin-not-found/-/plugin-not-found-3.2.64.tgz",
3959
+ "integrity": "sha512-WDCPkFw5Qi9ALVODnGWdFDcm49iBOg7G2/u1C/o/KB4eSxlQn0JEDhLaMGcLmwOYKQnQdI9x35K77vhR1JrwDg==",
3943
3960
  "dev": true,
3944
3961
  "license": "MIT",
3945
3962
  "dependencies": {
3946
- "@inquirer/prompts": "^7.8.0",
3963
+ "@inquirer/prompts": "^7.8.1",
3947
3964
  "@oclif/core": "^4.5.2",
3948
3965
  "ansis": "^3.17.0",
3949
3966
  "fast-levenshtein": "^3.0.0"
@@ -6357,9 +6374,9 @@
6357
6374
  }
6358
6375
  },
6359
6376
  "node_modules/bowser": {
6360
- "version": "2.11.0",
6361
- "resolved": "https://registry.npmjs.org/bowser/-/bowser-2.11.0.tgz",
6362
- "integrity": "sha512-AlcaJBi/pqqJBIQ8U9Mcpc9i8Aqxn88Skv5d+xBX006BY5u8N3mGLHa5Lgppa7L/HfwgwLgZ6NYs+Ag6uUmJRA==",
6377
+ "version": "2.12.0",
6378
+ "resolved": "https://registry.npmjs.org/bowser/-/bowser-2.12.0.tgz",
6379
+ "integrity": "sha512-HcOcTudTeEWgbHh0Y1Tyb6fdeR71m4b/QACf0D4KswGTsNeIJQmg38mRENZPAYPZvGFN3fk3604XbQEPdxXdKg==",
6363
6380
  "dev": true,
6364
6381
  "license": "MIT"
6365
6382
  },
@@ -6393,9 +6410,9 @@
6393
6410
  "license": "ISC"
6394
6411
  },
6395
6412
  "node_modules/browserslist": {
6396
- "version": "4.25.1",
6397
- "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.25.1.tgz",
6398
- "integrity": "sha512-KGj0KoOMXLpSNkkEI6Z6mShmQy0bc1I+T7K9N81k4WWMrfz+6fQ6es80B/YLAeRoKvjYE1YSHHOW1qe9xIVzHw==",
6413
+ "version": "4.25.2",
6414
+ "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.25.2.tgz",
6415
+ "integrity": "sha512-0si2SJK3ooGzIawRu61ZdPCO1IncZwS8IzuX73sPZsXW6EQ/w/DAfPyKI8l1ETTCr2MnvqWitmlCUxgdul45jA==",
6399
6416
  "dev": true,
6400
6417
  "funding": [
6401
6418
  {
@@ -6413,8 +6430,8 @@
6413
6430
  ],
6414
6431
  "license": "MIT",
6415
6432
  "dependencies": {
6416
- "caniuse-lite": "^1.0.30001726",
6417
- "electron-to-chromium": "^1.5.173",
6433
+ "caniuse-lite": "^1.0.30001733",
6434
+ "electron-to-chromium": "^1.5.199",
6418
6435
  "node-releases": "^2.0.19",
6419
6436
  "update-browserslist-db": "^1.1.3"
6420
6437
  },
@@ -6711,9 +6728,9 @@
6711
6728
  }
6712
6729
  },
6713
6730
  "node_modules/chardet": {
6714
- "version": "0.7.0",
6715
- "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz",
6716
- "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==",
6731
+ "version": "2.1.0",
6732
+ "resolved": "https://registry.npmjs.org/chardet/-/chardet-2.1.0.tgz",
6733
+ "integrity": "sha512-bNFETTG/pM5ryzQ9Ad0lJOTa6HWD/YsScAR3EnCPZRPlQh77JocYktSHOUHelyhm8IARL+o4c4F1bP5KVOjiRA==",
6717
6734
  "dev": true,
6718
6735
  "license": "MIT"
6719
6736
  },
@@ -7587,21 +7604,6 @@
7587
7604
  "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
7588
7605
  }
7589
7606
  },
7590
- "node_modules/external-editor": {
7591
- "version": "3.1.0",
7592
- "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz",
7593
- "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==",
7594
- "dev": true,
7595
- "license": "MIT",
7596
- "dependencies": {
7597
- "chardet": "^0.7.0",
7598
- "iconv-lite": "^0.4.24",
7599
- "tmp": "^0.0.33"
7600
- },
7601
- "engines": {
7602
- "node": ">=4"
7603
- }
7604
- },
7605
7607
  "node_modules/fast-copy": {
7606
7608
  "version": "3.0.2",
7607
7609
  "resolved": "https://registry.npmjs.org/fast-copy/-/fast-copy-3.0.2.tgz",
@@ -8500,13 +8502,13 @@
8500
8502
  }
8501
8503
  },
8502
8504
  "node_modules/iconv-lite": {
8503
- "version": "0.4.24",
8504
- "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
8505
- "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
8505
+ "version": "0.6.3",
8506
+ "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
8507
+ "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
8506
8508
  "dev": true,
8507
8509
  "license": "MIT",
8508
8510
  "dependencies": {
8509
- "safer-buffer": ">= 2.1.2 < 3"
8511
+ "safer-buffer": ">= 2.1.2 < 3.0.0"
8510
8512
  },
8511
8513
  "engines": {
8512
8514
  "node": ">=0.10.0"
@@ -11422,9 +11424,9 @@
11422
11424
  }
11423
11425
  },
11424
11426
  "node_modules/napi-postinstall": {
11425
- "version": "0.3.2",
11426
- "resolved": "https://registry.npmjs.org/napi-postinstall/-/napi-postinstall-0.3.2.tgz",
11427
- "integrity": "sha512-tWVJxJHmBWLy69PvO96TZMZDrzmw5KeiZBz3RHmiM2XZ9grBJ2WgMAFVVg25nqp3ZjTFUs2Ftw1JhscL3Teliw==",
11427
+ "version": "0.3.3",
11428
+ "resolved": "https://registry.npmjs.org/napi-postinstall/-/napi-postinstall-0.3.3.tgz",
11429
+ "integrity": "sha512-uTp172LLXSxuSYHv/kou+f6KW3SMppU9ivthaVTXian9sOt3XM/zHYHpRZiLgQoxeWfYUnslNWQHF1+G71xcow==",
11428
11430
  "dev": true,
11429
11431
  "license": "MIT",
11430
11432
  "bin": {
@@ -11839,21 +11841,21 @@
11839
11841
  }
11840
11842
  },
11841
11843
  "node_modules/oclif": {
11842
- "version": "4.22.6",
11843
- "resolved": "https://registry.npmjs.org/oclif/-/oclif-4.22.6.tgz",
11844
- "integrity": "sha512-TsFZfPdhOKtBRv3YKnJMUVbL/JTw5IDs4DoWekpn7c+jBDw/snp0STCe48YYW4hotULwfy2yPbKr0KyzDQ7gjw==",
11844
+ "version": "4.22.9",
11845
+ "resolved": "https://registry.npmjs.org/oclif/-/oclif-4.22.9.tgz",
11846
+ "integrity": "sha512-zrrvAFI/MvfP54QueJrvYl3mjS1eYyeHGV3ITv7NQ16ykcg83E+rXBva2CfymMr1/r9b7m82GTFID6i8f8O66g==",
11845
11847
  "dev": true,
11846
11848
  "license": "MIT",
11847
11849
  "dependencies": {
11848
- "@aws-sdk/client-cloudfront": "^3.850.0",
11850
+ "@aws-sdk/client-cloudfront": "^3.864.0",
11849
11851
  "@aws-sdk/client-s3": "^3.850.0",
11850
11852
  "@inquirer/confirm": "^3.1.22",
11851
11853
  "@inquirer/input": "^2.2.4",
11852
11854
  "@inquirer/select": "^2.5.0",
11853
11855
  "@oclif/core": "^4.5.2",
11854
11856
  "@oclif/plugin-help": "^6.2.29",
11855
- "@oclif/plugin-not-found": "^3.2.61",
11856
- "@oclif/plugin-warn-if-update-available": "^3.1.44",
11857
+ "@oclif/plugin-not-found": "^3.2.63",
11858
+ "@oclif/plugin-warn-if-update-available": "^3.1.46",
11857
11859
  "ansis": "^3.16.0",
11858
11860
  "async-retry": "^1.3.3",
11859
11861
  "change-case": "^4",
@@ -11910,16 +11912,6 @@
11910
11912
  "url": "https://github.com/sponsors/sindresorhus"
11911
11913
  }
11912
11914
  },
11913
- "node_modules/os-tmpdir": {
11914
- "version": "1.0.2",
11915
- "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
11916
- "integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==",
11917
- "dev": true,
11918
- "license": "MIT",
11919
- "engines": {
11920
- "node": ">=0.10.0"
11921
- }
11922
- },
11923
11915
  "node_modules/oxc-resolver": {
11924
11916
  "version": "11.6.1",
11925
11917
  "resolved": "https://registry.npmjs.org/oxc-resolver/-/oxc-resolver-11.6.1.tgz",
@@ -13383,9 +13375,9 @@
13383
13375
  }
13384
13376
  },
13385
13377
  "node_modules/smol-toml": {
13386
- "version": "1.4.1",
13387
- "resolved": "https://registry.npmjs.org/smol-toml/-/smol-toml-1.4.1.tgz",
13388
- "integrity": "sha512-CxdwHXyYTONGHThDbq5XdwbFsuY4wlClRGejfE2NtwUtiHYsP1QtNsHb/hnj31jKYSchztJsaA8pSQoVzkfCFg==",
13378
+ "version": "1.4.2",
13379
+ "resolved": "https://registry.npmjs.org/smol-toml/-/smol-toml-1.4.2.tgz",
13380
+ "integrity": "sha512-rInDH6lCNiEyn3+hH8KVGFdbjc099j47+OSgbMrfDYX1CmXLfdKd7qi6IfcWj2wFxvSVkuI46M+wPGYfEOEj6g==",
13389
13381
  "dev": true,
13390
13382
  "license": "BSD-3-Clause",
13391
13383
  "engines": {
@@ -14036,19 +14028,6 @@
14036
14028
  "integrity": "sha512-Je6p7pkk+KMzMv2XXKmAE3McmolOQFdxkKw0R8EYNr7sELW46JqnNeTX8ybPiQgvg1ymCoF8LXs5fzFaZvJPTA==",
14037
14029
  "license": "MIT"
14038
14030
  },
14039
- "node_modules/tmp": {
14040
- "version": "0.0.33",
14041
- "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
14042
- "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
14043
- "dev": true,
14044
- "license": "MIT",
14045
- "dependencies": {
14046
- "os-tmpdir": "~1.0.2"
14047
- },
14048
- "engines": {
14049
- "node": ">=0.6.0"
14050
- }
14051
- },
14052
14031
  "node_modules/tmpl": {
14053
14032
  "version": "1.0.5",
14054
14033
  "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz",
package/oclif.manifest.json CHANGED
@@ -284,5 +284,5 @@
284
284
  ]
285
285
  }
286
286
  },
287
- "version": "1.0.1-dev-70.16851323858-1"
287
+ "version": "1.0.1-dev-81.16862932114-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-dev-70.16851323858-1",
4
+ "version": "1.0.1-dev-81.16862932114-1",
5
5
  "exports": "./lib/driver/MergeDriver.js",
6
6
  "type": "module",
7
7
  "author": "Sébastien Colladon (colladonsebastien@gmail.com)",
@@ -32,7 +32,7 @@
32
32
  "knip": "^5.62.0",
33
33
  "mocha": "^11.7.1",
34
34
  "nyc": "^17.1.0",
35
- "oclif": "^4.22.6",
35
+ "oclif": "^4.22.9",
36
36
  "shx": "^0.4.0",
37
37
  "ts-jest": "^29.4.1",
38
38
  "ts-node": "^10.9.2",
@@ -41,7 +41,7 @@
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",