fix: devScripts update (#1006) + core v6

* chore: updates from devScripts

* chore: remove some devDeps

* chore: refresh schema

* test: decouple PDR dependency stuff

---------

Co-authored-by: mshanemc <[email protected]>

Author: svc-cli-bot

package.json

@@ -6,13 +6,13 @@
   "main": "lib/index.js",
   "bugs": "https://github.com/forcedotcom/cli/issues",
   "dependencies": {
-    "@oclif/core": "^2.15.0",
-    "@salesforce/apex-node": "^2.1.0",
-    "@salesforce/core": "^5.3.20",
+    "@oclif/core": "^3.11.0",
+    "@salesforce/apex-node": "^2.1.2",
+    "@salesforce/core": "^6.1.3",
     "@salesforce/kit": "^3.0.15",
-    "@salesforce/sf-plugins-core": "^3.1.25",
-    "@salesforce/source-deploy-retrieve": "^9.8.5",
-    "@salesforce/source-tracking": "^4.4.0",
+    "@salesforce/sf-plugins-core": "^5.0.1",
+    "@salesforce/source-deploy-retrieve": "^10.0.0",
+    "@salesforce/source-tracking": "^5.0.0",
     "chalk": "^4.1.2",
     "got": "^11.8.6",
     "proxy-agent": "^6.3.1",
@@ -22,9 +22,9 @@
     "@oclif/plugin-command-snapshot": "^4.0.16",
     "@oclif/plugin-help": "^5.2.20",
     "@salesforce/cli-plugins-testkit": "^5.0.2",
-    "@salesforce/dev-scripts": "^6.0.3",
+    "@salesforce/dev-scripts": "^7.1.0",
     "@salesforce/plugin-command-reference": "^3.0.45",
-    "@salesforce/plugin-deploy-retrieve": "^1.19.3",
+    "@salesforce/plugin-deploy-retrieve": "^2.1.1",
     "@salesforce/plugin-info": "^2.6.51",
     "@salesforce/source-testkit": "^2.1.62",
     "@salesforce/ts-sinon": "1.4.19",
@@ -33,7 +33,7 @@
     "archiver": "^5.3.2",
     "chai-each": "^0.0.1",
     "cross-env": "^7.0.3",
-    "eslint-plugin-sf-plugin": "^1.16.13",
+    "eslint-plugin-sf-plugin": "^1.16.15",
     "oclif": "^3.16.0",
     "shx": "0.3.4",
     "ts-node": "^10.9.1",

schemas/force-source-retrieve.json

@@ -200,17 +200,7 @@
           "type": "string"
         },
         "manageableState": {
-          "type": "string",
-          "enum": [
-            "beta",
-            "deleted",
-            "deprecated",
-            "deprecatedEditable",
-            "installed",
-            "installedEditable",
-            "released",
-            "unmanaged"
-          ]
+          "$ref": "#/definitions/ManageableState"
         },
         "namespacePrefix": {
           "type": "string"
@@ -233,6 +223,19 @@
       ],
       "additionalProperties": false
     },
+    "ManageableState": {
+      "type": "string",
+      "enum": [
+        "beta",
+        "deleted",
+        "deprecated",
+        "deprecatedEditable",
+        "installed",
+        "installedEditable",
+        "released",
+        "unmanaged"
+      ]
+    },
     "RequestStatus": {
       "type": "string",
       "enum": ["Pending", "InProgress", "Succeeded", "SucceededPartial", "Failed", "Canceling", "Canceled"]

test/commands/source/deploy.test.ts

@@ -14,7 +14,6 @@ import { ConfigAggregator, Lifecycle, Messages, SfProject } from '@salesforce/co
 import { Config } from '@oclif/core';
 import { SfCommand } from '@salesforce/sf-plugins-core';
 import { MockTestOrgData, TestContext } from '@salesforce/core/lib/testSetup';
-import ConfigMeta, { ConfigVars } from '@salesforce/plugin-deploy-retrieve/lib/configMeta';
 import { Deploy } from '../../../src/commands/force/source/deploy';
 import { DeployCommandResult, DeployResultFormatter } from '../../../src/formatters/deployResultFormatter';
 import {
@@ -86,7 +85,26 @@ describe('force:source:deploy', () => {
   const runDeployCmd = async (params: string[], options?: { sourceApiVersion?: string }) => {
     const cmd = new TestDeploy(params, oclifConfigStub);
     cmd.project = SfProject.getInstance();
-    cmd.configAggregator = await (await ConfigAggregator.create({ customConfigMeta: ConfigMeta })).reload();
+    cmd.configAggregator =
+      await // this is simplified from https://github.com/salesforcecli/plugin-deploy-retrieve/blob/d481ac1d79e29e20302924e688be7ec75df22957/src/configMeta.ts#L24-L25
+      // as a workaround for
+      // 1. PDR being ESM before plugin-source
+      // 2. lib/configMeta.js not being in the top-level exports
+      (
+        await ConfigAggregator.create({
+          customConfigMeta: [
+            {
+              key: 'org-metadata-rest-deploy',
+              description: 'foo',
+              hidden: true,
+              input: {
+                validator: (value: string): boolean => typeof value === 'string' && ['true', 'false'].includes(value),
+                failedMessage: 'boo!',
+              },
+            },
+          ],
+        })
+      ).reload();
     sandbox.stub(cmd.project, 'getDefaultPackage').returns({ name: '', path: '', fullPath: defaultDir });
     sandbox.stub(cmd.project, 'getUniquePackageDirectories').returns([{ fullPath: defaultDir, path: '', name: '' }]);
     sandbox.stub(cmd.project, 'getPackageDirectories').returns([{ fullPath: defaultDir, path: '', name: '' }]);
@@ -416,7 +434,7 @@ describe('force:source:deploy', () => {
       });
 
       it('should REST deploy with config', async () => {
-        await $$.stubConfig({ [ConfigVars.ORG_METADATA_REST_DEPLOY]: 'true', 'target-org': testOrg.username });
+        await $$.stubConfig({ 'org-metadata-rest-deploy': 'true', 'target-org': testOrg.username });
 
         const manifest = 'package.xml';
         const result = await runDeployCmd(['--manifest', manifest, '--json']);