@modern-js/server 2.48.5 → 2.49.0

package/dist/cjs/server/devServerOld.js

@@ -1,346 +0,0 @@
-"use strict";
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var devServerOld_exports = {};
-__export(devServerOld_exports, {
-  ModernDevServer: () => ModernDevServer
-});
-module.exports = __toCommonJS(devServerOld_exports);
-var import_http = require("http");
-var import_path = __toESM(require("path"));
-var import_https = require("https");
-var import_utils = require("@modern-js/utils");
-var import_prod_server = require("@modern-js/prod-server");
-var import_lodash = require("@modern-js/utils/lodash");
-var import_fileReader = require("@modern-js/runtime-utils/fileReader");
-var import_constants = require("../constants");
-var import_mock = require("../dev-tools/mock");
-var import_register = require("../dev-tools/register");
-var import_watcher = __toESM(require("../dev-tools/watcher"));
-var import_dev_middleware = __toESM(require("../dev-tools/dev-middleware"));
-var import_workerSSRRender = require("./workerSSRRender");
-class ModernDevServer extends import_prod_server.ModernServer {
-  getDevOptions(options) {
-    const devOptions = typeof options.dev === "boolean" ? {} : options.dev;
-    const defaultOptions = (0, import_constants.getDefaultDevOptions)();
-    return (0, import_lodash.merge)(defaultOptions, devOptions);
-  }
-  addMiddlewareHandler(handlers) {
-    handlers.forEach((handler) => {
-      this.addHandler((ctx, next) => {
-        const { req, res } = ctx;
-        return handler(req, res, next);
-      });
-    });
-  }
-  applySetupMiddlewares() {
-    const setupMiddlewares = this.dev.setupMiddlewares || [];
-    const serverOptions = {
-      sockWrite: (type, data) => this.devMiddleware.sockWrite(type, data)
-    };
-    const befores = [];
-    const afters = [];
-    setupMiddlewares.forEach((handler) => {
-      handler({
-        unshift: (...handlers) => befores.unshift(...handlers),
-        push: (...handlers) => afters.push(...handlers)
-      }, serverOptions);
-    });
-    return {
-      befores,
-      afters
-    };
-  }
-  // Complete the preparation of services
-  async onInit(runner, app) {
-    this.runner = runner;
-    const { dev } = this;
-    const { befores, afters } = this.applySetupMiddlewares();
-    const beforeHandlers = this.dev.before || [];
-    this.addMiddlewareHandler([
-      ...beforeHandlers,
-      ...befores
-    ]);
-    await this.applyDefaultMiddlewares(app);
-    const afterHandlers = this.dev.after || [];
-    this.addMiddlewareHandler([
-      ...afters,
-      ...afterHandlers
-    ]);
-    this.initFileReader();
-    await super.onInit(runner, app);
-    if (dev.watch) {
-      this.startWatcher();
-      app.on("close", async () => {
-        var _this_watcher;
-        await ((_this_watcher = this.watcher) === null || _this_watcher === void 0 ? void 0 : _this_watcher.close());
-      });
-    }
-  }
-  // override the ModernServer renderHandler logic
-  getRenderHandler() {
-    if (this.useSSRWorker) {
-      var _this_conf_server, _conf_security;
-      const { distDir, staticGenerate, conf, metaName } = this;
-      const ssrConfig = (_this_conf_server = this.conf.server) === null || _this_conf_server === void 0 ? void 0 : _this_conf_server.ssr;
-      const forceCSR = typeof ssrConfig === "object" ? ssrConfig.forceCSR : false;
-      return (0, import_prod_server.createRenderHandler)({
-        ssrRender: import_workerSSRRender.workerSSRRender,
-        distDir,
-        staticGenerate,
-        conf,
-        forceCSR,
-        nonce: (_conf_security = conf.security) === null || _conf_security === void 0 ? void 0 : _conf_security.nonce,
-        metaName
-      });
-    }
-    return super.getRenderHandler();
-  }
-  initFileReader() {
-    var _this_dev_devMiddleware, _this_dev;
-    let isInit = false;
-    if (((_this_dev = this.dev) === null || _this_dev === void 0 ? void 0 : (_this_dev_devMiddleware = _this_dev.devMiddleware) === null || _this_dev_devMiddleware === void 0 ? void 0 : _this_dev_devMiddleware.writeToDisk) === false) {
-      this.addHandler((ctx, next) => {
-        var _ctx_res_locals;
-        if (isInit) {
-          return next();
-        }
-        isInit = true;
-        if (!((_ctx_res_locals = ctx.res.locals) === null || _ctx_res_locals === void 0 ? void 0 : _ctx_res_locals.webpack)) {
-          import_fileReader.fileReader.reset();
-          return next();
-        }
-        const { devMiddleware: webpackDevMid } = ctx.res.locals.webpack;
-        const { outputFileSystem } = webpackDevMid;
-        if (outputFileSystem) {
-          import_fileReader.fileReader.reset(outputFileSystem);
-        } else {
-          import_fileReader.fileReader.reset();
-        }
-        return next();
-      });
-    }
-  }
-  async applyDefaultMiddlewares(app) {
-    const { pwd, dev, devMiddleware, conf } = this;
-    const isUseStreamingSSR = (routes) => routes === null || routes === void 0 ? void 0 : routes.some((r) => r.isStream === true);
-    const isUseSSRPreload = () => {
-      const { server: { ssr, ssrByEntries } } = conf;
-      const checkUsePreload = (ssr2) => typeof ssr2 === "object" && Boolean(ssr2.preload);
-      return checkUsePreload(ssr) || Object.values(ssrByEntries || {}).some((ssr2) => checkUsePreload(ssr2));
-    };
-    if (!isUseStreamingSSR(this.getRoutes()) && !isUseSSRPreload() && dev.compress) {
-      const { default: compression } = await Promise.resolve().then(() => __toESM(require("http-compression")));
-      this.addHandler((ctx, next) => {
-        compression({
-          gzip: true,
-          brotli: false
-        })(ctx.req, ctx.res, next);
-      });
-    }
-    this.addHandler((ctx, next) => {
-      ctx.res.setHeader("Access-Control-Allow-Origin", "*");
-      if (ctx.path.includes("hot-update")) {
-        ctx.res.setHeader("Access-Control-Allow-Credentials", "false");
-      }
-      const confHeaders = dev.headers;
-      if (confHeaders) {
-        for (const [key, value] of Object.entries(confHeaders)) {
-          ctx.res.setHeader(key, value);
-        }
-      }
-      next();
-    });
-    this.mockHandler = (0, import_mock.createMockHandler)({
-      pwd
-    });
-    this.addHandler((ctx, next) => {
-      if (this.mockHandler) {
-        this.mockHandler(ctx, next);
-      } else {
-        next();
-      }
-    });
-    if (dev.proxy) {
-      const { handlers, handleUpgrade } = (0, import_prod_server.createProxyHandler)(dev.proxy);
-      app && handleUpgrade(app);
-      handlers.forEach((handler) => {
-        this.addHandler(handler);
-      });
-    }
-    devMiddleware.init(app);
-    devMiddleware.on("change", (stats) => {
-      if (stats.toJson({
-        all: false
-      }).name !== "server") {
-        this.onRepack({
-          routes: this.getRoutes()
-        });
-      }
-    });
-    this.addHandler((ctx, next) => {
-      const { req, res } = ctx;
-      if (devMiddleware.middleware) {
-        devMiddleware.middleware(req, res, next);
-      } else {
-        next();
-      }
-    });
-    if (dev.historyApiFallback) {
-      const { default: connectHistoryApiFallback } = await Promise.resolve().then(() => __toESM(require("connect-history-api-fallback")));
-      const historyApiFallbackMiddleware = connectHistoryApiFallback(typeof dev.historyApiFallback === "boolean" ? {} : dev.historyApiFallback);
-      this.addHandler((ctx, next) => historyApiFallbackMiddleware(ctx.req, ctx.res, next));
-    }
-  }
-  onRepack(options = {}) {
-    if (Array.isArray(options.routes)) {
-      this.router.reset(this.filterRoutes(options.routes));
-    }
-    this.cleanSSRCache();
-    import_fileReader.fileReader.reset();
-    this.runner.repack();
-    super.onRepack(options);
-  }
-  async createHTTPServer(handler) {
-    const { dev } = this;
-    const devHttpsOption = typeof dev === "object" && dev.https;
-    if (devHttpsOption) {
-      const { genHttpsOptions } = require("../dev-tools/https");
-      const httpsOptions = await genHttpsOptions(devHttpsOption, this.pwd);
-      return (0, import_https.createServer)(httpsOptions, handler);
-    } else {
-      return (0, import_http.createServer)(handler);
-    }
-  }
-  warmupSSRBundle() {
-  }
-  async onServerChange({ filepath, event }) {
-    const { pwd } = this;
-    const { mock } = import_prod_server.AGGRED_DIR;
-    const mockPath = import_path.default.normalize(import_path.default.join(pwd, mock));
-    this.runner.reset();
-    if (filepath.startsWith(mockPath)) {
-      this.mockHandler = (0, import_mock.createMockHandler)({
-        pwd
-      });
-    } else {
-      try {
-        const success = this.runner.onApiChange([
-          {
-            filename: filepath,
-            event
-          }
-        ]);
-        if (success !== true) {
-          await super.onServerChange({
-            filepath
-          });
-        }
-      } catch (e) {
-        this.logger.error(e);
-      }
-    }
-  }
-  createContext(req, res) {
-    return super.createContext(req, res, {
-      etag: true,
-      metaName: this.metaName
-    });
-  }
-  setupStaticMiddleware(_) {
-    return async (context, next) => {
-      return next();
-    };
-  }
-  cleanSSRCache() {
-    const { distDir } = this;
-    const bundles = this.router.getBundles();
-    bundles.forEach((bundle) => {
-      const filepath = import_path.default.join(distDir, bundle);
-      if (require.cache[filepath]) {
-        delete require.cache[filepath];
-      }
-    });
-    const loadable = import_path.default.join(distDir, import_utils.LOADABLE_STATS_FILE);
-    if (require.cache[loadable]) {
-      delete require.cache[loadable];
-    }
-  }
-  startWatcher() {
-    var _this_conf_server;
-    const { pwd, distDir, appContext } = this;
-    const { mock } = import_prod_server.AGGRED_DIR;
-    const apiDir = (appContext === null || appContext === void 0 ? void 0 : appContext.apiDirectory) || import_utils.API_DIR;
-    const sharedDir = (appContext === null || appContext === void 0 ? void 0 : appContext.sharedDirectory) || import_utils.SHARED_DIR;
-    const defaultWatched = [
-      `${mock}/**/*`,
-      `${import_utils.SERVER_DIR}/**/*`,
-      `${apiDir}/**`,
-      `${sharedDir}/**/*`,
-      `${distDir}/${import_utils.SERVER_BUNDLE_DIRECTORY}/*-server-loaders.js`
-    ];
-    const watchOptions = (0, import_watcher.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 = import_path.default.isAbsolute(p) ? p : import_path.default.join(pwd, p);
-      return import_path.default.normalize(finalPath);
-    });
-    const watcher = new import_watcher.default();
-    watcher.createDepTree();
-    watcher.listen(defaultWatchedPaths, watchOptions, (filepath, event) => {
-      if (filepath.includes("-server-loaders.js")) {
-        delete require.cache[filepath];
-        return;
-      } else {
-        watcher.updateDepTree();
-        watcher.cleanDepCache(filepath);
-      }
-      this.onServerChange({
-        filepath,
-        event
-      });
-    });
-    this.watcher = watcher;
-  }
-  constructor(options) {
-    super(options);
-    this.mockHandler = null;
-    this.appContext = options.appContext;
-    this.workDir = this.pwd;
-    this.useSSRWorker = Boolean(options.useSSRWorker);
-    this.dev = this.getDevOptions(options);
-    this.devMiddleware = new import_dev_middleware.default({
-      dev: this.dev,
-      devMiddleware: options.devMiddleware
-    });
-    (0, import_register.enableRegister)(this.pwd, this.conf);
-  }
-}
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  ModernDevServer
-});

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

