nx 20.4.0-rc.0 → 20.5.0-beta.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "20.4.0-rc.0",
+  "version": "20.5.0-beta.0",
   "private": false,
   "description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
   "repository": {
@@ -82,16 +82,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-arm64": "20.4.0-rc.0",
-    "@nx/nx-darwin-x64": "20.4.0-rc.0",
-    "@nx/nx-freebsd-x64": "20.4.0-rc.0",
-    "@nx/nx-linux-arm-gnueabihf": "20.4.0-rc.0",
-    "@nx/nx-linux-arm64-gnu": "20.4.0-rc.0",
-    "@nx/nx-linux-arm64-musl": "20.4.0-rc.0",
-    "@nx/nx-linux-x64-gnu": "20.4.0-rc.0",
-    "@nx/nx-linux-x64-musl": "20.4.0-rc.0",
-    "@nx/nx-win32-arm64-msvc": "20.4.0-rc.0",
-    "@nx/nx-win32-x64-msvc": "20.4.0-rc.0"
+    "@nx/nx-darwin-arm64": "20.5.0-beta.0",
+    "@nx/nx-darwin-x64": "20.5.0-beta.0",
+    "@nx/nx-freebsd-x64": "20.5.0-beta.0",
+    "@nx/nx-linux-arm-gnueabihf": "20.5.0-beta.0",
+    "@nx/nx-linux-arm64-gnu": "20.5.0-beta.0",
+    "@nx/nx-linux-arm64-musl": "20.5.0-beta.0",
+    "@nx/nx-linux-x64-gnu": "20.5.0-beta.0",
+    "@nx/nx-linux-x64-musl": "20.5.0-beta.0",
+    "@nx/nx-win32-arm64-msvc": "20.5.0-beta.0",
+    "@nx/nx-win32-x64-msvc": "20.5.0-beta.0"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",

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

@@ -189,6 +189,7 @@ async function processFilesAndCreateAndSerializeProjectGraph(plugins) {
                 };
             }
         }
+        (0, nx_deps_cache_1.writeCache)(g.projectFileMapCache, g.projectGraph, projectConfigurationsResult.sourceMaps, errors);
         if (errors.length > 0) {
             return {
                 error: new error_types_1.DaemonProjectGraphError(errors, g.projectGraph, projectConfigurationsResult.sourceMaps),
@@ -202,7 +203,6 @@ async function processFilesAndCreateAndSerializeProjectGraph(plugins) {
             };
         }
         else {
-            (0, nx_deps_cache_1.writeCache)(g.projectFileMapCache, g.projectGraph);
             return g;
         }
     }

package/src/devkit-exports.d.ts

