Skip to content

Commit 0f47e93

Browse files
authored
fix: bump dep + add msg W-18895089 (#1473)
* fix: bump dep + add msg * chore: bump sfdx-core
1 parent f700329 commit 0f47e93

File tree

4 files changed

+21
-65
lines changed

4 files changed

+21
-65
lines changed

messages/resume_scratch.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,3 +51,7 @@ There are no recent job IDs (ScratchOrgInfo requests) in your cache that match %
5151
# success
5252

5353
Your scratch org is ready.
54+
55+
# StillInProgressError.actions
56+
57+
Increase the --wait time because creating a scratch org can take a while.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"dependencies": {
88
"@oclif/core": "^4.5.1",
99
"@oclif/multi-stage-output": "^0.8.18",
10-
"@salesforce/core": "^8.18.1",
10+
"@salesforce/core": "^8.18.5",
1111
"@salesforce/kit": "^3.2.3",
1212
"@salesforce/sf-plugins-core": "^12.2.3",
1313
"@salesforce/source-deploy-retrieve": "^12.21.5",

src/commands/org/resume/scratch.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,9 @@ export default class OrgResumeScratch extends SfCommand<ScratchCreateResponse> {
125125
if (cache.keys() && e instanceof Error && e.name === 'CacheMissError') {
126126
// we have something in the cache, but it didn't match what the user passed in
127127
throw messages.createError('error.jobIdMismatch', [jobId]);
128+
} else if (e instanceof SfError && e.name === 'StillInProgressError') {
129+
e.actions = messages.getMessages('StillInProgressError.actions');
130+
throw e;
128131
} else {
129132
throw SfError.wrap(e);
130133
}

yarn.lock

Lines changed: 13 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -1326,16 +1326,11 @@
13261326
"@inquirer/type" "^3.0.7"
13271327
yoctocolors-cjs "^2.1.2"
13281328

1329-
"@inquirer/figures@^1.0.12":
1329+
"@inquirer/figures@^1.0.12", "@inquirer/figures@^1.0.5":
13301330
version "1.0.12"
13311331
resolved "https://registry.yarnpkg.com/@inquirer/figures/-/figures-1.0.12.tgz#667d6254cc7ba3b0c010a323d78024a1d30c6053"
13321332
integrity sha512-MJttijd8rMFcKJC8NYmprWr6hD3r9Gd9qUC0XwPNwoEPWSMVJwA2MlXxF+nhZZNMY+HXsWa+o7KY2emWYIn0jQ==
13331333

1334-
"@inquirer/figures@^1.0.5":
1335-
version "1.0.11"
1336-
resolved "https://registry.yarnpkg.com/@inquirer/figures/-/figures-1.0.11.tgz#4744e6db95288fea1dead779554859710a959a21"
1337-
integrity sha512-eOg92lvrn/aRUqbxRyvpEWnrvRuTYRifixHkYVpJiygTgVSBIHDqLh0SrMQXkafvULg3ck11V7xvR+zcgvpHFw==
1338-
13391334
"@inquirer/input@^2.2.4":
13401335
version "2.2.7"
13411336
resolved "https://registry.npmjs.org/@inquirer/input/-/input-2.2.7.tgz"
@@ -1690,10 +1685,10 @@
16901685
strip-ansi "6.0.1"
16911686
ts-retry-promise "^0.8.1"
16921687

1693-
"@salesforce/core@^8.14.0", "@salesforce/core@^8.15.0", "@salesforce/core@^8.18.1", "@salesforce/core@^8.5.1", "@salesforce/core@^8.8.0":
1694-
version "8.18.1"
1695-
resolved "https://registry.yarnpkg.com/@salesforce/core/-/core-8.18.1.tgz#4a790f9479339f45e42799d9ef7a1428d49b6ba1"
1696-
integrity sha512-RkG9Ye5TdsIQz4KLUHvDpVjbrTeeRmw5KUJIHRyMGAOjKB8wr2jvgXyZm7GD0epIW5ILsyKQQWWOa1uqsfVycA==
1688+
"@salesforce/core@^8.14.0", "@salesforce/core@^8.15.0", "@salesforce/core@^8.18.1", "@salesforce/core@^8.18.5", "@salesforce/core@^8.5.1", "@salesforce/core@^8.8.0":
1689+
version "8.18.5"
1690+
resolved "https://registry.yarnpkg.com/@salesforce/core/-/core-8.18.5.tgz#8205f3b1ee9ef63740128bef81cc32213a76296a"
1691+
integrity sha512-zQSIjo0L0ddcZbj3Oxxig2J6aYL5H5FY45TpXAXpjGe0UPWNxXkU2mrcDfs9OSn0MhM3uMj4fUIM1a158/3Lug==
16971692
dependencies:
16981693
"@jsforce/jsforce-node" "^3.9.1"
16991694
"@salesforce/kit" "^3.2.2"
@@ -1703,7 +1698,7 @@
17031698
change-case "^4.1.2"
17041699
fast-levenshtein "^3.0.0"
17051700
faye "^1.4.0"
1706-
form-data "^4.0.0"
1701+
form-data "^4.0.4"
17071702
js2xmlparser "^4.0.1"
17081703
jsonwebtoken "9.0.2"
17091704
jszip "3.10.1"
@@ -4036,14 +4031,7 @@ es-array-method-boxes-properly@^1.0.0:
40364031
resolved "https://registry.npmjs.org/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz"
40374032
integrity sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA==
40384033

4039-
es-define-property@^1.0.0:
4040-
version "1.0.0"
4041-
resolved "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz"
4042-
integrity sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==
4043-
dependencies:
4044-
get-intrinsic "^1.2.4"
4045-
4046-
es-define-property@^1.0.1:
4034+
es-define-property@^1.0.0, es-define-property@^1.0.1:
40474035
version "1.0.1"
40484036
resolved "https://registry.yarnpkg.com/es-define-property/-/es-define-property-1.0.1.tgz#983eb2f9a6724e9303f61addf011c72e09e0b0fa"
40494037
integrity sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==
@@ -4060,16 +4048,7 @@ es-object-atoms@^1.0.0, es-object-atoms@^1.1.1:
40604048
dependencies:
40614049
es-errors "^1.3.0"
40624050

4063-
es-set-tostringtag@^2.0.2:
4064-
version "2.0.3"
4065-
resolved "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.3.tgz"
4066-
integrity sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ==
4067-
dependencies:
4068-
get-intrinsic "^1.2.4"
4069-
has-tostringtag "^1.0.2"
4070-
hasown "^2.0.1"
4071-
4072-
es-set-tostringtag@^2.1.0:
4051+
es-set-tostringtag@^2.0.2, es-set-tostringtag@^2.1.0:
40734052
version "2.1.0"
40744053
resolved "https://registry.yarnpkg.com/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz#f31dbbe0c183b00a6d26eb6325c810c0fd18bd4d"
40754054
integrity sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==
@@ -4615,7 +4594,7 @@ form-data-encoder@^2.1.2:
46154594
resolved "https://registry.npmjs.org/form-data-encoder/-/form-data-encoder-2.1.4.tgz"
46164595
integrity sha512-yDYSgNMraqvnxiEXO4hi88+YZxaHC6QKzb5N84iRCTDeRO7ZALpir/lVmf/uXUhnwUr2O4HU8s/n6x+yNjQkHw==
46174596

4618-
form-data@^4.0.0:
4597+
form-data@^4.0.0, form-data@^4.0.4:
46194598
version "4.0.4"
46204599
resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.4.tgz#784cdcce0669a9d68e94d11ac4eea98088edd2c4"
46214600
integrity sha512-KrGhL9Q4zjj0kiUt5OO4Mr/A/jlI2jDYs5eHBpYHPcBEVSiipAvn2Ko2HnPe20rmcuuvMHNdZFp+4IlGTMF0Ow==
@@ -4709,18 +4688,7 @@ get-func-name@^2.0.1, get-func-name@^2.0.2:
47094688
resolved "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.2.tgz"
47104689
integrity sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ==
47114690

4712-
get-intrinsic@^1.1.3, get-intrinsic@^1.2.1, get-intrinsic@^1.2.2, get-intrinsic@^1.2.3, get-intrinsic@^1.2.4:
4713-
version "1.2.4"
4714-
resolved "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz"
4715-
integrity sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==
4716-
dependencies:
4717-
es-errors "^1.3.0"
4718-
function-bind "^1.1.2"
4719-
has-proto "^1.0.1"
4720-
has-symbols "^1.0.3"
4721-
hasown "^2.0.0"
4722-
4723-
get-intrinsic@^1.2.6:
4691+
get-intrinsic@^1.2.1, get-intrinsic@^1.2.2, get-intrinsic@^1.2.3, get-intrinsic@^1.2.4, get-intrinsic@^1.2.6:
47244692
version "1.3.0"
47254693
resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.3.0.tgz#743f0e3b6964a93a5491ed1bffaae054d7f98d01"
47264694
integrity sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==
@@ -4904,14 +4872,7 @@ globby@^14.1.0:
49044872
slash "^5.1.0"
49054873
unicorn-magic "^0.3.0"
49064874

4907-
gopd@^1.0.1:
4908-
version "1.0.1"
4909-
resolved "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz"
4910-
integrity sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==
4911-
dependencies:
4912-
get-intrinsic "^1.1.3"
4913-
4914-
gopd@^1.2.0:
4875+
gopd@^1.0.1, gopd@^1.2.0:
49154876
version "1.2.0"
49164877
resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.2.0.tgz#89f56b8217bdbc8802bd299df6d7f1081d7e51a1"
49174878
integrity sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==
@@ -5009,12 +4970,7 @@ has-proto@^1.0.1, has-proto@^1.0.3:
50094970
resolved "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz"
50104971
integrity sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==
50114972

5012-
has-symbols@^1.0.2, has-symbols@^1.0.3:
5013-
version "1.0.3"
5014-
resolved "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz"
5015-
integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==
5016-
5017-
has-symbols@^1.1.0:
4973+
has-symbols@^1.0.2, has-symbols@^1.0.3, has-symbols@^1.1.0:
50184974
version "1.1.0"
50194975
resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.1.0.tgz#fc9c6a783a084951d0b971fe1018de813707a338"
50204976
integrity sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==
@@ -5034,14 +4990,7 @@ hasha@^5.0.0:
50344990
is-stream "^2.0.0"
50354991
type-fest "^0.8.0"
50364992

5037-
hasown@^2.0.0, hasown@^2.0.1:
5038-
version "2.0.1"
5039-
resolved "https://registry.npmjs.org/hasown/-/hasown-2.0.1.tgz"
5040-
integrity sha512-1/th4MHjnwncwXsIW6QMzlvYL9kG5e/CpVvLRZe4XPa8TOUNbCELqmvhDmnkNsAjwaG4+I8gJJL0JBvTTLO9qA==
5041-
dependencies:
5042-
function-bind "^1.1.2"
5043-
5044-
hasown@^2.0.2:
4993+
hasown@^2.0.0, hasown@^2.0.1, hasown@^2.0.2:
50454994
version "2.0.2"
50464995
resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.2.tgz#003eaf91be7adc372e84ec59dc37252cedb80003"
50474996
integrity sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==

0 commit comments

Comments
 (0)