Skip to content

fix(@angular/cli): clean up architect options #10763

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
May 10, 2018
Merged

fix(@angular/cli): clean up architect options #10763

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
184 changes: 95 additions & 89 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

29 changes: 4 additions & 25 deletions packages/@angular/cli/commands/build.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,6 @@
import { ArchitectCommand } from '../models/architect-command';
import { Option, CommandScope } from '../models/command';
import { Version } from '../upgrade/version';

export interface Options {
project?: string;
configuration?: string;
prod: boolean;
}
import { ArchitectCommand, ArchitectCommandOptions } from '../models/architect-command';

export default class BuildCommand extends ArchitectCommand {
public readonly name = 'build';
Expand All @@ -20,29 +14,14 @@ export default class BuildCommand extends ArchitectCommand {
this.configurationOption
];

public validate(options: Options) {
public validate(options: ArchitectCommandOptions) {
// Check Angular and TypeScript versions.
Version.assertCompatibleAngularVersion(this.project.root);
Version.assertTypescriptVersion(this.project.root);
return super.validate(options);
}

public async run(options: Options) {
let configuration = options.configuration;
if (!configuration && options.prod) {
configuration = 'production';
}

const overrides = { ...options };
delete overrides.project;
delete overrides.configuration;
delete overrides.prod;

return this.runArchitectTarget({
project: options.project,
target: this.target,
configuration,
overrides
}, options);
public async run(options: ArchitectCommandOptions) {
return this.runArchitectTarget(options);
}
}
25 changes: 3 additions & 22 deletions packages/@angular/cli/commands/e2e.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
import { CommandScope, Option } from '../models/command';
import { ArchitectCommand } from '../models/architect-command';
import { ArchitectCommand, ArchitectCommandOptions } from '../models/architect-command';

export interface Options {
project?: string;
configuration?: string;
prod: boolean;
}

export default class E2eCommand extends ArchitectCommand {
public readonly name = 'e2e';
Expand All @@ -19,21 +14,7 @@ export default class E2eCommand extends ArchitectCommand {
this.configurationOption
];

public run(options: Options) {
let configuration = options.configuration;
if (!configuration && options.prod) {
configuration = 'production';
}

const overrides = { ...options };
delete overrides.project;
delete overrides.prod;

return this.runArchitectTarget({
project: options.project,
target: this.target,
configuration,
overrides
}, options);
public run(options: ArchitectCommandOptions) {
return this.runArchitectTarget(options);
}
}
17 changes: 3 additions & 14 deletions packages/@angular/cli/commands/lint.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
import { CommandScope, Option } from '../models/command';
import { ArchitectCommand } from '../models/architect-command';
import { ArchitectCommand, ArchitectCommandOptions } from '../models/architect-command';

export interface Options {
project?: string;
configuration?: string;
}

export default class LintCommand extends ArchitectCommand {
public readonly name = 'lint';
Expand All @@ -17,14 +13,7 @@ export default class LintCommand extends ArchitectCommand {
this.configurationOption
];

public async run(options: Options) {
const overrides = { ...options };
delete overrides.project;
return this.runArchitectTarget({
project: options.project,
target: this.target,
configuration: options.configuration,
overrides
}, options);
public async run(options: ArchitectCommandOptions) {
return this.runArchitectTarget(options);
}
}
17 changes: 3 additions & 14 deletions packages/@angular/cli/commands/run.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
import { CommandScope, Option } from '../models/command';
import { ArchitectCommand } from '../models/architect-command';
import { ArchitectCommand, ArchitectCommandOptions } from '../models/architect-command';

export interface RunOptions {
target: string;
}

export default class RunCommand extends ArchitectCommand {
public readonly name = 'run';
Expand All @@ -14,17 +11,9 @@ export default class RunCommand extends ArchitectCommand {
this.configurationOption
];

public async run(options: RunOptions) {
public async run(options: ArchitectCommandOptions) {
if (options.target) {
const [project, target, configuration] = options.target.split(':');
const overrides = { ...options };
delete overrides.target;
return this.runArchitectTarget({
project,
target,
configuration,
overrides
}, options);
return this.runArchitectTarget(options);
} else {
throw new Error('Invalid architect target.');
}
Expand Down
28 changes: 4 additions & 24 deletions packages/@angular/cli/commands/serve.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,7 @@
import { CommandScope, Option } from '../models/command';
import { Version } from '../upgrade/version';
import { ArchitectCommand } from '../models/architect-command';
import { ArchitectCommand, ArchitectCommandOptions } from '../models/architect-command';

export interface Options {
project?: string;
configuration?: string;
prod: boolean;
}

export default class ServeCommand extends ArchitectCommand {
public readonly name = 'serve';
Expand All @@ -19,29 +14,14 @@ export default class ServeCommand extends ArchitectCommand {
this.configurationOption
];

public validate(_options: Options) {
public validate(_options: ArchitectCommandOptions) {
// Check Angular and TypeScript versions.
Version.assertCompatibleAngularVersion(this.project.root);
Version.assertTypescriptVersion(this.project.root);
return true;
}

public async run(options: Options) {
let configuration = options.configuration;
if (!configuration && options.prod) {
configuration = 'production';
}

const overrides = { ...options };
delete overrides.project;
delete overrides.configuration;
delete overrides.prod;

return this.runArchitectTarget({
project: options.project,
target: this.target,
configuration,
overrides
}, options);
public async run(options: ArchitectCommandOptions) {
return this.runArchitectTarget(options);
}
}
26 changes: 3 additions & 23 deletions packages/@angular/cli/commands/test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
import { CommandScope, Option } from '../models/command';
import { ArchitectCommand } from '../models/architect-command';
import { ArchitectCommand, ArchitectCommandOptions } from '../models/architect-command';

export interface Options {
project?: string;
configuration?: string;
prod: boolean;
}

export default class TestCommand extends ArchitectCommand {
public readonly name = 'test';
Expand All @@ -19,22 +14,7 @@ export default class TestCommand extends ArchitectCommand {
this.configurationOption
];

public async run(options: Options) {
let configuration = options.configuration;
if (!configuration && options.prod) {
configuration = 'production';
}

const overrides = { ...options };
delete overrides.project;
delete overrides.configuration;
delete overrides.prod;

return this.runArchitectTarget({
project: options.project,
target: this.target,
configuration,
overrides
}, options);
public async run(options: ArchitectCommandOptions) {
return this.runArchitectTarget(options);
}
}
17 changes: 3 additions & 14 deletions packages/@angular/cli/commands/xi18n.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
import { CommandScope, Option } from '../models/command';
import { ArchitectCommand } from '../models/architect-command';
import { ArchitectCommand, ArchitectCommandOptions } from '../models/architect-command';

export interface Options {
project?: string;
configuration?: string;
}

export default class Xi18nCommand extends ArchitectCommand {
public readonly name = 'xi18n';
Expand All @@ -16,14 +12,7 @@ export default class Xi18nCommand extends ArchitectCommand {
this.configurationOption
];

public async run(options: Options) {
const overrides = { ...options };
delete overrides.project;
return this.runArchitectTarget({
project: options.project,
target: this.target,
configuration: options.configuration,
overrides
}, options);
public async run(options: ArchitectCommandOptions) {
return this.runArchitectTarget(options);
}
}
Loading