diff --git a/packages/angular/cli/commands/add-impl.ts b/packages/angular/cli/commands/add-impl.ts index 45f44bdef2..dd309030f9 100644 --- a/packages/angular/cli/commands/add-impl.ts +++ b/packages/angular/cli/commands/add-impl.ts @@ -131,7 +131,7 @@ export class AddCommand extends SchematicCommand { // 'latest' is invalid so search for most recent matching package const versionManifests = Object.values(packageMetadata.versions).filter( (value: PackageManifest) => !prerelease(value.version) && !value.deprecated, - ) as PackageManifest[]; + ); versionManifests.sort((a, b) => rcompare(a.version, b.version, true)); diff --git a/packages/angular/cli/commands/extract-i18n-impl.ts b/packages/angular/cli/commands/extract-i18n-impl.ts index e559f0cc4a..47c25b0ca6 100644 --- a/packages/angular/cli/commands/extract-i18n-impl.ts +++ b/packages/angular/cli/commands/extract-i18n-impl.ts @@ -16,15 +16,19 @@ export class ExtractI18nCommand extends ArchitectCommand { public readonly target = 'serve'; - public validate(_options: ArchitectCommandOptions & Arguments) { + public validate() { return true; } diff --git a/packages/angular/cli/lib/init.ts b/packages/angular/cli/lib/init.ts index 86c06b3bf2..cb1764824c 100644 --- a/packages/angular/cli/lib/init.ts +++ b/packages/angular/cli/lib/init.ts @@ -12,7 +12,6 @@ import 'symbol-observable'; import * as fs from 'fs'; import * as path from 'path'; import { SemVer } from 'semver'; -import { Duplex } from 'stream'; import { colors } from '../utilities/color'; import { isWarningEnabled } from '../utilities/config'; diff --git a/packages/angular/cli/models/command.ts b/packages/angular/cli/models/command.ts index 6b13e3fc31..7f334aefe7 100644 --- a/packages/angular/cli/models/command.ts +++ b/packages/angular/cli/models/command.ts @@ -52,7 +52,7 @@ export abstract class Command return 0; } - async printJsonHelp(_options: T & Arguments): Promise { + async printJsonHelp(): Promise { const replacer = (key: string, value: string) => key === 'name' ? strings.dasherize(value) : value; @@ -176,7 +176,7 @@ export abstract class Command if (options.help === true) { return this.printHelp(); } else if (options.help === 'json' || options.help === 'JSON') { - return this.printJsonHelp(options); + return this.printJsonHelp(); } else { const startTime = +new Date(); if (this.useReportAnalytics) { diff --git a/packages/angular/cli/models/schematic-command.ts b/packages/angular/cli/models/schematic-command.ts index 5f134236a0..99d2f13a95 100644 --- a/packages/angular/cli/models/schematic-command.ts +++ b/packages/angular/cli/models/schematic-command.ts @@ -243,7 +243,7 @@ export abstract class SchematicCommand< packageRegistry: options.packageRegistry, // A schema registry is required to allow customizing addUndefinedDefaults registry: new schema.CoreSchemaRegistry(formats.standardFormats), - resolvePaths: !!this.workspace + resolvePaths: this.workspace // Workspace ? this.collectionName === this.defaultCollectionName // Favor __dirname for @schematics/angular to use the build-in version diff --git a/packages/angular/cli/package.json b/packages/angular/cli/package.json index 620bb25421..1453551cd5 100644 --- a/packages/angular/cli/package.json +++ b/packages/angular/cli/package.json @@ -46,6 +46,9 @@ "symbol-observable": "4.0.0", "uuid": "8.3.2" }, + "devDependencies": { + "rxjs": "6.6.7" + }, "ng-update": { "migrations": "@schematics/angular/migrations/migration-collection.json", "packageGroup": { diff --git a/packages/angular/cli/src/commands/update/schematic/index.ts b/packages/angular/cli/src/commands/update/schematic/index.ts index 91d18fa42c..21005571bd 100644 --- a/packages/angular/cli/src/commands/update/schematic/index.ts +++ b/packages/angular/cli/src/commands/update/schematic/index.ts @@ -435,7 +435,7 @@ function _usageMessage( target, }; }) - .filter(({ name, info, version, target }) => { + .filter(({ info, version, target }) => { return (target && semver.compare(info.installed.version, version) < 0); }) .filter(({ target }) => {