@mui/internal-code-infra 0.0.2-canary.5 → 0.0.2-canary.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mui/internal-code-infra",
-  "version": "0.0.2-canary.5",
+  "version": "0.0.2-canary.7",
   "description": "Infra scripts and configs to be used across MUI repos.",
   "type": "module",
   "repository": {
@@ -25,6 +25,7 @@
     "@next/eslint-plugin-next": "^15.3.3",
     "@octokit/rest": "^22.0.0",
     "@eslint/compat": "^1.3.1",
+    "chalk": "^5.4.1",
     "eslint-config-airbnb": "^19.0.4",
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-config-prettier": "^10.1.5",
@@ -40,6 +41,7 @@
     "execa": "^7.2.0",
     "git-url-parse": "^16.1.0",
     "globals": "^16.2.0",
+    "globby": "^14.1.0",
     "minimatch": "^10.0.3",
     "semver": "^7.7.2",
     "typescript-eslint": "^8.35.1",
@@ -69,7 +71,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitSha": "556e598a7d04ab395d41b50c9eaefcf698c1ee3c",
+  "gitSha": "2c91642f426d2b1c7e7d8419b76933bc3fc18390",
   "scripts": {
     "typescript": "tsc -p tsconfig.json",
     "test": "pnpm -w test --project @mui/internal-code-infra"

package/src/cli/cmdJsonLint.mjs

@@ -0,0 +1,80 @@
+#!/usr/bin/env node
+
+import chalk from 'chalk';
+import fs from 'node:fs/promises';
+import { globby } from 'globby';
+import path from 'path';
+
+/**
+ * @typedef {Object} Args
+ * @property {boolean} [silent] Run in silent mode without logging
+ */
+
+/**
+ * @param {string} message
+ * @returns {string}
+ */
+const passMessage = (message) => `✓ ${chalk.gray(message)}`;
+/**
+ * @param {string} message
+ * @returns {string}
+ */
+const failMessage = (message) => `❌ ${chalk.whiteBright(message)}`;
+
+export default /** @type {import('yargs').CommandModule<{}, Args>} */ ({
+  command: 'jsonlint',
+  describe: 'Lint JSON files',
+  builder: (yargs) => {
+    return yargs.option('silent', {
+      type: 'boolean',
+      default: false,
+      description: "Don't log file names.",
+    });
+  },
+  handler: async (args) => {
+    const cwd = process.cwd();
+    const lintIgnoreContent = await (async () => {
+      // Reads both for backwards compatibility in the desired order
+      for (const ignoreFile of ['.lintignore', '.eslintignore']) {
+        const lintIgnorePath = path.join(cwd, ignoreFile);
+        try {
+          // eslint-disable-next-line no-await-in-loop
+          return await fs.readFile(lintIgnorePath, { encoding: 'utf8' });
+        } catch (ex) {
+          console.error(ex);
+          continue;
+        }
+      }
+      return '';
+    })();
+
+    const lintignore = lintIgnoreContent.split(/\r?\n/).filter(Boolean);
+
+    const filenames = await globby('**/*.json', {
+      cwd,
+      gitignore: true,
+      ignore: [...lintignore, '**/tsconfig*.json'],
+      followSymbolicLinks: false,
+    });
+
+    let passed = true;
+    const checks = filenames.map(async (filename) => {
+      const content = await fs.readFile(path.join(cwd, filename), { encoding: 'utf8' });
+      try {
+        JSON.parse(content);
+        if (!args.silent) {
+          // eslint-disable-next-line no-console
+          console.log(passMessage(filename));
+        }
+      } catch (error) {
+        passed = false;
+        console.error(failMessage(`Error parsing ${filename}:\n\n${String(error)}`));
+      }
+    });
+
+    await Promise.allSettled(checks);
+    if (!passed) {
+      throw new Error('❌ At least one file did not pass. Check the console output');
+    }
+  },
+});

package/src/cli/cmdListWorkspaces.mjs

@@ -0,0 +1,66 @@
+#!/usr/bin/env node
+
+/* eslint-disable no-console */
+
+/**
+ * @typedef {import('./pnpm.mjs').Package} Package
+ */
+
+import { getWorkspacePackages } from './pnpm.mjs';
+
+/**
+ * @typedef {Object} Args
+ * @property {boolean} [publicOnly] - Whether to filter to only public packages
+ * @property {'json'|'path'|'name'} [output] - Output format (name, path, or json)
+ * @property {string} [sinceRef] - Git reference to filter changes since
+ */
+
+export default /** @type {import('yargs').CommandModule<{}, Args>} */ ({
+  command: 'list-workspaces',
+  describe: 'List all pnpm workspaces in the repository',
+  builder: (yargs) => {
+    return yargs
+      .option('public-only', {
+        type: 'boolean',
+        default: false,
+        description: 'Filter to only public packages',
+      })
+      .option('output', {
+        type: 'string',
+        choices: ['json', 'path', 'name'],
+        default: 'name',
+        description:
+          'Output format: name (package names), path (package paths), or json (full JSON)',
+      })
+      .option('since-ref', {
+        type: 'string',
+        description: 'Filter packages changed since git reference',
+      });
+  },
+  handler: async (argv) => {
+    const { publicOnly = false, output = 'name', sinceRef } = argv;
+
+    try {
+      // Get packages using our helper function
+      const packages = await getWorkspacePackages({ sinceRef, publicOnly });
+
+      if (output === 'json') {
+        // Serialize packages to JSON
+        console.log(JSON.stringify(packages, null, 2));
+      } else if (output === 'path') {
+        // Print package paths
+        packages.forEach((pkg) => {
+          console.log(pkg.path);
+        });
+      } else {
+        // Print package names (default)
+        packages.forEach((pkg) => {
+          console.log(pkg.name);
+        });
+      }
+    } catch (/** @type {any} */ error) {
+      console.error('Error listing workspaces:', error.message);
+      process.exit(1);
+    }
+  },
+});

package/src/cli/cmdPublish.mjs

@@ -293,7 +293,7 @@ export default /** @type {import('yargs').CommandModule<{}, Args>} */ ({
 
     // Get all packages
     console.log('🔍 Discovering all workspace packages...');
-    const allPackages = await getWorkspacePackages();
+    const allPackages = await getWorkspacePackages({ publicOnly: true });
 
     if (allPackages.length === 0) {
       console.log('⚠️  No public packages found in workspace');

package/src/cli/cmdPublishCanary.mjs

@@ -208,7 +208,7 @@ export default /** @type {import('yargs').CommandModule<{}, Args>} */ ({
 
     // Always get all packages first
     console.log('🔍 Discovering all workspace packages...');
-    const allPackages = await getWorkspacePackages();
+    const allPackages = await getWorkspacePackages({ publicOnly: true });
 
     if (allPackages.length === 0) {
       console.log('⚠️  No public packages found in workspace');
@@ -223,7 +223,9 @@ export default /** @type {import('yargs').CommandModule<{}, Args>} */ ({
         ? '🔍 Checking for packages changed since canary tag...'
         : '🔍 No canary tag found, will publish all packages',
     );
-    const packages = canaryTag ? await getWorkspacePackages(canaryTag) : allPackages;
+    const packages = canaryTag
+      ? await getWorkspacePackages({ sinceRef: canaryTag, publicOnly: true })
+      : allPackages;
 
     console.log(`📋 Found ${packages.length} packages that need canary publishing:`);
     packages.forEach((pkg) => {

package/src/cli/index.mjs

@@ -3,5 +3,14 @@ import { hideBin } from 'yargs/helpers';
 
 import cmdPublish from './cmdPublish.mjs';
 import cmdPublishCanary from './cmdPublishCanary.mjs';
+import cmdListWorkspaces from './cmdListWorkspaces.mjs';
+import cmdJsonLint from './cmdJsonLint.mjs';
 
-yargs().command(cmdPublish).command(cmdPublishCanary).help().parse(hideBin(process.argv));
+yargs()
+  .command(cmdPublish)
+  .command(cmdPublishCanary)
+  .command(cmdListWorkspaces)
+  .command(cmdJsonLint)
+  .demandCommand(1, 'You need at least one command before moving on')
+  .help()
+  .parse(hideBin(process.argv));

package/src/cli/pnpm.mjs

@@ -34,20 +34,28 @@ import * as semver from 'semver';
  */
 
 /**
- * Get all workspace packages that are public
- * @param {string|null} [sinceRef] - Git reference to filter changes since
- * @returns {Promise<Package[]>} Array of public packages
+ * @typedef {Object} GetWorkspacePackagesOptions
+ * @property {string|null} [sinceRef] - Git reference to filter changes since
+ * @property {boolean} [publicOnly=false] - Whether to filter to only public packages
  */
-export async function getWorkspacePackages(sinceRef = null) {
+
+/**
+ * Get workspace packages with optional filtering
+ * @param {GetWorkspacePackagesOptions} [options={}] - Options for filtering packages
+ * @returns {Promise<Package[]>} Array of packages
+ */
+export async function getWorkspacePackages(options = {}) {
+  const { sinceRef = null, publicOnly = false } = options;
+
   // Build command with conditional filter
   const filterArg = sinceRef ? ['--filter', `...[${sinceRef}]`] : [];
   const result = await $`pnpm ls -r --json --depth -1 ${filterArg}`;
   /** @type {PnpmListResultItem[]} */
   const packageData = JSON.parse(result.stdout);
 
-  // Filter out private packages and format the response
-  const publicPackages = packageData
-    .filter((pkg) => !pkg.private)
+  // Filter packages based on options
+  const filteredPackages = packageData
+    .filter((pkg) => !publicOnly || !pkg.private)
     .map((pkg) => {
       if (!pkg.name || !pkg.version) {
         throw new Error(`Invalid package data: ${JSON.stringify(pkg)}`);
@@ -59,7 +67,7 @@ export async function getWorkspacePackages(sinceRef = null) {
       };
     });
 
-  return publicPackages;
+  return filteredPackages;
 }
 
 /**

package/src/eslint/baseConfig.mjs

@@ -22,7 +22,8 @@ export function createBaseConfig(
 ) {
   const ignoreRules = /** @type {import('@eslint/compat').FlatConfig[]} */ (
     // All repos should use .lintignore going forward.
-    ['.gitignore', '.lintignore']
+    // .eslintignore is for backward compatibility. Should be removed in future.
+    ['.gitignore', '.lintignore', '.eslintignore']
       .map((file) => {
         if (fs.existsSync(`${baseDirectory}/${file}`)) {
           return includeIgnoreFile(path.join(baseDirectory, file), `Ignore rules from ${file}`);