@@ -1,54 +0,0 @@
-import { HMR_SOCK_PATH } from "@modern-js/utils/universal/constants";
-function createSocketUrl(resourceQuery) {
-  var searchParams = resourceQuery.substr(1).split("&");
-  var options = {};
-  var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
-  try {
-    for (var _iterator = searchParams[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
-      var pair = _step.value;
-      var ary = pair.split("=");
-      options[ary[0]] = decodeURIComponent(ary[1]);
-    }
-  } catch (err) {
-    _didIteratorError = true;
-    _iteratorError = err;
-  } finally {
-    try {
-      if (!_iteratorNormalCompletion && _iterator.return != null) {
-        _iterator.return();
-      }
-    } finally {
-      if (_didIteratorError) {
-        throw _iteratorError;
-      }
-    }
-  }
-  var currentLocation = self.location;
-  return getSocketUrl(options, currentLocation);
-}
-function formatURL(param) {
-  var port = param.port, protocol = param.protocol, hostname = param.hostname, pathname = param.pathname;
-  if (typeof URL !== "undefined") {
-    var url = new URL("http://localhost");
-    url.port = port;
-    url.hostname = hostname;
-    url.protocol = protocol;
-    url.pathname = pathname;
-    return url.toString();
-  }
-  var colon = protocol.indexOf(":") === -1 ? ":" : "";
-  return "".concat(protocol).concat(colon, "//").concat(hostname, ":").concat(port).concat(pathname);
-}
-function getSocketUrl(urlParts, location) {
-  var host = urlParts.host, port = urlParts.port, path = urlParts.path, protocol = urlParts.protocol;
-  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/esm/dev-tools/dev-middleware/hmr-client/index.js

@@ -1,162 +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/universal/format-webpack";
-import { createSocketUrl } from "./createSocketUrl";
-var require_hmr_client = __commonJS({
-  "src/dev-tools/dev-middleware/hmr-client/index.ts"(exports, module) {
-    var hadRuntimeError = false;
-    var socketUrl = createSocketUrl(__resourceQuery);
-    var connection = new WebSocket(socketUrl);
-    connection.onopen = function() {
-      if (typeof console !== "undefined" && typeof console.info === "function") {
-        console.info("[HMR] connected.");
-      }
-    };
-    connection.onclose = function() {
-      if (typeof console !== "undefined" && typeof console.info === "function") {
-        console.info("[HMR] disconnected. Refresh the page if necessary.");
-      }
-    };
-    var isFirstCompilation = true;
-    var mostRecentCompilationHash = null;
-    var hasCompileErrors = false;
-    function clearOutdatedErrors() {
-      if (typeof console !== "undefined" && typeof console.clear === "function") {
-        if (hasCompileErrors) {
-          console.clear();
-        }
-      }
-    }
-    function handleSuccess() {
-      clearOutdatedErrors();
-      var isHotUpdate = !isFirstCompilation;
-      isFirstCompilation = false;
-      hasCompileErrors = false;
-      if (isHotUpdate) {
-        tryApplyUpdates();
-      }
-    }
-    function handleWarnings(warnings) {
-      clearOutdatedErrors();
-      var isHotUpdate = !isFirstCompilation;
-      isFirstCompilation = false;
-      hasCompileErrors = false;
-      function printWarnings() {
-        var formatted = formatWebpackMessages({
-          warnings,
-          errors: []
-        });
-        if (typeof console !== "undefined" && typeof console.warn === "function") {
-          for (var 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;
-      var formatted = formatWebpackMessages({
-        errors,
-        warnings: []
-      });
-      if (typeof console !== "undefined" && typeof console.error === "function") {
-        var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
-        try {
-          for (var _iterator = formatted.errors[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
-            var error = _step.value;
-            console.error(stripAnsi(error));
-          }
-        } catch (err) {
-          _didIteratorError = true;
-          _iteratorError = err;
-        } finally {
-          try {
-            if (!_iteratorNormalCompletion && _iterator.return != null) {
-              _iterator.return();
-            }
-          } finally {
-            if (_didIteratorError) {
-              throw _iteratorError;
-            }
-          }
-        }
-      }
-    }
-    function handleAvailableHash(hash) {
-      mostRecentCompilationHash = hash;
-    }
-    connection.onmessage = function(e) {
-      var 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) {
-        var wantsForcedReload = err || !updatedModules || hadRuntimeError;
-        if (wantsForcedReload) {
-          window.location.reload();
-          return;
-        }
-        if (isUpdateAvailable()) {
-          tryApplyUpdates();
-        }
-      }
-      var result = module.hot.check(
-        /* autoApply */
-        true,
-        handleApplyUpdates
-      );
-      if (result === null || result === void 0 ? void 0 : result.then) {
-        result.then(function(updatedModules) {
-          handleApplyUpdates(null, updatedModules);
-        }, function(err) {
-          handleApplyUpdates(err, null);
-        });
-      }
-    }
-  }
-});
-export default require_hmr_client();

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

@@ -1,82 +0,0 @@
-import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
-import { _ as _class_call_check } from "@swc/helpers/_/_class_call_check";
-import { _ as _inherits } from "@swc/helpers/_/_inherits";
-import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
-import { _ as _create_super } from "@swc/helpers/_/_create_super";
-import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
-import { EventEmitter } from "events";
-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) : "";
-  var host = (client === null || client === void 0 ? void 0 : client.host) ? "&host=".concat(client.host) : "";
-  var path = (client === null || client === void 0 ? void 0 : client.path) ? "&path=".concat(client.path) : "";
-  var port = (client === null || client === void 0 ? void 0 : client.port) ? "&port=".concat(client.port) : "";
-  var clientEntry = "".concat(require.resolve("@modern-js/server/hmr-client"), "?").concat(host).concat(path).concat(port).concat(protocol);
-  return clientEntry;
-}
-var DevMiddleware = /* @__PURE__ */ function(EventEmitter2) {
-  "use strict";
-  _inherits(DevMiddleware2, EventEmitter2);
-  var _super = _create_super(DevMiddleware2);
-  function DevMiddleware2(param) {
-    var dev = param.dev, devMiddleware = param.devMiddleware;
-    _class_call_check(this, DevMiddleware2);
-    var _this;
-    _this = _super.call(this);
-    _this.devOptions = dev;
-    _this.socketServer = new SocketServer(dev);
-    if (devMiddleware) {
-      _this.middleware = _this.setupDevMiddleware(devMiddleware);
-    }
-    return _this;
-  }
-  var _proto = DevMiddleware2.prototype;
-  _proto.init = function init(app) {
-    var _this = this;
-    app.on("listening", function() {
-      _this.socketServer.prepare(app);
-    });
-    var _this1 = this;
-    app.on("close", /* @__PURE__ */ _async_to_generator(function() {
-      var _this_middleware;
-      return _ts_generator(this, function(_state) {
-        (_this_middleware = _this1.middleware) === null || _this_middleware === void 0 ? void 0 : _this_middleware.close(noop);
-        _this1.socketServer.close();
-        return [
-          2
-        ];
-      });
-    }));
-  };
-  _proto.sockWrite = function sockWrite(type, data) {
-    this.socketServer.sockWrite(type, data);
-  };
-  _proto.setupDevMiddleware = function setupDevMiddleware(devMiddleware) {
-    var _this = this;
-    var devOptions = this.devOptions;
-    var callbacks = {
-      onInvalid: function() {
-        _this.socketServer.sockWrite("invalid");
-      },
-      onDone: function(stats) {
-        _this.socketServer.updateStats(stats);
-        _this.emit("change", stats);
-      }
-    };
-    var enableHMR = this.devOptions.hot || this.devOptions.liveReload;
-    var middleware = devMiddleware(_object_spread({
-      headers: devOptions.headers,
-      stats: false,
-      callbacks,
-      hmrClientPath: enableHMR ? getHMRClientPath(devOptions.client) : void 0,
-      serverSideRender: true
-    }, devOptions.devMiddleware));
-    return middleware;
-  };
-  return DevMiddleware2;
-}(EventEmitter);
-export {
-  DevMiddleware as default
-};