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

package/CHANGELOG.md

@@ -1,5 +1,104 @@
 # @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
+
+- dda38c9c3e: chore: v2
+
+### Minor Changes
+
+- b710adb843: feat: extract the data loader
+  feat: 提取 data loader
+
+### Patch Changes
+
+- 7879e8f711: refactor: remove enableModernMode config
+
+  refactor: 不再支持 enableModernMode 配置项
+
+- d4e8e6fb90: fix: modernjs dev server can't start normaly
+  fix: modernjs dev 服务端不能正常启动
+- 15bf09d9c8: feat: support completely custom server, export render() api for render single page
+  feat: 支持完全自定义 Server，导出 render() 方法用来渲染单个页面
+- 61f21d1e77: fix: ignore the entire distPath for pia ssr bundle
+  fix: dist 目录的产物不应该被 ts-node 编译
+- 4f277fe288: fix(server): remove peer dependencies warning
+
+  fix(server): 修复 peer dependencies 出现 warning 提示的问题
+
+- cce8ecee2d: fix: handle some `TODO` & `FIXME`, change some tests
+  fix: 处理一些 `TODO` 和 `FIXME`, 修改了一些 tests
+- ea7cf06257: chore: bump webpack/babel-loader/postcss-loader/tsconfig-paths
+
+  chore: 升级 webpack/babel-loader/postcss-loader/tsconfig-paths 版本
+
+- ebbeed1ece: chore: dev server default cross origin
+  chore: 开发环境 Server 默认跨域
+- 14b712da84: fix: use consistent alias type and default value across packages
+
+  fix: 在各个包中使用一致的 alias 类型定义和默认值
+
+- Updated dependencies [9b915e0c10]
+- Updated dependencies [7879e8f711]
+- Updated dependencies [c9e800d39a]
+- Updated dependencies [d4e8e6fb90]
+- Updated dependencies [d032d49e09]
+- Updated dependencies [6aca875011]
+- Updated dependencies [15bf09d9c8]
+- Updated dependencies [2e6031955e]
+- Updated dependencies [7b7d12cf8f]
+- Updated dependencies [7efeed4]
+- Updated dependencies [92f0eade39]
+- Updated dependencies [edd1cfb1af]
+- Updated dependencies [cc971eabfc]
+- Updated dependencies [5b9049f2e9]
+- Updated dependencies [6bda14ed71]
+- Updated dependencies [a8642da58f]
+- Updated dependencies [92004d1906]
+- Updated dependencies [b8bbe036c7]
+- Updated dependencies [40ed5874c6]
+- Updated dependencies [87c1ff86b9]
+- Updated dependencies [c2bb0f1745]
+- Updated dependencies [d5a31df781]
+- Updated dependencies [dda38c9c3e]
+- Updated dependencies [102d32e4ba]
+- Updated dependencies [8b8e1bb571]
+- Updated dependencies [3bbea92b2a]
+- Updated dependencies [73cd29dd9f]
+- Updated dependencies [b710adb843]
+- Updated dependencies [cce8ecee2d]
+- Updated dependencies [18aaf42249]
+- Updated dependencies [ea7cf06257]
+- Updated dependencies [bbe4c4ab64]
+- Updated dependencies [e4558a0bc4]
+- Updated dependencies [abf3421a75]
+- Updated dependencies [543be9558e]
+- Updated dependencies [14b712da84]
+  - @modern-js/server-utils@2.0.0-beta.6
+  - @modern-js/prod-server@2.0.0-beta.6
+  - @modern-js/types@2.0.0-beta.6
+  - @modern-js/utils@2.0.0-beta.6
+
 ## 2.0.0-beta.4
 
 ### Major Changes

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

