fix types for @mui/styled-engine

mui · Feb 25, 2025 · 207d8b4 · 207d8b4
1 parent 620be65
commit 207d8b4
Show file tree

Hide file tree

Showing 7 changed files with 40 additions and 20 deletions.
diff --git a/packages/mui-private-theming/package.json b/packages/mui-private-theming/package.json
@@ -26,11 +26,12 @@
     "url": "https://opencollective.com/mui-org"
   },
   "scripts": {
-    "build": "pnpm build:modern && pnpm build:node && pnpm build:stable && pnpm build:copy-files",
+    "build": "pnpm build:modern && pnpm build:node && pnpm build:stable && pnpm build:types && pnpm build:copy-files",
     "build:modern": "node ../../scripts/build.mjs modern",
     "build:node": "node ../../scripts/build.mjs node",
     "build:stable": "node ../../scripts/build.mjs stable",
     "build:copy-files": "node ../../scripts/copyFiles.mjs",
+    "build:types": "tsx ../../scripts/buildTypes.mts --skipTsc",
     "prebuild": "rimraf build",
     "release": "pnpm build && pnpm publish",
     "test": "cd ../../ && cross-env NODE_ENV=test mocha 'packages/mui-private-theming/**/*.test.?(c|m)[jt]s?(x)'",

diff --git a/packages/mui-private-theming/src/defaultTheme/index.js b/packages/mui-private-theming/src/defaultTheme/index.js
@@ -0,0 +1 @@
+export {};
diff --git a/packages/mui-styled-engine-sc/package.json b/packages/mui-styled-engine-sc/package.json
@@ -26,11 +26,12 @@
     "url": "https://opencollective.com/mui-org"
   },
   "scripts": {
-    "build": "pnpm build:modern && pnpm build:node && pnpm build:stable && pnpm build:copy-files",
+    "build": "pnpm build:modern && pnpm build:node && pnpm build:stable && pnpm build:types && pnpm build:copy-files",
     "build:modern": "node ../../scripts/build.mjs modern",
     "build:node": "node ../../scripts/build.mjs node",
     "build:stable": "node ../../scripts/build.mjs stable",
     "build:copy-files": "node ../../scripts/copyFiles.mjs",
+    "build:types": "tsx ../../scripts/buildTypes.mts --skipTsc",
     "prebuild": "rimraf build",
     "release": "pnpm build && pnpm publish",
     "test": "cd ../../ && cross-env NODE_ENV=test mocha 'packages/mui-styled-engine-sc/**/*.test.?(c|m)[jt]s?(x)'",

diff --git a/packages/mui-styled-engine/package.json b/packages/mui-styled-engine/package.json
@@ -26,11 +26,12 @@
     "url": "https://opencollective.com/mui-org"
   },
   "scripts": {
-    "build": "pnpm build:modern && pnpm build:node && pnpm build:stable && pnpm build:copy-files",
+    "build": "pnpm build:modern && pnpm build:node && pnpm build:stable && pnpm build:types && pnpm build:copy-files",
     "build:modern": "node ../../scripts/build.mjs modern",
     "build:node": "node ../../scripts/build.mjs node",
     "build:stable": "node ../../scripts/build.mjs stable",
     "build:copy-files": "node ../../scripts/copyFiles.mjs",
+    "build:types": "tsx ../../scripts/buildTypes.mts --skipTsc",
     "prebuild": "rimraf build",
     "release": "pnpm build && pnpm publish",
     "test": "cd ../../ && cross-env NODE_ENV=test mocha 'packages/mui-styled-engine/**/*.test.?(c|m)[jt]s?(x)'",

diff --git a/packages/mui-styles/package.json b/packages/mui-styles/package.json
@@ -26,11 +26,12 @@
     "url": "https://opencollective.com/mui-org"
   },
   "scripts": {
-    "build": "pnpm build:modern && pnpm build:node && pnpm build:stable && pnpm build:copy-files",
+    "build": "pnpm build:modern && pnpm build:node && pnpm build:stable && pnpm build:types && pnpm build:copy-files",
     "build:modern": "node ../../scripts/build.mjs modern",
     "build:node": "node ../../scripts/build.mjs node",
     "build:stable": "node ../../scripts/build.mjs stable",
     "build:copy-files": "node ../../scripts/copyFiles.mjs",
+    "build:types": "tsx ../../scripts/buildTypes.mts --skipTsc",
     "prebuild": "rimraf build",
     "release": "pnpm build && pnpm publish",
     "test": "cd ../../ && cross-env NODE_ENV=test mocha 'packages/mui-styles/**/*.test.?(c|m)[jt]s?(x)'",

diff --git a/packages/mui-styles/src/defaultTheme/index.js b/packages/mui-styles/src/defaultTheme/index.js
diff --git a/scripts/buildTypes.mts b/scripts/buildTypes.mts
@@ -54,29 +54,37 @@ async function copyDeclarations(sourceDirectory: string, destinationDirectory: s
   });
 }
 
-async function main() {
-  const packageRoot = process.cwd();
+interface HandlerArgv {
+  skipTsc: boolean;
+}
 
-  const tsconfigPath = path.join(packageRoot, 'tsconfig.build.json');
-  const tsconfigExists = await fs.access(tsconfigPath).then(
-    () => true,
-    () => false,
-  );
-  if (!tsconfigExists) {
-    throw new Error(
-      'Unable to find a tsconfig to build this project. ' +
-        `The package root needs to contain a 'tsconfig.build.json'. ` +
-        `The package root is '${packageRoot}'`,
-    );
-  }
+async function main(argv: HandlerArgv) {
+  const packageRoot = process.cwd();
 
   const srcPath = path.join(packageRoot, 'src');
   const buildFolder = path.join(packageRoot, 'build');
   const esmFolder = path.join(buildFolder, 'esm');
   const modernFolder = path.join(buildFolder, 'modern');
 
   await typescriptCopy({ from: srcPath, to: esmFolder });
-  await emitDeclarations(tsconfigPath, esmFolder);
+
+  if (!argv.skipTsc) {
+    const tsconfigPath = path.join(packageRoot, 'tsconfig.build.json');
+    const tsconfigExists = await fs.access(tsconfigPath).then(
+      () => true,
+      () => false,
+    );
+
+    if (!tsconfigExists) {
+      throw new Error(
+        'Unable to find a tsconfig to build this project. ' +
+          `The package root needs to contain a 'tsconfig.build.json'. ` +
+          `The package root is '${packageRoot}'`,
+      );
+    }
+
+    await emitDeclarations(tsconfigPath, esmFolder);
+  }
 
   await addImportExtensions(esmFolder);
 
@@ -85,10 +93,17 @@ async function main() {
 }
 
 yargs(process.argv.slice(2))
-  .command({
+  .command<HandlerArgv>({
     command: '$0',
     description:
       'Builds a project with a fix for https://github.com/microsoft/TypeScript/issues/39117',
+    builder: (command) => {
+      return command.option('skipTsc', {
+        type: 'boolean',
+        default: false,
+        describe: 'Set to `true` if you want the legacy behavior of just copying .d.ts files.',
+      });
+    },
     handler: main,
   })
   .help()