@modern-js/server 2.21.1 → 2.22.0

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @modern-js/server
 
+## 2.22.0
+
+### Patch Changes
+
+- Updated dependencies [3d48836]
+- Updated dependencies [5050e8e]
+- Updated dependencies [4991c8a]
+- Updated dependencies [cb9e1ec]
+- Updated dependencies [ea961e7]
+  - @modern-js/utils@2.22.0
+  - @modern-js/prod-server@2.22.0
+  - @modern-js/server-utils@2.22.0
+  - @modern-js/types@2.22.0
+
 ## 2.21.1
 
 ### Patch Changes

package/dist/cjs/constants.js

@@ -4,7 +4,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "getDefaultDevOptions", {
   enumerable: true,
-  get: () => getDefaultDevOptions
+  get: function() {
+    return getDefaultDevOptions;
+  }
 });
 const _constants = require("@modern-js/utils/universal/constants");
 const getDefaultDevOptions = () => {

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

@@ -10,8 +10,12 @@ function _export(target, all) {
     });
 }
 _export(exports, {
-  createSocketUrl: () => createSocketUrl,
-  formatURL: () => formatURL
+  createSocketUrl: function() {
+    return createSocketUrl;
+  },
+  formatURL: function() {
+    return formatURL;
+  }
 });
 const _constants = require("@modern-js/utils/universal/constants");
 function createSocketUrl(resourceQuery) {

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

@@ -4,7 +4,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "default", {
   enumerable: true,
-  get: () => DevMiddleware
+  get: function() {
+    return DevMiddleware;
+  }
 });
 const _define_property = require("@swc/helpers/_/_define_property");
 const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
@@ -51,6 +53,7 @@ class DevMiddleware extends _events.EventEmitter {
       stats: false,
       callbacks,
       hmrClientPath: enableHMR ? getHMRClientPath(devOptions.client) : void 0,
+      serverSideRender: true,
       ...devOptions.devMiddleware
     });
     return middleware;

package/dist/cjs/dev-tools/dev-middleware/socketServer.js

@@ -4,7 +4,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "default", {
   enumerable: true,
-  get: () => SocketServer
+  get: function() {
+    return SocketServer;
+  }
 });
 const _define_property = require("@swc/helpers/_/_define_property");
 const _interop_require_default = require("@swc/helpers/_/_interop_require_default");

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

@@ -4,7 +4,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "genHttpsOptions", {
   enumerable: true,
-  get: () => genHttpsOptions
+  get: function() {
+    return genHttpsOptions;
+  }
 });
 const _utils = require("@modern-js/utils");
 const genHttpsOptions = async (userOptions, pwd) => {

package/dist/cjs/dev-tools/mock/getMockData.js

@@ -10,8 +10,12 @@ function _export(target, all) {
     });
 }
 _export(exports, {
-  default: () => _default,
-  getMatched: () => getMatched
+  default: function() {
+    return _default;
+  },
+  getMatched: function() {
+    return getMatched;
+  }
 });
 const _pathtoregexp = require("path-to-regexp");
 const VALID_METHODS = [

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

@@ -4,7 +4,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "createMockHandler", {
   enumerable: true,
-  get: () => createMockHandler
+  get: function() {
+    return createMockHandler;
+  }
 });
 const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
 const _interop_require_wildcard = require("@swc/helpers/_/_interop_require_wildcard");

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

@@ -4,7 +4,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "enableRegister", {
   enumerable: true,
-  get: () => enableRegister
+  get: function() {
+    return enableRegister;
+  }
 });
 const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
 const _path = /* @__PURE__ */ _interop_require_default._(require("path"));

package/dist/cjs/dev-tools/watcher/dependencyTree.js

@@ -10,8 +10,12 @@ function _export(target, all) {
     });
 }
 _export(exports, {
-  defaultIgnores: () => defaultIgnores,
-  DependencyTree: () => DependencyTree
+  defaultIgnores: function() {
+    return defaultIgnores;
+  },
+  DependencyTree: function() {
+    return DependencyTree;
+  }
 });
 const _define_property = require("@swc/helpers/_/_define_property");
 const _interop_require_default = require("@swc/helpers/_/_interop_require_default");

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

