@modern-js/app-tools 3.0.3 → 3.0.4

package/dist/cjs/plugins/analyze/index.js

@@ -26,6 +26,7 @@ __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
     default: ()=>analyze
 });
+const types_namespaceObject = require("node:util/types");
 const external_path_namespaceObject = require("path");
 const utils_namespaceObject = require("@modern-js/utils");
 const index_js_namespaceObject = require("../../builder/index.js");
@@ -198,7 +199,16 @@ const analyze = ()=>({
                             port
                         });
                     });
-                    builder.addPlugins(resolvedConfig.builderPlugins);
+                    const getFlattenedPlugins = async (pluginOptions)=>{
+                        let plugins = pluginOptions;
+                        do plugins = (await Promise.all(plugins)).flat(1 / 0);
+                        while (plugins.some((v)=>(0, types_namespaceObject.isPromise)(v)));
+                        return plugins;
+                    };
+                    if (resolvedConfig.builderPlugins) {
+                        const plugins = await getFlattenedPlugins(resolvedConfig.builderPlugins);
+                        builder.addPlugins(plugins);
+                    }
                     api.updateAppContext({
                         builder
                     });

package/dist/esm/plugins/analyze/index.mjs

@@ -1,3 +1,4 @@
+import { isPromise } from "node:util/types";
 import { extname, resolve } from "path";
 import { createDebugger, fs, getArgv, getMeta, isApiOnly, isDevCommand, minimist } from "@modern-js/utils";
 import { createBuilderGenerator } from "../../builder/index.mjs";
@@ -170,7 +171,16 @@ const analyze = ()=>({
                             port
                         });
                     });
-                    builder.addPlugins(resolvedConfig.builderPlugins);
+                    const getFlattenedPlugins = async (pluginOptions)=>{
+                        let plugins = pluginOptions;
+                        do plugins = (await Promise.all(plugins)).flat(1 / 0);
+                        while (plugins.some((v)=>isPromise(v)));
+                        return plugins;
+                    };
+                    if (resolvedConfig.builderPlugins) {
+                        const plugins = await getFlattenedPlugins(resolvedConfig.builderPlugins);
+                        builder.addPlugins(plugins);
+                    }
                     api.updateAppContext({
                         builder
                     });

package/dist/esm-node/plugins/analyze/index.mjs

@@ -1,4 +1,5 @@
 import "node:module";
+import { isPromise } from "node:util/types";
 import { extname, resolve } from "path";
 import { createDebugger, fs, getArgv, getMeta, isApiOnly, isDevCommand, minimist } from "@modern-js/utils";
 import { createBuilderGenerator } from "../../builder/index.mjs";
@@ -171,7 +172,16 @@ const analyze = ()=>({
                             port
                         });
                     });
-                    builder.addPlugins(resolvedConfig.builderPlugins);
+                    const getFlattenedPlugins = async (pluginOptions)=>{
+                        let plugins = pluginOptions;
+                        do plugins = (await Promise.all(plugins)).flat(1 / 0);
+                        while (plugins.some((v)=>isPromise(v)));
+                        return plugins;
+                    };
+                    if (resolvedConfig.builderPlugins) {
+                        const plugins = await getFlattenedPlugins(resolvedConfig.builderPlugins);
+                        builder.addPlugins(plugins);
+                    }
                     api.updateAppContext({
                         builder
                     });

package/dist/types/types/config/index.d.ts

@@ -1,4 +1,4 @@
-import type { RsbuildPlugin } from '@modern-js/builder';
+import type { RsbuildPlugins } from '@modern-js/builder';
 import type { CLIPlugin, CLIPluginExtends } from '@modern-js/plugin';
 import type { BffUserConfig, ServerUserConfig } from '@modern-js/server-core';
 import type { RsbuildConfig } from '@rsbuild/core';
@@ -33,7 +33,7 @@ export interface AppToolsUserConfig {
     tools?: ToolsUserConfig;
     security?: SecurityUserConfig;
     testing?: TestingUserConfig;
-    builderPlugins?: Array<RsbuildPlugin>;
+    builderPlugins?: RsbuildPlugins;
     performance?: PerformanceUserConfig;
     environments?: RsbuildConfig['environments'];
     splitChunks?: RsbuildConfig['splitChunks'];

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "3.0.3",
+  "version": "3.0.4",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
   "exports": {
@@ -93,16 +93,16 @@
     "ndepe": "^0.1.13",
     "pkg-types": "^1.3.1",
     "std-env": "^3.10.0",
-    "@modern-js/builder": "3.0.3",
-    "@modern-js/i18n-utils": "3.0.3",
-    "@modern-js/plugin": "3.0.3",
-    "@modern-js/plugin-data-loader": "3.0.3",
-    "@modern-js/prod-server": "3.0.3",
-    "@modern-js/server": "3.0.3",
-    "@modern-js/server-core": "3.0.3",
-    "@modern-js/server-utils": "3.0.3",
-    "@modern-js/types": "3.0.3",
-    "@modern-js/utils": "3.0.3"
+    "@modern-js/builder": "3.0.4",
+    "@modern-js/i18n-utils": "3.0.4",
+    "@modern-js/plugin-data-loader": "3.0.4",
+    "@modern-js/plugin": "3.0.4",
+    "@modern-js/server": "3.0.4",
+    "@modern-js/server-core": "3.0.4",
+    "@modern-js/prod-server": "3.0.4",
+    "@modern-js/server-utils": "3.0.4",
+    "@modern-js/types": "3.0.4",
+    "@modern-js/utils": "3.0.4"
   },
   "devDependencies": {
     "@rslib/core": "0.19.6",
@@ -111,8 +111,8 @@
     "ts-node": "^10.9.2",
     "tsconfig-paths": "^4.2.0",
     "typescript": "^5",
-    "@scripts/rstest-config": "2.66.0",
-    "@modern-js/rslib": "2.68.10"
+    "@modern-js/rslib": "2.68.10",
+    "@scripts/rstest-config": "2.66.0"
   },
   "peerDependencies": {
     "ts-node": "^10.9.2",