@modern-js/server-core 3.9.3 → 3.10.1

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

@@ -77,28 +77,51 @@ function injectTemplates(pwd, routes, htmlTemplatePromise) {
         await next();
     };
 }
-const loadBundle = async (filepath, monitors)=>{
-    if (!await utils_namespaceObject.fs.pathExists(filepath)) return;
+function reportBundleError(filepath, error, monitors) {
+    const detail = error instanceof Error ? error.stack || error.message : error;
+    if (monitors) monitors.error(`Load ${filepath} bundle failed, error = %s`, detail);
+    else console.error(`Load ${filepath} bundle failed, error = ${detail}`);
+}
+const loadBundle = async (filepath, monitors, { required = false, failOnError = false } = {})=>{
+    if (!required && !failOnError && !await utils_namespaceObject.fs.pathExists(filepath)) return;
     try {
+        if (!required && failOnError) try {
+            await utils_namespaceObject.fs.access(filepath);
+        } catch (e) {
+            const code = e?.code;
+            if ('ENOENT' === code || 'ENOTDIR' === code) return;
+            throw e;
+        }
         const module = await (0, utils_namespaceObject.compatibleRequire)(filepath, false);
         return module;
     } catch (e) {
-        if (monitors) monitors.error(`Load ${filepath} bundle failed, error = %s`, e instanceof Error ? e.stack || e.message : e);
-        else console.error(`Load ${filepath} bundle failed, error = ${e instanceof Error ? e.stack || e.message : e}`);
+        reportBundleError(filepath, e, monitors);
+        if (failOnError) throw e;
         return;
     }
 };
-async function getServerManifest(pwd, routes, monitors) {
+async function getServerManifest(pwd, routes, monitors, { failOnError = false } = {}) {
     const loaderBundles = {};
     const renderBundles = {};
     await Promise.all(routes.filter((route)=>Boolean(route.bundle)).map(async (route)=>{
+        const failOnBundleError = failOnError && Boolean(route.isSSR);
         const entryName = route.entryName || utils_namespaceObject.MAIN_ENTRY_NAME;
         const renderBundlePath = external_path_default().join(pwd, route.bundle || '');
         const loaderBundlePath = external_path_default().join(pwd, utils_namespaceObject.SERVER_BUNDLE_DIRECTORY, `${entryName}-server-loaders.js`);
-        const renderBundle = await loadBundle(renderBundlePath, monitors);
-        const loaderBundle = await loadBundle(loaderBundlePath, monitors);
+        const renderBundle = await loadBundle(renderBundlePath, monitors, {
+            required: failOnBundleError,
+            failOnError: failOnBundleError
+        });
+        const loaderBundle = await loadBundle(loaderBundlePath, monitors, {
+            failOnError: failOnBundleError
+        });
         renderBundle && (renderBundles[entryName] = renderBundle);
-        loaderBundle && (loaderBundles[entryName] = loaderBundle?.loadModules ? await loaderBundle?.loadModules() : loaderBundle);
+        if (loaderBundle) try {
+            loaderBundles[entryName] = loaderBundle.loadModules ? await loaderBundle.loadModules() : loaderBundle;
+        } catch (e) {
+            if (failOnBundleError) reportBundleError(loaderBundlePath, e, monitors);
+            throw e;
+        }
     }));
     const loadableUri = external_path_default().join(pwd, utils_namespaceObject.LOADABLE_STATS_FILE);
     const loadableStats = await (0, utils_namespaceObject.compatibleRequire)(loadableUri).catch((_)=>({}));
@@ -166,13 +189,18 @@ const injectRscManifestPlugin = (enableRsc)=>({
 const injectResourcePlugin = ()=>({
         name: '@modern-js/plugin-inject-resource',
         setup (api) {
-            api.onPrepare(()=>{
+            api.onPrepare(async ()=>{
                 const { middlewares, routes, distDirectory: pwd } = api.getServerContext();
                 let htmlTemplatePromise;
                 let manifestPromise;
                 if ((0, utils_namespaceObject.isProd)()) {
-                    manifestPromise = getServerManifest(pwd, routes || [], void 0);
+                    const warmupRoutes = routes || [];
+                    const failOnError = warmupRoutes.some((route)=>route.isSSR && route.bundle) && !warmupRoutes.some((route)=>route.isRSC);
+                    manifestPromise = getServerManifest(pwd, warmupRoutes, void 0, {
+                        failOnError
+                    });
                     htmlTemplatePromise = getHtmlTemplates(pwd, routes || []);
+                    if (failOnError) await manifestPromise;
                 }
                 middlewares.push({
                     name: 'inject-server-manifest',

package/dist/cjs/serverBase.js

@@ -31,6 +31,7 @@ __webpack_require__.d(__webpack_exports__, {
     ServerBase: ()=>ServerBase,
     createServerBase: ()=>createServerBase
 });
+const fileReader_namespaceObject = require("@modern-js/runtime-utils/fileReader");
 const server_namespaceObject = require("@modern-js/plugin/server");
 const external_hono_namespaceObject = require("hono");
 const external_context_js_namespaceObject = require("./context.js");
@@ -111,11 +112,14 @@ class ServerBase {
     }
     constructor(options){
         _class_private_method_init(this, _applyMiddlewares);
+        this.fileReader = fileReader_namespaceObject.fileReader;
         this.plugins = [];
         this.serverContext = null;
         this.serverOptions = options;
         this.app = new external_hono_namespaceObject.Hono();
-        this.app.use('*', external_context_js_namespaceObject.run);
+        this.app.use('*', async (context, next)=>{
+            await (0, external_context_js_namespaceObject.run)(context, next);
+        });
     }
 }
 function applyMiddlewares() {

package/dist/esm/adapters/node/plugins/resource.mjs

@@ -27,28 +27,51 @@ function injectTemplates(pwd, routes, htmlTemplatePromise) {
         await next();
     };
 }
-const loadBundle = async (filepath, monitors)=>{
-    if (!await fs.pathExists(filepath)) return;
+function reportBundleError(filepath, error, monitors) {
+    const detail = error instanceof Error ? error.stack || error.message : error;
+    if (monitors) monitors.error(`Load ${filepath} bundle failed, error = %s`, detail);
+    else console.error(`Load ${filepath} bundle failed, error = ${detail}`);
+}
+const loadBundle = async (filepath, monitors, { required = false, failOnError = false } = {})=>{
+    if (!required && !failOnError && !await fs.pathExists(filepath)) return;
     try {
+        if (!required && failOnError) try {
+            await fs.access(filepath);
+        } catch (e) {
+            const code = e?.code;
+            if ('ENOENT' === code || 'ENOTDIR' === code) return;
+            throw e;
+        }
         const module = await compatibleRequire(filepath, false);
         return module;
     } catch (e) {
-        if (monitors) monitors.error(`Load ${filepath} bundle failed, error = %s`, e instanceof Error ? e.stack || e.message : e);
-        else console.error(`Load ${filepath} bundle failed, error = ${e instanceof Error ? e.stack || e.message : e}`);
+        reportBundleError(filepath, e, monitors);
+        if (failOnError) throw e;
         return;
     }
 };
-async function getServerManifest(pwd, routes, monitors) {
+async function getServerManifest(pwd, routes, monitors, { failOnError = false } = {}) {
     const loaderBundles = {};
     const renderBundles = {};
     await Promise.all(routes.filter((route)=>Boolean(route.bundle)).map(async (route)=>{
+        const failOnBundleError = failOnError && Boolean(route.isSSR);
         const entryName = route.entryName || MAIN_ENTRY_NAME;
         const renderBundlePath = path.join(pwd, route.bundle || '');
         const loaderBundlePath = path.join(pwd, SERVER_BUNDLE_DIRECTORY, `${entryName}-server-loaders.js`);
-        const renderBundle = await loadBundle(renderBundlePath, monitors);
-        const loaderBundle = await loadBundle(loaderBundlePath, monitors);
+        const renderBundle = await loadBundle(renderBundlePath, monitors, {
+            required: failOnBundleError,
+            failOnError: failOnBundleError
+        });
+        const loaderBundle = await loadBundle(loaderBundlePath, monitors, {
+            failOnError: failOnBundleError
+        });
         renderBundle && (renderBundles[entryName] = renderBundle);
-        loaderBundle && (loaderBundles[entryName] = loaderBundle?.loadModules ? await loaderBundle?.loadModules() : loaderBundle);
+        if (loaderBundle) try {
+            loaderBundles[entryName] = loaderBundle.loadModules ? await loaderBundle.loadModules() : loaderBundle;
+        } catch (e) {
+            if (failOnBundleError) reportBundleError(loaderBundlePath, e, monitors);
+            throw e;
+        }
     }));
     const loadableUri = path.join(pwd, LOADABLE_STATS_FILE);
     const loadableStats = await compatibleRequire(loadableUri).catch((_)=>({}));
@@ -116,13 +139,18 @@ const injectRscManifestPlugin = (enableRsc)=>({
 const injectResourcePlugin = ()=>({
         name: '@modern-js/plugin-inject-resource',
         setup (api) {
-            api.onPrepare(()=>{
+            api.onPrepare(async ()=>{
                 const { middlewares, routes, distDirectory: pwd } = api.getServerContext();
                 let htmlTemplatePromise;
                 let manifestPromise;
                 if (isProd()) {
-                    manifestPromise = getServerManifest(pwd, routes || [], void 0);
+                    const warmupRoutes = routes || [];
+                    const failOnError = warmupRoutes.some((route)=>route.isSSR && route.bundle) && !warmupRoutes.some((route)=>route.isRSC);
+                    manifestPromise = getServerManifest(pwd, warmupRoutes, void 0, {
+                        failOnError
+                    });
                     htmlTemplatePromise = getHtmlTemplates(pwd, routes || []);
+                    if (failOnError) await manifestPromise;
                 }
                 middlewares.push({
                     name: 'inject-server-manifest',

package/dist/esm/serverBase.mjs

@@ -1,3 +1,4 @@
+import { fileReader } from "@modern-js/runtime-utils/fileReader";
 import { server as server_server } from "@modern-js/plugin/server";
 import { Hono } from "hono";
 import { run } from "./context.mjs";
@@ -78,11 +79,14 @@ class ServerBase {
     }
     constructor(options){
         _class_private_method_init(this, _applyMiddlewares);
+        this.fileReader = fileReader;
         this.plugins = [];
         this.serverContext = null;
         this.serverOptions = options;
         this.app = new Hono();
-        this.app.use('*', run);
+        this.app.use('*', async (context, next)=>{
+            await run(context, next);
+        });
     }
 }
 function applyMiddlewares() {

package/dist/esm-node/adapters/node/plugins/resource.mjs

@@ -28,28 +28,51 @@ function injectTemplates(pwd, routes, htmlTemplatePromise) {
         await next();
     };
 }
-const loadBundle = async (filepath, monitors)=>{
-    if (!await fs.pathExists(filepath)) return;
+function reportBundleError(filepath, error, monitors) {
+    const detail = error instanceof Error ? error.stack || error.message : error;
+    if (monitors) monitors.error(`Load ${filepath} bundle failed, error = %s`, detail);
+    else console.error(`Load ${filepath} bundle failed, error = ${detail}`);
+}
+const loadBundle = async (filepath, monitors, { required = false, failOnError = false } = {})=>{
+    if (!required && !failOnError && !await fs.pathExists(filepath)) return;
     try {
+        if (!required && failOnError) try {
+            await fs.access(filepath);
+        } catch (e) {
+            const code = e?.code;
+            if ('ENOENT' === code || 'ENOTDIR' === code) return;
+            throw e;
+        }
         const module = await compatibleRequire(filepath, false);
         return module;
     } catch (e) {
-        if (monitors) monitors.error(`Load ${filepath} bundle failed, error = %s`, e instanceof Error ? e.stack || e.message : e);
-        else console.error(`Load ${filepath} bundle failed, error = ${e instanceof Error ? e.stack || e.message : e}`);
+        reportBundleError(filepath, e, monitors);
+        if (failOnError) throw e;
         return;
     }
 };
-async function getServerManifest(pwd, routes, monitors) {
+async function getServerManifest(pwd, routes, monitors, { failOnError = false } = {}) {
     const loaderBundles = {};
     const renderBundles = {};
     await Promise.all(routes.filter((route)=>Boolean(route.bundle)).map(async (route)=>{
+        const failOnBundleError = failOnError && Boolean(route.isSSR);
         const entryName = route.entryName || MAIN_ENTRY_NAME;
         const renderBundlePath = path.join(pwd, route.bundle || '');
         const loaderBundlePath = path.join(pwd, SERVER_BUNDLE_DIRECTORY, `${entryName}-server-loaders.js`);
-        const renderBundle = await loadBundle(renderBundlePath, monitors);
-        const loaderBundle = await loadBundle(loaderBundlePath, monitors);
+        const renderBundle = await loadBundle(renderBundlePath, monitors, {
+            required: failOnBundleError,
+            failOnError: failOnBundleError
+        });
+        const loaderBundle = await loadBundle(loaderBundlePath, monitors, {
+            failOnError: failOnBundleError
+        });
         renderBundle && (renderBundles[entryName] = renderBundle);
-        loaderBundle && (loaderBundles[entryName] = loaderBundle?.loadModules ? await loaderBundle?.loadModules() : loaderBundle);
+        if (loaderBundle) try {
+            loaderBundles[entryName] = loaderBundle.loadModules ? await loaderBundle.loadModules() : loaderBundle;
+        } catch (e) {
+            if (failOnBundleError) reportBundleError(loaderBundlePath, e, monitors);
+            throw e;
+        }
     }));
     const loadableUri = path.join(pwd, LOADABLE_STATS_FILE);
     const loadableStats = await compatibleRequire(loadableUri).catch((_)=>({}));
@@ -117,13 +140,18 @@ const injectRscManifestPlugin = (enableRsc)=>({
 const injectResourcePlugin = ()=>({
         name: '@modern-js/plugin-inject-resource',
         setup (api) {
-            api.onPrepare(()=>{
+            api.onPrepare(async ()=>{
                 const { middlewares, routes, distDirectory: pwd } = api.getServerContext();
                 let htmlTemplatePromise;
                 let manifestPromise;
                 if (isProd()) {
-                    manifestPromise = getServerManifest(pwd, routes || [], void 0);
+                    const warmupRoutes = routes || [];
+                    const failOnError = warmupRoutes.some((route)=>route.isSSR && route.bundle) && !warmupRoutes.some((route)=>route.isRSC);
+                    manifestPromise = getServerManifest(pwd, warmupRoutes, void 0, {
+                        failOnError
+                    });
                     htmlTemplatePromise = getHtmlTemplates(pwd, routes || []);
+                    if (failOnError) await manifestPromise;
                 }
                 middlewares.push({
                     name: 'inject-server-manifest',

package/dist/esm-node/serverBase.mjs

@@ -1,4 +1,5 @@
 import "node:module";
+import { fileReader } from "@modern-js/runtime-utils/fileReader";
 import { server as server_server } from "@modern-js/plugin/server";
 import { Hono } from "hono";
 import { run } from "./context.mjs";
@@ -79,11 +80,14 @@ class ServerBase {
     }
     constructor(options){
         _class_private_method_init(this, _applyMiddlewares);
+        this.fileReader = fileReader;
         this.plugins = [];
         this.serverContext = null;
         this.serverOptions = options;
         this.app = new Hono();
-        this.app.use('*', run);
+        this.app.use('*', async (context, next)=>{
+            await run(context, next);
+        });
     }
 }
 function applyMiddlewares() {

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

@@ -1,5 +1,5 @@
 export { httpCallBack2HonoMid, connectMid2HonoMid, connectMockMid2HonoMid, } from './hono.js';
 export type { ServerNodeContext, ServerNodeMiddleware } from './hono.js';
-export { createNodeServer, sendResponse, createWebRequest, } from './node.js';
+export { createNodeServer, sendResponse, createWebRequest } from './node.js';
 export { serverStaticPlugin, injectResourcePlugin, getHtmlTemplates, getServerManifest, injectNodeSeverPlugin, injectRscManifestPlugin, } from './plugins/index.js';
 export { loadServerPlugins, loadServerEnv, loadServerRuntimeConfig, loadServerCliConfig, loadCacheConfig, } from './helper/index.js';

package/dist/types/adapters/node/plugins/resource.d.ts

@@ -2,7 +2,9 @@ import type { Monitors, ServerRoute } from '@modern-js/types';
 import type { Middleware, ServerEnv, ServerManifest, ServerPlugin } from '../../../types/index.js';
 export declare function getHtmlTemplates(pwd: string, routes: ServerRoute[]): Promise<Record<string, string>>;
 export declare function injectTemplates(pwd: string, routes?: ServerRoute[], htmlTemplatePromise?: ReturnType<typeof getHtmlTemplates>): Middleware<ServerEnv>;
-export declare function getServerManifest(pwd: string, routes: ServerRoute[], monitors?: Monitors): Promise<ServerManifest>;
+export declare function getServerManifest(pwd: string, routes: ServerRoute[], monitors?: Monitors, { failOnError }?: {
+    failOnError?: boolean | undefined;
+}): Promise<ServerManifest>;
 export declare function injectServerManifest(pwd: string, routes?: ServerRoute[], manifestPromise?: Promise<ServerManifest>): Middleware<ServerEnv>;
 export declare function getRscServerManifest(pwd: string): Promise<any>;
 export declare function getClientManifest(pwd: string): Promise<any>;

package/dist/types/hono.d.ts

@@ -1,3 +1,3 @@
 export type { Context, Next, MiddlewareHandler, MiddlewareHandler as Middleware, HonoRequest, } from 'hono';
-export { setCookie, getCookie, deleteCookie, } from 'hono/cookie';
+export { setCookie, getCookie, deleteCookie } from 'hono/cookie';
 export { languageDetector } from 'hono/language';

package/dist/types/serverBase.d.ts

@@ -9,6 +9,7 @@ export interface ServerBaseOptions extends ServerCreateOptions {
 }
 export declare class ServerBase<E extends Env = any> {
     #private;
+    readonly fileReader: import("@modern-js/runtime-utils/fileReader").FileReader;
     serverOptions: ServerBaseOptions;
     private app;
     private plugins;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "3.9.3",
+  "version": "3.10.1",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
   "exports": {
@@ -71,19 +71,18 @@
     "flatted": "^3.4.4",
     "hono": "^4.11.7",
     "ts-deepmerge": "8.0.0",
-    "@modern-js/plugin": "3.9.3",
-    "@modern-js/runtime-utils": "3.9.3",
-    "@modern-js/utils": "3.9.3"
+    "@modern-js/plugin": "3.10.1",
+    "@modern-js/utils": "3.10.1",
+    "@modern-js/runtime-utils": "3.10.1"
   },
   "devDependencies": {
-    "@rslib/core": "1.0.1",
     "@types/cloneable-readable": "^2.0.3",
     "@types/merge-deep": "^3.0.3",
     "@types/node": "^20",
     "http-proxy-middleware": "^2.0.10",
     "typescript": "^5",
     "@modern-js/rslib": "2.68.10",
-    "@modern-js/types": "3.9.3",
+    "@modern-js/types": "3.10.1",
     "@scripts/rstest-config": "2.66.0"
   },
   "sideEffects": false,
@@ -92,8 +91,8 @@
     "access": "public"
   },
   "scripts": {
-    "dev": "rslib build --watch",
-    "build": "rslib build",
+    "dev": "rs lib --watch",
+    "build": "rs lib",
     "test": "rstest --passWithNoTests"
   }
 }

package/rstack.config.mts

@@ -0,0 +1,4 @@
+import { rslibConfig } from '@modern-js/rslib';
+import { define } from 'rstack';
+
+define.lib(rslibConfig);

package/rslib.config.mts

@@ -1,4 +0,0 @@
-import { rslibConfig } from '@modern-js/rslib';
-import { defineConfig } from '@rslib/core';
-
-export default defineConfig(rslibConfig);