@@ -10,10 +10,18 @@ function _export(target, all) {
     });
 }
 _export(exports, {
-  default: () => Watcher,
-  defaultWatchOptions: () => defaultWatchOptions,
-  getWatchedFiles: () => getWatchedFiles,
-  mergeWatchOptions: () => mergeWatchOptions
+  default: function() {
+    return Watcher;
+  },
+  defaultWatchOptions: function() {
+    return defaultWatchOptions;
+  },
+  getWatchedFiles: function() {
+    return getWatchedFiles;
+  },
+  mergeWatchOptions: function() {
+    return mergeWatchOptions;
+  }
 });
 const _define_property = require("@swc/helpers/_/_define_property");
 const _interop_require_default = require("@swc/helpers/_/_interop_require_default");

package/dist/cjs/dev-tools/watcher/statsCache.js

@@ -4,7 +4,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "StatsCache", {
   enumerable: true,
-  get: () => StatsCache
+  get: function() {
+    return StatsCache;
+  }
 });
 const _define_property = require("@swc/helpers/_/_define_property");
 const _interop_require_default = require("@swc/helpers/_/_interop_require_default");

package/dist/cjs/index.js

@@ -10,8 +10,12 @@ function _export(target, all) {
     });
 }
 _export(exports, {
-  Server: () => _server.DevServer,
-  default: () => _default
+  Server: function() {
+    return _server.DevServer;
+  },
+  default: function() {
+    return _default;
+  }
 });
 const _server = require("./server");
 const _default = (options) => {

package/dist/cjs/server/devServer.js

@@ -4,7 +4,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "ModernDevServer", {
   enumerable: true,
-  get: () => ModernDevServer
+  get: function() {
+    return ModernDevServer;
+  }
 });
 const _define_property = require("@swc/helpers/_/_define_property");
 const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
@@ -163,6 +165,32 @@ class ModernDevServer extends _prodserver.ModernServer {
   }
   warmupSSRBundle() {
   }
+  initReader() {
+    var _this_dev, _this_dev_devMiddleware;
+    let isInit = false;
+    if (this.devMiddleware && ((_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) => {
+        if (isInit) {
+          return next();
+        }
+        isInit = true;
+        if (!ctx.res.locals.webpack) {
+          this.reader.init();
+          return next();
+        }
+        const { devMiddleware: webpackDevMid } = ctx.res.locals.webpack;
+        const { outputFileSystem } = webpackDevMid;
+        if (outputFileSystem) {
+          this.reader.init(outputFileSystem);
+        } else {
+          this.reader.init();
+        }
+        return next();
+      });
+    } else {
+      super.initReader();
+    }
+  }
   async onServerChange({ filepath, event }) {
     const { pwd } = this;
     const { mock } = _prodserver.AGGRED_DIR;

package/dist/cjs/server/index.js

@@ -4,7 +4,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "DevServer", {
   enumerable: true,
-  get: () => DevServer
+  get: function() {
+    return DevServer;
+  }
 });
 const _prodserver = require("@modern-js/prod-server");
 const _devServer = require("./devServer");

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

@@ -84,7 +84,8 @@ var DevMiddleware = /* @__PURE__ */ function(EventEmitter2) {
           headers: devOptions.headers,
           stats: false,
           callbacks: callbacks,
-          hmrClientPath: enableHMR ? getHMRClientPath(devOptions.client) : void 0
+          hmrClientPath: enableHMR ? getHMRClientPath(devOptions.client) : void 0,
+          serverSideRender: true
         }, devOptions.devMiddleware));
         return middleware;
       }

package/dist/esm/server/devServer.js

@@ -349,6 +349,36 @@ export var ModernDevServer = /* @__PURE__ */ function(ModernServer2) {
       value: function warmupSSRBundle() {
       }
     },
