[infra] WIP - use .mjs extension instead of nested package.json

.circleci/config.yml

@@ -43,6 +43,7 @@ default-job: &default-job
     AWS_REGION_ARTIFACTS: eu-central-1
     COREPACK_ENABLE_DOWNLOAD_PROMPT: '0'
     DANGER_DISABLE_TRANSPILATION: 'true'
+    MUI_EXPERIMENTAL_MJS: 1
   working_directory: /tmp/material-ui
   docker:
     - image: cimg/node:20.17
@@ -239,14 +240,6 @@ jobs:
             pnpm --filter @mui/material typescript:module-augmentation
             pnpm --filter @mui/joy typescript:module-augmentation
             pnpm --filter @mui/system typescript:module-augmentation
-      - run:
-          name: Diff declaration files
-          command: |
-            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:stable && pnpm -r build:types
-            git --no-pager diff
       - run:
           name: Any defect declaration files?
           command: node scripts/testBuiltTypes.mjs
@@ -595,7 +588,7 @@ jobs:
 
       - run:
           name: build @mui packages
-          command: pnpm lerna run --ignore @mui/icons-material --concurrency 6 --scope "@mui/*" build
+          command: pnpm release:build --scope "@mui/*" --ignore @mui/icons-material
       - aws-cli/setup:
           aws_access_key_id: $AWS_ACCESS_KEY_ID_ARTIFACTS
           aws_secret_access_key: $AWS_SECRET_ACCESS_KEY_ARTIFACTS

.github/workflows/ci.yml

@@ -33,6 +33,8 @@ jobs:
           cache: 'pnpm' # https://github.com/actions/setup-node/blob/main/docs/advanced-usage.md#caching-packages-dependencies
       - run: pnpm install:codesandbox
       - run: pnpm build:codesandbox
+        env:
+          MUI_EXPERIMENTAL_MJS: 1
       - run: pnpm pkg-pr-new-release
 
   # Tests dev-only scripts across all supported dev environments

netlify.toml

@@ -8,6 +8,7 @@
 [build.environment]
   NODE_VERSION = "20"
   PNPM_FLAGS = "--frozen-lockfile"
+  MUI_EXPERIMENTAL_MJS = "1"
 
 [[plugins]]
   package = "./packages/netlify-plugin-cache-docs"

package.json

@@ -189,6 +189,8 @@
     "prettier": "^3.6.2",
     "pretty-quick": "^4.2.2",
     "process": "^0.11.10",
+    "regexp.escape": "^2.0.1",
+    "resolve-pkg-maps": "^1.0.0",
     "rimraf": "^6.0.1",
     "serve": "^14.2.4",
     "stylelint": "^16.22.0",
@@ -209,6 +211,15 @@
   "engines": {
     "pnpm": "10.13.1"
   },
