nx 21.2.0-beta.2 → 21.2.0-beta.3

package/src/core/graph/styles.js

@@ -1 +1 @@
-"use strict";(self.webpackChunk=self.webpackChunk||[]).push([[869],{932:()=>{}},s=>{var e;e=932,s(s.s=e)}]);
+"use strict";(self.webpackChunk=self.webpackChunk||[]).push([[869],{5873:()=>{}},s=>{var e;e=5873,s(s.s=e)}]);

package/src/native/index.d.ts

@@ -73,6 +73,12 @@ export declare class NxCache {
   checkCacheFsInSync(): boolean
 }
 
+export declare class NxConsolePreferences {
+  constructor(homeDir: string)
+  getAutoInstallPreference(): boolean | null
+  setAutoInstallPreference(autoInstall: boolean): void
+}
+
 export declare class NxTaskHistory {
   constructor(db: ExternalObject<NxDbConnection>)
   recordTaskRuns(taskRuns: Array<TaskRun>): void
@@ -148,6 +154,8 @@ export interface CachedResult {
   size?: number
 }
 
+export declare export declare function canInstallNxConsole(): boolean
+
 export declare export declare function closeDbConnection(connection: ExternalObject<NxDbConnection>): void
 
 export declare export declare function connectToNxDb(cacheDir: string, nxVersion: string, dbName?: string | undefined | null): ExternalObject<NxDbConnection>
@@ -235,11 +243,13 @@ export interface InputsInput {
   projects?: string | Array<string>
 }
 
+export declare export declare function installNxConsole(): void
+
 export const IS_WASM: boolean
 
-export declare export declare function logError(message: string): void
+export declare export declare function logDebug(message: string): void
 
-export declare export declare function logInfo(message: string): void
+export declare export declare function logError(message: string): void
 
 /** Stripped version of the NxJson interface for use in rust */
 export interface NxJson {

package/src/native/native-bindings.js

@@ -368,6 +368,7 @@ module.exports.HashPlanner = nativeBinding.HashPlanner
 module.exports.HttpRemoteCache = nativeBinding.HttpRemoteCache
 module.exports.ImportResult = nativeBinding.ImportResult
 module.exports.NxCache = nativeBinding.NxCache
+module.exports.NxConsolePreferences = nativeBinding.NxConsolePreferences
 module.exports.NxTaskHistory = nativeBinding.NxTaskHistory
 module.exports.RunningTasksService = nativeBinding.RunningTasksService
 module.exports.RustPseudoTerminal = nativeBinding.RustPseudoTerminal
@@ -375,6 +376,7 @@ module.exports.TaskDetails = nativeBinding.TaskDetails
 module.exports.TaskHasher = nativeBinding.TaskHasher
 module.exports.Watcher = nativeBinding.Watcher
 module.exports.WorkspaceContext = nativeBinding.WorkspaceContext
+module.exports.canInstallNxConsole = nativeBinding.canInstallNxConsole
 module.exports.closeDbConnection = nativeBinding.closeDbConnection
 module.exports.connectToNxDb = nativeBinding.connectToNxDb
 module.exports.copy = nativeBinding.copy
@@ -387,9 +389,10 @@ module.exports.getFilesForOutputs = nativeBinding.getFilesForOutputs
 module.exports.getTransformableOutputs = nativeBinding.getTransformableOutputs
 module.exports.hashArray = nativeBinding.hashArray
 module.exports.hashFile = nativeBinding.hashFile
+module.exports.installNxConsole = nativeBinding.installNxConsole
 module.exports.IS_WASM = nativeBinding.IS_WASM
+module.exports.logDebug = nativeBinding.logDebug
 module.exports.logError = nativeBinding.logError
-module.exports.logInfo = nativeBinding.logInfo
 module.exports.parseTaskStatus = nativeBinding.parseTaskStatus
 module.exports.remove = nativeBinding.remove
 module.exports.restoreTerminal = nativeBinding.restoreTerminal

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

@@ -59,51 +59,57 @@ function __napi_rs_initialize_modules(__napiInstance) {
   __napiInstance.exports['__napi_register__get_transformable_outputs_5']?.()
   __napiInstance.exports['__napi_register__hash_array_6']?.()
   __napiInstance.exports['__napi_register__hash_file_7']?.()
-  __napiInstance.exports['__napi_register__log_info_8']?.()
-  __napiInstance.exports['__napi_register__log_error_9']?.()
-  __napiInstance.exports['__napi_register__IS_WASM_10']?.()
-  __napiInstance.exports['__napi_register__get_binary_target_11']?.()
-  __napiInstance.exports['__napi_register__ImportResult_struct_12']?.()
-  __napiInstance.exports['__napi_register__find_imports_13']?.()
-  __napiInstance.exports['__napi_register__transfer_project_graph_14']?.()
-  __napiInstance.exports['__napi_register__ExternalNode_struct_15']?.()
-  __napiInstance.exports['__napi_register__Target_struct_16']?.()
-  __napiInstance.exports['__napi_register__Project_struct_17']?.()
-  __napiInstance.exports['__napi_register__ProjectGraph_struct_18']?.()
-  __napiInstance.exports['__napi_register__HashPlanner_struct_19']?.()
-  __napiInstance.exports['__napi_register__HashPlanner_impl_23']?.()
-  __napiInstance.exports['__napi_register__HashDetails_struct_24']?.()
-  __napiInstance.exports['__napi_register__HasherOptions_struct_25']?.()
-  __napiInstance.exports['__napi_register__TaskHasher_struct_26']?.()
-  __napiInstance.exports['__napi_register__TaskHasher_impl_29']?.()
-  __napiInstance.exports['__napi_register__Task_struct_30']?.()
-  __napiInstance.exports['__napi_register__TaskTarget_struct_31']?.()
-  __napiInstance.exports['__napi_register__TaskResult_struct_32']?.()
-  __napiInstance.exports['__napi_register__TaskGraph_struct_33']?.()
-  __napiInstance.exports['__napi_register__FileData_struct_34']?.()
-  __napiInstance.exports['__napi_register__InputsInput_struct_35']?.()
-  __napiInstance.exports['__napi_register__FileSetInput_struct_36']?.()
-  __napiInstance.exports['__napi_register__RuntimeInput_struct_37']?.()
-  __napiInstance.exports['__napi_register__EnvironmentInput_struct_38']?.()
-  __napiInstance.exports['__napi_register__ExternalDependenciesInput_struct_39']?.()
-  __napiInstance.exports['__napi_register__DepsOutputsInput_struct_40']?.()
-  __napiInstance.exports['__napi_register__NxJson_struct_41']?.()
-  __napiInstance.exports['__napi_register__FileLock_struct_42']?.()
-  __napiInstance.exports['__napi_register__FileLock_impl_44']?.()
-  __napiInstance.exports['__napi_register__WorkspaceContext_struct_45']?.()
-  __napiInstance.exports['__napi_register__WorkspaceContext_impl_56']?.()
-  __napiInstance.exports['__napi_register__WorkspaceErrors_57']?.()
-  __napiInstance.exports['__napi_register__NxWorkspaceFiles_struct_58']?.()
-  __napiInstance.exports['__napi_register__NxWorkspaceFilesExternals_struct_59']?.()
-  __napiInstance.exports['__napi_register__UpdatedWorkspaceFiles_struct_60']?.()
-  __napiInstance.exports['__napi_register__FileMap_struct_61']?.()
-  __napiInstance.exports['__napi_register____test_only_transfer_file_map_62']?.()
+  __napiInstance.exports['__napi_register__can_install_nx_console_8']?.()
+  __napiInstance.exports['__napi_register__install_nx_console_9']?.()
+  __napiInstance.exports['__napi_register__NxConsolePreferences_struct_10']?.()
+  __napiInstance.exports['__napi_register__NxConsolePreferences_impl_14']?.()
+  __napiInstance.exports['__napi_register__log_debug_15']?.()
+  __napiInstance.exports['__napi_register__log_error_16']?.()
+  __napiInstance.exports['__napi_register__IS_WASM_17']?.()
+  __napiInstance.exports['__napi_register__get_binary_target_18']?.()
+  __napiInstance.exports['__napi_register__ImportResult_struct_19']?.()
+  __napiInstance.exports['__napi_register__find_imports_20']?.()
+  __napiInstance.exports['__napi_register__transfer_project_graph_21']?.()
+  __napiInstance.exports['__napi_register__ExternalNode_struct_22']?.()
+  __napiInstance.exports['__napi_register__Target_struct_23']?.()
+  __napiInstance.exports['__napi_register__Project_struct_24']?.()
+  __napiInstance.exports['__napi_register__ProjectGraph_struct_25']?.()
+  __napiInstance.exports['__napi_register__HashPlanner_struct_26']?.()
+  __napiInstance.exports['__napi_register__HashPlanner_impl_30']?.()
+  __napiInstance.exports['__napi_register__HashDetails_struct_31']?.()
+  __napiInstance.exports['__napi_register__HasherOptions_struct_32']?.()
+  __napiInstance.exports['__napi_register__TaskHasher_struct_33']?.()
+  __napiInstance.exports['__napi_register__TaskHasher_impl_36']?.()
+  __napiInstance.exports['__napi_register__Task_struct_37']?.()
+  __napiInstance.exports['__napi_register__TaskTarget_struct_38']?.()
+  __napiInstance.exports['__napi_register__TaskResult_struct_39']?.()
+  __napiInstance.exports['__napi_register__TaskGraph_struct_40']?.()
+  __napiInstance.exports['__napi_register__FileData_struct_41']?.()
+  __napiInstance.exports['__napi_register__InputsInput_struct_42']?.()
+  __napiInstance.exports['__napi_register__FileSetInput_struct_43']?.()
+  __napiInstance.exports['__napi_register__RuntimeInput_struct_44']?.()
+  __napiInstance.exports['__napi_register__EnvironmentInput_struct_45']?.()
+  __napiInstance.exports['__napi_register__ExternalDependenciesInput_struct_46']?.()
+  __napiInstance.exports['__napi_register__DepsOutputsInput_struct_47']?.()
+  __napiInstance.exports['__napi_register__NxJson_struct_48']?.()
+  __napiInstance.exports['__napi_register__FileLock_struct_49']?.()
+  __napiInstance.exports['__napi_register__FileLock_impl_51']?.()
+  __napiInstance.exports['__napi_register__WorkspaceContext_struct_52']?.()
+  __napiInstance.exports['__napi_register__WorkspaceContext_impl_63']?.()
+  __napiInstance.exports['__napi_register__WorkspaceErrors_64']?.()
+  __napiInstance.exports['__napi_register__NxWorkspaceFiles_struct_65']?.()
+  __napiInstance.exports['__napi_register__NxWorkspaceFilesExternals_struct_66']?.()
+  __napiInstance.exports['__napi_register__UpdatedWorkspaceFiles_struct_67']?.()
+  __napiInstance.exports['__napi_register__FileMap_struct_68']?.()
+  __napiInstance.exports['__napi_register____test_only_transfer_file_map_69']?.()
 }
 export const FileLock = __napiModule.exports.FileLock
 export const HashPlanner = __napiModule.exports.HashPlanner
 export const ImportResult = __napiModule.exports.ImportResult
+export const NxConsolePreferences = __napiModule.exports.NxConsolePreferences
 export const TaskHasher = __napiModule.exports.TaskHasher
 export const WorkspaceContext = __napiModule.exports.WorkspaceContext
+export const canInstallNxConsole = __napiModule.exports.canInstallNxConsole
 export const copy = __napiModule.exports.copy
 export const expandOutputs = __napiModule.exports.expandOutputs
 export const findImports = __napiModule.exports.findImports
@@ -112,9 +118,10 @@ export const getFilesForOutputs = __napiModule.exports.getFilesForOutputs
 export const getTransformableOutputs = __napiModule.exports.getTransformableOutputs
 export const hashArray = __napiModule.exports.hashArray
 export const hashFile = __napiModule.exports.hashFile
+export const installNxConsole = __napiModule.exports.installNxConsole
 export const IS_WASM = __napiModule.exports.IS_WASM
+export const logDebug = __napiModule.exports.logDebug
 export const logError = __napiModule.exports.logError
-export const logInfo = __napiModule.exports.logInfo
 export const remove = __napiModule.exports.remove
 export const testOnlyTransferFileMap = __napiModule.exports.testOnlyTransferFileMap
 export const transferProjectGraph = __napiModule.exports.transferProjectGraph

package/src/native/nx.wasi.cjs

@@ -90,51 +90,57 @@ function __napi_rs_initialize_modules(__napiInstance) {
   __napiInstance.exports['__napi_register__get_transformable_outputs_5']?.()
   __napiInstance.exports['__napi_register__hash_array_6']?.()
   __napiInstance.exports['__napi_register__hash_file_7']?.()
-  __napiInstance.exports['__napi_register__log_info_8']?.()
-  __napiInstance.exports['__napi_register__log_error_9']?.()
-  __napiInstance.exports['__napi_register__IS_WASM_10']?.()
-  __napiInstance.exports['__napi_register__get_binary_target_11']?.()
-  __napiInstance.exports['__napi_register__ImportResult_struct_12']?.()
-  __napiInstance.exports['__napi_register__find_imports_13']?.()
-  __napiInstance.exports['__napi_register__transfer_project_graph_14']?.()
-  __napiInstance.exports['__napi_register__ExternalNode_struct_15']?.()
-  __napiInstance.exports['__napi_register__Target_struct_16']?.()
-  __napiInstance.exports['__napi_register__Project_struct_17']?.()
-  __napiInstance.exports['__napi_register__ProjectGraph_struct_18']?.()
-  __napiInstance.exports['__napi_register__HashPlanner_struct_19']?.()
-  __napiInstance.exports['__napi_register__HashPlanner_impl_23']?.()
-  __napiInstance.exports['__napi_register__HashDetails_struct_24']?.()
-  __napiInstance.exports['__napi_register__HasherOptions_struct_25']?.()
-  __napiInstance.exports['__napi_register__TaskHasher_struct_26']?.()
-  __napiInstance.exports['__napi_register__TaskHasher_impl_29']?.()
-  __napiInstance.exports['__napi_register__Task_struct_30']?.()
-  __napiInstance.exports['__napi_register__TaskTarget_struct_31']?.()
-  __napiInstance.exports['__napi_register__TaskResult_struct_32']?.()
-  __napiInstance.exports['__napi_register__TaskGraph_struct_33']?.()
-  __napiInstance.exports['__napi_register__FileData_struct_34']?.()
-  __napiInstance.exports['__napi_register__InputsInput_struct_35']?.()
-  __napiInstance.exports['__napi_register__FileSetInput_struct_36']?.()
-  __napiInstance.exports['__napi_register__RuntimeInput_struct_37']?.()
-  __napiInstance.exports['__napi_register__EnvironmentInput_struct_38']?.()
-  __napiInstance.exports['__napi_register__ExternalDependenciesInput_struct_39']?.()
-  __napiInstance.exports['__napi_register__DepsOutputsInput_struct_40']?.()
-  __napiInstance.exports['__napi_register__NxJson_struct_41']?.()
-  __napiInstance.exports['__napi_register__FileLock_struct_42']?.()
-  __napiInstance.exports['__napi_register__FileLock_impl_44']?.()
-  __napiInstance.exports['__napi_register__WorkspaceContext_struct_45']?.()
-  __napiInstance.exports['__napi_register__WorkspaceContext_impl_56']?.()
-  __napiInstance.exports['__napi_register__WorkspaceErrors_57']?.()
-  __napiInstance.exports['__napi_register__NxWorkspaceFiles_struct_58']?.()
-  __napiInstance.exports['__napi_register__NxWorkspaceFilesExternals_struct_59']?.()
-  __napiInstance.exports['__napi_register__UpdatedWorkspaceFiles_struct_60']?.()
-  __napiInstance.exports['__napi_register__FileMap_struct_61']?.()
-  __napiInstance.exports['__napi_register____test_only_transfer_file_map_62']?.()
+  __napiInstance.exports['__napi_register__can_install_nx_console_8']?.()
+  __napiInstance.exports['__napi_register__install_nx_console_9']?.()
+  __napiInstance.exports['__napi_register__NxConsolePreferences_struct_10']?.()
+  __napiInstance.exports['__napi_register__NxConsolePreferences_impl_14']?.()
+  __napiInstance.exports['__napi_register__log_debug_15']?.()
+  __napiInstance.exports['__napi_register__log_error_16']?.()
+  __napiInstance.exports['__napi_register__IS_WASM_17']?.()
+  __napiInstance.exports['__napi_register__get_binary_target_18']?.()
+  __napiInstance.exports['__napi_register__ImportResult_struct_19']?.()
+  __napiInstance.exports['__napi_register__find_imports_20']?.()
+  __napiInstance.exports['__napi_register__transfer_project_graph_21']?.()
+  __napiInstance.exports['__napi_register__ExternalNode_struct_22']?.()
+  __napiInstance.exports['__napi_register__Target_struct_23']?.()
+  __napiInstance.exports['__napi_register__Project_struct_24']?.()
+  __napiInstance.exports['__napi_register__ProjectGraph_struct_25']?.()
+  __napiInstance.exports['__napi_register__HashPlanner_struct_26']?.()
+  __napiInstance.exports['__napi_register__HashPlanner_impl_30']?.()
+  __napiInstance.exports['__napi_register__HashDetails_struct_31']?.()
+  __napiInstance.exports['__napi_register__HasherOptions_struct_32']?.()
+  __napiInstance.exports['__napi_register__TaskHasher_struct_33']?.()
+  __napiInstance.exports['__napi_register__TaskHasher_impl_36']?.()
+  __napiInstance.exports['__napi_register__Task_struct_37']?.()
+  __napiInstance.exports['__napi_register__TaskTarget_struct_38']?.()
+  __napiInstance.exports['__napi_register__TaskResult_struct_39']?.()
+  __napiInstance.exports['__napi_register__TaskGraph_struct_40']?.()
+  __napiInstance.exports['__napi_register__FileData_struct_41']?.()
+  __napiInstance.exports['__napi_register__InputsInput_struct_42']?.()
+  __napiInstance.exports['__napi_register__FileSetInput_struct_43']?.()
+  __napiInstance.exports['__napi_register__RuntimeInput_struct_44']?.()
+  __napiInstance.exports['__napi_register__EnvironmentInput_struct_45']?.()
+  __napiInstance.exports['__napi_register__ExternalDependenciesInput_struct_46']?.()
+  __napiInstance.exports['__napi_register__DepsOutputsInput_struct_47']?.()
+  __napiInstance.exports['__napi_register__NxJson_struct_48']?.()
+  __napiInstance.exports['__napi_register__FileLock_struct_49']?.()
+  __napiInstance.exports['__napi_register__FileLock_impl_51']?.()
+  __napiInstance.exports['__napi_register__WorkspaceContext_struct_52']?.()
+  __napiInstance.exports['__napi_register__WorkspaceContext_impl_63']?.()
+  __napiInstance.exports['__napi_register__WorkspaceErrors_64']?.()
+  __napiInstance.exports['__napi_register__NxWorkspaceFiles_struct_65']?.()
+  __napiInstance.exports['__napi_register__NxWorkspaceFilesExternals_struct_66']?.()
+  __napiInstance.exports['__napi_register__UpdatedWorkspaceFiles_struct_67']?.()
+  __napiInstance.exports['__napi_register__FileMap_struct_68']?.()
+  __napiInstance.exports['__napi_register____test_only_transfer_file_map_69']?.()
 }
 module.exports.FileLock = __napiModule.exports.FileLock
 module.exports.HashPlanner = __napiModule.exports.HashPlanner
 module.exports.ImportResult = __napiModule.exports.ImportResult
+module.exports.NxConsolePreferences = __napiModule.exports.NxConsolePreferences
 module.exports.TaskHasher = __napiModule.exports.TaskHasher
 module.exports.WorkspaceContext = __napiModule.exports.WorkspaceContext
+module.exports.canInstallNxConsole = __napiModule.exports.canInstallNxConsole
 module.exports.copy = __napiModule.exports.copy
 module.exports.expandOutputs = __napiModule.exports.expandOutputs
 module.exports.findImports = __napiModule.exports.findImports
@@ -143,9 +149,10 @@ module.exports.getFilesForOutputs = __napiModule.exports.getFilesForOutputs
 module.exports.getTransformableOutputs = __napiModule.exports.getTransformableOutputs
 module.exports.hashArray = __napiModule.exports.hashArray
 module.exports.hashFile = __napiModule.exports.hashFile
+module.exports.installNxConsole = __napiModule.exports.installNxConsole
 module.exports.IS_WASM = __napiModule.exports.IS_WASM
+module.exports.logDebug = __napiModule.exports.logDebug
 module.exports.logError = __napiModule.exports.logError
-module.exports.logInfo = __napiModule.exports.logInfo
 module.exports.remove = __napiModule.exports.remove
 module.exports.testOnlyTransferFileMap = __napiModule.exports.testOnlyTransferFileMap
 module.exports.transferProjectGraph = __napiModule.exports.transferProjectGraph

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

@@ -9,6 +9,7 @@ const object_sort_1 = require("../../../utils/object-sort");
 const project_graph_builder_1 = require("../../../project-graph/project-graph-builder");
 const project_graph_1 = require("../../../config/project-graph");
 const file_hasher_1 = require("../../../hasher/file-hasher");
+const project_graph_pruning_1 = require("./project-graph-pruning");
 // we use key => node map to avoid duplicate work when parsing keys
 let keyMap = new Map();
 let currentLockFileHash;
@@ -278,7 +279,7 @@ function parseBaseVersion(rawVersion, isV5) {
 function stringifyPnpmLockfile(graph, rootLockFileContent, packageJson) {
     const data = (0, pnpm_normalizer_1.parseAndNormalizePnpmLockfile)(rootLockFileContent);
     const { lockfileVersion, packages } = data;
-    const rootSnapshot = mapRootSnapshot(packageJson, packages, graph.externalNodes, +lockfileVersion);
+    const rootSnapshot = mapRootSnapshot(packageJson, packages, graph, +lockfileVersion);
     const snapshots = mapSnapshots(data.packages, graph.externalNodes, +lockfileVersion);
     const output = {
         ...data,
@@ -397,7 +398,7 @@ function versionIsAlias(key, versionExpr, lockfileVersion) {
         ? key.startsWith(`${packageName}/${version}`)
         : key.startsWith(`${packageName}@${version}`);
 }
-function mapRootSnapshot(packageJson, packages, nodes, lockfileVersion) {
+function mapRootSnapshot(packageJson, packages, graph, lockfileVersion) {
     const snapshot = { specifiers: {} };
     [
         'dependencies',
@@ -408,7 +409,14 @@ function mapRootSnapshot(packageJson, packages, nodes, lockfileVersion) {
         if (packageJson[depType]) {
             Object.keys(packageJson[depType]).forEach((packageName) => {
                 const version = packageJson[depType][packageName];
-                const node = nodes[`npm:${packageName}@${version}`] || nodes[`npm:${packageName}`];
+                const node = graph.externalNodes[`npm:${packageName}@${version}`] ||
+                    (graph.externalNodes[`npm:${packageName}`] &&
+                        graph.externalNodes[`npm:${packageName}`].data.version === version
+                        ? graph.externalNodes[`npm:${packageName}`]
+                        : (0, project_graph_pruning_1.findNodeMatchingVersion)(graph, packageName, version));
+                if (!node) {
+                    throw new Error(`Could not find external node for package ${packageName}@${version}.`);
+                }
                 snapshot.specifiers[packageName] = version;
                 // peer dependencies are mapped to dependencies
                 let section = depType === 'peerDependencies' ? 'dependencies' : depType;

package/src/plugins/js/lock-file/project-graph-pruning.d.ts

@@ -1,7 +1,8 @@
-import { ProjectGraph } from '../../../config/project-graph';
+import { ProjectGraph, ProjectGraphExternalNode } from '../../../config/project-graph';
 import { PackageJson } from '../../../utils/package-json';
 /**
  * Prune project graph's external nodes and their dependencies
  * based on the pruned package.json
  */
 export declare function pruneProjectGraph(graph: ProjectGraph, prunedPackageJson: PackageJson): ProjectGraph;
+export declare function findNodeMatchingVersion(graph: ProjectGraph, packageName: string, versionExpr: string): ProjectGraphExternalNode;

package/src/plugins/js/lock-file/project-graph-pruning.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.pruneProjectGraph = pruneProjectGraph;
+exports.findNodeMatchingVersion = findNodeMatchingVersion;
 const semver_1 = require("semver");
 const project_graph_builder_1 = require("../../../project-graph/project-graph-builder");
 const operators_1 = require("../../../project-graph/operators");
@@ -92,6 +93,9 @@ function rehoistNodes(graph, packageJsonDeps, builder) {
             }
         }
     });
+    if (!packagesToRehoist.size) {
+        return;
+    }
     // invert dependencies for easier traversal back
     const invertedGraph = (0, operators_1.reverse)(builder.graph);
     const invBuilder = new project_graph_builder_1.ProjectGraphBuilder(invertedGraph, {});

package/src/plugins/js/project-graph/build-dependencies/target-project-locator.js

@@ -90,9 +90,8 @@ class TargetProjectLocator {
             return externalProject;
         }
         if (this.tsConfig.config) {
-            // TODO(meeroslav): this block is probably obsolete
-            // and existed only because of the incomplete `paths` matching
-            // if import cannot be matched using tsconfig `paths` the compilation would fail anyway
+            // TODO: this can be removed once we rework resolveImportWithRequire below
+            // to properly handle ESM (exports, imports, conditions)
             const resolvedProject = this.resolveImportWithTypescript(importExpr, filePath);
             if (resolvedProject) {
                 return resolvedProject;
@@ -256,21 +255,32 @@ class TargetProjectLocator {
     }
     resolveImportWithTypescript(normalizedImportExpr, filePath) {
         let resolvedModule;
-        if (this.typescriptResolutionCache.has(normalizedImportExpr)) {
-            resolvedModule = this.typescriptResolutionCache.get(normalizedImportExpr);
+        const projectName = (0, find_project_for_path_1.findProjectForPath)(filePath, this.projectRootMappings);
+        const cacheScope = projectName
+            ? // fall back to the project name if the project root can't be determined
+                this.nodes[projectName]?.data?.root || projectName
+            : // fall back to the file path if the project can't be determined
+                filePath;
+        const cacheKey = `${normalizedImportExpr}__${cacheScope}`;
+        if (this.typescriptResolutionCache.has(cacheKey)) {
+            resolvedModule = this.typescriptResolutionCache.get(cacheKey);
         }
         else {
             resolvedModule = (0, typescript_1.resolveModuleByImport)(normalizedImportExpr, filePath, this.tsConfig.absolutePath);
-            this.typescriptResolutionCache.set(normalizedImportExpr, resolvedModule ? resolvedModule : null);
+            this.typescriptResolutionCache.set(cacheKey, resolvedModule ? resolvedModule : null);
         }
-        // TODO: vsavkin temporary workaround. Remove it once we reworking handling of npm packages.
-        if (resolvedModule && resolvedModule.indexOf('node_modules/') === -1) {
+        if (!resolvedModule) {
+            return;
+        }
+        const nodeModulesIndex = resolvedModule.lastIndexOf('node_modules/');
+        if (nodeModulesIndex === -1) {
             const resolvedProject = this.findProjectOfResolvedModule(resolvedModule);
-            if (resolvedProject) {
-                return resolvedProject;
-            }
+            return resolvedProject;
         }
-        return;
+        // strip the node_modules/ prefix from the resolved module path
+        const packagePath = resolvedModule.substring(nodeModulesIndex + 'node_modules/'.length);
+        const externalProject = this.findNpmProjectFromImport(packagePath, filePath);
+        return externalProject;
     }
     resolveImportWithRequire(normalizedImportExpr, filePath) {
         return (0, node_path_1.relative)(workspace_root_1.workspaceRoot, require.resolve(normalizedImportExpr, {

package/src/plugins/js/utils/register.d.ts

@@ -1,3 +1,4 @@
+import type { TsConfigOptions } from 'ts-node';
 import type { CompilerOptions } from 'typescript';
 /**
  * Optionally, if swc-node and tsconfig-paths are available in the current workspace, apply the require
@@ -23,7 +24,7 @@ export declare function registerTsProject(tsConfigPath: string): () => void;
  */
 export declare function registerTsProject(path: string, configFilename: string): any;
 export declare function getSwcTranspiler(compilerOptions: CompilerOptions): (...args: unknown[]) => unknown;
-export declare function getTsNodeTranspiler(compilerOptions: CompilerOptions): (...args: unknown[]) => unknown;
+export declare function getTsNodeTranspiler(compilerOptions: CompilerOptions, tsNodeOptions?: TsConfigOptions): (...args: unknown[]) => unknown;
 export declare function getTranspiler(compilerOptions: CompilerOptions, tsConfigRaw?: unknown): () => (...args: unknown[]) => unknown;
 /**
  * Register ts-node or swc-node given a set of compiler options.
@@ -33,7 +34,7 @@ export declare function getTranspiler(compilerOptions: CompilerOptions, tsConfig
  *
  * @returns cleanup method
  */
-export declare function registerTranspiler(compilerOptions: CompilerOptions): () => void;
+export declare function registerTranspiler(compilerOptions: CompilerOptions, tsConfigRaw?: unknown): () => void;
 /**
  * @param tsConfigPath Adds the paths from a tsconfig file into node resolutions
  * @returns cleanup function

package/src/plugins/js/utils/register.js

@@ -9,6 +9,7 @@ exports.registerTsConfigPaths = registerTsConfigPaths;
 exports.getTsNodeCompilerOptions = getTsNodeCompilerOptions;
 const path_1 = require("path");
 const logger_1 = require("../../../utils/logger");
+const typescript_1 = require("./typescript");
 const swcNodeInstalled = packageIsInstalled('@swc-node/register');
 const tsNodeInstalled = packageIsInstalled('ts-node/register');
 let ts;
@@ -53,10 +54,10 @@ function registerTsProject(path, configFilename) {
         return () => { };
     }
     const tsConfigPath = configFilename ? (0, path_1.join)(path, configFilename) : path;
-    const compilerOptions = readCompilerOptions(tsConfigPath);
+    const { compilerOptions, tsConfigRaw } = readCompilerOptions(tsConfigPath);
     const cleanupFunctions = [
         registerTsConfigPaths(tsConfigPath),
-        registerTranspiler(compilerOptions),
+        registerTranspiler(compilerOptions, tsConfigRaw),
     ];
     // Add ESM support for `.ts` files.
     // NOTE: There is no cleanup function for this, as it's not possible to unregister the loader.
@@ -90,12 +91,16 @@ function getSwcTranspiler(compilerOptions) {
     const cleanupFn = register(compilerOptions);
     return typeof cleanupFn === 'function' ? cleanupFn : () => { };
 }
-function getTsNodeTranspiler(compilerOptions) {
+function getTsNodeTranspiler(compilerOptions, tsNodeOptions) {
     const { register } = require('ts-node');
     // ts-node doesn't provide a cleanup method
     const service = register({
+        ...tsNodeOptions,
         transpileOnly: true,
-        compilerOptions: getTsNodeCompilerOptions(compilerOptions),
+        compilerOptions: getTsNodeCompilerOptions({
+            ...tsNodeOptions?.compilerOptions,
+            ...compilerOptions,
+        }),
         // we already read and provide the compiler options, so prevent ts-node from reading them again
         skipProject: true,
     });
@@ -165,21 +170,30 @@ function getTranspiler(compilerOptions, tsConfigRaw) {
     compilerOptions.target = ts.ScriptTarget.ES2021;
     compilerOptions.inlineSourceMap = true;
     compilerOptions.skipLibCheck = true;
+    let _getTranspiler;
+    let registrationKey = JSON.stringify(compilerOptions);
+    let tsNodeOptions;
+    if (swcNodeInstalled && !preferTsNode) {
+        _getTranspiler = getSwcTranspiler;
+    }
+    else if (tsNodeInstalled) {
+        // We can fall back on ts-node if it's available
+        _getTranspiler = getTsNodeTranspiler;
+        tsNodeOptions = filterRecognizedTsConfigTsNodeOptions(tsConfigRaw?.['ts-node']).recognized;
+        // include ts-node options in the registration key
+        registrationKey += JSON.stringify(tsNodeOptions);
+    }
+    else {
+        _getTranspiler = undefined;
+    }
     // Just return if transpiler was already registered before.
-    const registrationKey = JSON.stringify(compilerOptions);
     const registrationEntry = registered.get(registrationKey);
     if (registered.has(registrationKey)) {
         registrationEntry.refCount++;
         return registrationEntry.cleanup;
     }
-    const _getTranspiler = swcNodeInstalled && !preferTsNode
-        ? getSwcTranspiler
-        : tsNodeInstalled
-            ? // We can fall back on ts-node if it's available
-                getTsNodeTranspiler
-            : undefined;
     if (_getTranspiler) {
-        const transpilerCleanup = _getTranspiler(compilerOptions);
+        const transpilerCleanup = _getTranspiler(compilerOptions, tsNodeOptions);
         const currRegistrationEntry = {
             refCount: 1,
             cleanup: () => {
@@ -204,9 +218,9 @@ function getTranspiler(compilerOptions, tsConfigRaw) {
  *
  * @returns cleanup method
  */
-function registerTranspiler(compilerOptions) {
+function registerTranspiler(compilerOptions, tsConfigRaw) {
     // Function to register transpiler that returns cleanup function
-    const transpiler = getTranspiler(compilerOptions);
+    const transpiler = getTranspiler(compilerOptions, tsConfigRaw);
     if (!transpiler) {
         warnNoTranspiler();
         return () => { };
@@ -245,7 +259,9 @@ function registerTsConfigPaths(tsConfigPath) {
 function readCompilerOptions(tsConfigPath) {
     const preferTsNode = process.env.NX_PREFER_TS_NODE === 'true';
     if (swcNodeInstalled && !preferTsNode) {
-        return readCompilerOptionsWithSwc(tsConfigPath);
+        return {
+            compilerOptions: readCompilerOptionsWithSwc(tsConfigPath),
+        };
     }
     else {
         return readCompilerOptionsWithTypescript(tsConfigPath);
@@ -261,16 +277,14 @@ function readCompilerOptionsWithSwc(tsConfigPath) {
     return compilerOptions;
 }
 function readCompilerOptionsWithTypescript(tsConfigPath) {
-    if (!ts) {
-        ts = require('typescript');
-    }
-    const { readConfigFile, parseJsonConfigFileContent, sys } = ts;
-    const jsonContent = readConfigFile(tsConfigPath, sys.readFile);
-    const { options } = parseJsonConfigFileContent(jsonContent.config, sys, (0, path_1.dirname)(tsConfigPath));
+    const { options, raw } = (0, typescript_1.readTsConfigWithoutFiles)(tsConfigPath);
     // This property is returned in compiler options for some reason, but not part of the typings.
     // ts-node fails on unknown props, so we have to remove it.
     delete options.configFilePath;
-    return options;
+    return {
+        compilerOptions: options,
+        tsConfigRaw: raw,
+    };
 }
 function loadTsConfigPaths() {
     try {

package/src/plugins/js/utils/typescript.d.ts

@@ -1,6 +1,7 @@
 import type * as ts from 'typescript';
 import type { Node, SyntaxKind } from 'typescript';
-export declare function readTsConfig(tsConfigPath: string): ts.ParsedCommandLine;
+export declare function readTsConfig(tsConfigPath: string, sys?: ts.System): ts.ParsedCommandLine;
+export declare function readTsConfigWithoutFiles(tsConfigPath: string): ts.ParsedCommandLine;
 export declare function readTsConfigOptions(tsConfigPath: string): ts.CompilerOptions;
 /**
  * Find a module based on its import

package/src/plugins/js/utils/typescript.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.readTsConfig = readTsConfig;
+exports.readTsConfigWithoutFiles = readTsConfigWithoutFiles;
 exports.readTsConfigOptions = readTsConfigOptions;
 exports.resolveModuleByImport = resolveModuleByImport;
 exports.getRootTsConfigFileName = getRootTsConfigFileName;
@@ -11,25 +12,29 @@ const fs_1 = require("fs");
 const path_1 = require("path");
 const normalizedAppRoot = workspace_root_1.workspaceRoot.replace(/\\/g, '/');
 let tsModule;
-function readTsConfig(tsConfigPath) {
+function readTsConfig(tsConfigPath, sys) {
     if (!tsModule) {
         tsModule = require('typescript');
     }
-    const readResult = tsModule.readConfigFile(tsConfigPath, tsModule.sys.readFile);
-    return tsModule.parseJsonConfigFileContent(readResult.config, tsModule.sys, (0, path_1.dirname)(tsConfigPath));
+    sys ??= tsModule.sys;
+    const readResult = tsModule.readConfigFile(tsConfigPath, sys.readFile);
+    return tsModule.parseJsonConfigFileContent(readResult.config, sys, (0, path_1.dirname)(tsConfigPath));
 }
-function readTsConfigOptions(tsConfigPath) {
+function readTsConfigWithoutFiles(tsConfigPath) {
     if (!tsModule) {
         tsModule = require('typescript');
     }
-    const readResult = tsModule.readConfigFile(tsConfigPath, tsModule.sys.readFile);
     // We only care about options, so we don't need to scan source files, and thus
     // `readDirectory` is stubbed for performance.
-    const host = {
+    const sys = {
         ...tsModule.sys,
         readDirectory: () => [],
     };
-    return tsModule.parseJsonConfigFileContent(readResult.config, host, (0, path_1.dirname)(tsConfigPath)).options;
+    return readTsConfig(tsConfigPath, sys);
+}
+function readTsConfigOptions(tsConfigPath) {
+    const { options } = readTsConfigWithoutFiles(tsConfigPath);
+    return options;
 }
 let compilerHost;
 /**