@modern-js/app-tools 2.67.2 → 2.67.4

package/dist/esm/plugins/deploy/platforms/node-entry.js

@@ -80,9 +80,11 @@ function _main() {
             appContext: {
               sharedDirectory: p_sharedDirectory,
               apiDirectory: p_apiDirectory,
-              lambdaDirectory: p_lambdaDirectory
+              lambdaDirectory: p_lambdaDirectory,
+              bffRuntimeFramework: p_bffRuntimeFramework
             },
-            plugins: p_plugins
+            plugins: p_plugins,
+            serverConfigPath: p_serverDirectory
           }, dynamicProdOptions);
           return [
             4,

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

@@ -1,11 +1,11 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import path from "node:path";
-import { DEFAULT_SERVER_CONFIG, ROUTE_SPEC_FILE, chalk, fs as fse } from "@modern-js/utils";
+import { DEFAULT_SERVER_CONFIG, ROUTE_SPEC_FILE, SERVER_DIR, chalk, fs as fse, getMeta } from "@modern-js/utils";
 import { nodeDepEmit as handleDependencies } from "ndepe";
 import { genPluginImportsCode, getPluginsCode, serverAppContenxtTemplate } from "../utils";
 var createNodePreset = function(appContext, config) {
-  var appDirectory = appContext.appDirectory, distDirectory = appContext.distDirectory, serverPlugins = appContext.serverPlugins, moduleType = appContext.moduleType;
+  var appDirectory = appContext.appDirectory, distDirectory = appContext.distDirectory, serverPlugins = appContext.serverPlugins, moduleType = appContext.moduleType, metaName = appContext.metaName;
   var isEsmProject = moduleType === "module";
   var plugins = serverPlugins.map(function(plugin) {
     return [
@@ -55,7 +55,7 @@ var createNodePreset = function(appContext, config) {
     },
     genEntry: function genEntry() {
       return _async_to_generator(function() {
-        var _config_bff, serverConfig, pluginImportCode, dynamicProdOptions, pluginsCode, entryCode, serverAppContext, cjsEntryFilePath;
+        var _config_bff, serverConfig, pluginImportCode, dynamicProdOptions, meta, serverConfigPath, pluginsCode, entryCode, serverAppContext, cjsEntryFilePath;
         return _ts_generator(this, function(_state) {
           switch (_state.label) {
             case 0:
@@ -77,6 +77,8 @@ var createNodePreset = function(appContext, config) {
                 config: serverConfig,
                 serverConfigFile: DEFAULT_SERVER_CONFIG
               };
+              meta = getMeta(metaName);
+              serverConfigPath = 'path.join(__dirname, "'.concat(SERVER_DIR, '", "').concat(meta, '.server")');
               pluginsCode = getPluginsCode(plugins);
               return [
                 4,
@@ -85,7 +87,7 @@ var createNodePreset = function(appContext, config) {
             case 1:
               entryCode = _state.sent().toString();
               serverAppContext = serverAppContenxtTemplate(appContext);
-              entryCode = entryCode.replace("p_genPluginImportsCode", pluginImportCode).replace("p_ROUTE_SPEC_FILE", '"'.concat(ROUTE_SPEC_FILE, '"')).replace("p_dynamicProdOptions", JSON.stringify(dynamicProdOptions)).replace("p_plugins", pluginsCode).replace("p_sharedDirectory", serverAppContext.sharedDirectory).replace("p_apiDirectory", serverAppContext.apiDirectory).replace("p_lambdaDirectory", serverAppContext.lambdaDirectory);
+              entryCode = entryCode.replace("p_genPluginImportsCode", pluginImportCode).replace("p_ROUTE_SPEC_FILE", '"'.concat(ROUTE_SPEC_FILE, '"')).replace("p_dynamicProdOptions", JSON.stringify(dynamicProdOptions)).replace("p_plugins", pluginsCode).replace("p_serverDirectory", serverConfigPath).replace("p_sharedDirectory", serverAppContext.sharedDirectory).replace("p_apiDirectory", serverAppContext.apiDirectory).replace("p_bffRuntimeFramework", '"'.concat(serverAppContext.bffRuntimeFramework, '"')).replace("p_lambdaDirectory", serverAppContext.lambdaDirectory);
               if (!isEsmProject)
                 return [
                   3,

package/dist/esm/plugins/deploy/platforms/vercel-handler.js

@@ -90,7 +90,8 @@ var require_vercel_handler = __commonJS({
                   apiDirectory: p_apiDirectory,
                   lambdaDirectory: p_lambdaDirectory
                 },
-                plugins: p_plugins
+                plugins: p_plugins,
+                serverConfigPath: p_serverDirectory
               }, dynamicProdOptions);
               return [
                 4,

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

@@ -1,12 +1,12 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import path from "node:path";
-import { DEFAULT_SERVER_CONFIG, ROUTE_SPEC_FILE, fs as fse } from "@modern-js/utils";
+import { DEFAULT_SERVER_CONFIG, ROUTE_SPEC_FILE, SERVER_DIR, fs as fse, getMeta } from "@modern-js/utils";
 import { nodeDepEmit as handleDependencies } from "ndepe";
 import { isMainEntry } from "../../../utils/routes";
 import { genPluginImportsCode, getPluginsCode, serverAppContenxtTemplate } from "../utils";
 var createVercelPreset = function(appContext, modernConfig, needModernServer) {
-  var appDirectory = appContext.appDirectory, distDirectory = appContext.distDirectory, entrypoints = appContext.entrypoints, serverPlugins = appContext.serverPlugins, moduleType = appContext.moduleType;
+  var appDirectory = appContext.appDirectory, distDirectory = appContext.distDirectory, entrypoints = appContext.entrypoints, serverPlugins = appContext.serverPlugins, moduleType = appContext.moduleType, metaName = appContext.metaName;
   var isEsmProject = moduleType === "module";
   var plugins = serverPlugins.map(function(plugin) {
     return [
@@ -40,7 +40,7 @@ var createVercelPreset = function(appContext, modernConfig, needModernServer) {
     },
     writeOutput: function writeOutput() {
       return _async_to_generator(function() {
-        var config, mainEntryName, staticDirectory, destHtmlDirectory, outputHtmlDirectory;
+        var config, mainEntryName, staticDirectory, destHtmlDirectory, outputHtmlDirectory, nodeVersion;
         return _ts_generator(this, function(_state) {
           switch (_state.label) {
             case 0:
@@ -133,10 +133,11 @@ var createVercelPreset = function(appContext, modernConfig, needModernServer) {
               ];
             case 7:
               _state.sent();
+              nodeVersion = process.versions.node.split(".")[0];
               return [
                 4,
                 fse.writeJSON(path.join(funcsDirectory, ".vc-config.json"), {
-                  runtime: "nodejs16.x",
+                  runtime: "nodejs".concat(nodeVersion, ".x"),
                   handler: "index.js",
                   launcherType: "Nodejs",
                   shouldAddHelpers: false,
@@ -156,7 +157,7 @@ var createVercelPreset = function(appContext, modernConfig, needModernServer) {
     },
     genEntry: function genEntry() {
       return _async_to_generator(function() {
-        var _modernConfig_bff, serverConfig, pluginImportCode, dynamicProdOptions, pluginsCode, serverAppContext, handlerCode;
+        var _modernConfig_bff, serverConfig, pluginImportCode, dynamicProdOptions, meta, serverConfigPath, pluginsCode, serverAppContext, handlerCode;
         return _ts_generator(this, function(_state) {
           switch (_state.label) {
             case 0:
@@ -180,6 +181,8 @@ var createVercelPreset = function(appContext, modernConfig, needModernServer) {
                 config: serverConfig,
                 serverConfigFile: DEFAULT_SERVER_CONFIG
               };
+              meta = getMeta(metaName);
+              serverConfigPath = 'path.join(__dirname, "'.concat(SERVER_DIR, '", "').concat(meta, '.server")');
               pluginsCode = getPluginsCode(plugins || []);
               serverAppContext = serverAppContenxtTemplate(appContext);
               return [
@@ -188,7 +191,7 @@ var createVercelPreset = function(appContext, modernConfig, needModernServer) {
               ];
             case 1:
               handlerCode = _state.sent().toString();
-              handlerCode = handlerCode.replace("p_genPluginImportsCode", pluginImportCode).replace("p_ROUTE_SPEC_FILE", '"'.concat(ROUTE_SPEC_FILE, '"')).replace("p_dynamicProdOptions", JSON.stringify(dynamicProdOptions)).replace("p_plugins", pluginsCode).replace("p_sharedDirectory", serverAppContext.sharedDirectory).replace("p_apiDirectory", serverAppContext.apiDirectory).replace("p_lambdaDirectory", serverAppContext.lambdaDirectory);
+              handlerCode = handlerCode.replace("p_genPluginImportsCode", pluginImportCode).replace("p_ROUTE_SPEC_FILE", '"'.concat(ROUTE_SPEC_FILE, '"')).replace("p_dynamicProdOptions", JSON.stringify(dynamicProdOptions)).replace("p_plugins", pluginsCode).replace("p_serverDirectory", serverConfigPath).replace("p_sharedDirectory", serverAppContext.sharedDirectory).replace("p_apiDirectory", serverAppContext.apiDirectory).replace("p_lambdaDirectory", serverAppContext.lambdaDirectory);
               return [
                 4,
                 fse.writeFile(handlerFilePath, handlerCode)

package/dist/esm/plugins/deploy/utils.js

@@ -1,13 +1,14 @@
 import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 import path from "path";
-import { ROUTE_SPEC_FILE, fs as fse, isDepExists } from "@modern-js/utils";
+import { ROUTE_SPEC_FILE, SERVER_DIR, fs as fse, getMeta, isDepExists } from "@modern-js/utils";
 var serverAppContenxtTemplate = function(appContext) {
-  var appDirectory = appContext.appDirectory, sharedDirectory = appContext.sharedDirectory, apiDirectory = appContext.apiDirectory, lambdaDirectory = appContext.lambdaDirectory, metaName = appContext.metaName;
+  var appDirectory = appContext.appDirectory, sharedDirectory = appContext.sharedDirectory, apiDirectory = appContext.apiDirectory, lambdaDirectory = appContext.lambdaDirectory, metaName = appContext.metaName, bffRuntimeFramework = appContext.bffRuntimeFramework;
   return {
     sharedDirectory: 'path.join(__dirname, "'.concat(path.relative(appDirectory, sharedDirectory), '")'),
     apiDirectory: 'path.join(__dirname, "'.concat(path.relative(appDirectory, apiDirectory), '")'),
     lambdaDirectory: 'path.join(__dirname, "'.concat(path.relative(appDirectory, lambdaDirectory), '")'),
-    metaName
+    metaName,
+    bffRuntimeFramework: bffRuntimeFramework || "hono"
   };
 };
 var genPluginImportsCode = function(plugins) {
@@ -22,7 +23,7 @@ var getPluginsCode = function(plugins) {
     return "plugin_".concat(index, "(").concat(options ? JSON.stringify(options) : "", ")");
   }).join(","), "]");
 };
-var getProjectUsage = function(appDirectory, distDirectory) {
+var getProjectUsage = function(appDirectory, distDirectory, metaName) {
   var routeJSON = path.join(distDirectory, ROUTE_SPEC_FILE);
   var routes = fse.readJSONSync(routeJSON).routes;
   var useSSR = false;
@@ -35,7 +36,15 @@ var getProjectUsage = function(appDirectory, distDirectory) {
       useAPI = true;
     }
   });
-  var useWebServer = isDepExists(appDirectory, "@modern-js/plugin-server");
+  var meta = getMeta(metaName);
+  var serverConfigPath = path.resolve(appDirectory, SERVER_DIR, "".concat(meta, ".server"));
+  var isServerConfigExists = [
+    ".ts",
+    ".js"
+  ].some(function(ex) {
+    return fse.existsSync("".concat(serverConfigPath).concat(ex));
+  });
+  var useWebServer = isDepExists(appDirectory, "@modern-js/plugin-server") || isServerConfigExists;
   return {
     useSSR,
     useAPI,

package/dist/esm/run/index.js

@@ -15,7 +15,7 @@ function run(_) {
 }
 function _run() {
   _run = _async_to_generator(function(param) {
-    var cwd, initialLog, _param_metaName, metaName, version, internalPlugins, _param_packageJsonConfig, packageJsonConfig, _param_statePluginName, statePluginName, configFile, _userConfig_runtime, _userConfig_runtime1, nodeVersion, versionArr, command, cliParams, SUPPORT_CONFIG_PARAM_COMMANDS, customConfigFile, appDirectory, finalConfigFile, userConfig, plugins;
+    var cwd, initialLog, _param_metaName, metaName, version, internalPlugins, _param_packageJsonConfig, packageJsonConfig, _param_statePluginName, statePluginName, configFile, _userConfig_runtime, _userConfig_runtime1, _userConfig_runtime_state, _userConfig_runtime2, nodeVersion, versionArr, command, cliParams, SUPPORT_CONFIG_PARAM_COMMANDS, customConfigFile, appDirectory, finalConfigFile, userConfig, plugins;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
@@ -75,7 +75,7 @@ function _run() {
           ];
         case 3:
           plugins = _state.sent();
-          if (!userConfig.autoLoadPlugins && userConfig.runtime && typeof userConfig.runtime !== "boolean" && (((_userConfig_runtime = userConfig.runtime) === null || _userConfig_runtime === void 0 ? void 0 : _userConfig_runtime.state) === true || _type_of((_userConfig_runtime1 = userConfig.runtime) === null || _userConfig_runtime1 === void 0 ? void 0 : _userConfig_runtime1.state) === "object")) {
+          if (!userConfig.autoLoadPlugins && userConfig.runtime && typeof userConfig.runtime !== "boolean" && (((_userConfig_runtime = userConfig.runtime) === null || _userConfig_runtime === void 0 ? void 0 : _userConfig_runtime.state) === true || _type_of((_userConfig_runtime1 = userConfig.runtime) === null || _userConfig_runtime1 === void 0 ? void 0 : _userConfig_runtime1.state) === "object" && !((_userConfig_runtime2 = userConfig.runtime) === null || _userConfig_runtime2 === void 0 ? void 0 : (_userConfig_runtime_state = _userConfig_runtime2.state) === null || _userConfig_runtime_state === void 0 ? void 0 : _userConfig_runtime_state.legacy))) {
             if (!userConfig.plugins.find(function(plugin) {
               return plugin.name === statePluginName;
             })) {

package/dist/esm/utils/initAppContext.js

@@ -21,7 +21,8 @@ var initAppContext = function(param) {
     checkedEntries: [],
     apiOnly: false,
     internalDirAlias: "@_".concat(metaName.replace(/-/g, "_"), "_internal"),
-    internalSrcAlias: "@_".concat(metaName.replace(/-/g, "_"), "_src")
+    internalSrcAlias: "@_".concat(metaName.replace(/-/g, "_"), "_src"),
+    bffRuntimeFramework: "hono"
   };
 };
 export {

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

@@ -63,7 +63,8 @@ const dev = async (api, options, devServerOptions) => {
       internalDirectory: appContext.internalDirectory,
       apiDirectory: appContext.apiDirectory,
       lambdaDirectory: appContext.lambdaDirectory,
-      sharedDirectory: appContext.sharedDirectory
+      sharedDirectory: appContext.sharedDirectory,
+      bffRuntimeFramework: appContext.bffRuntimeFramework
     },
     serverConfigPath,
     routes: serverRoutes,

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

@@ -40,7 +40,8 @@ const serve = async (api, serverOptions) => {
       internalDirectory,
       sharedDirectory: getTargetDir(appContext.sharedDirectory, appContext.appDirectory, appContext.distDirectory),
       apiDirectory: isCrossProjectServer ? appContext.apiDirectory : getTargetDir(appContext.apiDirectory, appContext.appDirectory, appContext.distDirectory),
-      lambdaDirectory: isCrossProjectServer ? appContext.lambdaDirectory : getTargetDir(appContext.lambdaDirectory, appContext.appDirectory, appContext.distDirectory)
+      lambdaDirectory: isCrossProjectServer ? appContext.lambdaDirectory : getTargetDir(appContext.lambdaDirectory, appContext.appDirectory, appContext.distDirectory),
+      bffRuntimeFramework: appContext.bffRuntimeFramework
     },
     runMode
   });

package/dist/esm-node/plugins/deploy/index.js

@@ -1,4 +1,5 @@
 import { provider } from "std-env";
+import { createGhPagesPreset } from "./platforms/gh-pages";
 import { createNetlifyPreset } from "./platforms/netlify";
 import { createNodePreset } from "./platforms/node";
 import { createVercelPreset } from "./platforms/vercel";
@@ -6,11 +7,12 @@ import { getProjectUsage } from "./utils";
 const deployPresets = {
   node: createNodePreset,
   vercel: createVercelPreset,
-  netlify: createNetlifyPreset
+  netlify: createNetlifyPreset,
+  ghPages: createGhPagesPreset
 };
 async function getDeployPreset(appContext, modernConfig, deployTarget) {
-  const { appDirectory, distDirectory } = appContext;
-  const { useSSR, useAPI, useWebServer } = getProjectUsage(appDirectory, distDirectory);
+  const { appDirectory, distDirectory, metaName } = appContext;
+  const { useSSR, useAPI, useWebServer } = getProjectUsage(appDirectory, distDirectory, metaName);
   const needModernServer = useSSR || useAPI || useWebServer;
   const createPreset = deployPresets[deployTarget];
   if (!createPreset) {

package/dist/esm-node/plugins/deploy/platforms/gh-pages.js

@@ -0,0 +1,57 @@
+import path from "path";
+import { fs } from "@modern-js/utils";
+import { logger } from "@modern-js/utils";
+async function reorganizeHtmlFiles(routes, baseDir, baseUrl = "/") {
+  if (!routes || !Array.isArray(routes)) {
+    logger.error("Invalid server routes");
+    return;
+  }
+  await fs.ensureDir(baseDir);
+  const baseUrlRegexp = new RegExp(`^${baseUrl}\\/?`);
+  const collectedEntryPaths = /* @__PURE__ */ new Set();
+  const copyPromises = routes.map(async (route) => {
+    const { urlPath, entryPath } = route;
+    if (!entryPath) {
+      logger.warn(`Route ${urlPath} does not specify entryPath, skipping`);
+      return;
+    }
+    if (collectedEntryPaths.has(entryPath)) {
+      return;
+    }
+    collectedEntryPaths.add(entryPath);
+    const sourceHtmlPath = path.join(baseDir, entryPath);
+    if (!await fs.pathExists(sourceHtmlPath)) {
+      logger.error(`Source HTML file does not exist: ${sourceHtmlPath}`);
+      return;
+    }
+    const targetDir = urlPath.replace(baseUrlRegexp, "");
+    await fs.ensureDir(path.dirname(targetDir));
+    const targetHtmlPath = path.join(baseDir, targetDir, "index.html");
+    try {
+      await fs.move(sourceHtmlPath, targetHtmlPath);
+    } catch (error) {
+      logger.error(`Failed to copy HTML file: ${error.message}`);
+    }
+  });
+  await Promise.all(copyPromises);
+}
+const createGhPagesPreset = (appContext, modernConfig) => {
+  const { serverRoutes, appDirectory, distDirectory } = appContext;
+  const { server: { baseUrl } } = modernConfig;
+  const outputDirectory = path.join(appDirectory, ".output");
+  return {
+    name: "gh-pages",
+    async prepare() {
+      await fs.remove(outputDirectory);
+    },
+    async writeOutput() {
+      await fs.copy(distDirectory, outputDirectory);
+    },
+    async end() {
+      await reorganizeHtmlFiles(serverRoutes, outputDirectory, Array.isArray(baseUrl) ? baseUrl[0] : baseUrl);
+    }
+  };
+};
+export {
+  createGhPagesPreset
+};

package/dist/esm-node/plugins/deploy/platforms/netlify-handler.js

@@ -35,9 +35,11 @@ var require_netlify_handler = __commonJS({
         appContext: {
           sharedDirectory: p_sharedDirectory,
           apiDirectory: p_apiDirectory,
-          lambdaDirectory: p_lambdaDirectory
+          lambdaDirectory: p_lambdaDirectory,
+          bffRuntimeFramework: p_bffRuntimeFramework
         },
         plugins: p_plugins,
+        serverConfigPath: p_serverDirectory,
         ...dynamicProdOptions
       };
       const requestHandler2 = await createNetlifyFunction(prodServerOptions);

package/dist/esm-node/plugins/deploy/platforms/netlify.js

@@ -1,5 +1,5 @@
 import path from "node:path";
-import { DEFAULT_SERVER_CONFIG, ROUTE_SPEC_FILE, fs as fse } from "@modern-js/utils";
+import { DEFAULT_SERVER_CONFIG, ROUTE_SPEC_FILE, SERVER_DIR, fs as fse, getMeta } from "@modern-js/utils";
 import { nodeDepEmit as handleDependencies } from "ndepe";
 import { isMainEntry } from "../../../utils/routes";
 import { genPluginImportsCode, getPluginsCode, serverAppContenxtTemplate } from "../utils";
@@ -17,7 +17,7 @@ async function cleanDistDirectory(dir) {
   }
 }
 const createNetlifyPreset = (appContext, modernConfig, needModernServer) => {
-  const { appDirectory, distDirectory, entrypoints, serverPlugins, moduleType } = appContext;
+  const { appDirectory, distDirectory, entrypoints, serverPlugins, moduleType, metaName } = appContext;
   const isEsmProject = moduleType === "module";
   const plugins = serverPlugins.map((plugin) => [
     plugin.name,
@@ -80,15 +80,17 @@ const createNetlifyPreset = (appContext, modernConfig, needModernServer) => {
           }
         }
       };
+      const meta = getMeta(metaName);
       const pluginImportCode = genPluginImportsCode(plugins || []);
       const dynamicProdOptions = {
         config: serverConfig,
         serverConfigFile: DEFAULT_SERVER_CONFIG
       };
+      const serverConfigPath = `path.join(__dirname, "${SERVER_DIR}", "${meta}.server")`;
       const pluginsCode = getPluginsCode(plugins);
       let handlerCode = (await fse.readFile(path.join(__dirname, "./netlify-handler.js"))).toString();
       const serverAppContext = serverAppContenxtTemplate(appContext);
-      handlerCode = handlerCode.replace("p_genPluginImportsCode", pluginImportCode).replace("p_ROUTE_SPEC_FILE", `"${ROUTE_SPEC_FILE}"`).replace("p_dynamicProdOptions", JSON.stringify(dynamicProdOptions)).replace("p_plugins", pluginsCode).replace("p_sharedDirectory", serverAppContext.sharedDirectory).replace("p_apiDirectory", serverAppContext.apiDirectory).replace("p_lambdaDirectory", serverAppContext.lambdaDirectory);
+      handlerCode = handlerCode.replace("p_genPluginImportsCode", pluginImportCode).replace("p_ROUTE_SPEC_FILE", `"${ROUTE_SPEC_FILE}"`).replace("p_dynamicProdOptions", JSON.stringify(dynamicProdOptions)).replace("p_plugins", pluginsCode).replace("p_bffRuntimeFramework", `"${serverAppContext.bffRuntimeFramework}"`).replace("p_serverDirectory", serverConfigPath).replace("p_sharedDirectory", serverAppContext.sharedDirectory).replace("p_apiDirectory", serverAppContext.apiDirectory).replace("p_lambdaDirectory", serverAppContext.lambdaDirectory);
       await fse.writeFile(handlerFilePath, handlerCode);
       if (isEsmProject) {
         await fse.copy(path.join(__dirname, "./netlify-entry.mjs"), entryFilePath);

package/dist/esm-node/plugins/deploy/platforms/node-entry.js

@@ -27,9 +27,11 @@ async function main() {
     appContext: {
       sharedDirectory: p_sharedDirectory,
       apiDirectory: p_apiDirectory,
-      lambdaDirectory: p_lambdaDirectory
+      lambdaDirectory: p_lambdaDirectory,
+      bffRuntimeFramework: p_bffRuntimeFramework
     },
     plugins: p_plugins,
+    serverConfigPath: p_serverDirectory,
     ...dynamicProdOptions
   };
   const app = await createProdServer(prodServerOptions);

package/dist/esm-node/plugins/deploy/platforms/node.js

@@ -1,9 +1,9 @@
 import path from "node:path";
-import { DEFAULT_SERVER_CONFIG, ROUTE_SPEC_FILE, chalk, fs as fse } from "@modern-js/utils";
+import { DEFAULT_SERVER_CONFIG, ROUTE_SPEC_FILE, SERVER_DIR, chalk, fs as fse, getMeta } from "@modern-js/utils";
 import { nodeDepEmit as handleDependencies } from "ndepe";
 import { genPluginImportsCode, getPluginsCode, serverAppContenxtTemplate } from "../utils";
 const createNodePreset = (appContext, config) => {
-  const { appDirectory, distDirectory, serverPlugins, moduleType } = appContext;
+  const { appDirectory, distDirectory, serverPlugins, moduleType, metaName } = appContext;
   const isEsmProject = moduleType === "module";
   const plugins = serverPlugins.map((plugin) => [
     plugin.name,
@@ -39,10 +39,12 @@ const createNodePreset = (appContext, config) => {
         config: serverConfig,
         serverConfigFile: DEFAULT_SERVER_CONFIG
       };
+      const meta = getMeta(metaName);
+      const serverConfigPath = `path.join(__dirname, "${SERVER_DIR}", "${meta}.server")`;
       const pluginsCode = getPluginsCode(plugins);
       let entryCode = (await fse.readFile(path.join(__dirname, "./node-entry.js"))).toString();
       const serverAppContext = serverAppContenxtTemplate(appContext);
-      entryCode = entryCode.replace("p_genPluginImportsCode", pluginImportCode).replace("p_ROUTE_SPEC_FILE", `"${ROUTE_SPEC_FILE}"`).replace("p_dynamicProdOptions", JSON.stringify(dynamicProdOptions)).replace("p_plugins", pluginsCode).replace("p_sharedDirectory", serverAppContext.sharedDirectory).replace("p_apiDirectory", serverAppContext.apiDirectory).replace("p_lambdaDirectory", serverAppContext.lambdaDirectory);
+      entryCode = entryCode.replace("p_genPluginImportsCode", pluginImportCode).replace("p_ROUTE_SPEC_FILE", `"${ROUTE_SPEC_FILE}"`).replace("p_dynamicProdOptions", JSON.stringify(dynamicProdOptions)).replace("p_plugins", pluginsCode).replace("p_serverDirectory", serverConfigPath).replace("p_sharedDirectory", serverAppContext.sharedDirectory).replace("p_apiDirectory", serverAppContext.apiDirectory).replace("p_bffRuntimeFramework", `"${serverAppContext.bffRuntimeFramework}"`).replace("p_lambdaDirectory", serverAppContext.lambdaDirectory);
       if (isEsmProject) {
         const cjsEntryFilePath = path.join(outputDirectory, "index.cjs");
         await fse.writeFile(cjsEntryFilePath, entryCode);

package/dist/esm-node/plugins/deploy/platforms/vercel-handler.js

@@ -38,6 +38,7 @@ var require_vercel_handler = __commonJS({
           lambdaDirectory: p_lambdaDirectory
         },
         plugins: p_plugins,
+        serverConfigPath: p_serverDirectory,
         ...dynamicProdOptions
       };
       const app = await createProdServer(prodServerOptions);

package/dist/esm-node/plugins/deploy/platforms/vercel.js

@@ -1,10 +1,10 @@
 import path from "node:path";
-import { DEFAULT_SERVER_CONFIG, ROUTE_SPEC_FILE, fs as fse } from "@modern-js/utils";
+import { DEFAULT_SERVER_CONFIG, ROUTE_SPEC_FILE, SERVER_DIR, fs as fse, getMeta } from "@modern-js/utils";
 import { nodeDepEmit as handleDependencies } from "ndepe";
 import { isMainEntry } from "../../../utils/routes";
 import { genPluginImportsCode, getPluginsCode, serverAppContenxtTemplate } from "../utils";
 const createVercelPreset = (appContext, modernConfig, needModernServer) => {
-  const { appDirectory, distDirectory, entrypoints, serverPlugins, moduleType } = appContext;
+  const { appDirectory, distDirectory, entrypoints, serverPlugins, moduleType, metaName } = appContext;
   const isEsmProject = moduleType === "module";
   const plugins = serverPlugins.map((plugin) => [
     plugin.name,
@@ -71,8 +71,9 @@ const createVercelPreset = (appContext, modernConfig, needModernServer) => {
             return !src.includes(distStaticDirectory);
           }
         });
+        const nodeVersion = process.versions.node.split(".")[0];
         await fse.writeJSON(path.join(funcsDirectory, ".vc-config.json"), {
-          runtime: "nodejs16.x",
+          runtime: `nodejs${nodeVersion}.x`,
           handler: "index.js",
           launcherType: "Nodejs",
           shouldAddHelpers: false,
@@ -100,10 +101,12 @@ const createVercelPreset = (appContext, modernConfig, needModernServer) => {
         config: serverConfig,
         serverConfigFile: DEFAULT_SERVER_CONFIG
       };
+      const meta = getMeta(metaName);
+      const serverConfigPath = `path.join(__dirname, "${SERVER_DIR}", "${meta}.server")`;
       const pluginsCode = getPluginsCode(plugins || []);
       const serverAppContext = serverAppContenxtTemplate(appContext);
       let handlerCode = (await fse.readFile(path.join(__dirname, "./vercel-handler.js"))).toString();
-      handlerCode = handlerCode.replace("p_genPluginImportsCode", pluginImportCode).replace("p_ROUTE_SPEC_FILE", `"${ROUTE_SPEC_FILE}"`).replace("p_dynamicProdOptions", JSON.stringify(dynamicProdOptions)).replace("p_plugins", pluginsCode).replace("p_sharedDirectory", serverAppContext.sharedDirectory).replace("p_apiDirectory", serverAppContext.apiDirectory).replace("p_lambdaDirectory", serverAppContext.lambdaDirectory);
+      handlerCode = handlerCode.replace("p_genPluginImportsCode", pluginImportCode).replace("p_ROUTE_SPEC_FILE", `"${ROUTE_SPEC_FILE}"`).replace("p_dynamicProdOptions", JSON.stringify(dynamicProdOptions)).replace("p_plugins", pluginsCode).replace("p_serverDirectory", serverConfigPath).replace("p_sharedDirectory", serverAppContext.sharedDirectory).replace("p_apiDirectory", serverAppContext.apiDirectory).replace("p_lambdaDirectory", serverAppContext.lambdaDirectory);
       await fse.writeFile(handlerFilePath, handlerCode);
       if (isEsmProject) {
         await fse.copy(path.join(__dirname, "./vercel-entry.mjs"), entryFilePath);

package/dist/esm-node/plugins/deploy/utils.js

@@ -1,12 +1,13 @@
 import path from "path";
-import { ROUTE_SPEC_FILE, fs as fse, isDepExists } from "@modern-js/utils";
+import { ROUTE_SPEC_FILE, SERVER_DIR, fs as fse, getMeta, isDepExists } from "@modern-js/utils";
 const serverAppContenxtTemplate = (appContext) => {
-  const { appDirectory, sharedDirectory, apiDirectory, lambdaDirectory, metaName } = appContext;
+  const { appDirectory, sharedDirectory, apiDirectory, lambdaDirectory, metaName, bffRuntimeFramework } = appContext;
   return {
     sharedDirectory: `path.join(__dirname, "${path.relative(appDirectory, sharedDirectory)}")`,
     apiDirectory: `path.join(__dirname, "${path.relative(appDirectory, apiDirectory)}")`,
     lambdaDirectory: `path.join(__dirname, "${path.relative(appDirectory, lambdaDirectory)}")`,
-    metaName
+    metaName,
+    bffRuntimeFramework: bffRuntimeFramework || "hono"
   };
 };
 const genPluginImportsCode = (plugins) => {
@@ -18,7 +19,7 @@ const genPluginImportsCode = (plugins) => {
 const getPluginsCode = (plugins) => {
   return `[${plugins.map(([, options], index) => `plugin_${index}(${options ? JSON.stringify(options) : ""})`).join(",")}]`;
 };
-const getProjectUsage = (appDirectory, distDirectory) => {
+const getProjectUsage = (appDirectory, distDirectory, metaName) => {
   const routeJSON = path.join(distDirectory, ROUTE_SPEC_FILE);
   const { routes } = fse.readJSONSync(routeJSON);
   let useSSR = false;
@@ -31,7 +32,15 @@ const getProjectUsage = (appDirectory, distDirectory) => {
       useAPI = true;
     }
   });
-  const useWebServer = isDepExists(appDirectory, "@modern-js/plugin-server");
+  const meta = getMeta(metaName);
+  const serverConfigPath = path.resolve(appDirectory, SERVER_DIR, `${meta}.server`);
+  const isServerConfigExists = [
+    ".ts",
+    ".js"
+  ].some((ex) => {
+    return fse.existsSync(`${serverConfigPath}${ex}`);
+  });
+  const useWebServer = isDepExists(appDirectory, "@modern-js/plugin-server") || isServerConfigExists;
   return {
     useSSR,
     useAPI,

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

@@ -8,7 +8,7 @@ import { getConfigFile } from "../utils/getConfigFile";
 import { getUserConfig } from "../utils/getUserConfig";
 import { loadInternalPlugins } from "../utils/loadPlugins";
 async function run({ cwd, initialLog, metaName = "modern-js", version, internalPlugins, packageJsonConfig = PACKAGE_JSON_CONFIG_NAME, statePluginName = STATE_PLUGIN_NAME, configFile }) {
-  var _userConfig_runtime, _userConfig_runtime1;
+  var _userConfig_runtime, _userConfig_runtime1, _userConfig_runtime_state, _userConfig_runtime2;
   const nodeVersion = process.versions.node;
   const versionArr = nodeVersion.split(".").map(Number);
   if (versionArr[0] <= 16) {
@@ -69,7 +69,7 @@ async function run({ cwd, initialLog, metaName = "modern-js", version, internalP
   const finalConfigFile = customConfigFile || getConfigFile(configFile);
   const userConfig = await getUserConfig(appDirectory, finalConfigFile, packageJsonConfig, metaName);
   const plugins = await loadInternalPlugins(appDirectory, internalPlugins === null || internalPlugins === void 0 ? void 0 : internalPlugins.cli, internalPlugins === null || internalPlugins === void 0 ? void 0 : internalPlugins.autoLoad, userConfig.autoLoadPlugins);
-  if (!userConfig.autoLoadPlugins && userConfig.runtime && typeof userConfig.runtime !== "boolean" && (((_userConfig_runtime = userConfig.runtime) === null || _userConfig_runtime === void 0 ? void 0 : _userConfig_runtime.state) === true || typeof ((_userConfig_runtime1 = userConfig.runtime) === null || _userConfig_runtime1 === void 0 ? void 0 : _userConfig_runtime1.state) === "object")) {
+  if (!userConfig.autoLoadPlugins && userConfig.runtime && typeof userConfig.runtime !== "boolean" && (((_userConfig_runtime = userConfig.runtime) === null || _userConfig_runtime === void 0 ? void 0 : _userConfig_runtime.state) === true || typeof ((_userConfig_runtime1 = userConfig.runtime) === null || _userConfig_runtime1 === void 0 ? void 0 : _userConfig_runtime1.state) === "object" && !((_userConfig_runtime2 = userConfig.runtime) === null || _userConfig_runtime2 === void 0 ? void 0 : (_userConfig_runtime_state = _userConfig_runtime2.state) === null || _userConfig_runtime_state === void 0 ? void 0 : _userConfig_runtime_state.legacy))) {
     if (!userConfig.plugins.find((plugin) => plugin.name === statePluginName)) {
       console.warn(`${chalk.red("\n[Warning]")} We will no longer support built-in \`runtime.state\`. If you want to use Reduck, you must run ${chalk.yellow.bold(`\`pnpm add ${statePluginName}@${version}\``)} to install the state plugin dependency and manually register the plugin. After install state plugin, please add the following code to ${chalk.yellow.bold(`\`${path.basename(finalConfigFile)}\``)}:
 

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

@@ -20,7 +20,8 @@ const initAppContext = ({ metaName, appDirectory, runtimeConfigFile, options, se
     checkedEntries: [],
     apiOnly: false,
     internalDirAlias: `@_${metaName.replace(/-/g, "_")}_internal`,
-    internalSrcAlias: `@_${metaName.replace(/-/g, "_")}_src`
+    internalSrcAlias: `@_${metaName.replace(/-/g, "_")}_src`,
+    bffRuntimeFramework: "hono"
   };
 };
 export {

package/dist/types/exports/server.d.ts

@@ -1,6 +1,5 @@
-import type { UnstableMiddleware, UnstableMiddlewareContext, UnstableNext } from '@modern-js/types';
+import type { UnstableMiddlewareContext, UnstableNext } from '@modern-js/types';
 export type { ServerPlugin, ServerPluginLegacy } from '@modern-js/server-core';
-export type RenderMiddleware = UnstableMiddleware;
 export type RenderMiddlewareContext = UnstableMiddlewareContext;
 export type RenderNext = UnstableNext;
 export { defineServerConfig as defineConfig } from '../utils/config';

package/dist/types/plugins/deploy/platforms/gh-pages.d.ts

@@ -0,0 +1,2 @@
+import type { CreatePreset } from './platform';
+export declare const createGhPagesPreset: CreatePreset;

package/dist/types/plugins/deploy/utils.d.ts

@@ -4,17 +4,19 @@ export type ServerAppContext = {
     apiDirectory: string;
     lambdaDirectory: string;
     metaName: string;
+    bffRuntimeFramework: string;
 };
 export declare const serverAppContenxtTemplate: (appContext: AppToolsContext<"shared">) => {
     sharedDirectory: string;
     apiDirectory: string;
     lambdaDirectory: string;
     metaName: string;
+    bffRuntimeFramework: string;
 };
 export type PluginItem = [string, Record<string, any> | undefined];
 export declare const genPluginImportsCode: (plugins: PluginItem[]) => string;
 export declare const getPluginsCode: (plugins: PluginItem[]) => string;
-export declare const getProjectUsage: (appDirectory: string, distDirectory: string) => {
+export declare const getProjectUsage: (appDirectory: string, distDirectory: string, metaName: string) => {
     useSSR: boolean;
     useAPI: boolean;
     useWebServer: boolean;

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

@@ -133,6 +133,11 @@ export interface AppToolsExtendContext<B extends Bundler = 'webpack'> {
      * @deprecated compat old plugin, default is app tools
      */
     toolsType?: string;
+    /**
+     * Identification for bff runtime framework
+     * @private
+     */
+    bffRuntimeFramework?: string;
 }
 export type AppToolsContext<B extends Bundler = 'webpack'> = AppContext<AppTools<B>> & AppToolsExtendContext<B>;
 export type AppToolsHooks<B extends Bundler = 'webpack'> = Hooks<AppToolsUserConfig<B>, AppToolsNormalizedConfig, {}, {}> & AppToolsExtendHooks;

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

@@ -28,4 +28,5 @@ export declare const initAppContext: ({ metaName, appDirectory, runtimeConfigFil
     apiOnly: boolean;
     internalDirAlias: string;
     internalSrcAlias: string;
+    bffRuntimeFramework: string;
 };