@mui/internal-code-infra 0.0.3-canary.24 → 0.0.3-canary.26

package/build/eslint/baseConfig.d.mts

@@ -1,10 +1,10 @@
 /**
  * @param {Object} [params]
  * @param {boolean} [params.enableReactCompiler] - Whether the config is for spec files.
- * @param {string} params.baseDirectory - The base directory for the configuration.
+ * @param {string} [params.baseDirectory] - The base directory for the configuration.
  * @returns {import('eslint').Linter.Config[]}
  */
-export function createBaseConfig({ enableReactCompiler, baseDirectory }?: {
+export function createBaseConfig({ enableReactCompiler, baseDirectory, }?: {
     enableReactCompiler?: boolean | undefined;
-    baseDirectory: string;
+    baseDirectory?: string | undefined;
 }): import("eslint").Linter.Config[];

package/build/eslint/extensions.d.mts

@@ -1,8 +1,8 @@
-export const EXTENSION_JS: "?(c|m)js?(x)";
-export const EXTENSION_JS_NO_MODULE: "js?(x)";
-export const EXTENSION_TS: "?(c|m)[jt]s?(x)";
-export const EXTENSION_TS_NO_MODULE: "[jt]s?(x)";
-export const EXTENSION_TS_ONLY: "?(c|m)ts?(x)";
-export const EXTENSION_TS_ONLY_NO_MODULE: "ts?(x)";
+export const EXTENSION_JS: ".?(c|m)js?(x)";
+export const EXTENSION_JS_NO_MODULE: ".js?(x)";
+export const EXTENSION_TS: ".?(c|m)[jt]s?(x)";
+export const EXTENSION_TS_NO_MODULE: ".[jt]s?(x)";
+export const EXTENSION_TS_ONLY: ".?(c|m)ts?(x)";
+export const EXTENSION_TS_ONLY_NO_MODULE: ".ts?(x)";
 export const EXTENSION_DTS: ".d.?(c|m)ts?(x)";
 export const EXTENSION_TEST_FILE: ".test.?(c|m)[jt]s?(x)";

package/build/eslint/jsonConfig.d.mts

@@ -0,0 +1,4 @@
+/**
+ * @returns {import('eslint').Linter.Config[]}
+ */
+export function createJsonConfig(): import("eslint").Linter.Config[];

package/build/eslint/material-ui/config.d.mts

@@ -1,7 +1,7 @@
 /**
  * @param {Object} [options]
- * @param {boolean} [options.reactCompilerEnabled] - Whether the config is for spec files.
+ * @param {boolean} [options.enableReactCompiler] - Whether the config is for spec files.
  */
 export function createCoreConfig(options?: {
-    reactCompilerEnabled?: boolean | undefined;
+    enableReactCompiler?: boolean | undefined;
 }): import("eslint").Linter.Config<import("eslint").Linter.RulesRecord>[];

package/build/utils/changelog.d.mts

@@ -33,37 +33,11 @@ export function findLatestTaggedVersion(opts: {
  * Fetches commits between two refs (lastRelease..release) including PR details.
  * Automatically handles GitHub OAuth authentication if none provided.
  *
- * @overload
- * @param {FetchCommitsOptions & {token: string}} opts
- * @returns {Promise<FetchedCommitDetails[]>}
- *
- * @overload
- * @param {FetchCommitsOptions & {octokit: OctokitType}} opts
- * @returns {Promise<FetchedCommitDetails[]>}
- *
- * @param {FetchCommitsOptions & ({token: string} | {octokit: OctokitType})} opts
- * @returns {Promise<FetchedCommitDetails[]>}
- */
-export function fetchCommitsBetweenRefs(opts: FetchCommitsOptions & {
-    token: string;
-}): Promise<FetchedCommitDetails[]>;
-/**
- * Fetches commits between two refs (lastRelease..release) including PR details.
- * Automatically handles GitHub OAuth authentication if none provided.
- *
- * @overload
- * @param {FetchCommitsOptions & {token: string}} opts
- * @returns {Promise<FetchedCommitDetails[]>}
- *
- * @overload
- * @param {FetchCommitsOptions & {octokit: OctokitType}} opts
- * @returns {Promise<FetchedCommitDetails[]>}
- *
- * @param {FetchCommitsOptions & ({token: string} | {octokit: OctokitType})} opts
+ * @param {FetchCommitsOptions & {octokit?: OctokitType}} opts
  * @returns {Promise<FetchedCommitDetails[]>}
  */
 export function fetchCommitsBetweenRefs(opts: FetchCommitsOptions & {
-    octokit: OctokitType;
+    octokit?: OctokitType;
 }): Promise<FetchedCommitDetails[]>;
 export type OctokitType = import("@octokit/rest").Octokit;
 export type AuthorAssociation = "team" | "first_timer" | "contributor";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mui/internal-code-infra",
-  "version": "0.0.3-canary.24",
+  "version": "0.0.3-canary.26",
   "description": "Infra scripts and configs to be used across MUI repos.",
   "type": "module",
   "license": "MIT",
@@ -56,6 +56,7 @@
     "@babel/preset-typescript": "^7.27.1",
     "@eslint/compat": "^1.4.0",
     "@eslint/js": "^9.36.0",
+    "@eslint/json": "^0.13.2",
     "@inquirer/confirm": "^5.1.18",
     "@napi-rs/keyring": "^1.2.0",
     "@next/eslint-plugin-next": "^15.5.4",
@@ -92,9 +93,9 @@
     "stylelint-config-standard": "^39.0.0",
     "typescript-eslint": "^8.45.0",
     "yargs": "^18.0.0",
-    "@mui/internal-babel-plugin-minify-errors": "2.0.8-canary.10",
     "@mui/internal-babel-plugin-display-name": "1.0.4-canary.7",
-    "@mui/internal-babel-plugin-resolve-imports": "2.0.7-canary.23"
+    "@mui/internal-babel-plugin-resolve-imports": "2.0.7-canary.23",
+    "@mui/internal-babel-plugin-minify-errors": "2.0.8-canary.10"
   },
   "peerDependencies": {
     "eslint": "^9.0.0",
@@ -126,7 +127,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitSha": "67aee4d1566ff1bdb001664a94aff573072f7818",
+  "gitSha": "28991468f6b404f3fbe289764f53d82f984a7d62",
   "scripts": {
     "build": "tsc -p tsconfig.build.json",
     "typescript": "tsc -p tsconfig.json",

package/src/cli/index.mjs

@@ -7,7 +7,6 @@ import cmdBuild from './cmdBuild.mjs';
 import cmdCopyFiles from './cmdCopyFiles.mjs';
 import cmdExtractErrorCodes from './cmdExtractErrorCodes.mjs';
 import cmdGithubAuth from './cmdGithubAuth.mjs';
-import cmdJsonLint from './cmdJsonLint.mjs';
 import cmdListWorkspaces from './cmdListWorkspaces.mjs';
 import cmdPublish from './cmdPublish.mjs';
 import cmdPublishCanary from './cmdPublishCanary.mjs';
@@ -24,7 +23,6 @@ yargs()
   .command(cmdCopyFiles)
   .command(cmdExtractErrorCodes)
   .command(cmdGithubAuth)
-  .command(cmdJsonLint)
   .command(cmdListWorkspaces)
   .command(cmdPublish)
   .command(cmdPublishCanary)

package/src/eslint/baseConfig.mjs

@@ -8,63 +8,94 @@ import reactPlugin from 'eslint-plugin-react';
 import { configs as reactCompilerPluginConfigs } from 'eslint-plugin-react-compiler';
 import reactHooks from 'eslint-plugin-react-hooks';
 import globals from 'globals';
-import * as fs from 'node:fs';
 import * as path from 'node:path';
 import * as tseslint from 'typescript-eslint';
+import fs from 'node:fs';
 import { createCoreConfig } from './material-ui/config.mjs';
 import muiPlugin from './material-ui/index.mjs';
+import { EXTENSION_TS } from './extensions.mjs';
+import { createJsonConfig } from './jsonConfig.mjs';
+
+/**
+ * @param {string} filePath
+ * @param {string | undefined} description
+ */
+function includeIgnoreIfExists(filePath, description) {
+  if (fs.existsSync(filePath)) {
+    return includeIgnoreFile(filePath, description);
+  }
+  return [];
+}
 
 /**
  * @param {Object} [params]
  * @param {boolean} [params.enableReactCompiler] - Whether the config is for spec files.
- * @param {string} params.baseDirectory - The base directory for the configuration.
+ * @param {string} [params.baseDirectory] - The base directory for the configuration.
  * @returns {import('eslint').Linter.Config[]}
  */
-export function createBaseConfig(
-  { enableReactCompiler = false, baseDirectory } = { baseDirectory: process.cwd() },
-) {
-  const ignoreRules = /** @type {import('@eslint/compat').FlatConfig[]} */ (
-    // All repos should use .lintignore going forward.
-    // .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}`);
-        }
-        return null;
-      })
-      .filter(Boolean)
-  );
-
-  return defineConfig(
-    ...ignoreRules,
-    eslintJs.configs.recommended,
-    importPlugin.flatConfigs.recommended,
-    importPlugin.flatConfigs.react,
-    jsxA11yPlugin.flatConfigs.recommended,
-    reactPlugin.configs.flat.recommended,
-    // @ts-expect-error Types are messed up https://github.com/facebook/react/issues/34705
-    reactHooks.configs['flat/recommended'],
-    tseslint.configs.recommended,
-    importPlugin.flatConfigs.typescript,
-    enableReactCompiler ? reactCompilerPluginConfigs.recommended : {},
+export function createBaseConfig({
+  enableReactCompiler = false,
+  baseDirectory = process.cwd(),
+} = {}) {
+  return defineConfig([
+    includeIgnoreIfExists(path.join(baseDirectory, '.gitignore'), `Ignore rules from .gitignore`),
+    includeIgnoreIfExists(path.join(baseDirectory, '.lintignore'), `Ignore rules from .lintignore`),
+    createJsonConfig(),
     prettier,
     {
-      name: 'typescript-eslint-parser',
-      languageOptions: {
-        ecmaVersion: 7,
-        globals: {
-          ...globals.es2020,
-          ...globals.browser,
-          ...globals.node,
+      name: 'Base config',
+      files: [`**/*${EXTENSION_TS}`],
+      extends: defineConfig([
+        eslintJs.configs.recommended,
+        importPlugin.flatConfigs.recommended,
+        importPlugin.flatConfigs.react,
+        jsxA11yPlugin.flatConfigs.recommended,
+        reactPlugin.configs.flat.recommended,
+        // @ts-expect-error Types are messed up https://github.com/facebook/react/issues/34705
+        reactHooks.configs['flat/recommended'],
+        tseslint.configs.recommended,
+        importPlugin.flatConfigs.typescript,
+        enableReactCompiler ? reactCompilerPluginConfigs.recommended : {},
+        {
+          name: 'typescript-eslint-parser',
+          languageOptions: {
+            ecmaVersion: 7,
+            globals: {
+              ...globals.es2020,
+              ...globals.browser,
+              ...globals.node,
+            },
+          },
+          plugins: {
+            'material-ui': muiPlugin,
+          },
+          extends: createCoreConfig({ enableReactCompiler }),
         },
-      },
-      plugins: {
-        'material-ui': muiPlugin,
-      },
-      extends: createCoreConfig({ reactCompilerEnabled: enableReactCompiler }),
+        // Lint rule to disallow usage of typescript namespaces.We've seen at least two problems with them:
+        //   * Creates non-portable types in base ui. [1]
+        //   * This pattern [2] leads to broken bundling in codesandbox [3].
+        // Gauging the ecosystem it also looks like support for namespaces in tooling is poor and tends to
+        // be treated as a deprecated feature.
+        // [1] https://github.com/mui/base-ui/pull/2324
+        // [2] https://github.com/mui/mui-x/blob/1cf853ed45cf301211ece1c0ca21981ea208edfb/packages/x-virtualizer/src/models/core.ts#L4-L10
+        // [3] https://codesandbox.io/embed/kgylpd?module=/src/Demo.tsx&fontsize=12
+        {
+          rules: {
+            '@typescript-eslint/no-namespace': 'error',
+          },
+        },
+        // Part of the migration away from airbnb config. Turned off initially.
+        {
+          rules: {
+            '@typescript-eslint/no-explicit-any': 'off',
+            '@typescript-eslint/no-unsafe-function-type': 'off',
+            '@typescript-eslint/no-empty-object-type': 'off',
+          },
+        },
+      ]),
     },
     {
+      name: 'ESM JS files',
       files: ['**/*.mjs'],
       rules: {
         'import/extensions': [
@@ -77,26 +108,5 @@ export function createBaseConfig(
         ],
       },
     },
-    // Lint rule to disallow usage of typescript namespaces.We've seen at least two problems with them:
-    //   * Creates non-portable types in base ui. [1]
-    //   * This pattern [2] leads to broken bundling in codesandbox [3].
-    // Gauging the ecosystem it also looks like support for namespaces in tooling is poor and tends to
-    // be treated as a deprecated feature.
-    // [1] https://github.com/mui/base-ui/pull/2324
-    // [2] https://github.com/mui/mui-x/blob/1cf853ed45cf301211ece1c0ca21981ea208edfb/packages/x-virtualizer/src/models/core.ts#L4-L10
-    // [3] https://codesandbox.io/embed/kgylpd?module=/src/Demo.tsx&fontsize=12
-    {
-      rules: {
-        '@typescript-eslint/no-namespace': 'error',
-      },
-    },
-    // Part of the migration away from airbnb config. Turned of initially.
-    {
-      rules: {
-        '@typescript-eslint/no-explicit-any': 'off',
-        '@typescript-eslint/no-unsafe-function-type': 'off',
-        '@typescript-eslint/no-empty-object-type': 'off',
-      },
-    },
-  );
+  ]);
 }

package/src/eslint/extensions.mjs

@@ -1,8 +1,8 @@
-export const EXTENSION_JS = '?(c|m)js?(x)';
-export const EXTENSION_JS_NO_MODULE = 'js?(x)';
-export const EXTENSION_TS = '?(c|m)[jt]s?(x)';
-export const EXTENSION_TS_NO_MODULE = '[jt]s?(x)';
-export const EXTENSION_TS_ONLY = '?(c|m)ts?(x)';
-export const EXTENSION_TS_ONLY_NO_MODULE = 'ts?(x)';
-export const EXTENSION_DTS = `.d.${EXTENSION_TS_ONLY}`;
-export const EXTENSION_TEST_FILE = `.test.${EXTENSION_TS}`;
+export const EXTENSION_JS = '.?(c|m)js?(x)';
+export const EXTENSION_JS_NO_MODULE = '.js?(x)';
+export const EXTENSION_TS = '.?(c|m)[jt]s?(x)';
+export const EXTENSION_TS_NO_MODULE = '.[jt]s?(x)';
+export const EXTENSION_TS_ONLY = '.?(c|m)ts?(x)';
+export const EXTENSION_TS_ONLY_NO_MODULE = '.ts?(x)';
+export const EXTENSION_DTS = `.d${EXTENSION_TS_ONLY}`;
+export const EXTENSION_TEST_FILE = `.test${EXTENSION_TS}`;

package/src/eslint/jsonConfig.mjs

@@ -0,0 +1,34 @@
+import { defineConfig } from 'eslint/config';
+import json from '@eslint/json';
+
+/**
+ * @returns {import('eslint').Linter.Config[]}
+ */
+export function createJsonConfig() {
+  return defineConfig([
+    {
+      name: 'JSON files',
+      files: ['**/*.json'],
+      ignores: ['package-lock.json'],
+      plugins: { json },
+      language: 'json/json',
+      extends: [json.configs.recommended],
+    },
+
+    {
+      name: 'JSONC files',
+      files: ['**/*.jsonc', '**/tsconfig.json', '**/tsconfig.*.json', '.vscode/**/*.json'],
+      plugins: { json },
+      language: 'json/jsonc',
+      extends: [json.configs.recommended],
+    },
+
+    {
+      name: 'JSON5 files',
+      files: ['**/*.json5'],
+      plugins: { json },
+      language: 'json/json5',
+      extends: [json.configs.recommended],
+    },
+  ]);
+}

package/src/eslint/material-ui/config.mjs

@@ -304,7 +304,7 @@ const airbnbJsxA11y = {
 
 /**
  * @param {Object} [options]
- * @param {boolean} [options.reactCompilerEnabled] - Whether the config is for spec files.
+ * @param {boolean} [options.enableReactCompiler] - Whether the config is for spec files.
  */
 export function createCoreConfig(options = {}) {
   return defineConfig([
@@ -502,7 +502,7 @@ export function createCoreConfig(options = {}) {
 
         'react/jsx-no-useless-fragment': ['error', { allowExpressions: true }],
         'lines-around-directive': 'off',
-        ...(options.reactCompilerEnabled ? { 'react-compiler/react-compiler': 'error' } : {}),
+        ...(options.enableReactCompiler ? { 'react-compiler/react-compiler': 'error' } : {}),
         // Prevent the use of `e` as a shorthand for `event`, `error`, etc.
         'id-denylist': ['error', 'e'],
         '@typescript-eslint/return-await': 'off',

package/src/eslint/testConfig.mjs

@@ -3,12 +3,14 @@ import testingLibrary from 'eslint-plugin-testing-library';
 import { defineConfig } from 'eslint/config';
 import globals from 'globals';
 import * as tseslint from 'typescript-eslint';
+import { EXTENSION_TS } from './extensions.mjs';
 
 /**
  * @type {import('eslint').Linter.Config}
  */
 export const baseSpecRules = {
-  files: ['**/*.spec.*'],
+  name: 'Spec files rules',
+  files: [`**/*.spec${EXTENSION_TS}`],
   rules: {
     'no-alert': 'off',
     'no-console': 'off',
@@ -51,6 +53,7 @@ export function createTestConfig(options = {}) {
     testingLibrary.configs['flat/dom'],
     testingLibrary.configs['flat/react'],
     {
+      name: 'Test files',
       languageOptions: {
         parser: tseslint.parser,
         parserOptions: {

package/src/utils/changelog.mjs

@@ -49,25 +49,14 @@ export async function findLatestTaggedVersion(opts) {
  * Fetches commits between two refs (lastRelease..release) including PR details.
  * Automatically handles GitHub OAuth authentication if none provided.
  *
- * @overload
- * @param {FetchCommitsOptions & {token: string}} opts
- * @returns {Promise<FetchedCommitDetails[]>}
- *
- * @overload
- * @param {FetchCommitsOptions & {octokit: OctokitType}} opts
- * @returns {Promise<FetchedCommitDetails[]>}
- *
- * @param {FetchCommitsOptions & ({token: string} | {octokit: OctokitType})} opts
+ * @param {FetchCommitsOptions & {octokit?: OctokitType}} opts
  * @returns {Promise<FetchedCommitDetails[]>}
  */
 export async function fetchCommitsBetweenRefs(opts) {
   const octokit =
-    // eslint-disable-next-line no-nested-ternary
     'octokit' in opts && opts.octokit
       ? opts.octokit
-      : 'token' in opts && opts.token
-        ? new Octokit({ auth: opts.token })
-        : new Octokit({ authStrategy: persistentAuthStrategy });
+      : new Octokit({ authStrategy: persistentAuthStrategy });
 
   return fetchCommitsRest({
     octokit,

package/build/cli/cmdJsonLint.d.mts

@@ -1,9 +0,0 @@
-#!/usr/bin/env node
-declare const _default: import("yargs").CommandModule<{}, Args>;
-export default _default;
-export type Args = {
-    /**
-     * Run in silent mode without logging
-     */
-    silent?: boolean | undefined;
-};

package/src/cli/cmdJsonLint.mjs

@@ -1,69 +0,0 @@
-#!/usr/bin/env node
-
-import chalk from 'chalk';
-import fs from 'node:fs/promises';
-import { globby } from 'globby';
-import path from 'node:path';
-import { mapConcurrently } from '../utils/build.mjs';
-
-/**
- * @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 filenames = await globby('**/*.json', {
-      cwd,
-      gitignore: true,
-      ignoreFiles: ['.lintignore'],
-      ignore: ['**/tsconfig*.json'],
-      followSymbolicLinks: false,
-    });
-
-    let passed = true;
-
-    await mapConcurrently(
-      filenames,
-      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)}`));
-        }
-      },
-      20,
-    );
-    if (!passed) {
-      throw new Error('❌ At least one file did not pass. Check the console output');
-    }
-  },
-});