+  "pnpm": {
+    "packageExtensions": {
+      "@pigment-css/react": {
+        "peerDependencies": {
+          "@mui/types": "7"
+        }
+      }
+    }
+  },
   "resolutions": {
     "@babel/core": "^7.28.0",
     "@babel/plugin-transform-runtime": "^7.28.0",

packages-internal/docs-utils/src/createTypeScriptProject.ts

@@ -38,7 +38,7 @@ export const createTypeScriptProject = (
   const {
     name,
     rootPath,
-    tsConfigPath: inputTsConfigPath = 'tsconfig.build.json',
+    tsConfigPath: inputTsConfigPath = 'tsconfig.json',
     entryPointPath: inputEntryPointPath,
     files,
   } = options;

packages-internal/docs-utils/tsconfig.build.json

@@ -1,6 +1,7 @@
 {
   "extends": "./tsconfig.json",
   "compilerOptions": {
+    "paths": {},
     "rootDir": "./src",
     "outDir": "./build",
     "declaration": true,

packages-internal/test-utils/tsconfig.build.json

@@ -1,6 +1,7 @@
 {
   "extends": "./tsconfig.json",
   "compilerOptions": {
+    "paths": {},
     "rootDir": "./src",
     "outDir": "./build",
     "declaration": true,

packages/api-docs-builder/utils/createTypeScriptProject.ts

@@ -43,7 +43,7 @@ export const createTypeScriptProject = (
   const {
     name,
     rootPath,
-    tsConfigPath: inputTsConfigPath = 'tsconfig.build.json',
+    tsConfigPath: inputTsConfigPath = 'tsconfig.json',
     entryPointPath: inputEntryPointPath,
     files,
   } = options;

packages/mui-docs/src/Ad/ad.styles.ts

@@ -1,6 +1,6 @@
-import { alpha, Theme } from '@mui/material/styles';
+import { alpha, CSSProperties, Theme } from '@mui/material/styles';
 
-export const adBodyImageStyles = (theme: Theme) => ({
+export const adBodyImageStyles = (theme: Theme): Record<string, CSSProperties> => ({
   root: {
     display: 'block',
     overflow: 'hidden',
@@ -45,7 +45,7 @@ export const adBodyImageStyles = (theme: Theme) => ({
   },
 });
 
-export const adBodyInlineStyles = (theme: Theme) => {
+export const adBodyInlineStyles = (theme: Theme): Record<string, CSSProperties> => {
   const baseline = adBodyImageStyles(theme);
 
   return {

packages/mui-docs/tsconfig.build.json

@@ -3,7 +3,7 @@
   // Actual .ts source files are transpiled via babel
   "extends": "./tsconfig.json",
   "compilerOptions": {
-    "composite": true,
+    "paths": {},
     "declaration": true,
     "noEmit": false,
     "emitDeclarationOnly": true,
@@ -12,10 +12,5 @@
     "tsBuildInfoFile": "build/tsconfig.build.tsbuildinfo"
   },
   "include": ["./types.d.ts", "src/**/*.ts*", "src/**/*.json"],
-  "exclude": ["src/**/*.spec.ts*", "src/**/*.test.ts*"],
-  "references": [
-    { "path": "../mui-material/tsconfig.build.json" },
-    { "path": "../mui-system/tsconfig.build.json" },
-    { "path": "../mui-icons-material/tsconfig.build.json" }
-  ]
+  "exclude": ["src/**/*.spec.ts*", "src/**/*.test.ts*"]
 }

packages/mui-icons-material/tsconfig.build.json

@@ -3,7 +3,7 @@
   // Actual .ts source files are transpiled via babel
   "extends": "./tsconfig.json",
   "compilerOptions": {
-    "composite": true,
+    "paths": {},
     "declaration": false,
     "noEmit": false,
     "emitDeclarationOnly": false,

packages/mui-joy/src/styles/variantColorInheritance.tsx

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { ColorPaletteProp, VariantProp } from '@mui/joy/styles/types';
+import { ColorPaletteProp, VariantProp } from './types';
 
 const VariantColorContext = React.createContext<string | undefined>(undefined);
 

packages/mui-joy/tsconfig.build.json

@@ -3,14 +3,13 @@
   // Actual .ts source files are transpiled via babel
   "extends": "./tsconfig.json",
   "compilerOptions": {
-    "composite": true,
+    "paths": {},
     "declaration": true,
     "noEmit": false,
     "emitDeclarationOnly": true,
     "outDir": "build/esm",
     "rootDir": "./src"
   },
   "include": ["./src/**/*.ts*"],
-  "exclude": ["src/**/*.spec.ts*", "src/**/*.test.ts*"],
-  "references": [{ "path": "../mui-system/tsconfig.build.json" }]
+  "exclude": ["src/**/*.spec.ts*", "src/**/*.test.ts*"]
 }

packages/mui-lab/tsconfig.build.json

@@ -3,16 +3,13 @@
   // Actual .ts source files are transpiled via babel
   "extends": "./tsconfig.json",
   "compilerOptions": {
+    "paths": {},
     "noEmit": false,
     "declaration": true,
     "rootDir": "./src",
     "outDir": "build/esm",
     "emitDeclarationOnly": true
   },
   "include": ["src/**/*.ts*"],
-  "exclude": ["src/**/*.d.ts", "src/**/*.test.*", "./**/*.spec.*"],
-  "references": [
-    { "path": "../mui-material/tsconfig.build.json" },
-    { "path": "../mui-system/tsconfig.build.json" }
-  ]
+  "exclude": ["src/**/*.d.ts", "src/**/*.test.*", "./**/*.spec.*"]
 }

packages/mui-material-nextjs/tsconfig.build.json

@@ -3,7 +3,7 @@
   // Actual .ts source files are transpiled via babel
   "extends": "./tsconfig.json",
   "compilerOptions": {
-    "composite": true,
+    "paths": {},
     "declaration": true,
     "noEmit": false,
     "emitDeclarationOnly": true,

packages/mui-material-pigment-css/tsconfig.build.json

@@ -1,7 +1,7 @@
 {
   "extends": "./tsconfig.json",
   "compilerOptions": {
-    "composite": true,
+    "paths": {},
     "declaration": true,
     "noEmit": false,
     "emitDeclarationOnly": true,

packages/mui-material/src/themeCssVarsAugmentation/index.d.ts → packages/mui-material/src/themeCssVarsAugmentation/index.ts

@@ -3,6 +3,7 @@ export {};
  * Enhance the theme types to include new properties from the CssVarsProvider.
  * The theme is typed with CSS variables in `styled`, `sx`, `useTheme`, etc.
  */
+
 declare module '@mui/material/styles' {
   interface CssThemeVariables {
     enabled: true;

packages/mui-material/tsconfig.build.json

@@ -3,14 +3,19 @@
   // Actual .ts source files are transpiled via babel
   "extends": "./tsconfig.json",
   "compilerOptions": {
-    "composite": true,
+    "paths": {
+      // reset paths, but keep the one for @mui/material. Necessary to be able to build
+      //   packages/mui-material/src/types/OverridableComponentAugmentation.ts
+      //   packages/mui-material/src/themeCssVarsAugmentation/index.ts
+      // as the types to be overriden are otherwise not found
+      "@mui/material/*": ["./src/*"]
+    },
     "declaration": true,
     "noEmit": false,
     "emitDeclarationOnly": true,
     "outDir": "build/esm",
     "rootDir": "./src"
   },
   "include": ["./src/**/*.ts*"],
-  "exclude": ["src/**/*.spec.ts*", "src/**/*.test.ts*"],
-  "references": [{ "path": "../mui-system/tsconfig.build.json" }]
+  "exclude": ["src/**/*.spec.ts*", "src/**/*.test.ts*"]
 }

packages/mui-stylis-plugin-rtl/tsconfig.build.json

@@ -3,7 +3,7 @@
   // Actual .ts source files are transpiled via babel
   "extends": "./tsconfig.json",
   "compilerOptions": {
-    "composite": true,
+    "paths": {},
     "declaration": true,
     "noEmit": false,
     "emitDeclarationOnly": true,

packages/mui-system/tsconfig.build.json

@@ -3,14 +3,13 @@
   // Actual .ts source files are transpiled via babel
   "extends": "./tsconfig.json",
   "compilerOptions": {
-    "composite": true,
+    "paths": {},
     "declaration": true,
     "noEmit": false,
     "emitDeclarationOnly": true,
     "outDir": "build/esm",
     "rootDir": "./src"
   },
   "include": ["src/**/*.ts*"],
-  "exclude": ["src/**/*.spec.ts*", "src/**/*.test.ts*"],
-  "references": [{ "path": "../mui-utils/tsconfig.build.json" }]
+  "exclude": ["src/**/*.spec.ts*", "src/**/*.test.ts*"]
 }

packages/mui-types/tsconfig.build.json

@@ -3,7 +3,12 @@
   // Actual .ts source files are transpiled via babel
   "extends": "./tsconfig.json",
   "compilerOptions": {
-    "composite": true,
+    "paths": {
+      // reset paths, but keep the one for @mui/types. Necessary to be able to build
+      //   packages/mui-types/src/OverridableComponentAugmentation.ts
+      // as the types to be overriden are otherwise not found
+      "@mui/types": ["./src"]
+    },
     "declaration": true,
     "noEmit": false,
     "emitDeclarationOnly": true,

packages/mui-utils/package.json

@@ -27,7 +27,7 @@
   "scripts": {
     "build": "pnpm build:node && pnpm build:stable && pnpm build:types && pnpm build:copy-files",
     "build:node": "node ../../scripts/build.mjs node",
-    "build:stable": "node ../../scripts/build.mjs stable",
+    "build:stable": "node ../../scripts/build.mjs stable --verbose",
     "build:copy-files": "node ../../scripts/copyFiles.mjs",
     "build:types": "tsx ../../scripts/buildTypes.mts",
     "prebuild": "rimraf build tsconfig.build.tsbuildinfo",

packages/mui-utils/tsconfig.build.json

@@ -3,7 +3,7 @@
   // Actual .ts source files are transpiled via babel
   "extends": "./tsconfig.json",
   "compilerOptions": {
-    "composite": true,
+    "paths": {},
     "declaration": true,
     "noEmit": false,
     "emitDeclarationOnly": true,
@@ -12,6 +12,5 @@
     "types": ["react", "node"]
   },
   "include": ["src/**/*.ts"],
-  "exclude": ["src/**/*.test.ts*", "src/**/*.spec.ts*"],
-  "references": [{ "path": "../mui-types/tsconfig.build.json" }]
+  "exclude": ["src/**/*.test.ts*", "src/**/*.spec.ts*"]
 }