Skip to content

Commit

Permalink
feat(cli): Add --forwardPorts option to Capacitor CLI (#5645)
Browse files Browse the repository at this point in the history
Co-authored-by: Mark Anderson <mark@ionic.io>
  • Loading branch information
thomasvidas and markemer committed Mar 15, 2023
1 parent bea0c75 commit 2f04d29
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 3 deletions.
10 changes: 9 additions & 1 deletion cli/src/android/run.ts
Expand Up @@ -12,7 +12,11 @@ const debug = Debug('capacitor:android:run');

export async function runAndroid(
config: Config,
{ target: selectedTarget, flavor: selectedFlavor }: RunCommandOptions,
{
target: selectedTarget,
flavor: selectedFlavor,
forwardPorts: selectedPorts,
}: RunCommandOptions,
): Promise<void> {
const target = await promptForPlatformTarget(
await getPlatformTargets('android'),
Expand Down Expand Up @@ -52,6 +56,10 @@ export async function runAndroid(

const nativeRunArgs = ['android', '--app', apkPath, '--target', target.id];

if (selectedPorts) {
nativeRunArgs.push('--forward', `${selectedPorts}`);
}

debug('Invoking native-run with args: %O', nativeRunArgs);

await runTask(
Expand Down
11 changes: 9 additions & 2 deletions cli/src/index.ts
Expand Up @@ -182,7 +182,6 @@ export function runProgram(config: Config): void {
),
),
);

program
.command(`run [platform]`)
.description(
Expand All @@ -195,18 +194,26 @@ export function runProgram(config: Config): void {
.allowUnknownOption(true)
.option('--target <id>', 'use a specific target')
.option('--no-sync', `do not run ${c.input('sync')}`)
.option(
'--forwardPorts <port:port>',
'Automatically run "adb reverse" for better live-reloading support',
)
.action(
wrapAction(
telemetryAction(
config,
async (platform, { scheme, flavor, list, target, sync }) => {
async (
platform,
{ scheme, flavor, list, target, sync, forwardPorts },
) => {
const { runCommand } = await import('./tasks/run');
await runCommand(config, platform, {
scheme,
flavor,
list,
target,
sync,
forwardPorts,
});
},
),
Expand Down
1 change: 1 addition & 0 deletions cli/src/tasks/run.ts
Expand Up @@ -24,6 +24,7 @@ export interface RunCommandOptions {
list?: boolean;
target?: string;
sync?: boolean;
forwardPorts?: string;
}

export async function runCommand(
Expand Down

0 comments on commit 2f04d29

Please sign in to comment.