@mui/internal-code-infra 0.0.4-canary.56 → 0.0.4-canary.58

package/build/cli/cmdBuild.d.mts

@@ -13,6 +13,7 @@ export type Args = {
     enableReactCompiler?: boolean;
     tsgo?: boolean;
     flat?: boolean;
+    expand: boolean;
 };
 declare const _default: import('yargs').CommandModule<{}, Args>;
 export default _default;

package/build/utils/build.d.mts

@@ -1,7 +1,12 @@
 export type BundleType = 'esm' | 'cjs';
-/**
- * @typedef {'esm' | 'cjs'} BundleType
- */
+export type BundleMeta = {
+    type: BundleType;
+    dir: string;
+    condition: 'import' | 'require';
+    outExtension: string;
+    typeOutExtension: string;
+};
+export declare const BASE_IGNORES: string[];
 /**
  * @param {BundleType} bundle
  * @param {Object} [options]
@@ -16,17 +21,17 @@ export declare function getOutExtension(bundle: BundleType, options?: {
     packageType?: 'module' | 'commonjs';
 }): string;
 /**
- * @param {Object} param0
- * @param {import('../cli/packageJson').PackageJson['exports']} param0.exports
- * @param {{type: BundleType; dir: string}[]} param0.bundles
- * @param {string} param0.outputDir
- * @param {string} param0.cwd
- * @param {boolean} [param0.addTypes]
- * @param {boolean} [param0.isFlat]
- * @param {'module' | 'commonjs'} [param0.packageType]
+ * @param {import('../cli/packageJson').PackageJson['exports']} packageExports
+ * @param {Object} options
+ * @param {{type: BundleType; dir: string}[]} options.bundles
+ * @param {string} options.outputDir
+ * @param {string} options.cwd
+ * @param {boolean} [options.addTypes]
+ * @param {boolean} [options.isFlat]
+ * @param {boolean} [options.expand] - Whether to enumerate glob patterns into concrete entries.
+ * @param {'module' | 'commonjs'} [options.packageType]
  */
