nx 16.8.1 → 16.9.0-beta.1

package/README.md

@@ -8,7 +8,7 @@
 [![Semantic Release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg?style=flat-square)]()
 [![Commitizen friendly](https://img.shields.io/badge/commitizen-friendly-brightgreen.svg)](http://commitizen.github.io/cz-cli/)
 [![Join the chat at https://gitter.im/nrwl-nx/community](https://badges.gitter.im/nrwl-nx/community.svg)](https://gitter.im/nrwl-nx/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-[![Join us @nx/community on slack](https://img.shields.io/badge/slack-%40nrwl%2Fcommunity-brightgreen)](https://join.slack.com/t/nrwlcommunity/shared_invite/enQtNzU5MTE4OTQwOTk0LTgxY2E0ZWYzMWE0YzA5ZDA2MWM1NDVhNmI2ZWMyYmZhNWJiODk3MjkxZjY3MzU5ZjRmM2NmNWU1OTgyZmE4Mzc)
+[![Join us on the Official Nx Discord Server](https://simpleicons.org/icons/discord.svg)](https://go.nx.dev/community)
 
 </div>
 

package/bin/nx.js

@@ -15,6 +15,8 @@ const child_process_1 = require("child_process");
 const path_1 = require("path");
 const assert_supported_platform_1 = require("../src/native/assert-supported-platform");
 const perf_hooks_1 = require("perf_hooks");
+const workspace_context_1 = require("../src/utils/workspace-context");
+const client_1 = require("../src/daemon/client/client");
 function main() {
     if (process.argv[2] !== 'report' &&
         process.argv[2] !== '--version' &&
@@ -42,9 +44,12 @@ function main() {
         // Angular CLI, and prettier both use ESM so we need to disable it in these cases.
         if (workspace &&
             workspace.type === 'nx' &&
-            !['format', 'format:check', 'format:write', 'g', 'generate'].some((cmd) => process.argv[3] === cmd)) {
+            !['format', 'format:check', 'format:write', 'g', 'generate'].some((cmd) => process.argv[2] === cmd)) {
             require('v8-compile-cache');
         }
+        if (!client_1.daemonClient.enabled() && workspace !== null) {
+            (0, workspace_context_1.setupWorkspaceContext)(workspace.dir);
+        }
         // polyfill rxjs observable to avoid issues with multiple version of Observable installed in node_modules
         // https://twitter.com/BenLesh/status/1192478226385428483?s=20
         if (!Symbol.observable)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "16.8.1",
+  "version": "16.9.0-beta.1",
   "private": false,
   "description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
   "repository": {
@@ -32,7 +32,7 @@
   },
   "homepage": "https://nx.dev",
   "dependencies": {
-    "@nrwl/tao": "16.8.1",
+    "@nrwl/tao": "16.9.0-beta.1",
     "@parcel/watcher": "2.0.4",
     "@yarnpkg/lockfile": "^1.1.0",
     "@yarnpkg/parsers": "3.0.0-rc.46",
@@ -45,7 +45,6 @@
     "dotenv": "~16.3.1",
     "dotenv-expand": "~10.0.0",
     "enquirer": "~2.3.6",
-    "fast-glob": "3.2.7",
     "figures": "3.2.0",
     "flat": "^5.0.2",
     "fs-extra": "^11.1.0",
@@ -82,16 +81,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-arm64": "16.8.1",
-    "@nx/nx-darwin-x64": "16.8.1",
-    "@nx/nx-freebsd-x64": "16.8.1",
-    "@nx/nx-linux-arm-gnueabihf": "16.8.1",
-    "@nx/nx-linux-arm64-gnu": "16.8.1",
-    "@nx/nx-linux-arm64-musl": "16.8.1",
-    "@nx/nx-linux-x64-gnu": "16.8.1",
-    "@nx/nx-linux-x64-musl": "16.8.1",
-    "@nx/nx-win32-arm64-msvc": "16.8.1",
-    "@nx/nx-win32-x64-msvc": "16.8.1"
+    "@nx/nx-darwin-arm64": "16.9.0-beta.1",
+    "@nx/nx-darwin-x64": "16.9.0-beta.1",
+    "@nx/nx-freebsd-x64": "16.9.0-beta.1",
+    "@nx/nx-linux-arm-gnueabihf": "16.9.0-beta.1",
+    "@nx/nx-linux-arm64-gnu": "16.9.0-beta.1",
+    "@nx/nx-linux-arm64-musl": "16.9.0-beta.1",
+    "@nx/nx-linux-x64-gnu": "16.9.0-beta.1",
+    "@nx/nx-linux-x64-musl": "16.9.0-beta.1",
+    "@nx/nx-win32-arm64-msvc": "16.9.0-beta.1",
+    "@nx/nx-win32-x64-msvc": "16.9.0-beta.1"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",
@@ -178,5 +177,5 @@
   },
   "main": "./bin/nx.js",
   "type": "commonjs",
-  "gitHead": "29a7b8575e683d3a581b4bf6f82ee4486bfa94dd"
+  "gitHead": "5056d6cefb2949ba865019e8b71e633fba28c091"
 }

package/src/command-line/affected/print-affected.js

@@ -6,7 +6,6 @@ const create_task_graph_1 = require("../../tasks-runner/create-task-graph");
 const task_hasher_1 = require("../../hasher/task-hasher");
 const hash_task_1 = require("../../hasher/hash-task");
 const package_manager_1 = require("../../utils/package-manager");
-const file_hasher_1 = require("../../hasher/file-hasher");
 const command_object_1 = require("./command-object");
 const logger_1 = require("../../utils/logger");
 /**
@@ -35,7 +34,7 @@ exports.printAffected = printAffected;
 async function createTasks(affectedProjectsWithTargetAndConfig, projectGraph, nxArgs, nxJson, overrides) {
     const defaultDependencyConfigs = (0, create_task_graph_1.mapTargetDefaultsToDependencies)(nxJson.targetDefaults);
     const taskGraph = (0, create_task_graph_1.createTaskGraph)(projectGraph, defaultDependencyConfigs, affectedProjectsWithTargetAndConfig.map((p) => p.name), nxArgs.targets, nxArgs.configuration, overrides);
-    const hasher = new task_hasher_1.InProcessTaskHasher({}, [], projectGraph, nxJson, {}, file_hasher_1.fileHasher);
+    const hasher = new task_hasher_1.InProcessTaskHasher({}, [], projectGraph, nxJson, {});
     const execCommand = (0, package_manager_1.getPackageManagerCommand)().exec;
     const tasks = Object.values(taskGraph.tasks);
     await Promise.all(tasks.map((t) => (0, hash_task_1.hashTask)(hasher, projectGraph, taskGraph, t)));

package/src/command-line/graph/graph.js

@@ -18,7 +18,6 @@ const project_graph_1 = require("../../project-graph/project-graph");
 const create_task_graph_1 = require("../../tasks-runner/create-task-graph");
 const client_1 = require("../../daemon/client/client");
 const nx_deps_cache_1 = require("../../project-graph/nx-deps-cache");
-const file_hasher_1 = require("../../hasher/file-hasher");
 const affected_1 = require("../affected/affected");
 const command_line_utils_1 = require("../../utils/command-line-utils");
 // maps file extention to MIME types
@@ -381,7 +380,6 @@ function createFileWatcher() {
 }
 async function createDepGraphClientResponse(affected = []) {
     perf_hooks_1.performance.mark('project graph watch calculation:start');
-    await file_hasher_1.fileHasher.init();
     let graph = (0, operators_1.pruneExternalNodes)(await (0, project_graph_1.createProjectGraphAsync)({ exitOnError: true }));
     let fileMap = (0, nx_deps_cache_1.readProjectFileMapCache)().projectFileMap;
     perf_hooks_1.performance.mark('project graph watch calculation:end');

package/src/command-line/repair/command-object.js

@@ -4,7 +4,16 @@ exports.yargsRepairCommand = void 0;
 const documentation_1 = require("../yargs-utils/documentation");
 exports.yargsRepairCommand = {
     command: 'repair',
-    describe: 'Repair any configuration that is no longer supported by Nx.',
+    describe: `Repair any configuration that is no longer supported by Nx.
+
+    Specifically, this will run every migration within the \`nx\` package
+    against the current repository. Doing so should fix any configuration
+    details left behind if the repository was previously updated to a new
+    Nx version without using \`nx migrate\`.
+
+    If your repository has only ever updated to newer versions of Nx with
+    \`nx migrate\`, running \`nx repair\` should do nothing.
+  `,
     builder: (yargs) => (0, documentation_1.linkToNxDevAndExamples)(yargs, 'repair').option('verbose', {
         type: 'boolean',
         describe: 'Prints additional information about the commands (e.g., stack traces)',

package/src/daemon/server/handle-hash-tasks.js

@@ -4,7 +4,6 @@ exports.handleHashTasks = void 0;
 const project_graph_incremental_recomputation_1 = require("./project-graph-incremental-recomputation");
 const task_hasher_1 = require("../../hasher/task-hasher");
 const configuration_1 = require("../../config/configuration");
-const file_hasher_1 = require("../../hasher/file-hasher");
 const set_hash_env_1 = require("../../hasher/set-hash-env");
 /**
  * We use this not to recreated hasher for every hash operation
@@ -18,7 +17,7 @@ async function handleHashTasks(payload) {
     const nxJson = (0, configuration_1.readNxJson)();
     if (projectGraph !== storedProjectGraph) {
         storedProjectGraph = projectGraph;
-        storedHasher = new task_hasher_1.InProcessTaskHasher(projectFileMap, allWorkspaceFiles, projectGraph, nxJson, payload.runnerOptions, file_hasher_1.fileHasher);
+        storedHasher = new task_hasher_1.InProcessTaskHasher(projectFileMap, allWorkspaceFiles, projectGraph, nxJson, payload.runnerOptions);
     }
     const response = JSON.stringify(await storedHasher.hashTasks(payload.tasks, payload.taskGraph));
     return {

package/src/daemon/server/handle-request-file-data.js

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.handleRequestFileData = void 0;
-const file_hasher_1 = require("../../hasher/file-hasher");
+const workspace_context_1 = require("../../utils/workspace-context");
+const workspace_root_1 = require("../../utils/workspace-root");
 async function handleRequestFileData() {
-    const response = JSON.stringify(file_hasher_1.fileHasher.allFileData());
+    const response = JSON.stringify((0, workspace_context_1.getAllFileDataInContext)(workspace_root_1.workspaceRoot));
     return {
         response,
         description: 'handleRequestFileData',

package/src/daemon/server/outputs-tracking.js

@@ -1,11 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.disableOutputsTracking = exports.processFileChangesInOutputs = exports.outputsHashesMatch = exports.recordOutputsHash = exports.recordedHash = exports._outputsHashesMatch = exports._recordOutputsHash = void 0;
-const fs_extra_1 = require("fs-extra");
 const path_1 = require("path");
-const fastGlob = require("fast-glob");
 const workspace_root_1 = require("../../utils/workspace-root");
 const collapse_expanded_outputs_1 = require("../../utils/collapse-expanded-outputs");
+const native_1 = require("../../native");
 let disabled = false;
 const dirsContainingOutputs = {};
 const recordedHashes = {};
@@ -60,22 +59,8 @@ async function outputsHashesMatch(_outputs, hash) {
 }
 exports.outputsHashesMatch = outputsHashesMatch;
 async function normalizeOutputs(outputs) {
-    return (await Promise.all(outputs.map((o) => normalizeOutput(o, true)))).flat();
-}
-async function normalizeOutput(output, expand) {
-    try {
-        await (0, fs_extra_1.lstat)((0, path_1.join)(workspace_root_1.workspaceRoot, output));
-        return [output];
-    }
-    catch (e) {
-        if (expand) {
-            const expanded = (0, collapse_expanded_outputs_1.collapseExpandedOutputs)(await fastGlob(output, { cwd: workspace_root_1.workspaceRoot, dot: true }));
-            return (await Promise.all(expanded.map((e) => normalizeOutput(e, false)))).flat();
-        }
-        else {
-            return [];
-        }
-    }
+    let expandedOutputs = (0, collapse_expanded_outputs_1.collapseExpandedOutputs)((0, native_1.getFilesForOutputs)(workspace_root_1.workspaceRoot, outputs));
+    return expandedOutputs;
 }
 function processFileChangesInOutputs(changeEvents, now = undefined) {
     if (!now) {

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

@@ -13,6 +13,7 @@ const child_process_1 = require("child_process");
 const file_hasher_1 = require("../../hasher/file-hasher");
 const retrieve_workspace_files_1 = require("../../project-graph/utils/retrieve-workspace-files");
 const nx_json_1 = require("../../config/nx-json");
+const workspace_context_1 = require("../../utils/workspace-context");
 let cachedSerializedProjectGraphPromise;
 const collectedUpdatedFiles = new Set();
 const collectedDeletedFiles = new Set();
@@ -117,11 +118,13 @@ function filterUpdatedFiles(files) {
 async function processCollectedUpdatedAndDeletedFiles() {
     try {
         perf_hooks_1.performance.mark('hash-watched-changes-start');
-        const updatedFiles = await file_hasher_1.fileHasher.hashFiles(filterUpdatedFiles([...collectedUpdatedFiles.values()]));
+        const updatedFiles = filterUpdatedFiles([
+            ...collectedUpdatedFiles.values(),
+        ]);
         const deletedFiles = [...collectedDeletedFiles.values()];
+        let updatedFileHashes = (0, workspace_context_1.updateFilesInContext)(updatedFiles, deletedFiles);
         perf_hooks_1.performance.mark('hash-watched-changes-end');
         perf_hooks_1.performance.measure('hash changed files from watcher', 'hash-watched-changes-start', 'hash-watched-changes-end');
-        file_hasher_1.fileHasher.incrementalUpdate(updatedFiles, deletedFiles);
         const nxJson = (0, nx_json_1.readNxJson)(workspace_root_1.workspaceRoot);
         const { projectNodes } = await (0, retrieve_workspace_files_1.retrieveProjectConfigurations)(workspace_root_1.workspaceRoot, nxJson);
         const workspaceConfigHash = computeWorkspaceConfigHash(projectNodes);
@@ -136,7 +139,7 @@ async function processCollectedUpdatedAndDeletedFiles() {
         }
         else {
             if (exports.projectFileMapWithFiles) {
-                exports.projectFileMapWithFiles = (0, file_map_utils_1.updateProjectFileMap)(projectNodes, exports.projectFileMapWithFiles.projectFileMap, exports.projectFileMapWithFiles.allWorkspaceFiles, updatedFiles, deletedFiles);
+                exports.projectFileMapWithFiles = (0, file_map_utils_1.updateProjectFileMap)(projectNodes, exports.projectFileMapWithFiles.projectFileMap, exports.projectFileMapWithFiles.allWorkspaceFiles, new Map(Object.entries(updatedFileHashes)), deletedFiles);
             }
             else {
                 exports.projectFileMapWithFiles = await (0, retrieve_workspace_files_1.retrieveWorkspaceFiles)(workspace_root_1.workspaceRoot, nxJson);
@@ -224,8 +227,7 @@ async function resetInternalState() {
     exports.currentProjectGraph = undefined;
     collectedUpdatedFiles.clear();
     collectedDeletedFiles.clear();
-    file_hasher_1.fileHasher.clear();
-    await file_hasher_1.fileHasher.ensureInitialized();
+    (0, workspace_context_1.resetWorkspaceContext)();
     waitPeriod = 100;
 }
 async function resetInternalStateIfNxDepsMissing() {

package/src/daemon/server/server.js

@@ -24,6 +24,8 @@ const cache_1 = require("../cache");
 const handle_hash_tasks_1 = require("./handle-hash-tasks");
 const file_hasher_1 = require("../../hasher/file-hasher");
 const handle_request_file_data_1 = require("./handle-request-file-data");
+const workspace_context_1 = require("../../utils/workspace-context");
+const native_1 = require("../../native");
 let performanceObserver;
 let workspaceWatcherError;
 let outputsWatcherError;
@@ -183,7 +185,7 @@ function lockFileHashChanged() {
         (0, path_1.join)(workspace_root_1.workspaceRoot, 'pnpm-lock.yaml'),
     ]
         .filter((file) => (0, fs_1.existsSync)(file))
-        .map((file) => file_hasher_1.fileHasher.hashFile(file));
+        .map((file) => (0, native_1.hashFile)(file));
     const newHash = (0, file_hasher_1.hashArray)(lockHashes);
     if (existingLockHash && newHash != existingLockHash) {
         existingLockHash = newHash;
@@ -277,6 +279,7 @@ const handleOutputsChanges = async (err, changeEvents) => {
     }
 };
 async function startServer() {
+    (0, workspace_context_1.setupWorkspaceContext)(workspace_root_1.workspaceRoot);
     // Persist metadata about the background process so that it can be cleaned up later if needed
     await (0, cache_1.writeDaemonJsonProcessCache)({
         processId: process.pid,
@@ -287,7 +290,6 @@ async function startServer() {
     }
     return new Promise(async (resolve, reject) => {
         try {
-            await file_hasher_1.fileHasher.ensureInitialized();
             server.listen(socket_utils_1.FULL_OS_SOCKET_PATH, async () => {
                 try {
                     logger_1.serverLogger.log(`Started listening on: ${socket_utils_1.FULL_OS_SOCKET_PATH}`);

package/src/devkit-exports.d.ts

@@ -72,7 +72,7 @@ export { DependencyType } from './config/project-graph';
 /**
  * @category Project Graph
  */
-export { ProjectGraphBuilder, ProjectGraphDependencyWithFile, validateDependency, } from './project-graph/project-graph-builder';
+export { ProjectGraphBuilder, RawProjectGraphDependency, DynamicDependency, ImplicitDependency, StaticDependency, validateDependency, } from './project-graph/project-graph-builder';
 /**
  * @category Utils
  */

package/src/devkit-internals.d.ts

@@ -13,3 +13,4 @@ export { combineOptionsForExecutor } from './utils/params';
 export { sortObjectByKeys } from './utils/object-sort';
 export { stripIndent } from './utils/logger';
 export { readModulePackageJson } from './utils/package-json';
+export { splitByColons } from './utils/split-target';

package/src/devkit-internals.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.readModulePackageJson = exports.stripIndent = exports.sortObjectByKeys = exports.combineOptionsForExecutor = exports.splitTarget = exports.retrieveProjectConfigurationsWithAngularProjects = exports.calculateDefaultProjectName = exports.readNxJsonFromDisk = exports.getExecutorInformation = exports.createTempNpmDirectory = void 0;
+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.
  *
@@ -26,3 +26,5 @@ var logger_1 = require("./utils/logger");
 Object.defineProperty(exports, "stripIndent", { enumerable: true, get: function () { return logger_1.stripIndent; } });
 var package_json_1 = require("./utils/package-json");
 Object.defineProperty(exports, "readModulePackageJson", { enumerable: true, get: function () { return package_json_1.readModulePackageJson; } });
+var split_target_2 = require("./utils/split-target");
+Object.defineProperty(exports, "splitByColons", { enumerable: true, get: function () { return split_target_2.splitByColons; } });

package/src/hasher/file-hasher.d.ts

@@ -1,15 +1,2 @@
-import { FileData } from '../config/project-graph';
-export declare class FileHasher {
-    private fileHashes;
-    private isInitialized;
-    init(): Promise<void>;
-    hashFile(path: string): string;
-    clear(): void;
-    ensureInitialized(): Promise<void>;
-    hashFiles(files: string[]): Promise<Map<string, string>>;
-    allFileData(): FileData[];
-    incrementalUpdate(updatedFiles: Map<string, string>, deletedFiles?: string[]): void;
-}
-export declare const fileHasher: FileHasher;
 export declare function hashArray(content: string[]): string;
 export declare function hashObject(obj: object): string;

package/src/hasher/file-hasher.js

@@ -1,68 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.hashObject = exports.hashArray = exports.fileHasher = exports.FileHasher = void 0;
-const perf_hooks_1 = require("perf_hooks");
-const workspace_root_1 = require("../utils/workspace-root");
-class FileHasher {
-    constructor() {
-        this.isInitialized = false;
-    }
-    async init() {
-        perf_hooks_1.performance.mark('init hashing:start');
-        // Import as needed. There is also an issue running unit tests in Nx repo if this is a top-level import.
-        const { hashFiles } = require('../native');
-        this.clear();
-        const filesObject = hashFiles(workspace_root_1.workspaceRoot);
-        this.fileHashes = new Map(Object.entries(filesObject));
-        perf_hooks_1.performance.mark('init hashing:end');
-        perf_hooks_1.performance.measure('init hashing', 'init hashing:start', 'init hashing:end');
-    }
-    hashFile(path) {
-        // Import as needed. There is also an issue running unit tests in Nx repo if this is a top-level import.
-        const { hashFile } = require('../native');
-        return hashFile(path).hash;
-    }
-    clear() {
-        this.fileHashes = new Map();
-        this.isInitialized = false;
-    }
-    async ensureInitialized() {
-        if (!this.isInitialized) {
-            await this.init();
-        }
-    }
-    async hashFiles(files) {
-        const r = new Map();
-        for (let f of files) {
-            r.set(f, this.hashFile(f));
-        }
-        return r;
-    }
-    allFileData() {
-        const res = [];
-        this.fileHashes.forEach((hash, file) => {
-            res.push({
-                file,
-                hash,
-            });
-        });
-        res.sort((x, y) => x.file.localeCompare(y.file));
-        return res;
-    }
-    incrementalUpdate(updatedFiles, deletedFiles = []) {
-        perf_hooks_1.performance.mark('incremental hashing:start');
-        updatedFiles.forEach((hash, filename) => {
-            this.fileHashes.set(filename, hash);
-        });
-        for (const deletedFile of deletedFiles) {
-            this.fileHashes.delete(deletedFile);
-        }
-        perf_hooks_1.performance.mark('incremental hashing:end');
-        perf_hooks_1.performance.measure('incremental hashing', 'incremental hashing:start', 'incremental hashing:end');
-    }
-}
-exports.FileHasher = FileHasher;
-exports.fileHasher = new FileHasher();
+exports.hashObject = exports.hashArray = void 0;
 function hashArray(content) {
     // Import as needed. There is also an issue running unit tests in Nx repo if this is a top-level import.
     const { hashArray } = require('../native');

package/src/hasher/task-hasher.d.ts

@@ -3,7 +3,6 @@ import { NxJsonConfiguration } from '../config/nx-json';
 import { Task, TaskGraph } from '../config/task-graph';
 import { InputDefinition } from '../config/workspace-json-project-json';
 import { DaemonClient } from '../daemon/client/client';
-import { FileHasher } from './file-hasher';
 type ExpandedSelfInput = {
     fileset: string;
 } | {
@@ -73,10 +72,9 @@ export declare class InProcessTaskHasher implements TaskHasher {
     private readonly projectGraph;
     private readonly nxJson;
     private readonly options;
-    private readonly fileHasher;
     static version: string;
     private taskHasher;
-    constructor(projectFileMap: ProjectFileMap, allWorkspaceFiles: FileData[], projectGraph: ProjectGraph, nxJson: NxJsonConfiguration, options: any, fileHasher: FileHasher);
+    constructor(projectFileMap: ProjectFileMap, allWorkspaceFiles: FileData[], projectGraph: ProjectGraph, nxJson: NxJsonConfiguration, options: any);
     hashTasks(tasks: Task[], taskGraph?: TaskGraph): Promise<Hash[]>;
     hashTask(task: Task, taskGraph?: TaskGraph): Promise<Hash>;
     private hashCommand;

package/src/hasher/task-hasher.js

@@ -13,6 +13,7 @@ const workspace_root_1 = require("../utils/workspace-root");
 const path_1 = require("path");
 const path_2 = require("../utils/path");
 const project_graph_utils_1 = require("../utils/project-graph-utils");
+const native_1 = require("../native");
 class DaemonBasedTaskHasher {
     constructor(daemonClient, runnerOptions) {
         this.daemonClient = daemonClient;
@@ -27,13 +28,12 @@ class DaemonBasedTaskHasher {
 }
 exports.DaemonBasedTaskHasher = DaemonBasedTaskHasher;
 class InProcessTaskHasher {
-    constructor(projectFileMap, allWorkspaceFiles, projectGraph, nxJson, options, fileHasher) {
+    constructor(projectFileMap, allWorkspaceFiles, projectGraph, nxJson, options) {
         this.projectFileMap = projectFileMap;
         this.allWorkspaceFiles = allWorkspaceFiles;
         this.projectGraph = projectGraph;
         this.nxJson = nxJson;
         this.options = options;
-        this.fileHasher = fileHasher;
         const legacyRuntimeInputs = (this.options && this.options.runtimeCacheInputs
             ? this.options.runtimeCacheInputs
             : []).map((r) => ({ runtime: r }));
@@ -46,7 +46,7 @@ class InProcessTaskHasher {
             '.gitignore',
             '.nxignore',
         ].map((d) => ({ fileset: `{workspaceRoot}/${d}` }));
-        this.taskHasher = new TaskHasherImpl(nxJson, legacyRuntimeInputs, legacyFilesetInputs, this.projectFileMap, this.allWorkspaceFiles, this.projectGraph, this.fileHasher, { selectivelyHashTsConfig: this.options.selectivelyHashTsConfig ?? false });
+        this.taskHasher = new TaskHasherImpl(nxJson, legacyRuntimeInputs, legacyFilesetInputs, this.projectFileMap, this.allWorkspaceFiles, this.projectGraph, { selectivelyHashTsConfig: this.options.selectivelyHashTsConfig ?? false });
     }
     async hashTasks(tasks, taskGraph) {
         return await Promise.all(tasks.map((t) => this.hashTask(t, taskGraph)));
@@ -93,14 +93,13 @@ const DEFAULT_INPUTS = [
     },
 ];
 class TaskHasherImpl {
-    constructor(nxJson, legacyRuntimeInputs, legacyFilesetInputs, projectFileMap, allWorkspaceFiles, projectGraph, fileHasher, options) {
+    constructor(nxJson, legacyRuntimeInputs, legacyFilesetInputs, projectFileMap, allWorkspaceFiles, projectGraph, options) {
         this.nxJson = nxJson;
         this.legacyRuntimeInputs = legacyRuntimeInputs;
         this.legacyFilesetInputs = legacyFilesetInputs;
         this.projectFileMap = projectFileMap;
         this.allWorkspaceFiles = allWorkspaceFiles;
         this.projectGraph = projectGraph;
-        this.fileHasher = fileHasher;
         this.options = options;
         this.filesetHashes = {};
         this.runtimeHashes = {};
@@ -206,7 +205,7 @@ class TaskHasherImpl {
                 minimatch(p, dependentTasksOutputFiles, { dot: true }));
             const hashDetails = {};
             const hashes = [];
-            for (const [file, hash] of await this.fileHasher.hashFiles(filteredFiles.map((p) => (0, path_1.join)(workspace_root_1.workspaceRoot, p)))) {
+            for (const [file, hash] of this.hashFiles(filteredFiles.map((p) => (0, path_1.join)(workspace_root_1.workspaceRoot, p)))) {
                 hashes.push(hash);
                 hashDetails[(0, path_2.normalizePath)((0, path_1.relative)(workspace_root_1.workspaceRoot, file))] = hash;
             }
@@ -220,6 +219,13 @@ class TaskHasherImpl {
         }
         return partialHashes;
     }
+    hashFiles(files) {
+        const r = new Map();
+        for (let f of files) {
+            r.set(f, (0, native_1.hashFile)(f));
+        }
+        return r;
+    }
     getExternalDependencyHash(externalNodeName) {
         const combinedHash = this.combinePartialHashes(this.externalDependencyHashes.get(externalNodeName));
         // Set the combined hash into the hashes so it's not recalculated next time

package/src/native/index.d.ts

@@ -16,7 +16,7 @@ export function getFilesForOutputs(directory: string, entries: Array<string>): A
 export function remove(src: string): void
 export function copy(src: string, dest: string): void
 export function hashArray(input: Array<string>): string
-export function hashFile(file: string): FileData | null
+export function hashFile(file: string): string | null
 export function hashFiles(workspaceRoot: string): Record<string, string>
 export function findImports(projectFileMap: Record<string, Array<string>>): Array<ImportResult>
 export interface ExternalNodeData {
@@ -69,10 +69,6 @@ export interface FileData {
   file: string
   hash: string
 }
-/**
- * Newly created files will have the `update` EventType as well.
- * This simplifies logic between OS's, IDEs and git operations
- */
 export const enum EventType {
   delete = 'delete',
   update = 'update',
@@ -87,21 +83,16 @@ export const enum WorkspaceErrors {
   ParseError = 'ParseError',
   Generic = 'Generic'
 }
-/** Get workspace config files based on provided globs */
-export function getProjectConfigurationFiles(workspaceRoot: string, globs: Array<string>): Array<string>
-/** Get workspace config files based on provided globs */
-export function getProjectConfigurations(workspaceRoot: string, globs: Array<string>, parseConfigurations: (arg0: Array<string>) => ConfigurationParserResult): ConfigurationParserResult
+export interface ConfigurationParserResult {
+  projectNodes: Record<string, object>
+  externalNodes: Record<string, object>
+}
 export interface NxWorkspaceFiles {
   projectFileMap: Record<string, Array<FileData>>
   globalFiles: Array<FileData>
   projectConfigurations: Record<string, object>
   externalNodes: Record<string, object>
 }
-export function getWorkspaceFilesNative(workspaceRoot: string, globs: Array<string>, parseConfigurations: (arg0: Array<string>) => ConfigurationParserResult): NxWorkspaceFiles
-export interface ConfigurationParserResult {
-  projectNodes: Record<string, object>
-  externalNodes: Record<string, object>
-}
 export class ImportResult {
   file: string
   sourceProject: string
@@ -118,3 +109,12 @@ export class Watcher {
   watch(callback: (err: string | null, events: WatchEvent[]) => void): void
   stop(): Promise<void>
 }
+export class WorkspaceContext {
+  workspaceRoot: string
+  constructor(workspaceRoot: string)
+  getWorkspaceFiles(globs: Array<string>, parseConfigurations: (arg0: Array<string>) => ConfigurationParserResult): NxWorkspaceFiles
+  getProjectConfigurationFiles(globs: Array<string>): Array<string>
+  getProjectConfigurations(globs: Array<string>, parseConfigurations: (arg0: Array<string>) => ConfigurationParserResult): ConfigurationParserResult
+  incrementalUpdate(updatedFiles: Array<string>, deletedFiles: Array<string>): Record<string, string>
+  allFileData(): Array<FileData>
+}

package/src/native/index.js

@@ -246,7 +246,7 @@ if (!nativeBinding) {
   throw new Error(`Failed to load native binding`)
 }
 
-const { expandOutputs, getFilesForOutputs, remove, copy, hashArray, hashFile, hashFiles, ImportResult, findImports, EventType, Watcher, WorkspaceErrors, getProjectConfigurationFiles, getProjectConfigurations, getWorkspaceFilesNative } = nativeBinding
+const { expandOutputs, getFilesForOutputs, remove, copy, hashArray, hashFile, hashFiles, ImportResult, findImports, EventType, Watcher, WorkspaceContext, WorkspaceErrors } = nativeBinding
 
 module.exports.expandOutputs = expandOutputs
 module.exports.getFilesForOutputs = getFilesForOutputs
@@ -259,7 +259,5 @@ module.exports.ImportResult = ImportResult
 module.exports.findImports = findImports
 module.exports.EventType = EventType
 module.exports.Watcher = Watcher
+module.exports.WorkspaceContext = WorkspaceContext
 module.exports.WorkspaceErrors = WorkspaceErrors
-module.exports.getProjectConfigurationFiles = getProjectConfigurationFiles
-module.exports.getProjectConfigurations = getProjectConfigurations
-module.exports.getWorkspaceFilesNative = getWorkspaceFilesNative

package/src/plugins/js/index.js

@@ -61,7 +61,7 @@ const createDependencies = (ctx) => {
             lockfileDependencies = readCachedParsedLockFile().dependencies ?? [];
         }
         else {
-            lockfileDependencies = (0, lock_file_1.getLockFileDependencies)(packageManager, lockFileContents, lockFileHash, ctx.graph);
+            lockfileDependencies = (0, lock_file_1.getLockFileDependencies)(packageManager, lockFileContents, lockFileHash, ctx);
             parsedLockFile.dependencies = lockfileDependencies;
             writeLastProcessedLockfileHash(lockFileHash, parsedLockFile);
         }

package/src/plugins/js/lock-file/lock-file.d.ts

@@ -4,8 +4,9 @@
  */
 import { PackageManager } from '../../../utils/package-manager';
 import { ProjectGraph, ProjectGraphExternalNode } from '../../../config/project-graph';
-import { ProjectGraphDependencyWithFile } from '../../../project-graph/project-graph-builder';
+import { RawProjectGraphDependency } from '../../../project-graph/project-graph-builder';
 import { PackageJson } from '../../../utils/package-json';
+import { CreateDependenciesContext } from '../../../utils/nx-plugin';
 export declare const LOCKFILES: string[];
 /**
  * Parses lock file and maps dependencies and metadata to {@link LockFileGraph}
@@ -14,7 +15,7 @@ export declare function getLockFileNodes(packageManager: PackageManager, content
 /**
  * Parses lock file and maps dependencies and metadata to {@link LockFileGraph}
  */
-export declare function getLockFileDependencies(packageManager: PackageManager, contents: string, lockFileHash: string, projectGraph: ProjectGraph): ProjectGraphDependencyWithFile[];
+export declare function getLockFileDependencies(packageManager: PackageManager, contents: string, lockFileHash: string, context: CreateDependenciesContext): RawProjectGraphDependency[];
 export declare function lockFileExists(packageManager: PackageManager): boolean;
 /**
  * Returns lock file name based on the detected package manager in the root

package/src/plugins/js/lock-file/lock-file.js

@@ -54,16 +54,16 @@ exports.getLockFileNodes = getLockFileNodes;
 /**
  * Parses lock file and maps dependencies and metadata to {@link LockFileGraph}
  */
-function getLockFileDependencies(packageManager, contents, lockFileHash, projectGraph) {
+function getLockFileDependencies(packageManager, contents, lockFileHash, context) {
     try {
         if (packageManager === 'yarn') {
-            return (0, yarn_parser_1.getYarnLockfileDependencies)(contents, lockFileHash, projectGraph);
+            return (0, yarn_parser_1.getYarnLockfileDependencies)(contents, lockFileHash, context);
         }
         if (packageManager === 'pnpm') {
-            return (0, pnpm_parser_1.getPnpmLockfileDependencies)(contents, lockFileHash, projectGraph);
+            return (0, pnpm_parser_1.getPnpmLockfileDependencies)(contents, lockFileHash, context);
         }
         if (packageManager === 'npm') {
-            return (0, npm_parser_1.getNpmLockfileDependencies)(contents, lockFileHash, projectGraph);
+            return (0, npm_parser_1.getNpmLockfileDependencies)(contents, lockFileHash, context);
         }
     }
     catch (e) {