@modern-js/server 2.15.1-alpha.0 → 2.17.0

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

@@ -1,17 +1,21 @@
+function _define_property(obj, key, value) {
+  if (key in obj) {
+    Object.defineProperty(obj, key, {
+      value,
+      enumerable: true,
+      configurable: true,
+      writable: true
+    });
+  } else {
+    obj[key] = value;
+  }
+  return obj;
+}
 import { createServer } from "http";
 import path from "path";
 import { createServer as createHttpsServer } from "https";
-import {
-  API_DIR,
-  SERVER_BUNDLE_DIRECTORY,
-  SERVER_DIR,
-  SHARED_DIR
-} from "@modern-js/utils";
-import {
-  createProxyHandler,
-  ModernServer,
-  AGGRED_DIR
-} from "@modern-js/prod-server";
+import { API_DIR, SERVER_BUNDLE_DIRECTORY, SERVER_DIR, SHARED_DIR } from "@modern-js/utils";
+import { createProxyHandler, ModernServer, AGGRED_DIR } from "@modern-js/prod-server";
 import { LOADABLE_STATS_FILE } from "@modern-js/utils/constants";
 import { merge as deepMerge } from "@modern-js/utils/lodash";
 import { getDefaultDevOptions } from "../constants";
@@ -19,19 +23,7 @@ import { createMockHandler } from "../dev-tools/mock";
 import { enableRegister } from "../dev-tools/register";
 import Watcher, { mergeWatchOptions } from "../dev-tools/watcher";
 import DevMiddleware from "../dev-tools/dev-middleware";
