Skip to content

Commit a52a595

Browse files
mdonnalleymdonnalley
committed
chore: bump MultiStageOutput
1 parent 5ad0309 commit a52a595

File tree

4 files changed

+50
-45
lines changed

4 files changed

+50
-45
lines changed

‎package.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@
66
"bugs": "https://github.com/forcedotcom/cli/issues",
77
"dependencies": {
88
"@oclif/core": "^4.0.16",
9+
"@oclif/multi-stage-output": "^0.3.0",
910
"@salesforce/core": "^8.2.7",
1011
"@salesforce/kit": "^3.2.0",
11-
"@salesforce/sf-plugins-core": "^11.3.3-dev.2",
12+
"@salesforce/sf-plugins-core": "^11.3.4",
1213
"@salesforce/source-deploy-retrieve": "^12.1.12",
1314
"ansis": "^3.2.0",
1415
"change-case": "^5.4.4",

‎src/commands/org/create/scratch.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
* For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
66
*/
77

8+
import { MultiStageOutput } from '@oclif/multi-stage-output';
89
import {
910
Lifecycle,
1011
Messages,
@@ -170,10 +171,11 @@ export default class OrgCreateScratch extends SfCommand<ScratchCreateResponse> {
170171
flags['client-id'] ? await this.secretPrompt({ message: messages.getMessage('prompt.secret') }) : undefined
171172
);
172173

173-
const stager = this.initStager<ScratchOrgLifecycleEvent & { alias: string | undefined }>({
174+
const stager = new MultiStageOutput<ScratchOrgLifecycleEvent & { alias: string | undefined }>({
174175
stages: flags.async ? ['prepare request', 'send request', 'done'] : scratchOrgLifecycleStages,
175176
title: flags.async ? 'Creating Scratch Org (async)' : 'Creating Scratch Org',
176177
data: { alias: flags.alias },
178+
jsonEnabled: this.jsonEnabled(),
177179
postStagesBlock: [
178180
{
179181
label: 'Request Id',

‎src/commands/org/resume/scratch.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import {
1919
SfError,
2020
} from '@salesforce/core';
2121
import terminalLink from 'terminal-link';
22+
import { MultiStageOutput } from '@oclif/multi-stage-output';
2223
import { ScratchCreateResponse } from '../../../shared/orgTypes.js';
2324

2425
Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
@@ -59,10 +60,11 @@ export default class OrgResumeScratch extends SfCommand<ScratchCreateResponse> {
5960
const cached = cache.get(jobId);
6061
const hubBaseUrl = cached?.hubBaseUrl;
6162

62-
const stager = this.initStager<ScratchOrgLifecycleEvent & { alias: string | undefined }>({
63+
const stager = new MultiStageOutput<ScratchOrgLifecycleEvent & { alias: string | undefined }>({
6364
stages: scratchOrgLifecycleStages,
6465
title: 'Resuming Scratch Org',
6566
data: { alias: cached?.alias },
67+
jsonEnabled: this.jsonEnabled(),
6668
postStagesBlock: [
6769
{
6870
label: 'Request Id',

‎yarn.lock‎

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1320,7 +1320,7 @@
13201320
resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-2.0.2.tgz#d9fae00a2d5cb40f92cfe64b47ad749fbc38f917"
13211321
integrity sha512-6EwiSjwWYP7pTckG6I5eyFANjPhmPjUX9JRLUSfNPC7FX7zK9gyZAfUEaECL6ALTpGX5AjnBq3C9XmVWPitNpw==
13221322

1323-
"@inquirer/confirm@^3.1.14", "@inquirer/confirm@^3.1.16", "@inquirer/confirm@^3.1.20", "@inquirer/confirm@^3.1.22":
1323+
"@inquirer/confirm@^3.1.14", "@inquirer/confirm@^3.1.16", "@inquirer/confirm@^3.1.22":
13241324
version "3.1.22"
13251325
resolved "https://registry.yarnpkg.com/@inquirer/confirm/-/confirm-3.1.22.tgz#23990624c11f60c6f7a5b0558c7505c35076a037"
13261326
integrity sha512-gsAKIOWBm2Q87CDfs9fEo7wJT3fwWIJfnDGMn9Qy74gBnNFOACDNfhUzovubbJjWnKLGBln7/NcSmZwj5DuEXg==
@@ -1360,7 +1360,7 @@
13601360
"@inquirer/core" "^9.0.8"
13611361
"@inquirer/type" "^1.5.1"
13621362

1363-
"@inquirer/password@^2.1.20", "@inquirer/password@^2.1.22":
1363+
"@inquirer/password@^2.1.22":
13641364
version "2.1.22"
13651365
resolved "https://registry.yarnpkg.com/@inquirer/password/-/password-2.1.22.tgz#ec7ee5709923cf285b3e0ae53eed4fdc3c05b422"
13661366
integrity sha512-5Fxt1L9vh3rAKqjYwqsjU4DZsEvY/2Gll+QkqR4yEpy6wvzLxdSgFhUcxfDAOtO4BEoTreWoznC0phagwLU5Kw==
@@ -1528,7 +1528,7 @@
15281528
wordwrap "^1.0.0"
15291529
wrap-ansi "^7.0.0"
15301530

1531-
"@oclif/core@^4", "@oclif/core@^4.0.15", "@oclif/core@^4.0.16":
1531+
"@oclif/core@^4", "@oclif/core@^4.0.16", "@oclif/core@^4.0.17":
15321532
version "4.0.17"
15331533
resolved "https://registry.yarnpkg.com/@oclif/core/-/core-4.0.17.tgz#2c934dd2b3789fe5e6cc9e2558a08007ba18cb03"
15341534
integrity sha512-zfdSRip9DVMOklMojWCLZEB4iOzy7LDTABCDzCXqmpZGS+o1e1xts4jGhnte3mi0WV0YthNfYqF16tqk6CWITA==
@@ -1551,12 +1551,13 @@
15511551
wordwrap "^1.0.0"
15521552
wrap-ansi "^7.0.0"
15531553

1554-
"@oclif/multi-stage-output@^0.2.1":
1555-
version "0.2.1"
1556-
resolved "https://registry.yarnpkg.com/@oclif/multi-stage-output/-/multi-stage-output-0.2.1.tgz#2f03992de174304c2a11ee48e864fef1396a0003"
1557-
integrity sha512-r5IbEcJ+ZDpMsaaTHqE1FAz4oXOMo3MLSKvRst0ye6CoEkv++UpYWBMGX0KBsvbfEpdrtHBvIhKcmYXTkFQ2Bw==
1554+
"@oclif/multi-stage-output@^0.3.0":
1555+
version "0.3.0"
1556+
resolved "https://registry.yarnpkg.com/@oclif/multi-stage-output/-/multi-stage-output-0.3.0.tgz#2d74763bd2215c61ec1cd53faf3138328d50122d"
1557+
integrity sha512-7pMD3CoXfS9/hEWzZ1b8GZb3leSNWENsMJS7uYTX0XqTXlrzh+eYvFHYcJh9bEkIw67LKjFfGGIwXbotdhtZKg==
15581558
dependencies:
15591559
"@oclif/core" "^4"
1560+
"@types/react" "^18.3.3"
15601561
change-case "^5.4.4"
15611562
cli-spinners "^2"
15621563
figures "^6.1.0"
@@ -1627,10 +1628,10 @@
16271628
strip-ansi "6.0.1"
16281629
ts-retry-promise "^0.8.1"
16291630

1630-
"@salesforce/core@^8.2.3", "@salesforce/core@^8.2.7", "@salesforce/core@^8.2.8", "@salesforce/core@^8.3.0":
1631-
version "8.3.0"
1632-
resolved "https://registry.yarnpkg.com/@salesforce/core/-/core-8.3.0.tgz#b61fb6c0c0dec5664ce12ba62ebe35136ae33878"
1633-
integrity sha512-HZchC42oGJ5RQsG9HpAb1bT7ohjB31ATDz46ryMvLngMmrfHnyzv2mlIi6UdYkJ/2meH2BJkibHi8paPrtF+/A==
1631+
"@salesforce/core@^8.2.3", "@salesforce/core@^8.2.7", "@salesforce/core@^8.2.8", "@salesforce/core@^8.3.0", "@salesforce/core@^8.4.0":
1632+
version "8.4.0"
1633+
resolved "https://registry.yarnpkg.com/@salesforce/core/-/core-8.4.0.tgz#d2ddfe07994c42b1e917e581e9cf47ad27b97a93"
1634+
integrity sha512-P+n0+Sp+v6voLTShW2E5sdF7gCUxEXJjNcc9Jtto0ZMyQesmQJ6WGpWmAuRoi+BVYc8OPSlEffndaYDAo/u73g==
16341635
dependencies:
16351636
"@jsforce/jsforce-node" "^3.4.0"
16361637
"@salesforce/kit" "^3.1.6"
@@ -1719,34 +1720,15 @@
17191720
resolved "https://registry.yarnpkg.com/@salesforce/schemas/-/schemas-1.9.0.tgz#ba477a112653a20b4edcf989c61c57bdff9aa3ca"
17201721
integrity sha512-LiN37zG5ODT6z70sL1fxF7BQwtCX9JOWofSU8iliSNIM+WDEeinnoFtVqPInRSNt8I0RiJxIKCrqstsmQRBNvA==
17211722

1722-
"@salesforce/sf-plugins-core@^11.2.4":
1723-
version "11.3.0"
1724-
resolved "https://registry.yarnpkg.com/@salesforce/sf-plugins-core/-/sf-plugins-core-11.3.0.tgz#7bf0466f65761dc6fdfdf78f79cc705dd74b6d87"
1725-
integrity sha512-kY+y8dxItkMCa52TCOxvu8nAPr2RyLf03pk+HVFMoHkVdumrbDdxmjYFNxAtYmDISQFx1W0SSoIeK2sboziDNw==
1726-
dependencies:
1727-
"@inquirer/confirm" "^3.1.20"
1728-
"@inquirer/password" "^2.1.20"
1729-
"@oclif/core" "^4.0.15"
1730-
"@salesforce/core" "^8.2.7"
1731-
"@salesforce/kit" "^3.2.1"
1732-
"@salesforce/ts-types" "^2.0.12"
1733-
ansis "^3.3.2"
1734-
cli-progress "^3.12.0"
1735-
natural-orderby "^3.0.2"
1736-
slice-ansi "^7.1.0"
1737-
string-width "^7.2.0"
1738-
terminal-link "^3.0.0"
1739-
1740-
"@salesforce/sf-plugins-core@^11.3.3-dev.2":
1741-
version "11.3.3-dev.2"
1742-
resolved "https://registry.yarnpkg.com/@salesforce/sf-plugins-core/-/sf-plugins-core-11.3.3-dev.2.tgz#b38c548216b0a950e21ee481e8d73be3199da162"
1743-
integrity sha512-25zArgUkG8dcOyojPv3+ILitg/gcrnLUUe8L+voFLPXn2ylWJ3h2wUX0pww3uZd+zHf+ywmuCysTKwgEpxYosg==
1723+
"@salesforce/sf-plugins-core@^11.2.4", "@salesforce/sf-plugins-core@^11.3.4":
1724+
version "11.3.4"
1725+
resolved "https://registry.yarnpkg.com/@salesforce/sf-plugins-core/-/sf-plugins-core-11.3.4.tgz#84fe3f0a1a3b5497103d8b1ed6de67aca1087f40"
1726+
integrity sha512-tgrdLbK4iZUD430lmAdrkMMgqSFiKXrkR6RYK3J4oHNj1kSzwSU7xvg+0U9NgVgEJQaLTEO5h2gV7LPnphlA6Q==
17441727
dependencies:
17451728
"@inquirer/confirm" "^3.1.22"
17461729
"@inquirer/password" "^2.1.22"
1747-
"@oclif/core" "^4.0.15"
1748-
"@oclif/multi-stage-output" "^0.2.1"
1749-
"@salesforce/core" "^8.2.7"
1730+
"@oclif/core" "^4.0.17"
1731+
"@salesforce/core" "^8.4.0"
17501732
"@salesforce/kit" "^3.2.1"
17511733
"@salesforce/ts-types" "^2.0.12"
17521734
ansis "^3.3.2"
@@ -2524,6 +2506,19 @@
25242506
resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.4.tgz#56e2cc26c397c038fab0e3a917a12d5c5909e901"
25252507
integrity sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA==
25262508

2509+
"@types/prop-types@*":
2510+
version "15.7.12"
2511+
resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.12.tgz#12bb1e2be27293c1406acb6af1c3f3a1481d98c6"
2512+
integrity sha512-5zvhXYtRNRluoE/jAp4GVsSduVUzNWKkOZrCDBWYtE7biZywwdC2AcEzg+cSMLFRfVgeAFqpfNabiPjxFddV1Q==
2513+
2514+
"@types/react@^18.3.3":
2515+
version "18.3.3"
2516+
resolved "https://registry.yarnpkg.com/@types/react/-/react-18.3.3.tgz#9679020895318b0915d7a3ab004d92d33375c45f"
2517+
integrity sha512-hti/R0pS0q1/xx+TsI73XIqk26eBsISZ2R0wUijXIngRK9R/e7Xw/cXVxQK7R5JjW+SV4zGcn5hXjudkN/pLIw==
2518+
dependencies:
2519+
"@types/prop-types" "*"
2520+
csstype "^3.0.2"
2521+
25272522
"@types/responselike@^1.0.0":
25282523
version "1.0.3"
25292524
resolved "https://registry.yarnpkg.com/@types/responselike/-/responselike-1.0.3.tgz#cc29706f0a397cfe6df89debfe4bf5cea159db50"
@@ -3615,6 +3610,11 @@ csprng@*:
36153610
dependencies:
36163611
sequin "*"
36173612

3613+
csstype@^3.0.2:
3614+
version "3.1.3"
3615+
resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.3.tgz#d80ff294d114fb0e6ac500fbf85b60137d7eff81"
3616+
integrity sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==
3617+
36183618
csv-parse@^5.5.2:
36193619
version "5.5.5"
36203620
resolved "https://registry.yarnpkg.com/csv-parse/-/csv-parse-5.5.5.tgz#68a271a9092877b830541805e14c8a80e6a22517"
@@ -7881,9 +7881,9 @@ type-fest@^1.0.2:
78817881
integrity sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA==
78827882

78837883
type-fest@^4.8.3:
7884-
version "4.20.1"
7885-
resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-4.20.1.tgz#d97bb1e923bf524e5b4b43421d586760fb2ee8be"
7886-
integrity sha512-R6wDsVsoS9xYOpy8vgeBlqpdOyzJ12HNfQhC/aAKWM3YoCV9TtunJzh/QpkMgeDhkoynDcw5f1y+qF9yc/HHyg==
7884+
version "4.25.0"
7885+
resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-4.25.0.tgz#b190374f969631866889bbdb01ece17ca424ee60"
7886+
integrity sha512-bRkIGlXsnGBRBQRAY56UXBm//9qH4bmJfFvq83gSz41N282df+fjy8ofcEgc1sM8geNt5cl6mC2g9Fht1cs8Aw==
78877887

78887888
typed-array-buffer@^1.0.1:
78897889
version "1.0.2"
@@ -8230,9 +8230,9 @@ write-file-atomic@^3.0.0:
82308230
typedarray-to-buffer "^3.1.5"
82318231

82328232
ws@^8.15.0:
8233-
version "8.17.1"
8234-
resolved "https://registry.yarnpkg.com/ws/-/ws-8.17.1.tgz#9293da530bb548febc95371d90f9c878727d919b"
8235-
integrity sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==
8233+
version "8.18.0"
8234+
resolved "https://registry.yarnpkg.com/ws/-/ws-8.18.0.tgz#0d7505a6eafe2b0e712d232b42279f53bc289bbc"
8235+
integrity sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==
82368236

82378237
xml2js@^0.6.2:
82388238
version "0.6.2"

0 commit comments

Comments
 (0)