nx 18.1.0-canary.20240307-84d96cc → 18.1.0-canary.20240309-235ca8c

package/src/core/graph/runtime.js

@@ -1 +1 @@
-(()=>{"use strict";var e,r={},t={};function o(e){var n=t[e];if(void 0!==n)return n.exports;var i=t[e]={id:e,loaded:!1,exports:{}};return r[e].call(i.exports,i,i.exports,o),i.loaded=!0,i.exports}o.m=r,e=[],o.O=(r,t,n,i)=>{if(!t){var l=1/0;for(f=0;f<e.length;f++){for(var[t,n,i]=e[f],a=!0,u=0;u<t.length;u++)(!1&i||l>=i)&&Object.keys(o.O).every((e=>o.O[e](t[u])))?t.splice(u--,1):(a=!1,i<l&&(l=i));if(a){e.splice(f--,1);var d=n();void 0!==d&&(r=d)}}return r}i=i||0;for(var f=e.length;f>0&&e[f-1][2]>i;f--)e[f]=e[f-1];e[f]=[t,n,i]},o.n=e=>{var r=e&&e.__esModule?()=>e.default:()=>e;return o.d(r,{a:r}),r},o.d=(e,r)=>{for(var t in r)o.o(r,t)&&!o.o(e,t)&&Object.defineProperty(e,t,{enumerable:!0,get:r[t]})},o.g=function(){if("object"==typeof globalThis)return globalThis;try{return this||new Function("return this")()}catch(e){if("object"==typeof window)return window}}(),o.o=(e,r)=>Object.prototype.hasOwnProperty.call(e,r),o.r=e=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},o.nmd=e=>(e.paths=[],e.children||(e.children=[]),e),(()=>{var e={2:0};o.O.j=r=>0===e[r];var r=(r,t)=>{var n,i,[l,a,u]=t,d=0;if(l.some((r=>0!==e[r]))){for(n in a)o.o(a,n)&&(o.m[n]=a[n]);if(u)var f=u(o)}for(r&&r(t);d<l.length;d++)i=l[d],o.o(e,i)&&e[i]&&e[i][0](),e[i]=0;return o.O(f)},t=self.webpackChunk=self.webpackChunk||[];t.forEach(r.bind(null,0)),t.push=r.bind(null,t.push.bind(t))})()})();
+(()=>{"use strict";var e,r={},t={};function o(e){var n=t[e];if(void 0!==n)return n.exports;var i=t[e]={id:e,loaded:!1,exports:{}};return r[e].call(i.exports,i,i.exports,o),i.loaded=!0,i.exports}o.m=r,e=[],o.O=(r,t,n,i)=>{if(!t){var l=1/0;for(f=0;f<e.length;f++){for(var[t,n,i]=e[f],a=!0,u=0;u<t.length;u++)(!1&i||l>=i)&&Object.keys(o.O).every((e=>o.O[e](t[u])))?t.splice(u--,1):(a=!1,i<l&&(l=i));if(a){e.splice(f--,1);var d=n();void 0!==d&&(r=d)}}return r}i=i||0;for(var f=e.length;f>0&&e[f-1][2]>i;f--)e[f]=e[f-1];e[f]=[t,n,i]},o.n=e=>{var r=e&&e.__esModule?()=>e.default:()=>e;return o.d(r,{a:r}),r},o.d=(e,r)=>{for(var t in r)o.o(r,t)&&!o.o(e,t)&&Object.defineProperty(e,t,{enumerable:!0,get:r[t]})},o.g=function(){if("object"==typeof globalThis)return globalThis;try{return this||new Function("return this")()}catch(e){if("object"==typeof window)return window}}(),o.o=(e,r)=>Object.prototype.hasOwnProperty.call(e,r),o.r=e=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},o.nmd=e=>(e.paths=[],e.children||(e.children=[]),e),(()=>{var e={666:0};o.O.j=r=>0===e[r];var r=(r,t)=>{var n,i,[l,a,u]=t,d=0;if(l.some((r=>0!==e[r]))){for(n in a)o.o(a,n)&&(o.m[n]=a[n]);if(u)var f=u(o)}for(r&&r(t);d<l.length;d++)i=l[d],o.o(e,i)&&e[i]&&e[i][0](),e[i]=0;return o.O(f)},t=self.webpackChunk=self.webpackChunk||[];t.forEach(r.bind(null,0)),t.push=r.bind(null,t.push.bind(t))})()})();

package/src/core/graph/styles.js

@@ -1 +1 @@
-"use strict";(self.webpackChunk=self.webpackChunk||[]).push([[3],{22232:(s,e,k)=>{k.r(e)}},s=>{var e;e=22232,s(s.s=e)}]);
+"use strict";(self.webpackChunk=self.webpackChunk||[]).push([[532],{22232:()=>{}},s=>{var e;e=22232,s(s.s=e)}]);

package/src/daemon/server/plugins.d.ts

@@ -0,0 +1,3 @@
+import { RemotePlugin } from '../../project-graph/plugins/internal-api';
+export declare function getPlugins(): Promise<RemotePlugin[]>;
+export declare function cleanupPlugins(): void;

