fix: remove duplicate short char from salesforceId flag and bump deps (#707)

* fix(deps): dev-scripts and sdr

* fix: remove duplicate short char from salesforceId flag

Author: mshanemc

command-snapshot.json

@@ -13,7 +13,9 @@
       "type",
       "wait"
     ],
-    "alias": []
+    "alias": [],
+    "flagChars": ["a", "f", "o", "s", "t", "w"],
+    "flagAliases": ["apiversion", "targetusername", "u"]
   },
   {
     "command": "force:org:create",
@@ -35,19 +37,25 @@
       "type",
       "wait"
     ],
-    "alias": []
+    "alias": [],
+    "flagChars": ["a", "c", "d", "f", "i", "n", "o", "s", "t", "v", "w"],
+    "flagAliases": ["apiversion", "targetdevhubusername", "targetusername", "u"]
   },
   {
     "command": "force:org:delete",
     "plugin": "@salesforce/plugin-org",
     "flags": ["api-version", "json", "loglevel", "no-prompt", "target-org", "targetdevhubusername"],
-    "alias": []
+    "alias": [],
+    "flagChars": ["o", "p", "v"],
+    "flagAliases": ["apiversion", "noprompt", "targetusername", "u"]
   },
   {
     "command": "force:org:status",
     "plugin": "@salesforce/plugin-org",
     "flags": ["api-version", "json", "loglevel", "sandboxname", "setalias", "setdefaultusername", "target-org", "wait"],
-    "alias": []
+    "alias": [],
+    "flagChars": ["a", "n", "o", "s", "w"],
+    "flagAliases": ["apiversion", "targetusername", "u"]
   },
   {
     "command": "org:create:sandbox",
@@ -67,7 +75,9 @@
       "target-org",
       "wait"
     ],
-    "alias": ["env:create:sandbox"]
+    "alias": ["env:create:sandbox"],
+    "flagChars": ["a", "c", "f", "i", "l", "n", "o", "s", "w"],
+    "flagAliases": []
   },
   {
     "command": "org:create:scratch",
@@ -94,60 +104,80 @@
       "username",
       "wait"
     ],
-    "alias": ["env:create:scratch"]
+    "alias": ["env:create:scratch"],
+    "flagChars": ["a", "c", "d", "e", "f", "i", "m", "t", "v", "w", "y"],
+    "flagAliases": []
   },
   {
     "command": "org:delete:sandbox",
     "plugin": "@salesforce/plugin-org",
     "flags": ["json", "no-prompt", "target-org"],
-    "alias": ["env:delete:sandbox"]
+    "alias": ["env:delete:sandbox"],
+    "flagChars": ["o", "p"],
+    "flagAliases": ["targetusername", "u"]
   },
   {
     "command": "org:delete:scratch",
     "plugin": "@salesforce/plugin-org",
     "flags": ["json", "no-prompt", "target-org"],
-    "alias": ["env:delete:scratch"]
+    "alias": ["env:delete:scratch"],
+    "flagChars": ["o", "p"],
+    "flagAliases": ["targetusername", "u"]
   },
   {
     "command": "org:display",
     "plugin": "@salesforce/plugin-org",
     "flags": ["api-version", "json", "loglevel", "target-org", "verbose"],
-    "alias": ["force:org:display"]
+    "alias": ["force:org:display"],
+    "flagChars": ["o"],
+    "flagAliases": ["apiversion", "targetusername", "u"]
   },
   {
     "command": "org:list",
     "plugin": "@salesforce/plugin-org",
     "flags": ["all", "clean", "json", "loglevel", "no-prompt", "skip-connection-status", "verbose"],
-    "alias": ["force:org:list"]
+    "alias": ["force:org:list"],
+    "flagChars": ["p"],
+    "flagAliases": ["noprompt", "skipconnectionstatus"]
   },
   {
     "command": "org:list:metadata",
     "plugin": "@salesforce/plugin-org",
     "flags": ["api-version", "folder", "json", "loglevel", "metadata-type", "output-file", "target-org"],
-    "alias": ["force:mdapi:listmetadata"]
+    "alias": ["force:mdapi:listmetadata"],
+    "flagChars": ["f", "m", "o"],
+    "flagAliases": ["a", "apiversion", "metadatatype", "resultfile", "targetusername", "u"]
   },
   {
     "command": "org:list:metadata-types",
     "plugin": "@salesforce/plugin-org",
     "flags": ["api-version", "filter-known", "json", "loglevel", "output-file", "target-org"],
-    "alias": ["force:mdapi:describemetadata"]
+    "alias": ["force:mdapi:describemetadata"],
+    "flagChars": ["f", "k", "o"],
+    "flagAliases": ["a", "apiversion", "filterknown", "resultfile", "targetusername", "u"]
   },
   {
     "command": "org:open",
     "plugin": "@salesforce/plugin-org",
     "flags": ["api-version", "browser", "json", "loglevel", "path", "source-file", "target-org", "url-only"],
-    "alias": ["force:org:open", "force:source:open"]
+    "alias": ["force:org:open", "force:source:open"],
+    "flagChars": ["b", "f", "o", "p", "r"],
+    "flagAliases": ["apiversion", "sourcefile", "targetusername", "u", "urlonly"]
   },
   {
     "command": "org:resume:sandbox",
     "plugin": "@salesforce/plugin-org",
     "flags": ["job-id", "json", "name", "target-org", "use-most-recent", "wait"],
-    "alias": ["env:resume:sandbox"]
+    "alias": ["env:resume:sandbox"],
+    "flagChars": ["i", "l", "n", "o", "w"],
+    "flagAliases": []
   },
   {
     "command": "org:resume:scratch",
     "plugin": "@salesforce/plugin-org",
     "flags": ["job-id", "json", "use-most-recent"],
-    "alias": ["env:resume:scratch"]
+    "alias": ["env:resume:scratch"],
+    "flagChars": ["i", "r"],
+    "flagAliases": []
   }
 ]

