Skip to content

Commit 1296ae3

Browse files
Merge pull request #62 from salesforcecli/phale/W-11644909
fix: add spinner and fix preserve file location msg
2 parents fdbaef4 + 7d732ae commit 1296ae3

File tree

4 files changed

+39
-29
lines changed

4 files changed

+39
-29
lines changed

messages/package_version_create.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -303,4 +303,12 @@ The %s value "%s" from the command line or sfdx-project.json is not in the corre
303303

304304
# requestInProgress
305305

306-
Request in progress. Sleeping %s seconds. Will wait a total of %s more seconds before timing out. Current Status=%s.
306+
Version create.
307+
308+
# packageVersionCreateWaitingStatus
309+
310+
%d minutes remaining until timeout. Create version status: %s
311+
312+
# packageVersionCreateFinalStatus
313+
314+
Create version status: %s

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"@salesforce/command": "^5.2.6",
1111
"@salesforce/core": "^3.26.2",
1212
"@salesforce/kit": "^1.6.0",
13-
"@salesforce/packaging": "^0.0.23",
13+
"@salesforce/packaging": "^0.0.27",
1414
"tslib": "^2",
1515
"chalk": "^4.1.2"
1616
},

src/commands/force/package/beta/version/create.ts

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -159,11 +159,18 @@ export class PackageVersionCreateCommand extends SfdxCommand {
159159
// eslint-disable-next-line @typescript-eslint/require-await
160160
Lifecycle.getInstance().on('in-progress', async (data: PackageVersionCreateReportProgress) => {
161161
if (data.Status !== Package2VersionStatus.success && data.Status !== Package2VersionStatus.error) {
162-
this.ux.log(
163-
messages.getMessage('requestInProgress', [frequency.seconds, data.remainingWaitTime.seconds, data.Status])
162+
this.ux.setSpinnerStatus(
163+
messages.getMessage('packageVersionCreateWaitingStatus', [data.remainingWaitTime.minutes, data.Status])
164164
);
165165
}
166166
});
167+
Lifecycle.getInstance().on(
168+
'packageVersionCreate:preserveFiles',
169+
// eslint-disable-next-line @typescript-eslint/require-await
170+
async (data: { location: string; message: string }) => {
171+
this.ux.log(messages.getMessage('tempFileLocation', [data.location]));
172+
}
173+
);
167174

168175
// resolve the package id from the --package flag, first checking if it's an alias, then using the flag (an id), and then looking for the package name from the --path flag
169176
let packageName: string;
@@ -179,18 +186,18 @@ export class PackageVersionCreateCommand extends SfdxCommand {
179186
const packageId = getPackageIdFromAlias(packageName, this.project);
180187

181188
const pv = new PackageVersion({ project: this.project, connection: this.hubOrg.getConnection() });
189+
this.ux.startSpinner(messages.getMessage('requestInProgress'));
182190
const result = await pv.create(
183191
{ ...this.flags, ...{ packageId } },
184192
{
185193
timeout: this.flags.wait as Duration,
186194
frequency,
187195
}
188196
);
189-
197+
this.ux.stopSpinner(messages.getMessage('packageVersionCreateFinalStatus', [result.Status]));
190198
switch (result.Status) {
191199
case 'Error':
192-
this.ux.log(messages.getMessage('unknownError', [result.Error.join('\n')]));
193-
break;
200+
throw messages.createError('unknownError', [result.Error.join('\n')]);
194201
case 'Success':
195202
this.ux.log(
196203
messages.getMessage(result.Status, [

yarn.lock

Lines changed: 17 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1150,10 +1150,10 @@
11501150
shx "^0.3.3"
11511151
tslib "^2.2.0"
11521152

1153-
"@salesforce/packaging@^0.0.23":
1154-
version "0.0.23"
1155-
resolved "https://registry.yarnpkg.com/@salesforce/packaging/-/packaging-0.0.23.tgz#033cfbd6407fcfdb916b575355773b5210af2d2e"
1156-
integrity sha512-TbqhfeIsU20In8NJuMeYHCMCNdBU4hbT+uY1/+lLZIdhP4f4dlUkWPGM3Os10f9MW47PPb8gT8+vlPDf5FWbdg==
1153+
"@salesforce/packaging@^0.0.27":
1154+
version "0.0.27"
1155+
resolved "https://registry.yarnpkg.com/@salesforce/packaging/-/packaging-0.0.27.tgz#4db9480024288a26f2549e4f3b7a7ddc20e62808"
1156+
integrity sha512-1hMGLD32zH/VCEik5wLVPXqQ7y6NHwvTsC5uKurCdvqjLjP3NuJQaSTXInaP3uXSttgmsy+XIsDlmp4f3aLtpw==
11571157
dependencies:
11581158
"@salesforce/core" "^3.26.2"
11591159
"@salesforce/kit" "^1.6.0"
@@ -1212,12 +1212,7 @@
12121212
resolved "https://registry.yarnpkg.com/@salesforce/prettier-config/-/prettier-config-0.0.2.tgz#ded39bf7cb75238edc9db6dd093649111350f8bc"
12131213
integrity sha512-KExM355BLbxCW6siGBV7oUOotXvvVp0tAWERgzUkM2FcMb9fWrjwXDrIHc8V0UdDlA3UXtFltDWgN+Yqi+BA/g==
12141214

1215-
"@salesforce/schemas@^1.0.1", "@salesforce/schemas@^1.1.0":
1216-
version "1.1.3"
1217-
resolved "https://registry.yarnpkg.com/@salesforce/schemas/-/schemas-1.1.3.tgz#fce83f55c7557d47b9c814d5d02978ad734300b3"
1218-
integrity sha512-XWohlOT2oQDqAJH00OXS3f2MGjkwZ6pr4emnnkHSQbg7UdGW0rvGpEnRKqBbDUfZ4K5YKSo9Gj216ZtaP3JLXg==
1219-
1220-
"@salesforce/schemas@^1.2.0":
1215+
"@salesforce/schemas@^1.0.1", "@salesforce/schemas@^1.1.0", "@salesforce/schemas@^1.2.0":
12211216
version "1.2.0"
12221217
resolved "https://registry.yarnpkg.com/@salesforce/schemas/-/schemas-1.2.0.tgz#3c7ed492e3ee5d9d9fb24a32b5c574893f6648db"
12231218
integrity sha512-76oYf/9Rsn6Yl+awrTQvLaQuRDNX7F3X9ksRiw53OCJdydIF05buX6XLzN0WDWpkCg/asw+lZMuAzbDVS0tBmg==
@@ -2274,9 +2269,9 @@ camelcase@^6.0.0:
22742269
integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==
22752270

22762271
caniuse-lite@^1.0.30001370:
2277-
version "1.0.30001382"
2278-
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001382.tgz#4d37f0d0b6fffb826c8e5e1c0f4bf8ce592db949"
2279-
integrity sha512-2rtJwDmSZ716Pxm1wCtbPvHtbDWAreTPxXbkc5RkKglow3Ig/4GNGazDI9/BVnXbG/wnv6r3B5FEbkfg9OcTGg==
2272+
version "1.0.30001383"
2273+
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001383.tgz#aecf317ccd940690725ae3ae4f28293c5fb8050e"
2274+
integrity sha512-swMpEoTp5vDoGBZsYZX7L7nXHe6dsHxi9o6/LKf/f0LukVtnrxly5GVb/fWdCDTqi/yw6Km6tiJ0pmBacm0gbg==
22802275

22812276
capital-case@^1.0.4:
22822277
version "1.0.4"
@@ -2788,14 +2783,14 @@ convert-source-map@^1.7.0:
27882783
safe-buffer "~5.1.1"
27892784

27902785
core-js-pure@^3.20.2:
2791-
version "3.24.1"
2792-
resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.24.1.tgz#8839dde5da545521bf282feb7dc6d0b425f39fd3"
2793-
integrity sha512-r1nJk41QLLPyozHUUPmILCEMtMw24NG4oWK6RbsDdjzQgg9ZvrUsPBj1MnG0wXXp1DCDU6j+wUvEmBSrtRbLXg==
2786+
version "3.25.0"
2787+
resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.25.0.tgz#f8d1f176ff29abbfeb610110de891d5ae5a361d4"
2788+
integrity sha512-IeHpLwk3uoci37yoI2Laty59+YqH9x5uR65/yiA0ARAJrTrN4YU0rmauLWfvqOuk77SlNJXj2rM6oT/dBD87+A==
27942789

27952790
core-js@^3.6.4:
2796-
version "3.24.1"
2797-
resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.24.1.tgz#cf7724d41724154010a6576b7b57d94c5d66e64f"
2798-
integrity sha512-0QTBSYSUZ6Gq21utGzkfITDylE8jWC9Ne1D2MrhvlsZBI1x39OdDIVbzSqtgMndIy6BlHxBXpMGqzZmnztg2rg==
2791+
version "3.25.0"
2792+
resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.25.0.tgz#be71d9e0dd648ffd70c44a7ec2319d039357eceb"
2793+
integrity sha512-CVU1xvJEfJGhyCpBrzzzU1kjCfgsGUxhEvwUV2e/cOedYWHdmluamx+knDnmhqALddMG16fZvIqvs9aijsHHaA==
27992794

28002795
28012796
version "1.0.2"
@@ -3197,9 +3192,9 @@ ejs@^3.1.6, ejs@^3.1.8:
31973192
jake "^10.8.5"
31983193

31993194
electron-to-chromium@^1.4.202:
3200-
version "1.4.228"
3201-
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.228.tgz#3baff13cf54198c2045f9bdd8b64db93aafd7f33"
3202-
integrity sha512-XfDHCvou7CsDMlFwb0WZ1tWmW48e7Sn7VBRyPfZsZZila9esRsJl1trO+OqDNV97GggFSt0ISbWslKXfQkG//g==
3195+
version "1.4.230"
3196+
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.230.tgz#666909fdf5765acb1348b69752ee9955dc1664b7"
3197+
integrity sha512-3pwjAK0qHSDN9+YAF4fJknsSruP7mpjdWzUSruIJD/JCH77pEh0SorEyb3xVaKkfwk2tzjOt2D8scJ0KAdfXLA==
32033198

32043199
emoji-regex@^8.0.0:
32053200
version "8.0.0"

0 commit comments

Comments
 (0)