@nx/gradle 22.6.0-beta.6 → 22.6.0-beta.8

package/src/executors/gradle/gradle-batch.impl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gradle-batch.impl.d.ts","sourceRoot":"","sources":["../../../../../../packages/gradle/src/executors/gradle/gradle-batch.impl.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EAEf,uBAAuB,EACvB,SAAS,EAEV,MAAM,YAAY,CAAC;AACpB,OAAO,EAEL,kBAAkB,EACnB,MAAM,iDAAiD,CAAC;AACzD,OAAO,EAAE,YAAY,EAAE,MAAM,0CAA0C,CAAC;AACxE,OAAO,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAkBhD,eAAO,MAAM,eAAe,QAG3B,CAAC;AAEF,wBAA8B,WAAW,CACvC,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,oBAAoB,CAAC,EAC5C,SAAS,EAAE,kBAAkB,EAC7B,OAAO,EAAE,eAAe,GACvB,OAAO,CAAC,YAAY,CAAC,CAkEvB;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,MAAM,EAAE,EACjB,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,oBAAoB,CAAC,EAC5C,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,uBAAuB,CAAC;;;;EAiE/C"}
+{"version":3,"file":"gradle-batch.impl.d.ts","sourceRoot":"","sources":["../../../../../../packages/gradle/src/executors/gradle/gradle-batch.impl.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EAEf,uBAAuB,EACvB,SAAS,EAEV,MAAM,YAAY,CAAC;AACpB,OAAO,EAEL,kBAAkB,EACnB,MAAM,iDAAiD,CAAC;AACzD,OAAO,EAAE,YAAY,EAAE,MAAM,0CAA0C,CAAC;AACxE,OAAO,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAchD,eAAO,MAAM,eAAe,QAG3B,CAAC;AAEF,wBAA8B,WAAW,CACvC,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,oBAAoB,CAAC,EAC5C,SAAS,EAAE,kBAAkB,EAC7B,OAAO,EAAE,eAAe,GACvB,OAAO,CAAC,YAAY,CAAC,CAkEvB;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,MAAM,EAAE,EACjB,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,oBAAoB,CAAC,EAC5C,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,uBAAuB,CAAC;;;;EAiE/C"}

package/src/executors/gradle/gradle-batch.impl.js

@@ -8,7 +8,6 @@ const run_commands_impl_1 = require("nx/src/executors/run-commands/run-commands.
 const exec_gradle_1 = require("../../utils/exec-gradle");
 const path_1 = require("path");
 const child_process_1 = require("child_process");
-const pseudo_terminal_1 = require("nx/src/tasks-runner/pseudo-terminal");
 const get_exclude_task_1 = require("./get-exclude-task");
 exports.batchRunnerPath = (0, path_1.join)(__dirname, '../../../batch-runner/build/libs/gradle-batch-runner-all.jar');
 async function gradleBatch(taskGraph, inputs, overrides, context) {
@@ -112,38 +111,20 @@ function getGradlewTasksToRun(taskIds, taskGraph, inputs, nodes) {
 }
 async function runTasksInBatch(gradlewTasksToRun, excludeTasks, excludeTestTasks, args, root) {
     const gradlewBatchStart = performance.mark(`gradlew-batch:start`);
-    const usePseudoTerminal = process.env.NX_NATIVE_COMMAND_RUNNER !== 'false' &&
-        pseudo_terminal_1.PseudoTerminal.isSupported();
     const debugOptions = ' ' + (process.env.NX_GRADLE_BATCH_DEBUG ?? '');
     const command = `java${debugOptions} -jar ${exports.batchRunnerPath} --tasks='${JSON.stringify(gradlewTasksToRun)}' --workspaceRoot=${root} --args='${args
         .join(' ')
         .replaceAll("'", '"')}' --excludeTasks='${Array.from(excludeTasks).join(',')}' --excludeTestTasks='${Array.from(excludeTestTasks).join(',')}' ${process.env.NX_VERBOSE_LOGGING === 'true' ? '' : '--quiet'}`;
-    let batchResults;
-    if (usePseudoTerminal && process.env.NX_VERBOSE_LOGGING !== 'true') {
-        const terminal = (0, pseudo_terminal_1.createPseudoTerminal)();
-        await terminal.init();
-        const cp = terminal.runCommand(command, {
-            cwd: devkit_1.workspaceRoot,
-            jsEnv: process.env,
-            quiet: true,
-        });
-        const results = await cp.getResults();
-        terminal.shutdown(0);
-        batchResults = results.terminalOutput;
-        batchResults = batchResults.replace(command, '');
-        const startIndex = batchResults.indexOf('{');
-        const endIndex = batchResults.lastIndexOf('}');
-        // only keep the json part
-        batchResults = batchResults.substring(startIndex, endIndex + 1);
-    }
-    else {
-        batchResults = (0, child_process_1.execSync)(command, {
-            cwd: devkit_1.workspaceRoot,
-            windowsHide: true,
-            env: process.env,
-            maxBuffer: run_commands_impl_1.LARGE_BUFFER,
-        }).toString();
-    }
+    // Use 'inherit' for stderr so Gradle output (tee'd to System.err
+    // by TeeOutputStream) flows to the terminal in real-time.
+    // stdout is piped to capture the JSON batch results.
+    const batchResults = (0, child_process_1.execSync)(command, {
+        cwd: devkit_1.workspaceRoot,
+        windowsHide: true,
+        env: process.env,
+        stdio: ['pipe', 'pipe', 'inherit'],
+        maxBuffer: run_commands_impl_1.LARGE_BUFFER,
+    }).toString();
     const gradlewBatchEnd = performance.mark(`gradlew-batch:end`);
     performance.measure(`gradlew-batch`, gradlewBatchStart.name, gradlewBatchEnd.name);
     const gradlewBatchResults = JSON.parse(batchResults);