fix: bump core and sf-plugins-core versions

Author: shetzel

.gitignore

@@ -30,6 +30,11 @@ docs
 *.sig
 package.json.bak.
 
+
+npm-shrinkwrap.json
+oclif.manifest.json
+oclif.lock
+
 # -- CLEAN ALL
 *.tsbuildinfo
 .eslintcache
@@ -42,7 +47,3 @@ node_modules
 # os specific files
 .DS_Store
 .idea
-
-oclif.manifest.json
-
-oclif.lock

package.json

@@ -6,9 +6,9 @@
   "bugs": "https://github.com/forcedotcom/cli/issues",
   "dependencies": {
     "@oclif/core": "^3.18.1",
-    "@salesforce/core": "^6.5.1",
+    "@salesforce/core": "^6.6.0",
     "@salesforce/kit": "^3.0.15",
-    "@salesforce/sf-plugins-core": "^7.1.4",
+    "@salesforce/sf-plugins-core": "^7.1.14",
     "@salesforce/source-deploy-retrieve": "^10.3.8",
     "chalk": "^5.3.0",
     "change-case": "^5.4.2",
@@ -26,7 +26,6 @@
     "moment": "^2.30.1",
     "oclif": "^4.4.2",
     "shelljs": "^0.8.5",
-    "shx": "0.3.4",
     "ts-node": "^10.9.2",
     "typescript": "^5.3.3"
   },
@@ -36,8 +35,9 @@
   "files": [
     "/lib",
     "/messages",
-    "/oclif.manifest.json",
-    "/oclif.lock"
+    "/npm-shrinkwrap.json",
+    "/oclif.lock",
+    "/oclif.manifest.json"
   ],
   "homepage": "https://github.com/salesforcecli/plugin-org",
   "keywords": [
@@ -100,13 +100,12 @@
     "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 oclif.lock",
     "compile": "wireit",
     "docs": "sf-docs",
     "format": "wireit",
     "link-check": "wireit",
     "lint": "wireit",
-    "postpack": "shx rm -f oclif.manifest.json oclif.lock",
+    "postpack": "sf-clean --ignore-signing-artifacts",
     "prepack": "sf-prepack",
     "prepare": "sf-install",
     "test": "wireit",

src/commands/org/create/scratch.ts

@@ -22,7 +22,7 @@ import { ScratchCreateResponse } from '../../../shared/orgTypes.js';
 Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
 const messages = Messages.loadMessages('@salesforce/plugin-org', 'create_scratch');
 
-export const secretTimeout = 60000;
+export const secretTimeout = 60_000;
 
 const definitionFileHelpGroupName = 'Definition File Override';
 export default class EnvCreateScratch extends SfCommand<ScratchCreateResponse> {

src/commands/org/refresh/sandbox.ts

@@ -6,7 +6,6 @@
  */
 
 import { Duration, omit } from '@salesforce/kit';
-import { isString } from '@salesforce/ts-types';
 import { Flags } from '@salesforce/sf-plugins-core';
 import { Lifecycle, Messages, SandboxInfo, SandboxEvents, SandboxProcessObject, SfError } from '@salesforce/core';
 import { Ux } from '@salesforce/sf-plugins-core';
@@ -204,7 +203,8 @@ export default class RefreshSandbox extends SandboxCommandBase<SandboxProcessObj
       const sandboxInfoRecord = await prodOrgConnection.singleRecordQuery<SandboxInfoRecord>(soql, { tooling: true });
       sandboxInfo = omit(sandboxInfoRecord, 'attributes');
     } catch (error: unknown) {
-      const err = error instanceof Error ? error : isString(error) ? SfError.wrap(error) : new SfError('unknown');
+      const err =
+        error instanceof Error ? error : typeof error === 'string' ? SfError.wrap(error) : new SfError('unknown');
       if (err.name === 'SingleRecordQuery_NoRecords') {
         throw messages.createError('error.SandboxNotFound', [sbxName, prodOrg.getUsername()]);
       }

src/shared/timeUtils.ts

@@ -25,8 +25,8 @@ export const getClockForSeconds = (timeInSec: number): string => {
 };
 export const getTimeComponentsFromSeconds = (timeInSec: number): TimeComponents => {
   const days = Duration.days(Math.floor(timeInSec / 86_400));
-  const hours = Duration.hours(Math.floor((timeInSec % 86_400) / 3_600));
-  const minutes = Duration.minutes(Math.floor((timeInSec % 3_600) / 60));
+  const hours = Duration.hours(Math.floor((timeInSec % 86_400) / 3600));
+  const minutes = Duration.minutes(Math.floor((timeInSec % 3600) / 60));
   const seconds = Duration.seconds(Math.floor(timeInSec % 60));
 
   return { days, hours, minutes, seconds };

test/nut/open.nut.ts

@@ -56,7 +56,7 @@ describe('test org:open command', () => {
     // we need stuff in the org
     const cs = await ComponentSetBuilder.build({ sourcepath: [path.join(session.project.dir, 'force-app')] });
     const deploy = await cs.deploy({ usernameOrConnection: defaultUsername });
-    const deployResult = await deploy.pollStatus(1000, 60000);
+    const deployResult = await deploy.pollStatus(1000, 60_000);
     expect(deployResult.getFileResponses().length).to.not.equal(0);
     const result = execCmd<OrgOpenOutput>(`force:source:open --sourcefile ${flexiPagePath} --urlonly --json`, {
       ensureExitCode: 0,

test/nut/sandbox.sandboxNut.ts

@@ -5,14 +5,13 @@
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 
-
 import { execCmd, TestSession } from '@salesforce/cli-plugins-testkit';
 import { Lifecycle, Messages, SandboxEvents, SandboxProcessObject, StatusEvent } from '@salesforce/core';
 import { expect, assert, config } from 'chai';
 
 config.truncateThreshold = 0;
 
-Messages.importMessagesDirectoryFromMetaUrl(import.meta.url)
+Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
 
 describe('Sandbox Orgs', () => {
   let session: TestSession;
@@ -36,15 +35,15 @@ describe('Sandbox Orgs', () => {
       );
       let rawResult = execCmd(
         `env:create:sandbox -a mySandbox -s -l Developer -o ${hubOrgUsername} --no-prompt --json --async`,
-        { timeout: 3600000 }
+        { timeout: 3_600_000 }
       );
       result = rawResult.jsonOutput?.result as SandboxProcessObject;
       // autogenerated sandbox names start with 'sbx'
       expect(result).to.be.ok;
       expect(result.SandboxName.startsWith('sbx'), 'env:create:sandbox').to.be.true;
       rawResult = execCmd<SandboxProcessObject>(
         `env:resume:sandbox --name ${result.SandboxName} -o ${hubOrgUsername} -w 60 --json`,
-        { timeout: 3600000 }
+        { timeout: 3_600_000 }
       );
       result = rawResult.jsonOutput?.result as SandboxProcessObject;
       expect(result).to.be.ok;