@mui/internal-docs-infra 0.10.1-canary.0 → 0.10.1-canary.2

package/cli/loadNextConfig.d.mts

@@ -4,6 +4,7 @@ export type ExtractedNextConfigOptions = {
   ordering?: OrderingConfig;
   descriptionReplacements?: DescriptionReplacement[];
   useVisibleDescription?: boolean;
+  socketDir?: string;
 };
 /**
  * Dynamically imports the next config from the given directory and extracts

package/cli/loadNextConfig.mjs

@@ -29,7 +29,8 @@ function extractUseVisibleDescriptionFromRemarkPlugins(remarkPlugins) {
 }
 
 /**
- * Extracts ordering and useVisibleDescription from loader options in a single pass.
+ * Extracts docs-infra options (ordering, descriptionReplacements, socketDir,
+ * useVisibleDescription) from loader options in a single pass.
  */
 function extractOptionsFromLoaderEntries(loaders) {
   const result = {};
@@ -43,6 +44,9 @@ function extractOptionsFromLoaderEntries(loaders) {
     if (!result.descriptionReplacements && loader.loader === TYPES_LOADER && loader.options?.descriptionReplacements) {
       result.descriptionReplacements = loader.options.descriptionReplacements;
     }
+    if (!result.socketDir && loader.loader === TYPES_LOADER && typeof loader.options?.socketDir === 'string') {
+      result.socketDir = loader.options.socketDir;
+    }
     if (result.useVisibleDescription === undefined && loader.options?.remarkPlugins) {
       const extracted = extractUseVisibleDescriptionFromRemarkPlugins(loader.options.remarkPlugins);
       if (typeof extracted === 'boolean') {
@@ -54,7 +58,8 @@ function extractOptionsFromLoaderEntries(loaders) {
 }
 
 /**
- * Searches turbopack rules for docs-infra options (ordering + useVisibleDescription).
+ * Searches turbopack rules for docs-infra options (ordering,
+ * descriptionReplacements, socketDir, useVisibleDescription).
  */
 function extractOptionsFromTurbopack(config) {
   const rules = config?.turbopack?.rules;
@@ -71,13 +76,15 @@ function extractOptionsFromTurbopack(config) {
     merged.ordering ??= extracted.ordering;
     merged.descriptionReplacements ??= extracted.descriptionReplacements;
     merged.useVisibleDescription ??= extracted.useVisibleDescription;
+    merged.socketDir ??= extracted.socketDir;
   }
   return merged;
 }
 
 /**
  * Calls the webpack function with a minimal config and extracts docs-infra
- * options (ordering + useVisibleDescription) from the resulting rules.
+ * options (ordering, descriptionReplacements, socketDir, useVisibleDescription)
+ * from the resulting rules.
  */
 function extractOptionsFromWebpack(config) {
   if (typeof config?.webpack !== 'function') {
@@ -105,6 +112,7 @@ function extractOptionsFromWebpack(config) {
       merged.ordering ??= extracted.ordering;
       merged.descriptionReplacements ??= extracted.descriptionReplacements;
       merged.useVisibleDescription ??= extracted.useVisibleDescription;
+      merged.socketDir ??= extracted.socketDir;
     }
     return merged;
   } catch {
@@ -131,7 +139,8 @@ export async function extractDocsInfraOptionsFromNextConfig(dir) {
     return {
       ordering: turbopack.ordering ?? webpack.ordering,
       descriptionReplacements: turbopack.descriptionReplacements ?? webpack.descriptionReplacements,
-      useVisibleDescription: turbopack.useVisibleDescription ?? webpack.useVisibleDescription
+      useVisibleDescription: turbopack.useVisibleDescription ?? webpack.useVisibleDescription,
+      socketDir: turbopack.socketDir ?? webpack.socketDir
     };
   } catch {
     // Config not importable — use defaults

package/cli/runValidate.mjs

@@ -85,8 +85,10 @@ const runValidate = {
     const {
       ordering,
       descriptionReplacements,
-      useVisibleDescription = false
+      useVisibleDescription = false,
+      socketDir: configSocketDir
     } = await extractDocsInfraOptionsFromNextConfig(cwd);
+    const socketDir = configSocketDir ? path.resolve(cwd, configSocketDir) : undefined;
 
     // If neither flag is set, run both. If one is set, run only that one.
     const runIndexes = !typesOnly || indexesOnly;
@@ -282,7 +284,8 @@ const runValidate = {
                 markerDir: typesMarkerDir
               },
               ordering,
-              descriptionReplacements
+              descriptionReplacements,
+              socketDir
             }
           });
         }));

package/cli/validateWorker.mjs

@@ -73,7 +73,8 @@ if (parentPort) {
             watchSourceDirectly: Boolean(typesMetaCall.structuredOptions?.watchSourceDirectly),
             updateParentIndex: excludeFromIndex ? undefined : task.syncTypesOptions.updateParentIndex,
             ordering: task.syncTypesOptions.ordering,
-            descriptionReplacements: task.syncTypesOptions.descriptionReplacements
+            descriptionReplacements: task.syncTypesOptions.descriptionReplacements,
+            socketDir: task.syncTypesOptions.socketDir
           });
           parentPort.postMessage({
             type: 'types',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mui/internal-docs-infra",
-  "version": "0.10.1-canary.0",
+  "version": "0.10.1-canary.2",
   "author": "MUI Team",
   "description": "MUI Infra - internal documentation creation tools.",
   "license": "MIT",
@@ -643,5 +643,5 @@
   "bin": {
     "docs-infra": "./cli/index.mjs"
   },
-  "gitSha": "baded479f6a2157c4f06962340f64e0712889483"
+  "gitSha": "7c06e2fc2908c14730ae31975a4e6fa27955fdcf"
 }

package/pipeline/loadServerTypesMeta/socketClient.d.mts

@@ -25,7 +25,9 @@ export declare function getLockPath(socketDir?: string): string;
 export declare function ensureSocketDir(socketDir?: string): Promise<void>;
 /**
  * Wait for the IPC endpoint to become available.
- * On Unix: Watches for the socket file to appear.
+ * On Unix: Polls the filesystem for the socket file to appear. We avoid
+ * `fs.watch` here because on macOS it does not reliably fire events when a
+ * unix domain socket file is created.
  * On Windows: Polls by attempting to connect to the named pipe.
  * @param socketDir - Optional custom directory for socket files (Unix only)
  * @param timeoutMs - Timeout in milliseconds (default: 5000)

package/pipeline/loadServerTypesMeta/socketClient.mjs

@@ -9,13 +9,20 @@
  */
 
 import { connect } from 'node:net';
-import { watch } from 'node:fs';
 import { mkdir, stat } from 'node:fs/promises';
+import { createHash } from 'node:crypto';
 import { tmpdir } from 'node:os';
 import { join } from 'node:path';
 import lockfile from 'proper-lockfile';
 const isWindows = process.platform === 'win32';
 
+/**
+ * Short, stable hash of the current project directory. Used to scope shared
+ * temp directories (CI runners, system tmp) so concurrent docs-infra processes
+ * from different projects don't collide on the same socket/lock files.
+ */
+const projectHash = createHash('sha256').update(process.cwd()).digest('hex').slice(0, 8);
+
 /**
  * Get the default socket directory.
  * On Unix: Prefers CI-specific temp directories, then falls back to system temp.
@@ -32,17 +39,18 @@ function getDefaultSocketDir() {
 
 /**
  * Get the effective socket directory for Unix sockets and lock files.
- * On CI environments, always prefer CI-specific temp directories.
- * Otherwise, use the provided socketDir or fall back to defaults.
+ * An explicit `socketDir` is always used as-is (assumed to be project-scoped,
+ * e.g. inside `.next/`). When no `socketDir` is given, shared temp directories
+ * (CI runner temp or system tmp) are namespaced with a short hash of the project
+ * directory so concurrent docs-infra processes from different projects don't
+ * collide on the same socket/lock files.
  * @param socketDir - Optional custom directory for socket files
  */
 function getEffectiveSocketDir(socketDir) {
-  // CI environments always use their temp directories for better compatibility
-  const ciTempDir = process.env.RUNNER_TEMP ?? process.env.AGENT_TEMPDIRECTORY;
-  if (ciTempDir) {
-    return `${ciTempDir}/mui-docs-infra`;
+  if (socketDir) {
+    return socketDir;
   }
-  return socketDir ?? `${getDefaultSocketDir()}/mui-docs-infra`;
+  return `${getDefaultSocketDir()}/mui-docs-infra-${projectHash}`;
 }
 
 /**
@@ -119,57 +127,42 @@ function sleep(ms) {
 
 /**
  * Wait for the IPC endpoint to become available.
- * On Unix: Watches for the socket file to appear.
+ * On Unix: Polls the filesystem for the socket file to appear. We avoid
+ * `fs.watch` here because on macOS it does not reliably fire events when a
+ * unix domain socket file is created.
  * On Windows: Polls by attempting to connect to the named pipe.
  * @param socketDir - Optional custom directory for socket files (Unix only)
  * @param timeoutMs - Timeout in milliseconds (default: 5000)
  */
 export async function waitForSocketFile(socketDir, timeoutMs = 5000) {
   const socketPath = getSocketPath(socketDir);
+  const pollInterval = 50;
+  const startTime = Date.now();
   if (isWindows) {
-    // On Windows, named pipes don't create files - poll by trying to connect
-    const startTime = Date.now();
-    const pollInterval = 100; // ms
-
     while (Date.now() - startTime < timeoutMs) {
       // eslint-disable-next-line no-await-in-loop
       if (await tryConnectToPipe(socketPath)) {
         return;
       }
-
-      // Wait before next poll
       // eslint-disable-next-line no-await-in-loop
       await sleep(pollInterval);
     }
     throw new Error(`Named pipe did not become available within ${timeoutMs}ms`);
   }
 
-  // Unix: Check if socket file already exists
-  if (await fileExists(socketPath)) {
-    return;
-  }
-
-  // Ensure the directory exists before watching
-  const dir = getEffectiveSocketDir(socketDir);
-  await mkdir(dir, {
+  // Ensure the directory exists so the first stat doesn't fail spuriously
+  await mkdir(getEffectiveSocketDir(socketDir), {
     recursive: true
   });
-  await new Promise((resolve, reject) => {
-    let timer;
-
-    // Watch the directory for the socket file to appear
-    const watcher = watch(dir, (eventType, filename) => {
-      if (filename && (filename.includes('types.sock') || isWindows && filename.includes('types'))) {
-        clearTimeout(timer);
-        watcher.close();
-        resolve();
-      }
-    });
-    timer = setTimeout(() => {
-      watcher.close();
-      reject(new Error(`Socket file did not appear within ${timeoutMs}ms`));
-    }, timeoutMs);
-  });
+  while (Date.now() - startTime < timeoutMs) {
+    // eslint-disable-next-line no-await-in-loop
+    if (await fileExists(socketPath)) {
+      return;
+    }
+    // eslint-disable-next-line no-await-in-loop
+    await sleep(pollInterval);
+  }
+  throw new Error(`Socket file did not appear within ${timeoutMs}ms`);
 }
 
 // Store the release function globally so we can call it when needed