nx 21.0.3 → 21.1.0-beta.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "21.0.3",
+  "version": "21.1.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": {
@@ -83,16 +83,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-arm64": "21.0.3",
-    "@nx/nx-darwin-x64": "21.0.3",
-    "@nx/nx-freebsd-x64": "21.0.3",
-    "@nx/nx-linux-arm-gnueabihf": "21.0.3",
-    "@nx/nx-linux-arm64-gnu": "21.0.3",
-    "@nx/nx-linux-arm64-musl": "21.0.3",
-    "@nx/nx-linux-x64-gnu": "21.0.3",
-    "@nx/nx-linux-x64-musl": "21.0.3",
-    "@nx/nx-win32-arm64-msvc": "21.0.3",
-    "@nx/nx-win32-x64-msvc": "21.0.3"
+    "@nx/nx-darwin-arm64": "21.1.0-beta.0",
+    "@nx/nx-darwin-x64": "21.1.0-beta.0",
+    "@nx/nx-freebsd-x64": "21.1.0-beta.0",
+    "@nx/nx-linux-arm-gnueabihf": "21.1.0-beta.0",
+    "@nx/nx-linux-arm64-gnu": "21.1.0-beta.0",
+    "@nx/nx-linux-arm64-musl": "21.1.0-beta.0",
+    "@nx/nx-linux-x64-gnu": "21.1.0-beta.0",
+    "@nx/nx-linux-x64-musl": "21.1.0-beta.0",
+    "@nx/nx-win32-arm64-msvc": "21.1.0-beta.0",
+    "@nx/nx-win32-x64-msvc": "21.1.0-beta.0"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",

package/src/command-line/init/init-v1.js

@@ -38,7 +38,7 @@ async function initHandler(options) {
             await (0, react_1.addNxToCraRepo)(options);
             (0, utils_1.printFinalMessage)({
                 learnMoreLink: options.integrated
-                    ? 'https://nx.dev/tutorials/2-react-monorepo/1r-introduction/1-welcome'
+                    ? 'https://nx.dev/getting-started/tutorials/react-monorepo-tutorial'
                     : 'https://nx.dev/getting-started/tutorials/react-standalone-tutorial',
             });
             return;

package/src/command-line/yargs-utils/shared-options.js

@@ -17,6 +17,7 @@ exports.parseCSV = parseCSV;
 exports.readParallelFromArgsAndEnv = readParallelFromArgsAndEnv;
 const nx_json_1 = require("../../config/nx-json");
 const is_tui_enabled_1 = require("../../tasks-runner/is-tui-enabled");
+const node_os_1 = require("node:os");
 exports.defaultYargsParserConfiguration = {
     'strip-dashed': true,
     'unknown-options-as-args': true,
@@ -304,15 +305,15 @@ function readParallelFromArgsAndEnv(args) {
     else if (args['parallel'] === 'true' ||
         args['parallel'] === true ||
         args['parallel'] === '' ||
-        // dont require passing --parallel if NX_PARALLEL is set, but allow overriding it
+        // don't require passing --parallel if NX_PARALLEL is set, but allow overriding it
         (process.env.NX_PARALLEL && args['parallel'] === undefined)) {
-        return Number(args['maxParallel'] ||
+        return concurrency(args['maxParallel'] ||
             args['max-parallel'] ||
             process.env.NX_PARALLEL ||
-            3);
+            '3');
     }
     else if (args['parallel'] !== undefined) {
-        return Number(args['parallel']);
+        return concurrency(args['parallel']);
     }
 }
 const coerceTuiAutoExit = (value) => {
@@ -328,3 +329,11 @@ const coerceTuiAutoExit = (value) => {
     }
     throw new Error(`Invalid value for --tui-auto-exit: ${value}`);
 };
+function concurrency(val) {
+    let parallel = typeof val === 'number' ? val : parseInt(val);
+    if (typeof val === 'string' && val.at(-1) === '%') {
+        const maxCores = (0, node_os_1.availableParallelism)?.() ?? (0, node_os_1.cpus)().length;
+        parallel = (maxCores * parallel) / 100;
+    }
+    return Math.max(1, Math.floor(parallel));
+}

package/src/native/index.d.ts

@@ -237,6 +237,10 @@ export interface InputsInput {
 
 export const IS_WASM: boolean
 
+export declare export declare function logError(message: string): void
+
+export declare export declare function logInfo(message: string): void
+
 /** Stripped version of the NxJson interface for use in rust */
 export interface NxJson {
   namedInputs?: Record<string, Array<JsInputs>>

package/src/native/native-bindings.js

@@ -388,6 +388,8 @@ module.exports.getTransformableOutputs = nativeBinding.getTransformableOutputs
 module.exports.hashArray = nativeBinding.hashArray
 module.exports.hashFile = nativeBinding.hashFile
 module.exports.IS_WASM = nativeBinding.IS_WASM
+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,43 +59,45 @@ 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__IS_WASM_8']?.()
-  __napiInstance.exports['__napi_register__get_binary_target_9']?.()
-  __napiInstance.exports['__napi_register__ImportResult_struct_10']?.()
-  __napiInstance.exports['__napi_register__find_imports_11']?.()
-  __napiInstance.exports['__napi_register__transfer_project_graph_12']?.()
-  __napiInstance.exports['__napi_register__ExternalNode_struct_13']?.()
-  __napiInstance.exports['__napi_register__Target_struct_14']?.()
-  __napiInstance.exports['__napi_register__Project_struct_15']?.()
-  __napiInstance.exports['__napi_register__ProjectGraph_struct_16']?.()
-  __napiInstance.exports['__napi_register__HashPlanner_struct_17']?.()
-  __napiInstance.exports['__napi_register__HashPlanner_impl_21']?.()
-  __napiInstance.exports['__napi_register__HashDetails_struct_22']?.()
-  __napiInstance.exports['__napi_register__HasherOptions_struct_23']?.()
-  __napiInstance.exports['__napi_register__TaskHasher_struct_24']?.()
-  __napiInstance.exports['__napi_register__TaskHasher_impl_27']?.()
-  __napiInstance.exports['__napi_register__Task_struct_28']?.()
-  __napiInstance.exports['__napi_register__TaskTarget_struct_29']?.()
-  __napiInstance.exports['__napi_register__TaskResult_struct_30']?.()
-  __napiInstance.exports['__napi_register__TaskGraph_struct_31']?.()
-  __napiInstance.exports['__napi_register__FileData_struct_32']?.()
-  __napiInstance.exports['__napi_register__InputsInput_struct_33']?.()
-  __napiInstance.exports['__napi_register__FileSetInput_struct_34']?.()
-  __napiInstance.exports['__napi_register__RuntimeInput_struct_35']?.()
-  __napiInstance.exports['__napi_register__EnvironmentInput_struct_36']?.()
-  __napiInstance.exports['__napi_register__ExternalDependenciesInput_struct_37']?.()
-  __napiInstance.exports['__napi_register__DepsOutputsInput_struct_38']?.()
-  __napiInstance.exports['__napi_register__NxJson_struct_39']?.()
-  __napiInstance.exports['__napi_register__FileLock_struct_40']?.()
-  __napiInstance.exports['__napi_register__FileLock_impl_42']?.()
-  __napiInstance.exports['__napi_register__WorkspaceContext_struct_43']?.()
-  __napiInstance.exports['__napi_register__WorkspaceContext_impl_54']?.()
-  __napiInstance.exports['__napi_register__WorkspaceErrors_55']?.()
-  __napiInstance.exports['__napi_register__NxWorkspaceFiles_struct_56']?.()
-  __napiInstance.exports['__napi_register__NxWorkspaceFilesExternals_struct_57']?.()
-  __napiInstance.exports['__napi_register__UpdatedWorkspaceFiles_struct_58']?.()
-  __napiInstance.exports['__napi_register__FileMap_struct_59']?.()
-  __napiInstance.exports['__napi_register____test_only_transfer_file_map_60']?.()
+  __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']?.()
 }
 export const FileLock = __napiModule.exports.FileLock
 export const HashPlanner = __napiModule.exports.HashPlanner
@@ -111,6 +113,8 @@ export const getTransformableOutputs = __napiModule.exports.getTransformableOutp
 export const hashArray = __napiModule.exports.hashArray
 export const hashFile = __napiModule.exports.hashFile
 export const IS_WASM = __napiModule.exports.IS_WASM
+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,43 +90,45 @@ 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__IS_WASM_8']?.()
-  __napiInstance.exports['__napi_register__get_binary_target_9']?.()
-  __napiInstance.exports['__napi_register__ImportResult_struct_10']?.()
-  __napiInstance.exports['__napi_register__find_imports_11']?.()
-  __napiInstance.exports['__napi_register__transfer_project_graph_12']?.()
-  __napiInstance.exports['__napi_register__ExternalNode_struct_13']?.()
-  __napiInstance.exports['__napi_register__Target_struct_14']?.()
-  __napiInstance.exports['__napi_register__Project_struct_15']?.()
-  __napiInstance.exports['__napi_register__ProjectGraph_struct_16']?.()
-  __napiInstance.exports['__napi_register__HashPlanner_struct_17']?.()
-  __napiInstance.exports['__napi_register__HashPlanner_impl_21']?.()
-  __napiInstance.exports['__napi_register__HashDetails_struct_22']?.()
-  __napiInstance.exports['__napi_register__HasherOptions_struct_23']?.()
-  __napiInstance.exports['__napi_register__TaskHasher_struct_24']?.()
-  __napiInstance.exports['__napi_register__TaskHasher_impl_27']?.()
-  __napiInstance.exports['__napi_register__Task_struct_28']?.()
-  __napiInstance.exports['__napi_register__TaskTarget_struct_29']?.()
-  __napiInstance.exports['__napi_register__TaskResult_struct_30']?.()
-  __napiInstance.exports['__napi_register__TaskGraph_struct_31']?.()
-  __napiInstance.exports['__napi_register__FileData_struct_32']?.()
-  __napiInstance.exports['__napi_register__InputsInput_struct_33']?.()
-  __napiInstance.exports['__napi_register__FileSetInput_struct_34']?.()
-  __napiInstance.exports['__napi_register__RuntimeInput_struct_35']?.()
-  __napiInstance.exports['__napi_register__EnvironmentInput_struct_36']?.()
-  __napiInstance.exports['__napi_register__ExternalDependenciesInput_struct_37']?.()
-  __napiInstance.exports['__napi_register__DepsOutputsInput_struct_38']?.()
-  __napiInstance.exports['__napi_register__NxJson_struct_39']?.()
-  __napiInstance.exports['__napi_register__FileLock_struct_40']?.()
-  __napiInstance.exports['__napi_register__FileLock_impl_42']?.()
-  __napiInstance.exports['__napi_register__WorkspaceContext_struct_43']?.()
-  __napiInstance.exports['__napi_register__WorkspaceContext_impl_54']?.()
-  __napiInstance.exports['__napi_register__WorkspaceErrors_55']?.()
-  __napiInstance.exports['__napi_register__NxWorkspaceFiles_struct_56']?.()
-  __napiInstance.exports['__napi_register__NxWorkspaceFilesExternals_struct_57']?.()
-  __napiInstance.exports['__napi_register__UpdatedWorkspaceFiles_struct_58']?.()
-  __napiInstance.exports['__napi_register__FileMap_struct_59']?.()
-  __napiInstance.exports['__napi_register____test_only_transfer_file_map_60']?.()
+  __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']?.()
 }
 module.exports.FileLock = __napiModule.exports.FileLock
 module.exports.HashPlanner = __napiModule.exports.HashPlanner
@@ -142,6 +144,8 @@ module.exports.getTransformableOutputs = __napiModule.exports.getTransformableOu
 module.exports.hashArray = __napiModule.exports.hashArray
 module.exports.hashFile = __napiModule.exports.hashFile
 module.exports.IS_WASM = __napiModule.exports.IS_WASM
+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/tasks-runner/run-command.js

@@ -15,6 +15,7 @@ const nx_json_1 = require("../config/nx-json");
 const client_1 = require("../daemon/client/client");
 const create_task_hasher_1 = require("../hasher/create-task-hasher");
 const hash_task_1 = require("../hasher/hash-task");
+const native_1 = require("../native");
 const tasks_execution_hooks_1 = require("../project-graph/plugins/tasks-execution-hooks");
 const project_graph_1 = require("../project-graph/project-graph");
 const handle_errors_1 = require("../utils/handle-errors");
@@ -39,8 +40,8 @@ const task_timings_life_cycle_1 = require("./life-cycles/task-timings-life-cycle
 const tui_summary_life_cycle_1 = require("./life-cycles/tui-summary-life-cycle");
 const task_graph_utils_1 = require("./task-graph-utils");
 const utils_1 = require("./utils");
-const chalk = require("chalk");
 const exit_codes_1 = require("../utils/exit-codes");
+const chalk = require("chalk");
 const originalStdoutWrite = process.stdout.write.bind(process.stdout);
 const originalStderrWrite = process.stderr.write.bind(process.stderr);
 const originalConsoleLog = console.log.bind(console);
@@ -132,9 +133,19 @@ async function getTerminalOutputLifeCycle(initiatingProject, initiatingTasks, pr
             /**
              * Patch stdout.write and stderr.write methods to pass Nx Cloud client logs to the TUI via the lifecycle
              */
-            const createPatchedLogWrite = (originalWrite) => {
+            const createPatchedLogWrite = (originalWrite, isError) => {
                 // @ts-ignore
                 return (chunk, encoding, callback) => {
+                    if (isError) {
+                        (0, native_1.logError)(Buffer.isBuffer(chunk)
+                            ? chunk.toString(encoding)
+                            : chunk.toString());
+                    }
+                    else {
+                        (0, native_1.logInfo)(Buffer.isBuffer(chunk)
+                            ? chunk.toString(encoding)
+                            : chunk.toString());
+                    }
                     // Check if the log came from the Nx Cloud client, otherwise invoke the original write method
                     const stackTrace = new Error().stack;
                     const isNxCloudLog = stackTrace.includes((0, node_path_1.join)(workspace_root_1.workspaceRoot, '.nx', 'cache', 'cloud'));
@@ -165,8 +176,8 @@ async function getTerminalOutputLifeCycle(initiatingProject, initiatingTasks, pr
                     // No-op the Nx Cloud client logs
                 };
             };
-            process.stdout.write = createPatchedLogWrite(originalStdoutWrite);
-            process.stderr.write = createPatchedLogWrite(originalStderrWrite);
+            process.stdout.write = createPatchedLogWrite(originalStdoutWrite, false);
+            process.stderr.write = createPatchedLogWrite(originalStderrWrite, true);
             // The cloud client calls console.log when NX_VERBOSE_LOGGING is set to true
             console.log = createPatchedConsoleMethod(originalConsoleLog);
             console.error = createPatchedConsoleMethod(originalConsoleError);

package/src/utils/find-matching-projects.js

@@ -113,7 +113,7 @@ function addMatchingProjectsByName(projectNames, projects, pattern, matchedProje
     }
     if (!(0, globs_1.isGlobPattern)(pattern.value)) {
         // Custom regex that is basically \b but includes hyphens (-) and excludes underscores (_), so "foo" pattern matches "foo_bar" but not "foo-e2e".
-        const regex = new RegExp(`(?<![a-zA-Z0-9-])${pattern.value}(?![a-zA-Z0-9-])`, 'i');
+        const regex = new RegExp(`(?<![@a-zA-Z0-9-])${pattern.value}(?![@a-zA-Z0-9-])`, 'i');
         const matchingProjects = Object.keys(projects).filter((name) => regex.test(name));
         for (const projectName of matchingProjects) {
             if (pattern.exclude) {