@modern-js/server-core 2.49.0 → 2.49.1-alpha.0

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

@@ -24,6 +24,7 @@ __export(node_exports, {
   createStaticMiddleware: () => import_middlewares.createStaticMiddleware,
   createWebRequest: () => import_node.createWebRequest,
   getHtmlTemplates: () => import_middlewares.getHtmlTemplates,
+  getServerManifest: () => import_middlewares.getServerManifest,
   httpCallBack2HonoMid: () => import_hono.httpCallBack2HonoMid,
   injectServerManifest: () => import_middlewares.injectServerManifest,
   injectTemplates: () => import_middlewares.injectTemplates,
@@ -45,6 +46,7 @@ var import_middlewares = require("./middlewares");
   createStaticMiddleware,
   createWebRequest,
   getHtmlTemplates,
+  getServerManifest,
   httpCallBack2HonoMid,
   injectServerManifest,
   injectTemplates,

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

@@ -28,6 +28,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var serverManifest_exports = {};
 __export(serverManifest_exports, {
+  getServerManifest: () => getServerManifest,
   injectServerManifest: () => injectServerManifest
 });
 module.exports = __toCommonJS(serverManifest_exports);
@@ -36,26 +37,32 @@ var import_utils = require("@modern-js/utils");
 async function getServerManifest(pwd, routes) {
   const loaderBundles = {};
   const renderBundles = {};
-  await Promise.all([
-    routes.map(async (route) => {
-      const entryName = route.entryName || import_utils.MAIN_ENTRY_NAME;
-      const loaderBundlePath = import_path.default.join(pwd, import_utils.SERVER_BUNDLE_DIRECTORY, `${entryName}-server-loaders.js`);
-      const renderBundlePath = import_path.default.join(pwd, route.bundle || "");
-      await Promise.allSettled([
-        Promise.resolve().then(() => __toESM(require(loaderBundlePath))),
-        Promise.resolve().then(() => __toESM(require(renderBundlePath)))
-      ]).then((results) => {
-        const { status: loaderStatus } = results[0];
-        if (loaderStatus === "fulfilled") {
-          loaderBundles[entryName] = results[0].value;
-        }
-        const { status: renderStatus } = results[1];
-        if (renderStatus === "fulfilled") {
-          renderBundles[entryName] = results[1].value;
-        }
-      });
-    })
-  ]);
+  await Promise.all(routes.map(async (route) => {
+    const entryName = route.entryName || import_utils.MAIN_ENTRY_NAME;
+    const loaderBundlePath = import_path.default.join(pwd, import_utils.SERVER_BUNDLE_DIRECTORY, `${entryName}-server-loaders.js`);
+    const renderBundlePath = import_path.default.join(pwd, route.bundle || "");
+    const dynamicImport = (filePath) => {
+      try {
+        const module2 = require(filePath);
+        return Promise.resolve(module2);
+      } catch (e) {
+        return Promise.reject(e);
+      }
+    };
+    await Promise.allSettled([
+      dynamicImport(loaderBundlePath),
+      dynamicImport(renderBundlePath)
+    ]).then((results) => {
+      const { status: loaderStatus } = results[0];
+      if (loaderStatus === "fulfilled") {
+        loaderBundles[entryName] = results[0].value;
+      }
+      const { status: renderStatus } = results[1];
+      if (renderStatus === "fulfilled") {
+        renderBundles[entryName] = results[1].value;
+      }
+    });
+  }));
   const loadableUri = import_path.default.join(pwd, import_utils.LOADABLE_STATS_FILE);
   const loadableStats = await Promise.resolve().then(() => __toESM(require(loadableUri))).catch((_) => ({}));
   const routesManifestUri = import_path.default.join(pwd, import_utils.ROUTE_MANIFEST_FILE);
@@ -78,5 +85,6 @@ function injectServerManifest(pwd, routes) {
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  getServerManifest,
   injectServerManifest
 });

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

@@ -2,7 +2,7 @@ import { loadServerEnv } from "./loadServer";
 import { httpCallBack2HonoMid, connectMid2HonoMid } from "./hono";
 import { createNodeServer, sendResponse, createWebRequest } from "./node";
 import { bindBFFHandler } from "./bff";
-import { createStaticMiddleware, registerMockHandlers, injectServerManifest, injectTemplates, getHtmlTemplates } from "./middlewares";
+import { createStaticMiddleware, registerMockHandlers, injectServerManifest, injectTemplates, getHtmlTemplates, getServerManifest } from "./middlewares";
 export {
   bindBFFHandler,
   connectMid2HonoMid,
@@ -10,6 +10,7 @@ export {
   createStaticMiddleware,
   createWebRequest,
   getHtmlTemplates,
+  getServerManifest,
   httpCallBack2HonoMid,
   injectServerManifest,
   injectTemplates,

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

@@ -15,45 +15,51 @@ function _getServerManifest() {
           renderBundles = {};
           return [
             4,
-            Promise.all([
-              routes.map(function() {
-                var _ref = _async_to_generator(function(route) {
-                  var entryName, loaderBundlePath, renderBundlePath;
-                  return _ts_generator(this, function(_state2) {
-                    switch (_state2.label) {
-                      case 0:
-                        entryName = route.entryName || MAIN_ENTRY_NAME;
-                        loaderBundlePath = path.join(pwd, SERVER_BUNDLE_DIRECTORY, "".concat(entryName, "-server-loaders.js"));
-                        renderBundlePath = path.join(pwd, route.bundle || "");
-                        return [
-                          4,
-                          Promise.allSettled([
-                            import(loaderBundlePath),
-                            import(renderBundlePath)
-                          ]).then(function(results) {
-                            var _results_ = results[0], loaderStatus = _results_.status;
-                            if (loaderStatus === "fulfilled") {
-                              loaderBundles[entryName] = results[0].value;
-                            }
-                            var _results_1 = results[1], renderStatus = _results_1.status;
-                            if (renderStatus === "fulfilled") {
-                              renderBundles[entryName] = results[1].value;
-                            }
-                          })
-                        ];
-                      case 1:
-                        _state2.sent();
-                        return [
-                          2
-                        ];
-                    }
-                  });
+            Promise.all(routes.map(function() {
+              var _ref = _async_to_generator(function(route) {
+                var entryName, loaderBundlePath, renderBundlePath, dynamicImport;
+                return _ts_generator(this, function(_state2) {
+                  switch (_state2.label) {
+                    case 0:
+                      entryName = route.entryName || MAIN_ENTRY_NAME;
+                      loaderBundlePath = path.join(pwd, SERVER_BUNDLE_DIRECTORY, "".concat(entryName, "-server-loaders.js"));
+                      renderBundlePath = path.join(pwd, route.bundle || "");
+                      dynamicImport = function(filePath) {
+                        try {
+                          var module = require(filePath);
+                          return Promise.resolve(module);
+                        } catch (e) {
+                          return Promise.reject(e);
+                        }
+                      };
+                      return [
+                        4,
+                        Promise.allSettled([
+                          dynamicImport(loaderBundlePath),
+                          dynamicImport(renderBundlePath)
+                        ]).then(function(results) {
+                          var _results_ = results[0], loaderStatus = _results_.status;
+                          if (loaderStatus === "fulfilled") {
+                            loaderBundles[entryName] = results[0].value;
+                          }
+                          var _results_1 = results[1], renderStatus = _results_1.status;
+                          if (renderStatus === "fulfilled") {
+                            renderBundles[entryName] = results[1].value;
+                          }
+                        })
+                      ];
+                    case 1:
+                      _state2.sent();
+                      return [
+                        2
+                      ];
+                  }
                 });
-                return function(route) {
-                  return _ref.apply(this, arguments);
-                };
-              }())
-            ])
+              });
+              return function(route) {
+                return _ref.apply(this, arguments);
+              };
+            }()))
           ];
         case 1:
           _state.sent();
@@ -128,5 +134,6 @@ function injectServerManifest(pwd, routes) {
   }();
 }
 export {
+  getServerManifest,
   injectServerManifest
 };

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

@@ -2,7 +2,7 @@ import { loadServerEnv } from "./loadServer";
 import { httpCallBack2HonoMid, connectMid2HonoMid } from "./hono";
 import { createNodeServer, sendResponse, createWebRequest } from "./node";
 import { bindBFFHandler } from "./bff";
-import { createStaticMiddleware, registerMockHandlers, injectServerManifest, injectTemplates, getHtmlTemplates } from "./middlewares";
+import { createStaticMiddleware, registerMockHandlers, injectServerManifest, injectTemplates, getHtmlTemplates, getServerManifest } from "./middlewares";
 export {
   bindBFFHandler,
   connectMid2HonoMid,
@@ -10,6 +10,7 @@ export {
   createStaticMiddleware,
   createWebRequest,
   getHtmlTemplates,
+  getServerManifest,
   httpCallBack2HonoMid,
   injectServerManifest,
   injectTemplates,

package/dist/esm-node/base/adapters/node/middlewares/serverManifest.js

@@ -3,26 +3,32 @@ import { LOADABLE_STATS_FILE, MAIN_ENTRY_NAME, ROUTE_MANIFEST_FILE, SERVER_BUNDL
 async function getServerManifest(pwd, routes) {
   const loaderBundles = {};
   const renderBundles = {};
-  await Promise.all([
-    routes.map(async (route) => {
-      const entryName = route.entryName || MAIN_ENTRY_NAME;
-      const loaderBundlePath = path.join(pwd, SERVER_BUNDLE_DIRECTORY, `${entryName}-server-loaders.js`);
-      const renderBundlePath = path.join(pwd, route.bundle || "");
-      await Promise.allSettled([
-        import(loaderBundlePath),
-        import(renderBundlePath)
-      ]).then((results) => {
-        const { status: loaderStatus } = results[0];
-        if (loaderStatus === "fulfilled") {
-          loaderBundles[entryName] = results[0].value;
-        }
-        const { status: renderStatus } = results[1];
-        if (renderStatus === "fulfilled") {
-          renderBundles[entryName] = results[1].value;
-        }
-      });
-    })
-  ]);
+  await Promise.all(routes.map(async (route) => {
+    const entryName = route.entryName || MAIN_ENTRY_NAME;
+    const loaderBundlePath = path.join(pwd, SERVER_BUNDLE_DIRECTORY, `${entryName}-server-loaders.js`);
+    const renderBundlePath = path.join(pwd, route.bundle || "");
+    const dynamicImport = (filePath) => {
+      try {
+        const module = require(filePath);
+        return Promise.resolve(module);
+      } catch (e) {
+        return Promise.reject(e);
+      }
+    };
+    await Promise.allSettled([
+      dynamicImport(loaderBundlePath),
+      dynamicImport(renderBundlePath)
+    ]).then((results) => {
+      const { status: loaderStatus } = results[0];
+      if (loaderStatus === "fulfilled") {
+        loaderBundles[entryName] = results[0].value;
+      }
+      const { status: renderStatus } = results[1];
+      if (renderStatus === "fulfilled") {
+        renderBundles[entryName] = results[1].value;
+      }
+    });
+  }));
   const loadableUri = path.join(pwd, LOADABLE_STATS_FILE);
   const loadableStats = await import(loadableUri).catch((_) => ({}));
   const routesManifestUri = path.join(pwd, ROUTE_MANIFEST_FILE);
@@ -44,5 +50,6 @@ function injectServerManifest(pwd, routes) {
   };
 }
 export {
+  getServerManifest,
   injectServerManifest
 };

package/dist/types/base/adapters/node/index.d.ts

@@ -3,4 +3,4 @@ export { httpCallBack2HonoMid, connectMid2HonoMid } from './hono';
 export type { ServerNodeContext, ServerNodeMiddleware } from './hono';
 export { createNodeServer, sendResponse, createWebRequest } from './node';
 export { bindBFFHandler } from './bff';
-export { createStaticMiddleware, registerMockHandlers, injectServerManifest, injectTemplates, getHtmlTemplates, } from './middlewares';
+export { createStaticMiddleware, registerMockHandlers, injectServerManifest, injectTemplates, getHtmlTemplates, getServerManifest, } from './middlewares';

package/dist/types/base/adapters/node/middlewares/serverManifest.d.ts

@@ -1,3 +1,4 @@
 import type { ServerRoute } from '@modern-js/types';
-import { Middleware, ServerEnv } from '../../../../core/server';
+import { Middleware, ServerEnv, ServerManifest } from '../../../../core/server';
+export declare function getServerManifest(pwd: string, routes: ServerRoute[]): Promise<ServerManifest>;
 export declare function injectServerManifest(pwd: string, routes?: ServerRoute[]): Middleware<ServerEnv>;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.49.0",
+  "version": "2.49.1-alpha.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -81,9 +81,9 @@
     "jest": "^29",
     "ts-jest": "^29.1.0",
     "typescript": "^5",
-    "@scripts/jest-config": "2.49.0",
     "@scripts/build": "2.49.0",
-    "@modern-js/types": "2.49.0"
+    "@modern-js/types": "2.49.0",
+    "@scripts/jest-config": "2.49.0"
   },
   "sideEffects": false,
   "publishConfig": {