diff --git a/packages/core/data-transfer/package.json b/packages/core/data-transfer/package.json index 04a2db5864..b56aa28c4d 100644 --- a/packages/core/data-transfer/package.json +++ b/packages/core/data-transfer/package.json @@ -65,7 +65,7 @@ "@types/uuid": "9.0.0", "koa": "2.13.4", "@types/koa": "2.13.4", - "knex": "1.0.7", + "knex": "2.4.0", "rimraf": "3.0.2", "typescript": "4.6.2" }, diff --git a/packages/core/strapi/lib/commands/transfer/export.js b/packages/core/strapi/lib/commands/transfer/export.js index 6197a8e062..841c9dceaa 100644 --- a/packages/core/strapi/lib/commands/transfer/export.js +++ b/packages/core/strapi/lib/commands/transfer/export.js @@ -112,7 +112,7 @@ module.exports = async (opts) => { logger.log(`Export archive is in ${chalk.green(outFile)}`); } catch { await strapi.telemetry.send('didDEITSProcessFail', getTelemetryPayload()); - logger.error('Export process failed'); + logger.error('Export process failed.'); process.exit(1); } diff --git a/packages/core/strapi/lib/commands/transfer/import.js b/packages/core/strapi/lib/commands/transfer/import.js index b2dbc96bf1..20cbad2e68 100644 --- a/packages/core/strapi/lib/commands/transfer/import.js +++ b/packages/core/strapi/lib/commands/transfer/import.js @@ -112,8 +112,7 @@ module.exports = async (opts) => { logger.info('Import process has been completed successfully!'); } catch (e) { await strapiInstance.telemetry.send('didDEITSProcessFail', getTelemetryPayload()); - logger.error('Import process failed unexpectedly'); - logger.error(e); + logger.error('Import process failed.'); process.exit(1); } diff --git a/packages/core/strapi/lib/commands/transfer/transfer.js b/packages/core/strapi/lib/commands/transfer/transfer.js index 2c79057e66..22d7a1513b 100644 --- a/packages/core/strapi/lib/commands/transfer/transfer.js +++ b/packages/core/strapi/lib/commands/transfer/transfer.js @@ -123,8 +123,7 @@ module.exports = async (opts) => { logger.log(`${chalk.bold('Transfer process has been completed successfully!')}`); process.exit(0); } catch (e) { - logger.error('Transfer process failed unexpectedly'); - logger.error(e); + logger.error('Transfer process failed.'); process.exit(1); } }; diff --git a/packages/core/strapi/lib/commands/transfer/utils.js b/packages/core/strapi/lib/commands/transfer/utils.js index f0a8dee0fa..02733ce4b2 100644 --- a/packages/core/strapi/lib/commands/transfer/utils.js +++ b/packages/core/strapi/lib/commands/transfer/utils.js @@ -140,23 +140,12 @@ const formatDiagnostic = ); try { if (kind === 'error') { - const { message, severity = 'fatal', error, details: moreDetails } = details; + const { message, severity = 'fatal' } = details; - const detailsInfo = error ?? moreDetails; - let errorMessage = errorColors[severity](`[${severity.toUpperCase()}] ${message}`); - if (detailsInfo && detailsInfo.details) { - const { - origin, - details: { step, details: stepDetails, ...moreInfo }, - } = detailsInfo; - errorMessage = `${errorMessage}. Thrown at ${origin} during ${step}.\n`; - if (stepDetails || moreInfo) { - const { check, ...info } = stepDetails ?? moreInfo; - errorMessage = `${errorMessage} Check ${check ?? ''}: ${JSON.stringify(info, null, 2)}`; - } - } + const colorizeError = errorColors[severity]; + const errorMessage = colorizeError(`[${severity.toUpperCase()}] ${message}`); - logger.error(new Error(errorMessage, error)); + logger.error(errorMessage); } if (kind === 'info') { const { message, params } = details;