nx 17.1.1 → 17.1.2

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

@@ -97,9 +97,11 @@ plugins, root = workspace_root_1.workspaceRoot) {
             }
         }
     }
+    const rootMap = createRootMap(projectRootMap);
     return {
         projects: readProjectConfigurationsFromRootMap(projectRootMap),
         externalNodes,
+        rootMap,
     };
 }
 exports.buildProjectsConfigurationsFromProjectPathsAndPlugins = buildProjectsConfigurationsFromProjectPathsAndPlugins;
@@ -221,3 +223,10 @@ function readTargetDefaultsForTarget(targetName, targetDefaults, executor) {
     }
 }
 exports.readTargetDefaultsForTarget = readTargetDefaultsForTarget;
+function createRootMap(projectRootMap) {
+    const map = {};
+    for (const [projectRoot, { name: projectName }] of projectRootMap) {
+        map[projectRoot] = projectName;
+    }
+    return map;
+}

package/src/project-graph/utils/retrieve-workspace-files.d.ts

@@ -44,5 +44,6 @@ export declare function retrieveProjectConfigurationsWithoutPluginInference(root
 export declare function createProjectConfigurations(workspaceRoot: string, nxJson: NxJsonConfiguration, configFiles: string[], plugins: LoadedNxPlugin[]): {
     projects: Record<string, ProjectConfiguration>;
     externalNodes: Record<string, ProjectGraphExternalNode>;
+    rootMap: Record<string, string>;
 };
 export declare function configurationGlobs(workspaceRoot: string, plugins: LoadedNxPlugin[]): string[];

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

@@ -23,12 +23,13 @@ async function retrieveWorkspaceFiles(workspaceRoot, nxJson) {
     perf_hooks_1.performance.mark('native-file-deps:end');
     perf_hooks_1.performance.measure('native-file-deps', 'native-file-deps:start', 'native-file-deps:end');
     perf_hooks_1.performance.mark('get-workspace-files:start');
-    const { projectConfigurations, projectFileMap, globalFiles, externalNodes } = (0, workspace_context_1.getNxWorkspaceFilesFromContext)(workspaceRoot, globs, (configs) => {
+    let projects;
+    let externalNodes;
+    const { projectFileMap, globalFiles } = (0, workspace_context_1.getNxWorkspaceFilesFromContext)(workspaceRoot, globs, (configs) => {
         const projectConfigurations = createProjectConfigurations(workspaceRoot, nxJson, configs, plugins);
-        return {
-            projectNodes: projectConfigurations.projects,
-            externalNodes: projectConfigurations.externalNodes,
-        };
+        projects = projectConfigurations.projects;
+        externalNodes = projectConfigurations.externalNodes;
+        return projectConfigurations.rootMap;
     });
     perf_hooks_1.performance.mark('get-workspace-files:end');
     perf_hooks_1.performance.measure('get-workspace-files', 'get-workspace-files:start', 'get-workspace-files:end');
@@ -40,9 +41,9 @@ async function retrieveWorkspaceFiles(workspaceRoot, nxJson) {
         },
         projectConfigurations: {
             version: 2,
-            projects: projectConfigurations,
+            projects,
         },
-        externalNodes: externalNodes,
+        externalNodes,
     };
 }
 exports.retrieveWorkspaceFiles = retrieveWorkspaceFiles;
@@ -78,13 +79,16 @@ function retrieveProjectConfigurationsSync(workspaceRoot, nxJson) {
 }
 exports.retrieveProjectConfigurationsSync = retrieveProjectConfigurationsSync;
 function _retrieveProjectConfigurations(workspaceRoot, nxJson, plugins, globs) {
-    return (0, workspace_context_1.getProjectConfigurationsFromContext)(workspaceRoot, globs, (configs) => {
-        const projectConfigurations = createProjectConfigurations(workspaceRoot, nxJson, configs, plugins);
-        return {
-            projectNodes: projectConfigurations.projects,
-            externalNodes: projectConfigurations.externalNodes,
+    let result;
+    (0, workspace_context_1.getProjectConfigurationsFromContext)(workspaceRoot, globs, (configs) => {
+        const { projects, externalNodes, rootMap } = createProjectConfigurations(workspaceRoot, nxJson, configs, plugins);
+        result = {
+            projectNodes: projects,
+            externalNodes: externalNodes,
         };
+        return rootMap;
     });
+    return result;
 }
 async function retrieveProjectConfigurationPaths(root, nxJson) {
     const projectGlobPatterns = configurationGlobs(root, await (0, nx_plugin_1.loadNxPlugins)(nxJson?.plugins ?? [], (0, installation_directory_1.getNxRequirePaths)(root), root));
@@ -104,18 +108,17 @@ function retrieveProjectConfigurationsWithoutPluginInference(root) {
     if (projectsWithoutPluginCache.has(cacheKey)) {
         return projectsWithoutPluginCache.get(cacheKey);
     }
-    const projectConfigurations = (0, workspace_context_1.getProjectConfigurationsFromContext)(root, projectGlobPatterns, (configs) => {
-        const { projects } = createProjectConfigurations(root, nxJson, configs, [
+    let projects;
+    (0, workspace_context_1.getProjectConfigurationsFromContext)(root, projectGlobPatterns, (configs) => {
+        const projectConfigurations = createProjectConfigurations(root, nxJson, configs, [
             { plugin: (0, package_json_workspaces_1.getNxPackageJsonWorkspacesPlugin)(root) },
             { plugin: project_json_1.CreateProjectJsonProjectsPlugin },
         ]);
-        return {
-            projectNodes: projects,
-            externalNodes: {},
-        };
-    }).projectNodes;
-    projectsWithoutPluginCache.set(cacheKey, projectConfigurations);
-    return projectConfigurations;
+        projects = projectConfigurations.projects;
+        return projectConfigurations.rootMap;
+    });
+    projectsWithoutPluginCache.set(cacheKey, projects);
+    return projects;
 }
 exports.retrieveProjectConfigurationsWithoutPluginInference = retrieveProjectConfigurationsWithoutPluginInference;
 function buildAllWorkspaceFiles(projectFileMap, globalFiles) {
@@ -130,13 +133,14 @@ function buildAllWorkspaceFiles(projectFileMap, globalFiles) {
 }
 function createProjectConfigurations(workspaceRoot, nxJson, configFiles, plugins) {
     perf_hooks_1.performance.mark('build-project-configs:start');
-    const { projects, externalNodes } = (0, project_configuration_utils_1.buildProjectsConfigurationsFromProjectPathsAndPlugins)(nxJson, configFiles, plugins, workspaceRoot);
+    const { projects, externalNodes, rootMap } = (0, project_configuration_utils_1.buildProjectsConfigurationsFromProjectPathsAndPlugins)(nxJson, configFiles, plugins, workspaceRoot);
     let projectConfigurations = projects;
     perf_hooks_1.performance.mark('build-project-configs:end');
     perf_hooks_1.performance.measure('build-project-configs', 'build-project-configs:start', 'build-project-configs:end');
     return {
         projects: projectConfigurations,
         externalNodes,
+        rootMap,
     };
 }
 exports.createProjectConfigurations = createProjectConfigurations;

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

@@ -1,8 +1,7 @@
-import type { ConfigurationParserResult } from '../native';
 export declare function setupWorkspaceContext(workspaceRoot: string): void;
-export declare function getNxWorkspaceFilesFromContext(workspaceRoot: string, globs: string[], parseConfigurations: (files: string[]) => ConfigurationParserResult): import("../native").NxWorkspaceFiles;
+export declare function getNxWorkspaceFilesFromContext(workspaceRoot: string, globs: string[], parseConfigurations: (files: string[]) => Record<string, string>): import("../native").NxWorkspaceFiles;
 export declare function globWithWorkspaceContext(workspaceRoot: string, globs: string[]): string[];
-export declare function getProjectConfigurationsFromContext(workspaceRoot: string, globs: string[], parseConfigurations: (files: string[]) => ConfigurationParserResult): ConfigurationParserResult;
+export declare function getProjectConfigurationsFromContext(workspaceRoot: string, globs: string[], parseConfigurations: (files: string[]) => Record<string, string>): Record<string, string>;
 export declare function updateFilesInContext(updatedFiles: string[], deletedFiles: string[]): Record<string, string>;
 export declare function getAllFileDataInContext(workspaceRoot: string): import("../native").FileData[];
 export declare function resetWorkspaceContext(): void;