@payfit/nx-core 4.19.1-ephemeral-fix-hard-coded-paths.2 → 4.19.1-ephemeral-fix-hard-coded-paths.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payfit/nx-core",
-  "version": "4.19.1-ephemeral-fix-hard-coded-paths.2",
+  "version": "4.19.1-ephemeral-fix-hard-coded-paths.4",
   "type": "commonjs",
   "main": "./src/index.js",
   "types": "./src/index.d.ts",
@@ -11,6 +11,7 @@
     "directory": "packages/nx-core"
   },
   "dependencies": {
+    "consola": "^3.4.2",
     "get-port": "^7.1.0",
     "ky": "^1.8.1",
     "semver": "7.7.2",

package/src/executors/publisher/docker.js

@@ -2,19 +2,23 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.publishDocker = publishDocker;
 const fs = require("node:fs");
+const consola_1 = require("consola");
 const aws_auth_1 = require("../../utils/aws-auth");
 const docker_1 = require("../../utils/docker");
 const github_1 = require("../../utils/github");
 async function publishDocker(options, context, version, projectRoot) {
-    await (0, aws_auth_1.checkAwsAuth)();
-    await (0, aws_auth_1.loginToEcr)();
     const projectDockerfile = `${projectRoot}/Dockerfile`;
     if (!fs.existsSync(projectDockerfile)) {
-        throw new Error('Dockerfile not found in project root');
+        consola_1.consola.warn(`Dockerfile not found at ${projectDockerfile}, soft failing`);
+        return {
+            success: true,
+        };
     }
-    console.log('Building docker image with version ' + version);
+    await (0, aws_auth_1.checkAwsAuth)();
+    await (0, aws_auth_1.loginToEcr)();
+    consola_1.consola.log('Building docker image with version ' + version);
     await (0, docker_1.buildDockerImage)(options.ecrRegistry, projectDockerfile, version, await (0, github_1.getSanitizedCurrentGitRepoUrl)(), await (0, github_1.getCurrentGitCommitSha)());
-    console.log(`Publishing docker image to ${options.ecrRegistry} with version ${version}`);
+    consola_1.consola.log(`Publishing docker image to ${options.ecrRegistry} with version ${version}`);
     return await (0, aws_auth_1.pushImageToEcr)(options.ecrRegistry, version);
 }
 //# sourceMappingURL=docker.js.map

package/src/executors/publisher/docker.js.map

@@ -1 +1 @@
-{"version":3,"file":"docker.js","sourceRoot":"","sources":["../../../../../../packages/nx-core/src/executors/publisher/docker.ts"],"names":[],"mappings":";;AAYA,sCA6BC;AAzCD,8BAA6B;AAI7B,mDAA+E;AAC/E,+CAAqD;AACrD,+CAG2B;AAGpB,KAAK,UAAU,aAAa,CACjC,OAAiC,EACjC,OAAwB,EACxB,OAAe,EACf,WAAmB;IAInB,MAAM,IAAA,uBAAY,GAAE,CAAA;IACpB,MAAM,IAAA,qBAAU,GAAE,CAAA;IAElB,MAAM,iBAAiB,GAAG,GAAG,WAAW,aAAa,CAAA;IAErD,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,iBAAiB,CAAC,EAAE,CAAC;QACtC,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAA;IACzD,CAAC;IACD,OAAO,CAAC,GAAG,CAAC,qCAAqC,GAAG,OAAO,CAAC,CAAA;IAC5D,MAAM,IAAA,yBAAgB,EACpB,OAAO,CAAC,WAAW,EACnB,iBAAiB,EACjB,OAAO,EACP,MAAM,IAAA,sCAA6B,GAAE,EACrC,MAAM,IAAA,+BAAsB,GAAE,CAC/B,CAAA;IAED,OAAO,CAAC,GAAG,CACT,8BAA8B,OAAO,CAAC,WAAW,iBAAiB,OAAO,EAAE,CAC5E,CAAA;IACD,OAAO,MAAM,IAAA,yBAAc,EAAC,OAAO,CAAC,WAAW,EAAE,OAAO,CAAC,CAAA;AAC3D,CAAC"}
+{"version":3,"file":"docker.js","sourceRoot":"","sources":["../../../../../../packages/nx-core/src/executors/publisher/docker.ts"],"names":[],"mappings":";;AAaA,sCAiCC;AA9CD,8BAA6B;AAG7B,qCAAiC;AAEjC,mDAA+E;AAC/E,+CAAqD;AACrD,+CAG2B;AAGpB,KAAK,UAAU,aAAa,CACjC,OAAiC,EACjC,OAAwB,EACxB,OAAe,EACf,WAAmB;IAInB,MAAM,iBAAiB,GAAG,GAAG,WAAW,aAAa,CAAA;IAErD,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,iBAAiB,CAAC,EAAE,CAAC;QACtC,iBAAO,CAAC,IAAI,CAAC,2BAA2B,iBAAiB,gBAAgB,CAAC,CAAA;QAC1E,OAAO;YACL,OAAO,EAAE,IAAI;SACd,CAAA;IACH,CAAC;IAED,MAAM,IAAA,uBAAY,GAAE,CAAA;IACpB,MAAM,IAAA,qBAAU,GAAE,CAAA;IAElB,iBAAO,CAAC,GAAG,CAAC,qCAAqC,GAAG,OAAO,CAAC,CAAA;IAC5D,MAAM,IAAA,yBAAgB,EACpB,OAAO,CAAC,WAAW,EACnB,iBAAiB,EACjB,OAAO,EACP,MAAM,IAAA,sCAA6B,GAAE,EACrC,MAAM,IAAA,+BAAsB,GAAE,CAC/B,CAAA;IAED,iBAAO,CAAC,GAAG,CACT,8BAA8B,OAAO,CAAC,WAAW,iBAAiB,OAAO,EAAE,CAC5E,CAAA;IACD,OAAO,MAAM,IAAA,yBAAc,EAAC,OAAO,CAAC,WAAW,EAAE,OAAO,CAAC,CAAA;AAC3D,CAAC"}

package/src/executors/publisher/executor.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const consola_1 = require("consola");
 const nx_1 = require("../../utils/nx");
 const docker_1 = require("./docker");
 const helm_1 = require("./helm");
@@ -7,12 +8,13 @@ const runExecutor = async (options, context) => {
     try {
         const projectGraph = (0, nx_1.getProjectFromGraph)(context);
         const projectRoot = projectGraph.data.root;
-        const version = (0, nx_1.getVersion)(projectRoot);
+        const projectDist = await (0, nx_1.getDistForApp)(projectGraph);
+        const version = (0, nx_1.getVersion)(projectDist);
         await (0, docker_1.publishDocker)(options, context, version, projectRoot);
-        await (0, helm_1.publishHelm)(options, context, version, projectRoot);
+        await (0, helm_1.publishHelm)(options, context, version, projectRoot, projectDist);
     }
     catch (error) {
-        console.error(error);
+        consola_1.consola.error(error);
         return {
             success: false,
         };

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

@@ -1 +1 @@
-{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../packages/nx-core/src/executors/publisher/executor.ts"],"names":[],"mappings":";;AAEA,uCAAgE;AAChE,qCAAwC;AACxC,iCAAoC;AAGpC,MAAM,WAAW,GAGuB,KAAK,EAC3C,OAAiC,EACjC,OAAwB,EACxB,EAAE;IACF,IAAI,CAAC;QACH,MAAM,YAAY,GAAG,IAAA,wBAAmB,EAAC,OAAO,CAAC,CAAA;QACjD,MAAM,WAAW,GAAG,YAAY,CAAC,IAAI,CAAC,IAAI,CAAA;QAC1C,MAAM,OAAO,GAAG,IAAA,eAAU,EAAC,WAAW,CAAC,CAAA;QACvC,MAAM,IAAA,sBAAa,EAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,CAAC,CAAA;QAC3D,MAAM,IAAA,kBAAW,EAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,CAAC,CAAA;IAC3D,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;QACpB,OAAO;YACL,OAAO,EAAE,KAAK;SACf,CAAA;IACH,CAAC;IACD,OAAO;QACL,OAAO,EAAE,IAAI;KACd,CAAA;AACH,CAAC,CAAA;AAED,kBAAe,WAAW,CAAA"}
+{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../packages/nx-core/src/executors/publisher/executor.ts"],"names":[],"mappings":";;AACA,qCAAiC;AAEjC,uCAA+E;AAC/E,qCAAwC;AACxC,iCAAoC;AAGpC,MAAM,WAAW,GAGuB,KAAK,EAC3C,OAAiC,EACjC,OAAwB,EACxB,EAAE;IACF,IAAI,CAAC;QACH,MAAM,YAAY,GAAG,IAAA,wBAAmB,EAAC,OAAO,CAAC,CAAA;QACjD,MAAM,WAAW,GAAG,YAAY,CAAC,IAAI,CAAC,IAAI,CAAA;QAC1C,MAAM,WAAW,GAAG,MAAM,IAAA,kBAAa,EAAC,YAAY,CAAC,CAAA;QACrD,MAAM,OAAO,GAAG,IAAA,eAAU,EAAC,WAAW,CAAC,CAAA;QACvC,MAAM,IAAA,sBAAa,EAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,CAAC,CAAA;QAC3D,MAAM,IAAA,kBAAW,EAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,WAAW,CAAC,CAAA;IACxE,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,iBAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;QACpB,OAAO;YACL,OAAO,EAAE,KAAK;SACf,CAAA;IACH,CAAC;IACD,OAAO;QACL,OAAO,EAAE,IAAI;KACd,CAAA;AACH,CAAC,CAAA;AAED,kBAAe,WAAW,CAAA"}

package/src/executors/publisher/helm.d.ts

@@ -1,5 +1,5 @@
 import { ExecutorContext } from '@nx/devkit';
 import { PublisherExecutorOptions } from './schema';
-export declare function publishHelm(options: PublisherExecutorOptions, context: ExecutorContext, version: string, projectRoot: string): Promise<{
+export declare function publishHelm(options: PublisherExecutorOptions, context: ExecutorContext, version: string, projectRoot: string, projectDist: string): Promise<{
     success: boolean;
 }>;

package/src/executors/publisher/helm.js

@@ -3,27 +3,29 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.publishHelm = publishHelm;
 const tslib_1 = require("tslib");
 const fs = require("node:fs");
+const consola_1 = require("consola");
 const aws_auth_1 = require("../../utils/aws-auth");
 const github_1 = require("../../utils/github");
 const helm_1 = require("../../utils/helm");
-const nx_1 = require("../../utils/nx");
 const tsh_1 = require("../../utils/tsh");
-async function publishHelm(options, context, version, projectRoot) {
+async function publishHelm(options, context, version, projectRoot, projectDist) {
     const env_1 = { stack: [], error: void 0, hasError: false };
     try {
         const projectHelmFolder = `${projectRoot}/.deploy`;
         const valuesConfigPath = `${projectHelmFolder}/values.yaml`;
         const chartConfigPath = `${projectHelmFolder}/Chart.yaml`;
-        const projectGraph = (0, nx_1.getProjectFromGraph)(context);
-        const destinationHelmFolder = `${await (0, nx_1.getDistForApp)(projectGraph)}/chart/`;
+        const destinationHelmFolder = `${projectDist}/chart/`;
         const gitBranchName = await (0, github_1.getSanitizedCurrentGitBranch)();
         if (!gitBranchName)
             throw new Error('Unable to get current Git branch');
-        await (0, aws_auth_1.checkAwsAuth)();
         if (!fs.existsSync(projectHelmFolder)) {
-            throw new Error(`.deploy folder not found for project ${context.projectName}`);
+            consola_1.consola.warn(`.deploy folder not found at ${projectHelmFolder}, soft failing`);
+            return {
+                success: true,
+            };
         }
-        console.log(`Publishing Helm chart to ${options.chartRegistry}/${gitBranchName} with version ${version}`);
+        await (0, aws_auth_1.checkAwsAuth)();
+        consola_1.consola.log(`Publishing Helm chart to ${options.chartRegistry}/${gitBranchName} with version ${version}`);
         // connect to the chartmuseum through teleport
         const proxyData = tslib_1.__addDisposableResource(env_1, await (0, tsh_1.getLocalPortForChartMuseum)(), false);
         await proxyData.isReady();
@@ -37,7 +39,7 @@ async function publishHelm(options, context, version, projectRoot) {
         const packagedHelmChartPath = `${destinationHelmFolder}${packagedHelmChartName}`;
         // If ociEcrRegistry is provided, push to ECR using OCI format
         if (options.ociEcrRegistry) {
-            console.log(`Publishing Helm chart to OCI registry ${options.ociEcrRegistry}`);
+            consola_1.consola.log(`Publishing Helm chart to OCI registry ${options.ociEcrRegistry}`);
             return (0, helm_1.pushOciPackagedHelm)(packagedHelmChartPath, options.ociEcrRegistry);
         }
         // Otherwise, push to the chartmuseum as before

package/src/executors/publisher/helm.js.map

@@ -1 +1 @@
-{"version":3,"file":"helm.js","sourceRoot":"","sources":["../../../../../../packages/nx-core/src/executors/publisher/helm.ts"],"names":[],"mappings":";;AAoBA,kCA4DC;;AAhFD,8BAA6B;AAI7B,mDAAmD;AACnD,+CAAiE;AACjE,2CASyB;AACzB,uCAAmE;AACnE,yCAA4D;AAGrD,KAAK,UAAU,WAAW,CAC/B,OAAiC,EACjC,OAAwB,EACxB,OAAe,EACf,WAAmB;;;QAInB,MAAM,iBAAiB,GAAG,GAAG,WAAW,UAAU,CAAA;QAClD,MAAM,gBAAgB,GAAG,GAAG,iBAAiB,cAAc,CAAA;QAC3D,MAAM,eAAe,GAAG,GAAG,iBAAiB,aAAa,CAAA;QACzD,MAAM,YAAY,GAAG,IAAA,wBAAmB,EAAC,OAAO,CAAC,CAAA;QACjD,MAAM,qBAAqB,GAAG,GAAG,MAAM,IAAA,kBAAa,EAAC,YAAY,CAAC,SAAS,CAAA;QAC3E,MAAM,aAAa,GAAG,MAAM,IAAA,qCAA4B,GAAE,CAAA;QAE1D,IAAI,CAAC,aAAa;YAAE,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAA;QAEvE,MAAM,IAAA,uBAAY,GAAE,CAAA;QAEpB,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,iBAAiB,CAAC,EAAE,CAAC;YACtC,MAAM,IAAI,KAAK,CACb,wCAAwC,OAAO,CAAC,WAAW,EAAE,CAC9D,CAAA;QACH,CAAC;QACD,OAAO,CAAC,GAAG,CACT,4BAA4B,OAAO,CAAC,aAAa,IAAI,aAAa,iBAAiB,OAAO,EAAE,CAC7F,CAAA;QACD,8CAA8C;QAC9C,MAAM,SAAS,0CAAG,MAAM,IAAA,gCAA0B,GAAE,QAAA,CAAA;QACpD,MAAM,SAAS,CAAC,OAAO,EAAE,CAAA;QAEzB,MAAM,IAAA,sCAA+B,EAAC,iBAAiB,EAAE,SAAS,CAAC,IAAI,CAAC,CAAA;QACxE,MAAM,IAAA,sBAAe,EAAC,iBAAiB,CAAC,CAAA;QACxC,MAAM,IAAA,oBAAa,EAAC,gBAAgB,EAAE,eAAe,EAAE,OAAO,CAAC,CAAA;QAC/D,MAAM,IAAA,kBAAW,EAAC,iBAAiB,EAAE,OAAO,EAAE,qBAAqB,CAAC,CAAA;QACpE,MAAM,IAAA,sCAA+B,EAAC,iBAAiB,EAAE,SAAS,CAAC,IAAI,CAAC,CAAA;QAExE,MAAM,WAAW,GAAG,MAAM,IAAA,uBAAgB,EAAC,iBAAiB,CAAC,CAAA;QAC7D,MAAM,qBAAqB,GAAG,GAAG,WAAW,CAAC,IAAI,IAAI,OAAO,MAAM,CAAA;QAClE,MAAM,qBAAqB,GAAG,GAAG,qBAAqB,GAAG,qBAAqB,EAAE,CAAA;QAEhF,8DAA8D;QAC9D,IAAI,OAAO,CAAC,cAAc,EAAE,CAAC;YAC3B,OAAO,CAAC,GAAG,CACT,yCAAyC,OAAO,CAAC,cAAc,EAAE,CAClE,CAAA;YACD,OAAO,IAAA,0BAAmB,EAAC,qBAAqB,EAAE,OAAO,CAAC,cAAc,CAAC,CAAA;QAC3E,CAAC;QAED,+CAA+C;QAC/C,MAAM,IAAA,uBAAgB,EACpB,qBAAqB,EACrB,qBAAqB,EACrB,OAAO,CAAC,aAAa,EACrB,aAAa,CACd,CAAA;QAED,OAAO;YACL,OAAO,EAAE,IAAI;SACd,CAAA;;;;;;;;;CACF"}
+{"version":3,"file":"helm.js","sourceRoot":"","sources":["../../../../../../packages/nx-core/src/executors/publisher/helm.ts"],"names":[],"mappings":";;AAoBA,kCAgEC;;AApFD,8BAA6B;AAG7B,qCAAiC;AAEjC,mDAAmD;AACnD,+CAAiE;AACjE,2CASyB;AACzB,yCAA4D;AAGrD,KAAK,UAAU,WAAW,CAC/B,OAAiC,EACjC,OAAwB,EACxB,OAAe,EACf,WAAmB,EACnB,WAAmB;;;QAInB,MAAM,iBAAiB,GAAG,GAAG,WAAW,UAAU,CAAA;QAClD,MAAM,gBAAgB,GAAG,GAAG,iBAAiB,cAAc,CAAA;QAC3D,MAAM,eAAe,GAAG,GAAG,iBAAiB,aAAa,CAAA;QACzD,MAAM,qBAAqB,GAAG,GAAG,WAAW,SAAS,CAAA;QACrD,MAAM,aAAa,GAAG,MAAM,IAAA,qCAA4B,GAAE,CAAA;QAE1D,IAAI,CAAC,aAAa;YAAE,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAA;QAEvE,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,iBAAiB,CAAC,EAAE,CAAC;YACtC,iBAAO,CAAC,IAAI,CACV,+BAA+B,iBAAiB,gBAAgB,CACjE,CAAA;YACD,OAAO;gBACL,OAAO,EAAE,IAAI;aACd,CAAA;QACH,CAAC;QAED,MAAM,IAAA,uBAAY,GAAE,CAAA;QAEpB,iBAAO,CAAC,GAAG,CACT,4BAA4B,OAAO,CAAC,aAAa,IAAI,aAAa,iBAAiB,OAAO,EAAE,CAC7F,CAAA;QACD,8CAA8C;QAC9C,MAAM,SAAS,0CAAG,MAAM,IAAA,gCAA0B,GAAE,QAAA,CAAA;QACpD,MAAM,SAAS,CAAC,OAAO,EAAE,CAAA;QAEzB,MAAM,IAAA,sCAA+B,EAAC,iBAAiB,EAAE,SAAS,CAAC,IAAI,CAAC,CAAA;QACxE,MAAM,IAAA,sBAAe,EAAC,iBAAiB,CAAC,CAAA;QACxC,MAAM,IAAA,oBAAa,EAAC,gBAAgB,EAAE,eAAe,EAAE,OAAO,CAAC,CAAA;QAC/D,MAAM,IAAA,kBAAW,EAAC,iBAAiB,EAAE,OAAO,EAAE,qBAAqB,CAAC,CAAA;QACpE,MAAM,IAAA,sCAA+B,EAAC,iBAAiB,EAAE,SAAS,CAAC,IAAI,CAAC,CAAA;QAExE,MAAM,WAAW,GAAG,MAAM,IAAA,uBAAgB,EAAC,iBAAiB,CAAC,CAAA;QAC7D,MAAM,qBAAqB,GAAG,GAAG,WAAW,CAAC,IAAI,IAAI,OAAO,MAAM,CAAA;QAClE,MAAM,qBAAqB,GAAG,GAAG,qBAAqB,GAAG,qBAAqB,EAAE,CAAA;QAEhF,8DAA8D;QAC9D,IAAI,OAAO,CAAC,cAAc,EAAE,CAAC;YAC3B,iBAAO,CAAC,GAAG,CACT,yCAAyC,OAAO,CAAC,cAAc,EAAE,CAClE,CAAA;YACD,OAAO,IAAA,0BAAmB,EAAC,qBAAqB,EAAE,OAAO,CAAC,cAAc,CAAC,CAAA;QAC3E,CAAC;QAED,+CAA+C;QAC/C,MAAM,IAAA,uBAAgB,EACpB,qBAAqB,EACrB,qBAAqB,EACrB,OAAO,CAAC,aAAa,EACrB,aAAa,CACd,CAAA;QAED,OAAO;YACL,OAAO,EAAE,IAAI;SACd,CAAA;;;;;;;;;CACF"}

package/src/scripts/version-actions.js

@@ -11,7 +11,7 @@ class customVersionAction extends release_1.VersionActions {
     async readCurrentVersionFromSourceManifest(tree) {
         return {
             currentVersion: '0.0.0',
-            manifestPath: `${this.projectGraphNode.data.root}/project.json`,
+            manifestPath: `${this.projectGraphNode.data.root}/package.json`,
         };
     }
     async readCurrentVersionFromRegistry(tree, currentVersionResolverMetadata) {
@@ -54,7 +54,7 @@ class customVersionAction extends release_1.VersionActions {
             const defaultVersion = `${expectedPattern}0`;
             // if currentVersion is null, return default version
             if (!currentVersion)
-                return `${defaultVersion}${preid.trim() ? '-' + preid : ''}`;
+                return defaultVersion;
             // we need to strip the actual version to be able to increment it, without the pre-id
             const matchingCurrVersion = currentVersion.match(/[0-9]{0,6}.[0-9]{2}.[0-9]*/);
             const matchedCurrentVersion = matchingCurrVersion && matchingCurrVersion.length > 0

package/src/scripts/version-actions.js.map

@@ -1 +1 @@
-{"version":3,"file":"version-actions.js","sourceRoot":"","sources":["../../../../../packages/nx-core/src/scripts/version-actions.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"version-actions.js","sourceRoot":"","sources":["../../../../../packages/nx-core/src/scripts/version-actions.ts"],"names":[],"mappings":"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"}

package/src/utils/exec.js

@@ -4,17 +4,18 @@ exports.execTiny = void 0;
 exports.exec_command = exec_command;
 const child_process_1 = require("child_process");
 const util_1 = require("util");
+const consola_1 = require("consola");
 const tinyexec_1 = require("tinyexec");
 async function exec_command(command) {
     const { stdout, stderr } = await (0, util_1.promisify)(child_process_1.exec)(command);
-    console.log(stdout);
-    console.error(stderr);
+    consola_1.consola.log(stdout);
+    consola_1.consola.error(stderr);
     const success = !stderr;
     return { success, stdout, stderr };
 }
 function createLoggingExecWrapper(execFn) {
     return (command, args = [], options = {}) => {
-        console.log(`Running '${command} ${args.join(' ')}'...`);
+        consola_1.consola.log(`Running '${command} ${args.join(' ')}'...`);
         return execFn(command, args, {
             throwOnError: true,
             ...options,

package/src/utils/exec.js.map

@@ -1 +1 @@
-{"version":3,"file":"exec.js","sourceRoot":"","sources":["../../../../../packages/nx-core/src/utils/exec.ts"],"names":[],"mappings":";;;AAOA,oCAOC;AAdD,iDAAoC;AACpC,+BAAgC;AAIhC,uCAA4B;AAErB,KAAK,UAAU,YAAY,CAAC,OAAe;IAChD,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,IAAA,gBAAS,EAAC,oBAAI,CAAC,CAAC,OAAO,CAAC,CAAA;IACzD,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;IACnB,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;IAErB,MAAM,OAAO,GAAG,CAAC,MAAM,CAAA;IACvB,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,CAAA;AACpC,CAAC;AAED,SAAS,wBAAwB,CAAC,MAAgB;IAChD,OAAO,CACL,OAAe,EACf,OAAiB,EAAE,EACnB,UAA4B,EAAE,EAC9B,EAAE;QACF,OAAO,CAAC,GAAG,CAAC,YAAY,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;QACxD,OAAO,MAAM,CAAC,OAAO,EAAE,IAAI,EAAE;YAC3B,YAAY,EAAE,IAAI;YAClB,GAAG,OAAO;SACX,CAAC,CAAA;IACJ,CAAC,CAAA;AACH,CAAC;AAEY,QAAA,QAAQ,GAAG,wBAAwB,CAAC,YAAC,CAAC,CAAA"}
+{"version":3,"file":"exec.js","sourceRoot":"","sources":["../../../../../packages/nx-core/src/utils/exec.ts"],"names":[],"mappings":";;;AAQA,oCAOC;AAfD,iDAAoC;AACpC,+BAAgC;AAIhC,qCAAiC;AACjC,uCAA4B;AAErB,KAAK,UAAU,YAAY,CAAC,OAAe;IAChD,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,IAAA,gBAAS,EAAC,oBAAI,CAAC,CAAC,OAAO,CAAC,CAAA;IACzD,iBAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;IACnB,iBAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;IAErB,MAAM,OAAO,GAAG,CAAC,MAAM,CAAA;IACvB,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,CAAA;AACpC,CAAC;AAED,SAAS,wBAAwB,CAAC,MAAgB;IAChD,OAAO,CACL,OAAe,EACf,OAAiB,EAAE,EACnB,UAA4B,EAAE,EAC9B,EAAE;QACF,iBAAO,CAAC,GAAG,CAAC,YAAY,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;QACxD,OAAO,MAAM,CAAC,OAAO,EAAE,IAAI,EAAE;YAC3B,YAAY,EAAE,IAAI;YAClB,GAAG,OAAO;SACX,CAAC,CAAA;IACJ,CAAC,CAAA;AACH,CAAC;AAEY,QAAA,QAAQ,GAAG,wBAAwB,CAAC,YAAC,CAAC,CAAA"}

package/src/utils/nx.d.ts

@@ -4,6 +4,6 @@ export declare function getProjectFromGraph(context: ExecutorContext): ProjectGr
 /**
  * Get the version of a project
  * @returns {string}
- * @param projectRoot
+ * @param projectDist project dist folder
  */
-export declare function getVersion(projectRoot: string): string | null;
+export declare function getVersion(projectDist: string): string | null;

package/src/utils/nx.js

@@ -35,13 +35,13 @@ function getProjectFromGraph(context) {
 /**
  * Get the version of a project
  * @returns {string}
- * @param projectRoot
+ * @param projectDist project dist folder
  */
-function getVersion(projectRoot) {
-    if (!fs.existsSync(`${projectRoot}/package.json`)) {
-        throw new Error(`package.json file not found at ${projectRoot}`);
+function getVersion(projectDist) {
+    if (!fs.existsSync(`${projectDist}/package.json`)) {
+        throw new Error(`package.json file not found at ${projectDist}`);
     }
-    return (JSON.parse(fs.readFileSync(`${projectRoot}/package.json`, 'utf8'))
+    return (JSON.parse(fs.readFileSync(`${projectDist}/package.json`, 'utf8'))
         ?.version || null);
 }
 //# sourceMappingURL=nx.js.map