Skip to content
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions packages/angular/cli/src/commands/update/update-resolver.ts
Original file line number Diff line number Diff line change
Expand Up @@ -942,11 +942,7 @@ export async function resolveUserUpdatePlan(
};

if (packages.size === 0) {
await Promise.all(
Array.from(npmDeps.keys()).map(async (depName) => {
await getOrFetchPackageMetadata(depName);
}),
);
await Promise.all(Array.from(npmDeps.keys(), (depName) => getOrFetchPackageMetadata(depName)));
} else {
let lastPackagesSize;
do {
Expand Down Expand Up @@ -999,12 +995,13 @@ export async function resolveUserUpdatePlan(
} while (packages.size > lastPackagesSize);
}

const isListingUpdates = packages.size === 0;
const packageInfoEntries = await Promise.all(
Array.from(npmDeps.keys(), async (depName) => {
const isUpdating = packages.has(depName);
const localPkgJson = getInstalledPackageJson(depName, workspaceRoot);

if (isUpdating || !localPkgJson) {
if (isListingUpdates || isUpdating || !localPkgJson) {
const metadata = await getOrFetchPackageMetadata(depName);
if (metadata) {
const info = await _buildPackageInfo(
Expand Down
23 changes: 23 additions & 0 deletions packages/angular/cli/src/commands/update/update-resolver_spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -289,6 +289,29 @@ describe('UpdateResolver', () => {
expect(plan.packagesToUpdate.size).toBe(0);
});

it('includes registry metadata when listing updates with locked dependency versions in package.json', async () => {
createMockWorkspace(
{
name: 'blah',
dependencies: {
'@angular-devkit-tests/update-base': '1.0.0',
},
},
{
'@angular-devkit-tests/update-base': { version: '1.0.0' },
},
);

const plan = await resolvePlan({
packages: [],
workspaceRoot: tempRoot,
});

const info = plan.packageInfoMap.get('@angular-devkit-tests/update-base');
expect(info?.npmPackageJson['dist-tags']?.['latest']).toBe('1.1.0');
expect(info?.npmPackageJson.versions).toContain('1.1.0');
});

it('should not error with yarn 2.0 protocols', async () => {
createMockWorkspace(
{
Expand Down