@mui/internal-code-infra 0.0.2 → 0.0.3-canary.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mui/internal-code-infra",
-  "version": "0.0.2",
+  "version": "0.0.3-canary.1",
   "description": "Infra scripts and configs to be used across MUI repos.",
   "type": "module",
   "license": "MIT",
@@ -31,6 +31,7 @@
     "@eslint/compat": "^1.3.2",
     "@eslint/js": "^9.34.0",
     "@next/eslint-plugin-next": "^15.5.0",
+    "@octokit/auth-action": "^6.0.1",
     "@octokit/rest": "^22.0.0",
     "@pnpm/find-workspace-dir": "^1000.1.2",
     "babel-plugin-optimize-clsx": "^2.6.2",
@@ -57,9 +58,9 @@
     "semver": "^7.7.2",
     "typescript-eslint": "^8.40.0",
     "yargs": "^18.0.0",
-    "@mui/internal-babel-plugin-resolve-imports": "2.0.5",
-    "@mui/internal-babel-plugin-minify-errors": "2.0.6",
-    "@mui/internal-babel-plugin-display-name": "1.0.2"
+    "@mui/internal-babel-plugin-minify-errors": "2.0.8-canary.7",
+    "@mui/internal-babel-plugin-display-name": "1.0.4-canary.6",
+    "@mui/internal-babel-plugin-resolve-imports": "2.0.7-canary.19"
   },
   "peerDependencies": {
     "eslint": "^9.0.0",
@@ -90,6 +91,7 @@
   "publishConfig": {
     "access": "public"
   },
+  "gitSha": "2159d7ef17d0ea7ff2ba98c5df9f6519fcaccfbe",
   "scripts": {
     "typescript": "tsc -p tsconfig.json",
     "test": "pnpm -w test --project @mui/internal-code-infra",

package/src/cli/cmdBuild.mjs

@@ -3,7 +3,7 @@ import { $ } from 'execa';
 import set from 'lodash-es/set.js';
 import * as fs from 'node:fs/promises';
 import * as path from 'node:path';
-import { getOutExtension, isMjsBuild } from '../utils/build.mjs';
+import { getOutExtension, isMjsBuild, validatePkgJson } from '../utils/build.mjs';
 
 /**
  * @typedef {Object} Args
@@ -16,6 +16,7 @@ import { getOutExtension, isMjsBuild } from '../utils/build.mjs';
  * @property {boolean} skipTsc - Whether to build types for the package.
  * @property {boolean} skipBabelRuntimeCheck - Whether to skip checking for Babel runtime dependencies in the package.
  * @property {boolean} skipPackageJson - Whether to skip generating the package.json file in the bundle output.
+ * @property {boolean} skipMainCheck - Whether to skip checking for main field in package.json.
  * @property {string[]} ignore - Globs to be ignored by Babel.
  */
 
@@ -209,6 +210,20 @@ async function writePackageJson({ packageJson, bundles, outputDir, cwd, addTypes
     }
   });
 
+  // default condition should come last
+  Object.keys(newExports).forEach((key) => {
+    const exportVal = newExports[key];
+    if (exportVal && typeof exportVal === 'object' && (exportVal.import || exportVal.require)) {
+      const defaultExport = exportVal.import || exportVal.require;
+      if (exportVal.import) {
+        delete exportVal.import;
+      } else if (exportVal.require) {
+        delete exportVal.require;
+      }
+      exportVal.default = defaultExport;
+    }
+  });
+
   packageJson.exports = newExports;
 
   await fs.writeFile(
@@ -277,6 +292,12 @@ export default /** @type {import('yargs').CommandModule<{}, Args>} */ ({
         type: 'boolean',
         default: false,
         description: 'Skip generating the package.json file in the bundle output.',
+      })
+      .option('skipMainCheck', {
+        // Currently added only to support @mui/icons-material. To be removed separately.
+        type: 'boolean',
+        default: false,
+        description: 'Skip checking for main field in package.json.',
       });
   },
   async handler(args) {
@@ -296,17 +317,9 @@ export default /** @type {import('yargs').CommandModule<{}, Args>} */ ({
     const cwd = process.cwd();
     const pkgJsonPath = path.join(cwd, 'package.json');
     const packageJson = JSON.parse(await fs.readFile(pkgJsonPath, { encoding: 'utf8' }));
-    const buildDirBase = packageJson.publishConfig?.directory;
-    if (!buildDirBase) {
-      throw new Error(
-        `No build directory specified in "${packageJson.name}" package.json. Specify it in the "publishConfig.directory" field.`,
-      );
-    }
-    if (packageJson.private === false) {
-      throw new Error(
-        `Remove the field "private": false from "${packageJson.name}" package.json. This is redundant.`,
-      );
-    }
+    validatePkgJson(packageJson, { skipMainCheck: args.skipMainCheck });
+
+    const buildDirBase = /** @type {string} */ (packageJson.publishConfig?.directory);
     const buildDir = path.join(cwd, buildDirBase);
 
     console.log(`Selected output directory: "${buildDirBase}"`);

package/src/cli/cmdPublish.mjs

@@ -12,8 +12,13 @@ import * as fs from 'node:fs/promises';
 import * as semver from 'semver';
 import gitUrlParse from 'git-url-parse';
 import { $ } from 'execa';
+import { createActionAuth } from '@octokit/auth-action';
 import { getWorkspacePackages, publishPackages } from './pnpm.mjs';
 
+function getOctokit() {
+  return new Octokit({ authStrategy: createActionAuth });
+}
+
 /**
  * @typedef {Object} Args
  * @property {boolean} dry-run Run in dry-run mode without publishing
@@ -92,14 +97,14 @@ async function parseChangelog(changelogPath, version) {
 
 /**
  * Check if GitHub release already exists
- * @param {Octokit} octokit - GitHub API client
  * @param {string} owner - Repository owner
  * @param {string} repo - Repository name
  * @param {string} version - Version to check
  * @returns {Promise<boolean>} True if release exists
  */
-async function checkGitHubReleaseExists(octokit, owner, repo, version) {
+async function checkGitHubReleaseExists(owner, repo, version) {
   try {
+    const octokit = getOctokit();
     await octokit.repos.getReleaseByTag({ owner, repo, tag: `v${version}` });
     return true;
   } catch (/** @type {any} */ error) {
@@ -184,18 +189,8 @@ async function validateGitHubRelease(version) {
   const repoInfo = await getRepositoryInfo();
   console.log(`📂 Repository: ${repoInfo.owner}/${repoInfo.repo}`);
 
-  // Check if release already exists on GitHub
-  const octokit = new Octokit({
-    auth: process.env.GITHUB_TOKEN,
-  });
-
   console.log(`🔍 Checking if GitHub release v${validVersion} already exists...`);
-  const releaseExists = await checkGitHubReleaseExists(
-    octokit,
-    repoInfo.owner,
-    repoInfo.repo,
-    validVersion,
-  );
+  const releaseExists = await checkGitHubReleaseExists(repoInfo.owner, repoInfo.repo, validVersion);
 
   if (releaseExists) {
     throw new Error(`GitHub release v${validVersion} already exists`);
@@ -233,12 +228,9 @@ async function publishToNpm(packages, options) {
 async function createRelease(version, changelogContent, repoInfo) {
   console.log('\n🚀 Creating GitHub draft release...');
 
-  const octokit = new Octokit({
-    auth: process.env.GITHUB_TOKEN,
-  });
-
   const sha = await getCurrentGitSha();
 
+  const octokit = getOctokit();
   await octokit.repos.createRelease({
     owner: repoInfo.owner,
     repo: repoInfo.repo,

package/src/utils/build.mjs

@@ -18,3 +18,53 @@ export function getOutExtension(bundle, isType = false) {
   }
   return bundle === 'esm' ? '.mjs' : '.js';
 }
+
+/**
+ * Validates the package.json before building.
+ * @param {Record<string, any>} packageJson
+ * @param {Object} [options]
+ * @param {boolean} [options.skipMainCheck=false] - Whether to skip checking for main field in package.json.
+ */
+export function validatePkgJson(packageJson, options = {}) {
+  const { skipMainCheck = false } = options;
+  /**
+   * @type {string[]}
+   */
+  const errors = [];
+  const buildDirBase = packageJson.publishConfig?.directory;
+  if (!buildDirBase) {
+    errors.push(
+      `No build directory specified in "${packageJson.name}" package.json. Specify it in the "publishConfig.directory" field.`,
+    );
+  }
+  if (packageJson.private === false) {
+    errors.push(
+      `Remove the field "private": false from "${packageJson.name}" package.json. This is redundant.`,
+    );
+  }
+
+  if (!skipMainCheck) {
+    if (packageJson.main) {
+      errors.push(
+        `Remove the field "main" from "${packageJson.name}" package.json. Add it as "exports["."]" instead.`,
+      );
+    }
+
+    if (packageJson.module) {
+      errors.push(
+        `Remove the field "module" from "${packageJson.name}" package.json. Add it as "exports["."]" instead.`,
+      );
+    }
+
+    if (packageJson.types || packageJson.typings) {
+      errors.push(
+        `Remove the field "types/typings" from "${packageJson.name}" package.json. Add it as "exports["."]" instead.`,
+      );
+    }
+  }
+
+  if (errors.length > 0) {
+    const error = new Error(errors.join('\n'));
+    throw error;
+  }
+}