fix: add server.logger to control internal logger (#6812)

Author: zllkjc

.changeset/dry-elephants-promise.md

@@ -0,0 +1,7 @@
+---
+'@modern-js/prod-server': patch
+'@modern-js/server-core': patch
+---
+
+fix: add `server.logger` to control internal server logger
+fix: 添加 `server.logger` 配置来控制 Server 内部日志

packages/server/core/src/plugins/default.ts

@@ -13,17 +13,32 @@ import {
 } from './render';
 
 export type CreateDefaultPluginsOptions = InjectRenderHandlerOptions & {
-  logger?: Logger;
+  logger?: Logger | false;
 };
 
+function createSilenceLogger() {
+  return new Proxy(
+    {},
+    {
+      get: () => {
+        return () => {
+          // do nothing
+        };
+      },
+    },
+  ) as Logger;
+}
+
 export function createDefaultPlugins(
   options: CreateDefaultPluginsOptions = {},
 ) {
   const plugins: ServerPlugin[] = [
     logPlugin(),
     initMonitorsPlugin(),
     injectRenderHandlerPlugin(options),
-    injectloggerPluigin(options.logger),
+    injectloggerPluigin(
+      options.logger ? options.logger : createSilenceLogger(),
+    ),
     injectServerTiming(),
     processedByPlugin(),
   ];

packages/server/core/src/types/config/server.ts

@@ -44,6 +44,7 @@ export interface ServerUserConfig {
    * @default false
    */
   useJsonScript?: boolean;
+  logger?: boolean | Record<string, unknown>;
 }
 
 export type ServerNormalizedConfig = ServerUserConfig;

packages/server/prod-server/src/apply.ts

@@ -15,10 +15,11 @@ import {
   loadCacheConfig,
   serverStaticPlugin,
 } from '@modern-js/server-core/node';
-import { createLogger, isProd } from '@modern-js/utils';
+import { Logger, createLogger, isProd } from '@modern-js/utils';
 import type { ProdServerOptions } from './types';
 
-function getLogger() {
+// Now we not use logger options, it can be implemented in the future
+function getLogger(_?: boolean | Record<string, unknown>) {
   if (process.env.DEBUG || process.env.NODE_ENV === 'production') {
     return createLogger({
       level: (process.env.MODERN_SERVER_LOG_LEVEL as any) || 'verbose',
@@ -35,7 +36,7 @@ export async function applyPlugins(
   options: ProdServerOptions,
   nodeServer?: NodeServer,
 ) {
-  const { pwd, appContext } = options;
+  const { pwd, appContext, config } = options;
 
   const loadCachePwd = isProd() ? pwd : appContext.appDirectory || pwd;
   const cacheConfig = await loadCacheConfig(loadCachePwd);
@@ -52,12 +53,13 @@ export async function applyPlugins(
     return c.html(createErrorHtml(500), 500);
   });
 
+  const loggerOptions = config.server.logger;
   const plugins = [
     ...(nodeServer ? [injectNodeSeverPlugin({ nodeServer })] : []),
     ...createDefaultPlugins({
       cacheConfig,
       staticGenerate: options.staticGenerate,
-      logger: getLogger(),
+      logger: loggerOptions === false ? false : getLogger(loggerOptions),
     }),
     ...(options.plugins || []),
     injectResourcePlugin(),

packages/server/prod-server/src/types.ts

@@ -7,8 +7,6 @@ import type { Reporter } from '@modern-js/types';
 import type { Logger } from '@modern-js/utils';
 
 interface ProdServerExtraOptions {
-  logger?: Logger;
-
   /** compat modern.server-runtime.config.ts */
   serverConfigFile?: string;