sfdx-md-merge-driver - npm Package Compare versions

Comparing version 0.1.2 to 0.1.3

CHANGELOG.md

@@ -5,2 +5,15 @@ # Changelog
 
+### [0.1.3](https://github.com/jayree/sfdx-md-merge-driver/compare/v0.1.1...v0.1.3) (2020-01-29)
+
+
+### Features
+
+* convert to typescript and oclif ([b03b4b6](https://github.com/jayree/sfdx-md-merge-driver/commit/b03b4b6d1dede2faee2c1b7f408217f33642d700))
+
+
+### Bug Fixes
+
+* Adding some conf missing ([cc81e8f](https://github.com/jayree/sfdx-md-merge-driver/commit/cc81e8f2dbd6dccd74a7b6b8a8e9ca2e6ed59aa4))
+* Put xml renderOpts for strict exact output than a Salesforce retrieve ([a30a1cc](https://github.com/jayree/sfdx-md-merge-driver/commit/a30a1ccb62a81a50ccb12793cdfd8f95b4c689ee))
+
 ### [0.1.2](https://github.com/jayree/sfdx-md-merge-driver/compare/v0.1.1...v0.1.2) (2020-01-22)
@@ -7,0 +20,0 @@

conf/merge-permissionset-config.json

@@ -18,2 +18,6 @@ {
   },
+  "customSettingAccesses": {
+    "uniqueKeys": ["name"],
+    "equalKeys": ["name", "enabled"]
+  },
   "description": {
@@ -20,0 +24,0 @@ "uniqueKeys": [],

conf/merge-profile-config.json

@@ -26,2 +26,6 @@ {
   },
+  "customSettingAccesses": {
+    "uniqueKeys": ["name"],
+    "equalKeys": ["name", "enabled"]
+  },
   "description": {
@@ -39,2 +43,6 @@ "uniqueKeys": [],
   },
+  "fullName": {
+    "uniqueKeys": [],
+    "equalKeys": []
+  },
   "layoutAssignments": {
@@ -98,2 +106,6 @@ "exclusiveUniqueKeys": ["recordType", "layout"],
   },
+  "profileActionOverrides" : {
+    "uniqueKeys" : [ "actionName", "type", "pageOrSobjectType", "formFactor" ],
+    "equalKeys"  : [ "actionName", "type", "pageOrSobjectType", "formFactor", "content" ]
+  },
   "recordTypeVisibilities": {
@@ -100,0 +112,0 @@ "uniqueKeys": ["recordType"],

lib/commands/merge.js

@@ -10,2 +10,3 @@ "use strict";
     xmldec: { version: '1.0', encoding: 'UTF-8' },
+    renderOpts: { pretty: true, indent: '    ', newline: '\n' },
     xmlns: true,
@@ -12,0 +13,0 @@ });

oclif.manifest.json

@@ -1,1 +0,1 @@
-{"version":"0.1.2","commands":{"install":{"id":"install","description":"Set up the merge driver in the current git repository.","pluginName":"sfdx-md-merge-driver","pluginType":"core","aliases":[],"flags":{"help":{"name":"help","type":"boolean","char":"h","description":"show CLI help","allowNo":false},"global":{"name":"global","type":"boolean","char":"g","description":"install to your user-level git configuration","allowNo":false},"driver":{"name":"driver","type":"option","char":"d","description":"string to install as the driver in the git configuration","default":"npx sfdx-md-merge-driver merge %O %A %B %P"},"name":{"name":"name","type":"option","char":"n","description":"String to use as the merge driver name in your configuration.","default":"sfdx-md-merge-driver"},"files":{"name":"files","type":"option","char":"t","description":"Filenames that will trigger this driver.","options":["*.profile","*.profile-meta.xml","*.permissionset","*.permissionset-meta.xml","*.labels","*.labels-meta.xml"],"default":["*.profile","*.profile-meta.xml","*.permissionset","*.permissionset-meta.xml","*.labels","*.labels-meta.xml"]}},"args":[]},"merge":{"id":"merge","description":"Check for conflicts and merge them if possible.","pluginName":"sfdx-md-merge-driver","pluginType":"core","aliases":[],"flags":{"help":{"name":"help","type":"boolean","char":"h","description":"show CLI help","allowNo":false}},"args":[{"name":"%O","description":"ancestor’s version","required":true},{"name":"%A","description":"current version","required":true},{"name":"%B","description":"other branches' version","required":true},{"name":"%P","description":"pathname in which the merged result will be stored"}]},"uninstall":{"id":"uninstall","description":"Remove a previously configured driver","pluginName":"sfdx-md-merge-driver","pluginType":"core","aliases":[],"flags":{"help":{"name":"help","type":"boolean","char":"h","description":"show CLI help","allowNo":false},"global":{"name":"global","type":"boolean","char":"g","description":"install to your user-level git configuration","allowNo":false},"name":{"name":"name","type":"option","char":"n","description":"String to use as the merge driver name in your configuration.","default":"sfdx-md-merge-driver"}},"args":[]}}}
+{"version":"0.1.3","commands":{"install":{"id":"install","description":"Set up the merge driver in the current git repository.","pluginName":"sfdx-md-merge-driver","pluginType":"core","aliases":[],"flags":{"help":{"name":"help","type":"boolean","char":"h","description":"show CLI help","allowNo":false},"global":{"name":"global","type":"boolean","char":"g","description":"install to your user-level git configuration","allowNo":false},"driver":{"name":"driver","type":"option","char":"d","description":"string to install as the driver in the git configuration","default":"npx sfdx-md-merge-driver merge %O %A %B %P"},"name":{"name":"name","type":"option","char":"n","description":"String to use as the merge driver name in your configuration.","default":"sfdx-md-merge-driver"},"files":{"name":"files","type":"option","char":"t","description":"Filenames that will trigger this driver.","options":["*.profile","*.profile-meta.xml","*.permissionset","*.permissionset-meta.xml","*.labels","*.labels-meta.xml"],"default":["*.profile","*.profile-meta.xml","*.permissionset","*.permissionset-meta.xml","*.labels","*.labels-meta.xml"]}},"args":[]},"merge":{"id":"merge","description":"Check for conflicts and merge them if possible.","pluginName":"sfdx-md-merge-driver","pluginType":"core","aliases":[],"flags":{"help":{"name":"help","type":"boolean","char":"h","description":"show CLI help","allowNo":false}},"args":[{"name":"%O","description":"ancestor’s version","required":true},{"name":"%A","description":"current version","required":true},{"name":"%B","description":"other branches' version","required":true},{"name":"%P","description":"pathname in which the merged result will be stored"}]},"uninstall":{"id":"uninstall","description":"Remove a previously configured driver","pluginName":"sfdx-md-merge-driver","pluginType":"core","aliases":[],"flags":{"help":{"name":"help","type":"boolean","char":"h","description":"show CLI help","allowNo":false},"global":{"name":"global","type":"boolean","char":"g","description":"install to your user-level git configuration","allowNo":false},"name":{"name":"name","type":"option","char":"n","description":"String to use as the merge driver name in your configuration.","default":"sfdx-md-merge-driver"}},"args":[]}}}

package.json

 {
   "name": "sfdx-md-merge-driver",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "git merge driver specific for Salesforce.com Metadata",
@@ -5,0 +5,0 @@ "author": "jayree @jayree",

README.md

@@ -65,3 +65,3 @@ # sfdx-md-merge-driver
 $ sfdx-md-merge-driver (-v|--version|version)
-sfdx-md-merge-driver/0.1.2 darwin-x64 node-v12.13.0
+sfdx-md-merge-driver/0.1.3 darwin-x64 node-v12.13.0
 $ sfdx-md-merge-driver --help [COMMAND]
@@ -139,3 +139,3 @@ USAGE
 
-_See code: [src/commands/install.ts](https://github.com/jayree/sfdx-md-merge-driver/blob/v0.1.2/src/commands/install.ts)_
+_See code: [src/commands/install.ts](https://github.com/jayree/sfdx-md-merge-driver/blob/v0.1.3/src/commands/install.ts)_
 
@@ -160,3 +160,3 @@ ## `sfdx-md-merge-driver merge %O %A %B [%P]`
 
-_See code: [src/commands/merge.ts](https://github.com/jayree/sfdx-md-merge-driver/blob/v0.1.2/src/commands/merge.ts)_
+_See code: [src/commands/merge.ts](https://github.com/jayree/sfdx-md-merge-driver/blob/v0.1.3/src/commands/merge.ts)_
 
@@ -177,3 +177,3 @@ ## `sfdx-md-merge-driver uninstall`
 
-_See code: [src/commands/uninstall.ts](https://github.com/jayree/sfdx-md-merge-driver/blob/v0.1.2/src/commands/uninstall.ts)_
+_See code: [src/commands/uninstall.ts](https://github.com/jayree/sfdx-md-merge-driver/blob/v0.1.3/src/commands/uninstall.ts)_
 <!-- commandsstop -->
@@ -180,0 +180,0 @@

Fixed alerts

Major refactor

Supply chain risk

Package has recently undergone a major refactor. It may be unstable or indicate significant internal changes. Use caution when updating to versions that include significant changes.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

62085

increased by1.97%

Lines of code

842

increased by2.06%

Number of medium supply chain risk alerts

0

decreased by-100%

No dependency changes