@modern-js/builder 2.9.0 → 2.11.0

package/CHANGELOG.md

@@ -1,5 +1,67 @@
 # @modern-js/builder
 
+## 2.11.0
+
+### Patch Changes
+
+- cfb058f: fix(builder): remove duplicated babel-plugin-import
+
+  fix(builder): 移除重复注册的 babel-plugin-import
+
+- 55b07fd: feat(builder): support output.assetsRetry in rspack-provider
+
+  feat(builder): 在 rspack-provider 中支持 output.assetsRetry 配置能力
+
+- 8b90c79: fix(builder): should preserve viewBox when minify svg
+
+  fix(builder): 修复压缩 svg 导致 viewBox 丢失的问题
+
+- 3171c9d: feat(builder): print total file size after build
+
+  feat(builder): 构建后输出文件体积的总和
+
+- cd1040f: feat: use generated default config objects instead of global objects
+  feat: 默认配置项使用动态生成替代全局对象
+- b71cef1: feat(builder): support setting forceSplitting to be an object
+
+  feat(builder): 支持将 forceSplitting 设置为一个对象
+
+- Updated dependencies [adcedad]
+- Updated dependencies [cfb058f]
+- Updated dependencies [a9c6083]
+- Updated dependencies [55b07fd]
+- Updated dependencies [0bd018b]
+- Updated dependencies [8b90c79]
+- Updated dependencies [a8c08c3]
+- Updated dependencies [3aa318d]
+- Updated dependencies [5d624fd]
+- Updated dependencies [e2466a1]
+- Updated dependencies [53b0a63]
+- Updated dependencies [02bb383]
+- Updated dependencies [381a3b9]
+- Updated dependencies [7a60f10]
+- Updated dependencies [cd1040f]
+- Updated dependencies [e262a99]
+- Updated dependencies [b71cef1]
+- Updated dependencies [274b2e5]
+- Updated dependencies [b9e1c54]
+  - @modern-js/builder-shared@2.11.0
+  - @modern-js/utils@2.11.0
+
+## 2.10.0
+
+### Patch Changes
+
+- Updated dependencies [a8db932]
+- Updated dependencies [92d247f]
+- Updated dependencies [0da32d0]
+- Updated dependencies [0d9962b]
+- Updated dependencies [fbefa7e]
+- Updated dependencies [4d54233]
+- Updated dependencies [6db4864]
+  - @modern-js/builder-shared@2.10.0
+  - @modern-js/utils@2.10.0
+
 ## 2.9.0
 
 ### Patch Changes

package/dist/plugins/antd.d.ts

@@ -0,0 +1,2 @@
+import type { DefaultBuilderPlugin } from '@modern-js/builder-shared';
+export declare const builderAntdPlugin: () => DefaultBuilderPlugin;

package/dist/plugins/antd.js

@@ -0,0 +1,34 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.builderAntdPlugin = void 0;
+const utils_1 = require("@modern-js/utils");
+const builderAntdPlugin = () => ({
+    name: `builder-plugin-antd`,
+    setup(api) {
+        api.modifyBuilderConfig(builderConfig => {
+            var _a, _b, _c;
+            (_a = builderConfig.source) !== null && _a !== void 0 ? _a : (builderConfig.source = {});
+            if ((_b = builderConfig.source.transformImport) === null || _b === void 0 ? void 0 : _b.some(item => item.libraryName === 'antd')) {
+                return;
+            }
+            const antdMajorVersion = (0, utils_1.getAntdMajorVersion)(api.context.rootPath);
+            // antd >= v5 no longer need babel-plugin-import
+            // see: https://ant.design/docs/react/migration-v5#remove-babel-plugin-import
+            if (antdMajorVersion && antdMajorVersion < 5) {
+                (_c = builderConfig.source) !== null && _c !== void 0 ? _c : (builderConfig.source = {});
+                builderConfig.source.transformImport = [
+                    ...(builderConfig.source.transformImport || []),
+                    {
+                        libraryName: 'antd',
+                        libraryDirectory: useSSR(api.context.target) ? 'lib' : 'es',
+                        style: true,
+                    },
+                ];
+            }
+        });
+    },
+});
+exports.builderAntdPlugin = builderAntdPlugin;
+function useSSR(target) {
+    return (Array.isArray(target) ? target : [target]).some(item => ['node', 'service-worker'].includes(item));
+}

