[code-infra] Update package layout for better ESM support

.circleci/config.yml

@@ -310,7 +310,7 @@ jobs:
             git add -f packages/mui-material/build || echo '/material declarations do not exist'
             git add -f packages/mui-lab/build || echo '/lab declarations do not exist'
             git add -f packages/mui-utils/build || echo '/utils declarations do not exist'
-            pnpm -r build:types
+            pnpm -r build:stable && pnpm -r build:types  
             git --no-pager diff
       - run:
           name: Any defect declaration files?

.github/workflows/ci.yml

@@ -38,7 +38,7 @@ jobs:
       - run: pnpm install
       - run: pnpm build:ci
         env:
-          NODE_OPTIONS: --max_old_space_size=4096
+          NODE_OPTIONS: --max_old_space_size=8192
       - run: pnpm release:changelog
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

apps/pigment-css-next-app/tsconfig.json

@@ -22,17 +22,6 @@
       "@/*": ["./src/*"]
     }
   },
-  "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"],
-  "exclude": ["node_modules"],
-  "references": [
-    {
-      "path": "../../packages/mui-system/tsconfig.build.json"
-    },
-    {
-      "path": "../../packages/mui-base/tsconfig.build.json"
-    },
-    {
-      "path": "../../packages/mui-material/tsconfig.build.json"
-    }
-  ]
+  "include": ["next-env.d.ts", "./src/**/*.ts", "./src/**/*.tsx", ".next/types/**/*.ts"],
+  "exclude": ["node_modules"]
 }

apps/pigment-css-vite-app/tsconfig.json

@@ -3,16 +3,5 @@
   "compilerOptions": {
     "jsx": "react-jsx",
     "allowImportingTsExtensions": true
-  },
-  "references": [
-    {
-      "path": "../../packages/mui-system/tsconfig.build.json"
-    },
-    {
-      "path": "../../packages/mui-base/tsconfig.build.json"
-    },
-    {
-      "path": "../../packages/mui-material/tsconfig.build.json"
-    }
-  ]
+  }
 }

babel.config.js

@@ -68,14 +68,9 @@ module.exports = function getBabelConfig(api) {
     '@babel/preset-typescript',
   ];
 
-  const usesAliases =
-    // in this config:
-    api.env(['coverage', 'development', 'test', 'benchmark']) ||
-    process.env.NODE_ENV === 'test' ||
-    // in webpack config:
-    api.env(['regressions']);
-
-  const outFileExtension = '.js';
+  // Essentially only replace in production builds.
+  // When aliasing we want to keep the original extension
+  const outFileExtension = process.env.MUI_OUT_FILE_EXTENSION || null;
 
   /** @type {babel.PluginItem[]} */
   const plugins = [
@@ -118,9 +113,7 @@ module.exports = function getBabelConfig(api) {
           [
             '@mui/internal-babel-plugin-resolve-imports',
             {
-              // Don't replace the extension when we're using aliases.
-              // Essentially only replace in production builds.
-              outExtension: usesAliases ? null : outFileExtension,
+              outExtension: outFileExtension,
             },
           ],
         ]

package.json

@@ -94,6 +94,7 @@
     "nx_test_karma": "cross-env NODE_ENV=test karma start test/karma.conf.js",
     "nx_test_regressions_run": "mocha --config test/regressions/.mocharc.js --delay 'test/regressions/**/*.test.js'",
     "nx_test_regressions_pigment_css_run": "mocha --config apps/pigment-css-vite-app/.mocharc.cjs --delay 'apps/pigment-css-vite-app/**/*.test.js'",
+    "clean": "pnpm -r exec rm -rf build",
     "nx_test_unit": "cross-env NODE_ENV=test mocha \"packages/**/*.test.?(c|m)[jt]s?(x)\" \"packages-internal/**/*.test.?(c|m)[jt]s?(x)\" \"docs/**/*.test.?(c|m)[jt]s?(x)\""
   },
   "dependencies": {
@@ -175,11 +176,11 @@
     "karma-mocha": "^2.0.1",
     "karma-sourcemap-loader": "^0.4.0",
     "karma-webpack": "^5.0.0",
-    "lerna": "^8.1.9",
+    "lerna": "^8.1.8",
     "lodash": "^4.17.21",
     "markdownlint-cli2": "^0.17.1",
     "mocha": "^11.0.1",
-    "nx": "^20.3.1",
+    "nx": "^19.8.14",
     "nyc": "^17.1.0",
     "piscina": "^4.8.0",
     "postcss-styled-syntax": "^0.7.0",

packages/mui-base/package.json

@@ -32,7 +32,7 @@
     "build:node": "node ../../scripts/build.mjs node",
     "build:stable": "node ../../scripts/build.mjs stable",
     "build:copy-files": "node ../../scripts/copyFiles.mjs",
-    "build:types": "node ../../scripts/buildTypes.mjs",
+    "build:types": "tsx ../../scripts/buildTypes.mts",
     "prebuild": "rimraf build tsconfig.build.tsbuildinfo",
     "release": "pnpm build && pnpm publish",
     "test": "cd ../../ && cross-env NODE_ENV=test mocha 'packages/mui-base/**/*.test.?(c|m)[jt]s?(x)'",

packages/mui-base/src/Select/Select.test.tsx

@@ -1006,7 +1006,7 @@ describe('<Select />', () => {
       );
 
       const select = screen.getByRole('combobox');
-      act(() => {
+      await act(async () => {
         select.click();
       });
 
@@ -1022,7 +1022,7 @@ describe('<Select />', () => {
 
       const select = screen.getByRole('combobox');
 
-      act(() => {
+      await act(async () => {
         select.click();
       });
 
@@ -1041,7 +1041,7 @@ describe('<Select />', () => {
       );
 
       const select = screen.getByRole('combobox');
-      act(() => {
+      await act(async () => {
         select.click();
       });
 
@@ -1253,11 +1253,11 @@ describe('<Select />', () => {
     const updateButton = getByTestId('update-externally');
     const selectButton = getByTestId('select');
 
-    act(() => updateButton.click());
-    act(() => selectButton.click());
+    await act(async () => updateButton.click());
+    await act(async () => selectButton.click());
 
     const option2 = getByText('2');
-    act(() => option2.click());
+    await act(async () => option2.click());
 
     expect(selectButton).to.have.text('1, 2');
   });

packages/mui-base/tsconfig.build.json

@@ -7,7 +7,7 @@
     "declaration": true,
     "noEmit": false,
     "emitDeclarationOnly": true,
-    "outDir": "build",
+    "outDir": "build/esm",
     "rootDir": "./src"
   },
   "include": ["src/**/*.ts*"],

packages/mui-docs/package.json

@@ -27,7 +27,7 @@
     "build:modern": "echo 'Skip modern build'",
     "build:node": "node ../../scripts/build.mjs node",
     "build:stable": "node ../../scripts/build.mjs stable",
-    "build:types": "node ../../scripts/buildTypes.mjs",
+    "build:types": "tsx ../../scripts/buildTypes.mts",
     "build:copy-files": "node ../../scripts/copyFiles.mjs ./src/translations/translations.json:./translations/translations.json ./src/translations/translations.json:./node/translations/translations.json",
     "prebuild": "rimraf build",
     "release": "pnpm build && pnpm publish",

packages/mui-docs/tsconfig.build.json

@@ -7,7 +7,7 @@
     "declaration": true,
     "noEmit": false,
     "emitDeclarationOnly": true,
-    "outDir": "build",
+    "outDir": "build/esm",
     "rootDir": "./src",
     "tsBuildInfoFile": "build/tsconfig.build.tsbuildinfo"
   },