@modern-js/server 2.48.0 → 2.48.2

package/dist/esm/server/workerSSRRender.js

@@ -14,7 +14,7 @@ function _workerSSRRender() {
         case 0:
           headers = ctx.headers, params = ctx.params;
           urlPath = renderOptions.route.urlPath;
-          url = "http://0.0.0.0:".concat(PORT, "/").concat(urlPath);
+          url = urlPath.startsWith("/") ? "http://0.0.0.0:".concat(PORT).concat(urlPath) : "http://0.0.0.0:".concat(PORT, "/").concat(urlPath);
           return [
             4,
             axios.get(url, {

package/dist/esm-node/constants.js

@@ -8,7 +8,7 @@ const getDefaultDevOptions = () => {
       // By default it is set to "location.hostname"
       host: "",
       // By default it is set to "location.protocol === 'https:' ? 'wss' : 'ws'""
-      protocol: ""
+      protocol: void 0
     },
     https: false,
     devMiddleware: {

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

@@ -1,4 +1,3 @@
-import { _ as _define_property } from "@swc/helpers/_/_define_property";
 import { EventEmitter } from "events";
 import SocketServer from "./socketServer";
 const noop = () => {
@@ -49,9 +48,6 @@ class DevMiddleware extends EventEmitter {
   }
   constructor({ dev, devMiddleware }) {
     super();
-    _define_property(this, "middleware", void 0);
-    _define_property(this, "devOptions", void 0);
-    _define_property(this, "socketServer", void 0);
     this.devOptions = dev;
     this.socketServer = new SocketServer(dev);
     if (devMiddleware) {

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

@@ -1,4 +1,3 @@
-import { _ as _define_property } from "@swc/helpers/_/_define_property";
 import ws from "ws";
 import { logger } from "@modern-js/utils";
 class SocketServer {
@@ -134,12 +133,8 @@ class SocketServer {
     connection.send(message);
   }
   constructor(options) {
-    _define_property(this, "wsServer", void 0);
-    _define_property(this, "sockets", []);
-    _define_property(this, "options", void 0);
-    _define_property(this, "app", void 0);
-    _define_property(this, "stats", void 0);
-    _define_property(this, "timer", null);
+    this.sockets = [];
+    this.timer = null;
     this.options = options;
   }
 }

package/dist/esm-node/dev-tools/watcher/dependencyTree.js

@@ -1,4 +1,3 @@
-import { _ as _define_property } from "@swc/helpers/_/_define_property";
 import minimatch from "minimatch";
 const defaultIgnores = [
   "**/coverage/**",
@@ -56,8 +55,6 @@ class DependencyTree {
     }).length > 0));
   }
   constructor() {
-    _define_property(this, "tree", void 0);
-    _define_property(this, "ignore", void 0);
     this.tree = /* @__PURE__ */ new Map();
     this.ignore = [
       ...defaultIgnores

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

@@ -1,4 +1,3 @@
-import { _ as _define_property } from "@swc/helpers/_/_define_property";
 import path from "path";
 import { fs, chokidar } from "@modern-js/utils";
 import { DependencyTree } from "./dependencyTree";
@@ -90,8 +89,7 @@ class Watcher {
     return this.watcher.close();
   }
   constructor() {
-    _define_property(this, "dependencyTree", null);
-    _define_property(this, "watcher", void 0);
+    this.dependencyTree = null;
   }
 }
 export {

package/dist/esm-node/dev-tools/watcher/statsCache.js

@@ -1,4 +1,3 @@
-import { _ as _define_property } from "@swc/helpers/_/_define_property";
 import fs from "fs";
 import crypto from "crypto";
 class StatsCache {
@@ -50,8 +49,8 @@ class StatsCache {
     return crypto.createHash("md5").update(fs.readFileSync(filename)).digest("hex");
   }
   constructor() {
-    _define_property(this, "cachedHash", {});
-    _define_property(this, "cachedSize", {});
+    this.cachedHash = {};
+    this.cachedSize = {};
   }
 }
 export {

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

@@ -1,4 +1,3 @@
-import { _ as _define_property } from "@swc/helpers/_/_define_property";
 import { createServer } from "http";
 import path from "path";
 import { createServer as createHttpsServer } from "https";
@@ -11,31 +10,6 @@ import { createMockHandler } from "../dev-tools/mock";
 import { enableRegister } from "../dev-tools/register";
 import Watcher, { mergeWatchOptions } from "../dev-tools/watcher";
 import { workerSSRRender } from "./workerSSRRender";
-const transformToRsbuildServerOptions = (dev) => {
-  var _dev_devMiddleware, _dev_before, _dev_after;
-  const rsbuildOptions = {
-    hmr: Boolean(dev.hot),
-    client: dev.client,
-    writeToDisk: (_dev_devMiddleware = dev.devMiddleware) === null || _dev_devMiddleware === void 0 ? void 0 : _dev_devMiddleware.writeToDisk,
-    compress: dev.compress,
-    headers: dev.headers,
-    historyApiFallback: dev.historyApiFallback,
-    proxy: dev.proxy,
-    publicDir: false
-  };
-  if (((_dev_before = dev.before) === null || _dev_before === void 0 ? void 0 : _dev_before.length) || ((_dev_after = dev.after) === null || _dev_after === void 0 ? void 0 : _dev_after.length)) {
-    rsbuildOptions.setupMiddlewares = [
-      ...dev.setupMiddlewares || [],
-      (middlewares) => {
-        middlewares.unshift(...dev.before || []);
-        middlewares.push(...dev.after || []);
-      }
-    ];
-  } else if (dev.setupMiddlewares) {
-    rsbuildOptions.setupMiddlewares = dev.setupMiddlewares;
-  }
-  return rsbuildOptions;
-};
 class ModernDevServer extends ModernServer {
   getDevOptions(options) {
     const devOptions = options.dev;
@@ -63,10 +37,8 @@ class ModernDevServer extends ModernServer {
     const { middlewares: rsbuildMiddlewares, close, onUpgrade } = (
       // https://github.com/web-infra-dev/rsbuild/blob/32fbb85e22158d5c4655505ce75e3452ce22dbb1/packages/shared/src/types/server.ts#L112
       await this.getMiddlewares({
-        ...transformToRsbuildServerOptions(this.dev),
-        compress: !isUseStreamingSSR(this.getRoutes()) && !isUseSSRPreload() && dev.compress,
-        htmlFallback: false,
-        publicDir: false
+        // TODO: move to uni-builder
+        compress: !isUseStreamingSSR(this.getRoutes()) && !isUseSSRPreload() && dev.compress
       })
     );
     app.on("upgrade", onUpgrade);
@@ -137,7 +109,7 @@ class ModernDevServer extends ModernServer {
   }
   // override the ModernServer renderHandler logic
   getRenderHandler() {
-    if (this.useWorkerSSR) {
+    if (this.useSSRWorker) {
       var _this_conf_server, _conf_security;
       const { distDir, staticGenerate, conf, metaName } = this;
       const ssrConfig = (_this_conf_server = this.conf.server) === null || _this_conf_server === void 0 ? void 0 : _this_conf_server.ssr;
@@ -278,17 +250,11 @@ class ModernDevServer extends ModernServer {
   }
   constructor(options) {
     super(options);
-    _define_property(this, "mockHandler", null);
-    _define_property(this, "dev", void 0);
-    _define_property(this, "useWorkerSSR", void 0);
-    _define_property(this, "appContext", void 0);
-    _define_property(this, "getMiddlewares", void 0);
-    _define_property(this, "rsbuild", void 0);
-    _define_property(this, "watcher", void 0);
-    _define_property(this, "closeCb", []);
+    this.mockHandler = null;
+    this.closeCb = [];
     this.appContext = options.appContext;
     this.workDir = this.pwd;
-    this.useWorkerSSR = Boolean(options.useWorkerSSR);
+    this.useSSRWorker = Boolean(options.useSSRWorker);
     this.dev = this.getDevOptions(options);
     this.getMiddlewares = options.getMiddlewares;
     this.rsbuild = options.rsbuild;

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

@@ -1,4 +1,3 @@
-import { _ as _define_property } from "@swc/helpers/_/_define_property";
 import { createServer } from "http";
 import path from "path";
 import { createServer as createHttpsServer } from "https";
@@ -72,7 +71,7 @@ class ModernDevServer extends ModernServer {
   }
   // override the ModernServer renderHandler logic
   getRenderHandler() {
-    if (this.useWorkerSSR) {
+    if (this.useSSRWorker) {
       var _this_conf_server, _conf_security;
       const { distDir, staticGenerate, conf, metaName } = this;
       const ssrConfig = (_this_conf_server = this.conf.server) === null || _this_conf_server === void 0 ? void 0 : _this_conf_server.ssr;
@@ -296,15 +295,10 @@ class ModernDevServer extends ModernServer {
   }
   constructor(options) {
     super(options);
-    _define_property(this, "mockHandler", null);
-    _define_property(this, "dev", void 0);
-    _define_property(this, "useWorkerSSR", void 0);
-    _define_property(this, "appContext", void 0);
-    _define_property(this, "devMiddleware", void 0);
-    _define_property(this, "watcher", void 0);
+    this.mockHandler = null;
     this.appContext = options.appContext;
     this.workDir = this.pwd;
-    this.useWorkerSSR = Boolean(options.useWorkerSSR);
+    this.useSSRWorker = Boolean(options.useSSRWorker);
     this.dev = this.getDevOptions(options);
     this.devMiddleware = new DevMiddleware({
       dev: this.dev,

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

@@ -4,7 +4,7 @@ const PORT = 9230;
 async function workerSSRRender(ctx, renderOptions, _runner) {
   const { headers, params } = ctx;
   const { urlPath } = renderOptions.route;
-  const url = `http://0.0.0.0:${PORT}/${urlPath}`;
+  const url = urlPath.startsWith("/") ? `http://0.0.0.0:${PORT}${urlPath}` : `http://0.0.0.0:${PORT}/${urlPath}`;
   const resposne = await axios.get(url, {
     timeout: 5e3,
     responseType: "text",

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

@@ -11,7 +11,7 @@ import type { ModernDevServerOptionsNew } from '../types';
 export declare class ModernDevServer extends ModernServer {
     private mockHandler;
     private readonly dev;
-    private readonly useWorkerSSR;
+    private readonly useSSRWorker;
     private readonly appContext;
     private getMiddlewares;
     private rsbuild;

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

@@ -11,7 +11,7 @@ import type { ModernDevServerOptions } from '../types';
 export declare class ModernDevServer extends ModernServer {
     private mockHandler;
     private readonly dev;
-    private readonly useWorkerSSR;
+    private readonly useSSRWorker;
     private readonly appContext;
     private readonly devMiddleware;
     private watcher?;

package/dist/types/types.d.ts

@@ -36,12 +36,12 @@ export type DevMiddleware = (options: DevMiddlewareOptions) => DevMiddlewareAPI;
 export type ExtraOptions = {
     dev: boolean | Partial<DevServerOptions>;
     devMiddleware?: DevMiddleware;
-    useWorkerSSR?: boolean;
+    useSSRWorker?: boolean;
 };
 export type ModernDevServerOptions = ModernServerOptions & ExtraOptions;
 export type ExtraOptionsNew = {
-    dev: Partial<DevServerOptions>;
-    useWorkerSSR?: boolean;
+    dev: Pick<DevServerOptions, 'watch' | 'https' | 'compress' | 'devMiddleware'>;
+    useSSRWorker?: boolean;
     rsbuild: RsbuildInstance;
     getMiddlewares: (overrides?: DevMiddlewaresConfig) => ReturnType<DevServerAPIs['getMiddlewares']>;
 };

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.48.0",
+  "version": "2.48.2",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -48,14 +48,14 @@
     "path-to-regexp": "^6.2.0",
     "ws": "^8.13.0",
     "axios": "^1.6.0",
-    "@modern-js/server-utils": "2.48.0",
-    "@modern-js/types": "2.48.0",
-    "@modern-js/utils": "2.48.0",
-    "@modern-js/runtime-utils": "2.48.0",
-    "@modern-js/prod-server": "2.48.0"
+    "@modern-js/prod-server": "2.48.2",
+    "@modern-js/server-utils": "2.48.2",
+    "@modern-js/types": "2.48.2",
+    "@modern-js/utils": "2.48.2",
+    "@modern-js/runtime-utils": "2.48.2"
   },
   "devDependencies": {
-    "@rsbuild/shared": "0.4.8",
+    "@rsbuild/shared": "0.4.15",
     "@types/connect-history-api-fallback": "^1.3.5",
     "@types/jest": "^29",
     "@types/minimatch": "^3.0.5",
@@ -68,9 +68,9 @@
     "typescript": "^5",
     "webpack": "^5.89.0",
     "websocket": "^1",
-    "@modern-js/server-core": "2.48.0",
-    "@scripts/build": "2.48.0",
-    "@scripts/jest-config": "2.48.0"
+    "@scripts/build": "2.48.2",
+    "@modern-js/server-core": "2.48.2",
+    "@scripts/jest-config": "2.48.2"
   },
   "peerDependencies": {
     "devcert": "^1.2.2",