@modern-js/server 2.31.2 → 2.32.1

package/CHANGELOG.md

@@ -1,5 +1,42 @@
 # @modern-js/server
 
+## 2.32.1
+
+### Patch Changes
+
+- Updated dependencies [90e053a]
+  - @modern-js/types@2.32.1
+  - @modern-js/prod-server@2.32.1
+  - @modern-js/utils@2.32.1
+  - @modern-js/server-utils@2.32.1
+
+## 2.32.0
+
+### Minor Changes
+
+- 2447d64: feat: support ssr resources preload
+  feat: 支持 ssr 资源预加载
+
+### Patch Changes
+
+- 5f7c714: fix: WebSocket upgrade handler cause HMR connection issue
+  fix: WebSocket upgrade handler 导致 HMR 连接错误
+- Updated dependencies [e6c7d33]
+- Updated dependencies [e5a3fb4]
+- Updated dependencies [6076166]
+- Updated dependencies [5f7c714]
+- Updated dependencies [a030aff]
+- Updated dependencies [6d73519]
+- Updated dependencies [79658a0]
+- Updated dependencies [4323e68]
+- Updated dependencies [3c91100]
+- Updated dependencies [2447d64]
+- Updated dependencies [5255eba]
+  - @modern-js/prod-server@2.32.0
+  - @modern-js/utils@2.32.0
+  - @modern-js/types@2.32.0
+  - @modern-js/server-utils@2.32.0
+
 ## 2.31.2
 
 ### Patch Changes

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021 Modern.js
+Copyright (c) 2021-present Modern.js
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/dist/cjs/server/devServer.js

