@modern-js/prod-server 2.6.1-alpha.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/libs/serveFile.js

@@ -33,9 +33,9 @@ __export(serveFile_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/modernServer.js

@@ -77,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);
@@ -96,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_serveFile.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)({
@@ -117,7 +104,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(import_serveFile.faviconFallbackHandler);
     this.addBeforeRouteHandler();
     this.addHandler(this.routeHandler.bind(this));
@@ -257,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/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/esm/libs/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/modernServer.js

@@ -231,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);
@@ -260,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:
@@ -292,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({
@@ -312,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));
@@ -664,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/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/libs/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/modernServer.js

@@ -67,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);
@@ -86,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({
@@ -107,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));
@@ -247,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/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/libs/context/context.d.ts

@@ -3,7 +3,7 @@
 /// <reference types="node" />
 /// <reference types="node" />
 /// <reference types="node/http" />
-/// <reference types=".dts-temp/i8fchs4liml2xhpvizgjb/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/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/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/utils.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 /// <reference types="node/http" />
-/// <reference types=".dts-temp/i8fchs4liml2xhpvizgjb/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.1-alpha.0",
+  "version": "2.7.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -45,8 +45,6 @@
     }
   },
   "dependencies": {
-    "@modern-js/utils": "2.6.0",
-    "@modern-js/server-core": "2.6.0",
     "etag": "^1.8.1",
     "fresh": "^0.5.2",
     "cookie": "^0.4.2",
@@ -55,13 +53,11 @@
     "lru-cache": "^6.0.0",
     "merge-deep": "^3.0.3",
     "path-to-regexp": "^6.2.0",
-    "serve-static": "^1.14.1"
+    "serve-static": "^1.14.1",
+    "@modern-js/utils": "2.7.0",
+    "@modern-js/server-core": "2.7.0"
   },
   "devDependencies": {
-    "@modern-js/types": "2.6.0",
-    "@modern-js/server-core": "2.6.0",
-    "@scripts/jest-config": "2.6.0",
-    "@scripts/build": "2.6.0",
     "@types/cookie": "^0.4.1",
     "@types/jest": "^27",
     "@types/lru-cache": "^5.1.1",
@@ -74,7 +70,11 @@
     "jest": "^27",
     "node-mocks-http": "^1.11.0",
     "portfinder": "^1.0.28",
-    "typescript": "^4"
+    "typescript": "^4",
+    "@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": {

package/dist/js/modern/constants.js

@@ -1,35 +0,0 @@
-const AGGRED_DIR = {
-  mock: "config/mock",
-  server: "server",
-  api: "api",
-  shared: "shared",
-  lambda: "lambda"
-};
-var ApiServerMode = /* @__PURE__ */ ((ApiServerMode2) => {
-  ApiServerMode2["func"] = "function";
-  ApiServerMode2["frame"] = "framework";
-  return ApiServerMode2;
-})(ApiServerMode || {});
-const ERROR_DIGEST = {
-  INIT: "Server init error",
-  ENOTF: "Page could not be found",
-  WARMUP: "SSR warmup failed",
-  EINTER: "Internal server error",
-  ERENDER: "SSR render failed",
-  EMICROINJ: "Get micro-frontend info failed"
-};
-const ERROR_PAGE_TEXT = {
-  404: "This page could not be found.",
-  500: "Internal Server Error."
-};
-const RUN_MODE = {
-  FULL: "full",
-  TYPE: "type"
-};
-export {
-  AGGRED_DIR,
-  ApiServerMode,
-  ERROR_DIGEST,
-  ERROR_PAGE_TEXT,
-  RUN_MODE
-};

package/dist/js/modern/index.js

@@ -1,18 +0,0 @@
-import { Server } from "./server";
-import { ModernServer } from "./server/modern-server";
-import { createProxyHandler } from "./libs/proxy";
-export * from "./type";
-export * from "./constants";
-var src_default = (options) => {
-  if (options == null) {
-    throw new Error("can not start mserver without options");
-  }
-  const server = new Server(options);
-  return server.init();
-};
-export {
-  ModernServer,
-  Server,
-  createProxyHandler,
-  src_default as default
-};