@modern-js/prod-server 2.6.0 → 2.7.0

package/CHANGELOG.md

@@ -1,5 +1,31 @@
 # @modern-js/prod-server
 
+## 2.7.0
+
+### Minor Changes
+
+- 84bfb439b8: feat: support custom apiDir, lambdaDir and style of writing for bff
+  feat: 支持定制 api 目录，lambda 目录，bff 的写法
+
+### Patch Changes
+
+- 7fff9020e1: chore: make file naming consistent
+
+  chore: 统一文件命名为小驼峰格式
+
+- 1eea234fdd: chore: make test files naming consistent
+
+  chore: 统一测试文件命名为小驼峰格式
+
+- Updated dependencies [0f15fc597c]
+- Updated dependencies [dcad887024]
+- Updated dependencies [a4672f7c16]
+- Updated dependencies [7fff9020e1]
+- Updated dependencies [1eea234fdd]
+- Updated dependencies [84bfb439b8]
+  - @modern-js/utils@2.7.0
+  - @modern-js/server-core@2.7.0
+
 ## 2.6.0
 
 ### Patch Changes

package/dist/cjs/index.js

@@ -18,14 +18,14 @@ var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "defau
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var src_exports = {};
 __export(src_exports, {
-  ModernServer: () => import_modern_server.ModernServer,
+  ModernServer: () => import_modernServer.ModernServer,
   Server: () => import_server.Server,
   createProxyHandler: () => import_proxy.createProxyHandler,
   default: () => src_default
 });
 module.exports = __toCommonJS(src_exports);
 var import_server = require("./server");
-var import_modern_server = require("./server/modern-server");
+var import_modernServer = require("./server/modernServer");
 var import_proxy = require("./libs/proxy");
 __reExport(src_exports, require("./type"), module.exports);
 __reExport(src_exports, require("./constants"), module.exports);

package/dist/cjs/libs/{serve-file.js → serveFile.js}