@@ -16,7 +16,7 @@ export type { WorkspaceJsonConfiguration, ProjectsConfigurations, TargetDependen
 export type { Generator, GeneratorCallback, PromiseExecutor, AsyncIteratorExecutor, Executor, ExecutorContext, TaskGraphExecutor, GeneratorsJson, ExecutorsJson, MigrationsJson, CustomHasher, HasherContext, } from './config/misc-interfaces';
 export { workspaceLayout } from './config/configuration';
 export type { NxPlugin, NxPluginV2, CreateNodes, CreateNodesFunction, CreateNodesResult, CreateNodesContext, CreateNodesContextV2, CreateNodesFunctionV2, CreateNodesResultV2, CreateNodesV2, CreateDependencies, CreateDependenciesContext, CreateMetadata, CreateMetadataContext, ProjectsMetadata, PreTasksExecution, PreTasksExecutionContext, PostTasksExecution, PostTasksExecutionContext, } from './project-graph/plugins';
-export { AggregateCreateNodesError } from './project-graph/error-types';
+export { AggregateCreateNodesError, StaleProjectGraphCacheError, } from './project-graph/error-types';
 export { createNodesFromFiles } from './project-graph/plugins';
 /**
  * @category Tasks

package/src/devkit-exports.js

@@ -4,11 +4,12 @@
  * Try hard to not add to this API to reduce the surface area we need to maintain.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isDaemonEnabled = exports.createProjectFileMapUsingProjectGraph = exports.cacheDir = exports.hashArray = exports.defaultTasksRunner = exports.getOutputsForTargetAndConfiguration = exports.readProjectsConfigurationFromProjectGraph = exports.readCachedProjectGraph = exports.createProjectGraphAsync = exports.reverse = exports.workspaceRoot = exports.normalizePath = exports.joinPathFragments = exports.stripIndents = exports.writeJsonFile = exports.readJsonFile = exports.stripJsonComments = exports.serializeJson = exports.parseJson = exports.updateJson = exports.writeJson = exports.readJson = exports.validateDependency = exports.DependencyType = exports.updateNxJson = exports.readNxJson = exports.globAsync = exports.glob = exports.getProjects = exports.updateProjectConfiguration = exports.removeProjectConfiguration = exports.readProjectConfiguration = exports.addProjectConfiguration = exports.runExecutor = exports.isWorkspacesEnabled = exports.getPackageManagerVersion = exports.detectPackageManager = exports.getPackageManagerCommand = exports.output = exports.logger = exports.createNodesFromFiles = exports.AggregateCreateNodesError = exports.workspaceLayout = void 0;
+exports.isDaemonEnabled = exports.createProjectFileMapUsingProjectGraph = exports.cacheDir = exports.hashArray = exports.defaultTasksRunner = exports.getOutputsForTargetAndConfiguration = exports.readProjectsConfigurationFromProjectGraph = exports.readCachedProjectGraph = exports.createProjectGraphAsync = exports.reverse = exports.workspaceRoot = exports.normalizePath = exports.joinPathFragments = exports.stripIndents = exports.writeJsonFile = exports.readJsonFile = exports.stripJsonComments = exports.serializeJson = exports.parseJson = exports.updateJson = exports.writeJson = exports.readJson = exports.validateDependency = exports.DependencyType = exports.updateNxJson = exports.readNxJson = exports.globAsync = exports.glob = exports.getProjects = exports.updateProjectConfiguration = exports.removeProjectConfiguration = exports.readProjectConfiguration = exports.addProjectConfiguration = exports.runExecutor = exports.isWorkspacesEnabled = exports.getPackageManagerVersion = exports.detectPackageManager = exports.getPackageManagerCommand = exports.output = exports.logger = exports.createNodesFromFiles = exports.StaleProjectGraphCacheError = exports.AggregateCreateNodesError = exports.workspaceLayout = void 0;
 var configuration_1 = require("./config/configuration");
 Object.defineProperty(exports, "workspaceLayout", { enumerable: true, get: function () { return configuration_1.workspaceLayout; } });
 var error_types_1 = require("./project-graph/error-types");
 Object.defineProperty(exports, "AggregateCreateNodesError", { enumerable: true, get: function () { return error_types_1.AggregateCreateNodesError; } });
+Object.defineProperty(exports, "StaleProjectGraphCacheError", { enumerable: true, get: function () { return error_types_1.StaleProjectGraphCacheError; } });
 var plugins_1 = require("./project-graph/plugins");
 Object.defineProperty(exports, "createNodesFromFiles", { enumerable: true, get: function () { return plugins_1.createNodesFromFiles; } });
 /**

package/src/native/index.d.ts

@@ -13,6 +13,15 @@ export declare class ChildProcess {
   onOutput(callback: (message: string) => void): void
 }
 
+export declare class FileLock {
+  locked: boolean
+  constructor(lockFilePath: string)
+  unlock(): void
+  check(): boolean
+  wait(): Promise<void>
+  lock(): void
+}
+
 export declare class HashPlanner {
   constructor(nxJson: NxJson, projectGraph: ExternalObject<ProjectGraph>)
   getPlans(taskIds: Array<string>, taskGraph: TaskGraph): Record<string, string[]>

package/src/native/native-bindings.js

@@ -362,6 +362,7 @@ if (!nativeBinding) {
 }
 
 module.exports.ChildProcess = nativeBinding.ChildProcess
+module.exports.FileLock = nativeBinding.FileLock
 module.exports.HashPlanner = nativeBinding.HashPlanner
 module.exports.ImportResult = nativeBinding.ImportResult
 module.exports.NxCache = nativeBinding.NxCache

package/src/native/nx.wasi-browser.js

@@ -85,15 +85,18 @@ function __napi_rs_initialize_modules(__napiInstance) {
   __napiInstance.exports['__napi_register__ExternalDependenciesInput_struct_36']?.()
   __napiInstance.exports['__napi_register__DepsOutputsInput_struct_37']?.()
   __napiInstance.exports['__napi_register__NxJson_struct_38']?.()
-  __napiInstance.exports['__napi_register__WorkspaceContext_struct_39']?.()
-  __napiInstance.exports['__napi_register__WorkspaceContext_impl_48']?.()
-  __napiInstance.exports['__napi_register__WorkspaceErrors_49']?.()
-  __napiInstance.exports['__napi_register__NxWorkspaceFiles_struct_50']?.()
-  __napiInstance.exports['__napi_register__NxWorkspaceFilesExternals_struct_51']?.()
-  __napiInstance.exports['__napi_register__UpdatedWorkspaceFiles_struct_52']?.()
-  __napiInstance.exports['__napi_register__FileMap_struct_53']?.()
-  __napiInstance.exports['__napi_register____test_only_transfer_file_map_54']?.()
+  __napiInstance.exports['__napi_register__FileLock_struct_39']?.()
+  __napiInstance.exports['__napi_register__FileLock_impl_41']?.()
+  __napiInstance.exports['__napi_register__WorkspaceContext_struct_42']?.()
+  __napiInstance.exports['__napi_register__WorkspaceContext_impl_51']?.()
+  __napiInstance.exports['__napi_register__WorkspaceErrors_52']?.()
+  __napiInstance.exports['__napi_register__NxWorkspaceFiles_struct_53']?.()
+  __napiInstance.exports['__napi_register__NxWorkspaceFilesExternals_struct_54']?.()
+  __napiInstance.exports['__napi_register__UpdatedWorkspaceFiles_struct_55']?.()
+  __napiInstance.exports['__napi_register__FileMap_struct_56']?.()
+  __napiInstance.exports['__napi_register____test_only_transfer_file_map_57']?.()
 }
+export const FileLock = __napiModule.exports.FileLock
 export const HashPlanner = __napiModule.exports.HashPlanner
 export const ImportResult = __napiModule.exports.ImportResult
 export const TaskHasher = __napiModule.exports.TaskHasher

package/src/native/nx.wasi.cjs

@@ -116,15 +116,18 @@ function __napi_rs_initialize_modules(__napiInstance) {
   __napiInstance.exports['__napi_register__ExternalDependenciesInput_struct_36']?.()
   __napiInstance.exports['__napi_register__DepsOutputsInput_struct_37']?.()
   __napiInstance.exports['__napi_register__NxJson_struct_38']?.()
-  __napiInstance.exports['__napi_register__WorkspaceContext_struct_39']?.()
-  __napiInstance.exports['__napi_register__WorkspaceContext_impl_48']?.()
-  __napiInstance.exports['__napi_register__WorkspaceErrors_49']?.()
-  __napiInstance.exports['__napi_register__NxWorkspaceFiles_struct_50']?.()
-  __napiInstance.exports['__napi_register__NxWorkspaceFilesExternals_struct_51']?.()
-  __napiInstance.exports['__napi_register__UpdatedWorkspaceFiles_struct_52']?.()
-  __napiInstance.exports['__napi_register__FileMap_struct_53']?.()
-  __napiInstance.exports['__napi_register____test_only_transfer_file_map_54']?.()
+  __napiInstance.exports['__napi_register__FileLock_struct_39']?.()
+  __napiInstance.exports['__napi_register__FileLock_impl_41']?.()
+  __napiInstance.exports['__napi_register__WorkspaceContext_struct_42']?.()
+  __napiInstance.exports['__napi_register__WorkspaceContext_impl_51']?.()
+  __napiInstance.exports['__napi_register__WorkspaceErrors_52']?.()
+  __napiInstance.exports['__napi_register__NxWorkspaceFiles_struct_53']?.()
+  __napiInstance.exports['__napi_register__NxWorkspaceFilesExternals_struct_54']?.()
+  __napiInstance.exports['__napi_register__UpdatedWorkspaceFiles_struct_55']?.()
+  __napiInstance.exports['__napi_register__FileMap_struct_56']?.()
+  __napiInstance.exports['__napi_register____test_only_transfer_file_map_57']?.()
 }
+module.exports.FileLock = __napiModule.exports.FileLock
 module.exports.HashPlanner = __napiModule.exports.HashPlanner
 module.exports.ImportResult = __napiModule.exports.ImportResult
 module.exports.TaskHasher = __napiModule.exports.TaskHasher

package/src/native/tests/__fixtures__/file-lock.fixture.js

@@ -0,0 +1,20 @@
+const { FileLock } = require('../../native-bindings.js');
+const ora = require('ora');
+const tmp = require('os').tmpdir();
+
+(async () => {
+  const lock = new FileLock(
+    require('path').join(tmp, 'nx-unit-tests', 'file-lock-fixture')
+  );
+  if (lock.locked) {
+    const s = ora('Waiting for lock').start();
+    await lock.wait();
+    s.stop();
+    console.log('waited for lock');
+  } else {
+    await lock.lock();
+    await new Promise((resolve) => setTimeout(resolve, 5000));
+    console.log('ran with lock');
+    await lock.unlock();
+  }
+})();

package/src/project-graph/error-types.d.ts

@@ -2,10 +2,14 @@ import { ConfigurationResult, ConfigurationSourceMaps } from './utils/project-co
 import { ProjectConfiguration } from '../config/workspace-json-project-json';
 import { ProjectGraph } from '../config/project-graph';
 import { CreateNodesFunctionV2 } from './plugins/public-api';
+export type ProjectGraphErrorTypes = AggregateCreateNodesError | MergeNodesError | CreateMetadataError | ProjectsWithNoNameError | MultipleProjectsWithSameNameError | ProcessDependenciesError | WorkspaceValidityError;
+export declare class StaleProjectGraphCacheError extends Error {
+    constructor();
+}
 export declare class ProjectGraphError extends Error {
     #private;
     private readonly errors;
-    constructor(errors: Array<AggregateCreateNodesError | MergeNodesError | ProjectsWithNoNameError | MultipleProjectsWithSameNameError | ProcessDependenciesError | CreateMetadataError | WorkspaceValidityError>, partialProjectGraph: ProjectGraph, partialSourceMaps: ConfigurationSourceMaps);
+    constructor(errors: Array<ProjectGraphErrorTypes>, partialProjectGraph: ProjectGraph, partialSourceMaps: ConfigurationSourceMaps | null);
     /**
      * The daemon cannot throw errors which contain methods as they are not serializable.
      *
@@ -19,7 +23,7 @@ export declare class ProjectGraphError extends Error {
      */
     getPartialProjectGraph(): ProjectGraph;
     getPartialSourcemaps(): ConfigurationSourceMaps;
-    getErrors(): (AggregateCreateNodesError | MergeNodesError | ProjectsWithNoNameError | MultipleProjectsWithSameNameError | ProcessDependenciesError | CreateMetadataError | WorkspaceValidityError)[];
+    getErrors(): ProjectGraphErrorTypes[];
 }
 export declare class MultipleProjectsWithSameNameError extends Error {
     conflicts: Map<string, string[]>;

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

@@ -1,7 +1,7 @@
 "use strict";
 var _ProjectGraphError_partialProjectGraph, _ProjectGraphError_partialSourceMaps;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LoadPluginError = exports.DaemonProjectGraphError = exports.AggregateProjectGraphError = exports.WorkspaceValidityError = exports.ProcessDependenciesError = exports.CreateMetadataError = exports.MergeNodesError = exports.AggregateCreateNodesError = exports.ProjectConfigurationsError = exports.ProjectWithNoNameError = exports.ProjectsWithNoNameError = exports.ProjectWithExistingNameError = exports.MultipleProjectsWithSameNameError = exports.ProjectGraphError = void 0;
+exports.LoadPluginError = exports.DaemonProjectGraphError = exports.AggregateProjectGraphError = exports.WorkspaceValidityError = exports.ProcessDependenciesError = exports.CreateMetadataError = exports.MergeNodesError = exports.AggregateCreateNodesError = exports.ProjectConfigurationsError = exports.ProjectWithNoNameError = exports.ProjectsWithNoNameError = exports.ProjectWithExistingNameError = exports.MultipleProjectsWithSameNameError = exports.ProjectGraphError = exports.StaleProjectGraphCacheError = void 0;
 exports.isProjectWithExistingNameError = isProjectWithExistingNameError;
 exports.isMultipleProjectsWithSameNameError = isMultipleProjectsWithSameNameError;
 exports.isProjectsWithNoNameError = isProjectsWithNoNameError;
@@ -14,6 +14,12 @@ exports.isCreateMetadataError = isCreateMetadataError;
 exports.isAggregateCreateNodesError = isAggregateCreateNodesError;
 exports.isMergeNodesError = isMergeNodesError;
 const tslib_1 = require("tslib");
+class StaleProjectGraphCacheError extends Error {
+    constructor() {
+        super('The project graph cache was stale. Ensure that it has been recently created before using `readCachedProjectGraph`.');
+    }
+}
+exports.StaleProjectGraphCacheError = StaleProjectGraphCacheError;
 class ProjectGraphError extends Error {
     constructor(errors, partialProjectGraph, partialSourceMaps) {
         const messageFragments = ['Failed to process project graph.'];

package/src/project-graph/nx-deps-cache.d.ts

@@ -1,6 +1,8 @@
 import { NxJsonConfiguration } from '../config/nx-json';
 import { FileData, FileMap, ProjectGraph } from '../config/project-graph';
 import { ProjectConfiguration } from '../config/workspace-json-project-json';
+import { ConfigurationSourceMaps } from './utils/project-configuration-utils';
+import { ProjectGraphErrorTypes } from './error-types';
 export interface FileMapCache {
     version: string;
     nxVersion: string;
@@ -11,9 +13,11 @@ export interface FileMapCache {
 }
 export declare const nxProjectGraph: string;
 export declare const nxFileMap: string;
+export declare const nxSourceMaps: string;
 export declare function ensureCacheDirectory(): void;
 export declare function readFileMapCache(): null | FileMapCache;
-export declare function readProjectGraphCache(): null | ProjectGraph;
+export declare function readProjectGraphCache(minimumComputedAt?: number): null | ProjectGraph;
+export declare function readSourceMapsCache(): null | ConfigurationSourceMaps;
 export declare function createProjectFileMapCache(nxJson: NxJsonConfiguration<'*' | string[]>, packageJsonDeps: Record<string, string>, fileMap: FileMap, tsConfig: {
     compilerOptions?: {
         paths?: {
@@ -21,7 +25,7 @@ export declare function createProjectFileMapCache(nxJson: NxJsonConfiguration<'*
         };
     };
 }): FileMapCache;
-export declare function writeCache(cache: FileMapCache, projectGraph: ProjectGraph): void;
+export declare function writeCache(cache: FileMapCache, projectGraph: ProjectGraph, sourceMaps: ConfigurationSourceMaps, errors: ProjectGraphErrorTypes[]): void;
 export declare function shouldRecomputeWholeGraph(cache: FileMapCache, packageJsonDeps: Record<string, string>, projects: Record<string, ProjectConfiguration>, nxJson: NxJsonConfiguration, tsConfig: {
     compilerOptions: {
         paths: {

package/src/project-graph/nx-deps-cache.js

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.nxFileMap = exports.nxProjectGraph = void 0;
+exports.nxSourceMaps = exports.nxFileMap = exports.nxProjectGraph = void 0;
 exports.ensureCacheDirectory = ensureCacheDirectory;
 exports.readFileMapCache = readFileMapCache;
 exports.readProjectGraphCache = readProjectGraphCache;
+exports.readSourceMapsCache = readSourceMapsCache;
 exports.createProjectFileMapCache = createProjectFileMapCache;
 exports.writeCache = writeCache;
 exports.shouldRecomputeWholeGraph = shouldRecomputeWholeGraph;
@@ -14,8 +15,10 @@ const perf_hooks_1 = require("perf_hooks");
 const cache_directory_1 = require("../utils/cache-directory");
 const fileutils_1 = require("../utils/fileutils");
 const versions_1 = require("../utils/versions");
+const error_types_1 = require("./error-types");
 exports.nxProjectGraph = (0, path_1.join)(cache_directory_1.workspaceDataDirectory, 'project-graph.json');
 exports.nxFileMap = (0, path_1.join)(cache_directory_1.workspaceDataDirectory, 'file-map.json');
+exports.nxSourceMaps = (0, path_1.join)(cache_directory_1.workspaceDataDirectory, 'source-maps.json');
 function ensureCacheDirectory() {
     try {
         if (!(0, node_fs_1.existsSync)(cache_directory_1.workspaceDataDirectory)) {
@@ -55,21 +58,62 @@ function readFileMapCache() {
     perf_hooks_1.performance.measure('read cache', 'read cache:start', 'read cache:end');
     return data ?? null;
 }
-function readProjectGraphCache() {
+function readProjectGraphCache(minimumComputedAt) {
     perf_hooks_1.performance.mark('read project-graph:start');
     ensureCacheDirectory();
-    let data = null;
     try {
         if ((0, fileutils_1.fileExists)(exports.nxProjectGraph)) {
-            data = (0, fileutils_1.readJsonFile)(exports.nxProjectGraph);
+            const { computedAt, errors, ...projectGraphCache } = (0, fileutils_1.readJsonFile)(exports.nxProjectGraph);
+            if (minimumComputedAt &&
+                (!computedAt || computedAt < minimumComputedAt)) {
+                throw new error_types_1.StaleProjectGraphCacheError();
+            }
+            if (errors && errors.length > 0) {
+                if (!minimumComputedAt) {
+                    // If you didn't pass minimum computed at, we do not know if
+                    // the errors on the cached graph would be relevant to what you
+                    // are running. Prior to adding error handling here, the graph
+                    // would not have been written to the cache. As such, this matches
+                    // existing behavior of the public API.
+                    return null;
+                }
+                throw new error_types_1.ProjectGraphError(errors, projectGraphCache, readSourceMapsCache());
+            }
+            return projectGraphCache;
+        }
+        else {
+            return null;
         }
     }
     catch (error) {
+        if (error instanceof error_types_1.StaleProjectGraphCacheError ||
+            error instanceof error_types_1.ProjectGraphError) {
+            throw error;
+        }
         console.log(`Error reading '${exports.nxProjectGraph}'. Continue the process without the cache.`);
         console.log(error);
+        return null;
+    }
+    finally {
+        perf_hooks_1.performance.mark('read project-graph:end');
+        perf_hooks_1.performance.measure('read cache', 'read project-graph:start', 'read project-graph:end');
+    }
+}
+function readSourceMapsCache() {
+    perf_hooks_1.performance.mark('read source-maps:start');
+    ensureCacheDirectory();
+    let data = null;
+    try {
+        if ((0, fileutils_1.fileExists)(exports.nxSourceMaps)) {
+            data = (0, fileutils_1.readJsonFile)(exports.nxSourceMaps);
+        }
+    }
+    catch (error) {
+        console.log(`Error reading '${exports.nxSourceMaps}'. Continue the process without the cache.`);
+        console.log(error);
     }
-    perf_hooks_1.performance.mark('read project-graph:end');
-    perf_hooks_1.performance.measure('read cache', 'read project-graph:start', 'read project-graph:end');
+    perf_hooks_1.performance.mark('read source-maps:end');
+    perf_hooks_1.performance.measure('read cache', 'read source-maps:start', 'read source-maps:end');
     return data ?? null;
 }
 function createProjectFileMapCache(nxJson, packageJsonDeps, fileMap, tsConfig) {
@@ -85,7 +129,7 @@ function createProjectFileMapCache(nxJson, packageJsonDeps, fileMap, tsConfig) {
     };
     return newValue;
 }
-function writeCache(cache, projectGraph) {
+function writeCache(cache, projectGraph, sourceMaps, errors) {
     perf_hooks_1.performance.mark('write cache:start');
     let retry = 1;
     let done = false;
@@ -98,11 +142,18 @@ function writeCache(cache, projectGraph) {
         const unique = (Math.random().toString(16) + '0000000').slice(2, 10);
         const tmpProjectGraphPath = `${exports.nxProjectGraph}~${unique}`;
         const tmpFileMapPath = `${exports.nxFileMap}~${unique}`;
+        const tmpSourceMapPath = `${exports.nxSourceMaps}~${unique}`;
         try {
-            (0, fileutils_1.writeJsonFile)(tmpProjectGraphPath, projectGraph);
+            (0, fileutils_1.writeJsonFile)(tmpProjectGraphPath, {
+                ...projectGraph,
+                errors,
+                computedAt: Date.now(),
+            });
             (0, node_fs_1.renameSync)(tmpProjectGraphPath, exports.nxProjectGraph);
             (0, fileutils_1.writeJsonFile)(tmpFileMapPath, cache);
             (0, node_fs_1.renameSync)(tmpFileMapPath, exports.nxFileMap);
+            (0, fileutils_1.writeJsonFile)(tmpSourceMapPath, sourceMaps);
+            (0, node_fs_1.renameSync)(tmpSourceMapPath, exports.nxSourceMaps);
             done = true;
         }
         catch (err) {

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

@@ -2,9 +2,11 @@ import { ProjectGraph } from '../config/project-graph';
 import { ProjectConfiguration, ProjectsConfigurations } from '../config/workspace-json-project-json';
 /**
  * Synchronously reads the latest cached copy of the workspace's ProjectGraph.
+ *
+ * @param {number} [minimumComputedAt] - The minimum timestamp that the cached ProjectGraph must have been computed at.
  * @throws {Error} if there is no cached ProjectGraph to read from
  */
-export declare function readCachedProjectGraph(): ProjectGraph;
+export declare function readCachedProjectGraph(minimumComputedAt?: number): ProjectGraph;
 export declare function readCachedProjectConfiguration(projectName: string): ProjectConfiguration;
 /**
  * Get the {@link ProjectsConfigurations} from the {@link ProjectGraph}

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

@@ -21,12 +21,18 @@ const nx_deps_cache_1 = require("./nx-deps-cache");
 const retrieve_workspace_files_1 = require("./utils/retrieve-workspace-files");
 const get_plugins_1 = require("./plugins/get-plugins");
 const logger_1 = require("../utils/logger");
+const native_1 = require("../native");
+const path_1 = require("path");
+const cache_directory_1 = require("../utils/cache-directory");
+const delayed_spinner_1 = require("../utils/delayed-spinner");
 /**
  * Synchronously reads the latest cached copy of the workspace's ProjectGraph.
+ *
+ * @param {number} [minimumComputedAt] - The minimum timestamp that the cached ProjectGraph must have been computed at.
  * @throws {Error} if there is no cached ProjectGraph to read from
  */
-function readCachedProjectGraph() {
-    const projectGraphCache = (0, nx_deps_cache_1.readProjectGraphCache)();
+function readCachedProjectGraph(minimumComputedAt) {
+    const projectGraphCache = (0, nx_deps_cache_1.readProjectGraphCache)(minimumComputedAt);
     if (!projectGraphCache) {
         const angularSpecificError = (0, fileutils_1.fileExists)(`${workspace_root_1.workspaceRoot}/angular.json`)
             ? (0, strip_indents_1.stripIndents) `
@@ -120,13 +126,13 @@ async function buildProjectGraphAndSourceMapsWithoutDaemon() {
         ...(projectConfigurationsError?.errors ?? []),
         ...(projectGraphError?.errors ?? []),
     ];
+    if (cacheEnabled) {
+        (0, nx_deps_cache_1.writeCache)(projectFileMapCache, projectGraph, sourceMaps, errors);
+    }
     if (errors.length > 0) {
         throw new error_types_1.ProjectGraphError(errors, projectGraph, sourceMaps);
     }
     else {
-        if (cacheEnabled) {
-            (0, nx_deps_cache_1.writeCache)(projectFileMapCache, projectGraph);
-        }
         return { projectGraph, sourceMaps };
     }
 }
@@ -159,6 +165,16 @@ function handleProjectGraphError(opts, e) {
         throw e;
     }
 }
+async function readCachedGraphAndHydrateFileMap(minimumComputedAt) {
+    const graph = readCachedProjectGraph(minimumComputedAt);
+    const projectRootMap = Object.fromEntries(Object.entries(graph.nodes).map(([project, { data }]) => [
+        data.root,
+        project,
+    ]));
+    const { allWorkspaceFiles, fileMap, rustReferences } = await (0, retrieve_workspace_files_1.retrieveWorkspaceFiles)(workspace_root_1.workspaceRoot, projectRootMap);
+    (0, build_project_graph_1.hydrateFileMap)(fileMap, allWorkspaceFiles, rustReferences);
+    return graph;
+}
 /**
  * Computes and returns a ProjectGraph.
  *
@@ -186,17 +202,14 @@ async function createProjectGraphAsync(opts = {
 }) {
     if (process.env.NX_FORCE_REUSE_CACHED_GRAPH === 'true') {
         try {
-            const graph = readCachedProjectGraph();
-            const projectRootMap = Object.fromEntries(Object.entries(graph.nodes).map(([project, { data }]) => [
-                data.root,
-                project,
-            ]));
-            const { allWorkspaceFiles, fileMap, rustReferences } = await (0, retrieve_workspace_files_1.retrieveWorkspaceFiles)(workspace_root_1.workspaceRoot, projectRootMap);
-            (0, build_project_graph_1.hydrateFileMap)(fileMap, allWorkspaceFiles, rustReferences);
-            return graph;
             // If no cached graph is found, we will fall through to the normal flow
+            const graph = await readCachedGraphAndHydrateFileMap();
+            return graph;
         }
         catch (e) {
+            if (e instanceof error_types_1.ProjectGraphError) {
+                throw e;
+            }
             logger_1.logger.verbose('Unable to use cached project graph', e);
         }
     }
@@ -209,6 +222,48 @@ async function createProjectGraphAndSourceMapsAsync(opts = {
 }) {
     perf_hooks_1.performance.mark('create-project-graph-async:start');
     if (!client_1.daemonClient.enabled()) {
+        const lock = !native_1.IS_WASM
+            ? new native_1.FileLock((0, path_1.join)(cache_directory_1.workspaceDataDirectory, 'project-graph.lock'))
+            : null;
+        let locked = lock?.locked;
+        while (locked) {
+            logger_1.logger.verbose('Waiting for graph construction in another process to complete');
+            const spinner = new delayed_spinner_1.DelayedSpinner('Waiting for graph construction in another process to complete');
+            const start = Date.now();
+            await lock.wait();
+            spinner.cleanup();
+            // Note: This will currently throw if any of the caches are missing...
+            // It would be nice if one of the processes that was waiting for the lock
+            // could pick up the slack and build the graph if it's missing, but
+            // we wouldn't want either of the below to happen:
+            // - All of the waiting processes to build the graph
+            // - Even one of the processes building the graph on a legitimate error
+            try {
+                // Ensuring that computedAt was after this process started
+                // waiting for the graph to complete, means that the graph
+                // was computed by the process was already working.
+                const graph = await readCachedGraphAndHydrateFileMap(start);
+                const sourceMaps = (0, nx_deps_cache_1.readSourceMapsCache)();
+                if (!sourceMaps) {
+                    throw new Error('The project graph was computed in another process, but the source maps are missing.');
+                }
+                return {
+                    projectGraph: graph,
+                    sourceMaps,
+                };
+            }
+            catch (e) {
+                // If the error is that the cached graph is stale after unlock,
+                // the process that was working on the graph must have been canceled,
+                // so we will fall through to the normal flow to ensure
+                // its created by one of the processes that was waiting
+                if (!(e instanceof error_types_1.StaleProjectGraphCacheError)) {
+                    throw e;
+                }
+            }
+            locked = lock.check();
+        }
+        lock?.lock();
         try {
             const res = await buildProjectGraphAndSourceMapsWithoutDaemon();
             perf_hooks_1.performance.measure('create-project-graph-async >> retrieve-project-configurations', 'retrieve-project-configurations:start', 'retrieve-project-configurations:end');
@@ -221,6 +276,9 @@ async function createProjectGraphAndSourceMapsAsync(opts = {
         catch (e) {
             handleProjectGraphError(opts, e);
         }
+        finally {
+            lock.unlock();
+        }
     }
     else {
         try {