Skip to content

Commit f16d985

Browse files
andreialecuandreialecu
committed
feat(@angular/cli): support yarn workspaces in ng update
1 parent 6c0ab83 commit f16d985

File tree

6 files changed

+104
-106
lines changed

6 files changed

+104
-106
lines changed

‎package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@
115115
"@types/pidusage": "^2.0.1",
116116
"@types/progress": "^2.0.3",
117117
"@types/request": "^2.47.1",
118+
"@types/resolve": "^1.17.1",
118119
"@types/rimraf": "^3.0.0",
119120
"@types/semver": "^7.0.0",
120121
"@types/universal-analytics": "^0.4.2",

‎packages/angular/cli/BUILD.bazel‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ ts_library(
7272
"@npm//@types/debug",
7373
"@npm//@types/inquirer",
7474
"@npm//@types/node",
75+
"@npm//@types/resolve",
7576
"@npm//@types/rimraf",
7677
"@npm//@types/semver",
7778
"@npm//@types/universal-analytics",

‎packages/angular/cli/commands/update-impl.ts‎

Lines changed: 26 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,12 @@ import {
2727
fetchPackageManifest,
2828
fetchPackageMetadata,
2929
} from '../utilities/package-metadata';
30-
import { PackageTreeNode, findNodeDependencies, readPackageTree } from '../utilities/package-tree';
30+
import {
31+
PackageTreeNode,
32+
findPackageJson,
33+
getProjectDependencies,
34+
readPackageJson,
35+
} from '../utilities/package-tree';
3136
import { Schema as UpdateCommandSchema } from './update';
3237

3338
const npa = require('npm-package-arg') as (selector: string) => PackageIdentifier;
@@ -377,15 +382,14 @@ export class UpdateCommand extends Command<UpdateCommandSchema> {
377382

378383
this.logger.info('Collecting installed dependencies...');
379384

380-
const packageTree = await readPackageTree(this.workspace.root);
381-
const rootDependencies = findNodeDependencies(packageTree);
385+
const rootDependencies = await getProjectDependencies(this.workspace.root);
382386

383-
this.logger.info(`Found ${Object.keys(rootDependencies).length} dependencies.`);
387+
this.logger.info(`Found ${rootDependencies.size} dependencies.`);
384388

385389
if (options.all) {
386390
// 'all' option and a zero length packages have already been checked.
387391
// Add all direct dependencies to be updated
388-
for (const dep of Object.keys(rootDependencies)) {
392+
for (const dep of rootDependencies.keys()) {
389393
const packageIdentifier = npa(dep);
390394
if (options.next) {
391395
packageIdentifier.fetchSpec = 'next';
@@ -400,7 +404,7 @@ export class UpdateCommand extends Command<UpdateCommandSchema> {
400404
next: options.next || false,
401405
verbose: options.verbose || false,
402406
packageManager: this.packageManager,
403-
packages: options.all ? Object.keys(rootDependencies) : [],
407+
packages: options.all ? rootDependencies.keys() : [],
404408
});
405409

406410
return success ? 0 : 1;
@@ -424,8 +428,9 @@ export class UpdateCommand extends Command<UpdateCommandSchema> {
424428
}
425429

426430
const packageName = packages[0].name;
427-
const packageDependency = rootDependencies[packageName];
428-
let packageNode = packageDependency && packageDependency.node;
431+
const packageDependency = rootDependencies.get(packageName);
432+
let packagePath = packageDependency?.path;
433+
let packageNode = packageDependency?.package;
429434
if (packageDependency && !packageNode) {
430435
this.logger.error('Package found in package.json but is not installed.');
431436

@@ -434,19 +439,20 @@ export class UpdateCommand extends Command<UpdateCommandSchema> {
434439
// Allow running migrations on transitively installed dependencies
435440
// There can technically be nested multiple versions
436441
// TODO: If multiple, this should find all versions and ask which one to use
437-
const child = packageTree.children.find(c => c.name === packageName);
438-
if (child) {
439-
packageNode = child;
442+
const packageJson = findPackageJson(this.workspace.root, packageName);
443+
if (packageJson) {
444+
packagePath = path.dirname(packageJson);
445+
packageNode = await readPackageJson(packagePath);
440446
}
441447
}
442448

443-
if (!packageNode) {
449+
if (!packageNode || !packagePath) {
444450
this.logger.error('Package is not installed.');
445451

446452
return 1;
447453
}
448454

449-
const updateMetadata = packageNode.package['ng-update'];
455+
const updateMetadata = packageNode['ng-update'];
450456
let migrations = updateMetadata && updateMetadata.migrations;
451457
if (migrations === undefined) {
452458
this.logger.error('Package does not provide migrations.');
@@ -477,14 +483,14 @@ export class UpdateCommand extends Command<UpdateCommandSchema> {
477483
}
478484

479485
// Check if it is a package-local location
480-
const localMigrations = path.join(packageNode.path, migrations);
486+
const localMigrations = path.join(packagePath, migrations);
481487
if (fs.existsSync(localMigrations)) {
482488
migrations = localMigrations;
483489
} else {
484490
// Try to resolve from package location.
485491
// This avoids issues with package hoisting.
486492
try {
487-
migrations = require.resolve(migrations, { paths: [packageNode.path] });
493+
migrations = require.resolve(migrations, { paths: [packagePath] });
488494
} catch (e) {
489495
if (e.code === 'MODULE_NOT_FOUND') {
490496
this.logger.error('Migrations for package were not found.');
@@ -513,7 +519,7 @@ export class UpdateCommand extends Command<UpdateCommandSchema> {
513519
}
514520

515521
const migrationRange = new semver.Range(
516-
'>' + from + ' <=' + (options.to || packageNode.package.version),
522+
'>' + from + ' <=' + (options.to || packageNode.version),
517523
);
518524

519525
success = await this.executeMigrations(
@@ -529,7 +535,7 @@ export class UpdateCommand extends Command<UpdateCommandSchema> {
529535
packageName === '@angular/core'
530536
&& options.from
531537
&& +options.from.split('.')[0] < 9
532-
&& (options.to || packageNode.package.version).split('.')[0] === '9'
538+
&& (options.to || packageNode.version).split('.')[0] === '9'
533539
) {
534540
this.logger.info(NG_VERSION_9_POST_MSG);
535541
}
@@ -547,8 +553,8 @@ export class UpdateCommand extends Command<UpdateCommandSchema> {
547553

548554
// Validate packages actually are part of the workspace
549555
for (const pkg of packages) {
550-
const node = rootDependencies[pkg.name] && rootDependencies[pkg.name].node;
551-
if (!node) {
556+
const node = rootDependencies.get(pkg.name);
557+
if (!node?.package) {
552558
this.logger.error(`Package '${pkg.name}' is not a dependency.`);
553559

554560
return 1;
@@ -627,7 +633,7 @@ export class UpdateCommand extends Command<UpdateCommandSchema> {
627633
return 1;
628634
}
629635

630-
if (manifest.version === node.package.version) {
636+
if (manifest.version === node.package?.version) {
631637
this.logger.info(`Package '${packageName}' is already up to date.`);
632638
continue;
633639
}

‎packages/angular/cli/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
"npm-pick-manifest": "6.1.0",
4040
"open": "7.2.0",
4141
"pacote": "9.5.12",
42-
"read-package-tree": "5.3.1",
42+
"resolve": "1.17.0",
4343
"rimraf": "3.0.2",
4444
"semver": "7.3.2",
4545
"symbol-observable": "1.2.0",
@@ -50,7 +50,7 @@
5050
"migrations": "@schematics/angular/migrations/migration-collection.json",
5151
"packageGroup": {
5252
"@angular/cli": "0.0.0",
53-
"@angular-devkit/build-angular": "0.0.0",
53+
"@angular-devkit/build-angular": "0.0.0",
5454
"@angular-devkit/build-ng-packagr": "0.0.0",
5555
"@angular-devkit/build-webpack": "0.0.0",
5656
"@angular-devkit/core": "0.0.0",

‎packages/angular/cli/utilities/package-tree.ts‎

Lines changed: 71 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -6,88 +6,94 @@
66
* found in the LICENSE file at https://angular.io/license
77
*/
88

9-
9+
import * as fs from 'fs';
10+
import { dirname, join } from 'path';
11+
import * as resolve from 'resolve';
12+
import { promisify } from 'util';
1013
import { NgAddSaveDepedency } from './package-metadata';
1114

12-
export interface PackageTreeNodeBase {
15+
const readFile = promisify(fs.readFile);
16+
17+
interface PackageJson {
1318
name: string;
14-
path: string;
15-
realpath: string;
16-
error?: Error;
17-
id: number;
18-
isLink: boolean;
19-
package: {
20-
name: string;
21-
version: string;
22-
dependencies?: Record<string, string>;
23-
devDependencies?: Record<string, string>;
24-
peerDependencies?: Record<string, string>;
25-
optionalDependencies?: Record<string, string>;
26-
'ng-update'?: {
27-
migrations?: string;
28-
};
29-
'ng-add'?: {
30-
save?: NgAddSaveDepedency;
31-
};
19+
version: string;
20+
dependencies?: Record<string, string>;
21+
devDependencies?: Record<string, string>;
22+
peerDependencies?: Record<string, string>;
23+
optionalDependencies?: Record<string, string>;
24+
'ng-update'?: {
25+
migrations?: string;
26+
};
27+
'ng-add'?: {
28+
save?: NgAddSaveDepedency;
3229
};
33-
parent?: PackageTreeNode;
34-
children: PackageTreeNode[];
3530
}
3631

37-
export interface PackageTreeActual extends PackageTreeNodeBase {
38-
isLink: false;
39-
}
32+
async function readJSON(file: string) {
33+
const buffer = await readFile(file);
4034

41-
export interface PackageTreeLink extends PackageTreeNodeBase {
42-
isLink: true;
43-
target: PackageTreeActual;
35+
return JSON.parse(buffer.toString());
4436
}
4537

46-
export type PackageTreeNode = PackageTreeActual | PackageTreeLink;
38+
function getAllDependencies(pkg: PackageJson) {
39+
return new Set([
40+
...Object.entries(pkg.dependencies || []),
41+
...Object.entries(pkg.devDependencies || []),
42+
...Object.entries(pkg.peerDependencies || []),
43+
...Object.entries(pkg.optionalDependencies || []),
44+
]);
45+
}
4746

48-
export function readPackageTree(path: string): Promise<PackageTreeNode> {
49-
const rpt = require('read-package-tree');
47+
export interface PackageTreeNode {
48+
name: string;
49+
version: string;
50+
path: string;
51+
package: PackageJson | undefined;
52+
}
5053

51-
return new Promise((resolve, reject) => {
52-
rpt(path, (e: Error | undefined, data: PackageTreeNode) => {
53-
if (e) {
54-
reject(e);
55-
} else {
56-
resolve(data);
57-
}
58-
});
59-
});
54+
export async function readPackageJson(packageJsonPath: string): Promise<PackageJson | undefined> {
55+
try {
56+
return await readJSON(packageJsonPath);
57+
} catch (err) {
58+
return undefined;
59+
}
6060
}
6161

62-
export interface NodeDependency {
63-
version: string;
64-
node?: PackageTreeNode;
62+
export function findPackageJson(workspaceDir: string, packageName: string) {
63+
try {
64+
// avoid require.resolve here, see: https://github.com/angular/angular-cli/pull/18610#issuecomment-681980185
65+
const packageJsonPath = resolve.sync(`${packageName}/package.json`, { paths: [workspaceDir] });
66+
67+
return packageJsonPath;
68+
} catch (err) {
69+
return undefined;
70+
}
6571
}
6672

67-
export function findNodeDependencies(node: PackageTreeNode) {
68-
const rawDeps: Record<string, string> = {
69-
...node.package.dependencies,
70-
...node.package.devDependencies,
71-
...node.package.peerDependencies,
72-
...node.package.optionalDependencies,
73-
};
73+
export async function getProjectDependencies(dir: string) {
74+
const pkgJsonPath = resolve.sync(join(dir, `package.json`));
75+
if (!pkgJsonPath) {
76+
throw new Error('Could not find package.json');
77+
}
7478

75-
return Object.entries(rawDeps).reduce(
76-
(deps, [name, version]) => {
77-
let dependencyNode;
78-
let parent: PackageTreeNode | undefined | null = node;
79-
while (!dependencyNode && parent) {
80-
dependencyNode = parent.children.find(child => child.name === name);
81-
parent = parent.parent;
82-
}
79+
const pkg: PackageJson = await readJSON(pkgJsonPath);
8380

84-
deps[name] = {
85-
node: dependencyNode,
86-
version,
87-
};
81+
const results = new Map<string, PackageTreeNode>();
82+
await Promise.all(
83+
Array.from(getAllDependencies(pkg)).map(async ([name, version]) => {
84+
const packageJsonPath = findPackageJson(dir, name);
85+
if (packageJsonPath) {
86+
const currentDependency = {
87+
name,
88+
version,
89+
path: dirname(packageJsonPath),
90+
package: await readPackageJson(packageJsonPath),
91+
};
8892

89-
return deps;
90-
},
91-
Object.create(null) as Record<string, NodeDependency>,
93+
results.set(currentDependency.name, currentDependency);
94+
}
95+
}),
9296
);
97+
98+
return results;
9399
}

‎yarn.lock‎

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1660,7 +1660,7 @@
16601660
"@types/tough-cookie" "*"
16611661
form-data "^2.5.0"
16621662

1663-
"@types/[email protected]":
1663+
"@types/[email protected]", "@types/resolve@^1.17.1":
16641664
version "1.17.1"
16651665
resolved "https://registry.yarnpkg.com/@types/resolve/-/resolve-1.17.1.tgz#3afd6ad8967c77e4376c598a82ddd58f46ec45d6"
16661666
integrity sha512-yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw==
@@ -8692,7 +8692,7 @@ object.assign@^4.1.0:
86928692
has-symbols "^1.0.0"
86938693
object-keys "^1.0.11"
86948694

8695-
object.getownpropertydescriptors@^2.0.3, object.getownpropertydescriptors@^2.1.0:
8695+
object.getownpropertydescriptors@^2.1.0:
86968696
version "2.1.0"
86978697
resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz#369bf1f9592d8ab89d712dced5cb81c7c5352649"
86988698
integrity sha512-Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg==
@@ -10112,15 +10112,6 @@ read-package-json@^2.0.0:
1011210112
normalize-package-data "^2.0.0"
1011310113
npm-normalize-package-bin "^1.0.0"
1011410114

10115-
[email protected]:
10116-
version "5.3.1"
10117-
resolved "https://registry.yarnpkg.com/read-package-tree/-/read-package-tree-5.3.1.tgz#a32cb64c7f31eb8a6f31ef06f9cedf74068fe636"
10118-
integrity sha512-mLUDsD5JVtlZxjSlPPx1RETkNjjvQYuweKwNVt1Sn8kP5Jh44pvYuUHCp6xSVDZWbNxVxG5lyZJ921aJH61sTw==
10119-
dependencies:
10120-
read-package-json "^2.0.0"
10121-
readdir-scoped-modules "^1.0.0"
10122-
util-promisify "^2.1.0"
10123-
1012410115
read-pkg-up@^1.0.1:
1012510116
version "1.0.1"
1012610117
resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"
@@ -10510,7 +10501,7 @@ resolve-url@^0.2.1:
1051010501
resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
1051110502
integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
1051210503

10513-
resolve@^1.1.5, resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.17.0, resolve@^1.3.2, resolve@^1.8.1:
10504+
resolve@1.17.0, resolve@^1.1.5, resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.17.0, resolve@^1.3.2, resolve@^1.8.1:
1051410505
version "1.17.0"
1051510506
resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.17.0.tgz#b25941b54968231cc2d1bb76a79cb7f2c0bf8444"
1051610507
integrity sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==
@@ -12487,13 +12478,6 @@ util-extend@^1.0.1:
1248712478
resolved "https://registry.yarnpkg.com/util-extend/-/util-extend-1.0.3.tgz#a7c216d267545169637b3b6edc6ca9119e2ff93f"
1248812479
integrity sha1-p8IW0mdUUWljeztu3GypEZ4v+T8=
1248912480

12490-
util-promisify@^2.1.0:
12491-
version "2.1.0"
12492-
resolved "https://registry.yarnpkg.com/util-promisify/-/util-promisify-2.1.0.tgz#3c2236476c4d32c5ff3c47002add7c13b9a82a53"
12493-
integrity sha1-PCI2R2xNMsX/PEcAKt18E7moKlM=
12494-
dependencies:
12495-
object.getownpropertydescriptors "^2.0.3"
12496-
1249712481
util.promisify@~1.0.0:
1249812482
version "1.0.1"
1249912483
resolved "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.0.1.tgz#6baf7774b80eeb0f7520d8b81d07982a59abbaee"

0 commit comments

Comments
 (0)