From 5e811b81d6f394aae079a239af0b108335559e8b Mon Sep 17 00:00:00 2001 From: Siriwat K Date: Thu, 1 Feb 2024 10:00:21 +0700 Subject: [PATCH] [utils] Use consistent build approach (#40837) --- packages/mui-utils/package.json | 4 ++-- scripts/build.mjs | 11 +++-------- scripts/sizeSnapshot/webpack.config.js | 2 +- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/packages/mui-utils/package.json b/packages/mui-utils/package.json index 6931410d10dc3a..5f97d78e7b0bc2 100644 --- a/packages/mui-utils/package.json +++ b/packages/mui-utils/package.json @@ -29,8 +29,8 @@ "build": "pnpm build:legacy && pnpm build:modern && pnpm build:node && pnpm build:stable && pnpm build:types && pnpm build:copy-files", "build:legacy": "node ../../scripts/build.mjs legacy", "build:modern": "node ../../scripts/build.mjs modern", - "build:node": "node ../../scripts/build.mjs node --ignoreTopLevel", - "build:stable": "node ../../scripts/build.mjs stable --ignoreTopLevel", + "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", "prebuild": "rimraf build tsconfig.build.tsbuildinfo", diff --git a/scripts/build.mjs b/scripts/build.mjs index 0ba59aac2937e0..711bcf389ae274 100644 --- a/scripts/build.mjs +++ b/scripts/build.mjs @@ -19,7 +19,7 @@ const validBundles = [ ]; async function run(argv) { - const { bundle, largeFiles, outDir: relativeOutDir, verbose, ignoreTopLevel } = argv; + const { bundle, largeFiles, outDir: relativeOutDir, verbose } = argv; if (validBundles.indexOf(bundle) === -1) { throw new TypeError( @@ -62,9 +62,9 @@ async function run(argv) { // // TODO v6: Switch to `exports` field. { - node: !ignoreTopLevel && topLevelPathImportsCanBePackages ? './node' : './', + node: topLevelPathImportsCanBePackages ? './node' : './', modern: './modern', - stable: !ignoreTopLevel && topLevelPathImportsCanBePackages ? './' : './esm', + stable: topLevelPathImportsCanBePackages ? './' : './esm', legacy: './legacy', }[bundle], ); @@ -119,11 +119,6 @@ yargs(process.argv.slice(2)) describe: 'Set to `true` if you know you are transpiling large files.', }) .option('out-dir', { default: './build', type: 'string' }) - .option('ignoreTopLevel', { - type: 'boolean', - default: false, - describe: 'Set to `true` to ignore switching out-dir based on top level import.', - }) .option('verbose', { type: 'boolean' }); }, handler: run, diff --git a/scripts/sizeSnapshot/webpack.config.js b/scripts/sizeSnapshot/webpack.config.js index e0b7c581aa8fb8..c32d969700b063 100644 --- a/scripts/sizeSnapshot/webpack.config.js +++ b/scripts/sizeSnapshot/webpack.config.js @@ -139,7 +139,7 @@ async function getWebpackEntries() { ...coreComponents, { id: '@material-ui/utils', - path: 'packages/mui-utils/build/esm/index.js', + path: 'packages/mui-utils/build/index.js', }, // TODO: Requires webpack v5 // Resolution of webpack/acorn to 7.x is blocked by nextjs (https://github.com/vercel/next.js/issues/11947)