@modern-js/app-tools 2.64.3 → 2.65.1

package/dist/cjs/builder/generator/index.js

@@ -53,11 +53,12 @@ async function generateBuilder(options, bundlerType) {
   return builder;
 }
 async function applyBuilderPlugins(builder, options) {
-  const { builderPluginAdapterBasic, builderPluginAdapterHtml, builderPluginAdapterSSR } = await import("../shared/builderPlugins/index.js");
+  const { builderPluginAdapterBasic, builderPluginAdapterHtml, builderPluginAdapterSSR, builderPluginAdapterHooks } = await import("../shared/builderPlugins/index.js");
   builder.addPlugins([
     builderPluginAdapterBasic(),
     builderPluginAdapterSSR(options),
-    builderPluginAdapterHtml(options)
+    builderPluginAdapterHtml(options),
+    builderPluginAdapterHooks(options)
   ]);
   builder.addPlugins([
     (0, import_adapterCopy.builderPluginAdapterCopy)(options)

package/dist/cjs/builder/shared/builderPlugins/builderHooks.js

@@ -0,0 +1,50 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var builderHooks_exports = {};
+__export(builderHooks_exports, {
+  builderPluginAdapterHooks: () => builderPluginAdapterHooks
+});
+module.exports = __toCommonJS(builderHooks_exports);
+const builderPluginAdapterHooks = (options) => ({
+  name: "builder-plugin-support-modern-hooks",
+  setup(api) {
+    var _internalContext_pluginAPI;
+    const _internalContext = options.appContext._internalContext;
+    const hooks = (_internalContext_pluginAPI = _internalContext.pluginAPI) === null || _internalContext_pluginAPI === void 0 ? void 0 : _internalContext_pluginAPI.getHooks();
+    api.modifyBundlerChain(async (chain, utils) => {
+      await (hooks === null || hooks === void 0 ? void 0 : hooks.modifyBundlerChain.call(chain, utils));
+    });
+    api.modifyRsbuildConfig(async (config, utils) => {
+      await (hooks === null || hooks === void 0 ? void 0 : hooks.modifyRsbuildConfig.call(config, utils));
+    });
+    api.modifyRspackConfig(async (config, utils) => {
+      await (hooks === null || hooks === void 0 ? void 0 : hooks.modifyRspackConfig.call(config, utils));
+    });
+    api.modifyWebpackChain(async (chain, utils) => {
+      await (hooks === null || hooks === void 0 ? void 0 : hooks.modifyWebpackChain.call(chain, utils));
+    });
+    api.modifyWebpackConfig(async (config, utils) => {
+      await (hooks === null || hooks === void 0 ? void 0 : hooks.modifyWebpackConfig.call(config, utils));
+    });
+  }
+});
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  builderPluginAdapterHooks
+});

package/dist/cjs/builder/shared/builderPlugins/index.js

@@ -18,9 +18,11 @@ module.exports = __toCommonJS(builderPlugins_exports);
 __reExport(builderPlugins_exports, require("./adapterBasic"), module.exports);
 __reExport(builderPlugins_exports, require("./adapterHtml"), module.exports);
 __reExport(builderPlugins_exports, require("./adapterSSR"), module.exports);
+__reExport(builderPlugins_exports, require("./builderHooks"), module.exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ...require("./adapterBasic"),
   ...require("./adapterHtml"),
-  ...require("./adapterSSR")
+  ...require("./adapterSSR"),
+  ...require("./builderHooks")
 });

package/dist/cjs/commands/build.js

@@ -80,12 +80,6 @@ const build = async (api, options) => {
     });
     return;
   }
-  api.modifyResolvedConfig((config) => {
-    return {
-      ...config,
-      cliOptions: options
-    };
-  });
   const { distDirectory, appDirectory, serverConfigFile } = appContext;
   await (0, import_config.buildServerConfig)({
     appDirectory,

package/dist/cjs/commands/dev.js

@@ -59,12 +59,6 @@ const dev = async (api, options, devServerOptions) => {
     });
   }
   await (0, import_register.registerCompiler)(appContext.appDirectory, appContext.distDirectory, normalizedConfig === null || normalizedConfig === void 0 ? void 0 : (_normalizedConfig_source = normalizedConfig.source) === null || _normalizedConfig_source === void 0 ? void 0 : _normalizedConfig_source.alias);
