Skip to content

Commit d205813

Browse files
dmhdmh
committed
[TASK] update watch and upload cmd-s error handlers
1 parent 30dfeb0 commit d205813

File tree

3 files changed

+40
-55
lines changed

3 files changed

+40
-55
lines changed

‎lib/compile/watch.js

+20-10
Original file line numberDiff line numberDiff line change
@@ -21,43 +21,53 @@ async function watchVendor () {
2121
ignoreInitial: true,
2222
awaitWriteFinish: false
2323
}).on('all', (event, path) => {
24-
console.log(`${chalk.red(event)} ${path}`)
25-
compileCss(true)
24+
if (event === 'add' || event === 'change') {
25+
console.log(`${chalk.red(event)} ${path}`)
26+
compileCss(true)
27+
}
2628
})
2729

2830
chokidar.watch(`${options.vendorSrc}/js`, {
2931
ignored: (path, stats) => Boolean(stats?.isFile() && !path.endsWith('.js')),
3032
ignoreInitial: true,
3133
awaitWriteFinish: false
3234
}).on('all', (event, path) => {
33-
console.log(`${chalk.red(event)} ${path}`)
34-
compileJs(true)
35+
if (event === 'add' || event === 'change') {
36+
console.log(`${chalk.red(event)} ${path}`)
37+
compileJs(true)
38+
}
3539
})
3640

3741
chokidar.watch(`${options.vendorSrc}/scss`, {
3842
ignored: (path, stats) => Boolean(stats?.isFile() && !path.endsWith('.scss')),
3943
ignoreInitial: true
4044
}).on('all', (event, path) => {
41-
console.log(`${chalk.red(event)} ${path}`)
42-
compileScss(true)
45+
if (event === 'add' || event === 'change') {
46+
console.log(`${chalk.red(event)} ${path}`)
47+
compileScss(true)
48+
}
4349
})
4450

4551
chokidar.watch(`${process.cwd()}/${options.themeFolder}`, {
4652
ignored: (path, stats) => Boolean(stats?.isFile() && !path.endsWith('fields.js')),
4753
ignoreInitial: true,
4854
awaitWriteFinish: false
4955
}).on('all', (event, path) => {
50-
console.log(`${chalk.red(event)} ${path}`)
51-
compileFieldsJs(path, true)
56+
if (event === 'add' || event === 'change') {
57+
console.log(`${chalk.red(event)} ${path}`)
58+
compileFieldsJs(path, true)
59+
}
5260
})
5361