package/dist/plugins/assetsRetry.d.ts

@@ -0,0 +1,2 @@
+import { DefaultBuilderPlugin } from '@modern-js/builder-shared';
+export declare function builderPluginAssetsRetry(): DefaultBuilderPlugin;

package/dist/plugins/assetsRetry.js

@@ -0,0 +1,48 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.builderPluginAssetsRetry = void 0;
+const builder_shared_1 = require("@modern-js/builder-shared");
+function builderPluginAssetsRetry() {
+    return {
+        name: 'builder-plugin-assets-retry',
+        setup(api) {
+            api.modifyBundlerChain(async (chain, { CHAIN_ID, target, HtmlPlugin }) => {
+                const config = api.getNormalizedConfig();
+                if (!config.output.assetsRetry || (0, builder_shared_1.isHtmlDisabled)(config, target)) {
+                    return;
+                }
+                const { AssetsRetryPlugin } = await Promise.resolve().then(() => __importStar(require('@modern-js/builder-shared')));
+                chain.plugin(CHAIN_ID.PLUGIN.ASSETS_RETRY).use(AssetsRetryPlugin, [
+                    {
+                        ...(config.output.assetsRetry || {}),
+                        HtmlPlugin,
+                    },
+                ]);
+            });
+        },
+    };
+}
+exports.builderPluginAssetsRetry = builderPluginAssetsRetry;

package/dist/plugins/fileSize.js

@@ -57,7 +57,7 @@ async function printHeader(longestFileLength, longestLabelLength) {
         }
         return `${prev + curLabel}    `;
     }, '  ');
