@mui/internal-code-infra 0.0.2-canary.34 → 0.0.2-canary.35

package/README.md

@@ -1,3 +1,3 @@
 # @mui/internal-code-infra
 
-Scripts and configs to be used across MUI repos.
+Build scripts and configs to be used across MUI repos.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mui/internal-code-infra",
-  "version": "0.0.2-canary.34",
+  "version": "0.0.2-canary.35",
   "description": "Infra scripts and configs to be used across MUI repos.",
   "type": "module",
   "license": "MIT",
@@ -57,8 +57,8 @@
     "semver": "^7.7.2",
     "typescript-eslint": "^8.35.1",
     "yargs": "^17.7.2",
-    "@mui/internal-babel-plugin-display-name": "1.0.4-canary.3",
     "@mui/internal-babel-plugin-minify-errors": "2.0.8-canary.4",
+    "@mui/internal-babel-plugin-display-name": "1.0.4-canary.3",
     "@mui/internal-babel-plugin-resolve-imports": "2.0.7-canary.13"
   },
   "peerDependencies": {
@@ -89,7 +89,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitSha": "5ed847881c8cf90a3f943edfa9161b7c74d4c98a",
+  "gitSha": "f76e805f3fa7ffa3c42fb934d1d28b07f22cfda0",
   "scripts": {
     "typescript": "tsc -p tsconfig.json",
     "test": "pnpm -w test --project @mui/internal-code-infra",

package/src/cli/cmdPublish.mjs

@@ -22,12 +22,19 @@ import { getWorkspacePackages, publishPackages } from './pnpm.mjs';
 
 /**
  * Get the version to release from the root package.json
- * @returns {Promise<string | null>} Version string
+ * @returns {Promise<string>} Version string
  */
 async function getReleaseVersion() {
   const result = await $`pnpm pkg get version`;
-  const version = JSON.parse(result.stdout.trim());
-  return semver.valid(version);
+  const versionData = JSON.parse(result.stdout.trim());
+  const version = versionData.version;
+
+  const validVersion = semver.valid(version);
+  if (!validVersion) {
+    throw new Error(`Invalid version in root package.json: ${version}`);
+  }
+
+  return validVersion;
 }
 
 /**
@@ -164,20 +171,15 @@ async function createGitTag(version, dryRun = false) {
 
 /**
  * Validate GitHub release requirements
- * @param {string | null} version - Version to validate
- * @returns {Promise<{changelogContent: string, version: string, repoInfo: {owner: string, repo: string}}>}
+ * @param {string} version - Version to validate
+ * @returns {Promise<{changelogContent: string, repoInfo: {owner: string, repo: string}}>}
  */
 async function validateGitHubRelease(version) {
   console.log('🔍 Validating GitHub release requirements...');
 
-  const validVersion = semver.valid(version);
-  if (!validVersion) {
-    throw new Error(`Invalid version in root package.json: ${version}`);
-  }
-
   // Check if CHANGELOG.md exists and parse it
-  console.log(`📄 Parsing CHANGELOG.md for version ${validVersion}...`);
-  const changelogContent = await parseChangelog('CHANGELOG.md', validVersion);
+  console.log(`📄 Parsing CHANGELOG.md for version ${version}...`);
+  const changelogContent = await parseChangelog('CHANGELOG.md', version);
   console.log('✅ Found changelog content for version');
 
   // Get repository info
@@ -189,20 +191,20 @@ async function validateGitHubRelease(version) {
     auth: process.env.GITHUB_TOKEN,
   });
 
-  console.log(`🔍 Checking if GitHub release v${validVersion} already exists...`);
+  console.log(`🔍 Checking if GitHub release v${version} already exists...`);
   const releaseExists = await checkGitHubReleaseExists(
     octokit,
     repoInfo.owner,
     repoInfo.repo,
-    validVersion,
+    version,
   );
 
   if (releaseExists) {
-    throw new Error(`GitHub release v${validVersion} already exists`);
+    throw new Error(`GitHub release v${version} already exists`);
   }
   console.log('✅ GitHub release does not exist yet');
 
-  return { changelogContent, repoInfo, version: validVersion };
+  return { changelogContent, repoInfo };
 }
 
 /**
@@ -259,7 +261,6 @@ export default /** @type {import('yargs').CommandModule<{}, Args>} */ ({
   describe: 'Publish packages to npm',
   builder: (yargs) => {
     return yargs
-      .parserConfiguration({ 'boolean-negation': false })
       .option('dry-run', {
         type: 'boolean',
         default: false,
@@ -272,9 +273,9 @@ export default /** @type {import('yargs').CommandModule<{}, Args>} */ ({
       });
   },
   handler: async (argv) => {
-    const { dryRun = false, githubRelease = false, noGitChecks = false } = argv;
+    const { dryRun = false, githubRelease = false } = argv;
 
-    const options = { dryRun, noGitChecks };
+    const options = { dryRun };
 
     if (dryRun) {
       console.log('🧪 Running in DRY RUN mode - no actual publishing will occur\n');
@@ -291,11 +292,11 @@ export default /** @type {import('yargs').CommandModule<{}, Args>} */ ({
 
     // Get version from root package.json
     const version = await getReleaseVersion();
+    console.log(`📋 Release version: ${version}`);
 
     // Early validation for GitHub release (before any publishing)
     let githubReleaseData = null;
     if (githubRelease) {
-      console.log(`📋 Release version: ${version}`);
       githubReleaseData = await validateGitHubRelease(version);
     }
 
@@ -303,18 +304,11 @@ export default /** @type {import('yargs').CommandModule<{}, Args>} */ ({
     await publishToNpm(allPackages, options);
 
     // Create GitHub release or git tag after successful npm publishing
-    if (githubRelease && githubReleaseData) {
-      if (dryRun) {
-        console.log('\n🚀 Would create GitHub draft release (dry-run)');
-        console.log(githubReleaseData?.changelogContent);
-      } else {
-        await createRelease(
-          githubReleaseData.version,
-          githubReleaseData.changelogContent,
-          githubReleaseData.repoInfo,
-        );
-      }
-    } else if (version) {
+    if (githubRelease && githubReleaseData && !dryRun) {
+      await createRelease(version, githubReleaseData.changelogContent, githubReleaseData.repoInfo);
+    } else if (githubRelease && dryRun) {
+      console.log('\n🚀 Would create GitHub draft release (dry-run)');
+    } else {
       // Create git tag when not doing GitHub release
       await createGitTag(version, dryRun);
     }