nx 18.1.0-canary.20240228-4d13753 → 18.1.0-canary.20240229-f6a183c

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "18.1.0-canary.20240228-4d13753",
+  "version": "18.1.0-canary.20240229-f6a183c",
   "private": false,
   "description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
   "repository": {
@@ -66,7 +66,7 @@
     "yargs-parser": "21.1.1",
     "node-machine-id": "1.1.12",
     "ora": "5.3.0",
-    "@nrwl/tao": "18.1.0-canary.20240228-4d13753"
+    "@nrwl/tao": "18.1.0-canary.20240229-f6a183c"
   },
   "peerDependencies": {
     "@swc-node/register": "^1.8.0",
@@ -81,16 +81,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-x64": "18.1.0-canary.20240228-4d13753",
-    "@nx/nx-darwin-arm64": "18.1.0-canary.20240228-4d13753",
-    "@nx/nx-linux-x64-gnu": "18.1.0-canary.20240228-4d13753",
-    "@nx/nx-linux-x64-musl": "18.1.0-canary.20240228-4d13753",
-    "@nx/nx-win32-x64-msvc": "18.1.0-canary.20240228-4d13753",
-    "@nx/nx-linux-arm64-gnu": "18.1.0-canary.20240228-4d13753",
-    "@nx/nx-linux-arm64-musl": "18.1.0-canary.20240228-4d13753",
-    "@nx/nx-linux-arm-gnueabihf": "18.1.0-canary.20240228-4d13753",
-    "@nx/nx-win32-arm64-msvc": "18.1.0-canary.20240228-4d13753",
-    "@nx/nx-freebsd-x64": "18.1.0-canary.20240228-4d13753"
+    "@nx/nx-darwin-x64": "18.1.0-canary.20240229-f6a183c",
+    "@nx/nx-darwin-arm64": "18.1.0-canary.20240229-f6a183c",
+    "@nx/nx-linux-x64-gnu": "18.1.0-canary.20240229-f6a183c",
+    "@nx/nx-linux-x64-musl": "18.1.0-canary.20240229-f6a183c",
+    "@nx/nx-win32-x64-msvc": "18.1.0-canary.20240229-f6a183c",
+    "@nx/nx-linux-arm64-gnu": "18.1.0-canary.20240229-f6a183c",
+    "@nx/nx-linux-arm64-musl": "18.1.0-canary.20240229-f6a183c",
+    "@nx/nx-linux-arm-gnueabihf": "18.1.0-canary.20240229-f6a183c",
+    "@nx/nx-win32-arm64-msvc": "18.1.0-canary.20240229-f6a183c",
+    "@nx/nx-freebsd-x64": "18.1.0-canary.20240229-f6a183c"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",

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

@@ -137,9 +137,12 @@ async function processFilesAndCreateAndSerializeProjectGraph() {
         logger_1.serverLogger.requestLog([...updatedFiles.values()]);
         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);
         await processCollectedUpdatedAndDeletedFiles(graphNodes, updatedFileHashes, deletedFiles);
-        return createAndSerializeProjectGraph(graphNodes);
+        const g = createAndSerializeProjectGraph(graphNodes);
+        delete global.NX_GRAPH_CREATION;
+        return g;
     }
     catch (err) {
         return Promise.resolve({

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

@@ -6,9 +6,11 @@ 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 projectJsons = projectFiles.filter((f) => f.endsWith('project.json'));
     for (let f of projectJsons) {
         const projectJson = (0, json_1.readJson)(tree, f);

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

@@ -187,8 +187,6 @@ async function updateProjectGraphWithPlugins(context, initProjectGraph) {
     const createDependencyPlugins = plugins.filter((plugin) => (0, utils_1.isNxPluginV2)(plugin) && plugin.createDependencies);
     await Promise.all(createDependencyPlugins.map(async (plugin) => {
         perf_hooks_1.performance.mark(`${plugin.name}:createDependencies - start`);
-        // Set this globally to allow plugins to know if they are being called from the project graph creation
-        global.NX_GRAPH_CREATION = true;
         try {
             // TODO: we shouldn't have to pass null here
             const dependencies = await plugin.createDependencies(null, {
@@ -206,7 +204,6 @@ async function updateProjectGraphWithPlugins(context, initProjectGraph) {
             }
             throw new Error(message);
         }
-        delete global.NX_GRAPH_CREATION;
         perf_hooks_1.performance.mark(`${plugin.name}:createDependencies - end`);
         perf_hooks_1.performance.measure(`${plugin.name}:createDependencies`, `${plugin.name}:createDependencies - start`, `${plugin.name}:createDependencies - end`);
     }));

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

@@ -12,7 +12,7 @@ export type RemotePlugin = Omit<NormalizedPlugin, 'createNodes'> & {
         fn: (matchedFiles: string[], context: CreateNodesContext) => Promise<CreateNodesResultWithContext[]>
     ];
 };
-export declare const nxPluginCache: Map<unknown, RemotePlugin>;
+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 function getDefaultPlugins(root: string): Promise<string[]>;

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

@@ -27,11 +27,11 @@ exports.loadNxPlugins = loadNxPlugins;
 async function loadNxPlugin(plugin, root = workspace_root_1.workspaceRoot) {
     const cacheKey = JSON.stringify(plugin);
     if (exports.nxPluginCache.has(cacheKey)) {
-        return exports.nxPluginCache.get(cacheKey);
+        return await exports.nxPluginCache.get(cacheKey);
     }
-    const loadedPlugin = await (0, plugin_pool_1.loadRemoteNxPlugin)(plugin, root);
-    exports.nxPluginCache.set(cacheKey, loadedPlugin);
-    return loadedPlugin;
+    const loadingPlugin = (0, plugin_pool_1.loadRemoteNxPlugin)(plugin, root);
+    exports.nxPluginCache.set(cacheKey, loadingPlugin);
+    return await loadingPlugin;
 }
 exports.loadNxPlugin = loadNxPlugin;
 async function getDefaultPlugins(root) {

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

@@ -94,53 +94,35 @@ function createWorkerHandler(worker, onload, onloadError) {
                             ? [
                                 createNodesPattern,
                                 (configFiles, ctx) => {
-                                    return new Promise(function (res, rej) {
-                                        const tx = pluginName + ':createNodes:' + performance.now();
+                                    const tx = pluginName + ':createNodes:' + performance.now();
+                                    return registerPendingPromise(tx, pending, () => {
                                         worker.send((0, messaging_1.createMessage)({
                                             type: 'createNodes',
                                             payload: { configFiles, context: ctx, tx },
                                         }));
-                                        pending.add(tx);
-                                        promiseBank.set(tx, {
-                                            promise: this,
-                                            resolver: res,
-                                            rejecter: rej,
-                                        });
                                     });
                                 },
                             ]
                             : undefined,
                         createDependencies: result.hasCreateDependencies
                             ? (opts, ctx) => {
-                                return new Promise(function (res, rej) {
-                                    const tx = pluginName + ':createNodes:' + performance.now();
+                                const tx = pluginName + ':createDependencies:' + performance.now();
+                                return registerPendingPromise(tx, pending, () => {
                                     worker.send((0, messaging_1.createMessage)({
                                         type: 'createDependencies',
                                         payload: { context: ctx, tx },
                                     }));
-                                    pending.add(tx);
-                                    promiseBank.set(tx, {
-                                        promise: this,
-                                        resolver: res,
-                                        rejecter: rej,
-                                    });
                                 });
                             }
                             : undefined,
                         processProjectGraph: result.hasProcessProjectGraph
                             ? (graph, ctx) => {
-                                return new Promise(function (res, rej) {
-                                    const tx = pluginName + ':processProjectGraph:' + performance.now();
+                                const tx = pluginName + ':processProjectGraph:' + performance.now();
+                                return registerPendingPromise(tx, pending, () => {
                                     worker.send((0, messaging_1.createMessage)({
                                         type: 'processProjectGraph',
                                         payload: { graph, ctx, tx },
                                     }));
-                                    pending.add(tx);
-                                    promiseBank.set(tx, {
-                                        promise: this,
-                                        resolver: res,
-                                        rejecter: rej,
-                                    });
                                 });
                             }
                             : undefined,
@@ -212,3 +194,23 @@ function getPendingPromises(pool, pidMap) {
     }
     return pendingTxs;
 }
+function registerPendingPromise(tx, pending, callback) {
+    let resolver, rejecter;
+    const promise = new Promise((res, rej) => {
+        resolver = res;
+        rejecter = rej;
+        callback();
+    }).then((val) => {
+        // Remove the promise from the pending set
+        pending.delete(tx);
+        // Return the original value
+        return val;
+    });
+    pending.add(tx);
+    promiseBank.set(tx, {
+        promise,
+        resolver,
+        rejecter,
+    });
+    return promise;
+}

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

@@ -65,6 +65,7 @@ function readProjectsConfigurationFromProjectGraph(projectGraph) {
 }
 exports.readProjectsConfigurationFromProjectGraph = readProjectsConfigurationFromProjectGraph;
 async function buildProjectGraphAndSourceMapsWithoutDaemon() {
+    global.NX_GRAPH_CREATION = true;
     const nxJson = (0, nx_json_1.readNxJson)();
     perf_hooks_1.performance.mark('retrieve-project-configurations:start');
     const { projects, externalNodes, sourceMaps, projectRootMap } = await (0, retrieve_workspace_files_1.retrieveProjectConfigurations)(workspace_root_1.workspaceRoot, nxJson);
@@ -76,6 +77,7 @@ async function buildProjectGraphAndSourceMapsWithoutDaemon() {
     perf_hooks_1.performance.mark('build-project-graph-using-project-file-map:start');
     const projectGraph = (await (0, build_project_graph_1.buildProjectGraphUsingProjectFileMap)(projects, externalNodes, fileMap, allWorkspaceFiles, rustReferences, cacheEnabled ? (0, nx_deps_cache_1.readFileMapCache)() : null, cacheEnabled)).projectGraph;
     perf_hooks_1.performance.mark('build-project-graph-using-project-file-map:end');
+    delete global.NX_GRAPH_CREATION;
     return { projectGraph, sourceMaps };
 }
 exports.buildProjectGraphAndSourceMapsWithoutDaemon = buildProjectGraphAndSourceMapsWithoutDaemon;

package/src/project-graph/utils/project-configuration-utils.js

@@ -141,8 +141,6 @@ plugins, root = workspace_root_1.workspaceRoot) {
         }
         const matchedFiles = [];
         performance.mark(`${plugin.name}:createNodes - start`);
-        // Set this globally to allow plugins to know if they are being called from the project graph creation
-        global.NX_GRAPH_CREATION = true;
         for (const file of projectFiles) {
             if ((0, minimatch_1.minimatch)(file, pattern, { dot: true })) {
                 matchedFiles.push(file);

package/src/project-graph/utils/retrieve-workspace-files.js

@@ -9,6 +9,7 @@ const internal_api_1 = require("../plugins/internal-api");
 const workspace_context_1 = require("../../utils/workspace-context");
 const build_all_workspace_files_1 = require("./build-all-workspace-files");
 const path_1 = require("path");
+const plugin_pool_1 = require("../plugins/plugin-pool");
 /**
  * Walks the workspace directory to create the `projectFileMap`, `ProjectConfigurations` and `allWorkspaceFiles`
  * @throws
@@ -41,7 +42,11 @@ exports.retrieveWorkspaceFiles = retrieveWorkspaceFiles;
  */
 async function retrieveProjectConfigurations(workspaceRoot, nxJson) {
     const plugins = await (0, internal_api_1.loadNxPlugins)(nxJson?.plugins ?? [], workspaceRoot);
-    return _retrieveProjectConfigurations(workspaceRoot, nxJson, plugins);
+    const projects = await _retrieveProjectConfigurations(workspaceRoot, nxJson, plugins);
+    if (!global.NX_GRAPH_CREATION) {
+        await (0, plugin_pool_1.shutdownPluginWorkers)();
+    }
+    return projects;
 }
 exports.retrieveProjectConfigurations = retrieveProjectConfigurations;
 async function retrieveProjectConfigurationsWithAngularProjects(workspaceRoot, nxJson) {