-    builder_shared_1.logger.log(chalk_1.default.bold(chalk_1.default.blue(headerRow)));
+    builder_shared_1.logger.log(chalk_1.default.bold.blue(headerRow));
 }
 async function printFileSizes(stats, distPath) {
     const { fs, filesize, gzipSize, stripAnsi } = await Promise.resolve().then(() => __importStar(require('@modern-js/utils')));
@@ -98,11 +98,15 @@ async function printFileSizes(stats, distPath) {
     const longestFileLength = Math.max(...assets.map(a => stripAnsi(a.folder + path_1.default.sep + a.name).length));
     builder_shared_1.logger.info(`File sizes after production build:\n`);
     printHeader(longestFileLength, longestLabelLength);
+    let totalSize = 0;
+    let totalGzipSize = 0;
     assets.forEach(asset => {
         let { sizeLabel } = asset;
         const { name, folder, gzipSizeLabel } = asset;
         const fileNameLength = stripAnsi(folder + path_1.default.sep + name).length;
         const sizeLength = stripAnsi(sizeLabel).length;
+        totalSize += asset.size;
+        totalGzipSize += asset.gzippedSize;
         if (sizeLength < longestLabelLength) {
             const rightPadding = ' '.repeat(longestLabelLength - sizeLength);
             sizeLabel += rightPadding;
@@ -114,7 +118,9 @@ async function printFileSizes(stats, distPath) {
         }
         builder_shared_1.logger.log(`  ${fileNameLabel}    ${sizeLabel}    ${gzipSizeLabel}`);
     });
-    builder_shared_1.logger.log('');
+    const totalSizeLabel = `${chalk_1.default.bold.blue('Total size:')}  ${filesize(totalSize)}`;
+    const gzippedSizeLabel = `${chalk_1.default.bold.blue('Gzipped size:')}  ${filesize(totalGzipSize)}`;
+    builder_shared_1.logger.log(`\n  ${totalSizeLabel}\n  ${gzippedSizeLabel}\n`);
 }
 const builderPluginFileSize = () => ({
     name: 'builder-plugin-file-size',

package/dist/plugins/index.d.ts

@@ -16,4 +16,6 @@ export declare const plugins: {
     font: () => Promise<import("@modern-js/builder-shared").DefaultBuilderPlugin>;
     image: () => Promise<import("@modern-js/builder-shared").DefaultBuilderPlugin>;
     media: () => Promise<import("@modern-js/builder-shared").DefaultBuilderPlugin>;
+    assetsRetry: () => Promise<import("@modern-js/builder-shared").DefaultBuilderPlugin>;
+    antd: () => Promise<import("@modern-js/builder-shared").DefaultBuilderPlugin>;
 };

package/dist/plugins/index.js

@@ -43,4 +43,6 @@ exports.plugins = {
     font: () => Promise.resolve().then(() => __importStar(require('./asset'))).then(m => m.builderAssetPlugin('font', builder_shared_1.FONT_EXTENSIONS)),
     image: () => Promise.resolve().then(() => __importStar(require('./asset'))).then(m => m.builderAssetPlugin('image', builder_shared_1.IMAGE_EXTENSIONS)),
     media: () => Promise.resolve().then(() => __importStar(require('./asset'))).then(m => m.builderAssetPlugin('media', builder_shared_1.MEDIA_EXTENSIONS)),
+    assetsRetry: () => Promise.resolve().then(() => __importStar(require('./assetsRetry'))).then(m => m.builderPluginAssetsRetry()),
+    antd: () => Promise.resolve().then(() => __importStar(require('./antd'))).then(m => m.builderAntdPlugin()),
 };

package/dist/plugins/splitChunks.d.ts

@@ -1,4 +1,4 @@
-import { DefaultBuilderPlugin } from '@modern-js/builder-shared';
+import { type DefaultBuilderPlugin } from '@modern-js/builder-shared';
 /** Expect to match path just like "./node_modules/react-router/" */
 export declare const createDependenciesRegExp: (...dependencies: (string | RegExp)[]) => RegExp;
 export declare function builderPluginSplitChunks(): DefaultBuilderPlugin;

package/dist/plugins/splitChunks.js

@@ -31,10 +31,12 @@ const assert_1 = __importDefault(require("assert"));
 const builder_shared_1 = require("@modern-js/builder-shared");
 function getUserDefinedCacheGroups(forceSplitting) {
     const cacheGroups = {};
-    forceSplitting.forEach((reg, index) => {
-        const key = `force-split-${index}`;
+    const pairs = Array.isArray(forceSplitting)
+        ? forceSplitting.map((regexp, index) => [`force-split-${index}`, regexp])
+        : Object.entries(forceSplitting);
+    pairs.forEach(([key, regexp]) => {
         cacheGroups[key] = {
-            test: reg,
+            test: regexp,
             name: key,
             chunks: 'all',
             // Ignore minimum size, minimum chunks and maximum requests and always create chunks for user defined cache group.

package/dist/plugins/svg.js

@@ -57,7 +57,10 @@ const builderPluginSvg = () => {
                     .type('javascript/auto')
                     .use(CHAIN_ID.USE.SVGR)
                     .loader(require.resolve('@svgr/webpack'))
-                    .options({ svgo: true })
+                    .options({
+                    svgo: true,
+                    svgoConfig: (0, builder_shared_1.getSvgoDefaultConfig)(),
+                })
                     .end()
                     .when(defaultExport === 'url', c => c
                     .use(CHAIN_ID.USE.URL)

package/package.json

@@ -14,7 +14,7 @@
   "engines": {
     "node": ">=14.0.0"
   },
-  "version": "2.9.0",
+  "version": "2.11.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/index.d.ts",
   "main": "./dist/index.js",
@@ -27,8 +27,8 @@
   },
   "dependencies": {
     "@svgr/webpack": "6.5.1",
-    "@modern-js/builder-shared": "2.9.0",
-    "@modern-js/utils": "2.9.0"
+    "@modern-js/builder-shared": "2.11.0",
+    "@modern-js/utils": "2.11.0"
   },
   "devDependencies": {
     "@babel/core": "7.18.0",
@@ -36,7 +36,7 @@
     "@types/babel__preset-env": "^7.9.2",
     "@types/node": "^14",
     "typescript": "^4",
-    "@scripts/vitest-config": "2.9.0"
+    "@scripts/vitest-config": "2.11.0"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",