@code-pushup/nx-plugin 0.96.0 → 0.97.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@code-pushup/nx-plugin",
-  "version": "0.96.0",
+  "version": "0.97.0",
   "license": "MIT",
   "description": "Nx plugin to integrate the Code PushUp CLI into your workspace 🛠️",
   "publishConfig": {
@@ -32,8 +32,8 @@
   "generators": "./generators.json",
   "executors": "./executors.json",
   "dependencies": {
-    "@code-pushup/models": "0.96.0",
-    "@code-pushup/utils": "0.96.0",
+    "@code-pushup/models": "0.97.0",
+    "@code-pushup/utils": "0.97.0",
     "@nx/devkit": ">=17.0.0",
     "nx": ">=17.0.0"
   },

package/src/executors/cli/executor.d.ts

@@ -1,8 +1,8 @@
 import type { ExecutorContext } from '@nx/devkit';
-import type { AutorunCommandExecutorOptions } from './schema.js';
+import type { CliCommandExecutorOptions } from './schema.js';
 export type ExecutorOutput = {
     success: boolean;
     command?: string;
     error?: Error;
 };
-export default function runAutorunExecutor(terminalAndExecutorOptions: AutorunCommandExecutorOptions, context: ExecutorContext): Promise<ExecutorOutput>;
+export default function runCliExecutor(terminalAndExecutorOptions: CliCommandExecutorOptions, context: ExecutorContext): Promise<ExecutorOutput>;

package/src/executors/cli/executor.js

@@ -1,40 +1,51 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = runAutorunExecutor;
+exports.default = runCliExecutor;
 const execute_process_js_1 = require("../../internal/execute-process.js");
 const context_js_1 = require("../internal/context.js");
 const utils_js_1 = require("./utils.js");
 /* eslint-disable-next-line max-lines-per-function */
-async function runAutorunExecutor(terminalAndExecutorOptions, context) {
+async function runCliExecutor(terminalAndExecutorOptions, context) {
     const { objectToCliArgs, formatCommandStatus, logger, stringifyError } = await Promise.resolve().then(() => require('@code-pushup/utils'));
     const normalizedContext = (0, context_js_1.normalizeContext)(context);
-    const cliArgumentObject = (0, utils_js_1.parseAutorunExecutorOptions)(terminalAndExecutorOptions, normalizedContext);
-    const { command: cliCommand } = terminalAndExecutorOptions;
-    const { verbose = false, dryRun, bin, ...restArgs } = cliArgumentObject;
+    const { command: cliCommand, verbose = false, dryRun, env: executorEnv, bin, projectPrefix, // Do not forward to CLI, it is handled plugin logic only
+    ...restArgs } = (0, utils_js_1.parseCliExecutorOptions)(terminalAndExecutorOptions, normalizedContext);
+    // this sets `CP_VERBOSE=true` on process.env
     logger.setVerbose(verbose);
     const command = bin ? `node` : 'npx';
-    const positionals = [
+    const args = [
         bin ?? '@code-pushup/cli',
         ...(cliCommand ? [cliCommand] : []),
+        ...objectToCliArgs(restArgs),
     ];
-    const args = [...positionals, ...objectToCliArgs(restArgs)];
-    const executorEnvVariables = {
+    const loggedEnvVars = {
+        ...executorEnv,
         ...(verbose && { CP_VERBOSE: 'true' }),
     };
     const commandString = formatCommandStatus([command, ...args].join(' '), {
         cwd: context.cwd,
-        env: executorEnvVariables,
+        env: loggedEnvVars,
     });
     if (dryRun) {
         logger.warn(`DryRun execution of: ${commandString}`);
     }
     else {
         try {
-            logger.debug(`With env vars: ${executorEnvVariables}`);
+            logger.debug(`Run CLI with env vars: ${JSON.stringify(loggedEnvVars)}`);
             await (0, execute_process_js_1.executeProcess)({
                 command,
                 args,
                 ...(context.cwd ? { cwd: context.cwd } : {}),
+                ...(executorEnv && Object.keys(executorEnv).length > 0
+                    ? {
+                        env: {
+                            // if env is undefined, executeProcess extends process.env by default
+                            ...process.env,
+                            // we don't pass `CP_VERBOSE=true` as it is handled inside logger.setVerbose
+                            ...executorEnv,
+                        },
+                    }
+                    : {}),
             });
         }
         catch (error) {

package/src/executors/cli/executor.js.map

@@ -1 +1 @@
-{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../src/executors/cli/executor.ts"],"names":[],"mappings":";;AAaA,qCAoDC;AAhED,0EAAmE;AACnE,uDAA0D;AAE1D,yCAAyD;AAQzD,qDAAqD;AACtC,KAAK,UAAU,kBAAkB,CAC9C,0BAAyD,EACzD,OAAwB;IAExB,MAAM,EAAE,eAAe,EAAE,mBAAmB,EAAE,MAAM,EAAE,cAAc,EAAE,GACpE,2CAAa,oBAAoB,EAAC,CAAC;IACrC,MAAM,iBAAiB,GAAG,IAAA,6BAAgB,EAAC,OAAO,CAAC,CAAC;IACpD,MAAM,iBAAiB,GAAG,IAAA,sCAA2B,EACnD,0BAA0B,EAC1B,iBAAiB,CAClB,CAAC;IACF,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,GAAG,0BAA0B,CAAC;IAC3D,MAAM,EAAE,OAAO,GAAG,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,QAAQ,EAAE,GAAG,iBAAiB,CAAC;IACxE,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;IAE3B,MAAM,OAAO,GAAG,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC;IACrC,MAAM,WAAW,GAAG;QAClB,GAAG,IAAI,kBAAkB;QACzB,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;KACpC,CAAC;IACF,MAAM,IAAI,GAAG,CAAC,GAAG,WAAW,EAAE,GAAG,eAAe,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC5D,MAAM,oBAAoB,GAAG;QAC3B,GAAG,CAAC,OAAO,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,CAAC;KACvC,CAAC;IACF,MAAM,aAAa,GAAG,mBAAmB,CAAC,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;QACtE,GAAG,EAAE,OAAO,CAAC,GAAG;QAChB,GAAG,EAAE,oBAAoB;KAC1B,CAAC,CAAC;IAEH,IAAI,MAAM,EAAE,CAAC;QACX,MAAM,CAAC,IAAI,CAAC,wBAAwB,aAAa,EAAE,CAAC,CAAC;IACvD,CAAC;SAAM,CAAC;QACN,IAAI,CAAC;YACH,MAAM,CAAC,KAAK,CAAC,kBAAkB,oBAAoB,EAAE,CAAC,CAAC;YACvD,MAAM,IAAA,mCAAc,EAAC;gBACnB,OAAO;gBACP,IAAI;gBACJ,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aAC7C,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC;YACpC,OAAO;gBACL,OAAO,EAAE,KAAK;gBACd,OAAO,EAAE,aAAa;gBACtB,KAAK,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,GAAG,KAAK,EAAE,CAAC;aAC9D,CAAC;QACJ,CAAC;IACH,CAAC;IACD,OAAO;QACL,OAAO,EAAE,IAAI;QACb,OAAO,EAAE,aAAa;KACvB,CAAC;AACJ,CAAC"}
+{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../src/executors/cli/executor.ts"],"names":[],"mappings":";;AAaA,iCAmEC;AA/ED,0EAAmE;AACnE,uDAA0D;AAE1D,yCAAqD;AAQrD,qDAAqD;AACtC,KAAK,UAAU,cAAc,CAC1C,0BAAqD,EACrD,OAAwB;IAExB,MAAM,EAAE,eAAe,EAAE,mBAAmB,EAAE,MAAM,EAAE,cAAc,EAAE,GACpE,2CAAa,oBAAoB,EAAC,CAAC;IACrC,MAAM,iBAAiB,GAAG,IAAA,6BAAgB,EAAC,OAAO,CAAC,CAAC;IACpD,MAAM,EACJ,OAAO,EAAE,UAAU,EACnB,OAAO,GAAG,KAAK,EACf,MAAM,EACN,GAAG,EAAE,WAAW,EAChB,GAAG,EACH,aAAa,EAAE,yDAAyD;IACxE,GAAG,QAAQ,EACZ,GAAG,IAAA,kCAAuB,EAAC,0BAA0B,EAAE,iBAAiB,CAAC,CAAC;IAC3E,6CAA6C;IAC7C,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;IAE3B,MAAM,OAAO,GAAG,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC;IACrC,MAAM,IAAI,GAAG;QACX,GAAG,IAAI,kBAAkB;QACzB,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACnC,GAAG,eAAe,CAAC,QAAQ,CAAC;KAC7B,CAAC;IACF,MAAM,aAAa,GAAG;QACpB,GAAG,WAAW;QACd,GAAG,CAAC,OAAO,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,CAAC;KACvC,CAAC;IACF,MAAM,aAAa,GAAG,mBAAmB,CAAC,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;QACtE,GAAG,EAAE,OAAO,CAAC,GAAG;QAChB,GAAG,EAAE,aAAa;KACnB,CAAC,CAAC;IAEH,IAAI,MAAM,EAAE,CAAC;QACX,MAAM,CAAC,IAAI,CAAC,wBAAwB,aAAa,EAAE,CAAC,CAAC;IACvD,CAAC;SAAM,CAAC;QACN,IAAI,CAAC;YACH,MAAM,CAAC,KAAK,CAAC,0BAA0B,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;YACxE,MAAM,IAAA,mCAAc,EAAC;gBACnB,OAAO;gBACP,IAAI;gBACJ,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC5C,GAAG,CAAC,WAAW,IAAI,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,MAAM,GAAG,CAAC;oBACpD,CAAC,CAAC;wBACE,GAAG,EAAE;4BACH,qEAAqE;4BACrE,GAAG,OAAO,CAAC,GAAG;4BACd,4EAA4E;4BAC5E,GAAG,WAAW;yBACf;qBACF;oBACH,CAAC,CAAC,EAAE,CAAC;aACR,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC;YACpC,OAAO;gBACL,OAAO,EAAE,KAAK;gBACd,OAAO,EAAE,aAAa;gBACtB,KAAK,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,GAAG,KAAK,EAAE,CAAC;aAC9D,CAAC;QACJ,CAAC;IACH,CAAC;IACD,OAAO;QACL,OAAO,EAAE,IAAI;QACb,OAAO,EAAE,aAAa;KACvB,CAAC;AACJ,CAAC"}

package/src/executors/cli/schema.d.ts

@@ -4,8 +4,8 @@ export type PrintConfigOptions = {
     output?: string;
 };
 export type PrintConfigCommandExecutorOptions = PrintConfigOptions;
-export type AutorunCommandExecutorOnlyOptions = ProjectExecutorOnlyOptions & CollectExecutorOnlyOptions & GeneralExecutorOnlyOptions;
-export type AutorunCommandExecutorOptions = Partial<{
+export type CliCommandExecutorOnlyOptions = ProjectExecutorOnlyOptions & CollectExecutorOnlyOptions & GeneralExecutorOnlyOptions;
+export type CliCommandExecutorOptions = Partial<{
     upload: Partial<UploadConfig>;
     persist: Partial<PersistConfig>;
-} & AutorunCommandExecutorOnlyOptions & GlobalExecutorOptions> & PrintConfigOptions;
+} & CliCommandExecutorOnlyOptions & GlobalExecutorOptions> & PrintConfigOptions;

package/src/executors/cli/schema.json

@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/schema",
-  "$id": "AutorunExecutorOptions",
+  "$id": "CliExecutorOptions",
   "title": "CodePushup CLI autorun executor",
   "description": "Executes the @code-pushup/cli autorun command See: https://github.com/code-pushup/cli/blob/main/packages/cli/README.md#autorun-command",
   "type": "object",
@@ -21,6 +21,13 @@
       "type": "string",
       "description": "Path to Code PushUp CLI"
     },
+    "env": {
+      "type": "object",
+      "additionalProperties": {
+        "type": "string"
+      },
+      "description": "Environment variables added to Code PushUp CLI process"
+    },
     "verbose": {
       "type": "boolean",
       "description": "Print additional logs"

package/src/executors/cli/utils.d.ts

@@ -1,5 +1,5 @@
 import type { NormalizedExecutorContext } from '../internal/context.js';
-import type { AutorunCommandExecutorOnlyOptions, AutorunCommandExecutorOptions, PrintConfigCommandExecutorOptions } from './schema.js';
-export declare function parseAutorunExecutorOnlyOptions(options: Partial<AutorunCommandExecutorOnlyOptions>): AutorunCommandExecutorOnlyOptions;
+import type { CliCommandExecutorOnlyOptions, CliCommandExecutorOptions, PrintConfigCommandExecutorOptions } from './schema.js';
+export declare function parseCliExecutorOnlyOptions(options: Partial<CliCommandExecutorOnlyOptions>): CliCommandExecutorOnlyOptions;
 export declare function parsePrintConfigExecutorOptions(options: Partial<PrintConfigCommandExecutorOptions>): PrintConfigCommandExecutorOptions;
-export declare function parseAutorunExecutorOptions(options: Partial<AutorunCommandExecutorOptions>, normalizedContext: NormalizedExecutorContext): AutorunCommandExecutorOptions;
+export declare function parseCliExecutorOptions(options: Partial<CliCommandExecutorOptions>, normalizedContext: NormalizedExecutorContext): CliCommandExecutorOptions;

package/src/executors/cli/utils.js

@@ -1,15 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseAutorunExecutorOnlyOptions = parseAutorunExecutorOnlyOptions;
+exports.parseCliExecutorOnlyOptions = parseCliExecutorOnlyOptions;
 exports.parsePrintConfigExecutorOptions = parsePrintConfigExecutorOptions;
-exports.parseAutorunExecutorOptions = parseAutorunExecutorOptions;
+exports.parseCliExecutorOptions = parseCliExecutorOptions;
 const config_js_1 = require("../internal/config.js");
-function parseAutorunExecutorOnlyOptions(options) {
-    const { projectPrefix, dryRun, onlyPlugins } = options;
+function parseCliExecutorOnlyOptions(options) {
+    const { projectPrefix, dryRun, onlyPlugins, env, bin } = options;
     return {
         ...(projectPrefix && { projectPrefix }),
         ...(dryRun != null && { dryRun }),
         ...(onlyPlugins && { onlyPlugins }),
+        ...(env && { env }),
+        ...(bin && { bin }),
     };
 }
 function parsePrintConfigExecutorOptions(options) {
@@ -18,14 +20,14 @@ function parsePrintConfigExecutorOptions(options) {
         ...(output && { output }),
     };
 }
-function parseAutorunExecutorOptions(options, normalizedContext) {
+function parseCliExecutorOptions(options, normalizedContext) {
     const { projectPrefix, persist, upload, command, output } = options;
     const needsUploadParams = command === 'upload' || command === 'autorun' || command === undefined;
     const uploadCfg = (0, config_js_1.uploadConfig)({ projectPrefix, ...upload }, normalizedContext);
     const hasApiToken = uploadCfg?.apiKey != null;
     return {
         ...parsePrintConfigExecutorOptions(options),
-        ...parseAutorunExecutorOnlyOptions(options),
+        ...parseCliExecutorOnlyOptions(options),
         ...(0, config_js_1.globalConfig)(options, normalizedContext),
         ...(output ? { output } : {}),
         persist: (0, config_js_1.persistConfig)({ projectPrefix, ...persist }, normalizedContext),

package/src/executors/cli/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../src/executors/cli/utils.ts"],"names":[],"mappings":";;AAYA,0EASC;AAED,0EAOC;AAED,kEAuBC;AAvDD,qDAI+B;AAQ/B,SAAgB,+BAA+B,CAC7C,OAAmD;IAEnD,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC;IACvD,OAAO;QACL,GAAG,CAAC,aAAa,IAAI,EAAE,aAAa,EAAE,CAAC;QACvC,GAAG,CAAC,MAAM,IAAI,IAAI,IAAI,EAAE,MAAM,EAAE,CAAC;QACjC,GAAG,CAAC,WAAW,IAAI,EAAE,WAAW,EAAE,CAAC;KACpC,CAAC;AACJ,CAAC;AAED,SAAgB,+BAA+B,CAC7C,OAAmD;IAEnD,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAC3B,OAAO;QACL,GAAG,CAAC,MAAM,IAAI,EAAE,MAAM,EAAE,CAAC;KAC1B,CAAC;AACJ,CAAC;AAED,SAAgB,2BAA2B,CACzC,OAA+C,EAC/C,iBAA4C;IAE5C,MAAM,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IACpE,MAAM,iBAAiB,GACrB,OAAO,KAAK,QAAQ,IAAI,OAAO,KAAK,SAAS,IAAI,OAAO,KAAK,SAAS,CAAC;IACzE,MAAM,SAAS,GAAG,IAAA,wBAAY,EAC5B,EAAE,aAAa,EAAE,GAAG,MAAM,EAAE,EAC5B,iBAAiB,CAClB,CAAC;IACF,MAAM,WAAW,GAAG,SAAS,EAAE,MAAM,IAAI,IAAI,CAAC;IAC9C,OAAO;QACL,GAAG,+BAA+B,CAAC,OAAO,CAAC;QAC3C,GAAG,+BAA+B,CAAC,OAAO,CAAC;QAC3C,GAAG,IAAA,wBAAY,EAAC,OAAO,EAAE,iBAAiB,CAAC;QAC3C,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC7B,OAAO,EAAE,IAAA,yBAAa,EAAC,EAAE,aAAa,EAAE,GAAG,OAAO,EAAE,EAAE,iBAAiB,CAAC;QACxE,mGAAmG;QACnG,qDAAqD;QACrD,6CAA6C;QAC7C,GAAG,CAAC,iBAAiB,IAAI,WAAW,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACnE,CAAC;AACJ,CAAC"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../src/executors/cli/utils.ts"],"names":[],"mappings":";;AAYA,kEAWC;AAED,0EAOC;AAED,0DAuBC;AAzDD,qDAI+B;AAQ/B,SAAgB,2BAA2B,CACzC,OAA+C;IAE/C,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC;IACjE,OAAO;QACL,GAAG,CAAC,aAAa,IAAI,EAAE,aAAa,EAAE,CAAC;QACvC,GAAG,CAAC,MAAM,IAAI,IAAI,IAAI,EAAE,MAAM,EAAE,CAAC;QACjC,GAAG,CAAC,WAAW,IAAI,EAAE,WAAW,EAAE,CAAC;QACnC,GAAG,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,CAAC;QACnB,GAAG,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,CAAC;KACpB,CAAC;AACJ,CAAC;AAED,SAAgB,+BAA+B,CAC7C,OAAmD;IAEnD,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAC3B,OAAO;QACL,GAAG,CAAC,MAAM,IAAI,EAAE,MAAM,EAAE,CAAC;KAC1B,CAAC;AACJ,CAAC;AAED,SAAgB,uBAAuB,CACrC,OAA2C,EAC3C,iBAA4C;IAE5C,MAAM,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IACpE,MAAM,iBAAiB,GACrB,OAAO,KAAK,QAAQ,IAAI,OAAO,KAAK,SAAS,IAAI,OAAO,KAAK,SAAS,CAAC;IACzE,MAAM,SAAS,GAAG,IAAA,wBAAY,EAC5B,EAAE,aAAa,EAAE,GAAG,MAAM,EAAE,EAC5B,iBAAiB,CAClB,CAAC;IACF,MAAM,WAAW,GAAG,SAAS,EAAE,MAAM,IAAI,IAAI,CAAC;IAC9C,OAAO;QACL,GAAG,+BAA+B,CAAC,OAAO,CAAC;QAC3C,GAAG,2BAA2B,CAAC,OAAO,CAAC;QACvC,GAAG,IAAA,wBAAY,EAAC,OAAO,EAAE,iBAAiB,CAAC;QAC3C,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC7B,OAAO,EAAE,IAAA,yBAAa,EAAC,EAAE,aAAa,EAAE,GAAG,OAAO,EAAE,EAAE,iBAAiB,CAAC;QACxE,mGAAmG;QACnG,qDAAqD;QACrD,6CAA6C;QAC7C,GAAG,CAAC,iBAAiB,IAAI,WAAW,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACnE,CAAC;AACJ,CAAC"}

package/src/executors/internal/config.js

@@ -8,8 +8,9 @@ const env_js_1 = require("./env.js");
 function globalConfig(options, context) {
     const { projectConfig } = context;
     const { root: projectRoot = '' } = projectConfig ?? {};
-    const { verbose, config } = options;
+    const { verbose, config, command } = options;
     return {
+        command,
         verbose: !!verbose,
         config: config ?? path.join(projectRoot, 'code-pushup.config.ts'),
     };
@@ -28,13 +29,9 @@ function persistConfig(options, context) {
 function uploadConfig(options, context) {
     const { workspaceRoot, projectName } = context;
     const { projectPrefix, server, apiKey, organization, project, timeout } = options;
-    const applyPrefix = workspaceRoot === '.';
-    const prefix = projectPrefix ? `${projectPrefix}-` : '';
-    const derivedProject = projectName && !project
-        ? applyPrefix
-            ? `${prefix}${projectName}`
-            : projectName
-        : project;
+    const applyPrefix = workspaceRoot !== '.';
+    const prefix = projectPrefix && applyPrefix ? `${projectPrefix}-` : '';
+    const derivedProject = projectName && !project ? `${prefix}${projectName}` : project;
     return {
         ...(0, env_js_1.parseEnv)(process.env),
         ...Object.fromEntries(Object.entries({

package/src/executors/internal/config.js.map

@@ -1 +1 @@
-{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../../src/executors/internal/config.ts"],"names":[],"mappings":";;AAUA,oCAWC;AAED,sCAkBC;AAED,oCA8BC;AAzED,kCAAkC;AAGlC,qCAAoC;AAOpC,SAAgB,YAAY,CAC1B,OAAiE,EACjE,OAAsC;IAEtC,MAAM,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC;IAClC,MAAM,EAAE,IAAI,EAAE,WAAW,GAAG,EAAE,EAAE,GAAG,aAAa,IAAI,EAAE,CAAC;IACvD,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IACpC,OAAO;QACL,OAAO,EAAE,CAAC,CAAC,OAAO;QAClB,MAAM,EAAE,MAAM,IAAI,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,uBAAuB,CAAC;KAClE,CAAC;AACJ,CAAC;AAED,SAAgB,aAAa,CAC3B,OAA4D,EAC5D,OAAsC;IAEtC,MAAM,EAAE,aAAa,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC;IAEjD,MAAM,EAAE,IAAI,EAAE,WAAW,GAAG,EAAE,EAAE,GAAG,aAAa,IAAI,EAAE,CAAC;IACvD,MAAM,EACJ,MAAM,EACN,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,cAAc,EAAE,WAAW,CAAC,EAAE,gDAAgD;IACnH,QAAQ,GACT,GAAG,OAAO,CAAC;IAEZ,OAAO;QACL,SAAS;QACT,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC7B,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KAClC,CAAC;AACJ,CAAC;AAED,SAAgB,YAAY,CAC1B,OAA2D,EAC3D,OAAkC;IAElC,MAAM,EAAE,aAAa,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC;IAE/C,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,OAAO,EAAE,OAAO,EAAE,GACrE,OAAO,CAAC;IACV,MAAM,WAAW,GAAG,aAAa,KAAK,GAAG,CAAC;IAC1C,MAAM,MAAM,GAAG,aAAa,CAAC,CAAC,CAAC,GAAG,aAAa,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;IAExD,MAAM,cAAc,GAClB,WAAW,IAAI,CAAC,OAAO;QACrB,CAAC,CAAC,WAAW;YACX,CAAC,CAAC,GAAG,MAAM,GAAG,WAAW,EAAE;YAC3B,CAAC,CAAC,WAAW;QACf,CAAC,CAAC,OAAO,CAAC;IAEd,OAAO;QACL,GAAG,IAAA,iBAAQ,EAAC,OAAO,CAAC,GAAG,CAAC;QACxB,GAAG,MAAM,CAAC,WAAW,CACnB,MAAM,CAAC,OAAO,CAAC;YACb,MAAM;YACN,MAAM;YACN,YAAY;YACZ,GAAG,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,cAAc,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACtD,OAAO;SACR,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,SAAS,CAAC,CACvC;KACF,CAAC;AACJ,CAAC"}
+{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../../src/executors/internal/config.ts"],"names":[],"mappings":";;AAUA,oCAYC;AAED,sCAkBC;AAED,oCA0BC;AAtED,kCAAkC;AAGlC,qCAAoC;AAOpC,SAAgB,YAAY,CAC1B,OAAiE,EACjE,OAAsC;IAEtC,MAAM,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC;IAClC,MAAM,EAAE,IAAI,EAAE,WAAW,GAAG,EAAE,EAAE,GAAG,aAAa,IAAI,EAAE,CAAC;IACvD,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IAC7C,OAAO;QACL,OAAO;QACP,OAAO,EAAE,CAAC,CAAC,OAAO;QAClB,MAAM,EAAE,MAAM,IAAI,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,uBAAuB,CAAC;KAClE,CAAC;AACJ,CAAC;AAED,SAAgB,aAAa,CAC3B,OAA4D,EAC5D,OAAsC;IAEtC,MAAM,EAAE,aAAa,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC;IAEjD,MAAM,EAAE,IAAI,EAAE,WAAW,GAAG,EAAE,EAAE,GAAG,aAAa,IAAI,EAAE,CAAC;IACvD,MAAM,EACJ,MAAM,EACN,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,cAAc,EAAE,WAAW,CAAC,EAAE,gDAAgD;IACnH,QAAQ,GACT,GAAG,OAAO,CAAC;IAEZ,OAAO;QACL,SAAS;QACT,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC7B,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KAClC,CAAC;AACJ,CAAC;AAED,SAAgB,YAAY,CAC1B,OAA2D,EAC3D,OAAkC;IAElC,MAAM,EAAE,aAAa,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC;IAE/C,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,OAAO,EAAE,OAAO,EAAE,GACrE,OAAO,CAAC;IACV,MAAM,WAAW,GAAG,aAAa,KAAK,GAAG,CAAC;IAC1C,MAAM,MAAM,GAAG,aAAa,IAAI,WAAW,CAAC,CAAC,CAAC,GAAG,aAAa,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;IAEvE,MAAM,cAAc,GAClB,WAAW,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,MAAM,GAAG,WAAW,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;IAEhE,OAAO;QACL,GAAG,IAAA,iBAAQ,EAAC,OAAO,CAAC,GAAG,CAAC;QACxB,GAAG,MAAM,CAAC,WAAW,CACnB,MAAM,CAAC,OAAO,CAAC;YACb,MAAM;YACN,MAAM;YACN,YAAY;YACZ,GAAG,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,cAAc,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACtD,OAAO;SACR,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,SAAS,CAAC,CACvC;KACF,CAAC;AACJ,CAAC"}

package/src/executors/internal/types.d.ts

@@ -4,6 +4,8 @@ import type { ProjectConfiguration } from 'nx/src/config/workspace-json-project-
  */
 export type GeneralExecutorOnlyOptions = {
     dryRun?: boolean;
+    env?: Record<string, string>;
+    bin?: string;
 };
 /**
  * executor types that apply for a subset of exector's.
@@ -19,7 +21,6 @@ export type ProjectExecutorOnlyOptions = {
 export type Command = 'collect' | 'upload' | 'autorun' | 'print-config' | 'compare' | 'merge-diffs' | 'history';
 export type GlobalExecutorOptions = {
     command?: Command;
-    bin?: string;
     verbose?: boolean;
     config?: string;
 };

package/src/generators/configuration/schema.d.ts

@@ -2,7 +2,6 @@ import type { DynamicTargetOptions } from '../../internal/types.js';
 
 export type ConfigurationGeneratorOptions = {
   project: string;
-  bin?: string;
   skipTarget?: boolean;
   skipConfig?: boolean;
   skipFormat?: boolean;

package/src/index.d.ts

@@ -4,7 +4,7 @@ declare const plugin: {
     createNodes: import("@nx/devkit").CreateNodes;
 };
 export default plugin;
-export type { AutorunCommandExecutorOptions } from './executors/cli/schema.js';
+export type { CliCommandExecutorOptions } from './executors/cli/schema.js';
 export { generateCodePushupConfig } from './generators/configuration/code-pushup-config.js';
 export { configurationGenerator } from './generators/configuration/generator.js';
 export type { ConfigurationGeneratorOptions } from './generators/configuration/schema.js';

package/src/index.js

@@ -15,10 +15,11 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createNodesV2 = exports.createNodes = exports.initSchematic = exports.initGenerator = exports.configurationGenerator = exports.generateCodePushupConfig = void 0;
+const constants_js_1 = require("./plugin/constants.js");
 const index_js_1 = require("./plugin/index.js");
 // default export for nx.json#plugins
 const plugin = {
-    name: '@code-pushup/nx-plugin',
+    name: constants_js_1.PLUGIN_NAME,
     createNodesV2: index_js_1.createNodesV2,
     // Keep for backwards compatibility with Nx < 21
     createNodes: index_js_1.createNodes,

package/src/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,gDAA+D;AAE/D,qCAAqC;AACrC,MAAM,MAAM,GAAG;IACb,IAAI,EAAE,wBAAwB;IAC9B,aAAa,EAAb,wBAAa;IACb,gDAAgD;IAChD,WAAW,EAAX,sBAAW;CACZ,CAAC;AAEF,kBAAe,MAAM,CAAC;AAGtB,0FAA4F;AAAnF,iIAAA,wBAAwB,OAAA;AACjC,wEAAiF;AAAxE,sHAAA,sBAAsB,OAAA;AAE/B,+DAA8E;AAArE,6GAAA,aAAa,OAAA;AAAE,6GAAA,aAAa,OAAA;AAErC,yDAAuC;AACvC,8CAA+D;AAAtD,uGAAA,WAAW,OAAA;AAAE,yGAAA,aAAa,OAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,wDAAoD;AACpD,gDAA+D;AAE/D,qCAAqC;AACrC,MAAM,MAAM,GAAG;IACb,IAAI,EAAE,0BAAW;IACjB,aAAa,EAAb,wBAAa;IACb,gDAAgD;IAChD,WAAW,EAAX,sBAAW;CACZ,CAAC;AAEF,kBAAe,MAAM,CAAC;AAGtB,0FAA4F;AAAnF,iIAAA,wBAAwB,OAAA;AACjC,wEAAiF;AAAxE,sHAAA,sBAAsB,OAAA;AAE/B,+DAA8E;AAArE,6GAAA,aAAa,OAAA;AAAE,6GAAA,aAAa,OAAA;AAErC,yDAAuC;AACvC,8CAA+D;AAAtD,uGAAA,WAAW,OAAA;AAAE,yGAAA,aAAa,OAAA"}

package/src/internal/types.d.ts

@@ -1,4 +1,5 @@
 export type DynamicTargetOptions = {
     targetName?: string;
     bin?: string;
+    env?: Record<string, string>;
 };

package/src/plugin/constants.d.ts

@@ -1 +1,2 @@
 export declare const CP_TARGET_NAME = "code-pushup";
+export declare const PLUGIN_NAME = "@code-pushup/nx-plugin";

package/src/plugin/constants.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CP_TARGET_NAME = void 0;
+exports.PLUGIN_NAME = exports.CP_TARGET_NAME = void 0;
 exports.CP_TARGET_NAME = 'code-pushup';
+exports.PLUGIN_NAME = '@code-pushup/nx-plugin';
 //# sourceMappingURL=constants.js.map

package/src/plugin/constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/plugin/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,cAAc,GAAG,aAAa,CAAC"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/plugin/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,cAAc,GAAG,aAAa,CAAC;AAC/B,QAAA,WAAW,GAAG,wBAAwB,CAAC"}

package/src/plugin/plugin.d.ts

@@ -1,4 +1,7 @@
 import type { CreateNodes, CreateNodesV2 } from '@nx/devkit';
 import type { CreateNodesOptions } from './types.js';
+/**
+ *  @deprecated
+ */
 export declare const createNodes: CreateNodes;
 export declare const createNodesV2: CreateNodesV2<CreateNodesOptions>;

package/src/plugin/plugin.js

@@ -2,14 +2,20 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createNodesV2 = exports.createNodes = void 0;
 const constants_js_1 = require("../internal/constants.js");
+const constants_js_2 = require("./constants.js");
 const targets_js_1 = require("./target/targets.js");
 const utils_js_1 = require("./utils.js");
 // name has to be "createNodes" to get picked up by Nx <v20
+/**
+ *  @deprecated
+ */
 exports.createNodes = [
     `**/${constants_js_1.PROJECT_JSON_FILE_NAME}`,
     async (projectConfigurationFile, createNodesOptions, context) => {
         const parsedCreateNodesOptions = createNodesOptions;
-        const normalizedContext = await (0, utils_js_1.normalizedCreateNodesContext)(context, projectConfigurationFile, parsedCreateNodesOptions);
+        const pluginsConfig = context.nxJsonConfiguration.pluginsConfig?.[constants_js_2.PLUGIN_NAME] ?? {};
+        const mergedOptions = { ...pluginsConfig, ...parsedCreateNodesOptions };
+        const normalizedContext = await (0, utils_js_1.normalizedCreateNodesContext)(context, projectConfigurationFile, mergedOptions);
         return {
             projects: {
                 [normalizedContext.projectRoot]: {
@@ -23,8 +29,11 @@ exports.createNodesV2 = [
     `**/${constants_js_1.PROJECT_JSON_FILE_NAME}`,
     async (projectConfigurationFiles, createNodesOptions, context) => {
         const parsedCreateNodesOptions = createNodesOptions;
+        const { pluginsConfig = {} } = context.nxJsonConfiguration;
+        const pluginsConfigObj = pluginsConfig[constants_js_2.PLUGIN_NAME] ?? {};
+        const mergedOptions = { ...pluginsConfigObj, ...parsedCreateNodesOptions };
         return await Promise.all(projectConfigurationFiles.map(async (projectConfigurationFile) => {
-            const normalizedContext = await (0, utils_js_1.normalizedCreateNodesV2Context)(context, projectConfigurationFile, parsedCreateNodesOptions);
+            const normalizedContext = await (0, utils_js_1.normalizedCreateNodesV2Context)(context, projectConfigurationFile, mergedOptions);
             const result = {
                 projects: {
                     [normalizedContext.projectRoot]: {

package/src/plugin/plugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../../../src/plugin/plugin.ts"],"names":[],"mappings":";;;AAQA,2DAAkE;AAClE,oDAAoD;AAEpD,yCAGoB;AAEpB,2DAA2D;AAC9C,QAAA,WAAW,GAAgB;IACtC,MAAM,qCAAsB,EAAE;IAC9B,KAAK,EACH,wBAAgC,EAChC,kBAA2B,EAC3B,OAA2B,EACC,EAAE;QAC9B,MAAM,wBAAwB,GAAG,kBAAwC,CAAC;QAC1E,MAAM,iBAAiB,GAAG,MAAM,IAAA,uCAA4B,EAC1D,OAAO,EACP,wBAAwB,EACxB,wBAAwB,CACzB,CAAC;QAEF,OAAO;YACL,QAAQ,EAAE;gBACR,CAAC,iBAAiB,CAAC,WAAW,CAAC,EAAE;oBAC/B,OAAO,EAAE,MAAM,IAAA,0BAAa,EAAC,iBAAiB,CAAC;iBAChD;aACF;SACF,CAAC;IACJ,CAAC;CACF,CAAC;AAEW,QAAA,aAAa,GAAsC;IAC9D,MAAM,qCAAsB,EAAE;IAC9B,KAAK,EACH,yBAA4C,EAC5C,kBAA2B,EAC3B,OAA6B,EACC,EAAE;QAChC,MAAM,wBAAwB,GAAG,kBAAwC,CAAC;QAE1E,OAAO,MAAM,OAAO,CAAC,GAAG,CACtB,yBAAyB,CAAC,GAAG,CAAC,KAAK,EAAC,wBAAwB,EAAC,EAAE;YAC7D,MAAM,iBAAiB,GAAG,MAAM,IAAA,yCAA8B,EAC5D,OAAO,EACP,wBAAwB,EACxB,wBAAwB,CACzB,CAAC;YAEF,MAAM,MAAM,GAAsB;gBAChC,QAAQ,EAAE;oBACR,CAAC,iBAAiB,CAAC,WAAW,CAAC,EAAE;wBAC/B,OAAO,EAAE,MAAM,IAAA,0BAAa,EAAC,iBAAiB,CAAC;qBAChD;iBACF;aACF,CAAC;YAEF,OAAO,CAAC,wBAAwB,EAAE,MAAM,CAAU,CAAC;QACrD,CAAC,CAAC,CACH,CAAC;IACJ,CAAC;CACF,CAAC"}
+{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../../../src/plugin/plugin.ts"],"names":[],"mappings":";;;AAQA,2DAAkE;AAClE,iDAA6C;AAC7C,oDAAoD;AAEpD,yCAGoB;AAEpB,2DAA2D;AAC3D;;GAEG;AACU,QAAA,WAAW,GAAgB;IACtC,MAAM,qCAAsB,EAAE;IAC9B,KAAK,EACH,wBAAgC,EAChC,kBAA2B,EAC3B,OAA2B,EACC,EAAE;QAC9B,MAAM,wBAAwB,GAAG,kBAAwC,CAAC;QAC1E,MAAM,aAAa,GACjB,OAAO,CAAC,mBAAmB,CAAC,aAAa,EAAE,CAAC,0BAAW,CAAC,IAAI,EAAE,CAAC;QACjE,MAAM,aAAa,GAAG,EAAE,GAAG,aAAa,EAAE,GAAG,wBAAwB,EAAE,CAAC;QAExE,MAAM,iBAAiB,GAAG,MAAM,IAAA,uCAA4B,EAC1D,OAAO,EACP,wBAAwB,EACxB,aAAa,CACd,CAAC;QAEF,OAAO;YACL,QAAQ,EAAE;gBACR,CAAC,iBAAiB,CAAC,WAAW,CAAC,EAAE;oBAC/B,OAAO,EAAE,MAAM,IAAA,0BAAa,EAAC,iBAAiB,CAAC;iBAChD;aACF;SACF,CAAC;IACJ,CAAC;CACF,CAAC;AAEW,QAAA,aAAa,GAAsC;IAC9D,MAAM,qCAAsB,EAAE;IAC9B,KAAK,EACH,yBAA4C,EAC5C,kBAA2B,EAC3B,OAA6B,EACC,EAAE;QAChC,MAAM,wBAAwB,GAAG,kBAAwC,CAAC;QAC1E,MAAM,EAAE,aAAa,GAAG,EAAE,EAAE,GAAG,OAAO,CAAC,mBAAmB,CAAC;QAC3D,MAAM,gBAAgB,GAAG,aAAa,CAAC,0BAAW,CAAC,IAAI,EAAE,CAAC;QAC1D,MAAM,aAAa,GAAG,EAAE,GAAG,gBAAgB,EAAE,GAAG,wBAAwB,EAAE,CAAC;QAE3E,OAAO,MAAM,OAAO,CAAC,GAAG,CACtB,yBAAyB,CAAC,GAAG,CAAC,KAAK,EAAC,wBAAwB,EAAC,EAAE;YAC7D,MAAM,iBAAiB,GAAG,MAAM,IAAA,yCAA8B,EAC5D,OAAO,EACP,wBAAwB,EACxB,aAAa,CACd,CAAC;YAEF,MAAM,MAAM,GAAsB;gBAChC,QAAQ,EAAE;oBACR,CAAC,iBAAiB,CAAC,WAAW,CAAC,EAAE;wBAC/B,OAAO,EAAE,MAAM,IAAA,0BAAa,EAAC,iBAAiB,CAAC;qBAChD;iBACF;aACF,CAAC;YAEF,OAAO,CAAC,wBAAwB,EAAE,MAAM,CAAU,CAAC;QACrD,CAAC,CAAC,CACH,CAAC;IACJ,CAAC;CACF,CAAC"}

package/src/plugin/target/executor-target.d.ts

@@ -3,4 +3,7 @@ import type { ProjectPrefixOptions } from '../types.js';
 export declare function createExecutorTarget(options?: {
     bin?: string;
     projectPrefix?: string;
-}): TargetConfiguration<ProjectPrefixOptions>;
+    env?: Record<string, string>;
+}): TargetConfiguration<ProjectPrefixOptions & {
+    env?: Record<string, string>;
+}>;

package/src/plugin/target/executor-target.js

@@ -3,11 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createExecutorTarget = createExecutorTarget;
 const constants_js_1 = require("../../internal/constants.js");
 function createExecutorTarget(options) {
-    const { bin, projectPrefix } = options ?? {};
+    const { bin, projectPrefix, env } = options ?? {};
     const executor = `${constants_js_1.PACKAGE_NAME}:cli`;
-    const executorOptions = (bin || projectPrefix) && {
+    const executorOptions = (bin || projectPrefix || env) && {
         ...(bin && { bin }),
         ...(projectPrefix && { projectPrefix }),
+        ...(env && { env }),
     };
     return { executor, ...(executorOptions && { options: executorOptions }) };
 }

package/src/plugin/target/executor-target.js.map

@@ -1 +1 @@
-{"version":3,"file":"executor-target.js","sourceRoot":"","sources":["../../../../src/plugin/target/executor-target.ts"],"names":[],"mappings":";;AAIA,oDAYC;AAfD,8DAA2D;AAG3D,SAAgB,oBAAoB,CAAC,OAGpC;IACC,MAAM,EAAE,GAAG,EAAE,aAAa,EAAE,GAAG,OAAO,IAAI,EAAE,CAAC;IAE7C,MAAM,QAAQ,GAAG,GAAG,2BAAY,MAAM,CAAC;IACvC,MAAM,eAAe,GAAG,CAAC,GAAG,IAAI,aAAa,CAAC,IAAI;QAChD,GAAG,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,CAAC;QACnB,GAAG,CAAC,aAAa,IAAI,EAAE,aAAa,EAAE,CAAC;KACxC,CAAC;IACF,OAAO,EAAE,QAAQ,EAAE,GAAG,CAAC,eAAe,IAAI,EAAE,OAAO,EAAE,eAAe,EAAE,CAAC,EAAE,CAAC;AAC5E,CAAC"}
+{"version":3,"file":"executor-target.js","sourceRoot":"","sources":["../../../../src/plugin/target/executor-target.ts"],"names":[],"mappings":";;AAIA,oDAgBC;AAnBD,8DAA2D;AAG3D,SAAgB,oBAAoB,CAAC,OAIpC;IAGC,MAAM,EAAE,GAAG,EAAE,aAAa,EAAE,GAAG,EAAE,GAAG,OAAO,IAAI,EAAE,CAAC;IAElD,MAAM,QAAQ,GAAG,GAAG,2BAAY,MAAM,CAAC;IACvC,MAAM,eAAe,GAAG,CAAC,GAAG,IAAI,aAAa,IAAI,GAAG,CAAC,IAAI;QACvD,GAAG,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,CAAC;QACnB,GAAG,CAAC,aAAa,IAAI,EAAE,aAAa,EAAE,CAAC;QACvC,GAAG,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,CAAC;KACpB,CAAC;IACF,OAAO,EAAE,QAAQ,EAAE,GAAG,CAAC,eAAe,IAAI,EAAE,OAAO,EAAE,eAAe,EAAE,CAAC,EAAE,CAAC;AAC5E,CAAC"}

package/src/plugin/target/targets.d.ts

@@ -5,7 +5,9 @@ export type CreateTargetsOptions = {
     createOptions: CreateNodesOptions;
 };
 export declare function createTargets(normalizedContext: CreateTargetsOptions): Promise<{
-    [x: string]: import("@nx/devkit").TargetConfiguration<import("../types.js").ProjectPrefixOptions>;
+    [x: string]: import("@nx/devkit").TargetConfiguration<import("../types.js").ProjectPrefixOptions & {
+        env?: Record<string, string>;
+    }>;
 } | {
     [x: string]: import("@nx/devkit").TargetConfiguration<import("nx/src/executors/run-commands/run-commands.impl.js").RunCommandsOptions>;
 }>;

package/src/plugin/target/targets.js

@@ -7,11 +7,11 @@ const configuration_target_js_1 = require("./configuration-target.js");
 const constants_js_2 = require("./constants.js");
 const executor_target_js_1 = require("./executor-target.js");
 async function createTargets(normalizedContext) {
-    const { targetName = constants_js_1.CP_TARGET_NAME, bin, projectPrefix, } = normalizedContext.createOptions;
+    const { targetName = constants_js_1.CP_TARGET_NAME, bin, projectPrefix, env, } = normalizedContext.createOptions;
     const rootFiles = await (0, promises_1.readdir)(normalizedContext.projectRoot);
     return rootFiles.some(filename => filename.match(constants_js_2.CODE_PUSHUP_CONFIG_REGEX))
         ? {
-            [targetName]: (0, executor_target_js_1.createExecutorTarget)({ bin, projectPrefix }),
+            [targetName]: (0, executor_target_js_1.createExecutorTarget)({ bin, projectPrefix, env }),
         }
         : // if NO code-pushup.config.*.(ts|js|mjs) is present return configuration target
             {

package/src/plugin/target/targets.js.map

@@ -1 +1 @@
-{"version":3,"file":"targets.js","sourceRoot":"","sources":["../../../../src/plugin/target/targets.ts"],"names":[],"mappings":";;AAgBA,sCAiBC;AAjCD,+CAA2C;AAC3C,kDAAiD;AAKjD,uEAAsE;AACtE,iDAA0D;AAC1D,6DAA4D;AAQrD,KAAK,UAAU,aAAa,CAAC,iBAAuC;IACzE,MAAM,EACJ,UAAU,GAAG,6BAAc,EAC3B,GAAG,EACH,aAAa,GACd,GAAG,iBAAiB,CAAC,aAAa,CAAC;IACpC,MAAM,SAAS,GAAG,MAAM,IAAA,kBAAO,EAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC;IAC/D,OAAO,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,uCAAwB,CAAC,CAAC;QACzE,CAAC,CAAC;YACE,CAAC,UAAU,CAAC,EAAE,IAAA,yCAAoB,EAAC,EAAE,GAAG,EAAE,aAAa,EAAE,CAAC;SAC3D;QACH,CAAC,CAAC,gFAAgF;YAChF;gBACE,CAAC,GAAG,UAAU,iBAAiB,CAAC,EAAE,MAAM,IAAA,mDAAyB,EAAC;oBAChE,WAAW,EAAE,iBAAiB,CAAC,WAAW,CAAC,IAAI;iBAChD,CAAC;aACH,CAAC;AACR,CAAC"}
+{"version":3,"file":"targets.js","sourceRoot":"","sources":["../../../../src/plugin/target/targets.ts"],"names":[],"mappings":";;AAgBA,sCAkBC;AAlCD,+CAA2C;AAC3C,kDAAiD;AAKjD,uEAAsE;AACtE,iDAA0D;AAC1D,6DAA4D;AAQrD,KAAK,UAAU,aAAa,CAAC,iBAAuC;IACzE,MAAM,EACJ,UAAU,GAAG,6BAAc,EAC3B,GAAG,EACH,aAAa,EACb,GAAG,GACJ,GAAG,iBAAiB,CAAC,aAAa,CAAC;IACpC,MAAM,SAAS,GAAG,MAAM,IAAA,kBAAO,EAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC;IAC/D,OAAO,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,uCAAwB,CAAC,CAAC;QACzE,CAAC,CAAC;YACE,CAAC,UAAU,CAAC,EAAE,IAAA,yCAAoB,EAAC,EAAE,GAAG,EAAE,aAAa,EAAE,GAAG,EAAE,CAAC;SAChE;QACH,CAAC,CAAC,gFAAgF;YAChF;gBACE,CAAC,GAAG,UAAU,iBAAiB,CAAC,EAAE,MAAM,IAAA,mDAAyB,EAAC;oBAChE,WAAW,EAAE,iBAAiB,CAAC,WAAW,CAAC,IAAI;iBAChD,CAAC;aACH,CAAC;AACR,CAAC"}