@modern-js/server 2.49.2 → 2.49.4

package/dist/cjs/createDevServer.js

@@ -48,16 +48,24 @@ const createDevServer = async (options, initProdMiddlewares) => {
   };
   const server = (0, import_base.createServerBase)(prodServerOptions);
   const closeCb = [];
+  const { middlewares: rsbuildMiddlewares, close, onHTTPUpgrade } = (getMiddlewares === null || getMiddlewares === void 0 ? void 0 : getMiddlewares()) || {};
+  close && closeCb.push(close);
+  rsbuildMiddlewares && server.all("*", (0, import_node.connectMid2HonoMid)(rsbuildMiddlewares));
   await (0, import_node.registerMockHandlers)({
     pwd,
     server
   });
-  const { middlewares: rsbuildMiddlewares, close, onHTTPUpgrade } = (getMiddlewares === null || getMiddlewares === void 0 ? void 0 : getMiddlewares()) || {};
-  close && closeCb.push(close);
-  rsbuildMiddlewares && server.all("*", (0, import_node.connectMid2HonoMid)(rsbuildMiddlewares));
   server.use("*", (0, import_helpers.initFileReader)());
   await server.init();
-  const nodeServer = (0, import_node.createNodeServer)(server.handle.bind(server));
+  const devHttpsOption = typeof dev === "object" && dev.https;
+  let nodeServer;
+  if (devHttpsOption) {
+    const { genHttpsOptions } = await Promise.resolve().then(() => __toESM(require("./dev-tools/https")));
+    const httpsOptions = await genHttpsOptions(devHttpsOption, pwd);
+    nodeServer = await (0, import_node.createNodeServer)(server.handle.bind(server), httpsOptions);
+  } else {
+    nodeServer = await (0, import_node.createNodeServer)(server.handle.bind(server));
+  }
   rsbuild === null || rsbuild === void 0 ? void 0 : rsbuild.onDevCompileDone(({ stats }) => {
     if (stats.toJson({
       all: false

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

@@ -0,0 +1,54 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+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 __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var https_exports = {};
+__export(https_exports, {
+  genHttpsOptions: () => genHttpsOptions
+});
+module.exports = __toCommonJS(https_exports);
+var import_utils = require("@modern-js/utils");
+const genHttpsOptions = async (userOptions, pwd) => {
+  const httpsOptions = typeof userOptions === "boolean" ? {} : userOptions;
+  if (!httpsOptions.key || !httpsOptions.cert) {
+    let devcertPath;
+    try {
+      devcertPath = require.resolve("devcert", {
+        paths: [
+          pwd,
+          __dirname
+        ]
+      });
+    } catch (err) {
+      const packageManager = await (0, import_utils.getPackageManager)(pwd);
+      const command = import_utils.chalk.yellow.bold(`${packageManager} add devcert@1.2.2 -D`);
+      import_utils.logger.error(`You have enabled "dev.https" option, but the "devcert" package is not installed.`);
+      import_utils.logger.error(`Please run ${command} to install manually, otherwise the https can not work.`);
+      throw new Error('[https] "devcert" is not found.');
+    }
+    const devcert = require(devcertPath);
+    const selfsign = await devcert.certificateFor([
+      "localhost"
+    ]);
+    return selfsign;
+  }
+  return httpsOptions;
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  genHttpsOptions
+});

package/dist/esm/createDevServer.js

@@ -9,7 +9,7 @@ import { API_DIR, SHARED_DIR } from "@modern-js/utils";
 import { startWatcher, onRepack, getDevOptions, initFileReader } from "./helpers";
 var createDevServer = function() {
   var _ref = _async_to_generator(function(options, initProdMiddlewares) {
-    var config, pwd, _options_routes, routes, getMiddlewares, rsbuild, appContext, dev, distDir, apiDir, sharedDir, prodServerOptions, server, closeCb, _ref2, rsbuildMiddlewares, close, onHTTPUpgrade, nodeServer, watchOptions, watcher;
+    var config, pwd, _options_routes, routes, getMiddlewares, rsbuild, appContext, dev, distDir, apiDir, sharedDir, prodServerOptions, server, closeCb, _ref2, rsbuildMiddlewares, close, onHTTPUpgrade, devHttpsOption, nodeServer, genHttpsOptions, httpsOptions, watchOptions, watcher;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
@@ -23,6 +23,9 @@ var createDevServer = function() {
           });
           server = createServerBase(prodServerOptions);
           closeCb = [];
+          _ref2 = (getMiddlewares === null || getMiddlewares === void 0 ? void 0 : getMiddlewares()) || {}, rsbuildMiddlewares = _ref2.middlewares, close = _ref2.close, onHTTPUpgrade = _ref2.onHTTPUpgrade;
+          close && closeCb.push(close);
+          rsbuildMiddlewares && server.all("*", connectMid2HonoMid(rsbuildMiddlewares));
           return [
             4,
             registerMockHandlers({
@@ -32,9 +35,6 @@ var createDevServer = function() {
           ];
         case 1:
           _state.sent();
-          _ref2 = (getMiddlewares === null || getMiddlewares === void 0 ? void 0 : getMiddlewares()) || {}, rsbuildMiddlewares = _ref2.middlewares, close = _ref2.close, onHTTPUpgrade = _ref2.onHTTPUpgrade;
-          close && closeCb.push(close);
-          rsbuildMiddlewares && server.all("*", connectMid2HonoMid(rsbuildMiddlewares));
           server.use("*", initFileReader());
           return [
             4,
@@ -42,7 +42,43 @@ var createDevServer = function() {
           ];
         case 2:
           _state.sent();
-          nodeServer = createNodeServer(server.handle.bind(server));
+          devHttpsOption = typeof dev === "object" && dev.https;
+          if (!devHttpsOption)
+            return [
+              3,
+              6
+            ];
+          return [
+            4,
+            import("./dev-tools/https")
+          ];
+        case 3:
+          genHttpsOptions = _state.sent().genHttpsOptions;
+          return [
+            4,
+            genHttpsOptions(devHttpsOption, pwd)
+          ];
+        case 4:
+          httpsOptions = _state.sent();
+          return [
+            4,
+            createNodeServer(server.handle.bind(server), httpsOptions)
+          ];
+        case 5:
+          nodeServer = _state.sent();
+          return [
+            3,
+            8
+          ];
+        case 6:
+          return [
+            4,
+            createNodeServer(server.handle.bind(server))
+          ];
+        case 7:
+          nodeServer = _state.sent();
+          _state.label = 8;
+        case 8:
           rsbuild === null || rsbuild === void 0 ? void 0 : rsbuild.onDevCompileDone(function(param) {
             var stats = param.stats;
             if (stats.toJson({
@@ -58,13 +94,13 @@ var createDevServer = function() {
               app: nodeServer
             })
           ];
-        case 3:
+        case 9:
           _state.sent();
           return [
             4,
             initProdMiddlewares(server, prodServerOptions)
           ];
-        case 4:
+        case 10:
           _state.sent();
           if (dev.watch) {
             watchOptions = config.server.watchOptions;

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

@@ -0,0 +1,74 @@
+import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
+import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
+import { chalk, getPackageManager, logger } from "@modern-js/utils";
+var genHttpsOptions = function() {
+  var _ref = _async_to_generator(function(userOptions, pwd) {
+    var httpsOptions, devcertPath, err, packageManager, command, devcert, selfsign;
+    return _ts_generator(this, function(_state) {
+      switch (_state.label) {
+        case 0:
+          httpsOptions = typeof userOptions === "boolean" ? {} : userOptions;
+          if (!(!httpsOptions.key || !httpsOptions.cert))
+            return [
+              3,
+              6
+            ];
+          _state.label = 1;
+        case 1:
+          _state.trys.push([
+            1,
+            2,
+            ,
+            4
+          ]);
+          devcertPath = require.resolve("devcert", {
+            paths: [
+              pwd,
+              __dirname
+            ]
+          });
+          return [
+            3,
+            4
+          ];
+        case 2:
+          err = _state.sent();
+          return [
+            4,
+            getPackageManager(pwd)
+          ];
+        case 3:
+          packageManager = _state.sent();
+          command = chalk.yellow.bold("".concat(packageManager, " add devcert@1.2.2 -D"));
+          logger.error('You have enabled "dev.https" option, but the "devcert" package is not installed.');
+          logger.error("Please run ".concat(command, " to install manually, otherwise the https can not work."));
+          throw new Error('[https] "devcert" is not found.');
+        case 4:
+          devcert = require(devcertPath);
+          return [
+            4,
+            devcert.certificateFor([
+              "localhost"
+            ])
+          ];
+        case 5:
+          selfsign = _state.sent();
+          return [
+            2,
+            selfsign
+          ];
+        case 6:
+          return [
+            2,
+            httpsOptions
+          ];
+      }
+    });
+  });
+  return function genHttpsOptions2(userOptions, pwd) {
+    return _ref.apply(this, arguments);
+  };
+}();
+export {
+  genHttpsOptions
+};

package/dist/esm-node/createDevServer.js

@@ -15,16 +15,24 @@ const createDevServer = async (options, initProdMiddlewares) => {
   };
   const server = createServerBase(prodServerOptions);
   const closeCb = [];
+  const { middlewares: rsbuildMiddlewares, close, onHTTPUpgrade } = (getMiddlewares === null || getMiddlewares === void 0 ? void 0 : getMiddlewares()) || {};
+  close && closeCb.push(close);
+  rsbuildMiddlewares && server.all("*", connectMid2HonoMid(rsbuildMiddlewares));
   await registerMockHandlers({
     pwd,
     server
   });
-  const { middlewares: rsbuildMiddlewares, close, onHTTPUpgrade } = (getMiddlewares === null || getMiddlewares === void 0 ? void 0 : getMiddlewares()) || {};
-  close && closeCb.push(close);
-  rsbuildMiddlewares && server.all("*", connectMid2HonoMid(rsbuildMiddlewares));
   server.use("*", initFileReader());
   await server.init();
-  const nodeServer = createNodeServer(server.handle.bind(server));
+  const devHttpsOption = typeof dev === "object" && dev.https;
+  let nodeServer;
+  if (devHttpsOption) {
+    const { genHttpsOptions } = await import("./dev-tools/https");
+    const httpsOptions = await genHttpsOptions(devHttpsOption, pwd);
+    nodeServer = await createNodeServer(server.handle.bind(server), httpsOptions);
+  } else {
+    nodeServer = await createNodeServer(server.handle.bind(server));
+  }
   rsbuild === null || rsbuild === void 0 ? void 0 : rsbuild.onDevCompileDone(({ stats }) => {
     if (stats.toJson({
       all: false

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

@@ -0,0 +1,30 @@
+import { chalk, getPackageManager, logger } from "@modern-js/utils";
+const genHttpsOptions = async (userOptions, pwd) => {
+  const httpsOptions = typeof userOptions === "boolean" ? {} : userOptions;
+  if (!httpsOptions.key || !httpsOptions.cert) {
+    let devcertPath;
+    try {
+      devcertPath = require.resolve("devcert", {
+        paths: [
+          pwd,
+          __dirname
+        ]
+      });
+    } catch (err) {
+      const packageManager = await getPackageManager(pwd);
+      const command = chalk.yellow.bold(`${packageManager} add devcert@1.2.2 -D`);
+      logger.error(`You have enabled "dev.https" option, but the "devcert" package is not installed.`);
+      logger.error(`Please run ${command} to install manually, otherwise the https can not work.`);
+      throw new Error('[https] "devcert" is not found.');
+    }
+    const devcert = require(devcertPath);
+    const selfsign = await devcert.certificateFor([
+      "localhost"
+    ]);
+    return selfsign;
+  }
+  return httpsOptions;
+};
+export {
+  genHttpsOptions
+};

package/dist/types/dev-tools/https/index.d.ts

@@ -0,0 +1,7 @@
+/// <reference types="node" />
+import type Buffer from 'buffer';
+import type { DevServerHttpsOptions } from '../../types';
+export declare const genHttpsOptions: (userOptions: DevServerHttpsOptions, pwd: string) => Promise<{
+    key?: Buffer | string;
+    cert?: Buffer | string;
+}>;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.49.2",
+  "version": "2.49.4",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -48,14 +48,14 @@
     "minimatch": "^3.0.4",
     "path-to-regexp": "^6.2.0",
     "ws": "^8.13.0",
-    "@modern-js/runtime-utils": "2.49.2",
-    "@modern-js/server-utils": "2.49.2",
-    "@modern-js/types": "2.49.2",
-    "@modern-js/utils": "2.49.2",
-    "@modern-js/server-core": "2.49.2"
+    "@modern-js/server-utils": "2.49.4",
+    "@modern-js/runtime-utils": "2.49.4",
+    "@modern-js/types": "2.49.4",
+    "@modern-js/utils": "2.49.4",
+    "@modern-js/server-core": "2.49.4"
   },
   "devDependencies": {
-    "@rsbuild/shared": "0.6.6",
+    "@rsbuild/shared": "0.6.15",
     "@types/connect-history-api-fallback": "^1.3.5",
     "@types/jest": "^29",
     "@types/minimatch": "^3.0.5",
@@ -68,8 +68,8 @@
     "typescript": "^5",
     "webpack": "^5.91.0",
     "websocket": "^1",
-    "@scripts/build": "2.49.2",
-    "@scripts/jest-config": "2.49.2"
+    "@scripts/build": "2.49.4",
+    "@scripts/jest-config": "2.49.4"
   },
   "peerDependencies": {
     "devcert": "^1.2.2",