@mui/internal-code-infra 0.0.3-canary.49 → 0.0.3-canary.50

package/build/utils/git.d.mts

@@ -0,0 +1,26 @@
+/**
+ * @typedef {Object} RepoInfo
+ * @property {string} owner - Repository owner
+ * @property {string} repo - Repository name
+ */
+/**
+ * Get current repository info from git remote
+ * @param {string[]} [remotes=['upstream', 'origin']] - Remote name(s) to check (default: ['upstream', 'origin'])
+ * @returns {Promise<RepoInfo>} Repository owner and name
+ */
+export function getRepositoryInfo(remotes?: string[]): Promise<RepoInfo>;
+/**
+ * Get current git SHA
+ * @returns {Promise<string>} Current git commit SHA
+ */
+export function getCurrentGitSha(): Promise<string>;
+export type RepoInfo = {
+    /**
+     * - Repository owner
+     */
+    owner: string;
+    /**
+     * - Repository name
+     */
+    repo: string;
+};

package/build/utils/pnpm.d.mts

@@ -124,11 +124,6 @@ export function readPackageJson(packagePath: string): Promise<import("../cli/pac
  * @returns {Promise<void>}
  */
 export function writePackageJson(packagePath: string, packageJson: Object): Promise<void>;
-/**
- * Get current git SHA
- * @returns {Promise<string>} Current git commit SHA
- */
-export function getCurrentGitSha(): Promise<string>;
 /**
  * Resolve a package@version specifier to an exact version
  * @param {string} packageSpec - Package specifier in format "package@version"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mui/internal-code-infra",
-  "version": "0.0.3-canary.49",
+  "version": "0.0.3-canary.50",
   "description": "Infra scripts and configs to be used across MUI repos.",
   "type": "module",
   "license": "MIT",
@@ -101,9 +101,9 @@
     "stylelint-config-standard": "^39.0.1",
     "typescript-eslint": "^8.46.3",
     "yargs": "^18.0.0",
-    "@mui/internal-babel-plugin-display-name": "1.0.4-canary.8",
+    "@mui/internal-babel-plugin-resolve-imports": "2.0.7-canary.28",
     "@mui/internal-babel-plugin-minify-errors": "2.0.8-canary.11",
-    "@mui/internal-babel-plugin-resolve-imports": "2.0.7-canary.28"
+    "@mui/internal-babel-plugin-display-name": "1.0.4-canary.8"
   },
   "peerDependencies": {
     "@next/eslint-plugin-next": "*",
@@ -140,7 +140,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitSha": "e8720c89db86b256b0422d1c77fc292f979b892c",
+  "gitSha": "c98d146c72fd9e4db92810432a550a4b2c530de9",
   "scripts": {
     "build": "tsc -p tsconfig.build.json",
     "typescript": "tsc -p tsconfig.json",

package/src/cli/cmdPublish.mjs

@@ -13,12 +13,12 @@ import { Octokit } from '@octokit/rest';
 import chalk from 'chalk';
 import envCI from 'env-ci';
 import { $ } from 'execa';
-import gitUrlParse from 'git-url-parse';
 import * as fs from 'node:fs/promises';
 import * as semver from 'semver';
 
 import { persistentAuthStrategy } from '../utils/github.mjs';
 import { getWorkspacePackages, publishPackages } from '../utils/pnpm.mjs';
+import { getCurrentGitSha, getRepositoryInfo } from '../utils/git.mjs';
 
 const isCI = envCI().isCi;
 
@@ -126,66 +126,6 @@ async function checkGitHubReleaseExists(owner, repo, version) {
   }
 }
 
-/**
- * Get current repository info from git remote
- * @param {string[]} [remotes=['origin']] - Remote name(s) to check (default: 'origin')
- * @returns {Promise<{owner: string, repo: string}>} Repository owner and name
- */
-async function getRepositoryInfo(remotes = ['origin']) {
-  /**
-   * @type {{owner: string, repo: string} | undefined}
-   */
-  let result;
-  /**
-   * @type {Record<string, any>}
-   */
-  const cause = {};
-
-  for (let i = 0; i < remotes.length; i += 1) {
-    const remote = remotes[i];
-    try {
-      // eslint-disable-next-line no-await-in-loop
-      const cliResult = await $`git remote get-url ${remote}`;
-      const url = cliResult.stdout.trim();
-
-      const parsed = gitUrlParse(url);
-      if (parsed.source !== 'github.com' && parsed.owner !== 'mui') {
-        cause[remote] = { message: `Unsupported git remote URL: ${url}` };
-        continue;
-      }
-
-      result = {
-        owner: parsed.owner,
-        repo: parsed.name,
-      };
-      break; // break as soon as we have a valid result
-    } catch (/** @type {any} */ error) {
-      const execaError = /** @type {import('execa').ExecaError} */ (error);
-      if (
-        i < remotes.length - 1 &&
-        typeof execaError.stderr === 'string' &&
-        execaError.stderr.includes('No such remote')
-      ) {
-        continue; // Try next remote
-      }
-      cause[remote] = error;
-    }
-  }
-  if (!result) {
-    throw new Error(`Failed to find remote`, { cause });
-  }
-  return result;
-}
-
-/**
- * Get current git SHA
- * @returns {Promise<string>} Current git commit SHA
- */
-async function getCurrentGitSha() {
-  const result = await $`git rev-parse HEAD`;
-  return result.stdout.trim();
-}
-
 /**
  * Create and push a git tag
  * @param {string} version - Version to tag
@@ -423,7 +363,7 @@ Please run the command "${chalk.bold('pnpm code-infra publish-new-package')}" fi
     return;
   }
   console.log('✅ No new packages found, proceeding...');
-  const repoInfo = await getRepositoryInfo(['upstream', 'origin']);
+  const repoInfo = await getRepositoryInfo();
   console.log(`📂 Repository: ${repoInfo.owner}/${repoInfo.repo}`);
   const params = {
     owner: repoInfo.owner,

package/src/cli/cmdPublishCanary.mjs

@@ -12,11 +12,9 @@ import path from 'node:path';
 import { createActionAuth } from '@octokit/auth-action';
 import { Octokit } from '@octokit/rest';
 import { $ } from 'execa';
-import gitUrlParse from 'git-url-parse';
 import * as semver from 'semver';
 
 import {
-  getCurrentGitSha,
   getPackageVersionInfo,
   getWorkspacePackages,
   publishPackages,
@@ -24,6 +22,7 @@ import {
   semverMax,
   writePackageJson,
 } from '../utils/pnpm.mjs';
+import { getCurrentGitSha, getRepositoryInfo } from '../utils/git.mjs';
 
 /**
  * @typedef {Object} Args
@@ -41,29 +40,6 @@ function getOctokit() {
   return new Octokit({ authStrategy: createActionAuth });
 }
 
-/**
- * Get current repository info from git remote
- * @returns {Promise<{owner: string, repo: string}>} Repository owner and name
- */
-async function getRepositoryInfo() {
-  try {
-    const result = await $`git remote get-url origin`;
-    const url = result.stdout.trim();
-
-    const parsed = gitUrlParse(url);
-    if (parsed.source !== 'github.com') {
-      throw new Error('Repository is not hosted on GitHub');
-    }
-
-    return {
-      owner: parsed.owner,
-      repo: parsed.name,
-    };
-  } catch (/** @type {any} */ error) {
-    throw new Error(`Failed to get repository info: ${error.message}`);
-  }
-}
-
 /**
  * @typedef {Object} Commit
  * @property {string} sha - Commit SHA

package/src/utils/git.mjs

@@ -0,0 +1,67 @@
+import { $ } from 'execa';
+import gitUrlParse from 'git-url-parse';
+
+/**
+ * @typedef {Object} RepoInfo
+ * @property {string} owner - Repository owner
+ * @property {string} repo - Repository name
+ */
+
+/**
+ * Get current repository info from git remote
+ * @param {string[]} [remotes=['upstream', 'origin']] - Remote name(s) to check (default: ['upstream', 'origin'])
+ * @returns {Promise<RepoInfo>} Repository owner and name
+ */
+export async function getRepositoryInfo(remotes = ['upstream', 'origin']) {
+  /**
+   * @type {Record<string, string>}
+   */
+  const cause = {};
+  const cliResult = $`git remote -v`;
+  /**
+   * @type {Map<string, string>}
+   */
+  const repoRemotes = new Map();
+
+  for await (const line of cliResult) {
+    // Match pattern: "remoteName url (fetch|push)"
+    const [remoteName, url, type] = line.trim().split(/\s+/, 3);
+    if (type === '(fetch)') {
+      repoRemotes.set(remoteName, url);
+    } else if (type !== '(push)') {
+      throw new Error(`Unexpected line format for "git remote -v": "${line}"`);
+    }
+  }
+
+  for (const remote of remotes) {
+    if (!repoRemotes.has(remote)) {
+      cause[remote] = 'Remote not found';
+      continue;
+    }
+    const url = /** @type {string} */ (repoRemotes.get(remote));
+    try {
+      const parsed = gitUrlParse(url);
+      if (parsed.source !== 'github.com' || parsed.owner !== 'mui') {
+        cause[remote] = `Remote is not a GitHub repository under 'mui' organization: ${url}`;
+        continue;
+      }
+      return {
+        owner: parsed.owner,
+        repo: parsed.name,
+      };
+    } catch (error) {
+      cause[remote] = `Failed to parse URL for remote ${remote}: ${url}`;
+    }
+  }
+
+  throw new Error(`Failed to find remote(s): ${remotes.join(', ')}`, { cause });
+}
+
+/**
+ * Get current git SHA
+ * @returns {Promise<string>} Current git commit SHA
+ */
+export async function getCurrentGitSha() {
+  const result = await $`git rev-parse HEAD`;
+  return result.stdout.trim();
+}

package/src/utils/pnpm.mjs

@@ -193,15 +193,6 @@ export async function writePackageJson(packagePath, packageJson) {
   await fs.writeFile(path.join(packagePath, 'package.json'), content);
 }
 
-/**
- * Get current git SHA
- * @returns {Promise<string>} Current git commit SHA
- */
-export async function getCurrentGitSha() {
-  const result = await $`git rev-parse HEAD`;
-  return result.stdout.trim();
-}
-
 /**
  * Resolve a package@version specifier to an exact version
  * @param {string} packageSpec - Package specifier in format "package@version"