@mui/internal-code-infra 0.1.1-canary.4 → 0.1.1-canary.5

package/build/changelog/fetchChangelogs.d.mts

@@ -22,16 +22,6 @@ export type FetchCommitsOptions = {
  * @property {string} release
  * @property {string} [org='mui'] - GitHub organization name, defaults to 'mui'
  */
-/**
- * @param {Object} opts
- * @param {string} opts.cwd
- * @param {boolean} [opts.fetchAll=true] Whether to fetch all tags from all remotes before finding the latest tag.
- * @returns {Promise<string>}
- */
-export declare function findLatestTaggedVersion(opts: {
-    cwd: string;
-    fetchAll?: boolean;
-}): Promise<string>;
 /**
  * Fetches commits between two refs (lastRelease..release) including PR details.
  * Automatically handles GitHub OAuth authentication if none provided.

package/build/changelog/index.d.mts

@@ -4,3 +4,4 @@
 export { generateChangelog } from './generateChangelog.mjs';
 export * from './loadChangelogConfig.mjs';
 export * from './fetchChangelogs.mjs';
+export { findLatestTaggedVersion } from '../utils/git.mjs';

package/build/cli/cmdBaseline.d.mts

@@ -0,0 +1,18 @@
+#!/usr/bin/env node
+export type Args = {
+    /**
+     * - Branch pull requests fork from
+     */
+    baseBranch?: string;
+    /**
+     * - Remote the base branch is fetched from
+     */
+    remote?: string;
+};
+/**
+ * @typedef {Object} Args
+ * @property {string} [baseBranch] - Branch pull requests fork from
+ * @property {string} [remote] - Remote the base branch is fetched from
+ */
+declare const _default: import('yargs').CommandModule<{}, Args>;
+export default _default;

package/build/utils/git.d.mts

@@ -13,22 +13,18 @@ export type RepoInfo = {
     remoteName: string;
 };
 /**
- * @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
+ * The canonical repository's remote, as opposed to a fork's: `upstream`, else `origin`, each only if
+ * it points at a mui repository. Reads the configured URLs, which `insteadOf` does not rewrite.
  * @param {string} [cwd=process.cwd()]
- * @returns {Promise<RepoInfo>} Repository owner and name
+ * @returns {Promise<RepoInfo>}
  */
 export declare function getRepositoryInfo(cwd?: string): Promise<RepoInfo>;
 /**
  * Get current git SHA
+ * @param {string} [cwd=process.cwd()]
  * @returns {Promise<string>} Current git commit SHA
  */
-export declare function getCurrentGitSha(): Promise<string>;
+export declare function getCurrentGitSha(cwd?: string): Promise<string>;
 /**
  * Check whether a tag already exists on the origin remote
  * @param {string} tagName - Tag name to check (e.g. `v1.2.3`)
@@ -36,3 +32,28 @@ export declare function getCurrentGitSha(): Promise<string>;
  * @returns {Promise<boolean>} True if the tag exists on origin
  */
 export declare function remoteGitTagExists(tagName: string, cwd?: string): Promise<boolean>;
+/**
+ * The commit HEAD should be compared against: where it forked from the base branch, or its parent
+ * when HEAD is already on the base branch.
+ * @param {Object} [options]
+ * @param {string} [options.cwd]
+ * @param {string} [options.remote] - Defaults to the canonical remote.
+ * @param {string} [options.baseBranch] - Defaults to the remote's default branch.
+ * @returns {Promise<string>}
+ */
+export declare function resolveBaseline(options?: {
+    cwd?: string;
+    remote?: string;
+    baseBranch?: string;
+}): Promise<string>;
+/**
+ * The most recent version tag reachable from HEAD — where a changelog's range starts.
+ * @param {Object} opts
+ * @param {string} opts.cwd
+ * @param {boolean} [opts.fetchAll=true] Whether to fetch all tags from all remotes before finding the latest tag.
+ * @returns {Promise<string>}
+ */
+export declare function findLatestTaggedVersion(opts: {
+    cwd: string;
+    fetchAll?: boolean;
+}): Promise<string>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mui/internal-code-infra",
-  "version": "0.1.1-canary.4",
+  "version": "0.1.1-canary.5",
   "author": "MUI Team",
   "description": "Infra scripts and configs to be used across MUI repos.",
   "license": "MIT",
