diff --git a/package.json b/package.json index 05ac8adb..73834bb6 100644 --- a/package.json +++ b/package.json @@ -5,24 +5,24 @@ "author": "Salesforce", "bugs": "https://github.com/forcedotcom/cli/issues", "dependencies": { - "@oclif/core": "^3.26.0", - "@salesforce/core": "^6.7.6", - "@salesforce/kit": "^3.0.15", - "@salesforce/sf-plugins-core": "^8.0.1", + "@oclif/core": "^3.26.2", + "@salesforce/core": "^7.0.1", + "@salesforce/kit": "^3.1.0", + "@salesforce/sf-plugins-core": "^9.0.0", "chalk": "^5.3.0", "change-case": "^5.4.3" }, "devDependencies": { "@oclif/plugin-command-snapshot": "^5.1.2", - "@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.73", "@salesforce/ts-types": "^2.0.9", "@types/chai-as-promised": "^7.1.8", "@types/chai-string": "^1.4.5", "chai-as-promised": "7.1.1", "chai-string": "^1.5.0", - "eslint-plugin-sf-plugin": "^1.17.5", + "eslint-plugin-sf-plugin": "^1.18.0", "jsforce": "^2.0.0-beta.28", "oclif": "^4.7.6", "ts-node": "^10.9.2", diff --git a/src/commands/org/create/shape.ts b/src/commands/org/create/shape.ts index 0a6f9c28..c6ecb581 100644 --- a/src/commands/org/create/shape.ts +++ b/src/commands/org/create/shape.ts @@ -12,7 +12,7 @@ import { loglevel, } from '@salesforce/sf-plugins-core'; import { Messages, Connection, Logger } from '@salesforce/core'; -import type { SaveResult } from 'jsforce'; +import type { SaveResult } from '@jsforce/jsforce-node'; import { isShapeEnabled, JsForceError } from '../../../shared/orgShapeListUtils.js'; Messages.importMessagesDirectoryFromMetaUrl(import.meta.url); @@ -22,7 +22,7 @@ export type ShapeCreateResult = { shapeId: string; success: boolean; errors: []; -} +}; export class OrgShapeCreateCommand extends SfCommand { public static readonly summary = messages.getMessage('summary'); diff --git a/src/commands/org/delete/snapshot.ts b/src/commands/org/delete/snapshot.ts index 3c053efc..7a8f1891 100644 --- a/src/commands/org/delete/snapshot.ts +++ b/src/commands/org/delete/snapshot.ts @@ -14,7 +14,7 @@ import { requiredHubFlagWithDeprecations, } from '@salesforce/sf-plugins-core'; import { Messages } from '@salesforce/core'; -import type { SaveResult, SaveError } from 'jsforce'; +import type { SaveResult, SaveError } from '@jsforce/jsforce-node'; import { queryByNameOrId } from '../../../shared/snapshot.js'; Messages.importMessagesDirectoryFromMetaUrl(import.meta.url); diff --git a/test/shape/create.test.ts b/test/shape/create.test.ts index 91c63abe..d1ae0278 100644 --- a/test/shape/create.test.ts +++ b/test/shape/create.test.ts @@ -9,10 +9,10 @@ import { fileURLToPath } from 'node:url'; import { Config } from '@oclif/core'; import { use, expect, config as chaiConfig } from 'chai'; import chaiAsPromised from 'chai-as-promised'; -import { TestContext, MockTestOrgData } from '@salesforce/core/lib/testSetup.js'; +import { TestContext, MockTestOrgData } from '@salesforce/core/testSetup'; import { SfCommand } from '@salesforce/sf-plugins-core'; -import type { SaveResult } from 'jsforce'; +import type { SaveResult } from '@jsforce/jsforce-node'; import sinon from 'sinon'; import { ensureJsonMap, ensureString, AnyJson } from '@salesforce/ts-types'; import { OrgShapeCreateCommand } from '../../src/commands/org/create/shape.js'; diff --git a/test/shape/delete.test.ts b/test/shape/delete.test.ts index 8676d2d5..047a99d7 100644 --- a/test/shape/delete.test.ts +++ b/test/shape/delete.test.ts @@ -10,10 +10,10 @@ import { fileURLToPath } from 'node:url'; import { Config } from '@oclif/core'; import { use, expect, config as chaiConfig } from 'chai'; import chaiAsPromised from 'chai-as-promised'; -import { TestContext, MockTestOrgData } from '@salesforce/core/lib/testSetup.js'; +import { TestContext, MockTestOrgData } from '@salesforce/core/testSetup'; import { SfCommand } from '@salesforce/sf-plugins-core'; -import type { SaveResult } from 'jsforce'; +import type { SaveResult } from '@jsforce/jsforce-node'; import sinon from 'sinon'; import { ensureJsonMap, ensureString, AnyJson } from '@salesforce/ts-types'; import { OrgShapeDeleteCommand } from '../../src/commands/org/delete/shape.js'; diff --git a/test/shape/list.test.ts b/test/shape/list.test.ts index becbeb96..65cd1721 100644 --- a/test/shape/list.test.ts +++ b/test/shape/list.test.ts @@ -13,7 +13,7 @@ import { use, expect } from 'chai'; import chaiAsPromised from 'chai-as-promised'; import sinon from 'sinon'; import { SfCommand } from '@salesforce/sf-plugins-core'; -import { TestContext, MockTestOrgData } from '@salesforce/core/lib/testSetup.js'; +import { TestContext, MockTestOrgData } from '@salesforce/core/testSetup'; import { OrgShapeListCommand } from '../../src/commands/org/list/shape.js'; import utils, { OrgShapeListResult } from '../../src/shared/orgShapeListUtils.js'; diff --git a/test/shared/orgShapeListUtils.test.ts b/test/shared/orgShapeListUtils.test.ts index 077d6e15..c4fb2581 100644 --- a/test/shared/orgShapeListUtils.test.ts +++ b/test/shared/orgShapeListUtils.test.ts @@ -4,15 +4,12 @@ * Licensed under the BSD 3-Clause license. * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause */ -import { expect } from 'chai'; -import chai from 'chai'; +import chai, { expect } from 'chai'; import chaiAsPromised from 'chai-as-promised'; - -chai.use(chaiAsPromised); -import { TestContext, MockTestOrgData } from '@salesforce/core/lib/testSetup.js'; +import { TestContext, MockTestOrgData } from '@salesforce/core/testSetup'; import { AnyJson, ensureJsonMap, ensureString } from '@salesforce/ts-types'; - import { getAllShapesFromOrg } from '../../src/shared/orgShapeListUtils.js'; +chai.use(chaiAsPromised); describe('shape list utils', () => { const $$ = new TestContext(); diff --git a/yarn.lock b/yarn.lock index 0072426f..bbbc2ae9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1260,6 +1260,26 @@ "@jridgewell/resolve-uri" "3.1.0" "@jridgewell/sourcemap-codec" "1.4.14" +"@jsforce/jsforce-node@^3.1.0": + version "3.1.0" + resolved "https://registry.yarnpkg.com/@jsforce/jsforce-node/-/jsforce-node-3.1.0.tgz#7f1b4ba60c0c84b870af8e43d713907b10ed8152" + integrity sha512-xsn6Qj36YyhG7uCL9DOswZhqN/OVIpXm5s8AWD7V9hSJfp5ReebEsjT7a52ztEMmkUAYjWvZC5alBJr7jJCJig== + dependencies: + "@sindresorhus/is" "^4" + "@types/node" "^18.15.3" + abort-controller "^3.0.0" + base64url "^3.0.1" + csv-parse "^5.5.2" + csv-stringify "^6.4.4" + faye "^1.4.0" + form-data "^4.0.0" + fs-extra "^8.1.0" + https-proxy-agent "^5.0.0" + multistream "^3.1.0" + node-fetch "^2.6.1" + strip-ansi "^6.0.0" + xml2js "^0.6.2" + "@nodelib/fs.scandir@2.1.5": version "2.1.5" resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5" @@ -1315,10 +1335,10 @@ wordwrap "^1.0.0" wrap-ansi "^7.0.0" -"@oclif/core@^3.15.1", "@oclif/core@^3.21.0", "@oclif/core@^3.23.0", "@oclif/core@^3.26.0": - version "3.26.0" - resolved "https://registry.yarnpkg.com/@oclif/core/-/core-3.26.0.tgz#959d5e9f13f4ad6a4e98235ad125189df9ee4279" - integrity sha512-TpMdfD4tfA2tVVbd4l0PrP02o5KoUXYmudBbTC7CeguDo/GLoprw4uL8cMsaVA26+cbcy7WYtOEydQiHVtJixA== +"@oclif/core@^3.15.1", "@oclif/core@^3.21.0", "@oclif/core@^3.26.0", "@oclif/core@^3.26.2": + version "3.26.2" + resolved "https://registry.yarnpkg.com/@oclif/core/-/core-3.26.2.tgz#92a92516e1309e5b1241c1b4932ab1d2546e294a" + integrity sha512-Gpn21jKjcOx0TecI1wLJrY/65jtgJx5f1GzTc81oKvEpKes1b3Li2SMZygRaWRpcQ3wjN0d7lTPi8WwLsmTBjA== dependencies: "@types/cli-progress" "^3.11.5" ansi-escapes "^4.3.2" @@ -1336,7 +1356,7 @@ indent-string "^4.0.0" is-wsl "^2.2.0" js-yaml "^3.14.1" - minimatch "^9.0.3" + minimatch "^9.0.4" natural-orderby "^2.0.3" object-treeify "^1.1.33" password-prompt "^1.1.3" @@ -1397,12 +1417,12 @@ resolved "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33" integrity sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg== -"@salesforce/cli-plugins-testkit@^5.1.14": - version "5.1.14" - resolved "https://registry.yarnpkg.com/@salesforce/cli-plugins-testkit/-/cli-plugins-testkit-5.1.14.tgz#34afac74c44b8492e56c78ac80af60261084cf39" - integrity sha512-Adt7A2CMONTZFGENHI91PUxRVuQOypNa+/JVRTXjp2ug3zrPhquxEjtgfG18vVZi/boKa0Td898/N14SOW5vNQ== +"@salesforce/cli-plugins-testkit@^5.2.0": + version "5.2.0" + resolved "https://registry.yarnpkg.com/@salesforce/cli-plugins-testkit/-/cli-plugins-testkit-5.2.0.tgz#dd664a9a51eac42f9959e0cfa1d3349256446291" + integrity sha512-b0lHGBycDBmeGcDx0j9SfxlNyCg3WhflNeX1PBitMTxgZ5O9UMiSFvLbqgGeTB8Eoq4JgNgou6RRrNoZHFnqcw== dependencies: - "@salesforce/core" "^6.7.6" + "@salesforce/core" "^7.0.0" "@salesforce/kit" "^3.1.0" "@salesforce/ts-types" "^2.0.9" "@types/shelljs" "^0.8.15" @@ -1413,7 +1433,7 @@ strip-ansi "6.0.1" ts-retry-promise "^0.8.0" -"@salesforce/core@^6.4.1", "@salesforce/core@^6.7.3", "@salesforce/core@^6.7.6": +"@salesforce/core@^6.4.1", "@salesforce/core@^6.7.3": version "6.7.6" resolved "https://registry.yarnpkg.com/@salesforce/core/-/core-6.7.6.tgz#6a73c6a4e615ce837be5b5c142cfc63a6c8db3bd" integrity sha512-0ZZ1GgUQTwTs8/xa+hmZd+wwKXkK8MNcI2Kn20HmHShsweA2Jp3Yaxx0+EbRPqhSBARXso+TADSnsOjlZvQ3tg== @@ -1436,15 +1456,38 @@ semver "^7.6.0" ts-retry-promise "^0.7.1" +"@salesforce/core@^7.0.0", "@salesforce/core@^7.0.1": + version "7.1.0" + resolved "https://registry.yarnpkg.com/@salesforce/core/-/core-7.1.0.tgz#60195ab0ad452b27594a0bca6852f1820915ff7f" + integrity sha512-TfGBjH7tJIgnrKxbbRvh4ujn60gPjqcr2xZBHMffjZVtfvXPoT07kd0TILyDWLFslYMJQFq3KA0GwL51g01WNQ== + dependencies: + "@jsforce/jsforce-node" "^3.1.0" + "@salesforce/kit" "^3.1.0" + "@salesforce/schemas" "^1.7.0" + "@salesforce/ts-types" "^2.0.9" + ajv "^8.12.0" + change-case "^4.1.2" + faye "^1.4.0" + form-data "^4.0.0" + js2xmlparser "^4.0.1" + jsonwebtoken "9.0.2" + jszip "3.10.1" + pino "^8.19.0" + pino-abstract-transport "^1.1.0" + pino-pretty "^10.3.1" + proper-lockfile "^4.1.2" + semver "^7.6.0" + ts-retry-promise "^0.7.1" + "@salesforce/dev-config@^4.1.0": version "4.1.0" resolved "https://registry.yarnpkg.com/@salesforce/dev-config/-/dev-config-4.1.0.tgz#e529576466d074e7a5f1441236510fef123da01e" integrity sha512-2iDDepiIwjXHS5IVY7pwv8jMo4xWosJ7p/UTj+lllpB/gnJiYLhjJPE4Z3FCGFKyvfg5jGaimCd8Ca6bLGsCQA== -"@salesforce/dev-scripts@^8.5.0": - version "8.5.0" - resolved "https://registry.yarnpkg.com/@salesforce/dev-scripts/-/dev-scripts-8.5.0.tgz#b0b44ca595450328c6186968528d9c0ef06cd27e" - integrity sha512-vR+CB5VoQrNAqNTcu5GZ/l4I4Rxd5HkIj/qTxEzP1EYnIlgjrbcsQgaunSnTrttIEy/BD8epd6UWAT8yAItufg== +"@salesforce/dev-scripts@^9.0.0": + version "9.0.0" + resolved "https://registry.yarnpkg.com/@salesforce/dev-scripts/-/dev-scripts-9.0.0.tgz#ab38c014ebc8baa92fccbb5cff9b8432e0f991d1" + integrity sha512-B89ipgncuhHLqLlr+LGSi7HN+eHPa3aw5B6PXQWqQj73QAkGN+E6EowwA50y7GkXeNx7GntbNRtQHvwMcnIorw== dependencies: "@commitlint/cli" "^17.1.2" "@commitlint/config-conventional" "^17.8.1" @@ -1518,16 +1561,16 @@ chalk "^4" inquirer "^8.2.5" -"@salesforce/sf-plugins-core@^8.0.1": - version "8.0.1" - resolved "https://registry.yarnpkg.com/@salesforce/sf-plugins-core/-/sf-plugins-core-8.0.1.tgz#f155cddfd7695aab0d8264848b634b2a91cdbf2c" - integrity sha512-R6SqJ1XqSINSWdZruKtC2SKGnLBh7KbFI7+qS0FYlyPU4IlWoa+AZkGwWvlczuSOumqnlhT95rNKwZTS5rJugA== +"@salesforce/sf-plugins-core@^9.0.0": + version "9.0.0" + resolved "https://registry.yarnpkg.com/@salesforce/sf-plugins-core/-/sf-plugins-core-9.0.0.tgz#8ac6e45fa985ef35ad7f47a09d96f2b2f6d70710" + integrity sha512-Eo1mfq68uVIEFgAE7oSlsfJT3YyShQAHRCiLqKivEcxu/3xOHPU212u2nT9igA81Me/6NZmBSvm6vLdN+L/9og== dependencies: "@inquirer/confirm" "^2.0.17" "@inquirer/password" "^1.1.16" - "@oclif/core" "^3.23.0" - "@salesforce/core" "^6.7.3" - "@salesforce/kit" "^3.0.15" + "@oclif/core" "^3.26.0" + "@salesforce/core" "^7.0.0" + "@salesforce/kit" "^3.1.0" "@salesforce/ts-types" "^2.0.9" chalk "^5.3.0" @@ -1538,6 +1581,11 @@ dependencies: tslib "^2.6.2" +"@sindresorhus/is@^4": + version "4.6.0" + resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-4.6.0.tgz#3c7c9c46e678feefe7a2e5bb609d3dbd665ffb3f" + integrity sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw== + "@sindresorhus/is@^5.2.0": version "5.6.0" resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-5.6.0.tgz#41dd6093d34652cddb5d5bdeee04eafc33826668" @@ -2201,10 +2249,10 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-12.20.55.tgz#c329cbd434c42164f846b909bd6f85b5537f6240" integrity sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ== -"@types/node@^18.19.28": - version "18.19.29" - resolved "https://registry.yarnpkg.com/@types/node/-/node-18.19.29.tgz#e7e9d796c1e195be7e7daf82b4abc50d017fb9db" - integrity sha512-5pAX7ggTmWZdhUrhRWLPf+5oM7F80bcKVCBbr0zwEkTNzTJL2CWQjznpFgHYy6GrzkYi2Yjy7DHKoynFxqPV8g== +"@types/node@^18.15.3", "@types/node@^18.19.28": + version "18.19.31" + resolved "https://registry.yarnpkg.com/@types/node/-/node-18.19.31.tgz#b7d4a00f7cb826b60a543cebdbda5d189aaecdcd" + integrity sha512-ArgCD39YpyyrtFKIqMDvjz79jto5fcI/SVUs2HwB+f0dAzq68yqOdyaSivLiLugSziTpNXLQrVb7RZFmdZzbhA== dependencies: undici-types "~5.26.4" @@ -3202,11 +3250,21 @@ csv-parse@^4.8.2: resolved "https://registry.yarnpkg.com/csv-parse/-/csv-parse-4.16.3.tgz#7ca624d517212ebc520a36873c3478fa66efbaf7" integrity sha512-cO1I/zmz4w2dcKHVvpCr7JVRu8/FymG5OEpmvsZYlccYolPBLoVGKUHgNoc4ZGkFeFlWGEDmMyBM+TTqRdW/wg== +csv-parse@^5.5.2: + version "5.5.5" + resolved "https://registry.yarnpkg.com/csv-parse/-/csv-parse-5.5.5.tgz#68a271a9092877b830541805e14c8a80e6a22517" + integrity sha512-erCk7tyU3yLWAhk6wvKxnyPtftuy/6Ak622gOO7BCJ05+TYffnPCJF905wmOQm+BpkX54OdAl8pveJwUdpnCXQ== + csv-stringify@^5.3.4: version "5.6.5" resolved "https://registry.yarnpkg.com/csv-stringify/-/csv-stringify-5.6.5.tgz#c6d74badda4b49a79bf4e72f91cce1e33b94de00" integrity sha512-PjiQ659aQ+fUTQqSrd1XEDnOr52jh30RBurfzkscaE2tPaFsDH5wOAHJiw8XAHphRknCwMUE9KRayc4K/NbO8A== +csv-stringify@^6.4.4: + version "6.4.6" + resolved "https://registry.yarnpkg.com/csv-stringify/-/csv-stringify-6.4.6.tgz#9ccf87cb8b017c96673a9fa061768c8ba83e8b98" + integrity sha512-h2V2XZ3uOTLilF5dPIptgUfN/o2ia/80Ie0Lly18LAnw5s8Eb7kt8rfxSUy24AztJZas9f6DPZpVlzDUtFt/ag== + dargs@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/dargs/-/dargs-7.0.0.tgz#04015c41de0bcb69ec84050f3d9be0caf8d6d5cc" @@ -3638,12 +3696,12 @@ eslint-plugin-jsdoc@^46.10.1: semver "^7.5.4" spdx-expression-parse "^4.0.0" -eslint-plugin-sf-plugin@^1.17.5: - version "1.17.5" - resolved "https://registry.yarnpkg.com/eslint-plugin-sf-plugin/-/eslint-plugin-sf-plugin-1.17.5.tgz#3ce0e7033eaf50675c962e7d2def3bb2cad15018" - integrity sha512-TQlUNOwop8aGeIOY+Vtj3OV0EGN7ps2YpV9LEvgGpw7Eeg5ocULQqR6WPwuRpeRn+XUNl7AC5NVDdhveA1fEEQ== +eslint-plugin-sf-plugin@^1.18.0: + version "1.18.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-sf-plugin/-/eslint-plugin-sf-plugin-1.18.0.tgz#c6eca90e7738e9a114d8257588220c63a2a3e0e3" + integrity sha512-5Q4yI6Hr07v/lTaivs8A8re2FUXDEGyzzHzBk2cWi4c6iMxUYf/vaZKO6ZSSsc4eCcP11JY3RkDBQn6P33x58g== dependencies: - "@salesforce/core" "^6.7.3" + "@salesforce/core" "^7.0.0" "@typescript-eslint/utils" "^6.17.0" eslint-plugin-unicorn@^50.0.1: @@ -5476,7 +5534,7 @@ minimatch@5.0.1: dependencies: brace-expansion "^2.0.1" -minimatch@9.0.3, minimatch@^9.0.1, minimatch@^9.0.3: +minimatch@9.0.3: version "9.0.3" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.3.tgz#a6e00c3de44c3a542bfaae70abfc22420a6da825" integrity sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg== @@ -5497,6 +5555,13 @@ minimatch@^5.0.1: dependencies: brace-expansion "^2.0.1" +minimatch@^9.0.1, minimatch@^9.0.3, minimatch@^9.0.4: + version "9.0.4" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.4.tgz#8e49c731d1749cbec05050ee5145147b32496a51" + integrity sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw== + dependencies: + brace-expansion "^2.0.1" + minimist-options@4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/minimist-options/-/minimist-options-4.1.0.tgz#c0655713c53a8a2ebd77ffa247d342c40f010619" @@ -7495,6 +7560,14 @@ xml2js@^0.5.0: sax ">=0.6.0" xmlbuilder "~11.0.0" +xml2js@^0.6.2: + version "0.6.2" + resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.6.2.tgz#dd0b630083aa09c161e25a4d0901e2b2a929b499" + integrity sha512-T4rieHaC1EXcES0Kxxj4JWgaUQHDk+qwHcYOCFHfiwKz7tOVPLq7Hjq9dM1WCMhylqMEfP7hMcOIChvotiZegA== + dependencies: + sax ">=0.6.0" + xmlbuilder "~11.0.0" + xmlbuilder@~11.0.0: version "11.0.1" resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-11.0.1.tgz#be9bae1c8a046e76b31127726347d0ad7002beb3"