@modern-js/server 2.6.0 → 2.6.1-alpha.0

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,