Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(): support consolelogs in native run #3995

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
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
7 changes: 5 additions & 2 deletions packages/ionic/src/commands/cordova/run.ts
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,6 @@ export class RunCommand extends CordovaCommand implements CommandPreRun {

const serveRunner = this.project && await this.project.getServeRunner();
const buildRunner = this.project && await this.project.getBuildRunner();

if (buildRunner) {
const libmetadata = await buildRunner.getCommandMetadata();
groups = libmetadata.groups || [];
Expand Down Expand Up @@ -241,6 +240,8 @@ Just like with ${input('ionic cordova build')}, you can pass additional options
}

protected async runServeDeploy(inputs: CommandLineInputs, options: CommandLineOptions) {


const conf = await loadConfigXml(this.integration);
const metadata = await this.getMetadata();

Expand Down Expand Up @@ -275,7 +276,9 @@ Just like with ${input('ionic cordova build')}, you can pass additional options
if (options['native-run']) {
const [ platform ] = inputs;
const packagePath = await getPackagePath(conf.getProjectInfo().name, platform, !options['device']);

const { port: portForward } = url.parse(livereloadUrl);
const consolelogsPortForward = options["consolelogs-port"] as string

const buildOpts: IShellRunOptions = { stream: cordovalogws };
// ignore very verbose compiler output unless --verbose (still pipe stderr)
Expand All @@ -284,7 +287,7 @@ Just like with ${input('ionic cordova build')}, you can pass additional options
}

await this.runCordova(filterArgumentsForCordova({ ...metadata, name: 'build' }, options), buildOpts);
await this.runNativeRun(createNativeRunArgs({ packagePath, platform, portForward }, options));
await this.runNativeRun(createNativeRunArgs({ packagePath, platform, portForward, consolelogsPortForward }, options));
} else {
await this.runCordova(filterArgumentsForCordova(metadata, options), { stream: cordovalogws });
await sleepForever();
Expand Down
1 change: 1 addition & 0 deletions packages/ionic/src/definitions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -672,6 +672,7 @@ export interface ServeDetails {
port: number;
externalNetworkInterfaces: NetworkInterface[];
externallyAccessible: boolean;
consolelogsPort?: number;
}

export interface IAilment {
Expand Down
6 changes: 5 additions & 1 deletion packages/ionic/src/lib/native-run.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,10 @@ export interface NativeRunSchema {
packagePath: string;
platform: string;
portForward?: string | number;
consolelogsPortForward?: string | number;
}

export function createNativeRunArgs({ packagePath, platform, portForward }: NativeRunSchema, options: CommandLineOptions): string[] {
export function createNativeRunArgs({ packagePath, platform, portForward, consolelogsPortForward }: NativeRunSchema, options: CommandLineOptions): string[] {
const opts = [platform, '--app', packagePath];
const target = options['target'] ? String(options['target']) : undefined;

Expand All @@ -33,6 +34,9 @@ export function createNativeRunArgs({ packagePath, platform, portForward }: Nati
if (!options['livereload-url'] && portForward) {
opts.push('--forward', `${portForward}:${portForward}`);
}
if (options['consolelogs'] && consolelogsPortForward) {
opts.push('--forward', `${consolelogsPortForward}:${consolelogsPortForward}`)
}

if (options['json']) {
opts.push('--json');
Expand Down
6 changes: 5 additions & 1 deletion packages/ionic/src/lib/project/angular/serve.ts
Original file line number Diff line number Diff line change
Expand Up @@ -138,17 +138,21 @@ The dev server can use HTTPS via the ${input('--ssl')} option ${chalk.bold.red('
const [ externalIP, availableInterfaces ] = await this.selectExternalIP(options);

const port = options.port = await findClosestOpenPort(options.port);
let consolelogsPort;

if (options.consolelogs && options.consolelogsPort) {
consolelogsPort = options.consolelogsPort = await findClosestOpenPort(options.consolelogsPort);
}
const ng = new AngularServeCLI(this.e);
await ng.serve(options);

return {
custom: ng.resolvedProgram !== ng.program,
protocol: options.ssl ? 'https' : 'http',
localAddress: 'localhost',
externalAddress: externalIP,
externalNetworkInterfaces: availableInterfaces,
port,
consolelogsPort,
externallyAccessible: ![BIND_ALL_ADDRESS, ...LOCAL_ADDRESSES].includes(externalIP),
};
}
Expand Down
11 changes: 9 additions & 2 deletions packages/ionic/src/lib/serve.ts
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,13 @@ export const COMMON_SERVE_COMMAND_OPTIONS: readonly CommandMetadataOption[] = [
default: false,
groups: [MetadataGroup.ADVANCED],
},
{
name: 'consolelogs-port',
summary: 'Port to use for console logs',
default: DEFAULT_DEV_LOGGER_PORT.toString(),
groups: [MetadataGroup.ADVANCED],

}
];

export interface ServeRunnerDeps {
Expand All @@ -102,7 +109,7 @@ export abstract class ServeRunner<T extends ServeOptions> implements Runner<T, S
return this.e.config.get('npmClient') === 'npm' ? new NpmServeCLI(this.e) : new YarnServeCLI(this.e);
}

createOptionsFromCommandLine(inputs: CommandLineInputs, options: CommandLineOptions): ServeOptions {
createOptionsFromCommandLine(_inputs: CommandLineInputs, options: CommandLineOptions): ServeOptions {
const separatedArgs = options['--'];

if (options['devapp'] && options['address'] === DEFAULT_ADDRESS) {
Expand Down Expand Up @@ -748,8 +755,8 @@ export async function serve(deps: ServeRunnerDeps, inputs: CommandLineInputs, op
}

const opts = runner.createOptionsFromCommandLine(inputs, options);
const details = await runner.run(opts);

const details = await runner.run(opts);
return details;
} catch (e) {
if (e instanceof RunnerException) {
Expand Down