Skip to content
Merged
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
2 changes: 2 additions & 0 deletions packages/ionic/src/definitions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -580,6 +580,8 @@ export interface ServeOptions {
}

export interface AngularServeOptions extends ServeOptions {
consolelogs?: boolean;
consolelogsPort?: number;
ssl?: boolean;
configuration?: string;
sourcemaps?: boolean;
Expand Down
31 changes: 30 additions & 1 deletion packages/ionic/src/lib/project/angular/serve.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
import { MetadataGroup, ParsedArgs, unparseArgs } from '@ionic/cli-framework';
import { stripAnsi } from '@ionic/cli-framework/utils/format';
import { str2num } from '@ionic/cli-framework/utils/string';
import { findClosestOpenPort } from '@ionic/utils-network';
import chalk from 'chalk';

import { AngularServeOptions, CommandLineInputs, CommandLineOptions, CommandMetadata, ServeDetails } from '../../../definitions';
import { input, strong, weak } from '../../color';
import { BIND_ALL_ADDRESS, LOCAL_ADDRESSES, SERVE_SCRIPT, ServeCLI, ServeRunner, ServeRunnerDeps } from '../../serve';
import { BIND_ALL_ADDRESS, DEFAULT_DEV_LOGGER_PORT as DEFAULT_CONSOLE_LOGS_PORT, LOCAL_ADDRESSES, SERVE_SCRIPT, ServeCLI, ServeRunner, ServeRunnerDeps } from '../../serve';

import { AngularProject } from './';

Expand Down Expand Up @@ -36,6 +37,22 @@ The dev server can use HTTPS via the ${input('--ssl')} option ${chalk.bold.red('
},
],
options: [
{
name: 'consolelogs',
summary: 'Print app console logs to the terminal',
type: Boolean,
groups: [MetadataGroup.ADVANCED, 'cordova'],
// aliases: ['c'], Already used by ng cli for --configuration
hint: weak('[ng]'),
},
{
name: 'consolelogs-port',
summary: 'Use specific port for console logs server',
type: String,
groups: [MetadataGroup.ADVANCED, 'cordova'],
hint: weak('[ng]'),
spec: { value: 'port' },
},
{
name: 'ssl',
summary: 'Use HTTPS for the dev server',
Expand Down Expand Up @@ -85,9 +102,19 @@ The dev server can use HTTPS via the ${input('--ssl')} option ${chalk.bold.red('
const ssl = options['ssl'] ? Boolean(options['ssl']) : undefined;
const configuration = options['configuration'] ? String(options['configuration']) : (prod ? 'production' : undefined);
const sourcemaps = typeof options['source-map'] === 'boolean' ? Boolean(options['source-map']) : undefined;
let consolelogs = typeof options['consolelogs'] === 'boolean' ? Boolean(options['consolelogs']) : undefined;
let consolelogsPort = consolelogs ? str2num(options['consolelogs-port'], DEFAULT_CONSOLE_LOGS_PORT) : undefined;

// if not defined, default to true for devapp
if (options.devapp) {
consolelogs = consolelogs === undefined ? true : consolelogs;
consolelogsPort = str2num(options['consolelogs-port'], DEFAULT_CONSOLE_LOGS_PORT);
}

return {
...baseOptions,
consolelogs,
consolelogsPort,
ssl,
configuration,
sourcemaps,
Expand Down Expand Up @@ -215,6 +242,8 @@ export class AngularServeCLI extends ServeCLI<AngularServeOptions> {
if (options.devapp) {
args.cordovaMock = true;
}
args.consolelogs = options.consolelogs ? true : undefined;
args['consolelogs-port'] = options.consolelogsPort ? String(options.consolelogsPort) : undefined;
}

if (this.resolvedProgram !== this.program) {
Expand Down