@payfit/nx-core 4.22.1-ephemeral-a0c24ec.0 → 4.22.1

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.22.1-ephemeral-a0c24ec.0",
3
+ "version": "4.22.1",
4
4
  "type": "commonjs",
5
5
  "main": "./src/index.js",
6
6
  "types": "./src/index.d.ts",
@@ -16,7 +16,7 @@
16
16
  "get-port": "^7.1.0",
17
17
  "ky": "^1.8.1",
18
18
  "semver": "7.7.2",
19
- "tinyexec": "1.0.1",
19
+ "tinyexec": "0.3.2",
20
20
  "tslib": "^2.8.1",
21
21
  "yaml": "2.8.0",
22
22
  "zod": "^3.24.3"
@@ -49,24 +49,27 @@ class customVersionAction extends release_1.VersionActions {
49
49
  const day = date.getDate();
50
50
  return `${year}${month}.${day}.`;
51
51
  }
52
- function getNewVersionFromCurrentVersion(currentVersion) {
52
+ function getNewVersionFromCurrentVersion(currentVersion, preid) {
53
53
  const expectedPattern = formatDate();
54
54
  const defaultVersion = `${expectedPattern}0`;
55
- // if currentVersion is null, return default version
56
55
  if (!currentVersion)
57
56
  return defaultVersion;
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]{1,2}.[0-9]*/);
60
- const matchedCurrentVersion = matchingCurrVersion && matchingCurrVersion.length > 0
61
- ? matchingCurrVersion[0]
62
- : null;
63
- // making sure currentVersion is containing the current date
57
+ // Extract base version and preid
58
+ const versionMatch = currentVersion.match(/^([0-9]{0,6}\.[0-9]{1,2}\.[0-9]*)(?:-([\w.-]+))?$/);
59
+ const matchedCurrentVersion = versionMatch ? versionMatch[1] : null;
60
+ const currentPreid = versionMatch ? versionMatch[2] : null;
64
61
  const isMatchingExpectedPattern = matchedCurrentVersion?.startsWith(expectedPattern);
65
- return isMatchingExpectedPattern
66
- ? (0, semver_1.inc)(matchedCurrentVersion, 'patch')
67
- : defaultVersion;
62
+ // making sure currentVersion is containing the current date
63
+ if (!isMatchingExpectedPattern)
64
+ return defaultVersion;
65
+ // If current version has a preid and new preid is empty, release current version
66
+ if (currentPreid && !preid.trim()) {
67
+ return matchedCurrentVersion;
68
+ }
69
+ return (0, semver_1.inc)(matchedCurrentVersion, 'patch');
68
70
  }
69
- const finalVersion = `${getNewVersionFromCurrentVersion(currentVersion)}${preid.trim() ? '-' + preid : ''}`;
71
+ const baseVersion = getNewVersionFromCurrentVersion(currentVersion, preid);
72
+ const finalVersion = `${baseVersion}${preid.trim() ? '-' + preid : ''}`;
70
73
  return {
71
74
  newVersion: finalVersion,
72
75
  logText: `New version: ${finalVersion}`,
@@ -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":"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"}