@bleedingdev/modern-js-app-tools 3.9.0-ultramodern.2 → 3.9.0-ultramodern.21

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

@@ -39,15 +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 npmAliases_js_namespaceObject = require("../utils/npmAliases.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');
@@ -77,13 +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 prodServerPackage = await (0, npmAliases_js_namespaceObject.readPackageIdentity)(entry);
+            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;
@@ -97,17 +104,6 @@ const createNodePreset = ({ appContext, modernConfig })=>{
                     };
                 }
             });
-            await (0, npmAliases_js_namespaceObject.preserveNpmAliases)({
-                appDirectory,
-                outputDirectory,
-                implicitAliases: [
-                    {
-                        aliasName: '@modern-js/prod-server',
-                        targetName: prodServerPackage.name,
-                        targetVersion: prodServerPackage.version
-                    }
-                ]
-            });
             console.log('Static directory:', utils_namespaceObject.chalk.blue(external_node_path_default().relative(appDirectory, staticDirectory).replace(/\\/g, '/')));
             console.log("You can preview this build by", utils_namespaceObject.chalk.blue('node .output/index'));
         }

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/generator.js

@@ -61,7 +61,7 @@ const serverAppContextTemplate = (appContext)=>{
 };
 const genPluginImportsCode = (plugins, isESM = false)=>plugins.map(([name, options], index)=>{
         const im = isESM ? `import * as plugin_${index}_ns from '${name}'` : `const plugin_${index}_ns = require('${name}')`;
-        return `${im};const plugin_${index} = plugin_${index}_ns.default || plugin_${index}_ns`;
+        return `${im};const plugin_${index} = typeof plugin_${index}_ns === 'function' ? plugin_${index}_ns : typeof plugin_${index}_ns.default === 'function' ? plugin_${index}_ns.default : plugin_${index}_ns.default?.default`;
     }).join(';\n');
 const getPluginsCode = (plugins)=>`[${plugins.map(([, options], index)=>`plugin_${index}(${options ? JSON.stringify(options) : ''})`).join(',')}]`;
 const getServerConfigPath = (meta)=>`path.join(__dirname, "${utils_namespaceObject.SERVER_DIR}", "${meta}.server")`;

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;

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

@@ -31,6 +31,7 @@ __webpack_require__.d(__webpack_exports__, {
     default: ()=>initialize
 });
 const utils_namespaceObject = require("@modern-js/utils");
+const lazyCompilation_js_namespaceObject = require("../../builder/shared/lazyCompilation.js");
 const index_js_namespaceObject = require("../../config/index.js");
 const initialize = ()=>({
         name: '@modern-js/plugin-initialize',
@@ -49,7 +50,8 @@ const initialize = ()=>({
                     ...defaultConfig.dev,
                     lazyCompilation: {
                         imports: true,
-                        entries: false
+                        entries: false,
+                        test: (0, lazyCompilation_js_namespaceObject.buildDefaultLazyCompilationTest)(appContext.appDirectory, appContext.internalDirectory)
                     }
                 };
                 return defaultConfig;

package/dist/cjs/plugins/serverBuild.js

@@ -72,16 +72,15 @@ const serverBuild = ()=>({
                     sourceDirs.push(serverDir);
                     if (external_fs_default().existsSync(sharedDir)) sourceDirs.push(sharedDir);
                 }
-                const { server } = modernConfig;
                 const { alias } = modernConfig.source;
                 if (sourceDirs.length > 0) await (0, server_utils_namespaceObject.compile)(appDirectory, {
-                    server,
                     alias
                 }, {
                     sourceDirs,
                     distDir,
                     tsconfigPath,
-                    moduleType
+                    moduleType,
+                    excludeFiles: api.getAppContext().serverCompileExcludedFiles
                 });
             });
         }

package/dist/cjs/{plugins/backendFederationBuild.js → server-plugin.js}

@@ -37,16 +37,13 @@ var __webpack_require__ = {};
 var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
-    default: ()=>emit_js_default(),
-    emitBackendFederationArtifacts: ()=>emit_js_namespaceObject.emitBackendFederationArtifacts
+    default: ()=>server_plugin_default()
 });
