Skip to content

Commit e680aa1

Browse files
alan-agius4clydin
authored andcommitted
refactor(@angular/cli): remove duplicate npmrc logic
1 parent 277b356 commit e680aa1

File tree

5 files changed

+95
-233
lines changed

5 files changed

+95
-233
lines changed

packages/angular/cli/src/commands/update/schematic/index.ts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,8 @@ import { logging, tags } from '@angular-devkit/core';
1010
import { Rule, SchematicContext, SchematicsException, Tree } from '@angular-devkit/schematics';
1111
import * as npa from 'npm-package-arg';
1212
import * as semver from 'semver';
13-
import { getNpmPackageJson } from './npm';
14-
import { NpmRepositoryPackageJson } from './npm-package-json';
15-
import { Dependency, JsonSchemaForNpmPackageJsonFiles } from './package-json';
13+
import { Dependency, JsonSchemaForNpmPackageJsonFiles } from '../../../../utilities/package-json';
14+
import { NpmRepositoryPackageJson, getNpmPackageJson } from '../../../../utilities/package-metadata';
1615
import { Schema as UpdateSchema } from './schema';
1716

1817
type VersionRange = string & { __VERSION_RANGE: void };
@@ -818,7 +817,7 @@ export default function (options: UpdateSchema): Rule {
818817
const allPackageMetadata = await Promise.all(
819818
Array.from(npmDeps.keys()).map((depName) =>
820819
getNpmPackageJson(depName, logger, {
821-
registryUrl: options.registry,
820+
registry: options.registry,
822821
usingYarn,
823822
verbose: options.verbose,
824823
}),

packages/angular/cli/src/commands/update/schematic/npm-package-json.ts

Lines changed: 0 additions & 28 deletions
This file was deleted.

packages/angular/cli/src/commands/update/schematic/npm.ts

Lines changed: 0 additions & 166 deletions
This file was deleted.

0 commit comments

Comments
 (0)