@@ -91,6 +91,7 @@ class ModernDevServer extends _prodserver.ModernServer {
         ssrRender: _workerSSRRender.workerSSRRender,
         distDir,
         staticGenerate,
+        conf,
         forceCSR,
         nonce: (_conf_security = conf.security) === null || _conf_security === void 0 ? void 0 : _conf_security.nonce,
         metaName
@@ -99,12 +100,17 @@ class ModernDevServer extends _prodserver.ModernServer {
     return super.getRenderHandler();
   }
   async applyDefaultMiddlewares(app) {
-    const { pwd, dev, devMiddleware } = this;
+    const { pwd, dev, devMiddleware, conf } = this;
     const isUseStreamingSSR = (routes) => {
       var _routes;
       return (_routes = routes) === null || _routes === void 0 ? void 0 : _routes.some((r) => r.isStream === true);
     };
-    if (!isUseStreamingSSR(this.getRoutes()) && dev.compress) {
+    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(() => /* @__PURE__ */ _interop_require_wildcard._(require("http-compression")));
       this.addHandler((ctx, next) => {
         compression({
@@ -136,11 +142,13 @@ class ModernDevServer extends _prodserver.ModernServer {
         next();
       }
     });
-    const proxyHandlers = (0, _prodserver.createProxyHandler)(dev.proxy);
-    app.on("upgrade", proxyHandlers.handleUpgrade);
-    proxyHandlers.handlers.forEach((handler) => {
-      this.addHandler(handler);
-    });
+    if (dev.proxy) {
+      const { handlers, handleUpgrade } = (0, _prodserver.createProxyHandler)(dev.proxy);
+      app && handleUpgrade(app);
+      handlers.forEach((handler) => {
+        this.addHandler(handler);
+      });
+    }
     devMiddleware.init(app);
     devMiddleware.on("change", (stats) => {
       if (stats.toJson({

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

@@ -21,9 +21,9 @@ function getHMRClientPath(client) {
   var clientEntry = "".concat(require.resolve("@modern-js/server/hmr-client"), "?").concat(host).concat(path).concat(port).concat(protocol);
   return clientEntry.replace("".concat(sep, "cjs").concat(sep, "dev-tools"), "".concat(sep, "esm").concat(sep, "dev-tools"));
 }
-var DevMiddleware = /* @__PURE__ */ function(EventEmitter1) {
+var DevMiddleware = /* @__PURE__ */ function(EventEmitter2) {
   "use strict";
-  _inherits(DevMiddleware2, EventEmitter1);
+  _inherits(DevMiddleware2, EventEmitter2);
   var _super = _create_super(DevMiddleware2);
   function DevMiddleware2(param) {
     var dev = param.dev, devMiddleware = param.devMiddleware;

package/dist/esm/server/devServer.js

@@ -22,9 +22,9 @@ import { enableRegister } from "../dev-tools/register";
 import Watcher, { mergeWatchOptions } from "../dev-tools/watcher";
 import DevMiddleware from "../dev-tools/dev-middleware";
 import { workerSSRRender } from "./workerSSRRender";
-export var ModernDevServer = /* @__PURE__ */ function(ModernServer1) {
+export var ModernDevServer = /* @__PURE__ */ function(ModernServer2) {
   "use strict";
-  _inherits(ModernDevServer2, ModernServer1);
+  _inherits(ModernDevServer2, ModernServer2);
   var _super = _create_super(ModernDevServer2);
   function ModernDevServer2(options) {
     _class_call_check(this, ModernDevServer2);
@@ -189,6 +189,7 @@ export var ModernDevServer = /* @__PURE__ */ function(ModernServer1) {
               ssrRender: workerSSRRender,
               distDir: distDir,
               staticGenerate: staticGenerate,
+              conf: conf,
               forceCSR: forceCSR,
               nonce: (_conf_security = conf.security) === null || _conf_security === void 0 ? void 0 : _conf_security.nonce,
               metaName: metaName
@@ -203,18 +204,27 @@ export var ModernDevServer = /* @__PURE__ */ function(ModernServer1) {
       value: function applyDefaultMiddlewares(app) {
         var _this = this;
         return _async_to_generator(function() {
-          var pwd, dev, devMiddleware, isUseStreamingSSR, _ref, compression, proxyHandlers, _ref1, connectHistoryApiFallback, historyApiFallbackMiddleware;
+          var pwd, dev, devMiddleware, conf, isUseStreamingSSR, isUseSSRPreload, _ref, compression, _createProxyHandler, handlers, handleUpgrade, _ref1, connectHistoryApiFallback, historyApiFallbackMiddleware;
           return _ts_generator(this, function(_state) {
             switch (_state.label) {
               case 0:
-                pwd = _this.pwd, dev = _this.dev, devMiddleware = _this.devMiddleware;
+                pwd = _this.pwd, dev = _this.dev, devMiddleware = _this.devMiddleware, conf = _this.conf;
                 isUseStreamingSSR = function(routes) {
                   var _routes;
                   return (_routes = routes) === null || _routes === void 0 ? void 0 : _routes.some(function(r) {
                     return r.isStream === true;
                   });
                 };
-                if (!(!isUseStreamingSSR(_this.getRoutes()) && dev.compress))
+                isUseSSRPreload = function() {
+                  var _conf_server = conf.server, ssr = _conf_server.ssr, ssrByEntries = _conf_server.ssrByEntries;
+                  var checkUsePreload = function(ssr2) {
+                    return typeof ssr2 === "object" && Boolean(ssr2.preload);
+                  };
+                  return checkUsePreload(ssr) || Object.values(ssrByEntries || {}).some(function(ssr2) {
+                    return checkUsePreload(ssr2);
+                  });
+                };
+                if (!(!isUseStreamingSSR(_this.getRoutes()) && !isUseSSRPreload() && dev.compress))
                   return [
                     3,
                     2
@@ -273,11 +283,13 @@ export var ModernDevServer = /* @__PURE__ */ function(ModernServer1) {
                     next();
                   }
                 });
-                proxyHandlers = createProxyHandler(dev.proxy);
-                app.on("upgrade", proxyHandlers.handleUpgrade);
-                proxyHandlers.handlers.forEach(function(handler) {
-                  _this.addHandler(handler);
-                });
+                if (dev.proxy) {
+                  _createProxyHandler = createProxyHandler(dev.proxy), handlers = _createProxyHandler.handlers, handleUpgrade = _createProxyHandler.handleUpgrade;
+                  app && handleUpgrade(app);
+                  handlers.forEach(function(handler) {
+                    _this.addHandler(handler);
+                  });
+                }
                 devMiddleware.init(app);
                 devMiddleware.on("change", function(stats) {
                   if (stats.toJson({

package/dist/esm/server/index.js

@@ -6,9 +6,9 @@ import { ModernDevServer } from "./devServer";
 var createDevServer = function(options) {
   return new ModernDevServer(options);
 };
-export var DevServer = /* @__PURE__ */ function(Server1) {
+export var DevServer = /* @__PURE__ */ function(Server2) {
   "use strict";
-  _inherits(DevServer2, Server1);
+  _inherits(DevServer2, Server2);
   var _super = _create_super(DevServer2);
   function DevServer2(options) {
     _class_call_check(this, DevServer2);

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

@@ -79,6 +79,7 @@ export class ModernDevServer extends ModernServer {
         ssrRender: workerSSRRender,
         distDir,
         staticGenerate,
+        conf,
         forceCSR,
         nonce: (_conf_security = conf.security) === null || _conf_security === void 0 ? void 0 : _conf_security.nonce,
         metaName
@@ -87,12 +88,17 @@ export class ModernDevServer extends ModernServer {
     return super.getRenderHandler();
   }
   async applyDefaultMiddlewares(app) {
-    const { pwd, dev, devMiddleware } = this;
+    const { pwd, dev, devMiddleware, conf } = this;
     const isUseStreamingSSR = (routes) => {
       var _routes;
       return (_routes = routes) === null || _routes === void 0 ? void 0 : _routes.some((r) => r.isStream === true);
     };
-    if (!isUseStreamingSSR(this.getRoutes()) && dev.compress) {
+    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 import("http-compression");
       this.addHandler((ctx, next) => {
         compression({
@@ -124,11 +130,13 @@ export class ModernDevServer extends ModernServer {
         next();
       }
     });
-    const proxyHandlers = createProxyHandler(dev.proxy);
-    app.on("upgrade", proxyHandlers.handleUpgrade);
-    proxyHandlers.handlers.forEach((handler) => {
-      this.addHandler(handler);
-    });
+    if (dev.proxy) {
+      const { handlers, handleUpgrade } = createProxyHandler(dev.proxy);
+      app && handleUpgrade(app);
+      handlers.forEach((handler) => {
+        this.addHandler(handler);
+      });
+    }
     devMiddleware.init(app);
     devMiddleware.on("change", (stats) => {
       if (stats.toJson({

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.31.2",
+  "version": "2.32.1",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -48,10 +48,10 @@
     "path-to-regexp": "^6.2.0",
     "ws": "^8.2.0",
     "axios": "^1.2.1",
-    "@modern-js/prod-server": "2.31.2",
-    "@modern-js/server-utils": "2.31.2",
-    "@modern-js/types": "2.31.2",
-    "@modern-js/utils": "2.31.2"
+    "@modern-js/prod-server": "2.32.1",
+    "@modern-js/server-utils": "2.32.1",
+    "@modern-js/types": "2.32.1",
+    "@modern-js/utils": "2.32.1"
   },
   "devDependencies": {
     "@types/connect-history-api-fallback": "^1.3.5",
@@ -66,9 +66,9 @@
     "typescript": "^5",
     "webpack": "^5.88.1",
     "websocket": "^1",
-    "@modern-js/server-core": "2.31.2",
-    "@scripts/jest-config": "2.31.1",
-    "@scripts/build": "2.31.1"
+    "@modern-js/server-core": "2.32.1",
+    "@scripts/build": "2.32.1",
+    "@scripts/jest-config": "2.32.1"
   },
   "peerDependencies": {
     "devcert": "^1.0.0",