@modern-js/server-core 2.60.6 → 2.61.0

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

@@ -58,7 +58,7 @@ const createWebRequest = (req, res, body) => {
     signal: controller.signal
   };
   res.on("close", () => controller.abort("res closed"));
-  if (body || !(method === "GET" || method === "HEAD") && ((_req_url = req.url) === null || _req_url === void 0 ? void 0 : _req_url.includes("__loader"))) {
+  if (body || !(method === "GET" || method === "HEAD") && ((_req_url = req.url) === null || _req_url === void 0 ? void 0 : _req_url.includes("__loader")) || req.headers["x-mf-micro"]) {
     init.body = body !== null && body !== void 0 ? body : (0, import_stream.createReadableStreamFromReadable)(req);
     init.duplex = "half";
   }

package/dist/cjs/pluginManager.js

@@ -70,7 +70,7 @@ function createCoreManager() {
   const hooks = {
     config: (0, import_plugin.createAsyncWaterfall)(),
     prepare: (0, import_plugin.createAsyncWaterfall)(),
-    reset: (0, import_plugin.createParallelWorkflow)(),
+    reset: (0, import_plugin.createAsyncWorkflow)(),
     prepareWebServer: (0, import_plugin.createAsyncPipeline)(),
     fallback: (0, import_plugin.createParallelWorkflow)(),
     prepareApiServer: (0, import_plugin.createAsyncPipeline)(),

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

@@ -28,7 +28,7 @@ var createWebRequest = function(req, res, body) {
   res.on("close", function() {
     return controller.abort("res closed");
   });
-  if (body || !(method === "GET" || method === "HEAD") && ((_req_url = req.url) === null || _req_url === void 0 ? void 0 : _req_url.includes("__loader"))) {
+  if (body || !(method === "GET" || method === "HEAD") && ((_req_url = req.url) === null || _req_url === void 0 ? void 0 : _req_url.includes("__loader")) || req.headers["x-mf-micro"]) {
     init.body = body !== null && body !== void 0 ? body : createReadableStreamFromReadable(req);
     init.duplex = "half";
   }

package/dist/esm/pluginManager.js

@@ -7,7 +7,7 @@ import { _ as _class_private_method_get } from "@swc/helpers/_/_class_private_me
 import { _ as _class_private_method_init } from "@swc/helpers/_/_class_private_method_init";
 import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
-import { createAsyncManager, createAsyncPipeline, createAsyncWaterfall, createContext, createParallelWorkflow } from "@modern-js/plugin";
+import { createAsyncManager, createAsyncPipeline, createAsyncWaterfall, createAsyncWorkflow, createContext, createParallelWorkflow } from "@modern-js/plugin";
 import { loadConfig } from "./utils";
 var _appContext = /* @__PURE__ */ new WeakMap(), _plugins = /* @__PURE__ */ new WeakMap(), _options = /* @__PURE__ */ new WeakMap(), _configContext = /* @__PURE__ */ new WeakMap(), _createCoreManager = /* @__PURE__ */ new WeakSet(), _initConfigContext = /* @__PURE__ */ new WeakSet();
 var PluginManager = /* @__PURE__ */ function() {
@@ -79,7 +79,7 @@ function createCoreManager() {
   var hooks = {
     config: createAsyncWaterfall(),
     prepare: createAsyncWaterfall(),
-    reset: createParallelWorkflow(),
+    reset: createAsyncWorkflow(),
     prepareWebServer: createAsyncPipeline(),
     fallback: createParallelWorkflow(),
     prepareApiServer: createAsyncPipeline(),

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

@@ -22,7 +22,7 @@ const createWebRequest = (req, res, body) => {
     signal: controller.signal
   };
   res.on("close", () => controller.abort("res closed"));
-  if (body || !(method === "GET" || method === "HEAD") && ((_req_url = req.url) === null || _req_url === void 0 ? void 0 : _req_url.includes("__loader"))) {
+  if (body || !(method === "GET" || method === "HEAD") && ((_req_url = req.url) === null || _req_url === void 0 ? void 0 : _req_url.includes("__loader")) || req.headers["x-mf-micro"]) {
     init.body = body !== null && body !== void 0 ? body : createReadableStreamFromReadable(req);
     init.duplex = "half";
   }

package/dist/esm-node/pluginManager.js

@@ -3,7 +3,7 @@ import { _ as _class_private_field_init } from "@swc/helpers/_/_class_private_fi
 import { _ as _class_private_field_set } from "@swc/helpers/_/_class_private_field_set";
 import { _ as _class_private_method_get } from "@swc/helpers/_/_class_private_method_get";
 import { _ as _class_private_method_init } from "@swc/helpers/_/_class_private_method_init";
-import { createAsyncManager, createAsyncPipeline, createAsyncWaterfall, createContext, createParallelWorkflow } from "@modern-js/plugin";
+import { createAsyncManager, createAsyncPipeline, createAsyncWaterfall, createAsyncWorkflow, createContext, createParallelWorkflow } from "@modern-js/plugin";
 import { loadConfig } from "./utils";
 var _appContext = /* @__PURE__ */ new WeakMap(), _plugins = /* @__PURE__ */ new WeakMap(), _options = /* @__PURE__ */ new WeakMap(), _configContext = /* @__PURE__ */ new WeakMap(), _createCoreManager = /* @__PURE__ */ new WeakSet(), _initConfigContext = /* @__PURE__ */ new WeakSet();
 class PluginManager {
@@ -47,7 +47,7 @@ function createCoreManager() {
   const hooks = {
     config: createAsyncWaterfall(),
     prepare: createAsyncWaterfall(),
-    reset: createParallelWorkflow(),
+    reset: createAsyncWorkflow(),
     prepareWebServer: createAsyncPipeline(),
     fallback: createParallelWorkflow(),
     prepareApiServer: createAsyncPipeline(),

package/dist/types/pluginManager.d.ts

@@ -11,9 +11,9 @@ export declare class PluginManager {
     init(): Promise<import("@modern-js/plugin").ToRunners<{
         config: import("@modern-js/plugin").AsyncWaterfall<ServerConfig>;
         prepare: import("@modern-js/plugin").AsyncWaterfall<void>;
-        reset: import("@modern-js/plugin").ParallelWorkflow<{
+        reset: import("@modern-js/plugin").AsyncWorkflow<{
             event: import("./types").ResetEvent;
-        }>;
+        }, void>;
         prepareWebServer: import("@modern-js/plugin").AsyncPipeline<import("./types").WebServerStartInput, import("./types").WebAdapter | import("@modern-js/types").UnstableMiddleware[] | null>;
         fallback: import("@modern-js/plugin").ParallelWorkflow<{
             reason: import("./types").FallbackReason;

package/dist/types/types/plugin.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="node" />
 /** Hooks */
 import type { IncomingMessage, Server as NodeServer, ServerResponse } from 'http';
-import type { AsyncPipeline, AsyncSetup, AsyncWaterfall, CommonAPI, ParallelWorkflow, PluginOptions, ToRunners, ToThreads, createContext } from '@modern-js/plugin';
+import type { AsyncPipeline, AsyncSetup, AsyncWaterfall, AsyncWorkflow, CommonAPI, ParallelWorkflow, PluginOptions, ToRunners, ToThreads, createContext } from '@modern-js/plugin';
 import type { AfterMatchContext, AfterRenderContext, AfterStreamingRenderContext, CacheOption, Container, HttpMethodDecider, ISAppContext, Logger, Metrics, MiddlewareContext, Reporter, ServerRoute, UnstableMiddleware } from '@modern-js/types';
 import type { MiddlewareHandler } from 'hono';
 import type { UserConfig } from './config';
@@ -49,9 +49,9 @@ export type WebAdapter = (ctx: MiddlewareContext) => void | Promise<void>;
 export interface ServerHooks {
     config: AsyncWaterfall<ServerConfig>;
     prepare: AsyncWaterfall<void>;
-    reset: ParallelWorkflow<{
+    reset: AsyncWorkflow<{
         event: ResetEvent;
-    }>;
+    }, void>;
     /**
      * @deprecated
      *

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

@@ -1,11 +1,5 @@
-/// <reference types="node" />
-import type { Readable } from 'node:stream';
-import type { BaseSSRServerContext, Logger, Metrics, Monitors, NestedRoute, Reporter, ServerRoute } from '@modern-js/types';
+import type { Logger, Metrics, Monitors, NestedRoute, Reporter, ServerRoute } from '@modern-js/types';
 import type { RequestHandler as BundleRequestHandler, OnError, OnTiming } from './requestHandler';
-export type SSRServerContext = BaseSSRServerContext & {
-    staticGenerate?: boolean;
-};
-export type ServerRender = (ssrContext: SSRServerContext) => Promise<string | Readable | ReadableStream>;
 export type RequestHandler = (request: Request, ...args: any[]) => Response | Promise<Response>;
 type ServerLoaderBundle = {
     routes: NestedRoute[];

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.60.6",
+  "version": "2.61.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -53,9 +53,9 @@
     "flatted": "^3.2.9",
     "hono": "^3.12.2",
     "ts-deepmerge": "7.0.1",
-    "@modern-js/plugin": "2.60.6",
-    "@modern-js/runtime-utils": "2.60.6",
-    "@modern-js/utils": "2.60.6"
+    "@modern-js/plugin": "2.61.0",
+    "@modern-js/utils": "2.61.0",
+    "@modern-js/runtime-utils": "2.61.0"
   },
   "devDependencies": {
     "@types/jest": "^29",
@@ -65,9 +65,9 @@
     "jest": "^29",
     "ts-jest": "^29.1.0",
     "typescript": "^5",
-    "@modern-js/types": "2.60.6",
-    "@scripts/jest-config": "2.60.6",
-    "@scripts/build": "2.60.6"
+    "@scripts/build": "2.61.0",
+    "@modern-js/types": "2.61.0",
+    "@scripts/jest-config": "2.61.0"
   },
   "sideEffects": false,
   "publishConfig": {