@modern-js/app-tools 2.62.1-alpha.1 → 2.62.2-alpha.0

package/dist/cjs/index.js

@@ -19,23 +19,29 @@ var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "defau
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var src_exports = {};
 __export(src_exports, {
+  appTools: () => import_new2.appTools,
   default: () => src_default,
+  defineConfig: () => import_defineConfig.defineConfig,
+  defineLegacyConfig: () => import_defineConfig.defineLegacyConfig,
   dev: () => import_dev.dev,
+  initAppContext: () => import_new2.initAppContext,
   mergeConfig: () => import_core.mergeConfig
 });
 module.exports = __toCommonJS(src_exports);
 var import_new = require("./new/index");
-__reExport(src_exports, require("./new/index"), module.exports);
+var import_new2 = require("./new/index");
 var import_dev = require("./commands/dev");
 var import_core = require("@modern-js/core");
-__reExport(src_exports, require("./defineConfig"), module.exports);
+var import_defineConfig = require("./defineConfig");
 __reExport(src_exports, require("./types"), module.exports);
 var src_default = import_new.appTools;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  appTools,
+  defineConfig,
+  defineLegacyConfig,
   dev,
+  initAppContext,
   mergeConfig,
-  ...require("./new/index"),
-  ...require("./defineConfig"),
   ...require("./types")
 });

package/dist/cjs/new/compat/hooks.js

