@mui/internal-code-infra 0.0.4-canary.71 → 0.0.4-canary.73

package/build/utils/git.d.mts

@@ -20,3 +20,10 @@ export declare function getRepositoryInfo(cwd?: string): Promise<RepoInfo>;
  * @returns {Promise<string>} Current git commit SHA
  */
 export declare function getCurrentGitSha(): Promise<string>;
+/**
+ * Check whether a tag already exists on the origin remote
+ * @param {string} tagName - Tag name to check (e.g. `v1.2.3`)
+ * @param {string} [cwd=process.cwd()]
+ * @returns {Promise<boolean>} True if the tag exists on origin
+ */
+export declare function remoteGitTagExists(tagName: string, cwd?: string): Promise<boolean>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mui/internal-code-infra",
-  "version": "0.0.4-canary.71",
+  "version": "0.0.4-canary.73",
   "author": "MUI Team",
   "description": "Infra scripts and configs to be used across MUI repos.",
   "license": "MIT",
@@ -136,8 +136,8 @@
     "yaml": "^2.9.0",
     "yargs": "^18.0.0",
     "@mui/internal-babel-plugin-display-name": "1.0.4-canary.21",
-    "@mui/internal-babel-plugin-minify-errors": "2.0.8-canary.28",
-    "@mui/internal-babel-plugin-resolve-imports": "2.0.7-canary.38"
+    "@mui/internal-babel-plugin-resolve-imports": "2.0.7-canary.38",
+    "@mui/internal-babel-plugin-minify-errors": "2.0.8-canary.28"
   },
   "peerDependencies": {
     "@next/eslint-plugin-next": "*",
@@ -186,7 +186,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitSha": "cb672accc6b61d455e18ce874f99ea841831a734",
+  "gitSha": "a646322dc5697683ef464c5a05a0de6240de9f05",
   "scripts": {
     "build": "tsgo -p tsconfig.build.json",
     "typescript": "tsgo -noEmit",

package/src/cli/cmdPublish.mjs

@@ -23,7 +23,7 @@ import {
   publishPackages,
   validatePublishDependencies,
 } from '../utils/pnpm.mjs';
-import { getCurrentGitSha, getRepositoryInfo } from '../utils/git.mjs';
+import { getCurrentGitSha, getRepositoryInfo, remoteGitTagExists } from '../utils/git.mjs';
 
 const isCI = envCI().isCi;
 
@@ -365,7 +365,13 @@ export default /** @type {import('yargs').CommandModule<{}, Args>} */ ({
       console.log(`✅ Published ${pkg.name}@${pkg.version}`);
     });
 
-    await createGitTag(version, dryRun);
+    // Tag the root version when it's new. Arbitrary package publishes that don't
+    // bump the root version don't create a new tag, so skip in that case.
+    if (await remoteGitTagExists(`v${version}`)) {
+      console.log(`ℹ️  Git tag v${version} already exists, skipping tag creation.`);
+    } else {
+      await createGitTag(version, dryRun);
+    }
 
     // Create GitHub release or git tag after successful npm publishing
     if (githubRelease && githubReleaseData) {

package/src/utils/git.mjs

@@ -73,3 +73,14 @@ export async function getCurrentGitSha() {
   const result = await $`git rev-parse HEAD`;
   return result.stdout.trim();
 }
+
+/**
+ * Check whether a tag already exists on the origin remote
+ * @param {string} tagName - Tag name to check (e.g. `v1.2.3`)
+ * @param {string} [cwd=process.cwd()]
+ * @returns {Promise<boolean>} True if the tag exists on origin
+ */
+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;
+}

package/src/utils/pnpm.mjs

@@ -78,18 +78,33 @@ import { parseDocument, isMap } from 'yaml';
 export async function getWorkspacePackages(options = {}) {
   const { sinceRef = null, publicOnly = false, nonPublishedOnly = false, filter = [] } = options;
 
-  // Build command with conditional filter
-  const filterArg = sinceRef ? ['--filter', `...[${sinceRef}]`] : [];
-  if (filter.length > 0) {
-    filter.forEach((f) => {
-      filterArg.push('--filter', f);
-    });
+  /**
+   * Run `pnpm ls` with the given --filter args and return the parsed list.
+   * @param {string[]} filterArg
+   * @returns {Promise<PnpmListResultItem[]>}
+   */
+  const listPackages = async (filterArg) => {
+    const result = await $({ cwd: options.cwd })`pnpm ls -r --json --depth -1 ${filterArg}`;
+    return JSON.parse(result.stdout);
+  };
+
+  // pnpm ORs --filter args, so intersect "matches filter" with "changed since ref"
+  // in JS. The `[ref]` selector (no `...`) excludes dependents of changed packages.
+  const patternFilterArg = filter.flatMap((f) => ['--filter', f]);
+  const [candidatePackages, changedPackages] = await Promise.all([
+    listPackages(patternFilterArg),
+    // null when no sinceRef (skip the constraint); [] when nothing changed.
+    sinceRef ? listPackages(['--filter', `[${sinceRef}]`]) : Promise.resolve(null),
+  ]);
+  let packageData = candidatePackages;
+  if (changedPackages) {
+    // sinceRef given but nothing changed → no packages, regardless of filter.
+    if (changedPackages.length === 0) {
+      return [];
+    }
+    const changedPaths = new Set(changedPackages.map((pkg) => pkg.path));
+    packageData = packageData.filter((pkg) => changedPaths.has(pkg.path));
   }
-  const result = options.cwd
-    ? await $({ cwd: options.cwd })`pnpm ls -r --json --depth -1 ${filterArg}`
-    : await $`pnpm ls -r --json --depth -1 ${filterArg}`;
-  /** @type {PnpmListResultItem[]} */
-  const packageData = JSON.parse(result.stdout);
 
   // Filter packages based on options
   const filteredPackages = packageData.flatMap((pkg) => {