@@ -53,14 +53,14 @@
     "code-infra": "./bin/code-infra.mjs"
   },
   "dependencies": {
-    "@argos-ci/core": "6.8.4",
-    "@babel/cli": "^8.0.5",
-    "@babel/core": "^8.0.5",
+    "@argos-ci/core": "6.8.5",
+    "@babel/cli": "^8.0.6",
+    "@babel/core": "^8.0.6",
     "@babel/plugin-syntax-jsx": "^8.0.1",
-    "@babel/plugin-syntax-typescript": "^8.0.1",
+    "@babel/plugin-syntax-typescript": "^8.0.3",
     "@babel/plugin-transform-react-pure-annotations": "^8.0.1",
-    "@babel/plugin-transform-runtime": "^8.0.1",
-    "@babel/preset-env": "^8.0.5",
+    "@babel/plugin-transform-runtime": "^8.0.6",
+    "@babel/preset-env": "^8.0.6",
     "@babel/preset-react": "^8.0.1",
     "@babel/preset-typescript": "^8.0.1",
     "@eslint/compat": "^2.1.1",
@@ -68,14 +68,14 @@
     "@eslint/json": "^2.1.0",
     "@inquirer/confirm": "^6.3.2",
     "@inquirer/select": "^5.2.5",
-    "@mui/internal-babel-plugin-display-name": "2.0.1-canary.0",
-    "@mui/internal-babel-plugin-minify-errors": "3.0.1-canary.0",
-    "@mui/internal-babel-plugin-resolve-imports": "3.0.1-canary.1",
-    "@napi-rs/keyring": "^2.0.0",
+    "@mui/internal-babel-plugin-display-name": "2.0.1-canary.1",
+    "@mui/internal-babel-plugin-minify-errors": "3.0.1-canary.1",
+    "@mui/internal-babel-plugin-resolve-imports": "3.0.1-canary.2",
+    "@napi-rs/keyring": "^2.1.0",
     "@octokit/auth-action": "^6.0.3",
     "@octokit/oauth-methods": "^6.0.5",
     "@octokit/rest": "^22.0.1",
-    "@pnpm/config.version-policy": "^1100.2.3",
+    "@pnpm/config.version-policy": "^1100.2.5",
     "@pnpm/find-workspace-dir": "^1000.1.5",
     "@pnpm/parse-wanted-dependency": "^1001.0.0",
     "@typescript-eslint/types": "^8.70.1",
@@ -86,9 +86,9 @@
     "babel-plugin-transform-import-meta": "^3.0.0",
     "babel-plugin-transform-react-remove-prop-types": "^0.4.24",
     "babel-plugin-transform-remove-imports": "^1.8.1",
-    "chalk": "^6.0.0",
+    "chalk": "^6.0.1",
     "clipboardy": "^5.3.2",
-    "content-type": "^3.1.0",
+    "content-type": "^3.1.1",
     "env-ci": "^11.2.0",
     "es-toolkit": "^1.52.0",
     "eslint-config-prettier": "^10.1.8",
@@ -106,11 +106,11 @@
     "git-url-parse": "^16.1.0",
     "globals": "^17.12.0",
     "globby": "^16.2.4",
-    "html-validate": "^11.15.0",
+    "html-validate": "^11.16.1",
     "minimatch": "^10.2.6",
     "node-html-parser": "^9.0.4",
-    "open": "^11.0.3",
-    "postcss-styled-syntax": "^0.7.2",
+    "open": "^11.0.4",
+    "postcss-styled-syntax": "^0.7.3",
     "regexp.escape": "^2.0.1",
     "rehype-slug": "^6.0.0",
     "rehype-stringify": "^10.0.1",
@@ -138,7 +138,7 @@
     "unified-lint-rule": "^3.0.1",
     "unist-util-visit": "^5.1.0",
     "yaml": "^2.9.1",
-    "yargs": "^18.1.0"
+    "yargs": "^18.2.0"
   },
   "peerDependencies": {
     "@next/eslint-plugin-next": "*",
@@ -187,7 +187,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitSha": "6b201e6626d428b0f335c8eb7103c8c9b9cf8f5b",
+  "gitSha": "c2a0ca83b8dd00ae2fa2b5714dbc6684d50926d9",
   "scripts": {
     "build": "tsc -p tsconfig.build.json",
     "typescript": "tsc -noEmit",

package/src/changelog/fetchChangelogs.mjs

@@ -1,7 +1,5 @@
 import { Octokit } from '@octokit/rest';
-import { $ } from 'execa';
 
-import { getRepositoryInfo } from '../utils/git.mjs';
 import { persistentAuthStrategy } from '../utils/github.mjs';
 
 /**
@@ -20,25 +18,6 @@ import { persistentAuthStrategy } from '../utils/github.mjs';
  * @property {string} [org='mui'] - GitHub organization name, defaults to 'mui'
  */
 
-/**
- * @param {Object} opts
- * @param {string} opts.cwd
- * @param {boolean} [opts.fetchAll=true] Whether to fetch all tags from all remotes before finding the latest tag.
- * @returns {Promise<string>}
- */
-export async function findLatestTaggedVersion(opts) {
-  const $$ = $({ cwd: opts.cwd });
-  const fetchAll = opts.fetchAll ?? true;
-  if (fetchAll) {
-    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();
-}
-
 /**
  * Fetches commits between two refs (lastRelease..release) including PR details.
  * Automatically handles GitHub OAuth authentication if none provided.

package/src/changelog/index.mjs

@@ -5,3 +5,6 @@
 export { generateChangelog } from './generateChangelog.mjs';
 export * from './loadChangelogConfig.mjs';
 export * from './fetchChangelogs.mjs';
+// Moved to the git utilities, where the rest of the local git plumbing lives. Re-exported because
+// `@mui/internal-code-infra/changelog` is a published entry point and this was part of it.
+export { findLatestTaggedVersion } from '../utils/git.mjs';

package/src/cli/cmdBaseline.mjs

@@ -0,0 +1,31 @@
+#!/usr/bin/env node
+
+/* eslint-disable no-console */
+
+import { resolveBaseline } from '../utils/git.mjs';
+
+/**
+ * @typedef {Object} Args
+ * @property {string} [baseBranch] - Branch pull requests fork from
+ * @property {string} [remote] - Remote the base branch is fetched from
+ */
+
+export default /** @type {import('yargs').CommandModule<{}, Args>} */ ({
+  command: 'baseline',
+  describe: 'Print the commit HEAD should be compared against',
+  builder: (yargs) => {
+    return yargs
+      .option('base-branch', {
+        type: 'string',
+        description: "Branch pull requests fork from. Default: the remote's default branch",
+      })
+      .option('remote', {
+        type: 'string',
+        description:
+          'Remote the base branch is fetched from. Default: upstream, else origin, whichever points at a mui repository',
+      });
+  },
+  handler: async (argv) => {
+    console.log(await resolveBaseline({ baseBranch: argv.baseBranch, remote: argv.remote }));
+  },
+});

package/src/cli/index.mjs

@@ -4,6 +4,7 @@ import yargs from 'yargs';
 import { hideBin } from 'yargs/helpers';
 
 import cmdArgosPush from './cmdArgosPush.mjs';
+import cmdBaseline from './cmdBaseline.mjs';
 import cmdBuild from './cmdBuild.mjs';
 import cmdCopyFiles from './cmdCopyFiles.mjs';
 import cmdExtractErrorCodes from './cmdExtractErrorCodes.mjs';
@@ -38,6 +39,7 @@ await yargs(hideBin(process.argv))
     globalArgv = argv;
   }, true)
   .command(cmdArgosPush)
+  .command(cmdBaseline)
   .command(cmdBuild)
   .command(cmdCopyFiles)
   .command(cmdExtractErrorCodes)

package/src/utils/git.mjs

@@ -9,68 +9,63 @@ import gitUrlParse from 'git-url-parse';
  */
 
 /**
- * Get current repository info from git remote
+ * The repository a remote URL points at, if it is a GitHub repository under `mui`.
+ * @param {string} url
+ * @returns {{ owner: string, repo: string } | null}
+ */
+function muiRepositoryOf(url) {
+  try {
+    const parsed = gitUrlParse(url);
+    return parsed.source === 'github.com' && parsed.owner === 'mui'
+      ? { owner: parsed.owner, repo: parsed.name }
+      : null;
+  } catch {
+    // Not a URL git-url-parse understands, such as a local path: not a mui repository either.
+    return null;
+  }
+}
+
+/**
+ * The canonical repository's remote, as opposed to a fork's: `upstream`, else `origin`, each only if
+ * it points at a mui repository. Reads the configured URLs, which `insteadOf` does not rewrite.
  * @param {string} [cwd=process.cwd()]
- * @returns {Promise<RepoInfo>} Repository owner and name
+ * @returns {Promise<RepoInfo>}
  */
 export async function getRepositoryInfo(cwd = process.cwd()) {
-  /**
-   * @type {Record<string, string>}
-   */
-  const cause = {};
-  const { stdout } = await $({ cwd })`git remote -v`;
-  const lines = stdout.trim().split('\n');
-  /**
-   * @type {Set<string>}
-   */
-  const repoRemotes = new Set();
-  /**
-   * @type {Map<string, { owner: string, repo: string }>}
-   */
-  const validRemotes = new Map();
-
-  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)') {
-      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;
-        }
-        if (!validRemotes.has(remoteName)) {
-          validRemotes.set(remoteName, { owner: parsed.owner, repo: parsed.name });
-        }
-      } catch (error) {
-        cause[remoteName] = `Failed to parse URL for remote ${remoteName}: ${url}`;
-      }
-    } else if (type !== '(push)') {
-      throw new Error(`Unexpected line format for "git remote -v": "${line}"`);
-    }
+  // Exits 1 when neither remote is configured; the error below reports that.
+  const { stdout } = await $({
+    cwd,
+    reject: false,
+  })`git config --get-regexp ${'^remote\\.(upstream|origin)\\.url$'}`;
+  /** @type {Map<string, string>} */
+  const urls = new Map();
+  for (const line of stdout.split('\n').filter(Boolean)) {
+    const [key, url] = line.split(' ', 2);
+    urls.set(key.slice('remote.'.length, -'.url'.length), url);
   }
 