package/src/daemon/server/plugins.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.cleanupPlugins = exports.getPlugins = void 0;
+const nx_json_1 = require("../../config/nx-json");
+const internal_api_1 = require("../../project-graph/plugins/internal-api");
+const workspace_root_1 = require("../../utils/workspace-root");
+let loadedPlugins;
+let cleanup;
+async function getPlugins() {
+    if (loadedPlugins) {
+        return loadedPlugins;
+    }
+    const pluginsConfiguration = (0, nx_json_1.readNxJson)().plugins ?? [];
+    const [result, cleanupFn] = await (0, internal_api_1.loadNxPluginsInIsolation)(pluginsConfiguration, workspace_root_1.workspaceRoot);
+    cleanup = cleanupFn;
+    return result;
+}
+exports.getPlugins = getPlugins;
+function cleanupPlugins() {
+    cleanup();
+}
+exports.cleanupPlugins = cleanupPlugins;

package/src/daemon/server/project-graph-incremental-recomputation.js

@@ -13,6 +13,7 @@ const workspace_context_1 = require("../../utils/workspace-context");
 const workspace_root_1 = require("../../utils/workspace-root");
 const file_watcher_sockets_1 = require("./file-watching/file-watcher-sockets");
 const logger_1 = require("./logger");
+const plugins_1 = require("./plugins");
 let cachedSerializedProjectGraphPromise;
 const collectedUpdatedFiles = new Set();
 const collectedDeletedFiles = new Set();
@@ -30,15 +31,16 @@ async function getCachedSerializedProjectGraphPromise() {
         // reset the wait time
         waitPeriod = 100;
         await resetInternalStateIfNxDepsMissing();
+        const plugins = await (0, plugins_1.getPlugins)();
         if (collectedUpdatedFiles.size == 0 && collectedDeletedFiles.size == 0) {
             if (!cachedSerializedProjectGraphPromise) {
                 cachedSerializedProjectGraphPromise =
-                    processFilesAndCreateAndSerializeProjectGraph();
+                    processFilesAndCreateAndSerializeProjectGraph(plugins);
             }
         }
         else {
             cachedSerializedProjectGraphPromise =
-                processFilesAndCreateAndSerializeProjectGraph();
+                processFilesAndCreateAndSerializeProjectGraph(plugins);
         }
         return await cachedSerializedProjectGraphPromise;
     }
@@ -77,7 +79,7 @@ function addUpdatedAndDeletedFiles(createdFiles, updatedFiles, deletedFiles) {
                 waitPeriod = waitPeriod * 2;
             }
             cachedSerializedProjectGraphPromise =