-export declare function createPackageExports({ exports: packageExports, bundles, outputDir, cwd, addTypes, isFlat, packageType, }: {
-    exports: import('../cli/packageJson').PackageJson['exports'];
+export declare function createPackageExports(packageExports: import('../cli/packageJson').PackageJson['exports'], { bundles, outputDir, cwd, addTypes, isFlat, expand, packageType, }: {
     bundles: {
         type: BundleType;
         dir: string;
@@ -35,6 +40,7 @@ export declare function createPackageExports({ exports: packageExports, bundles,
     cwd: string;
     addTypes?: boolean;
     isFlat?: boolean;
+    expand?: boolean;
     packageType?: 'module' | 'commonjs';
 }): Promise<{
     main?: string;
@@ -42,15 +48,46 @@ export declare function createPackageExports({ exports: packageExports, bundles,
     exports: import('../cli/packageJson').PackageJson.ExportConditions;
 }>;
 /**
- * @param {Object} param0
- * @param {import('../cli/packageJson').PackageJson['bin']} param0.bin
- * @param {{type: BundleType; dir: string}[]} param0.bundles
- * @param {string} param0.cwd
- * @param {boolean} [param0.isFlat]
- * @param {'module' | 'commonjs'} [param0.packageType]
+ * Generates the package.json `imports` field for the built package, rewriting
+ * internal subpath imports (keys starting with `#`) that point at source files
+ * into their built equivalents with `import`/`require`/`types` conditions.
+ *
+ * Mirrors {@link createPackageExports} but without the `.` / `package.json` /
+ * `main` / `types` index handling that only applies to public exports. Entries
+ * that resolve to bare specifiers (e.g. an external package) are passed through
+ * unchanged, since the `imports` field commonly aliases dependencies.
+ * @param {import('../cli/packageJson').PackageJson['imports']} packageImports
+ * @param {Object} options
+ * @param {{type: BundleType; dir: string}[]} options.bundles
+ * @param {string} options.cwd
+ * @param {string} [options.outputDir] - Used to verify non-source passthrough paths exist in the build output.
+ * @param {boolean} [options.addTypes]
+ * @param {boolean} [options.isFlat]
+ * @param {boolean} [options.expand] - Whether to enumerate glob patterns into concrete entries.
+ * @param {'module' | 'commonjs'} [options.packageType]
+ * @returns {Promise<import('../cli/packageJson').PackageJson.Imports | undefined>}
  */
-export declare function createPackageBin({ bin, bundles, cwd, isFlat, packageType }: {
-    bin: import('../cli/packageJson').PackageJson['bin'];
+export declare function createPackageImports(packageImports: import('../cli/packageJson').PackageJson['imports'], { bundles, cwd, outputDir, addTypes, isFlat, expand, packageType, }: {
+    bundles: {
+        type: BundleType;
+        dir: string;
+    }[];
+    cwd: string;
+    outputDir?: string;
+    addTypes?: boolean;
+    isFlat?: boolean;
+    expand?: boolean;
+    packageType?: 'module' | 'commonjs';
+}): Promise<import('../cli/packageJson').PackageJson.Imports | undefined>;
+/**
+ * @param {import('../cli/packageJson').PackageJson['bin']} bin
+ * @param {Object} options
+ * @param {{type: BundleType; dir: string}[]} options.bundles
+ * @param {string} options.cwd
+ * @param {boolean} [options.isFlat]
+ * @param {'module' | 'commonjs'} [options.packageType]
+ */
+export declare function createPackageBin(bin: import('../cli/packageJson').PackageJson['bin'], { bundles, cwd, isFlat, packageType }: {
     bundles: {
         type: BundleType;
         dir: string;
@@ -84,7 +121,6 @@ export declare function markFn<F extends () => Promise<any>>(label: string, fn:
  * @param {string} label
  */
 export declare function measureFn(label: string): PerformanceMeasure;
-export declare const BASE_IGNORES: string[];
 /**
  * A utility to map a function over an array of items in a worker pool.
  *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mui/internal-code-infra",
-  "version": "0.0.4-canary.56",
+  "version": "0.0.4-canary.58",
   "author": "MUI Team",
   "description": "Infra scripts and configs to be used across MUI repos.",
   "license": "MIT",
@@ -139,9 +139,9 @@
     "unified-lint-rule": "^3.0.1",
     "unist-util-visit": "^5.1.0",
     "yargs": "^18.0.0",
-    "@mui/internal-babel-plugin-display-name": "1.0.4-canary.20",
+    "@mui/internal-babel-plugin-minify-errors": "2.0.8-canary.27",
     "@mui/internal-babel-plugin-resolve-imports": "2.0.7-canary.36",
-    "@mui/internal-babel-plugin-minify-errors": "2.0.8-canary.27"
+    "@mui/internal-babel-plugin-display-name": "1.0.4-canary.20"
   },
   "peerDependencies": {
     "@next/eslint-plugin-next": "*",
@@ -191,7 +191,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitSha": "c0380f22916148bebba5dee261c1a2a3a9211a5e",
+  "gitSha": "bb17bc0e20f7110beb4315d5ddd54d9b83213043",
   "scripts": {
     "build": "tsgo -p tsconfig.build.json",
     "typescript": "tsgo -noEmit",

package/src/cli/cmdBuild.mjs

@@ -10,6 +10,7 @@ import * as semver from 'semver';
 import {
   createPackageBin,
   createPackageExports,
+  createPackageImports,
   getOutExtension,
   mapConcurrently,
   validatePkgJson,
@@ -31,6 +32,7 @@ import {
  * @property {boolean} [enableReactCompiler] - Whether to use the React compiler.
  * @property {boolean} [tsgo] - Whether to build types using typescript native (tsgo).
  * @property {boolean} [flat] - Builds the package in a flat structure without subdirectories for each module type.
+ * @property {boolean} expand - Whether to enumerate glob patterns in exports/imports into concrete entries.
  */
 
 const validBundles = [
@@ -85,6 +87,7 @@ ${content}`,
  * @param {string} param0.cwd
  * @param {boolean} param0.addTypes - Whether to add type declarations for the package.
  * @param {boolean} param0.isFlat - Whether the build is flat structure.
+ * @param {boolean} [param0.expand] - Whether to enumerate glob patterns into concrete entries.
  * @param {'module' | 'commonjs'} param0.packageType - The package.json type field.
  */
 async function writePackageJson({
@@ -94,36 +97,50 @@ async function writePackageJson({
   cwd,
   addTypes = false,
   isFlat = false,
+  expand = true,
   packageType,
 }) {
   delete packageJson.scripts;
   delete packageJson.publishConfig?.directory;
   delete packageJson.devDependencies;
-  delete packageJson.imports;
 
   const resolvedPackageType = packageType || packageJson.type || 'commonjs';
   packageJson.type = resolvedPackageType;
 
   const originalExports = packageJson.exports;
   delete packageJson.exports;
+  const originalImports = packageJson.imports;
+  delete packageJson.imports;
   const originalBin = packageJson.bin;
   delete packageJson.bin;
 
-  const {
-    exports: packageExports,
-    main,
-    types,
-  } = await createPackageExports({
-    exports: originalExports,
-    bundles,
-    outputDir,
-    cwd,
-    addTypes,
-    isFlat,
-    packageType: resolvedPackageType,
-  });
+  const [{ exports: packageExports, main, types }, packageImports] = await Promise.all([
+    createPackageExports(originalExports, {
+      bundles,
+      outputDir,
+      cwd,
+      addTypes,
+      isFlat,
+      expand,
+      packageType: resolvedPackageType,
+    }),
+    originalImports
+      ? createPackageImports(originalImports, {
+          bundles,
+          cwd,
+          outputDir,
+          addTypes,
+          isFlat,
+          expand,
+          packageType: resolvedPackageType,
+        })
+      : Promise.resolve(undefined),
+  ]);
 
   packageJson.exports = packageExports;
+  if (packageImports) {
+    packageJson.imports = packageImports;
+  }
   if (main) {
     packageJson.main = main;
   }
@@ -131,8 +148,7 @@ async function writePackageJson({
     packageJson.types = types;
   }
 
-  const bin = await createPackageBin({
-    bin: originalBin,
+  const bin = await createPackageBin(originalBin, {
     bundles,
     cwd,
     isFlat,
@@ -228,6 +244,12 @@ export default /** @type {import('yargs').CommandModule<{}, Args>} */ ({
         default: process.env.MUI_BUILD_FLAT === '1',
         description:
           'Builds the package in a flat structure without subdirectories for each module type.',
+      })
+      .option('expand', {
+        type: 'boolean',
+        default: true,
+        description:
+          'Enumerate glob patterns in the package.json "exports"/"imports" into concrete entries. Use --no-expand to keep them as Node runtime subpath patterns.',
       });
   },
   async handler(args) {
@@ -416,6 +438,7 @@ export default /** @type {import('yargs').CommandModule<{}, Args>} */ ({
       outputDir: buildDir,
       addTypes: buildTypes,
       isFlat: !!args.flat,
+      expand: args.expand,
       packageType,
     });