Skip to content

Commit

Permalink
fix(core): listing plugin capabilities causes issues when returning n…
Browse files Browse the repository at this point in the history
…ull (#15308)
  • Loading branch information
AgentEnder authored Feb 28, 2023
1 parent 1975181 commit 031005f
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 13 deletions.
8 changes: 7 additions & 1 deletion packages/nx/src/utils/plugins/installed-plugins.ts
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,13 @@ export function getInstalledPluginsAndCapabilities(
for (const plugin of Array.from(plugins).sort()) {
try {
const capabilities = getPluginCapabilities(workspaceRoot, plugin);
if (capabilities.executors || capabilities.generators) {
if (
capabilities &&
(capabilities.executors ||
capabilities.generators ||
capabilities.projectGraphExtension ||
capabilities.projectInference)
) {
result.set(plugin, capabilities);
}
} catch {}
Expand Down
14 changes: 6 additions & 8 deletions packages/nx/src/utils/plugins/local-plugins.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,11 @@ import { output } from '../output';
import type { PluginCapabilities } from './models';
import { hasElements } from './shared';
import { readJsonFile } from '../fileutils';
import { PackageJson, readNxMigrateConfig } from '../package-json';
import { PackageJson } from '../package-json';
import { ProjectsConfigurations } from '../../config/workspace-json-project-json';
import { join } from 'path';
import { workspaceRoot } from '../workspace-root';
import { existsSync } from 'fs';
import { ExecutorsJson, GeneratorsJson } from '../../config/misc-interfaces';
import { loadNxPlugin } from '../nx-plugin';
import { getNxRequirePaths } from '../installation-directory';
import { getPluginCapabilities } from './plugin-capabilities';

export function getLocalWorkspacePlugins(
Expand All @@ -26,10 +23,11 @@ export function getLocalWorkspacePlugins(
packageJson.name
);
if (
capabilities.executors ||
capabilities.generators ||
capabilities.projectGraphExtension ||
capabilities.projectInference
capabilities &&
(capabilities.executors ||
capabilities.generators ||
capabilities.projectGraphExtension ||
capabilities.projectInference)
) {
plugins.set(packageJson.name, {
...capabilities,
Expand Down
8 changes: 4 additions & 4 deletions packages/nx/src/utils/plugins/models.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ import {

export interface PluginCapabilities {
name: string;
executors: { [name: string]: ExecutorsJsonEntry };
generators: { [name: string]: GeneratorsJsonEntry };
projectInference: boolean;
projectGraphExtension: boolean;
executors?: { [name: string]: ExecutorsJsonEntry };
generators?: { [name: string]: GeneratorsJsonEntry };
projectInference?: boolean;
projectGraphExtension?: boolean;
}

export interface CorePlugin {
Expand Down

1 comment on commit 031005f

@vercel
Copy link

@vercel vercel bot commented on 031005f Feb 28, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

nx-dev – ./

nx.dev
nx-dev-nrwl.vercel.app
nx-dev-git-master-nrwl.vercel.app
nx-five.vercel.app

Please sign in to comment.