@@ -17,42 +17,43 @@ 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+ if ( releaseSemver . endsWith ( '.0' ) ) {
28+ // Remove the patch number if zero (wine uses both 2 and 3 numbers).
29+ upstreamVersion = releaseSemver . replace ( / [ . ] 0 * $ / , '' ) ;
30+ }
2131
22- console . log ( `package version: ${ topPackageJson . version } ` ) ;
32+ let versionFields = {
33+ packageVersion,
34+ releaseVersion,
35+ releaseSemver,
36+ upstreamVersion,
37+ }
2338
24- let versionFields ;
39+ console . log ( `package version: ${ topPackageJson . version } ` ) ;
2540
2641 if ( topPackageJson . xpack && ! releaseVersion . startsWith ( '0.0.0' ) ) {
42+
2743 // Remove the first part, up to the last dot.
2844 const npmSubversion = releaseVersion . replace ( / ^ .* [ . ] / , '' ) ;
2945
3046 // Remove from the last dot to the end.
3147 const xpackVersion = releaseVersion . replace ( / [ . ] [ 0 - 9 ] * $ / , '' ) ;
3248
33- // Remove the pre-release.
34- const xpackSemver = xpackVersion . replace ( / [ - ] .* $ / , '' ) ;
35-
3649 // Remove the first part, up to the dash.
3750 const xpackSubversion = xpackVersion . replace ( / ^ .* [ - ] / , '' ) ;
3851
39- let upstreamVersion = xpackSemver ;
40- if ( xpackSemver . endsWith ( '.0' ) ) {
41- // Remove the patch number if zero (wine uses both 2 and 3 numbers).
42- upstreamVersion = xpackSemver . replace ( / [ . ] 0 * $ / , '' ) ;
43- }
44-
4552 versionFields = {
46- releaseVersion ,
53+ ... versionFields ,
4754 xpackVersion,
48- xpackSemver,
4955 xpackSubversion,
5056 npmSubversion,
51- upstreamVersion,
52- }
53- } else {
54- versionFields = {
55- releaseVersion
5657 }
5758 }
5859
0 commit comments