fix(core): plugin pool should not clobber promises when called multip…

…le times (#21977)
nrwl · Feb 28, 2024 · 4d13753 · 4d13753
1 parent 888110a
commit 4d13753
Show file tree

Hide file tree

Showing 8 changed files with 240 additions and 208 deletions.
diff --git a/packages/nx/src/project-graph/build-project-graph.ts b/packages/nx/src/project-graph/build-project-graph.ts
@@ -13,11 +13,8 @@ import {
 } from './nx-deps-cache';
 import { applyImplicitDependencies } from './utils/implicit-project-dependencies';
 import { normalizeProjectNodes } from './utils/normalize-project-nodes';
-import {
-  isNxPluginV1,
-  isNxPluginV2,
-  loadNxPlugins,
-} from './plugins/internal-api';
+import { loadNxPlugins } from './plugins/internal-api';
+import { isNxPluginV1, isNxPluginV2 } from './plugins/utils';
 import { CreateDependenciesContext } from './plugins';
 import { getRootTsConfigPath } from '../plugins/js/utils/typescript';
 import {

diff --git a/packages/nx/src/project-graph/plugins/internal-api.ts b/packages/nx/src/project-graph/plugins/internal-api.ts
@@ -1,10 +1,8 @@
 // This file contains the bits and bobs of the internal API for loading and interacting with Nx plugins.
 // For the public API, used by plugin authors, see `./public-api.ts`.
 
-import { join, dirname } from 'path';
+import { join } from 'path';
 
-import { toProjectName } from '../../config/workspaces';
-import { combineGlobPatterns } from '../../utils/globs';
 import { workspaceRoot } from '../../utils/workspace-root';
 import { PluginConfiguration } from '../../config/nx-json';
 import { NxPluginV1 } from '../../utils/nx-plugin.deprecated';
@@ -88,42 +86,6 @@ export async function loadNxPlugin(
   return loadedPlugin;
 }
 
-export function isNxPluginV2(plugin: NxPlugin): plugin is NxPluginV2 {
-  return 'createNodes' in plugin || 'createDependencies' in plugin;
-}
-
-export function isNxPluginV1(
-  plugin: NxPlugin | RemotePlugin
-): plugin is NxPluginV1 {
-  return 'processProjectGraph' in plugin || 'projectFilePatterns' in plugin;
-}
-
-export function normalizeNxPlugin(plugin: NxPlugin): NormalizedPlugin {
-  if (isNxPluginV2(plugin)) {
-    return plugin;
-  }
-  if (isNxPluginV1(plugin) && plugin.projectFilePatterns) {
-    return {
-      ...plugin,
-      createNodes: [
-        `*/**/${combineGlobPatterns(plugin.projectFilePatterns)}`,
-        (configFilePath) => {
-          const root = dirname(configFilePath);
-          return {
-            projects: {
-              [root]: {
-                name: toProjectName(configFilePath),
-                targets: plugin.registerProjectTargets?.(configFilePath),
-              },
-            },
-          };
-        },
-      ],
-    };
-  }
-  return plugin;
-}
-
 export async function getDefaultPlugins(root: string) {
   return [
     join(__dirname, '../../plugins/js'),

diff --git a/packages/nx/src/project-graph/plugins/messaging.ts b/packages/nx/src/project-graph/plugins/messaging.ts
@@ -30,16 +30,12 @@ export interface PluginWorkerLoadResult {
       };
 }
 
-export interface PluginWorkerShutdownMessage {
-  type: 'shutdown';
-  payload: undefined;
-}
-
 export interface PluginWorkerCreateNodesMessage {
   type: 'createNodes';
   payload: {
     configFiles: string[];
     context: CreateNodesContext;
+    tx: string;
   };
 }
 
@@ -49,17 +45,20 @@ export interface PluginWorkerCreateNodesResult {
     | {
         success: true;
         result: Awaited<ReturnType<RemotePlugin['createNodes'][1]>>;
+        tx: string;
       }
     | {
         success: false;
         error: string;
+        tx: string;
       };
 }
 
 export interface PluginCreateDependenciesMessage {
   type: 'createDependencies';
   payload: {
     context: CreateDependenciesContext;
+    tx: string;
   };
 }
 
@@ -69,10 +68,12 @@ export interface PluginCreateDependenciesResult {
     | {
         dependencies: ReturnType<RemotePlugin['createDependencies']>;
         success: true;
+        tx: string;
       }
     | {
         success: false;
         error: string;
+        tx: string;
       };
 }
 
@@ -81,6 +82,7 @@ export interface PluginWorkerProcessProjectGraphMessage {
   payload: {
     graph: ProjectGraph;
     ctx: ProjectGraphProcessorContext;
+    tx: string;
   };
 }
 
@@ -90,16 +92,17 @@ export interface PluginWorkerProcessProjectGraphResult {
     | {
         graph: ProjectGraph;
         success: true;
+        tx: string;
       }
     | {
         success: false;
         error: string;
+        tx: string;
       };
 }
 
 export type PluginWorkerMessage =
   | PluginWorkerLoadMessage
-  | PluginWorkerShutdownMessage
   | PluginWorkerCreateNodesMessage
   | PluginCreateDependenciesMessage
   | PluginWorkerProcessProjectGraphMessage;