@mui/internal-code-infra 0.0.4-canary.42 → 0.0.4-canary.43

package/package.json

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

package/src/utils/build.mjs

@@ -34,6 +34,20 @@ export function getOutExtension(bundle, options = {}) {
   return bundle === 'cjs' ? '.js' : '.mjs';
 }
 
+/**
+ * Returns a new object with `import` first, `require` second, `default` last,
+ * and any other condition keys preserved in their original relative order in between.
+ * @param {Record<string, any>} conditions
+ * @returns {Record<string, any>}
+ */
+function sortExportConditions(conditions) {
+  /** @type {Record<string, number | undefined>} */
+  const order = { import: 0, require: 1, default: 3 };
+  return Object.fromEntries(
+    Object.entries(conditions).sort(([a], [b]) => (order[a] ?? 2) - (order[b] ?? 2)),
+  );
+}
+
 /**
  * @param {Object} param0
  * @param {NonNullable<import('../cli/packageJson').PackageJson.Exports>} param0.importPath
@@ -367,7 +381,8 @@ export async function createPackageExports({
     }
   });
 
-  // Transform import/require to default/require pattern
+  // Rebuild condition objects with stable key order; bundles run in parallel so
+  // import/require insertion order would otherwise depend on Promise timing.
   Object.keys(newExports).forEach((key) => {
     const exportVal = newExports[key];
     if (Array.isArray(exportVal)) {
@@ -387,6 +402,8 @@ export async function createPackageExports({
             ? defaultExport.default
             : defaultExport;
       }
+
+      newExports[key] = sortExportConditions(exportVal);
     }
   });
 

package/src/utils/build.test.mjs

@@ -15,6 +15,45 @@ async function createFile(filePath, contents = '') {
 }
 
 describe('createPackageExports', () => {
+  it('always puts import before require regardless of bundle array order', async () => {
+    const cwd = await makeTempDir();
+    const outputDir = path.join(cwd, 'build');
+
+    await Promise.all([
+      createFile(path.join(cwd, 'src/index.ts')),
+      createFile(path.join(cwd, 'src/feature.ts')),
+      createFile(path.join(outputDir, 'index.js')),
+      createFile(path.join(outputDir, 'index.cjs')),
+      createFile(path.join(outputDir, 'feature.js')),
+      createFile(path.join(outputDir, 'feature.cjs')),
+    ]);
+
+    // Pass cjs before esm to verify the key order is still 'import' then 'require'
+    const { exports: packageExports } = await createPackageExports({
+      exports: {
+        '.': './src/index.ts',
+        './feature': './src/feature.ts',
+      },
+      bundles: [
+        { type: 'cjs', dir: '.' },
+        { type: 'esm', dir: '.' },
+      ],
+      outputDir,
+      cwd,
+      isFlat: true,
+      packageType: 'module',
+    });
+
+    expect(Object.keys(/** @type {Record<string, unknown>} */ (packageExports['.']))).toEqual([
+      'import',
+      'require',
+      'default',
+    ]);
+    expect(
+      Object.keys(/** @type {Record<string, unknown>} */ (packageExports['./feature'])),
+    ).toEqual(['import', 'require', 'default']);
+  });
+
   it('creates exports for a dual bundle module package', async () => {
     const cwd = await makeTempDir();
     const outputDir = path.join(cwd, 'build');