@mui/internal-code-infra 0.0.3-canary.62 → 0.0.3-canary.64

package/build/utils/git.d.mts

@@ -2,13 +2,13 @@
  * @typedef {Object} RepoInfo
  * @property {string} owner - Repository owner
  * @property {string} repo - Repository name
+ * @property {string} remoteName - Remote 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>;
+export function getRepositoryInfo(): Promise<RepoInfo>;
 /**
  * Get current git SHA
  * @returns {Promise<string>} Current git commit SHA
@@ -23,4 +23,8 @@ export type RepoInfo = {
      * - Repository name
      */
     repo: string;
+    /**
+     * - Remote name
+     */
+    remoteName: string;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mui/internal-code-infra",
-  "version": "0.0.3-canary.62",
+  "version": "0.0.3-canary.64",
   "description": "Infra scripts and configs to be used across MUI repos.",
   "type": "module",
   "license": "MIT",
@@ -61,14 +61,14 @@
     "@eslint/compat": "^2.0.0",
     "@eslint/js": "^9.39.1",
     "@eslint/json": "^0.14.0",
-    "@inquirer/confirm": "^5.1.21",
+    "@inquirer/confirm": "^6.0.3",
     "@inquirer/select": "^5.0.2",
     "@napi-rs/keyring": "^1.2.0",
     "@octokit/auth-action": "^6.0.2",
     "@octokit/oauth-methods": "^6.0.2",
     "@octokit/rest": "^22.0.1",
     "@pnpm/find-workspace-dir": "^1000.1.3",
-    "@vitest/eslint-plugin": "^1.5.1",
+    "@vitest/eslint-plugin": "^1.6.4",
     "babel-plugin-optimize-clsx": "^2.6.2",
     "babel-plugin-react-compiler": "^1.0.0",
     "babel-plugin-transform-inline-environment-variables": "^0.4.4",
@@ -103,9 +103,9 @@
     "stylelint-config-standard": "^39.0.1",
     "typescript-eslint": "^8.49.0",
     "yargs": "^18.0.0",
-    "@mui/internal-babel-plugin-minify-errors": "2.0.8-canary.13",
+    "@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-display-name": "1.0.4-canary.8"
+    "@mui/internal-babel-plugin-minify-errors": "2.0.8-canary.13"
   },
   "peerDependencies": {
     "@next/eslint-plugin-next": "*",
@@ -142,7 +142,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitSha": "d9cf3df228aa4a3e7a7b1663bad0d7167f40d22c",
+  "gitSha": "dbef881bae7f3202ea876354b83af83f8970559a",
   "scripts": {
     "build": "tsc -p tsconfig.build.json",
     "typescript": "tsc -p tsconfig.json",

package/src/utils/changelog.mjs

@@ -2,6 +2,7 @@ import { Octokit } from '@octokit/rest';
 import { $ } from 'execa';
 
 import { persistentAuthStrategy } from './github.mjs';
+import { getRepositoryInfo } from './git.mjs';
 
 /**
  * @typedef {import('@octokit/rest').Octokit} OctokitType
@@ -39,8 +40,10 @@ export async function findLatestTaggedVersion(opts) {
   const $$ = $({ cwd: opts.cwd });
   const fetchAll = opts.fetchAll ?? true;
   if (fetchAll) {
-    // Fetch all tags from all remotes to ensure we have the latest tags.
-    await $$`git fetch --tags --all`;
+    const { remoteName } = await getRepositoryInfo();
+    // Fetch all tags from the mui remote to ensure we have the latest tags.
+    // --force to update any existing tags that may have changed to avoid the clobering error.
+    await $$`git fetch --tags --force ${remoteName}`;
   }
   const { stdout } = await $$`git describe --tags --abbrev=0 --match ${'v*'}`; // only include "version-tags"
   return stdout.trim();

package/src/utils/git.mjs

@@ -5,56 +5,54 @@ import gitUrlParse from 'git-url-parse';
  * @typedef {Object} RepoInfo
  * @property {string} owner - Repository owner
  * @property {string} repo - Repository name
+ * @property {string} remoteName - Remote 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']) {
+export async function getRepositoryInfo() {
   /**
    * @type {Record<string, string>}
    */
   const cause = {};
-  const cliResult = $`git remote -v`;
+  const { stdout } = await $`git remote -v`;
+  const lines = stdout.trim().split('\n');
   /**
-   * @type {Map<string, string>}
+   * @type {Set<string>}
    */
-  const repoRemotes = new Map();
+  const repoRemotes = new Set();
 
-  for await (const line of cliResult) {
+  for (const line of lines) {
     // Match pattern: "remoteName url (fetch|push)"
     const [remoteName, url, type] = line.trim().split(/\s+/, 3);
+    repoRemotes.add(remoteName);
     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;
+      try {
+        const parsed = gitUrlParse(url);
+        if (parsed.source !== 'github.com' || parsed.owner !== 'mui') {
+          cause[remoteName] = `Remote is not a GitHub repository under 'mui' organization: ${url}`;
+          continue;
+        }
+        return {
+          owner: parsed.owner,
+          repo: parsed.name,
+          remoteName,
+        };
+      } catch (error) {
+        cause[remoteName] = `Failed to parse URL for remote ${remoteName}: ${url}`;
       }
-      return {
-        owner: parsed.owner,
-        repo: parsed.name,
-      };
-    } catch (error) {
-      cause[remote] = `Failed to parse URL for remote ${remote}: ${url}`;
+    }
+    if (type !== '(push)') {
+      throw new Error(`Unexpected line format for "git remote -v": "${line}"`);
     }
   }
 
-  throw new Error(`Failed to find remote(s): ${remotes.join(', ')}`, { cause });
+  throw new Error(
+    `Failed to find correct remote(s) in : ${Array.from(repoRemotes.keys()).join(', ')}`,
+    { cause },
+  );
 }
 
 /**