Merge branch 'main' into mdonnalley/refactor-tests

Author: mdonnalley

CHANGELOG.md

@@ -1,3 +1,15 @@
+## [2.4.3](https://github.com/salesforcecli/plugin-org/compare/2.4.2...2.4.3) (2023-02-27)
+
+### Bug Fixes
+
+- bump deps ([219cf1e](https://github.com/salesforcecli/plugin-org/commit/219cf1e20f26a54ccb87f9d601a72eaf13e936b7))
+
+## [2.4.2](https://github.com/salesforcecli/plugin-org/compare/2.4.1...2.4.2) (2023-02-22)
+
+### Bug Fixes
+
+- remove beta tag from org commands ([13ba4ea](https://github.com/salesforcecli/plugin-org/commit/13ba4ea871fed556e5b4742f50cdd3d6cf2e374f))
+
 ## [2.4.1](https://github.com/salesforcecli/plugin-org/compare/2.4.0...2.4.1) (2023-02-17)
 
 ### Bug Fixes

package.json

@@ -1,54 +1,54 @@
 {
   "name": "@salesforce/plugin-org",
   "description": "Commands to interact with Salesforce orgs",
-  "version": "2.4.1",
+  "version": "2.4.3",
   "author": "Salesforce",
   "main": "lib/index.js",
   "bugs": "https://github.com/forcedotcom/cli/issues",
   "dependencies": {
-    "@oclif/core": "^2.3.0",
-    "@salesforce/core": "^3.33.4",
+    "@oclif/core": "^2.3.1",
+    "@salesforce/core": "^3.33.5",
     "@salesforce/kit": "^1.9.0",
     "@salesforce/sf-plugins-core": "^2.2.3",
     "open": "8.4.1",
     "tslib": "^2"
   },
   "devDependencies": {
     "@oclif/plugin-command-snapshot": "^3.3.4",
-    "@salesforce/cli-plugins-testkit": "^3.2.21",
+    "@salesforce/cli-plugins-testkit": "^3.2.23",
     "@salesforce/dev-config": "^3.1.0",
-    "@salesforce/dev-scripts": "^4.0.0-beta.9",
+    "@salesforce/dev-scripts": "^4.1.1",
     "@salesforce/plugin-command-reference": "^2.2.9",
     "@salesforce/prettier-config": "^0.0.2",
     "@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",
-    "@typescript-eslint/parser": "^5.46.0",
+    "@typescript-eslint/eslint-plugin": "^5.54.0",
+    "@typescript-eslint/parser": "^5.53.0",
     "chai": "^4.3.7",
     "chai-as-promised": "^7.1.1",
     "eslint": "^8.33.0",
     "eslint-config-prettier": "^8.6.0",
     "eslint-config-salesforce": "^1.1.1",
-    "eslint-config-salesforce-license": "^0.1.6",
+    "eslint-config-salesforce-license": "^0.2.0",
     "eslint-config-salesforce-typescript": "^1.1.1",
     "eslint-plugin-header": "^3.0.0",
     "eslint-plugin-import": "2.27.5",
-    "eslint-plugin-jsdoc": "^39.6.7",
+    "eslint-plugin-jsdoc": "^40.0.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.5",
+    "oclif": "^3.7.0",
     "prettier": "^2.8.4",
     "pretty-quick": "^3.1.0",
     "shelljs": "^0.8.5",
     "shx": "0.3.4",
     "sinon": "10.0.0",
     "ts-node": "^10.9.1",
-    "typescript": "^4.9.4",
+    "typescript": "^4.9.5",
     "wireit": "^0.9.5"
   },
   "engines": {
@@ -115,10 +115,6 @@
     "prepack": "sf-prepack",
     "prepare": "sf-install",
     "test": "wireit",
-    "test:command-reference": "wireit",
-    "test:compile": "wireit",
-    "test:deprecation-policy": "wireit",
-    "test:json-schema": "wireit",
     "test:nuts": "nyc mocha \"./test/nut/*.nut.ts\" --slow 4500 --timeout 1200000 --parallel --jobs 10",
     "test:nuts:legacy": "nyc mocha \"./test/nut/legacy/*.nut.ts\" --slow 4500 --timeout 1200000 --parallel --jobs 10",
     "test:nuts:sandbox": "nyc mocha \"./test/**/*.sandboxNut.ts\" --slow 450000 --timeout 7200000 --parallel --jobs 10",
@@ -150,16 +146,23 @@
       "clean": "if-file-deleted"
     },
     "format": {
-      "command": "prettier --write \"+(src|test|schemas)/**/*.+(ts|js|json)|command-snapshot.json\""
+      "command": "prettier --write \"+(src|test|schemas)/**/*.+(ts|js|json)|command-snapshot.json\"",
+      "files": [
+        "src/**/*.ts",
+        "test/**/*.ts",
+        "schemas/**/*.json",
+        "command-snapshot.json",
+        ".prettier*"
+      ],
+      "output": []
     },
     "lint": {
       "command": "eslint src test --color --cache --cache-location .eslintcache",
       "files": [
         "src/**/*.ts",
         "test/**/*.ts",
         "messages/**",
-        ".eslintignore",
-        ".eslintrc.js"
+        ".eslint*"
       ],
       "output": []
     },
@@ -177,7 +180,8 @@
       "command": "\"./bin/dev\" commandreference:generate --erroronwarnings",
       "files": [
         "src/**/*.ts",
-        "messages/**"
+        "messages/**",
+        "package.json"
       ],
       "output": [
         "tmp/root"
@@ -216,7 +220,10 @@
         "test/**/*.ts",
         "src/**/*.ts",
         "tsconfig.json",
-        "test/tsconfig.json"
+        ".mocha*",
+        "test/tsconfig.json",
+        "!*.nut.ts",
+        ".nycrc"
       ],
       "output": []
     }

src/commands/force/org/create.ts

@@ -282,7 +282,7 @@ export class Create extends SfCommand<CreateResult> {
     if (!scratchOrgInfo) {
       throw new SfError('No scratch org info returned from scratchOrgCreate');
     }
-    if (!authFields || !authFields.orgId) {
+    if (!authFields?.orgId) {
       throw new SfError('Information missing from authFields');
     }
 

src/commands/org/create/sandbox.ts

@@ -116,7 +116,6 @@ export default class CreateSandbox extends SandboxCommandBase<SandboxProcessObje
       allowNo: false,
     }),
   };
-  public static readonly state = 'beta';
   private flags!: Interfaces.InferredFlags<typeof CreateSandbox.flags>;
 
   public async run(): Promise<SandboxProcessObject> {

src/commands/org/create/scratch.ts

@@ -31,7 +31,6 @@ export default class EnvCreateScratch extends SfCommand<ScratchCreateResponse> {
   public static readonly examples = messages.getMessages('examples');
   public static readonly aliases = ['env:create:scratch'];
   public static readonly deprecateAliases = true;
-  public static readonly state = 'beta';
 
   public static readonly flags = {
     alias: Flags.string({

src/commands/org/delete/sandbox.ts

@@ -31,7 +31,6 @@ export default class EnvDeleteSandbox extends SfCommand<SandboxDeleteResponse> {
       summary: messages.getMessage('flags.no-prompt.summary'),
     }),
   };
-  public static readonly state = 'beta';
 
   public async run(): Promise<SandboxDeleteResponse> {
     const flags = (await this.parse(EnvDeleteSandbox)).flags;

src/commands/org/delete/scratch.ts

@@ -33,7 +33,6 @@ export default class EnvDeleteScratch extends SfCommand<ScratchDeleteResponse> {
       summary: messages.getMessage('flags.no-prompt.summary'),
     }),
   };
-  public static readonly state = 'beta';
 
   public async run(): Promise<ScratchDeleteResponse> {
     const flags = (await this.parse(EnvDeleteScratch)).flags;

src/commands/org/resume/sandbox.ts

@@ -70,7 +70,6 @@ export default class ResumeSandbox extends SandboxCommandBase<SandboxProcessObje
       description: messages.getMessage('flags.targetOrg.description'),
     }),
   };
-  public static readonly state = 'beta';
   private flags!: Interfaces.InferredFlags<typeof ResumeSandbox.flags>;
 
   public async run(): Promise<SandboxProcessObject> {

test/nut/legacy/delete.org.nut.ts

@@ -20,16 +20,14 @@ describe('Delete Orgs', () => {
   // create our own orgs to delete to avoid interfering with other NUTs/cleanup
   before(async () => {
     session = await TestSession.create({
-      project: { name: 'forceOrgList' },
+      project: { name: 'legacyOrgDelete' },
       devhubAuthStrategy: 'AUTO',
       scratchOrgs: [
         {
-          executable: 'sfdx',
           setDefault: true,
           config: join('config', 'project-scratch-def.json'),
         },
         {
-          executable: 'sfdx',
           alias: 'anAlias',
           config: join('config', 'project-scratch-def.json'),
         },

test/nut/listAndDisplay.nut.ts

@@ -34,7 +34,7 @@ const verifyHumanResults = (
   const aliasUserLine = lines.find((line) => line.includes(aliasedUsername));
   assert(aliasUserLine);
   expect(aliasUserLine).to.include('anAlias');
-  // verbose mode should display sractch org Id and dev hub org Id
+  // verbose mode should display scratch org Id and dev hub org Id
   if (verbose) {
     expect(defaultUserLine.match(/00D/g)).to.have.lengthOf(2, defaultUserLine);
     expect(aliasUserLine.match(/00D/g)).to.have.lengthOf(2, aliasUserLine);
@@ -57,12 +57,10 @@ describe('Org Command NUT', () => {
       devhubAuthStrategy: 'AUTO',
       scratchOrgs: [
         {
-          executable: 'sfdx',
           config: join('config', 'project-scratch-def.json'),
           setDefault: true,
         },
         {
-          executable: 'sfdx',
           config: join('config', 'project-scratch-def.json'),
           alias: 'anAlias',
         },