+    {
+      key: "initReader",
+      value: function initReader() {
+        var _this = this;
+        var _this_dev, _this_dev_devMiddleware;
+        var isInit = false;
+        if (this.devMiddleware && ((_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(function(ctx, next) {
+            if (isInit) {
+              return next();
+            }
+            isInit = true;
+            if (!ctx.res.locals.webpack) {
+              _this.reader.init();
+              return next();
+            }
+            var _ctx_res_locals_webpack = ctx.res.locals.webpack, webpackDevMid = _ctx_res_locals_webpack.devMiddleware;
+            var outputFileSystem = webpackDevMid.outputFileSystem;
+            if (outputFileSystem) {
+              _this.reader.init(outputFileSystem);
+            } else {
+              _this.reader.init();
+            }
+            return next();
+          });
+        } else {
+          _get(_get_prototype_of(ModernDevServer2.prototype), "initReader", this).call(this);
+        }
+      }
+    },
     {
       key: "onServerChange",
       value: function onServerChange(param) {

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

@@ -42,6 +42,7 @@ class DevMiddleware extends EventEmitter {
       stats: false,
       callbacks,
       hmrClientPath: enableHMR ? getHMRClientPath(devOptions.client) : void 0,
+      serverSideRender: true,
       ...devOptions.devMiddleware
     });
     return middleware;

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

@@ -153,6 +153,32 @@ export class ModernDevServer extends ModernServer {
   }
   warmupSSRBundle() {
   }
+  initReader() {
+    var _this_dev, _this_dev_devMiddleware;
+    let isInit = false;
+    if (this.devMiddleware && ((_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) => {
+        if (isInit) {
+          return next();
+        }
+        isInit = true;
+        if (!ctx.res.locals.webpack) {
+          this.reader.init();
+          return next();
+        }
+        const { devMiddleware: webpackDevMid } = ctx.res.locals.webpack;
+        const { outputFileSystem } = webpackDevMid;
+        if (outputFileSystem) {
+          this.reader.init(outputFileSystem);
+        } else {
+          this.reader.init();
+        }
+        return next();
+      });
+    } else {
+      super.initReader();
+    }
+  }
   async onServerChange({ filepath, event }) {
     const { pwd } = this;
     const { mock } = AGGRED_DIR;

package/dist/types/server/devServer.d.ts

@@ -20,6 +20,7 @@ export declare class ModernDevServer extends ModernServer {
   onRepack(options?: BuildOptions): void;
   createHTTPServer(handler: (req: IncomingMessage, res: ServerResponse, next?: () => void) => void): Promise<Server<typeof IncomingMessage, typeof ServerResponse> | import("https").Server<typeof IncomingMessage, typeof ServerResponse>>;
   protected warmupSSRBundle(): void;
+  protected initReader(): void;
   protected onServerChange({
     filepath,
     event

package/dist/types/types.d.ts

@@ -20,6 +20,8 @@ export type DevMiddlewareOptions = {
   stats?: boolean;
   /** should trigger when compiler hook called */
   callbacks: MiddlewareCallbacks;
+  /** whether use Server Side Render */
+  serverSideRender?: boolean;
 };
 /**
  * The modern/server do nothing about compiler, the devMiddleware need do such things to ensure dev works well:

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.21.1",
+  "version": "2.22.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -47,10 +47,10 @@
     "minimatch": "^3.0.4",
     "path-to-regexp": "^6.2.0",
     "ws": "^8.2.0",
-    "@modern-js/prod-server": "2.21.1",
-    "@modern-js/server-utils": "2.21.1",
-    "@modern-js/types": "2.21.1",
-    "@modern-js/utils": "2.21.1"
+    "@modern-js/prod-server": "2.22.0",
+    "@modern-js/server-utils": "2.22.0",
+    "@modern-js/types": "2.22.0",
+    "@modern-js/utils": "2.22.0"
   },
   "devDependencies": {
     "@types/connect-history-api-fallback": "^1.3.5",
@@ -65,9 +65,9 @@
     "typescript": "^5",
     "webpack": "^5.82.1",
     "websocket": "^1",
-    "@modern-js/server-core": "2.21.1",
-    "@scripts/jest-config": "2.21.1",
-    "@scripts/build": "2.21.1"
+    "@modern-js/server-core": "2.22.0",
+    "@scripts/jest-config": "2.22.0",
+    "@scripts/build": "2.22.0"
   },
   "peerDependencies": {
     "devcert": "^1.0.0",