@@ -17,38 +17,39 @@ export function getCustomFields() {
1717 const topFileContent = fs . readFileSync ( topFilePath ) ;
1818
1919 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+ }
2134
2235 console . log ( `package version: ${ topPackageJson . version } ` ) ;
2336
24- let versionFields ;
25-
2637 if ( topPackageJson . xpack && ! releaseVersion . startsWith ( '0.0.0' ) ) {
38+
2739 // Remove the first part, up to the last dot.
2840 const npmSubversion = releaseVersion . replace ( / ^ .* [ . ] / , '' ) ;
2941
3042 // Remove from the last dot to the end.
3143 const xpackVersion = releaseVersion . replace ( / [ . ] [ 0 - 9 ] * $ / , '' ) ;
3244
33- // Remove the pre-release.
34- const xpackSemver = xpackVersion . replace ( / [ - ] .* $ / , '' ) ;
35-
3645 // Remove the first part, up to the dash.
3746 const xpackSubversion = xpackVersion . replace ( / ^ .* [ - ] / , '' ) ;
3847
39- let upstreamVersion = xpackSemver ;
40-
4148 versionFields = {
42- releaseVersion ,
49+ ... versionFields ,
4350 xpackVersion,
44- xpackSemver,
4551 xpackSubversion,
4652 npmSubversion,
47- upstreamVersion,
48- }
49- } else {
50- versionFields = {
51- releaseVersion
5253 }
5354 }
5455
0 commit comments