@modern-js/server 2.6.0 → 2.7.0

package/CHANGELOG.md

@@ -1,5 +1,35 @@
 # @modern-js/server
 
+## 2.7.0
+
+### Minor Changes
+
+- 84bfb439b8: feat: support custom apiDir, lambdaDir and style of writing for bff
+  feat: 支持定制 api 目录，lambda 目录，bff 的写法
+
+### Patch Changes
+
+- 6378e26bf9: fix: modern server not serve static file in developmenet env, dev-server-middleware serve it
+  fix: modern server 在开发环境不再托管静态文件，dev-server-middleware 托管他们
+- 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/types@2.7.0
+  - @modern-js/prod-server@2.7.0
+  - @modern-js/server-utils@2.7.0
+
 ## 2.6.0
 
 ### Patch Changes

package/dist/cjs/dev-tools/dev-middleware/index.js

@@ -31,7 +31,7 @@ __export(dev_middleware_exports, {
 });
 module.exports = __toCommonJS(dev_middleware_exports);
 var import_events = require("events");
-var import_socket_server = __toESM(require("./socket-server"));
+var import_socketServer = __toESM(require("./socketServer"));
 const noop = () => {
 };
 function getHMRClientPath(client) {
@@ -46,7 +46,7 @@ class DevMiddleware extends import_events.EventEmitter {
   constructor({ dev, devMiddleware }) {
     super();
     this.devOptions = dev;
-    this.socketServer = new import_socket_server.default(dev);
+    this.socketServer = new import_socketServer.default(dev);
     if (devMiddleware) {
       this.middleware = this.setupDevMiddleware(devMiddleware);
     }

package/dist/cjs/dev-tools/dev-middleware/{socket-server.js → socketServer.js}

@@ -25,11 +25,11 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var socket_server_exports = {};
-__export(socket_server_exports, {
+var socketServer_exports = {};
+__export(socketServer_exports, {
   default: () => SocketServer
 });
-module.exports = __toCommonJS(socket_server_exports);
+module.exports = __toCommonJS(socketServer_exports);
 var import_ws = __toESM(require("ws"));
 var import_utils = require("@modern-js/utils");
 class SocketServer {

package/dist/cjs/dev-tools/watcher/{dependency-tree.js → dependencyTree.js}

@@ -25,12 +25,12 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var dependency_tree_exports = {};
-__export(dependency_tree_exports, {
+var dependencyTree_exports = {};
+__export(dependencyTree_exports, {
   DependencyTree: () => DependencyTree,
   defaultIgnores: () => defaultIgnores
 });
-module.exports = __toCommonJS(dependency_tree_exports);
+module.exports = __toCommonJS(dependencyTree_exports);
 var import_minimatch = __toESM(require("minimatch"));
 const defaultIgnores = [
   "**/bower_components/**",

package/dist/cjs/dev-tools/watcher/index.js

@@ -35,8 +35,8 @@ __export(watcher_exports, {
 module.exports = __toCommonJS(watcher_exports);
 var import_path = __toESM(require("path"));
 var import_utils = require("@modern-js/utils");
-var import_dependency_tree = require("./dependency-tree");
-var import_stats_cache = require("./stats-cache");
+var import_dependencyTree = require("./dependencyTree");
+var import_statsCache = require("./statsCache");
 const defaultWatchOptions = {
   // 初始化的时候不触发 add、addDir 事件
   ignoreInitial: true,
@@ -79,7 +79,7 @@ class Watcher {
   listen(files, options, callback) {
     const watched = files.filter(Boolean);
     const filenames = watched.map((filename) => filename.replace(/\\/g, "/"));
-    const cache = new import_stats_cache.StatsCache();
+    const cache = new import_statsCache.StatsCache();
     const watcher = import_utils.chokidar.watch(filenames, options);
     watcher.on("ready", () => {
       cache.add(getWatchedFiles(watcher));
@@ -103,7 +103,7 @@ class Watcher {
     this.watcher = watcher;
   }
   createDepTree() {
-    this.dependencyTree = new import_dependency_tree.DependencyTree();
+    this.dependencyTree = new import_dependencyTree.DependencyTree();
   }
   updateDepTree() {
     var _a;

package/dist/cjs/dev-tools/watcher/{stats-cache.js → statsCache.js}

@@ -25,11 +25,11 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var stats_cache_exports = {};
-__export(stats_cache_exports, {
+var statsCache_exports = {};
+__export(statsCache_exports, {
   StatsCache: () => StatsCache
 });
-module.exports = __toCommonJS(stats_cache_exports);
+module.exports = __toCommonJS(statsCache_exports);
 var import_fs = __toESM(require("fs"));
 var import_crypto = __toESM(require("crypto"));
 class StatsCache {

package/dist/cjs/server/{dev-server.js → devServer.js}

@@ -25,11 +25,11 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var dev_server_exports = {};
-__export(dev_server_exports, {
+var devServer_exports = {};
+__export(devServer_exports, {
   ModernDevServer: () => ModernDevServer
 });
-module.exports = __toCommonJS(dev_server_exports);
+module.exports = __toCommonJS(devServer_exports);
 var import_http = require("http");
 var import_path = __toESM(require("path"));
 var import_https = require("https");
@@ -45,6 +45,7 @@ class ModernDevServer extends import_prod_server.ModernServer {
   constructor(options) {
     super(options);
     this.mockHandler = null;
+    this.appContext = options.appContext;
     this.workDir = this.pwd;
     this.dev = this.getDevOptions(options);
     this.devMiddleware = new import_dev_middleware.default({
@@ -211,6 +212,11 @@ class ModernDevServer extends import_prod_server.ModernServer {
   createContext(req, res) {
     return super.createContext(req, res, { etag: true });
   }
+  setupStaticMiddleware(_) {
+    return async (context, next) => {
+      return next();
+    };
+  }
   async setupBeforeDevMiddleware() {
     const { runner, conf, dev } = this;
     const setupMids = dev.before || [];
@@ -239,13 +245,15 @@ class ModernDevServer extends import_prod_server.ModernServer {
   }
   startWatcher() {
     var _a;
-    const { pwd, distDir } = this;
+    const { pwd, distDir, appContext } = this;
     const { mock } = import_prod_server.AGGRED_DIR;
+    const apiDir = (appContext == null ? void 0 : appContext.apiDirectory) || import_utils.API_DIR;
+    const sharedDir = (appContext == null ? void 0 : appContext.sharedDirectory) || import_utils.SHARED_DIR;
     const defaultWatched = [
       `${mock}/**/*`,
       `${import_utils.SERVER_DIR}/**/*`,
-      `${import_utils.API_DIR}/**`,
-      `${import_utils.SHARED_DIR}/**/*`,
+      `${apiDir}/**`,
+      `${sharedDir}/**/*`,
       `${distDir}/${import_utils.SERVER_BUNDLE_DIRECTORY}/*-server-loaders.js`
     ];
     const watchOptions = (0, import_watcher.mergeWatchOptions)((_a = this.conf.server) == null ? void 0 : _a.watchOptions);

package/dist/cjs/server/index.js

@@ -21,9 +21,9 @@ __export(server_exports, {
 });
 module.exports = __toCommonJS(server_exports);
 var import_prod_server = require("@modern-js/prod-server");
-var import_dev_server = require("./dev-server");
+var import_devServer = require("./devServer");
 const createDevServer = (options) => {
-  return new import_dev_server.ModernDevServer(options);
+  return new import_devServer.ModernDevServer(options);
 };
 class DevServer extends import_prod_server.Server {
   constructor(options) {

package/dist/esm/dev-tools/dev-middleware/index.js

@@ -236,7 +236,7 @@ var __generator = this && this.__generator || function(thisArg, body) {
     }
 };
 import { EventEmitter } from "events";
-import SocketServer from "./socket-server";
+import SocketServer from "./socketServer";
 var noop = function() {};
 function getHMRClientPath(client) {
     var protocol = (client === null || client === void 0 ? void 0 : client.protocol) ? "&protocol=".concat(client.protocol) : "";

package/dist/esm/dev-tools/watcher/index.js

@@ -72,8 +72,8 @@ function _unsupportedIterableToArray(o, minLen) {
 }
 import path from "path";
 import { fs, chokidar } from "@modern-js/utils";
-import { DependencyTree } from "./dependency-tree";
-import { StatsCache } from "./stats-cache";
+import { DependencyTree } from "./dependencyTree";
+import { StatsCache } from "./statsCache";
 var defaultWatchOptions = {
     // 初始化的时候不触发 add、addDir 事件
     ignoreInitial: true,

package/dist/esm/server/{dev-server.js → devServer.js}

@@ -255,13 +255,13 @@ var __generator = this && this.__generator || function(thisArg, body) {
         trys: [],
         ops: []
     };
-    return g = {
+    return(g = {
         next: verb(0),
         "throw": verb(1),
         "return": verb(2)
     }, typeof Symbol === "function" && (g[Symbol.iterator] = function() {
         return this;
-    }), g;
+    }), g);
     function verb(n) {
         return function(v) {
             return step([
@@ -361,8 +361,10 @@ var ModernDevServer = /*#__PURE__*/ function(ModernServer) {
         _this = _super.call(this, options);
         _defineProperty(_assertThisInitialized(_this), "mockHandler", null);
         _defineProperty(_assertThisInitialized(_this), "dev", void 0);
+        _defineProperty(_assertThisInitialized(_this), "appContext", void 0);
         _defineProperty(_assertThisInitialized(_this), "devMiddleware", void 0);
         _defineProperty(_assertThisInitialized(_this), "watcher", void 0);
+        _this.appContext = options.appContext;
         _this.workDir = _this.pwd;
         _this.dev = _this.getDevOptions(options);
         _this.devMiddleware = new DevMiddleware({
@@ -694,6 +696,24 @@ var ModernDevServer = /*#__PURE__*/ function(ModernServer) {
                 });
             }
         },
+        {
+            key: "setupStaticMiddleware",
+            value: function setupStaticMiddleware(_) {
+                return function() {
+                    var _ref = _asyncToGenerator(function(context, next) {
+                        return __generator(this, function(_state) {
+                            return [
+                                2,
+                                next()
+                            ];
+                        });
+                    });
+                    return function(context, next) {
+                        return _ref.apply(this, arguments);
+                    };
+                }();
+            }
+        },
         {
             key: "setupBeforeDevMiddleware",
             value: function setupBeforeDevMiddleware() {
@@ -768,13 +788,15 @@ var ModernDevServer = /*#__PURE__*/ function(ModernServer) {
             value: function startWatcher() {
                 var _this = this;
                 var _this_conf_server;
-                var _this1 = this, pwd = _this1.pwd, distDir = _this1.distDir;
+                var _this1 = this, pwd = _this1.pwd, distDir = _this1.distDir, appContext = _this1.appContext;
                 var mock = AGGRED_DIR.mock;
+                var apiDir = (appContext === null || appContext === void 0 ? void 0 : appContext.apiDirectory) || API_DIR;
+                var sharedDir = (appContext === null || appContext === void 0 ? void 0 : appContext.sharedDirectory) || SHARED_DIR;
                 var defaultWatched = [
                     "".concat(mock, "/**/*"),
                     "".concat(SERVER_DIR, "/**/*"),
-                    "".concat(API_DIR, "/**"),
-                    "".concat(SHARED_DIR, "/**/*"),
+                    "".concat(apiDir, "/**"),
+                    "".concat(sharedDir, "/**/*"),
                     "".concat(distDir, "/").concat(SERVER_BUNDLE_DIRECTORY, "/*-server-loaders.js")
                 ];
                 var watchOptions = mergeWatchOptions((_this_conf_server = this.conf.server) === null || _this_conf_server === void 0 ? void 0 : _this_conf_server.watchOptions);

package/dist/esm/server/index.js

@@ -70,7 +70,7 @@ function _createSuper(Derived) {
     };
 }
 import { Server } from "@modern-js/prod-server";
-import { ModernDevServer } from "./dev-server";
+import { ModernDevServer } from "./devServer";
 var createDevServer = function(options) {
     return new ModernDevServer(options);
 };

package/dist/esm-node/dev-tools/dev-middleware/index.js

@@ -1,5 +1,5 @@
 import { EventEmitter } from "events";
-import SocketServer from "./socket-server";
+import SocketServer from "./socketServer";
 const noop = () => {
 };
 function getHMRClientPath(client) {

package/dist/esm-node/dev-tools/watcher/index.js

@@ -1,7 +1,7 @@
 import path from "path";
 import { fs, chokidar } from "@modern-js/utils";
-import { DependencyTree } from "./dependency-tree";
-import { StatsCache } from "./stats-cache";
+import { DependencyTree } from "./dependencyTree";
+import { StatsCache } from "./statsCache";
 const defaultWatchOptions = {
   // 初始化的时候不触发 add、addDir 事件
   ignoreInitial: true,

package/dist/esm-node/server/{dev-server.js → devServer.js}

@@ -22,6 +22,7 @@ class ModernDevServer extends ModernServer {
   constructor(options) {
     super(options);
     this.mockHandler = null;
+    this.appContext = options.appContext;
     this.workDir = this.pwd;
     this.dev = this.getDevOptions(options);
     this.devMiddleware = new DevMiddleware({
@@ -188,6 +189,11 @@ class ModernDevServer extends ModernServer {
   createContext(req, res) {
     return super.createContext(req, res, { etag: true });
   }
+  setupStaticMiddleware(_) {
+    return async (context, next) => {
+      return next();
+    };
+  }
   async setupBeforeDevMiddleware() {
     const { runner, conf, dev } = this;
     const setupMids = dev.before || [];
@@ -216,13 +222,15 @@ class ModernDevServer extends ModernServer {
   }
   startWatcher() {
     var _a;
-    const { pwd, distDir } = this;
+    const { pwd, distDir, appContext } = this;
     const { mock } = AGGRED_DIR;
+    const apiDir = (appContext == null ? void 0 : appContext.apiDirectory) || API_DIR;
+    const sharedDir = (appContext == null ? void 0 : appContext.sharedDirectory) || SHARED_DIR;
     const defaultWatched = [
       `${mock}/**/*`,
       `${SERVER_DIR}/**/*`,
-      `${API_DIR}/**`,
-      `${SHARED_DIR}/**/*`,
+      `${apiDir}/**`,
+      `${sharedDir}/**/*`,
       `${distDir}/${SERVER_BUNDLE_DIRECTORY}/*-server-loaders.js`
     ];
     const watchOptions = mergeWatchOptions((_a = this.conf.server) == null ? void 0 : _a.watchOptions);

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

@@ -1,5 +1,5 @@
 import { Server } from "@modern-js/prod-server";
-import { ModernDevServer } from "./dev-server";
+import { ModernDevServer } from "./devServer";
 const createDevServer = (options) => {
   return new ModernDevServer(options);
 };

package/dist/types/server/{dev-server.d.ts → devServer.d.ts}

@@ -1,12 +1,14 @@
 /// <reference types="node" />
 /// <reference types="node" />
 import { IncomingMessage, Server, ServerResponse } from 'http';
-import { ServerHookRunner, ModernServer, BuildOptions } from '@modern-js/prod-server';
+import { NextFunction, ServerHookRunner, ModernServer, BuildOptions } from '@modern-js/prod-server';
+import type { ModernServerContext } from '@modern-js/types';
 import { WatchEvent } from '../dev-tools/watcher';
 import type { ModernDevServerOptions } from '../types';
 export declare class ModernDevServer extends ModernServer {
   private mockHandler;
   private readonly dev;
+  private readonly appContext;
   private readonly devMiddleware;
   private watcher?;
   constructor(options: ModernDevServerOptions);
@@ -26,6 +28,7 @@ export declare class ModernDevServer extends ModernServer {
     event: WatchEvent;
   }): void;
   protected createContext(req: IncomingMessage, res: ServerResponse): import("@modern-js/prod-server/src/libs/context").ModernServerContext;
+  protected setupStaticMiddleware(_: string): (context: ModernServerContext, next: NextFunction) => Promise<void>;
   private setupBeforeDevMiddleware;
   private setupAfterDevMiddleware;
   private cleanSSRCache;

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",
@@ -33,10 +33,10 @@
     "minimatch": "^3.0.4",
     "path-to-regexp": "^6.2.0",
     "ws": "^8.2.0",
-    "@modern-js/prod-server": "2.6.0",
-    "@modern-js/types": "2.6.0",
-    "@modern-js/server-utils": "2.6.0",
-    "@modern-js/utils": "2.6.0"
+    "@modern-js/prod-server": "2.7.0",
+    "@modern-js/server-utils": "2.7.0",
+    "@modern-js/types": "2.7.0",
+    "@modern-js/utils": "2.7.0"
   },
   "devDependencies": {
     "@types/connect-history-api-fallback": "^1.3.5",
@@ -51,9 +51,9 @@
     "typescript": "^4",
     "webpack": "^5.75.0",
     "websocket": "^1",
-    "@modern-js/server-core": "2.6.0",
-    "@scripts/jest-config": "2.6.0",
-    "@scripts/build": "2.6.0"
+    "@modern-js/server-core": "2.7.0",
+    "@scripts/jest-config": "2.7.0",
+    "@scripts/build": "2.7.0"
   },
   "peerDependencies": {
     "devcert": "^1.0.0",