-const emit_js_namespaceObject = require("./backend-federation/emit.js");
-var emit_js_default = /*#__PURE__*/ __webpack_require__.n(emit_js_namespaceObject);
+const server_plugin_namespaceObject = require("@modern-js/server-runtime-extensions/server-plugin");
+var server_plugin_default = /*#__PURE__*/ __webpack_require__.n(server_plugin_namespaceObject);
 exports["default"] = __webpack_exports__["default"];
-exports.emitBackendFederationArtifacts = __webpack_exports__.emitBackendFederationArtifacts;
 for(var __rspack_i in __webpack_exports__)if (-1 === [
-    "default",
-    "emitBackendFederationArtifacts"
+    "default"
 ].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
 Object.defineProperty(exports, '__esModule', {
     value: true

package/dist/cjs/utils/loadPlugins.js

@@ -55,12 +55,7 @@ const resolveCliPlugin = async (p, appDirectory)=>{
     const pkg = 'string' == typeof p ? p : p[0];
     const pluginOptions = 'string' == typeof p ? void 0 : p[1];
     const path = (0, utils_namespaceObject.tryResolve)(pkg, appDirectory);
-    let module;
-    try {
-        module = await (0, utils_namespaceObject.compatibleRequire)(path);
-    } catch (e) {
-        ({ default: module } = await (0, utils_namespaceObject.dynamicImport)(path));
-    }
+    const module = await (0, utils_namespaceObject.compatibleRequire)(path);
     if ('function' == typeof module) {
         const result = module(pluginOptions);
         return result;

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

@@ -14,7 +14,8 @@ function createPublicPattern(appContext, config, chain) {
         noErrorOnMissing: true,
         transform: (content, absoluteFrom)=>{
             if (!/\.html?$/.test(absoluteFrom)) return content;
-            return content.toString('utf8').replace(/<%=\s*assetPrefix\s*%>/g, removeTailSlash(chain.output.get('publicPath')));
+            const publicPath = chain.output.get('publicPath');
+            return content.toString('utf8').replace(/<%=\s*assetPrefix\s*%>/g, removeTailSlash('string' == typeof publicPath ? publicPath : ''));
         }
     };
 }

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

@@ -1,6 +1,6 @@
 import { createBuilder } from "@modern-js/builder";
 import { mergeRsbuildConfig } from "@rsbuild/core";
-import { builderPluginAdapterBasic, builderPluginAdapterHooks, builderPluginAdapterHtml, builderPluginAdapterPrecompress, builderPluginAdapterSSR } from "../shared/builderPlugins/index.mjs";
+import { builderPluginAdapterBasic, builderPluginAdapterHooks, builderPluginAdapterHtml, builderPluginAdapterSSR } from "../shared/builderPlugins/index.mjs";
 import { builderPluginAdapterCopy } from "./adapterCopy.mjs";
 import { createBuilderProviderConfig } from "./createBuilderProviderConfig.mjs";
 import { getBuilderEnvironments } from "./getBuilderEnvironments.mjs";
@@ -40,7 +40,6 @@ async function applyBuilderPlugins(builder, options) {
         builderPluginAdapterBasic(options),
         builderPluginAdapterSSR(options),
         builderPluginAdapterHtml(options),
-        builderPluginAdapterPrecompress(options),
         builderPluginAdapterHooks(options)
     ]);
     builder.addPlugins([

package/dist/esm/builder/shared/builderPlugins/adapterHtml.mjs

@@ -26,7 +26,8 @@ const builderPluginAdapterHtml = (options)=>({
 async function injectAssetPrefix({ chain }) {
     const entries = chain.entryPoints.entries() || {};
     const entryNames = Object.keys(entries);
-    const assetPrefix = removeTailSlash(chain.output.get('publicPath') || '');
+    const publicPath = chain.output.get('publicPath');
+    const assetPrefix = removeTailSlash('string' == typeof publicPath ? publicPath : '');
     const code = `window.__assetPrefix__ = '${assetPrefix}';`;
     entryNames.forEach((entryName)=>{
         entries[entryName].prepend(createVirtualModule(code));

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

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

package/dist/esm/builder/shared/lazyCompilation.mjs

@@ -1,3 +1,4 @@
+import node_path from "node:path";
 import { collectRouteComponentFiles, normalizeModulePath } from "@modern-js/utils";
 function aggregateEagerRouteComponentFiles(byEntry) {
     const files = new Set();
@@ -20,6 +21,18 @@ function buildSSRLazyCompilationTest(eagerRouteFiles, userTest) {
         return userTestFn(m);
     };
 }
+function buildDefaultLazyCompilationTest(appDirectory, internalDirectory) {
+    let dirs;
+    return (m)=>{
+        if (!('resource' in m) || 'string' != typeof m.resource) return true;
+        dirs ??= {
+            app: normalizeModulePath(appDirectory),
+            internal: normalizeModulePath(internalDirectory)
+        };
+        const file = m.resource.split('?')[0].split(node_path.sep).join('/');
+        return file.startsWith(`${dirs.app}/`) && !file.startsWith(`${dirs.internal}/`) && !file.slice(dirs.app.length).includes('/node_modules/');
+    };
+}
 function planSSRLazyCompilation(current, info) {
     if (!current) return {
         apply: false
@@ -41,4 +54,4 @@ function planSSRLazyCompilation(current, info) {
         }
     };
 }
-export { aggregateEagerRouteComponentFiles, buildSSRLazyCompilationTest, collectRouteComponentFiles, normalizeModulePath, planSSRLazyCompilation };
+export { aggregateEagerRouteComponentFiles, buildDefaultLazyCompilationTest, buildSSRLazyCompilationTest, collectRouteComponentFiles, normalizeModulePath, planSSRLazyCompilation };

package/dist/esm/commands/index.mjs

@@ -1,4 +1,8 @@
 import { i18n, localeKeys } from "../locale/index.mjs";
+const deployTargetOption = [
+    '--deploy-target <target>',
+    'deploy target; overrides deploy.target and MODERNJS_DEPLOY'
+];
 const devCommand = async (program, api)=>{
     program.command('dev').alias('start').usage('[options]').description(i18n.t(localeKeys.command.dev.describe)).option('-c --config <config>', i18n.t(localeKeys.command.shared.config)).option('-e --entry [entry...]', i18n.t(localeKeys.command.dev.entry)).option('--analyze', i18n.t(localeKeys.command.shared.analyze)).option('--api-only', i18n.t(localeKeys.command.dev.apiOnly)).option('--web-only', i18n.t(localeKeys.command.dev.webOnly)).action(async (options)=>{
         const { dev } = await import("./dev.mjs");
@@ -6,7 +10,7 @@ const devCommand = async (program, api)=>{
     });
 };
 const buildCommand = async (program, api)=>{
-    program.command('build').usage('[options]').description(i18n.t(localeKeys.command.build.describe)).option('-c --config <config>', i18n.t(localeKeys.command.shared.config)).option('--analyze', i18n.t(localeKeys.command.shared.analyze)).option('-w --watch', i18n.t(localeKeys.command.build.watch)).action(async (options)=>{
+    program.command('build').usage('[options]').description(i18n.t(localeKeys.command.build.describe)).option('-c --config <config>', i18n.t(localeKeys.command.shared.config)).option('--analyze', i18n.t(localeKeys.command.shared.analyze)).option('-w --watch', i18n.t(localeKeys.command.build.watch)).option(...deployTargetOption).action(async (options)=>{
         const { build } = await import("./build.mjs");
         await build(api, options);
     });
@@ -18,7 +22,7 @@ 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)=>{
+    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)).option(...deployTargetOption).description(i18n.t(localeKeys.command.deploy.describe)).action(async (options)=>{
         const { deploy } = await import("./deploy.mjs");
         await deploy(api, options);
         process.exit(0);

package/dist/esm/compat/hooks.mjs

@@ -59,7 +59,7 @@ function handleSetupResult(setupResult, api) {
             if (newAPI && api[newAPI]) api[newAPI](async (...params)=>{
                 const { isMultiple, params: transformParams } = transformHookParams(key, params);
                 if (isMultiple) return transformHookResult(key, await fn(...transformParams));
-                return transformHookResult(key, await fn(transformParams));
+                else return transformHookResult(key, await fn(transformParams));
             });
         }
     });

package/dist/esm/config/index.mjs

@@ -1,3 +1,2 @@
-export * from "./build-environment.mjs";
 export * from "./default.mjs";
 export * from "./initialize/index.mjs";

package/dist/esm/index.mjs

@@ -1,4 +1,5 @@
-import { createCloudflareBuilderPlugin } from "@modern-js/app-tools-extensions/cloudflare-builder";
+import { resolveDeployTarget } from "@modern-js/app-tools-extensions/deploy-output/target";
+import { createPolicyDefaultsPlugin } from "@modern-js/app-tools-extensions/policy-defaults";
 import { castArray } from "@modern-js/builder";
 import { getLocaleLanguage } from "@modern-js/i18n-utils/language-detector";
 import { createAsyncHook } from "@modern-js/plugin";
@@ -9,7 +10,6 @@ import { compatPlugin } from "./compat/index.mjs";
 import { DEFAULT_RUNTIME_CONFIG_FILE } from "./constants.mjs";
 import { i18n } from "./locale/index.mjs";
 import analyze from "./plugins/analyze/index.mjs";
-import backendFederationBuild from "./plugins/backendFederationBuild.mjs";
 import deploy from "./plugins/deploy/index.mjs";
 import initialize from "./plugins/initialize/index.mjs";
 import serverBuild from "./plugins/serverBuild.mjs";
@@ -18,9 +18,8 @@ import { generateWatchFiles } from "./utils/generateWatchFiles.mjs";
 import { initAppContext } from "./utils/initAppContext.mjs";
 import { restart } from "./utils/restart.mjs";
 export * from "./defineConfig.mjs";
-export * from "./presetUltramodern.mjs";
 export * from "./types/index.mjs";
-const appTools = ()=>({
+const appTools = (options = {})=>({
         name: '@modern-js/app-tools',
         usePlugins: [
             serverRuntime(),
@@ -28,9 +27,8 @@ const appTools = ()=>({
             initialize(),
             analyze(),
             serverBuild(),
-            backendFederationBuild(),
             deploy(),
-            createCloudflareBuilderPlugin()
+            createPolicyDefaultsPlugin(options)
         ],
         post: [
             '@modern-js/plugin-initialize',
@@ -77,6 +75,11 @@ const appTools = ()=>({
                 deprecatedCommands(program);
             });
             api.onPrepare(async ()=>{
+                api.updateAppContext({
+                    deployTarget: resolveDeployTarget({
+                        configTarget: api.getNormalizedConfig().deploy?.target
+                    })
+                });
                 const command = getCommand();
                 if ('deploy' === command) {
                     const isSkipBuild = [

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

@@ -61,6 +61,6 @@ 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.`);
 };
 export { getFileSystemEntry, hasEntry, hasServerEntry };

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

@@ -26,7 +26,7 @@ const applyRouteOptions = (original, routeOptions)=>{
             ...original,
             urlPath: url
         };
-        {
+        else {
             const { path: urlPath, ...other } = url;
             return {
                 ...original,

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

@@ -9,14 +9,14 @@ const walkDirectory = (dir)=>fs.readdirSync(dir).reduce((previous, filename)=>{
             ...previous,
             ...walkDirectory(filePath)
         ];
-        return [
+        else return [
             ...previous,
             filePath
         ];
     }, []);
 const replaceWithAlias = (base, filePath, alias)=>{
     if (filePath.includes(base)) return normalizeToPosixPath(path.join(alias, path.relative(base, filePath)));
-    return filePath;
+    else return filePath;
 };
 const parseModule = async ({ source, filename })=>{
     let content = source;

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

@@ -1,5 +1,5 @@
 import { createCloudflarePreset } from "@modern-js/app-tools-extensions/cloudflare";
-import { provider } from "std-env";
+import { getDeployingTarget } from "@modern-js/app-tools-extensions/deploy-output/target";
 import { createGhPagesPreset } from "./platforms/gh-pages.mjs";
 import { createNetlifyPreset } from "./platforms/netlify.mjs";
 import { createNodePreset } from "./platforms/node.mjs";
@@ -12,24 +12,11 @@ const deployPresets = {
     ghPages: createGhPagesPreset,
     cloudflare: 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 = provider)=>modernConfig.deploy?.target || envDeployTarget || normalizeDetectedProvider(detectedProvider) || 'node';
 async function getDeployPreset(appContext, modernConfig, deployTarget, api) {
     const { appDirectory, distDirectory, metaName } = appContext;
     const { useSSR, useAPI, useWebServer } = 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,
@@ -41,11 +28,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 = 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();
@@ -54,4 +39,3 @@ const deploy = ()=>({
         }
     });
 export default deploy;
-export { getSupportedDeployTargets, resolveDeployTarget };

package/dist/esm/plugins/deploy/platforms/netlify.mjs

@@ -1,4 +1,5 @@
 import node_path from "node:path";
+import { traceDeployFiles } from "@modern-js/app-tools-extensions/deploy-output/trace-files";
 import { fs, removeModuleSyncFromExports } from "@modern-js/utils";
 import { nodeDepEmit } from "ndepe";
 import { isMainEntry } from "../../../utils/routes.mjs";
@@ -71,8 +72,8 @@ const createNetlifyPreset = ({ appContext, modernConfig, needModernServer })=>{
             if (!needModernServer) return;
             const entry = isEsmProject ? await resolveESMDependency('@modern-js/prod-server') : require.resolve('@modern-js/prod-server');
             const netlifyEntry = isEsmProject ? await 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 nodeDepEmit({
+                traceFiles: traceDeployFiles,
                 appDir: appDirectory,
                 sourceDir: funcsDirectory,
                 includeEntries: [

package/dist/esm/plugins/deploy/platforms/node.mjs

@@ -1,11 +1,12 @@
+import { createRequire } from "node:module";
 import node_path from "node:path";
+import { traceDeployFiles } from "@modern-js/app-tools-extensions/deploy-output/trace-files";
 import { chalk, fs, removeModuleSyncFromExports } from "@modern-js/utils";
 import { nodeDepEmit } from "ndepe";
 import { readTemplate, resolveESMDependency } from "../utils/index.mjs";
 import { generateHandler } from "../utils/generator.mjs";
-import { preserveNpmAliases, readPackageIdentity } from "../utils/npmAliases.mjs";
 const createNodePreset = ({ appContext, modernConfig })=>{
-    const { appDirectory, distDirectory, moduleType } = appContext;
+    const { appDirectory, distDirectory, moduleType, serverPlugins } = appContext;
     const isEsmProject = 'module' === moduleType;
     const outputDirectory = node_path.join(appDirectory, '.output');
     const staticDirectory = node_path.join(outputDirectory, 'static');
@@ -35,13 +36,19 @@ const createNodePreset = ({ appContext, modernConfig })=>{
         async end () {
             const filter = (filePath)=>!filePath.startsWith(staticDirectory) && !filePath.endsWith('.map');
             const entry = isEsmProject ? await resolveESMDependency('@modern-js/prod-server') : require.resolve('@modern-js/prod-server');
-            if (!entry) throw new Error('Cannot find @modern-js/prod-server');
-            const prodServerPackage = await readPackageIdentity(entry);
+            const requireFromApp = createRequire(node_path.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 resolveESMDependency(specifier, appDirectory));
+            }
             await nodeDepEmit({
+                traceFiles: traceDeployFiles,
                 appDir: appDirectory,
                 sourceDir: outputDirectory,
                 includeEntries: [
-                    entry
+                    entry,
+                    ...pluginEntries
                 ],
                 copyWholePackage (pkgName) {
                     return '@modern-js/utils' === pkgName;
@@ -55,17 +62,6 @@ const createNodePreset = ({ appContext, modernConfig })=>{
                     };
                 }
             });
-            await preserveNpmAliases({
-                appDirectory,
-                outputDirectory,
-                implicitAliases: [
-                    {
-                        aliasName: '@modern-js/prod-server',
-                        targetName: prodServerPackage.name,
-                        targetVersion: prodServerPackage.version
-                    }
-                ]
-            });
             console.log('Static directory:', chalk.blue(node_path.relative(appDirectory, staticDirectory).replace(/\\/g, '/')));
             console.log("You can preview this build by", chalk.blue('node .output/index'));
         }

package/dist/esm/plugins/deploy/platforms/vercel.mjs

@@ -1,4 +1,5 @@
 import node_path from "node:path";
+import { traceDeployFiles } from "@modern-js/app-tools-extensions/deploy-output/trace-files";
 import { fs, removeModuleSyncFromExports } from "@modern-js/utils";
 import { nodeDepEmit } from "ndepe";
 import { isMainEntry } from "../../../utils/routes.mjs";
@@ -91,8 +92,8 @@ const createVercelPreset = ({ appContext, modernConfig, needModernServer })=>{
         async end () {
             if (!needModernServer) return;
             const entry = isEsmProject ? await resolveESMDependency('@modern-js/prod-server') : require.resolve('@modern-js/prod-server');
-            if (!entry) throw new Error('Cannot find @modern-js/prod-server');
             await nodeDepEmit({
+                traceFiles: traceDeployFiles,
                 appDir: appDirectory,
                 sourceDir: funcsDirectory,
                 includeEntries: [

package/dist/esm/plugins/deploy/utils/generator.mjs

@@ -15,7 +15,7 @@ const serverAppContextTemplate = (appContext)=>{
 };
 const genPluginImportsCode = (plugins, isESM = false)=>plugins.map(([name, options], index)=>{
         const im = isESM ? `import * as plugin_${index}_ns from '${name}'` : `const plugin_${index}_ns = require('${name}')`;
-        return `${im};const plugin_${index} = plugin_${index}_ns.default || plugin_${index}_ns`;
+        return `${im};const plugin_${index} = typeof plugin_${index}_ns === 'function' ? plugin_${index}_ns : typeof plugin_${index}_ns.default === 'function' ? plugin_${index}_ns.default : plugin_${index}_ns.default?.default`;
     }).join(';\n');
 const getPluginsCode = (plugins)=>`[${plugins.map(([, options], index)=>`plugin_${index}(${options ? JSON.stringify(options) : ''})`).join(',')}]`;
 const getServerConfigPath = (meta)=>`path.join(__dirname, "${SERVER_DIR}", "${meta}.server")`;

package/dist/esm/plugins/deploy/utils/index.mjs

@@ -1,6 +1,6 @@
-import { createRequire } from "node:module";
-import { pathToFileURL } from "node:url";
-import { ROUTE_SPEC_FILE, SERVER_DIR, dynamicImport, fs, getMeta } from "@modern-js/utils";
+import { fileURLToPath, pathToFileURL } from "node:url";
+import { ROUTE_SPEC_FILE, SERVER_DIR, fs, getMeta } from "@modern-js/utils";
+import { moduleResolve } from "import-meta-resolve";
 import path from "path";
 const normalizePath = (filePath)=>filePath.replace(/\\/g, '/');
 const getProjectUsage = (appDirectory, distDirectory, metaName)=>{
@@ -26,17 +26,20 @@ const getProjectUsage = (appDirectory, distDirectory, metaName)=>{
 };
 const getTemplatePath = (file)=>path.join(__dirname, '../platforms/templates', file);
 const readTemplate = async (file)=>(await 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 ? pathToFileURL(path.join(fromDirectory, 'package.json')) : pathToFileURL(`${__dirname}/`);
     try {
-        const resolverPath = pathToFileURL(createRequire(__filename).resolve('import-meta-resolve')).href;
-        const { moduleResolve } = await dynamicImport(resolverPath);
-        return normalizePath(moduleResolve(entry, pathToFileURL(`${__dirname}/`), conditions, false).pathname.replace(/^\/(\w):/, '$1:'));
-    } catch (err) {}
+        return normalizePath(fileURLToPath(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
+        });
+    }
 };
 export { getProjectUsage, getTemplatePath, normalizePath, readTemplate, resolveESMDependency };