From a7a5016833722b713627003d8eacd8bec5789d70 Mon Sep 17 00:00:00 2001 From: Mike Donnalley Date: Thu, 26 Jan 2023 12:05:05 -0700 Subject: [PATCH 1/3] feat: use latest sf-plugins-core and oclif/core --- package.json | 6 +-- src/commands/org/create/user.ts | 2 +- yarn.lock | 66 ++++++++++++++++++++++++++++++++- 3 files changed, 68 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 4a322572..af1d04f5 100644 --- a/package.json +++ b/package.json @@ -6,10 +6,10 @@ "main": "lib/index.js", "bugs": "https://github.com/forcedotcom/cli/issues", "dependencies": { - "@oclif/core": "^1.24.0", + "@oclif/core": "^2.0.6", "@salesforce/core": "^3.33.0", "@salesforce/kit": "^1.8.2", - "@salesforce/sf-plugins-core": "1.22.1", + "@salesforce/sf-plugins-core": "^2.0.0-beta.6", "@salesforce/ts-types": "^1.7.2", "tslib": "^2" }, @@ -139,4 +139,4 @@ "publishConfig": { "access": "public" } -} \ No newline at end of file +} diff --git a/src/commands/org/create/user.ts b/src/commands/org/create/user.ts index 3abd2d5c..9eb98527 100644 --- a/src/commands/org/create/user.ts +++ b/src/commands/org/create/user.ts @@ -112,7 +112,7 @@ export class CreateUserCommand extends SfCommand { public async run(): Promise { const { flags, argv } = await this.parse(CreateUserCommand); - this.varargs = parseVarArgs({}, argv); + this.varargs = parseVarArgs({}, argv as string[]); this.flags = flags as Interfaces.InferredFlags; this.logger = await Logger.child(this.constructor.name); const defaultUserFields: DefaultUserFields = await DefaultUserFields.create({ diff --git a/yarn.lock b/yarn.lock index 78e64a60..b2605626 100644 --- a/yarn.lock +++ b/yarn.lock @@ -729,7 +729,7 @@ is-wsl "^2.1.1" tslib "^2.3.1" -"@oclif/core@^1.20.3", "@oclif/core@^1.20.4", "@oclif/core@^1.23.0", "@oclif/core@^1.23.1", "@oclif/core@^1.24.0": +"@oclif/core@^1.20.3", "@oclif/core@^1.20.4", "@oclif/core@^1.23.0", "@oclif/core@^1.23.1": version "1.24.0" resolved "https://registry.yarnpkg.com/@oclif/core/-/core-1.24.0.tgz#e94e2f3a1259ebb3cc867d04b12c5bfc31c21f50" integrity sha512-J41suyV4fLfLcRRySZdtgFYSjIlpYqD90SY01Fm4+ZJUMcfDh/eQAD4sogyYOsIT0bfEzYOyYCjmfHmgcoX5aA== @@ -763,6 +763,40 @@ widest-line "^3.1.0" wrap-ansi "^7.0.0" +"@oclif/core@^2.0.6": + version "2.0.6" + resolved "https://registry.yarnpkg.com/@oclif/core/-/core-2.0.6.tgz#8d3a571a162578999e3e95cb20d8b1f0403c33d7" + integrity sha512-AOgr1bBjjAyCWcaaai1z7kBULg2zodCuubnmoU7mge2IL/hh2E6F2jdI7wpPK6KI7gVqZq0PKGxsl4EOFsrErQ== + dependencies: + "@types/cli-progress" "^3.11.0" + ansi-escapes "^4.3.2" + ansi-styles "^4.3.0" + cardinal "^2.1.1" + chalk "^4.1.2" + clean-stack "^3.0.1" + cli-progress "^3.10.0" + debug "^4.3.4" + ejs "^3.1.6" + fs-extra "^9.1.0" + get-package-type "^0.1.0" + globby "^11.1.0" + hyperlinker "^1.0.0" + indent-string "^4.0.0" + is-wsl "^2.2.0" + js-yaml "^3.14.1" + natural-orderby "^2.0.3" + object-treeify "^1.1.33" + password-prompt "^1.1.2" + semver "^7.3.7" + string-width "^4.2.3" + strip-ansi "^6.0.1" + supports-color "^8.1.1" + supports-hyperlinks "^2.2.0" + tslib "^2.4.1" + widest-line "^3.1.0" + wordwrap "^1.0.0" + wrap-ansi "^7.0.0" + "@oclif/dev-cli@^1": version "1.26.10" resolved "https://registry.yarnpkg.com/@oclif/dev-cli/-/dev-cli-1.26.10.tgz#d8df3a79009b68552f5e7f249d1d19ca52278382" @@ -1097,6 +1131,15 @@ shx "^0.3.3" tslib "^2.2.0" +"@salesforce/kit@^1.8.3": + version "1.8.3" + resolved "https://registry.yarnpkg.com/@salesforce/kit/-/kit-1.8.3.tgz#b590b78a8618494c51534598a7eb0683ba0da3f2" + integrity sha512-p+0tWR2pyCAIjZwDXGhrYFPuLckX9fP3Xa6Jync9POeQBfDGyK9CRd1eaiWj+6BeDS9kwvgm5M6o+OptIEhEjw== + dependencies: + "@salesforce/ts-types" "^1.7.2" + shx "^0.3.3" + tslib "^2.2.0" + "@salesforce/plugin-command-reference@^2.2.9": version "2.2.9" resolved "https://registry.yarnpkg.com/@salesforce/plugin-command-reference/-/plugin-command-reference-2.2.9.tgz#0d56e2acff6486db86312fd4982b0a8a0161d291" @@ -1124,7 +1167,7 @@ resolved "https://registry.yarnpkg.com/@salesforce/schemas/-/schemas-1.4.0.tgz#7dff427c8059895d8108176047aee600703c82d6" integrity sha512-BJ25uphssN42Zy6kksheFHMTLiR98AAHe/Wxnv0T4dYxtrEbUjSXVAGKZqfewJPFXA4xB5gxC+rQZtfz6xKCFg== -"@salesforce/sf-plugins-core@1.22.1", "@salesforce/sf-plugins-core@^1.21.5": +"@salesforce/sf-plugins-core@^1.21.5": version "1.22.1" resolved "https://registry.yarnpkg.com/@salesforce/sf-plugins-core/-/sf-plugins-core-1.22.1.tgz#58c445aa8c72ae7ddd6ec39269ae1d944d059e9b" integrity sha512-UAAi7I753+t9zVJDHMzk81XCsYU5q2kq7aSgFbokdvnnPx45i3NptyaKNCRDeOBxp3eYCuNG6iFZ+xzC+v8cfA== @@ -1136,6 +1179,18 @@ chalk "^4" inquirer "^8.2.5" +"@salesforce/sf-plugins-core@^2.0.0-beta.6": + version "2.0.0-beta.6" + resolved "https://registry.yarnpkg.com/@salesforce/sf-plugins-core/-/sf-plugins-core-2.0.0-beta.6.tgz#1bb8bbe45b3a9e44231da6392d69e2dbd518a4db" + integrity sha512-TnAq4UsdauYnthnthxGsOFtRghjrRZjSjJyCdKjymV8Uc/6pDMXJNgAD5PKT0GGU2kAHSTkH6YeOlsrQiRgrWw== + dependencies: + "@oclif/core" "^2.0.6" + "@salesforce/core" "^3.32.12" + "@salesforce/kit" "^1.8.3" + "@salesforce/ts-types" "^1.7.1" + chalk "^4" + inquirer "^8.2.5" + "@salesforce/ts-sinon@^1.4.4": version "1.4.4" resolved "https://registry.yarnpkg.com/@salesforce/ts-sinon/-/ts-sinon-1.4.4.tgz#ee7039f7eb6c488d58b0a3365e7196e9b1b1ebb4" @@ -1327,6 +1382,13 @@ resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.3.1.tgz#e2c6e73e0bdeb2521d00756d099218e9f5d90a04" integrity sha512-/zPMqDkzSZ8t3VtxOa4KPq7uzzW978M9Tvh+j7GHKuo6k6GTLxPJ4J5gE5cjfJ26pnXst0N5Hax8Sr0T2Mi9zQ== +"@types/cli-progress@^3.11.0": + version "3.11.0" + resolved "https://registry.yarnpkg.com/@types/cli-progress/-/cli-progress-3.11.0.tgz#ec79df99b26757c3d1c7170af8422e0fc95eef7e" + integrity sha512-XhXhBv1R/q2ahF3BM7qT5HLzJNlIL0wbcGyZVjqOTqAybAnsLisd7gy1UCyIqpL+5Iv6XhlSyzjLCnI2sIdbCg== + dependencies: + "@types/node" "*" + "@types/expect@^1.20.4": version "1.20.4" resolved "https://registry.yarnpkg.com/@types/expect/-/expect-1.20.4.tgz#8288e51737bf7e3ab5d7c77bfa695883745264e5" From 2cec662385587ef30f61e8e7dc5f9c3885e71a4c Mon Sep 17 00:00:00 2001 From: Mike Donnalley Date: Thu, 26 Jan 2023 13:41:23 -0700 Subject: [PATCH 2/3] chore: bump deps --- package.json | 4 ++-- yarn.lock | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index af1d04f5..1d73bcd5 100644 --- a/package.json +++ b/package.json @@ -6,10 +6,10 @@ "main": "lib/index.js", "bugs": "https://github.com/forcedotcom/cli/issues", "dependencies": { - "@oclif/core": "^2.0.6", + "@oclif/core": "^2.0.7", "@salesforce/core": "^3.33.0", "@salesforce/kit": "^1.8.2", - "@salesforce/sf-plugins-core": "^2.0.0-beta.6", + "@salesforce/sf-plugins-core": "^2.0.0-beta.8", "@salesforce/ts-types": "^1.7.2", "tslib": "^2" }, diff --git a/yarn.lock b/yarn.lock index b2605626..c1718a8d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -763,10 +763,10 @@ widest-line "^3.1.0" wrap-ansi "^7.0.0" -"@oclif/core@^2.0.6": - version "2.0.6" - resolved "https://registry.yarnpkg.com/@oclif/core/-/core-2.0.6.tgz#8d3a571a162578999e3e95cb20d8b1f0403c33d7" - integrity sha512-AOgr1bBjjAyCWcaaai1z7kBULg2zodCuubnmoU7mge2IL/hh2E6F2jdI7wpPK6KI7gVqZq0PKGxsl4EOFsrErQ== +"@oclif/core@^2.0.7": + version "2.0.7" + resolved "https://registry.yarnpkg.com/@oclif/core/-/core-2.0.7.tgz#a17a85dfa105dda120fbc5647432010feaa97a9e" + integrity sha512-pj7hIH8SBeH3qha47fmyqdaBdNVEqesRgnKFh8Ytdb4S41/4BYOiQuyQGuvnKgvicH6DMxp4FbM9EQEW46V9xw== dependencies: "@types/cli-progress" "^3.11.0" ansi-escapes "^4.3.2" @@ -1179,12 +1179,12 @@ chalk "^4" inquirer "^8.2.5" -"@salesforce/sf-plugins-core@^2.0.0-beta.6": - version "2.0.0-beta.6" - resolved "https://registry.yarnpkg.com/@salesforce/sf-plugins-core/-/sf-plugins-core-2.0.0-beta.6.tgz#1bb8bbe45b3a9e44231da6392d69e2dbd518a4db" - integrity sha512-TnAq4UsdauYnthnthxGsOFtRghjrRZjSjJyCdKjymV8Uc/6pDMXJNgAD5PKT0GGU2kAHSTkH6YeOlsrQiRgrWw== +"@salesforce/sf-plugins-core@^2.0.0-beta.8": + version "2.0.0-beta.8" + resolved "https://registry.yarnpkg.com/@salesforce/sf-plugins-core/-/sf-plugins-core-2.0.0-beta.8.tgz#b6a775b1ed209e9fce13ce4ddf19e4323b148cd5" + integrity sha512-5jFFotkAlCxg9fqpCIVXnpoejpJ97mloYUL9/9ZPtc1teBIabwMT+k3g12LmcMa0CXd8YumKhnkOIbsvjh29LQ== dependencies: - "@oclif/core" "^2.0.6" + "@oclif/core" "^2.0.7" "@salesforce/core" "^3.32.12" "@salesforce/kit" "^1.8.3" "@salesforce/ts-types" "^1.7.1" From 35ded9ee80131e28b813127ea1da56842c03c35f Mon Sep 17 00:00:00 2001 From: Mike Donnalley Date: Mon, 30 Jan 2023 13:46:02 -0700 Subject: [PATCH 3/3] chore: bump deps --- package.json | 4 ++-- yarn.lock | 35 +++++++++++++++++++++++++++++------ 2 files changed, 31 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index fc7c33f0..f968130c 100644 --- a/package.json +++ b/package.json @@ -7,9 +7,9 @@ "bugs": "https://github.com/forcedotcom/cli/issues", "dependencies": { "@oclif/core": "^2.0.7", - "@salesforce/core": "^3.33.0", + "@salesforce/core": "^3.33.1", "@salesforce/kit": "^1.8.2", - "@salesforce/sf-plugins-core": "^2.0.0-beta.8", + "@salesforce/sf-plugins-core": "^2.0.1", "@salesforce/ts-types": "^1.7.2", "tslib": "^2" }, diff --git a/yarn.lock b/yarn.lock index 404c1ab3..17ca316a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1055,7 +1055,7 @@ strip-ansi "6.0.1" ts-retry-promise "^0.7.0" -"@salesforce/core@^3.32.12", "@salesforce/core@^3.33.0": +"@salesforce/core@^3.32.12": version "3.33.0" resolved "https://registry.yarnpkg.com/@salesforce/core/-/core-3.33.0.tgz#481cbd58955a7384a1f9200e02effc4dfe8e59da" integrity sha512-nz7qKwm1GpNr8swksthm5jKORj4wn647iCm6Ij1X5oRts1uynLdnqyNDtWD6OJCOaMXunjRmnhRB82JXq/TnFg== @@ -1078,6 +1078,29 @@ jsonwebtoken "9.0.0" ts-retry-promise "^0.7.0" +"@salesforce/core@^3.33.1": + version "3.33.1" + resolved "https://registry.yarnpkg.com/@salesforce/core/-/core-3.33.1.tgz#3dd0a44ba22763e8e0c2c97df03393e5c2c845d9" + integrity sha512-jaed8rK+NhSxB6MjYUN8f/2VkvtbFN/Ce/l6JvgFE+cvOf2g+lPv1pSsnKKlaSiiYcXkOvIRDT9d9ns1RLJzUw== + dependencies: + "@salesforce/bunyan" "^2.0.0" + "@salesforce/kit" "^1.8.0" + "@salesforce/schemas" "^1.4.0" + "@salesforce/ts-types" "^1.7.2" + "@types/graceful-fs" "^4.1.5" + "@types/semver" "^7.3.13" + ajv "^8.11.2" + archiver "^5.3.0" + change-case "^4.1.2" + debug "^3.2.7" + faye "^1.4.0" + form-data "^4.0.0" + graceful-fs "^4.2.9" + js2xmlparser "^4.0.1" + jsforce "^2.0.0-beta.19" + jsonwebtoken "9.0.0" + ts-retry-promise "^0.7.0" + "@salesforce/dev-config@^3.0.0", "@salesforce/dev-config@^3.1.0": version "3.1.0" resolved "https://registry.yarnpkg.com/@salesforce/dev-config/-/dev-config-3.1.0.tgz#8eb5b35860ff60d1c1dc3fd9329b01a28475d5b9" @@ -1179,13 +1202,13 @@ chalk "^4" inquirer "^8.2.5" -"@salesforce/sf-plugins-core@^2.0.0-beta.8": - version "2.0.0-beta.8" - resolved "https://registry.yarnpkg.com/@salesforce/sf-plugins-core/-/sf-plugins-core-2.0.0-beta.8.tgz#b6a775b1ed209e9fce13ce4ddf19e4323b148cd5" - integrity sha512-5jFFotkAlCxg9fqpCIVXnpoejpJ97mloYUL9/9ZPtc1teBIabwMT+k3g12LmcMa0CXd8YumKhnkOIbsvjh29LQ== +"@salesforce/sf-plugins-core@^2.0.1": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@salesforce/sf-plugins-core/-/sf-plugins-core-2.0.1.tgz#079d6cc200ea53ce7fb60aafb5eaf5f2b48e46c9" + integrity sha512-vT4Y9n/4lStSWrfMAlgQB/XzwJAYK6ibcsFykHNCl86NCoebVGzg5KDIxYjHpidrt2PG/nPk7NL9iBtTH/p8Yg== dependencies: "@oclif/core" "^2.0.7" - "@salesforce/core" "^3.32.12" + "@salesforce/core" "^3.33.1" "@salesforce/kit" "^1.8.3" "@salesforce/ts-types" "^1.7.1" chalk "^4"