Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 33 additions & 17 deletions packages/platform-android/src/commands/runAndroid/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@

import path from 'path';
import execa from 'execa';
import {spawnSync, spawn, execFileSync} from 'child_process';
import chalk from 'chalk';
import fs from 'fs';
import type {ConfigT} from 'types';
Expand Down Expand Up @@ -87,7 +86,19 @@ async function runAndroid(argv: Array<string>, config: ConfigT, args: FlagsT) {
} else {
// result == 'not_running'
logger.info('Starting JS server...');
startServerInNewWindow(args.port, args.terminal, config.reactNativePath);
try {
startServerInNewWindow(
args.port,
args.terminal,
config.reactNativePath,
);
} catch (error) {
logger.warn(
`Failed to automatically start the packager server. Please run "react-native start" manually. Error details: ${
error.message
}`,
);
}
}
return buildAndRun(args);
});
Expand Down Expand Up @@ -178,7 +189,7 @@ function buildApk(gradlew) {
const gradleArgs = ['build', '-x', 'lint'];
logger.info('Building the app...');
logger.debug(`Running command "${gradlew} ${gradleArgs.join(' ')}"`);
execFileSync(gradlew, gradleArgs, {stdio: 'inherit'});
execa.sync(gradlew, gradleArgs, {stdio: 'inherit'});
} catch (error) {
throw new CLIError('Failed to build the app.', error);
}
Expand All @@ -204,7 +215,7 @@ function tryInstallAppOnDevice(args, adbPath, device) {
logger.debug(
`Running command "cd android && adb -s ${device} install -r -d ${pathToApk}"`,
);
execFileSync(adbPath, adbArgs, {stdio: 'inherit'});
execa.sync(adbPath, adbArgs, {stdio: 'inherit'});
} catch (error) {
throw new CLIError('Failed to install the app on the device.', error);
}
Expand Down Expand Up @@ -310,33 +321,38 @@ function startServerInNewWindow(port, terminal, reactNativePath) {
});

if (process.platform === 'darwin') {
if (terminal) {
return spawnSync(
try {
return execa.sync(
'open',
['-a', terminal, launchPackagerScript],
procConfig,
);
} catch (error) {
return execa.sync('open', [launchPackagerScript], procConfig);
}
return spawnSync('open', [launchPackagerScript], procConfig);
}
if (process.platform === 'linux') {
if (terminal) {
procConfig.detached = true;
return spawn(terminal, ['-e', `sh ${launchPackagerScript}`], procConfig);
try {
return execa.sync(terminal, ['-e', `sh ${launchPackagerScript}`], {
...procConfig,
detached: true,
});
} catch (error) {
// By default, the child shell process will be attached to the parent
return execa.sync('sh', [launchPackagerScript], procConfig);
}
// By default, the child shell process will be attached to the parent
procConfig.detached = false;
return spawn('sh', [launchPackagerScript], procConfig);
}
if (/^win/.test(process.platform)) {
procConfig.detached = true;
procConfig.stdio = 'ignore';
//Temporary fix for #484. See comment on line 254
fs.writeFileSync(launchPackagerScript, launchPackagerScriptContent, {
encoding: 'utf8',
flag: 'w',
});
return spawn('cmd.exe', ['/C', launchPackagerScript], procConfig);
return execa.sync('cmd.exe', ['/C', launchPackagerScript], {
...procConfig,
detached: true,
stdio: 'ignore',
});
}
logger.error(
`Cannot start the packager. Unknown platform ${process.platform}`,
Expand Down Expand Up @@ -400,7 +416,7 @@ export default {
name: '--terminal [string]',
description:
'Launches the Metro Bundler in a new window using the specified terminal path.',
default: getDefaultUserTerminal,
default: getDefaultUserTerminal(),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How was it working previously?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it either didn't or used open/sh to open with a default program

},
{
name: '--tasks [list]',
Expand Down