@@ -25,17 +25,17 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var serve_file_exports = {};
-__export(serve_file_exports, {
+var serveFile_exports = {};
+__export(serveFile_exports, {
   createStaticFileHandler: () => createStaticFileHandler,
   faviconFallbackHandler: () => faviconFallbackHandler
 });
-module.exports = __toCommonJS(serve_file_exports);
+module.exports = __toCommonJS(serveFile_exports);
 var import_serve_static = __toESM(require("serve-static"));
 var import_utils = require("@modern-js/utils");
-var import_utils2 = require("../utils");
 const removedPrefix = (req, prefix) => {
-  if ((0, import_utils2.useLocalPrefix)(prefix)) {
+  const useLocalPrefix = !prefix.includes(".");
+  if (useLocalPrefix) {
     req.url = req.url.slice(prefix.length);
     return () => {
       req.url = prefix + req.url;
@@ -53,11 +53,10 @@ const faviconFallbackHandler = (context, next) => {
     next();
   }
 };
-const createStaticFileHandler = (rules, output = {}) => (
+const createStaticFileHandler = (rules, assetPrefix = "/") => (
   // eslint-disable-next-line consistent-return
   async (context, next) => {
     const { url: requestUrl, req, res } = context;
-    const { assetPrefix = "/" } = output;
     const hitRule = rules.find((item) => {
       if ((0, import_utils.isString)(item.path) && requestUrl.startsWith(item.path)) {
         return true;

package/dist/cjs/server/index.js

@@ -37,10 +37,10 @@ var import_server_core = require("@modern-js/server-core");
 var import_metrics = require("../libs/metrics");
 var import_loadConfig = require("../libs/loadConfig");
 var import_utils2 = require("../utils");
-var import_modern_server_split = require("./modern-server-split");
+var import_modernServerSplit = require("./modernServerSplit");
 class Server {
   constructor(options) {
-    this.serverImpl = import_modern_server_split.createProdServer;
+    this.serverImpl = import_modernServerSplit.createProdServer;
     options.logger = options.logger || new import_utils.Logger({
       level: "warn"
     });
@@ -172,14 +172,16 @@ class Server {
   }
   initAppContext() {
     const { options } = this;
-    const { pwd: appDirectory, plugins = [], config } = options;
+    const { pwd: appDirectory, plugins = [], config, appContext } = options;
     const serverPlugins = plugins.map((p) => ({
       server: p
     }));
     return {
       appDirectory,
+      apiDirectory: appContext == null ? void 0 : appContext.apiDirectory,
+      lambdaDirectory: appContext == null ? void 0 : appContext.lambdaDirectory,
+      sharedDirectory: (appContext == null ? void 0 : appContext.sharedDirectory) || import_path.default.resolve(appDirectory, import_utils.SHARED_DIR),
       distDirectory: import_path.default.join(appDirectory, config.output.path || "dist"),
-      sharedDirectory: import_path.default.resolve(appDirectory, import_utils.SHARED_DIR),
       plugins: serverPlugins
     };
   }

package/dist/cjs/server/{modern-server.js → modernServer.js}

@@ -25,17 +25,17 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var modern_server_exports = {};
-__export(modern_server_exports, {
+var modernServer_exports = {};
+__export(modernServer_exports, {
   ModernServer: () => ModernServer
 });
-module.exports = __toCommonJS(modern_server_exports);
+module.exports = __toCommonJS(modernServer_exports);
 var import_http = require("http");
 var import_path = __toESM(require("path"));
 var import_utils = require("@modern-js/utils");
 var import_route = require("../libs/route");
 var import_render = require("../libs/render");
-var import_serve_file = require("../libs/serve-file");
+var import_serveFile = require("../libs/serveFile");
 var import_utils2 = require("../utils");
 var reader = __toESM(require("../libs/render/reader"));
 var import_proxy = require("../libs/proxy");
@@ -43,7 +43,6 @@ var import_context = require("../libs/context");
 var import_template = require("../libs/hook-api/template");
 var import_constants = require("../constants");
 var import_hook_api = require("../libs/hook-api");
-const API_DIR = "./api";
 const SERVER_DIR = "./server";
 class ModernServer {
   constructor({
@@ -78,7 +77,7 @@ class ModernServer {
   }
   // server prepare
   async onInit(runner, app) {
-    var _a, _b;
+    var _a, _b, _c;
     this.runner = runner;
     const { distDir, staticGenerate, conf } = this;
     (0, import_utils2.debug)("final server conf", this.conf);
@@ -97,19 +96,6 @@ class ModernServer {
     this.warmupSSRBundle();
     await this.prepareFrameHandler();
     await this.prepareBeforeRouteHandler(usageRoutes, distDir);
-    const staticPathRegExp = (0, import_utils2.getStaticReg)(
-      this.conf.output || {},
-      this.conf.html
-    );
-    this.staticFileHandler = (0, import_serve_file.createStaticFileHandler)(
-      [
-        {
-          path: staticPathRegExp,
-          target: distDir
-        }
-      ],
-      this.conf.output
-    );
     const ssrConfig = (_b = this.conf.server) == null ? void 0 : _b.ssr;
     const forceCSR = typeof ssrConfig === "object" ? ssrConfig.forceCSR : false;
     this.routeRenderHandler = (0, import_render.createRenderHandler)({
@@ -118,8 +104,8 @@ class ModernServer {
       forceCSR
     });
     await this.setupBeforeProdMiddleware();
-    this.addHandler(this.staticFileHandler);
-    this.addHandler(import_serve_file.faviconFallbackHandler);
+    this.addHandler(this.setupStaticMiddleware((_c = this.conf.output) == null ? void 0 : _c.assetPrefix));
+    this.addHandler(import_serveFile.faviconFallbackHandler);
     this.addBeforeRouteHandler();
     this.addHandler(this.routeHandler.bind(this));
     this.compose();
@@ -212,13 +198,12 @@ class ModernServer {
     const { getMiddlewares, ...collector } = (0, import_utils2.createMiddlewareCollecter)();
     await runner.gather(collector);
     const { api: pluginAPIExt, web: pluginWebExt } = getMiddlewares();
-    const apiDir = import_path.default.join(workDir, API_DIR);
     const serverDir = import_path.default.join(workDir, SERVER_DIR);
     if (await import_utils.fs.pathExists(import_path.default.join(serverDir)) && !onlyApi) {
       const webExtension = (0, import_utils2.mergeExtension)(pluginWebExt);
       this.frameWebHandler = await this.prepareWebHandler(webExtension);
     }
-    if (import_utils.fs.existsSync(apiDir) && !onlyWeb) {
+    if (!onlyWeb) {
       const apiExtension = (0, import_utils2.mergeExtension)(pluginAPIExt);
       this.frameAPIHandler = await this.prepareAPIHandler(apiExtension);
     }
@@ -243,6 +228,7 @@ class ModernServer {
         pwd: workDir,
         config: extension,
         prefix: Array.isArray(prefix) ? prefix[0] : prefix,
+        httpMethodDecider: bff == null ? void 0 : bff.httpMethodDecider,
         render: this.render.bind(this)
       },
       { onLast: () => null }
@@ -258,6 +244,22 @@ class ModernServer {
       this.addHandler(mid);
     });
   }
+  setupStaticMiddleware(prefix) {
+    const staticPathRegExp = (0, import_utils2.getStaticReg)(
+      this.conf.output,
+      this.conf.html,
+      prefix
+    );
+    return (0, import_serveFile.createStaticFileHandler)(
+      [
+        {
+          path: staticPathRegExp,
+          target: this.distDir
+        }
+      ],
+      prefix
+    );
+  }
   async handleAPI(context) {
     const { req, res } = context;
     if (!this.frameAPIHandler) {

package/dist/cjs/server/{modern-server-split.js → modernServerSplit.js}

@@ -15,13 +15,13 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var modern_server_split_exports = {};
-__export(modern_server_split_exports, {
+var modernServerSplit_exports = {};
+__export(modernServerSplit_exports, {
   createProdServer: () => createProdServer
 });
-module.exports = __toCommonJS(modern_server_split_exports);
-var import_modern_server = require("./modern-server");
-class ModernSSRServer extends import_modern_server.ModernServer {
+module.exports = __toCommonJS(modernServerSplit_exports);
+var import_modernServer = require("./modernServer");
+class ModernSSRServer extends import_modernServer.ModernServer {
   prepareAPIHandler(_) {
     return null;
   }
@@ -29,7 +29,7 @@ class ModernSSRServer extends import_modern_server.ModernServer {
     return this.render404(context);
   }
 }
-class ModernAPIServer extends import_modern_server.ModernServer {
+class ModernAPIServer extends import_modernServer.ModernServer {
   prepareWebHandler(_) {
     return null;
   }
@@ -37,7 +37,7 @@ class ModernAPIServer extends import_modern_server.ModernServer {
     return routes.filter((route) => route.isApi);
   }
 }
-class ModernWebServer extends import_modern_server.ModernServer {
+class ModernWebServer extends import_modernServer.ModernServer {
   async warmupSSRBundle() {
     return null;
   }
@@ -57,7 +57,7 @@ const createProdServer = (options) => {
   } else if (options.webOnly) {
     return new ModernWebServer(options);
   } else {
-    return new import_modern_server.ModernServer(options);
+    return new import_modernServer.ModernServer(options);
   }
 };
 // Annotate the CommonJS export names for ESM import in node:

package/dist/cjs/utils.js

@@ -25,8 +25,7 @@ __export(utils_exports, {
   isRedirect: () => isRedirect,
   mergeExtension: () => mergeExtension,
   noop: () => noop,
-  prepareFavicons: () => prepareFavicons,
-  useLocalPrefix: () => useLocalPrefix
+  prepareFavicons: () => prepareFavicons
 });
 module.exports = __toCommonJS(utils_exports);
 var import_utils = require("@modern-js/utils");
@@ -89,16 +88,9 @@ const createMiddlewareCollecter = () => {
     addAPIMiddleware
   };
 };
-const useLocalPrefix = (url) => {
-  return (0, import_utils.isProd)() && !url.includes(".");
-};
-const getStaticReg = (output = {}, html = {}) => {
-  const {
-    distPath: { css: cssPath, js: jsPath, media: mediaPath } = {},
-    assetPrefix = "/"
-  } = output;
+const getStaticReg = (output = {}, html = {}, prefix = "/") => {
+  const { distPath: { css: cssPath, js: jsPath, media: mediaPath } = {} } = output;
   const { favicon, faviconByEntries } = html;
-  const prefix = useLocalPrefix(assetPrefix) ? assetPrefix : "";
   const favicons = prepareFavicons(favicon, faviconByEntries);
   const staticFiles = [cssPath, jsPath, mediaPath].filter((v) => Boolean(v));
   const staticReg = ["static/", "upload/", ...staticFiles];
@@ -147,6 +139,5 @@ const isRedirect = (code) => {
   isRedirect,
   mergeExtension,
   noop,
-  prepareFavicons,
-  useLocalPrefix
+  prepareFavicons
 });

package/dist/cjs/{worker-server.js → workerServer.js}

@@ -15,12 +15,12 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var worker_server_exports = {};
-__export(worker_server_exports, {
+var workerServer_exports = {};
+__export(workerServer_exports, {
   createHandler: () => createHandler,
   handleUrl: () => handleUrl
 });
-module.exports = __toCommonJS(worker_server_exports);
+module.exports = __toCommonJS(workerServer_exports);
 var import_logger = require("./libs/logger");
 var import_route = require("./libs/route");
 var import_metrics = require("./libs/metrics");

package/dist/esm/index.js

@@ -1,5 +1,5 @@
 import { Server } from "./server";
-import { ModernServer } from "./server/modern-server";
+import { ModernServer } from "./server/modernServer";
 import { createProxyHandler } from "./libs/proxy";
 export * from "./type";
 export * from "./constants";

package/dist/esm/libs/{serve-file.js → serveFile.js}

@@ -124,9 +124,9 @@ var __generator = this && this.__generator || function(thisArg, body) {
 };
 import serve from "serve-static";
 import { isString, isRegExp } from "@modern-js/utils";
-import { useLocalPrefix } from "../utils";
 var removedPrefix = function(req, prefix) {
-    if (useLocalPrefix(prefix)) {
+    var useLocalPrefix = !prefix.includes(".");
+    if (useLocalPrefix) {
         req.url = req.url.slice(prefix.length);
         return function() {
             req.url = prefix + req.url;
@@ -144,14 +144,13 @@ var faviconFallbackHandler = function(context, next) {
     }
 };
 var createStaticFileHandler = function(rules) {
-    var output = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {};
+    var assetPrefix = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : "/";
     return function() {
         var _ref = // eslint-disable-next-line consistent-return
         _asyncToGenerator(function(context, next) {
-            var requestUrl, req, res, _output_assetPrefix, assetPrefix, hitRule, resume;
+            var requestUrl, req, res, hitRule, resume;
             return __generator(this, function(_state) {
                 requestUrl = context.url, req = context.req, res = context.res;
-                _output_assetPrefix = output.assetPrefix, assetPrefix = _output_assetPrefix === void 0 ? "/" : _output_assetPrefix;
                 hitRule = rules.find(function(item) {
                     if (isString(item.path) && requestUrl.startsWith(item.path)) {
                         return true;

package/dist/esm/server/index.js

@@ -225,7 +225,7 @@ import { serverManager, AppContext, ConfigContext, loadPlugins } from "@modern-j
 import { metrics as defaultMetrics } from "../libs/metrics";
 import { loadConfig, getServerConfigPath, requireConfig } from "../libs/loadConfig";
 import { debug } from "../utils";
-import { createProdServer } from "./modern-server-split";
+import { createProdServer } from "./modernServerSplit";
 var Server = /*#__PURE__*/ function() {
     "use strict";
     function Server(options) {
@@ -496,7 +496,7 @@ var Server = /*#__PURE__*/ function() {
             key: "initAppContext",
             value: function initAppContext() {
                 var options = this.options;
-                var appDirectory = options.pwd, _options_plugins = options.plugins, plugins = _options_plugins === void 0 ? [] : _options_plugins, config = options.config;
+                var appDirectory = options.pwd, _options_plugins = options.plugins, plugins = _options_plugins === void 0 ? [] : _options_plugins, config = options.config, appContext = options.appContext;
                 var serverPlugins = plugins.map(function(p) {
                     return {
                         server: p
@@ -504,8 +504,10 @@ var Server = /*#__PURE__*/ function() {
                 });
                 return {
                     appDirectory: appDirectory,
+                    apiDirectory: appContext === null || appContext === void 0 ? void 0 : appContext.apiDirectory,
+                    lambdaDirectory: appContext === null || appContext === void 0 ? void 0 : appContext.lambdaDirectory,
+                    sharedDirectory: (appContext === null || appContext === void 0 ? void 0 : appContext.sharedDirectory) || path.resolve(appDirectory, SHARED_DIR),
                     distDirectory: path.join(appDirectory, config.output.path || "dist"),
-                    sharedDirectory: path.resolve(appDirectory, SHARED_DIR),
                     plugins: serverPlugins
                 };
             }

package/dist/esm/server/{modern-server.js → modernServer.js}

@@ -201,7 +201,7 @@ import path from "path";
 import { fs, isPromise, mime, ROUTE_SPEC_FILE } from "@modern-js/utils";
 import { RouteMatchManager } from "../libs/route";
 import { createRenderHandler } from "../libs/render";
-import { createStaticFileHandler, faviconFallbackHandler } from "../libs/serve-file";
+import { createStaticFileHandler, faviconFallbackHandler } from "../libs/serveFile";
 import { createErrorDocument, createMiddlewareCollecter, getStaticReg, mergeExtension, noop, debug, isRedirect } from "../utils";
 import * as reader from "../libs/render/reader";
 import { createProxyHandler } from "../libs/proxy";
@@ -209,7 +209,6 @@ import { createContext } from "../libs/context";
 import { templateInjectableStream } from "../libs/hook-api/template";
 import { AGGRED_DIR, ERROR_DIGEST, ERROR_PAGE_TEXT, RUN_MODE } from "../constants";
 import { createAfterMatchContext, createAfterRenderContext, createMiddlewareContext } from "../libs/hook-api";
-var API_DIR = "./api";
 var SERVER_DIR = "./server";
 var ModernServer = /*#__PURE__*/ function() {
     "use strict";
@@ -232,7 +231,6 @@ var ModernServer = /*#__PURE__*/ function() {
         _defineProperty(this, "runMode", void 0);
         _defineProperty(this, "reader", reader);
         _defineProperty(this, "proxyTarget", void 0);
-        _defineProperty(this, "staticFileHandler", void 0);
         _defineProperty(this, "routeRenderHandler", void 0);
         _defineProperty(this, "beforeRouteHandler", null);
         _defineProperty(this, "frameWebHandler", null);
@@ -261,7 +259,7 @@ var ModernServer = /*#__PURE__*/ function() {
             function onInit(runner, app) {
                 var _this = this;
                 return _asyncToGenerator(function() {
-                    var _conf_bff, _this_conf_server, distDir, staticGenerate, conf, usageRoutes, staticPathRegExp, ssrConfig, forceCSR;
+                    var _conf_bff, _this_conf_server, _this_conf_output, distDir, staticGenerate, conf, usageRoutes, ssrConfig, forceCSR;
                     return __generator(this, function(_state) {
                         switch(_state.label){
                             case 0:
@@ -293,13 +291,6 @@ var ModernServer = /*#__PURE__*/ function() {
                                 ];
                             case 2:
                                 _state.sent();
-                                staticPathRegExp = getStaticReg(_this.conf.output || {}, _this.conf.html);
-                                _this.staticFileHandler = createStaticFileHandler([
-                                    {
-                                        path: staticPathRegExp,
-                                        target: distDir
-                                    }
-                                ], _this.conf.output);
                                 ssrConfig = (_this_conf_server = _this.conf.server) === null || _this_conf_server === void 0 ? void 0 : _this_conf_server.ssr;
                                 forceCSR = typeof ssrConfig === "object" ? ssrConfig.forceCSR : false;
                                 _this.routeRenderHandler = createRenderHandler({
@@ -313,7 +304,7 @@ var ModernServer = /*#__PURE__*/ function() {
                                 ];
                             case 3:
                                 _state.sent();
-                                _this.addHandler(_this.staticFileHandler);
+                                _this.addHandler(_this.setupStaticMiddleware((_this_conf_output = _this.conf.output) === null || _this_conf_output === void 0 ? void 0 : _this_conf_output.assetPrefix));
                                 _this.addHandler(faviconFallbackHandler);
                                 _this.addBeforeRouteHandler();
                                 _this.addHandler(_this.routeHandler.bind(_this));
@@ -516,7 +507,7 @@ var ModernServer = /*#__PURE__*/ function() {
             function prepareFrameHandler(options) {
                 var _this = this;
                 return _asyncToGenerator(function() {
-                    var workDir, runner, _ref, onlyApi, onlyWeb, _createMiddlewareCollecter, getMiddlewares, collector, _getMiddlewares, pluginAPIExt, pluginWebExt, apiDir, serverDir, webExtension, apiExtension;
+                    var workDir, runner, _ref, onlyApi, onlyWeb, _createMiddlewareCollecter, getMiddlewares, collector, _getMiddlewares, pluginAPIExt, pluginWebExt, serverDir, webExtension, apiExtension;
                     return __generator(this, function(_state) {
                         switch(_state.label){
                             case 0:
@@ -532,7 +523,6 @@ var ModernServer = /*#__PURE__*/ function() {
                             case 1:
                                 _state.sent();
                                 _getMiddlewares = getMiddlewares(), pluginAPIExt = _getMiddlewares.api, pluginWebExt = _getMiddlewares.web;
-                                apiDir = path.join(workDir, API_DIR);
                                 serverDir = path.join(workDir, SERVER_DIR);
                                 return [
                                     4,
@@ -552,7 +542,7 @@ var ModernServer = /*#__PURE__*/ function() {
                                 _this.frameWebHandler = _state.sent();
                                 _state.label = 4;
                             case 4:
-                                if (!(fs.existsSync(apiDir) && !onlyWeb)) return [
+                                if (!!onlyWeb) return [
                                     3,
                                     6
                                 ];
@@ -621,6 +611,7 @@ var ModernServer = /*#__PURE__*/ function() {
                                 pwd: workDir,
                                 config: extension,
                                 prefix: Array.isArray(prefix) ? prefix[0] : prefix,
+                                httpMethodDecider: bff === null || bff === void 0 ? void 0 : bff.httpMethodDecider,
                                 render: _this.render.bind(_this)
                             }, {
                                 onLast: function() {
@@ -665,6 +656,18 @@ var ModernServer = /*#__PURE__*/ function() {
                 })();
             }
         },
+        {
+            key: "setupStaticMiddleware",
+            value: function setupStaticMiddleware(prefix) {
+                var staticPathRegExp = getStaticReg(this.conf.output, this.conf.html, prefix);
+                return createStaticFileHandler([
+                    {
+                        path: staticPathRegExp,
+                        target: this.distDir
+                    }
+                ], prefix);
+            }
+        },
         {
             key: "handleAPI",
             value: function handleAPI(context) {

package/dist/esm/server/{modern-server-split.js → modernServerSplit.js}

@@ -230,7 +230,7 @@ var __generator = this && this.__generator || function(thisArg, body) {
         };
     }
 };
-import { ModernServer } from "./modern-server";
+import { ModernServer } from "./modernServer";
 var ModernSSRServer = /*#__PURE__*/ function(ModernServer) {
     "use strict";
     _inherits(ModernSSRServer, ModernServer);

package/dist/esm/utils.js

@@ -51,7 +51,7 @@ function _unsupportedIterableToArray(o, minLen) {
     if (n === "Map" || n === "Set") return Array.from(n);
     if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen);
 }
-import { createDebugger, isProd } from "@modern-js/utils";
+import { createDebugger } from "@modern-js/utils";
 var debug = createDebugger("prod-server");
 var mergeExtension = function(users) {
     var output = [];
@@ -85,14 +85,10 @@ var createMiddlewareCollecter = function() {
         addAPIMiddleware: addAPIMiddleware
     };
 };
-var useLocalPrefix = function(url) {
-    return isProd() && !url.includes(".");
-};
 var getStaticReg = function() {
-    var output = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {}, html = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {};
-    var tmp = output.distPath, _ref = tmp === void 0 ? {} : tmp, cssPath = _ref.css, jsPath = _ref.js, mediaPath = _ref.media, _output_assetPrefix = output.assetPrefix, assetPrefix = _output_assetPrefix === void 0 ? "/" : _output_assetPrefix;
+    var output = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {}, html = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {}, prefix = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : "/";
+    var tmp = output.distPath, _ref = tmp === void 0 ? {} : tmp, cssPath = _ref.css, jsPath = _ref.js, mediaPath = _ref.media;
     var favicon = html.favicon, faviconByEntries = html.faviconByEntries;
-    var prefix = useLocalPrefix(assetPrefix) ? assetPrefix : "";
     var favicons = prepareFavicons(favicon, faviconByEntries);
     var staticFiles = [
         cssPath,
@@ -144,4 +140,4 @@ var isRedirect = function(code) {
         308
     ].includes(code);
 };
-export { createErrorDocument, createMiddlewareCollecter, debug, getStaticReg, headersWithoutCookie, isRedirect, mergeExtension, noop, prepareFavicons, useLocalPrefix };
+export { createErrorDocument, createMiddlewareCollecter, debug, getStaticReg, headersWithoutCookie, isRedirect, mergeExtension, noop, prepareFavicons };

package/dist/esm-node/index.js

@@ -1,5 +1,5 @@
 import { Server } from "./server";
-import { ModernServer } from "./server/modern-server";
+import { ModernServer } from "./server/modernServer";
 import { createProxyHandler } from "./libs/proxy";
 export * from "./type";
 export * from "./constants";

package/dist/esm-node/libs/{serve-file.js → serveFile.js}

@@ -1,8 +1,8 @@
 import serve from "serve-static";
 import { isString, isRegExp } from "@modern-js/utils";
-import { useLocalPrefix } from "../utils";
 const removedPrefix = (req, prefix) => {
-  if (useLocalPrefix(prefix)) {
+  const useLocalPrefix = !prefix.includes(".");
+  if (useLocalPrefix) {
     req.url = req.url.slice(prefix.length);
     return () => {
       req.url = prefix + req.url;
@@ -20,11 +20,10 @@ const faviconFallbackHandler = (context, next) => {
     next();
   }
 };
-const createStaticFileHandler = (rules, output = {}) => (
+const createStaticFileHandler = (rules, assetPrefix = "/") => (
   // eslint-disable-next-line consistent-return
   async (context, next) => {
     const { url: requestUrl, req, res } = context;
-    const { assetPrefix = "/" } = output;
     const hitRule = rules.find((item) => {
       if (isString(item.path) && requestUrl.startsWith(item.path)) {
         return true;

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

@@ -21,7 +21,7 @@ import {
   requireConfig
 } from "../libs/loadConfig";
 import { debug } from "../utils";
-import { createProdServer } from "./modern-server-split";
+import { createProdServer } from "./modernServerSplit";
 class Server {
   constructor(options) {
     this.serverImpl = createProdServer;
@@ -156,14 +156,16 @@ class Server {
   }
   initAppContext() {
     const { options } = this;
-    const { pwd: appDirectory, plugins = [], config } = options;
+    const { pwd: appDirectory, plugins = [], config, appContext } = options;
     const serverPlugins = plugins.map((p) => ({
       server: p
     }));
     return {
       appDirectory,
+      apiDirectory: appContext == null ? void 0 : appContext.apiDirectory,
+      lambdaDirectory: appContext == null ? void 0 : appContext.lambdaDirectory,
+      sharedDirectory: (appContext == null ? void 0 : appContext.sharedDirectory) || path.resolve(appDirectory, SHARED_DIR),
       distDirectory: path.join(appDirectory, config.output.path || "dist"),
-      sharedDirectory: path.resolve(appDirectory, SHARED_DIR),
       plugins: serverPlugins
     };
   }

package/dist/esm-node/server/{modern-server.js → modernServer.js}

@@ -8,7 +8,7 @@ import { createRenderHandler } from "../libs/render";
 import {
   createStaticFileHandler,
   faviconFallbackHandler
-} from "../libs/serve-file";
+} from "../libs/serveFile";
 import {
   createErrorDocument,
   createMiddlewareCollecter,
@@ -33,7 +33,6 @@ import {
   createAfterRenderContext,
   createMiddlewareContext
 } from "../libs/hook-api";
-const API_DIR = "./api";
 const SERVER_DIR = "./server";
 class ModernServer {
   constructor({
@@ -68,7 +67,7 @@ class ModernServer {
   }
   // server prepare
   async onInit(runner, app) {
-    var _a, _b;
+    var _a, _b, _c;
     this.runner = runner;
     const { distDir, staticGenerate, conf } = this;
     debug("final server conf", this.conf);
@@ -87,19 +86,6 @@ class ModernServer {
     this.warmupSSRBundle();
     await this.prepareFrameHandler();
     await this.prepareBeforeRouteHandler(usageRoutes, distDir);
-    const staticPathRegExp = getStaticReg(
-      this.conf.output || {},
-      this.conf.html
-    );
-    this.staticFileHandler = createStaticFileHandler(
-      [
-        {
-          path: staticPathRegExp,
-          target: distDir
-        }
-      ],
-      this.conf.output
-    );
     const ssrConfig = (_b = this.conf.server) == null ? void 0 : _b.ssr;
     const forceCSR = typeof ssrConfig === "object" ? ssrConfig.forceCSR : false;
     this.routeRenderHandler = createRenderHandler({
@@ -108,7 +94,7 @@ class ModernServer {
       forceCSR
     });
     await this.setupBeforeProdMiddleware();
-    this.addHandler(this.staticFileHandler);
+    this.addHandler(this.setupStaticMiddleware((_c = this.conf.output) == null ? void 0 : _c.assetPrefix));
     this.addHandler(faviconFallbackHandler);
     this.addBeforeRouteHandler();
     this.addHandler(this.routeHandler.bind(this));
@@ -202,13 +188,12 @@ class ModernServer {
     const { getMiddlewares, ...collector } = createMiddlewareCollecter();
     await runner.gather(collector);
     const { api: pluginAPIExt, web: pluginWebExt } = getMiddlewares();
-    const apiDir = path.join(workDir, API_DIR);
     const serverDir = path.join(workDir, SERVER_DIR);
     if (await fs.pathExists(path.join(serverDir)) && !onlyApi) {
       const webExtension = mergeExtension(pluginWebExt);
       this.frameWebHandler = await this.prepareWebHandler(webExtension);
     }
-    if (fs.existsSync(apiDir) && !onlyWeb) {
+    if (!onlyWeb) {
       const apiExtension = mergeExtension(pluginAPIExt);
       this.frameAPIHandler = await this.prepareAPIHandler(apiExtension);
     }
@@ -233,6 +218,7 @@ class ModernServer {
         pwd: workDir,
         config: extension,
         prefix: Array.isArray(prefix) ? prefix[0] : prefix,
+        httpMethodDecider: bff == null ? void 0 : bff.httpMethodDecider,
         render: this.render.bind(this)
       },
       { onLast: () => null }
@@ -248,6 +234,22 @@ class ModernServer {
       this.addHandler(mid);
     });
   }
+  setupStaticMiddleware(prefix) {
+    const staticPathRegExp = getStaticReg(
+      this.conf.output,
+      this.conf.html,
+      prefix
+    );
+    return createStaticFileHandler(
+      [
+        {
+          path: staticPathRegExp,
+          target: this.distDir
+        }
+      ],
+      prefix
+    );
+  }
   async handleAPI(context) {
     const { req, res } = context;
     if (!this.frameAPIHandler) {

package/dist/esm-node/server/{modern-server-split.js → modernServerSplit.js}

@@ -1,4 +1,4 @@
-import { ModernServer } from "./modern-server";
+import { ModernServer } from "./modernServer";
 class ModernSSRServer extends ModernServer {
   prepareAPIHandler(_) {
     return null;

package/dist/esm-node/utils.js

@@ -1,4 +1,4 @@
-import { createDebugger, isProd } from "@modern-js/utils";
+import { createDebugger } from "@modern-js/utils";
 const debug = createDebugger("prod-server");
 const mergeExtension = (users) => {
   const output = [];
@@ -58,16 +58,9 @@ const createMiddlewareCollecter = () => {
     addAPIMiddleware
   };
 };
-const useLocalPrefix = (url) => {
-  return isProd() && !url.includes(".");
-};
-const getStaticReg = (output = {}, html = {}) => {
-  const {
-    distPath: { css: cssPath, js: jsPath, media: mediaPath } = {},
-    assetPrefix = "/"
-  } = output;
+const getStaticReg = (output = {}, html = {}, prefix = "/") => {
+  const { distPath: { css: cssPath, js: jsPath, media: mediaPath } = {} } = output;
   const { favicon, faviconByEntries } = html;
-  const prefix = useLocalPrefix(assetPrefix) ? assetPrefix : "";
   const favicons = prepareFavicons(favicon, faviconByEntries);
   const staticFiles = [cssPath, jsPath, mediaPath].filter((v) => Boolean(v));
   const staticReg = ["static/", "upload/", ...staticFiles];
@@ -115,6 +108,5 @@ export {
   isRedirect,
   mergeExtension,
   noop,
-  prepareFavicons,
-  useLocalPrefix
+  prepareFavicons
 };

package/dist/types/index.d.ts

@@ -2,7 +2,7 @@ import { ModernServerOptions } from './type';
 import { Server } from './server';
 export { Server };
 export type { ServerConfig } from '@modern-js/server-core';
-export { ModernServer } from './server/modern-server';
+export { ModernServer } from './server/modernServer';
 export { createProxyHandler } from './libs/proxy';
 export * from './type';
 export * from './constants';

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

@@ -3,7 +3,7 @@
 /// <reference types="node" />
 /// <reference types="node" />
 /// <reference types="node/http" />
-/// <reference types=".dts-temp/x5zLsplldTCJONgx6eTKT/src/type" />
+/// <reference types=".dts-temp/NtW8DT-FXC5GraMEoP2PI/src/type" />
 import { IncomingMessage, ServerResponse } from 'http';
 import { URL } from 'url';
 import qs from 'querystring';

package/dist/types/libs/{serve-file.d.ts → serveFile.d.ts}

@@ -1,4 +1,3 @@
-import { ServerOptions } from '@modern-js/server-core';
 import type { ModernServerContext } from '@modern-js/types';
 import { NextFunction, ModernServerHandler } from '../type';
 type Rule = {
@@ -6,5 +5,5 @@ type Rule = {
   target: string;
 };
 export declare const faviconFallbackHandler: ModernServerHandler;
-export declare const createStaticFileHandler: (rules: Rule[], output?: ServerOptions['output']) => (context: ModernServerContext, next: NextFunction) => Promise<void>;
+export declare const createStaticFileHandler: (rules: Rule[], assetPrefix?: string) => (context: ModernServerContext, next: NextFunction) => Promise<void>;
 export {};

package/dist/types/server/{modern-server.d.ts → modernServer.d.ts}

@@ -22,7 +22,6 @@ export declare class ModernServer implements ModernServerInterface {
   protected readonly runMode: string;
   protected reader: typeof reader;
   protected readonly proxyTarget: ModernServerOptions['proxyTarget'];
-  private staticFileHandler;
   private routeRenderHandler;
   private beforeRouteHandler;
   private frameWebHandler;
@@ -63,6 +62,7 @@ export declare class ModernServer implements ModernServerInterface {
   protected prepareAPIHandler(extension: APIServerStartInput['config']): Promise<Adapter>;
   protected filterRoutes(routes: ModernRouteInterface[]): ServerRoute[];
   protected setupBeforeProdMiddleware(): Promise<void>;
+  protected setupStaticMiddleware(prefix?: string): (context: ModernServerContext, next: NextFunction) => Promise<void>;
   protected handleAPI(context: ModernServerContext): Promise<void>;
   protected handleWeb(context: ModernServerContext, route: ModernRoute): Promise<import("../type").RenderResult | null>;
   protected proxy(): Promise<any>;

package/dist/types/type.d.ts

@@ -26,7 +26,14 @@ export type ModernServerOptions = {
   ssrOnly?: boolean;
   webOnly?: boolean;
   runMode?: string;
-  [propName: string]: any;
+  appContext?: {
+    appDirectory?: string;
+    sharedDirectory: string;
+    apiDirectory: string;
+    lambdaDirectory: string;
+  };
+  serverConfigFile?: string;
+  proxyTarget?: any;
 };
 export type RenderResult = {
   content: string | Buffer;

package/dist/types/utils.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 /// <reference types="node/http" />
-/// <reference types=".dts-temp/x5zLsplldTCJONgx6eTKT/src/type" />
+/// <reference types=".dts-temp/NtW8DT-FXC5GraMEoP2PI/src/type" />
 import { IncomingMessage } from 'http';
 import type { OutputNormalizedConfig, HtmlNormalizedConfig } from '@modern-js/server-core';
 export declare const debug: any;
@@ -18,8 +18,7 @@ export declare const createMiddlewareCollecter: () => {
   addWebMiddleware: (input: any) => void;
   addAPIMiddleware: (input: any) => void;
 };
-export declare const useLocalPrefix: (url: string) => boolean;
-export declare const getStaticReg: (output?: OutputNormalizedConfig, html?: HtmlNormalizedConfig) => RegExp;
+export declare const getStaticReg: (output?: OutputNormalizedConfig, html?: HtmlNormalizedConfig, prefix?: string) => RegExp;
 export declare const prepareFavicons: (favicon: string | undefined, faviconByEntries?: Record<string, string | undefined>) => string[];
 export declare const headersWithoutCookie: (headers: IncomingMessage['headers']) => import("http").IncomingHttpHeaders;
 export declare const isRedirect: (code: number) => boolean;

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.6.0",
+  "version": "2.7.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -27,11 +27,11 @@
     },
     "./worker": {
       "node": {
-        "jsnext:source": "./src/worker-server.ts",
-        "import": "./dist/esm-node/worker-server.js",
-        "require": "./dist/cjs/worker-server.js"
+        "jsnext:source": "./src/workerServer.ts",
+        "import": "./dist/esm-node/workerServer.js",
+        "require": "./dist/cjs/workerServer.js"
       },
-      "default": "./dist/esm/worker-server.js"
+      "default": "./dist/esm/workerServer.js"
     }
   },
   "typesVersions": {
@@ -40,7 +40,7 @@
         "./dist/types/index.d.ts"
       ],
       "worker": [
-        "./dist/types/worker-server.d.ts"
+        "./dist/types/workerServer.d.ts"
       ]
     }
   },
@@ -54,8 +54,8 @@
     "merge-deep": "^3.0.3",
     "path-to-regexp": "^6.2.0",
     "serve-static": "^1.14.1",
-    "@modern-js/utils": "2.6.0",
-    "@modern-js/server-core": "2.6.0"
+    "@modern-js/utils": "2.7.0",
+    "@modern-js/server-core": "2.7.0"
   },
   "devDependencies": {
     "@types/cookie": "^0.4.1",
@@ -71,10 +71,10 @@
     "node-mocks-http": "^1.11.0",
     "portfinder": "^1.0.28",
     "typescript": "^4",
-    "@modern-js/types": "2.6.0",
-    "@modern-js/server-core": "2.6.0",
-    "@scripts/jest-config": "2.6.0",
-    "@scripts/build": "2.6.0"
+    "@modern-js/types": "2.7.0",
+    "@modern-js/server-core": "2.7.0",
+    "@scripts/jest-config": "2.7.0",
+    "@scripts/build": "2.7.0"
   },
   "sideEffects": false,
   "publishConfig": {