5462
chokidar.watch(`${process.cwd()}/${options.themeFolder}/partials`, {
5563
ignored: (path, stats) => Boolean(stats?.isFile() && !path.endsWith('.js')),
5664
ignoreInitial: true,
5765
awaitWriteFinish: false
5866
}).on('all', (event, path) => {
59-
console.log(`${chalk.red(event)} ${path}`)
60-
compileFieldsJs('', true)
67+
if (event === 'add' || event === 'change') {
68+
console.log(`${chalk.red(event)} ${path}`)
69+
compileFieldsJs('', true)
70+
}
6171
})
6272
} catch (error) {
6373
console.error(error)

‎lib/hubspot/upload.js

+15-40
Original file line numberDiff line numberDiff line change
@@ -133,14 +133,9 @@ async function uploadTheme (config, themeName) {
133133
)
134134
ui.endTask({ taskName: 'uploadTheme', timeStart })
135135
} catch (error) {
136-
if (error.cause.response.data.errorType === 'TEMPLATE_VALIDATION_FAILED') {
137-
console.error(chalk.red(error.cause.response.data.errorType))
138-
console.error(error.message)
139-
process.exitCode = 1
140-
} else {
141-
console.error(error.message)
142-
process.exitCode = 1
143-
}
136+
console.error(chalk.red('Error:'))
137+
console.error(error.message)
138+
process.exitCode = 1
144139
if (process.env.DEBUG_MODE === 'debug') {
145140
console.error(error)
146141
process.exitCode = 1
@@ -189,14 +184,9 @@ async function cleanUploadThemeTemplates (config, themeName) {
189184
ui.endTask({ taskName: 'cleanUploadThemeTemplates', timeStart })
190185
} catch (error) {
191186
spinner.fail()
192-
if (error.cause.response.data.errorType === 'TEMPLATE_VALIDATION_FAILED') {
193-
console.error(chalk.red(error.cause.response.data.errorType))
194-
console.error(error.message)
195-
process.exitCode = 1
196-
} else {
197-
console.error(error.message)
198-
process.exitCode = 1
199-
}
187+
console.error(chalk.red('Error:'))
188+
console.error(error.message)
189+
process.exitCode = 1
200190
if (process.env.DEBUG_MODE === 'debug') {
201191
console.error(error)
202192
process.exitCode = 1
@@ -246,14 +236,9 @@ async function cleanUploadTheme (config, themeName) {
246236
ui.endTask({ taskName: 'cleanUploadTheme', timeStart })
247237
} catch (error) {
248238
spinner.fail()
249-
if (error.cause.response.data.errorType === 'TEMPLATE_VALIDATION_FAILED') {
250-
console.error(chalk.red(error.cause.response.data.errorType))
251-
console.error(error.message)
252-
process.exitCode = 1
253-
} else {
254-
console.error(error.message)
255-
process.exitCode = 1
256-
}
239+
console.error(chalk.red('Error:'))
240+
console.error(error.message)
241+
process.exitCode = 1
257242
if (process.env.DEBUG_MODE === 'debug') {
258243
console.error(error)
259244
process.exitCode = 1
@@ -303,14 +288,9 @@ async function ciUploadTheme (config, themeName) {
303288
ui.endTask({ taskName: 'ciUpload', timeStart })
304289
} catch (error) {
305290
spinner.fail()
306-
if (error.cause.response.data.errorType === 'TEMPLATE_VALIDATION_FAILED') {
307-
console.error(chalk.red(error.cause.response.data.errorType))
308-
console.error(error.message)
309-
process.exitCode = 1
310-
} else {
311-
console.error(error.message)
312-
process.exitCode = 1
313-
}
291+
console.error(chalk.red('Error:'))
292+
console.error(error.message)
293+
process.exitCode = 1
314294
if (process.env.DEBUG_MODE === 'debug') {
315295
console.error(error)
316296
process.exitCode = 1
@@ -419,14 +399,9 @@ async function uploadSelectedModules (config) {
419399
}
420400
ui.endTask({ taskName: 'uploadModules', timeStart })
421401
} catch (error) {
422-
if (error?.cause?.response?.data?.errorType === 'TEMPLATE_VALIDATION_FAILED') {
423-
console.error(chalk.red(error.cause.response.data.errorType))
424-
console.error(error.message)
425-
process.exitCode = 1
426-
} else {
427-
console.error(error.message)
428-
process.exitCode = 1
429-
}
402+
console.error(chalk.red('Error:'))
403+
console.error(error.message)
404+
process.exitCode = 1
430405
if (process.env.DEBUG_MODE === 'debug') {
431406
console.error(error)
432407
process.exitCode = 1

‎lib/hubspot/watch.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -76,12 +76,12 @@ async function watchHubspotTheme (config, themeName) {
7676
undefined,
7777
undefined,
7878
(file, dest, accountId) => (/** @type {any} */error) => {
79-
if (error && error.response && error.response.data) {
80-
if (error.response.data.status === 'error') {
81-
console.error(chalk.red(error.response.data.message))
79+
if (error && error.data) {
80+
if (error.data.status === 'error') {
81+
console.error(chalk.red(error.data.message))
8282
}
83-
if (Array.isArray(error.response.data.errors)) {
84-
error.response.data.errors.forEach((/** @type {any} */error) => {
83+
if (Array.isArray(error.data.errors)) {
84+
error.data.errors.forEach((/** @type {any} */error) => {
8585
if (!error.severity) {
8686
console.error(chalk.bold.red('●E'), error.message)
8787
} else {

0 commit comments

Comments
 (0)