-                processFilesAndCreateAndSerializeProjectGraph();
+                processFilesAndCreateAndSerializeProjectGraph(await (0, plugins_1.getPlugins)());
             await cachedSerializedProjectGraphPromise;
             if (createdFiles.length > 0) {
                 (0, file_watcher_sockets_1.notifyFileWatcherSockets)(createdFiles, null, null);
@@ -125,7 +127,7 @@ async function processCollectedUpdatedAndDeletedFiles({ projects, externalNodes,
         throw e;
     }
 }
-async function processFilesAndCreateAndSerializeProjectGraph() {
+async function processFilesAndCreateAndSerializeProjectGraph(plugins) {
     try {
         perf_hooks_1.performance.mark('hash-watched-changes-start');
         const updatedFiles = [...collectedUpdatedFiles.values()];
@@ -138,7 +140,7 @@ async function processFilesAndCreateAndSerializeProjectGraph() {
         logger_1.serverLogger.requestLog([...deletedFiles]);
         const nxJson = (0, nx_json_1.readNxJson)(workspace_root_1.workspaceRoot);
         global.NX_GRAPH_CREATION = true;
-        const graphNodes = await (0, retrieve_workspace_files_1.retrieveProjectConfigurations)(workspace_root_1.workspaceRoot, nxJson);
+        const graphNodes = await (0, retrieve_workspace_files_1.retrieveProjectConfigurations)(plugins, workspace_root_1.workspaceRoot, nxJson);
         await processCollectedUpdatedAndDeletedFiles(graphNodes, updatedFileHashes, deletedFiles);
         const g = createAndSerializeProjectGraph(graphNodes);
         delete global.NX_GRAPH_CREATION;
@@ -175,7 +177,7 @@ async function createAndSerializeProjectGraph({ projects, sourceMaps, }) {
         const fileMap = copyFileMap(exports.fileMapWithFiles.fileMap);
         const allWorkspaceFiles = copyFileData(exports.fileMapWithFiles.allWorkspaceFiles);
         const rustReferences = exports.fileMapWithFiles.rustReferences;
-        const { projectGraph, projectFileMapCache } = await (0, build_project_graph_1.buildProjectGraphUsingProjectFileMap)(projects, knownExternalNodes, fileMap, allWorkspaceFiles, rustReferences, exports.currentProjectFileMapCache || (0, nx_deps_cache_1.readFileMapCache)(), true);
+        const { projectGraph, projectFileMapCache } = await (0, build_project_graph_1.buildProjectGraphUsingProjectFileMap)(projects, knownExternalNodes, fileMap, allWorkspaceFiles, rustReferences, exports.currentProjectFileMapCache || (0, nx_deps_cache_1.readFileMapCache)(), true, await (0, plugins_1.getPlugins)());
         exports.currentProjectFileMapCache = projectFileMapCache;
         exports.currentProjectGraph = projectGraph;
         perf_hooks_1.performance.mark('create-project-graph-end');

package/src/daemon/server/shutdown-utils.js

@@ -5,6 +5,7 @@ const workspace_root_1 = require("../../utils/workspace-root");
 const logger_1 = require("./logger");
 const socket_utils_1 = require("../socket-utils");
 const cache_1 = require("../cache");
+const plugins_1 = require("./plugins");
 exports.SERVER_INACTIVITY_TIMEOUT_MS = 10800000; // 10800000 ms = 3 hours
 let watcherInstance;
 function storeWatcherInstance(instance) {
@@ -28,6 +29,7 @@ async function handleServerProcessTermination({ server, reason, }) {
     try {
         server.close();
         (0, cache_1.deleteDaemonJsonProcessCache)();
+        (0, plugins_1.cleanupPlugins)();
         if (watcherInstance) {
             await watcherInstance.stop();
             logger_1.serverLogger.watcherLog(`Stopping the watcher for ${workspace_root_1.workspaceRoot} (sources)`);

package/src/devkit-internals.d.ts

@@ -18,4 +18,3 @@ export { hashObject } from './hasher/file-hasher';
 export { hashWithWorkspaceContext } from './utils/workspace-context';
 export { createProjectRootMappingsFromProjectConfigurations, findProjectForPath, } from './project-graph/utils/find-project-for-path';
 export { registerTsProject } from './plugins/js/utils/register';
-export { shutdownPluginWorkers } from './project-graph/plugins/plugin-pool';

package/src/devkit-internals.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.shutdownPluginWorkers = exports.registerTsProject = exports.findProjectForPath = exports.createProjectRootMappingsFromProjectConfigurations = exports.hashWithWorkspaceContext = exports.hashObject = exports.splitByColons = exports.readModulePackageJson = exports.stripIndent = exports.sortObjectByKeys = exports.combineOptionsForExecutor = exports.splitTarget = exports.retrieveProjectConfigurationsWithAngularProjects = exports.calculateDefaultProjectName = exports.readNxJsonFromDisk = exports.getExecutorInformation = exports.createTempNpmDirectory = void 0;
+exports.registerTsProject = exports.findProjectForPath = exports.createProjectRootMappingsFromProjectConfigurations = exports.hashWithWorkspaceContext = exports.hashObject = exports.splitByColons = exports.readModulePackageJson = exports.stripIndent = exports.sortObjectByKeys = exports.combineOptionsForExecutor = exports.splitTarget = exports.retrieveProjectConfigurationsWithAngularProjects = exports.calculateDefaultProjectName = exports.readNxJsonFromDisk = exports.getExecutorInformation = exports.createTempNpmDirectory = void 0;
 /**
  * Note to developers: STOP! These exports are available via requireNx in @nx/devkit.
  *
@@ -37,5 +37,3 @@ Object.defineProperty(exports, "createProjectRootMappingsFromProjectConfiguratio
 Object.defineProperty(exports, "findProjectForPath", { enumerable: true, get: function () { return find_project_for_path_1.findProjectForPath; } });
 var register_1 = require("./plugins/js/utils/register");
 Object.defineProperty(exports, "registerTsProject", { enumerable: true, get: function () { return register_1.registerTsProject; } });
-var plugin_pool_1 = require("./project-graph/plugins/plugin-pool");
-Object.defineProperty(exports, "shutdownPluginWorkers", { enumerable: true, get: function () { return plugin_pool_1.shutdownPluginWorkers; } });

package/src/executors/utils/convert-nx-executor.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.convertNxExecutor = void 0;
 const nx_json_1 = require("../../config/nx-json");
 const retrieve_workspace_files_1 = require("../../project-graph/utils/retrieve-workspace-files");
+const internal_api_1 = require("../../project-graph/plugins/internal-api");
 /**
  * Convert an Nx Executor into an Angular Devkit Builder
  *
@@ -15,10 +16,12 @@ function convertNxExecutor(executor) {
     const builderFunction = (options, builderContext) => {
         const promise = async () => {
             const nxJsonConfiguration = (0, nx_json_1.readNxJson)(builderContext.workspaceRoot);
+            const [plugins, cleanup] = await (0, internal_api_1.loadNxPluginsInIsolation)(nxJsonConfiguration.plugins, builderContext.workspaceRoot);
             const projectsConfigurations = {
                 version: 2,
-                projects: (await (0, retrieve_workspace_files_1.retrieveProjectConfigurations)(builderContext.workspaceRoot, nxJsonConfiguration)).projects,
+                projects: (await (0, retrieve_workspace_files_1.retrieveProjectConfigurations)(plugins, builderContext.workspaceRoot, nxJsonConfiguration)).projects,
             };
+            cleanup();
             const context = {
                 root: builderContext.workspaceRoot,
                 projectName: builderContext.target.project,

package/src/migrations/update-15-1-0/set-project-names.js

@@ -6,11 +6,9 @@ const json_1 = require("../../generators/utils/json");
 const format_changed_files_with_prettier_if_available_1 = require("../../generators/internal-utils/format-changed-files-with-prettier-if-available");
 const retrieve_workspace_files_1 = require("../../project-graph/utils/retrieve-workspace-files");
 const internal_api_1 = require("../../project-graph/plugins/internal-api");
-const plugin_pool_1 = require("../../project-graph/plugins/plugin-pool");
 async function default_1(tree) {
     const nxJson = (0, nx_json_1.readNxJson)(tree);
-    const projectFiles = await (0, retrieve_workspace_files_1.retrieveProjectConfigurationPaths)(tree.root, await (0, internal_api_1.loadNxPlugins)(nxJson?.plugins));
-    await (0, plugin_pool_1.shutdownPluginWorkers)();
+    const projectFiles = (0, retrieve_workspace_files_1.retrieveProjectConfigurationPaths)(tree.root, (await (0, internal_api_1.loadPlugins)(nxJson?.plugins ?? [], tree.root)).map((p) => p.plugin));
     const projectJsons = projectFiles.filter((f) => f.endsWith('project.json'));
     for (let f of projectJsons) {
         const projectJson = (0, json_1.readJson)(tree, f);

package/src/migrations/update-17-2-0/move-default-base.d.ts

@@ -2,4 +2,4 @@ import { Tree } from '../../generators/tree';
 /**
  * Updates existing workspaces to move nx.json's affected.defaultBase to nx.json's base.
  */
-export default function update(host: Tree): void;
+export default function update(host: Tree): Promise<void>;

package/src/migrations/update-17-2-0/move-default-base.js

@@ -6,7 +6,7 @@ const format_changed_files_with_prettier_if_available_1 = require("../../generat
 /**
  * Updates existing workspaces to move nx.json's affected.defaultBase to nx.json's base.
  */
-function update(host) {
+async function update(host) {
     const nxJson = (0, nx_json_1.readNxJson)(host);
     if (nxJson?.affected?.defaultBase) {
         nxJson.defaultBase = nxJson.affected.defaultBase;
@@ -16,6 +16,6 @@ function update(host) {
         }
         (0, nx_json_1.updateNxJson)(host, nxJson);
     }
-    (0, format_changed_files_with_prettier_if_available_1.formatChangedFilesWithPrettierIfAvailable)(host);
+    await (0, format_changed_files_with_prettier_if_available_1.formatChangedFilesWithPrettierIfAvailable)(host);
 }
 exports.default = update;

package/src/project-graph/affected/locators/project-glob-changes.js

@@ -9,7 +9,8 @@ const retrieve_workspace_files_1 = require("../../utils/retrieve-workspace-files
 const internal_api_1 = require("../../plugins/internal-api");
 const globs_1 = require("../../../utils/globs");
 const getTouchedProjectsFromProjectGlobChanges = async (touchedFiles, projectGraphNodes, nxJson) => {
-    const globPattern = (0, globs_1.combineGlobPatterns)((0, retrieve_workspace_files_1.configurationGlobs)(await (0, internal_api_1.loadNxPlugins)(nxJson?.plugins, workspace_root_1.workspaceRoot)));
+    const plugins = await (0, internal_api_1.loadPlugins)(nxJson?.plugins ?? [], workspace_root_1.workspaceRoot);
+    const globPattern = (0, globs_1.combineGlobPatterns)((0, retrieve_workspace_files_1.configurationGlobs)(plugins.map((p) => p.plugin)));
     const touchedProjects = new Set();
     for (const touchedFile of touchedFiles) {
         const isProjectFile = (0, minimatch_1.minimatch)(touchedFile.file, globPattern, {

package/src/project-graph/build-project-graph.d.ts

@@ -1,5 +1,6 @@
 import { FileData } from './file-utils';
 import { FileMapCache } from './nx-deps-cache';
+import { RemotePlugin } from './plugins/internal-api';
 import { FileMap, ProjectGraph, ProjectGraphExternalNode } from '../config/project-graph';
 import { ProjectConfiguration } from '../config/workspace-json-project-json';
 import { NxWorkspaceFilesExternals } from '../native';
@@ -8,7 +9,7 @@ export declare function getFileMap(): {
     allWorkspaceFiles: FileData[];
     rustReferences: NxWorkspaceFilesExternals | null;
 };
-export declare function buildProjectGraphUsingProjectFileMap(projects: Record<string, ProjectConfiguration>, externalNodes: Record<string, ProjectGraphExternalNode>, fileMap: FileMap, allWorkspaceFiles: FileData[], rustReferences: NxWorkspaceFilesExternals, fileMapCache: FileMapCache | null, shouldWriteCache: boolean): Promise<{
+export declare function buildProjectGraphUsingProjectFileMap(projects: Record<string, ProjectConfiguration>, externalNodes: Record<string, ProjectGraphExternalNode>, fileMap: FileMap, allWorkspaceFiles: FileData[], rustReferences: NxWorkspaceFilesExternals, fileMapCache: FileMapCache | null, shouldWriteCache: boolean, plugins: RemotePlugin[]): Promise<{
     projectGraph: ProjectGraph;
     projectFileMapCache: FileMapCache;
 }>;

package/src/project-graph/build-project-graph.js

@@ -8,7 +8,6 @@ const assert_workspace_validity_1 = require("../utils/assert-workspace-validity"
 const nx_deps_cache_1 = require("./nx-deps-cache");
 const implicit_project_dependencies_1 = require("./utils/implicit-project-dependencies");
 const normalize_project_nodes_1 = require("./utils/normalize-project-nodes");
-const internal_api_1 = require("./plugins/internal-api");
 const utils_1 = require("./plugins/utils");
 const typescript_1 = require("../plugins/js/utils/typescript");
 const fileutils_1 = require("../utils/fileutils");
@@ -16,7 +15,6 @@ const project_graph_builder_1 = require("./project-graph-builder");
 const configuration_1 = require("../config/configuration");
 const fs_1 = require("fs");
 const output_1 = require("../utils/output");
-const plugin_pool_1 = require("./plugins/plugin-pool");
 let storedFileMap = null;
 let storedAllWorkspaceFiles = null;
 let storedRustReferences = null;
@@ -40,7 +38,7 @@ function getFileMap() {
     }
 }
 exports.getFileMap = getFileMap;
-async function buildProjectGraphUsingProjectFileMap(projects, externalNodes, fileMap, allWorkspaceFiles, rustReferences, fileMapCache, shouldWriteCache) {
+async function buildProjectGraphUsingProjectFileMap(projects, externalNodes, fileMap, allWorkspaceFiles, rustReferences, fileMapCache, shouldWriteCache, plugins) {
     storedFileMap = fileMap;
     storedAllWorkspaceFiles = allWorkspaceFiles;
     storedRustReferences = rustReferences;
@@ -66,12 +64,11 @@ async function buildProjectGraphUsingProjectFileMap(projects, externalNodes, fil
         };
     }
     const context = createContext(projects, nxJson, externalNodes, fileMap, filesToProcess);
-    let projectGraph = await buildProjectGraphUsingContext(nxJson, externalNodes, context, cachedFileData, projectGraphVersion);
+    let projectGraph = await buildProjectGraphUsingContext(nxJson, externalNodes, context, cachedFileData, projectGraphVersion, plugins);
     const projectFileMapCache = (0, nx_deps_cache_1.createProjectFileMapCache)(nxJson, packageJsonDeps, fileMap, rootTsConfig);
     if (shouldWriteCache) {
         (0, nx_deps_cache_1.writeCache)(projectFileMapCache, projectGraph);
     }
-    await (0, plugin_pool_1.shutdownPluginWorkers)();
     return {
         projectGraph,
         projectFileMapCache,
@@ -94,7 +91,7 @@ function readCombinedDeps() {
         ...installationPackageJson.devDependencies,
     };
 }
-async function buildProjectGraphUsingContext(nxJson, knownExternalNodes, ctx, cachedFileData, projectGraphVersion) {
+async function buildProjectGraphUsingContext(nxJson, knownExternalNodes, ctx, cachedFileData, projectGraphVersion, plugins) {
     perf_hooks_1.performance.mark('build project graph:start');
     const builder = new project_graph_builder_1.ProjectGraphBuilder(null, ctx.fileMap.projectFileMap);
     builder.setVersion(projectGraphVersion);
@@ -103,7 +100,7 @@ async function buildProjectGraphUsingContext(nxJson, knownExternalNodes, ctx, ca
     }
     await (0, normalize_project_nodes_1.normalizeProjectNodes)(ctx, builder);
     const initProjectGraph = builder.getUpdatedProjectGraph();
-    const r = await updateProjectGraphWithPlugins(ctx, initProjectGraph);
+    const r = await updateProjectGraphWithPlugins(ctx, initProjectGraph, plugins);
     const updatedBuilder = new project_graph_builder_1.ProjectGraphBuilder(r, ctx.fileMap.projectFileMap);
     for (const proj of Object.keys(cachedFileData.projectFileMap)) {
         for (const f of ctx.fileMap.projectFileMap[proj] || []) {
@@ -141,8 +138,7 @@ function createContext(projects, nxJson, externalNodes, fileMap, filesToProcess)
         filesToProcess,
     };
 }
-async function updateProjectGraphWithPlugins(context, initProjectGraph) {
-    const plugins = await (0, internal_api_1.loadNxPlugins)(context.nxJsonConfiguration?.plugins, context.workspaceRoot);
+async function updateProjectGraphWithPlugins(context, initProjectGraph, plugins) {
     let graph = initProjectGraph;
     for (const plugin of plugins) {
         try {

package/src/project-graph/plugins/internal-api.d.ts

@@ -1,6 +1,7 @@
 import { PluginConfiguration } from '../../config/nx-json';
 import { NxPluginV1 } from '../../utils/nx-plugin.deprecated';
 import { CreateNodesContext, CreateNodesResult, NxPluginV2 } from './public-api';
+export { loadPlugins, loadPlugin } from './worker-api';
 export type CreateNodesResultWithContext = CreateNodesResult & {
     file: string;
     pluginName: string;
@@ -12,7 +13,10 @@ export type RemotePlugin = Omit<NormalizedPlugin, 'createNodes'> & {
         fn: (matchedFiles: string[], context: CreateNodesContext) => Promise<CreateNodesResultWithContext[]>
     ];
 };
-export declare const nxPluginCache: Map<unknown, Promise<RemotePlugin>>;
-export declare function loadNxPlugins(plugins: PluginConfiguration[], root?: string): Promise<RemotePlugin[]>;
-export declare function loadNxPlugin(plugin: PluginConfiguration, root?: string): Promise<RemotePlugin>;
+export declare const nxPluginCache: Map<unknown, [Promise<RemotePlugin>, () => void]>;
+/**
+ * This loads plugins in isolation in their own worker so that they do not disturb other workers or the main process.
+ */
+export declare function loadNxPluginsInIsolation(plugins: PluginConfiguration[], root?: string): Promise<[RemotePlugin[], () => void]>;
+export declare function loadNxPluginInIsolation(plugin: PluginConfiguration, root?: string): [Promise<RemotePlugin>, () => void];
 export declare function getDefaultPlugins(root: string): Promise<string[]>;

package/src/project-graph/plugins/internal-api.js

@@ -2,38 +2,54 @@
 // 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`.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDefaultPlugins = exports.loadNxPlugin = exports.loadNxPlugins = exports.nxPluginCache = void 0;
+exports.getDefaultPlugins = exports.loadNxPluginInIsolation = exports.loadNxPluginsInIsolation = exports.nxPluginCache = exports.loadPlugin = exports.loadPlugins = void 0;
 const path_1 = require("path");
 const workspace_root_1 = require("../../utils/workspace-root");
 const angular_json_1 = require("../../adapter/angular-json");
 const plugin_pool_1 = require("./plugin-pool");
+var worker_api_1 = require("./worker-api");
+Object.defineProperty(exports, "loadPlugins", { enumerable: true, get: function () { return worker_api_1.loadPlugins; } });
+Object.defineProperty(exports, "loadPlugin", { enumerable: true, get: function () { return worker_api_1.loadPlugin; } });
 // Short lived cache (cleared between cmd runs)
 // holding resolved nx plugin objects.
 // Allows loaded plugins to not be reloaded when
 // referenced multiple times.
 exports.nxPluginCache = new Map();
-async function loadNxPlugins(plugins, root = workspace_root_1.workspaceRoot) {
+/**
+ * This loads plugins in isolation in their own worker so that they do not disturb other workers or the main process.
+ */
+async function loadNxPluginsInIsolation(plugins, root = workspace_root_1.workspaceRoot) {
     const result = [];
     plugins ??= [];
     plugins.unshift((0, path_1.join)(__dirname, '../../plugins/project-json/build-nodes/package-json-next-to-project-json'));
     // We push the nx core node plugins onto the end, s.t. it overwrites any other plugins
     plugins.push(...(await getDefaultPlugins(root)));
+    const cleanupFunctions = [];
     for (const plugin of plugins) {
-        result.push(loadNxPlugin(plugin, root));
+        const [loadedPluginPromise, cleanup] = loadNxPluginInIsolation(plugin, root);
+        result.push(loadedPluginPromise);
+        cleanupFunctions.push(cleanup);
     }
-    return Promise.all(result);
+    return [
+        await Promise.all(result),
+        () => {
+            for (const fn of cleanupFunctions) {
+                fn();
+            }
+        },
+    ];
 }
-exports.loadNxPlugins = loadNxPlugins;
-async function loadNxPlugin(plugin, root = workspace_root_1.workspaceRoot) {
+exports.loadNxPluginsInIsolation = loadNxPluginsInIsolation;
+function loadNxPluginInIsolation(plugin, root = workspace_root_1.workspaceRoot) {
     const cacheKey = JSON.stringify(plugin);
     if (exports.nxPluginCache.has(cacheKey)) {
-        return await exports.nxPluginCache.get(cacheKey);
+        return exports.nxPluginCache.get(cacheKey);
     }
-    const loadingPlugin = (0, plugin_pool_1.loadRemoteNxPlugin)(plugin, root);
-    exports.nxPluginCache.set(cacheKey, loadingPlugin);
-    return await loadingPlugin;
+    const [loadingPlugin, cleanup] = (0, plugin_pool_1.loadRemoteNxPlugin)(plugin, root);
+    exports.nxPluginCache.set(cacheKey, [loadingPlugin, cleanup]);
+    return [loadingPlugin, cleanup];
 }
-exports.loadNxPlugin = loadNxPlugin;
+exports.loadNxPluginInIsolation = loadNxPluginInIsolation;
 async function getDefaultPlugins(root) {
     return [
         (0, path_1.join)(__dirname, '../../plugins/js'),

package/src/project-graph/plugins/plugin-pool.d.ts

@@ -1,4 +1,3 @@
 import { PluginConfiguration } from '../../config/nx-json';
 import { RemotePlugin } from './internal-api';
-export declare function loadRemoteNxPlugin(plugin: PluginConfiguration, root: string): Promise<RemotePlugin>;
-export declare function shutdownPluginWorkers(): Promise<void>;
+export declare function loadRemoteNxPlugin(plugin: PluginConfiguration, root: string): readonly [Promise<RemotePlugin>, () => void];

package/src/project-graph/plugins/plugin-pool.js

@@ -1,17 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.shutdownPluginWorkers = exports.loadRemoteNxPlugin = void 0;
+exports.loadRemoteNxPlugin = void 0;
 const child_process_1 = require("child_process");
 const path = require("path");
 // TODO (@AgentEnder): After scoped verbose logging is implemented, re-add verbose logs here.
 // import { logger } from '../../utils/logger';
 const internal_api_1 = require("./internal-api");
 const messaging_1 = require("./messaging");
-const pool = new Set();
-const pidMap = new Map();
-// transaction id (tx) -> Promise, Resolver, Rejecter
-// Makes sure that we can resolve the correct promise when the worker sends back the result
-const promiseBank = new Map();
+const cleanupFunctions = new Set();
+const pluginNames = new Map();
 function loadRemoteNxPlugin(plugin, root) {
     // this should only really be true when running unit tests within
     // the Nx repo. We still need to start the worker in this case,
@@ -36,40 +33,44 @@ function loadRemoteNxPlugin(plugin, root) {
         ],
     });
     worker.send((0, messaging_1.createMessage)({ type: 'load', payload: { plugin, root } }));
-    pool.add(worker);
     // logger.verbose(`[plugin-worker] started worker: ${worker.pid}`);
-    return new Promise((res, rej) => {
-        worker.on('message', createWorkerHandler(worker, res, rej));
-        worker.on('exit', createWorkerExitHandler(worker));
-    });
+    const pendingPromises = new Map();
+    const exitHandler = createWorkerExitHandler(worker, pendingPromises);
+    const cleanupFunction = () => {
+        worker.off('exit', exitHandler);
+        shutdownPluginWorker(worker, pendingPromises);
+    };
+    cleanupFunctions.add(cleanupFunction);
+    return [
+        new Promise((res, rej) => {
+            worker.on('message', createWorkerHandler(worker, pendingPromises, res, rej));
+            worker.on('exit', exitHandler);
+        }),
+        () => {
+            cleanupFunction();
+            cleanupFunctions.delete(cleanupFunction);
+        },
+    ];
 }
 exports.loadRemoteNxPlugin = loadRemoteNxPlugin;
-let pluginWorkersShutdown = false;
-async function shutdownPluginWorkers() {
+async function shutdownPluginWorker(worker, pendingPromises) {
     // Clears the plugin cache so no refs to the workers are held
     internal_api_1.nxPluginCache.clear();
-    // Marks the workers as shutdown so that we don't report unexpected exits
-    pluginWorkersShutdown = true;
     // logger.verbose(`[plugin-pool] starting worker shutdown`);
-    const pending = getPendingPromises(pool, pidMap);
-    for (const pendingPromise of pending) {
-        pendingPromise.rejector(new Error('Shutting down'));
-    }
-    // logger.verbose(`[plugin-pool] all pending operations completed`);
-    for (const childProcess of pool) {
-        childProcess.kill('SIGINT');
-    }
-    // logger.verbose(`[plugin-pool] all workers killed`);
+    // Other things may be interacting with the worker.
+    // Wait for all pending promises to be done before killing the worker
+    await Promise.all(Array.from(pendingPromises.values()).map(({ promise }) => promise));
+    worker.kill('SIGINT');
 }
-exports.shutdownPluginWorkers = shutdownPluginWorkers;
 /**
  * Creates a message handler for the given worker.
  * @param worker Instance of plugin-worker
+ * @param pending Set of pending promises
  * @param onload Resolver for RemotePlugin promise
  * @param onloadError Rejecter for RemotePlugin promise
  * @returns Function to handle messages from the worker
  */
-function createWorkerHandler(worker, onload, onloadError) {
+function createWorkerHandler(worker, pending, onload, onloadError) {
     let pluginName;
     return function (message) {
         const parsed = JSON.parse(message);
@@ -83,8 +84,7 @@ function createWorkerHandler(worker, onload, onloadError) {
                 if (result.success) {
                     const { name, createNodesPattern } = result;
                     pluginName = name;
-                    const pending = new Set();
-                    pidMap.set(worker.pid, { name, pending });
+                    pluginNames.set(worker, pluginName);
                     onload({
                         name,
                         createNodes: createNodesPattern
@@ -130,81 +130,57 @@ function createWorkerHandler(worker, onload, onloadError) {
                 }
             },
             createDependenciesResult: ({ tx, ...result }) => {
-                const { resolver, rejector } = promiseBank.get(tx);
+                const { resolver, rejector } = pending.get(tx);
                 if (result.success) {
                     resolver(result.dependencies);
                 }
                 else if (result.success === false) {
                     rejector(result.error);
                 }
-                pidMap.get(worker.pid)?.pending.delete(tx);
-                promiseBank.delete(tx);
             },
             createNodesResult: ({ tx, ...result }) => {
-                const { resolver, rejector } = promiseBank.get(tx);
+                const { resolver, rejector } = pending.get(tx);
                 if (result.success) {
                     resolver(result.result);
                 }
                 else if (result.success === false) {
                     rejector(result.error);
                 }
-                pidMap.get(worker.pid)?.pending.delete(tx);
-                promiseBank.delete(tx);
             },
             processProjectGraphResult: ({ tx, ...result }) => {
-                const { resolver, rejector } = promiseBank.get(tx);
+                const { resolver, rejector } = pending.get(tx);
                 if (result.success) {
                     resolver(result.graph);
                 }
                 else if (result.success === false) {
                     rejector(result.error);
                 }
-                pidMap.get(worker.pid)?.pending.delete(tx);
-                promiseBank.delete(tx);
             },
         });
     };
 }
-function createWorkerExitHandler(worker) {
+function createWorkerExitHandler(worker, pendingPromises) {
     return () => {
-        if (!pluginWorkersShutdown) {
-            pidMap.get(worker.pid)?.pending.forEach((tx) => {
-                const { rejector } = promiseBank.get(tx);
-                rejector(new Error(`Plugin worker ${pidMap.get(worker.pid).name ?? worker.pid} exited unexpectedly with code ${worker.exitCode}`));
-            });
-            shutdownPluginWorkers();
+        for (const [_, pendingPromise] of pendingPromises) {
+            pendingPromise.rejector(new Error(`Plugin worker ${pluginNames.get(worker) ?? worker.pid} exited unexpectedly with code ${worker.exitCode}`));
         }
     };
 }
 process.on('exit', () => {
-    if (pool.size) {
-        shutdownPluginWorkers();
+    for (const fn of cleanupFunctions) {
+        fn();
     }
 });
-function getPendingPromises(pool, pidMap) {
-    const pendingTxs = [];
-    for (const p of pool) {
-        const { pending } = pidMap.get(p.pid) ?? { pending: new Set() };
-        for (const tx of pending) {
-            pendingTxs.push(promiseBank.get(tx));
-        }
-    }
-    return pendingTxs;
-}
 function registerPendingPromise(tx, pending, callback) {
     let resolver, rejector;
     const promise = new Promise((res, rej) => {
         resolver = res;
         rejector = rej;
         callback();
-    }).then((val) => {
-        // Remove the promise from the pending set
+    }).finally(() => {
         pending.delete(tx);
-        // Return the original value
-        return val;
     });
-    pending.add(tx);
-    promiseBank.set(tx, {
+    pending.set(tx, {
         promise,
         resolver,
         rejector,

package/src/project-graph/plugins/plugin-worker.js

@@ -1,10 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const installation_directory_1 = require("../../utils/installation-directory");
-const worker_api_1 = require("./worker-api");
 const messaging_1 = require("./messaging");
-const retrieve_workspace_files_1 = require("../utils/retrieve-workspace-files");
 const utils_1 = require("./utils");
+const worker_api_1 = require("./worker-api");
 global.NX_GRAPH_CREATION = true;
 let plugin;
 let pluginOptions;
@@ -13,7 +11,7 @@ process.on('message', async (message) => {
         load: async ({ plugin: pluginConfiguration, root }) => {
             process.chdir(root);
             try {
-                ({ plugin, options: pluginOptions } = await loadPluginFromWorker(pluginConfiguration, root));
+                ({ plugin, options: pluginOptions } = await (0, worker_api_1.loadPlugin)(pluginConfiguration, root));
                 return {
                     type: 'load-result',
                     payload: {
@@ -82,18 +80,6 @@ process.on('message', async (message) => {
         },
     });
 });
-let projectsWithoutInference;
-async function loadPluginFromWorker(plugin, root) {
-    try {
-        require.resolve(typeof plugin === 'string' ? plugin : plugin.plugin);
-    }
-    catch {
-        // If a plugin cannot be resolved, we will need projects to resolve it
-        projectsWithoutInference ??=
-            await (0, retrieve_workspace_files_1.retrieveProjectConfigurationsWithoutPluginInference)(root);
-    }
-    return await (0, worker_api_1.loadNxPluginAsync)(plugin, (0, installation_directory_1.getNxRequirePaths)(root), projectsWithoutInference, root);
-}
 function runCreateNodesInParallel(configFiles, context) {
     const promises = configFiles.map((file) => {
         performance.mark(`${plugin.name}:createNodes:${file} - start`);