@mui/internal-code-infra 0.0.4-canary.110 → 0.0.4-canary.112

package/build/cli/cmdBuild.d.mts

@@ -48,7 +48,7 @@ export type Args = {
      */
     enableReactCompiler?: boolean;
     /**
-     * - Whether to build types using typescript native (tsgo).
+     * - Whether to build types using the native TypeScript compiler.
      */
     tsgo?: boolean;
     /**

package/build/cli/cmdListWorkspaces.d.mts

@@ -8,7 +8,7 @@ export type Args = {
     /**
      * - Output format (name, path, or json)
      */
-    output?: 'json' | 'path' | 'name' | 'publish-dir';
+    output?: 'json' | 'path' | 'name';
     /**
      * - Git reference to filter changes since
      */
@@ -21,7 +21,7 @@ export type Args = {
 /**
  * @typedef {Object} Args
  * @property {boolean} [publicOnly] - Whether to filter to only public packages
- * @property {'json'|'path'|'name'|'publish-dir'} [output] - Output format (name, path, or json)
+ * @property {'json'|'path'|'name'} [output] - Output format (name, path, or json)
  * @property {string} [sinceRef] - Git reference to filter changes since
  * @property {string[]} [filter] - Same as filtering packages with --filter in pnpm. Only include packages matching the filter. See https://pnpm.io/filtering.
  */

package/build/utils/typescript.d.mts

@@ -3,7 +3,7 @@
  * @param {string} tsconfig - The path to the tsconfig.json file.
  * @param {string} outDir - The output directory for the declaration files.
  * @param {Object} options
- * @param {boolean} [options.useTsgo] - Whether to use typescript native (tsgo).
+ * @param {boolean} [options.useTsgo] - Whether to use the native TypeScript compiler.
  */
 export declare function emitDeclarations(tsconfig: string, outDir: string, options: {
     useTsgo?: boolean;
@@ -44,7 +44,7 @@ export declare function moveAndTransformDeclarations({ inputDir, buildDir, bundl
  * @param {string} param0.buildDir - The build directory.
  * @param {string} param0.cwd - The current working directory.
  * @param {boolean} param0.skipTsc - Whether to skip running TypeScript compiler (tsc) for building types.
- * @param {boolean} [param0.useTsgo=false] - Whether to build types using typescript native (tsgo).
+ * @param {boolean} [param0.useTsgo=false] - Whether to build types using the native TypeScript compiler.
  * @param {'module' | 'commonjs'} [param0.packageType] - The package.json type field.
  */
 export declare function createTypes({ bundles, srcDir, buildDir, cwd, skipTsc, useTsgo, packageType, verbose, }: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mui/internal-code-infra",
-  "version": "0.0.4-canary.110",
+  "version": "0.0.4-canary.112",
   "author": "MUI Team",
   "description": "Infra scripts and configs to be used across MUI repos.",
   "license": "MIT",
@@ -136,21 +136,17 @@
     "unist-util-visit": "^5.1.0",
     "yaml": "^2.9.0",
     "yargs": "^18.1.0",
-    "@mui/internal-babel-plugin-display-name": "1.0.4-canary.23",
-    "@mui/internal-babel-plugin-resolve-imports": "2.0.7-canary.42",
-    "@mui/internal-babel-plugin-minify-errors": "2.0.8-canary.30"
+    "@mui/internal-babel-plugin-display-name": "1.0.4-canary.24",
+    "@mui/internal-babel-plugin-minify-errors": "2.0.8-canary.31",
+    "@mui/internal-babel-plugin-resolve-imports": "2.0.7-canary.43"
   },
   "peerDependencies": {
     "@next/eslint-plugin-next": "*",
-    "@typescript/native-preview": ">=7.0.0-dev.0",
     "eslint": "^9.0.0 || ^10.0.0",
     "prettier": "^3.0.0",
     "typescript": "^5.0.0 || ^6.0.0"
   },
   "peerDependenciesMeta": {
-    "@typescript/native-preview": {
-      "optional": true
-    },
     "typescript": {
       "optional": true
     }
@@ -168,12 +164,14 @@
     "@types/yargs": "17.0.35",
     "@typescript-eslint/parser": "8.68.0",
     "@typescript-eslint/rule-tester": "8.68.0",
+    "@typescript/native": "npm:typescript@7.0.2",
     "eslint": "10.9.1",
     "get-port": "7.2.0",
     "prettier": "3.9.6",
     "remark": "15.0.1",
     "remark-mdx": "3.1.1",
     "serve": "14.2.6",
+    "typescript": "npm:@typescript/typescript6@6.0.2",
     "typescript-eslint": "8.68.0"
   },
   "files": [
@@ -189,10 +187,10 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitSha": "fdfa28912aa56f2473702b4a49a5a7a3164f5e4c",
+  "gitSha": "eabc9a70f76489811b6e04991bdcf7f5d03fa8bb",
   "scripts": {
-    "build": "tsgo -p tsconfig.build.json",
-    "typescript": "tsgo -noEmit",
+    "build": "tsc -p tsconfig.build.json",
+    "typescript": "tsc -noEmit",
     "test": "pnpm -w test --project @mui/internal-code-infra",
     "test:copy": "rm -rf build && node bin/code-infra.mjs copy-files --glob \"src/cli/*.mjs\" --glob \"src/eslint/**/*.mjs:esm\""
   }

package/src/cli/cmdBuild.mjs

@@ -30,7 +30,7 @@ import { readPnpmConfig } from '../utils/pnpm.mjs';
  * @property {string[]} ignore - Globs to be ignored by Babel.
  * @property {string[]} [copy] - Files/Directories to be copied. Can be a glob pattern.
  * @property {boolean} [enableReactCompiler] - Whether to use the React compiler.
- * @property {boolean} [tsgo] - Whether to build types using typescript native (tsgo).
+ * @property {boolean} [tsgo] - Whether to build types using the native TypeScript compiler.
  * @property {boolean} [flat] - Deprecated no-op; flat builds are always used.
  * @property {boolean} expand - Whether to enumerate glob patterns in exports/imports into concrete entries.
  */
@@ -229,9 +229,9 @@ export default /** @type {import('yargs').CommandModule<{}, Args>} */ ({
       })
       .option('tsgo', {
         type: 'boolean',
-        default: process.env.MUI_USE_TSGO,
+        default: false,
         description:
-          'Uses tsgo cli instead of tsc for type generation. Can also be set via env var "MUI_USE_TSGO"',
+          'Use the native TypeScript compiler instead of the TS6 JS compiler for type generation',
       })
       .option('flat', {
         type: 'boolean',

package/src/cli/cmdListWorkspaces.mjs

@@ -6,14 +6,12 @@
  * @typedef {import('../utils/pnpm.mjs').PublicPackage} PublicPackage
  */
 
-import * as fs from 'node:fs/promises';
-import * as path from 'node:path';
 import { getWorkspacePackages } from '../utils/pnpm.mjs';
 
 /**
  * @typedef {Object} Args
  * @property {boolean} [publicOnly] - Whether to filter to only public packages
- * @property {'json'|'path'|'name'|'publish-dir'} [output] - Output format (name, path, or json)
+ * @property {'json'|'path'|'name'} [output] - Output format (name, path, or json)
  * @property {string} [sinceRef] - Git reference to filter changes since
  * @property {string[]} [filter] - Same as filtering packages with --filter in pnpm. Only include packages matching the filter. See https://pnpm.io/filtering.
  */
@@ -30,10 +28,10 @@ export default /** @type {import('yargs').CommandModule<{}, Args>} */ ({
       })
       .option('output', {
         type: 'string',
-        choices: ['json', 'path', 'name', 'publish-dir'],
+        choices: ['json', 'path', 'name'],
         default: 'path',
         description:
-          'Output format: name (package names), path (package paths), publish-dir (publish directories), or json (full JSON)',
+          'Output format: name (package names), path (package paths), or json (full JSON)',
       })
       .option('since-ref', {
         type: 'string',
@@ -60,32 +58,6 @@ export default /** @type {import('yargs').CommandModule<{}, Args>} */ ({
       packages.forEach((pkg) => {
         console.log(pkg.path);
       });
-    } else if (output === 'publish-dir') {
-      // Works around https://github.com/stackblitz-labs/pkg.pr.new/issues/389: pkg-pr-new rewrites
-      // workspace:* deps to its URLs in the source package.json, but `pnpm pack` honors
-      // publishConfig.directory and packs the build package.json, whose workspace:* deps are left to
-      // resolve to plain versions. Pointing pkg-pr-new at the build dir makes both act on the same file.
-      // Note: #389 was closed by pkg-pr-new#499, but that only fixed the tarball location, not the dep
-      // resolution — verified still broken on 0.0.78. Do not remove until the packed deps are URLs
-      // without this. Removing it prematurely regressed publishing once (see mui-public#1354).
-      // Print publish directories (package.json publishConfig.directory or package path)
-      const publishDirs = await Promise.all(
-        packages.map(async (pkg) => {
-          const packageJsonPath = path.join(pkg.path, 'package.json');
-          const packageJsonContent = await fs.readFile(packageJsonPath, 'utf8');
-          const packageJson = JSON.parse(packageJsonContent);
-
-          if (packageJson.publishConfig?.directory) {
-            return path.join(pkg.path, packageJson.publishConfig.directory);
-          }
-
-          return pkg.path;
-        }),
-      );
-
-      publishDirs.forEach((dir) => {
-        console.log(dir);
-      });
     } else if (output === 'name') {
       // Print package names (default)
       packages.forEach((pkg) => {

package/src/utils/typescript.mjs

@@ -14,21 +14,43 @@ import { getOutExtension, mapConcurrently } from '../utils/build.mjs';
 const $$ = $({ stdio: 'inherit' });
 
 /**
- * Checks if tsgo CLI is available in the workspace's node_modules.
- * @param {string} cwd - The current working directory to start searching from.
- * @returns {Promise<string | null>} - The path to tsgo if found, null otherwise.
+ * Finds a CLI shim in a directory's node_modules/.bin.
+ * @param {string} dir
+ * @param {string} name
+ * @returns {Promise<string | null>}
  */
-async function findTsgo(cwd) {
-  const workspaceDir = await findWorkspaceDir(cwd);
-  if (!workspaceDir) {
-    return null;
-  }
-  const tsgoPath = path.join(workspaceDir, 'node_modules', '.bin', 'tsgo');
-  const exists = await fs.stat(tsgoPath).then(
+async function findBin(dir, name) {
+  const binPath = path.join(dir, 'node_modules', '.bin', name);
+  const exists = await fs.stat(binPath).then(
     (stat) => stat.isFile(),
     () => false,
   );
-  return exists ? tsgoPath : null;
+  return exists ? binPath : null;
+}
+
+/**
+ * Resolves the native/JS TypeScript CLI pair from the workspace root's
+ * `node_modules/.bin`: tsgo/tsc when the legacy `tsgo` shim exists, tsc/tsc6
+ * otherwise, with bare `tsc` from PATH as the JS fallback.
+ *
+ * @param {string} cwd
+ * @returns {Promise<{ native: string | null, js: string }>}
+ */
+async function findTscPair(cwd) {
+  const workspaceDir = await findWorkspaceDir(cwd);
+  if (!workspaceDir) {
+    return { native: null, js: 'tsc' };
+  }
+
+  const [tsgo, tsc, tsc6] = await Promise.all([
+    findBin(workspaceDir, 'tsgo'),
+    findBin(workspaceDir, 'tsc'),
+    findBin(workspaceDir, 'tsc6'),
+  ]);
+  if (tsgo) {
+    return { native: tsgo, js: 'tsc' };
+  }
+  return { native: tsc, js: tsc6 ?? 'tsc' };
 }
 
 /**
@@ -36,44 +58,38 @@ async function findTsgo(cwd) {
  * @param {string} tsconfig - The path to the tsconfig.json file.
  * @param {string} outDir - The output directory for the declaration files.
  * @param {Object} options
- * @param {boolean} [options.useTsgo] - Whether to use typescript native (tsgo).
+ * @param {boolean} [options.useTsgo] - Whether to use the native TypeScript compiler.
  */
 export async function emitDeclarations(tsconfig, outDir, options) {
   const { useTsgo = false } = options ?? {};
   const tsconfigDir = path.dirname(tsconfig);
   const rootDir = path.resolve(tsconfigDir, './src');
 
-  const tsgoPath = useTsgo ? await findTsgo(tsconfigDir) : null;
+  const pair = await findTscPair(tsconfigDir);
+  const tsgoPath = useTsgo ? pair.native : null;
   if (useTsgo && !tsgoPath) {
     throw new Error(
-      '--tsgo flag was passed or MUI_USE_TSGO environment was set but no tsgo cli was found. Either remove the flag to use tsc or install the native package "@typescript/native-preview" at the workspace level to use tsgo.',
+      '--tsgo flag was passed but no native TypeScript cli was found. Either remove the flag to use the JS compiler or install TypeScript 7 at the workspace root, as "typescript@^7" or under an alias such as "@typescript/native".',
     );
   }
 
-  if (tsgoPath) {
-    console.log('Using tsgo for declaration emit');
-    await $$`${tsgoPath}
-      -p ${tsconfig}
-      --rootDir ${rootDir}
-      --outDir ${outDir}
-      --declaration
-      --emitDeclarationOnly
-      --noEmit false
-      --composite false
-      --incremental false
-      --declarationMap false`;
-  } else {
-    await $$`tsc
-      -p ${tsconfig}
-      --rootDir ${rootDir}
-      --outDir ${outDir}
-      --declaration
-      --emitDeclarationOnly
-      --noEmit false
-      --composite false
-      --incremental false
-      --declarationMap false`;
-  }
+  const tscPath = tsgoPath ?? pair.js;
+  console.log(
+    tsgoPath
+      ? `Using ts-native for declaration emit: ${tscPath}`
+      : `Using ${tscPath} for declaration emit`,
+  );
+
+  await $$`${tscPath}
+    -p ${tsconfig}
+    --rootDir ${rootDir}
+    --outDir ${outDir}
+    --declaration
+    --emitDeclarationOnly
+    --noEmit false
+    --composite false
+    --incremental false
+    --declarationMap false`;
 }
 
 /**
@@ -198,7 +214,7 @@ export async function moveAndTransformDeclarations({ inputDir, buildDir, bundles
  * @param {string} param0.buildDir - The build directory.
  * @param {string} param0.cwd - The current working directory.
  * @param {boolean} param0.skipTsc - Whether to skip running TypeScript compiler (tsc) for building types.
- * @param {boolean} [param0.useTsgo=false] - Whether to build types using typescript native (tsgo).
+ * @param {boolean} [param0.useTsgo=false] - Whether to build types using the native TypeScript compiler.
  * @param {'module' | 'commonjs'} [param0.packageType] - The package.json type field.
  */
 export async function createTypes({