[material-ui][mui-system] Simplify version prerelease export (#43699)

mui · Sep 11, 2024 · 494c10c · 494c10c
1 parent 4be712a
commit 494c10c
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 18 deletions.
diff --git a/babel.config.js b/babel.config.js
@@ -110,8 +110,7 @@ module.exports = function getBabelConfig(api) {
           'MUI_MAJOR_VERSION',
           'MUI_MINOR_VERSION',
           'MUI_PATCH_VERSION',
-          'MUI_PRERELEASE_LABEL',
-          'MUI_PRERELEASE_NUMBER',
+          'MUI_PRERELEASE',
         ],
       },
     ],

diff --git a/packages/mui-material/src/index.test.js b/packages/mui-material/src/index.test.js
@@ -6,14 +6,9 @@
 import { expect } from 'chai';
 import * as MaterialUI from './index';
 
-const versionExports = [
-  'version',
-  'major',
-  'minor',
-  'patch',
-  'preReleaseLabel',
-  'preReleaseNumber',
-];
+// To skip them in the undefined exports test
+// These are checked in the build process (scripts/build.mjs)
+const versionExports = ['version', 'major', 'minor', 'patch', 'prerelease'];
 
 describe('material-ui', () => {
   it('should have exports', () => {

diff --git a/packages/mui-material/src/version/index.ts b/packages/mui-material/src/version/index.ts
@@ -2,7 +2,6 @@ export const version = process.env.MUI_VERSION;
 export const major = Number(process.env.MUI_MAJOR_VERSION);
 export const minor = Number(process.env.MUI_MINOR_VERSION);
 export const patch = Number(process.env.MUI_PATCH_VERSION);
-export const preReleaseLabel = process.env.MUI_PRERELEASE_LABEL || null;
-export const preReleaseNumber = Number(process.env.MUI_PRERELEASE_NUMBER) || null;
+export const prerelease = process.env.MUI_PRERELEASE;
 
 export default version;
diff --git a/packages/mui-system/src/version/index.ts b/packages/mui-system/src/version/index.ts
@@ -2,7 +2,6 @@ export const version = process.env.MUI_VERSION;
 export const major = Number(process.env.MUI_MAJOR_VERSION);
 export const minor = Number(process.env.MUI_MINOR_VERSION);
 export const patch = Number(process.env.MUI_PATCH_VERSION);
-export const preReleaseLabel = process.env.MUI_PRERELEASE_LABEL || null;
-export const preReleaseNumber = Number(process.env.MUI_PRERELEASE_NUMBER) || null;
+export const prerelease = process.env.MUI_PRERELEASE;
 
 export default version;
diff --git a/scripts/utils.mjs b/scripts/utils.mjs
@@ -23,9 +23,8 @@ export async function getVersionEnvVariables() {
     throw new Error('Could not find the version in the package.json');
   }
 
-  const [versionNumber, preReleaseInfo] = version.split('-');
+  const [versionNumber, prerelease] = version.split('-');
   const [major, minor, patch] = versionNumber.split('.');
-  const [preReleaseLabel, preReleaseNumber] = preReleaseInfo ? preReleaseInfo.split('.') : [];
 
   if (!major || !minor || !patch) {
     throw new Error(`Couldn't parse version from package.json`);
@@ -36,7 +35,6 @@ export async function getVersionEnvVariables() {
     MUI_MAJOR_VERSION: major,
     MUI_MINOR_VERSION: minor,
     MUI_PATCH_VERSION: patch,
-    MUI_PRERELEASE_LABEL: preReleaseLabel,
-    MUI_PRERELEASE_NUMBER: preReleaseNumber,
+    MUI_PRERELEASE: prerelease,
   };
 }