@@ -17,38 +17,39 @@ export function getCustomFields() {
17
17
const topFileContent = fs . readFileSync ( topFilePath ) ;
18
18
19
19
const topPackageJson = JSON . parse ( topFileContent . toString ( ) ) ;
20
- const releaseVersion = topPackageJson . version . replace ( / [ . - ] p r e / , '' ) ;
20
+ const packageVersion = topPackageJson . version ;
21
+ // Remove the pre used during development.
22
+ const releaseVersion = packageVersion . replace ( / [ . - ] p r e .* / , '' ) ;
23
+ // Remove the pre-release.
24
+ const releaseSemver = releaseVersion . replace ( / [ - ] .* $ / , '' ) ;
25
+
26
+ let upstreamVersion = releaseSemver ;
27
+
28
+ let versionFields = {
29
+ packageVersion,
30
+ releaseVersion,
31
+ releaseSemver,
32
+ upstreamVersion,
33
+ }
21
34
22
35
console . log ( `package version: ${ topPackageJson . version } ` ) ;
23
36
24
- let versionFields ;
25
-
26
37
if ( topPackageJson . xpack && ! releaseVersion . startsWith ( '0.0.0' ) ) {
38
+
27
39
// Remove the first part, up to the last dot.
28
40
const npmSubversion = releaseVersion . replace ( / ^ .* [ . ] / , '' ) ;
29
41
30
42
// Remove from the last dot to the end.
31
43
const xpackVersion = releaseVersion . replace ( / [ . ] [ 0 - 9 ] * $ / , '' ) ;
32
44
33
- // Remove the pre-release.
34
- const xpackSemver = xpackVersion . replace ( / [ - ] .* $ / , '' ) ;
35
-
36
45
// Remove the first part, up to the dash.
37
46
const xpackSubversion = xpackVersion . replace ( / ^ .* [ - ] / , '' ) ;
38
47
39
- let upstreamVersion = xpackSemver ;
40
-
41
48
versionFields = {
42
- releaseVersion ,
49
+ ... versionFields ,
43
50
xpackVersion,
44
- xpackSemver,
45
51
xpackSubversion,
46
52
npmSubversion,
47
- upstreamVersion,
48
- }
49
- } else {
50
- versionFields = {
51
- releaseVersion
52
53
}
53
54
}
54
55
0 commit comments