feat: core7 + jsforce-node

* chore: updates from devScripts * test: top-level testSetup --------- Co-authored-by: mshanemc <[email protected]>
salesforcecli · Apr 10, 2024 · 618e5c5 · 618e5c5
1 parent a2857f7
commit 618e5c5
Show file tree

Hide file tree

Showing 8 changed files with 176 additions and 43 deletions.
diff --git a/package.json b/package.json
@@ -5,19 +5,19 @@
   "author": "Salesforce",
   "bugs": "https://github.com/forcedotcom/cli/issues",
   "dependencies": {
-    "@oclif/core": "^3.26.0",
-    "@salesforce/core": "^6.7.1",
-    "@salesforce/kit": "^3.0.15",
-    "@salesforce/sf-plugins-core": "^8.0.3",
+    "@oclif/core": "^3.26.2",
+    "@salesforce/core": "^7.0.1",
+    "@salesforce/kit": "^3.1.0",
+    "@salesforce/sf-plugins-core": "^9.0.0",
     "@salesforce/ts-types": "^2.0.9"
   },
   "devDependencies": {
     "@oclif/plugin-command-snapshot": "^5.1.4",
-    "@salesforce/cli-plugins-testkit": "^5.1.14",
-    "@salesforce/dev-scripts": "^8.5.0",
+    "@salesforce/cli-plugins-testkit": "^5.2.0",
+    "@salesforce/dev-scripts": "^9.0.0",
     "@salesforce/plugin-command-reference": "^3.0.74",
     "chai-each": "^0.0.1",
-    "eslint-plugin-sf-plugin": "^1.17.5",
+    "eslint-plugin-sf-plugin": "^1.18.0",
     "oclif": "^4.7.6",
     "ts-node": "^10.9.2",
     "typescript": "^5.4.4"

diff --git a/test/commands/create.test.ts b/test/commands/create.test.ts
@@ -9,7 +9,7 @@
 
 import fs from 'node:fs';
 import { AuthInfo, Connection, DefaultUserFields, Logger, Org, User } from '@salesforce/core';
-import { MockTestOrgData, TestContext } from '@salesforce/core/lib/testSetup.js';
+import { MockTestOrgData, TestContext } from '@salesforce/core/testSetup';
 import { expect } from 'chai';
 import { assert, JsonMap } from '@salesforce/ts-types';
 import { Config } from '@oclif/core';

diff --git a/test/commands/display.test.ts b/test/commands/display.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { AuthInfo, Connection, Org } from '@salesforce/core';
-import { MockTestOrgData, TestContext } from '@salesforce/core/lib/testSetup.js';
+import { MockTestOrgData, TestContext } from '@salesforce/core/testSetup';
 import { expect } from 'chai';
 import { DisplayUserCommand } from '../../src/commands/org/display/user.js';
 

diff --git a/test/commands/list.test.ts b/test/commands/list.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { Connection, Org } from '@salesforce/core';
-import { MockTestOrgData, TestContext } from '@salesforce/core/lib/testSetup.js';
+import { MockTestOrgData, TestContext } from '@salesforce/core/testSetup';
 import { expect } from 'chai';
 import { ListUsersCommand } from '../../src/commands/org/list/users.js';
 

diff --git a/test/commands/password/generate.test.ts b/test/commands/password/generate.test.ts
@@ -6,9 +6,10 @@
  */
 
 import { Connection, Messages, User } from '@salesforce/core';
-import { MockTestOrgData, TestContext } from '@salesforce/core/lib/testSetup.js';
-import { SecureBuffer } from '@salesforce/core/lib/crypto/secureBuffer.js';
+import { MockTestOrgData, TestContext } from '@salesforce/core/testSetup';
 import { assert, expect } from 'chai';
+// dirty import to stub something we don't want to export from sfdx-core
+import { SecureBuffer } from '../../../node_modules/@salesforce/core/lib/crypto/secureBuffer.js';
 import { PasswordData, GenerateUserPasswordCommand } from '../../../src/commands/org/generate/password.js';
 
 Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);

diff --git a/test/commands/permset/assign.test.ts b/test/commands/permset/assign.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { Connection, User } from '@salesforce/core';
-import { MockTestOrgData, TestContext } from '@salesforce/core/lib/testSetup.js';
+import { MockTestOrgData, TestContext } from '@salesforce/core/testSetup';
 import { expect } from 'chai';
 import { AssignPermSetCommand } from '../../../src/commands/org/assign/permset.js';
 

diff --git a/test/commands/permsetlicense/assign.test.ts b/test/commands/permsetlicense/assign.test.ts
@@ -5,7 +5,7 @@
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 import { Connection } from '@salesforce/core';
-import { MockTestOrgData, TestContext } from '@salesforce/core/lib/testSetup.js';
+import { MockTestOrgData, TestContext } from '@salesforce/core/testSetup';
 import { assert, expect } from 'chai';
 import { AssignPermSetLicenseCommand } from '../../../src/commands/org/assign/permsetlicense.js';