-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({
-      dev: this.dev,
-      devMiddleware: options.devMiddleware
-    });
-    enableRegister(this.pwd, this.conf);
-  }
+export class ModernDevServer extends ModernServer {
   getDevOptions(options) {
     const devOptions = typeof options.dev === "boolean" ? {} : options.dev;
     const defaultOptions = getDefaultDevOptions();
@@ -53,15 +45,15 @@ class ModernDevServer extends ModernServer {
     const befores = [];
     const afters = [];
     setupMiddlewares.forEach((handler) => {
-      handler(
-        {
-          unshift: (...handlers) => befores.unshift(...handlers),
-          push: (...handlers) => afters.push(...handlers)
-        },
-        serverOptions
-      );
+      handler({
+        unshift: (...handlers) => befores.unshift(...handlers),
+        push: (...handlers) => afters.push(...handlers)
+      }, serverOptions);
     });
-    return { befores, afters };
+    return {
+      befores,
+      afters
+    };
   }
   // Complete the preparation of services
   async onInit(runner, app) {
@@ -69,16 +61,22 @@ class ModernDevServer extends ModernServer {
     const { dev } = this;
     const { befores, afters } = this.applySetupMiddlewares();
     const beforeHandlers = await this.setupBeforeDevMiddleware();
-    this.addMiddlewareHandler([...beforeHandlers, ...befores]);
+    this.addMiddlewareHandler([
+      ...beforeHandlers,
+      ...befores
+    ]);
     await this.applyDefaultMiddlewares(app);
     const afterHandlers = await this.setupAfterDevMiddleware();
-    this.addMiddlewareHandler([...afters, ...afterHandlers]);
+    this.addMiddlewareHandler([
+      ...afters,
+      ...afterHandlers
+    ]);
     await super.onInit(runner, app);
     if (dev.watch) {
       this.startWatcher();
       app.on("close", async () => {
-        var _a;
-        await ((_a = this.watcher) == null ? void 0 : _a.close());
+        var _this_watcher;
+        await ((_this_watcher = this.watcher) === null || _this_watcher === void 0 ? void 0 : _this_watcher.close());
       });
     }
   }
@@ -97,7 +95,9 @@ class ModernDevServer extends ModernServer {
       }
       next();
     });
-    this.mockHandler = createMockHandler({ pwd });
+    this.mockHandler = createMockHandler({
+      pwd
+    });
     this.addHandler((ctx, next) => {
       if (this.mockHandler) {
         this.mockHandler(ctx, next);
@@ -113,8 +113,12 @@ class ModernDevServer extends ModernServer {
     }
     devMiddleware.init(app);
     devMiddleware.on("change", (stats) => {
-      if (stats.toJson({ all: false }).name !== "server") {
-        this.onRepack({ routes: this.getRoutes() });
+      if (stats.toJson({
+        all: false
+      }).name !== "server") {
+        this.onRepack({
+          routes: this.getRoutes()
+        });
       }
     });
     this.addHandler((ctx, next) => {
@@ -127,12 +131,8 @@ class ModernDevServer extends ModernServer {
     });
     if (dev.historyApiFallback) {
       const { default: connectHistoryApiFallback } = await import("connect-history-api-fallback");
-      const historyApiFallbackMiddleware = connectHistoryApiFallback(
-        typeof dev.historyApiFallback === "boolean" ? {} : dev.historyApiFallback
-      );
-      this.addHandler(
-        (ctx, next) => historyApiFallbackMiddleware(ctx.req, ctx.res, next)
-      );
+      const historyApiFallbackMiddleware = connectHistoryApiFallback(typeof dev.historyApiFallback === "boolean" ? {} : dev.historyApiFallback);
+      this.addHandler((ctx, next) => historyApiFallbackMiddleware(ctx.req, ctx.res, next));
     }
   }
   onRepack(options = {}) {
@@ -157,23 +157,27 @@ class ModernDevServer extends ModernServer {
   }
   warmupSSRBundle() {
   }
-  async onServerChange({
-    filepath,
-    event
-  }) {
+  async onServerChange({ filepath, event }) {
     const { pwd } = this;
     const { mock } = AGGRED_DIR;
     const mockPath = path.normalize(path.join(pwd, mock));
     this.runner.reset();
     if (filepath.startsWith(mockPath)) {
-      this.mockHandler = createMockHandler({ pwd });
+      this.mockHandler = createMockHandler({
+        pwd
+      });
     } else {
       try {
         const success = this.runner.onApiChange([
-          { filename: filepath, event }
+          {
+            filename: filepath,
+            event
+          }
         ]);
         if (success !== true) {
-          await super.onServerChange({ filepath });
+          await super.onServerChange({
+            filepath
+          });
         }
       } catch (e) {
         this.logger.error(e);
@@ -181,7 +185,9 @@ class ModernDevServer extends ModernServer {
     }
   }
   createContext(req, res) {
-    return super.createContext(req, res, { etag: true });
+    return super.createContext(req, res, {
+      etag: true
+    });
   }
   setupStaticMiddleware(_) {
     return async (context, next) => {
@@ -192,13 +198,19 @@ class ModernDevServer extends ModernServer {
     const { runner, conf, dev } = this;
     const setupMids = dev.before || [];
     const pluginMids = await runner.beforeDevServer(conf);
-    return [...setupMids, ...pluginMids].flat();
+    return [
+      ...setupMids,
+      ...pluginMids
+    ].flat();
   }
   async setupAfterDevMiddleware() {
     const { runner, conf, dev } = this;
     const setupMids = dev.after || [];
     const pluginMids = await runner.afterDevServer(conf);
-    return [...pluginMids, ...setupMids].flat();
+    return [
+      ...pluginMids,
+      ...setupMids
+    ].flat();
   }
   cleanSSRCache() {
     const { distDir } = this;
@@ -215,11 +227,11 @@ class ModernDevServer extends ModernServer {
     }
   }
   startWatcher() {
-    var _a;
+    var _this_conf_server;
     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 apiDir = (appContext === null || appContext === void 0 ? void 0 : appContext.apiDirectory) || API_DIR;
+    const sharedDir = (appContext === null || appContext === void 0 ? void 0 : appContext.sharedDirectory) || SHARED_DIR;
     const defaultWatched = [
       `${mock}/**/*`,
       `${SERVER_DIR}/**/*`,
@@ -227,7 +239,7 @@ class ModernDevServer extends ModernServer {
       `${sharedDir}/**/*`,
       `${distDir}/${SERVER_BUNDLE_DIRECTORY}/*-server-loaders.js`
     ];
-    const watchOptions = mergeWatchOptions((_a = this.conf.server) == null ? void 0 : _a.watchOptions);
+    const watchOptions = mergeWatchOptions((_this_conf_server = this.conf.server) === null || _this_conf_server === void 0 ? void 0 : _this_conf_server.watchOptions);
     const defaultWatchedPaths = defaultWatched.map((p) => {
       const finalPath = path.isAbsolute(p) ? p : path.join(pwd, p);
       return path.normalize(finalPath);
@@ -248,7 +260,20 @@ class ModernDevServer extends ModernServer {
     });
     this.watcher = watcher;
   }
+  constructor(options) {
+    super(options);
+    _define_property(this, "mockHandler", null);
+    _define_property(this, "dev", void 0);
+    _define_property(this, "appContext", void 0);
+    _define_property(this, "devMiddleware", void 0);
+    _define_property(this, "watcher", void 0);
+    this.appContext = options.appContext;
+    this.workDir = this.pwd;
+    this.dev = this.getDevOptions(options);
+    this.devMiddleware = new DevMiddleware({
+      dev: this.dev,
+      devMiddleware: options.devMiddleware
+    });
+    enableRegister(this.pwd, this.conf);
+  }
 }
-export {
-  ModernDevServer
-};

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

@@ -3,7 +3,7 @@ import { ModernDevServer } from "./devServer";
 const createDevServer = (options) => {
   return new ModernDevServer(options);
 };
-class DevServer extends Server {
+export class DevServer extends Server {
   constructor(options) {
     super(options);
     if (options.dev) {
@@ -11,6 +11,3 @@ class DevServer extends Server {
     }
   }
 }
-export {
-  DevServer
-};

package/dist/esm-node/types.js

@@ -0,0 +1 @@
+export {};

package/package.json

@@ -3,7 +3,11 @@
   "description": "A Progressive React Framework for modern web development.",
   "homepage": "https://modernjs.dev",
   "bugs": "https://github.com/web-infra-dev/modern.js/issues",
-  "repository": "web-infra-dev/modern.js",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/web-infra-dev/modern.js",
+    "directory": "packages/server/server"
+  },
   "license": "MIT",
   "keywords": [
     "react",
@@ -11,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.15.1-alpha.0",
+  "version": "2.17.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -41,10 +45,10 @@
     "minimatch": "^3.0.4",
     "path-to-regexp": "^6.2.0",
     "ws": "^8.2.0",
-    "@modern-js/prod-server": "2.15.0",
-    "@modern-js/types": "2.15.0",
-    "@modern-js/utils": "2.15.0",
-    "@modern-js/server-utils": "2.15.0"
+    "@modern-js/prod-server": "2.17.0",
+    "@modern-js/server-utils": "2.17.0",
+    "@modern-js/types": "2.17.0",
+    "@modern-js/utils": "2.17.0"
   },
   "devDependencies": {
     "@types/connect-history-api-fallback": "^1.3.5",
@@ -59,9 +63,9 @@
     "typescript": "^4",
     "webpack": "^5.76.2",
     "websocket": "^1",
-    "@scripts/build": "2.15.0",
-    "@modern-js/server-core": "2.15.0",
-    "@scripts/jest-config": "2.15.0"
+    "@modern-js/server-core": "2.17.0",
+    "@scripts/jest-config": "2.17.0",
+    "@scripts/build": "2.17.0"
   },
   "peerDependencies": {
     "devcert": "^1.0.0",

package/dist/js/modern/constants.js

@@ -1,19 +0,0 @@
-import { getIpv4Interfaces, HMR_SOCK_PATH } from "@modern-js/utils";
-const getDefaultDevOptions = () => {
-  const network = getIpv4Interfaces().find((item) => !item.internal);
-  return {
-    client: {
-      port: "8080",
-      path: HMR_SOCK_PATH,
-      host: (network == null ? void 0 : network.address) || "localhost"
-    },
-    https: false,
-    devMiddleware: { writeToDisk: true },
-    watch: true,
-    hot: true,
-    liveReload: true
-  };
-};
-export {
-  getDefaultDevOptions
-};

package/dist/js/modern/dev-tools/dev-middleware/hmr-client/createSocketUrl.js

@@ -1,41 +0,0 @@
-import { HMR_SOCK_PATH } from "@modern-js/utils/constants";
-function createSocketUrl(resourceQuery) {
-  const searchParams = resourceQuery.substr(1).split("&");
-  const options = {};
-  for (const pair of searchParams) {
-    const ary = pair.split("=");
-    options[ary[0]] = decodeURIComponent(ary[1]);
-  }
-  const currentLocation = self.location;
-  return getSocketUrl(options, currentLocation);
-}
-function formatURL({
-  port,
-  protocol,
-  hostname,
-  pathname
-}) {
-  if (window.URL) {
-    const url = new URL("http://localhost");
-    url.port = port;
-    url.hostname = hostname;
-    url.protocol = protocol;
-    url.pathname = pathname;
-    return url.toString();
-  }
-  const colon = protocol.indexOf(":") === -1 ? ":" : "";
-  return `${protocol}${colon}//${hostname}:${port}${pathname}`;
-}
-function getSocketUrl(urlParts, location) {
-  const { host, port, path, protocol } = urlParts;
-  return formatURL({
-    protocol: protocol || (location.protocol === "https:" ? "wss" : "ws"),
-    hostname: host || location.hostname,
-    port: port || location.port,
-    pathname: path || HMR_SOCK_PATH
-  });
-}
-export {
-  createSocketUrl,
-  formatURL
-};

package/dist/js/modern/dev-tools/dev-middleware/hmr-client/index.js

@@ -1,143 +0,0 @@
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __commonJS = (cb, mod) => function __require() {
-  return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
-};
-import stripAnsi from "@modern-js/utils/strip-ansi";
-import { formatWebpackMessages } from "@modern-js/utils/format";
-import { createSocketUrl } from "./createSocketUrl";
-var require_hmr_client = __commonJS({
-  "src/dev-tools/dev-middleware/hmr-client/index.ts"(exports, module) {
-    const hadRuntimeError = false;
-    const socketUrl = createSocketUrl(__resourceQuery);
-    const connection = new WebSocket(socketUrl);
-    connection.onclose = function() {
-      if (typeof console !== "undefined" && typeof console.info === "function") {
-        console.info(
-          "The development server has disconnected.\nRefresh the page if necessary."
-        );
-      }
-    };
-    let isFirstCompilation = true;
-    let mostRecentCompilationHash = null;
-    let hasCompileErrors = false;
-    function clearOutdatedErrors() {
-      if (typeof console !== "undefined" && typeof console.clear === "function") {
-        if (hasCompileErrors) {
-          console.clear();
-        }
-      }
-    }
-    function handleSuccess() {
-      clearOutdatedErrors();
-      const isHotUpdate = !isFirstCompilation;
-      isFirstCompilation = false;
-      hasCompileErrors = false;
-      if (isHotUpdate) {
-        tryApplyUpdates();
-      }
-    }
-    function handleWarnings(warnings) {
-      clearOutdatedErrors();
-      const isHotUpdate = !isFirstCompilation;
-      isFirstCompilation = false;
-      hasCompileErrors = false;
-      function printWarnings() {
-        const formatted = formatWebpackMessages({
-          warnings,
-          errors: []
-        });
-        if (typeof console !== "undefined" && typeof console.warn === "function") {
-          for (let i = 0; i < formatted.warnings.length; i++) {
-            if (i === 5) {
-              console.warn(
-                "There were more warnings in other files.\nYou can find a complete log in the terminal."
-              );
-              break;
-            }
-            console.warn(stripAnsi(formatted.warnings[i]));
-          }
-        }
-      }
-      printWarnings();
-      if (isHotUpdate) {
-        tryApplyUpdates();
-      }
-    }
-    function handleErrors(errors) {
-      clearOutdatedErrors();
-      isFirstCompilation = false;
-      hasCompileErrors = true;
-      const formatted = formatWebpackMessages({
-        errors,
-        warnings: []
-      });
-      if (typeof console !== "undefined" && typeof console.error === "function") {
-        for (const error of formatted.errors) {
-          console.error(stripAnsi(error));
-        }
-      }
-    }
-    function handleAvailableHash(hash) {
-      mostRecentCompilationHash = hash;
-    }
-    connection.onmessage = function(e) {
-      const message = JSON.parse(e.data);
-      switch (message.type) {
-        case "hash":
-          handleAvailableHash(message.data);
-          break;
-        case "still-ok":
-        case "ok":
-          handleSuccess();
-          break;
-        case "content-changed":
-          window.location.reload();
-          break;
-        case "warnings":
-          handleWarnings(message.data);
-          break;
-        case "errors":
-          handleErrors(message.data);
-          break;
-        default:
-      }
-    };
-    function isUpdateAvailable() {
-      return mostRecentCompilationHash !== __webpack_hash__;
-    }
-    function canApplyUpdates() {
-      return module.hot.status() === "idle";
-    }
-    function tryApplyUpdates() {
-      if (!module.hot) {
-        window.location.reload();
-        return;
-      }
-      if (!isUpdateAvailable() || !canApplyUpdates()) {
-        return;
-      }
-      function handleApplyUpdates(err, updatedModules) {
-        const wantsForcedReload = err || !updatedModules || hadRuntimeError;
-        if (wantsForcedReload) {
-          window.location.reload();
-          return;
-        }
-        if (isUpdateAvailable()) {
-          tryApplyUpdates();
-        }
-      }
-      const result = module.hot.check(true, handleApplyUpdates);
-      if (result == null ? void 0 : result.then) {
-        result.then(
-          (updatedModules) => {
-            handleApplyUpdates(null, updatedModules);
-          },
-          (err) => {
-            handleApplyUpdates(err, null);
-          }
-        );
-      }
-    }
-  }
-});
-export default require_hmr_client();

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

@@ -1,94 +0,0 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __async = (__this, __arguments, generator) => {
-  return new Promise((resolve, reject) => {
-    var fulfilled = (value) => {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var rejected = (value) => {
-      try {
-        step(generator.throw(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
-    step((generator = generator.apply(__this, __arguments)).next());
-  });
-};
-import { EventEmitter } from "events";
-import SocketServer from "./socket-server";
-const noop = () => {
-};
-function getHMRClientPath(client) {
-  const protocol = (client == null ? void 0 : client.protocol) ? `&protocol=${client.protocol}` : "";
-  const host = (client == null ? void 0 : client.host) ? `&host=${client.host}` : "";
-  const path = (client == null ? void 0 : client.path) ? `&path=${client.path}` : "";
-  const port = (client == null ? void 0 : client.port) ? `&port=${client.port}` : "";
-  const clientEntry = `${require.resolve("./hmr-client")}?${host}${path}${port}${protocol}`;
-  return clientEntry;
-}
-class DevMiddleware extends EventEmitter {
-  constructor({ dev, devMiddleware }) {
-    super();
-    this.devOptions = dev;
-    this.socketServer = new SocketServer(dev);
-    if (devMiddleware) {
-      this.middleware = this.setupDevMiddleware(devMiddleware);
-    }
-  }
-  init(app) {
-    app.on("listening", () => {
-      this.socketServer.prepare(app);
-    });
-    app.on("close", () => __async(this, null, function* () {
-      var _a;
-      (_a = this.middleware) == null ? void 0 : _a.close(noop);
-      this.socketServer.close();
-    }));
-  }
-  sockWrite(type, data) {
-    this.socketServer.sockWrite(type, data);
-  }
-  setupDevMiddleware(devMiddleware) {
-    const { devOptions } = this;
-    const callbacks = {
-      onInvalid: () => {
-        this.socketServer.sockWrite("invalid");
-      },
-      onDone: (stats) => {
-        this.socketServer.updateStats(stats);
-        this.emit("change", stats);
-      }
-    };
-    const enableHMR = this.devOptions.hot || this.devOptions.liveReload;
-    const middleware = devMiddleware(__spreadValues({
-      headers: devOptions.headers,
-      stats: false,
-      callbacks,
-      hmrClientPath: enableHMR ? getHMRClientPath(devOptions.client) : void 0
-    }, devOptions.devMiddleware));
-    return middleware;
-  }
-}
-export {
-  DevMiddleware as default
-};