Merge branch 'main' into mdonnalley/refactor-tests

Author: mdonnalley

CHANGELOG.md

@@ -40,7 +40,7 @@
   {
     "command": "force:org:delete",
     "plugin": "@salesforce/plugin-org",
-    "flags": ["api-version", "json", "loglevel", "no-prompt", "target-org"],
+    "flags": ["api-version", "json", "loglevel", "no-prompt", "target-org", "targetdevhubusername"],
     "alias": []
   },
   {

command-snapshot.json

@@ -22,6 +22,10 @@ To mark the org for deletion without being prompted to confirm, specify --noprom
 
 No prompt to confirm deletion.
 
+# flags.targetdevhubusername
+
+The targetdevhubusername flag exists only for backwards compatibility. It is not necessary and has no effect.
+
 # confirmDelete
 
 Enqueue %s org with name: %s for deletion? Are you sure (y/n)?

messages/delete.md

@@ -1,7 +1,7 @@
 {
   "name": "@salesforce/plugin-org",
   "description": "Commands to interact with Salesforce orgs",
-  "version": "2.3.4",
+  "version": "2.4.1",
   "author": "Salesforce",
   "main": "lib/index.js",
   "bugs": "https://github.com/forcedotcom/cli/issues",
@@ -15,13 +15,13 @@
   },
   "devDependencies": {
     "@oclif/plugin-command-snapshot": "^3.3.4",
-    "@salesforce/cli-plugins-testkit": "^3.2.18",
+    "@salesforce/cli-plugins-testkit": "^3.2.21",
     "@salesforce/dev-config": "^3.1.0",
-    "@salesforce/dev-scripts": "^3.1.1",
+    "@salesforce/dev-scripts": "^4.0.0-beta.9",
     "@salesforce/plugin-command-reference": "^2.2.9",
     "@salesforce/prettier-config": "^0.0.2",
-    "@salesforce/ts-sinon": "1.4.4",
-    "@swc/core": "^1.3.24",
+    "@salesforce/ts-sinon": "1.4.6",
+    "@swc/core": "^1.3.36",
     "@types/chai-as-promised": "^7.1.5",
     "@types/shelljs": "^0.8.10",
     "@typescript-eslint/eslint-plugin": "^5.42.1",
@@ -36,13 +36,13 @@
     "eslint-plugin-header": "^3.0.0",
     "eslint-plugin-import": "2.27.5",
     "eslint-plugin-jsdoc": "^39.6.7",
-    "eslint-plugin-sf-plugin": "^1.7.0",
+    "eslint-plugin-sf-plugin": "^1.8.1",
     "husky": "^7.0.4",
     "mocha": "^9.1.3",
     "moment": "^2.29.1",
     "nyc": "^15.1.0",
-    "oclif": "^3.6.1",
-    "prettier": "^2.8.3",
+    "oclif": "^3.6.5",
+    "prettier": "^2.8.4",
     "pretty-quick": "^3.1.0",
     "shelljs": "^0.8.5",
     "shx": "0.3.4",
@@ -103,19 +103,18 @@
   },
   "repository": "salesforcecli/plugin-org",
   "scripts": {
-    "build": "sf-build",
+    "build": "wireit",
     "clean": "sf-clean",
     "clean-all": "sf-clean all",
     "clean:lib": "shx rm -rf lib && shx rm -rf coverage && shx rm -rf .nyc_output && shx rm -f oclif.manifest.json",
-    "compile": "sf-compile",
+    "compile": "wireit",
     "docs": "sf-docs",
-    "format": "sf-format",
-    "lint": "sf-lint",
+    "format": "wireit",
+    "lint": "wireit",
     "postpack": "shx rm -f oclif.manifest.json",
     "prepack": "sf-prepack",
     "prepare": "sf-install",
-    "pretest": "sf-compile-test",
-    "test": "sf-test",
+    "test": "wireit",
     "test:command-reference": "wireit",
     "test:compile": "wireit",
     "test:deprecation-policy": "wireit",

package.json

@@ -21,6 +21,9 @@
         "clientId": {
           "type": "string"
         },
+        "apiVersion": {
+          "type": "string"
+        },
         "alias": {
           "type": "string"
         },

schemas/org-display.json

@@ -31,6 +31,15 @@ export class Delete extends SfCommand<DeleteResult> {
   };
   public static readonly flags = {
     'target-org': requiredOrgFlagWithDeprecations,
+    targetdevhubusername: Flags.string({
+      summary: messages.getMessage('flags.targetdevhubusername'),
+      char: 'v',
+      hidden: true,
+      deprecated: {
+        version: '58.0',
+        message: messages.getMessage('flags.targetdevhubusername'),
+      },
+    }),
     'api-version': orgApiVersionFlagWithDeprecations,
     'no-prompt': Flags.boolean({
       char: 'p',

src/commands/force/org/delete.ts

@@ -64,6 +64,7 @@ export class OrgDisplayCommand extends SfCommand<OrgDisplayReturn> {
       devHubId: fields.devHubUsername,
 
       // copied properties
+      apiVersion: fields.instanceApiVersion,
       accessToken: fields.accessToken,
       instanceUrl: fields.instanceUrl,
       username: fields.username,

src/commands/org/display.ts

@@ -14,6 +14,7 @@ export type OrgDisplayReturn = Partial<ScratchOrgFields> & {
   accessToken: string;
   instanceUrl: string;
   clientId: string;
+  apiVersion?: string;
 
   alias?: string;
   password?: string;

src/shared/orgTypes.ts

@@ -39,7 +39,7 @@ describe('env:create:scratch async/resume', () => {
 
   before(async () => {
     session = await TestSession.create({
-      project: { name: 'testProject' },
+      project: {},
       devhubAuthStrategy: 'AUTO',
     });
     cacheFilePath = path.join(session.dir, '.sf', ScratchOrgCache.getFileName());

test/nut/async-create-resume.nut.ts

@@ -7,7 +7,7 @@
 import * as path from 'path';
 import { assert, expect } from 'chai';
 import { TestSession, execCmd, genUniqueString } from '@salesforce/cli-plugins-testkit';
-import { ScratchOrgCreateResult, Messages } from '@salesforce/core';
+import { ScratchOrgCreateResult } from '@salesforce/core';
 
 let session: TestSession;
 
@@ -43,16 +43,8 @@ describe('org:create command', () => {
         {
           ensureExitCode: 1,
         }
-      ).jsonOutput as unknown as { message: string };
-
-      Messages.importMessagesDirectory(
-        // 'messages' is appended to the path
-        path.join(__dirname, '..', '..', '..', 'node_modules', '@salesforce', 'core'),
-        false,
-        '@salesforce/core'
-      );
-      const messages = Messages.loadMessages('@salesforce/core', 'scratchOrgErrorCodes');
-      expect(errorOutput.message).to.be.a('string').and.to.include(messages.getMessage('C-1007'));
+      ).jsonOutput as unknown as { name: string };
+      expect(errorOutput.name).to.be.a('string').and.include('C-1007');
     });
   });