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

refactor(@angular/cli): update CLI package to be strict compliant #18506

Merged
merged 1 commit into from Aug 12, 2020
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/angular/cli/commands/config-impl.ts
Expand Up @@ -115,7 +115,7 @@ function getValueFromPath<T extends JsonArray | JsonObject>(
const fragments = parseJsonPath(path);

try {
return fragments.reduce((value: JsonValue, current: string | number) => {
return fragments.reduce((value: JsonValue | undefined, current: string | number) => {
if (value == undefined || typeof value != 'object') {
return undefined;
} else if (typeof current == 'string' && !Array.isArray(value)) {
Expand All @@ -139,7 +139,7 @@ function setValueFromPath<T extends JsonArray | JsonObject>(
const fragments = parseJsonPath(path);

try {
return fragments.reduce((value: JsonValue, current: string | number, index: number) => {
return fragments.reduce((value: JsonValue | undefined, current: string | number, index: number) => {
if (value == undefined || typeof value != 'object') {
return undefined;
} else if (typeof current == 'string' && !Array.isArray(value)) {
Expand Down
5 changes: 2 additions & 3 deletions packages/angular/cli/commands/update-impl.ts
Expand Up @@ -55,9 +55,8 @@ const disableVersionCheck =

export class UpdateCommand extends Command<UpdateCommandSchema> {
public readonly allowMissingWorkspace = true;

private workflow: NodeWorkflow;
private packageManager: PackageManager;
private workflow!: NodeWorkflow;
private packageManager = PackageManager.Npm;

async initialize() {
this.packageManager = await getPackageManager(this.workspace.root);
Expand Down
1 change: 0 additions & 1 deletion packages/angular/cli/commands/xi18n-impl.ts
Expand Up @@ -12,7 +12,6 @@ import { Schema as Xi18nCommandSchema } from './xi18n';

export class Xi18nCommand extends ArchitectCommand<Xi18nCommandSchema> {
public readonly target = 'extract-i18n';
public readonly multiTarget: true;

public async run(options: Xi18nCommandSchema & Arguments) {
const version = process.version.substr(1).split('.');
Expand Down
15 changes: 6 additions & 9 deletions packages/angular/cli/lib/cli/index.ts
Expand Up @@ -42,17 +42,14 @@ export default async function(options: { testing?: boolean; cliArgs: string[] })
});

// Redirect console to logger
console.log = function() {
logger.info(format.apply(null, arguments));
console.info = console.log = function(...args) {
logger.info(format(...args));
};
console.info = function() {
logger.info(format.apply(null, arguments));
console.warn = function(...args) {
logger.warn(format(...args));
};
console.warn = function() {
logger.warn(format.apply(null, arguments));
};
console.error = function() {
logger.error(format.apply(null, arguments));
console.error = function(...args) {
logger.error(format(...args));
};

let projectDetails = getWorkspaceDetails();
Expand Down
8 changes: 4 additions & 4 deletions packages/angular/cli/models/architect-command.ts
Expand Up @@ -26,10 +26,10 @@ export interface ArchitectCommandOptions extends BaseCommandOptions {
export abstract class ArchitectCommand<
T extends ArchitectCommandOptions = ArchitectCommandOptions
> extends Command<T> {
protected _architect: Architect;
protected _architectHost: WorkspaceNodeModulesArchitectHost;
protected _workspace: workspaces.WorkspaceDefinition;
protected _registry: json.schema.SchemaRegistry;
protected _architect!: Architect;
protected _architectHost!: WorkspaceNodeModulesArchitectHost;
protected _workspace!: workspaces.WorkspaceDefinition;
protected _registry!: json.schema.SchemaRegistry;

// If this command supports running multiple targets.
protected multiTarget = false;
Expand Down
4 changes: 2 additions & 2 deletions packages/angular/cli/models/schematic-command.ts
Expand Up @@ -75,8 +75,8 @@ export abstract class SchematicCommand<
> extends Command<T> {
readonly allowPrivateSchematics: boolean = false;
private _host = new NodeJsSyncHost();
private _workspace: workspaces.WorkspaceDefinition;
protected _workflow: NodeWorkflow;
private _workspace: workspaces.WorkspaceDefinition | undefined;
protected _workflow!: NodeWorkflow;

protected defaultCollectionName = '@schematics/angular';
protected collectionName = this.defaultCollectionName;
Expand Down