@@ -107,11 +107,11 @@ function getHookRunners(context) {
     afterDev: async (params) => {
       return hooks.onAfterDev.call(params);
     },
-    beforeDeploy: async () => {
-      return hooks.onBeforeDeploy.call();
+    beforeDeploy: async (options) => {
+      return hooks.onBeforeDeploy.call(options);
     },
-    afterDeploy: async () => {
-      return hooks.onAfterDeploy.call();
+    afterDeploy: async (options) => {
+      return hooks.onAfterDeploy.call(options);
     },
     beforeExit: async () => {
       return hooks.onBeforeExit.call();

package/dist/cjs/new/compat/index.js

@@ -24,22 +24,25 @@ module.exports = __toCommonJS(compat_exports);
 var import_hooks = require("./hooks");
 const compatPlugin = () => ({
   name: "@modern-js/app-tools-compat",
-  registryApi: (context, updateAppContext) => {
+  _registryApi: (getAppContext, updateAppContext) => {
+    const getInternalContext = () => {
+      return getAppContext()._internalContext;
+    };
     return {
       useAppContext: () => {
-        return context;
+        return getAppContext();
       },
-      setAppContext: (context2) => {
-        return updateAppContext(context2);
+      setAppContext: (context) => {
+        return updateAppContext(context);
       },
       useConfigContext: () => {
-        return context.config;
+        return getInternalContext().config;
       },
       useResolvedConfigContext: () => {
-        return context.normalizedConfig;
+        return getInternalContext().normalizedConfig;
       },
       useHookRunners: () => {
-        return (0, import_hooks.getHookRunners)(context);
+        return (0, import_hooks.getHookRunners)(getInternalContext());
       }
     };
   },

package/dist/cjs/new/context.js

@@ -33,7 +33,7 @@ __export(context_exports, {
 module.exports = __toCommonJS(context_exports);
 var import_path = __toESM(require("path"));
 var import_utils = require("@modern-js/utils");
-const initAppContext = ({ appDirectory, runtimeConfigFile, options, serverConfigFile }) => {
+const initAppContext = ({ appDirectory, runtimeConfigFile, options, serverConfigFile, tempDir }) => {
   const { metaName = "modern-js", apiDir = "api", distDir = "", sharedDir = "shared" } = options || {};
   return {
     metaName,
@@ -47,7 +47,7 @@ const initAppContext = ({ appDirectory, runtimeConfigFile, options, serverConfig
     sharedDirectory: import_path.default.resolve(appDirectory, sharedDir),
     distDirectory: distDir,
     serverPlugins: [],
-    internalDirectory: import_path.default.resolve(appDirectory, `./node_modules/.${metaName}`),
+    internalDirectory: import_path.default.resolve(appDirectory, tempDir || `./node_modules/.${metaName}`),
     htmlTemplates: {},
     serverRoutes: [],
     entrypoints: [],

package/dist/cjs/new/index.js

@@ -59,12 +59,15 @@ const appTools = (options = {
     addRuntimeExports: (0, import_plugin_v2.createAsyncHook)()
   },
   setup: (api) => {
+    var _userConfig_output;
     const context = api.getAppContext();
+    const userConfig = api.getConfig();
     api.updateAppContext((0, import_context.initAppContext)({
       appDirectory: context.appDirectory,
       options: {},
       serverConfigFile: import_constants.DEFAULT_SERVER_CONFIG_FILE,
-      runtimeConfigFile: import_constants.DEFAULT_RUNTIME_CONFIG_FILE
+      runtimeConfigFile: import_constants.DEFAULT_RUNTIME_CONFIG_FILE,
+      tempDir: (_userConfig_output = userConfig.output) === null || _userConfig_output === void 0 ? void 0 : _userConfig_output.tempDir
     }));
   }
 });

package/dist/cjs/new/loadPlugins.js

@@ -39,9 +39,9 @@ const resolveCliPlugin = async (p, appDirectory) => {
   }
   return module2;
 };
-const loadInternalPlugins = async (appDirectory, internalPlugins, autoLoad, autoLoadPlugins, forceAutoLoadPlugins) => {
+const loadInternalPlugins = async (appDirectory, internalPlugins, autoLoad, autoLoadPlugins) => {
   const plugins = [
-    ...forceAutoLoadPlugins || autoLoadPlugins ? (0, import_utils.getInternalPlugins)(appDirectory, internalPlugins) : [],
+    ...autoLoadPlugins ? (0, import_utils.getInternalPlugins)(appDirectory, internalPlugins) : [],
     ...autoLoad ? (0, import_utils.getInternalPlugins)(appDirectory, autoLoad) : []
   ];
   const loadedPlugins = await Promise.all(plugins.map((plugin) => {

package/dist/cjs/new/run.js

@@ -29,7 +29,7 @@ var import_constants = require("./constants");
 var import_getConfigFile = require("./getConfigFile");
 var import_loadPlugins = require("./loadPlugins");
 var import_utils2 = require("./utils");
-async function run({ cwd, initialLog, version, internalPlugins, forceAutoLoadPlugins, packageJsonConfig, configFile }) {
+async function run({ cwd, initialLog, version, internalPlugins, packageJsonConfig, configFile }) {
   const command = process.argv[2];
   const cliParams = (0, import_utils.minimist)(process.argv.slice(2));
   const SUPPORT_CONFIG_PARAM_COMMANDS = [
@@ -49,12 +49,13 @@ async function run({ cwd, initialLog, version, internalPlugins, forceAutoLoadPlu
     customConfigFile = cliParams["config-file"];
   }
   const appDirectory = await (0, import_cli.initAppDir)(cwd);
-  const autoLoadPlugins = await (0, import_utils2.getIsAutoLoadPlugins)(appDirectory, customConfigFile || (0, import_getConfigFile.getConfigFile)(configFile));
-  const plugins = await (0, import_loadPlugins.loadInternalPlugins)(appDirectory, internalPlugins === null || internalPlugins === void 0 ? void 0 : internalPlugins.cli, internalPlugins === null || internalPlugins === void 0 ? void 0 : internalPlugins.autoLoad, autoLoadPlugins, forceAutoLoadPlugins);
+  const finalConfigFile = customConfigFile || (0, import_getConfigFile.getConfigFile)(configFile);
+  const autoLoadPlugins = await (0, import_utils2.getIsAutoLoadPlugins)(appDirectory, finalConfigFile);
+  const plugins = await (0, import_loadPlugins.loadInternalPlugins)(appDirectory, internalPlugins === null || internalPlugins === void 0 ? void 0 : internalPlugins.cli, internalPlugins === null || internalPlugins === void 0 ? void 0 : internalPlugins.autoLoad, autoLoadPlugins);
   await (0, import_run.run)({
     cwd,
     initialLog: initialLog || `Modern.js Framework v${version}`,
-    configFile: customConfigFile || (0, import_getConfigFile.getConfigFile)(configFile),
+    configFile: finalConfigFile,
     packageJsonConfig: packageJsonConfig || import_constants.PACKAGE_JSON_CONFIG_NAME,
     internalPlugins: plugins,
     handleSetupResult: import_hooks.handleSetupResult

package/dist/cjs/utils/restart.js

@@ -21,7 +21,7 @@ __export(restart_exports, {
   restart: () => restart
 });
 module.exports = __toCommonJS(restart_exports);
-var import_core = require("@modern-js/core");
+var import_cli = require("@modern-js/plugin-v2/cli");
 var import_utils = require("@modern-js/utils");
 async function restart(hooksRunner, filename) {
   (0, import_utils.clearConsole)();
@@ -30,7 +30,7 @@ async function restart(hooksRunner, filename) {
   let hasGetError = false;
   await hooksRunner.beforeRestart();
   try {
-    await import_core.cli.init(import_core.cli.getPrevInitOptions());
+    await import_cli.cli.init(import_cli.cli.getPrevInitOptions());
   } catch (err) {
     console.error(err);
     hasGetError = true;

package/dist/esm/index.js

@@ -1,12 +1,16 @@
 import { appTools } from "./new/index";
-export * from "./new/index";
+import { appTools as appTools2, initAppContext } from "./new/index";
 import { dev } from "./commands/dev";
 import { mergeConfig } from "@modern-js/core";
-export * from "./defineConfig";
+import { defineConfig, defineLegacyConfig } from "./defineConfig";
 export * from "./types";
 var src_default = appTools;
 export {
+  appTools2 as appTools,
   src_default as default,
+  defineConfig,
+  defineLegacyConfig,
   dev,
+  initAppContext,
   mergeConfig
 };

package/dist/esm/new/compat/hooks.js

@@ -290,22 +290,32 @@ function getHookRunners(context) {
         return _ref.apply(this, arguments);
       };
     }(),
-    beforeDeploy: /* @__PURE__ */ _async_to_generator(function() {
-      return _ts_generator(this, function(_state) {
-        return [
-          2,
-          hooks.onBeforeDeploy.call()
-        ];
+    beforeDeploy: function() {
+      var _ref = _async_to_generator(function(options) {
+        return _ts_generator(this, function(_state) {
+          return [
+            2,
+            hooks.onBeforeDeploy.call(options)
+          ];
+        });
       });
-    }),
-    afterDeploy: /* @__PURE__ */ _async_to_generator(function() {
-      return _ts_generator(this, function(_state) {
-        return [
-          2,
-          hooks.onAfterDeploy.call()
-        ];
+      return function(options) {
+        return _ref.apply(this, arguments);
+      };
+    }(),
+    afterDeploy: function() {
+      var _ref = _async_to_generator(function(options) {
+        return _ts_generator(this, function(_state) {
+          return [
+            2,
+            hooks.onAfterDeploy.call(options)
+          ];
+        });
       });
-    }),
+      return function(options) {
+        return _ref.apply(this, arguments);
+      };
+    }(),
     beforeExit: /* @__PURE__ */ _async_to_generator(function() {
       return _ts_generator(this, function(_state) {
         return [

package/dist/esm/new/compat/index.js

@@ -2,22 +2,25 @@ import { getHookRunners } from "./hooks";
 var compatPlugin = function() {
   return {
     name: "@modern-js/app-tools-compat",
-    registryApi: function(context, updateAppContext) {
+    _registryApi: function(getAppContext, updateAppContext) {
+      var getInternalContext = function() {
+        return getAppContext()._internalContext;
+      };
       return {
         useAppContext: function() {
-          return context;
+          return getAppContext();
         },
-        setAppContext: function(context2) {
-          return updateAppContext(context2);
+        setAppContext: function(context) {
+          return updateAppContext(context);
         },
         useConfigContext: function() {
-          return context.config;
+          return getInternalContext().config;
         },
         useResolvedConfigContext: function() {
-          return context.normalizedConfig;
+          return getInternalContext().normalizedConfig;
         },
         useHookRunners: function() {
-          return getHookRunners(context);
+          return getHookRunners(getInternalContext());
         }
       };
     },

package/dist/esm/new/context.js

@@ -1,7 +1,7 @@
 import path from "path";
 import { address } from "@modern-js/utils";
 var initAppContext = function(param) {
-  var appDirectory = param.appDirectory, runtimeConfigFile = param.runtimeConfigFile, options = param.options, serverConfigFile = param.serverConfigFile;
+  var appDirectory = param.appDirectory, runtimeConfigFile = param.runtimeConfigFile, options = param.options, serverConfigFile = param.serverConfigFile, tempDir = param.tempDir;
   var _ref = options || {}, _ref_metaName = _ref.metaName, metaName = _ref_metaName === void 0 ? "modern-js" : _ref_metaName, _ref_apiDir = _ref.apiDir, apiDir = _ref_apiDir === void 0 ? "api" : _ref_apiDir, _ref_distDir = _ref.distDir, distDir = _ref_distDir === void 0 ? "" : _ref_distDir, _ref_sharedDir = _ref.sharedDir, sharedDir = _ref_sharedDir === void 0 ? "shared" : _ref_sharedDir;
   return {
     metaName,
@@ -15,7 +15,7 @@ var initAppContext = function(param) {
     sharedDirectory: path.resolve(appDirectory, sharedDir),
     distDirectory: distDir,
     serverPlugins: [],
-    internalDirectory: path.resolve(appDirectory, "./node_modules/.".concat(metaName)),
+    internalDirectory: path.resolve(appDirectory, tempDir || "./node_modules/.".concat(metaName)),
     htmlTemplates: {},
     serverRoutes: [],
     entrypoints: [],

package/dist/esm/new/index.js

@@ -36,12 +36,15 @@ var appTools = function() {
       addRuntimeExports: createAsyncHook()
     },
     setup: function(api) {
+      var _userConfig_output;
       var context = api.getAppContext();
+      var userConfig = api.getConfig();
       api.updateAppContext(initAppContext({
         appDirectory: context.appDirectory,
         options: {},
         serverConfigFile: DEFAULT_SERVER_CONFIG_FILE,
-        runtimeConfigFile: DEFAULT_RUNTIME_CONFIG_FILE
+        runtimeConfigFile: DEFAULT_RUNTIME_CONFIG_FILE,
+        tempDir: (_userConfig_output = userConfig.output) === null || _userConfig_output === void 0 ? void 0 : _userConfig_output.tempDir
       }));
     }
   };

package/dist/esm/new/loadPlugins.js

@@ -62,12 +62,12 @@ var resolveCliPlugin = function() {
   };
 }();
 var loadInternalPlugins = function() {
-  var _ref = _async_to_generator(function(appDirectory, internalPlugins, autoLoad, autoLoadPlugins, forceAutoLoadPlugins) {
+  var _ref = _async_to_generator(function(appDirectory, internalPlugins, autoLoad, autoLoadPlugins) {
     var plugins, loadedPlugins;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
-          plugins = _to_consumable_array(forceAutoLoadPlugins || autoLoadPlugins ? getInternalPlugins(appDirectory, internalPlugins) : []).concat(_to_consumable_array(autoLoad ? getInternalPlugins(appDirectory, autoLoad) : []));
+          plugins = _to_consumable_array(autoLoadPlugins ? getInternalPlugins(appDirectory, internalPlugins) : []).concat(_to_consumable_array(autoLoad ? getInternalPlugins(appDirectory, autoLoad) : []));
           return [
             4,
             Promise.all(plugins.map(function(plugin) {
@@ -85,7 +85,7 @@ var loadInternalPlugins = function() {
       }
     });
   });
-  return function loadInternalPlugins2(appDirectory, internalPlugins, autoLoad, autoLoadPlugins, forceAutoLoadPlugins) {
+  return function loadInternalPlugins2(appDirectory, internalPlugins, autoLoad, autoLoadPlugins) {
     return _ref.apply(this, arguments);
   };
 }();

package/dist/esm/new/run.js

@@ -13,11 +13,11 @@ function run(_) {
 }
 function _run() {
   _run = _async_to_generator(function(param) {
-    var cwd, initialLog, version, internalPlugins, forceAutoLoadPlugins, packageJsonConfig, configFile, command, cliParams, SUPPORT_CONFIG_PARAM_COMMANDS, customConfigFile, appDirectory, autoLoadPlugins, plugins;
+    var cwd, initialLog, version, internalPlugins, packageJsonConfig, configFile, command, cliParams, SUPPORT_CONFIG_PARAM_COMMANDS, customConfigFile, appDirectory, finalConfigFile, autoLoadPlugins, plugins;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
-          cwd = param.cwd, initialLog = param.initialLog, version = param.version, internalPlugins = param.internalPlugins, forceAutoLoadPlugins = param.forceAutoLoadPlugins, packageJsonConfig = param.packageJsonConfig, configFile = param.configFile;
+          cwd = param.cwd, initialLog = param.initialLog, version = param.version, internalPlugins = param.internalPlugins, packageJsonConfig = param.packageJsonConfig, configFile = param.configFile;
           command = process.argv[2];
           cliParams = minimist(process.argv.slice(2));
           SUPPORT_CONFIG_PARAM_COMMANDS = [
@@ -41,15 +41,16 @@ function _run() {
           ];
         case 1:
           appDirectory = _state.sent();
+          finalConfigFile = customConfigFile || getConfigFile(configFile);
           return [
             4,
-            getIsAutoLoadPlugins(appDirectory, customConfigFile || getConfigFile(configFile))
+            getIsAutoLoadPlugins(appDirectory, finalConfigFile)
           ];
         case 2:
           autoLoadPlugins = _state.sent();
           return [
             4,
-            loadInternalPlugins(appDirectory, internalPlugins === null || internalPlugins === void 0 ? void 0 : internalPlugins.cli, internalPlugins === null || internalPlugins === void 0 ? void 0 : internalPlugins.autoLoad, autoLoadPlugins, forceAutoLoadPlugins)
+            loadInternalPlugins(appDirectory, internalPlugins === null || internalPlugins === void 0 ? void 0 : internalPlugins.cli, internalPlugins === null || internalPlugins === void 0 ? void 0 : internalPlugins.autoLoad, autoLoadPlugins)
           ];
         case 3:
           plugins = _state.sent();
@@ -58,7 +59,7 @@ function _run() {
             CLIPluginRun({
               cwd,
               initialLog: initialLog || "Modern.js Framework v".concat(version),
-              configFile: customConfigFile || getConfigFile(configFile),
+              configFile: finalConfigFile,
               packageJsonConfig: packageJsonConfig || PACKAGE_JSON_CONFIG_NAME,
               internalPlugins: plugins,
               handleSetupResult

package/dist/esm/utils/restart.js

@@ -1,6 +1,6 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
-import { cli } from "@modern-js/core";
+import { cli } from "@modern-js/plugin-v2/cli";
 import { chalk, clearConsole, getFullArgv, logger, program } from "@modern-js/utils";
 function restart(hooksRunner, filename) {
   return _restart.apply(this, arguments);

package/dist/esm-node/index.js

@@ -1,12 +1,16 @@
 import { appTools } from "./new/index";
-export * from "./new/index";
+import { appTools as appTools2, initAppContext } from "./new/index";
 import { dev } from "./commands/dev";
 import { mergeConfig } from "@modern-js/core";
-export * from "./defineConfig";
+import { defineConfig, defineLegacyConfig } from "./defineConfig";
 export * from "./types";
 var src_default = appTools;
 export {
+  appTools2 as appTools,
   src_default as default,
+  defineConfig,
+  defineLegacyConfig,
   dev,
+  initAppContext,
   mergeConfig
 };

package/dist/esm-node/new/compat/hooks.js

@@ -83,11 +83,11 @@ function getHookRunners(context) {
     afterDev: async (params) => {
       return hooks.onAfterDev.call(params);
     },
-    beforeDeploy: async () => {
-      return hooks.onBeforeDeploy.call();
+    beforeDeploy: async (options) => {
+      return hooks.onBeforeDeploy.call(options);
     },
-    afterDeploy: async () => {
-      return hooks.onAfterDeploy.call();
+    afterDeploy: async (options) => {
+      return hooks.onAfterDeploy.call(options);
     },
     beforeExit: async () => {
       return hooks.onBeforeExit.call();

package/dist/esm-node/new/compat/index.js

@@ -1,22 +1,25 @@
 import { getHookRunners } from "./hooks";
 const compatPlugin = () => ({
   name: "@modern-js/app-tools-compat",
-  registryApi: (context, updateAppContext) => {
+  _registryApi: (getAppContext, updateAppContext) => {
+    const getInternalContext = () => {
+      return getAppContext()._internalContext;
+    };
     return {
       useAppContext: () => {
-        return context;
+        return getAppContext();
       },
-      setAppContext: (context2) => {
-        return updateAppContext(context2);
+      setAppContext: (context) => {
+        return updateAppContext(context);
       },
       useConfigContext: () => {
-        return context.config;
+        return getInternalContext().config;
       },
       useResolvedConfigContext: () => {
-        return context.normalizedConfig;
+        return getInternalContext().normalizedConfig;
       },
       useHookRunners: () => {
-        return getHookRunners(context);
+        return getHookRunners(getInternalContext());
       }
     };
   },

package/dist/esm-node/new/context.js

@@ -1,6 +1,6 @@
 import path from "path";
 import { address } from "@modern-js/utils";
-const initAppContext = ({ appDirectory, runtimeConfigFile, options, serverConfigFile }) => {
+const initAppContext = ({ appDirectory, runtimeConfigFile, options, serverConfigFile, tempDir }) => {
   const { metaName = "modern-js", apiDir = "api", distDir = "", sharedDir = "shared" } = options || {};
   return {
     metaName,
@@ -14,7 +14,7 @@ const initAppContext = ({ appDirectory, runtimeConfigFile, options, serverConfig
     sharedDirectory: path.resolve(appDirectory, sharedDir),
     distDirectory: distDir,
     serverPlugins: [],
-    internalDirectory: path.resolve(appDirectory, `./node_modules/.${metaName}`),
+    internalDirectory: path.resolve(appDirectory, tempDir || `./node_modules/.${metaName}`),
     htmlTemplates: {},
     serverRoutes: [],
     entrypoints: [],

package/dist/esm-node/new/index.js

@@ -34,12 +34,15 @@ const appTools = (options = {
     addRuntimeExports: createAsyncHook()
   },
   setup: (api) => {
+    var _userConfig_output;
     const context = api.getAppContext();
+    const userConfig = api.getConfig();
     api.updateAppContext(initAppContext({
       appDirectory: context.appDirectory,
       options: {},
       serverConfigFile: DEFAULT_SERVER_CONFIG_FILE,
-      runtimeConfigFile: DEFAULT_RUNTIME_CONFIG_FILE
+      runtimeConfigFile: DEFAULT_RUNTIME_CONFIG_FILE,
+      tempDir: (_userConfig_output = userConfig.output) === null || _userConfig_output === void 0 ? void 0 : _userConfig_output.tempDir
     }));
   }
 });

package/dist/esm-node/new/loadPlugins.js

@@ -16,9 +16,9 @@ const resolveCliPlugin = async (p, appDirectory) => {
   }
   return module;
 };
-const loadInternalPlugins = async (appDirectory, internalPlugins, autoLoad, autoLoadPlugins, forceAutoLoadPlugins) => {
+const loadInternalPlugins = async (appDirectory, internalPlugins, autoLoad, autoLoadPlugins) => {
   const plugins = [
-    ...forceAutoLoadPlugins || autoLoadPlugins ? getInternalPlugins(appDirectory, internalPlugins) : [],
+    ...autoLoadPlugins ? getInternalPlugins(appDirectory, internalPlugins) : [],
     ...autoLoad ? getInternalPlugins(appDirectory, autoLoad) : []
   ];
   const loadedPlugins = await Promise.all(plugins.map((plugin) => {

package/dist/esm-node/new/run.js

@@ -6,7 +6,7 @@ import { PACKAGE_JSON_CONFIG_NAME } from "./constants";
 import { getConfigFile } from "./getConfigFile";
 import { loadInternalPlugins } from "./loadPlugins";
 import { getIsAutoLoadPlugins } from "./utils";
-async function run({ cwd, initialLog, version, internalPlugins, forceAutoLoadPlugins, packageJsonConfig, configFile }) {
+async function run({ cwd, initialLog, version, internalPlugins, packageJsonConfig, configFile }) {
   const command = process.argv[2];
   const cliParams = minimist(process.argv.slice(2));
   const SUPPORT_CONFIG_PARAM_COMMANDS = [
@@ -26,12 +26,13 @@ async function run({ cwd, initialLog, version, internalPlugins, forceAutoLoadPlu
     customConfigFile = cliParams["config-file"];
   }
   const appDirectory = await initAppDir(cwd);
-  const autoLoadPlugins = await getIsAutoLoadPlugins(appDirectory, customConfigFile || getConfigFile(configFile));
-  const plugins = await loadInternalPlugins(appDirectory, internalPlugins === null || internalPlugins === void 0 ? void 0 : internalPlugins.cli, internalPlugins === null || internalPlugins === void 0 ? void 0 : internalPlugins.autoLoad, autoLoadPlugins, forceAutoLoadPlugins);
+  const finalConfigFile = customConfigFile || getConfigFile(configFile);
+  const autoLoadPlugins = await getIsAutoLoadPlugins(appDirectory, finalConfigFile);
+  const plugins = await loadInternalPlugins(appDirectory, internalPlugins === null || internalPlugins === void 0 ? void 0 : internalPlugins.cli, internalPlugins === null || internalPlugins === void 0 ? void 0 : internalPlugins.autoLoad, autoLoadPlugins);
   await CLIPluginRun({
     cwd,
     initialLog: initialLog || `Modern.js Framework v${version}`,
-    configFile: customConfigFile || getConfigFile(configFile),
+    configFile: finalConfigFile,
     packageJsonConfig: packageJsonConfig || PACKAGE_JSON_CONFIG_NAME,
     internalPlugins: plugins,
     handleSetupResult

package/dist/esm-node/utils/restart.js

@@ -1,4 +1,4 @@
-import { cli } from "@modern-js/core";
+import { cli } from "@modern-js/plugin-v2/cli";
 import { chalk, clearConsole, getFullArgv, logger, program } from "@modern-js/utils";
 async function restart(hooksRunner, filename) {
   clearConsole();

package/dist/types/index.d.ts

@@ -1,16 +1,9 @@
 import { appTools } from './new/index';
-export * from './new/index';
+export { appTools, initAppContext, type AppToolsPlugin } from './new/index';
 export { dev } from './commands/dev';
 export type { DevOptions } from './utils/types';
 export { mergeConfig } from '@modern-js/core';
-export * from './defineConfig';
+export { defineConfig, defineLegacyConfig } from './defineConfig';
 export * from './types';
 export type { RuntimeUserConfig } from './types/config';
-export type AppToolsOptions = {
-    /**
-     * Specify which bundler to use for the build.
-     * @default `webpack`
-     * */
-    bundler?: 'rspack' | 'webpack' | 'experimental-rspack';
-};
 export default appTools;

package/dist/types/new/compat/hooks.d.ts

@@ -1,4 +1,4 @@
-import type { InternalContext } from '@modern-js/plugin-v2';
+import type { InternalContext } from '@modern-js/plugin-v2/types';
 import type { AppToolsNormalizedConfig, AppToolsUserConfig } from '../../types';
 import type { AppToolsExtendAPIName } from '../types';
 /**

package/dist/types/new/compat/index.d.ts

@@ -1,4 +1,4 @@
-import type { InternalContext, Plugin } from '@modern-js/plugin-v2';
+import type { InternalContext, Plugin } from '@modern-js/plugin-v2/types';
 import type { AppToolsNormalizedConfig, AppToolsUserConfig } from '../../types/config';
 import type { AppTools, AppToolsExtendAPIName } from '../types';
 export declare const compatPlugin: () => Plugin<AppTools<'shared'>, InternalContext<AppToolsUserConfig<'shared'>, AppToolsNormalizedConfig, AppToolsExtendAPIName<'shared'>>>;

package/dist/types/new/context.d.ts

@@ -1,4 +1,4 @@
-export declare const initAppContext: ({ appDirectory, runtimeConfigFile, options, serverConfigFile, }: {
+export declare const initAppContext: ({ appDirectory, runtimeConfigFile, options, serverConfigFile, tempDir, }: {
     appDirectory: string;
     runtimeConfigFile: string | false;
     options?: {
@@ -9,6 +9,7 @@ export declare const initAppContext: ({ appDirectory, runtimeConfigFile, options
         sharedDir?: string | undefined;
     } | undefined;
     serverConfigFile: string;
+    tempDir?: string | undefined;
 }) => {
     metaName: string;
     runtimeConfigFile: string | false;

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

@@ -1,15 +1,9 @@
-import type { InternalContext, Plugin } from '@modern-js/plugin-v2';
+import type { InternalContext, Plugin } from '@modern-js/plugin-v2/types';
+import { type AppToolsOptions } from '../old';
 import type { AppToolsNormalizedConfig, AppToolsUserConfig } from '../types';
 import { initAppContext } from './context';
 import type { AppTools, AppToolsExtendAPIName } from './types';
 export * from '../defineConfig';
 export { initAppContext };
-export type AppToolsOptions = {
-    /**
-     * Specify which bundler to use for the build.
-     * @default `webpack`
-     * */
-    bundler?: 'rspack' | 'webpack' | 'experimental-rspack';
-};
 export type AppToolsPlugin = Plugin<AppTools<'shared'>, InternalContext<AppToolsUserConfig<'shared'>, AppToolsNormalizedConfig, AppToolsExtendAPIName<'shared'>>>;
 export declare const appTools: (options?: AppToolsOptions) => AppToolsPlugin;

package/dist/types/new/loadPlugins.d.ts

@@ -1,4 +1,4 @@
-import type { Plugin } from '@modern-js/plugin-v2';
+import type { Plugin } from '@modern-js/plugin-v2/types';
 import type { InternalPlugins } from '@modern-js/types';
 /**
  * Load internal plugins which in @modern-js scope and user's custom plugins.
@@ -6,4 +6,4 @@ import type { InternalPlugins } from '@modern-js/types';
  * @param internalPlugins - Internal plugins.
  * @returns Plugin Objects has been required.
  */
-export declare const loadInternalPlugins: (appDirectory: string, internalPlugins?: InternalPlugins, autoLoad?: InternalPlugins, autoLoadPlugins?: boolean, forceAutoLoadPlugins?: boolean) => Promise<Plugin[]>;
+export declare const loadInternalPlugins: (appDirectory: string, internalPlugins?: InternalPlugins, autoLoad?: InternalPlugins, autoLoadPlugins?: boolean) => Promise<Plugin[]>;

package/dist/types/new/run.d.ts

@@ -7,8 +7,7 @@ export interface RunOptions {
         cli?: InternalPlugins;
         autoLoad?: InternalPlugins;
     };
-    forceAutoLoadPlugins?: boolean;
     initialLog?: string;
     version: string;
 }
-export declare function run({ cwd, initialLog, version, internalPlugins, forceAutoLoadPlugins, packageJsonConfig, configFile, }: RunOptions): Promise<void>;
+export declare function run({ cwd, initialLog, version, internalPlugins, packageJsonConfig, configFile, }: RunOptions): Promise<void>;

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

@@ -1,6 +1,6 @@
 import type { DevToolData, RegisterBuildPlatformResult } from '@modern-js/core';
-import type { CLIPluginAPI, PluginHookTap, TransformFunction } from '@modern-js/plugin-v2';
-import type { AppContext } from '@modern-js/plugin-v2/dist/types';
+import type { AppContext } from '@modern-js/plugin-v2/types';
+import type { CLIPluginAPI, PluginHookTap, TransformFunction } from '@modern-js/plugin-v2/types';
 import type { Entrypoint, NestedRouteForCli, PageRoute, RouteLegacy, ServerPlugin, ServerRoute } from '@modern-js/types';
 import type { AppToolsNormalizedConfig, AppToolsUserConfig } from '../../types/config';
 import type { RuntimePlugin } from '../../types/hooks';
@@ -39,7 +39,7 @@ export type BeforePrintInstructionsFn = TransformFunction<{
 export type RegisterDevFn = () => Promise<DevToolData> | DevToolData;
 export type RegisterBuildPlatformFn = () => Promise<RegisterBuildPlatformResult> | RegisterBuildPlatformResult;
 export type AddRuntimeExportsFn = () => Promise<void> | void;
-export interface AppToolsExtendAPI<B extends Bundler> {
+interface AppToolsExtendAPI<B extends Bundler = 'webpack'> {
     onBeforeConfig: PluginHookTap<BeforeConfigFn>;
     onAfterPrepare: PluginHookTap<AfterPrepareFn>;
     deploy: PluginHookTap<DeplpoyFn>;
@@ -84,6 +84,7 @@ export interface AppToolsExtendAPI<B extends Bundler> {
      */
     useHookRunners: () => ReturnType<typeof getHookRunners>;
 }
-export interface AppTools<B extends Bundler> extends CLIPluginAPI<AppToolsUserConfig<B>, AppToolsNormalizedConfig<AppToolsUserConfig<B>>>, AppToolsExtendAPI<B> {
+export interface AppTools<B extends Bundler = 'webpack'> extends CLIPluginAPI<AppToolsUserConfig<B>, AppToolsNormalizedConfig<AppToolsUserConfig<B>>>, AppToolsExtendAPI<B> {
 }
-export type AppToolsExtendAPIName<B extends Bundler> = keyof AppToolsExtendAPI<B> & string;
+export type AppToolsExtendAPIName<B extends Bundler = 'webpack'> = keyof AppToolsExtendAPI<B> & string;
+export {};

package/dist/types/old.d.ts

@@ -1,18 +1,11 @@
 import type { CliPlugin } from '@modern-js/core';
-import type { AppTools } from './types';
+import type { AppTools, AppToolsOptions } from './types';
 export { dev } from './commands/dev';
 export type { DevOptions } from './utils/types';
 export { mergeConfig } from '@modern-js/core';
 export * from './defineConfig';
 export * from './types';
 export type { RuntimeUserConfig } from './types/config';
-export type AppToolsOptions = {
-    /**
-     * Specify which bundler to use for the build.
-     * @default `webpack`
-     * */
-    bundler?: 'rspack' | 'webpack' | 'experimental-rspack';
-};
 /**
  * The core package of the framework, providing CLI commands, build capabilities, configuration parsing and more.
  */

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

@@ -24,3 +24,10 @@ export type AppNormalizedConfig<B extends Bundler = 'webpack'> = NormalizedConfi
 export type AppLegacyNormalizedConfig = NormalizedConfig<LegacyAppTools>;
 export type AppUserConfig<B extends Bundler = 'webpack'> = UserConfig<AppTools<B>>;
 export type AppLegacyUserConfig = UserConfig<LegacyAppTools>;
+export type AppToolsOptions = {
+    /**
+     * Specify which bundler to use for the build.
+     * @default `webpack`
+     * */
+    bundler?: 'rspack' | 'webpack' | 'experimental-rspack';
+};

package/dist/types/utils/restart.d.ts

@@ -1,3 +1,3 @@
-import { type ToRunners } from '@modern-js/core';
+import type { ToRunners } from '@modern-js/core';
 import type { AppToolsHooks } from '../types/hooks';
 export declare function restart(hooksRunner: ToRunners<AppToolsHooks>, filename: string): Promise<void>;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.62.1-alpha.1",
+  "version": "2.62.2-alpha.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -96,20 +96,20 @@
     "mlly": "^1.6.1",
     "pkg-types": "^1.1.0",
     "std-env": "^3.7.0",
-    "@modern-js/plugin": "2.62.0",
     "@modern-js/plugin-v2": "2.60.6",
-    "@modern-js/plugin-i18n": "2.62.0",
-    "@modern-js/plugin-data-loader": "2.62.0",
-    "@modern-js/prod-server": "2.62.0",
-    "@modern-js/core": "2.62.0",
-    "@modern-js/server": "2.62.0",
-    "@modern-js/node-bundle-require": "2.62.0",
-    "@modern-js/rsbuild-plugin-esbuild": "2.62.0",
-    "@modern-js/server-core": "2.62.0",
-    "@modern-js/types": "2.62.0",
-    "@modern-js/utils": "2.62.0",
-    "@modern-js/uni-builder": "2.62.0",
-    "@modern-js/server-utils": "2.62.0"
+    "@modern-js/core": "2.62.1",
+    "@modern-js/plugin": "2.62.1",
+    "@modern-js/plugin-i18n": "2.62.1",
+    "@modern-js/plugin-data-loader": "2.62.1",
+    "@modern-js/prod-server": "2.62.1",
+    "@modern-js/rsbuild-plugin-esbuild": "2.62.1",
+    "@modern-js/node-bundle-require": "2.62.1",
+    "@modern-js/server": "2.62.1",
+    "@modern-js/uni-builder": "2.62.1",
+    "@modern-js/server-utils": "2.62.1",
+    "@modern-js/server-core": "2.62.1",
+    "@modern-js/utils": "2.62.1",
+    "@modern-js/types": "2.62.1"
   },
   "devDependencies": {
     "@rsbuild/plugin-webpack-swc": "~1.0.3",
@@ -121,8 +121,8 @@
     "tsconfig-paths": "^4.2.0",
     "typescript": "^5",
     "webpack": "^5.96.1",
-    "@scripts/build": "2.62.0",
-    "@scripts/jest-config": "2.62.0"
+    "@scripts/build": "2.62.1",
+    "@scripts/jest-config": "2.62.1"
   },
   "peerDependencies": {
     "ts-node": "^10.7.0",