@modern-js/server 2.0.0-beta.6 → 2.0.0-beta.7

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # @modern-js/server
 
+## 2.0.0-beta.7
+
+### Major Changes
+
+- dda38c9c3e: chore: v2
+
+### Patch Changes
+
+- Updated dependencies [c9e800d39a]
+- Updated dependencies [edd1cfb1af]
+- Updated dependencies [6bda14ed71]
+- Updated dependencies [dda38c9c3e]
+- Updated dependencies [8b8e1bb571]
+- Updated dependencies [bbe4c4ab64]
+  - @modern-js/prod-server@2.0.0-beta.7
+  - @modern-js/utils@2.0.0-beta.7
+  - @modern-js/types@2.0.0-beta.7
+  - @modern-js/server-utils@2.0.0-beta.7
+
 ## 2.0.0-beta.6
 
 ### Major Changes

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

@@ -35,20 +35,22 @@ var __async = (__this, __arguments, generator) => {
   });
 };
 import { EventEmitter } from "events";
-import webpackDevMiddleware from "@modern-js/utils/webpack-dev-middleware";
-import DevServerPlugin from "./dev-server-plugin";
 import SocketServer from "./socket-server";
 const noop = () => {
 };
+function getHMRClientPath(client) {
+  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}`;
+  return clientEntry;
+}
 class DevMiddleware extends EventEmitter {
-  constructor({ compiler, dev, devMiddleware }) {
+  constructor({ dev, devMiddleware }) {
     super();
-    this.compiler = compiler;
     this.devOptions = dev;
     this.socketServer = new SocketServer(dev);
-    if (this.compiler) {
-      this.setupDevServerPlugin();
-      this.setupHooks();
+    if (devMiddleware) {
       this.middleware = this.setupDevMiddleware(devMiddleware);
     }
   }
@@ -62,61 +64,29 @@ class DevMiddleware extends EventEmitter {
       this.socketServer.close();
     }));
   }
-  setupDevServerPlugin() {
-    const { devOptions } = this;
-    if (this.compiler.compilers) {
-      this.compiler.compilers.forEach((target) => {
-        if (this.isClientCompiler(target)) {
-          new DevServerPlugin(devOptions).apply(target);
-        }
-      });
-    } else {
-      new DevServerPlugin(devOptions).apply(this.compiler);
-    }
-  }
   sockWrite(type, data) {
     this.socketServer.sockWrite(type, data);
   }
-  setupHooks() {
-    const invalidPlugin = () => {
-      this.socketServer.sockWrite("invalid");
-    };
-    const addHooks = (compiler) => {
-      if (compiler.name === "server") {
-        return;
-      }
-      const { compile, invalid, done } = compiler.hooks;
-      compile.tap("modern-dev-server", invalidPlugin);
-      invalid.tap("modern-dev-server", invalidPlugin);
-      done.tap("modern-dev-server", (stats) => {
+  setupDevMiddleware(devMiddleware) {
+    const { devOptions } = this;
+    const callbacks = {
+      onInvalid: () => {
+        this.socketServer.sockWrite("invalid");
+      },
+      onDone: (stats) => {
         this.socketServer.updateStats(stats);
         this.emit("change", stats);
-      });
+      }
     };
-    if (this.compiler.compilers) {
-      this.compiler.compilers.forEach(addHooks);
-    } else {
-      addHooks(this.compiler);
-    }
-  }
-  setupDevMiddleware(devMiddleware = webpackDevMiddleware) {
-    const { devOptions } = this;
-    const middleware = devMiddleware(this.compiler, __spreadValues({
+    const enableHMR = this.devOptions.hot || this.devOptions.liveReload;
+    const middleware = devMiddleware(__spreadValues({
       headers: devOptions.headers,
-      stats: false
+      stats: false,
+      callbacks,
+      hmrClientPath: enableHMR ? getHMRClientPath(devOptions.client) : void 0
     }, devOptions.devMiddleware));
     return middleware;
   }
-  isClientCompiler(compiler) {
-    const { target } = compiler.options;
-    if (target) {
-      if (Array.isArray(target)) {
-        return !target.includes("node");
-      }
-      return target !== "node";
-    }
-    return compiler.name === "client";
-  }
 }
 export {
   DevMiddleware as default

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

@@ -18,10 +18,27 @@ var __async = (__this, __arguments, generator) => {
     step((generator = generator.apply(__this, __arguments)).next());
   });
 };
-import * as devcert from "devcert";
-const genHttpsOptions = (userOptions) => __async(void 0, null, function* () {
+import { chalk, getPackageManager, logger } from "@modern-js/utils";
+const genHttpsOptions = (userOptions, pwd) => __async(void 0, null, function* () {
   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 = yield getPackageManager(pwd);
+      const command = chalk.yellow.bold(
+        `${packageManager} install 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 = yield devcert.certificateFor(["localhost"]);
     return selfsign;
   }

