refactor: wip

Author: John Doe

packages/nx-plugin/src/executors/cli/executor.ts

@@ -23,35 +23,42 @@ export default async function runAutorunExecutor(
     normalizedContext,
   );
   const { command: cliCommand } = terminalAndExecutorOptions;
-  const { dryRun, verbose, bin, ...restArgs } = cliArgumentObject;
+  const {
+    dryRun,
+    verbose,
+    env: executorEnv,
+    bin,
+    ...restArgs
+  } = cliArgumentObject;
   const command = bin ? `node` : 'npx';
   const positionals = [
     bin ?? '@code-pushup/cli',
     ...(cliCommand ? [cliCommand] : []),
   ];
   const args = [...positionals, ...objectToCliArgs(restArgs)];
-  const executorEnvVariables = {
+  const env = {
+    ...executorEnv,
     ...(verbose && { CP_VERBOSE: 'true' }),
   };
   const commandString = formatCommandStatus([command, ...args].join(' '), {
     cwd: context.cwd,
-    env: executorEnvVariables,
+    env,
   });
 
   if (dryRun) {
     logger.warn(`DryRun execution of: ${commandString}`);
   } else {
     try {
-      logger.debug(`With env vars: ${executorEnvVariables}`);
+      logger.debug(`With env vars: ${env}`);
       await executeProcess({
         command,
         args,
         ...(context.cwd ? { cwd: context.cwd } : {}),
-        ...(verbose
+        ...(Object.keys(env).length > 0
           ? {
               env: {
                 ...process.env,
-                ...executorEnvVariables,
+                ...env,
               },
             }
           : {}),

packages/nx-plugin/src/executors/internal/types.ts

@@ -30,6 +30,7 @@ export type Command =
 export type GlobalExecutorOptions = {
   command?: Command;
   bin?: string;
+  env?: Record<string, string>;
   verbose?: boolean;
   config?: string;
 };