From cab753c52c0bb25a80b292090a62339d21be25a0 Mon Sep 17 00:00:00 2001 From: afc163 Date: Tue, 27 Aug 2024 09:55:59 +0800 Subject: [PATCH] chore: fix webpack config of dist bundle (#50575) --- .github/workflows/size-limit.yml | 1 - biome.json | 3 ++- package.json | 3 --- webpack.config.js | 27 +++++++-------------------- 4 files changed, 9 insertions(+), 25 deletions(-) diff --git a/.github/workflows/size-limit.yml b/.github/workflows/size-limit.yml index 65ba79c033..83ecd4fafa 100644 --- a/.github/workflows/size-limit.yml +++ b/.github/workflows/size-limit.yml @@ -27,5 +27,4 @@ jobs: env: NODE_OPTIONS: "--max_old_space_size=4096" PRODUCTION_ONLY: 1 - NO_DUP_CHECK: 1 CI_JOB_NUMBER: 1 diff --git a/biome.json b/biome.json index 3813e8237f..2c37d8587f 100644 --- a/biome.json +++ b/biome.json @@ -9,7 +9,8 @@ "_site/**/*", "node_modules", "server", - "scripts/previewEditor/**/*" + "scripts/previewEditor/**/*", + "package.json" ] }, "formatter": { diff --git a/package.json b/package.json index b593390a9d..72054bd6e8 100644 --- a/package.json +++ b/package.json @@ -53,8 +53,6 @@ "deploy:china-mirror": "git checkout gh-pages && git pull origin gh-pages && git push git@gitee.com:ant-design/ant-design.git gh-pages -f", "predist": "npm run version && npm run token:statistic && npm run token:meta", "dist": "antd-tools run dist", - "dist:esbuild": "ESBUILD=true npm run dist", - "dist:esbuild-no-dup-check": "ESBUILD=true NO_DUP_CHECK=true npm run dist", "format": "biome format --write .", "install-react-16": "npm i --no-save --legacy-peer-deps react@16 react-dom@16 @testing-library/react@12", "install-react-17": "npm i --no-save --legacy-peer-deps react@17 react-dom@17 @testing-library/react@12", @@ -240,7 +238,6 @@ "dotenv": "^16.4.5", "dumi": "~2.4.5", "dumi-plugin-color-chunk": "^1.1.1", - "esbuild-loader": "^4.2.1", "eslint": "^8.57.0", "eslint-config-airbnb": "^19.0.4", "eslint-config-prettier": "^9.1.0", diff --git a/webpack.config.js b/webpack.config.js index f350f7cbb6..751dd59609 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -3,7 +3,6 @@ const getWebpackConfig = require('@ant-design/tools/lib/getWebpackConfig'); const { BundleAnalyzerPlugin } = require('webpack-bundle-analyzer'); const { codecovWebpackPlugin } = require('@codecov/webpack-plugin'); -const { EsbuildPlugin } = require('esbuild-loader'); const CircularDependencyPlugin = require('circular-dependency-plugin'); const DuplicatePackageCheckerPlugin = require('@madccc/duplicate-package-checker-webpack-plugin'); const path = require('path'); @@ -40,32 +39,16 @@ if (process.env.PRODUCTION_ONLY) { // eslint-disable-next-line no-console console.log('🍐 Build production only'); webpackConfig = webpackConfig.filter((config) => config.mode === 'production'); - webpackConfig.forEach((config) => { - config.plugins.push( - codecovWebpackPlugin({ - enableBundleAnalysis: process.env.CODECOV_TOKEN !== undefined, - bundleName: 'antd', - uploadToken: process.env.CODECOV_TOKEN, - }), - ); - }); } +// RUN_ENV: https://github.com/ant-design/antd-tools/blob/14ee166fc1f4ab5e87da45ee3b0643a8325f1bc3/lib/gulpfile.js#L48 if (process.env.RUN_ENV === 'PRODUCTION') { webpackConfig.forEach((config) => { addLocales(config); externalDayjs(config); externalCssinjs(config); - // Reduce non-minified dist files size config.optimization.usedExports = true; - // use esbuild - if (process.env.ESBUILD || process.env.CSB_REPO) { - config.optimization.minimizer[0] = new EsbuildPlugin({ - target: 'es2015', - css: true, - }); - } if (!process.env.CI || process.env.ANALYZER) { config.plugins.push( @@ -77,7 +60,11 @@ if (process.env.RUN_ENV === 'PRODUCTION') { ); } - if (!process.env.NO_DUP_CHECK) { + if (config.mode !== 'production') { + return; + } + + if (!process.env.PRODUCTION_ONLY) { config.plugins.push( new DuplicatePackageCheckerPlugin({ verbose: true, @@ -89,7 +76,7 @@ if (process.env.RUN_ENV === 'PRODUCTION') { config.plugins.push( codecovWebpackPlugin({ enableBundleAnalysis: process.env.CODECOV_TOKEN !== undefined, - bundleName: 'antd', + bundleName: 'antd.min', uploadToken: process.env.CODECOV_TOKEN, }), );