package/dist/js/modern/index.js

@@ -1,7 +1,7 @@
 import { DevServer as Server } from "./server";
 var src_default = (options) => {
   if (options == null) {
-    throw new Error("can not start mserver without options");
+    throw new Error("can not start server without options");
   }
   const server = new Server(options);
   return server.init();

package/dist/js/modern/server/dev-server.js

@@ -68,7 +68,6 @@ class ModernDevServer extends ModernServer {
     this.dev = this.getDevOptions(options);
     this.devMiddleware = new DevMiddleware({
       dev: this.dev,
-      compiler: options.compiler,
       devMiddleware: options.devMiddleware
     });
     enableRegister(this.pwd, this.conf);
@@ -195,7 +194,7 @@ class ModernDevServer extends ModernServer {
       const devHttpsOption = typeof dev === "object" && dev.https;
       if (devHttpsOption) {
         const { genHttpsOptions } = require("../dev-tools/https");
-        const httpsOptions = yield genHttpsOptions(devHttpsOption);
+        const httpsOptions = yield genHttpsOptions(devHttpsOption, this.pwd);
         return createHttpsServer(httpsOptions, handler);
       } else {
         return createServer(handler);

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

@@ -61,20 +61,22 @@ __export(dev_middleware_exports, {
 });
 module.exports = __toCommonJS(dev_middleware_exports);
 var import_events = require("events");
-var import_webpack_dev_middleware = __toESM(require("@modern-js/utils/webpack-dev-middleware"));
-var import_dev_server_plugin = __toESM(require("./dev-server-plugin"));
 var import_socket_server = __toESM(require("./socket-server"));
 const noop = () => {
 };
+function getHMRClientPath(client) {
+  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}`;
+  return clientEntry;
+}
 class DevMiddleware extends import_events.EventEmitter {
-  constructor({ compiler, dev, devMiddleware }) {
+  constructor({ dev, devMiddleware }) {
     super();
-    this.compiler = compiler;
     this.devOptions = dev;
     this.socketServer = new import_socket_server.default(dev);
-    if (this.compiler) {
-      this.setupDevServerPlugin();
-      this.setupHooks();
+    if (devMiddleware) {
       this.middleware = this.setupDevMiddleware(devMiddleware);
     }
   }
@@ -88,61 +90,29 @@ class DevMiddleware extends import_events.EventEmitter {
       this.socketServer.close();
     }));
   }
-  setupDevServerPlugin() {
-    const { devOptions } = this;
-    if (this.compiler.compilers) {
-      this.compiler.compilers.forEach((target) => {
-        if (this.isClientCompiler(target)) {
-          new import_dev_server_plugin.default(devOptions).apply(target);
-        }
-      });
-    } else {
-      new import_dev_server_plugin.default(devOptions).apply(this.compiler);
-    }
-  }
   sockWrite(type, data) {
     this.socketServer.sockWrite(type, data);
   }
-  setupHooks() {
-    const invalidPlugin = () => {
-      this.socketServer.sockWrite("invalid");
-    };
-    const addHooks = (compiler) => {
-      if (compiler.name === "server") {
-        return;
-      }
-      const { compile, invalid, done } = compiler.hooks;
-      compile.tap("modern-dev-server", invalidPlugin);
-      invalid.tap("modern-dev-server", invalidPlugin);
-      done.tap("modern-dev-server", (stats) => {
+  setupDevMiddleware(devMiddleware) {
+    const { devOptions } = this;
+    const callbacks = {
+      onInvalid: () => {
+        this.socketServer.sockWrite("invalid");
+      },
+      onDone: (stats) => {
         this.socketServer.updateStats(stats);
         this.emit("change", stats);
-      });
+      }
     };
-    if (this.compiler.compilers) {
-      this.compiler.compilers.forEach(addHooks);
-    } else {
-      addHooks(this.compiler);
-    }
-  }
-  setupDevMiddleware(devMiddleware = import_webpack_dev_middleware.default) {
-    const { devOptions } = this;
-    const middleware = devMiddleware(this.compiler, __spreadValues({
+    const enableHMR = this.devOptions.hot || this.devOptions.liveReload;
+    const middleware = devMiddleware(__spreadValues({
       headers: devOptions.headers,
-      stats: false
+      stats: false,
+      callbacks,
+      hmrClientPath: enableHMR ? getHMRClientPath(devOptions.client) : void 0
     }, devOptions.devMiddleware));
     return middleware;
   }
-  isClientCompiler(compiler) {
-    const { target } = compiler.options;
-    if (target) {
-      if (Array.isArray(target)) {
-        return !target.includes("node");
-      }
-      return target !== "node";
-    }
-    return compiler.name === "client";
-  }
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {});

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

@@ -1,8 +1,6 @@
-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)
@@ -16,10 +14,6 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var __async = (__this, __arguments, generator) => {
   return new Promise((resolve, reject) => {
@@ -46,10 +40,27 @@ __export(https_exports, {
   genHttpsOptions: () => genHttpsOptions
 });
 module.exports = __toCommonJS(https_exports);
-var devcert = __toESM(require("devcert"));
-const genHttpsOptions = (userOptions) => __async(void 0, null, function* () {
+var import_utils = require("@modern-js/utils");
+const genHttpsOptions = (userOptions, pwd) => __async(void 0, null, function* () {
   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 = yield (0, import_utils.getPackageManager)(pwd);
+      const command = import_utils.chalk.yellow.bold(
+        `${packageManager} install 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 = yield devcert.certificateFor(["localhost"]);
     return selfsign;
   }

package/dist/js/node/index.js

@@ -24,7 +24,7 @@ module.exports = __toCommonJS(src_exports);
 var import_server = require("./server");
 var src_default = (options) => {
   if (options == null) {
-    throw new Error("can not start mserver without options");
+    throw new Error("can not start server without options");
   }
   const server = new import_server.DevServer(options);
   return server.init();

package/dist/js/node/server/dev-server.js

@@ -84,7 +84,6 @@ class ModernDevServer extends import_prod_server.ModernServer {
     this.dev = this.getDevOptions(options);
     this.devMiddleware = new import_dev_middleware.default({
       dev: this.dev,
-      compiler: options.compiler,
       devMiddleware: options.devMiddleware
     });
     (0, import_register.enableRegister)(this.pwd, this.conf);
@@ -211,7 +210,7 @@ class ModernDevServer extends import_prod_server.ModernServer {
       const devHttpsOption = typeof dev === "object" && dev.https;
       if (devHttpsOption) {
         const { genHttpsOptions } = require("../dev-tools/https");
-        const httpsOptions = yield genHttpsOptions(devHttpsOption);
+        const httpsOptions = yield genHttpsOptions(devHttpsOption, this.pwd);
         return (0, import_https.createServer)(httpsOptions, handler);
       } else {
         return (0, import_http.createServer)(handler);

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

@@ -236,29 +236,30 @@ var __generator = this && this.__generator || function(thisArg, body) {
     }
 };
 import { EventEmitter } from "events";
-import webpackDevMiddleware from "@modern-js/utils/webpack-dev-middleware";
-import DevServerPlugin from "./dev-server-plugin";
 import SocketServer from "./socket-server";
 var noop = function() {};
+function getHMRClientPath(client) {
+    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("./hmr-client"), "?").concat(host).concat(path).concat(port);
+    return clientEntry;
+}
 var DevMiddleware = /*#__PURE__*/ function(EventEmitter) {
     "use strict";
     _inherits(DevMiddleware, EventEmitter);
     var _super = _createSuper(DevMiddleware);
     function DevMiddleware(param) {
-        var compiler = param.compiler, dev = param.dev, devMiddleware = param.devMiddleware;
+        var dev = param.dev, devMiddleware = param.devMiddleware;
         _classCallCheck(this, DevMiddleware);
         var _this;
         _this = _super.call(this);
         _defineProperty(_assertThisInitialized(_this), "middleware", void 0);
-        _defineProperty(_assertThisInitialized(_this), "compiler", void 0);
         _defineProperty(_assertThisInitialized(_this), "devOptions", void 0);
         _defineProperty(_assertThisInitialized(_this), "socketServer", void 0);
-        _this.compiler = compiler;
         _this.devOptions = dev;
         _this.socketServer = new SocketServer(dev);
-        if (_this.compiler) {
-            _this.setupDevServerPlugin();
-            _this.setupHooks();
+        if (devMiddleware) {
             _this.middleware = _this.setupDevMiddleware(devMiddleware);
         }
         return _this;
@@ -284,22 +285,6 @@ var DevMiddleware = /*#__PURE__*/ function(EventEmitter) {
                 }));
             }
         },
-        {
-            key: "setupDevServerPlugin",
-            value: function setupDevServerPlugin() {
-                var _this = this;
-                var devOptions = this.devOptions;
-                if (this.compiler.compilers) {
-                    this.compiler.compilers.forEach(function(target) {
-                        if (_this.isClientCompiler(target)) {
-                            new DevServerPlugin(devOptions).apply(target);
-                        }
-                    });
-                } else {
-                    new DevServerPlugin(devOptions).apply(this.compiler);
-                }
-            }
-        },
         {
             key: "sockWrite",
             value: function sockWrite(type, data) {
@@ -307,55 +292,28 @@ var DevMiddleware = /*#__PURE__*/ function(EventEmitter) {
             }
         },
         {
-            key: "setupHooks",
-            value: function setupHooks() {
+            key: "setupDevMiddleware",
+            value: function setupDevMiddleware(devMiddleware) {
                 var _this = this;
-                var invalidPlugin = function() {
-                    _this.socketServer.sockWrite("invalid");
-                };
-                var addHooks = function(compiler) {
-                    if (compiler.name === "server") {
-                        return;
-                    }
-                    var _hooks = compiler.hooks, compile = _hooks.compile, invalid = _hooks.invalid, done = _hooks.done;
-                    compile.tap("modern-dev-server", invalidPlugin);
-                    invalid.tap("modern-dev-server", invalidPlugin);
-                    done.tap("modern-dev-server", function(stats) {
+                var devOptions = this.devOptions;
+                var callbacks = {
+                    onInvalid: function() {
+                        _this.socketServer.sockWrite("invalid");
+                    },
+                    onDone: function(stats) {
                         _this.socketServer.updateStats(stats);
                         _this.emit("change", stats);
-                    });
+                    }
                 };
-                if (this.compiler.compilers) {
-                    this.compiler.compilers.forEach(addHooks);
-                } else {
-                    addHooks(this.compiler);
-                }
-            }
-        },
-        {
-            key: "setupDevMiddleware",
-            value: function setupDevMiddleware() {
-                var devMiddleware = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : webpackDevMiddleware;
-                var devOptions = this.devOptions;
-                var middleware = devMiddleware(this.compiler, _objectSpread({
+                var enableHMR = this.devOptions.hot || this.devOptions.liveReload;
+                var middleware = devMiddleware(_objectSpread({
                     headers: devOptions.headers,
-                    stats: false
+                    stats: false,
+                    callbacks: callbacks,
+                    hmrClientPath: enableHMR ? getHMRClientPath(devOptions.client) : void 0
                 }, devOptions.devMiddleware));
                 return middleware;
             }
-        },
-        {
-            key: "isClientCompiler",
-            value: function isClientCompiler(compiler) {
-                var target = compiler.options.target;
-                if (target) {
-                    if (Array.isArray(target)) {
-                        return !target.includes("node");
-                    }
-                    return target !== "node";
-                }
-                return compiler.name === "client";
-            }
         }
     ]);
     return DevMiddleware;

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

@@ -122,31 +122,63 @@ var __generator = this && this.__generator || function(thisArg, body) {
         };
     }
 };
-import * as devcert from "devcert";
+import { chalk, getPackageManager, logger } from "@modern-js/utils";
 var genHttpsOptions = function() {
-    var _ref = _asyncToGenerator(function(userOptions) {
-        var httpsOptions, selfsign;
+    var _ref = _asyncToGenerator(function(userOptions, pwd) {
+        var httpsOptions, devcertPath, err, packageManager, command, devcert, selfsign;
         return __generator(this, function(_state) {
             switch(_state.label){
                 case 0:
                     httpsOptions = typeof userOptions === "boolean" ? {} : userOptions;
                     if (!(!httpsOptions.key || !httpsOptions.cert)) return [
                         3,
-                        2
+                        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, " install 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 1:
+                case 5:
                     selfsign = _state.sent();
                     return [
                         2,
                         selfsign
                     ];
-                case 2:
+                case 6:
                     return [
                         2,
                         httpsOptions
@@ -154,7 +186,7 @@ var genHttpsOptions = function() {
             }
         });
     });
-    return function genHttpsOptions(userOptions) {
+    return function genHttpsOptions(userOptions, pwd) {
         return _ref.apply(this, arguments);
     };
 }();

package/dist/js/treeshaking/index.js

@@ -1,7 +1,7 @@
 import { DevServer as Server } from "./server";
 var src_default = function(options) {
     if (options == null) {
-        throw new Error("can not start mserver without options");
+        throw new Error("can not start server without options");
     }
     var server = new Server(options);
     return server.init();

package/dist/js/treeshaking/server/dev-server.js

@@ -367,7 +367,6 @@ var ModernDevServer = /*#__PURE__*/ function(ModernServer) {
         _this.dev = _this.getDevOptions(options);
         _this.devMiddleware = new DevMiddleware({
             dev: _this.dev,
-            compiler: options.compiler,
             devMiddleware: options.devMiddleware
         });
         enableRegister(_this.pwd, _this.conf);
@@ -628,7 +627,7 @@ var ModernDevServer = /*#__PURE__*/ function(ModernServer) {
                                 genHttpsOptions = require("../dev-tools/https").genHttpsOptions;
                                 return [
                                     4,
-                                    genHttpsOptions(devHttpsOption)
+                                    genHttpsOptions(devHttpsOption, _this.pwd)
                                 ];
                             case 1:
                                 httpsOptions = _state.sent();

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

@@ -2,28 +2,21 @@
 /// <reference types="node" />
 import { Server } from 'http';
 import { EventEmitter } from 'events';
-import { Compiler, MultiCompiler } from 'webpack';
-import { DevServerOptions, DevMiddlewareAPI, CustomDevMiddleware } from '../../types';
+import { DevServerOptions, DevMiddlewareAPI, DevMiddleware as CustomDevMiddleware } from '../../types';
 declare type Options = {
-  compiler: MultiCompiler | Compiler | null;
   dev: DevServerOptions;
   devMiddleware?: CustomDevMiddleware;
 };
 export default class DevMiddleware extends EventEmitter {
   middleware?: DevMiddlewareAPI;
-  private compiler;
   private devOptions;
   private socketServer;
   constructor({
-    compiler,
     dev,
     devMiddleware
   }: Options);
   init(app: Server): void;
-  private setupDevServerPlugin;
   sockWrite(type: string, data?: Record<string, any> | string | boolean): void;
-  private setupHooks;
   private setupDevMiddleware;
-  private isClientCompiler;
 }
 export {};

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

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

package/dist/types/types.d.ts

@@ -1,6 +1,5 @@
 /// <reference types="node" />
 import type { IncomingMessage, ServerResponse } from 'http';
-import type webpack from 'webpack';
 import type { DevServerOptions, DevServerHttpsOptions, NextFunction } from '@modern-js/types';
 import type { ModernServerOptions } from '@modern-js/prod-server';
 export type { DevServerOptions, DevServerHttpsOptions };
@@ -8,14 +7,32 @@ declare type Middleware = (req: IncomingMessage, res: ServerResponse, next: Next
 export declare type DevMiddlewareAPI = Middleware & {
   close: (callback: (err: Error | null | undefined) => void) => any;
 };
-export declare type CustomDevMiddleware = (compiler: webpack.MultiCompiler | webpack.Compiler, options: {
+export declare type MiddlewareCallbacks = {
+  onInvalid: () => void;
+  onDone: (stats: any) => void;
+};
+export declare type DevMiddlewareOptions = {
+  /** To ensure HMR works, the devMiddleware need inject the hmr client path into page when HMR enable. */
+  hmrClientPath?: string;
+  /** The options need by compiler middleware (like webpackMiddleware) */
+
   headers?: Record<string, string>;
   writeToDisk?: boolean | ((filename: string) => boolean);
   stats?: boolean;
-}) => DevMiddlewareAPI;
+  /** should trigger when compiler hook called */
+
+  callbacks: MiddlewareCallbacks;
+};
+/**
+ * The modern/server do nothing about compiler, the devMiddleware need do such things to ensure dev works well:
+ * - Call compiler.watch （normally did by webpack-dev-middleware）.
+ * - Inject the hmr client path into page （the hmr client modern/server already provide）.
+ * - Notify server when compiler hooks are triggered.
+ */
+
+export declare type DevMiddleware = (options: DevMiddlewareOptions) => DevMiddlewareAPI;
 export declare type ExtraOptions = {
   dev: boolean | Partial<DevServerOptions>;
-  compiler: webpack.MultiCompiler | webpack.Compiler | null;
-  devMiddleware?: CustomDevMiddleware;
+  devMiddleware?: DevMiddleware;
 };
 export declare type ModernDevServerOptions = ModernServerOptions & ExtraOptions;

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.0.0-beta.6",
+  "version": "2.0.0-beta.7",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -31,14 +31,13 @@
     "@babel/core": "^7.18.0",
     "@babel/register": "^7.17.7",
     "connect-history-api-fallback": "^2.0.0",
-    "devcert": "^1.2.2",
     "minimatch": "^3.0.4",
     "path-to-regexp": "^6.2.0",
     "ws": "^8.2.0",
-    "@modern-js/prod-server": "2.0.0-beta.6",
-    "@modern-js/server-utils": "2.0.0-beta.6",
-    "@modern-js/types": "2.0.0-beta.6",
-    "@modern-js/utils": "2.0.0-beta.6"
+    "@modern-js/prod-server": "2.0.0-beta.7",
+    "@modern-js/server-utils": "2.0.0-beta.7",
+    "@modern-js/types": "2.0.0-beta.7",
+    "@modern-js/utils": "2.0.0-beta.7"
   },
   "devDependencies": {
     "@types/connect-history-api-fallback": "^1.3.5",
@@ -53,15 +52,19 @@
     "typescript": "^4",
     "webpack": "^5.75.0",
     "websocket": "^1",
-    "@modern-js/server-core": "2.0.0-beta.6",
-    "@scripts/jest-config": "2.0.0-beta.6",
-    "@scripts/build": "2.0.0-beta.6"
+    "@modern-js/server-core": "2.0.0-beta.7",
+    "@scripts/build": "2.0.0-beta.7",
+    "@scripts/jest-config": "2.0.0-beta.7"
   },
   "peerDependencies": {
+    "devcert": "^1.0.0",
     "ts-node": "^10.1.0",
     "tsconfig-paths": ">= 3.0.0 || >= 4.0.0"
   },
   "peerDependenciesMeta": {
+    "devcert": {
+      "optional": true
+    },
     "ts-node": {
       "optional": true
     },

package/dist/js/modern/dev-tools/dev-middleware/dev-server-plugin.js

@@ -1,32 +0,0 @@
-class DevServerPlugin {
-  constructor(options) {
-    this.options = options;
-  }
-  injectHMRClient(compiler) {
-    const { client } = this.options;
-    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}`;
-    new compiler.webpack.EntryPlugin(compiler.context, clientEntry, {
-      name: void 0
-    }).apply(compiler);
-  }
-  apply(compiler) {
-    if (this.options.hot || this.options.liveReload) {
-      this.injectHMRClient(compiler);
-    }
-    const compilerOptions = compiler.options;
-    const { HotModuleReplacementPlugin } = compiler.webpack;
-    compilerOptions.plugins = compilerOptions.plugins || [];
-    if (!compilerOptions.plugins.find(
-      (p) => p.constructor === HotModuleReplacementPlugin
-    )) {
-      const plugin = new HotModuleReplacementPlugin();
-      plugin.apply(compiler);
-    }
-  }
-}
-export {
-  DevServerPlugin as default
-};

package/dist/js/node/dev-tools/dev-middleware/dev-server-plugin.js

@@ -1,59 +0,0 @@
-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(
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var dev_server_plugin_exports = {};
-__export(dev_server_plugin_exports, {
-  default: () => DevServerPlugin
-});
-module.exports = __toCommonJS(dev_server_plugin_exports);
-class DevServerPlugin {
-  constructor(options) {
-    this.options = options;
-  }
-  injectHMRClient(compiler) {
-    const { client } = this.options;
-    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}`;
-    new compiler.webpack.EntryPlugin(compiler.context, clientEntry, {
-      name: void 0
-    }).apply(compiler);
-  }
-  apply(compiler) {
-    if (this.options.hot || this.options.liveReload) {
-      this.injectHMRClient(compiler);
-    }
-    const compilerOptions = compiler.options;
-    const { HotModuleReplacementPlugin } = compiler.webpack;
-    compilerOptions.plugins = compilerOptions.plugins || [];
-    if (!compilerOptions.plugins.find(
-      (p) => p.constructor === HotModuleReplacementPlugin
-    )) {
-      const plugin = new HotModuleReplacementPlugin();
-      plugin.apply(compiler);
-    }
-  }
-}
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {});

package/dist/js/treeshaking/dev-tools/dev-middleware/dev-server-plugin.js

@@ -1,74 +0,0 @@
-function _classCallCheck(instance, Constructor) {
-    if (!(instance instanceof Constructor)) {
-        throw new TypeError("Cannot call a class as a function");
-    }
-}
-function _defineProperties(target, props) {
-    for(var i = 0; i < props.length; i++){
-        var descriptor = props[i];
-        descriptor.enumerable = descriptor.enumerable || false;
-        descriptor.configurable = true;
-        if ("value" in descriptor) descriptor.writable = true;
-        Object.defineProperty(target, descriptor.key, descriptor);
-    }
-}
-function _createClass(Constructor, protoProps, staticProps) {
-    if (protoProps) _defineProperties(Constructor.prototype, protoProps);
-    if (staticProps) _defineProperties(Constructor, staticProps);
-    return Constructor;
-}
-function _defineProperty(obj, key, value) {
-    if (key in obj) {
-        Object.defineProperty(obj, key, {
-            value: value,
-            enumerable: true,
-            configurable: true,
-            writable: true
-        });
-    } else {
-        obj[key] = value;
-    }
-    return obj;
-}
-var DevServerPlugin = /*#__PURE__*/ function() {
-    "use strict";
-    function DevServerPlugin(options) {
-        _classCallCheck(this, DevServerPlugin);
-        _defineProperty(this, "options", void 0);
-        this.options = options;
-    }
-    _createClass(DevServerPlugin, [
-        {
-            key: "injectHMRClient",
-            value: function injectHMRClient(compiler) {
-                var client = this.options.client;
-                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("./hmr-client"), "?").concat(host).concat(path).concat(port);
-                new compiler.webpack.EntryPlugin(compiler.context, clientEntry, {
-                    name: void 0
-                }).apply(compiler);
-            }
-        },
-        {
-            key: "apply",
-            value: function apply(compiler) {
-                if (this.options.hot || this.options.liveReload) {
-                    this.injectHMRClient(compiler);
-                }
-                var compilerOptions = compiler.options;
-                var HotModuleReplacementPlugin = compiler.webpack.HotModuleReplacementPlugin;
-                compilerOptions.plugins = compilerOptions.plugins || [];
-                if (!compilerOptions.plugins.find(function(p) {
-                    return p.constructor === HotModuleReplacementPlugin;
-                })) {
-                    var plugin = new HotModuleReplacementPlugin();
-                    plugin.apply(compiler);
-                }
-            }
-        }
-    ]);
-    return DevServerPlugin;
-}();
-export { DevServerPlugin as default };

package/dist/types/dev-tools/dev-middleware/dev-server-plugin.d.ts

@@ -1,8 +0,0 @@
-import type webpack from 'webpack';
-import type { DevServerOptions } from '../../types';
-export default class DevServerPlugin {
-  private readonly options;
-  constructor(options: DevServerOptions);
-  injectHMRClient(compiler: webpack.Compiler): void;
-  apply(compiler: webpack.Compiler): void;
-}