@bleedingdev/modern-js-app-tools 3.9.0-ultramodern.9 → 3.9.3-ultramodern.10

package/dist/cjs/index.js

@@ -1,11 +1,5 @@
 "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");
     },
@@ -39,9 +33,6 @@ var __webpack_modules__ = {
     "./plugins/serverBuild" (module) {
         module.exports = require("./plugins/serverBuild.js");
     },
-    "./plugins/serverRuntime" (module) {
-        module.exports = require("./plugins/serverRuntime.js");
-    },
     "./rsbuild" (module) {
         module.exports = require("./rsbuild.js");
     },
@@ -60,6 +51,9 @@ var __webpack_modules__ = {
     "./utils/restart" (module) {
         module.exports = require("./utils/restart.js");
     },
+    "@modern-js/app-tools-extensions/deploy-output/target" (module) {
+        module.exports = require("@modern-js/app-tools-extensions/deploy-output/target");
+    },
     "@modern-js/app-tools-extensions/policy-defaults" (module) {
         module.exports = require("@modern-js/app-tools-extensions/policy-defaults");
     },
@@ -129,27 +123,26 @@ function __webpack_require__(moduleId) {
 var __webpack_exports__ = {};
 (()=>{
     __webpack_require__.r(__webpack_exports__);
-    var _modern_js_app_tools_extensions_policy_defaults__rspack_import_0 = __webpack_require__("@modern-js/app-tools-extensions/policy-defaults");
-    var _modern_js_builder__rspack_import_1 = __webpack_require__("@modern-js/builder");
-    var _modern_js_i18n_utils_language_detector__rspack_import_2 = __webpack_require__("@modern-js/i18n-utils/language-detector");
-    var _modern_js_plugin__rspack_import_3 = __webpack_require__("@modern-js/plugin");
-    var _modern_js_utils__rspack_import_4 = __webpack_require__("@modern-js/utils");
-    var path__rspack_import_5 = __webpack_require__("path");
-    var path__rspack_import_5_default = /*#__PURE__*/ __webpack_require__.n(path__rspack_import_5);
-    var _commands__rspack_import_6 = __webpack_require__("./commands");
-    var _compat__rspack_import_7 = __webpack_require__("./compat");
-    var _constants__rspack_import_8 = __webpack_require__("./constants");
-    var _locale__rspack_import_9 = __webpack_require__("./locale");
-    var _plugins_analyze__rspack_import_10 = __webpack_require__("./plugins/analyze");
-    var _plugins_analyze__rspack_import_10_default = /*#__PURE__*/ __webpack_require__.n(_plugins_analyze__rspack_import_10);
-    var _plugins_deploy__rspack_import_11 = __webpack_require__("./plugins/deploy");
-    var _plugins_deploy__rspack_import_11_default = /*#__PURE__*/ __webpack_require__.n(_plugins_deploy__rspack_import_11);
-    var _plugins_initialize__rspack_import_12 = __webpack_require__("./plugins/initialize");
-    var _plugins_initialize__rspack_import_12_default = /*#__PURE__*/ __webpack_require__.n(_plugins_initialize__rspack_import_12);
-    var _plugins_serverBuild__rspack_import_13 = __webpack_require__("./plugins/serverBuild");
-    var _plugins_serverBuild__rspack_import_13_default = /*#__PURE__*/ __webpack_require__.n(_plugins_serverBuild__rspack_import_13);
-    var _plugins_serverRuntime__rspack_import_14 = __webpack_require__("./plugins/serverRuntime");
-    var _plugins_serverRuntime__rspack_import_14_default = /*#__PURE__*/ __webpack_require__.n(_plugins_serverRuntime__rspack_import_14);
+    var _modern_js_app_tools_extensions_deploy_output_target__rspack_import_0 = __webpack_require__("@modern-js/app-tools-extensions/deploy-output/target");
+    var _modern_js_app_tools_extensions_policy_defaults__rspack_import_1 = __webpack_require__("@modern-js/app-tools-extensions/policy-defaults");
+    var _modern_js_builder__rspack_import_2 = __webpack_require__("@modern-js/builder");
+    var _modern_js_i18n_utils_language_detector__rspack_import_3 = __webpack_require__("@modern-js/i18n-utils/language-detector");
+    var _modern_js_plugin__rspack_import_4 = __webpack_require__("@modern-js/plugin");
+    var _modern_js_utils__rspack_import_5 = __webpack_require__("@modern-js/utils");
+    var path__rspack_import_6 = __webpack_require__("path");
+    var path__rspack_import_6_default = /*#__PURE__*/ __webpack_require__.n(path__rspack_import_6);
+    var _commands__rspack_import_7 = __webpack_require__("./commands");
+    var _compat__rspack_import_8 = __webpack_require__("./compat");
+    var _constants__rspack_import_9 = __webpack_require__("./constants");
+    var _locale__rspack_import_10 = __webpack_require__("./locale");
+    var _plugins_analyze__rspack_import_11 = __webpack_require__("./plugins/analyze");
+    var _plugins_analyze__rspack_import_11_default = /*#__PURE__*/ __webpack_require__.n(_plugins_analyze__rspack_import_11);
+    var _plugins_deploy__rspack_import_12 = __webpack_require__("./plugins/deploy");
+    var _plugins_deploy__rspack_import_12_default = /*#__PURE__*/ __webpack_require__.n(_plugins_deploy__rspack_import_12);
+    var _plugins_initialize__rspack_import_13 = __webpack_require__("./plugins/initialize");
+    var _plugins_initialize__rspack_import_13_default = /*#__PURE__*/ __webpack_require__.n(_plugins_initialize__rspack_import_13);
+    var _plugins_serverBuild__rspack_import_14 = __webpack_require__("./plugins/serverBuild");
+    var _plugins_serverBuild__rspack_import_14_default = /*#__PURE__*/ __webpack_require__.n(_plugins_serverBuild__rspack_import_14);
     var _utils_generateWatchFiles__rspack_import_15 = __webpack_require__("./utils/generateWatchFiles");
     var _utils_initAppContext__rspack_import_16 = __webpack_require__("./utils/initAppContext");
     var _utils_restart__rspack_import_17 = __webpack_require__("./utils/restart");
@@ -164,20 +157,16 @@ var __webpack_exports__ = {};
         "serve",
         "generateWatchFiles",
         "initAppContext",
-        "deploy",
         "defineConfig",
-        "build",
         "closeServer"
     ].indexOf(__rspack_import_key) < 0) __rspack_reexport[__rspack_import_key] = ()=>_defineConfig__rspack_import_18[__rspack_import_key];
     __webpack_require__.d(__webpack_exports__, __rspack_reexport);
-    var _commands_build__rspack_import_19 = __webpack_require__("./commands/build");
-    var _commands_deploy__rspack_import_20 = __webpack_require__("./commands/deploy");
-    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_dev__rspack_import_19 = __webpack_require__("./commands/dev");
+    var _commands_serve__rspack_import_20 = __webpack_require__("./commands/serve");
+    var _rsbuild__rspack_import_21 = __webpack_require__("./rsbuild");
+    var _types__rspack_import_22 = __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_22)if ([
         "dev",
         "resolveModernRsbuildConfig",
         "mergeConfig",
@@ -186,24 +175,21 @@ var __webpack_exports__ = {};
         "serve",
         "generateWatchFiles",
         "initAppContext",
-        "deploy",
         "defineConfig",
-        "build",
         "closeServer"
-    ].indexOf(__rspack_import_key) < 0) __rspack_reexport[__rspack_import_key] = ()=>_types__rspack_import_24[__rspack_import_key];
+    ].indexOf(__rspack_import_key) < 0) __rspack_reexport[__rspack_import_key] = ()=>_types__rspack_import_22[__rspack_import_key];
     __webpack_require__.d(__webpack_exports__, __rspack_reexport);
