@payfit/nx-core 4.19.1-ephemeral-fix-hard-coded-paths.6 → 4.19.1-ephemeral-fix-hard-coded-paths.7

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 CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@payfit/nx-core",
3
- "version": "4.19.1-ephemeral-fix-hard-coded-paths.6",
3
+ "version": "4.19.1-ephemeral-fix-hard-coded-paths.7",
4
4
  "type": "commonjs",
5
5
  "main": "./src/index.js",
6
6
  "types": "./src/index.d.ts",
@@ -10,6 +10,7 @@ const runExecutor = async (options, context) => {
10
10
  const projectRoot = projectGraph.data.root;
11
11
  const projectDist = await (0, nx_1.getDistForApp)(projectGraph);
12
12
  const version = (0, nx_1.getVersion)(projectDist);
13
+ consola_1.consola.log('version = ' + version);
13
14
  await (0, docker_1.publishDocker)(options, context, version, projectRoot);
14
15
  await (0, helm_1.publishHelm)(options, context, version, projectRoot, projectDist);
15
16
  }
@@ -1 +1 @@
1
- {"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"}
1
+ {"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,iBAAO,CAAC,GAAG,CAAC,YAAY,GAAG,OAAO,CAAC,CAAA;QACnC,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"}
@@ -56,7 +56,7 @@ class customVersionAction extends release_1.VersionActions {
56
56
  if (!currentVersion)
57
57
  return defaultVersion;
58
58
  // we need to strip the actual version to be able to increment it, without the pre-id
59
- const matchingCurrVersion = currentVersion.match(/[0-9]{0,6}.[0-9]{2}.[0-9]*/);
59
+ const matchingCurrVersion = currentVersion.match(/[0-9]{0,6}.[0-9]{1,2}.[0-9]*/);
60
60
  const matchedCurrentVersion = matchingCurrVersion && matchingCurrVersion.length > 0
61
61
  ? matchingCurrVersion[0]
62
62
  : null;
@@ -1 +1 @@
1
- {"version":3,"file":"version-actions.js","sourceRoot":"","sources":["../../../../../packages/nx-core/src/scripts/version-actions.ts"],"names":[],"mappings":"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"}
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;IAyG3C,CAAC;IAvGC,KAAK,CAAC,oCAAoC,CACxC,IAAU;QAEV,OAAO;YACL,cAAc,EAAE,OAAO;YACvB,YAAY,EAAE,GAAG,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,IAAI,eAAe;SAChE,CAAA;IACH,CAAC;IACD,KAAK,CAAC,8BAA8B,CAClC,IAAU,EACV,8BAA+F;QAE/F,OAAO;YACL,cAAc,EAAE,OAAO;YACvB,OAAO,EAAE,+BAA+B;SACzC,CAAA;IACH,CAAC;IACD,KAAK,CAAC,8BAA8B,CAClC,IAAU,EACV,YAA0B,EAC1B,qBAA6B;QAK7B,OAAO;YACL,cAAc,EAAE,OAAO;YACvB,oBAAoB,EAAE,OAAO;SAC9B,CAAA;IACH,CAAC;IACD,KAAK,CAAC,yBAAyB,CAAC,gBAAwB;QACtD,OAAO,KAAK,CAAA;IACd,CAAC;IACD,KAAK,CAAC,oBAAoB,CACxB,IAAU,EACV,UAAkB;QAElB,8CAA8C;QAC9C,MAAM,eAAe,GAAG,GAAG,MAAM,IAAA,kBAAa,EAAC,IAAI,CAAC,gBAAgB,CAAC,eAAe,CAAA;QACpF,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,EAAE,QAAQ,EAAE,CAAA;QAC9D,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,CAAA;QAC/C,WAAW,CAAC,OAAO,GAAG,UAAU,CAAA;QAChC,IAAI,CAAC,KAAK,CAAC,eAAe,EAAE,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,CAAA;QACxD,OAAO,EAAE,CAAA;IACX,CAAC;IACD,KAAK,CAAC,yBAAyB,CAC7B,IAAU,EACV,YAA0B,EAC1B,oBAA4C;QAE5C,OAAO,EAAE,CAAA;IACX,CAAC;IACD,KAAK,CAAC,mBAAmB,CACvB,cAA6B,EAC7B,eAAuB,EACvB,qBAA6B,EAC7B,yBAAkD,EAClD,KAAa;QAKb,SAAS,UAAU;YACjB,MAAM,IAAI,GAAG,IAAI,IAAI,EAAE,CAAA;YACvB,MAAM,IAAI,GAAG,IAAI,CAAC,WAAW,EAAE,CAAA;YAC/B,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAA,CAAC,0BAA0B;YACrF,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,EAAE,CAAA;YAE1B,OAAO,GAAG,IAAI,GAAG,KAAK,IAAI,GAAG,GAAG,CAAA;QAClC,CAAC;QAED,SAAS,+BAA+B,CAAC,cAA6B;YACpE,MAAM,eAAe,GAAG,UAAU,EAAE,CAAA;YACpC,MAAM,cAAc,GAAG,GAAG,eAAe,GAAG,CAAA;YAE5C,oDAAoD;YACpD,IAAI,CAAC,cAAc;gBAAE,OAAO,cAAc,CAAA;YAE1C,qFAAqF;YACrF,MAAM,mBAAmB,GAAG,cAAc,CAAC,KAAK,CAC9C,8BAA8B,CAC/B,CAAA;YACD,MAAM,qBAAqB,GACzB,mBAAmB,IAAI,mBAAmB,CAAC,MAAM,GAAG,CAAC;gBACnD,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC;gBACxB,CAAC,CAAC,IAAI,CAAA;YAEV,4DAA4D;YAC5D,MAAM,yBAAyB,GAC7B,qBAAqB,EAAE,UAAU,CAAC,eAAe,CAAC,CAAA;YAEpD,OAAO,yBAAyB;gBAC9B,CAAC,CAAC,IAAA,YAAG,EAAC,qBAAqB,EAAE,OAAO,CAAC;gBACrC,CAAC,CAAC,cAAc,CAAA;QACpB,CAAC;QAED,MAAM,YAAY,GAAG,GAAG,+BAA+B,CAAC,cAAc,CAAC,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,GAAG,GAAG,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAA;QAE3G,OAAO;YACL,UAAU,EAAE,YAAY;YACxB,OAAO,EAAE,gBAAgB,YAAY,EAAE;SACxC,CAAA;IACH,CAAC;CACF;AA1GD,sCA0GC"}
package/src/utils/nx.js CHANGED
@@ -5,6 +5,7 @@ exports.getProjectFromGraph = getProjectFromGraph;
5
5
  exports.getVersion = getVersion;
6
6
  const fs = require("node:fs");
7
7
  const devkit_1 = require("@nx/devkit");
8
+ const consola_1 = require("consola");
8
9
  async function getDistForApp(project) {
9
10
  if (!project.data.targets?.build) {
10
11
  throw new Error('No build target found in project.json');
@@ -41,6 +42,7 @@ function getVersion(projectDist) {
41
42
  if (!fs.existsSync(`${projectDist}/package.json`)) {
42
43
  throw new Error(`package.json file not found at ${projectDist}`);
43
44
  }
45
+ consola_1.consola.log('getVersion at ' + projectDist);
44
46
  return (JSON.parse(fs.readFileSync(`${projectDist}/package.json`, 'utf8'))
45
47
  ?.version || null);
46
48
  }
@@ -1 +1 @@
1
- {"version":3,"file":"nx.js","sourceRoot":"","sources":["../../../../../packages/nx-core/src/utils/nx.ts"],"names":[],"mappings":";;AAQA,sCAiCC;AAED,kDAQC;AAOD,gCAQC;AAlED,8BAA6B;AAE7B,uCAImB;AAEZ,KAAK,UAAU,aAAa,CACjC,OAAgC;IAEhC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,EAAE,CAAC;QACjC,MAAM,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAA;IAC1D,CAAC;IACD,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;QACxC,MAAM,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAA;IAC1D,CAAC;IAED,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAA;IAErD,MAAM,YAAY,GAAG,UAAU;SAC5B,GAAG,CAAC,MAAM,CAAC,EAAE,CACZ,MAAM,CAAC,OAAO,CACZ,sBAAsB,EACtB,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAC9C,CACF;SACA,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,iBAAiB,EAAE,sBAAa,CAAC,CAAC;SAC/D,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,eAAe,EAAE,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;IAEvE,IAAI,CAAC,YAAY,EAAE,CAAC;QAClB,MAAM,IAAI,KAAK,CAAC,iDAAiD,CAAC,CAAA;IACpE,CAAC;IAED,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;QACjC,MAAM,IAAI,KAAK,CACb,qBAAqB,YAAY,kCAAkC,CACpE,CAAA;IACH,CAAC;IAED,OAAO,YAAY,CAAA;AACrB,CAAC;AAED,SAAgB,mBAAmB,CACjC,OAAwB;IAExB,MAAM,YAAY,GAAG,OAAO,CAAC,YAAY,EAAE,KAAK,CAAC,OAAO,CAAC,WAAW,IAAI,EAAE,CAAC,CAAA;IAC3E,IAAI,CAAC,YAAY,EAAE,CAAC;QAClB,MAAM,IAAI,KAAK,CAAC,0DAA0D,CAAC,CAAA;IAC7E,CAAC;IACD,OAAO,YAAY,CAAA;AACrB,CAAC;AAED;;;;GAIG;AACH,SAAgB,UAAU,CAAC,WAAmB;IAC5C,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,GAAG,WAAW,eAAe,CAAC,EAAE,CAAC;QAClD,MAAM,IAAI,KAAK,CAAC,kCAAkC,WAAW,EAAE,CAAC,CAAA;IAClE,CAAC;IACD,OAAO,CACL,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,GAAG,WAAW,eAAe,EAAE,MAAM,CAAC,CAAC;QAChE,EAAE,OAAO,IAAI,IAAI,CACpB,CAAA;AACH,CAAC"}
1
+ {"version":3,"file":"nx.js","sourceRoot":"","sources":["../../../../../packages/nx-core/src/utils/nx.ts"],"names":[],"mappings":";;AASA,sCAiCC;AAED,kDAQC;AAOD,gCASC;AApED,8BAA6B;AAE7B,uCAImB;AACnB,qCAAiC;AAE1B,KAAK,UAAU,aAAa,CACjC,OAAgC;IAEhC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,EAAE,CAAC;QACjC,MAAM,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAA;IAC1D,CAAC;IACD,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;QACxC,MAAM,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAA;IAC1D,CAAC;IAED,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAA;IAErD,MAAM,YAAY,GAAG,UAAU;SAC5B,GAAG,CAAC,MAAM,CAAC,EAAE,CACZ,MAAM,CAAC,OAAO,CACZ,sBAAsB,EACtB,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAC9C,CACF;SACA,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,iBAAiB,EAAE,sBAAa,CAAC,CAAC;SAC/D,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,eAAe,EAAE,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;IAEvE,IAAI,CAAC,YAAY,EAAE,CAAC;QAClB,MAAM,IAAI,KAAK,CAAC,iDAAiD,CAAC,CAAA;IACpE,CAAC;IAED,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;QACjC,MAAM,IAAI,KAAK,CACb,qBAAqB,YAAY,kCAAkC,CACpE,CAAA;IACH,CAAC;IAED,OAAO,YAAY,CAAA;AACrB,CAAC;AAED,SAAgB,mBAAmB,CACjC,OAAwB;IAExB,MAAM,YAAY,GAAG,OAAO,CAAC,YAAY,EAAE,KAAK,CAAC,OAAO,CAAC,WAAW,IAAI,EAAE,CAAC,CAAA;IAC3E,IAAI,CAAC,YAAY,EAAE,CAAC;QAClB,MAAM,IAAI,KAAK,CAAC,0DAA0D,CAAC,CAAA;IAC7E,CAAC;IACD,OAAO,YAAY,CAAA;AACrB,CAAC;AAED;;;;GAIG;AACH,SAAgB,UAAU,CAAC,WAAmB;IAC5C,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,GAAG,WAAW,eAAe,CAAC,EAAE,CAAC;QAClD,MAAM,IAAI,KAAK,CAAC,kCAAkC,WAAW,EAAE,CAAC,CAAA;IAClE,CAAC;IACD,iBAAO,CAAC,GAAG,CAAC,gBAAgB,GAAG,WAAW,CAAC,CAAA;IAC3C,OAAO,CACL,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,GAAG,WAAW,eAAe,EAAE,MAAM,CAAC,CAAC;QAChE,EAAE,OAAO,IAAI,IAAI,CACpB,CAAA;AACH,CAAC"}