@modern-js/server-core 2.47.1-alpha.1 → 2.47.1-alpha.2

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

@@ -37,13 +37,13 @@ const bindBFFHandler = async (server, options) => {
   await runner.gather(collector);
   const webOnly = await (0, import_utils.isWebOnly)();
   let handler;
-  const renderHandler = (0, import_middlewares.getRenderHandler)(options);
   if (webOnly) {
     handler = async (c, next) => {
       c.body("");
       await next();
     };
   } else {
+    const renderHandler = enableHandleWeb ? await (0, import_middlewares.getRenderHandler)(options) : null;
     handler = await server.runner.prepareApiServer({
       pwd: options.pwd,
       prefix,

package/dist/cjs/base/adapters/node/middlewares/templates.js

@@ -52,7 +52,7 @@ async function getHtmlTemplates(pwd, routes) {
 }
 function createInjectHtml(pwd, routes) {
   return async (c, next) => {
-    if (c.req.method.toUpperCase() === "GET" && !c.get("templates") && routes) {
+    if (!c.get("templates") && routes) {
       const templates = await getHtmlTemplates(pwd, routes);
       c.set("templates", templates);
     }

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

@@ -28,6 +28,7 @@ var import_stream = require("./polyfills/stream");
 var import_install = require("./polyfills/install");
 (0, import_install.installGlobals)();
 const createWebRequest = (req, res) => {
+  var _req_url;
   const headerRecord = [];
   const len = req.rawHeaders.length;
   for (let i = 0; i < len; i += 2) {
@@ -44,6 +45,10 @@ const createWebRequest = (req, res) => {
     signal: controller.signal
   };
   res.on("close", () => controller.abort());
+  if (!(method === "GET" || method === "HEAD") && ((_req_url = req.url) === null || _req_url === void 0 ? void 0 : _req_url.includes("__loader"))) {
+    init.body = (0, import_stream.createReadableStreamFromReadable)(req);
+    init.duplex = "half";
+  }
   const url = `http://${req.headers.host}${req.url}`;
   const request = new Request(url, init);
   return request;

package/dist/cjs/base/middlewares/customServer/index.js

@@ -28,6 +28,10 @@ var import_constants = require("../../constants");
 var import_context = require("./context");
 const noop = () => {
 };
+const isHtmlResponse = (response) => {
+  const contentType = response.headers.get("content-type");
+  return contentType === null || contentType === void 0 ? void 0 : contentType.includes("text/html");
+};
 class CustomServer {
   getHookMiddleware(entryName, routes) {
     return async (c, next) => {
@@ -61,7 +65,7 @@ class CustomServer {
         return void 0;
       }
       await next();
-      if (c.finalized && !c.res.body) {
+      if (c.finalized && (!c.res.body || !isHtmlResponse(c.res))) {
         return void 0;
       }
       if (routeInfo.isStream) {

package/dist/cjs/base/middlewares/dataHandler.js

@@ -28,7 +28,9 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var dataHandler_exports = {};
 __export(dataHandler_exports, {
-  bindDataHandlers: () => bindDataHandlers
+  bindDataHandlers: () => bindDataHandlers,
+  createDataHandlers: () => createDataHandlers,
+  dataHandler: () => dataHandler
 });
 module.exports = __toCommonJS(dataHandler_exports);
 var import_utils = require("@modern-js/utils");
@@ -40,6 +42,16 @@ const bindDataHandlers = async (server, routes, distDir) => {
     server.all(`${route.urlPath === "/" ? "*" : `${route.urlPath}/*`}`, createDataHandler(routes, bundlePath));
   });
 };
+const createDataHandlers = async (routes, distDir) => {
+  const path = await (0, import_utils2.getPathModule)();
+  const handlers = /* @__PURE__ */ new Map();
+  routes.forEach((route) => {
+    const bundlePath = path.join(distDir, import_utils.SERVER_BUNDLE_DIRECTORY, `${route.entryName || import_utils.MAIN_ENTRY_NAME}-server-loaders.js`);
+    const dataHandler2 = createDataHandler(routes, bundlePath);
+    handlers.set(`${route.entryName || import_utils.MAIN_ENTRY_NAME}`, dataHandler2);
+  });
+  return handlers;
+};
 const createDataHandler = (serverRoutes, buildModulePath) => {
   return async (context, next) => {
     let buildModule;
@@ -63,7 +75,30 @@ const createDataHandler = (serverRoutes, buildModulePath) => {
     return response ? response : next();
   };
 };
+const dataHandler = async (request, { routeInfo, serverRoutes, pwd, reporter, logger }) => {
+  const path = await (0, import_utils2.getPathModule)();
+  const serverLoaderBundlePath = path.join(pwd, import_utils.SERVER_BUNDLE_DIRECTORY, `${routeInfo.entryName || import_utils.MAIN_ENTRY_NAME}-server-loaders.js`);
+  let serverLoaderModule;
+  try {
+    serverLoaderModule = await Promise.resolve().then(() => __toESM(require(serverLoaderBundlePath)));
+  } catch (_) {
+    return;
+  }
+  const { routes, handleRequest } = serverLoaderModule;
+  const response = await handleRequest({
+    request,
+    serverRoutes,
+    context: {
+      logger,
+      reporter
+    },
+    routes
+  });
+  return response;
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  bindDataHandlers
+  bindDataHandlers,
+  createDataHandlers,
+  dataHandler
 });

package/dist/cjs/base/middlewares/renderHandler/index.js

@@ -44,7 +44,7 @@ function createRenderHandler(render) {
     return res;
   };
 }
-function getRenderHandler(options) {
+async function getRenderHandler(options) {
   const { routes, pwd, config } = options;
   if (routes && routes.length > 0) {
     var _config_server, _options_config_security;
@@ -81,8 +81,8 @@ async function bindRenderHandler(server, options) {
       const customServerMiddleware = customServer.getServerMiddleware();
       server.use(urlPath, customServerMiddleware);
     }
-    const render = getRenderHandler(options);
-    render && server.get("*", createRenderHandler(render));
+    const render = await getRenderHandler(options);
+    render && server.all("*", createRenderHandler(render));
   }
 }
 // Annotate the CommonJS export names for ESM import in node:

package/dist/cjs/base/middlewares/renderHandler/render.js

@@ -24,8 +24,9 @@ module.exports = __toCommonJS(render_exports);
 var import_utils = require("@modern-js/utils");
 var import_request = require("../../utils/request");
 var import_utils2 = require("../../utils");
+var import_dataHandler = require("../dataHandler");
 var import_ssrRender = require("./ssrRender");
-function createRender({ routes, pwd, metaName, staticGenerate, forceCSR, nonce }) {
+async function createRender({ routes, pwd, metaName, staticGenerate, forceCSR, nonce }) {
   return async (req, { logger, nodeReq, reporter, tpls }) => {
     const routeInfo = matchRoute(req, routes);
     if (!routeInfo) {
@@ -41,7 +42,7 @@ function createRender({ routes, pwd, metaName, staticGenerate, forceCSR, nonce }
       throw new Error(`Can't found entry ${routeInfo.entryName} html `);
     }
     const renderMode = getRenderMode(req, metaName || "modern-js", routeInfo.isSSR, forceCSR);
-    return renderMode === "csr" ? csrRender(html) : (0, import_ssrRender.ssrRender)(req, {
+    const renderOptions = {
       pwd,
       mode: "string",
       html,
@@ -51,8 +52,23 @@ function createRender({ routes, pwd, metaName, staticGenerate, forceCSR, nonce }
       nonce,
       logger,
       nodeReq,
-      reporter
-    });
+      reporter,
+      serverRoutes: routes
+    };
+    switch (renderMode) {
+      case "data":
+        let response = await (0, import_dataHandler.dataHandler)(req, renderOptions);
+        if (!response) {
+          response = await (0, import_ssrRender.ssrRender)(req, renderOptions);
+        }
+        return response;
+      case "ssr":
+        return (0, import_ssrRender.ssrRender)(req, renderOptions);
+      case "csr":
+        return csrRender(html);
+      default:
+        throw new Error(`Unknown render mode: ${renderMode}`);
+    }
   };
 }
 function matchRoute(req, routes) {
@@ -68,6 +84,9 @@ function matchRoute(req, routes) {
 function getRenderMode(req, framework, isSSR, forceCSR) {
   const query = (0, import_request.parseQuery)(req);
   if (isSSR) {
+    if (query.__loader) {
+      return "data";
+    }
     if (forceCSR && (query.csr || req.headers.get(`x-${(0, import_utils.cutNameByHyphen)(framework)}-ssr-fallback`))) {
       return "csr";
     }

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

@@ -14,13 +14,13 @@ const bindBFFHandler = async (server, options) => {
   await runner.gather(collector);
   const webOnly = await isWebOnly();
   let handler;
-  const renderHandler = getRenderHandler(options);
   if (webOnly) {
     handler = async (c, next) => {
       c.body("");
       await next();
     };
   } else {
+    const renderHandler = enableHandleWeb ? await getRenderHandler(options) : null;
     handler = await server.runner.prepareApiServer({
       pwd: options.pwd,
       prefix,

package/dist/esm/base/adapters/node/middlewares/templates.js

@@ -19,7 +19,7 @@ async function getHtmlTemplates(pwd, routes) {
 }
 function createInjectHtml(pwd, routes) {
   return async (c, next) => {
-    if (c.req.method.toUpperCase() === "GET" && !c.get("templates") && routes) {
+    if (!c.get("templates") && routes) {
       const templates = await getHtmlTemplates(pwd, routes);
       c.set("templates", templates);
     }

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

@@ -1,8 +1,9 @@
 import { createServer, ServerResponse } from "node:http";
-import { writeReadableStreamToWritable } from "./polyfills/stream";
+import { createReadableStreamFromReadable, writeReadableStreamToWritable } from "./polyfills/stream";
 import { installGlobals } from "./polyfills/install";
 installGlobals();
 const createWebRequest = (req, res) => {
+  var _req_url;
   const headerRecord = [];
   const len = req.rawHeaders.length;
   for (let i = 0; i < len; i += 2) {
@@ -19,6 +20,10 @@ const createWebRequest = (req, res) => {
     signal: controller.signal
   };
   res.on("close", () => controller.abort());
+  if (!(method === "GET" || method === "HEAD") && ((_req_url = req.url) === null || _req_url === void 0 ? void 0 : _req_url.includes("__loader"))) {
+    init.body = createReadableStreamFromReadable(req);
+    init.duplex = "half";
+  }
   const url = `http://${req.headers.host}${req.url}`;
   const request = new Request(url, init);
   return request;

package/dist/esm/base/middlewares/customServer/index.js

@@ -5,6 +5,10 @@ import { ServerReportTimings } from "../../constants";
 import { createAfterMatchCtx, createAfterRenderCtx, createCustomMiddlewaresCtx, createAfterStreamingRenderContext } from "./context";
 const noop = () => {
 };
+const isHtmlResponse = (response) => {
+  const contentType = response.headers.get("content-type");
+  return contentType === null || contentType === void 0 ? void 0 : contentType.includes("text/html");
+};
 class CustomServer {
   getHookMiddleware(entryName, routes) {
     return async (c, next) => {
@@ -38,7 +42,7 @@ class CustomServer {
         return void 0;
       }
       await next();
-      if (c.finalized && !c.res.body) {
+      if (c.finalized && (!c.res.body || !isHtmlResponse(c.res))) {
         return void 0;
       }
       if (routeInfo.isStream) {

package/dist/esm/base/middlewares/dataHandler.js

@@ -7,6 +7,16 @@ const bindDataHandlers = async (server, routes, distDir) => {
     server.all(`${route.urlPath === "/" ? "*" : `${route.urlPath}/*`}`, createDataHandler(routes, bundlePath));
   });
 };
+const createDataHandlers = async (routes, distDir) => {
+  const path = await getPathModule();
+  const handlers = /* @__PURE__ */ new Map();
+  routes.forEach((route) => {
+    const bundlePath = path.join(distDir, SERVER_BUNDLE_DIRECTORY, `${route.entryName || MAIN_ENTRY_NAME}-server-loaders.js`);
+    const dataHandler2 = createDataHandler(routes, bundlePath);
+    handlers.set(`${route.entryName || MAIN_ENTRY_NAME}`, dataHandler2);
+  });
+  return handlers;
+};
 const createDataHandler = (serverRoutes, buildModulePath) => {
   return async (context, next) => {
     let buildModule;
@@ -30,6 +40,29 @@ const createDataHandler = (serverRoutes, buildModulePath) => {
     return response ? response : next();
   };
 };
+const dataHandler = async (request, { routeInfo, serverRoutes, pwd, reporter, logger }) => {
+  const path = await getPathModule();
+  const serverLoaderBundlePath = path.join(pwd, SERVER_BUNDLE_DIRECTORY, `${routeInfo.entryName || MAIN_ENTRY_NAME}-server-loaders.js`);
+  let serverLoaderModule;
+  try {
+    serverLoaderModule = await import(serverLoaderBundlePath);
+  } catch (_) {
+    return;
+  }
+  const { routes, handleRequest } = serverLoaderModule;
+  const response = await handleRequest({
+    request,
+    serverRoutes,
+    context: {
+      logger,
+      reporter
+    },
+    routes
+  });
+  return response;
+};
 export {
-  bindDataHandlers
+  bindDataHandlers,
+  createDataHandlers,
+  dataHandler
 };

package/dist/esm/base/middlewares/renderHandler/index.js

@@ -20,7 +20,7 @@ function createRenderHandler(render) {
     return res;
   };
 }
-function getRenderHandler(options) {
+async function getRenderHandler(options) {
   const { routes, pwd, config } = options;
   if (routes && routes.length > 0) {
     var _config_server, _options_config_security;
@@ -57,8 +57,8 @@ async function bindRenderHandler(server, options) {
       const customServerMiddleware = customServer.getServerMiddleware();
       server.use(urlPath, customServerMiddleware);
     }
-    const render = getRenderHandler(options);
-    render && server.get("*", createRenderHandler(render));
+    const render = await getRenderHandler(options);
+    render && server.all("*", createRenderHandler(render));
   }
 }
 export {

package/dist/esm/base/middlewares/renderHandler/render.js

@@ -1,8 +1,9 @@
 import { cutNameByHyphen } from "@modern-js/utils";
 import { parseQuery } from "../../utils/request";
 import { createErrorHtml, sortRoutes } from "../../utils";
+import { dataHandler } from "../dataHandler";
 import { ssrRender } from "./ssrRender";
-function createRender({ routes, pwd, metaName, staticGenerate, forceCSR, nonce }) {
+async function createRender({ routes, pwd, metaName, staticGenerate, forceCSR, nonce }) {
   return async (req, { logger, nodeReq, reporter, tpls }) => {
     const routeInfo = matchRoute(req, routes);
     if (!routeInfo) {
@@ -18,7 +19,7 @@ function createRender({ routes, pwd, metaName, staticGenerate, forceCSR, nonce }
       throw new Error(`Can't found entry ${routeInfo.entryName} html `);
     }
     const renderMode = getRenderMode(req, metaName || "modern-js", routeInfo.isSSR, forceCSR);
-    return renderMode === "csr" ? csrRender(html) : ssrRender(req, {
+    const renderOptions = {
       pwd,
       mode: "string",
       html,
@@ -28,8 +29,23 @@ function createRender({ routes, pwd, metaName, staticGenerate, forceCSR, nonce }
       nonce,
       logger,
       nodeReq,
-      reporter
-    });
+      reporter,
+      serverRoutes: routes
+    };
+    switch (renderMode) {
+      case "data":
+        let response = await dataHandler(req, renderOptions);
+        if (!response) {
+          response = await ssrRender(req, renderOptions);
+        }
+        return response;
+      case "ssr":
+        return ssrRender(req, renderOptions);
+      case "csr":
+        return csrRender(html);
+      default:
+        throw new Error(`Unknown render mode: ${renderMode}`);
+    }
   };
 }
 function matchRoute(req, routes) {
@@ -45,6 +61,9 @@ function matchRoute(req, routes) {
 function getRenderMode(req, framework, isSSR, forceCSR) {
   const query = parseQuery(req);
   if (isSSR) {
+    if (query.__loader) {
+      return "data";
+    }
     if (forceCSR && (query.csr || req.headers.get(`x-${cutNameByHyphen(framework)}-ssr-fallback`))) {
       return "csr";
     }

package/dist/types/base/middlewares/dataHandler.d.ts

@@ -1,3 +1,9 @@
 import type { ServerRoute } from '@modern-js/types';
+import { Middleware } from '../../core/server';
 import type { ServerBase } from '../serverBase';
+import { SSRRenderOptions } from './renderHandler/ssrRender';
 export declare const bindDataHandlers: (server: ServerBase, routes: ServerRoute[], distDir: string) => Promise<void>;
+export declare const createDataHandlers: (routes: ServerRoute[], distDir: string) => Promise<Map<string, Middleware>>;
+export declare const dataHandler: (request: Request, { routeInfo, serverRoutes, pwd, reporter, logger, }: SSRRenderOptions & {
+    serverRoutes: ServerRoute[];
+}) => Promise<Response | void>;

package/dist/types/base/middlewares/renderHandler/index.d.ts

@@ -5,5 +5,5 @@ export type BindRenderHandleOptions = {
     metaName?: string;
     staticGenerate?: boolean;
 };
-export declare function getRenderHandler(options: ServerBaseOptions & BindRenderHandleOptions): Render | null;
+export declare function getRenderHandler(options: ServerBaseOptions & BindRenderHandleOptions): Promise<Render | null>;
 export declare function bindRenderHandler(server: ServerBase, options: ServerBaseOptions & BindRenderHandleOptions): Promise<void>;

package/dist/types/base/middlewares/renderHandler/render.d.ts

@@ -8,5 +8,5 @@ interface CreateRenderOptions {
     forceCSR?: boolean;
     nonce?: string;
 }
-export declare function createRender({ routes, pwd, metaName, staticGenerate, forceCSR, nonce, }: CreateRenderOptions): Render;
+export declare function createRender({ routes, pwd, metaName, staticGenerate, forceCSR, nonce, }: CreateRenderOptions): Promise<Render>;
 export {};

package/dist/types/base/middlewares/renderHandler/ssrRender.d.ts

@@ -2,9 +2,8 @@
 /// <reference types="dist/types/core/server" />
 import type { IncomingMessage } from 'http';
 import type { Logger, Reporter, ServerRoute } from '@modern-js/types';
-interface SSRRenderOptions {
+export interface SSRRenderOptions {
     pwd: string;
-    mode: 'string' | 'stream';
     html: string;
     routeInfo: ServerRoute;
     staticGenerate: boolean;
@@ -15,4 +14,3 @@ interface SSRRenderOptions {
     nonce?: string;
 }
 export declare function ssrRender(request: Request, { routeInfo, pwd, html, staticGenerate, nonce, metaName, reporter, logger, nodeReq, }: SSRRenderOptions): Promise<Response>;
-export {};

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.47.1-alpha.1",
+  "version": "2.47.1-alpha.2",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -54,9 +54,9 @@
     "hono": "^3.12.2",
     "isbot": "3.8.0",
     "merge-deep": "^3.0.3",
+    "@modern-js/utils": "2.47.0",
     "@modern-js/runtime-utils": "2.47.0",
-    "@modern-js/plugin": "2.47.0",
-    "@modern-js/utils": "2.47.0"
+    "@modern-js/plugin": "2.47.0"
   },
   "devDependencies": {
     "@types/jest": "^29",