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

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

@@ -1,3 +1,5 @@
+import "node:module";
+/*#__PURE__*/ import.meta.url;
 import path from "path";
 import { fileReader } from "@modern-js/runtime-utils/fileReader";
 import { LOADABLE_STATS_FILE, MAIN_ENTRY_NAME, NESTED_ROUTE_SPEC_FILE, ROUTE_MANIFEST_FILE, SERVER_BUNDLE_DIRECTORY, compatibleRequire, fs, isProd } from "@modern-js/utils";
@@ -27,25 +29,25 @@ function injectTemplates(pwd, routes, htmlTemplatePromise) {
         await next();
     };
 }
-const loadBundle = async (filepath, logger)=>{
+const loadBundle = async (filepath, monitors)=>{
     if (!await fs.pathExists(filepath)) return;
     try {
         const module = await compatibleRequire(filepath, false);
         return module;
     } catch (e) {
-        logger.error(`Load ${filepath} bundle failed, error = %s`, e instanceof Error ? e.stack || e.message : e);
+        monitors.error(`Load ${filepath} bundle failed, error = %s`, e instanceof Error ? e.stack || e.message : e);
         return;
     }
 };
-async function getServerManifest(pwd, routes, logger) {
+async function getServerManifest(pwd, routes, monitors) {
     const loaderBundles = {};
     const renderBundles = {};
     await Promise.all(routes.filter((route)=>Boolean(route.bundle)).map(async (route)=>{
         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, logger);
-        const loaderBundle = await loadBundle(loaderBundlePath, logger);
+        const renderBundle = await loadBundle(renderBundlePath, monitors);
+        const loaderBundle = await loadBundle(loaderBundlePath, monitors);
         renderBundle && (renderBundles[entryName] = renderBundle);
         loaderBundle && (loaderBundles[entryName] = loaderBundle?.loadModules ? await loaderBundle?.loadModules() : loaderBundle);
     }));
@@ -66,8 +68,8 @@ async function getServerManifest(pwd, routes, logger) {
 function injectServerManifest(pwd, routes, manifestPromise) {
     return async (c, next)=>{
         if (routes && !c.get('serverManifest')) {
-            const logger = c.get('logger');
-            const serverManifest = await (manifestPromise || getServerManifest(pwd, routes, logger));
+            const monitors = c.get('monitors');
+            const serverManifest = await (manifestPromise || getServerManifest(pwd, routes, monitors));
             c.set('serverManifest', serverManifest);
         }
         await next();

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

@@ -1,3 +1,5 @@
+import "node:module";
+/*#__PURE__*/ import.meta.url;
 import path from "path";
 import { fileReader } from "@modern-js/runtime-utils/fileReader";
 import { fs } from "@modern-js/utils";

package/dist/esm-node/constants.mjs

@@ -1,3 +1,5 @@
+import "node:module";
+/*#__PURE__*/ import.meta.url;
 const AGGRED_DIR = {
     mock: 'config/mock',
     server: 'server',

package/dist/esm-node/context.mjs

@@ -1,3 +1,5 @@
+import "node:module";
+/*#__PURE__*/ import.meta.url;
 import { createStorage } from "./utils/storage.mjs";
 const { run, useHonoContext } = createStorage();
 export { run, useHonoContext };

package/dist/esm-node/helper.mjs

@@ -1,3 +1,5 @@
+import "node:module";
+/*#__PURE__*/ import.meta.url;
 const LOADER_CONTEXT = 'loaderContext';
 function getLoaderCtx(c) {
     const loaderContext = c.get(LOADER_CONTEXT);

package/dist/esm-node/hono.mjs

@@ -1,3 +1,5 @@
+import "node:module";
+/*#__PURE__*/ import.meta.url;
 import { deleteCookie, getCookie, setCookie } from "hono/cookie";
 import { languageDetector } from "hono/language";
 export { deleteCookie, getCookie, languageDetector, setCookie };

package/dist/esm-node/index.mjs

@@ -1,8 +1,10 @@
+import "node:module";
+/*#__PURE__*/ import.meta.url;
 import { ErrorDigest, createErrorHtml, onError } from "./utils/index.mjs";
 import { getPublicDirConfig, getPublicDirPatterns, getPublicDirRoutePrefixes, normalizePublicDir, normalizePublicDirPath, resolvePublicDirPaths } from "./utils/publicDir.mjs";
 import { AGGRED_DIR } from "./constants.mjs";
 import { createServerBase } from "./serverBase.mjs";
-import { useHonoContext } from "./context.mjs";
+import { run, useHonoContext } from "./context.mjs";
 import { Hono } from "hono";
 import { getLoaderCtx } from "./helper.mjs";
 export * from "./plugins/index.mjs";
@@ -10,4 +12,4 @@ export * from "./types/plugins/index.mjs";
 export * from "./types/render.mjs";
 export * from "./types/config/index.mjs";
 export * from "./types/requestHandler.mjs";
-export { AGGRED_DIR, ErrorDigest, Hono, createErrorHtml, createServerBase, getLoaderCtx, getPublicDirConfig, getPublicDirPatterns, getPublicDirRoutePrefixes, normalizePublicDir, normalizePublicDirPath, onError, resolvePublicDirPaths, useHonoContext };
+export { AGGRED_DIR, ErrorDigest, Hono, createErrorHtml, createServerBase, getLoaderCtx, getPublicDirConfig, getPublicDirPatterns, getPublicDirRoutePrefixes, normalizePublicDir, normalizePublicDirPath, onError, resolvePublicDirPaths, run, useHonoContext };

package/dist/esm-node/plugins/compat/hooks.mjs

@@ -1,3 +1,5 @@
+import "node:module";
+/*#__PURE__*/ import.meta.url;
 function getHookRunners(context) {
     const { hooks } = context;
     return {

package/dist/esm-node/plugins/compat/index.mjs

@@ -1,3 +1,5 @@
+import "node:module";
+/*#__PURE__*/ import.meta.url;
 import { createAsyncHook, createAsyncPipelineHook } from "@modern-js/plugin";
 import { getHookRunners, handleSetupResult } from "./hooks.mjs";
 const compatPlugin = ()=>({

package/dist/esm-node/plugins/default.mjs

@@ -1,3 +1,5 @@
+import "node:module";
+/*#__PURE__*/ import.meta.url;
 import { compatPlugin } from "./compat/index.mjs";
 import { logPlugin } from "./log.mjs";
 import { initMonitorsPlugin, injectServerTiming, injectloggerPlugin } from "./monitors.mjs";

package/dist/esm-node/plugins/favicon.mjs

@@ -1,3 +1,5 @@
+import "node:module";
+/*#__PURE__*/ import.meta.url;
 const faviconPlugin = ()=>({
         name: '@modern-js/plugin-favicon',
         setup (api) {

package/dist/esm-node/plugins/index.mjs

@@ -1,3 +1,5 @@
+import "node:module";
+/*#__PURE__*/ import.meta.url;
 import { getRenderHandler, injectRenderHandlerPlugin, renderPlugin } from "./render/index.mjs";
 import { faviconPlugin } from "./favicon.mjs";
 import { injectServerTiming, injectloggerPlugin } from "./monitors.mjs";

package/dist/esm-node/plugins/log.mjs

@@ -1,3 +1,5 @@
+import "node:module";
+/*#__PURE__*/ import.meta.url;
 import { getPathname } from "../utils/index.mjs";
 const humanize = (times)=>{
     const [delimiter, separator] = [

package/dist/esm-node/plugins/middlewares.mjs

@@ -1,3 +1,5 @@
+import "node:module";
+/*#__PURE__*/ import.meta.url;
 const injectConfigMiddlewarePlugin = (configMiddlewares = [], configRenderMiddlewares = [])=>({
         name: '@modern-js/plugin-inject-config-middleware',
         setup (api) {

package/dist/esm-node/plugins/monitors.mjs

@@ -1,3 +1,5 @@
+import "node:module";
+/*#__PURE__*/ import.meta.url;
 import { time } from "@modern-js/runtime-utils/time";
 import { SERVER_TIMING, ServerTimings } from "../constants.mjs";
 function createMonitors() {

package/dist/esm-node/plugins/processedBy.mjs

@@ -1,3 +1,5 @@
+import "node:module";
+/*#__PURE__*/ import.meta.url;
 const processedByPlugin = ()=>({
         name: '@modern-js/plugin-processed',
         setup (api) {

package/dist/esm-node/plugins/render/csrRscRender.mjs

@@ -1,3 +1,5 @@
+import "node:module";
+/*#__PURE__*/ import.meta.url;
 import { MAIN_ENTRY_NAME } from "@modern-js/utils/universal/constants";
 import { createRequestHandlerConfig } from "./utils.mjs";
 const csrRscRender = async (req, options)=>{

package/dist/esm-node/plugins/render/dataHandler.mjs

@@ -1,3 +1,5 @@
+import "node:module";
+/*#__PURE__*/ import.meta.url;
 import { MAIN_ENTRY_NAME } from "@modern-js/utils/universal/constants";
 const dataHandler = async (request, { routeInfo, serverRoutes, monitors, onError, onTiming, serverManifest, loaderContext })=>{
     const serverLoaderModule = serverManifest?.loaderBundles?.[routeInfo.entryName || MAIN_ENTRY_NAME];

package/dist/esm-node/plugins/render/index.mjs

@@ -1,3 +1,5 @@
+import "node:module";
+/*#__PURE__*/ import.meta.url;
 import { getLoaderCtx } from "../../helper.mjs";
 import { sortRoutes } from "../../utils/index.mjs";
 import { requestLatencyMiddleware } from "../monitors.mjs";

package/dist/esm-node/plugins/render/inject.mjs

@@ -1,3 +1,5 @@
+import "node:module";
+/*#__PURE__*/ import.meta.url;
 import { createRender } from "./render.mjs";
 const injectRenderHandlerPlugin = ({ staticGenerate, cacheConfig })=>({
         name: '@modern-js/plugin-inject-render',

package/dist/esm-node/plugins/render/render.mjs

@@ -1,3 +1,5 @@
+import "node:module";
+/*#__PURE__*/ import.meta.url;
 import * as __rspack_external__modern_js_runtime_utils_router_2aa8d96f from "@modern-js/runtime-utils/router";
 import { cutNameByHyphen } from "@modern-js/utils/universal";
 import { TrieRouter } from "hono/router/trie-router";

package/dist/esm-node/plugins/render/renderRscHandler.mjs

@@ -1,3 +1,5 @@
+import "node:module";
+/*#__PURE__*/ import.meta.url;
 import { MAIN_ENTRY_NAME } from "@modern-js/utils/universal/constants";
 import { createRequestHandlerConfig } from "./utils.mjs";
 const renderRscHandler = async (req, options)=>{

package/dist/esm-node/plugins/render/serverActionHandler.mjs

@@ -1,3 +1,5 @@
+import "node:module";
+/*#__PURE__*/ import.meta.url;
 import { MAIN_ENTRY_NAME } from "@modern-js/utils/universal/constants";
 const serverActionHandler = async (req, { serverManifest, routeInfo, rscClientManifest })=>{
     const serverBundle = serverManifest?.renderBundles?.[routeInfo.entryName || MAIN_ENTRY_NAME];

package/dist/esm-node/plugins/render/ssrCache.mjs

@@ -1,3 +1,5 @@
+import "node:module";
+/*#__PURE__*/ import.meta.url;
 import { createMemoryStorage } from "@modern-js/runtime-utils/storer";
 import { X_RENDER_CACHE } from "../../constants.mjs";
 import { createTransformStream, getPathname } from "../../utils/index.mjs";

package/dist/esm-node/plugins/render/ssrRender.mjs

@@ -1,3 +1,5 @@
+import "node:module";
+/*#__PURE__*/ import.meta.url;
 import { MAIN_ENTRY_NAME } from "@modern-js/utils/universal/constants";
 import { X_MODERNJS_RENDER } from "../../constants.mjs";
 import { getPathname, parseHeaders } from "../../utils/index.mjs";

package/dist/esm-node/plugins/render/utils.mjs

@@ -1,3 +1,5 @@
+import "node:module";
+/*#__PURE__*/ import.meta.url;
 function createRequestHandlerConfig(userConfig) {
     const { output, server, security, html, source } = userConfig;
     return {

package/dist/esm-node/plugins/route.mjs

@@ -1,3 +1,5 @@
+import "node:module";
+/*#__PURE__*/ import.meta.url;
 import { MAIN_ENTRY_NAME } from "@modern-js/utils/universal/constants";
 import { sortRoutes } from "../utils/index.mjs";
 function injectRoute(route) {

package/dist/esm-node/serverBase.mjs

@@ -1,3 +1,5 @@
+import "node:module";
+/*#__PURE__*/ import.meta.url;
 import { server as server_server } from "@modern-js/plugin/server";
 import { Hono } from "hono";
 import { run } from "./context.mjs";

package/dist/esm-node/types/config/bff.mjs

@@ -0,0 +1,2 @@
+import "node:module";
+/*#__PURE__*/ import.meta.url;

package/dist/esm-node/types/config/dev.mjs

@@ -0,0 +1,2 @@
+import "node:module";
+/*#__PURE__*/ import.meta.url;

package/dist/esm-node/types/config/html.mjs

@@ -0,0 +1,2 @@
+import "node:module";
+/*#__PURE__*/ import.meta.url;

package/dist/esm-node/types/config/index.mjs

@@ -1,3 +1,5 @@
+import "node:module";
+/*#__PURE__*/ import.meta.url;
 export * from "./bff.mjs";
 export * from "./html.mjs";
 export * from "./output.mjs";

package/dist/esm-node/types/config/output.mjs

@@ -0,0 +1,2 @@
+import "node:module";
+/*#__PURE__*/ import.meta.url;

package/dist/esm-node/types/config/security.mjs

@@ -0,0 +1,2 @@
+import "node:module";
+/*#__PURE__*/ import.meta.url;

package/dist/esm-node/types/config/server.mjs

@@ -0,0 +1,2 @@
+import "node:module";
+/*#__PURE__*/ import.meta.url;

package/dist/esm-node/types/config/share.mjs

@@ -0,0 +1,2 @@
+import "node:module";
+/*#__PURE__*/ import.meta.url;

package/dist/esm-node/types/config/source.mjs

@@ -0,0 +1,2 @@
+import "node:module";
+/*#__PURE__*/ import.meta.url;

package/dist/esm-node/types/config/tools.mjs

@@ -0,0 +1,2 @@
+import "node:module";
+/*#__PURE__*/ import.meta.url;

package/dist/esm-node/types/index.mjs

@@ -1,3 +1,5 @@
+import "node:module";
+/*#__PURE__*/ import.meta.url;
 export * from "./config/index.mjs";
 export * from "./plugins/index.mjs";
 export * from "./render.mjs";

package/dist/esm-node/types/plugins/base.mjs

@@ -0,0 +1,2 @@
+import "node:module";
+/*#__PURE__*/ import.meta.url;

package/dist/esm-node/types/plugins/index.mjs

@@ -1 +1,3 @@
+import "node:module";
+/*#__PURE__*/ import.meta.url;
 export * from "./plugin.mjs";

package/dist/esm-node/types/plugins/plugin.mjs

@@ -0,0 +1,2 @@
+import "node:module";
+/*#__PURE__*/ import.meta.url;

package/dist/esm-node/types/render.mjs

@@ -0,0 +1,2 @@
+import "node:module";
+/*#__PURE__*/ import.meta.url;

package/dist/esm-node/types/requestHandler.mjs

@@ -0,0 +1,2 @@
+import "node:module";
+/*#__PURE__*/ import.meta.url;

package/dist/esm-node/types/server.mjs

@@ -0,0 +1,2 @@
+import "node:module";
+/*#__PURE__*/ import.meta.url;

package/dist/esm-node/utils/entry.mjs

@@ -1,3 +1,5 @@
+import "node:module";
+/*#__PURE__*/ import.meta.url;
 const sortRoutes = (route1, route2)=>route2.urlPath.length - route1.urlPath.length;
 const uniqueKeyByRoute = (route)=>`${route.entryName}-${route.urlPath}`;
 export { sortRoutes, uniqueKeyByRoute };

package/dist/esm-node/utils/env.mjs

@@ -1,3 +1,5 @@
+import "node:module";
+/*#__PURE__*/ import.meta.url;
 const getRuntimeEnv = ()=>{
     if (globalThis?.process?.release?.name === 'node') return 'node';
     return 'other';

package/dist/esm-node/utils/error.mjs

@@ -1,3 +1,5 @@
+import "node:module";
+/*#__PURE__*/ import.meta.url;
 import { parseHeaders } from "./request.mjs";
 const ERROR_PAGE_TEXT = {
     404: 'This page could not be found.',

package/dist/esm-node/utils/index.mjs

@@ -1,3 +1,5 @@
+import "node:module";
+/*#__PURE__*/ import.meta.url;
 export * from "./env.mjs";
 export * from "./transformStream.mjs";
 export * from "./middlewareCollector.mjs";

package/dist/esm-node/utils/middlewareCollector.mjs

@@ -1,3 +1,5 @@
+import "node:module";
+/*#__PURE__*/ import.meta.url;
 const mergeExtension = (users)=>{
     const output = [];
     return {

package/dist/esm-node/utils/publicDir.mjs

@@ -1,3 +1,5 @@
+import "node:module";
+/*#__PURE__*/ import.meta.url;
 import path from "path";
 function normalizePublicDir(publicDir) {
     if (!publicDir) return [];

package/dist/esm-node/utils/request.mjs

@@ -1,3 +1,5 @@
+import "node:module";
+/*#__PURE__*/ import.meta.url;
 function parseQuery(req) {
     const query = {};
     const { url } = req;

package/dist/esm-node/utils/serverConfig.mjs

@@ -1,3 +1,5 @@
+import "node:module";
+/*#__PURE__*/ import.meta.url;
 import { merge } from "ts-deepmerge";
 const loadConfig = ({ cliConfig, serverConfig })=>{
     const config = merge({

package/dist/esm-node/utils/storage.mjs

@@ -1,3 +1,5 @@
+import "node:module";
+/*#__PURE__*/ import.meta.url;
 import { AsyncLocalStorage } from "async_hooks";
 const createStorage = ()=>{
     let storage;

package/dist/esm-node/utils/transformStream.mjs

@@ -1,3 +1,5 @@
+import "node:module";
+/*#__PURE__*/ import.meta.url;
 function createTransformStream(fn) {
     const decoder = new TextDecoder();
     const encoder = new TextEncoder();

package/dist/esm-node/utils/warmup.mjs

@@ -1,3 +1,5 @@
+import "node:module";
+/*#__PURE__*/ import.meta.url;
 function warmup(bundles) {
     bundles.forEach((bundle)=>{
         bundle && import(bundle).catch((_)=>{});

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

@@ -1,8 +1,8 @@
-import type { Logger, ServerRoute } from '@modern-js/types';
+import type { Monitors, ServerRoute } from '@modern-js/types';
 import type { Middleware, ServerEnv, ServerManifest, ServerPlugin } from '../../../types';
 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[], logger: Logger): Promise<ServerManifest>;
+export declare function getServerManifest(pwd: string, routes: ServerRoute[], monitors: Monitors): 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/index.d.ts

@@ -3,7 +3,7 @@ export { normalizePublicDir, normalizePublicDirPath, getPublicDirRoutePrefixes,
 export { AGGRED_DIR } from './constants';
 export type { ServerBase, ServerBaseOptions } from './serverBase';
 export { createServerBase } from './serverBase';
-export { useHonoContext } from './context';
+export { run, useHonoContext } from './context';
 export { Hono } from 'hono';
 export type { Middleware, MiddlewareHandler, Context, Next, HonoRequest as InternalRequest, ServerEnv, ServerManifest, ServerLoaderBundle, } from './types';
 export { getLoaderCtx } from './helper';

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

@@ -28,7 +28,7 @@ export interface ServerUserConfig {
     baseUrl?: string | string[];
     port?: number;
     watchOptions?: WatchOptions;
-    compiler?: 'babel' | 'typescript';
+    compiler?: 'typescript';
     /**
      * @description use json script tag instead of inline script
      * @default false

package/dist/types/types/config/tools.d.ts

@@ -1,8 +1,2 @@
-import type { BabelTransformOptions } from '@modern-js/types/common';
-import type { ConfigChain } from './share';
-type ToolsBabelConfig = ConfigChain<BabelTransformOptions, any>;
-export interface ToolsUserConfig {
-    babel?: ToolsBabelConfig;
-}
+export type ToolsUserConfig = Record<string, never>;
 export type ToolsNormalizedConfig = ToolsUserConfig;
-export {};

package/package.json

@@ -15,25 +15,34 @@
     "modern",
     "modern.js"
   ],
-  "version": "3.0.0-alpha.1",
-  "jsnext:source": "./src/index.ts",
+  "version": "3.0.0-alpha.2",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
-  "module": "./dist/esm-node/index.mjs",
   "exports": {
     ".": {
       "types": "./dist/types/index.d.ts",
-      "import": "./dist/esm-node/index.mjs",
+      "modern:source": "./src/index.ts",
+      "node": {
+        "import": "./dist/esm-node/index.mjs",
+        "require": "./dist/cjs/index.js"
+      },
       "default": "./dist/cjs/index.js"
     },
     "./node": {
       "types": "./dist/types/adapters/node/index.d.ts",
-      "import": "./dist/esm-node/adapters/node/index.mjs",
+      "modern:source": "./src/adapters/node/index.ts",
+      "node": {
+        "import": "./dist/esm-node/adapters/node/index.mjs",
+        "require": "./dist/cjs/adapters/node/index.js"
+      },
       "default": "./dist/cjs/adapters/node/index.js"
     },
     "./hono": {
       "types": "./dist/types/hono.d.ts",
-      "import": "./dist/esm-node/hono.mjs",
+      "node": {
+        "import": "./dist/esm-node/hono.mjs",
+        "require": "./dist/cjs/hono.js"
+      },
       "default": "./dist/cjs/hono.js"
     }
   },
@@ -60,22 +69,22 @@
     "@web-std/stream": "^1.0.3",
     "cloneable-readable": "^3.0.0",
     "flatted": "^3.3.3",
-    "hono": "^4.10.4",
+    "hono": "^4.11.7",
     "ts-deepmerge": "7.0.3",
-    "@modern-js/plugin": "3.0.0-alpha.1",
-    "@modern-js/runtime-utils": "3.0.0-alpha.1",
-    "@modern-js/utils": "3.0.0-alpha.1"
+    "@modern-js/plugin": "3.0.0-alpha.2",
+    "@modern-js/runtime-utils": "3.0.0-alpha.2",
+    "@modern-js/utils": "3.0.0-alpha.2"
   },
   "devDependencies": {
-    "@rslib/core": "0.19.1",
+    "@rslib/core": "0.19.3",
     "@types/cloneable-readable": "^2.0.3",
     "@types/merge-deep": "^3.0.3",
     "@types/node": "^20",
     "http-proxy-middleware": "^2.0.9",
     "typescript": "^5",
-    "@modern-js/types": "3.0.0-alpha.1",
+    "@modern-js/rslib": "2.68.10",
     "@scripts/rstest-config": "2.66.0",
-    "@modern-js/rslib": "2.68.10"
+    "@modern-js/types": "3.0.0-alpha.2"
   },
   "sideEffects": false,
   "publishConfig": {