sf-git-merge-driver 1.0.0-dev-3.13992313901-1 → 1.0.0-dev-3.14022905562-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.
- package/README.md +3 -3
- package/lib/constant/conflicConstant.d.ts +6 -0
- package/lib/constant/conflicConstant.js +7 -0
- package/lib/constant/conflicConstant.js.map +1 -0
- package/lib/constant/metadataConstant.d.ts +4 -53
- package/lib/constant/metadataConstant.js +4 -53
- package/lib/constant/metadataConstant.js.map +1 -1
- package/lib/merger/JsonMerger.d.ts +2 -36
- package/lib/merger/JsonMerger.js +151 -532
- package/lib/merger/JsonMerger.js.map +1 -1
- package/lib/merger/XmlMerger.js +1 -1
- package/lib/merger/XmlMerger.js.map +1 -1
- package/lib/merger/conflictMarker.d.ts +2 -0
- package/lib/merger/conflictMarker.js +12 -0
- package/lib/merger/conflictMarker.js.map +1 -0
- package/lib/merger/textAttribute.d.ts +2 -0
- package/lib/merger/textAttribute.js +55 -0
- package/lib/merger/textAttribute.js.map +1 -0
- package/lib/service/MetadataService.d.ts +4 -0
- package/lib/service/MetadataService.js +70 -0
- package/lib/service/MetadataService.js.map +1 -0
- package/lib/service/NamespaceHandler.d.ts +5 -0
- package/lib/service/NamespaceHandler.js +35 -0
- package/lib/service/NamespaceHandler.js.map +1 -0
- package/lib/types/jsonTypes.d.ts +6 -0
- package/lib/types/jsonTypes.js +2 -0
- package/lib/types/jsonTypes.js.map +1 -0
- package/lib/types/mergeScenario.d.ts +17 -0
- package/lib/types/mergeScenario.js +38 -0
- package/lib/types/mergeScenario.js.map +1 -0
- package/lib/utils/mergeUtils.d.ts +4 -0
- package/lib/utils/mergeUtils.js +5 -0
- package/lib/utils/mergeUtils.js.map +1 -0
- package/npm-shrinkwrap.json +237 -16
- package/oclif.manifest.json +1 -1
- package/package.json +4 -4
package/npm-shrinkwrap.json
CHANGED
|
@@ -1,17 +1,17 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "sf-git-merge-driver",
|
|
3
|
-
"version": "1.0.0-dev-3.
|
|
3
|
+
"version": "1.0.0-dev-3.14022905562-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-3.
|
|
9
|
+
"version": "1.0.0-dev-3.14022905562-1",
|
|
10
10
|
"license": "MIT",
|
|
11
11
|
"dependencies": {
|
|
12
12
|
"@oclif/core": "^4.2.10",
|
|
13
|
-
"@salesforce/core": "^8.8.
|
|
14
|
-
"@salesforce/sf-plugins-core": "^12.2.
|
|
13
|
+
"@salesforce/core": "^8.8.6",
|
|
14
|
+
"@salesforce/sf-plugins-core": "^12.2.1",
|
|
15
15
|
"fast-xml-parser": "^5.0.9",
|
|
16
16
|
"lodash-es": "^4.17.21",
|
|
17
17
|
"simple-git": "^3.27.0"
|
|
@@ -30,7 +30,7 @@
|
|
|
30
30
|
"knip": "^5.46.0",
|
|
31
31
|
"mocha": "^11.1.0",
|
|
32
32
|
"nyc": "^17.1.0",
|
|
33
|
-
"oclif": "^4.17.
|
|
33
|
+
"oclif": "^4.17.40",
|
|
34
34
|
"shx": "^0.4.0",
|
|
35
35
|
"ts-jest": "^29.2.6",
|
|
36
36
|
"ts-node": "^10.9.2",
|
|
@@ -366,9 +366,9 @@
|
|
|
366
366
|
}
|
|
367
367
|
},
|
|
368
368
|
"node_modules/@aws-sdk/client-s3": {
|
|
369
|
-
"version": "3.
|
|
370
|
-
"resolved": "https://registry.npmjs.org/@aws-sdk/client-s3/-/client-s3-3.
|
|
371
|
-
"integrity": "sha512-
|
|
369
|
+
"version": "3.772.0",
|
|
370
|
+
"resolved": "https://registry.npmjs.org/@aws-sdk/client-s3/-/client-s3-3.772.0.tgz",
|
|
371
|
+
"integrity": "sha512-HQXlQIyyLp47h1/Hdjr36yK8/gsAAFX2vRzgDJhSRaz0vWZlWX07AJdYfrxapLUXfVU6DbBu3rwi2UGqM7ixqQ==",
|
|
372
372
|
"dev": true,
|
|
373
373
|
"license": "Apache-2.0",
|
|
374
374
|
"dependencies": {
|
|
@@ -376,14 +376,14 @@
|
|
|
376
376
|
"@aws-crypto/sha256-browser": "5.2.0",
|
|
377
377
|
"@aws-crypto/sha256-js": "5.2.0",
|
|
378
378
|
"@aws-sdk/core": "3.758.0",
|
|
379
|
-
"@aws-sdk/credential-provider-node": "3.
|
|
379
|
+
"@aws-sdk/credential-provider-node": "3.772.0",
|
|
380
380
|
"@aws-sdk/middleware-bucket-endpoint": "3.734.0",
|
|
381
381
|
"@aws-sdk/middleware-expect-continue": "3.734.0",
|
|
382
382
|
"@aws-sdk/middleware-flexible-checksums": "3.758.0",
|
|
383
383
|
"@aws-sdk/middleware-host-header": "3.734.0",
|
|
384
384
|
"@aws-sdk/middleware-location-constraint": "3.734.0",
|
|
385
385
|
"@aws-sdk/middleware-logger": "3.734.0",
|
|
386
|
-
"@aws-sdk/middleware-recursion-detection": "3.
|
|
386
|
+
"@aws-sdk/middleware-recursion-detection": "3.772.0",
|
|
387
387
|
"@aws-sdk/middleware-sdk-s3": "3.758.0",
|
|
388
388
|
"@aws-sdk/middleware-ssec": "3.734.0",
|
|
389
389
|
"@aws-sdk/middleware-user-agent": "3.758.0",
|
|
@@ -433,6 +433,227 @@
|
|
|
433
433
|
"node": ">=18.0.0"
|
|
434
434
|
}
|
|
435
435
|
},
|
|
436
|
+
"node_modules/@aws-sdk/client-s3/node_modules/@aws-sdk/client-sso": {
|
|
437
|
+
"version": "3.772.0",
|
|
438
|
+
"resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.772.0.tgz",
|
|
439
|
+
"integrity": "sha512-sDdxepi74+cL6gXJJ2yw3UNSI7GBvoGTwZqFyPoNAzcURvaYwo8dBr7G4jS9GDanjTlO3CGVAf2VMcpqEvmoEw==",
|
|
440
|
+
"dev": true,
|
|
441
|
+
"license": "Apache-2.0",
|
|
442
|
+
"dependencies": {
|
|
443
|
+
"@aws-crypto/sha256-browser": "5.2.0",
|
|
444
|
+
"@aws-crypto/sha256-js": "5.2.0",
|
|
445
|
+
"@aws-sdk/core": "3.758.0",
|
|
446
|
+
"@aws-sdk/middleware-host-header": "3.734.0",
|
|
447
|
+
"@aws-sdk/middleware-logger": "3.734.0",
|
|
448
|
+
"@aws-sdk/middleware-recursion-detection": "3.772.0",
|
|
449
|
+
"@aws-sdk/middleware-user-agent": "3.758.0",
|
|
450
|
+
"@aws-sdk/region-config-resolver": "3.734.0",
|
|
451
|
+
"@aws-sdk/types": "3.734.0",
|
|
452
|
+
"@aws-sdk/util-endpoints": "3.743.0",
|
|
453
|
+
"@aws-sdk/util-user-agent-browser": "3.734.0",
|
|
454
|
+
"@aws-sdk/util-user-agent-node": "3.758.0",
|
|
455
|
+
"@smithy/config-resolver": "^4.0.1",
|
|
456
|
+
"@smithy/core": "^3.1.5",
|
|
457
|
+
"@smithy/fetch-http-handler": "^5.0.1",
|
|
458
|
+
"@smithy/hash-node": "^4.0.1",
|
|
459
|
+
"@smithy/invalid-dependency": "^4.0.1",
|
|
460
|
+
"@smithy/middleware-content-length": "^4.0.1",
|
|
461
|
+
"@smithy/middleware-endpoint": "^4.0.6",
|
|
462
|
+
"@smithy/middleware-retry": "^4.0.7",
|
|
463
|
+
"@smithy/middleware-serde": "^4.0.2",
|
|
464
|
+
"@smithy/middleware-stack": "^4.0.1",
|
|
465
|
+
"@smithy/node-config-provider": "^4.0.1",
|
|
466
|
+
"@smithy/node-http-handler": "^4.0.3",
|
|
467
|
+
"@smithy/protocol-http": "^5.0.1",
|
|
468
|
+
"@smithy/smithy-client": "^4.1.6",
|
|
469
|
+
"@smithy/types": "^4.1.0",
|
|
470
|
+
"@smithy/url-parser": "^4.0.1",
|
|
471
|
+
"@smithy/util-base64": "^4.0.0",
|
|
472
|
+
"@smithy/util-body-length-browser": "^4.0.0",
|
|
473
|
+
"@smithy/util-body-length-node": "^4.0.0",
|
|
474
|
+
"@smithy/util-defaults-mode-browser": "^4.0.7",
|
|
475
|
+
"@smithy/util-defaults-mode-node": "^4.0.7",
|
|
476
|
+
"@smithy/util-endpoints": "^3.0.1",
|
|
477
|
+
"@smithy/util-middleware": "^4.0.1",
|
|
478
|
+
"@smithy/util-retry": "^4.0.1",
|
|
479
|
+
"@smithy/util-utf8": "^4.0.0",
|
|
480
|
+
"tslib": "^2.6.2"
|
|
481
|
+
},
|
|
482
|
+
"engines": {
|
|
483
|
+
"node": ">=18.0.0"
|
|
484
|
+
}
|
|
485
|
+
},
|
|
486
|
+
"node_modules/@aws-sdk/client-s3/node_modules/@aws-sdk/credential-provider-ini": {
|
|
487
|
+
"version": "3.772.0",
|
|
488
|
+
"resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.772.0.tgz",
|
|
489
|
+
"integrity": "sha512-T1Ec9Q25zl5c/eZUPHZsiq8vgBeWBjHM7WM5xtZszZRPqqhQGnmFlomz1r9rwhW8RFB5k8HRaD/SLKo6jtYl/A==",
|
|
490
|
+
"dev": true,
|
|
491
|
+
"license": "Apache-2.0",
|
|
492
|
+
"dependencies": {
|
|
493
|
+
"@aws-sdk/core": "3.758.0",
|
|
494
|
+
"@aws-sdk/credential-provider-env": "3.758.0",
|
|
495
|
+
"@aws-sdk/credential-provider-http": "3.758.0",
|
|
496
|
+
"@aws-sdk/credential-provider-process": "3.758.0",
|
|
497
|
+
"@aws-sdk/credential-provider-sso": "3.772.0",
|
|
498
|
+
"@aws-sdk/credential-provider-web-identity": "3.772.0",
|
|
499
|
+
"@aws-sdk/nested-clients": "3.772.0",
|
|
500
|
+
"@aws-sdk/types": "3.734.0",
|
|
501
|
+
"@smithy/credential-provider-imds": "^4.0.1",
|
|
502
|
+
"@smithy/property-provider": "^4.0.1",
|
|
503
|
+
"@smithy/shared-ini-file-loader": "^4.0.1",
|
|
504
|
+
"@smithy/types": "^4.1.0",
|
|
505
|
+
"tslib": "^2.6.2"
|
|
506
|
+
},
|
|
507
|
+
"engines": {
|
|
508
|
+
"node": ">=18.0.0"
|
|
509
|
+
}
|
|
510
|
+
},
|
|
511
|
+
"node_modules/@aws-sdk/client-s3/node_modules/@aws-sdk/credential-provider-node": {
|
|
512
|
+
"version": "3.772.0",
|
|
513
|
+
"resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.772.0.tgz",
|
|
514
|
+
"integrity": "sha512-0IdVfjBO88Mtekq/KaScYSIEPIeR+ABRvBOWyj/c/qQ2KJyI0GRlSAzpANfxDLHVPn3yEHuZd9nRL6sOmOMI0A==",
|
|
515
|
+
"dev": true,
|
|
516
|
+
"license": "Apache-2.0",
|
|
517
|
+
"dependencies": {
|
|
518
|
+
"@aws-sdk/credential-provider-env": "3.758.0",
|
|
519
|
+
"@aws-sdk/credential-provider-http": "3.758.0",
|
|
520
|
+
"@aws-sdk/credential-provider-ini": "3.772.0",
|
|
521
|
+
"@aws-sdk/credential-provider-process": "3.758.0",
|
|
522
|
+
"@aws-sdk/credential-provider-sso": "3.772.0",
|
|
523
|
+
"@aws-sdk/credential-provider-web-identity": "3.772.0",
|
|
524
|
+
"@aws-sdk/types": "3.734.0",
|
|
525
|
+
"@smithy/credential-provider-imds": "^4.0.1",
|
|
526
|
+
"@smithy/property-provider": "^4.0.1",
|
|
527
|
+
"@smithy/shared-ini-file-loader": "^4.0.1",
|
|
528
|
+
"@smithy/types": "^4.1.0",
|
|
529
|
+
"tslib": "^2.6.2"
|
|
530
|
+
},
|
|
531
|
+
"engines": {
|
|
532
|
+
"node": ">=18.0.0"
|
|
533
|
+
}
|
|
534
|
+
},
|
|
535
|
+
"node_modules/@aws-sdk/client-s3/node_modules/@aws-sdk/credential-provider-sso": {
|
|
536
|
+
"version": "3.772.0",
|
|
537
|
+
"resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.772.0.tgz",
|
|
538
|
+
"integrity": "sha512-yR3Y5RAVPa4ogojcBOpZUx6XyRVAkynIJCjd0avdlxW1hhnzSr5/pzoiJ6u21UCbkxlJJTDZE3jfFe7tt+HA4w==",
|
|
539
|
+
"dev": true,
|
|
540
|
+
"license": "Apache-2.0",
|
|
541
|
+
"dependencies": {
|
|
542
|
+
"@aws-sdk/client-sso": "3.772.0",
|
|
543
|
+
"@aws-sdk/core": "3.758.0",
|
|
544
|
+
"@aws-sdk/token-providers": "3.772.0",
|
|
545
|
+
"@aws-sdk/types": "3.734.0",
|
|
546
|
+
"@smithy/property-provider": "^4.0.1",
|
|
547
|
+
"@smithy/shared-ini-file-loader": "^4.0.1",
|
|
548
|
+
"@smithy/types": "^4.1.0",
|
|
549
|
+
"tslib": "^2.6.2"
|
|
550
|
+
},
|
|
551
|
+
"engines": {
|
|
552
|
+
"node": ">=18.0.0"
|
|
553
|
+
}
|
|
554
|
+
},
|
|
555
|
+
"node_modules/@aws-sdk/client-s3/node_modules/@aws-sdk/credential-provider-web-identity": {
|
|
556
|
+
"version": "3.772.0",
|
|
557
|
+
"resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.772.0.tgz",
|
|
558
|
+
"integrity": "sha512-yHAT5Y2y0fnecSuWRUn8NMunKfDqFYhnOpGq8UyCEcwz9aXzibU0hqRIEm51qpR81hqo0GMFDH0EOmegZ/iW5w==",
|
|
559
|
+
"dev": true,
|
|
560
|
+
"license": "Apache-2.0",
|
|
561
|
+
"dependencies": {
|
|
562
|
+
"@aws-sdk/core": "3.758.0",
|
|
563
|
+
"@aws-sdk/nested-clients": "3.772.0",
|
|
564
|
+
"@aws-sdk/types": "3.734.0",
|
|
565
|
+
"@smithy/property-provider": "^4.0.1",
|
|
566
|
+
"@smithy/types": "^4.1.0",
|
|
567
|
+
"tslib": "^2.6.2"
|
|
568
|
+
},
|
|
569
|
+
"engines": {
|
|
570
|
+
"node": ">=18.0.0"
|
|
571
|
+
}
|
|
572
|
+
},
|
|
573
|
+
"node_modules/@aws-sdk/client-s3/node_modules/@aws-sdk/middleware-recursion-detection": {
|
|
574
|
+
"version": "3.772.0",
|
|
575
|
+
"resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.772.0.tgz",
|
|
576
|
+
"integrity": "sha512-zg0LjJa4v7fcLzn5QzZvtVS+qyvmsnu7oQnb86l6ckduZpWDCDC9+A0ZzcXTrxblPCJd3JqkoG1+Gzi4S4Ny/Q==",
|
|
577
|
+
"dev": true,
|
|
578
|
+
"license": "Apache-2.0",
|
|
579
|
+
"dependencies": {
|
|
580
|
+
"@aws-sdk/types": "3.734.0",
|
|
581
|
+
"@smithy/protocol-http": "^5.0.1",
|
|
582
|
+
"@smithy/types": "^4.1.0",
|
|
583
|
+
"tslib": "^2.6.2"
|
|
584
|
+
},
|
|
585
|
+
"engines": {
|
|
586
|
+
"node": ">=18.0.0"
|
|
587
|
+
}
|
|
588
|
+
},
|
|
589
|
+
"node_modules/@aws-sdk/client-s3/node_modules/@aws-sdk/nested-clients": {
|
|
590
|
+
"version": "3.772.0",
|
|
591
|
+
"resolved": "https://registry.npmjs.org/@aws-sdk/nested-clients/-/nested-clients-3.772.0.tgz",
|
|
592
|
+
"integrity": "sha512-gNJbBxR5YlEumsCS9EWWEASXEnysL0aDnr9MNPX1ip/g1xOqRHmytgV/+t8RFZFTKg0OprbWTq5Ich3MqsEuCQ==",
|
|
593
|
+
"dev": true,
|
|
594
|
+
"license": "Apache-2.0",
|
|
595
|
+
"dependencies": {
|
|
596
|
+
"@aws-crypto/sha256-browser": "5.2.0",
|
|
597
|
+
"@aws-crypto/sha256-js": "5.2.0",
|
|
598
|
+
"@aws-sdk/core": "3.758.0",
|
|
599
|
+
"@aws-sdk/middleware-host-header": "3.734.0",
|
|
600
|
+
"@aws-sdk/middleware-logger": "3.734.0",
|
|
601
|
+
"@aws-sdk/middleware-recursion-detection": "3.772.0",
|
|
602
|
+
"@aws-sdk/middleware-user-agent": "3.758.0",
|
|
603
|
+
"@aws-sdk/region-config-resolver": "3.734.0",
|
|
604
|
+
"@aws-sdk/types": "3.734.0",
|
|
605
|
+
"@aws-sdk/util-endpoints": "3.743.0",
|
|
606
|
+
"@aws-sdk/util-user-agent-browser": "3.734.0",
|
|
607
|
+
"@aws-sdk/util-user-agent-node": "3.758.0",
|
|
608
|
+
"@smithy/config-resolver": "^4.0.1",
|
|
609
|
+
"@smithy/core": "^3.1.5",
|
|
610
|
+
"@smithy/fetch-http-handler": "^5.0.1",
|
|
611
|
+
"@smithy/hash-node": "^4.0.1",
|
|
612
|
+
"@smithy/invalid-dependency": "^4.0.1",
|
|
613
|
+
"@smithy/middleware-content-length": "^4.0.1",
|
|
614
|
+
"@smithy/middleware-endpoint": "^4.0.6",
|
|
615
|
+
"@smithy/middleware-retry": "^4.0.7",
|
|
616
|
+
"@smithy/middleware-serde": "^4.0.2",
|
|
617
|
+
"@smithy/middleware-stack": "^4.0.1",
|
|
618
|
+
"@smithy/node-config-provider": "^4.0.1",
|
|
619
|
+
"@smithy/node-http-handler": "^4.0.3",
|
|
620
|
+
"@smithy/protocol-http": "^5.0.1",
|
|
621
|
+
"@smithy/smithy-client": "^4.1.6",
|
|
622
|
+
"@smithy/types": "^4.1.0",
|
|
623
|
+
"@smithy/url-parser": "^4.0.1",
|
|
624
|
+
"@smithy/util-base64": "^4.0.0",
|
|
625
|
+
"@smithy/util-body-length-browser": "^4.0.0",
|
|
626
|
+
"@smithy/util-body-length-node": "^4.0.0",
|
|
627
|
+
"@smithy/util-defaults-mode-browser": "^4.0.7",
|
|
628
|
+
"@smithy/util-defaults-mode-node": "^4.0.7",
|
|
629
|
+
"@smithy/util-endpoints": "^3.0.1",
|
|
630
|
+
"@smithy/util-middleware": "^4.0.1",
|
|
631
|
+
"@smithy/util-retry": "^4.0.1",
|
|
632
|
+
"@smithy/util-utf8": "^4.0.0",
|
|
633
|
+
"tslib": "^2.6.2"
|
|
634
|
+
},
|
|
635
|
+
"engines": {
|
|
636
|
+
"node": ">=18.0.0"
|
|
637
|
+
}
|
|
638
|
+
},
|
|
639
|
+
"node_modules/@aws-sdk/client-s3/node_modules/@aws-sdk/token-providers": {
|
|
640
|
+
"version": "3.772.0",
|
|
641
|
+
"resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.772.0.tgz",
|
|
642
|
+
"integrity": "sha512-d1Waa1vyebuokcAWYlkZdtFlciIgob7B39vPRmtxMObbGumJKiOy/qCe2/FB/72h1Ej9Ih32lwvbxUjORQWN4g==",
|
|
643
|
+
"dev": true,
|
|
644
|
+
"license": "Apache-2.0",
|
|
645
|
+
"dependencies": {
|
|
646
|
+
"@aws-sdk/nested-clients": "3.772.0",
|
|
647
|
+
"@aws-sdk/types": "3.734.0",
|
|
648
|
+
"@smithy/property-provider": "^4.0.1",
|
|
649
|
+
"@smithy/shared-ini-file-loader": "^4.0.1",
|
|
650
|
+
"@smithy/types": "^4.1.0",
|
|
651
|
+
"tslib": "^2.6.2"
|
|
652
|
+
},
|
|
653
|
+
"engines": {
|
|
654
|
+
"node": ">=18.0.0"
|
|
655
|
+
}
|
|
656
|
+
},
|
|
436
657
|
"node_modules/@aws-sdk/client-sso": {
|
|
437
658
|
"version": "3.758.0",
|
|
438
659
|
"resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.758.0.tgz",
|
|
@@ -11195,19 +11416,19 @@
|
|
|
11195
11416
|
}
|
|
11196
11417
|
},
|
|
11197
11418
|
"node_modules/oclif": {
|
|
11198
|
-
"version": "4.17.
|
|
11199
|
-
"resolved": "https://registry.npmjs.org/oclif/-/oclif-4.17.
|
|
11200
|
-
"integrity": "sha512-
|
|
11419
|
+
"version": "4.17.40",
|
|
11420
|
+
"resolved": "https://registry.npmjs.org/oclif/-/oclif-4.17.40.tgz",
|
|
11421
|
+
"integrity": "sha512-lS7tsZD0KJaKpwZe/7uC3awNRfFTJEKMAPlu18S0KfJWtdPf9sn4eIcwo+Vyd13rfmpHNx82rP+PtUUJ2n1nEw==",
|
|
11201
11422
|
"dev": true,
|
|
11202
11423
|
"license": "MIT",
|
|
11203
11424
|
"dependencies": {
|
|
11204
11425
|
"@aws-sdk/client-cloudfront": "^3.764.0",
|
|
11205
|
-
"@aws-sdk/client-s3": "^3.
|
|
11426
|
+
"@aws-sdk/client-s3": "^3.772.0",
|
|
11206
11427
|
"@inquirer/confirm": "^3.1.22",
|
|
11207
11428
|
"@inquirer/input": "^2.2.4",
|
|
11208
11429
|
"@inquirer/select": "^2.5.0",
|
|
11209
11430
|
"@oclif/core": "^4.2.8",
|
|
11210
|
-
"@oclif/plugin-help": "^6.2.
|
|
11431
|
+
"@oclif/plugin-help": "^6.2.27",
|
|
11211
11432
|
"@oclif/plugin-not-found": "^3.2.46",
|
|
11212
11433
|
"@oclif/plugin-warn-if-update-available": "^3.1.31",
|
|
11213
11434
|
"async-retry": "^1.3.3",
|
|
@@ -11223,7 +11444,7 @@
|
|
|
11223
11444
|
"normalize-package-data": "^6",
|
|
11224
11445
|
"semver": "^7.7.1",
|
|
11225
11446
|
"sort-package-json": "^2.15.1",
|
|
11226
|
-
"tiny-jsonc": "^1.0.
|
|
11447
|
+
"tiny-jsonc": "^1.0.2",
|
|
11227
11448
|
"validate-npm-package-name": "^5.0.1"
|
|
11228
11449
|
},
|
|
11229
11450
|
"bin": {
|
package/oclif.manifest.json
CHANGED
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-3.
|
|
4
|
+
"version": "1.0.0-dev-3.14022905562-1",
|
|
5
5
|
"exports": "./lib/driver/MergeDriver.js",
|
|
6
6
|
"type": "module",
|
|
7
7
|
"author": "Sébastien Colladon (colladonsebastien@gmail.com)",
|
|
@@ -11,8 +11,8 @@
|
|
|
11
11
|
},
|
|
12
12
|
"dependencies": {
|
|
13
13
|
"@oclif/core": "^4.2.10",
|
|
14
|
-
"@salesforce/core": "^8.8.
|
|
15
|
-
"@salesforce/sf-plugins-core": "^12.2.
|
|
14
|
+
"@salesforce/core": "^8.8.6",
|
|
15
|
+
"@salesforce/sf-plugins-core": "^12.2.1",
|
|
16
16
|
"fast-xml-parser": "^5.0.9",
|
|
17
17
|
"lodash-es": "^4.17.21",
|
|
18
18
|
"simple-git": "^3.27.0"
|
|
@@ -31,7 +31,7 @@
|
|
|
31
31
|
"knip": "^5.46.0",
|
|
32
32
|
"mocha": "^11.1.0",
|
|
33
33
|
"nyc": "^17.1.0",
|
|
34
|
-
"oclif": "^4.17.
|
|
34
|
+
"oclif": "^4.17.40",
|
|
35
35
|
"shx": "^0.4.0",
|
|
36
36
|
"ts-jest": "^29.2.6",
|
|
37
37
|
"ts-node": "^10.9.2",
|