package.json

@@ -10,16 +10,16 @@
     "@salesforce/core": "^4.0.1",
     "@salesforce/kit": "^3.0.2",
     "@salesforce/sf-plugins-core": "^3.0.2",
-    "@salesforce/source-deploy-retrieve": "^8.6.0",
+    "@salesforce/source-deploy-retrieve": "^9.1.0",
     "open": "^8.4.2",
     "tslib": "^2"
   },
   "devDependencies": {
-    "@oclif/plugin-command-snapshot": "^3.3.15",
-    "@salesforce/cli-plugins-testkit": "^3.3.6",
+    "@oclif/plugin-command-snapshot": "^4.0.2",
+    "@salesforce/cli-plugins-testkit": "^4.0.1",
     "@salesforce/dev-config": "^4.0.1",
-    "@salesforce/dev-scripts": "^5.3.0",
-    "@salesforce/plugin-command-reference": "^2.4.4",
+    "@salesforce/dev-scripts": "^5.4.2",
+    "@salesforce/plugin-command-reference": "^3.0.2",
     "@salesforce/plugin-source": "^2.10.10",
     "@salesforce/prettier-config": "^0.0.3",
     "@salesforce/ts-sinon": "1.4.6",
@@ -33,10 +33,10 @@
     "eslint-config-salesforce": "^2.0.1",
     "eslint-config-salesforce-license": "^0.2.0",
     "eslint-config-salesforce-typescript": "^1.1.1",
-    "eslint-plugin-header": "^3.0.0",
+    "eslint-plugin-header": "^3.1.1",
     "eslint-plugin-import": "2.27.5",
     "eslint-plugin-jsdoc": "^43.0.5",
-    "eslint-plugin-sf-plugin": "^1.15.5",
+    "eslint-plugin-sf-plugin": "^1.15.6",
     "husky": "^7.0.4",
     "mocha": "^10.2.0",
     "moment": "^2.29.1",
@@ -234,4 +234,4 @@
       "output": []
     }
   }
-}
+}

src/commands/org/create/scratch.ts

@@ -142,6 +142,8 @@ export default class EnvCreateScratch extends SfCommand<ScratchCreateResponse> {
       startsWith: '00D',
       length: 15,
       helpGroup: definitionFileHelpGroupName,
+      // salesforceId flag has `i` and that would be a conflict with client-id
+      char: undefined,
     }),
   };