@@ -13,7 +13,7 @@ var require_hmr_client = __commonJS({
     connection.onclose = function() {
       if (typeof console !== "undefined" && typeof console.info === "function") {
         console.info(
-          "The development server has disconnected. Refresh the page if necessary."
+          "The development server has disconnected.\nRefresh the page if necessary."
         );
       }
     };
@@ -50,7 +50,7 @@ var require_hmr_client = __commonJS({
           for (let i = 0; i < formatted.warnings.length; i++) {
             if (i === 5) {
               console.warn(
-                "There were more warnings in other files. You can find a complete log in the terminal."
+                "There were more warnings in other files.\nYou can find a complete log in the terminal."
               );
               break;
             }

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/constants.js

@@ -15,11 +15,11 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var stdin_exports = {};
-__export(stdin_exports, {
+var constants_exports = {};
+__export(constants_exports, {
   getDefaultDevOptions: () => getDefaultDevOptions
 });
-module.exports = __toCommonJS(stdin_exports);
+module.exports = __toCommonJS(constants_exports);
 var import_utils = require("@modern-js/utils");
 const getDefaultDevOptions = () => {
   const network = (0, import_utils.getIpv4Interfaces)().find((item) => !item.internal);
@@ -36,3 +36,7 @@ const getDefaultDevOptions = () => {
     liveReload: true
   };
 };
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  getDefaultDevOptions
+});

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

@@ -15,12 +15,12 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var stdin_exports = {};
-__export(stdin_exports, {
+var createSocketUrl_exports = {};
+__export(createSocketUrl_exports, {
   createSocketUrl: () => createSocketUrl,
   formatURL: () => formatURL
 });
-module.exports = __toCommonJS(stdin_exports);
+module.exports = __toCommonJS(createSocketUrl_exports);
 var import_constants = require("@modern-js/utils/constants");
 function createSocketUrl(resourceQuery) {
   const searchParams = resourceQuery.substr(1).split("&");
@@ -58,3 +58,8 @@ function getSocketUrl(urlParts, location) {
     pathname: path || import_constants.HMR_SOCK_PATH
   });
 }
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  createSocketUrl,
+  formatURL
+});

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

@@ -25,7 +25,7 @@ const connection = new WebSocket(socketUrl);
 connection.onclose = function() {
   if (typeof console !== "undefined" && typeof console.info === "function") {
     console.info(
-      "The development server has disconnected. Refresh the page if necessary."
+      "The development server has disconnected.\nRefresh the page if necessary."
     );
   }
 };
@@ -62,7 +62,7 @@ function handleWarnings(warnings) {
       for (let i = 0; i < formatted.warnings.length; i++) {
         if (i === 5) {
           console.warn(
-            "There were more warnings in other files. You can find a complete log in the terminal."
+            "There were more warnings in other files.\nYou can find a complete log in the terminal."
           );
           break;
         }

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

@@ -2,8 +2,22 @@ var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __getProtoOf = Object.getPrototypeOf;
 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 __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -21,31 +35,6 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var stdin_exports = {};
-__export(stdin_exports, {
-  default: () => DevMiddleware
-});
-module.exports = __toCommonJS(stdin_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"));
-var __defProp2 = Object.defineProperty;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __hasOwnProp2 = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp2(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp2.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) => {
@@ -66,17 +55,28 @@ var __async = (__this, __arguments, generator) => {
     step((generator = generator.apply(__this, __arguments)).next());
   });
 };
+var dev_middleware_exports = {};
+__export(dev_middleware_exports, {
+  default: () => DevMiddleware
+});
+module.exports = __toCommonJS(dev_middleware_exports);
+var import_events = require("events");
+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);
     }
   }
@@ -90,59 +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/dev-middleware/socket-server.js

@@ -21,11 +21,11 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var stdin_exports = {};
-__export(stdin_exports, {
+var socket_server_exports = {};
+__export(socket_server_exports, {
   default: () => SocketServer
 });
-module.exports = __toCommonJS(stdin_exports);
+module.exports = __toCommonJS(socket_server_exports);
 var import_ws = __toESM(require("ws"));
 var import_utils = require("@modern-js/utils");
 class SocketServer {
@@ -155,3 +155,5 @@ class SocketServer {
     connection.send(message);
   }
 }
+// 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,17 +14,7 @@ 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 stdin_exports = {};
-__export(stdin_exports, {
-  genHttpsOptions: () => genHttpsOptions
-});
-module.exports = __toCommonJS(stdin_exports);
-var devcert = __toESM(require("devcert"));
 var __async = (__this, __arguments, generator) => {
   return new Promise((resolve, reject) => {
     var fulfilled = (value) => {
@@ -47,11 +35,38 @@ var __async = (__this, __arguments, generator) => {
     step((generator = generator.apply(__this, __arguments)).next());
   });
 };
-const genHttpsOptions = (userOptions) => __async(void 0, null, function* () {
+var https_exports = {};
+__export(https_exports, {
+  genHttpsOptions: () => genHttpsOptions
+});
+module.exports = __toCommonJS(https_exports);
+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;
   }
   return httpsOptions;
 });
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  genHttpsOptions
+});