@modern-js/server-core 2.58.0 → 2.58.1

package/dist/cjs/adapters/node/helper/loadConfig.js

@@ -34,6 +34,7 @@ __export(loadConfig_exports, {
 module.exports = __toCommonJS(loadConfig_exports);
 var import_path = __toESM(require("path"));
 var import_utils = require("@modern-js/utils");
+var import_flatted = require("flatted");
 const requireConfig = (serverConfigPath) => {
   if (import_utils.fs.pathExistsSync(serverConfigPath)) {
     return (0, import_utils.compatRequire)(serverConfigPath);
@@ -75,7 +76,8 @@ function loadServerCliConfig(pwd, defaultConfig = {}) {
     dev: {}
   };
   try {
-    cliConfig = require(cliConfigPath);
+    const content = import_utils.fs.readFileSync(cliConfigPath, "utf-8");
+    cliConfig = (0, import_flatted.parse)(content);
   } catch (_2) {
   }
   const mergedCliConfig = import_utils.lodash.merge(defaultConfig, cliConfig);

package/dist/cjs/plugins/customServer/index.js

@@ -169,7 +169,7 @@ function isRedirect(headers, code) {
 }
 async function createMiddlewareContextFromHono(c) {
   const loaderContext = (0, import_helper.getLoaderCtx)(c);
-  let rawRequest = c.req.raw;
+  const rawRequest = c.req.raw;
   const method = rawRequest.method.toUpperCase();
   if (![
     "GET",
@@ -184,11 +184,14 @@ async function createMiddlewareContextFromHono(c) {
       method: rawRequest.method
     };
     init.duplex = "half";
-    rawRequest = new Request(rawRequest.url, init);
+    c.req.raw = new Request(rawRequest.url, init);
   }
   return {
     get request() {
-      return rawRequest;
+      return c.req.raw;
+    },
+    set request(request) {
+      c.req.raw = request;
     },
     get response() {
       return c.res;

package/dist/esm/adapters/node/helper/loadConfig.js

@@ -1,5 +1,6 @@
 import path from "path";
 import { compatRequire, fs, DEFAULT_SERVER_CONFIG, requireExistModule, ensureAbsolutePath, OUTPUT_CONFIG_FILE, lodash as _ } from "@modern-js/utils";
+import { parse } from "flatted";
 var requireConfig = function(serverConfigPath) {
   if (fs.pathExistsSync(serverConfigPath)) {
     return compatRequire(serverConfigPath);
@@ -43,7 +44,8 @@ function loadServerCliConfig(pwd) {
     dev: {}
   };
   try {
-    cliConfig = require(cliConfigPath);
+    var content = fs.readFileSync(cliConfigPath, "utf-8");
+    cliConfig = parse(content);
   } catch (_2) {
   }
   var mergedCliConfig = _.merge(defaultConfig, cliConfig);

package/dist/esm/plugins/customServer/index.js

@@ -310,14 +310,17 @@ function _createMiddlewareContextFromHono() {
             method: rawRequest.method
           };
           init.duplex = "half";
-          rawRequest = new Request(rawRequest.url, init);
+          c.req.raw = new Request(rawRequest.url, init);
           _state.label = 2;
         case 2:
           return [
             2,
             {
               get request() {
-                return rawRequest;
+                return c.req.raw;
+              },
+              set request(request) {
+                c.req.raw = request;
               },
               get response() {
                 return c.res;

package/dist/esm-node/adapters/node/helper/loadConfig.js

@@ -1,5 +1,6 @@
 import path from "path";
 import { compatRequire, fs, DEFAULT_SERVER_CONFIG, requireExistModule, ensureAbsolutePath, OUTPUT_CONFIG_FILE, lodash as _ } from "@modern-js/utils";
+import { parse } from "flatted";
 const requireConfig = (serverConfigPath) => {
   if (fs.pathExistsSync(serverConfigPath)) {
     return compatRequire(serverConfigPath);
@@ -41,7 +42,8 @@ function loadServerCliConfig(pwd, defaultConfig = {}) {
     dev: {}
   };
   try {
-    cliConfig = require(cliConfigPath);
+    const content = fs.readFileSync(cliConfigPath, "utf-8");
+    cliConfig = parse(content);
   } catch (_2) {
   }
   const mergedCliConfig = _.merge(defaultConfig, cliConfig);

package/dist/esm-node/plugins/customServer/index.js

@@ -135,7 +135,7 @@ function isRedirect(headers, code) {
 }
 async function createMiddlewareContextFromHono(c) {
   const loaderContext = getLoaderCtx(c);
-  let rawRequest = c.req.raw;
+  const rawRequest = c.req.raw;
   const method = rawRequest.method.toUpperCase();
   if (![
     "GET",
@@ -150,11 +150,14 @@ async function createMiddlewareContextFromHono(c) {
       method: rawRequest.method
     };
     init.duplex = "half";
-    rawRequest = new Request(rawRequest.url, init);
+    c.req.raw = new Request(rawRequest.url, init);
   }
   return {
     get request() {
-      return rawRequest;
+      return c.req.raw;
+    },
+    set request(request) {
+      c.req.raw = request;
     },
     get response() {
       return c.res;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.58.0",
+  "version": "2.58.1",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -48,13 +48,14 @@
   "dependencies": {
     "@swc/helpers": "0.5.3",
     "@web-std/fetch": "^4.2.1",
-    "@web-std/stream": "^1.0.3",
     "@web-std/file": "^3.0.3",
+    "@web-std/stream": "^1.0.3",
+    "flatted": "^3.2.9",
     "hono": "^3.12.2",
     "ts-deepmerge": "7.0.0",
-    "@modern-js/plugin": "2.58.0",
-    "@modern-js/runtime-utils": "2.58.0",
-    "@modern-js/utils": "2.58.0"
+    "@modern-js/plugin": "2.58.1",
+    "@modern-js/runtime-utils": "2.58.1",
+    "@modern-js/utils": "2.58.1"
   },
   "devDependencies": {
     "@types/jest": "^29",
@@ -64,9 +65,9 @@
     "jest": "^29",
     "ts-jest": "^29.1.0",
     "typescript": "^5",
-    "@modern-js/types": "2.58.0",
-    "@scripts/build": "2.58.0",
-    "@scripts/jest-config": "2.58.0"
+    "@modern-js/types": "2.58.1",
+    "@scripts/build": "2.58.1",
+    "@scripts/jest-config": "2.58.1"
   },
   "sideEffects": false,
   "publishConfig": {