@bleedingdev/modern-js-app-tools 3.5.0-ultramodern.98 → 3.5.0-ultramodern.99

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

@@ -46,6 +46,10 @@ function modifyOutputConfig(config, appContext) {
     };
 }
 function createBuilderProviderConfig(resolveConfig, appContext) {
+    const builderDevConfig = {
+        ...resolveConfig.dev
+    };
+    delete builderDevConfig.mockDir;
     const htmlConfig = {
         ...resolveConfig.html
     };
@@ -64,7 +68,7 @@ function createBuilderProviderConfig(resolveConfig, appContext) {
             ...resolveConfig.source
         },
         dev: {
-            ...resolveConfig.dev,
+            ...builderDevConfig,
             port: appContext.port
         },
         server: serverConfig,

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

@@ -82,6 +82,13 @@ function resolvePackageFile(packageName, filePath, paths) {
             paths
         }));
     } catch  {
+        try {
+            const packageJsonPath = require.resolve(`${packageName}/package.json`, {
+                paths
+            });
+            const packageFile = external_node_path_default().join(external_node_path_default().dirname(packageJsonPath), filePath);
+            if (external_node_fs_default().existsSync(packageFile)) return external_node_fs_default().realpathSync(packageFile);
+        } catch  {}
         const packageEntry = resolvePackageEntry(packageName, paths);
         if (!packageEntry) return;
         const packageRoot = findPackageRoot(packageEntry, packageName);

package/dist/cjs/commands/build.js

@@ -98,9 +98,10 @@ const build = async (api, options)=>{
     utils_namespaceObject.logger.info('Starting production build...');
     if (!appContext.builder) throw new Error('Expect the Builder to have been initialized, But the appContext.builder received `undefined`');
     await appContext.builder.onAfterBuild(async ()=>copyEnvFiles(appContext.appDirectory, appContext.distDirectory));
-    await appContext.builder.build({
+    const buildResult = await appContext.builder.build({
         watch: options?.watch
     });
+    if (!options?.watch) await buildResult?.close();
 };
 exports.build = __webpack_exports__.build;
 for(var __rspack_i in __webpack_exports__)if (-1 === [

package/dist/cjs/commands/deploy.js

@@ -31,10 +31,12 @@ __webpack_require__.d(__webpack_exports__, {
     deploy: ()=>deploy
 });
 const loadPlugins_js_namespaceObject = require("../utils/loadPlugins.js");
-const deploy = async (api, options)=>{
+const external_build_js_namespaceObject = require("./build.js");
+const deploy = async (api, options = {})=>{
     const hooks = api.getHooks();
     const { metaName } = api.getAppContext();
-    await (0, loadPlugins_js_namespaceObject.getServerPlugins)(api, metaName);
+    if (options.skipBuild) await (0, loadPlugins_js_namespaceObject.getServerPlugins)(api, metaName);
+    else await (0, external_build_js_namespaceObject.build)(api);
     await hooks.onBeforeDeploy.call(options);
     await hooks.deploy.call();
     await hooks.onAfterDeploy.call(options);

package/dist/cjs/commands/index.js

@@ -56,10 +56,6 @@ const serverCommand = (program, api)=>{
 };
 const deployCommand = (program, api)=>{
     program.command('deploy').usage('[options]').option('-c --config <config>', index_js_namespaceObject.i18n.t(index_js_namespaceObject.localeKeys.command.shared.config)).option('-s --skip-build', index_js_namespaceObject.i18n.t(index_js_namespaceObject.localeKeys.command.shared.skipBuild)).description(index_js_namespaceObject.i18n.t(index_js_namespaceObject.localeKeys.command.deploy.describe)).action(async (options)=>{
-        if (!options.skipBuild) {
-            const { build } = await import("./build.js");
-            await build(api);
-        }
         const { deploy } = await import("./deploy.js");
         await deploy(api, options);
         process.exit(0);

package/dist/cjs/config/default.js

@@ -31,10 +31,12 @@ __webpack_require__.d(__webpack_exports__, {
     createDefaultConfig: ()=>createDefaultConfig,
     isLazyCompilationSafeByDefault: ()=>isLazyCompilationSafeByDefault
 });
+const server_core_namespaceObject = require("@modern-js/server-core");
 const utils_namespaceObject = require("@modern-js/utils");
 const env_js_namespaceObject = require("../utils/env.js");
 function createDefaultConfig(appContext) {
     const dev = {
+        mockDir: `./${server_core_namespaceObject.AGGRED_DIR.mock}`,
         cliShortcuts: {
             help: false,
             custom: (shortcuts = [])=>shortcuts.filter(({ key })=>'r' !== key && 'u' !== key && 'o' !== key)

package/dist/cjs/index.js

@@ -1,5 +1,11 @@
 "use strict";
 var __webpack_modules__ = {
+    "./commands/build" (module) {
+        module.exports = require("./commands/build.js");
+    },
+    "./commands/deploy" (module) {
+        module.exports = require("./commands/deploy.js");
+    },
     "./commands/dev" (module) {
         module.exports = require("./commands/dev.js");
     },
@@ -51,6 +57,9 @@ var __webpack_modules__ = {
     "./types?6efa" (module) {
         module.exports = require("./types/index.js");
     },
+    "./utils/createServer" (module) {
+        module.exports = require("./utils/createServer.js");
+    },
     "./utils/generateWatchFiles" (module) {
         module.exports = require("./utils/generateWatchFiles.js");
     },
@@ -164,7 +173,10 @@ var __webpack_exports__ = {};
         "serve",
         "generateWatchFiles",
         "initAppContext",
-        "defineConfig"
+        "deploy",
+        "defineConfig",
+        "build",
+        "closeServer"
     ].indexOf(__rspack_import_key) < 0) __rspack_reexport[__rspack_import_key] = ()=>_defineConfig__rspack_import_19[__rspack_import_key];
     __webpack_require__.d(__webpack_exports__, __rspack_reexport);
     var _presetUltramodern__rspack_import_20 = __webpack_require__("./presetUltramodern");
@@ -178,15 +190,20 @@ var __webpack_exports__ = {};
         "serve",
         "generateWatchFiles",
         "initAppContext",
-        "defineConfig"
+        "deploy",
+        "defineConfig",
+        "build",
+        "closeServer"
     ].indexOf(__rspack_import_key) < 0) __rspack_reexport[__rspack_import_key] = ()=>_presetUltramodern__rspack_import_20[__rspack_import_key];
     __webpack_require__.d(__webpack_exports__, __rspack_reexport);
-    var _commands_dev__rspack_import_21 = __webpack_require__("./commands/dev");
-    var _commands_serve__rspack_import_22 = __webpack_require__("./commands/serve");
-    var _rsbuild__rspack_import_23 = __webpack_require__("./rsbuild");
-    var _types__rspack_import_24 = __webpack_require__("./types?6efa");
+    var _commands_build__rspack_import_21 = __webpack_require__("./commands/build");
+    var _commands_deploy__rspack_import_22 = __webpack_require__("./commands/deploy");
+    var _commands_dev__rspack_import_23 = __webpack_require__("./commands/dev");
+    var _commands_serve__rspack_import_24 = __webpack_require__("./commands/serve");
+    var _rsbuild__rspack_import_25 = __webpack_require__("./rsbuild");
+    var _types__rspack_import_26 = __webpack_require__("./types?6efa");
     var __rspack_reexport = {};
-    for(const __rspack_import_key in _types__rspack_import_24)if ([
+    for(const __rspack_import_key in _types__rspack_import_26)if ([
         "dev",
         "resolveModernRsbuildConfig",
         "mergeConfig",
@@ -195,10 +212,14 @@ var __webpack_exports__ = {};
         "serve",
         "generateWatchFiles",
         "initAppContext",
-        "defineConfig"
-    ].indexOf(__rspack_import_key) < 0) __rspack_reexport[__rspack_import_key] = ()=>_types__rspack_import_24[__rspack_import_key];
+        "deploy",
+        "defineConfig",
+        "build",
+        "closeServer"
+    ].indexOf(__rspack_import_key) < 0) __rspack_reexport[__rspack_import_key] = ()=>_types__rspack_import_26[__rspack_import_key];
     __webpack_require__.d(__webpack_exports__, __rspack_reexport);
-    var _modern_js_plugin_cli__rspack_import_25 = __webpack_require__("@modern-js/plugin/cli");
+    var _utils_createServer__rspack_import_27 = __webpack_require__("./utils/createServer");
+    var _modern_js_plugin_cli__rspack_import_28 = __webpack_require__("@modern-js/plugin/cli");
     const appTools = ()=>({
             name: '@modern-js/app-tools',
             usePlugins: [
@@ -264,7 +285,18 @@ var __webpack_exports__ = {};
                         ].some((tag)=>(0, _modern_js_utils__rspack_import_3.getArgv)().includes(tag));
                         if (isSkipBuild) return;
                     }
-                    if ('dev' === command || 'start' === command || 'build' === command || 'deploy' === command) {
+                    const { command: contextCommand } = api.getAppContext();
+                    const shouldClean = [
+                        'dev',
+                        'start',
+                        'build',
+                        'deploy'
+                    ].includes(command) || [
+                        'dev',
+                        'start',
+                        'build'
+                    ].includes(contextCommand);
+                    if (shouldClean) {
                         const resolvedConfig = api.getNormalizedConfig();
                         if (resolvedConfig.output.cleanDistPath) {
                             const appContext = api.getAppContext();
@@ -304,21 +336,27 @@ var __webpack_exports__ = {};
         });
     const __rspack_default_export = appTools;
     __webpack_require__.d(__webpack_exports__, {
+        build: ()=>_commands_build__rspack_import_21.build,
+        closeServer: ()=>_utils_createServer__rspack_import_27.closeServer,
         defineConfig: ()=>_defineConfig__rspack_import_19.defineConfig,
-        dev: ()=>_commands_dev__rspack_import_21.dev,
+        deploy: ()=>_commands_deploy__rspack_import_22.deploy,
+        dev: ()=>_commands_dev__rspack_import_23.dev,
         generateWatchFiles: ()=>_utils_generateWatchFiles__rspack_import_16.generateWatchFiles,
         initAppContext: ()=>_utils_initAppContext__rspack_import_17.initAppContext,
-        mergeConfig: ()=>_modern_js_plugin_cli__rspack_import_25.mergeConfig,
-        resolveModernRsbuildConfig: ()=>_rsbuild__rspack_import_23.resolveModernRsbuildConfig,
-        serve: ()=>_commands_serve__rspack_import_22.serve
+        mergeConfig: ()=>_modern_js_plugin_cli__rspack_import_28.mergeConfig,
+        resolveModernRsbuildConfig: ()=>_rsbuild__rspack_import_25.resolveModernRsbuildConfig,
+        serve: ()=>_commands_serve__rspack_import_24.serve
     }, {
         appTools: appTools,
         default: __rspack_default_export
     });
 })();
 exports.appTools = __webpack_exports__.appTools;
+exports.build = __webpack_exports__.build;
+exports.closeServer = __webpack_exports__.closeServer;
 exports["default"] = __webpack_exports__["default"];
 exports.defineConfig = __webpack_exports__.defineConfig;
+exports.deploy = __webpack_exports__.deploy;
 exports.dev = __webpack_exports__.dev;
 exports.generateWatchFiles = __webpack_exports__.generateWatchFiles;
 exports.initAppContext = __webpack_exports__.initAppContext;
@@ -327,8 +365,11 @@ exports.resolveModernRsbuildConfig = __webpack_exports__.resolveModernRsbuildCon
 exports.serve = __webpack_exports__.serve;
 for(var __rspack_i in __webpack_exports__)if (-1 === [
     "appTools",
+    "build",
+    "closeServer",
     "default",
     "defineConfig",
+    "deploy",
     "dev",
     "generateWatchFiles",
     "initAppContext",

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

@@ -55,7 +55,7 @@ const analyze = ()=>({
                 const resolvedConfig = api.getNormalizedConfig();
                 const hooks = api.getHooks();
                 try {
-                    if ((0, external_utils_js_namespaceObject.checkIsBuildCommands)()) utils_namespaceObject.fs.emptydirSync(appContext.internalDirectory);
+                    if ((0, external_utils_js_namespaceObject.checkIsBuildCommands)(appContext.command)) utils_namespaceObject.fs.emptydirSync(appContext.internalDirectory);
                 } catch  {}
                 const apiOnly = await (0, utils_namespaceObject.isApiOnly)(appContext.appDirectory, resolvedConfig.source?.entriesDir, appContext.apiDirectory);
                 const [{ getProdEntrypoints, getProdServerRoutes }] = await Promise.all([
@@ -157,7 +157,7 @@ const analyze = ()=>({
                     htmlTemplates
                 };
                 api.updateAppContext(appContext);
-                if ((0, external_utils_js_namespaceObject.checkIsBuildCommands)()) {
+                if ((0, external_utils_js_namespaceObject.checkIsBuildCommands)(appContext.command)) {
                     await hooks.generateEntryCode.call({
                         entrypoints
                     });

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

@@ -87,7 +87,7 @@ const parseModule = async ({ source, filename })=>{
     return await (0, external_es_module_lexer_namespaceObject.parse)(content);
 };
 const getServerCombinedModuleFile = (internalDirectory, entryName)=>external_path_default().join(internalDirectory, entryName, 'server-loader-combined.js');
-const checkIsBuildCommands = ()=>{
+const checkIsBuildCommands = (contextCommand)=>{
     const buildCommands = [
         'dev',
         'start',
@@ -97,7 +97,8 @@ const checkIsBuildCommands = ()=>{
         'dev-worker'
     ];
     const command = (0, utils_namespaceObject.getCommand)();
-    return buildCommands.includes(command);
+    if (buildCommands.includes(command)) return true;
+    return 'dev' === contextCommand || 'start' === contextCommand || 'build' === contextCommand || 'deploy' === contextCommand;
 };
 const checkIsServeCommand = ()=>{
     const command = (0, utils_namespaceObject.getCommand)();

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

@@ -57,7 +57,7 @@ const initialize = ()=>({
             api.modifyResolvedConfig(async (resolved)=>{
                 let appContext = api.getAppContext();
                 const userConfig = api.getConfig();
-                const port = await getServerPort(resolved);
+                const port = await getServerPort(resolved, appContext.command);
                 appContext = {
                     ...appContext,
                     port,
@@ -92,9 +92,10 @@ function stabilizeConfig(resolve, config, keys) {
         resolve[key] = config[key] || {};
     });
 }
-async function getServerPort(config) {
+async function getServerPort(config, contextCommand) {
     const prodPort = Number(process.env.PORT) || config.server.port || 8080;
-    if ((0, utils_namespaceObject.isDev)() && (0, utils_namespaceObject.isDevCommand)()) return (0, utils_namespaceObject.getPort)(Number(process.env.PORT) || prodPort);
+    const isProgrammaticDev = 'dev' === contextCommand || 'start' === contextCommand;
+    if ((0, utils_namespaceObject.isDev)() && ((0, utils_namespaceObject.isDevCommand)() || isProgrammaticDev)) return (0, utils_namespaceObject.getPort)(Number(process.env.PORT) || prodPort);
     return prodPort;
 }
 exports["default"] = __webpack_exports__["default"];

package/dist/cjs/plugins/serverBuild.js

@@ -60,7 +60,7 @@ const serverBuild = ()=>({
         name: '@modern-js/server-build',
         setup (api) {
             api.onAfterBuild(async ()=>{
-                const { appDirectory, distDirectory, metaName } = api.getAppContext();
+                const { appDirectory, distDirectory, metaName, moduleType } = api.getAppContext();
                 if (!checkHasCache(appDirectory) && !checkHasConfig(appDirectory, metaName)) return;
                 const modernConfig = api.getNormalizedConfig();
                 const distDir = external_path_default().resolve(distDirectory);
@@ -80,7 +80,8 @@ const serverBuild = ()=>({
                 }, {
                     sourceDirs,
                     distDir,
-                    tsconfigPath
+                    tsconfigPath,
+                    moduleType
                 });
             });
         }

package/dist/esm/builder/generator/createBuilderProviderConfig.mjs

@@ -14,6 +14,10 @@ function modifyOutputConfig(config, appContext) {
     };
 }
 function createBuilderProviderConfig(resolveConfig, appContext) {
+    const builderDevConfig = {
+        ...resolveConfig.dev
+    };
+    delete builderDevConfig.mockDir;
     const htmlConfig = {
         ...resolveConfig.html
     };
@@ -32,7 +36,7 @@ function createBuilderProviderConfig(resolveConfig, appContext) {
             ...resolveConfig.source
         },
         dev: {
-            ...resolveConfig.dev,
+            ...builderDevConfig,
             port: appContext.port
         },
         server: serverConfig,

package/dist/esm/builder/generator/getBuilderEnvironments.mjs

@@ -39,6 +39,13 @@ function resolvePackageFile(packageName, filePath, paths) {
             paths
         }));
     } catch  {
+        try {
+            const packageJsonPath = require.resolve(`${packageName}/package.json`, {
+                paths
+            });
+            const packageFile = node_path.join(node_path.dirname(packageJsonPath), filePath);
+            if (node_fs.existsSync(packageFile)) return node_fs.realpathSync(packageFile);
+        } catch  {}
         const packageEntry = resolvePackageEntry(packageName, paths);
         if (!packageEntry) return;
         const packageRoot = findPackageRoot(packageEntry, packageName);

package/dist/esm/commands/build.mjs

@@ -56,8 +56,9 @@ const build = async (api, options)=>{
     logger.info('Starting production build...');
     if (!appContext.builder) throw new Error('Expect the Builder to have been initialized, But the appContext.builder received `undefined`');
     await appContext.builder.onAfterBuild(async ()=>copyEnvFiles(appContext.appDirectory, appContext.distDirectory));
-    await appContext.builder.build({
+    const buildResult = await appContext.builder.build({
         watch: options?.watch
     });
+    if (!options?.watch) await buildResult?.close();
 };
 export { build };

package/dist/esm/commands/deploy.mjs

@@ -1,8 +1,10 @@
 import { getServerPlugins } from "../utils/loadPlugins.mjs";
-const deploy = async (api, options)=>{
+import { build } from "./build.mjs";
+const deploy = async (api, options = {})=>{
     const hooks = api.getHooks();
     const { metaName } = api.getAppContext();
-    await getServerPlugins(api, metaName);
+    if (options.skipBuild) await getServerPlugins(api, metaName);
+    else await build(api);
     await hooks.onBeforeDeploy.call(options);
     await hooks.deploy.call();
     await hooks.onAfterDeploy.call(options);

package/dist/esm/commands/index.mjs

@@ -19,10 +19,6 @@ const serverCommand = (program, api)=>{
 };
 const deployCommand = (program, api)=>{
     program.command('deploy').usage('[options]').option('-c --config <config>', i18n.t(localeKeys.command.shared.config)).option('-s --skip-build', i18n.t(localeKeys.command.shared.skipBuild)).description(i18n.t(localeKeys.command.deploy.describe)).action(async (options)=>{
-        if (!options.skipBuild) {
-            const { build } = await import("./build.mjs");
-            await build(api);
-        }
         const { deploy } = await import("./deploy.mjs");
         await deploy(api, options);
         process.exit(0);

package/dist/esm/config/default.mjs

@@ -1,7 +1,9 @@
+import { AGGRED_DIR } from "@modern-js/server-core";
 import { DEFAULT_ENTRY_NAME } from "@modern-js/utils";
 import { getAutoInjectEnv } from "../utils/env.mjs";
 function createDefaultConfig(appContext) {
     const dev = {
+        mockDir: `./${AGGRED_DIR.mock}`,
         cliShortcuts: {
             help: false,
             custom: (shortcuts = [])=>shortcuts.filter(({ key })=>'r' !== key && 'u' !== key && 'o' !== key)

package/dist/esm/index.mjs

@@ -85,7 +85,18 @@ const appTools = ()=>({
                     ].some((tag)=>getArgv().includes(tag));
                     if (isSkipBuild) return;
                 }
-                if ('dev' === command || 'start' === command || 'build' === command || 'deploy' === command) {
+                const { command: contextCommand } = api.getAppContext();
+                const shouldClean = [
+                    'dev',
+                    'start',
+                    'build',
+                    'deploy'
+                ].includes(command) || [
+                    'dev',
+                    'start',
+                    'build'
+                ].includes(contextCommand);
+                if (shouldClean) {
                     const resolvedConfig = api.getNormalizedConfig();
                     if (resolvedConfig.output.cleanDistPath) {
                         const appContext = api.getAppContext();
@@ -125,9 +136,12 @@ const appTools = ()=>({
     });
 const src = appTools;
 export { defineConfig } from "./defineConfig.mjs";
+export { build } from "./commands/build.mjs";
+export { deploy } from "./commands/deploy.mjs";
 export { dev } from "./commands/dev.mjs";
 export { serve } from "./commands/serve.mjs";
 export { resolveModernRsbuildConfig } from "./rsbuild.mjs";
+export { closeServer } from "./utils/createServer.mjs";
 export { mergeConfig } from "@modern-js/plugin/cli";
 export default src;
 export { appTools, generateWatchFiles, initAppContext };

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

@@ -23,7 +23,7 @@ const analyze = ()=>({
                 const resolvedConfig = api.getNormalizedConfig();
                 const hooks = api.getHooks();
                 try {
-                    if (checkIsBuildCommands()) fs.emptydirSync(appContext.internalDirectory);
+                    if (checkIsBuildCommands(appContext.command)) fs.emptydirSync(appContext.internalDirectory);
                 } catch  {}
                 const apiOnly = await isApiOnly(appContext.appDirectory, resolvedConfig.source?.entriesDir, appContext.apiDirectory);
                 const [{ getProdEntrypoints, getProdServerRoutes }] = await Promise.all([
@@ -125,7 +125,7 @@ const analyze = ()=>({
                     htmlTemplates
                 };
                 api.updateAppContext(appContext);
-                if (checkIsBuildCommands()) {
+                if (checkIsBuildCommands(appContext.command)) {
                     await hooks.generateEntryCode.call({
                         entrypoints
                     });

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

@@ -38,7 +38,7 @@ const parseModule = async ({ source, filename })=>{
     return await parse(content);
 };
 const getServerCombinedModuleFile = (internalDirectory, entryName)=>path.join(internalDirectory, entryName, 'server-loader-combined.js');
-const checkIsBuildCommands = ()=>{
+const checkIsBuildCommands = (contextCommand)=>{
     const buildCommands = [
         'dev',
         'start',
@@ -48,7 +48,8 @@ const checkIsBuildCommands = ()=>{
         'dev-worker'
     ];
     const command = getCommand();
-    return buildCommands.includes(command);
+    if (buildCommands.includes(command)) return true;
+    return 'dev' === contextCommand || 'start' === contextCommand || 'build' === contextCommand || 'deploy' === contextCommand;
 };
 const checkIsServeCommand = ()=>{
     const command = getCommand();

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

@@ -25,7 +25,7 @@ const initialize = ()=>({
             api.modifyResolvedConfig(async (resolved)=>{
                 let appContext = api.getAppContext();
                 const userConfig = api.getConfig();
-                const port = await getServerPort(resolved);
+                const port = await getServerPort(resolved, appContext.command);
                 appContext = {
                     ...appContext,
                     port,
@@ -60,9 +60,10 @@ function stabilizeConfig(resolve, config, keys) {
         resolve[key] = config[key] || {};
     });
 }
-async function getServerPort(config) {
+async function getServerPort(config, contextCommand) {
     const prodPort = Number(process.env.PORT) || config.server.port || 8080;
-    if (isDev() && isDevCommand()) return getPort(Number(process.env.PORT) || prodPort);
+    const isProgrammaticDev = 'dev' === contextCommand || 'start' === contextCommand;
+    if (isDev() && (isDevCommand() || isProgrammaticDev)) return getPort(Number(process.env.PORT) || prodPort);
     return prodPort;
 }
 export default initialize;

package/dist/esm/plugins/serverBuild.mjs

@@ -17,7 +17,7 @@ const serverBuild = ()=>({
         name: '@modern-js/server-build',
         setup (api) {
             api.onAfterBuild(async ()=>{
-                const { appDirectory, distDirectory, metaName } = api.getAppContext();
+                const { appDirectory, distDirectory, metaName, moduleType } = api.getAppContext();
                 if (!checkHasCache(appDirectory) && !checkHasConfig(appDirectory, metaName)) return;
                 const modernConfig = api.getNormalizedConfig();
                 const distDir = path.resolve(distDirectory);
@@ -37,7 +37,8 @@ const serverBuild = ()=>({
                 }, {
                     sourceDirs,
                     distDir,
-                    tsconfigPath
+                    tsconfigPath,
+                    moduleType
                 });
             });
         }

package/dist/esm-node/builder/generator/createBuilderProviderConfig.mjs

@@ -15,6 +15,10 @@ function modifyOutputConfig(config, appContext) {
     };
 }
 function createBuilderProviderConfig(resolveConfig, appContext) {
+    const builderDevConfig = {
+        ...resolveConfig.dev
+    };
+    delete builderDevConfig.mockDir;
     const htmlConfig = {
         ...resolveConfig.html
     };
@@ -33,7 +37,7 @@ function createBuilderProviderConfig(resolveConfig, appContext) {
             ...resolveConfig.source
         },
         dev: {
-            ...resolveConfig.dev,
+            ...builderDevConfig,
             port: appContext.port
         },
         server: serverConfig,

package/dist/esm-node/builder/generator/getBuilderEnvironments.mjs

@@ -44,6 +44,13 @@ function resolvePackageFile(packageName, filePath, paths) {
             paths
         }));
     } catch  {
+        try {
+            const packageJsonPath = require.resolve(`${packageName}/package.json`, {
+                paths
+            });
+            const packageFile = node_path.join(node_path.dirname(packageJsonPath), filePath);
+            if (node_fs.existsSync(packageFile)) return node_fs.realpathSync(packageFile);
+        } catch  {}
         const packageEntry = resolvePackageEntry(packageName, paths);
         if (!packageEntry) return;
         const packageRoot = findPackageRoot(packageEntry, packageName);

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

@@ -57,8 +57,9 @@ const build = async (api, options)=>{
     logger.info('Starting production build...');
     if (!appContext.builder) throw new Error('Expect the Builder to have been initialized, But the appContext.builder received `undefined`');
     await appContext.builder.onAfterBuild(async ()=>copyEnvFiles(appContext.appDirectory, appContext.distDirectory));
-    await appContext.builder.build({
+    const buildResult = await appContext.builder.build({
         watch: options?.watch
     });
+    if (!options?.watch) await buildResult?.close();
 };
 export { build };

package/dist/esm-node/commands/deploy.mjs

@@ -1,9 +1,11 @@
 import "node:module";
 import { getServerPlugins } from "../utils/loadPlugins.mjs";
-const deploy = async (api, options)=>{
+import { build } from "./build.mjs";
+const deploy = async (api, options = {})=>{
     const hooks = api.getHooks();
     const { metaName } = api.getAppContext();
-    await getServerPlugins(api, metaName);
+    if (options.skipBuild) await getServerPlugins(api, metaName);
+    else await build(api);
     await hooks.onBeforeDeploy.call(options);
     await hooks.deploy.call();
     await hooks.onAfterDeploy.call(options);

package/dist/esm-node/commands/index.mjs

@@ -20,10 +20,6 @@ const serverCommand = (program, api)=>{
 };
 const deployCommand = (program, api)=>{
     program.command('deploy').usage('[options]').option('-c --config <config>', i18n.t(localeKeys.command.shared.config)).option('-s --skip-build', i18n.t(localeKeys.command.shared.skipBuild)).description(i18n.t(localeKeys.command.deploy.describe)).action(async (options)=>{
-        if (!options.skipBuild) {
-            const { build } = await import("./build.mjs");
-            await build(api);
-        }
         const { deploy } = await import("./deploy.mjs");
         await deploy(api, options);
         process.exit(0);

package/dist/esm-node/config/default.mjs

@@ -1,8 +1,10 @@
 import "node:module";
+import { AGGRED_DIR } from "@modern-js/server-core";
 import { DEFAULT_ENTRY_NAME } from "@modern-js/utils";
 import { getAutoInjectEnv } from "../utils/env.mjs";
 function createDefaultConfig(appContext) {
     const dev = {
+        mockDir: `./${AGGRED_DIR.mock}`,
         cliShortcuts: {
             help: false,
             custom: (shortcuts = [])=>shortcuts.filter(({ key })=>'r' !== key && 'u' !== key && 'o' !== key)

package/dist/esm-node/index.mjs

@@ -87,7 +87,18 @@ const appTools = ()=>({
                     ].some((tag)=>getArgv().includes(tag));
                     if (isSkipBuild) return;
                 }
-                if ('dev' === command || 'start' === command || 'build' === command || 'deploy' === command) {
+                const { command: contextCommand } = api.getAppContext();
+                const shouldClean = [
+                    'dev',
+                    'start',
+                    'build',
+                    'deploy'
+                ].includes(command) || [
+                    'dev',
+                    'start',
+                    'build'
+                ].includes(contextCommand);
+                if (shouldClean) {
                     const resolvedConfig = api.getNormalizedConfig();
                     if (resolvedConfig.output.cleanDistPath) {
                         const appContext = api.getAppContext();
@@ -127,9 +138,12 @@ const appTools = ()=>({
     });
 const src = appTools;
 export { defineConfig } from "./defineConfig.mjs";
+export { build } from "./commands/build.mjs";
+export { deploy } from "./commands/deploy.mjs";
 export { dev } from "./commands/dev.mjs";
 export { serve } from "./commands/serve.mjs";
 export { resolveModernRsbuildConfig } from "./rsbuild.mjs";
+export { closeServer } from "./utils/createServer.mjs";
 export { mergeConfig } from "@modern-js/plugin/cli";
 export default src;
 export { appTools, generateWatchFiles, initAppContext };