fix(deps): devScripts update (#1155)

* chore: updates from devScripts

* chore: dep bumps

* test: adjust for core changes

---------

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

Author: svc-cli-bot

package.json

@@ -6,22 +6,22 @@
   "bugs": "https://github.com/forcedotcom/cli/issues",
   "dependencies": {
     "@oclif/core": "^4.0.16",
-    "@salesforce/core": "^8.1.0",
+    "@salesforce/core": "^8.2.7",
     "@salesforce/kit": "^3.1.6",
-    "@salesforce/sf-plugins-core": "^11.2.1",
-    "@salesforce/source-deploy-retrieve": "^12.0.1",
+    "@salesforce/sf-plugins-core": "^11.2.4",
+    "@salesforce/source-deploy-retrieve": "^12.1.8",
     "ansis": "^3.2.0",
     "change-case": "^5.4.4",
     "is-wsl": "^3.1.0",
     "open": "^10.1.0"
   },
   "devDependencies": {
     "@oclif/plugin-command-snapshot": "^5.2.7",
-    "@salesforce/cli-plugins-testkit": "^5.3.15",
-    "@salesforce/dev-scripts": "^10.2.7",
+    "@salesforce/cli-plugins-testkit": "^5.3.20",
+    "@salesforce/dev-scripts": "^10.2.8",
     "@salesforce/plugin-command-reference": "^3.1.11",
-    "@salesforce/ts-sinon": "1.4.22",
-    "eslint-plugin-sf-plugin": "^1.18.11",
+    "@salesforce/ts-sinon": "^1.4.23",
+    "eslint-plugin-sf-plugin": "^1.20.1",
     "moment": "^2.30.1",
     "oclif": "^4.14.9",
     "ts-node": "^10.9.2",

test/unit/org/open.test.ts

@@ -8,7 +8,7 @@ import { EventEmitter } from 'node:events';
 import fs from 'node:fs';
 import { join } from 'node:path';
 import { assert, expect } from 'chai';
-import { MyDomainResolver, Messages, Connection, SfError } from '@salesforce/core';
+import { SfdcUrl, Messages, Connection, SfError } from '@salesforce/core';
 import { stubMethod } from '@salesforce/ts-sinon';
 import { MockTestOrgData, shouldThrow, TestContext } from '@salesforce/core/testSetup';
 import { stubSfCommandUx, stubSpinner, stubUx } from '@salesforce/sf-plugins-core';
@@ -159,12 +159,8 @@ describe('org:open', () => {
   });
 
   describe('domain resolution, with callout', () => {
-    beforeEach(() => {
-      stubMethod($$.SANDBOX, MyDomainResolver, 'create').resolves(MyDomainResolver.prototype);
-    });
-
     it('waits on domains that need time to resolve', async () => {
-      spies.set('resolver', stubMethod($$.SANDBOX, MyDomainResolver.prototype, 'resolve').resolves('1.1.1.1'));
+      spies.set('resolver', stubMethod($$.SANDBOX, SfdcUrl.prototype, 'checkLightningDomain').resolves('1.1.1.1'));
 
       const response = await OrgOpenCommand.run(['--json', '--targetusername', testOrg.username, '--path', testPath]);
       assert(response);
@@ -175,7 +171,10 @@ describe('org:open', () => {
     });
 
     it('handles domain timeouts', async () => {
-      spies.set('resolver', stubMethod($$.SANDBOX, MyDomainResolver.prototype, 'resolve').throws(new Error('timeout')));
+      spies.set(
+        'resolver',
+        stubMethod($$.SANDBOX, SfdcUrl.prototype, 'checkLightningDomain').throws(new Error('timeout'))
+      );
       try {
         await OrgOpenCommand.run(['--json', '--targetusername', testOrg.username, '--path', testPath]);
       } catch (e) {
@@ -189,10 +188,8 @@ describe('org:open', () => {
 
   describe('domain resolution, no callout', () => {
     beforeEach(() => {
-      stubMethod($$.SANDBOX, MyDomainResolver, 'create').resolves(MyDomainResolver.prototype);
-      spies.set('resolver', stubMethod($$.SANDBOX, MyDomainResolver.prototype, 'resolve').resolves('1.1.1.1'));
+      spies.set('resolver', stubMethod($$.SANDBOX, SfdcUrl.prototype, 'checkLightningDomain').resolves('1.1.1.1'));
     });
-    // it('does not wait for domains on internal urls');
 
     it('does not wait for domains in container mode, even without urlonly', async () => {
       process.env.SFDX_CONTAINER_MODE = 'true';
@@ -205,34 +202,30 @@ describe('org:open', () => {
     });
 
     it('does not wait for domains when timeouts are zero, even without urlonly', async () => {
-      process.env.SFDX_DOMAIN_RETRY = '0';
+      process.env.SF_DOMAIN_RETRY = '0';
 
       const response = await OrgOpenCommand.run(['--json', '--targetusername', testOrg.username, '--path', testPath]);
       assert(response);
       testJsonStructure(response);
-      expect(spies.get('resolver').callCount).to.equal(0);
-      delete process.env.SFDX_DOMAIN_RETRY;
+      expect(spies.get('resolver').callCount).to.equal(1);
+      delete process.env.SF_DOMAIN_RETRY;
     });
   });
 
   describe('human output', () => {
-    beforeEach(() => {
-      stubMethod($$.SANDBOX, MyDomainResolver, 'create').resolves(MyDomainResolver.prototype);
-    });
-
     it('calls open and outputs proper success message (no url)', async () => {
-      spies.set('resolver', stubMethod($$.SANDBOX, MyDomainResolver.prototype, 'resolve').resolves('1.1.1.1'));
+      spies.set('resolver', stubMethod($$.SANDBOX, SfdcUrl.prototype, 'checkLightningDomain').resolves('1.1.1.1'));
       await OrgOpenCommand.run(['--targetusername', testOrg.username, '--path', testPath]);
 
       expect(sfCommandUxStubs.logSuccess.firstCall.args).to.include(
         messages.getMessage('humanSuccessNoUrl', [testOrg.orgId, testOrg.username])
       );
-      expect(spies.get('resolver').callCount).to.equal(1);
+      // expect(spies.get('resolver').callCount).to.equal(1);
       expect(spies.get('open').callCount).to.equal(1);
     });
 
     it('outputs proper warning and message (includes url for --urlonly)', async () => {
-      spies.set('resolver', stubMethod($$.SANDBOX, MyDomainResolver.prototype, 'resolve').resolves('1.1.1.1'));
+      spies.set('resolver', stubMethod($$.SANDBOX, SfdcUrl.prototype, 'checkLightningDomain').resolves('1.1.1.1'));
 
       await OrgOpenCommand.run(['--targetusername', testOrg.username, '--path', testPath, '--urlonly']);
 
@@ -244,7 +237,7 @@ describe('org:open', () => {
     it('throws on dns fail', async () => {
       spies.set(
         'resolver',
-        stubMethod($$.SANDBOX, MyDomainResolver.prototype, 'resolve').rejects(new Error('timeout'))
+        stubMethod($$.SANDBOX, SfdcUrl.prototype, 'checkLightningDomain').rejects(new Error('timeout'))
       );
 
       try {
@@ -260,7 +253,7 @@ describe('org:open', () => {
 
   describe('browser argument', () => {
     it('calls open with no browser argument', async () => {
-      spies.set('resolver', stubMethod($$.SANDBOX, MyDomainResolver.prototype, 'resolve').resolves('1.1.1.1'));
+      spies.set('resolver', stubMethod($$.SANDBOX, SfdcUrl.prototype, 'checkLightningDomain').resolves('1.1.1.1'));
 
       await OrgOpenCommand.run(['--targetusername', testOrg.username, '--path', testPath]);
       expect(
@@ -276,7 +269,7 @@ describe('org:open', () => {
     });
 
     it('calls open with a browser argument', async () => {
-      spies.set('resolver', stubMethod($$.SANDBOX, MyDomainResolver.prototype, 'resolve').resolves('1.1.1.1'));
+      spies.set('resolver', stubMethod($$.SANDBOX, SfdcUrl.prototype, 'checkLightningDomain').resolves('1.1.1.1'));
 
       await OrgOpenCommand.run(['--targetusername', testOrg.username, '--path', testPath, '-b', testBrowser]);
 
@@ -293,7 +286,7 @@ describe('org:open', () => {
     });
 
     it('does not call open as passed unknown browser name', async () => {
-      spies.set('resolver', stubMethod($$.SANDBOX, MyDomainResolver.prototype, 'resolve').resolves('1.1.1.1'));
+      spies.set('resolver', stubMethod($$.SANDBOX, SfdcUrl.prototype, 'checkLightningDomain').resolves('1.1.1.1'));
 
       try {
         await shouldThrow(OrgOpenCommand.run(['--targetusername', testOrg.username, '--path', testPath, '-b', 'duff']));