Skip to content

refactor(@angular/cli): streamline version command package reporting #31339

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 30, 2025
Merged

refactor(@angular/cli): streamline version command package reporting #31339

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 5 additions & 24 deletions packages/angular/cli/src/commands/version/version-info.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*/

import { createRequire } from 'node:module';
import { resolve } from 'node:path';
import { VERSION } from '../../utilities/version';

/**
* A subset of `package.json` fields that are relevant for the version command.
Expand Down Expand Up @@ -65,11 +65,9 @@ export function gatherVersionInfo(context: {
packageManager: { name: string; version: string | undefined };
root: string;
}): VersionInfo {
const localRequire = createRequire(resolve(__filename, '../../../'));
// Trailing slash is used to allow the path to be treated as a directory
const workspaceRequire = createRequire(context.root + '/');

const cliPackage: PartialPackageInfo = localRequire('./package.json');
let workspacePackage: PartialPackageInfo | undefined;
try {
workspacePackage = workspaceRequire('./package.json');
Expand All @@ -80,8 +78,6 @@ export function gatherVersionInfo(context: {

const packageNames = new Set(
Object.keys({
...cliPackage.dependencies,
...cliPackage.devDependencies,
...workspacePackage?.dependencies,
...workspacePackage?.devDependencies,
}),
Expand All @@ -90,11 +86,11 @@ export function gatherVersionInfo(context: {
const versions: Record<string, string> = {};
for (const name of packageNames) {
if (PACKAGE_PATTERNS.some((p) => p.test(name))) {
versions[name] = getVersion(name, workspaceRequire, localRequire);
versions[name] = getVersion(name, workspaceRequire);
}
}

const ngCliVersion = cliPackage.version;
const ngCliVersion = VERSION.full;
let angularCoreVersion = '';
const angularSameAsCore: string[] = [];

Expand Down Expand Up @@ -135,32 +131,17 @@ export function gatherVersionInfo(context: {
* @param localRequire A `require` function for the CLI.
* @returns The version of the package, or `<error>` if it could not be found.
*/
function getVersion(
moduleName: string,
workspaceRequire: NodeJS.Require,
localRequire: NodeJS.Require,
): string {
function getVersion(moduleName: string, workspaceRequire: NodeJS.Require): string {
let packageInfo: PartialPackageInfo | undefined;
let cliOnly = false;

// Try to find the package in the workspace
try {
packageInfo = workspaceRequire(`${moduleName}/package.json`);
} catch {}

// If not found, try to find within the CLI
if (!packageInfo) {
try {
packageInfo = localRequire(`${moduleName}/package.json`);
cliOnly = true;
} catch {}
}

// If found, attempt to get the version
if (packageInfo) {
try {
return packageInfo.version + (cliOnly ? ' (cli-only)' : '');
} catch {}
return packageInfo.version;
}

return '<error>';
Expand Down