diff --git a/apps/studio/src/lib/import-export/export/export-database.ts b/apps/studio/src/lib/import-export/export/export-database.ts index 50bf4dd3f0..8fec0b931d 100644 --- a/apps/studio/src/lib/import-export/export/export-database.ts +++ b/apps/studio/src/lib/import-export/export/export-database.ts @@ -20,17 +20,13 @@ export async function exportDatabaseToFile( // Execute the command to export directly to the temp file // Use absolute path /wordpress/ because that's where site.path is mounted in the WASM filesystem const vfsFilePath = `/wordpress/${ tempFileName }`; - const { stderr, exitCode } = await server.executeWpCliCommand( + const { exitCode } = await server.executeWpCliCommand( `sqlite export ${ vfsFilePath } --require=/tmp/sqlite-command/command.php --enable-ast-driver`, { skipPluginsAndThemes: true, } ); - if ( stderr ) { - throw new Error( `Database export failed: ${ stderr }` ); - } - if ( exitCode ) { throw new Error( 'Database export failed' ); } @@ -58,9 +54,6 @@ export async function exportDatabaseToMultipleFiles( skipPluginsAndThemes: true, } ); - if ( tablesResult.stderr ) { - throw new Error( `Database export failed: ${ tablesResult.stderr }` ); - } if ( tablesResult.exitCode ) { throw new Error( 'Database export failed' ); } @@ -89,17 +82,13 @@ export async function exportDatabaseToMultipleFiles( const vfsFilePath = `/wordpress/${ fileName }`; // Execute the command to export directly to a temporary file in the project directory - const { stderr, exitCode } = await server.executeWpCliCommand( + const { exitCode } = await server.executeWpCliCommand( `sqlite export ${ vfsFilePath } --tables=${ table } --require=/tmp/sqlite-command/command.php --enable-ast-driver`, { skipPluginsAndThemes: true, } ); - if ( stderr ) { - throw new Error( `Database export failed: ${ stderr }` ); - } - if ( exitCode ) { throw new Error( 'Database export failed' ); } diff --git a/apps/studio/src/lib/import-export/export/exporters/default-exporter.ts b/apps/studio/src/lib/import-export/export/exporters/default-exporter.ts index 9d2ccff1e0..cbf3a09115 100644 --- a/apps/studio/src/lib/import-export/export/exporters/default-exporter.ts +++ b/apps/studio/src/lib/import-export/export/exporters/default-exporter.ts @@ -308,7 +308,7 @@ export class DefaultExporter extends EventEmitter implements Exporter { return []; } - const { stderr, stdout } = await server.executeWpCliCommand( + const { exitCode, stdout } = await server.executeWpCliCommand( 'plugin list --status=active,inactive --fields=name,status,version --format=json', { skipPluginsAndThemes: true, @@ -320,8 +320,7 @@ export class DefaultExporter extends EventEmitter implements Exporter { try { return parseJsonFromPhpOutput( stdout ); } catch ( error ) { - if ( stderr ) { - console.error( `Could not get information about plugins: ${ stderr }` ); + if ( exitCode ) { throw new Error( 'Could not get information about installed plugins to create meta.json file.' ); @@ -340,7 +339,7 @@ export class DefaultExporter extends EventEmitter implements Exporter { return []; } - const { stderr, stdout } = await server.executeWpCliCommand( + const { exitCode, stdout } = await server.executeWpCliCommand( 'theme list --fields=name,status,version --format=json', { skipPluginsAndThemes: true, @@ -352,8 +351,7 @@ export class DefaultExporter extends EventEmitter implements Exporter { try { return parseJsonFromPhpOutput( stdout ); } catch ( error ) { - if ( stderr ) { - console.error( `Could not get information about themes: ${ stderr }` ); + if ( exitCode ) { throw new Error( 'Could not get information about installed themes to create meta.json file.' ); diff --git a/apps/studio/src/lib/import-export/tests/export/exporters/default-exporter.test.ts b/apps/studio/src/lib/import-export/tests/export/exporters/default-exporter.test.ts index 7e32ea83ac..87f8300e33 100644 --- a/apps/studio/src/lib/import-export/tests/export/exporters/default-exporter.test.ts +++ b/apps/studio/src/lib/import-export/tests/export/exporters/default-exporter.test.ts @@ -560,7 +560,7 @@ platformTestSuite( 'DefaultExporter', ( { normalize } ) => { return Promise.resolve( { stdout: '
some html', stderr: 'Error', - exitCode: 0, + exitCode: 1, } ); default: return Promise.resolve( { stdout: '', stderr: '', exitCode: 0 } );