@modern-js/builder 2.21.1 → 2.22.0

package/CHANGELOG.md

@@ -1,5 +1,27 @@
 # @modern-js/builder
 
+## 2.22.0
+
+### Patch Changes
+
+- 9c3c231: feat(deps): bump @svgr/webpack from v6 to v8
+
+  feat(deps): 将 @svgr/webpack 从 v6 升级到 v8
+
+- 850cde6: feat(builder): add arco config to transformImport by default
+
+  feat(builder): 默认增加 arco 的 transformImport 配置
+
+- ae3fcc2: fix(builder): failed to configure browserslist when target is web-worker
+
+  fix(builder): 修复 target 为 web-worker 时无法配置 browserslist 的问题
+
+- Updated dependencies [3d48836]
+- Updated dependencies [5050e8e]
+- Updated dependencies [850cde6]
+  - @modern-js/builder-shared@2.22.0
+  - @modern-js/utils@2.22.0
+
 ## 2.21.1
 
 ### Patch Changes

package/dist/plugins/antd.d.ts

@@ -1,2 +1,3 @@
-import type { DefaultBuilderPlugin } from '@modern-js/builder-shared';
-export declare const builderAntdPlugin: () => DefaultBuilderPlugin;
+import type { BuilderTarget, DefaultBuilderPlugin } from '@modern-js/builder-shared';
+export declare const builderPluginAntd: () => DefaultBuilderPlugin;
+export declare function useSSR(target: BuilderTarget | BuilderTarget[]): boolean;

package/dist/plugins/antd.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.builderAntdPlugin = void 0;
+exports.useSSR = exports.builderPluginAntd = void 0;
 const utils_1 = require("@modern-js/utils");
-const builderAntdPlugin = () => ({
+const builderPluginAntd = () => ({
     name: `builder-plugin-antd`,
     setup(api) {
         api.modifyBuilderConfig(builderConfig => {
@@ -29,7 +29,8 @@ const builderAntdPlugin = () => ({
         });
     },
 });
-exports.builderAntdPlugin = builderAntdPlugin;
+exports.builderPluginAntd = builderPluginAntd;
 function useSSR(target) {
     return (Array.isArray(target) ? target : [target]).some(item => ['node', 'service-worker'].includes(item));
 }
+exports.useSSR = useSSR;

package/dist/plugins/arco.d.ts

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

package/dist/plugins/arco.js

@@ -0,0 +1,38 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.builderPluginArco = void 0;
+const utils_1 = require("@modern-js/utils");
+const antd_1 = require("./antd");
+const builderPluginArco = () => ({
+    name: `builder-plugin-arco`,
+    setup(api) {
+        const ARCO_NAME = '@arco-design/web-react';
+        const ARCO_ICON = `${ARCO_NAME}/icon`;
+        api.modifyBuilderConfig(builderConfig => {
+            const { transformImport = [] } = builderConfig.source || {};
+            if (transformImport === false ||
+                !(0, utils_1.isPackageInstalled)(ARCO_NAME, api.context.rootPath)) {
+                return;
+            }
+            const isUseSSR = (0, antd_1.useSSR)(api.context.target);
+            if (!(transformImport === null || transformImport === void 0 ? void 0 : transformImport.some(item => item.libraryName === ARCO_NAME))) {
+                transformImport.push({
+                    libraryName: ARCO_NAME,
+                    libraryDirectory: isUseSSR ? 'lib' : 'es',
+                    camelToDashComponentName: false,
+                    style: true,
+                });
+            }
+            if (!(transformImport === null || transformImport === void 0 ? void 0 : transformImport.some(item => item.libraryName === ARCO_ICON))) {
+                transformImport.push({
+                    libraryName: ARCO_ICON,
+                    libraryDirectory: isUseSSR ? 'react-icon-cjs' : 'react-icon',
+                    camelToDashComponentName: false,
+                });
+            }
+            builderConfig.source || (builderConfig.source = {});
+            builderConfig.source.transformImport = transformImport;
+        });
+    },
+});
+exports.builderPluginArco = builderPluginArco;

package/dist/plugins/index.js

@@ -44,7 +44,8 @@ exports.plugins = {
     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()),
+    antd: () => Promise.resolve().then(() => __importStar(require('./antd'))).then(m => m.builderPluginAntd()),
+    arco: () => Promise.resolve().then(() => __importStar(require('./arco'))).then(m => m.builderPluginArco()),
     tsChecker: () => Promise.resolve().then(() => __importStar(require('./tsChecker'))).then(m => m.builderPluginTsChecker()),
     checkSyntax: () => Promise.resolve().then(() => __importStar(require('./checkSyntax'))).then(m => m.builderPluginCheckSyntax()),
 };

package/dist/plugins/target.js

@@ -14,16 +14,20 @@ const builderPluginTarget = () => ({
                 chain.target('webworker');
                 return;
             }
+            // browserslist is not supported when target is web-worker
+            if (target === 'web-worker') {
+                chain.target(['webworker', 'es5']);
+                return;
+            }
             const browserslist = await (0, builder_shared_1.getBrowserslist)(api.context.rootPath);
-            const basicTarget = target === 'web-worker' ? 'webworker' : 'web';
             if (browserslist) {
-                chain.merge({ target: [basicTarget, 'browserslist'] });
+                chain.merge({ target: ['web', 'browserslist'] });
             }
             else if (target === 'modern-web') {
-                chain.merge({ target: [basicTarget, 'es2015'] });
+                chain.merge({ target: ['web', 'es2015'] });
             }
             else {
-                chain.merge({ target: [basicTarget, 'es5'] });
+                chain.merge({ target: ['web', 'es5'] });
             }
         });
     },

package/package.json

@@ -18,7 +18,7 @@
   "engines": {
     "node": ">=14.0.0"
   },
-  "version": "2.21.1",
+  "version": "2.22.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/index.d.ts",
   "main": "./dist/index.js",
@@ -30,15 +30,15 @@
     }
   },
   "dependencies": {
-    "@svgr/webpack": "6.5.1",
-    "@modern-js/builder-shared": "2.21.1",
-    "@modern-js/utils": "2.21.1"
+    "@svgr/webpack": "8.0.1",
+    "@modern-js/builder-shared": "2.22.0",
+    "@modern-js/utils": "2.22.0"
   },
   "devDependencies": {
     "@types/babel__core": "^7.20.0",
     "@types/node": "^14",
     "typescript": "^5",
-    "@scripts/vitest-config": "2.21.1"
+    "@scripts/vitest-config": "2.22.0"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",