nx 20.5.0-canary.20250212-7c5fcf3 → 20.5.0-canary.20250214-ef08108

package/src/project-graph/plugins/tasks-execution-hooks.js

@@ -5,8 +5,9 @@ exports.runPostTasksExecution = runPostTasksExecution;
 const get_plugins_1 = require("./get-plugins");
 const is_on_daemon_1 = require("../../daemon/is-on-daemon");
 const client_1 = require("../../daemon/client/client");
+const enabled_1 = require("../../daemon/client/enabled");
 async function runPreTasksExecution(pluginContext) {
-    if ((0, is_on_daemon_1.isOnDaemon)() || !(0, client_1.isDaemonEnabled)()) {
+    if ((0, is_on_daemon_1.isOnDaemon)() || !(0, enabled_1.isDaemonEnabled)(pluginContext.nxJsonConfiguration)) {
         performance.mark(`preTasksExecution:start`);
         const plugins = await (0, get_plugins_1.getPlugins)(pluginContext.workspaceRoot);
         const envs = await Promise.all(plugins
@@ -21,7 +22,7 @@ async function runPreTasksExecution(pluginContext) {
                 performance.measure(`${plugin.name}:preTasksExecution`, `${plugin.name}:preTasksExecution:start`, `${plugin.name}:preTasksExecution:end`);
             }
         }));
-        if (!(0, client_1.isDaemonEnabled)()) {
+        if (!(0, enabled_1.isDaemonEnabled)(pluginContext.nxJsonConfiguration)) {
             applyProcessEnvs(envs);
         }
         performance.mark(`preTasksExecution:end`);
@@ -41,7 +42,7 @@ function applyProcessEnvs(envs) {
     }
 }
 async function runPostTasksExecution(context) {
-    if ((0, is_on_daemon_1.isOnDaemon)() || !(0, client_1.isDaemonEnabled)()) {
+    if ((0, is_on_daemon_1.isOnDaemon)() || !(0, enabled_1.isDaemonEnabled)(context.nxJsonConfiguration)) {
         performance.mark(`postTasksExecution:start`);
         const plugins = await (0, get_plugins_1.getPlugins)();
         await Promise.all(plugins

package/src/project-graph/plugins/utils.d.ts

@@ -1,2 +1,2 @@
-import { CreateNodesContextV2, CreateNodesFunction, CreateNodesResult } from './public-api';
-export declare function createNodesFromFiles<T = unknown>(createNodes: CreateNodesFunction<T>, configFiles: readonly string[], options: T, context: CreateNodesContextV2): Promise<[file: string, value: CreateNodesResult][]>;
+import { CreateNodesContext, CreateNodesContextV2, CreateNodesResult } from './public-api';
+export declare function createNodesFromFiles<T = unknown>(createNodes: (projectConfigurationFile: string, options: T | undefined, context: CreateNodesContext, idx: number) => CreateNodesResult | Promise<CreateNodesResult>, configFiles: readonly string[], options: T, context: CreateNodesContextV2): Promise<[file: string, value: CreateNodesResult][]>;

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

@@ -5,12 +5,12 @@ const error_types_1 = require("../error-types");
 async function createNodesFromFiles(createNodes, configFiles, options, context) {
     const results = [];
     const errors = [];
-    await Promise.all(configFiles.map(async (file) => {
+    await Promise.all(configFiles.map(async (file, idx) => {
         try {
             const value = await createNodes(file, options, {
                 ...context,
                 configFiles,
-            });
+            }, idx);
             if (value) {
                 results.push([file, value]);
             }

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

@@ -280,7 +280,7 @@ async function createProjectGraphAndSourceMapsAsync(opts = {
             handleProjectGraphError(opts, e);
         }
         finally {
-            lock.unlock();
+            lock?.unlock();
         }
     }
     else {

package/src/utils/workspace-context.d.ts

@@ -12,6 +12,7 @@ export declare function globWithWorkspaceContextSync(workspaceRoot: string, glob
 export declare function globWithWorkspaceContext(workspaceRoot: string, globs: string[], exclude?: string[]): Promise<string[]>;
 export declare function multiGlobWithWorkspaceContext(workspaceRoot: string, globs: string[], exclude?: string[]): Promise<string[][]>;
 export declare function hashWithWorkspaceContext(workspaceRoot: string, globs: string[], exclude?: string[]): Promise<string>;
+export declare function hashMultiGlobWithWorkspaceContext(workspaceRoot: string, globGroups: string[][]): Promise<string[]>;
 export declare function updateContextWithChangedFiles(workspaceRoot: string, createdFiles: string[], updatedFiles: string[], deletedFiles: string[]): Promise<void>;
 export declare function updateFilesInContext(workspaceRoot: string, updatedFiles: string[], deletedFiles: string[]): Record<string, string>;
 export declare function getAllFileDataInContext(workspaceRoot: string): Promise<import("../native").FileData[]>;

package/src/utils/workspace-context.js

@@ -6,6 +6,7 @@ exports.globWithWorkspaceContextSync = globWithWorkspaceContextSync;
 exports.globWithWorkspaceContext = globWithWorkspaceContext;
 exports.multiGlobWithWorkspaceContext = multiGlobWithWorkspaceContext;
 exports.hashWithWorkspaceContext = hashWithWorkspaceContext;
+exports.hashMultiGlobWithWorkspaceContext = hashMultiGlobWithWorkspaceContext;
 exports.updateContextWithChangedFiles = updateContextWithChangedFiles;
 exports.updateFilesInContext = updateFilesInContext;
 exports.getAllFileDataInContext = getAllFileDataInContext;
@@ -65,6 +66,13 @@ async function hashWithWorkspaceContext(workspaceRoot, globs, exclude) {
     }
     return client_1.daemonClient.hashGlob(globs, exclude);
 }
+async function hashMultiGlobWithWorkspaceContext(workspaceRoot, globGroups) {
+    if ((0, is_on_daemon_1.isOnDaemon)() || !client_1.daemonClient.enabled()) {
+        ensureContextAvailable(workspaceRoot);
+        return workspaceContext.hashFilesMatchingGlobs(globGroups);
+    }
+    return client_1.daemonClient.hashMultiGlob(globGroups);
+}
 async function updateContextWithChangedFiles(workspaceRoot, createdFiles, updatedFiles, deletedFiles) {
     if (!client_1.daemonClient.enabled()) {
         updateFilesInContext(workspaceRoot, [...createdFiles, ...updatedFiles], deletedFiles);