Skip to content

Commit 7d889bd

Browse files
authored
Merge pull request #5209 from Shopify/jm/01-15-unify_asset_upload_error_reporting
[Themes] `theme dev` - unify asset upload error reporting
2 parents 92d7121 + 0971b54 commit 7d889bd

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

.changeset/stupid-phones-try.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@shopify/theme': minor
3+
---
4+
5+
Unify how asset upload errors are reported in the `theme dev` command

packages/theme/src/cli/utilities/theme-uploader.ts

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import {partitionThemeFiles} from './theme-fs.js'
22
import {rejectGeneratedStaticAssets} from './asset-checksum.js'
33
import {renderTasksToStdErr} from './theme-ui.js'
4-
import {createSyncingCatchError} from './errors.js'
4+
import {createSyncingCatchError, renderThrownError} from './errors.js'
55
import {AdminSession} from '@shopify/cli-kit/node/session'
66
import {Result, Checksum, Theme, ThemeFileSystem} from '@shopify/cli-kit/node/themes/types'
77
import {AssetParams, bulkUploadThemeAssets, deleteThemeAsset} from '@shopify/cli-kit/node/themes/api'
88
import {Task} from '@shopify/cli-kit/node/ui'
9-
import {outputDebug, outputInfo, outputNewline, outputWarn} from '@shopify/cli-kit/node/output'
9+
import {outputDebug} from '@shopify/cli-kit/node/output'
1010

1111
interface UploadOptions {
1212
nodelete?: boolean
@@ -432,10 +432,8 @@ async function handleFailedUploads(
432432
function reportFailedUploads(uploadResults: Map<string, Result>) {
433433
for (const [key, result] of uploadResults.entries()) {
434434
if (!result.success) {
435-
const errorMessage = result.errors?.asset?.map((err) => `-${err}`).join('\n')
436-
outputWarn(`Failed to upload file ${key}:`)
437-
outputInfo(`${errorMessage}`)
438-
outputNewline()
435+
const errorMessage = result.errors?.asset?.join('\n') ?? 'File upload failed'
436+
renderThrownError(key, new Error(errorMessage))
439437
}
440438
}
441439
}

0 commit comments

Comments
 (0)