-    var _utils_createServer__rspack_import_25 = __webpack_require__("./utils/createServer");
-    var _modern_js_plugin_cli__rspack_import_26 = __webpack_require__("@modern-js/plugin/cli");
+    var _utils_createServer__rspack_import_23 = __webpack_require__("./utils/createServer");
+    var _modern_js_plugin_cli__rspack_import_24 = __webpack_require__("@modern-js/plugin/cli");
     const appTools = (options = {})=>({
             name: '@modern-js/app-tools',
             usePlugins: [
-                _plugins_serverRuntime__rspack_import_14_default()(),
-                (0, _compat__rspack_import_7.compatPlugin)(),
-                _plugins_initialize__rspack_import_12_default()(),
-                _plugins_analyze__rspack_import_10_default()(),
-                _plugins_serverBuild__rspack_import_13_default()(),
-                _plugins_deploy__rspack_import_11_default()(),
-                (0, _modern_js_app_tools_extensions_policy_defaults__rspack_import_0.createPolicyDefaultsPlugin)(options)
+                (0, _compat__rspack_import_8.compatPlugin)(),
+                _plugins_initialize__rspack_import_13_default()(),
+                _plugins_analyze__rspack_import_11_default()(),
+                _plugins_serverBuild__rspack_import_14_default()(),
+                _plugins_deploy__rspack_import_12_default()(),
+                (0, _modern_js_app_tools_extensions_policy_defaults__rspack_import_1.createPolicyDefaultsPlugin)(options)
             ],
             post: [
                 '@modern-js/plugin-initialize',
@@ -214,66 +200,65 @@ var __webpack_exports__ = {};
                 '@modern-js/plugin-polyfill'
             ],
             registryHooks: {
-                onAfterPrepare: (0, _modern_js_plugin__rspack_import_3.createAsyncHook)(),
-                deploy: (0, _modern_js_plugin__rspack_import_3.createAsyncHook)(),
-                checkEntryPoint: (0, _modern_js_plugin__rspack_import_3.createAsyncHook)(),
-                modifyEntrypoints: (0, _modern_js_plugin__rspack_import_3.createAsyncHook)(),
-                modifyBuilderEnvironments: (0, _modern_js_plugin__rspack_import_3.createAsyncHook)(),
-                modifyFileSystemRoutes: (0, _modern_js_plugin__rspack_import_3.createAsyncHook)(),
-                generateEntryCode: (0, _modern_js_plugin__rspack_import_3.createAsyncHook)(),
-                onBeforeGenerateRoutes: (0, _modern_js_plugin__rspack_import_3.createAsyncHook)(),
-                onBeforePrintInstructions: (0, _modern_js_plugin__rspack_import_3.createAsyncHook)()
+                onAfterPrepare: (0, _modern_js_plugin__rspack_import_4.createAsyncHook)(),
+                deploy: (0, _modern_js_plugin__rspack_import_4.createAsyncHook)(),
+                checkEntryPoint: (0, _modern_js_plugin__rspack_import_4.createAsyncHook)(),
+                modifyEntrypoints: (0, _modern_js_plugin__rspack_import_4.createAsyncHook)(),
+                modifyBuilderEnvironments: (0, _modern_js_plugin__rspack_import_4.createAsyncHook)(),
+                modifyFileSystemRoutes: (0, _modern_js_plugin__rspack_import_4.createAsyncHook)(),
+                generateEntryCode: (0, _modern_js_plugin__rspack_import_4.createAsyncHook)(),
+                onBeforeGenerateRoutes: (0, _modern_js_plugin__rspack_import_4.createAsyncHook)(),
+                onBeforePrintInstructions: (0, _modern_js_plugin__rspack_import_4.createAsyncHook)()
             },
             setup: (api)=>{
                 const context = api.getAppContext();
                 const userConfig = api.getConfig();
-                const locale = (0, _modern_js_i18n_utils_language_detector__rspack_import_2.getLocaleLanguage)();
-                _locale__rspack_import_9.i18n.changeLanguage({
+                const locale = (0, _modern_js_i18n_utils_language_detector__rspack_import_3.getLocaleLanguage)();
+                _locale__rspack_import_10.i18n.changeLanguage({
                     locale
                 });
                 api.updateAppContext((0, _utils_initAppContext__rspack_import_16.initAppContext)({
                     metaName: context.metaName,
                     appDirectory: context.appDirectory,
-                    runtimeConfigFile: _constants__rspack_import_8.DEFAULT_RUNTIME_CONFIG_FILE,
+                    runtimeConfigFile: _constants__rspack_import_9.DEFAULT_RUNTIME_CONFIG_FILE,
                     options: {
                         bffRuntimeFramework: userConfig.bff?.runtimeFramework
                     },
                     tempDir: userConfig.output?.tempDir
                 }));
                 api.addCommand(async ({ program })=>{
-                    await (0, _commands__rspack_import_6.devCommand)(program, api);
-                    await (0, _commands__rspack_import_6.buildCommand)(program, api);
-                    (0, _commands__rspack_import_6.serverCommand)(program, api);
-                    (0, _commands__rspack_import_6.deployCommand)(program, api);
-                    (0, _commands__rspack_import_6.inspectCommand)(program, api);
-                    (0, _commands__rspack_import_6.infoCommand)(program, api);
-                    (0, _modern_js_utils__rspack_import_4.deprecatedCommands)(program);
+                    await (0, _commands__rspack_import_7.devCommand)(program, api);
+                    await (0, _commands__rspack_import_7.buildCommand)(program, api);
+                    (0, _commands__rspack_import_7.serverCommand)(program, api);
+                    (0, _commands__rspack_import_7.deployCommand)(program, api);
+                    (0, _commands__rspack_import_7.inspectCommand)(program, api);
+                    (0, _commands__rspack_import_7.infoCommand)(program, api);
+                    (0, _modern_js_utils__rspack_import_5.deprecatedCommands)(program);
                 });
                 api.onPrepare(async ()=>{
-                    const command = (0, _modern_js_utils__rspack_import_4.getCommand)();
+                    api.updateAppContext({
+                        deployTarget: (0, _modern_js_app_tools_extensions_deploy_output_target__rspack_import_0.resolveDeployTarget)({
+                            configTarget: api.getNormalizedConfig().deploy?.target
+                        })
+                    });
+                    const command = (0, _modern_js_utils__rspack_import_5.getCommand)();
                     if ('deploy' === command) {
                         const isSkipBuild = [
                             '-s',
                             '--skip-build'
-                        ].some((tag)=>(0, _modern_js_utils__rspack_import_4.getArgv)().includes(tag));
+                        ].some((tag)=>(0, _modern_js_utils__rspack_import_5.getArgv)().includes(tag));
                         if (isSkipBuild) return;
                     }
-                    const { command: contextCommand } = api.getAppContext();
-                    const shouldClean = [
+                    if ([
                         'dev',
                         'start',
                         'build',
                         'deploy'
-                    ].includes(command) || [
-                        'dev',
-                        'start',
-                        'build'
-                    ].includes(contextCommand);
-                    if (shouldClean) {
+                    ].includes(command)) {
                         const resolvedConfig = api.getNormalizedConfig();
                         if (resolvedConfig.output.cleanDistPath) {
                             const appContext = api.getAppContext();
-                            await (0, _modern_js_utils__rspack_import_4.emptyDir)(appContext.distDirectory);
+                            await (0, _modern_js_utils__rspack_import_5.emptyDir)(appContext.distDirectory);
                         }
                     }
                 });
@@ -281,7 +266,7 @@ var __webpack_exports__ = {};
                     const appContext = api.getAppContext();
                     const config = api.getNormalizedConfig();
                     const files = await (0, _utils_generateWatchFiles__rspack_import_15.generateWatchFiles)(appContext, config.source.configDir);
-                    const watchFiles = (0, _modern_js_builder__rspack_import_1.castArray)(config.dev.watchFiles);
+                    const watchFiles = (0, _modern_js_builder__rspack_import_2.castArray)(config.dev.watchFiles);
                     watchFiles.forEach(({ type, paths })=>{
                         if ('reload-server' === type) files.push(...Array.isArray(paths) ? paths : [
                             paths
@@ -292,7 +277,7 @@ var __webpack_exports__ = {};
                 api.onFileChanged(async (e)=>{
                     const { filename, eventType, isPrivate } = e;
                     const { appDirectory, apiDirectory } = api.getAppContext();
-                    const relativeApiPath = path__rspack_import_5_default().relative(appDirectory, apiDirectory);
+                    const relativeApiPath = path__rspack_import_6_default().relative(appDirectory, apiDirectory);
                     const isApiProject = filename.startsWith(`${relativeApiPath}/`);
                     if (!isPrivate && ('change' === eventType || 'unlink' === eventType) && !isApiProject) {
                         const { closeServer } = await import("./utils/createServer.js");
@@ -300,36 +285,27 @@ var __webpack_exports__ = {};
                         await (0, _utils_restart__rspack_import_17.restart)(api.getHooks(), filename);
                     }
                 });
-                api.onBeforeRestart(()=>{
-                    (0, _modern_js_utils__rspack_import_4.cleanRequireCache)([
-                        require.resolve('./plugins/analyze')
-                    ]);
-                });
             }
         });
     const __rspack_default_export = appTools;
     __webpack_require__.d(__webpack_exports__, {
-        build: ()=>_commands_build__rspack_import_19.build,
-        closeServer: ()=>_utils_createServer__rspack_import_25.closeServer,
+        closeServer: ()=>_utils_createServer__rspack_import_23.closeServer,
         defineConfig: ()=>_defineConfig__rspack_import_18.defineConfig,
-        deploy: ()=>_commands_deploy__rspack_import_20.deploy,
-        dev: ()=>_commands_dev__rspack_import_21.dev,
+        dev: ()=>_commands_dev__rspack_import_19.dev,
         generateWatchFiles: ()=>_utils_generateWatchFiles__rspack_import_15.generateWatchFiles,
         initAppContext: ()=>_utils_initAppContext__rspack_import_16.initAppContext,
-        mergeConfig: ()=>_modern_js_plugin_cli__rspack_import_26.mergeConfig,
-        resolveModernRsbuildConfig: ()=>_rsbuild__rspack_import_23.resolveModernRsbuildConfig,
-        serve: ()=>_commands_serve__rspack_import_22.serve
+        mergeConfig: ()=>_modern_js_plugin_cli__rspack_import_24.mergeConfig,
+        resolveModernRsbuildConfig: ()=>_rsbuild__rspack_import_21.resolveModernRsbuildConfig,
+        serve: ()=>_commands_serve__rspack_import_20.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;
@@ -338,11 +314,9 @@ 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/getFileSystemEntry.js

@@ -106,7 +106,7 @@ const getFileSystemEntry = async (hooks, appContext, config)=>{
         }));
         return scanDir(hooks, dirs);
     } else throw Error("source.entriesDir accept a directory.");
-    throw Error(`src dir ${entriesDir} not found.`);
+    else throw Error(`src dir ${entriesDir} not found.`);
 };
 exports.getFileSystemEntry = __webpack_exports__.getFileSystemEntry;
 exports.hasEntry = __webpack_exports__.hasEntry;

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

@@ -52,7 +52,7 @@ const applyBaseUrl = (baseUrl, routes)=>{
             ...applyBaseUrl(current, routes)
         ], []);
     else return routes.map((route)=>{
-        const urlPath = (0, utils_namespaceObject.urlJoin)(baseUrl, route.urlPath);
+        const urlPath = (0, utils_namespaceObject.urlJoin)(baseUrl, route.urlPath).replace(/^\/{2,}/, '/');
         return {
             ...route,
             urlPath: '/' === urlPath ? urlPath : (0, utils_namespaceObject.removeTailSlash)(urlPath)
@@ -70,7 +70,7 @@ const applyRouteOptions = (original, routeOptions)=>{
             ...original,
             urlPath: url
         };
-        {
+        else {
             const { path: urlPath, ...other } = url;
             return {
                 ...original,

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)(appContext.command)) utils_namespaceObject.fs.emptydirSync(appContext.internalDirectory);
+                    if ((0, external_utils_js_namespaceObject.checkIsBuildCommands)()) 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)(appContext.command)) {
+                if ((0, external_utils_js_namespaceObject.checkIsBuildCommands)()) {
                     await hooks.generateEntryCode.call({
                         entrypoints
                     });

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

@@ -58,14 +58,14 @@ const walkDirectory = (dir)=>external_fs_default().readdirSync(dir).reduce((prev
             ...previous,
             ...walkDirectory(filePath)
         ];
-        return [
+        else return [
             ...previous,
             filePath
         ];
     }, []);
 const replaceWithAlias = (base, filePath, alias)=>{
     if (filePath.includes(base)) return (0, utils_namespaceObject.normalizeToPosixPath)(external_path_default().join(alias, external_path_default().relative(base, filePath)));
-    return filePath;
+    else return filePath;
 };
 const parseModule = async ({ source, filename })=>{
     let content = source;
@@ -84,10 +84,11 @@ const parseModule = async ({ source, filename })=>{
         });
         content = result.code;
     }
-    return await (0, external_es_module_lexer_namespaceObject.parse)(content);
+    await (0, external_es_module_lexer_namespaceObject.init)();
+    return (0, external_es_module_lexer_namespaceObject.parse)(content);
 };
 const getServerCombinedModuleFile = (internalDirectory, entryName)=>external_path_default().join(internalDirectory, entryName, 'server-loader-combined.js');
-const checkIsBuildCommands = (contextCommand)=>{
+const checkIsBuildCommands = ()=>{
     const buildCommands = [
         'dev',
         'start',
@@ -97,8 +98,7 @@ const checkIsBuildCommands = (contextCommand)=>{
         'dev-worker'
     ];
     const command = (0, utils_namespaceObject.getCommand)();
-    if (buildCommands.includes(command)) return true;
-    return 'dev' === contextCommand || 'start' === contextCommand || 'build' === contextCommand || 'deploy' === contextCommand;
+    return buildCommands.includes(command);
 };
 const checkIsServeCommand = ()=>{
     const command = (0, utils_namespaceObject.getCommand)();

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

@@ -28,12 +28,10 @@ var __webpack_require__ = {};
 var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
-    default: ()=>deploy,
-    getSupportedDeployTargets: ()=>getSupportedDeployTargets,
-    resolveDeployTarget: ()=>resolveDeployTarget
+    default: ()=>deploy
 });
 const cloudflare_namespaceObject = require("@modern-js/app-tools-extensions/cloudflare");
-const external_std_env_namespaceObject = require("std-env");
+const target_namespaceObject = require("@modern-js/app-tools-extensions/deploy-output/target");
 const gh_pages_js_namespaceObject = require("./platforms/gh-pages.js");
 const netlify_js_namespaceObject = require("./platforms/netlify.js");
 const node_js_namespaceObject = require("./platforms/node.js");
@@ -46,24 +44,11 @@ const deployPresets = {
     ghPages: gh_pages_js_namespaceObject.createGhPagesPreset,
     cloudflare: cloudflare_namespaceObject.createCloudflarePreset
 };
-const getSupportedDeployTargets = ()=>Object.keys(deployPresets);
-const isDeployTarget = (target)=>Object.prototype.hasOwnProperty.call(deployPresets, target);
-const providerDeployTargets = {
-    vercel: 'vercel',
-    netlify: 'netlify',
-    cloudflare: 'cloudflare',
-    cloudflare_pages: 'cloudflare',
-    cloudflare_workers: 'cloudflare'
-};
-const normalizeDetectedProvider = (value)=>value ? providerDeployTargets[value] : void 0;
-const resolveDeployTarget = (modernConfig, envDeployTarget = process.env.MODERNJS_DEPLOY, detectedProvider = external_std_env_namespaceObject.provider)=>modernConfig.deploy?.target || envDeployTarget || normalizeDetectedProvider(detectedProvider) || 'node';
 async function getDeployPreset(appContext, modernConfig, deployTarget, api) {
     const { appDirectory, distDirectory, metaName } = appContext;
     const { useSSR, useAPI, useWebServer } = (0, index_js_namespaceObject.getProjectUsage)(appDirectory, distDirectory, metaName);
     const needModernServer = useSSR || useAPI || useWebServer;
-    if (!isDeployTarget(deployTarget)) throw new Error(`Unknown deploy target: '${deployTarget}'. deploy.target or MODERNJS_DEPLOY should be one of: ${getSupportedDeployTargets().join(', ')}.`);
-    const createPreset = deployPresets[deployTarget];
-    return createPreset({
+    return deployPresets[deployTarget]({
         appContext,
         modernConfig,
         needModernServer,
@@ -75,11 +60,9 @@ const deploy = ()=>({
         setup: (api)=>{
             api.deploy(async ()=>{
                 const appContext = api.getAppContext();
-                const { metaName } = appContext;
-                const modernConfig = api.getNormalizedConfig();
-                const deployTarget = resolveDeployTarget(modernConfig);
-                if ('modern-js' !== metaName && !modernConfig.deploy?.target && !process.env.MODERNJS_DEPLOY) return;
-                const deployPreset = await getDeployPreset(appContext, modernConfig, deployTarget, api);
+                const deployTarget = (0, target_namespaceObject.getDeployingTarget)(appContext);
+                if (!deployTarget) return;
+                const deployPreset = await getDeployPreset(appContext, api.getNormalizedConfig(), deployTarget, api);
                 deployPreset?.prepare && await deployPreset?.prepare();
                 deployPreset?.writeOutput && await deployPreset?.writeOutput();
                 deployPreset?.genEntry && await deployPreset?.genEntry();
@@ -88,12 +71,8 @@ const deploy = ()=>({
         }
     });
 exports["default"] = __webpack_exports__["default"];
-exports.getSupportedDeployTargets = __webpack_exports__.getSupportedDeployTargets;
-exports.resolveDeployTarget = __webpack_exports__.resolveDeployTarget;
 for(var __rspack_i in __webpack_exports__)if (-1 === [
-    "default",
-    "getSupportedDeployTargets",
-    "resolveDeployTarget"
+    "default"
 ].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
 Object.defineProperty(exports, '__esModule', {
     value: true

package/dist/cjs/plugins/deploy/platforms/netlify.js

@@ -41,6 +41,7 @@ __webpack_require__.d(__webpack_exports__, {
 });
 const external_node_path_namespaceObject = require("node:path");
 var external_node_path_default = /*#__PURE__*/ __webpack_require__.n(external_node_path_namespaceObject);
+const trace_files_namespaceObject = require("@modern-js/app-tools-extensions/deploy-output/trace-files");
 const utils_namespaceObject = require("@modern-js/utils");
 const external_ndepe_namespaceObject = require("ndepe");
 const routes_js_namespaceObject = require("../../../utils/routes.js");
@@ -113,8 +114,8 @@ const createNetlifyPreset = ({ appContext, modernConfig, needModernServer })=>{
             if (!needModernServer) return;
             const entry = isEsmProject ? await (0, index_js_namespaceObject.resolveESMDependency)('@modern-js/prod-server') : require.resolve('@modern-js/prod-server');
             const netlifyEntry = isEsmProject ? await (0, index_js_namespaceObject.resolveESMDependency)('@modern-js/prod-server/netlify') : require.resolve('@modern-js/prod-server/netlify');
-            if (!entry || !netlifyEntry) throw new Error('Cannot find @modern-js/prod-server');
             await (0, external_ndepe_namespaceObject.nodeDepEmit)({
+                traceFiles: trace_files_namespaceObject.traceDeployFiles,
                 appDir: appDirectory,
                 sourceDir: funcsDirectory,
                 includeEntries: [

package/dist/cjs/plugins/deploy/platforms/node.js

@@ -39,14 +39,16 @@ __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
     createNodePreset: ()=>createNodePreset
 });
+const external_node_module_namespaceObject = require("node:module");
 const external_node_path_namespaceObject = require("node:path");
 var external_node_path_default = /*#__PURE__*/ __webpack_require__.n(external_node_path_namespaceObject);
+const trace_files_namespaceObject = require("@modern-js/app-tools-extensions/deploy-output/trace-files");
 const utils_namespaceObject = require("@modern-js/utils");
 const external_ndepe_namespaceObject = require("ndepe");
 const index_js_namespaceObject = require("../utils/index.js");
 const generator_js_namespaceObject = require("../utils/generator.js");
 const createNodePreset = ({ appContext, modernConfig })=>{
-    const { appDirectory, distDirectory, moduleType } = appContext;
+    const { appDirectory, distDirectory, moduleType, serverPlugins } = appContext;
     const isEsmProject = 'module' === moduleType;
     const outputDirectory = external_node_path_default().join(appDirectory, '.output');
     const staticDirectory = external_node_path_default().join(outputDirectory, 'static');
@@ -76,12 +78,19 @@ const createNodePreset = ({ appContext, modernConfig })=>{
         async end () {
             const filter = (filePath)=>!filePath.startsWith(staticDirectory) && !filePath.endsWith('.map');
             const entry = isEsmProject ? await (0, index_js_namespaceObject.resolveESMDependency)('@modern-js/prod-server') : require.resolve('@modern-js/prod-server');
-            if (!entry) throw new Error('Cannot find @modern-js/prod-server');
+            const requireFromApp = (0, external_node_module_namespaceObject.createRequire)(external_node_path_default().join(appDirectory, 'package.json'));
+            const pluginEntries = new Set();
+            for (const plugin of serverPlugins)for (const specifier of plugin.includeEntries ?? []){
+                pluginEntries.add(requireFromApp.resolve(specifier));
+                if (isEsmProject) pluginEntries.add(await (0, index_js_namespaceObject.resolveESMDependency)(specifier, appDirectory));
+            }
             await (0, external_ndepe_namespaceObject.nodeDepEmit)({
+                traceFiles: trace_files_namespaceObject.traceDeployFiles,
                 appDir: appDirectory,
                 sourceDir: outputDirectory,
                 includeEntries: [
-                    entry
+                    entry,
+                    ...pluginEntries
                 ],
                 copyWholePackage (pkgName) {
                     return '@modern-js/utils' === pkgName;

package/dist/cjs/plugins/deploy/platforms/templates/node-entry.cjs

@@ -35,10 +35,11 @@ async function main() {
     const app = await createProdServer(prodServerOptions);
     const port = process.env.PORT || 8080;
     app.listen({
-        host: '::',
         port
     }, ()=>{
-        console.log(`\x1b[32mServer is listening on http://[::]:${port}`, '\x1b[0m');
+        const address = app.address();
+        const loopback = 'IPv6' === address.family ? '[::1]' : '127.0.0.1';
+        console.log(`\x1b[32mServer is listening on http://${loopback}:${address.port}`, '\x1b[0m');
     });
 }
 main();

package/dist/cjs/plugins/deploy/platforms/templates/node-entry.mjs

@@ -37,10 +37,11 @@ async function main() {
     const app = await createProdServer(prodServerOptions);
     const port = process.env.PORT || 8080;
     app.listen({
-        host: '::',
         port
     }, ()=>{
-        console.log(`\x1b[32mServer is listening on http://[::]:${port}`, '\x1b[0m');
+        const address = app.address();
+        const loopback = 'IPv6' === address.family ? '[::1]' : '127.0.0.1';
+        console.log(`\x1b[32mServer is listening on http://${loopback}:${address.port}`, '\x1b[0m');
     });
 }
 main();

package/dist/cjs/plugins/deploy/platforms/vercel.js

@@ -41,6 +41,7 @@ __webpack_require__.d(__webpack_exports__, {
 });
 const external_node_path_namespaceObject = require("node:path");
 var external_node_path_default = /*#__PURE__*/ __webpack_require__.n(external_node_path_namespaceObject);
+const trace_files_namespaceObject = require("@modern-js/app-tools-extensions/deploy-output/trace-files");
 const utils_namespaceObject = require("@modern-js/utils");
 const external_ndepe_namespaceObject = require("ndepe");
 const routes_js_namespaceObject = require("../../../utils/routes.js");
@@ -133,8 +134,8 @@ const createVercelPreset = ({ appContext, modernConfig, needModernServer })=>{
         async end () {
             if (!needModernServer) return;
             const entry = isEsmProject ? await (0, index_js_namespaceObject.resolveESMDependency)('@modern-js/prod-server') : require.resolve('@modern-js/prod-server');
-            if (!entry) throw new Error('Cannot find @modern-js/prod-server');
             await (0, external_ndepe_namespaceObject.nodeDepEmit)({
+                traceFiles: trace_files_namespaceObject.traceDeployFiles,
                 appDir: appDirectory,
                 sourceDir: funcsDirectory,
                 includeEntries: [

package/dist/cjs/plugins/deploy/utils/index.js

@@ -43,9 +43,9 @@ __webpack_require__.d(__webpack_exports__, {
     readTemplate: ()=>readTemplate,
     resolveESMDependency: ()=>resolveESMDependency
 });
-const external_node_module_namespaceObject = require("node:module");
 const external_node_url_namespaceObject = require("node:url");
 const utils_namespaceObject = require("@modern-js/utils");
+const external_import_meta_resolve_namespaceObject = require("import-meta-resolve");
 const external_path_namespaceObject = require("path");
 var external_path_default = /*#__PURE__*/ __webpack_require__.n(external_path_namespaceObject);
 const normalizePath = (filePath)=>filePath.replace(/\\/g, '/');
@@ -72,18 +72,21 @@ const getProjectUsage = (appDirectory, distDirectory, metaName)=>{
 };
 const getTemplatePath = (file)=>external_path_default().join(__dirname, '../platforms/templates', file);
 const readTemplate = async (file)=>(await utils_namespaceObject.fs.readFile(getTemplatePath(file))).toString();
-const resolveESMDependency = async (entry)=>{
-    const conditions = new Set([
-        'node',
-        'import',
-        'module',
-        'default'
-    ]);
+const DEPLOY_CONDITIONS = [
+    'node',
+    'import',
+    'module',
+    'default'
+];
+const resolveESMDependency = async (entry, fromDirectory)=>{
+    const base = fromDirectory ? (0, external_node_url_namespaceObject.pathToFileURL)(external_path_default().join(fromDirectory, 'package.json')) : (0, external_node_url_namespaceObject.pathToFileURL)(`${__dirname}/`);
     try {
-        const resolverPath = (0, external_node_url_namespaceObject.pathToFileURL)((0, external_node_module_namespaceObject.createRequire)(__filename).resolve('import-meta-resolve')).href;
-        const { moduleResolve } = await (0, utils_namespaceObject.dynamicImport)(resolverPath);
-        return normalizePath(moduleResolve(entry, (0, external_node_url_namespaceObject.pathToFileURL)(`${__dirname}/`), conditions, false).pathname.replace(/^\/(\w):/, '$1:'));
-    } catch (err) {}
+        return normalizePath((0, external_node_url_namespaceObject.fileURLToPath)((0, external_import_meta_resolve_namespaceObject.moduleResolve)(entry, base, new Set(DEPLOY_CONDITIONS), false)));
+    } catch (cause) {
+        throw new Error(`Cannot resolve "${entry}" with conditions [${DEPLOY_CONDITIONS.join(', ')}] from ${base.href}: ${cause.message}`, {
+            cause
+        });
+    }
 };
 exports.getProjectUsage = __webpack_exports__.getProjectUsage;
 exports.getTemplatePath = __webpack_exports__.getTemplatePath;