@payfit/nx-core 4.19.1-ephemeral-fix-hard-coded-paths.2 → 4.19.1-ephemeral-fix-hard-coded-paths.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/src/executors/publisher/executor.js +3 -2
- package/src/executors/publisher/executor.js.map +1 -1
- package/src/executors/publisher/helm.d.ts +1 -1
- package/src/executors/publisher/helm.js +2 -4
- package/src/executors/publisher/helm.js.map +1 -1
- package/src/scripts/version-actions.js +2 -2
- package/src/scripts/version-actions.js.map +1 -1
- package/src/utils/nx.d.ts +2 -2
- package/src/utils/nx.js +5 -5
package/package.json
CHANGED
|
@@ -7,9 +7,10 @@ const runExecutor = async (options, context) => {
|
|
|
7
7
|
try {
|
|
8
8
|
const projectGraph = (0, nx_1.getProjectFromGraph)(context);
|
|
9
9
|
const projectRoot = projectGraph.data.root;
|
|
10
|
-
const
|
|
10
|
+
const projectDist = await (0, nx_1.getDistForApp)(projectGraph);
|
|
11
|
+
const version = (0, nx_1.getVersion)(projectDist);
|
|
11
12
|
await (0, docker_1.publishDocker)(options, context, version, projectRoot);
|
|
12
|
-
await (0, helm_1.publishHelm)(options, context, version, projectRoot);
|
|
13
|
+
await (0, helm_1.publishHelm)(options, context, version, projectRoot, projectDist);
|
|
13
14
|
}
|
|
14
15
|
catch (error) {
|
|
15
16
|
console.error(error);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../packages/nx-core/src/executors/publisher/executor.ts"],"names":[],"mappings":";;AAEA,
|
|
1
|
+
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../packages/nx-core/src/executors/publisher/executor.ts"],"names":[],"mappings":";;AAEA,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,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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { ExecutorContext } from '@nx/devkit';
|
|
2
2
|
import { PublisherExecutorOptions } from './schema';
|
|
3
|
-
export declare function publishHelm(options: PublisherExecutorOptions, context: ExecutorContext, version: string, projectRoot: string): Promise<{
|
|
3
|
+
export declare function publishHelm(options: PublisherExecutorOptions, context: ExecutorContext, version: string, projectRoot: string, projectDist: string): Promise<{
|
|
4
4
|
success: boolean;
|
|
5
5
|
}>;
|
|
@@ -6,16 +6,14 @@ const fs = require("node:fs");
|
|
|
6
6
|
const aws_auth_1 = require("../../utils/aws-auth");
|
|
7
7
|
const github_1 = require("../../utils/github");
|
|
8
8
|
const helm_1 = require("../../utils/helm");
|
|
9
|
-
const nx_1 = require("../../utils/nx");
|
|
10
9
|
const tsh_1 = require("../../utils/tsh");
|
|
11
|
-
async function publishHelm(options, context, version, projectRoot) {
|
|
10
|
+
async function publishHelm(options, context, version, projectRoot, projectDist) {
|
|
12
11
|
const env_1 = { stack: [], error: void 0, hasError: false };
|
|
13
12
|
try {
|
|
14
13
|
const projectHelmFolder = `${projectRoot}/.deploy`;
|
|
15
14
|
const valuesConfigPath = `${projectHelmFolder}/values.yaml`;
|
|
16
15
|
const chartConfigPath = `${projectHelmFolder}/Chart.yaml`;
|
|
17
|
-
const
|
|
18
|
-
const destinationHelmFolder = `${await (0, nx_1.getDistForApp)(projectGraph)}/chart/`;
|
|
16
|
+
const destinationHelmFolder = `${projectDist}/chart/`;
|
|
19
17
|
const gitBranchName = await (0, github_1.getSanitizedCurrentGitBranch)();
|
|
20
18
|
if (!gitBranchName)
|
|
21
19
|
throw new Error('Unable to get current Git branch');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helm.js","sourceRoot":"","sources":["../../../../../../packages/nx-core/src/executors/publisher/helm.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"helm.js","sourceRoot":"","sources":["../../../../../../packages/nx-core/src/executors/publisher/helm.ts"],"names":[],"mappings":";;AAmBA,kCA4DC;;AA/ED,8BAA6B;AAI7B,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,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"}
|
|
@@ -11,7 +11,7 @@ class customVersionAction extends release_1.VersionActions {
|
|
|
11
11
|
async readCurrentVersionFromSourceManifest(tree) {
|
|
12
12
|
return {
|
|
13
13
|
currentVersion: '0.0.0',
|
|
14
|
-
manifestPath: `${this.projectGraphNode.data.root}/
|
|
14
|
+
manifestPath: `${this.projectGraphNode.data.root}/package.json`,
|
|
15
15
|
};
|
|
16
16
|
}
|
|
17
17
|
async readCurrentVersionFromRegistry(tree, currentVersionResolverMetadata) {
|
|
@@ -54,7 +54,7 @@ class customVersionAction extends release_1.VersionActions {
|
|
|
54
54
|
const defaultVersion = `${expectedPattern}0`;
|
|
55
55
|
// if currentVersion is null, return default version
|
|
56
56
|
if (!currentVersion)
|
|
57
|
-
return
|
|
57
|
+
return defaultVersion;
|
|
58
58
|
// we need to strip the actual version to be able to increment it, without the pre-id
|
|
59
59
|
const matchingCurrVersion = currentVersion.match(/[0-9]{0,6}.[0-9]{2}.[0-9]*/);
|
|
60
60
|
const matchedCurrentVersion = matchingCurrVersion && matchingCurrVersion.length > 0
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"version-actions.js","sourceRoot":"","sources":["../../../../../packages/nx-core/src/scripts/version-actions.ts"],"names":[],"mappings":";;AACA,wCAA2C;AAE3C,mCAA4B;AAE5B,oCAA2C;AAE3C,MAAqB,mBAAoB,SAAQ,wBAAc;IAA/D;;QACE,2BAAsB,GAAG,CAAC,cAAc,CAAC,CAAA;
|
|
1
|
+
{"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/nx.d.ts
CHANGED
|
@@ -4,6 +4,6 @@ export declare function getProjectFromGraph(context: ExecutorContext): ProjectGr
|
|
|
4
4
|
/**
|
|
5
5
|
* Get the version of a project
|
|
6
6
|
* @returns {string}
|
|
7
|
-
* @param
|
|
7
|
+
* @param projectDist project dist folder
|
|
8
8
|
*/
|
|
9
|
-
export declare function getVersion(
|
|
9
|
+
export declare function getVersion(projectDist: string): string | null;
|
package/src/utils/nx.js
CHANGED
|
@@ -35,13 +35,13 @@ function getProjectFromGraph(context) {
|
|
|
35
35
|
/**
|
|
36
36
|
* Get the version of a project
|
|
37
37
|
* @returns {string}
|
|
38
|
-
* @param
|
|
38
|
+
* @param projectDist project dist folder
|
|
39
39
|
*/
|
|
40
|
-
function getVersion(
|
|
41
|
-
if (!fs.existsSync(`${
|
|
42
|
-
throw new Error(`package.json file not found at ${
|
|
40
|
+
function getVersion(projectDist) {
|
|
41
|
+
if (!fs.existsSync(`${projectDist}/package.json`)) {
|
|
42
|
+
throw new Error(`package.json file not found at ${projectDist}`);
|
|
43
43
|
}
|
|
44
|
-
return (JSON.parse(fs.readFileSync(`${
|
|
44
|
+
return (JSON.parse(fs.readFileSync(`${projectDist}/package.json`, 'utf8'))
|
|
45
45
|
?.version || null);
|
|
46
46
|
}
|
|
47
47
|
//# sourceMappingURL=nx.js.map
|