@mui/internal-code-infra 0.1.1-canary.21 → 0.1.1-canary.23

package/build/utils/pnpm.d.mts

@@ -124,19 +124,15 @@ export declare function getPublishRegistry(packagePath: string): Promise<string>
  * @returns {Promise<string | null>} Version string, or null when absent/invalid
  */
 export declare function getReleaseVersion(cwd?: string): Promise<string | null>;
-/**
- * Filter to the packages that must be published by hand before CI can take over.
- *
- * A brand new package has to be pushed once manually (see
- * `code-infra publish-new-package`) before the OIDC-based workflow can publish
- * it, so the release fails with a clear message instead of a confusing 404
- * midway through. See {@link getPackageVersionInfo} for the version-level check.
- *
- * @param {PublicPackage[]} packages - Packages to check
- * @returns {Promise<PublicPackage[]>} The subset needing a manual first publish
- */
-export declare function getPackagesNeedingManualPublish(packages: PublicPackage[]): Promise<PublicPackage[]>;
 export type RegistryPackage = {
+    /**
+     * - Registry that the package publishes to
+     */
+    registry: string;
+    /**
+     * - Whether the package is on the registry
+     */
+    exists: boolean;
     /**
      * - Dist-tags of the package
      */
@@ -148,17 +144,36 @@ export type RegistryPackage = {
 };
 /**
  * @typedef {Object} RegistryPackage
+ * @property {string} registry - Registry that the package publishes to
+ * @property {boolean} exists - Whether the package is on the registry
  * @property {Record<string, string>} distTags - Dist-tags of the package
  * @property {string[]} versions - Published versions of the package
  */
 /**
- * Read the dist-tags and the published versions of each package with `pnpm view`, so
- * the lookup uses the same registry configuration and credentials as `pnpm publish`.
+ * Read each package from its publish registry with `pnpm view`, so the lookup uses the
+ * same registry configuration and credentials as `pnpm publish`.
  *
  * @param {PublicPackage[]} packages - Packages to read
- * @returns {Promise<Map<string, RegistryPackage | null>>} By package name, null for a package that is not on the registry
+ * @param {{ npmOnly?: boolean }} [options] - `npmOnly` reads only the packages that publish to npm.
+ *   Checks that only concern npm use it, so a missing credential for another registry does not block them.
+ * @returns {Promise<Map<string, RegistryPackage>>} By package name
+ */
+export declare function getRegistryPackages(packages: PublicPackage[], { npmOnly }?: {
+    npmOnly?: boolean;
+}): Promise<Map<string, RegistryPackage>>;
+/**
+ * Filter to the packages that must be published by hand before CI can take over.
+ *
+ * A brand new package has to be pushed once manually (see
+ * `code-infra publish-new-package`) before the OIDC-based workflow can publish
+ * it, so the release fails with a clear message instead of a confusing 404
+ * midway through. See {@link getPackageVersionInfo} for the version-level check.
+ *
+ * @param {PublicPackage[]} packages - Packages to check
+ * @param {Map<string, RegistryPackage>} registryPackages - Registry data from {@link getRegistryPackages}
+ * @returns {PublicPackage[]} The subset needing a manual first publish
  */
-export declare function getRegistryPackages(packages: PublicPackage[]): Promise<Map<string, RegistryPackage | null>>;
+export declare function getPackagesNeedingManualPublish(packages: PublicPackage[], registryPackages: Map<string, RegistryPackage>): PublicPackage[];
 export type DistTagConflict = {
     /**
      * - Package to publish
@@ -179,15 +194,15 @@ export type DistTagConflict = {
  *
  * @param {PublicPackage[]} packages - Packages to publish
  * @param {string} tag - Dist-tag to publish with
- * @param {Map<string, RegistryPackage | null>} registryPackages - Registry data from {@link getRegistryPackages}
+ * @param {Map<string, RegistryPackage>} registryPackages - Registry data from {@link getRegistryPackages}
  * @returns {DistTagConflict[]}
  */
-export declare function getDistTagConflicts(packages: PublicPackage[], tag: string, registryPackages: Map<string, RegistryPackage | null>): DistTagConflict[];
+export declare function getDistTagConflicts(packages: PublicPackage[], tag: string, registryPackages: Map<string, RegistryPackage>): DistTagConflict[];
 /**
  * Get package version info from registry.
  *
  * Resolves through `pnpm view`, which reports a lookup failure the same way it
- * reports a missing version. Use {@link getPackagesNeedingManualPublish} where
+ * reports a missing version. Use {@link getRegistryPackages} where
  * absence has to be told apart from an error.
  *
  * @param {string} packageName - Name of the package

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mui/internal-code-infra",
-  "version": "0.1.1-canary.21",
+  "version": "0.1.1-canary.23",
   "author": "MUI Team",
   "description": "Infra scripts and configs to be used across MUI repos.",
   "license": "MIT",
@@ -67,23 +67,23 @@
     "@eslint/compat": "^2.1.1",
     "@eslint/js": "^10.0.1",
     "@eslint/json": "^2.1.1",
-    "@inquirer/confirm": "^6.3.3",
-    "@inquirer/select": "^5.2.6",
+    "@inquirer/confirm": "^6.3.4",
+    "@inquirer/select": "^5.2.7",
     "@mui/internal-babel-plugin-display-name": "2.0.1-canary.2",
     "@mui/internal-babel-plugin-minify-errors": "3.0.1-canary.2",
     "@mui/internal-babel-plugin-resolve-imports": "3.0.1-canary.3",
-    "@napi-rs/keyring": "^2.1.1",
+    "@napi-rs/keyring": "^2.1.2",
     "@octokit/auth-action": "^6.0.3",
     "@octokit/oauth-methods": "^6.0.5",
     "@octokit/plugin-retry": "^8.1.1",
     "@octokit/plugin-throttling": "^11.0.5",
     "@octokit/rest": "^22.0.1",
-    "@pnpm/config.version-policy": "^1100.2.8",
+    "@pnpm/config.version-policy": "^1100.2.9",
     "@pnpm/find-workspace-dir": "^1000.1.5",
     "@pnpm/parse-wanted-dependency": "^1001.0.0",
-    "@typescript-eslint/types": "^8.71.2",
-    "@typescript-eslint/utils": "^8.71.2",
-    "@vitest/eslint-plugin": "^1.6.27",
+    "@typescript-eslint/types": "^8.72.0",
+    "@typescript-eslint/utils": "^8.72.0",
+    "@vitest/eslint-plugin": "^1.6.28",
     "babel-plugin-optimize-clsx": "^2.6.2",
     "babel-plugin-react-compiler": "^1.0.0",
     "babel-plugin-transform-import-meta": "^3.1.0",
@@ -100,19 +100,19 @@
     "eslint-plugin-compat": "^7.0.2",
     "eslint-plugin-import": "^2.32.0",
     "eslint-plugin-jsx-a11y": "^6.10.2",
-    "eslint-plugin-mdx": "^3.8.1",
+    "eslint-plugin-mdx": "^3.8.2",
     "eslint-plugin-package-json": "^1.10.1",
     "eslint-plugin-react": "^7.37.5",
     "eslint-plugin-react-compiler": "^19.1.0-rc.2",
     "eslint-plugin-react-hooks": "^7.1.1",
     "eslint-plugin-testing-library": "^7.16.2",
-    "execa": "^10.1.1",
+    "execa": "^10.2.0",
     "git-url-parse": "^16.1.0",
     "globals": "^17.13.0",
     "globby": "^16.2.4",
-    "html-validate": "^11.16.2",
+    "html-validate": "^11.17.0",
     "minimatch": "^10.2.6",
-    "node-html-parser": "^9.0.4",
+    "node-html-parser": "^9.0.5",
     "open": "^11.0.4",
     "postcss-styled-syntax": "^0.7.4",
     "regexp.escape": "^2.0.1",
@@ -137,7 +137,7 @@
     "resolve-pkg-maps": "^1.0.0",
     "semver": "^7.8.5",
     "stylelint-config-standard": "^40.0.0",
-    "typescript-eslint": "^8.71.2",
+    "typescript-eslint": "^8.72.0",
     "unified": "^11.0.5",
     "unified-lint-rule": "^3.0.1",
     "unist-util-visit": "^5.1.0",
@@ -166,10 +166,10 @@
     "@types/mdast": "4.0.4",
     "@types/regexp.escape": "2.0.0",
     "@types/yargs": "17.0.35",
-    "@typescript-eslint/parser": "8.71.2",
-    "@typescript-eslint/rule-tester": "8.71.2",
+    "@typescript-eslint/parser": "8.72.0",
+    "@typescript-eslint/rule-tester": "8.72.0",
     "@typescript/native": "npm:typescript@7.0.2",
-    "eslint": "10.12.0",
+    "eslint": "10.13.0",
     "get-port": "7.2.0",
     "prettier": "3.9.10",
     "remark": "15.0.1",
@@ -190,7 +190,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitSha": "e8aec3f286672d4639af7b385ef313c3d8ec74f3",
+  "gitSha": "8d779945c318e7e2dada1296b64de1e618a99942",
   "scripts": {
     "build": "tsc -p tsconfig.build.json",
     "typescript": "tsc -noEmit",

package/src/cli/cmdPublish.mjs

@@ -366,7 +366,8 @@ export default /** @type {import('yargs').CommandModule<{}, Args>} */ ({
       githubReleaseData = await validateGitHubRelease(version);
     }
 
-    const newPackages = await getPackagesNeedingManualPublish(filteredPackages);
+    const registryPackages = await getRegistryPackages(filteredPackages);
+    const newPackages = getPackagesNeedingManualPublish(filteredPackages, registryPackages);
 
     if (newPackages.length > 0) {
       const newPackageNames = newPackages.map((pkg) => pkg.name).join(', ');
@@ -375,11 +376,7 @@ export default /** @type {import('yargs').CommandModule<{}, Args>} */ ({
       );
     }
 
-    const distTagConflicts = getDistTagConflicts(
-      filteredPackages,
-      tag,
-      await getRegistryPackages(filteredPackages),
-    );
+    const distTagConflicts = getDistTagConflicts(filteredPackages, tag, registryPackages);
     if (distTagConflicts.length > 0) {
       throw new Error(
         `Publishing with the "${tag}" dist-tag would move it to the wrong release line:
@@ -441,8 +438,10 @@ const PUBLISH_WORKFLOW_ID = `.github/${WORKFLOW_PATH}`;
  */
 async function triggerLocalGithubPublishWorkflow(opts) {
   console.log(`🔍 Checking if there are new packages to publish in the workspace...`);
-  const newPackages = await getPackagesNeedingManualPublish(
-    await getWorkspacePackages({ publicOnly: true }),
+  const packages = await getWorkspacePackages({ publicOnly: true });
+  const newPackages = getPackagesNeedingManualPublish(
+    packages,
+    await getRegistryPackages(packages, { npmOnly: true }),
   );
   if (newPackages.length) {
     console.warn(

package/src/cli/cmdPublishNewPackage.mjs

@@ -13,6 +13,7 @@ import { getRepositoryInfo } from '../utils/git.mjs';
 import { toPosixPath } from '../utils/path.mjs';
 import {
   getPackagesNeedingManualPublish,
+  getRegistryPackages,
   getWorkspacePackages,
   PLACEHOLDER_VERSION,
 } from '../utils/pnpm.mjs';
@@ -50,8 +51,10 @@ export default /** @type {import('yargs').CommandModule<{}, Args>} */ ({
       }),
   async handler(args) {
     console.log(`🔍 Detecting new packages to publish in workspace...`);
-    const newPackages = await getPackagesNeedingManualPublish(
-      await getWorkspacePackages({ publicOnly: true }),
+    const packages = await getWorkspacePackages({ publicOnly: true });
+    const newPackages = getPackagesNeedingManualPublish(
+      packages,
+      await getRegistryPackages(packages, { npmOnly: true }),
     );
 
     if (!newPackages.length) {

package/src/utils/pnpm.mjs

@@ -192,42 +192,82 @@ function requiresTrustedPublisherBootstrap(registry) {
 }
 
 /**
- * Filter to the packages that must be published by hand before CI can take over.
- *
- * A brand new package has to be pushed once manually (see
- * `code-infra publish-new-package`) before the OIDC-based workflow can publish
- * it, so the release fails with a clear message instead of a confusing 404
- * midway through. See {@link getPackageVersionInfo} for the version-level check.
+ * @typedef {Object} RegistryPackage
+ * @property {string} registry - Registry that the package publishes to
+ * @property {boolean} exists - Whether the package is on the registry
+ * @property {Record<string, string>} distTags - Dist-tags of the package
+ * @property {string[]} versions - Published versions of the package
+ */
+
+/**
+ * Read each package from its publish registry with `pnpm view`, so the lookup uses the
+ * same registry configuration and credentials as `pnpm publish`.
  *
- * @param {PublicPackage[]} packages - Packages to check
- * @returns {Promise<PublicPackage[]>} The subset needing a manual first publish
+ * @param {PublicPackage[]} packages - Packages to read
+ * @param {{ npmOnly?: boolean }} [options] - `npmOnly` reads only the packages that publish to npm.
+ *   Checks that only concern npm use it, so a missing credential for another registry does not block them.
+ * @returns {Promise<Map<string, RegistryPackage>>} By package name
  */
-export async function getPackagesNeedingManualPublish(packages) {
-  const results = await Promise.all(
+export async function getRegistryPackages(packages, { npmOnly = false } = {}) {
+  const entries = await Promise.all(
     packages.map(async (pkg) => {
       const registry = await getPublishRegistry(pkg.path);
-      if (!requiresTrustedPublisherBootstrap(registry)) {
-        return false;
+      if (npmOnly && registry !== NPMJS_REGISTRY) {
+        return null;
       }
-
-      // HEAD, because only the status matters — a packument runs to megabytes.
-      const res = await fetch(new URL(pkg.name, registry), { method: 'HEAD' });
-      if (res.status === 404) {
-        return true;
+      const { exitCode, stdout, stderr } = await $({
+        cwd: pkg.path,
+        reject: false,
+        // pnpm resolves its own `packageManager` version from `--registry`, which may not serve it.
+        env: { PNPM_CONFIG_PM_ON_FAIL: 'ignore' },
+      })`pnpm view ${pkg.name} dist-tags versions --json --registry ${registry}`;
+      let info;
+      try {
+        info = JSON.parse(stdout || '{}');
+      } catch {
+        info = {};
       }
-      if (!res.ok) {
-        // Anything else (401, 5xx, a proxy hiccup) tells us nothing about
-        // whether the package exists. Treating it as "already published" would
-        // silently disable the check, so fail loudly instead.
+      // Anything but a 404 tells nothing about whether the package exists. Treating it as
+      // "not published" would silently disable the checks, so fail loudly instead.
+      if (exitCode !== 0 && info.error?.code !== 'ERR_PNPM_FETCH_404') {
         throw new Error(
-          `Failed to check whether ${pkg.name} exists on ${registry}: HTTP ${res.status}`,
+          `Failed to read ${pkg.name} from ${registry}: ${info.error?.message ?? stderr}`,
         );
       }
-      return false;
+      /** @type {RegistryPackage} */
+      const registryPackage = {
+        registry,
+        exists: exitCode === 0,
+        distTags: info['dist-tags'] ?? {},
+        versions: [info.versions ?? []].flat(),
+      };
+      return /** @type {const} */ ([pkg.name, registryPackage]);
     }),
   );
+  return new Map(entries.filter((entry) => entry !== null));
+}
 
-  return packages.filter((_pkg, index) => results[index]);
+/**
+ * Filter to the packages that must be published by hand before CI can take over.
+ *
+ * A brand new package has to be pushed once manually (see
+ * `code-infra publish-new-package`) before the OIDC-based workflow can publish
+ * it, so the release fails with a clear message instead of a confusing 404
+ * midway through. See {@link getPackageVersionInfo} for the version-level check.
+ *
+ * @param {PublicPackage[]} packages - Packages to check
+ * @param {Map<string, RegistryPackage>} registryPackages - Registry data from {@link getRegistryPackages}
+ * @returns {PublicPackage[]} The subset needing a manual first publish
+ */
+export function getPackagesNeedingManualPublish(packages, registryPackages) {
+  return packages.filter((pkg) => {
+    const registryPackage = registryPackages.get(pkg.name);
+    return (
+      registryPackage !== undefined &&
+      !registryPackage.exists &&
+      requiresTrustedPublisherBootstrap(registryPackage.registry)
+    );
+  });
 }
 
 /**
@@ -256,54 +296,6 @@ function getDistTagConflict(tag, version, current) {
   return null;
 }
 
-/**
- * @typedef {Object} RegistryPackage
- * @property {Record<string, string>} distTags - Dist-tags of the package
- * @property {string[]} versions - Published versions of the package
- */
-
-/**
- * Read the dist-tags and the published versions of each package with `pnpm view`, so
- * the lookup uses the same registry configuration and credentials as `pnpm publish`.
- *
- * @param {PublicPackage[]} packages - Packages to read
- * @returns {Promise<Map<string, RegistryPackage | null>>} By package name, null for a package that is not on the registry
- */
-export async function getRegistryPackages(packages) {
-  const entries = await Promise.all(
-    packages.map(async (pkg) => {
-      const registry = await getPublishRegistry(pkg.path);
-      const { exitCode, stdout, stderr } = await $({
-        cwd: pkg.path,
-        reject: false,
-        // pnpm resolves its own `packageManager` version from `--registry`, which may not serve it.
-        env: { PNPM_CONFIG_PM_ON_FAIL: 'ignore' },
-      })`pnpm view ${pkg.name} dist-tags versions --json --registry ${registry}`;
-      let info;
-      try {
-        info = JSON.parse(stdout || '{}');
-      } catch {
-        info = {};
-      }
-      if (exitCode !== 0) {
-        if (info.error?.code === 'ERR_PNPM_FETCH_404') {
-          return /** @type {const} */ ([pkg.name, null]);
-        }
-        throw new Error(
-          `Failed to read the dist-tags of ${pkg.name} from ${registry}: ${info.error?.message ?? stderr}`,
-        );
-      }
-      /** @type {RegistryPackage} */
-      const registryPackage = {
-        distTags: info['dist-tags'] ?? {},
-        versions: [info.versions ?? []].flat(),
-      };
-      return /** @type {const} */ ([pkg.name, registryPackage]);
-    }),
-  );
-  return new Map(entries);
-}
-
 /**
  * @typedef {Object} DistTagConflict
  * @property {PublicPackage} pkg - Package to publish
@@ -315,19 +307,19 @@ export async function getRegistryPackages(packages) {
  *
  * @param {PublicPackage[]} packages - Packages to publish
  * @param {string} tag - Dist-tag to publish with
- * @param {Map<string, RegistryPackage | null>} registryPackages - Registry data from {@link getRegistryPackages}
+ * @param {Map<string, RegistryPackage>} registryPackages - Registry data from {@link getRegistryPackages}
  * @returns {DistTagConflict[]}
  */
 export function getDistTagConflicts(packages, tag, registryPackages) {
   return packages.flatMap((pkg) => {
     const registryPackage = registryPackages.get(pkg.name);
-    // A package that is not on the registry yet has no dist-tags to protect. pnpm skips versions
-    // that are already published, such as unchanged packages on a legacy branch.
+    // pnpm skips versions that are already published, such as unchanged packages on a legacy branch.
     if (!registryPackage || registryPackage.versions.includes(pkg.version)) {
       return [];
     }
+    // A package that is not on the registry yet has no dist-tags to protect, and npm points
+    // `latest` at the first version, which is the placeholder for a new package.
     const current = semver.valid(registryPackage.distTags[tag]);
-    // npm points `latest` at the first version, which is the placeholder for a new package.
     if (!current || current === PLACEHOLDER_VERSION) {
       return [];
     }
@@ -340,7 +332,7 @@ export function getDistTagConflicts(packages, tag, registryPackages) {
  * Get package version info from registry.
  *
  * Resolves through `pnpm view`, which reports a lookup failure the same way it
- * reports a missing version. Use {@link getPackagesNeedingManualPublish} where
+ * reports a missing version. Use {@link getRegistryPackages} where
  * absence has to be told apart from an error.
  *
  * @param {string} packageName - Name of the package