[code-infra] Update module resolution for typescript@next (#46940)

Janpot · web-flow · commit 292637d313d3 · 2025-09-24T11:52:55.000+02:00
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -258,10 +258,14 @@ jobs:
           command: pnpm typescript:ci
           environment:
             NODE_OPTIONS: --max-old-space-size=3072
+      - run:
+          name: Prepare files
+          # Enable configuration that is only valid in typescript@next
+          command: sed -i 's|// <ts@next uncomment>||g' test/moduleResolution/tsconfig.node.json
       - run:
           name: Build declaration files
           command: |
-            pnpm -r build
+            pnpm lerna run --scope "@mui/*" build
       - run:
           name: Log defect declaration files
           command: |
diff --git a/packages-internal/docs-utils/tsconfig.build.json b/packages-internal/docs-utils/tsconfig.build.json
@@ -8,7 +8,6 @@
     "composite": true,
     "tsBuildInfoFile": "./build/.tsbuildinfo",
     "target": "ES2020",
-    "module": "commonjs",
     "types": ["node"]
   },
   "exclude": ["./test/*.ts"]
diff --git a/packages-internal/docs-utils/tsconfig.json b/packages-internal/docs-utils/tsconfig.json
@@ -1,7 +1,8 @@
 {
   "compilerOptions": {
     "noEmit": true,
-    "moduleResolution": "node",
+    "module": "nodenext",
+    "moduleResolution": "nodenext",
     "types": ["node"],
     "strict": true,
     "esModuleInterop": true,
diff --git a/packages-internal/scripts/tsconfig.base.json b/packages-internal/scripts/tsconfig.base.json
@@ -1,16 +1,14 @@
 {
   "compilerOptions": {
     "target": "ES2020",
-    "moduleResolution": "node",
-    "module": "commonjs",
+    "moduleResolution": "nodenext",
+    "module": "nodenext",
     "types": ["node"],
-
     "strict": true,
     "declaration": true,
     "declarationMap": true,
     "sourceMap": true,
     "composite": true,
-
     "esModuleInterop": true,
     "isolatedModules": true
   }
diff --git a/packages-internal/scripts/typescript-to-proptypes/tsconfig.test.json b/packages-internal/scripts/typescript-to-proptypes/tsconfig.test.json
@@ -1,7 +1,6 @@
 {
   "compilerOptions": {
     "noEmit": true,
-    "moduleResolution": "node",
     "types": ["node", "mocha"],
     "strict": true,
     "esModuleInterop": true,
diff --git a/packages-internal/test-utils/src/setupVitest.ts b/packages-internal/test-utils/src/setupVitest.ts
@@ -23,7 +23,7 @@ testingLibrary.configure({
 (globalThis as any).IS_REACT_ACT_ENVIRONMENT = true;
 
 failOnConsole({
-  silenceMessage: (message) => {
+  silenceMessage: (message: string) => {
     if (process.env.NODE_ENV === 'production') {
       // TODO: mock scheduler
       if (message.includes('act(...) is not supported in production builds of React')) {
diff --git a/packages-internal/test-utils/tsconfig.build.json b/packages-internal/test-utils/tsconfig.build.json
@@ -10,7 +10,6 @@
     "composite": true,
     "tsBuildInfoFile": "./build/.tsbuildinfo",
     "target": "ES2020",
-    "module": "commonjs",
     "types": ["node"],
     "allowJs": true
   }
diff --git a/packages-internal/test-utils/tsconfig.json b/packages-internal/test-utils/tsconfig.json
@@ -2,7 +2,8 @@
   "compilerOptions": {
     "lib": ["es2020", "dom"],
     "noEmit": true,
-    "moduleResolution": "node",
+    "module": "nodenext",
+    "moduleResolution": "nodenext",
     "types": ["node", "mocha"],
     "strict": true,
     "esModuleInterop": true,
diff --git a/packages/api-docs-builder/tsconfig.json b/packages/api-docs-builder/tsconfig.json
@@ -9,8 +9,8 @@
     "esModuleInterop": true,
     "types": ["node", "mocha"],
     "target": "ES2020",
-    "module": "CommonJS",
-    "moduleResolution": "node",
+    "module": "nodenext",
+    "moduleResolution": "nodenext",
     "strict": true,
     "baseUrl": "./",
     "paths": {
diff --git a/test/moduleResolution/tsconfig.json b/test/moduleResolution/tsconfig.json
@@ -2,11 +2,11 @@
   "compilerOptions": {
     // rely on workspace linking
     "paths": {},
-    "module": "commonjs",
     "target": "es5",
     "lib": ["es6", "dom"],
     "jsx": "react",
-    "moduleResolution": "node",
+    "module": "nodenext",
+    "moduleResolution": "nodenext",
     "strict": true,
     "noEmit": true,
     "noErrorTruncation": true,
diff --git a/test/moduleResolution/tsconfig.node.json b/test/moduleResolution/tsconfig.node.json
@@ -1,6 +1,9 @@
 {
   "extends": "./tsconfig.json",
   "compilerOptions": {
+    // <ts@next uncomment> "ignoreDeprecations": "6.0",
+    "module": "commonjs",
+    // This will stop functioning under typescript 7.0. We can probably just remove this test by then
     "moduleResolution": "node"
   }
 }
diff --git a/test/regressions/tsconfig.node.json b/test/regressions/tsconfig.node.json
@@ -3,11 +3,11 @@
     "tsBuildInfoFile": "../node_modules/.tmp/regressions/tsconfig.node.tsbuildinfo",
     "target": "ES2022",
     "lib": ["ES2023"],
-    "module": "ESNext",
+    "module": "nodenext",
     "skipLibCheck": true,
 
     /* Bundler mode */
-    "moduleResolution": "bundler",
+    "moduleResolution": "nodenext",
     "allowImportingTsExtensions": true,
     "isolatedModules": true,
     "moduleDetection": "force",
diff --git a/tsconfig.json b/tsconfig.json
@@ -1,14 +1,14 @@
 {
   "compilerOptions": {
-    "module": "esnext",
     // aligning with Node18 recommendation: https://www.npmjs.com/package/@tsconfig/node18
     "target": "es2022",
     "lib": ["es2020", "dom", "dom.iterable"],
     "jsx": "preserve",
-    "moduleResolution": "node",
     "forceConsistentCasingInFileNames": true,
     "strict": true,
     "noEmit": true,
+    "module": "preserve",
+    "moduleResolution": "bundler",
     "experimentalDecorators": true,
     "allowSyntheticDefaultImports": true,
     "noErrorTruncation": false,

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"compilerOptions": {`
`3`	`3`	`"noEmit": true,`
`4`		`- "moduleResolution": "node",`
`5`	`4`	`"types": ["node", "mocha"],`
`6`	`5`	`"strict": true,`
`7`	`6`	`"esModuleInterop": true,`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,6 @@`
`10`	`10`	`"composite": true,`
`11`	`11`	`"tsBuildInfoFile": "./build/.tsbuildinfo",`
`12`	`12`	`"target": "ES2020",`
`13`		`- "module": "commonjs",`
`14`	`13`	`"types": ["node"],`
`15`	`14`	`"allowJs": true`
`16`	`15`	`}`