-  const preferredOrder = ['upstream', 'origin', ...validRemotes.keys()];
-  for (const name of preferredOrder) {
-    const match = validRemotes.get(name);
-    if (match) {
-      return { ...match, remoteName: name };
+  for (const remoteName of ['upstream', 'origin']) {
+    const url = urls.get(remoteName);
+    const repository = url ? muiRepositoryOf(url) : null;
+    if (repository) {
+      return { ...repository, remoteName };
     }
   }
 
+  const found = [...urls].map(([name, url]) => `${name}: ${url}`).join(', ') || 'none';
   throw new Error(
-    `Failed to find correct remote(s) in : ${Array.from(repoRemotes.keys()).join(', ')}`,
-    { cause },
+    `No canonical remote: neither \`upstream\` nor \`origin\` points at a mui repository (${found}). ` +
+      'Add an `upstream` remote for it, or name the remote explicitly where the command allows it.',
   );
 }
 
 /**
  * Get current git SHA
+ * @param {string} [cwd=process.cwd()]
  * @returns {Promise<string>} Current git commit SHA
  */
-export async function getCurrentGitSha() {
-  const result = await $`git rev-parse HEAD`;
+export async function getCurrentGitSha(cwd = process.cwd()) {
+  const result = await $({ cwd })`git rev-parse HEAD`;
   return result.stdout.trim();
 }
 
@@ -84,3 +79,69 @@ export async function remoteGitTagExists(tagName, cwd = process.cwd()) {
   const { stdout } = await $({ cwd })`git ls-remote --tags origin refs/tags/${tagName}`;
   return stdout.trim().length > 0;
 }
+
+/**
+ * The default branch of `remote`, as the remote itself reports it.
+ * @param {string} remote
+ * @param {string} cwd
+ * @returns {Promise<string>}
+ */
+async function getDefaultBranchOf(remote, cwd) {
+  const { stdout } = await $({ cwd })`git ls-remote --symref ${remote} HEAD`;
+  const match = /^ref: refs\/heads\/(\S+)\tHEAD$/m.exec(stdout);
+  if (!match) {
+    throw new Error(`Remote "${remote}" does not report a default branch.`);
+  }
+  return match[1];
+}
+
+/**
+ * The commit HEAD should be compared against: where it forked from the base branch, or its parent
+ * when HEAD is already on the base branch.
+ * @param {Object} [options]
+ * @param {string} [options.cwd]
+ * @param {string} [options.remote] - Defaults to the canonical remote.
+ * @param {string} [options.baseBranch] - Defaults to the remote's default branch.
+ * @returns {Promise<string>}
+ */
+export async function resolveBaseline(options = {}) {
+  const cwd = options.cwd ?? process.cwd();
+  const remote = options.remote ?? (await getRepositoryInfo(cwd)).remoteName;
+  const baseBranch = options.baseBranch ?? (await getDefaultBranchOf(remote, cwd));
+
+  await $({ cwd })`git fetch --no-tags ${remote} ${baseBranch}`;
+  const [forkPoint, head] = await Promise.all([
+    $({ cwd })`git merge-base HEAD FETCH_HEAD`.then((result) => result.stdout.trim()),
+    getCurrentGitSha(cwd),
+  ]);
+  if (forkPoint !== head) {
+    return forkPoint;
+  }
+
+  const parent = await $({ cwd, reject: false })`git rev-parse --verify HEAD~1`;
+  if (parent.exitCode !== 0) {
+    throw new Error(
+      'HEAD has no parent commit to compare against. A shallow clone is the usual cause.',
+    );
+  }
+  return parent.stdout.trim();
+}
+
+/**
+ * The most recent version tag reachable from HEAD — where a changelog's range starts.
+ * @param {Object} opts
+ * @param {string} opts.cwd
+ * @param {boolean} [opts.fetchAll=true] Whether to fetch all tags from all remotes before finding the latest tag.
+ * @returns {Promise<string>}
+ */
+export async function findLatestTaggedVersion(opts) {
+  const $$ = $({ cwd: opts.cwd });
+  const fetchAll = opts.fetchAll ?? true;
+  if (fetchAll) {
+    // --force to update any existing tags that may have changed to avoid the clobering error.
+    const { remoteName } = await getRepositoryInfo(opts.cwd);
+    await $$`git fetch --tags --force ${remoteName}`;
+  }
+  const { stdout } = await $$`git describe --tags --abbrev=0 --match ${'v*'}`; // only include "version-tags"
+  return stdout.trim();
+}