refactor(@angular/cli): remove duplicate npmrc logic

angular · Jun 16, 2021 · e680aa1 · e680aa1
1 parent 277b356
commit e680aa1
Show file tree

Hide file tree

Showing 5 changed files with 95 additions and 233 deletions.
diff --git a/packages/angular/cli/src/commands/update/schematic/index.ts b/packages/angular/cli/src/commands/update/schematic/index.ts
@@ -10,9 +10,8 @@ import { logging, tags } from '@angular-devkit/core';
 import { Rule, SchematicContext, SchematicsException, Tree } from '@angular-devkit/schematics';
 import * as npa from 'npm-package-arg';
 import * as semver from 'semver';
-import { getNpmPackageJson } from './npm';
-import { NpmRepositoryPackageJson } from './npm-package-json';
-import { Dependency, JsonSchemaForNpmPackageJsonFiles } from './package-json';
+import { Dependency, JsonSchemaForNpmPackageJsonFiles } from '../../../../utilities/package-json';
+import { NpmRepositoryPackageJson, getNpmPackageJson } from '../../../../utilities/package-metadata';
 import { Schema as UpdateSchema } from './schema';
 
 type VersionRange = string & { __VERSION_RANGE: void };
@@ -818,7 +817,7 @@ export default function (options: UpdateSchema): Rule {
     const allPackageMetadata = await Promise.all(
       Array.from(npmDeps.keys()).map((depName) =>
         getNpmPackageJson(depName, logger, {
-          registryUrl: options.registry,
+          registry: options.registry,
           usingYarn,
           verbose: options.verbose,
         }),

diff --git a/packages/angular/cli/src/commands/update/schematic/npm-package-json.ts b/packages/angular/cli/src/commands/update/schematic/npm-package-json.ts
diff --git a/packages/angular/cli/src/commands/update/schematic/npm.ts b/packages/angular/cli/src/commands/update/schematic/npm.ts
diff --git a/...commands/update/schematic/package-json.ts → ...ges/angular/cli/utilities/package-json.ts b/...commands/update/schematic/package-json.ts → ...ges/angular/cli/utilities/package-json.ts