-  api.modifyResolvedConfig((config) => {
-    return {
-      ...config,
-      cliOptions: options
-    };
-  });
   const { appDirectory, distDirectory, port, apiOnly, serverConfigFile, metaName, serverRoutes } = appContext;
   await (0, import_config.buildServerConfig)({
     appDirectory,

package/dist/esm/builder/generator/index.js

@@ -51,7 +51,7 @@ function applyBuilderPlugins(builder, options) {
 }
 function _applyBuilderPlugins() {
   _applyBuilderPlugins = _async_to_generator(function(builder, options) {
-    var _ref, builderPluginAdapterBasic, builderPluginAdapterHtml, builderPluginAdapterSSR, normalizedConfig, pluginNodePolyfill;
+    var _ref, builderPluginAdapterBasic, builderPluginAdapterHtml, builderPluginAdapterSSR, builderPluginAdapterHooks, normalizedConfig, pluginNodePolyfill;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
@@ -60,11 +60,12 @@ function _applyBuilderPlugins() {
             import("../shared/builderPlugins/index.js")
           ];
         case 1:
-          _ref = _state.sent(), builderPluginAdapterBasic = _ref.builderPluginAdapterBasic, builderPluginAdapterHtml = _ref.builderPluginAdapterHtml, builderPluginAdapterSSR = _ref.builderPluginAdapterSSR;
+          _ref = _state.sent(), builderPluginAdapterBasic = _ref.builderPluginAdapterBasic, builderPluginAdapterHtml = _ref.builderPluginAdapterHtml, builderPluginAdapterSSR = _ref.builderPluginAdapterSSR, builderPluginAdapterHooks = _ref.builderPluginAdapterHooks;
           builder.addPlugins([
             builderPluginAdapterBasic(),
             builderPluginAdapterSSR(options),
-            builderPluginAdapterHtml(options)
+            builderPluginAdapterHtml(options),
+            builderPluginAdapterHooks(options)
           ]);
           builder.addPlugins([
             builderPluginAdapterCopy(options)

package/dist/esm/builder/shared/builderPlugins/builderHooks.js

@@ -0,0 +1,120 @@
+import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
+import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
+var builderPluginAdapterHooks = function(options) {
+  return {
+    name: "builder-plugin-support-modern-hooks",
+    setup: function setup(api) {
+      var _internalContext_pluginAPI;
+      var _internalContext = options.appContext._internalContext;
+      var hooks = (_internalContext_pluginAPI = _internalContext.pluginAPI) === null || _internalContext_pluginAPI === void 0 ? void 0 : _internalContext_pluginAPI.getHooks();
+      api.modifyBundlerChain(function() {
+        var _ref = _async_to_generator(function(chain, utils) {
+          return _ts_generator(this, function(_state) {
+            switch (_state.label) {
+              case 0:
+                return [
+                  4,
+                  hooks === null || hooks === void 0 ? void 0 : hooks.modifyBundlerChain.call(chain, utils)
+                ];
+              case 1:
+                _state.sent();
+                return [
+                  2
+                ];
+            }
+          });
+        });
+        return function(chain, utils) {
+          return _ref.apply(this, arguments);
+        };
+      }());
+      api.modifyRsbuildConfig(function() {
+        var _ref = _async_to_generator(function(config, utils) {
+          return _ts_generator(this, function(_state) {
+            switch (_state.label) {
+              case 0:
+                return [
+                  4,
+                  hooks === null || hooks === void 0 ? void 0 : hooks.modifyRsbuildConfig.call(config, utils)
+                ];
+              case 1:
+                _state.sent();
+                return [
+                  2
+                ];
+            }
+          });
+        });
+        return function(config, utils) {
+          return _ref.apply(this, arguments);
+        };
+      }());
+      api.modifyRspackConfig(function() {
+        var _ref = _async_to_generator(function(config, utils) {
+          return _ts_generator(this, function(_state) {
+            switch (_state.label) {
+              case 0:
+                return [
+                  4,
+                  hooks === null || hooks === void 0 ? void 0 : hooks.modifyRspackConfig.call(config, utils)
+                ];
+              case 1:
+                _state.sent();
+                return [
+                  2
+                ];
+            }
+          });
+        });
+        return function(config, utils) {
+          return _ref.apply(this, arguments);
+        };
+      }());
+      api.modifyWebpackChain(function() {
+        var _ref = _async_to_generator(function(chain, utils) {
+          return _ts_generator(this, function(_state) {
+            switch (_state.label) {
+              case 0:
+                return [
+                  4,
+                  hooks === null || hooks === void 0 ? void 0 : hooks.modifyWebpackChain.call(chain, utils)
+                ];
+              case 1:
+                _state.sent();
+                return [
+                  2
+                ];
+            }
+          });
+        });
+        return function(chain, utils) {
+          return _ref.apply(this, arguments);
+        };
+      }());
+      api.modifyWebpackConfig(function() {
+        var _ref = _async_to_generator(function(config, utils) {
+          return _ts_generator(this, function(_state) {
+            switch (_state.label) {
+              case 0:
+                return [
+                  4,
+                  hooks === null || hooks === void 0 ? void 0 : hooks.modifyWebpackConfig.call(config, utils)
+                ];
+              case 1:
+                _state.sent();
+                return [
+                  2
+                ];
+            }
+          });
+        });
+        return function(config, utils) {
+          return _ref.apply(this, arguments);
+        };
+      }());
+    }
+  };
+};
+export {
+  builderPluginAdapterHooks
+};

package/dist/esm/builder/shared/builderPlugins/index.js

@@ -1,3 +1,4 @@
 export * from "./adapterBasic";
 export * from "./adapterHtml";
 export * from "./adapterSSR";
+export * from "./builderHooks";

package/dist/esm/commands/build.js

@@ -1,6 +1,4 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
-import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
-import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { logger } from "@modern-js/utils";
 import { buildServerConfig } from "../utils/config";
@@ -105,11 +103,6 @@ var build = function() {
             2
           ];
         case 10:
-          api.modifyResolvedConfig(function(config) {
-            return _object_spread_props(_object_spread({}, config), {
-              cliOptions: options
-            });
-          });
           distDirectory1 = appContext.distDirectory, appDirectory1 = appContext.appDirectory, serverConfigFile1 = appContext.serverConfigFile;
           return [
             4,

package/dist/esm/commands/dev.js

@@ -53,11 +53,6 @@ var dev = function() {
           ];
         case 4:
           _state.sent();
-          api.modifyResolvedConfig(function(config) {
-            return _object_spread_props(_object_spread({}, config), {
-              cliOptions: options
-            });
-          });
           appDirectory = appContext.appDirectory, distDirectory = appContext.distDirectory, port = appContext.port, apiOnly = appContext.apiOnly, serverConfigFile = appContext.serverConfigFile, metaName = appContext.metaName, serverRoutes = appContext.serverRoutes;
           return [
             4,

package/dist/esm-node/builder/generator/index.js

@@ -20,11 +20,12 @@ async function generateBuilder(options, bundlerType) {
   return builder;
 }
 async function applyBuilderPlugins(builder, options) {
-  const { builderPluginAdapterBasic, builderPluginAdapterHtml, builderPluginAdapterSSR } = await import("../shared/builderPlugins/index.js");
+  const { builderPluginAdapterBasic, builderPluginAdapterHtml, builderPluginAdapterSSR, builderPluginAdapterHooks } = await import("../shared/builderPlugins/index.js");
   builder.addPlugins([
     builderPluginAdapterBasic(),
     builderPluginAdapterSSR(options),
-    builderPluginAdapterHtml(options)
+    builderPluginAdapterHtml(options),
+    builderPluginAdapterHooks(options)
   ]);
   builder.addPlugins([
     builderPluginAdapterCopy(options)

package/dist/esm-node/builder/shared/builderPlugins/builderHooks.js

@@ -0,0 +1,26 @@
+const builderPluginAdapterHooks = (options) => ({
+  name: "builder-plugin-support-modern-hooks",
+  setup(api) {
+    var _internalContext_pluginAPI;
+    const _internalContext = options.appContext._internalContext;
+    const hooks = (_internalContext_pluginAPI = _internalContext.pluginAPI) === null || _internalContext_pluginAPI === void 0 ? void 0 : _internalContext_pluginAPI.getHooks();
+    api.modifyBundlerChain(async (chain, utils) => {
+      await (hooks === null || hooks === void 0 ? void 0 : hooks.modifyBundlerChain.call(chain, utils));
+    });
+    api.modifyRsbuildConfig(async (config, utils) => {
+      await (hooks === null || hooks === void 0 ? void 0 : hooks.modifyRsbuildConfig.call(config, utils));
+    });
+    api.modifyRspackConfig(async (config, utils) => {
+      await (hooks === null || hooks === void 0 ? void 0 : hooks.modifyRspackConfig.call(config, utils));
+    });
+    api.modifyWebpackChain(async (chain, utils) => {
+      await (hooks === null || hooks === void 0 ? void 0 : hooks.modifyWebpackChain.call(chain, utils));
+    });
+    api.modifyWebpackConfig(async (config, utils) => {
+      await (hooks === null || hooks === void 0 ? void 0 : hooks.modifyWebpackConfig.call(config, utils));
+    });
+  }
+});
+export {
+  builderPluginAdapterHooks
+};

package/dist/esm-node/builder/shared/builderPlugins/index.js

@@ -1,3 +1,4 @@
 export * from "./adapterBasic";
 export * from "./adapterHtml";
 export * from "./adapterSSR";
+export * from "./builderHooks";

package/dist/esm-node/commands/build.js

@@ -47,12 +47,6 @@ const build = async (api, options) => {
     });
     return;
   }
-  api.modifyResolvedConfig((config) => {
-    return {
-      ...config,
-      cliOptions: options
-    };
-  });
   const { distDirectory, appDirectory, serverConfigFile } = appContext;
   await buildServerConfig({
     appDirectory,

package/dist/esm-node/commands/dev.js

@@ -26,12 +26,6 @@ const dev = async (api, options, devServerOptions) => {
     });
   }
   await registerCompiler(appContext.appDirectory, appContext.distDirectory, normalizedConfig === null || normalizedConfig === void 0 ? void 0 : (_normalizedConfig_source = normalizedConfig.source) === null || _normalizedConfig_source === void 0 ? void 0 : _normalizedConfig_source.alias);
-  api.modifyResolvedConfig((config) => {
-    return {
-      ...config,
-      cliOptions: options
-    };
-  });
   const { appDirectory, distDirectory, port, apiOnly, serverConfigFile, metaName, serverRoutes } = appContext;
   await buildServerConfig({
     appDirectory,

package/dist/types/builder/shared/builderPlugins/builderHooks.d.ts

@@ -0,0 +1,4 @@
+import type { RsbuildPlugin } from '@rsbuild/core';
+import type { Bundler } from '../../../types';
+import type { BuilderOptions } from '../types';
+export declare const builderPluginAdapterHooks: <B extends Bundler>(options: BuilderOptions<B>) => RsbuildPlugin;

package/dist/types/builder/shared/builderPlugins/index.d.ts

@@ -1,3 +1,4 @@
 export * from './adapterBasic';
 export * from './adapterHtml';
 export * from './adapterSSR';
+export * from './builderHooks';

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.64.3",
+  "version": "2.65.1",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -91,20 +91,20 @@
     "ndepe": "0.1.5",
     "pkg-types": "^1.1.0",
     "std-env": "^3.7.0",
-    "@modern-js/core": "2.64.3",
-    "@modern-js/node-bundle-require": "2.64.3",
-    "@modern-js/plugin": "2.64.3",
-    "@modern-js/plugin-data-loader": "2.64.3",
-    "@modern-js/plugin-i18n": "2.64.3",
-    "@modern-js/plugin-v2": "2.64.3",
-    "@modern-js/prod-server": "2.64.3",
-    "@modern-js/server": "2.64.3",
-    "@modern-js/rsbuild-plugin-esbuild": "2.64.3",
-    "@modern-js/server-core": "2.64.3",
-    "@modern-js/server-utils": "2.64.3",
-    "@modern-js/types": "2.64.3",
-    "@modern-js/uni-builder": "2.64.3",
-    "@modern-js/utils": "2.64.3"
+    "@modern-js/core": "2.65.1",
+    "@modern-js/node-bundle-require": "2.65.1",
+    "@modern-js/plugin": "2.65.1",
+    "@modern-js/plugin-data-loader": "2.65.1",
+    "@modern-js/plugin-i18n": "2.65.1",
+    "@modern-js/plugin-v2": "2.65.1",
+    "@modern-js/prod-server": "2.65.1",
+    "@modern-js/rsbuild-plugin-esbuild": "2.65.1",
+    "@modern-js/server": "2.65.1",
+    "@modern-js/server-core": "2.65.1",
+    "@modern-js/server-utils": "2.65.1",
+    "@modern-js/types": "2.65.1",
+    "@modern-js/uni-builder": "2.65.1",
+    "@modern-js/utils": "2.65.1"
   },
   "devDependencies": {
     "@rsbuild/plugin-webpack-swc": "1.0.9",
@@ -116,8 +116,8 @@
     "tsconfig-paths": "^4.2.0",
     "typescript": "^5",
     "webpack": "^5.98.0",
-    "@scripts/build": "2.64.3",
-    "@scripts/jest-config": "2.64.3"
+    "@scripts/build": "2.65.1",
+    "@scripts/jest-config": "2.65.1"
   },
   "peerDependencies": {
     "ts-node": "^10.7.0",